@madarco/agentbox 0.12.0 → 0.14.0

package/dist/{chunk-IZXPJPPV.js → chunk-TCS5HXJX.js}

@@ -4,7 +4,6 @@ import {
   GitWorktreeError,
   STATE_DIR,
   STATE_FILE,
-  allocateProjectIndex,
   computeDockerContextFingerprint,
   detectGitRepos,
   ensureImage,
@@ -18,13 +17,14 @@ import {
   readPreparedDockerState,
   readState,
   recordBox,
-  removeBoxRecord
-} from "./chunk-SNTHHWKY.js";
+  removeBoxRecord,
+  reserveProjectIndex
+} from "./chunk-XKH7NTT7.js";
 
 // ../../packages/sandbox-docker/dist/index.js
 import { mkdir as mkdir7, stat as stat8 } from "fs/promises";
 import { homedir as homedir10 } from "os";
-import { basename as basename4, join as join11, resolve as resolve3 } from "path";
+import { basename as basename4, join as join12, resolve as resolve3 } from "path";
 import { execa as execa14 } from "execa";
 
 // ../../packages/ctl/dist/index.js
@@ -704,7 +704,7 @@ async function loadCarrySection(path) {
 
 // ../../packages/sandbox-docker/dist/index.js
 import { spawnSync } from "child_process";
-import { mkdir as mkdir3, mkdtemp as mkdtemp2, readdir as readdir3, readFile as readFile4, realpath as realpath2, rm as rm2, stat as stat3, writeFile as writeFile22 } from "fs/promises";
+import { mkdir as mkdir3, mkdtemp as mkdtemp2, readdir as readdir3, readFile as readFile42, realpath as realpath2, rm as rm2, stat as stat3, writeFile as writeFile22 } from "fs/promises";
 import { homedir as homedir3, tmpdir as tmpdir2 } from "os";
 import { isAbsolute as isAbsolute2, join as join4, relative as relative2 } from "path";
 import { setTimeout as delay } from "timers/promises";
@@ -737,11 +737,13 @@ var BUILT_IN_DEFAULTS = {
     defaultCheckpointDaytona: "",
     defaultCheckpointHetzner: "",
     defaultCheckpointVercel: "",
+    defaultCheckpointE2b: "",
     size: "",
     sizeDocker: "",
     sizeDaytona: "",
     sizeHetzner: "",
     sizeVercel: "",
+    sizeE2b: "",
     withPlaywright: false,
     withEnv: false,
     resyncOnStart: true,
@@ -754,6 +756,7 @@ var BUILT_IN_DEFAULTS = {
     imageDaytona: "",
     imageHetzner: "",
     imageVercel: "",
+    imageE2b: "",
     // Mirrors BOX_IMAGE_REGISTRY in @agentbox/sandbox-docker. Empty disables the
     // registry pull (always build the docker base image locally).
     imageRegistry: "ghcr.io/madarco/agentbox/box",
@@ -782,7 +785,8 @@ var BUILT_IN_DEFAULTS = {
     sessionName: "opencode"
   },
   attach: {
-    openIn: "split"
+    openIn: "split",
+    cmuxStatus: true
   },
   code: {
     ide: "auto",
@@ -834,8 +838,8 @@ var KEY_REGISTRY = [
   {
     key: "box.provider",
     type: "enum",
-    enumValues: ["docker", "daytona", "hetzner", "vercel"],
-    description: "Sandbox backend new boxes are created on: local Docker containers, Daytona Cloud sandboxes, Hetzner Cloud VPSes, or Vercel Sandboxes."
+    enumValues: ["docker", "daytona", "hetzner", "vercel", "e2b"],
+    description: "Sandbox backend new boxes are created on: local Docker containers, Daytona Cloud sandboxes, Hetzner Cloud VPSes, Vercel Sandboxes, or E2B microVMs."
   },
   {
     key: "box.hostSnapshot",
@@ -871,6 +875,12 @@ var KEY_REGISTRY = [
     description: "Per-provider override of `box.defaultCheckpoint` for vercel. Wins over the global when set; set via `agentbox checkpoint set-default --provider vercel`.",
     advanced: true
   },
+  {
+    key: "box.defaultCheckpointE2b",
+    type: "string",
+    description: "Per-provider override of `box.defaultCheckpoint` for e2b. Wins over the global when set; set via `agentbox checkpoint set-default --provider e2b`.",
+    advanced: true
+  },
   {
     key: "box.size",
     type: "string",
@@ -900,6 +910,12 @@ var KEY_REGISTRY = [
     description: "Per-provider override of `box.size` for vercel. Reserved \u2014 vercel sizing is controlled via `box.vercelVcpus`.",
     advanced: true
   },
+  {
+    key: "box.sizeE2b",
+    type: "string",
+    description: "Per-provider override of `box.size` for e2b. Reserved \u2014 e2b sizing is template-level (set at `agentbox prepare --provider e2b` time via --vcpus / --memory).",
+    advanced: true
+  },
   {
     key: "checkpoint.maxLayers",
     type: "int",
@@ -971,6 +987,12 @@ var KEY_REGISTRY = [
     description: "Per-provider override of `box.image` for vercel (snapshot id, e.g. `snap_\u2026`). Written by `agentbox prepare --provider vercel`.",
     advanced: true
   },
+  {
+    key: "box.imageE2b",
+    type: "string",
+    description: "Per-provider override of `box.image` for e2b (template id or `name:tag`, e.g. `agentbox-base:latest`). Written by `agentbox prepare --provider e2b`.",
+    advanced: true
+  },
   {
     key: "box.imageRegistry",
     type: "string",
@@ -1052,7 +1074,12 @@ var KEY_REGISTRY = [
     key: "attach.openIn",
     type: "enum",
     enumValues: ["split", "window", "tab", "same"],
-    description: "Where `agentbox claude|codex|opencode` opens the attached session when run from tmux or iTerm2: `split` (tmux split-window / iTerm2 vertical split, default), `window` (tmux new-window / new iTerm2 window), `tab` (tmux new-window / new iTerm2 tab), or `same` (attach inline in the current terminal). Outside tmux/iTerm2 every value behaves like `same`."
+    description: "Where `agentbox claude|codex|opencode` opens the attached session when run from tmux, cmux, or iTerm2: `split` (tmux split-window / cmux new-split / iTerm2 vertical split, default \u2014 same workspace), `window` (tmux new-window / cmux new-workspace / new iTerm2 window), `tab` (tmux new-window / cmux new-surface tab in the current pane, same workspace / new iTerm2 tab), or `same` (attach inline in the current terminal). Outside tmux/cmux/iTerm2 every value behaves like `same`."
+  },
+  {
+    key: "attach.cmuxStatus",
+    type: "bool",
+    description: "When attached inside cmux, reflect the box agent's live activity on its cmux workspace (colour + description: blue=working, amber=needs input, idle clears; restored on detach) and, when the agent needs input, flag the box's own tab via a cmux notification (tab badge + reorder + desktop notification) so it stands out among sibling tabs. cmux only; no-op in other terminals."
   },
   {
     key: "code.ide",
@@ -1520,7 +1547,7 @@ function writeLeaf(obj, branch, leaf, value) {
   b[leaf] = value;
 }
 function resolveDefaultCheckpoint(cfg, provider) {
-  const perProvider = provider === "daytona" ? cfg.box.defaultCheckpointDaytona : provider === "hetzner" ? cfg.box.defaultCheckpointHetzner : provider === "vercel" ? cfg.box.defaultCheckpointVercel : cfg.box.defaultCheckpointDocker;
+  const perProvider = provider === "daytona" ? cfg.box.defaultCheckpointDaytona : provider === "hetzner" ? cfg.box.defaultCheckpointHetzner : provider === "vercel" ? cfg.box.defaultCheckpointVercel : provider === "e2b" ? cfg.box.defaultCheckpointE2b : cfg.box.defaultCheckpointDocker;
   if (perProvider && perProvider.length > 0) return perProvider;
   return cfg.box.defaultCheckpoint;
 }
@@ -1529,15 +1556,16 @@ function defaultCheckpointConfigKey(provider) {
   if (provider === "daytona") return "box.defaultCheckpointDaytona";
   if (provider === "hetzner") return "box.defaultCheckpointHetzner";
   if (provider === "vercel") return "box.defaultCheckpointVercel";
+  if (provider === "e2b") return "box.defaultCheckpointE2b";
   return "box.defaultCheckpoint";
 }
 function resolveBoxSize(cfg, provider) {
-  const perProvider = provider === "daytona" ? cfg.box.sizeDaytona : provider === "hetzner" ? cfg.box.sizeHetzner : provider === "vercel" ? cfg.box.sizeVercel : cfg.box.sizeDocker;
+  const perProvider = provider === "daytona" ? cfg.box.sizeDaytona : provider === "hetzner" ? cfg.box.sizeHetzner : provider === "vercel" ? cfg.box.sizeVercel : provider === "e2b" ? cfg.box.sizeE2b : cfg.box.sizeDocker;
   if (perProvider && perProvider.length > 0) return perProvider;
   return cfg.box.size;
 }
 function resolveBoxImage(cfg, provider) {
-  const perProvider = provider === "daytona" ? cfg.box.imageDaytona : provider === "hetzner" ? cfg.box.imageHetzner : provider === "vercel" ? cfg.box.imageVercel : cfg.box.imageDocker;
+  const perProvider = provider === "daytona" ? cfg.box.imageDaytona : provider === "hetzner" ? cfg.box.imageHetzner : provider === "vercel" ? cfg.box.imageVercel : provider === "e2b" ? cfg.box.imageE2b : cfg.box.imageDocker;
   if (perProvider && perProvider.length > 0) return perProvider;
   return cfg.box.image;
 }
@@ -1546,6 +1574,7 @@ function boxImageConfigKey(provider) {
   if (provider === "daytona") return "box.imageDaytona";
   if (provider === "hetzner") return "box.imageHetzner";
   if (provider === "vercel") return "box.imageVercel";
+  if (provider === "e2b") return "box.imageE2b";
   return "box.image";
 }
 async function setConfigValue(scope, key, value, cwd, opts = {}) {
@@ -1746,7 +1775,7 @@ import { copyFile, mkdtemp, readdir as readdir22, readFile as readFile32, rm as
 import { homedir as homedir22, tmpdir } from "os";
 import { basename as basename2, join as join32, relative } from "path";
 import { execa as execa4 } from "execa";
-import { chmod, mkdir as mkdir22, readFile as readFile24 } from "fs/promises";
+import { chmod, mkdir as mkdir22, readFile as readFile23 } from "fs/promises";
 import { basename as basename3, join as join22 } from "path";
 import { execa as execa3 } from "execa";
 import { spawnSync as spawnSync2 } from "child_process";
@@ -1760,11 +1789,14 @@ import { homedir as homedir5 } from "os";
 import { join as join6 } from "path";
 import { execa as execa7 } from "execa";
 import { randomBytes as randomBytes3 } from "crypto";
+import { createHash as createHash22 } from "crypto";
+import { readFile as readFile52 } from "fs/promises";
+import { join as join7 } from "path";
 import { execa as execa8 } from "execa";
 import { existsSync } from "fs";
-import { readFile as readFile52 } from "fs/promises";
+import { readFile as readFile6 } from "fs/promises";
 import { homedir as homedir6 } from "os";
-import { join as join7 } from "path";
+import { join as join8 } from "path";
 import { execa as execa9 } from "execa";
 
 // ../../packages/core/dist/index.js
@@ -1799,6 +1831,12 @@ function resolveAgentLauncher(kind) {
   if (kind === "opencode") return opencodeLauncher;
   throw new Error(`unknown agent kind: ${String(kind)}`);
 }
+var UserFacingError = class extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "UserFacingError";
+  }
+};
 var BoxNotFoundError = class extends Error {
   constructor(query) {
     super(`no agentbox matches "${query}"`);
@@ -1827,10 +1865,10 @@ function generateBoxId() {
 import { execa as execa10 } from "execa";
 import { mkdir as mkdir42, readdir as readdir42, rm as rm32, stat as stat6 } from "fs/promises";
 import { homedir as homedir7, platform } from "os";
-import { join as join8, resolve as resolve2 } from "path";
-import { mkdir as mkdir5, mkdtemp as mkdtemp3, readFile as readFile6, readdir as readdir5, rm as rm4, writeFile as writeFile32 } from "fs/promises";
+import { join as join9, resolve as resolve2 } from "path";
+import { mkdir as mkdir5, mkdtemp as mkdtemp3, readFile as readFile7, readdir as readdir5, rm as rm4, writeFile as writeFile32 } from "fs/promises";
 import { homedir as homedir8, tmpdir as tmpdir3 } from "os";
-import { basename as basename32, join as join9 } from "path";
+import { basename as basename32, join as join10 } from "path";
 import { execa as execa11 } from "execa";
 import { stat as stat7 } from "fs/promises";
 import { execa as execa12 } from "execa";
@@ -1838,22 +1876,22 @@ import { execa as execa13 } from "execa";
 import { spawn } from "child_process";
 import { randomBytes as randomBytes22 } from "crypto";
 import { existsSync as existsSync2, openSync } from "fs";
-import { cp, mkdir as mkdir6, readFile as readFile7, readdir as readdir6, rename as rename3, rm as rm5, unlink as unlink2, writeFile as writeFile4 } from "fs/promises";
+import { cp, mkdir as mkdir6, readFile as readFile8, readdir as readdir6, rename as rename3, rm as rm5, unlink as unlink2, writeFile as writeFile4 } from "fs/promises";
 import { request as httpRequest } from "http";
 import { createRequire } from "module";
 import { homedir as homedir9 } from "os";
-import { dirname as dirname3, join as join10, resolve as resolve22, sep } from "path";
+import { dirname as dirname3, join as join11, resolve as resolve22, sep } from "path";
 import { setTimeout as delay2 } from "timers/promises";
 import { fileURLToPath } from "url";
 
 // ../../packages/relay/dist/index.js
 import { createHash as createHash2, randomBytes as randomBytes2 } from "crypto";
 import { execa } from "execa";
-import { spawn as spawn4 } from "child_process";
+import { spawn as spawn3 } from "child_process";
 import {
   mkdir as mkdir2,
   readdir as readdir2,
-  readFile as readFile23,
+  readFile as readFile4,
   rename as rename2,
   unlink,
   writeFile as writeFile2
@@ -1915,7 +1953,7 @@ async function loadQueueConfig() {
   const d = BUILT_IN_DEFAULTS.queue;
   let global = {};
   try {
-    global = parseUserConfig(await readFile23(GLOBAL_CONFIG_FILE, "utf8"), GLOBAL_CONFIG_FILE);
+    global = parseUserConfig(await readFile4(GLOBAL_CONFIG_FILE, "utf8"), GLOBAL_CONFIG_FILE);
   } catch {
   }
   const q = global.queue ?? {};
@@ -1935,7 +1973,7 @@ async function writeJob(job) {
 }
 async function readJob(id) {
   try {
-    const raw = await readFile23(join3(QUEUE_DIR, `${id}.json`), "utf8");
+    const raw = await readFile4(join3(QUEUE_DIR, `${id}.json`), "utf8");
     return JSON.parse(raw);
   } catch (err) {
     if (err.code === "ENOENT") return null;
@@ -1961,7 +1999,7 @@ async function loadQueue() {
   for (const name of entries) {
     if (!name.endsWith(".json")) continue;
     try {
-      const raw = await readFile23(join3(QUEUE_DIR, name), "utf8");
+      const raw = await readFile4(join3(QUEUE_DIR, name), "utf8");
       out.push(JSON.parse(raw));
     } catch {
     }
@@ -1969,6 +2007,8 @@ async function loadQueue() {
   out.sort((a, b) => a.createdAt < b.createdAt ? -1 : a.createdAt > b.createdAt ? 1 : 0);
   return out;
 }
+var TERMINAL_RETENTION_MS = 60 * 60 * 1e3;
+var SWEEP_INTERVAL_MS = 60 * 1e3;
 function processAlive(pid) {
   try {
     process.kill(pid, 0);
@@ -2037,7 +2077,7 @@ async function uncachedBoxStateCount() {
 }
 function inspectDockerState(containerName) {
   return new Promise((resolveP) => {
-    const child = spawn4("docker", ["inspect", "--format", "{{.State.Status}}", containerName], {
+    const child = spawn3("docker", ["inspect", "--format", "{{.State.Status}}", containerName], {
       stdio: ["ignore", "pipe", "pipe"]
     });
     let out = "";
@@ -2072,19 +2112,19 @@ function queueLogPath(id) {
 // ../../packages/sandbox-docker/dist/index.js
 import { execa as execa16 } from "execa";
 import { readdir as readdir7, rm as rm6, stat as stat9 } from "fs/promises";
-import { join as join13 } from "path";
+import { join as join14 } from "path";
 import { execa as execa15 } from "execa";
-import { join as join12 } from "path";
+import { join as join13 } from "path";
 import { homedir as homedir11 } from "os";
-import { join as join14 } from "path";
+import { join as join15 } from "path";
 import { execa as execa17 } from "execa";
 import { existsSync as existsSync3, mkdirSync, renameSync, statSync } from "fs";
 import { basename as basename5, dirname as dirname22, posix, resolve as resolve4 } from "path";
 import { execa as execa18 } from "execa";
-import { createHash as createHash22 } from "crypto";
-import { copyFile as copyFile2, mkdir as mkdir8, mkdtemp as mkdtemp4, readdir as readdir8, readFile as readFile8, rm as rm7, stat as stat10 } from "fs/promises";
+import { createHash as createHash32 } from "crypto";
+import { copyFile as copyFile2, mkdir as mkdir8, mkdtemp as mkdtemp4, readdir as readdir8, readFile as readFile9, rm as rm7, stat as stat10 } from "fs/promises";
 import { homedir as homedir12, tmpdir as tmpdir4 } from "os";
-import { basename as basename6, dirname as dirname32, join as join15 } from "path";
+import { basename as basename6, dirname as dirname32, join as join16 } from "path";
 import { execa as execa19 } from "execa";
 function isHostPathHookCommand(command, hostHome) {
   if (typeof command !== "string" || command.length === 0) return false;
@@ -3015,7 +3055,7 @@ function isRealAgentCredential(agent, text) {
 }
 async function hostClaudeBackupExpired(path = CREDENTIALS_BACKUP_FILE, now = Date.now()) {
   try {
-    const parsed = JSON.parse(await readFile24(path, "utf8"));
+    const parsed = JSON.parse(await readFile23(path, "utf8"));
     const exp = parsed?.claudeAiOauth?.expiresAt;
     return typeof exp === "number" && Number.isFinite(exp) && exp < now;
   } catch {
@@ -3063,7 +3103,7 @@ function extractOpencodeCredentials(volume, image) {
 }
 async function hostBackupHasCredentials(path = CREDENTIALS_BACKUP_FILE) {
   try {
-    const parsed = JSON.parse(await readFile24(path, "utf8"));
+    const parsed = JSON.parse(await readFile23(path, "utf8"));
     const rt = parsed?.claudeAiOauth?.refreshToken;
     return typeof rt === "string" && rt.length > 0;
   } catch {
@@ -3235,6 +3275,64 @@ async function resolveClaudeMemoryDir(hostWorkspace, hostHome = homedir22()) {
   }
   return memDir;
 }
+async function buildBoxClaudeJsonFromHost(opts) {
+  const { hostHome, hostWorkspace } = opts;
+  const hostClaudeJson = join32(hostHome, ".claude.json");
+  let working;
+  if (await pathExists(hostClaudeJson)) {
+    try {
+      working = JSON.parse(await readFile32(hostClaudeJson, "utf8"));
+    } catch {
+      working = null;
+    }
+  }
+  if (working === void 0 || working === null) {
+    working = {
+      installMethod: "native",
+      autoUpdates: false,
+      autoUpdatesProtectedForNative: true,
+      // Pre-accept onboarding so the in-box Claude doesn't show the theme
+      // picker on first run. AgentBox installing implies the user has
+      // already used Claude Code on the host.
+      hasCompletedOnboarding: true,
+      projects: { [CLOUD_WORKSPACE]: { hasTrustDialogAccepted: true } }
+    };
+  } else {
+    working = filterHostHooks(working, hostHome).data;
+    working = setInstallMethodNative(working).data;
+    if (hostWorkspace) {
+      working = addProjectAlias(working, hostWorkspace, CLOUD_WORKSPACE).data;
+    }
+    working = trustWorkspace(working, CLOUD_WORKSPACE).data;
+    if (typeof working === "object" && working !== null) {
+      const w = working;
+      if (w["hasCompletedOnboarding"] !== true) w["hasCompletedOnboarding"] = true;
+    }
+  }
+  return working;
+}
+async function stageClaudeJsonOnlyForUpload(opts = {}) {
+  const hostHome = opts.hostHome ?? homedir22();
+  const stageDir = await mkStageDir("claude-json-only");
+  let tarballPath = null;
+  try {
+    const claudeJson = await buildBoxClaudeJsonFromHost({
+      hostHome,
+      hostWorkspace: opts.hostWorkspace
+    });
+    await writeFile3(join32(stageDir, "_claude.json"), JSON.stringify(claudeJson, null, 2));
+    tarballPath = await tarballFromDir(stageDir, "claude-json-only");
+    return {
+      tarballPath,
+      cleanup: makeCleanup([stageDir, tarballPath]),
+      warnings: []
+    };
+  } catch (err) {
+    await rm3(stageDir, { recursive: true, force: true });
+    if (tarballPath) await rm3(tarballPath, { force: true });
+    throw err;
+  }
+}
 async function stageClaudeStaticForUpload(opts = {}) {
   const hostHome = opts.hostHome ?? homedir22();
   const hostClaude = join32(hostHome, ".claude");
@@ -3267,31 +3365,11 @@ async function stageClaudeStaticForUpload(opts = {}) {
       } catch {
       }
     }
-    const hostClaudeJson = join32(hostHome, ".claude.json");
-    let working;
-    if (await pathExists(hostClaudeJson)) {
-      try {
-        working = JSON.parse(await readFile32(hostClaudeJson, "utf8"));
-      } catch {
-        working = null;
-      }
-    }
-    if (working === void 0 || working === null) {
-      working = {
-        installMethod: "native",
-        autoUpdates: false,
-        autoUpdatesProtectedForNative: true,
-        projects: { [CLOUD_WORKSPACE]: { hasTrustDialogAccepted: true } }
-      };
-    } else {
-      working = filterHostHooks(working, hostHome).data;
-      working = setInstallMethodNative(working).data;
-      if (opts.hostWorkspace) {
-        working = addProjectAlias(working, opts.hostWorkspace, CLOUD_WORKSPACE).data;
-      }
-      working = trustWorkspace(working, CLOUD_WORKSPACE).data;
-    }
-    await writeFile3(join32(stageDir, "_claude.json"), JSON.stringify(working, null, 2));
+    const claudeJson = await buildBoxClaudeJsonFromHost({
+      hostHome,
+      hostWorkspace: opts.hostWorkspace
+    });
+    await writeFile3(join32(stageDir, "_claude.json"), JSON.stringify(claudeJson, null, 2));
     const pluginsDir = join32(stageDir, "plugins");
     if (await pathExists(pluginsDir)) {
       try {
@@ -3699,7 +3777,7 @@ async function maybeFilterTo(src, dest, hostHome, opts = {}) {
   };
   let parsed;
   try {
-    parsed = JSON.parse(await readFile4(src, "utf8"));
+    parsed = JSON.parse(await readFile42(src, "utf8"));
   } catch {
     return zero;
   }
@@ -3782,7 +3860,7 @@ async function isDir(p) {
 }
 async function readReferencedPluginKeys(installedPluginsJsonPath) {
   try {
-    const raw = await readFile4(installedPluginsJsonPath, "utf8");
+    const raw = await readFile42(installedPluginsJsonPath, "utf8");
     return referencedPluginVersionKeys(JSON.parse(raw));
   } catch {
     return /* @__PURE__ */ new Set();
@@ -4257,7 +4335,7 @@ async function listChildDirs(dir) {
 }
 async function readJsonFile(path) {
   try {
-    return JSON.parse(await readFile4(path, "utf8"));
+    return JSON.parse(await readFile42(path, "utf8"));
   } catch {
     return void 0;
   }
@@ -5374,6 +5452,75 @@ async function seedWorkspace(opts) {
     }
   }
 }
+async function regenerateRestoredWorktrees(opts) {
+  const log = opts.onLog ?? (() => {
+  });
+  const script = [
+    "set -e",
+    'OLD="$1"; NEW="$2"; MAIN="$3"; BR="$4"; BASE="$5"; META="$6"',
+    // Rename baked content to the fresh unique path (rename, not copy).
+    '[ "$OLD" = "$NEW" ] || mv "$OLD" "$NEW"',
+    // Fresh branch at the base ref; -f is safe because pickFreshBranch already
+    // guaranteed BR is unused on the host.
+    'git -C "$MAIN" branch -f "$BR" "$BASE"',
+    // Author worktree metadata under the bind-mounted host .git.
+    'mkdir -p "$META"',
+    'printf "../..\\n" > "$META/commondir"',
+    'printf "%s\\n" "$NEW/.git" > "$META/gitdir"',
+    'printf "ref: refs/heads/%s\\n" "$BR" > "$META/HEAD"',
+    // Point the worktree's gitfile at the fresh metadata dir.
+    'printf "gitdir: %s\\n" "$META" > "$NEW/.git"',
+    // Reset tracked files to the fork base so the box starts CLEAN at the host
+    // base ref — same git state as a fresh create. The baked tree was captured
+    // on the source box's (possibly divergent/older) branch, so its tracked
+    // deviations are staleness, not work; resetting drops that noise. The
+    // gitignored warm artifacts (node_modules, .next, build caches) are
+    // untouched by reset --hard — that warm state is the checkpoint's value.
+    'git -C "$NEW" reset -q --hard HEAD',
+    // Boxes carry no signing key; mirror seedWorkspace's per-worktree config so
+    // host commit.gpgsign=true doesn't break in-box commits. extensions.
+    // worktreeConfig writes the SHARED (bind-mounted) .git/config, so concurrent
+    // boxes race on .git/config.lock — retry through the contention rather than
+    // aborting (best-effort, like seedWorkspace). The per-worktree gpgsign write
+    // needs the extension enabled first, so it follows the retry.
+    "set +e",
+    'for i in 1 2 3 4 5 6 7 8; do git -C "$MAIN" config extensions.worktreeConfig true && break; sleep 0.25; done',
+    'git -C "$NEW" config --worktree commit.gpgsign false',
+    "exit 0"
+  ].join("\n");
+  for (const p of opts.plans) {
+    const baseRef = p.kind === "root" ? opts.fromBranch ?? "HEAD" : "HEAD";
+    const metaDir = `${p.hostMainRepo}/.git/worktrees/${fsSafeBranch(p.freshBranch)}`;
+    const r = await execa8(
+      "docker",
+      [
+        "exec",
+        "--user",
+        "vscode",
+        opts.container,
+        "bash",
+        "-c",
+        script,
+        "bash",
+        p.bakedGitWorktreePath,
+        p.freshGitWorktreePath,
+        p.hostMainRepo,
+        p.freshBranch,
+        baseRef,
+        metaDir
+      ],
+      { reject: false }
+    );
+    if (r.exitCode !== 0) {
+      throw new GitWorktreeError(
+        `regenerate worktree for ${p.freshBranch} failed: ${r.stderr || r.stdout}`
+      );
+    }
+    log(
+      `restored worktree ${p.freshGitWorktreePath} on fresh branch ${p.freshBranch} (base ${baseRef})`
+    );
+  }
+}
 async function seedWorkspaceFromDir(opts) {
   const log = opts.onLog ?? (() => {
   });
@@ -5413,6 +5560,12 @@ async function gitIn(container, ct, args) {
 function splitNul(s) {
   return s.split("\0").filter((p) => p.length > 0);
 }
+var NON_REGULAR_TOKEN = "-";
+function classifyUntrackedOverlay(boxToken, hostHash) {
+  if (boxToken === void 0) return "copy";
+  if (boxToken === NON_REGULAR_TOKEN) return "conflict";
+  return boxToken === hostHash ? "identical" : "conflict";
+}
 async function unmergedPaths(container, ct) {
   const r = await gitIn(container, ct, ["diff", "--name-only", "--diff-filter=U", "-z"]);
   return r.exitCode === 0 ? splitNul(r.stdout) : [];
@@ -5509,7 +5662,7 @@ async function resyncWorkspaceFromHost(opts) {
       }
     }
     if (hostUntracked.length > 0) {
-      const filter = await execa8(
+      const probe = await execa8(
         "docker",
         [
           "exec",
@@ -5519,15 +5672,42 @@ async function resyncWorkspaceFromHost(opts) {
           opts.container,
           "bash",
           "-c",
-          'cd "$1" && while IFS= read -r -d "" f; do [ -e "$f" ] && printf "%s\\0" "$f"; done',
+          'cd "$1" && while IFS= read -r -d "" f; do if [ -f "$f" ] && [ ! -L "$f" ]; then printf "%s\\0%s\\0" "$(sha256sum < "$f" | cut -d" " -f1)" "$f"; elif [ -e "$f" ]; then printf "%s\\0%s\\0" "-" "$f"; fi; done',
           "bash",
           ct
         ],
         { input: hostUntracked.join("\0"), reject: false }
       );
-      const existing = new Set(filter.exitCode === 0 ? splitNul(filter.stdout) : []);
-      const toCopy = hostUntracked.filter((p) => !existing.has(p));
-      for (const p of hostUntracked) if (existing.has(p)) res.overlaySkipped.push(p);
+      const boxTokens = /* @__PURE__ */ new Map();
+      if (probe.exitCode === 0) {
+        const flat = splitNul(probe.stdout);
+        for (let i = 0; i + 1 < flat.length; i += 2) {
+          const token = flat[i];
+          const path = flat[i + 1];
+          if (token !== void 0 && path !== void 0) boxTokens.set(path, token);
+        }
+      }
+      const toCopy = [];
+      let identical = 0;
+      for (const p of hostUntracked) {
+        const boxToken = boxTokens.get(p);
+        let hostHash = "";
+        if (boxToken !== void 0 && boxToken !== NON_REGULAR_TOKEN) {
+          try {
+            hostHash = createHash22("sha256").update(await readFile52(join7(hostMain, p))).digest("hex");
+          } catch {
+            identical++;
+            continue;
+          }
+        }
+        const verdict = classifyUntrackedOverlay(boxToken, hostHash);
+        if (verdict === "copy") toCopy.push(p);
+        else if (verdict === "conflict") res.overlaySkipped.push(p);
+        else identical++;
+      }
+      if (identical > 0) {
+        log(`resync: ${ct}: ${String(identical)} untracked host file(s) already identical in box (no-op)`);
+      }
       if (toCopy.length > 0) {
         const tarOut = await execa8("tar", ["-C", hostMain, "--null", "-T", "-", "-cf", "-"], {
           input: toCopy.join("\0"),
@@ -5637,7 +5817,7 @@ async function startPortlessProxy() {
 function portlessStateDirCandidates() {
   const env = process.env["PORTLESS_STATE_DIR"];
   if (env && env.trim().length > 0) return [env.trim()];
-  return ["/tmp/portless", join7(homedir6(), ".portless")];
+  return ["/tmp/portless", join8(homedir6(), ".portless")];
 }
 function pidAlive(pid) {
   if (!Number.isFinite(pid) || pid <= 0) return false;
@@ -5650,7 +5830,7 @@ function pidAlive(pid) {
 }
 async function readProxyPid(dir) {
   try {
-    const raw = await readFile52(join7(dir, "proxy.pid"), "utf8");
+    const raw = await readFile6(join8(dir, "proxy.pid"), "utf8");
     const pid = Number.parseInt(raw.trim(), 10);
     return Number.isFinite(pid) && pid > 0 ? pid : null;
   } catch {
@@ -5670,7 +5850,7 @@ async function resolvePortlessHostStateDir(override) {
   if (env && env.trim().length > 0) return env.trim();
   const live = await findLivePortlessStateDir();
   if (live) return live;
-  const home = join7(homedir6(), ".portless");
+  const home = join8(homedir6(), ".portless");
   if (existsSync(home)) return home;
   if (existsSync("/tmp/portless")) return "/tmp/portless";
   return home;
@@ -5699,12 +5879,12 @@ var EXCLUDE_DIRS = /* @__PURE__ */ new Set([
   ".cache",
   ".parcel-cache"
 ]);
-var SNAPSHOTS_ROOT = join8(homedir7(), ".agentbox", "snapshots");
+var SNAPSHOTS_ROOT = join9(homedir7(), ".agentbox", "snapshots");
 function snapshotPathFor(box) {
   const mnemonic = sanitizeMnemonic(box.name);
   const n = box.projectIndex;
   const segment = typeof n === "number" && Number.isFinite(n) && n > 0 ? `${box.id}-${String(n)}-${mnemonic}` : `${box.id}-${mnemonic}`;
-  return join8(SNAPSHOTS_ROOT, segment);
+  return join9(SNAPSHOTS_ROOT, segment);
 }
 async function findExcludedDirs(root, excluded = EXCLUDE_DIRS) {
   const matches = [];
@@ -5717,7 +5897,7 @@ async function findExcludedDirs(root, excluded = EXCLUDE_DIRS) {
     }
     for (const entry of entries) {
       if (!entry.isDirectory()) continue;
-      const abs = join8(dir, entry.name);
+      const abs = join9(dir, entry.name);
       if (excluded.has(entry.name)) {
         matches.push(abs);
         continue;
@@ -5739,21 +5919,21 @@ async function createSnapshot(opts) {
   await Promise.all(toPrune.map((p) => rm32(p, { recursive: true, force: true })));
   return { destination, prunedPaths: toPrune };
 }
-var CHECKPOINTS_ROOT = join9(homedir8(), ".agentbox", "checkpoints");
+var CHECKPOINTS_ROOT = join10(homedir8(), ".agentbox", "checkpoints");
 var CHECKPOINT_IMAGE_PREFIX = "agentbox-ckpt-";
 function checkpointImageTag(projectRoot, name) {
   const mnemonic = sanitizeMnemonic(basename32(projectRoot));
   return `${CHECKPOINT_IMAGE_PREFIX}${hashProjectPath(projectRoot)}_${mnemonic}:${name}`;
 }
 function projectCheckpointsDir(projectRoot) {
-  return join9(CHECKPOINTS_ROOT, projectDirSegment(projectRoot));
+  return join10(CHECKPOINTS_ROOT, projectDirSegment(projectRoot));
 }
 function checkpointDir(projectRoot, name) {
-  return join9(projectCheckpointsDir(projectRoot), name);
+  return join10(projectCheckpointsDir(projectRoot), name);
 }
 async function readManifest(dir) {
   try {
-    const raw = await readFile6(join9(dir, "manifest.json"), "utf8");
+    const raw = await readFile7(join10(dir, "manifest.json"), "utf8");
     const m = JSON.parse(raw);
     if (m.schema !== 2 && m.schema !== 3) return null;
     return m;
@@ -5770,7 +5950,7 @@ async function listCheckpointsInDir(root) {
   }
   const out = [];
   for (const name of entries) {
-    const dir = join9(root, name);
+    const dir = join10(root, name);
     const manifest = await readManifest(dir);
     if (manifest) out.push({ name, dir, manifest });
   }
@@ -5789,7 +5969,7 @@ async function listAllCheckpoints() {
   }
   const out = [];
   for (const segment of segments) {
-    const items = await listCheckpointsInDir(join9(CHECKPOINTS_ROOT, segment));
+    const items = await listCheckpointsInDir(join10(CHECKPOINTS_ROOT, segment));
     if (items.length > 0) out.push({ segment, items });
   }
   return out;
@@ -5809,7 +5989,7 @@ async function listAllCheckpointImages() {
   }
   const out = /* @__PURE__ */ new Set();
   for (const proj of projectDirs) {
-    const projPath = join9(CHECKPOINTS_ROOT, proj);
+    const projPath = join10(CHECKPOINTS_ROOT, proj);
     let names;
     try {
       names = (await readdir5(projPath, { withFileTypes: true })).filter((e) => e.isDirectory()).map((e) => e.name);
@@ -5817,7 +5997,7 @@ async function listAllCheckpointImages() {
       continue;
     }
     for (const name of names) {
-      const manifest = await readManifest(join9(projPath, name));
+      const manifest = await readManifest(join10(projPath, name));
       if (manifest) out.add(manifest.image);
     }
   }
@@ -5978,7 +6158,7 @@ async function createCheckpoint(opts) {
     cliVersion: stamp.cliVersion,
     createdAt: (/* @__PURE__ */ new Date()).toISOString()
   };
-  await writeFile32(join9(dir, "manifest.json"), JSON.stringify(manifest, null, 2) + "\n", "utf8");
+  await writeFile32(join10(dir, "manifest.json"), JSON.stringify(manifest, null, 2) + "\n", "utf8");
   if (opts.setDefault) {
     await setConfigValue("project", "box.defaultCheckpointDocker", name, opts.projectRoot);
     log(`set project default checkpoint (box.defaultCheckpointDocker) -> ${name}`);
@@ -5995,9 +6175,9 @@ async function flattenImage(sourceTag, destTag, log) {
   if (create.exitCode !== 0) {
     throw new CheckpointError(`docker create for flatten failed`, create.stdout, create.stderr);
   }
-  const scratch = await mkdtemp3(join9(tmpdir3(), "agentbox-flatten-"));
+  const scratch = await mkdtemp3(join10(tmpdir3(), "agentbox-flatten-"));
   try {
-    const rootfsPath = join9(scratch, "rootfs.tar");
+    const rootfsPath = join10(scratch, "rootfs.tar");
     log(`exporting rootfs of ${sourceTag} to ${rootfsPath}`);
     const exp = await execa11("docker", ["export", "-o", rootfsPath, tmpName], { reject: false });
     if (exp.exitCode !== 0) {
@@ -6010,11 +6190,11 @@ async function flattenImage(sourceTag, destTag, log) {
       "ADD rootfs.tar /",
       ...renderConfigDirectives(cfg)
     ];
-    await writeFile32(join9(scratch, "Dockerfile"), lines.join("\n") + "\n", "utf8");
+    await writeFile32(join10(scratch, "Dockerfile"), lines.join("\n") + "\n", "utf8");
     log(`building flattened ${destTag} from rootfs.tar (FROM scratch)`);
     const build = await execa11(
       "docker",
-      ["build", "-t", destTag, "-f", join9(scratch, "Dockerfile"), scratch],
+      ["build", "-t", destTag, "-f", join10(scratch, "Dockerfile"), scratch],
       { reject: false }
     );
     if (build.exitCode !== 0) {
@@ -6105,10 +6285,10 @@ async function ensureHomeOwnedByVscode(container) {
     { reject: false }
   );
 }
-var STATE_DIR22 = join10(homedir9(), ".agentbox");
-var PID_FILE = join10(STATE_DIR22, "relay.pid");
-var LOG_FILE = join10(STATE_DIR22, "relay.log");
-var RELAY_HOME_DIR = join10(STATE_DIR22, "relay");
+var STATE_DIR22 = join11(homedir9(), ".agentbox");
+var PID_FILE = join11(STATE_DIR22, "relay.pid");
+var LOG_FILE = join11(STATE_DIR22, "relay.log");
+var RELAY_HOME_DIR = join11(STATE_DIR22, "relay");
 var PORT = DEFAULT_RELAY_PORT;
 var ENDPOINT = {
   // host.docker.internal is the Docker Desktop / OrbStack-supplied alias for
@@ -6275,13 +6455,13 @@ async function stageRelayHome(version, log) {
   if (process.env.AGENTBOX_RELAY_BIN || process.env.AGENTBOX_CLI_ENTRY) return null;
   const cliRoot = findCliRoot(dirname3(fileURLToPath(import.meta.url)));
   if (cliRoot === null) return null;
-  const homeDir = join10(RELAY_HOME_DIR, version);
-  const stagedEntry = join10(homeDir, "dist", "index.js");
-  const stagedBin = join10(homeDir, "runtime", "relay", "bin.cjs");
+  const homeDir = join11(RELAY_HOME_DIR, version);
+  const stagedEntry = join11(homeDir, "dist", "index.js");
+  const stagedBin = join11(homeDir, "runtime", "relay", "bin.cjs");
   if (existsSync2(stagedEntry) && existsSync2(stagedBin)) {
     return { relayBin: stagedBin, cliEntry: stagedEntry };
   }
-  const nodeModules = resolveDepRoot(join10(cliRoot, "dist", "index.js"));
+  const nodeModules = resolveDepRoot(join11(cliRoot, "dist", "index.js"));
   if (nodeModules === null) return null;
   const tmpDir = `${homeDir}.tmp-${String(process.pid)}`;
   try {
@@ -6289,10 +6469,10 @@ async function stageRelayHome(version, log) {
     await rm5(tmpDir, { recursive: true, force: true });
     await mkdir6(tmpDir, { recursive: true });
     for (const sub of ["dist", "runtime", "share"]) {
-      const src = join10(cliRoot, sub);
-      if (existsSync2(src)) await cp(src, join10(tmpDir, sub), { recursive: true });
+      const src = join11(cliRoot, sub);
+      if (existsSync2(src)) await cp(src, join11(tmpDir, sub), { recursive: true });
     }
-    await cp(nodeModules, join10(tmpDir, "node_modules"), { recursive: true, dereference: true });
+    await cp(nodeModules, join11(tmpDir, "node_modules"), { recursive: true, dereference: true });
     await rm5(homeDir, { recursive: true, force: true });
     await rename3(tmpDir, homeDir);
   } catch (err) {
@@ -6311,7 +6491,7 @@ async function stageRelayHome(version, log) {
 }
 function findCliRoot(moduleDir) {
   for (const root of [resolve22(moduleDir, ".."), resolve22(moduleDir, "..", "..")]) {
-    if (existsSync2(join10(root, "dist", "index.js")) && existsSync2(join10(root, "runtime", "relay", "bin.cjs"))) {
+    if (existsSync2(join11(root, "dist", "index.js")) && existsSync2(join11(root, "runtime", "relay", "bin.cjs"))) {
       return root;
     }
   }
@@ -6326,7 +6506,7 @@ function resolveDepRoot(fromFile) {
     const idx = main.lastIndexOf(marker);
     if (idx === -1) return null;
     const nm = main.slice(0, idx + marker.length - 1);
-    return existsSync2(join10(nm, "commander")) ? nm : null;
+    return existsSync2(join11(nm, "commander")) ? nm : null;
   } catch {
     return null;
   }
@@ -6340,7 +6520,7 @@ async function gcOldRelayHomes(keepVersion) {
   }
   for (const name of entries) {
     if (name === keepVersion) continue;
-    await rm5(join10(RELAY_HOME_DIR, name), { recursive: true, force: true }).catch(() => {
+    await rm5(join11(RELAY_HOME_DIR, name), { recursive: true, force: true }).catch(() => {
     });
   }
 }
@@ -6451,7 +6631,7 @@ function fetchHealthz(timeoutMs) {
 }
 async function readPidFile() {
   try {
-    const text = await readFile7(PID_FILE, "utf8");
+    const text = await readFile8(PID_FILE, "utf8");
     const pid = Number.parseInt(text.trim(), 10);
     return Number.isFinite(pid) && pid > 0 ? pid : null;
   } catch {
@@ -6797,7 +6977,7 @@ async function pathExists6(p) {
 async function buildIdentityMounts() {
   const home = homedir10();
   const candidates = [
-    { src: join11(home, ".gitconfig"), dst: "/home/vscode/.gitconfig", readOnly: true }
+    { src: join12(home, ".gitconfig"), dst: "/home/vscode/.gitconfig", readOnly: true }
   ];
   const out = [];
   for (const c of candidates) {
@@ -6814,7 +6994,7 @@ async function createBox(opts) {
   if (!await pathExists6(workspace)) {
     throw new Error(`workspace does not exist: ${workspace}`);
   }
-  const cfgPath = join11(workspace, "agentbox.yaml");
+  const cfgPath = join12(workspace, "agentbox.yaml");
   if (await pathExists6(cfgPath)) {
     try {
       const cfg = await loadConfig(cfgPath);
@@ -6894,12 +7074,35 @@ async function createBox(opts) {
   }
   let projectIndex;
   if (opts.projectRoot) {
-    projectIndex = allocateProjectIndex(await readState(), opts.projectRoot);
+    projectIndex = await reserveProjectIndex(
+      { id, name, container: containerName, image: imageRef, workspacePath: workspace, createdAt },
+      opts.projectRoot
+    );
   }
   const repoCarryOvers = [];
   const gitWorktreeRecords = [];
+  const restoreWorktreePlans = [];
   if (checkpointImage && restoredWorktrees && restoredWorktrees.length > 0) {
-    gitWorktreeRecords.push(...restoredWorktrees);
+    for (const w of restoredWorktrees) {
+      const branchBase = w.kind === "root" ? `agentbox/${name}` : `agentbox/${name}--${w.relPathFromWorkspace.replace(/[^A-Za-z0-9._-]+/g, "_")}`;
+      const freshBranch = await pickFreshBranch(w.hostMainRepo, branchBase);
+      const freshGitWorktreePath = gitWorktreePathFor(freshBranch);
+      restoreWorktreePlans.push({
+        hostMainRepo: w.hostMainRepo,
+        kind: w.kind,
+        bakedGitWorktreePath: w.gitWorktreePath,
+        freshBranch,
+        freshGitWorktreePath
+      });
+      gitWorktreeRecords.push({
+        kind: w.kind,
+        hostMainRepo: w.hostMainRepo,
+        containerPath: w.containerPath,
+        gitWorktreePath: freshGitWorktreePath,
+        branch: freshBranch,
+        relPathFromWorkspace: w.relPathFromWorkspace
+      });
+    }
   }
   if (!checkpointImage) {
     const repos = await detectGitRepos(workspace);
@@ -7007,7 +7210,7 @@ async function createBox(opts) {
     log(`seeded claude credentials into ${claudeSpec.volume} from host backup`);
   }
   const claudeMounts = buildClaudeMounts(claudeSpec, process.env);
-  const wantCodex = opts.codexConfig !== void 0 || await pathExists6(join11(homedir10(), ".codex"));
+  const wantCodex = opts.codexConfig !== void 0 || await pathExists6(join12(homedir10(), ".codex"));
   let codexMounts;
   let codexConfigVolume;
   if (wantCodex) {
@@ -7027,7 +7230,7 @@ async function createBox(opts) {
     codexMounts = buildCodexMounts(codexSpec, process.env);
     codexConfigVolume = codexSpec.volume;
   }
-  const wantOpencode = opts.opencodeConfig !== void 0 || await pathExists6(join11(homedir10(), ".config", "opencode")) || await pathExists6(join11(homedir10(), ".local", "share", "opencode"));
+  const wantOpencode = opts.opencodeConfig !== void 0 || await pathExists6(join12(homedir10(), ".config", "opencode")) || await pathExists6(join12(homedir10(), ".local", "share", "opencode"));
   let opencodeMounts;
   let opencodeConfigVolume;
   if (wantOpencode) {
@@ -7048,9 +7251,9 @@ async function createBox(opts) {
     opencodeConfigVolume = opencodeSpec.volume;
   }
   const boxDir = boxRunDirFor({ id, name, projectIndex });
-  const socketDir = join11(boxDir, "run");
-  const socketPath = join11(socketDir, "ctl.sock");
-  const mergedExportDir = join11(boxDir, "workspace");
+  const socketDir = join12(boxDir, "run");
+  const socketPath = join12(socketDir, "ctl.sock");
+  const mergedExportDir = join12(boxDir, "workspace");
   await mkdir7(socketDir, { recursive: true });
   await mkdir7(mergedExportDir, { recursive: true });
   const extraVolumes = await buildIdentityMounts();
@@ -7139,6 +7342,36 @@ async function createBox(opts) {
       effectiveLimits = { ...appliedLimits, disk: null };
     }
   }
+  const baseRecord = {
+    id,
+    name,
+    container: containerName,
+    image: imageRef,
+    workspacePath: workspace,
+    snapshotDir,
+    socketPath,
+    claudeConfigVolume: claudeSpec.volume,
+    codexConfigVolume,
+    opencodeConfigVolume,
+    vscodeServerVolume: vscodeServerVolumeName(id),
+    cursorServerVolume: cursorServerVolumeName(id),
+    relayToken: relayUp ? relayToken : void 0,
+    gitWorktrees: gitWorktreeRecords.length > 0 ? gitWorktreeRecords : void 0,
+    withPlaywright: opts.withPlaywright ? true : void 0,
+    withEnv: opts.withEnv ? true : void 0,
+    vncEnabled: vncEnabled ? true : void 0,
+    vncContainerPort: vncEnabled ? VNC_CONTAINER_PORT : void 0,
+    vncPassword,
+    webContainerPort: WEB_CONTAINER_PORT,
+    dockerVolume,
+    dockerCacheShared: dockerCacheShared || void 0,
+    projectRoot: opts.projectRoot,
+    projectIndex,
+    checkpointImage,
+    checkpointSource,
+    resourceLimits: persistableLimits(effectiveLimits),
+    createdAt
+  };
   await runBox({
     name: containerName,
     image: imageRef,
@@ -7158,6 +7391,7 @@ async function createBox(opts) {
     }
   });
   log(`container ${containerName} started`);
+  await recordBox(baseRecord);
   if (gitWorktreeRecords.length > 0) {
     await chownGitBindParents({
       container: containerName,
@@ -7183,6 +7417,7 @@ async function createBox(opts) {
         if (opts.useBranch !== void 0) {
           log(`seedWorkspace failed for --use-branch ${opts.useBranch}; cleaning up the box`);
           await execa14("docker", ["rm", "-f", containerName], { reject: false });
+          await removeBoxRecord(id);
           for (const w of gitWorktreeRecords) {
             await removeInBoxWorktree({
               hostMainRepo: w.hostMainRepo,
@@ -7198,21 +7433,27 @@ async function createBox(opts) {
       const source = snapshotDir ?? workspace;
       await seedWorkspaceFromDir({ container: containerName, hostSource: source, onLog: log });
     }
-  } else if (restoredWorktrees && restoredWorktrees.length > 0) {
+  } else if (restoreWorktreePlans.length > 0) {
+    await regenerateRestoredWorktrees({
+      container: containerName,
+      plans: restoreWorktreePlans,
+      fromBranch: opts.fromBranch,
+      onLog: log
+    });
     await bindWorktrees(
       containerName,
-      restoredWorktrees.map((w) => ({
+      gitWorktreeRecords.map((w) => ({
         kind: w.kind,
         containerPath: w.containerPath,
         gitWorktreePath: w.gitWorktreePath
       })),
       log
     );
-    log("re-bound /workspace from checkpoint image");
+    log("re-bound /workspace from checkpoint image (fresh per-box worktree)");
     if (opts.resyncOnStart !== false) {
       const repos = await resyncWorkspaceFromHost({
         container: containerName,
-        worktrees: restoredWorktrees,
+        worktrees: gitWorktreeRecords,
         onLog: log
       });
       resyncResult = {
@@ -7227,15 +7468,15 @@ async function createBox(opts) {
   }
   await repairIdeOwnership(containerName);
   log(".vscode-server + .cursor-server ownership verified");
-  const ctl = await launchCtlDaemon(containerName, socketPath);
-  if (ctl.up) log("agentbox-ctl daemon up");
-  else log(`agentbox-ctl daemon did not become reachable: ${ctl.reason}`);
   const dockerd = await launchDockerdDaemon(containerName);
   if (dockerd.up) {
     log(`dockerd up (data root=${dockerVolume})`);
   } else {
     log(`dockerd did not become ready: ${dockerd.reason}`);
   }
+  const ctl = await launchCtlDaemon(containerName, socketPath);
+  if (ctl.up) log("agentbox-ctl daemon up");
+  else log(`agentbox-ctl daemon did not become reachable: ${ctl.reason}`);
   if (opts.withPlaywright) {
     log("installing @playwright/cli@latest (--with-playwright)");
     const result = await execa14(
@@ -7354,41 +7595,14 @@ async function createBox(opts) {
     }
   }
   const record = {
-    id,
-    name,
-    container: containerName,
-    image: imageRef,
-    workspacePath: workspace,
-    snapshotDir,
-    socketPath,
-    claudeConfigVolume: claudeSpec.volume,
-    codexConfigVolume,
-    opencodeConfigVolume,
-    vscodeServerVolume: vscodeServerVolumeName(id),
-    cursorServerVolume: cursorServerVolumeName(id),
-    relayToken: relayUp ? relayToken : void 0,
-    gitWorktrees: gitWorktreeRecords.length > 0 ? gitWorktreeRecords : void 0,
-    withPlaywright: opts.withPlaywright ? true : void 0,
-    withEnv: opts.withEnv ? true : void 0,
+    ...baseRecord,
     carry: carrySummary,
-    vncEnabled: vncEnabled ? true : void 0,
-    vncContainerPort: vncEnabled ? VNC_CONTAINER_PORT : void 0,
     vncHostPort: vncHostPort ?? void 0,
-    vncPassword,
-    webContainerPort: WEB_CONTAINER_PORT,
     webHostPort: webHostPort ?? void 0,
     portlessAlias: portlessAliasName,
     portlessUrl,
     portlessVncAlias: portlessVncAliasName,
-    portlessVncUrl,
-    dockerVolume,
-    dockerCacheShared: dockerCacheShared || void 0,
-    projectRoot: opts.projectRoot,
-    projectIndex,
-    checkpointImage,
-    checkpointSource,
-    resourceLimits: persistableLimits(effectiveLimits),
-    createdAt
+    portlessVncUrl
   };
   await recordBox(record);
   return { record, imageBuilt: built, resync: resyncResult };
@@ -7574,7 +7788,7 @@ async function getBoxEndpoints(record, engine, persisted) {
     for (const svc of persistedServices) pushService(svc.name, svc.port);
   } else {
     try {
-      const cfg = await loadConfig(join12(record.workspacePath, "agentbox.yaml"));
+      const cfg = await loadConfig(join13(record.workspacePath, "agentbox.yaml"));
       if (!webServiceName) {
         webServiceName = cfg.services.find((s) => s.expose)?.name ?? null;
       }
@@ -7725,9 +7939,9 @@ async function resyncBox(idOrName, onLog) {
 async function startBox(idOrName) {
   const box = await resolveBox(idOrName);
   for (const w of box.gitWorktrees ?? []) {
-    if (!await pathExists7(join13(w.hostMainRepo, ".git"))) {
+    if (!await pathExists7(join14(w.hostMainRepo, ".git"))) {
       throw new Error(
-        `main repo for box worktree missing: ${join13(w.hostMainRepo, ".git")} (recreate the box)`
+        `main repo for box worktree missing: ${join14(w.hostMainRepo, ".git")} (recreate the box)`
       );
     }
   }
@@ -7743,12 +7957,12 @@ async function startBox(idOrName) {
     );
   }
   await ensureHomeOwnedByVscode(box.container);
-  if (box.socketPath) {
-    await launchCtlDaemon(box.container, box.socketPath);
-  }
   if (box.dockerVolume) {
     await launchDockerdDaemon(box.container);
   }
+  if (box.socketPath) {
+    await launchCtlDaemon(box.container, box.socketPath);
+  }
   if (box.vncEnabled) {
     await launchVncDaemon(box.container);
     const freshHostPort = await publishedHostPort(box.container, VNC_CONTAINER_PORT);
@@ -7896,16 +8110,13 @@ async function destroyBox(idOrName, opts = {}) {
     } catch {
     }
   }
-  const ownsWorktrees = !box.checkpointImage;
-  if (ownsWorktrees) {
-    for (const w of box.gitWorktrees ?? []) {
-      try {
-        await removeInBoxWorktree({
-          hostMainRepo: w.hostMainRepo,
-          gitWorktreePath: w.gitWorktreePath
-        });
-      } catch {
-      }
+  for (const w of box.gitWorktrees ?? []) {
+    try {
+      await removeInBoxWorktree({
+        hostMainRepo: w.hostMainRepo,
+        gitWorktreePath: w.gitWorktreePath
+      });
+    } catch {
     }
   }
   const beforeContainer = await inspectContainerStatus(box.container);
@@ -7956,7 +8167,7 @@ async function destroyBox(idOrName, opts = {}) {
 async function listSnapshotDirs() {
   try {
     const entries = await readdir7(SNAPSHOTS_ROOT, { withFileTypes: true });
-    return entries.filter((e) => e.isDirectory()).map((e) => join13(SNAPSHOTS_ROOT, e.name));
+    return entries.filter((e) => e.isDirectory()).map((e) => join14(SNAPSHOTS_ROOT, e.name));
   } catch {
     return [];
   }
@@ -7964,7 +8175,7 @@ async function listSnapshotDirs() {
 async function listBoxDirs() {
   try {
     const entries = await readdir7(BOXES_ROOT, { withFileTypes: true });
-    return entries.filter((e) => e.isDirectory()).map((e) => join13(BOXES_ROOT, e.name));
+    return entries.filter((e) => e.isDirectory()).map((e) => join14(BOXES_ROOT, e.name));
   } catch {
     return [];
   }
@@ -8149,7 +8360,7 @@ async function volumeSizeBytes(name) {
   if (!name) return null;
   const engine = await detectEngine();
   if (engine === "orbstack") {
-    const live = join14(homedir11(), "OrbStack", "docker", "volumes", name);
+    const live = join15(homedir11(), "OrbStack", "docker", "volumes", name);
     const sz = await duBytes(live);
     if (sz !== null) return sz;
   }
@@ -8212,7 +8423,7 @@ async function allCheckpointImagesBytes() {
   return any ? total : null;
 }
 async function agentboxHomeBytes() {
-  return duBytes(join14(homedir11(), ".agentbox"));
+  return duBytes(join15(homedir11(), ".agentbox"));
 }
 function limitsFromRecord(record) {
   const r = record.resourceLimits;
@@ -8598,7 +8809,7 @@ async function walkFiles(root, prefix = "") {
   const out = [];
   for (const ent of entries) {
     const rel = prefix ? `${prefix}/${ent.name}` : ent.name;
-    const full = join15(root, ent.name);
+    const full = join16(root, ent.name);
     if (ent.isDirectory()) {
       out.push(...await walkFiles(full, rel));
     } else if (ent.isFile()) {
@@ -8614,20 +8825,20 @@ async function walkFiles(root, prefix = "") {
   return out;
 }
 async function hashFile(absPath) {
-  const buf = await readFile8(absPath);
-  return createHash22("sha256").update(buf).digest("hex");
+  const buf = await readFile9(absPath);
+  return createHash32("sha256").update(buf).digest("hex");
 }
 async function buildHostSet(name, hostDir, boxDst) {
   if (hostDir === null) return { dst: boxDst, files: {}, hostDir: null };
   const rels = await walkFiles(hostDir);
   const files = {};
   for (const rel of rels) {
-    files[rel] = await hashFile(join15(hostDir, rel));
+    files[rel] = await hashFile(join16(hostDir, rel));
   }
   return { dst: boxDst, files, hostDir };
 }
 async function buildHostSyncManifest(workspacePath, hostHome = homedir12()) {
-  const workflowsDir = join15(hostHome, ".claude", "workflows");
+  const workflowsDir = join16(hostHome, ".claude", "workflows");
   const workflowsHost = await pathExists8(workflowsDir) ? workflowsDir : null;
   const memoryHost = await resolveClaudeMemoryDir(workspacePath, hostHome);
   const [workflows, memory] = await Promise.all([
@@ -8649,7 +8860,7 @@ function computeSyncDelta(host, box) {
         uploads.push({
           set: name,
           rel,
-          absSrc: join15(hostSet.hostDir, rel),
+          absSrc: join16(hostSet.hostDir, rel),
           dst: `${hostSet.dst}/${rel}`
         });
       }
@@ -8668,15 +8879,15 @@ async function stageDynamicSyncTarball(uploads) {
     return { tarballPath: null, cleanup: async () => {
     } };
   }
-  const stageDir = await mkdtemp4(join15(tmpdir4(), "agentbox-dynsync-stage-"));
+  const stageDir = await mkdtemp4(join16(tmpdir4(), "agentbox-dynsync-stage-"));
   let tarballPath = null;
   try {
     for (const up of uploads) {
-      const target = join15(stageDir, up.set, up.rel);
+      const target = join16(stageDir, up.set, up.rel);
       await mkdir8(dirname32(target), { recursive: true });
       await copyFile2(up.absSrc, target);
     }
-    tarballPath = join15(tmpdir4(), `agentbox-dynsync-${basename6(stageDir)}.tar.gz`);
+    tarballPath = join16(tmpdir4(), `agentbox-dynsync-${basename6(stageDir)}.tar.gz`);
     await execa19("tar", ["-czf", tarballPath, "-C", stageDir, "."], {
       env: { ...process.env, COPYFILE_DISABLE: "1" }
     });
@@ -8742,6 +8953,7 @@ export {
   renderPortsTable,
   loadCarrySection,
   resolveAgentLauncher,
+  UserFacingError,
   BoxNotFoundError,
   AmbiguousBoxError,
   generateBoxId,
@@ -8798,6 +9010,7 @@ export {
   encodeClaudeProjectsKey,
   BOX_CLAUDE_PROJECT_DIR,
   resolveClaudeMemoryDir,
+  stageClaudeJsonOnlyForUpload,
   stageClaudeStaticForUpload,
   stageClaudeCredentialsForUpload,
   stageCodexStaticForUpload,
@@ -8973,4 +9186,4 @@ export {
   browserSessionActive,
   ensureBoxBrowser
 };
-//# sourceMappingURL=chunk-IZXPJPPV.js.map
+//# sourceMappingURL=chunk-TCS5HXJX.js.map