fixes

Author: aarondfrancis

src/Buffers/PrintableBuffer.php

@@ -125,5 +125,4 @@ public function writeString(int $row, int $col, string $text): array
 
         return [$advanceCursor, $remainder];
     }
-
 }

src/Commands/Command.php

@@ -12,6 +12,7 @@
 use Chewie\Concerns\Ticks;
 use Chewie\Contracts\Loopable;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Str;
 use SoloTerm\Solo\Commands\Concerns\ManagesProcess;
 use SoloTerm\Solo\Hotkeys\Hotkey;
 use SoloTerm\Solo\Hotkeys\KeyHandler;
@@ -168,12 +169,13 @@ public function isInteractive(): bool
     */
     public function dd()
     {
-        dd($this->screen->output());
+        dd($this->screen->printable->buffer);
     }
 
     public function addOutput($text)
     {
-        $text = str_replace('[screen is terminating]', '', $text);
+        $text = Str::before($text, $this->outputEndMarker);
+        $text = Str::after($text, $this->outputStartMarker);
 
         $this->screen->write($text);
     }

src/Commands/Concerns/ManagesProcess.php

@@ -18,13 +18,18 @@
 use SoloTerm\Solo\Support\ErrorBox;
 use SoloTerm\Solo\Support\PendingProcess;
 use SoloTerm\Solo\Support\ProcessTracker;
+use SoloTerm\Solo\Support\Screen;
 use Symfony\Component\Process\InputStream;
 use Symfony\Component\Process\Process as SymfonyProcess;
 
 trait ManagesProcess
 {
     public ?InvokedProcess $process = null;
 
+    public $outputStartMarker = '[[==SOLO_START==]]';
+
+    public $outputEndMarker = '[[==SOLO_END==]]';
+
     protected array $afterTerminateCallbacks = [];
 
     protected bool $stopping = false;
@@ -58,16 +63,9 @@ public function createPendingProcess(): PendingProcess
 
         $screen = $this->makeNewScreen();
 
-        // Build the command by adding a few necessary arguments.
-        $built = implode(' && ', [
-            $this->localEnvironmentVariables(),
-            "stty cols {$screen->width} rows {$screen->height}",
-            "screen -U -q {$this->command}"
-        ]);
-
         // We have to make our own so that we can control pty.
         $process = app(PendingProcess::class)
-            ->command(['bash', '-c', $built])
+            ->command($this->buildCommandArray($screen))
             ->forever()
             ->timeout(0)
             ->idleTimeout(0)
@@ -96,7 +94,28 @@ public function createPendingProcess(): PendingProcess
         ]);
     }
 
-    protected function localEnvironmentVariables()
+    protected function buildCommandArray(Screen $screen): array
+    {
+        $local = $this->localeEnvironmentVariables();
+        $size = sprintf('stty cols %d rows %d', $screen->width, $screen->height);
+
+        $inner = sprintf(
+            "printf '%%s' %s; %s; printf '%%s' %s",
+            $this->outputStartMarker,
+            $this->command,
+            $this->outputEndMarker
+        );
+
+        $built = implode(' && ', [
+            $local,
+            $size,
+            'screen -U -q sh -c ' . escapeshellarg($inner)
+        ]);
+
+        return ['bash', '-c', $built];
+    }
+
+    protected function localeEnvironmentVariables()
     {
         $locale = $this->utf8Locale();
 

tests/Integration/NamespacedCommandTest.php

@@ -19,20 +19,21 @@ class NamespacedCommandTest extends Base
     public function run_solo_command_in_directory()
     {
         $actions = [
-            's', function ($ansi, $plain) {
+            's',
+            function ($ansi, $plain) {
                 $this->assertStringContainsString('List', $plain);
                 $this->assertStringContainsString('solo.php', $plain);
             },
-            Key::LEFT, fn($plain) => $this->assertStringContainsString('Vue3', $plain),
-            's', fn($plain) => $this->assertStringContainsString('Directory not found: resources/js/vue3', $plain),
+            Key::LEFT,
+            fn($plain) => $this->assertStringContainsString('Vue3', $plain),
+            's',
+            fn($plain) => $this->assertStringContainsString('Directory not found: resources/js/vue3', $plain),
         ];
 
         $this->runSolo($actions, function () {
             config()->set('solo.commands', [
-                'List' => Command::from('ls')
-                    ->inDirectory('config'),
-                'Vue3' => Command::from('npm run dev')
-                    ->inDirectory('resources/js/vue3'),
+                'List' => Command::from('ls')->inDirectory('config'),
+                'Vue3' => Command::from('npm run dev')->inDirectory('resources/js/vue3'),
             ]);
         });
 

tests/Unit/CommandSerializationTest.php

@@ -10,6 +10,15 @@
 
 class CommandSerializationTest extends TestCase
 {
+    protected function setUp(): void
+    {
+        $this->beforeApplicationDestroyed(function () {
+            $this->artisan('config:clear');
+        });
+
+        parent::setUp();
+    }
+
     #[Test]
     public function command_config_can_be_serialized_and_cached(): void
     {

tests/Unit/ScreenTest.php

@@ -911,6 +911,4 @@ public function test_combining_characters(): void
             "\e[1G*"  // Should treat combining characters as single unit
         ], iterate: true);
     }
-
-
 }