sandboxbox 3.0.13 → 3.0.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sandboxbox",
-  "version": "3.0.13",
+  "version": "3.0.15",
   "description": "Lightweight process containment sandbox for CLI tools - Playwright, Claude Code, and more. Pure Node.js, no dependencies.",
   "type": "module",
   "main": "cli.js",

package/test.txt

@@ -0,0 +1 @@
+This is a test file created by Claude Code.

package/utils/commands/claude.js

@@ -75,7 +75,8 @@ export async function claudeCommand(projectDir, prompt) {
     const claudeArgs = [
       '--verbose',
       '--output-format', 'stream-json',
-      '--permission-mode', 'bypassPermissions'
+      '--permission-mode', 'bypassPermissions',
+      '--allowed-tools', ALLOWED_TOOLS.join(',')
     ];
 
     console.log(color('blue', `📝 Running Claude Code with host settings\n`));
@@ -84,10 +85,16 @@ export async function claudeCommand(projectDir, prompt) {
       const claudeStartTime = Date.now();
       console.log(color('cyan', '⏱️  Stage 3: Starting Claude Code...'));
 
-      const proc = spawn('sh', ['-c', `cd "${join(sandboxDir, 'workspace')}" && claude ${claudeArgs.join(' ')}`], {
+      const workspacePath = join(sandboxDir, 'workspace');
+
+      // Modify the prompt to include directory change instruction
+      const modifiedPrompt = `You are working in a sandboxed environment. Your working directory is "${workspacePath}". All operations should be performed in this directory. ${prompt}`;
+
+      const proc = spawn('claude', claudeArgs, {
+        cwd: workspacePath,  // Set working directory directly
         env: env,  // Use the environment directly without modification
         stdio: ['pipe', 'pipe', 'pipe'],
-        shell: true,  // Use shell for proper directory handling
+        shell: false,  // Don't use shell since we're setting cwd directly
         detached: false
       });
 
@@ -138,8 +145,10 @@ export async function claudeCommand(projectDir, prompt) {
               }
             }
           } catch (jsonError) {
-            // Skip malformed JSON lines - might be incomplete chunks
-            // Silently continue to avoid breaking the stream
+            // Log JSON parsing errors for troubleshooting
+            console.log(color('red', `🔍 JSON parse error: ${jsonError.message}`));
+            console.log(color('yellow', `🔍 Problematic line: ${line}`));
+            console.log(color('cyan', '🔍 This suggests an issue with the output stream formatting'));
           }
         }
       }
@@ -150,8 +159,8 @@ export async function claudeCommand(projectDir, prompt) {
         reject(error);
       });
 
-      // Write prompt to stdin
-      proc.stdin.write(prompt);
+      // Write modified prompt to stdin
+      proc.stdin.write(modifiedPrompt);
       proc.stdin.end();
 
       let stdoutOutput = '';
@@ -161,20 +170,6 @@ export async function claudeCommand(projectDir, prompt) {
       proc.stdout.on('data', (data) => {
         stdoutOutput += data.toString();
 
-        // Check for errors in JSON output with error handling
-        const lines = data.toString().split('\n').filter(l => l.trim());
-        for (const line of lines) {
-          try {
-            const event = JSON.parse(line);
-            if (event.type === 'result' && event.is_error) {
-              lastError = event.result;
-            }
-          } catch (jsonError) {
-            // Ignore JSON parsing errors - might be incomplete chunks
-            console.error('JSON parse error:', jsonError.message);
-          }
-        }
-
         handleStreamingOutput(data);
       });
 

package/utils/sandbox.js

@@ -30,11 +30,15 @@ export function createSandbox(projectDir) {
   });
 
   // Configure host repository to accept pushes to current branch
-  execSync(`cd "${projectDir}" && git config receive.denyCurrentBranch updateInstead`, {
-    stdio: 'pipe',
-    shell: true,
-    windowsHide: true
-  });
+  try {
+    execSync(`cd "${projectDir}" && git config receive.denyCurrentBranch updateInstead`, {
+      stdio: 'pipe',
+      shell: true,
+      windowsHide: true
+    });
+  } catch (error) {
+    console.log(`⚠️  Warning: Could not configure host repository: ${error.message}`);
+  }
 
   // Copy/clone the project to workspace
   if (existsSync(join(projectDir, '.git'))) {
@@ -67,6 +71,7 @@ export function createSandbox(projectDir) {
       stdio: 'pipe',
       shell: true
     });
+    console.log(`✅ Configured host directory as remote 'origin': ${projectDir}`);
   } catch (e) {
     // Remote already exists, update it
     execSync(`git remote set-url origin "${projectDir}"`, {
@@ -74,6 +79,7 @@ export function createSandbox(projectDir) {
       stdio: 'pipe',
       shell: true
     });
+    console.log(`✅ Updated remote 'origin' to host directory: ${projectDir}`);
   }
 
   // Set up upstream tracking for current branch
@@ -84,6 +90,20 @@ export function createSandbox(projectDir) {
       stdio: 'pipe'
     }).trim();
 
+    // Ensure the branch exists on the host side
+    try {
+      execSync(`cd "${projectDir}" && git checkout ${currentBranch}`, {
+        stdio: 'pipe',
+        shell: true
+      });
+    } catch (e) {
+      // Branch doesn't exist on host, create it
+      execSync(`cd "${projectDir}" && git checkout -b ${currentBranch}`, {
+        stdio: 'pipe',
+        shell: true
+      });
+    }
+
     execSync(`git branch --set-upstream-to=origin/${currentBranch} ${currentBranch}`, {
       cwd: workspaceDir,
       stdio: 'pipe',
@@ -91,6 +111,7 @@ export function createSandbox(projectDir) {
     });
   } catch (e) {
     // Upstream may not exist yet, ignore error
+    console.log(`⚠️  Warning: Could not set up upstream tracking: ${e.message}`);
   }
 
   // Batch fetch git identity settings for efficiency