@fitlab-ai/agent-infra 0.8.5 → 0.9.0

package/lib/sandbox/index.ts

@@ -2,14 +2,14 @@ const USAGE = `Usage: ai sandbox <command> [options]
 
 Commands:
   create <branch> [base]       Create a sandbox (VM + image + worktree + container)
-  exec <branch | TASK-id | N | '#N'> [cmd...]
+  exec [--recreate] <branch | TASK-id | N> [cmd...]
                                Enter sandbox or run a command. N (bare) is the
                                recommended form for task short ids (e.g.
-                               'ai sandbox exec 11'); '#N' is also accepted.
+                               'ai sandbox exec 11').
   ls                           List sandboxes for the current project (the '#'
                                column is a display-only row number; the 'SHORT'
                                column shows the active task short id, '-' if none)
-  show <branch | TASK-id | N | '#N'>
+  show <branch | TASK-id | N>
                                Show one sandbox's worktree and per-tool state paths
   prune [--dry-run]            Remove orphaned per-branch state dirs
   rebuild [--quiet] [--refresh]
@@ -18,9 +18,9 @@ Commands:
   rm <branch> | --all | --purge
                                Remove one sandbox, all sandboxes not bound to an
                                active task (--all), or tear down everything (--purge)
-  start <branch | TASK-id | N | '#N'>
-                               Start an existing stopped sandbox container
-                               (e.g. after the Docker daemon restarted)
+  start [--recreate] <branch | TASK-id | N>
+                               Verify or recover an existing sandbox container;
+                               optionally replace only the container on failure
   vm status|start|stop         Manage the sandbox VM (macOS) or check the backend (Windows)
 
 Run 'ai sandbox <command> --help' for details.`;

package/lib/sandbox/mounts.ts

@@ -0,0 +1,55 @@
+import path from 'node:path';
+import {
+  shareBranchDir,
+  shareCommonDir,
+  shellConfigDirCandidates,
+  worktreeDirCandidates
+} from './constants.ts';
+import type { SandboxConfig } from './config.ts';
+
+export type SandboxBindMountDeclaration = {
+  hostPaths: string[];
+  containerPath: string;
+  readOnly: boolean;
+};
+
+export function sandboxCoreBindMounts(
+  config: Pick<
+    SandboxConfig,
+    'repoRoot' | 'worktreeBase' | 'shareBase' | 'shellConfigBase'
+  >,
+  branch: string,
+  overrides: { worktree?: string; shellConfigHostDir?: string } = {}
+): SandboxBindMountDeclaration[] {
+  return [
+    {
+      hostPaths: overrides.worktree
+        ? [overrides.worktree]
+        : worktreeDirCandidates(config, branch),
+      containerPath: '/workspace',
+      readOnly: false
+    },
+    {
+      hostPaths: [path.join(config.repoRoot, '.agents', 'workspace')],
+      containerPath: '/workspace/.agents/workspace',
+      readOnly: false
+    },
+    {
+      hostPaths: [shareCommonDir(config)],
+      containerPath: '/share/common',
+      readOnly: false
+    },
+    {
+      hostPaths: [shareBranchDir(config, branch)],
+      containerPath: '/share/branch',
+      readOnly: false
+    },
+    {
+      hostPaths: overrides.shellConfigHostDir
+        ? [overrides.shellConfigHostDir]
+        : shellConfigDirCandidates(config, branch),
+      containerPath: '/home/devuser/.host-shell-config',
+      readOnly: true
+    }
+  ];
+}