@madarco/agentbox 0.11.2 → 0.12.0

package/dist/index.js

@@ -5,7 +5,7 @@ import {
   maskKey,
   readDaytonaCredStatus,
   secretsPath
-} from "./chunk-ZGVMN54V.js";
+} from "./chunk-2LF5YILI.js";
 import {
   detectEgressIp,
   ensureHetznerCredentials,
@@ -26,12 +26,14 @@ import {
 } from "./chunk-ECLLV5JH.js";
 import {
   agentSpecsForCloud,
+  currentCloudBaseFingerprint,
   ensureAgentVolumesForCloud,
+  listAllCloudCheckpoints,
   listCloudCheckpoints,
   probeCloudCheckpoint,
   resolveCloudCheckpoint,
   seedAgentVolumesIfFresh
-} from "./chunk-MXXXKJYS.js";
+} from "./chunk-DHJ7OMIP.js";
 import {
   ADVANCED_HINT_GROUPS,
   ALERT_BAND_ROWS,
@@ -62,7 +64,7 @@ import {
   statusLine,
   stripTitleGlyph,
   subscribePrompts
-} from "./chunk-GYJ62GFL.js";
+} from "./chunk-HFV6THYG.js";
 import {
   AmbiguousBoxError,
   BOX_STATUS_EVENT,
@@ -88,6 +90,7 @@ import {
   allCheckpointImagesBytes,
   allocateShellSessionName,
   attachedContainerUri,
+  boxImageConfigKey,
   boxResourceStats,
   buildClaudeAttachArgv,
   buildClaudeLoginRunArgv,
@@ -99,10 +102,12 @@ import {
   buildShellSessionAttachArgv,
   buildVncUrls,
   bumpProjectGcCounter,
+  carrySourceHash,
   claudeSessionInfo,
   clearRelayNotice,
   codexSessionInfo,
   configPathFor,
+  copyCarryPathsToBox,
   createBox,
   createCheckpoint,
   defaultCheckpointConfigKey,
@@ -136,6 +141,7 @@ import {
   inspectBox,
   installPortless,
   killShellSession,
+  listAllCheckpoints,
   listBoxes,
   listCheckpoints,
   listProjectsConfigured,
@@ -173,11 +179,14 @@ import {
   renderTaskTable,
   resetPortlessCache,
   resolveAgentLauncher,
+  resolveBoxImage,
+  resolveBoxSize,
   resolveCheckpoint,
   resolveClaudeVolume,
   resolveCodexVolume,
   resolveDefaultCheckpoint,
   resolveOpencodeVolume,
+  resyncBox,
   runInteractiveClaudeLogin,
   runInteractiveCodexLogin,
   runInteractiveOpencodeLogin,
@@ -208,21 +217,25 @@ import {
   waitForTmuxPaneContent,
   warmUpClaudeCredentials,
   writeJob
-} from "./chunk-ZJXTIH6C.js";
+} from "./chunk-IZXPJPPV.js";
 import {
   DEFAULT_BOX_IMAGE,
   STATE_DIR,
+  computeDockerContextFingerprint,
   ensureImage,
   hostOpenCommand,
+  imageExists,
   imageInfo,
+  readPreparedDockerState,
   readState,
+  recordBox,
   resolveBoxRef
 } from "./chunk-SNTHHWKY.js";
 import "./chunk-G3H2L3O2.js";
 
 // src/version.ts
-var AGENTBOX_VERSION = true ? "0.11.2" : "0.0.0-dev";
-var AGENTBOX_COMMIT = true ? "3683063c" : "dev";
+var AGENTBOX_VERSION = true ? "0.12.0" : "0.0.0-dev";
+var AGENTBOX_COMMIT = true ? "9df04087" : "dev";
 
 // src/index.ts
 import { Command as Command46 } from "commander";
@@ -254,13 +267,16 @@ var HELP_GROUPS = [
       "prepare",
       "wait",
       "prune",
+      "doctor",
       "self-update",
       "install",
       "config",
+      "git",
       "relay",
       "docker",
       "daytona",
-      "hetzner"
+      "hetzner",
+      "vercel"
     ]
   }
 ];
@@ -593,7 +609,7 @@ function parsePositiveInt(raw, label) {
 }
 
 // src/commands/claude.ts
-import { confirm as confirm3, intro, isCancel as isCancel4, log as log8, outro, spinner as spinner3 } from "@clack/prompts";
+import { confirm as confirm3, intro, isCancel as isCancel4, log as log9, outro, spinner as spinner3 } from "@clack/prompts";
 import { Command as Command2 } from "commander";
 
 // src/auth.ts
@@ -691,6 +707,293 @@ function buildPromptArgs(agentKind, prompt, userArgs) {
   return resolveAgentLauncher(agentKind).buildArgs(prompt, userArgs);
 }
 
+// src/lib/carry-resync.ts
+import { join as join4 } from "path";
+
+// src/lib/carry-resolve.ts
+import { realpath, stat as stat2 } from "fs/promises";
+import { homedir as homedir2 } from "os";
+import { isAbsolute, join as join3, normalize, resolve } from "path";
+var DEFAULT_MAX_BYTES = 50 * 1024 * 1024;
+var DENYLIST_DEST_PREFIXES = ["/proc", "/sys", "/dev"];
+var DENYLIST_DEST_EXACT = /* @__PURE__ */ new Set(["/etc/passwd", "/etc/shadow"]);
+async function resolveCarry(items, opts) {
+  const home = opts.homeDir ?? homedir2();
+  const cap = opts.maxBytes ?? readMaxBytesFromEnv() ?? DEFAULT_MAX_BYTES;
+  const projectRoot = opts.projectRoot;
+  const entries = [];
+  const errors = [];
+  for (const [i, item] of items.entries()) {
+    const where = `carry[${String(i)}]`;
+    try {
+      const entry = await resolveOne(item, { projectRoot, home, cap, where });
+      entries.push(entry);
+    } catch (err) {
+      errors.push(err instanceof Error ? err.message : String(err));
+    }
+  }
+  return { entries, errors };
+}
+function readMaxBytesFromEnv() {
+  const raw = process.env.AGENTBOX_CARRY_MAX_BYTES;
+  if (!raw) return void 0;
+  const n = Number(raw);
+  if (!Number.isFinite(n) || n <= 0) return void 0;
+  return Math.floor(n);
+}
+async function resolveOne(item, ctx) {
+  const absSrc = expandHostPath(item.src, ctx);
+  if (containsDotDot(absSrc)) {
+    throw new Error(`${ctx.where}: resolved src "${absSrc}" contains .. \u2014 refused`);
+  }
+  validateBoxDest(item.dest, ctx);
+  const optional = item.optional;
+  const rawSrc = item.src;
+  const rawDest = item.dest;
+  const absDest = item.dest;
+  let st;
+  try {
+    st = await stat2(absSrc);
+  } catch (err) {
+    if (err.code === "ENOENT") {
+      if (optional) {
+        return {
+          rawSrc,
+          rawDest,
+          absSrc,
+          absDest,
+          kind: "missing",
+          ...item.mode !== void 0 ? { mode: item.mode } : {},
+          ...item.user !== void 0 ? { user: item.user } : {},
+          optional: true
+        };
+      }
+      throw new Error(`${ctx.where}: host src "${absSrc}" does not exist (use optional: true to skip)`);
+    }
+    throw err;
+  }
+  let symlinkInfo;
+  try {
+    const real = await realpath(absSrc);
+    if (real !== absSrc) {
+      const homeReal = await realpathSafe(ctx.home);
+      const rootReal = await realpathSafe(ctx.projectRoot);
+      if (!isInside(real, homeReal) && !isInside(real, rootReal)) {
+        symlinkInfo = "outside-home";
+      } else {
+        symlinkInfo = "safe";
+      }
+    }
+  } catch {
+  }
+  if (st.isDirectory()) {
+    const bytes = await dirSizeCapped(absSrc, ctx.cap);
+    if (bytes > ctx.cap) {
+      throw new Error(
+        `${ctx.where}: dir "${absSrc}" exceeds ${String(ctx.cap)} bytes (set AGENTBOX_CARRY_MAX_BYTES to raise the cap or narrow the path)`
+      );
+    }
+    return {
+      rawSrc,
+      rawDest,
+      absSrc,
+      absDest,
+      kind: "dir",
+      bytes,
+      ...item.mode !== void 0 ? { mode: item.mode } : {},
+      ...item.user !== void 0 ? { user: item.user } : {},
+      optional,
+      ...symlinkInfo ? { symlinkInfo } : {}
+    };
+  }
+  if (st.isFile()) {
+    if (st.size > ctx.cap) {
+      throw new Error(
+        `${ctx.where}: file "${absSrc}" is ${String(st.size)} bytes, exceeds cap ${String(ctx.cap)} (set AGENTBOX_CARRY_MAX_BYTES to raise)`
+      );
+    }
+    return {
+      rawSrc,
+      rawDest,
+      absSrc,
+      absDest,
+      kind: "file",
+      bytes: st.size,
+      ...item.mode !== void 0 ? { mode: item.mode } : {},
+      ...item.user !== void 0 ? { user: item.user } : {},
+      optional,
+      ...symlinkInfo ? { symlinkInfo } : {}
+    };
+  }
+  throw new Error(`${ctx.where}: src "${absSrc}" is neither a regular file nor a directory`);
+}
+function expandHostPath(src, ctx) {
+  if (src.startsWith("~/")) {
+    return resolve(ctx.home, src.slice(2));
+  }
+  if (src.startsWith("./")) {
+    return resolve(ctx.projectRoot, src.slice(2));
+  }
+  if (isAbsolute(src)) return resolve(src);
+  throw new Error(`${ctx.where}: src "${src}" must start with /, ~/, or ./`);
+}
+function containsDotDot(p) {
+  const segs = normalize(p).split("/");
+  return segs.some((s) => s === "..");
+}
+function validateBoxDest(dest, ctx) {
+  if (dest.length === 0) {
+    throw new Error(`${ctx.where}.dest must not be empty`);
+  }
+  if (!dest.startsWith("/") && !dest.startsWith("~/")) {
+    throw new Error(`${ctx.where}.dest "${dest}" must start with / or ~/`);
+  }
+  const rawTail = dest.startsWith("~/") ? dest.slice(2) : dest.slice(1);
+  if (rawTail.split("/").some((s) => s === "..")) {
+    throw new Error(`${ctx.where}.dest "${dest}" contains .. \u2014 refused`);
+  }
+  if (DENYLIST_DEST_EXACT.has(dest)) {
+    throw new Error(`${ctx.where}.dest "${dest}" is on the denylist`);
+  }
+  for (const p of DENYLIST_DEST_PREFIXES) {
+    if (dest === p || dest.startsWith(`${p}/`)) {
+      throw new Error(`${ctx.where}.dest "${dest}" is on the denylist (prefix ${p})`);
+    }
+  }
+}
+function isInside(child, parent) {
+  const c = resolve(child);
+  const p = resolve(parent);
+  if (c === p) return true;
+  return c.startsWith(p + "/");
+}
+async function realpathSafe(p) {
+  try {
+    return await realpath(p);
+  } catch {
+    return resolve(p);
+  }
+}
+async function dirSizeCapped(dir, cap) {
+  let total = 0;
+  const seen = /* @__PURE__ */ new Set();
+  async function walk(d) {
+    if (total > cap) return;
+    const { readdir: readdir3 } = await import("fs/promises");
+    let names;
+    try {
+      names = await readdir3(d);
+    } catch {
+      return;
+    }
+    for (const name of names) {
+      if (total > cap) return;
+      const full = join3(d, name);
+      let st;
+      try {
+        st = await stat2(full);
+      } catch {
+        continue;
+      }
+      const key = `${String(st.dev)}:${String(st.ino)}`;
+      if (seen.has(key)) continue;
+      seen.add(key);
+      if (st.isDirectory()) {
+        await walk(full);
+      } else if (st.isFile()) {
+        total += st.size;
+        if (total > cap) return;
+      }
+    }
+  }
+  await walk(dir);
+  return total;
+}
+
+// src/lib/carry-resync.ts
+async function resyncCarryFiles(args) {
+  const log45 = args.onLog ?? (() => {
+  });
+  const prior = args.box.carry?.entries ?? [];
+  if (prior.length === 0) return { recopied: 0, skippedNew: 0 };
+  const items = await loadCarrySection(join4(args.projectRoot, "agentbox.yaml"));
+  if (items.length === 0) return { recopied: 0, skippedNew: 0 };
+  const resolved = await resolveCarry(items, { projectRoot: args.projectRoot });
+  if (resolved.errors.length > 0) {
+    log45(`carry: resync skipped (resolve errors: ${resolved.errors.length})`);
+    return { recopied: 0, skippedNew: 0 };
+  }
+  const priorByDest = new Map(prior.map((e) => [e.dest, e]));
+  const changed = [];
+  let skippedNew = 0;
+  for (const entry of resolved.entries) {
+    if (entry.kind === "missing") continue;
+    const existing = priorByDest.get(entry.absDest);
+    if (!existing) {
+      skippedNew += 1;
+      continue;
+    }
+    const hash = await carrySourceHash(entry);
+    if (hash === void 0 || hash !== existing.hash) changed.push(entry);
+  }
+  if (skippedNew > 0) {
+    log45(
+      `carry: ${String(skippedNew)} new entry/entries not applied on resync \u2014 recreate the box to approve`
+    );
+  }
+  if (changed.length === 0) return { recopied: 0, skippedNew };
+  const result = await copyCarryPathsToBox({
+    container: args.box.container,
+    entries: changed,
+    onLog: log45
+  });
+  for (const err of result.errors) log45(`carry: ${err}`);
+  const updatedByDest = new Map(result.applied.map((e) => [e.dest, e]));
+  const mergedEntries = prior.map((e) => updatedByDest.get(e.dest) ?? e);
+  await recordBox({
+    ...args.box,
+    carry: { count: mergedEntries.length, entries: mergedEntries }
+  });
+  if (result.applied.length > 0) {
+    log45(`carry: re-copied ${String(result.applied.length)} changed file(s)`);
+  }
+  return { recopied: result.applied.length, skippedNew };
+}
+
+// src/lib/resync-warning.ts
+function repoRelative(containerPath, file) {
+  const base = containerPath.replace(/^\/workspace\/?/, "");
+  return base ? `${base}/${file}` : file;
+}
+function buildResyncWarning(r) {
+  if (!r.hadConflicts) return null;
+  const files = [];
+  for (const repo of r.repos) {
+    for (const f of repo.mergeConflicts) files.push(repoRelative(repo.containerPath, f));
+    for (const f of repo.overlaySkipped) files.push(repoRelative(repo.containerPath, f));
+  }
+  const unique = [...new Set(files)];
+  if (unique.length === 0) return null;
+  return "[agentbox] I synced this box with the host's latest workspace (new commits + the host's uncommitted/untracked changes). These files had conflicting host changes that I SKIPPED to keep your box's version \u2014 review them if the host edits matter:\n" + unique.map((f) => `  - ${f}`).join("\n");
+}
+function prependResyncWarning(warning, prompt) {
+  if (!warning) return prompt;
+  return prompt.length > 0 ? `${warning}
+
+${prompt}` : warning;
+}
+
+// src/lib/resync-start.ts
+async function maybeResyncWorkspace(args) {
+  if (!args.enabled) return null;
+  if ((args.box.provider ?? "docker") !== "docker") return null;
+  const onLog = (line) => args.spinner?.message(line);
+  args.spinner?.message("resyncing workspace with host");
+  const result = await resyncBox(args.box.id, onLog);
+  await resyncCarryFiles({ box: args.box, projectRoot: args.projectRoot, onLog });
+  return buildResyncWarning(result);
+}
+
 // src/lib/skip-permissions.ts
 var CLAUDE_SKIP_PERMISSIONS_FLAG = "--dangerously-skip-permissions";
 var CODEX_SKIP_PERMISSIONS_FLAG = "--dangerously-bypass-approvals-and-sandbox";
@@ -867,7 +1170,7 @@ function makeProgressReporter(verbose) {
 }
 
 // src/lib/launch-recap.ts
-import { homedir as homedir2 } from "os";
+import { homedir as homedir3 } from "os";
 import { note } from "@clack/prompts";
 
 // src/lib/from-branch.ts
@@ -964,7 +1267,7 @@ async function resolveBranchSelection(opts) {
 
 // src/lib/launch-recap.ts
 function homeShorten(p) {
-  const home = homedir2();
+  const home = homedir3();
   return p === home || p.startsWith(home + "/") ? "~" + p.slice(home.length) : p;
 }
 function whiten(text) {
@@ -1044,7 +1347,8 @@ async function cloudAgentCreate(args) {
 }
 
 // src/lib/carry-gate.ts
-import { join as join4 } from "path";
+import { join as join5 } from "path";
+import { log as log5 } from "@clack/prompts";
 
 // src/carry-prompt.ts
 import { isCancel, log as log4, select } from "@clack/prompts";
@@ -1138,211 +1442,11 @@ function pad(s, w) {
   return s + " ".repeat(w - s.length);
 }
 
-// src/lib/carry-resolve.ts
-import { realpath, stat as stat2 } from "fs/promises";
-import { homedir as homedir3 } from "os";
-import { isAbsolute, join as join3, normalize, resolve } from "path";
-var DEFAULT_MAX_BYTES = 50 * 1024 * 1024;
-var DENYLIST_DEST_PREFIXES = ["/proc", "/sys", "/dev"];
-var DENYLIST_DEST_EXACT = /* @__PURE__ */ new Set(["/etc/passwd", "/etc/shadow"]);
-async function resolveCarry(items, opts) {
-  const home = opts.homeDir ?? homedir3();
-  const cap = opts.maxBytes ?? readMaxBytesFromEnv() ?? DEFAULT_MAX_BYTES;
-  const projectRoot = opts.projectRoot;
-  const entries = [];
-  const errors = [];
-  for (const [i, item] of items.entries()) {
-    const where = `carry[${String(i)}]`;
-    try {
-      const entry = await resolveOne(item, { projectRoot, home, cap, where });
-      entries.push(entry);
-    } catch (err) {
-      errors.push(err instanceof Error ? err.message : String(err));
-    }
-  }
-  return { entries, errors };
-}
-function readMaxBytesFromEnv() {
-  const raw = process.env.AGENTBOX_CARRY_MAX_BYTES;
-  if (!raw) return void 0;
-  const n = Number(raw);
-  if (!Number.isFinite(n) || n <= 0) return void 0;
-  return Math.floor(n);
-}
-async function resolveOne(item, ctx) {
-  const absSrc = expandHostPath(item.src, ctx);
-  if (containsDotDot(absSrc)) {
-    throw new Error(`${ctx.where}: resolved src "${absSrc}" contains .. \u2014 refused`);
-  }
-  validateBoxDest(item.dest, ctx);
-  const optional = item.optional;
-  const rawSrc = item.src;
-  const rawDest = item.dest;
-  const absDest = item.dest;
-  let st;
-  try {
-    st = await stat2(absSrc);
-  } catch (err) {
-    if (err.code === "ENOENT") {
-      if (optional) {
-        return {
-          rawSrc,
-          rawDest,
-          absSrc,
-          absDest,
-          kind: "missing",
-          ...item.mode !== void 0 ? { mode: item.mode } : {},
-          ...item.user !== void 0 ? { user: item.user } : {},
-          optional: true
-        };
-      }
-      throw new Error(`${ctx.where}: host src "${absSrc}" does not exist (use optional: true to skip)`);
-    }
-    throw err;
-  }
-  let symlinkInfo;
-  try {
-    const real = await realpath(absSrc);
-    if (real !== absSrc) {
-      const homeReal = await realpathSafe(ctx.home);
-      const rootReal = await realpathSafe(ctx.projectRoot);
-      if (!isInside(real, homeReal) && !isInside(real, rootReal)) {
-        symlinkInfo = "outside-home";
-      } else {
-        symlinkInfo = "safe";
-      }
-    }
-  } catch {
-  }
-  if (st.isDirectory()) {
-    const bytes = await dirSizeCapped(absSrc, ctx.cap);
-    if (bytes > ctx.cap) {
-      throw new Error(
-        `${ctx.where}: dir "${absSrc}" exceeds ${String(ctx.cap)} bytes (set AGENTBOX_CARRY_MAX_BYTES to raise the cap or narrow the path)`
-      );
-    }
-    return {
-      rawSrc,
-      rawDest,
-      absSrc,
-      absDest,
-      kind: "dir",
-      bytes,
-      ...item.mode !== void 0 ? { mode: item.mode } : {},
-      ...item.user !== void 0 ? { user: item.user } : {},
-      optional,
-      ...symlinkInfo ? { symlinkInfo } : {}
-    };
-  }
-  if (st.isFile()) {
-    if (st.size > ctx.cap) {
-      throw new Error(
-        `${ctx.where}: file "${absSrc}" is ${String(st.size)} bytes, exceeds cap ${String(ctx.cap)} (set AGENTBOX_CARRY_MAX_BYTES to raise)`
-      );
-    }
-    return {
-      rawSrc,
-      rawDest,
-      absSrc,
-      absDest,
-      kind: "file",
-      bytes: st.size,
-      ...item.mode !== void 0 ? { mode: item.mode } : {},
-      ...item.user !== void 0 ? { user: item.user } : {},
-      optional,
-      ...symlinkInfo ? { symlinkInfo } : {}
-    };
-  }
-  throw new Error(`${ctx.where}: src "${absSrc}" is neither a regular file nor a directory`);
-}
-function expandHostPath(src, ctx) {
-  if (src.startsWith("~/")) {
-    return resolve(ctx.home, src.slice(2));
-  }
-  if (src.startsWith("./")) {
-    return resolve(ctx.projectRoot, src.slice(2));
-  }
-  if (isAbsolute(src)) return resolve(src);
-  throw new Error(`${ctx.where}: src "${src}" must start with /, ~/, or ./`);
-}
-function containsDotDot(p) {
-  const segs = normalize(p).split("/");
-  return segs.some((s) => s === "..");
-}
-function validateBoxDest(dest, ctx) {
-  if (dest.length === 0) {
-    throw new Error(`${ctx.where}.dest must not be empty`);
-  }
-  if (!dest.startsWith("/") && !dest.startsWith("~/")) {
-    throw new Error(`${ctx.where}.dest "${dest}" must start with / or ~/`);
-  }
-  const rawTail = dest.startsWith("~/") ? dest.slice(2) : dest.slice(1);
-  if (rawTail.split("/").some((s) => s === "..")) {
-    throw new Error(`${ctx.where}.dest "${dest}" contains .. \u2014 refused`);
-  }
-  if (DENYLIST_DEST_EXACT.has(dest)) {
-    throw new Error(`${ctx.where}.dest "${dest}" is on the denylist`);
-  }
-  for (const p of DENYLIST_DEST_PREFIXES) {
-    if (dest === p || dest.startsWith(`${p}/`)) {
-      throw new Error(`${ctx.where}.dest "${dest}" is on the denylist (prefix ${p})`);
-    }
-  }
-}
-function isInside(child, parent) {
-  const c = resolve(child);
-  const p = resolve(parent);
-  if (c === p) return true;
-  return c.startsWith(p + "/");
-}
-async function realpathSafe(p) {
-  try {
-    return await realpath(p);
-  } catch {
-    return resolve(p);
-  }
-}
-async function dirSizeCapped(dir, cap) {
-  let total = 0;
-  const seen = /* @__PURE__ */ new Set();
-  async function walk(d) {
-    if (total > cap) return;
-    const { readdir: readdir3 } = await import("fs/promises");
-    let names;
-    try {
-      names = await readdir3(d);
-    } catch {
-      return;
-    }
-    for (const name of names) {
-      if (total > cap) return;
-      const full = join3(d, name);
-      let st;
-      try {
-        st = await stat2(full);
-      } catch {
-        continue;
-      }
-      const key = `${String(st.dev)}:${String(st.ino)}`;
-      if (seen.has(key)) continue;
-      seen.add(key);
-      if (st.isDirectory()) {
-        await walk(full);
-      } else if (st.isFile()) {
-        total += st.size;
-        if (total > cap) return;
-      }
-    }
-  }
-  await walk(dir);
-  return total;
-}
-
 // src/lib/carry-gate.ts
 async function runCarryGate(args) {
-  const log44 = args.onLog ?? (() => {
+  const emit = args.onLog ?? (() => {
   });
-  const yamlPath = join4(args.projectRoot, "agentbox.yaml");
+  const yamlPath = join5(args.projectRoot, "agentbox.yaml");
   const items = await loadCarrySection(yamlPath);
   if (items.length === 0) return { decision: "approve", entries: [] };
   const resolved = await resolveCarry(items, { projectRoot: args.projectRoot });
@@ -1362,17 +1466,38 @@ async function runCarryGate(args) {
   });
   if (decision === "cancel") return { decision: "cancel" };
   if (decision === "skip-this-run") {
-    log44(`carry: skipped for this box (${String(resolved.entries.length)} entry/entries not copied)`);
+    emit(`carry: skipped for this box (${String(resolved.entries.length)} entry/entries not copied)`);
     return { decision: "skip", entries: [] };
   }
   return { decision: "approve", entries: resolved.entries };
 }
+async function runQueuedCarryGate(args) {
+  try {
+    const gate = await runCarryGate({
+      projectRoot: args.projectRoot,
+      yes: !!args.opts.yes,
+      carryYesFlag: args.opts.carryYes ? true : void 0,
+      carrySkipFlag: args.opts.carry === "skip" ? true : void 0,
+      onLog: args.onLog
+    });
+    if (gate.decision === "cancel") {
+      log5.warn("carry: cancelled \u2014 not queuing the job");
+      args.onClose?.();
+      process.exit(0);
+    }
+    return gate.decision === "approve" ? gate.entries : [];
+  } catch (err) {
+    log5.error(err instanceof Error ? err.message : String(err));
+    args.onClose?.();
+    process.exit(1);
+  }
+}
 
 // src/session-teleport/claude.ts
 import { mkdir, mkdtemp, readdir, readFile as readFile2, stat as stat3, writeFile } from "fs/promises";
 import { existsSync } from "fs";
 import { homedir as homedir4, tmpdir } from "os";
-import { join as join5 } from "path";
+import { join as join6 } from "path";
 
 // src/session-teleport/cwd-encoding.ts
 function encodeClaudeProjectsDir(absPath) {
@@ -1393,7 +1518,7 @@ var TeleportError = class extends Error {
 var BOX_CLAUDE_PROJECTS_DIR = `/home/vscode/.claude/projects/${BOX_WORKSPACE_ENCODED}`;
 async function resolveClaudeTeleport(opts) {
   const hostHome = opts.hostHome ?? homedir4();
-  const projectDir = join5(
+  const projectDir = join6(
     hostHome,
     ".claude",
     "projects",
@@ -1406,8 +1531,8 @@ async function resolveClaudeTeleport(opts) {
   }
   const sessionPath = await pickSessionFile(projectDir, opts.mode);
   const sessionId = sessionPath.replace(/\.jsonl$/u, "").split("/").pop() ?? "";
-  const stage = await mkdtemp(join5(tmpdir(), "agentbox-teleport-claude-"));
-  const stagedFile = join5(stage, `${sessionId}.jsonl`);
+  const stage = await mkdtemp(join6(tmpdir(), "agentbox-teleport-claude-"));
+  const stagedFile = join6(stage, `${sessionId}.jsonl`);
   await rewriteSessionFile(sessionPath, stagedFile, opts.hostCwd);
   opts.log?.(`teleport: claude session ${sessionId} staged for upload`);
   return {
@@ -1421,7 +1546,7 @@ async function resolveClaudeTeleport(opts) {
 }
 async function pickSessionFile(projectDir, mode) {
   if (mode.kind === "resume") {
-    const target = join5(projectDir, `${mode.id}.jsonl`);
+    const target = join6(projectDir, `${mode.id}.jsonl`);
     if (!existsSync(target)) {
       throw new TeleportError(
         `Claude session "${mode.id}" not found in ${projectDir}. List available sessions with: ls "${projectDir}"`
@@ -1438,7 +1563,7 @@ async function pickSessionFile(projectDir, mode) {
   }
   const stats = await Promise.all(
     jsonl.map(async (name) => {
-      const full = join5(projectDir, name);
+      const full = join6(projectDir, name);
       const s = await stat3(full);
       return { full, mtimeMs: s.mtimeMs };
     })
@@ -1472,7 +1597,7 @@ async function rewriteSessionFile(src, dst, hostCwd) {
     }
     out.push(line);
   }
-  await mkdir(join5(dst, ".."), { recursive: true });
+  await mkdir(join6(dst, ".."), { recursive: true });
   await writeFile(dst, out.join("\n"), "utf8");
 }
 
@@ -1480,10 +1605,10 @@ async function rewriteSessionFile(src, dst, hostCwd) {
 import { mkdtemp as mkdtemp2, readdir as readdir2, readFile as readFile3, stat as stat4, writeFile as writeFile2 } from "fs/promises";
 import { existsSync as existsSync2 } from "fs";
 import { homedir as homedir5, tmpdir as tmpdir2 } from "os";
-import { join as join6 } from "path";
+import { join as join7 } from "path";
 async function resolveCodexTeleport(opts) {
   const hostHome = opts.hostHome ?? homedir5();
-  const sessionsRoot = join6(hostHome, ".codex", "sessions");
+  const sessionsRoot = join7(hostHome, ".codex", "sessions");
   if (!existsSync2(sessionsRoot)) {
     throw new TeleportError(
       `no Codex session history found on the host (expected at ${sessionsRoot}). Run \`codex\` at least once before using -c / --resume.`
@@ -1525,8 +1650,8 @@ async function resolveCodexTeleport(opts) {
     matching.sort((a, b) => b.mtimeMs - a.mtimeMs);
     picked = matching[0];
   }
-  const stage = await mkdtemp2(join6(tmpdir2(), "agentbox-teleport-codex-"));
-  const stagedFile = join6(stage, posixBasename(picked.relPath));
+  const stage = await mkdtemp2(join7(tmpdir2(), "agentbox-teleport-codex-"));
+  const stagedFile = join7(stage, posixBasename(picked.relPath));
   await rewriteCodexSession(picked.hostPath, stagedFile, opts.hostCwd);
   opts.log?.(`teleport: codex session ${picked.uuid} staged for upload`);
   const boxParentDir = `/home/vscode/.codex/sessions/${posixDirname(picked.relPath)}`;
@@ -1552,21 +1677,21 @@ async function listCodexSessions(sessionsRoot) {
   const years = await safeReaddir(sessionsRoot);
   for (const y of years) {
     if (!/^\d{4}$/u.test(y)) continue;
-    const yDir = join6(sessionsRoot, y);
+    const yDir = join7(sessionsRoot, y);
     const months = await safeReaddir(yDir);
     for (const m of months) {
       if (!/^\d{2}$/u.test(m)) continue;
-      const mDir = join6(yDir, m);
+      const mDir = join7(yDir, m);
       const days = await safeReaddir(mDir);
       for (const d of days) {
         if (!/^\d{2}$/u.test(d)) continue;
-        const dDir = join6(mDir, d);
+        const dDir = join7(mDir, d);
         const files = await safeReaddir(dDir);
         for (const name of files) {
           if (!name.startsWith("rollout-") || !name.endsWith(".jsonl")) continue;
           const uuid = extractCodexUuid(name);
           if (uuid === null) continue;
-          const hostPath = join6(dDir, name);
+          const hostPath = join7(dDir, name);
           let mtimeMs = 0;
           try {
             mtimeMs = (await stat4(hostPath)).mtimeMs;
@@ -1688,39 +1813,76 @@ async function uploadTeleport(input) {
   );
 }
 
+// src/session-teleport/plan.ts
+import { mkdtemp as mkdtemp3, readFile as readFile4, writeFile as writeFile3 } from "fs/promises";
+import { existsSync as existsSync3 } from "fs";
+import { homedir as homedir6, tmpdir as tmpdir3 } from "os";
+import { basename, isAbsolute as isAbsolute2, join as join8, resolve as resolve2 } from "path";
+var BOX_CLAUDE_PLANS_DIR = "/home/vscode/.claude/plans";
+function expandHome(p, hostHome) {
+  if (p === "~") return hostHome;
+  if (p.startsWith("~/")) return join8(hostHome, p.slice(2));
+  return isAbsolute2(p) ? p : resolve2(p);
+}
+async function resolvePlanTeleport(opts) {
+  const hostHome = opts.hostHome ?? homedir6();
+  const planFile = expandHome(opts.planPath, hostHome);
+  if (!existsSync3(planFile)) {
+    throw new TeleportError(
+      `plan file not found on the host: ${planFile}. Pass --plan with the path to a Claude Code plan (e.g. ~/.claude/plans/<slug>.md).`
+    );
+  }
+  const name = basename(planFile);
+  const stage = await mkdtemp3(join8(tmpdir3(), "agentbox-teleport-plan-"));
+  const stagedFile = join8(stage, name);
+  const raw = await readFile4(planFile, "utf8");
+  const absCwd = opts.hostCwd ? resolve2(expandHome(opts.hostCwd, hostHome)) : "";
+  const rewritten = absCwd ? raw.split(absCwd).join(BOX_WORKSPACE) : raw;
+  await writeFile3(stagedFile, rewritten, "utf8");
+  opts.log?.(`teleport: claude plan ${name} staged for upload`);
+  return {
+    agent: "claude",
+    sessionId: name,
+    hostFile: stagedFile,
+    boxPath: `${BOX_CLAUDE_PLANS_DIR}/${name}`,
+    boxParentDir: BOX_CLAUDE_PLANS_DIR,
+    forwardArgs: []
+  };
+}
+
 // src/lib/install-hint.ts
-import { log as log5 } from "@clack/prompts";
-import { existsSync as existsSync3, mkdirSync, writeFileSync } from "fs";
-import { homedir as homedir6 } from "os";
-import { join as join7 } from "path";
+import { log as log6 } from "@clack/prompts";
+import { existsSync as existsSync4, mkdirSync, writeFileSync } from "fs";
+import { homedir as homedir7 } from "os";
+import { join as join9 } from "path";
 function maybeShowInstallHint() {
   try {
-    const skill = join7(homedir6(), ".claude", "skills", "agentbox", "SKILL.md");
-    if (existsSync3(skill)) return;
-    const marker = join7(homedir6(), ".agentbox", "install-hint-shown");
-    if (existsSync3(marker)) return;
-    mkdirSync(join7(homedir6(), ".agentbox"), { recursive: true });
+    const skill = join9(homedir7(), ".claude", "skills", "agentbox", "SKILL.md");
+    if (existsSync4(skill)) return;
+    const marker = join9(homedir7(), ".agentbox", "install-hint-shown");
+    if (existsSync4(marker)) return;
+    mkdirSync(join9(homedir7(), ".agentbox"), { recursive: true });
     writeFileSync(marker, "");
-    log5.info("tip: run 'agentbox install' to enable the /agentbox fork command in host Claude");
+    log6.info("tip: run 'agentbox install' to enable the /agentbox fork command in host Claude");
   } catch {
   }
 }
 
 // src/lib/log-file.ts
 import { closeSync, mkdirSync as mkdirSync2, openSync, renameSync, symlinkSync, unlinkSync, writeFileSync as writeFileSync2, writeSync } from "fs";
-import { homedir as homedir7 } from "os";
-import { join as join8 } from "path";
+import { homedir as homedir8 } from "os";
+import { join as join10 } from "path";
 function stateDir() {
-  return process.env.AGENTBOX_HOME ?? join8(homedir7(), ".agentbox");
+  return process.env.AGENTBOX_HOME ?? join10(homedir8(), ".agentbox");
 }
 function logsDir() {
-  return join8(stateDir(), "logs");
+  return join10(stateDir(), "logs");
 }
 function openCommandLog(command) {
   const dir = logsDir();
   mkdirSync2(dir, { recursive: true });
-  const path = join8(dir, `${command}.log`);
-  const prev = join8(dir, `${command}.log.prev`);
+  const path = join10(dir, `${command}.log`);
+  const prev = join10(dir, `${command}.log.prev`);
   try {
     renameSync(path, prev);
   } catch {
@@ -1780,7 +1942,7 @@ function openCommandLog(command) {
   };
 }
 function updateLatestSymlink(dir, target) {
-  const link = join8(dir, "latest.log");
+  const link = join10(dir, "latest.log");
   try {
     unlinkSync(link);
   } catch {
@@ -1835,7 +1997,7 @@ function resolveLimits(box, flags) {
 }
 
 // src/portless-prompt.ts
-import { confirm, isCancel as isCancel2, log as log6, spinner as spinner2 } from "@clack/prompts";
+import { confirm, isCancel as isCancel2, log as log7, spinner as spinner2 } from "@clack/prompts";
 async function setupPortlessHost() {
   let state = await detectPortless();
   if (!state.installed) {
@@ -1845,13 +2007,13 @@ async function setupPortlessHost() {
     resetPortlessCache();
     s2.stop(ok ? "portless installed" : "portless install failed");
     if (!ok) {
-      log6.warn(`Could not install Portless \u2014 run \`${portlessInstallHint()}\` yourself.`);
+      log7.warn(`Could not install Portless \u2014 run \`${portlessInstallHint()}\` yourself.`);
       return;
     }
     state = await detectPortless();
   }
   if (state.proxyRunning) {
-    log6.info("Portless proxy already running \u2014 boxes will use it.");
+    log7.info("Portless proxy already running \u2014 boxes will use it.");
     return;
   }
   const s = spinner2();
@@ -1863,7 +2025,7 @@ async function setupPortlessHost() {
     s.stop("portless proxy started");
   } else {
     s.stop("portless proxy did not start");
-    log6.warn(`Could not start the Portless proxy \u2014 run \`${portlessStartHint()}\` yourself.`);
+    log7.warn(`Could not start the Portless proxy \u2014 run \`${portlessStartHint()}\` yourself.`);
   }
 }
 async function maybePromptPortless(args) {
@@ -1878,7 +2040,7 @@ async function maybePromptPortless(args) {
   try {
     await setConfigValue("global", "portless.enabled", answer, args.cwd, { raw: false });
   } catch (err) {
-    log6.warn(
+    log7.warn(
       `Could not save the Portless preference: ${err instanceof Error ? err.message : String(err)}`
     );
   }
@@ -1887,43 +2049,83 @@ async function maybePromptPortless(args) {
 }
 
 // src/wizard.ts
-import { confirm as confirm2, isCancel as isCancel3, log as log7, multiselect } from "@clack/prompts";
-import { basename } from "path";
+import { confirm as confirm2, isCancel as isCancel3, log as log8, multiselect } from "@clack/prompts";
+import { basename as basename2 } from "path";
 
 // src/provider/cloud-backend.ts
 async function cloudBackendForProvider(provider) {
   switch (provider) {
     case "daytona":
-      return (await import("./dist-PTJ6CEQY.js")).daytonaBackend;
+      return (await import("./dist-47LVLYUV.js")).daytonaBackend;
     case "hetzner":
-      return (await import("./dist-WMQDMTWS.js")).hetznerBackend;
+      return (await import("./dist-SWUOU34W.js")).hetznerBackend;
     case "vercel":
-      return (await import("./dist-RAZP76VX.js")).vercelBackend;
+      return (await import("./dist-24PY2ZMO.js")).vercelBackend;
     default:
       return null;
   }
 }
 
 // src/checkpoint-lookup.ts
-async function checkpointExistsForProvider(provider, projectRoot, ref) {
-  if (provider === "docker") {
-    return await resolveCheckpoint(projectRoot, ref) !== null;
+function short(sha) {
+  return sha.slice(0, 12);
+}
+async function evaluateDockerCheckpoint(projectRoot, ref) {
+  const head = await resolveCheckpoint(projectRoot, ref);
+  if (!head) return { state: "missing" };
+  if (!await imageExists(head.manifest.image)) return { state: "missing" };
+  const fp = head.manifest.baseFingerprint;
+  if (head.manifest.schema === 2 || !fp) {
+    return {
+      state: "stale",
+      reason: "captured before checkpoint versioning; base image unverifiable"
+    };
   }
-  if (await resolveCloudCheckpoint(projectRoot, provider, ref) === null) return false;
+  const current = readPreparedDockerState()?.base?.contextSha256 ?? (await computeDockerContextFingerprint())?.contextSha256;
+  if (current && fp !== current) {
+    return {
+      state: "stale",
+      reason: `base image updated since capture (captured ${short(fp)}, current ${short(current)})`
+    };
+  }
+  return { state: "fresh" };
+}
+async function evaluateCloudCheckpoint(provider, projectRoot, ref) {
+  const found = await resolveCloudCheckpoint(projectRoot, provider, ref);
+  if (!found) return { state: "missing" };
   try {
     const backend = await cloudBackendForProvider(provider);
-    if (!backend) return true;
-    const { live } = await probeCloudCheckpoint(backend, projectRoot, ref);
-    return live;
+    if (backend) {
+      const { live } = await probeCloudCheckpoint(backend, projectRoot, ref);
+      if (!live) return { state: "missing" };
+    }
   } catch {
-    return true;
   }
+  const fp = found.manifest.baseFingerprint;
+  if (found.manifest.schema < 2 || !fp) {
+    return {
+      state: "stale",
+      reason: "captured before checkpoint versioning; base snapshot unverifiable"
+    };
+  }
+  const current = currentCloudBaseFingerprint(provider);
+  if (current && fp !== current) {
+    return {
+      state: "stale",
+      reason: `base snapshot updated since capture (captured ${short(fp)}, current ${short(current)})`
+    };
+  }
+  return { state: "fresh" };
+}
+async function evaluateCheckpoint(provider, projectRoot, ref) {
+  if (provider === "docker") return evaluateDockerCheckpoint(projectRoot, ref);
+  return evaluateCloudCheckpoint(provider, projectRoot, ref);
 }
 
 // src/wizard.ts
 var IN_BOX_SETUP_GUIDE_PATH = "/usr/local/share/agentbox/setup-guide.md";
 function buildSetupInitialPrompt(workspace) {
-  const name = basename(workspace);
+  const name = basename2(workspace);
   return `The user just opened a new agentbox sandbox for "${name}" but the workspace has no agentbox.yaml yet. Please run the /agentbox-setup skill (or read ${IN_BOX_SETUP_GUIDE_PATH} if the skill is not loaded), then explore /workspace and propose an agentbox.yaml. Save the file to /workspace/agentbox.yaml. Then run \`agentbox-ctl reload\` from inside the box so the already-running supervisor applies the new config and immediately runs the declared tasks and autostarts the services (no box restart needed). When done, summarise what services and tasks you declared, and remind the user how to land the file on the host (commit through the bind-mounted .git, or "agentbox download env" on the host).`;
 }
 var WIZARD_AUTOLAUNCH_ENV = "AGENTBOX_WIZARD_AUTOLAUNCH";
@@ -1933,25 +2135,37 @@ async function maybeRunSetupWizard(args) {
   if (process.env[WIZARD_AUTOLAUNCH_ENV] === "1") {
     if (args.command !== "claude") return { action: "proceed" };
     const envFiles = parseEnvFilesFromEnv(process.env[WIZARD_ENV_FILES_ENV]);
-    if (args.checkpointRef && await checkpointAppliesHere(args)) {
-      return { action: "proceed", envFilesToImport: envFiles };
-    }
     const proj2 = await findProjectRoot(args.workspace);
-    if (proj2.hasAgentboxYaml) return { action: "proceed", envFilesToImport: envFiles };
-    return {
-      action: "launch-with-prompt",
-      initialPrompt: buildSetupInitialPrompt(proj2.root),
-      envFilesToImport: envFiles
-    };
+    return nonInteractiveOutcome(args, proj2, await checkpointStatus(args, proj2.root), envFiles);
   }
-  if (args.yes) return { action: "proceed" };
-  if (!process.stdin.isTTY) return { action: "proceed" };
   const proj = await findProjectRoot(args.workspace);
-  if (proj.hasAgentboxYaml) return { action: "proceed" };
-  if (args.checkpointRef && await checkpointAppliesHere(args)) {
-    log7.info(`starting from checkpoint "${args.checkpointRef}"; skipping agentbox.yaml setup`);
+  const status = await checkpointStatus(args, proj.root);
+  if (args.yes || !process.stdin.isTTY) {
+    return nonInteractiveOutcome(args, proj, status, void 0);
+  }
+  const fromDefault = args.checkpointFromDefault !== false;
+  if (proj.hasAgentboxYaml) {
+    return { action: "proceed", discardCheckpoint: discardOnMissing(status, fromDefault) };
+  }
+  if (status.state === "fresh" || status.state === "stale" && !fromDefault) {
+    log8.info(`starting from checkpoint "${args.checkpointRef}"; skipping agentbox.yaml setup`);
     return { action: "proceed" };
   }
+  let discardCheckpoint = false;
+  let recreateChosen = false;
+  if (status.state === "stale" && fromDefault) {
+    const recreate = await confirm2({
+      message: `Snapshot "${args.checkpointRef}" is stale (${status.reason}). Start from base and run Setup Wizard? (No = use it anyway)`,
+      initialValue: true
+    });
+    if (isCancel3(recreate) || !recreate) {
+      return { action: "proceed" };
+    }
+    discardCheckpoint = true;
+    recreateChosen = true;
+  } else if (status.state === "missing") {
+    discardCheckpoint = discardOnMissing(status, fromDefault) ?? false;
+  }
   let envFilesToImport;
   if (!args.withEnv) {
     const found = await scanHostEnvFiles(proj.root, WIZARD_ENV_SCAN_PATTERNS);
@@ -1967,23 +2181,57 @@ async function maybeRunSetupWizard(args) {
       }
     }
   }
-  const go = await confirm2({
-    message: "New project: run setup wizard? Will install dependencies and setup agentbox.yaml",
-    initialValue: true
-  });
-  if (isCancel3(go) || !go) return { action: "proceed", envFilesToImport };
-  if (args.command === "create") return { action: "switch-to-claude", envFilesToImport };
+  if (!recreateChosen) {
+    const go = await confirm2({
+      message: "New project: run setup wizard? Will install dependencies and setup agentbox.yaml",
+      initialValue: true
+    });
+    if (isCancel3(go) || !go) {
+      return {
+        action: "proceed",
+        envFilesToImport,
+        discardCheckpoint: discardCheckpoint || void 0
+      };
+    }
+  }
+  if (args.command === "create") {
+    return {
+      action: "switch-to-claude",
+      envFilesToImport,
+      discardCheckpoint: discardCheckpoint || void 0
+    };
+  }
   return {
     action: "launch-with-prompt",
     initialPrompt: buildSetupInitialPrompt(proj.root),
-    envFilesToImport
+    envFilesToImport,
+    discardCheckpoint: discardCheckpoint || void 0
   };
 }
-async function checkpointAppliesHere(args) {
-  if (!args.checkpointRef) return false;
-  const proj = await findProjectRoot(args.workspace);
+async function checkpointStatus(args, projectRoot) {
+  if (!args.checkpointRef) return { state: "missing" };
   const provider = args.provider ?? "docker";
-  return checkpointExistsForProvider(provider, proj.root, args.checkpointRef);
+  return evaluateCheckpoint(provider, projectRoot, args.checkpointRef);
+}
+function discardOnMissing(status, fromDefault) {
+  return status.state === "missing" && fromDefault ? true : void 0;
+}
+function nonInteractiveOutcome(args, proj, status, envFilesToImport) {
+  const fromDefault = args.checkpointFromDefault !== false;
+  const usableAsIs = status.state === "fresh" || status.state === "stale" && !fromDefault;
+  const discardCheckpoint = fromDefault && (status.state === "missing" || status.state === "stale" && !proj.hasAgentboxYaml) ? true : void 0;
+  if (usableAsIs || proj.hasAgentboxYaml) {
+    return { action: "proceed", envFilesToImport, discardCheckpoint };
+  }
+  if (args.command === "claude") {
+    return {
+      action: "launch-with-prompt",
+      initialPrompt: buildSetupInitialPrompt(proj.root),
+      envFilesToImport,
+      discardCheckpoint
+    };
+  }
+  return { action: "proceed", envFilesToImport, discardCheckpoint };
 }
 function serializeEnvFilesForEnv(files) {
   if (!files || files.length === 0) return void 0;
@@ -2024,6 +2272,7 @@ function pickCreateOpts(opts) {
     withPlaywright: opts.withPlaywright,
     withEnv: opts.withEnv,
     vnc: opts.vnc,
+    resync: opts.resync,
     sharedDockerCache: opts.sharedDockerCache,
     portless: opts.portless,
     sessionName: opts.sessionName,
@@ -2038,7 +2287,7 @@ function logPrune(rebuild) {
   if (rebuild.prunedBytes <= 0) return;
   const mb = Math.round(rebuild.prunedBytes / 1024 / 1024);
   const n = rebuild.pruned.length;
-  log8.info(`pruned ${String(n)} stale plugin cache${n === 1 ? "" : "s"} (${String(mb)} MB freed)`);
+  log9.info(`pruned ${String(n)} stale plugin cache${n === 1 ? "" : "s"} (${String(mb)} MB freed)`);
 }
 var RELAY_HOST_URL = `http://127.0.0.1:${String(DEFAULT_RELAY_PORT)}`;
 async function attachClaudeWrapped(box, sessionName, reattach, onError, openIn) {
@@ -2102,7 +2351,7 @@ async function maybeRunClaudeLogin(args) {
   const message = args.authSource === "auth-file" ? "You're on a legacy API token (shows as 'Claude API'). Sign in with your Claude subscription instead?" : "Sign in with your Claude subscription? (saved and reused by every box)";
   const answer = await confirm3({ message, initialValue: true });
   if (isCancel4(answer) || !answer) {
-    log8.info("Skipped sign-in \u2014 claude will prompt you to /login inside the box.");
+    log9.info("Skipped sign-in \u2014 claude will prompt you to /login inside the box.");
     return;
   }
   const s = spinner3();
@@ -2116,10 +2365,10 @@ async function maybeRunClaudeLogin(args) {
   s.stop("image ready");
   const exitCode = await runClaudeLoginContainer(args.image, ["--claudeai"]);
   if (exitCode !== 0) {
-    log8.warn("Claude login did not complete; continuing \u2014 run `agentbox claude login` to retry.");
+    log9.warn("Claude login did not complete; continuing \u2014 run `agentbox claude login` to retry.");
     return;
   }
-  log8.success("Signed in with your Claude subscription \u2014 saved for future boxes.");
+  log9.success("Signed in with your Claude subscription \u2014 saved for future boxes.");
 }
 async function maybeRunCloudClaudeLogin(args) {
   if (!process.stdin.isTTY || args.yes) return;
@@ -2130,7 +2379,7 @@ async function maybeRunCloudClaudeLogin(args) {
   const message = expired ? "Your saved Claude login looks expired. Sign in again? (saved and reused by every box)" : "Sign in with your Claude subscription? (saved and reused by every box)";
   const answer = await confirm3({ message, initialValue: true });
   if (isCancel4(answer) || !answer) {
-    log8.info("Skipped sign-in \u2014 claude will prompt you to /login inside the box.");
+    log9.info("Skipped sign-in \u2014 claude will prompt you to /login inside the box.");
     return;
   }
   const s = spinner3();
@@ -2144,12 +2393,15 @@ async function maybeRunCloudClaudeLogin(args) {
   s.stop("image ready");
   const exitCode = await runClaudeLoginContainer(args.image, ["--claudeai"]);
   if (exitCode !== 0) {
-    log8.warn("Claude login did not complete; continuing \u2014 run `agentbox claude login` to retry.");
+    log9.warn("Claude login did not complete; continuing \u2014 run `agentbox claude login` to retry.");
     return;
   }
-  log8.success("Signed in with your Claude subscription \u2014 saved for future boxes.");
+  log9.success("Signed in with your Claude subscription \u2014 saved for future boxes.");
 }
-var claudeCommand = new Command2("claude").description("Create a sandboxed box and launch Claude Code in a detachable tmux session").option("-w, --workspace <path>", "host workspace to mount", process.cwd()).option("-n, --name <name>", "friendly box name (default: <workspace-basename>-<id>)").option("--host-snapshot", "APFS-clone the host workspace into a per-box scratch dir before seeding /workspace (stabilizes the tar-pipe source)").option("--no-host-snapshot", "tar-pipe directly from the live host workspace at create time").option(
+var claudeCommand = new Command2("claude").description("Create a sandboxed box and launch Claude Code in a detachable tmux session").option("-w, --workspace <path>", "host workspace to mount", process.cwd()).option("-n, --name <name>", "friendly box name (default: <workspace-basename>-<id>)").option(
+  "--host-snapshot",
+  "APFS-clone the host workspace into a per-box scratch dir before seeding /workspace (stabilizes the tar-pipe source)"
+).option("--no-host-snapshot", "tar-pipe directly from the live host workspace at create time").option(
   "--snapshot <ref>",
   "start from a project checkpoint (see `agentbox checkpoint`); overrides box.defaultCheckpoint"
 ).option("--image <ref>", "override the box image").option("-y, --yes", "skip prompts, accept defaults").option(
@@ -2172,15 +2424,15 @@ var claudeCommand = new Command2("claude").description("Create a sandboxed box a
   "--with-env",
   "copy host env/config files (.env*, secrets.toml, agentbox.yaml, ...) into /workspace at create time (gitignore-bypassing)"
 ).option("--no-vnc", "disable the per-box Xvnc + noVNC web client (on by default)").option(
+  "--no-resync",
+  "do not sync the box with the host on start (default: merge the host's current branch + overlay its uncommitted/untracked changes, keeping the box's version on conflict)"
+).option(
   "--shared-docker-cache",
   "use the shared 'agentbox-docker-cache' volume for in-box docker images (preserved on destroy; only one box can run at a time when set)"
 ).option(
   "--portless",
   "map the box web app to https://<name>.localhost via the Portless proxy (Docker Desktop)"
-).option("--no-portless", "do not register a Portless alias for this box").option("--session-name <name>", "tmux session name (default from config; built-in: claude)").option("--memory <size>", "memory ceiling (e.g. 512m, 2g); unset = unlimited").option("--cpus <n>", "CPU count cap (fractional ok, e.g. 1.5); unset = unlimited").option("--pids-limit <n>", "max process count (PIDs cgroup); unset = unlimited").option("--disk <size>", "best-effort writable-layer size (e.g. 10g); no-op on overlay2/macOS").option(
-  "--provider <name>",
-  "sandbox backend: 'docker' (default) or 'daytona' for a cloud box"
-).option(
+).option("--no-portless", "do not register a Portless alias for this box").option("--session-name <name>", "tmux session name (default from config; built-in: claude)").option("--memory <size>", "memory ceiling (e.g. 512m, 2g); unset = unlimited").option("--cpus <n>", "CPU count cap (fractional ok, e.g. 1.5); unset = unlimited").option("--pids-limit <n>", "max process count (PIDs cgroup); unset = unlimited").option("--disk <size>", "best-effort writable-layer size (e.g. 10g); no-op on overlay2/macOS").option("--provider <name>", "sandbox backend: 'docker' (default) or 'daytona' for a cloud box").option(
   "--from-branch <ref>",
   "base the box's per-box branch on this ref (branch / tag / SHA) instead of HEAD. Branch/tag names are fetched from origin first."
 ).option(
@@ -2204,6 +2456,9 @@ var claudeCommand = new Command2("claude").description("Create a sandboxed box a
 ).option(
   "--resume <id>",
   "teleport the specified host Claude Code session id into the box and resume from it"
+).option(
+  "--plan <path>",
+  'copy a Claude Code plan file (e.g. ~/.claude/plans/<slug>.md) into the box, launch claude with --permission-mode plan, and seed a "resume the plan" prompt'
 ).argument(
   "[claude-args...]",
   "extra args passed to claude inside the box; place after `--`, e.g. `agentbox claude -- --model sonnet`"
@@ -2214,14 +2469,23 @@ var claudeCommand = new Command2("claude").description("Create a sandboxed box a
   intro("Starting Claude in a box...");
   let resumeMode = null;
   if (opts.continue === true && opts.resume) {
-    log8.error("only one of -c / --continue / --resume can be passed");
+    log9.error("only one of -c / --continue / --resume can be passed");
     cmdLog.close();
     process.exit(2);
   }
   if (opts.continue === true) resumeMode = { kind: "continue" };
   else if (opts.resume) resumeMode = { kind: "resume", id: opts.resume };
   if (resumeMode && opts.initialPrompt && opts.initialPrompt.length > 0) {
-    log8.error("-i / --initial-prompt cannot be combined with -c / --resume (seeding a new turn into a resumed session is not supported).");
+    log9.error(
+      "-i / --initial-prompt cannot be combined with -c / --resume (seeding a new turn into a resumed session is not supported)."
+    );
+    cmdLog.close();
+    process.exit(2);
+  }
+  if (opts.plan && opts.initialPrompt && opts.initialPrompt.length > 0) {
+    log9.error(
+      '--plan cannot be combined with -i / --initial-prompt (--plan already seeds an interactive "resume the plan" turn).'
+    );
     cmdLog.close();
     process.exit(2);
   }
@@ -2236,7 +2500,24 @@ var claudeCommand = new Command2("claude").description("Create a sandboxed box a
       });
     } catch (err) {
       if (err instanceof TeleportError) {
-        log8.error(err.message);
+        log9.error(err.message);
+        cmdLog.close();
+        process.exit(2);
+      }
+      throw err;
+    }
+  }
+  let planPrepared = null;
+  if (opts.plan) {
+    try {
+      planPrepared = await resolvePlanTeleport({
+        planPath: opts.plan,
+        hostCwd: opts.workspace,
+        log: (line) => cmdLog.write(line)
+      });
+    } catch (err) {
+      if (err instanceof TeleportError) {
+        log9.error(err.message);
         cmdLog.close();
         process.exit(2);
       }
@@ -2257,7 +2538,7 @@ var claudeCommand = new Command2("claude").description("Create a sandboxed box a
       });
     } catch (err) {
       if (err instanceof MissingAgentCredsError) {
-        log8.error(err.message);
+        log9.error(err.message);
         cmdLog.close();
         process.exit(2);
       }
@@ -2265,13 +2546,19 @@ var claudeCommand = new Command2("claude").description("Create a sandboxed box a
     }
     const maxRunningOverride = parseMaxOption("--max-running", opts.maxRunning);
     const maxWorkingOverride = parseMaxOption("--max-working", opts.maxWorking);
+    const carryForQueue = await runQueuedCarryGate({
+      projectRoot,
+      opts,
+      onLog: (line) => cmdLog.write(line),
+      onClose: () => cmdLog.close()
+    });
     const result = await submitQueueJob({
       agent: "claude-code",
       boxName: opts.name ?? "",
       providerName,
       prompt: opts.initialPrompt,
       agentArgs: claudeArgs,
-      createOpts: pickCreateOpts(opts),
+      createOpts: { ...pickCreateOpts(opts), carry: carryForQueue },
       maxRunningOverride,
       maxWorkingOverride
     });
@@ -2315,13 +2602,13 @@ var claudeCommand = new Command2("claude").description("Create a sandboxed box a
       onLog: (line) => cmdLog.write(line)
     });
     if (gate.decision === "cancel") {
-      log8.warn("carry: cancelled \u2014 not creating the box");
+      log9.warn("carry: cancelled \u2014 not creating the box");
       cmdLog.close();
       process.exit(0);
     }
     if (gate.decision === "approve") carryEntries = gate.entries;
   } catch (err) {
-    log8.error(err instanceof Error ? err.message : String(err));
+    log9.error(err instanceof Error ? err.message : String(err));
     cmdLog.close();
     process.exit(1);
   }
@@ -2330,11 +2617,22 @@ var claudeCommand = new Command2("claude").description("Create a sandboxed box a
     yes: !!opts.yes,
     command: "claude",
     checkpointRef,
+    checkpointFromDefault: !(opts.snapshot && opts.snapshot.length > 0),
     provider: providerName,
     withEnv: cfg.effective.box.withEnv
   });
+  const effectiveCheckpointRef = wiz.discardCheckpoint ? void 0 : checkpointRef;
   let effectiveClaudeArgs = claudeArgs;
-  if (wiz.action === "launch-with-prompt" && wiz.initialPrompt) {
+  if (planPrepared) {
+    const hasPermissionMode = effectiveClaudeArgs.some(
+      (a) => a === "--permission-mode" || a.startsWith("--permission-mode=")
+    );
+    if (!hasPermissionMode) {
+      effectiveClaudeArgs = [...effectiveClaudeArgs, "--permission-mode", "plan"];
+    }
+    const planPrompt = `Resume the plan at ~/.claude/plans/${planPrepared.sessionId}`;
+    effectiveClaudeArgs = buildPromptArgs("claude-code", planPrompt, effectiveClaudeArgs);
+  } else if (wiz.action === "launch-with-prompt" && wiz.initialPrompt) {
     effectiveClaudeArgs = buildPromptArgs("claude-code", wiz.initialPrompt, claudeArgs);
   }
   effectiveClaudeArgs = applyClaudeSkipPermissions(effectiveClaudeArgs, cfg.effective);
@@ -2351,7 +2649,7 @@ var claudeCommand = new Command2("claude").description("Create a sandboxed box a
     }));
   } catch (err) {
     if (err instanceof FromBranchError || err instanceof UseBranchError) {
-      log8.error(err.message);
+      log9.error(err.message);
       cmdLog.close();
       process.exit(2);
     }
@@ -2365,7 +2663,7 @@ var claudeCommand = new Command2("claude").description("Create a sandboxed box a
       request: {
         workspacePath: opts.workspace,
         name: opts.name,
-        checkpointRef,
+        checkpointRef: effectiveCheckpointRef,
         image: cfg.effective.box.image,
         withPlaywright,
         withEnv: cfg.effective.box.withEnv,
@@ -2384,18 +2682,28 @@ var claudeCommand = new Command2("claude").description("Create a sandboxed box a
       verbose: opts.verbose === true,
       openIn: cfg.effective.attach.openIn,
       attach: opts.attach !== false,
-      beforeStart: resumePrepared ? async (box) => {
+      beforeStart: resumePrepared || planPrepared ? async (box) => {
         try {
-          await uploadTeleport({
-            box,
-            provider,
-            resolved: resumePrepared,
-            log: (line) => cmdLog.write(line)
-          });
-          return { agentArgsPrefix: resumePrepared.forwardArgs };
+          if (resumePrepared) {
+            await uploadTeleport({
+              box,
+              provider,
+              resolved: resumePrepared,
+              log: (line) => cmdLog.write(line)
+            });
+          }
+          if (planPrepared) {
+            await uploadTeleport({
+              box,
+              provider,
+              resolved: planPrepared,
+              log: (line) => cmdLog.write(line)
+            });
+          }
+          return { agentArgsPrefix: resumePrepared?.forwardArgs ?? [] };
         } catch (err) {
           if (err instanceof TeleportError) {
-            log8.error(err.message);
+            log9.error(err.message);
             cmdLog.close();
             process.exit(2);
           }
@@ -2416,9 +2724,10 @@ var claudeCommand = new Command2("claude").description("Create a sandboxed box a
       workspacePath: opts.workspace,
       name: opts.name,
       useSnapshot,
-      checkpointRef,
+      checkpointRef: effectiveCheckpointRef,
       fromBranch,
       useBranch,
+      resyncOnStart: opts.resync,
       image: cfg.effective.box.image,
       claudeConfig: { isolate: cfg.effective.box.isolateClaudeConfig },
       claudeEnv: resolved.env,
@@ -2465,8 +2774,35 @@ var claudeCommand = new Command2("claude").description("Create a sandboxed box a
       } catch (err) {
         if (err instanceof TeleportError) {
           s.stop("teleport failed");
-          log8.error(err.message);
-          log8.info(
+          log9.error(err.message);
+          log9.info(
+            `The box ${result.record.container} is up but unused. Destroy it with: agentbox destroy ${result.record.container} -y`
+          );
+          cmdLog.close();
+          process.exit(2);
+        }
+        throw err;
+      }
+    }
+    if (planPrepared) {
+      s.message("uploading plan into box");
+      cmdLog.write("uploading plan into box");
+      try {
+        const provider = await providerForBox(result.record);
+        await uploadTeleport({
+          box: result.record,
+          provider,
+          resolved: planPrepared,
+          log: (line) => {
+            s.message(clampSpinnerLine(line));
+            cmdLog.write(line);
+          }
+        });
+      } catch (err) {
+        if (err instanceof TeleportError) {
+          s.stop("plan upload failed");
+          log9.error(err.message);
+          log9.info(
             `The box ${result.record.container} is up but unused. Destroy it with: agentbox destroy ${result.record.container} -y`
           );
           cmdLog.close();
@@ -2475,6 +2811,18 @@ var claudeCommand = new Command2("claude").description("Create a sandboxed box a
         throw err;
       }
     }
+    const createResyncWarning = result.resync ? buildResyncWarning(result.resync) : null;
+    let pendingCreateResyncWarn = null;
+    if (createResyncWarning) {
+      const hasSeed = Boolean(planPrepared) || wiz.action === "launch-with-prompt" && Boolean(wiz.initialPrompt) || Boolean(resumePrepared);
+      if (hasSeed) pendingCreateResyncWarn = createResyncWarning;
+      else
+        effectiveClaudeArgs = buildPromptArgs(
+          "claude-code",
+          createResyncWarning,
+          effectiveClaudeArgs
+        );
+    }
     s.message("starting claude session");
     await startClaudeSession({
       container: result.record.container,
@@ -2482,12 +2830,15 @@ var claudeCommand = new Command2("claude").description("Create a sandboxed box a
       sessionName,
       boxName: result.record.name
     });
+    if (pendingCreateResyncWarn) log9.warn(pendingCreateResyncWarn);
     const nSuffix = typeof result.record.projectIndex === "number" ? `  \xB7  n ${String(result.record.projectIndex)}` : "";
     s.stop(`box ready${nSuffix}`);
     logPrune(rebuild);
     for (const f of rebuild.failed) {
-      log8.warn(`plugin install failed for ${f.dir}; claude may still load it. stderr:
-${f.stderr.trim()}`);
+      log9.warn(
+        `plugin install failed for ${f.dir}; claude may still load it. stderr:
+${f.stderr.trim()}`
+      );
     }
     maybeShowInstallHint();
     await printLaunchRecap({
@@ -2497,7 +2848,7 @@ ${f.stderr.trim()}`);
       workspacePath: opts.workspace,
       fromBranch,
       useBranch,
-      checkpointRef,
+      checkpointRef: effectiveCheckpointRef,
       attaching: opts.attach !== false
     });
     if (opts.attach === false) {
@@ -2514,10 +2865,10 @@ ${f.stderr.trim()}`);
     s.stop("failed");
     cmdLog.write(`FAIL: ${err instanceof Error ? err.stack ?? err.message : String(err)}`);
     if (err instanceof ClaudeSessionError) {
-      log8.error(err.message);
+      log9.error(err.message);
       if (containerName) {
-        log8.info(`The box ${containerName} is still running. Destroy it with:`);
-        log8.info(`  agentbox destroy ${containerName} -y`);
+        log9.info(`The box ${containerName} is still running. Destroy it with:`);
+        log9.info(`  agentbox destroy ${containerName} -y`);
       }
       cmdLog.close();
       process.exit(1);
@@ -2538,6 +2889,7 @@ async function startOrAttachClaude(box, claudeArgs, opts, resumePrepared) {
     };
   }
   if (attachIn !== void 0) cliOverrides.attach = { openIn: attachIn };
+  if (opts.resync !== void 0) cliOverrides.box = { resyncOnStart: opts.resync };
   const cfg = await loadEffectiveConfig(box.workspacePath, { cliOverrides });
   const sessionName = cfg.effective.claude.sessionName;
   const openIn = cfg.effective.attach.openIn;
@@ -2572,6 +2924,7 @@ async function startOrAttachClaude(box, claudeArgs, opts, resumePrepared) {
   });
   const s = spinner3();
   s.start("preparing box");
+  const wasDown = insp.state === "paused" || insp.state === "stopped";
   if (insp.state === "paused") {
     s.message("unpausing box");
     await unpauseBox(box.id);
@@ -2579,6 +2932,12 @@ async function startOrAttachClaude(box, claudeArgs, opts, resumePrepared) {
     s.message("starting box");
     await startBox(box.id);
   }
+  const resyncWarning = await maybeResyncWorkspace({
+    box,
+    enabled: cfg.effective.box.resyncOnStart && wasDown,
+    projectRoot: cfg.projectRoot,
+    spinner: s
+  });
   const syncConfig = opts.syncConfig !== false;
   if (syncConfig) {
     s.message("syncing ~/.claude into box volume");
@@ -2618,12 +2977,15 @@ async function startOrAttachClaude(box, claudeArgs, opts, resumePrepared) {
     } catch (err) {
       if (err instanceof TeleportError) {
         s.stop("teleport failed");
-        log8.error(err.message);
+        log9.error(err.message);
         process.exit(2);
       }
       throw err;
     }
   }
+  if (resyncWarning && !resumePrepared) {
+    effectiveArgs = buildPromptArgs("claude-code", resyncWarning, effectiveArgs);
+  }
   s.message("starting claude session");
   await startClaudeSession({
     container: box.container,
@@ -2632,10 +2994,13 @@ async function startOrAttachClaude(box, claudeArgs, opts, resumePrepared) {
     boxName: box.name
   });
   s.stop(`box ${box.container} ready`);
+  if (resyncWarning && resumePrepared) log9.warn(resyncWarning);
   logPrune(rebuild);
   for (const f of rebuild.failed) {
-    log8.warn(`plugin install failed for ${f.dir}; claude may still load it. stderr:
-${f.stderr.trim()}`);
+    log9.warn(
+      `plugin install failed for ${f.dir}; claude may still load it. stderr:
+${f.stderr.trim()}`
+    );
   }
   if (!wantAttach) {
     outro(
@@ -2673,7 +3038,7 @@ var claudeAttachCommand = new Command2("attach").description(
     await startOrAttachClaude(box, [], { ...opts, syncConfig: false });
   } catch (err) {
     if (err instanceof ClaudeSessionError) {
-      log8.error(err.message);
+      log9.error(err.message);
       process.exit(1);
     }
     handleLifecycleError(err);
@@ -2705,7 +3070,7 @@ var claudeStartCommand = new Command2("start").description(
     let effectiveClaudeArgs = shifted && idOrName ? [idOrName, ...claudeArgs] : claudeArgs;
     let resumeMode = null;
     if (opts.continue === true && opts.resume) {
-      log8.error("only one of -c / --continue / --resume can be passed");
+      log9.error("only one of -c / --continue / --resume can be passed");
       process.exit(2);
     }
     if (opts.continue === true) resumeMode = { kind: "continue" };
@@ -2720,7 +3085,7 @@ var claudeStartCommand = new Command2("start").description(
         });
       } catch (err) {
         if (err instanceof TeleportError) {
-          log8.error(err.message);
+          log9.error(err.message);
           process.exit(2);
         }
         throw err;
@@ -2747,7 +3112,7 @@ var claudeStartCommand = new Command2("start").description(
           effectiveClaudeArgs = [...resumePrepared.forwardArgs, ...effectiveClaudeArgs];
         } catch (err) {
           if (err instanceof TeleportError) {
-            log8.error(err.message);
+            log9.error(err.message);
             process.exit(2);
           }
           throw err;
@@ -2766,7 +3131,7 @@ var claudeStartCommand = new Command2("start").description(
     await startOrAttachClaude(box, effectiveClaudeArgs, opts, resumePrepared);
   } catch (err) {
     if (err instanceof ClaudeSessionError) {
-      log8.error(err.message);
+      log9.error(err.message);
       process.exit(1);
     }
     handleLifecycleError(err);
@@ -2780,7 +3145,7 @@ var claudeLoginCommand = new Command2("login").description(
 ).action(async (args) => {
   intro("Signing in to Claude...");
   if (!process.stdin.isTTY) {
-    log8.error("`agentbox claude login` needs an interactive terminal.");
+    log9.error("`agentbox claude login` needs an interactive terminal.");
     process.exit(1);
   }
   try {
@@ -2792,7 +3157,7 @@ var claudeLoginCommand = new Command2("login").description(
     s.stop("image ready");
     const exitCode = await runClaudeLoginContainer(image, args);
     if (exitCode !== 0) {
-      log8.warn(`\`claude auth login\` exited with code ${String(exitCode)}`);
+      log9.warn(`\`claude auth login\` exited with code ${String(exitCode)}`);
       process.exit(exitCode);
     }
     outro("signed in \u2014 credentials saved for future boxes");
@@ -2805,17 +3170,18 @@ claudeCommand.addCommand(claudeStartCommand);
 claudeCommand.addCommand(claudeLoginCommand);
 
 // src/commands/checkpoint.ts
-import { confirm as confirm4, isCancel as isCancel5, log as log9 } from "@clack/prompts";
+import { confirm as confirm4, isCancel as isCancel5, log as log10 } from "@clack/prompts";
 import { Command as Command3 } from "commander";
+import { basename as basename3 } from "path";
 var CLOUD_BACKENDS = ["daytona", "hetzner", "vercel"];
 async function cloudProviderFor(backend) {
   switch (backend) {
     case "daytona":
-      return (await import("./dist-PTJ6CEQY.js")).daytonaProvider;
+      return (await import("./dist-47LVLYUV.js")).daytonaProvider;
     case "hetzner":
-      return (await import("./dist-WMQDMTWS.js")).hetznerProvider;
+      return (await import("./dist-SWUOU34W.js")).hetznerProvider;
     case "vercel":
-      return (await import("./dist-RAZP76VX.js")).vercelProvider;
+      return (await import("./dist-24PY2ZMO.js")).vercelProvider;
   }
 }
 var CHECKPOINT_NOTICE = "Checkpoint in progress \u2014 the box will be unresponsive for a moment";
@@ -2839,10 +3205,10 @@ var createSub = new Command3("create").description("Capture a box state as a pro
     }
     const insp = await inspectBox(box.id);
     if (insp.state === "paused") {
-      log9.info("box is paused; unpausing");
+      log10.info("box is paused; unpausing");
       await unpauseBox(box.id);
     } else if (insp.state === "stopped") {
-      log9.info("box is stopped; starting");
+      log10.info("box is stopped; starting");
       await startBox(box.id);
     } else if (insp.state === "missing") {
       throw new Error(`box ${box.name} has no container; was it destroyed?`);
@@ -2877,13 +3243,13 @@ var createSub = new Command3("create").description("Capture a box state as a pro
         setDefault: opts.setDefault === true,
         replace: opts.replace === true,
         maxLayers: cfg.effective.checkpoint.maxLayers,
-        onLog: (line) => log9.info(line)
+        onLog: (line) => log10.info(line)
       });
-      log9.success(
+      log10.success(
         `checkpoint ${info.name} (${info.manifest.type}) -> ${info.dir}` + (opts.setDefault ? "  [project default]" : "")
       );
       if (!opts.setDefault) {
-        log9.info(
+        log10.info(
           `make it the default for new boxes: agentbox checkpoint set-default ${info.name}`
         );
       }
@@ -2898,8 +3264,78 @@ var createSub = new Command3("create").description("Capture a box state as a pro
     handleLifecycleError(err);
   }
 });
-var lsSub = new Command3("ls").description("List this project's checkpoints (both docker and cloud)").action(async () => {
+function dockerRow(c, def) {
+  const flag = c.name === def ? " *default" : "";
+  return `${c.name}  docker (${c.manifest.type})  from ${c.manifest.sourceBoxName}  ${c.manifest.createdAt}${flag}
+`;
+}
+function cloudRow(c, backend, def) {
+  const flag = c.name === def ? " *default" : "";
+  return `${c.name}  ${backend} (snapshot)  from ${c.manifest.sourceBoxName}  ${c.manifest.createdAt}${flag}
+`;
+}
+async function listAllProjects() {
+  const projects = await listProjectsConfigured();
+  const rootByHash = new Map(projects.map((p) => [p.hash, p.originalPath]));
+  const dockerGroups = await listAllCheckpoints();
+  const cloudGroups = await Promise.all(
+    CLOUD_BACKENDS.map(async (backend) => ({
+      backend,
+      groups: await listAllCloudCheckpoints(backend)
+    }))
+  );
+  const bySegment = /* @__PURE__ */ new Map();
+  const ensure = (segment) => {
+    let m = bySegment.get(segment);
+    if (!m) {
+      m = { projectRoot: rootByHash.get(segment.slice(0, 16)), docker: [], cloud: [] };
+      bySegment.set(segment, m);
+    }
+    return m;
+  };
+  for (const g of dockerGroups) ensure(g.segment).docker = g.items;
+  for (const { backend, groups } of cloudGroups) {
+    for (const g of groups) ensure(g.segment).cloud.push({ backend, items: g.items });
+  }
+  if (bySegment.size === 0) {
+    process.stdout.write("no checkpoints found\n");
+    return;
+  }
+  const entries = [...bySegment.entries()].sort(([sa, a], [sb, b]) => {
+    const la = a.projectRoot ? basename3(a.projectRoot) : sa;
+    const lb = b.projectRoot ? basename3(b.projectRoot) : sb;
+    return la.localeCompare(lb) || sa.localeCompare(sb);
+  });
+  let first = true;
+  for (const [segment, m] of entries) {
+    let defDocker = "";
+    const defCloud = /* @__PURE__ */ new Map();
+    if (m.projectRoot) {
+      const cfg = await loadEffectiveConfig(m.projectRoot).catch(() => null);
+      if (cfg) {
+        defDocker = resolveDefaultCheckpoint(cfg.effective, "docker");
+        for (const { backend } of m.cloud) {
+          defCloud.set(backend, resolveDefaultCheckpoint(cfg.effective, backend));
+        }
+      }
+    }
+    const label = m.projectRoot ? basename3(m.projectRoot) : segment;
+    const loc = m.projectRoot ?? "(project config not found)";
+    process.stdout.write(`${first ? "" : "\n"}${label}  (${loc})
+`);
+    first = false;
+    for (const c of m.docker) process.stdout.write(`  ${dockerRow(c, defDocker)}`);
+    for (const { backend, items } of m.cloud) {
+      for (const c of items) process.stdout.write(`  ${cloudRow(c, backend, defCloud.get(backend) ?? "")}`);
+    }
+  }
+}
+var lsSub = new Command3("ls").description("List this project's checkpoints (both docker and cloud); -g for all projects").option("-g, --global", "include checkpoints from all projects").action(async (opts) => {
   try {
+    if (opts.global) {
+      await listAllProjects();
+      return;
+    }
     const projectRoot = (await findProjectRoot(process.cwd())).root;
     const cfg = await loadEffectiveConfig(projectRoot);
     const defDocker = resolveDefaultCheckpoint(cfg.effective, "docker");
@@ -2918,19 +3354,11 @@ var lsSub = new Command3("ls").description("List this project's checkpoints (bot
       return;
     }
     for (const c of dockerList) {
-      const flag = c.name === defDocker ? " *default" : "";
-      process.stdout.write(
-        `${c.name}  docker (${c.manifest.type})  from ${c.manifest.sourceBoxName}  ${c.manifest.createdAt}${flag}
-`
-      );
+      process.stdout.write(dockerRow(c, defDocker));
     }
     for (const { backend, def, items } of cloudLists) {
       for (const c of items) {
-        const flag = c.name === def ? " *default" : "";
-        process.stdout.write(
-          `${c.name}  ${backend} (snapshot)  from ${c.manifest.sourceBoxName}  ${c.manifest.createdAt}${flag}
-`
-        );
+        process.stdout.write(cloudRow(c, backend, def));
       }
     }
   } catch (err) {
@@ -2998,7 +3426,7 @@ var rmSub = new Command3("rm").description("Delete a checkpoint (any provider th
     if (!opts.yes) {
       const ok = await confirm4({ message: `Delete checkpoint ${ref}?`, initialValue: false });
       if (isCancel5(ok) || !ok) {
-        log9.info("cancelled");
+        log10.info("cancelled");
         return;
       }
     }
@@ -3019,7 +3447,7 @@ var rmSub = new Command3("rm").description("Delete a checkpoint (any provider th
         process.stdout.write(`removed ${backend} checkpoint ${ref}
 `);
       } catch (err) {
-        log9.warn(
+        log10.warn(
           `${backend} checkpoint remove failed: ${err instanceof Error ? err.message : String(err)}`
         );
       }
@@ -3037,9 +3465,9 @@ var rmSub = new Command3("rm").description("Delete a checkpoint (any provider th
     for (const [key, projectValue, effectiveValue] of defKeys) {
       if (projectValue === ref) {
         await unsetConfigValue("project", key, projectRoot);
-        log9.info(`cleared project ${key} (was ${ref})`);
+        log10.info(`cleared project ${key} (was ${ref})`);
       } else if (effectiveValue === ref) {
-        log9.warn(
+        log10.warn(
           `${key} = ${ref} is set outside the per-project config (global or agentbox.yaml defaults) \u2014 clear it manually`
         );
       }
@@ -3050,17 +3478,17 @@ var rmSub = new Command3("rm").description("Delete a checkpoint (any provider th
 });
 async function runCloudCheckpointCreate(box, opts) {
   if (opts.merged) {
-    log9.warn("--merged is Docker-only (cloud snapshots are always flattened); ignoring");
+    log10.warn("--merged is Docker-only (cloud snapshots are always flattened); ignoring");
   }
   const projectRoot = await projectRootFor(box.workspacePath, box.projectRoot);
   const name = opts.name ?? `${box.name}-${String(Date.now()).slice(-6)}`;
   const provider = await providerForBox(box);
   const state = await provider.probeState(box);
   if (state === "paused") {
-    log9.info("box is paused; resuming");
+    log10.info("box is paused; resuming");
     await provider.resume(box);
   } else if (state === "stopped") {
-    log9.info("box is stopped; starting");
+    log10.info("box is stopped; starting");
     await provider.start(box);
   } else if (state === "missing") {
     throw new Error(`cloud sandbox for ${box.name} is missing; was it deleted?`);
@@ -3074,7 +3502,7 @@ async function runCloudCheckpointCreate(box, opts) {
       initialValue: false
     });
     if (isCancel5(ok) || !ok) {
-      log9.info("cancelled");
+      log10.info("cancelled");
       return;
     }
   }
@@ -3089,21 +3517,21 @@ async function runCloudCheckpointCreate(box, opts) {
       try {
         const saved = await provider.extractAgentCredentials(box);
         if (saved.length > 0) {
-          log9.info(`saved ${saved.join(", ")} login to ~/.agentbox for future boxes`);
+          log10.info(`saved ${saved.join(", ")} login to ~/.agentbox for future boxes`);
         }
       } catch (err) {
-        log9.warn(`agent credential extract skipped: ${err instanceof Error ? err.message : String(err)}`);
+        log10.warn(`agent credential extract skipped: ${err instanceof Error ? err.message : String(err)}`);
       }
     }
-    log9.info(`capturing cloud snapshot '${name}' (this may take a few minutes)`);
+    log10.info(`capturing cloud snapshot '${name}' (this may take a few minutes)`);
     const result = await provider.checkpoint.create(box, name);
-    log9.success(`checkpoint ${result.ref} (daytona snapshot) captured`);
+    log10.success(`checkpoint ${result.ref} (daytona snapshot) captured`);
     if (opts.setDefault) {
       const key = defaultCheckpointConfigKey(box.provider ?? "daytona");
       await setConfigValue("project", key, result.ref, projectRoot);
-      log9.info(`set project default checkpoint (${key}) -> ${result.ref}`);
+      log10.info(`set project default checkpoint (${key}) -> ${result.ref}`);
     } else {
-      log9.info(
+      log10.info(
         `make it the default for new boxes: agentbox checkpoint set-default --provider ${box.provider ?? "daytona"} ${result.ref}`
       );
     }
@@ -3115,15 +3543,15 @@ var checkpointCommand = new Command3("checkpoint").alias("checkpoints").descript
 
 // src/commands/code.ts
 import { spawn } from "child_process";
-import { log as log10 } from "@clack/prompts";
+import { log as log11 } from "@clack/prompts";
 import { Command as Command4, InvalidArgumentError } from "commander";
 
 // src/ssh-config.ts
 import { promises as fs } from "fs";
-import { homedir as homedir8 } from "os";
-import { join as join9 } from "path";
+import { homedir as homedir9 } from "os";
+import { join as join11 } from "path";
 function sshConfigPath() {
-  return join9(homedir8(), ".ssh", "config");
+  return join11(homedir9(), ".ssh", "config");
 }
 function beginMarker(alias) {
   return `# BEGIN agentbox cloud box ${alias}`;
@@ -3174,7 +3602,7 @@ function buildBlock(opts) {
 }
 async function writeAgentboxSshAlias(opts) {
   const path = sshConfigPath();
-  await fs.mkdir(join9(homedir8(), ".ssh"), { recursive: true, mode: 448 });
+  await fs.mkdir(join11(homedir9(), ".ssh"), { recursive: true, mode: 448 });
   const existing = await readConfig();
   const stripped = stripBlock(existing, opts.alias);
   const separator = stripped.length === 0 || stripped.endsWith("\n") ? "" : "\n";
@@ -3256,11 +3684,11 @@ var codeCommand = new Command4("code").description("Open a box in VS Code or Cur
     }
     const exit = await launchIde(folderUri, forcedIde);
     if (exit.code !== 0) {
-      log10.error(`failed to launch ${exit.flavor ? ideProfile(exit.flavor).displayName : "IDE"} via ${exit.via} (exit ${String(exit.code)})`);
+      log11.error(`failed to launch ${exit.flavor ? ideProfile(exit.flavor).displayName : "IDE"} via ${exit.via} (exit ${String(exit.code)})`);
       process.stdout.write(folderUri + "\n");
       process.exit(1);
     }
-    log10.success(
+    log11.success(
       `opening ${box.name} in ${ideProfile(exit.flavor).displayName} (${exit.via})`
     );
   } catch (err) {
@@ -3270,10 +3698,10 @@ var codeCommand = new Command4("code").description("Open a box in VS Code or Cur
 async function prepareDockerAttach(box, opts) {
   const insp = await inspectBox(box.id);
   if (insp.state === "paused") {
-    log10.info(`box is paused; unpausing`);
+    log11.info(`box is paused; unpausing`);
     await unpauseBox(box.id);
   } else if (insp.state === "stopped") {
-    log10.info(`box is stopped; starting`);
+    log11.info(`box is stopped; starting`);
     await startBox(box.id);
   } else if (insp.state === "missing") {
     throw new Error(`box ${box.name} has no container; was it destroyed?`);
@@ -3284,9 +3712,9 @@ async function prepareDockerAttach(box, opts) {
       const lines = [];
       if (reply.timedOut.length > 0) lines.push(`timed out: ${reply.timedOut.join(", ")}`);
       if (reply.failed.length > 0) lines.push(`failed: ${reply.failed.join(", ")}`);
-      log10.warn(`box not fully ready (${lines.join("; ")}). Opening anyway.`);
+      log11.warn(`box not fully ready (${lines.join("; ")}). Opening anyway.`);
     } else {
-      log10.success("all units ready");
+      log11.success("all units ready");
     }
   }
   if (opts.autoTerminals) {
@@ -3296,14 +3724,14 @@ async function prepareDockerAttach(box, opts) {
         regen: opts.regenTasks
       });
       if (r.status === "wrote") {
-        log10.info(`wrote /workspace/.vscode/tasks.json (${String(services.length)} service(s))`);
+        log11.info(`wrote /workspace/.vscode/tasks.json (${String(services.length)} service(s))`);
       } else if (r.status === "skipped-user-owned") {
-        log10.warn(
+        log11.warn(
           "user-owned .vscode/tasks.json detected; skipping auto-terminals (pass --regen-tasks to overwrite)"
         );
       }
     } catch (err) {
-      log10.warn(
+      log11.warn(
         `auto-terminals failed: ${err instanceof Error ? err.message : String(err)}`
       );
     }
@@ -3315,10 +3743,10 @@ async function prepareCloudAttach(box, opts) {
   const p = await providerForBox(box);
   const state = await p.probeState(box);
   if (state === "paused") {
-    log10.info("box is paused; resuming");
+    log11.info("box is paused; resuming");
     await p.resume(box);
   } else if (state === "stopped") {
-    log10.info("box is stopped; starting");
+    log11.info("box is stopped; starting");
     await p.start(box);
   } else if (state === "missing") {
     throw new Error(`cloud sandbox for ${box.name} is missing; was it deleted?`);
@@ -3331,12 +3759,12 @@ async function prepareCloudAttach(box, opts) {
         const lines = [];
         if (reply.timedOut.length > 0) lines.push(`timed out: ${reply.timedOut.join(", ")}`);
         if (reply.failed.length > 0) lines.push(`failed: ${reply.failed.join(", ")}`);
-        log10.warn(`box not fully ready (${lines.join("; ")}). Opening anyway.`);
+        log11.warn(`box not fully ready (${lines.join("; ")}). Opening anyway.`);
       } else {
-        log10.success("all units ready");
+        log11.success("all units ready");
       }
     } catch (err) {
-      log10.warn(`wait-ready failed (continuing): ${err instanceof Error ? err.message : String(err)}`);
+      log11.warn(`wait-ready failed (continuing): ${err instanceof Error ? err.message : String(err)}`);
     }
   }
   if (!p.buildAttach) {
@@ -3358,7 +3786,7 @@ async function prepareCloudAttach(box, opts) {
     user: target.user,
     identityFile: target.identityFile
   });
-  log10.info(`updated ~/.ssh/config alias ${alias}`);
+  log11.info(`updated ~/.ssh/config alias ${alias}`);
   return `vscode-remote://ssh-remote+${alias}/workspace`;
 }
 async function runWaitReadyDocker(container, timeoutMs) {
@@ -3383,7 +3811,7 @@ async function launchIde(folderUri, forced) {
   if (code !== null) return code;
   const cursor = await tryCli("cursor", folderUri);
   if (cursor !== null) return cursor;
-  log10.warn("neither `code` nor `cursor` found in PATH; falling back to `open vscode://...`");
+  log11.warn("neither `code` nor `cursor` found in PATH; falling back to `open vscode://...`");
   return launchOne("vscode", folderUri);
 }
 async function tryCli(flavor, folderUri) {
@@ -3396,7 +3824,7 @@ async function launchOne(flavor, folderUri) {
   const profile = ideProfile(flavor);
   const cliCode = await spawnCommand(profile.cli, ["--folder-uri", folderUri]);
   if (cliCode !== 127) return { code: cliCode, flavor, via: "cli" };
-  log10.warn(
+  log11.warn(
     `\`${profile.cli}\` not found in PATH; falling back to \`${hostOpenCommand()} ${profile.protocolScheme}://...\` (the %2B URL-encoding bug may break attach)`
   );
   const url = `${profile.protocolScheme}://${folderUri.replace(/^vscode-remote:\/\//, "vscode-remote/")}`;
@@ -3404,10 +3832,10 @@ async function launchOne(flavor, folderUri) {
   return { code: fallback, flavor, via: "open" };
 }
 function spawnCommand(cmd, args) {
-  return new Promise((resolve3) => {
+  return new Promise((resolve4) => {
     const child = spawn(cmd, args, { stdio: "ignore" });
-    child.once("error", () => resolve3(127));
-    child.once("exit", (code) => resolve3(code ?? -1));
+    child.once("error", () => resolve4(127));
+    child.once("exit", (code) => resolve4(code ?? -1));
   });
 }
 async function fetchServiceNamesDocker(container) {
@@ -3425,9 +3853,9 @@ async function fetchServiceNamesDocker(container) {
 
 // src/commands/codex.ts
 import { access } from "fs/promises";
-import { homedir as homedir9 } from "os";
-import { join as join10 } from "path";
-import { confirm as confirm5, intro as intro2, isCancel as isCancel6, log as log11, outro as outro2, spinner as spinner4 } from "@clack/prompts";
+import { homedir as homedir10 } from "os";
+import { join as join12 } from "path";
+import { confirm as confirm5, intro as intro2, isCancel as isCancel6, log as log12, outro as outro2, spinner as spinner4 } from "@clack/prompts";
 import { Command as Command5 } from "commander";
 function reattachRef2(r) {
   return typeof r.projectIndex === "number" ? String(r.projectIndex) : r.name;
@@ -3442,6 +3870,7 @@ function pickCodexCreateOpts(opts) {
     withPlaywright: opts.withPlaywright,
     withEnv: opts.withEnv,
     vnc: opts.vnc,
+    resync: opts.resync,
     sharedDockerCache: opts.sharedDockerCache,
     portless: opts.portless,
     sessionName: opts.sessionName,
@@ -3504,7 +3933,7 @@ async function maybeRunCodexLogin(args) {
     initialValue: true
   });
   if (isCancel6(answer) || !answer) {
-    log11.info("Skipped sign-in \u2014 codex will prompt you to sign in inside the box.");
+    log12.info("Skipped sign-in \u2014 codex will prompt you to sign in inside the box.");
     return;
   }
   const s = spinner4();
@@ -3515,14 +3944,14 @@ async function maybeRunCodexLogin(args) {
   s.stop("image ready");
   const exitCode = await runCodexLoginContainer(args.image, []);
   if (exitCode !== 0) {
-    log11.warn("Codex login did not complete; continuing \u2014 run `agentbox codex login` to retry.");
+    log12.warn("Codex login did not complete; continuing \u2014 run `agentbox codex login` to retry.");
     return;
   }
-  log11.success("Signed in to Codex \u2014 saved for future boxes.");
+  log12.success("Signed in to Codex \u2014 saved for future boxes.");
 }
 async function cloudCodexCredAvailable(env = process.env) {
   if ((env["OPENAI_API_KEY"] ?? "").length > 0) return true;
-  for (const p of [CODEX_CREDENTIALS_BACKUP_FILE, join10(homedir9(), ".codex", "auth.json")]) {
+  for (const p of [CODEX_CREDENTIALS_BACKUP_FILE, join12(homedir10(), ".codex", "auth.json")]) {
     try {
       await access(p);
       return true;
@@ -3539,7 +3968,7 @@ async function maybeRunCloudCodexLogin(args) {
     initialValue: true
   });
   if (isCancel6(answer) || !answer) {
-    log11.info("Skipped sign-in \u2014 codex will prompt you to sign in inside the box.");
+    log12.info("Skipped sign-in \u2014 codex will prompt you to sign in inside the box.");
     return;
   }
   const s = spinner4();
@@ -3550,12 +3979,12 @@ async function maybeRunCloudCodexLogin(args) {
   s.stop("image ready");
   const exitCode = await runCodexLoginContainer(args.image, []);
   if (exitCode !== 0) {
-    log11.warn("Codex login did not complete; continuing \u2014 run `agentbox codex login` to retry.");
+    log12.warn("Codex login did not complete; continuing \u2014 run `agentbox codex login` to retry.");
     return;
   }
   const { copied } = await extractCodexCredentials(SHARED_CODEX_VOLUME, args.image);
-  if (copied) log11.success("Signed in to Codex \u2014 saved for future boxes.");
-  else log11.warn("Codex login finished but no auth.json was captured \u2014 sign in inside the box if needed.");
+  if (copied) log12.success("Signed in to Codex \u2014 saved for future boxes.");
+  else log12.warn("Codex login finished but no auth.json was captured \u2014 sign in inside the box if needed.");
 }
 var codexCommand = new Command5("codex").description("Create a sandboxed box and launch OpenAI Codex in a detachable tmux session").option("-w, --workspace <path>", "host workspace to mount", process.cwd()).option("-n, --name <name>", "friendly box name (default: <workspace-basename>-<id>)").option("--host-snapshot", "APFS-clone the host workspace into a per-box scratch dir before seeding /workspace (stabilizes the tar-pipe source)").option("--no-host-snapshot", "tar-pipe directly from the live host workspace at create time").option(
   "--snapshot <ref>",
@@ -3580,6 +4009,9 @@ var codexCommand = new Command5("codex").description("Create a sandboxed box and
   "--with-env",
   "copy host env/config files (.env*, secrets.toml, agentbox.yaml, ...) into /workspace at create time (gitignore-bypassing)"
 ).option("--no-vnc", "disable the per-box Xvnc + noVNC web client (on by default)").option(
+  "--no-resync",
+  "do not sync the box with the host on start (default: merge the host's current branch + overlay its uncommitted/untracked changes, keeping the box's version on conflict)"
+).option(
   "--shared-docker-cache",
   "use the shared 'agentbox-docker-cache' volume for in-box docker images (preserved on destroy; only one box can run at a time when set)"
 ).option(
@@ -3622,14 +4054,14 @@ var codexCommand = new Command5("codex").description("Create a sandboxed box and
   intro2("Starting Codex in a box...");
   let resumeMode = null;
   if (opts.continue === true && opts.resume) {
-    log11.error("only one of -c / --continue / --resume can be passed");
+    log12.error("only one of -c / --continue / --resume can be passed");
     cmdLog.close();
     process.exit(2);
   }
   if (opts.continue === true) resumeMode = { kind: "continue" };
   else if (opts.resume) resumeMode = { kind: "resume", id: opts.resume };
   if (resumeMode && opts.initialPrompt && opts.initialPrompt.length > 0) {
-    log11.error("-i / --initial-prompt cannot be combined with -c / --resume.");
+    log12.error("-i / --initial-prompt cannot be combined with -c / --resume.");
     cmdLog.close();
     process.exit(2);
   }
@@ -3644,7 +4076,7 @@ var codexCommand = new Command5("codex").description("Create a sandboxed box and
       });
     } catch (err) {
       if (err instanceof TeleportError) {
-        log11.error(err.message);
+        log12.error(err.message);
         cmdLog.close();
         process.exit(2);
       }
@@ -3667,7 +4099,7 @@ var codexCommand = new Command5("codex").description("Create a sandboxed box and
       });
     } catch (err) {
       if (err instanceof MissingAgentCredsError) {
-        log11.error(err.message);
+        log12.error(err.message);
         cmdLog.close();
         process.exit(2);
       }
@@ -3675,13 +4107,19 @@ var codexCommand = new Command5("codex").description("Create a sandboxed box and
     }
     const maxRunningOverride = parseMaxOption("--max-running", opts.maxRunning);
     const maxWorkingOverride = parseMaxOption("--max-working", opts.maxWorking);
+    const carryForQueue = await runQueuedCarryGate({
+      projectRoot,
+      opts,
+      onLog: (line) => cmdLog.write(line),
+      onClose: () => cmdLog.close()
+    });
     const result = await submitQueueJob({
       agent: "codex",
       boxName: opts.name ?? "",
       providerName,
       prompt: opts.initialPrompt,
       agentArgs: codexArgs,
-      createOpts: pickCodexCreateOpts(opts),
+      createOpts: { ...pickCodexCreateOpts(opts), carry: carryForQueue },
       maxRunningOverride,
       maxWorkingOverride
     });
@@ -3701,13 +4139,13 @@ var codexCommand = new Command5("codex").description("Create a sandboxed box and
       onLog: (line) => cmdLog.write(line)
     });
     if (gate.decision === "cancel") {
-      log11.warn("carry: cancelled \u2014 not creating the box");
+      log12.warn("carry: cancelled \u2014 not creating the box");
       cmdLog.close();
       process.exit(0);
     }
     if (gate.decision === "approve") carryEntries = gate.entries;
   } catch (err) {
-    log11.error(err instanceof Error ? err.message : String(err));
+    log12.error(err instanceof Error ? err.message : String(err));
     cmdLog.close();
     process.exit(1);
   }
@@ -3724,7 +4162,7 @@ var codexCommand = new Command5("codex").description("Create a sandboxed box and
     }));
   } catch (err) {
     if (err instanceof FromBranchError || err instanceof UseBranchError) {
-      log11.error(err.message);
+      log12.error(err.message);
       cmdLog.close();
       process.exit(2);
     }
@@ -3768,7 +4206,7 @@ var codexCommand = new Command5("codex").description("Create a sandboxed box and
           return { agentArgsPrefix: resumePrepared.forwardArgs };
         } catch (err) {
           if (err instanceof TeleportError) {
-            log11.error(err.message);
+            log12.error(err.message);
             cmdLog.close();
             process.exit(2);
           }
@@ -3799,6 +4237,7 @@ var codexCommand = new Command5("codex").description("Create a sandboxed box and
       checkpointRef,
       fromBranch,
       useBranch,
+      resyncOnStart: opts.resync,
       image: cfg.effective.box.image,
       codexConfig: { isolate: cfg.effective.box.isolateCodexConfig },
       withPlaywright,
@@ -3843,8 +4282,8 @@ var codexCommand = new Command5("codex").description("Create a sandboxed box and
       } catch (err) {
         if (err instanceof TeleportError) {
           s.stop("teleport failed");
-          log11.error(err.message);
-          log11.info(
+          log12.error(err.message);
+          log12.info(
             `The box ${result.record.container} is up but unused. Destroy it with: agentbox destroy ${result.record.container} -y`
           );
           cmdLog.close();
@@ -3853,6 +4292,10 @@ var codexCommand = new Command5("codex").description("Create a sandboxed box and
         throw err;
       }
     }
+    const createResyncWarning = result.resync ? buildResyncWarning(result.resync) : null;
+    if (createResyncWarning && !resumePrepared) {
+      effectiveCodexArgs = buildPromptArgs("codex", createResyncWarning, effectiveCodexArgs);
+    }
     s.message("starting codex session");
     await startCodexSession({
       container: result.record.container,
@@ -3861,6 +4304,7 @@ var codexCommand = new Command5("codex").description("Create a sandboxed box and
     });
     const nSuffix = typeof result.record.projectIndex === "number" ? `  \xB7  n ${String(result.record.projectIndex)}` : "";
     s.stop(`box ready${nSuffix}`);
+    if (createResyncWarning && resumePrepared) log12.warn(createResyncWarning);
     await printLaunchRecap({
       record: result.record,
       mode: "codex",
@@ -3885,10 +4329,10 @@ var codexCommand = new Command5("codex").description("Create a sandboxed box and
     s.stop("failed");
     cmdLog.write(`FAIL: ${err instanceof Error ? err.stack ?? err.message : String(err)}`);
     if (err instanceof CodexSessionError) {
-      log11.error(err.message);
+      log12.error(err.message);
       if (containerName) {
-        log11.info(`The box ${containerName} is still running. Destroy it with:`);
-        log11.info(`  agentbox destroy ${containerName} -y`);
+        log12.info(`The box ${containerName} is still running. Destroy it with:`);
+        log12.info(`  agentbox destroy ${containerName} -y`);
       }
       cmdLog.close();
       process.exit(1);
@@ -3909,6 +4353,7 @@ async function startOrAttachCodex(box, codexArgs, opts, resumePrepared) {
     };
   }
   if (attachIn !== void 0) cliOverrides.attach = { openIn: attachIn };
+  if (opts.resync !== void 0) cliOverrides.box = { resyncOnStart: opts.resync };
   const cfg = await loadEffectiveConfig(box.workspacePath, { cliOverrides });
   const sessionName = cfg.effective.codex.sessionName;
   const openIn = cfg.effective.attach.openIn;
@@ -3937,6 +4382,7 @@ async function startOrAttachCodex(box, codexArgs, opts, resumePrepared) {
   await maybeRunCodexLogin({ image: box.image, yes: false });
   const s = spinner4();
   s.start("preparing box");
+  const wasDown = insp.state === "paused" || insp.state === "stopped";
   if (insp.state === "paused") {
     s.message("unpausing box");
     await unpauseBox(box.id);
@@ -3944,6 +4390,12 @@ async function startOrAttachCodex(box, codexArgs, opts, resumePrepared) {
     s.message("starting box");
     await startBox(box.id);
   }
+  const resyncWarning = await maybeResyncWorkspace({
+    box,
+    enabled: cfg.effective.box.resyncOnStart && wasDown,
+    projectRoot: cfg.projectRoot,
+    spinner: s
+  });
   const syncConfig = opts.syncConfig !== false;
   if (syncConfig && box.codexConfigVolume) {
     s.message("syncing ~/.codex into box volume");
@@ -3974,15 +4426,19 @@ async function startOrAttachCodex(box, codexArgs, opts, resumePrepared) {
     } catch (err) {
       if (err instanceof TeleportError) {
         s.stop("teleport failed");
-        log11.error(err.message);
+        log12.error(err.message);
         process.exit(2);
       }
       throw err;
     }
   }
+  if (resyncWarning && !resumePrepared) {
+    effectiveArgs = buildPromptArgs("codex", resyncWarning, effectiveArgs);
+  }
   s.message("starting codex session");
   await startCodexSession({ container: box.container, codexArgs: effectiveArgs, sessionName });
   s.stop(`box ${box.container} ready`);
+  if (resyncWarning && resumePrepared) log12.warn(resyncWarning);
   if (!wantAttach) {
     outro2(
       `session "${sessionName}" started \u2014 attach with: agentbox codex attach ${reattachRef2(box)}`
@@ -4019,7 +4475,7 @@ var codexAttachCommand = new Command5("attach").description(
     await startOrAttachCodex(box, [], { ...opts, syncConfig: false });
   } catch (err) {
     if (err instanceof CodexSessionError) {
-      log11.error(err.message);
+      log12.error(err.message);
       process.exit(1);
     }
     handleLifecycleError(err);
@@ -4051,7 +4507,7 @@ var codexStartCommand = new Command5("start").description(
     let effectiveCodexArgs = shifted && idOrName ? [idOrName, ...codexArgs] : codexArgs;
     let resumeMode = null;
     if (opts.continue === true && opts.resume) {
-      log11.error("only one of -c / --continue / --resume can be passed");
+      log12.error("only one of -c / --continue / --resume can be passed");
       process.exit(2);
     }
     if (opts.continue === true) resumeMode = { kind: "continue" };
@@ -4066,7 +4522,7 @@ var codexStartCommand = new Command5("start").description(
         });
       } catch (err) {
         if (err instanceof TeleportError) {
-          log11.error(err.message);
+          log12.error(err.message);
           process.exit(2);
         }
         throw err;
@@ -4093,7 +4549,7 @@ var codexStartCommand = new Command5("start").description(
           effectiveCodexArgs = [...resumePrepared.forwardArgs, ...effectiveCodexArgs];
         } catch (err) {
           if (err instanceof TeleportError) {
-            log11.error(err.message);
+            log12.error(err.message);
             process.exit(2);
           }
           throw err;
@@ -4112,7 +4568,7 @@ var codexStartCommand = new Command5("start").description(
     await startOrAttachCodex(box, effectiveCodexArgs, opts, resumePrepared);
   } catch (err) {
     if (err instanceof CodexSessionError) {
-      log11.error(err.message);
+      log12.error(err.message);
       process.exit(1);
     }
     handleLifecycleError(err);
@@ -4126,7 +4582,7 @@ var codexLoginCommand = new Command5("login").description(
 ).action(async (args) => {
   intro2("Signing in to Codex...");
   if (!process.stdin.isTTY) {
-    log11.error("`agentbox codex login` needs an interactive terminal.");
+    log12.error("`agentbox codex login` needs an interactive terminal.");
     process.exit(1);
   }
   try {
@@ -4140,7 +4596,7 @@ var codexLoginCommand = new Command5("login").description(
     s.stop("image ready");
     const exitCode = await runCodexLoginContainer(image, args);
     if (exitCode !== 0) {
-      log11.warn(`\`codex login\` exited with code ${String(exitCode)}`);
+      log12.warn(`\`codex login\` exited with code ${String(exitCode)}`);
       process.exit(exitCode);
     }
     outro2("signed in \u2014 credentials saved for future boxes");
@@ -4154,9 +4610,9 @@ codexCommand.addCommand(codexLoginCommand);
 
 // src/commands/opencode.ts
 import { access as access2 } from "fs/promises";
-import { homedir as homedir10 } from "os";
-import { join as join11 } from "path";
-import { confirm as confirm6, intro as intro3, isCancel as isCancel7, log as log12, outro as outro3, spinner as spinner5 } from "@clack/prompts";
+import { homedir as homedir11 } from "os";
+import { join as join13 } from "path";
+import { confirm as confirm6, intro as intro3, isCancel as isCancel7, log as log13, outro as outro3, spinner as spinner5 } from "@clack/prompts";
 import { Command as Command6 } from "commander";
 function reattachRef3(r) {
   return typeof r.projectIndex === "number" ? String(r.projectIndex) : r.name;
@@ -4171,6 +4627,7 @@ function pickOpencodeCreateOpts(opts) {
     withPlaywright: opts.withPlaywright,
     withEnv: opts.withEnv,
     vnc: opts.vnc,
+    resync: opts.resync,
     sharedDockerCache: opts.sharedDockerCache,
     portless: opts.portless,
     sessionName: opts.sessionName,
@@ -4230,7 +4687,7 @@ async function maybeRunOpencodeLogin(args) {
     initialValue: true
   });
   if (isCancel7(answer) || !answer) {
-    log12.info("Skipped sign-in \u2014 opencode will prompt you to sign in inside the box.");
+    log13.info("Skipped sign-in \u2014 opencode will prompt you to sign in inside the box.");
     return;
   }
   const s = spinner5();
@@ -4244,16 +4701,16 @@ async function maybeRunOpencodeLogin(args) {
   s.stop("image ready");
   const exitCode = await runOpencodeLoginContainer(args.image, []);
   if (exitCode !== 0) {
-    log12.warn("OpenCode login did not complete; continuing \u2014 run `agentbox opencode login` to retry.");
+    log13.warn("OpenCode login did not complete; continuing \u2014 run `agentbox opencode login` to retry.");
     return;
   }
-  log12.success("Signed in to OpenCode \u2014 saved for future boxes.");
+  log13.success("Signed in to OpenCode \u2014 saved for future boxes.");
 }
 async function cloudOpencodeCredAvailable(env = process.env) {
   for (const k of OPENCODE_FORWARDED_ENV_KEYS) {
     if ((env[k] ?? "").length > 0) return true;
   }
-  for (const p of [OPENCODE_CREDENTIALS_BACKUP_FILE, join11(homedir10(), ".local", "share", "opencode", "auth.json")]) {
+  for (const p of [OPENCODE_CREDENTIALS_BACKUP_FILE, join13(homedir11(), ".local", "share", "opencode", "auth.json")]) {
     try {
       await access2(p);
       return true;
@@ -4270,7 +4727,7 @@ async function maybeRunCloudOpencodeLogin(args) {
     initialValue: true
   });
   if (isCancel7(answer) || !answer) {
-    log12.info("Skipped sign-in \u2014 opencode will prompt you to sign in inside the box.");
+    log13.info("Skipped sign-in \u2014 opencode will prompt you to sign in inside the box.");
     return;
   }
   const s = spinner5();
@@ -4284,12 +4741,12 @@ async function maybeRunCloudOpencodeLogin(args) {
   s.stop("image ready");
   const exitCode = await runOpencodeLoginContainer(args.image, []);
   if (exitCode !== 0) {
-    log12.warn("OpenCode login did not complete; continuing \u2014 run `agentbox opencode login` to retry.");
+    log13.warn("OpenCode login did not complete; continuing \u2014 run `agentbox opencode login` to retry.");
     return;
   }
   const { copied } = await extractOpencodeCredentials(SHARED_OPENCODE_VOLUME, args.image);
-  if (copied) log12.success("Signed in to OpenCode \u2014 saved for future boxes.");
-  else log12.warn("OpenCode login finished but no auth.json was captured \u2014 sign in inside the box if needed.");
+  if (copied) log13.success("Signed in to OpenCode \u2014 saved for future boxes.");
+  else log13.warn("OpenCode login finished but no auth.json was captured \u2014 sign in inside the box if needed.");
 }
 var opencodeCommand = new Command6("opencode").description("Create a sandboxed box and launch OpenCode in a detachable tmux session").option("-w, --workspace <path>", "host workspace to mount", process.cwd()).option("-n, --name <name>", "friendly box name (default: <workspace-basename>-<id>)").option("--host-snapshot", "APFS-clone the host workspace into a per-box scratch dir before seeding /workspace (stabilizes the tar-pipe source)").option("--no-host-snapshot", "tar-pipe directly from the live host workspace at create time").option(
   "--snapshot <ref>",
@@ -4308,6 +4765,9 @@ var opencodeCommand = new Command6("opencode").description("Create a sandboxed b
   "--with-env",
   "copy host env/config files (.env*, secrets.toml, agentbox.yaml, ...) into /workspace at create time (gitignore-bypassing)"
 ).option("--no-vnc", "disable the per-box Xvnc + noVNC web client (on by default)").option(
+  "--no-resync",
+  "do not sync the box with the host on start (default: merge the host's current branch + overlay its uncommitted/untracked changes, keeping the box's version on conflict)"
+).option(
   "--shared-docker-cache",
   "use the shared 'agentbox-docker-cache' volume for in-box docker images (preserved on destroy; only one box can run at a time when set)"
 ).option(
@@ -4357,7 +4817,7 @@ var opencodeCommand = new Command6("opencode").description("Create a sandboxed b
       });
     } catch (err) {
       if (err instanceof TeleportError) {
-        log12.error(err.message);
+        log13.error(err.message);
         cmdLog.close();
         process.exit(2);
       }
@@ -4380,7 +4840,7 @@ var opencodeCommand = new Command6("opencode").description("Create a sandboxed b
       });
     } catch (err) {
       if (err instanceof MissingAgentCredsError) {
-        log12.error(err.message);
+        log13.error(err.message);
         cmdLog.close();
         process.exit(2);
       }
@@ -4388,13 +4848,19 @@ var opencodeCommand = new Command6("opencode").description("Create a sandboxed b
     }
     const maxRunningOverride = parseMaxOption("--max-running", opts.maxRunning);
     const maxWorkingOverride = parseMaxOption("--max-working", opts.maxWorking);
+    const carryForQueue = await runQueuedCarryGate({
+      projectRoot,
+      opts,
+      onLog: (line) => cmdLog.write(line),
+      onClose: () => cmdLog.close()
+    });
     const result = await submitQueueJob({
       agent: "opencode",
       boxName: opts.name ?? "",
       providerName,
       prompt: opts.initialPrompt,
       agentArgs: opencodeArgs,
-      createOpts: pickOpencodeCreateOpts(opts),
+      createOpts: { ...pickOpencodeCreateOpts(opts), carry: carryForQueue },
       maxRunningOverride,
       maxWorkingOverride
     });
@@ -4414,13 +4880,13 @@ var opencodeCommand = new Command6("opencode").description("Create a sandboxed b
       onLog: (line) => cmdLog.write(line)
     });
     if (gate.decision === "cancel") {
-      log12.warn("carry: cancelled \u2014 not creating the box");
+      log13.warn("carry: cancelled \u2014 not creating the box");
       cmdLog.close();
       process.exit(0);
     }
     if (gate.decision === "approve") carryEntries = gate.entries;
   } catch (err) {
-    log12.error(err instanceof Error ? err.message : String(err));
+    log13.error(err instanceof Error ? err.message : String(err));
     cmdLog.close();
     process.exit(1);
   }
@@ -4437,7 +4903,7 @@ var opencodeCommand = new Command6("opencode").description("Create a sandboxed b
     }));
   } catch (err) {
     if (err instanceof FromBranchError || err instanceof UseBranchError) {
-      log12.error(err.message);
+      log13.error(err.message);
       cmdLog.close();
       process.exit(2);
     }
@@ -4494,6 +4960,7 @@ var opencodeCommand = new Command6("opencode").description("Create a sandboxed b
       checkpointRef,
       fromBranch,
       useBranch,
+      resyncOnStart: opts.resync,
       image: cfg.effective.box.image,
       opencodeConfig: { isolate: cfg.effective.box.isolateOpencodeConfig },
       withPlaywright,
@@ -4525,8 +4992,10 @@ var opencodeCommand = new Command6("opencode").description("Create a sandboxed b
       opencodeArgs,
       sessionName
     });
+    const createResyncWarning = result.resync ? buildResyncWarning(result.resync) : null;
     const nSuffix = typeof result.record.projectIndex === "number" ? `  \xB7  n ${String(result.record.projectIndex)}` : "";
     s.stop(`box ready${nSuffix}`);
+    if (createResyncWarning) log13.warn(createResyncWarning);
     await printLaunchRecap({
       record: result.record,
       mode: "opencode",
@@ -4551,10 +5020,10 @@ var opencodeCommand = new Command6("opencode").description("Create a sandboxed b
     s.stop("failed");
     cmdLog.write(`FAIL: ${err instanceof Error ? err.stack ?? err.message : String(err)}`);
     if (err instanceof OpencodeSessionError) {
-      log12.error(err.message);
+      log13.error(err.message);
       if (containerName) {
-        log12.info(`The box ${containerName} is still running. Destroy it with:`);
-        log12.info(`  agentbox destroy ${containerName} -y`);
+        log13.info(`The box ${containerName} is still running. Destroy it with:`);
+        log13.info(`  agentbox destroy ${containerName} -y`);
       }
       cmdLog.close();
       process.exit(1);
@@ -4569,6 +5038,7 @@ async function startOrAttachOpencode(box, opencodeArgs, opts) {
   const cliOverrides = {};
   if (opts.sessionName) cliOverrides.opencode = { sessionName: opts.sessionName };
   if (attachIn !== void 0) cliOverrides.attach = { openIn: attachIn };
+  if (opts.resync !== void 0) cliOverrides.box = { resyncOnStart: opts.resync };
   const cfg = await loadEffectiveConfig(box.workspacePath, { cliOverrides });
   const sessionName = cfg.effective.opencode.sessionName;
   const openIn = cfg.effective.attach.openIn;
@@ -4592,6 +5062,7 @@ async function startOrAttachOpencode(box, opencodeArgs, opts) {
   await maybeRunOpencodeLogin({ image: box.image, yes: false });
   const s = spinner5();
   s.start("preparing box");
+  const wasDown = insp.state === "paused" || insp.state === "stopped";
   if (insp.state === "paused") {
     s.message("unpausing box");
     await unpauseBox(box.id);
@@ -4599,6 +5070,12 @@ async function startOrAttachOpencode(box, opencodeArgs, opts) {
     s.message("starting box");
     await startBox(box.id);
   }
+  const resyncWarning = await maybeResyncWorkspace({
+    box,
+    enabled: cfg.effective.box.resyncOnStart && wasDown,
+    projectRoot: cfg.projectRoot,
+    spinner: s
+  });
   const syncConfig = opts.syncConfig !== false;
   if (syncConfig && box.opencodeConfigVolume) {
     s.message("syncing OpenCode config into box volume");
@@ -4614,6 +5091,7 @@ async function startOrAttachOpencode(box, opencodeArgs, opts) {
   s.message("starting opencode session");
   await startOpencodeSession({ container: box.container, opencodeArgs, sessionName });
   s.stop(`box ${box.container} ready`);
+  if (resyncWarning) log13.warn(resyncWarning);
   if (!wantAttach) {
     outro3(
       `session "${sessionName}" started \u2014 attach with: agentbox opencode attach ${reattachRef3(box)}`
@@ -4650,7 +5128,7 @@ var opencodeAttachCommand = new Command6("attach").description(
     await startOrAttachOpencode(box, [], { ...opts, syncConfig: false });
   } catch (err) {
     if (err instanceof OpencodeSessionError) {
-      log12.error(err.message);
+      log13.error(err.message);
       process.exit(1);
     }
     handleLifecycleError(err);
@@ -4689,7 +5167,7 @@ var opencodeStartCommand = new Command6("start").description(
         });
       } catch (err) {
         if (err instanceof TeleportError) {
-          log12.error(err.message);
+          log13.error(err.message);
           process.exit(2);
         }
         throw err;
@@ -4718,7 +5196,7 @@ var opencodeStartCommand = new Command6("start").description(
     await startOrAttachOpencode(box, effectiveOpencodeArgs, opts);
   } catch (err) {
     if (err instanceof OpencodeSessionError) {
-      log12.error(err.message);
+      log13.error(err.message);
       process.exit(1);
     }
     handleLifecycleError(err);
@@ -4732,7 +5210,7 @@ var opencodeLoginCommand = new Command6("login").description(
 ).action(async (args) => {
   intro3("Signing in to OpenCode...");
   if (!process.stdin.isTTY) {
-    log12.error("`agentbox opencode login` needs an interactive terminal.");
+    log13.error("`agentbox opencode login` needs an interactive terminal.");
     process.exit(1);
   }
   try {
@@ -4746,7 +5224,7 @@ var opencodeLoginCommand = new Command6("login").description(
     s.stop("image ready");
     const exitCode = await runOpencodeLoginContainer(image, args);
     if (exitCode !== 0) {
-      log12.warn(`\`opencode auth login\` exited with code ${String(exitCode)}`);
+      log13.warn(`\`opencode auth login\` exited with code ${String(exitCode)}`);
       process.exit(exitCode);
     }
     outro3("signed in \u2014 credentials saved for future boxes");
@@ -5025,7 +5503,7 @@ function handleError(err) {
 var configCommand = new Command7("config").description("Read / write layered config (global, per-project, workspace `defaults:` block)").addCommand(getCommand).addCommand(setCommand).addCommand(unsetCommand).addCommand(listCommand).addCommand(pathCommand).addCommand(editCommand).addCommand(listProjectsCommand);
 
 // src/commands/cp.ts
-import { log as log13 } from "@clack/prompts";
+import { log as log14 } from "@clack/prompts";
 import { Command as Command8 } from "commander";
 function parseBoxArg(arg) {
   const idx = arg.indexOf(":");
@@ -5108,10 +5586,10 @@ var cpCommand = new Command8("cp").description("Copy files between host and box
     }
     const insp = await inspectBox(box.id);
     if (insp.state === "paused") {
-      log13.info("box is paused; unpausing");
+      log14.info("box is paused; unpausing");
       await unpauseBox(box.id);
     } else if (insp.state === "stopped") {
-      log13.info("box is stopped; starting");
+      log14.info("box is stopped; starting");
       await startBox(box.id);
     } else if (insp.state === "missing") {
       throw new Error(`box ${box.name} has no container; was it destroyed?`);
@@ -5119,7 +5597,7 @@ var cpCommand = new Command8("cp").description("Copy files between host and box
     if (parsed.direction === "upload") {
       const result = await uploadToBox(box, parsed.hostPath, parsed.boxPath);
       if (result.warn) {
-        log13.warn(`copied to ${box.name}:${result.finalPath}, but ${result.warn}`);
+        log14.warn(`copied to ${box.name}:${result.finalPath}, but ${result.warn}`);
       } else {
         process.stdout.write(`copied to ${box.name}:${result.finalPath}
 `);
@@ -5135,13 +5613,12 @@ var cpCommand = new Command8("cp").description("Copy files between host and box
 });
 
 // src/commands/create.ts
-import { intro as intro4, log as log14, outro as outro4 } from "@clack/prompts";
+import { intro as intro4, log as log15, outro as outro4 } from "@clack/prompts";
 import { Command as Command9 } from "commander";
 import { execSync, spawnSync as spawnSync2 } from "child_process";
 function buildCliOverrides(opts) {
   const box = {};
   if (opts.hostSnapshot !== void 0) box.hostSnapshot = opts.hostSnapshot;
-  if (opts.image !== void 0) box.image = opts.image;
   if (opts.withPlaywright === true) box.withPlaywright = true;
   if (opts.withEnv === true) box.withEnv = true;
   if (opts.vnc === false) box.vnc = false;
@@ -5179,7 +5656,12 @@ async function attachShell(record) {
   });
   process.exit(code);
 }
-var createCommand = new Command9("create").description("Create and start a new agent box (Docker container with /workspace seeded via in-container git worktree)").option("-w, --workspace <path>", "host workspace to mount", process.cwd()).option("-n, --name <name>", "friendly box name (default: <workspace-basename>-<id>)").option("--provider <name>", "sandbox backend: 'docker' (default) or 'daytona' (cloud)").option("--host-snapshot", "APFS-clone the host workspace into a per-box scratch dir before seeding /workspace (stabilizes the tar-pipe source)").option("--no-host-snapshot", "bind the live workspace directly (host edits leak into reads)").option(
+var createCommand = new Command9("create").description(
+  "Create and start a new agent box (Docker container with /workspace seeded via in-container git worktree)"
+).option("-w, --workspace <path>", "host workspace to mount", process.cwd()).option("-n, --name <name>", "friendly box name (default: <workspace-basename>-<id>)").option("--provider <name>", "sandbox backend: 'docker' (default) or 'daytona' (cloud)").option(
+  "--host-snapshot",
+  "APFS-clone the host workspace into a per-box scratch dir before seeding /workspace (stabilizes the tar-pipe source)"
+).option("--no-host-snapshot", "bind the live workspace directly (host edits leak into reads)").option(
   "--snapshot <ref>",
   "start from a project checkpoint (see `agentbox checkpoint`); overrides box.defaultCheckpoint"
 ).option("--image <ref>", "override the box image", void 0).option(
@@ -5189,17 +5671,27 @@ var createCommand = new Command9("create").description("Create and start a new a
   "--with-env",
   "copy host env/config files (.env*, secrets.toml, agentbox.yaml, ...) into /workspace at create time (gitignore-bypassing)"
 ).option("--no-vnc", "disable the per-box Xvnc + noVNC web client (on by default)").option(
+  "--no-resync",
+  "when starting from a checkpoint, do not merge the host's current branch + overlay its uncommitted/untracked changes (default: do, keeping the box's version on conflict)"
+).option(
   "--shared-docker-cache",
   "use the shared 'agentbox-docker-cache' volume for in-box docker images (preserved on destroy; only one box can run at a time when set)"
 ).option(
   "--portless",
   "map the box web app to https://<name>.localhost via the Portless proxy (Docker Desktop)"
-).option("--no-portless", "do not register a Portless alias for this box").option("--memory <size>", "memory ceiling (e.g. 512m, 2g); unset = unlimited").option("--cpus <n>", "CPU count cap (fractional ok, e.g. 1.5); unset = unlimited").option("--pids-limit <n>", "max process count (PIDs cgroup); unset = unlimited").option("--disk <size>", "best-effort container writable-layer size (e.g. 10g); no-op on overlay2/macOS").option(
+).option("--no-portless", "do not register a Portless alias for this box").option("--memory <size>", "memory ceiling (e.g. 512m, 2g); unset = unlimited").option("--cpus <n>", "CPU count cap (fractional ok, e.g. 1.5); unset = unlimited").option("--pids-limit <n>", "max process count (PIDs cgroup); unset = unlimited").option(
+  "--disk <size>",
+  "best-effort container writable-layer size (e.g. 10g); no-op on overlay2/macOS"
+).option(
+  "--size <spec>",
+  "VM size for cloud providers. Hetzner: server type (e.g. cx33). Daytona: cpu-mem-disk GB (e.g. 4-8-20). Overrides box.size / box.size<Provider>."
+).option(
   "--bundle-depth <n>",
   "cap commits shipped in the cloud-seed git bundle (daytona, hetzner). 0 = full history. Unset = adaptive (200 commits, re-bundle at 100 if >20 MB). Ignored for docker.",
   (v) => {
     const n = Number.parseInt(v, 10);
-    if (!Number.isInteger(n) || n < 0) throw new Error(`--bundle-depth: expected a non-negative integer, got "${v}"`);
+    if (!Number.isInteger(n) || n < 0)
+      throw new Error(`--bundle-depth: expected a non-negative integer, got "${v}"`);
     return n;
   }
 ).option(
@@ -5230,8 +5722,21 @@ var createCommand = new Command9("create").description("Create and start a new a
   const providerName = opts.provider ?? cfg.effective.box.provider ?? "docker";
   const checkpointRef = resolveCheckpointRef(
     opts,
-    resolveDefaultCheckpoint(cfg.effective, providerName)
+    resolveDefaultCheckpoint(
+      cfg.effective,
+      providerName
+    )
+  );
+  const sizeDefault = resolveBoxSize(
+    cfg.effective,
+    providerName
   );
+  const effectiveSize = opts.size && opts.size.length > 0 ? opts.size : sizeDefault;
+  const imageDefault = resolveBoxImage(
+    cfg.effective,
+    providerName
+  );
+  const effectiveImage = opts.image && opts.image.length > 0 ? opts.image : imageDefault;
   const isDocker = providerName === "docker";
   const isHetzner = providerName === "hetzner";
   let portlessEnabled;
@@ -5258,13 +5763,13 @@ var createCommand = new Command9("create").description("Create and start a new a
       onLog: (line) => cmdLog.write(line)
     });
     if (gate.decision === "cancel") {
-      log14.warn("carry: cancelled \u2014 not creating the box");
+      log15.warn("carry: cancelled \u2014 not creating the box");
       cmdLog.close();
       process.exit(0);
     }
     if (gate.decision === "approve") carryEntries = gate.entries;
   } catch (err) {
-    log14.error(err instanceof Error ? err.message : String(err));
+    log15.error(err instanceof Error ? err.message : String(err));
     cmdLog.close();
     process.exit(1);
   }
@@ -5273,9 +5778,11 @@ var createCommand = new Command9("create").description("Create and start a new a
     yes: !!opts.yes,
     command: "create",
     checkpointRef,
+    checkpointFromDefault: !(opts.snapshot && opts.snapshot.length > 0),
     provider: providerName,
     withEnv: cfg.effective.box.withEnv
   });
+  const effectiveCheckpointRef = wiz.discardCheckpoint ? void 0 : checkpointRef;
   if (wiz.action === "switch-to-claude" && isDocker) {
     process.env[WIZARD_AUTOLAUNCH_ENV] = "1";
     const serialized = serializeEnvFilesForEnv(wiz.envFilesToImport);
@@ -5312,7 +5819,7 @@ var createCommand = new Command9("create").description("Create and start a new a
     } catch (err) {
       if (err instanceof FromBranchError || err instanceof UseBranchError) {
         s.stop("aborting: invalid branch selection");
-        log14.error(err.message);
+        log15.error(err.message);
         cmdLog.close();
         process.exit(2);
       }
@@ -5321,8 +5828,8 @@ var createCommand = new Command9("create").description("Create and start a new a
     const result = await provider.create({
       workspacePath: opts.workspace,
       name: opts.name,
-      checkpointRef,
-      image: cfg.effective.box.image,
+      checkpointRef: effectiveCheckpointRef,
+      image: effectiveImage,
       allowPull: opts.build ? false : void 0,
       imageRegistry: cfg.effective.box.imageRegistry,
       withPlaywright,
@@ -5334,6 +5841,7 @@ var createCommand = new Command9("create").description("Create and start a new a
       bundleDepth: cfg.effective.box.bundleDepth,
       fromBranch,
       useBranch,
+      resyncOnStart: opts.resync,
       projectRoot,
       onLog: (line) => {
         s.message(line);
@@ -5344,6 +5852,7 @@ var createCommand = new Command9("create").description("Create and start a new a
         sharedCache: cfg.effective.box.dockerCacheShared,
         portless: portlessEnabled,
         portlessStateDir: cfg.effective.portless.stateDir || void 0,
+        ...effectiveSize ? { size: effectiveSize } : {},
         // Vercel-only sizing (box.vercelVcpus / vercelTimeoutMs). The cloud
         // scaffold reads these as overrides; other providers ignore them.
         ...provider.name === "vercel" ? {
@@ -5354,17 +5863,19 @@ var createCommand = new Command9("create").description("Create and start a new a
       }
     });
     s.stop(`box ${result.record.container} ready`);
-    log14.info(`id:        ${result.record.id}`);
+    const createResyncWarning = result.resync ? buildResyncWarning(result.resync) : null;
+    if (createResyncWarning) log15.warn(createResyncWarning);
+    log15.info(`id:        ${result.record.id}`);
     if (typeof result.record.projectIndex === "number") {
-      log14.info(`n:         ${String(result.record.projectIndex)}   (in ${projectRoot})`);
+      log15.info(`n:         ${String(result.record.projectIndex)}   (in ${projectRoot})`);
     }
-    log14.info(`container: ${result.record.container}`);
-    log14.info(`image:     ${result.record.image}${result.imageBuilt ? " (built just now)" : ""}`);
+    log15.info(`container: ${result.record.container}`);
+    log15.info(`image:     ${result.record.image}${result.imageBuilt ? " (built just now)" : ""}`);
     if (result.record.snapshotDir) {
-      log14.info(`snapshot:  ${result.record.snapshotDir}`);
+      log15.info(`snapshot:  ${result.record.snapshotDir}`);
     }
     if (result.record.checkpointSource) {
-      log14.info(
+      log15.info(
         `checkpoint: ${result.record.checkpointSource.ref} (${result.record.checkpointSource.type}) \u2192 ${result.record.checkpointImage ?? "(missing)"}`
       );
     }
@@ -5376,7 +5887,7 @@ var createCommand = new Command9("create").description("Create and start a new a
       `  agentbox claude attach ${result.record.name}`,
       `  agentbox url ${result.record.name}`
     ];
-    log14.message(
+    log15.message(
       [
         "",
         "Try it:",
@@ -5395,7 +5906,7 @@ var createCommand = new Command9("create").description("Create and start a new a
           const protectedPaths = boxes.map((b) => b.projectRoot).filter((p) => typeof p === "string");
           const res = await pruneOrphanProjectConfigs({ protectedPaths });
           if (res.removed.length > 0) {
-            log14.info(
+            log15.info(
               `cleaned ${String(res.removed.length)} orphan project config dir(s): ` + res.removed.map((r) => r.originalPath).join(", ")
             );
           }
@@ -5405,7 +5916,7 @@ var createCommand = new Command9("create").description("Create and start a new a
     }
     outro4("done");
     if (attachClaudeAfter) {
-      const { cloudAgentAttach: cloudAgentAttach2 } = await import("./_cloud-attach-XWCVLO5V.js");
+      const { cloudAgentAttach: cloudAgentAttach2 } = await import("./_cloud-attach-XKO4SHR3.js");
       await cloudAgentAttach2({
         box: result.record,
         binary: "claude",
@@ -5421,14 +5932,14 @@ var createCommand = new Command9("create").description("Create and start a new a
     s.stop("failed");
     const msg = err instanceof Error ? err.message : String(err);
     cmdLog.write(`FAIL: ${err instanceof Error ? err.stack ?? err.message : String(err)}`);
-    log14.error(msg);
+    log15.error(msg);
     try {
       const running = execSync('docker ps --format "{{.Names}}"', {
         stdio: ["ignore", "pipe", "ignore"]
       }).toString().split("\n").filter((n) => n.startsWith("agentbox-"));
       if (running.length > 0) {
-        log14.warn(`leftover containers: ${running.join(", ")}`);
-        log14.warn(`remove with: docker rm -f ${running.join(" ")}`);
+        log15.warn(`leftover containers: ${running.join(", ")}`);
+        log15.warn(`remove with: docker rm -f ${running.join(" ")}`);
       }
     } catch {
     }
@@ -5441,7 +5952,7 @@ var createCommand = new Command9("create").description("Create and start a new a
 
 // src/commands/dashboard.ts
 import { spawn as spawn2 } from "child_process";
-import { log as log15 } from "@clack/prompts";
+import { log as log16 } from "@clack/prompts";
 import { Command as Command10 } from "commander";
 
 // src/dashboard/layout.ts
@@ -6039,8 +6550,8 @@ var Compositor = class {
     this.drawChrome();
     this.scheduleRender();
     this.pollTimer = setInterval(() => void this.poll(), POLL_MS);
-    await new Promise((resolve3) => {
-      this.resolveDone = resolve3;
+    await new Promise((resolve4) => {
+      this.resolveDone = resolve4;
     });
   }
   async refreshBoxes() {
@@ -6965,7 +7476,7 @@ function toSidebar(b) {
 var dashboardCommand = new Command10("dashboard").description("Box list + the selected box live Agent session").argument("[box]", "initial box (default: first running box; -p restricts to the cwd project)").option("-p, --project", "only this project's boxes (default: all boxes globally)").action(async (idOrName, opts) => {
   try {
     if (!process.stdout.isTTY || !process.stdin.isTTY) {
-      log15.error("agentbox dashboard needs an interactive terminal");
+      log16.error("agentbox dashboard needs an interactive terminal");
       process.exit(2);
     }
     const backend = await loadPtyBackend();
@@ -6975,10 +7486,10 @@ var dashboardCommand = new Command10("dashboard").description("Box list + the se
       ptySpawn = backend.ptySpawn;
       termCtor = backend.termCtor;
     } else {
-      log15.error(
+      log16.error(
         "agentbox dashboard is unavailable here (native terminal backend failed to load)"
       );
-      log15.info("use `agentbox claude` / `agentbox claude attach` instead");
+      log16.info("use `agentbox claude` / `agentbox claude attach` instead");
       process.exit(2);
     }
     const project = await findProjectRoot(process.cwd());
@@ -7383,11 +7894,11 @@ var dashboardCommand = new Command10("dashboard").description("Box list + the se
 });
 
 // ../../packages/sandbox-daytona/dist/cli.js
-import { log as log16, spinner as spinner6 } from "@clack/prompts";
+import { log as log17, spinner as spinner6 } from "@clack/prompts";
 import { Command as Command11 } from "commander";
 function reportError(err) {
   const message = err instanceof Error ? err.message : String(err);
-  log16.error(message);
+  log17.error(message);
   process.exitCode = 1;
 }
 var loginSub = new Command11("login").description("Set up (or rotate) Daytona credentials for cloud boxes").option("--status", "show what is currently configured (masked) and exit").action(async (opts) => {
@@ -7446,7 +7957,7 @@ var resyncSub = new Command11("resync").description(
     const sb = spinner6();
     sb.start(`provisioning throwaway sandbox to refresh: ${agents.join(", ")}`);
     const ensured = await ensureAgentVolumesForCloud(daytonaBackend, {
-      onLog: (line) => log16.info(line)
+      onLog: (line) => log17.info(line)
     });
     if (ensured.agents.length === 0) {
       sb.stop("no agent volumes available \u2014 the daytona backend has no volume primitive");
@@ -7486,7 +7997,7 @@ var resyncSub = new Command11("resync").description(
       }
       sb3.stop("throwaway sandbox destroyed");
     }
-    log16.success(
+    log17.success(
       `Daytona agent volumes refreshed: ${agents.join(", ")}. Next \`agentbox create --provider daytona\` will use the updated credentials.`
     );
   } catch (err) {
@@ -7506,11 +8017,11 @@ var dockerCommand = new Command12("docker").description(
 });
 
 // ../../packages/sandbox-hetzner/dist/cli.js
-import { log as log17 } from "@clack/prompts";
+import { log as log18 } from "@clack/prompts";
 import { Command as Command13 } from "commander";
 function reportError2(err) {
   const message = err instanceof Error ? err.message : String(err);
-  log17.error(message);
+  log18.error(message);
   process.exitCode = 1;
 }
 var loginSub2 = new Command13("login").description("Set up (or rotate) Hetzner Cloud credentials for VPS boxes").option("--status", "show what is currently configured (masked) and exit").action(async (opts) => {
@@ -7654,11 +8165,11 @@ var hetznerCommand = new Command13("hetzner").description(
 ).addCommand(loginSub2, { isDefault: true }).addCommand(firewallSub);
 
 // ../../packages/sandbox-vercel/dist/cli.js
-import { log as log18 } from "@clack/prompts";
+import { log as log19 } from "@clack/prompts";
 import { Command as Command14 } from "commander";
 function reportError3(err) {
   const message = err instanceof Error ? err.message : String(err);
-  log18.error(message);
+  log19.error(message);
   process.exitCode = 1;
 }
 function relativeExpiry(expiresAt) {
@@ -7729,7 +8240,7 @@ var vercelCommand = new Command14("vercel").description(
 ).addCommand(loginSub3, { isDefault: true });
 
 // src/commands/destroy.ts
-import { confirm as confirm7, isCancel as isCancel8, log as log19 } from "@clack/prompts";
+import { confirm as confirm7, isCancel as isCancel8, log as log20 } from "@clack/prompts";
 import { Command as Command15 } from "commander";
 var destroyCommand = new Command15("destroy").alias("rm").description("Destroy a box and discard its container writable layer (where /workspace lived)").argument(
   "[box]",
@@ -7738,7 +8249,7 @@ var destroyCommand = new Command15("destroy").alias("rm").description("Destroy a
   try {
     const box = await resolveBoxOrExit(idOrName);
     if (!opts.yes) {
-      log19.warn("Will also wipe the box volume and agent work-in-progress");
+      log20.warn("Will also wipe the box volume and agent work-in-progress");
       const rootBranch = box.gitWorktrees?.find((w) => w.kind === "root")?.branch;
       const lines = [box.name];
       if (rootBranch) lines.push(`branch:    ${rootBranch}`);
@@ -7746,13 +8257,13 @@ var destroyCommand = new Command15("destroy").alias("rm").description("Destroy a
       if (box.snapshotDir) {
         lines.push(`snapshot:  ${box.snapshotDir}${opts.keepSnapshot ? " (will be kept)" : ""}`);
       }
-      log19.info(lines.join("\n"));
+      log20.info(lines.join("\n"));
       const ok = await confirm7({
         message: "Destroy this box?",
         initialValue: false
       });
       if (isCancel8(ok) || !ok) {
-        log19.info("cancelled");
+        log20.info("cancelled");
         return;
       }
     }
@@ -7785,11 +8296,11 @@ var destroyCommand = new Command15("destroy").alias("rm").description("Destroy a
 });
 
 // src/commands/download.ts
-import { confirm as confirm13, isCancel as isCancel14, log as log25 } from "@clack/prompts";
+import { confirm as confirm13, isCancel as isCancel14, log as log26 } from "@clack/prompts";
 import { Command as Command21 } from "commander";
 
 // src/commands/download-claude.ts
-import { confirm as confirm8, isCancel as isCancel9, log as log20 } from "@clack/prompts";
+import { confirm as confirm8, isCancel as isCancel9, log as log21 } from "@clack/prompts";
 import { Command as Command16 } from "commander";
 function tag(item) {
   const noun = item.category === "plugins" ? "plugin" : item.category.replace(/s$/, "");
@@ -7805,7 +8316,7 @@ var downloadClaudeCommand = new Command16("claude").description(
     const box = await resolveBoxOrExit(idOrName);
     const volume = box.claudeConfigVolume ?? resolveClaudeVolume({ isolate: false, boxId: box.id }).volume;
     if (volume === SHARED_CLAUDE_VOLUME) {
-      log20.warn(
+      log21.warn(
         `Reading the shared ${SHARED_CLAUDE_VOLUME} volume \u2014 it aggregates Claude extensions installed in ANY box, not just ${box.name}.`
       );
     }
@@ -7835,7 +8346,7 @@ var downloadClaudeCommand = new Command16("claude").description(
         initialValue: false
       });
       if (isCancel9(ok) || !ok) {
-        log20.info("cancelled");
+        log21.info("cancelled");
         return;
       }
     }
@@ -7850,7 +8361,7 @@ var downloadClaudeCommand = new Command16("claude").description(
 });
 
 // src/commands/download-codex.ts
-import { confirm as confirm9, isCancel as isCancel10, log as log21 } from "@clack/prompts";
+import { confirm as confirm9, isCancel as isCancel10, log as log22 } from "@clack/prompts";
 import { Command as Command17 } from "commander";
 var downloadCodexCommand = new Command17("codex").description(
   "Download box-side Codex config/auth (config.toml, auth.json, prompts) back to host ~/.codex (additive)"
@@ -7862,7 +8373,7 @@ var downloadCodexCommand = new Command17("codex").description(
     const box = await resolveBoxOrExit(idOrName);
     const volume = box.codexConfigVolume ?? resolveCodexVolume({ isolate: false, boxId: box.id }).volume;
     if (volume === SHARED_CODEX_VOLUME) {
-      log21.warn(
+      log22.warn(
         `Reading the shared ${SHARED_CODEX_VOLUME} volume \u2014 it aggregates Codex config from ANY box, not just ${box.name}.`
       );
     }
@@ -7888,7 +8399,7 @@ var downloadCodexCommand = new Command17("codex").description(
         initialValue: false
       });
       if (isCancel10(ok) || !ok) {
-        log21.info("cancelled");
+        log22.info("cancelled");
         return;
       }
     }
@@ -7901,7 +8412,7 @@ var downloadCodexCommand = new Command17("codex").description(
 });
 
 // src/commands/download-opencode.ts
-import { confirm as confirm10, isCancel as isCancel11, log as log22 } from "@clack/prompts";
+import { confirm as confirm10, isCancel as isCancel11, log as log23 } from "@clack/prompts";
 import { Command as Command18 } from "commander";
 var downloadOpencodeCommand = new Command18("opencode").description(
   "Download box-side OpenCode config/auth (auth.json, opencode.json, agents, commands, themes) back to host ~/.config + ~/.local/share opencode (additive)"
@@ -7913,7 +8424,7 @@ var downloadOpencodeCommand = new Command18("opencode").description(
     const box = await resolveBoxOrExit(idOrName);
     const volume = box.opencodeConfigVolume ?? resolveOpencodeVolume({ isolate: false, boxId: box.id }).volume;
     if (volume === SHARED_OPENCODE_VOLUME) {
-      log22.warn(
+      log23.warn(
         `Reading the shared ${SHARED_OPENCODE_VOLUME} volume \u2014 it aggregates OpenCode config from ANY box, not just ${box.name}.`
       );
     }
@@ -7939,7 +8450,7 @@ var downloadOpencodeCommand = new Command18("opencode").description(
         initialValue: false
       });
       if (isCancel11(ok) || !ok) {
-        log22.info("cancelled");
+        log23.info("cancelled");
         return;
       }
     }
@@ -7952,7 +8463,7 @@ var downloadOpencodeCommand = new Command18("opencode").description(
 });
 
 // src/commands/download-config.ts
-import { confirm as confirm11, isCancel as isCancel12, log as log23 } from "@clack/prompts";
+import { confirm as confirm11, isCancel as isCancel12, log as log24 } from "@clack/prompts";
 import { Command as Command19 } from "commander";
 function tagChange(line) {
   const sp = line.indexOf(" ");
@@ -7970,15 +8481,15 @@ var downloadConfigCommand = new Command19("config").description("Download agentb
     const box = await resolveBoxOrExit(idOrName);
     const insp = await inspectBox(box.id);
     if (insp.state === "paused") {
-      log23.info("box is paused; unpausing");
+      log24.info("box is paused; unpausing");
       await unpauseBox(box.id);
     } else if (insp.state === "stopped") {
-      log23.info("box is stopped; starting");
+      log24.info("box is stopped; starting");
       await startBox(box.id);
     } else if (insp.state === "missing") {
       throw new Error(`box ${box.name} has no container; was it destroyed?`);
     }
-    log23.info(`agentbox.yaml bypasses gitignore and copies directly into ${box.workspacePath}`);
+    log24.info(`agentbox.yaml bypasses gitignore and copies directly into ${box.workspacePath}`);
     const preview = await pullToHost(box, {
       dryRun: true,
       respectGitignore: false,
@@ -8006,7 +8517,7 @@ var downloadConfigCommand = new Command19("config").description("Download agentb
         initialValue: false
       });
       if (isCancel12(ok) || !ok) {
-        log23.info("cancelled");
+        log24.info("cancelled");
         return;
       }
     }
@@ -8028,7 +8539,7 @@ var downloadConfigCommand = new Command19("config").description("Download agentb
 });
 
 // src/commands/download-env.ts
-import { confirm as confirm12, isCancel as isCancel13, log as log24 } from "@clack/prompts";
+import { confirm as confirm12, isCancel as isCancel13, log as log25 } from "@clack/prompts";
 import { Command as Command20 } from "commander";
 function tagChange2(line) {
   const sp = line.indexOf(" ");
@@ -8052,15 +8563,15 @@ var downloadEnvCommand = new Command20("env").description(
     const box = await resolveBoxOrExit(idOrName);
     const insp = await inspectBox(box.id);
     if (insp.state === "paused") {
-      log24.info("box is paused; unpausing");
+      log25.info("box is paused; unpausing");
       await unpauseBox(box.id);
     } else if (insp.state === "stopped") {
-      log24.info("box is stopped; starting");
+      log25.info("box is stopped; starting");
       await startBox(box.id);
     } else if (insp.state === "missing") {
       throw new Error(`box ${box.name} has no container; was it destroyed?`);
     }
-    log24.info(
+    log25.info(
       `env/config files bypass gitignore and copy directly into ${box.workspacePath}`
     );
     const patterns = [...DEFAULT_ENV_PATTERNS, ...opts.pattern];
@@ -8091,7 +8602,7 @@ var downloadEnvCommand = new Command20("env").description(
         initialValue: false
       });
       if (isCancel13(ok) || !ok) {
-        log24.info("cancelled");
+        log25.info("cancelled");
         return;
       }
     }
@@ -8139,7 +8650,7 @@ var downloadCommand = new Command21("download").enablePositionalOptions().descri
         throw new Error("cloud download does not yet support --dry-run; omit to bulk-pull /workspace.");
       }
       if (!opts.respectGitignore || opts.includeNodeModules || opts.withEnv || opts.pattern.length > 0) {
-        log25.warn(
+        log26.warn(
           "cloud download ignores gitignore/--with-env/--pattern filters in v1 \u2014 pulling the whole /workspace tree (Phase 6 polish)."
         );
       }
@@ -8149,7 +8660,7 @@ var downloadCommand = new Command21("download").enablePositionalOptions().descri
           initialValue: false
         });
         if (isCancel14(ok) || !ok) {
-          log25.info("cancelled");
+          log26.info("cancelled");
           return;
         }
       }
@@ -8168,17 +8679,17 @@ var downloadCommand = new Command21("download").enablePositionalOptions().descri
     }
     const insp = await inspectBox(box.id);
     if (insp.state === "paused") {
-      log25.info("box is paused; unpausing");
+      log26.info("box is paused; unpausing");
       await unpauseBox(box.id);
     } else if (insp.state === "stopped") {
-      log25.info("box is stopped; starting");
+      log26.info("box is stopped; starting");
       await startBox(box.id);
     } else if (insp.state === "missing") {
       throw new Error(`box ${box.name} has no container; was it destroyed?`);
     }
     const rootWorktree = box.gitWorktrees?.find((w) => w.kind === "root");
     if (rootWorktree) {
-      log25.warn(
+      log26.warn(
         `This box has been committing to branch \`${rootWorktree.branch}\` in a separate worktree.
 For a git-aware merge instead of a file copy, run from your checkout:
   git merge ${rootWorktree.branch}
@@ -8214,7 +8725,7 @@ Continuing with rsync into ${box.workspacePath}`
         initialValue: false
       });
       if (isCancel14(ok) || !ok) {
-        log25.info("cancelled");
+        log26.info("cancelled");
         return;
       }
     }
@@ -8242,7 +8753,7 @@ downloadCommand.addCommand(downloadOpencodeCommand);
 downloadCommand.addCommand(downloadConfigCommand);
 
 // src/commands/drive.ts
-import { log as log26 } from "@clack/prompts";
+import { log as log27 } from "@clack/prompts";
 import { Command as Command22 } from "commander";
 
 // src/lib/drive/keys.ts
@@ -8528,7 +9039,7 @@ var driveWaitCommand = new Command22("wait").description("Block until --text app
         }) + "\n"
       );
     } else {
-      log26.error(`text not found within ${String(timeoutMs)}ms: ${opts.text}`);
+      log27.error(`text not found within ${String(timeoutMs)}ms: ${opts.text}`);
     }
     process.exit(1);
   } catch (err) {
@@ -8555,8 +9066,8 @@ driveCommand.addCommand(driveWaitCommand);
 driveCommand.addCommand(driveResizeCommand);
 function handleDriveError(err) {
   if (err instanceof SessionNotFoundError) {
-    log26.error(err.message);
-    log26.info("start an agent first (e.g. `agentbox claude <box>`) or pass --session.");
+    log27.error(err.message);
+    log27.info("start an agent first (e.g. `agentbox claude <box>`) or pass --session.");
     process.exit(2);
   }
   handleLifecycleError(err);
@@ -8580,11 +9091,11 @@ function sleep2(ms) {
 }
 
 // src/commands/fork.ts
-import { log as log27 } from "@clack/prompts";
+import { log as log28 } from "@clack/prompts";
 import { Command as Command23 } from "commander";
-import { existsSync as existsSync4, readdirSync, statSync } from "fs";
-import { homedir as homedir11 } from "os";
-import { join as join12 } from "path";
+import { existsSync as existsSync5, readdirSync, statSync } from "fs";
+import { homedir as homedir12 } from "os";
+import { join as join14 } from "path";
 var FORK_AGENTS = ["claude", "codex", "opencode"];
 var AGENT_COMMAND = {
   claude: claudeCommand,
@@ -8604,12 +9115,12 @@ function resolveSessionArgs(agent, opts) {
   }
   if (opts.session) return ["--resume", opts.session];
   if (agent === "codex") return ["--continue"];
-  const dir = join12(homedir11(), ".claude", "projects", encodeClaudeProjectsDir(opts.workspace));
-  if (!existsSync4(dir)) return ["--continue"];
+  const dir = join14(homedir12(), ".claude", "projects", encodeClaudeProjectsDir(opts.workspace));
+  if (!existsSync5(dir)) return ["--continue"];
   const now = Date.now();
   const recent = readdirSync(dir).filter((f) => f.endsWith(".jsonl")).map((f) => {
     try {
-      return statSync(join12(dir, f)).mtimeMs;
+      return statSync(join14(dir, f)).mtimeMs;
     } catch {
       return 0;
     }
@@ -8641,27 +9152,44 @@ var forkCommand = new Command23("fork").description(
 ).option(
   "--session <id>",
   "host agent session id to resume (default: the newest session for this cwd; claude refuses if several were used recently). Ignored for --agent opencode."
-).option("--provider <name>", "sandbox backend: 'docker' (default), 'daytona', or 'hetzner'").option("-n, --name <name>", "box name (default: fork-<HHMMSS>)").option(
+).option(
+  "--provider <name>",
+  "sandbox backend: 'docker' (default), 'daytona', or 'hetzner', or 'vercel'"
+).option("-n, --name <name>", "box name (default: fork-<HHMMSS>)").option(
   "--attach-in <mode>",
   "where to open the forked session: window | tab | split | background | same (default: tab). Falls back to background outside tmux/iTerm."
 ).option(
-  "--carry-yes",
-  "auto-approve agentbox.yaml's carry: block (fork skips carry by default \u2014 it does not silently re-copy host files into the new box)"
+  "--carry <mode>",
+  "carry: block handling \u2014 'send' (default) copies agentbox.yaml's declared host files into the box; 'skip' disables it. Host\u2192box copy is safe (the host is trusted; the box is the untrusted side).",
+  "send"
+).option(
+  "--plan <path>",
+  'copy a Claude Code plan file (e.g. ~/.claude/plans/<slug>.md) into the box, start claude in plan mode, and seed a "resume the plan" prompt. Claude only.'
 ).action(async (opts) => {
   if ((process.env.AGENTBOX_RELAY_URL ?? "").trim().length > 0) {
-    log27.error(
+    log28.error(
       "agentbox fork runs on the host only: it teleports a host agent session into a new box. You appear to be inside a box (AGENTBOX_RELAY_URL is set) \u2014 box\u2192box fork is not supported yet."
     );
     process.exit(2);
   }
   const agent = opts.agent?.trim() || "claude";
   if (!FORK_AGENTS.includes(agent)) {
-    log27.error(`--agent: expected one of ${FORK_AGENTS.join(", ")}, got "${opts.agent ?? ""}"`);
+    log28.error(`--agent: expected one of ${FORK_AGENTS.join(", ")}, got "${opts.agent ?? ""}"`);
     process.exit(2);
   }
   const attachIn = opts.attachIn ?? "tab";
   if (!FORK_ATTACH_VALUES.includes(attachIn)) {
-    log27.error(`--attach-in: expected one of ${FORK_ATTACH_VALUES.join(", ")}, got "${attachIn}"`);
+    log28.error(`--attach-in: expected one of ${FORK_ATTACH_VALUES.join(", ")}, got "${attachIn}"`);
+    process.exit(2);
+  }
+  const plan = opts.plan?.trim();
+  if (plan && agent !== "claude") {
+    log28.error("--plan is only supported with --agent claude (plan mode is Claude-specific).");
+    process.exit(2);
+  }
+  const carryMode = opts.carry ?? "send";
+  if (carryMode !== "send" && carryMode !== "skip") {
+    log28.error(`--carry: expected 'send' or 'skip', got "${opts.carry ?? ""}"`);
     process.exit(2);
   }
   const provider = opts.provider?.trim();
@@ -8669,17 +9197,21 @@ var forkCommand = new Command23("fork").description(
   try {
     sessionArgs = resolveSessionArgs(agent, opts);
   } catch (err) {
-    log27.error(err instanceof Error ? err.message : String(err));
+    log28.error(err instanceof Error ? err.message : String(err));
     process.exit(2);
   }
   const subArgv = [
     "-y",
-    ...opts.carryYes ? ["--carry-yes"] : ["--carry", "skip"],
+    // Host is trusted, the box is the unsafe side, so host→box carry is safe:
+    // fork sends the declared carry: block by default (--carry-yes auto-approves
+    // the same gate create uses). `--carry skip` opts out.
+    ...carryMode === "skip" ? ["--carry", "skip"] : ["--carry-yes"],
     "-w",
     opts.workspace,
     "-n",
     opts.name ?? defaultForkName(),
     ...provider ? ["--provider", provider] : [],
+    ...plan ? ["--plan", plan] : [],
     ...sessionArgs,
     ...resolveAttachArgs(attachIn)
   ];
@@ -8687,17 +9219,25 @@ var forkCommand = new Command23("fork").description(
 });
 
 // src/commands/install.ts
-import { confirm as confirm14, intro as intro6, isCancel as isCancel15, log as log29, note as note2, outro as outro5, select as select2, spinner as spinner8 } from "@clack/prompts";
+import { confirm as confirm14, intro as intro6, isCancel as isCancel15, log as log30, note as note2, outro as outro5, select as select2, spinner as spinner8 } from "@clack/prompts";
 import { Command as Command25 } from "commander";
-import { existsSync as existsSync6, mkdirSync as mkdirSync5, readFileSync, writeFileSync as writeFileSync4 } from "fs";
-import { homedir as homedir14 } from "os";
-import { dirname as dirname2, join as join15, resolve as resolve2 } from "path";
+import {
+  existsSync as existsSync7,
+  lstatSync,
+  mkdirSync as mkdirSync5,
+  readFileSync,
+  rmSync,
+  symlinkSync as symlinkSync2,
+  writeFileSync as writeFileSync4
+} from "fs";
+import { homedir as homedir15 } from "os";
+import { dirname as dirname2, join as join17, resolve as resolve3, sep } from "path";
 import { fileURLToPath } from "url";
 
 // src/lib/doctor-checks.ts
 import { accessSync, constants as fsConstants, mkdirSync as mkdirSync3 } from "fs";
-import { homedir as homedir12 } from "os";
-import { join as join13 } from "path";
+import { homedir as homedir13 } from "os";
+import { join as join15 } from "path";
 import { execa as execa2 } from "execa";
 var ALL_PROVIDERS = ["docker", "daytona", "hetzner", "vercel"];
 var NODE_MIN_MAJOR = 20;
@@ -8745,7 +9285,7 @@ function checkPlatform() {
   };
 }
 function checkAgentboxHome() {
-  const dir = join13(homedir12(), ".agentbox");
+  const dir = join15(homedir13(), ".agentbox");
   try {
     mkdirSync3(dir, { recursive: true });
     accessSync(dir, fsConstants.W_OK);
@@ -8817,7 +9357,7 @@ async function dockerChecks() {
     ];
   }
   const daemonRes = { label: "docker daemon", status: "ok", detail: "reachable" };
-  const mod = await import("./dist-ASLPRUQR.js");
+  const mod = await import("./dist-RZZSSUNB.js");
   let imgRes;
   try {
     const img = await mod.imageInfo(mod.DEFAULT_BOX_IMAGE);
@@ -8848,7 +9388,7 @@ async function dockerChecks() {
 }
 async function daytonaChecks() {
   try {
-    const mod = await import("./dist-PTJ6CEQY.js");
+    const mod = await import("./dist-47LVLYUV.js");
     const status = await mod.getDaytonaStatus();
     if (!status.configured) {
       return [
@@ -8884,7 +9424,7 @@ async function daytonaChecks() {
 }
 async function hetznerChecks() {
   try {
-    const mod = await import("./dist-WMQDMTWS.js");
+    const mod = await import("./dist-SWUOU34W.js");
     const cred = mod.readHetznerCredStatus();
     const credRes = cred.source === "none" ? {
       label: "credentials",
@@ -8916,7 +9456,7 @@ async function hetznerChecks() {
 }
 async function vercelChecks() {
   try {
-    const mod = await import("./dist-RAZP76VX.js");
+    const mod = await import("./dist-24PY2ZMO.js");
     const cred = mod.readVercelCredStatus();
     const credRes = cred.auth === "none" ? {
       label: "credentials",
@@ -9042,15 +9582,15 @@ function formatDetailed(groups) {
 }
 
 // src/lib/first-run.ts
-import { existsSync as existsSync5, mkdirSync as mkdirSync4, writeFileSync as writeFileSync3 } from "fs";
-import { homedir as homedir13 } from "os";
-import { dirname, join as join14 } from "path";
+import { existsSync as existsSync6, mkdirSync as mkdirSync4, writeFileSync as writeFileSync3 } from "fs";
+import { homedir as homedir14 } from "os";
+import { dirname, join as join16 } from "path";
 var MARKER_VERSION = 1;
 function setupMarkerPath() {
-  return join14(homedir13(), ".agentbox", "setup-complete.json");
+  return join16(homedir14(), ".agentbox", "setup-complete.json");
 }
 function isFirstRun() {
-  return !existsSync5(setupMarkerPath());
+  return !existsSync6(setupMarkerPath());
 }
 function markSetupComplete(provider) {
   const path = setupMarkerPath();
@@ -9064,7 +9604,7 @@ function markSetupComplete(provider) {
 }
 
 // src/commands/prepare.ts
-import { intro as intro5, log as log28, spinner as spinner7 } from "@clack/prompts";
+import { intro as intro5, log as log29, spinner as spinner7 } from "@clack/prompts";
 import { Command as Command24 } from "commander";
 async function dockerStatus() {
   let img;
@@ -9127,7 +9667,7 @@ async function renderDocker(status) {
 }
 async function daytonaStatus() {
   try {
-    const mod = await import("./dist-PTJ6CEQY.js");
+    const mod = await import("./dist-47LVLYUV.js");
     return await mod.getDaytonaStatus();
   } catch (err) {
     return {
@@ -9201,7 +9741,7 @@ async function runPrepare(providerName, opts = {}) {
   }
   const provider = await getProvider(providerName);
   if (typeof provider.prepare !== "function") {
-    log28.error(`provider '${providerName}' does not implement prepare`);
+    log29.error(`provider '${providerName}' does not implement prepare`);
     process.exit(1);
   }
   const cwd = opts.cwd ?? process.cwd();
@@ -9219,25 +9759,41 @@ async function runPrepare(providerName, opts = {}) {
     });
     if (result.snapshotName !== void 0) {
       sp.stop(`prepared ${providerName}: snapshot '${result.snapshotName}'`);
+      const configKey = boxImageConfigKey(providerName);
       try {
-        const written = await setConfigValue("project", "box.image", result.snapshotName, cwd);
-        log28.success(`box.image = ${result.snapshotName} (written to ${written.path})`);
+        const written = await setConfigValue("project", configKey, result.snapshotName, cwd);
+        log29.success(`${configKey} = ${result.snapshotName} (written to ${written.path})`);
       } catch (err) {
         const msg = err instanceof Error ? err.message : String(err);
-        log28.warn(
+        log29.warn(
           `prepared snapshot '${result.snapshotName}', but failed to pin it into the project config: ${msg}
-Run \`agentbox config set --project box.image ${result.snapshotName}\` manually.`
+Run \`agentbox config set --project ${configKey} ${result.snapshotName}\` manually.`
         );
       }
     } else {
       sp.stop(`${providerName.slice(0, 1).toUpperCase() + providerName.slice(1)} provider ready`);
     }
+    try {
+      const cfg = await loadEffectiveConfig(cwd).catch(() => null);
+      const projectImage = cfg?.layers.project.values.box?.image;
+      if (typeof projectImage === "string" && projectImage.length > 0 && projectImage !== DEFAULT_BOX_IMAGE) {
+        const cleared = await unsetConfigValue("project", "box.image", cwd);
+        if (cleared.existed) {
+          log29.warn(
+            `migrated stale \`box.image\` from a previous prepare (was \`${projectImage}\`); re-set manually if you actually meant it: \`agentbox config set --project box.image <ref>\``
+          );
+        }
+      }
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      log29.warn(`could not migrate stale box.image (continuing): ${msg}`);
+    }
     if (!opts.suppressStatus) {
       process.stdout.write("\n");
       await showStatus({ onlyProvider: providerName });
     }
     if (!opts.suppressTip) {
-      log28.info(
+      log29.info(
         "tip: install the agentbox host skill so Claude Code on this machine can drive AgentBox for you:\n  npx skills add https://github.com/madarco/agentbox --skill agentbox"
       );
     }
@@ -9369,40 +9925,53 @@ ${LOGO_L2}\x1B[0m` + SYNC_END2);
 }
 var LEGACY_INFO_MARKER = "Drive AgentBox from the host:";
 function installTargets() {
-  const home = homedir14();
-  const claudeSkills = join15(home, ".claude", "skills");
+  const home = homedir15();
+  const claudeSkills = join17(home, ".claude", "skills");
   return [
-    { src: join15("agentbox", "SKILL.md"), dest: join15(claudeSkills, "agentbox", "SKILL.md") },
+    { src: join17("agentbox", "SKILL.md"), dest: join17(claudeSkills, "agentbox", "SKILL.md") },
     {
-      src: join15("agentbox-info", "SKILL.md"),
-      dest: join15(claudeSkills, "agentbox-info", "SKILL.md")
+      src: join17("agentbox-info", "SKILL.md"),
+      dest: join17(claudeSkills, "agentbox-info", "SKILL.md")
     },
     {
-      src: join15("codex", "agentbox.md"),
-      dest: join15(home, ".codex", "prompts", "agentbox.md"),
-      gateDir: join15(home, ".codex")
+      src: join17("codex", "agentbox.md"),
+      dest: join17(home, ".codex", "prompts", "agentbox.md"),
+      gateDir: join17(home, ".codex")
     },
     {
-      src: join15("opencode", "agentbox.md"),
-      dest: join15(home, ".config", "opencode", "commands", "agentbox.md"),
-      gateDir: join15(home, ".config", "opencode")
+      src: join17("opencode", "agentbox.md"),
+      dest: join17(home, ".config", "opencode", "commands", "agentbox.md"),
+      gateDir: join17(home, ".config", "opencode")
     }
   ];
 }
 function resolveHostSkillsDir() {
   const here = dirname2(fileURLToPath(import.meta.url));
   const candidates = [
-    resolve2(here, "..", "share", "host-skills"),
-    resolve2(here, "..", "..", "share", "host-skills")
+    resolve3(here, "..", "share", "host-skills"),
+    resolve3(here, "..", "..", "share", "host-skills")
   ];
   for (const c of candidates) {
-    if (existsSync6(c)) return c;
+    if (existsSync7(c)) return c;
   }
   throw new Error(`could not locate bundled host skills; tried:
   ${candidates.join("\n  ")}`);
 }
+function isSymlink(target) {
+  try {
+    return lstatSync(target).isSymbolicLink();
+  } catch {
+    return false;
+  }
+}
+function isSourceCheckout(srcDir) {
+  return !srcDir.split(sep).includes("node_modules");
+}
 function writableReason(target, force) {
-  if (!existsSync6(target)) return "new";
+  if (!existsSync7(target)) {
+    if (isSymlink(target)) return "managed";
+    return "new";
+  }
   const existing = readFileSync(target, "utf8");
   if (existing.includes(MANAGED_SENTINEL) || existing.includes(LEGACY_INFO_MARKER)) {
     return "managed";
@@ -9414,31 +9983,38 @@ function installHostSkills(opts = {}) {
   const dryRun = opts.dryRun === true;
   const quiet = opts.quiet === true;
   const srcDir = resolveHostSkillsDir();
+  const link = isSourceCheckout(srcDir);
   const written = [];
   const blocked = [];
   let skipped = 0;
   for (const t of installTargets()) {
-    const src = join15(srcDir, t.src);
-    if (!existsSync6(src)) {
-      if (!quiet) log29.warn(`bundled file missing (skipped): ${src}`);
+    const src = join17(srcDir, t.src);
+    if (!existsSync7(src)) {
+      if (!quiet) log30.warn(`bundled file missing (skipped): ${src}`);
       skipped++;
       continue;
     }
-    if (t.gateDir && !existsSync6(t.gateDir)) continue;
+    if (t.gateDir && !existsSync7(t.gateDir)) continue;
     const reason = writableReason(t.dest, force);
     if (reason === "skip") {
-      if (!quiet) log29.warn(`user-modified file at ${t.dest}, skipping; pass --force to overwrite`);
+      if (!quiet) log30.warn(`user-modified file at ${t.dest}, skipping; pass --force to overwrite`);
       blocked.push(t.dest);
       skipped++;
       continue;
     }
     if (dryRun) {
-      if (!quiet) log29.info(`would write ${t.dest} (${reason})`);
+      if (!quiet) log30.info(`would ${link ? "link" : "write"} ${t.dest} (${reason})`);
       written.push(t.dest);
       continue;
     }
     mkdirSync5(dirname2(t.dest), { recursive: true });
-    writeFileSync4(t.dest, readFileSync(src, "utf8"));
+    if (link) {
+      rmSync(t.dest, { force: true });
+      symlinkSync2(resolve3(srcDir, t.src), t.dest);
+    } else {
+      if (isSymlink(t.dest)) rmSync(t.dest, { force: true });
+      writeFileSync4(t.dest, readFileSync(src, "utf8"));
+    }
     written.push(t.dest);
   }
   return { written, skipped, blocked };
@@ -9465,10 +10041,10 @@ function ensureTty() {
 async function runProviderLogin(name) {
   if (name === "docker") return true;
   if (name === "daytona") {
-    const mod2 = await import("./dist-PTJ6CEQY.js");
+    const mod2 = await import("./dist-47LVLYUV.js");
     const status2 = await mod2.getDaytonaStatus();
     if (status2.configured) {
-      log29.info("daytona: already configured");
+      log30.info("daytona: already configured");
       const rotate = await confirm14({ message: "Re-authenticate Daytona?", initialValue: false });
       if (isCancel15(rotate)) return false;
       if (rotate) await mod2.ensureDaytonaCredentials({ force: true });
@@ -9478,10 +10054,10 @@ async function runProviderLogin(name) {
     return true;
   }
   if (name === "hetzner") {
-    const mod2 = await import("./dist-WMQDMTWS.js");
+    const mod2 = await import("./dist-SWUOU34W.js");
     const status2 = mod2.readHetznerCredStatus();
     if (status2.source !== "none") {
-      log29.info("hetzner: already configured");
+      log30.info("hetzner: already configured");
       const rotate = await confirm14({ message: "Re-authenticate Hetzner?", initialValue: false });
       if (isCancel15(rotate)) return false;
       if (rotate) await mod2.ensureHetznerCredentials({ force: true });
@@ -9490,10 +10066,10 @@ async function runProviderLogin(name) {
     await mod2.ensureHetznerCredentials();
     return true;
   }
-  const mod = await import("./dist-RAZP76VX.js");
+  const mod = await import("./dist-24PY2ZMO.js");
   const status = mod.readVercelCredStatus();
   if (status.auth !== "none") {
-    log29.info(`vercel: already configured (${status.auth})`);
+    log30.info(`vercel: already configured (${status.auth})`);
     const rotate = await confirm14({ message: "Re-authenticate Vercel?", initialValue: false });
     if (isCancel15(rotate)) return false;
     if (rotate) await mod.ensureVercelCredentials({ force: true });
@@ -9524,8 +10100,8 @@ async function runInstallWizard(opts = {}) {
   process.stdout.write("  " + formatCompact([sysGroup]) + "\n");
   const hardFail = sysResults.find((r) => r.status === "fail");
   if (hardFail) {
-    log29.error(`system check failed: ${hardFail.label} \u2014 ${hardFail.detail}`);
-    log29.info("run `agentbox doctor` for full detail");
+    log30.error(`system check failed: ${hardFail.label} \u2014 ${hardFail.detail}`);
+    log30.info("run `agentbox doctor` for full detail");
     const cont = await confirm14({ message: "Continue anyway?", initialValue: false });
     if (isCancel15(cont) || !cont) {
       outro5("aborted");
@@ -9536,7 +10112,7 @@ async function runInstallWizard(opts = {}) {
   if (opts.provider) {
     const candidate = opts.provider.trim();
     if (!isProviderName(candidate)) {
-      log29.error(`unknown --provider: ${candidate}`);
+      log30.error(`unknown --provider: ${candidate}`);
       return false;
     }
     providerName = candidate;
@@ -9578,12 +10154,12 @@ async function runInstallWizard(opts = {}) {
         suppressTip: true
       });
     } catch (err) {
-      log29.warn(
+      log30.warn(
         `prepare failed: ${err instanceof Error ? err.message : String(err)} \u2014 you can rerun \`agentbox prepare --provider ${providerName}\` later`
       );
     }
   } else {
-    log29.info(
+    log30.info(
       `skipped \u2014 the ${providerName} base will build lazily on first \`agentbox ${providerName === "docker" ? "" : providerName + " "}create\``
     );
   }
@@ -9598,14 +10174,14 @@ async function runInstallWizard(opts = {}) {
       sp.stop(`Agentbox Skills: nothing to write (${String(skillRes.skipped)} skipped)`);
     }
     if (skillRes.blocked.length > 0) {
-      log29.warn(
+      log30.warn(
         `user-modified host skill file(s) left in place: ${skillRes.blocked.join(", ")}
 pass \`agentbox install --skills-only --force\` to overwrite`
       );
     }
   } catch (err) {
     sp.stop("Agentbox Skills: failed");
-    log29.warn(err instanceof Error ? err.message : String(err));
+    log30.warn(err instanceof Error ? err.message : String(err));
   }
   markSetupComplete(providerName);
   const providerGroup = await runProviderChecks(providerName);
@@ -9631,7 +10207,7 @@ var installCommand = new Command25("install").description(
     try {
       res = installHostSkills({ force: opts.force, dryRun: opts.dryRun });
     } catch (err) {
-      log29.error(err instanceof Error ? err.message : String(err));
+      log30.error(err instanceof Error ? err.message : String(err));
       process.exit(1);
     }
     if (opts.dryRun) {
@@ -9798,6 +10374,8 @@ var PR_OP_DESCRIPTIONS = {
   create: "Open a PR for the box's branch (host `gh pr create`, no prompt).",
   view: "Show a PR (read-only).",
   list: "List PRs (read-only).",
+  diff: "Show a PR diff (read-only).",
+  checks: "Show a PR's CI check status (read-only).",
   comment: "Comment on a PR.",
   review: "Review a PR.",
   merge: "Merge a PR (host `gh pr merge`). AGENTBOX_PROMPT=off bypass still requires AGENTBOX_GH_FORCE=1.",
@@ -9836,7 +10414,7 @@ for (const op of GH_PR_OPS) {
 var gitCommand = new Command27("git").description("Run git / gh pr operations against a box from the host").addCommand(pushCommand).addCommand(fetchCommand).addCommand(pullCommand).addCommand(checkoutCommand).addCommand(statusCommand).addCommand(prCommand);
 
 // src/commands/list.ts
-import { log as log30 } from "@clack/prompts";
+import { log as log31 } from "@clack/prompts";
 import { Command as Command28 } from "commander";
 import { pathToFileURL } from "url";
 
@@ -9866,17 +10444,17 @@ async function applyLiveCloudStates(boxes) {
   );
 }
 function withTimeout(p, ms) {
-  return new Promise((resolve3) => {
-    const t = setTimeout(() => resolve3(null), ms);
+  return new Promise((resolve4) => {
+    const t = setTimeout(() => resolve4(null), ms);
     if (typeof t.unref === "function") t.unref();
     p.then(
       (v) => {
         clearTimeout(t);
-        resolve3(v);
+        resolve4(v);
       },
       () => {
         clearTimeout(t);
-        resolve3(null);
+        resolve4(null);
       }
     );
   });
@@ -9948,10 +10526,10 @@ function urlCell(box, stream) {
     const label = "(VNC)";
     parts.push({ text: hyperlink(label, vnc.url, stream), width: label.length });
   }
-  const sep = " ";
+  const sep2 = " ";
   return {
-    text: parts.map((p) => p.text).join(sep),
-    width: parts.reduce((a, p) => a + p.width, 0) + sep.length * (parts.length - 1)
+    text: parts.map((p) => p.text).join(sep2),
+    width: parts.reduce((a, p) => a + p.width, 0) + sep2.length * (parts.length - 1)
   };
 }
 function workspaceCell(path, target, stream) {
@@ -10051,7 +10629,7 @@ var listCommand2 = withWatchOptions(
   )
 ).action(async (opts) => {
   if (opts.json && opts.watch) {
-    log30.error("cannot combine --json with --watch");
+    log31.error("cannot combine --json with --watch");
     process.exit(2);
   }
   const all = opts.global ?? false;
@@ -10069,7 +10647,7 @@ var listCommand2 = withWatchOptions(
 });
 
 // src/commands/logs.ts
-import { log as log31 } from "@clack/prompts";
+import { log as log32 } from "@clack/prompts";
 import { Command as Command29 } from "commander";
 import { spawn as spawn3 } from "child_process";
 var DAEMON_LOG_PATH = "/var/log/agentbox/ctl-daemon.log";
@@ -10091,9 +10669,9 @@ var logsCommand = new Command29("logs").description("Print recent log lines from
       service = boxArg;
     }
     if (!service && !opts.daemon) {
-      log31.error("missing <service> argument");
-      log31.info("usage: agentbox logs [box] <service> [-n N] [-f]");
-      log31.info("       agentbox logs [box] --daemon [-n N] [-f]");
+      log32.error("missing <service> argument");
+      log32.info("usage: agentbox logs [box] <service> [-n N] [-f]");
+      log32.info("       agentbox logs [box] --daemon [-n N] [-f]");
       process.exit(2);
     }
     const box = await resolveBoxOrExit(idOrName);
@@ -10104,7 +10682,7 @@ var logsCommand = new Command29("logs").description("Print recent log lines from
     if (!opts.follow) {
       const proc = await provider.exec(box, args, { user: "vscode" });
       if (proc.exitCode !== 0) {
-        log31.error(
+        log32.error(
           `${opts.daemon ? "daemon log" : "agentbox-ctl logs"} failed: ${proc.stderr || proc.stdout}`
         );
         process.exit(1);
@@ -10160,11 +10738,11 @@ var logsCommand = new Command29("logs").description("Print recent log lines from
 });
 
 // src/commands/open.ts
-import { log as log32 } from "@clack/prompts";
+import { log as log33 } from "@clack/prompts";
 import { execa as execa3 } from "execa";
-import { existsSync as existsSync7, mkdirSync as mkdirSync6 } from "fs";
-import { homedir as homedir15 } from "os";
-import { join as join16 } from "path";
+import { existsSync as existsSync8, mkdirSync as mkdirSync6 } from "fs";
+import { homedir as homedir16 } from "os";
+import { join as join18 } from "path";
 import { Command as Command30 } from "commander";
 
 // src/commands/path.ts
@@ -10226,7 +10804,7 @@ var openCommand = new Command30("open").description("Open a box's /workspace in
   }
 });
 async function runCloudOpen(box, provider, opts) {
-  const mountRoot = join16(homedir15(), ".agentbox", "mounts", box.name);
+  const mountRoot = join18(homedir16(), ".agentbox", "mounts", box.name);
   if (opts.unmount) {
     const ok = await tryUnmount(mountRoot);
     if (ok) process.stdout.write(`unmounted ${mountRoot}
@@ -10263,13 +10841,13 @@ async function runCloudOpen(box, provider, opts) {
     user: target.user,
     identityFile: target.identityFile
   });
-  if (!existsSync7(mountRoot)) {
+  if (!existsSync8(mountRoot)) {
     mkdirSync6(mountRoot, { recursive: true, mode: 493 });
   } else if (await isMounted(mountRoot)) {
-    log32.info(`re-mounting (stale mount detected at ${mountRoot})`);
+    log33.info(`re-mounting (stale mount detected at ${mountRoot})`);
     await tryUnmount(mountRoot);
   }
-  log32.info(`mounting ${alias}:/workspace at ${mountRoot}`);
+  log33.info(`mounting ${alias}:/workspace at ${mountRoot}`);
   const mount = await execa3(
     sshfsBin,
     [
@@ -10340,7 +10918,7 @@ var pauseCommand = new Command31("pause").description(
 });
 
 // src/commands/prune.ts
-import { confirm as confirm15, isCancel as isCancel16, log as log33 } from "@clack/prompts";
+import { confirm as confirm15, isCancel as isCancel16, log as log34 } from "@clack/prompts";
 import { Command as Command32 } from "commander";
 function totalRemovals(r, projectConfigs) {
   return r.removedRecords.length + r.removedContainers.length + r.removedVolumes.length + r.removedSnapshotDirs.length + r.removedBoxDirs.length + projectConfigs.length;
@@ -10400,7 +10978,7 @@ var pruneCommand = new Command32("prune").description("Clean up orphan state.jso
       return;
     }
     if (opts.provider !== void 0 && opts.provider !== "docker") {
-      log33.error(`unknown provider '${opts.provider}'; expected docker, daytona, hetzner, or vercel`);
+      log34.error(`unknown provider '${opts.provider}'; expected docker, daytona, hetzner, or vercel`);
       process.exit(2);
     }
     const dryRun = opts.dryRun ?? false;
@@ -10413,13 +10991,13 @@ var pruneCommand = new Command32("prune").description("Clean up orphan state.jso
       process.stdout.write("nothing to prune\n");
       return;
     }
-    log33.info(`would remove:
+    log34.info(`would remove:
 ${summary(preview, previewProjects)}`);
     if (dryRun) return;
     if (!opts.yes) {
       const ok = await confirm15({ message: "Proceed with prune?", initialValue: true });
       if (isCancel16(ok) || !ok) {
-        log33.info("cancelled");
+        log34.info("cancelled");
         return;
       }
     }
@@ -10440,7 +11018,7 @@ async function pruneCloud(provider, opts) {
   const dryRun = opts.dryRun ?? false;
   const backend = await cloudBackendForProvider(provider);
   if (!backend.list) {
-    log33.error(`${provider} backend doesn't expose \`list()\`; cannot enumerate sandboxes for prune`);
+    log34.error(`${provider} backend doesn't expose \`list()\`; cannot enumerate sandboxes for prune`);
     process.exit(2);
   }
   const [remote, state] = await Promise.all([backend.list(), readState()]);
@@ -10460,7 +11038,7 @@ async function pruneCloud(provider, opts) {
 `);
     return;
   }
-  log33.info(`found ${String(orphans.length)} ${provider} sandbox(es) not in this CLI's state:`);
+  log34.info(`found ${String(orphans.length)} ${provider} sandbox(es) not in this CLI's state:`);
   for (const sb of orphans) {
     const parts = [sb.sandboxId];
     if (sb.name) parts.push(sb.name);
@@ -10476,7 +11054,7 @@ async function pruneCloud(provider, opts) {
       initialValue: false
     });
     if (isCancel16(ok) || !ok) {
-      log33.info("cancelled");
+      log34.info("cancelled");
       return;
     }
   }
@@ -10488,7 +11066,7 @@ async function pruneCloud(provider, opts) {
       deleted++;
     } catch (err) {
       failed++;
-      log33.warn(
+      log34.warn(
         `delete ${sb.sandboxId} failed: ${err instanceof Error ? err.message : String(err)}`
       );
     }
@@ -10500,8 +11078,8 @@ async function pruneCloud(provider, opts) {
 }
 
 // src/commands/queue.ts
-import { readFile as readFile4, stat as stat5 } from "fs/promises";
-import { intro as intro7, log as log34, outro as outro6 } from "@clack/prompts";
+import { readFile as readFile5, stat as stat5 } from "fs/promises";
+import { intro as intro7, log as log35, outro as outro6 } from "@clack/prompts";
 import { Command as Command33 } from "commander";
 var TERMINAL_STATUSES = /* @__PURE__ */ new Set(["done", "failed", "cancelled"]);
 var queueCommand = new Command33("queue").description("Inspect and manage background `agentbox claude|codex|opencode -i` jobs");
@@ -10510,8 +11088,8 @@ var queueListCommand = new Command33("list").description("List queued, running,
   const cfg = await loadQueueConfig();
   const visible = opts.all === true ? jobs : jobs.filter((j) => !TERMINAL_STATUSES.has(j.status));
   if (visible.length === 0) {
-    log34.info(opts.all ? "no queued jobs." : "no active queued jobs (--all to see terminal).");
-    log34.info(`queue.maxConcurrent = ${String(cfg.maxConcurrent)} (queue.enabled=${String(cfg.enabled)})`);
+    log35.info(opts.all ? "no queued jobs." : "no active queued jobs (--all to see terminal).");
+    log35.info(`queue.maxConcurrent = ${String(cfg.maxConcurrent)} (queue.enabled=${String(cfg.enabled)})`);
     return;
   }
   const rows = visible.map((j) => ({
@@ -10536,19 +11114,19 @@ var queueListCommand = new Command33("list").description("List queued, running,
       headers.map((h, i) => pad4(String(r[h]), widths[i])).join("  ") + "\n"
     );
   }
-  log34.info(`queue.maxConcurrent = ${String(cfg.maxConcurrent)} (queue.enabled=${String(cfg.enabled)})`);
+  log35.info(`queue.maxConcurrent = ${String(cfg.maxConcurrent)} (queue.enabled=${String(cfg.enabled)})`);
 });
 var queueShowCommand = new Command33("show").description("Dump a job manifest and tail its log").argument("<id>", "queue job id (from `agentbox queue list`)").option("--tail <n>", "lines of log to print (default: 50)", "50").action(async (id, opts) => {
   const job = await readJob(id);
   if (!job) {
-    log34.error(`no job with id ${id}`);
+    log35.error(`no job with id ${id}`);
     process.exit(1);
   }
   process.stdout.write(JSON.stringify(job, null, 2) + "\n");
   const tailN = Number.parseInt(opts.tail, 10) || 50;
   try {
     await stat5(job.logPath);
-    const text = await readFile4(job.logPath, "utf8");
+    const text = await readFile5(job.logPath, "utf8");
     const lines = text.split(/\r?\n/);
     const slice = lines.slice(Math.max(0, lines.length - tailN - 1));
     process.stdout.write(`
@@ -10557,18 +11135,18 @@ var queueShowCommand = new Command33("show").description("Dump a job manifest an
     process.stdout.write(slice.join("\n"));
     if (!slice.join("\n").endsWith("\n")) process.stdout.write("\n");
   } catch {
-    log34.info(`(no log at ${job.logPath} yet)`);
+    log35.info(`(no log at ${job.logPath} yet)`);
   }
 });
 var queueCancelCommand = new Command33("cancel").description("Cancel a queued job; running jobs are NOT killed \u2014 use `agentbox destroy` instead").argument("<id>", "queue job id (from `agentbox queue list`)").action(async (id) => {
   intro7(`Cancelling queue job ${id}...`);
   const job = await readJob(id);
   if (!job) {
-    log34.error(`no job with id ${id}`);
+    log35.error(`no job with id ${id}`);
     process.exit(1);
   }
   if (job.status !== "queued") {
-    log34.error(
+    log35.error(
       `job ${id} is ${job.status}; cancel only flips 'queued' \u2192 'cancelled'.` + (job.status === "running" ? ` Use 'agentbox destroy ${job.boxName || id}' to stop the box.` : "")
     );
     process.exit(1);
@@ -10588,7 +11166,7 @@ var queueClearCommand = new Command33("clear").description("Sweep terminal-state
   if (opts.all === true || opts.failed === true) targets.add("failed");
   if (opts.all === true || opts.cancelled === true) targets.add("cancelled");
   if (targets.size === 0) {
-    log34.error("pick at least one of: --done, --failed, --cancelled, --all");
+    log35.error("pick at least one of: --done, --failed, --cancelled, --all");
     process.exit(2);
   }
   const jobs = await loadQueue();
@@ -10598,7 +11176,7 @@ var queueClearCommand = new Command33("clear").description("Sweep terminal-state
     await deleteJob(j.id);
     removed += 1;
   }
-  log34.success(`removed ${String(removed)} manifest${removed === 1 ? "" : "s"}`);
+  log35.success(`removed ${String(removed)} manifest${removed === 1 ? "" : "s"}`);
 });
 var QUEUE_WAIT_EVENTS = [
   "new-box",
@@ -10615,7 +11193,7 @@ var queueWaitForCommand = new Command33("wait-for").description(
   `Block until a queue / box event fires. <event> one of: ${QUEUE_WAIT_EVENTS.join(" | ")}.`
 ).argument("<event>", `target event: ${QUEUE_WAIT_EVENTS.join(" | ")}`).option("--box <ref>", "box ref (required for box-paused / box-running / box-stopped)").option("--job <id>", "queue job id (required for job-done)").option("--timeout <ms>", `wall-clock cap (default: ${String(DEFAULT_QUEUE_WAIT_TIMEOUT_MS)})`).option("--json", "emit a JSON envelope { matched, elapsedMs, ... }").action(async (eventRaw, opts) => {
   if (!QUEUE_WAIT_EVENTS.includes(eventRaw)) {
-    log34.error(`unknown event '${eventRaw}' (one of: ${QUEUE_WAIT_EVENTS.join(", ")})`);
+    log35.error(`unknown event '${eventRaw}' (one of: ${QUEUE_WAIT_EVENTS.join(", ")})`);
     process.exit(2);
   }
   const event = eventRaw;
@@ -10635,11 +11213,11 @@ var queueWaitForCommand = new Command33("wait-for").description(
       if (opts.json === true) {
         process.stdout.write(JSON.stringify({ matched: false, event, elapsedMs }) + "\n");
       } else {
-        log34.error(`'${event}' did not occur within ${String(timeoutMs)}ms`);
+        log35.error(`'${event}' did not occur within ${String(timeoutMs)}ms`);
       }
       process.exit(1);
     }
-    log34.error(err instanceof Error ? err.message : String(err));
+    log35.error(err instanceof Error ? err.message : String(err));
     process.exit(1);
   }
 });
@@ -10736,7 +11314,7 @@ function truncate(s, max) {
 }
 
 // src/commands/relay.ts
-import { log as log35, spinner as spinner9 } from "@clack/prompts";
+import { log as log36, spinner as spinner9 } from "@clack/prompts";
 import { Command as Command34 } from "commander";
 async function rehydrateFromState() {
   const state = await readState();
@@ -10830,7 +11408,7 @@ var restartSub = new Command34("restart").description("Stop then start the host
       s2.stop(`relay running on ${ep.hostUrl}`);
     } catch (err) {
       s2.stop("relay start failed");
-      log35.warn(err instanceof Error ? err.message : String(err));
+      log36.warn(err instanceof Error ? err.message : String(err));
       throw err;
     }
   } catch (err) {
@@ -10842,23 +11420,23 @@ var relayCommand = new Command34("relay").description("Manage the host relay pro
 // src/commands/_run-queued-job.ts
 import { Command as Command35 } from "commander";
 var runQueuedJobCommand = new Command35("_run-queued-job").description("internal: run a queued background agent job (do not invoke directly)").argument("<id>", "queue job id (from ~/.agentbox/queue/<id>.json)").action(async (id) => {
-  const log44 = openCommandLog(`queue-${id}`);
-  log44.write(`worker pid=${String(process.pid)} starting for job ${id}`);
+  const log45 = openCommandLog(`queue-${id}`);
+  log45.write(`worker pid=${String(process.pid)} starting for job ${id}`);
   let job = null;
   try {
     job = await readJob(id);
     if (!job) {
-      log44.write(`FATAL: no manifest at id=${id}`);
-      log44.close();
+      log45.write(`FATAL: no manifest at id=${id}`);
+      log45.close();
       process.exit(64);
     }
     const onBoxCreated = (boxId) => {
       if (job) job = { ...job, boxId };
     };
     if ((job.providerName || "docker") === "docker") {
-      await runDockerJob(job, log44, onBoxCreated);
+      await runDockerJob(job, log45, onBoxCreated);
     } else {
-      await runCloudJob(job, log44, onBoxCreated);
+      await runCloudJob(job, log45, onBoxCreated);
     }
     const done = {
       ...job,
@@ -10867,12 +11445,12 @@ var runQueuedJobCommand = new Command35("_run-queued-job").description("internal
       exitCode: 0
     };
     await writeJob(done);
-    log44.write(`done`);
-    log44.close();
+    log45.write(`done`);
+    log45.close();
     process.exit(0);
   } catch (err) {
     const msg = err instanceof Error ? err.stack ?? err.message : String(err);
-    log44.write(`FAIL: ${msg}`);
+    log45.write(`FAIL: ${msg}`);
     if (job) {
       try {
         const failed = {
@@ -10886,11 +11464,11 @@ var runQueuedJobCommand = new Command35("_run-queued-job").description("internal
       } catch {
       }
     }
-    log44.close();
+    log45.close();
     process.exit(1);
   }
 });
-async function runDockerJob(job, log44, onBoxCreated) {
+async function runDockerJob(job, log45, onBoxCreated) {
   const opts = job.createOpts;
   const cfg = await loadEffectiveConfig(opts.workspace, {
     cliOverrides: buildOverridesFromJob(job)
@@ -10902,7 +11480,7 @@ async function runDockerJob(job, log44, onBoxCreated) {
   const useSnapshot = opts.hostSnapshot === false ? false : opts.hostSnapshot === true ? true : cfg.effective.box.hostSnapshot ?? false;
   const resolved = job.agent === "claude-code" ? await resolveClaudeAuth(process.env) : null;
   const withPlaywright = cfg.effective.box.withPlaywright || cfg.effective.browser.default !== "agent-browser";
-  log44.write(`creating box for agent=${job.agent}`);
+  log45.write(`creating box for agent=${job.agent}`);
   const result = await createBox({
     workspacePath: opts.workspace,
     name: opts.name && opts.name.length > 0 ? opts.name : void 0,
@@ -10922,21 +11500,28 @@ async function runDockerJob(job, log44, onBoxCreated) {
     // undefined so the create path skips the live prompt.
     portless: opts.portless,
     portlessStateDir: cfg.effective.portless.stateDir || void 0,
+    resyncOnStart: opts.resync,
     limits: resolveLimits(cfg.effective.box, opts),
+    // carry: entries the submitter resolved + approved on the host; applied here
+    // at box-create time (the worker runs on the host, so it can read the files).
+    carry: opts.carry,
     projectRoot,
-    onLog: (line) => log44.write(line)
+    onLog: (line) => log45.write(line)
   });
-  log44.write(`box created: ${result.record.container}`);
+  log45.write(`box created: ${result.record.container}`);
   onBoxCreated(result.record.id);
   await writeJob({ ...job, boxId: result.record.id });
-  const promptedArgs = buildPromptArgs(job.agent, job.prompt, job.agentArgs);
+  const resyncWarning = result.resync ? buildResyncWarning(result.resync) : null;
+  if (resyncWarning) log45.write(resyncWarning);
+  const prompt = prependResyncWarning(resyncWarning, job.prompt);
+  const promptedArgs = buildPromptArgs(job.agent, prompt, job.agentArgs);
   if (job.agent === "claude-code") {
-    log44.write(`checking plugin native deps`);
+    log45.write(`checking plugin native deps`);
     await rebuildPluginNativeDeps(result.record.container, {
       volume: result.record.claudeConfigVolume ?? SHARED_CLAUDE_VOLUME,
-      onProgress: (line) => log44.write(line)
+      onProgress: (line) => log45.write(line)
     });
-    log44.write(`starting claude session`);
+    log45.write(`starting claude session`);
     await startClaudeSession({
       container: result.record.container,
       claudeArgs: applyClaudeSkipPermissions(promptedArgs, cfg.effective),
@@ -10944,22 +11529,22 @@ async function runDockerJob(job, log44, onBoxCreated) {
       boxName: result.record.name
     });
   } else if (job.agent === "codex") {
-    log44.write(`checking codex`);
+    log45.write(`checking codex`);
     await ensureCodexInstalled(result.record.container, {
-      onProgress: (line) => log44.write(line)
+      onProgress: (line) => log45.write(line)
     });
-    log44.write(`starting codex session`);
+    log45.write(`starting codex session`);
     await startCodexSession({
       container: result.record.container,
       codexArgs: applyCodexSkipPermissions(promptedArgs, cfg.effective),
       sessionName: cfg.effective.codex.sessionName
     });
   } else if (job.agent === "opencode") {
-    log44.write(`checking opencode`);
+    log45.write(`checking opencode`);
     await ensureOpencodeInstalled(result.record.container, {
-      onProgress: (line) => log44.write(line)
+      onProgress: (line) => log45.write(line)
     });
-    log44.write(`starting opencode session`);
+    log45.write(`starting opencode session`);
     await startOpencodeSession({
       container: result.record.container,
       opencodeArgs: promptedArgs,
@@ -10969,7 +11554,7 @@ async function runDockerJob(job, log44, onBoxCreated) {
     throw new Error(`unknown agent kind: ${String(job.agent)}`);
   }
 }
-async function runCloudJob(job, log44, onBoxCreated) {
+async function runCloudJob(job, log45, onBoxCreated) {
   const opts = job.createOpts;
   const cfg = await loadEffectiveConfig(opts.workspace, {
     cliOverrides: buildOverridesFromJob(job)
@@ -10980,7 +11565,7 @@ async function runCloudJob(job, log44, onBoxCreated) {
   const providerDefault = resolveDefaultCheckpoint(cfg.effective, providerName);
   const checkpointRef = opts.snapshot && opts.snapshot.length > 0 ? opts.snapshot : providerDefault.length > 0 ? providerDefault : void 0;
   const withPlaywright = cfg.effective.box.withPlaywright || cfg.effective.browser.default !== "agent-browser";
-  log44.write(`creating cloud box (${providerName}) for agent=${job.agent}`);
+  log45.write(`creating cloud box (${providerName}) for agent=${job.agent}`);
   const result = await provider.create({
     workspacePath: opts.workspace,
     name: opts.name && opts.name.length > 0 ? opts.name : void 0,
@@ -10990,10 +11575,13 @@ async function runCloudJob(job, log44, onBoxCreated) {
     withEnv: cfg.effective.box.withEnv,
     vnc: { enabled: cfg.effective.box.vnc },
     limits: resolveLimits(cfg.effective.box, opts),
+    // carry: entries the submitter resolved + approved on the host; the cloud
+    // worker runs on the host too, so it reads the files and uploads them.
+    carry: opts.carry,
     projectRoot,
-    onLog: (line) => log44.write(line)
+    onLog: (line) => log45.write(line)
   });
-  log44.write(`box created: ${result.record.id}`);
+  log45.write(`box created: ${result.record.id}`);
   onBoxCreated(result.record.id);
   await writeJob({ ...job, boxId: result.record.id });
   const promptedArgs = buildPromptArgs(job.agent, job.prompt, job.agentArgs);
@@ -11015,7 +11603,7 @@ async function runCloudJob(job, log44, onBoxCreated) {
   } else {
     throw new Error(`unknown agent kind: ${String(job.agent)}`);
   }
-  log44.write(`starting detached ${job.agent} session`);
+  log45.write(`starting detached ${job.agent} session`);
   await cloudAgentStartDetached({
     box: result.record,
     binary,
@@ -11052,7 +11640,7 @@ function buildOverridesFromJob(job) {
 
 // src/commands/screen.ts
 import { spawnSync as spawnSync3 } from "child_process";
-import { log as log36 } from "@clack/prompts";
+import { log as log37 } from "@clack/prompts";
 import { Command as Command36 } from "commander";
 var SIGNED_URL_TTL_MIN = 1;
 var SIGNED_URL_TTL_MAX = 86400;
@@ -11083,10 +11671,10 @@ var screenCommand = new Command36("screen").description("Open a box's VNC (noVNC
     if (provider === "docker") {
       const insp = await inspectBox(box.id);
       if (insp.state === "paused") {
-        log36.info("box is paused; unpausing");
+        log37.info("box is paused; unpausing");
         await unpauseBox(box.id);
       } else if (insp.state === "stopped") {
-        log36.info("box is stopped; starting");
+        log37.info("box is stopped; starting");
         await startBox(box.id);
       } else if (insp.state === "missing") {
         throw new Error(`box ${box.name} has no container; was it destroyed?`);
@@ -11096,13 +11684,13 @@ var screenCommand = new Command36("screen").description("Open a box's VNC (noVNC
       const inBoxUrl = exposePort !== void 0 ? box.portlessUrl ?? `http://localhost:${String(exposePort)}` : "about:blank";
       const br = await ensureBoxBrowser(box.container, void 0, inBoxUrl);
       if (br.up && !br.alreadyRunning) {
-        log36.info(
+        log37.info(
           exposePort !== void 0 ? `opened ${inBoxUrl} in the in-box browser (visible in the VNC view)` : "started in-box browser"
         );
       } else if (br.alreadyRunning) {
-        log36.info("in-box browser already running; left it untouched");
+        log37.info("in-box browser already running; left it untouched");
       } else {
-        log36.warn(`could not start in-box browser: ${br.reason ?? "unknown"}`);
+        log37.warn(`could not start in-box browser: ${br.reason ?? "unknown"}`);
       }
       const engine = await detectEngine();
       const urls = buildVncUrls(box, engine);
@@ -11123,10 +11711,10 @@ var screenCommand = new Command36("screen").description("Open a box's VNC (noVNC
       const p = await providerForBox(box);
       const state = await p.probeState(box);
       if (state === "paused") {
-        log36.info("box is paused; resuming");
+        log37.info("box is paused; resuming");
         await p.resume(box);
       } else if (state === "stopped") {
-        log36.info("box is stopped; starting");
+        log37.info("box is stopped; starting");
         await p.start(box);
       } else if (state === "missing") {
         throw new Error(`cloud sandbox for ${box.name} is missing; was it deleted?`);
@@ -11141,14 +11729,14 @@ var screenCommand = new Command36("screen").description("Open a box's VNC (noVNC
             user: "vscode"
           });
           if (br.exitCode === 0) {
-            log36.info(`opened ${webUrl} in the in-box browser (visible in the VNC view)`);
+            log37.info(`opened ${webUrl} in the in-box browser (visible in the VNC view)`);
           } else {
-            log36.warn(
+            log37.warn(
               `could not open in-box browser (continuing): ${br.stderr.trim() || br.stdout.trim() || `exit ${String(br.exitCode)}`}`
             );
           }
         } catch (err) {
-          log36.warn(
+          log37.warn(
             `in-box browser skipped: ${err instanceof Error ? err.message : String(err)}`
           );
         }
@@ -11174,18 +11762,18 @@ var screenCommand = new Command36("screen").description("Open a box's VNC (noVNC
 
 // src/commands/shell.ts
 import { spawnSync as spawnSync4 } from "child_process";
-import { log as log38 } from "@clack/prompts";
+import { log as log39 } from "@clack/prompts";
 import { Command as Command37 } from "commander";
 
 // src/commands/_provider-guard.ts
-import { log as log37 } from "@clack/prompts";
+import { log as log38 } from "@clack/prompts";
 function requireDockerProvider(box, commandName) {
   const provider = box.provider ?? "docker";
   if (provider === "docker") return;
-  log37.error(
+  log38.error(
     `\`agentbox ${commandName}\` doesn't yet support cloud boxes (this box's provider is '${provider}').`
   );
-  log37.info(
+  log38.info(
     "Cloud-provider routing for this command is on the Phase 3 backlog. For now: use `agentbox url` for web access, `agentbox-ctl git push` from inside the sandbox via SSH/web terminal, or fall back to the cloud provider's own console."
   );
   process.exit(2);
@@ -11225,10 +11813,10 @@ function fmtAgo2(iso) {
 async function ensureBoxRunning(box) {
   const insp = await inspectBox(box.id);
   if (insp.state === "paused") {
-    log38.info("box is paused; unpausing");
+    log39.info("box is paused; unpausing");
     await unpauseBox(box.id);
   } else if (insp.state === "stopped") {
-    log38.info("box is stopped; starting");
+    log39.info("box is stopped; starting");
     await startBox(box.id);
   } else if (insp.state === "missing") {
     throw new Error(`box ${box.name} has no container; was it destroyed?`);
@@ -11267,7 +11855,7 @@ async function startOrAttachShell(box, cfg) {
   const label = shellLabel(cfg.sessionName);
   const info = await shellSessionInfo(box.container, cfg.sessionName, cfg.user);
   if (info.running) {
-    log38.info(`reattaching to shell "${label}" \u2014 Control+a d to detach`);
+    log39.info(`reattaching to shell "${label}" \u2014 Control+a d to detach`);
   } else {
     await startShellSession({
       container: box.container,
@@ -11275,7 +11863,7 @@ async function startOrAttachShell(box, cfg) {
       user: cfg.user,
       login: cfg.login
     });
-    log38.info(`shell "${label}" \u2014 Control+a d to detach, leaves it running`);
+    log39.info(`shell "${label}" \u2014 Control+a d to detach, leaves it running`);
   }
   const code = await runWrappedAttach({
     container: box.container,
@@ -11428,11 +12016,11 @@ var shellLsCommand = new Command37("ls").description("List the shell tmux sessio
     requireDockerProvider(box, "shell");
     const insp = await inspectBox(box.id);
     if (insp.state !== "running") {
-      log38.info(`box ${box.name} is ${insp.state} \u2014 no live shell sessions`);
+      log39.info(`box ${box.name} is ${insp.state} \u2014 no live shell sessions`);
       return;
     }
     if (insp.shellSessions.length === 0) {
-      log38.info(
+      log39.info(
         `no shell sessions in ${box.name} \u2014 start one with: agentbox shell ${reattachRef4(box)}`
       );
       return;
@@ -11452,25 +12040,25 @@ var shellKillCommand = new Command37("kill").description("Kill a shell tmux sess
     requireDockerProvider(box, "shell");
     const insp = await inspectBox(box.id);
     if (insp.state !== "running") {
-      log38.info(`box ${box.name} is ${insp.state} \u2014 no shell sessions to kill`);
+      log39.info(`box ${box.name} is ${insp.state} \u2014 no shell sessions to kill`);
       return;
     }
     if (opts.all) {
       if (insp.shellSessions.length === 0) {
-        log38.info(`no shell sessions in ${box.name}`);
+        log39.info(`no shell sessions in ${box.name}`);
         return;
       }
       let killed = 0;
       for (const s of insp.shellSessions) {
         if (await killShellSession(box.container, s.sessionName)) killed++;
       }
-      log38.success(`killed ${String(killed)} shell session${killed === 1 ? "" : "s"} in ${box.name}`);
+      log39.success(`killed ${String(killed)} shell session${killed === 1 ? "" : "s"} in ${box.name}`);
       return;
     }
     const target = shellSessionName(opts.name);
     const ok = await killShellSession(box.container, target);
-    if (ok) log38.success(`killed shell "${shellLabel(target)}" in ${box.name}`);
-    else log38.warn(`no shell "${shellLabel(target)}" in ${box.name} (already gone?)`);
+    if (ok) log39.success(`killed shell "${shellLabel(target)}" in ${box.name}`);
+    else log39.warn(`no shell "${shellLabel(target)}" in ${box.name} (already gone?)`);
   } catch (err) {
     handleLifecycleError(err);
   }
@@ -11504,7 +12092,7 @@ var startCommand = new Command38("start").description(
 });
 
 // src/commands/status.ts
-import { log as log40 } from "@clack/prompts";
+import { log as log41 } from "@clack/prompts";
 import { Command as Command39 } from "commander";
 
 // src/endpoints-render.ts
@@ -11535,7 +12123,7 @@ function renderEndpointLines(endpoints, stream) {
 }
 
 // src/commands/inspect.ts
-import { log as log39 } from "@clack/prompts";
+import { log as log40 } from "@clack/prompts";
 function fmtLimit(n, unit) {
   return n && n > 0 ? `${String(n)}${unit}` : "unlimited";
 }
@@ -11680,7 +12268,7 @@ function renderCodexActivityCloud(persisted) {
 async function runInspect(box, opts) {
   try {
     if (opts.json && opts.watch) {
-      log39.error("cannot combine --json with --watch");
+      log40.error("cannot combine --json with --watch");
       process.exit(2);
     }
     const isCloud = (box.provider ?? "docker") !== "docker";
@@ -11724,7 +12312,7 @@ var statusCommand2 = withWatchOptions(
 ).action(async (idOrName, opts) => {
   try {
     if (opts.json && opts.watch) {
-      log40.error("cannot combine --json with --watch");
+      log41.error("cannot combine --json with --watch");
       process.exit(2);
     }
     const box = await resolveBoxOrExit(idOrName);
@@ -12053,7 +12641,7 @@ var unpauseCommand = new Command42("unpause").description(
 
 // src/commands/update.ts
 import { spawn as spawn4 } from "child_process";
-import { confirm as confirm16, intro as intro8, isCancel as isCancel17, log as log41, outro as outro7, spinner as spinner10 } from "@clack/prompts";
+import { confirm as confirm16, intro as intro8, isCancel as isCancel17, log as log42, outro as outro7, spinner as spinner10 } from "@clack/prompts";
 import { Command as Command43 } from "commander";
 
 // src/exec-method.ts
@@ -12099,8 +12687,8 @@ function runInherit(cmd, args) {
   });
 }
 var updateCommand = new Command43("self-update").description(
-  "Update agentbox: self-update via npm/pnpm (unless run via npx), wipe the box image so it rebuilds, and reload the relay"
-).option("-y, --yes", "skip the confirmation prompt").option("--dry-run", "show what would happen, don't change anything").option("--skip-self", "skip the package self-update; only refresh the image + relay").action(async (opts) => {
+  "Update agentbox: self-update via npm/pnpm (unless run via npx), refresh the host skills, wipe the box image so it rebuilds, and reload the relay"
+).option("-y, --yes", "skip the confirmation prompt").option("--dry-run", "show what would happen, don't change anything").option("--skip-self", "skip the package self-update; only refresh the skills + image + relay").option("--skip-skills", "skip refreshing the host skill files in ~/.claude, ~/.codex, ~/.config/opencode").action(async (opts) => {
   try {
     const method = detectExecutionMethod({
       userAgent: process.env.npm_config_user_agent,
@@ -12108,10 +12696,12 @@ var updateCommand = new Command43("self-update").description(
     });
     intro8("agentbox self-update");
     const selfStep = opts.skipSelf ? "self-update: skipped (--skip-self)" : describeSelfUpdate(method);
-    log41.info(
+    const skillsStep = opts.skipSkills ? "skills: skipped (--skip-skills)" : "skills: refresh agentbox-managed host skill files in ~/.claude (and Codex/OpenCode)";
+    log42.info(
       [
         "plan:",
         `  ${selfStep}`,
+        `  ${skillsStep}`,
         `  image: docker image rm -f ${DEFAULT_BOX_IMAGE} (rebuilds on next create/claude)`,
         "  relay: stop, then respawn unless a self-update ran"
       ].join("\n")
@@ -12123,25 +12713,55 @@ var updateCommand = new Command43("self-update").description(
     if (!opts.yes) {
       const ok = await confirm16({ message: "Proceed with update?", initialValue: true });
       if (isCancel17(ok) || !ok) {
-        log41.info("cancelled");
+        log42.info("cancelled");
         return;
       }
     }
     let selfUpdated = false;
     if (opts.skipSelf) {
-      log41.info("skipping self-update (--skip-self)");
+      log42.info("skipping self-update (--skip-self)");
     } else {
       const cmd = selfUpdateCommand(method);
       if (cmd === null) {
-        log41.info(describeSelfUpdate(method));
+        log42.info(describeSelfUpdate(method));
       } else {
-        log41.info(`running: ${cmd.cmd} ${cmd.args.join(" ")}`);
+        log42.info(`running: ${cmd.cmd} ${cmd.args.join(" ")}`);
         const code = await runInherit(cmd.cmd, cmd.args);
         if (code !== 0) {
           throw new Error(`${cmd.cmd} exited with code ${String(code)}`);
         }
         selfUpdated = true;
-        log41.success(`updated ${PKG} via ${cmd.cmd}`);
+        log42.success(`updated ${PKG} via ${cmd.cmd}`);
+      }
+    }
+    if (opts.skipSkills) {
+      log42.info("skipping skills refresh (--skip-skills)");
+    } else if (selfUpdated) {
+      const code = await runInherit("agentbox", ["install", "--skills-only"]);
+      if (code === 0) {
+        log42.success("refreshed host skills (via updated build)");
+      } else {
+        log42.warn(
+          `host skills not refreshed (agentbox install --skills-only exited ${String(code)}) \u2014 run it manually to pick up the new versions`
+        );
+      }
+    } else {
+      try {
+        const res = installHostSkills({ quiet: true });
+        if (res.written.length > 0) {
+          log42.success(`refreshed host skills (${String(res.written.length)} file(s))`);
+        } else {
+          log42.info(`host skills already current (${String(res.skipped)} skipped)`);
+        }
+        if (res.blocked.length > 0) {
+          log42.warn(
+            `user-modified skill file(s) left in place: ${res.blocked.join(", ")} \u2014 run \`agentbox install --skills-only --force\` to overwrite`
+          );
+        }
+      } catch (err) {
+        log42.warn(
+          `host skills not refreshed (${err instanceof Error ? err.message : String(err)})`
+        );
       }
     }
     const s = spinner10();
@@ -12157,7 +12777,7 @@ var updateCommand = new Command43("self-update").description(
       stop.stopped ? `stopped relay (pid ${String(stop.pid)})` : "relay was not running"
     );
     if (selfUpdated) {
-      log41.info(
+      log42.info(
         "relay will restart automatically (with the updated build) on your next `agentbox create` / `agentbox claude`"
       );
     } else {
@@ -12168,7 +12788,7 @@ var updateCommand = new Command43("self-update").description(
         sr2.stop(`relay back up on ${ep.hostUrl}`);
       } catch (err) {
         sr2.stop("relay restart failed");
-        log41.warn(
+        log42.warn(
           `${err instanceof Error ? err.message : String(err)} \u2014 it will retry on the next box command`
         );
       }
@@ -12181,7 +12801,7 @@ var updateCommand = new Command43("self-update").description(
 
 // src/commands/url.ts
 import { spawnSync as spawnSync5 } from "child_process";
-import { log as log42 } from "@clack/prompts";
+import { log as log43 } from "@clack/prompts";
 import { Command as Command44 } from "commander";
 var SIGNED_URL_TTL_MIN2 = 1;
 var SIGNED_URL_TTL_MAX2 = 86400;
@@ -12214,10 +12834,10 @@ var urlCommand = new Command44("url").description(
     if (provider === "docker") {
       const insp = await inspectBox(box.id);
       if (insp.state === "paused") {
-        log42.info("box is paused; unpausing");
+        log43.info("box is paused; unpausing");
         await unpauseBox(box.id);
       } else if (insp.state === "stopped") {
-        log42.info("box is stopped; starting");
+        log43.info("box is stopped; starting");
         await startBox(box.id);
       } else if (insp.state === "missing") {
         throw new Error(`box ${box.name} has no container; was it destroyed?`);
@@ -12246,10 +12866,10 @@ var urlCommand = new Command44("url").description(
       const p = await providerForBox(box);
       const state = await p.probeState(box);
       if (state === "paused") {
-        log42.info("box is paused; resuming");
+        log43.info("box is paused; resuming");
         await p.resume(box);
       } else if (state === "stopped") {
-        log42.info("box is stopped; starting");
+        log43.info("box is stopped; starting");
         await p.start(box);
       } else if (state === "missing") {
         throw new Error(`cloud sandbox for ${box.name} is missing; was it deleted?`);
@@ -12273,7 +12893,7 @@ var urlCommand = new Command44("url").description(
 });
 
 // src/commands/wait.ts
-import { log as log43 } from "@clack/prompts";
+import { log as log44 } from "@clack/prompts";
 import { Command as Command45 } from "commander";
 var waitCommand = new Command45("wait").description("Block until the box reports all autostart units ready").argument(
   "[box]",
@@ -12291,7 +12911,7 @@ var waitCommand = new Command45("wait").description("Block until the box reports
     try {
       parsed = JSON.parse(proc.stdout);
     } catch {
-      log43.error(`agentbox-ctl wait-ready failed: ${proc.stderr || proc.stdout}`);
+      log44.error(`agentbox-ctl wait-ready failed: ${proc.stderr || proc.stdout}`);
       process.exit(1);
     }
     if (opts.json) {