sandboxbox 3.0.33 → 3.0.35

package/CLAUDE.md

@@ -196,4 +196,5 @@ Environment variable `XDG_CACHE_HOME` set to `${sandboxDir}/.cache` for Playwrig
 ### File Cleanup
 - All temporary directories auto-cleanup on exit
 - Error handling for cleanup failures (ignore errors)
-- Signal handlers ensure cleanup on interrupts
+- Signal handlers ensure cleanup on interrupts
+- the only git operations we want is setting up the project, there should be no explicit git operations to end or merge the project work in the sandbox, the agent must have a hook as part of the plugin in ../plugin (which must be up to date) that is set up correctly to make it call a curl statement that will instruct it to do a git merge intelligently at the end, only claude must be doing the git merge there should be no automation around that

package/package.json

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

package/sandboxbox-settings.json

@@ -18,33 +18,6 @@
           }
         ]
       }
-    ],
-    "Stop": [
-      {
-        "matcher": "*",
-        "hooks": [
-          {
-            "type": "command",
-            "command": "echo 'SESSION_END: Intelligently analyze all changes made during this session and prepare to commit them back to the host repository if they represent meaningful progress.'"
-          },
-          {
-            "type": "command",
-            "command": "echo 'GIT_INTEGRATION: Review modified files, stage appropriate changes, and create an intelligent commit message that describes the work accomplished. Push to host repository if changes are ready.'"
-          },
-          {
-            "type": "command",
-            "command": "git status --porcelain"
-          },
-          {
-            "type": "command",
-            "command": "if [ -n \"$(git status --porcelain)\" ]; then echo 'Changes detected - preparing intelligent Git operations...'; git add -A; echo 'Changes staged. Ready for intelligent commit analysis.'; else echo 'No changes detected in working directory.'; fi"
-          },
-          {
-            "type": "command",
-            "command": "echo 'Please intelligently analyze the staged changes and create an appropriate commit message, then commit and push if the changes are ready.'"
-          }
-        ]
-      }
     ]
   }
 }

package/utils/sandbox.js

@@ -66,6 +66,25 @@ export function createSandbox(projectDir, options = {}) {
     });
   }
 
+  // Ensure .claude is in .gitignore in the sandbox workspace
+  const gitignorePath = join(workspaceDir, '.gitignore');
+  if (!existsSync(gitignorePath)) {
+    writeFileSync(gitignorePath, `# Claude Code settings (project-specific, not to be committed)
+.claude/
+
+# Dependencies
+node_modules/
+*.log
+.DS_Store
+`);
+  } else {
+    // Add .claude to existing .gitignore if not already present
+    const gitignoreContent = readFileSync(gitignorePath, 'utf8');
+    if (!gitignoreContent.includes('.claude/')) {
+      writeFileSync(gitignorePath, gitignoreContent + '\n# Claude Code settings (project-specific, not to be committed)\n.claude/\n');
+    }
+  }
+
   // Set up host repo as origin in sandbox (pointing to host directory)
   try {
     execSync(`git remote add origin "${projectDir}"`, {
@@ -114,6 +133,18 @@ export function createSandbox(projectDir, options = {}) {
     // Upstream may not exist yet, ignore error
   }
 
+  // Copy project's .claude/settings.json if it exists (project-level Claude settings)
+  const projectClaudeSettingsPath = join(projectDir, '.claude', 'settings.json');
+  if (existsSync(projectClaudeSettingsPath)) {
+    const sandboxClaudeSettingsPath = join(workspaceDir, '.claude', 'settings.json');
+    mkdirSync(join(workspaceDir, '.claude'), { recursive: true });
+    cpSync(projectClaudeSettingsPath, sandboxClaudeSettingsPath);
+
+    if (VERBOSE_OUTPUT) {
+      console.log('✅ Copied project Claude settings to sandbox');
+    }
+  }
+
   // Batch fetch git identity settings for efficiency
   const gitSettings = execSync(`git config --global --get user.name && git config --global --get user.email && git config --global --get color.ui`, {
     stdio: 'pipe',
@@ -130,6 +161,34 @@ export function createSandbox(projectDir, options = {}) {
     shell: true
   });
 
+  // Configure Git remote to host for bidirectional synchronization
+  try {
+    execSync(`cd "${workspaceDir}" && git remote add host "${projectDir}"`, {
+      stdio: 'pipe',
+      shell: true
+    });
+
+    if (VERBOSE_OUTPUT) {
+      console.log('✅ Configured Git remote to host repository');
+    }
+  } catch (error) {
+    // Remote might already exist, try to update it
+    try {
+      execSync(`cd "${workspaceDir}" && git remote set-url host "${projectDir}"`, {
+        stdio: 'pipe',
+        shell: true
+      });
+
+      if (VERBOSE_OUTPUT) {
+        console.log('✅ Updated Git remote to host repository');
+      }
+    } catch (updateError) {
+      if (VERBOSE_OUTPUT) {
+        console.log('⚠️  Could not configure Git remote to host');
+      }
+    }
+  }
+
   // Setup Claude settings in sandbox
   const hostClaudeDir = join(homedir(), '.claude');
   const sandboxClaudeDir = join(sandboxDir, '.claude');