Simplify exec command parsing and tests

Author: richiemcilroy

packages/cli/src/commands/exec.ts

@@ -6,44 +6,35 @@ export function execCommand(): Command {
   return new Command('exec')
     .description('Execute a command in a sandbox')
     .argument('<sandbox_id>', 'Sandbox ID')
-    .argument('<cmd>', 'Command to execute (quote if it contains spaces)')
-    .option('--no-stream', 'Wait for completion instead of streaming')
+    .argument('<cmd...>', 'Command to execute')
+    .allowUnknownOption(true)
     .option('--json', 'Output as JSON')
     .action(
       async (
         sandboxId: string,
-        cmd: string,
-        options: { stream: boolean; json?: boolean },
+        cmdParts: string[],
+        options: { json?: boolean },
       ) => {
+        const cmd = cmdParts.join(' ')
         try {
           const client = getClient()
           const sandbox = await client.get(sandboxId)
+          const result = await sandbox.exec(cmd)
 
-          if (options.json || !options.stream) {
-            const result = await sandbox.exec(cmd)
-
-            if (options.json) {
-              printJson({
-                exec_id: result.execId,
-                exit_code: result.exitCode,
-                stdout: result.stdout,
-                stderr: result.stderr,
-                duration_ms: result.durationMs,
-              })
-            } else {
-              if (result.stdout) process.stdout.write(result.stdout)
-              if (result.stderr) process.stderr.write(result.stderr)
-            }
-
-            if (result.exitCode !== 0) process.exit(1)
-          } else {
-            const result = await sandbox.exec(cmd, {
-              onStdout: (data) => process.stdout.write(data),
-              onStderr: (data) => process.stderr.write(data),
+          if (options.json) {
+            printJson({
+              exec_id: result.execId,
+              exit_code: result.exitCode,
+              stdout: result.stdout,
+              stderr: result.stderr,
+              duration_ms: result.durationMs,
             })
-
-            if (result.exitCode !== 0) process.exit(1)
+          } else {
+            if (result.stdout) process.stdout.write(result.stdout)
+            if (result.stderr) process.stderr.write(result.stderr)
           }
+
+          if (result.exitCode !== 0) process.exit(1)
         } catch (err) {
           handleError(err)
         }

packages/cli/src/commands/mcp-init.test.ts

@@ -13,13 +13,16 @@ describe('mcp init command', () => {
   let tempDir: string
   let previousHome: string | undefined
   let previousApiKey: string | undefined
+  let previousXdg: string | undefined
   let logSpy: ReturnType<typeof spyOn>
 
   beforeEach(() => {
     tempDir = mkdtempSync(join(tmpdir(), 'sandchest-mcp-init-'))
     previousHome = process.env['HOME']
     previousApiKey = process.env['SANDCHEST_API_KEY']
+    previousXdg = process.env['XDG_CONFIG_HOME']
     process.env['HOME'] = tempDir
+    process.env['XDG_CONFIG_HOME'] = join(tempDir, '.config')
     process.env['SANDCHEST_API_KEY'] = 'sk_test_key'
     process.env['NO_COLOR'] = '1'
     logSpy = spyOn(console, 'log').mockImplementation(() => {})
@@ -37,6 +40,11 @@ describe('mcp init command', () => {
     } else {
       process.env['SANDCHEST_API_KEY'] = previousApiKey
     }
+    if (previousXdg === undefined) {
+      delete process.env['XDG_CONFIG_HOME']
+    } else {
+      process.env['XDG_CONFIG_HOME'] = previousXdg
+    }
     delete process.env['NO_COLOR']
     logSpy.mockRestore()
   })