@madarco/agentbox 0.8.0 → 0.10.0

package/dist/{chunk-6OZDFNBF.js → chunk-7UIAO7PC.js}

@@ -19,13 +19,13 @@ import {
   recordBox,
   removeBoxRecord,
   writePreparedDockerState
-} from "./chunk-BGK32PZE.js";
+} from "./chunk-KL36BRN4.js";
 
 // ../../packages/sandbox-docker/dist/index.js
 import { randomBytes as randomBytes3 } from "crypto";
 import { mkdir as mkdir7, stat as stat6 } from "fs/promises";
 import { homedir as homedir9 } from "os";
-import { basename as basename2, join as join10, resolve as resolve3 } from "path";
+import { basename as basename3, join as join10, resolve as resolve3 } from "path";
 import { execa as execa13 } from "execa";
 
 // ../../packages/ctl/dist/index.js
@@ -736,6 +736,7 @@ var BUILT_IN_DEFAULTS = {
     defaultCheckpointDocker: "",
     defaultCheckpointDaytona: "",
     defaultCheckpointHetzner: "",
+    defaultCheckpointVercel: "",
     withPlaywright: false,
     withEnv: false,
     vnc: true,
@@ -748,16 +749,21 @@ var BUILT_IN_DEFAULTS = {
     cpus: 0,
     pidsLimit: 0,
     disk: "",
-    bundleDepth: void 0
+    bundleDepth: void 0,
+    vercelVcpus: 2,
+    vercelTimeoutMs: 27e5,
+    vercelNetworkPolicy: ""
   },
   checkpoint: {
     maxLayers: 3
   },
   claude: {
-    sessionName: "claude"
+    sessionName: "claude",
+    dangerouslySkipPermissions: true
   },
   codex: {
-    sessionName: "codex"
+    sessionName: "codex",
+    dangerouslySkipPermissions: true
   },
   opencode: {
     sessionName: "opencode"
@@ -799,7 +805,12 @@ var BUILT_IN_DEFAULTS = {
   },
   queue: {
     enabled: true,
-    maxConcurrent: 5
+    maxConcurrent: 5,
+    maxWorking: 0,
+    idleGraceSeconds: 15
+  },
+  cloud: {
+    useCurrentBranch: false
   },
   maintenance: {
     pruneProjectConfigs: true,
@@ -810,8 +821,8 @@ var KEY_REGISTRY = [
   {
     key: "box.provider",
     type: "enum",
-    enumValues: ["docker", "daytona", "hetzner"],
-    description: "Sandbox backend new boxes are created on: local Docker containers, Daytona Cloud sandboxes, or Hetzner Cloud VPSes."
+    enumValues: ["docker", "daytona", "hetzner", "vercel"],
+    description: "Sandbox backend new boxes are created on: local Docker containers, Daytona Cloud sandboxes, Hetzner Cloud VPSes, or Vercel Sandboxes."
   },
   {
     key: "box.hostSnapshot",
@@ -841,6 +852,12 @@ var KEY_REGISTRY = [
     description: "Per-provider override of `box.defaultCheckpoint` for hetzner. Wins over the global when set; set via `agentbox checkpoint set-default --provider hetzner`.",
     advanced: true
   },
+  {
+    key: "box.defaultCheckpointVercel",
+    type: "string",
+    description: "Per-provider override of `box.defaultCheckpoint` for vercel. Wins over the global when set; set via `agentbox checkpoint set-default --provider vercel`.",
+    advanced: true
+  },
   {
     key: "checkpoint.maxLayers",
     type: "int",
@@ -914,16 +931,41 @@ var KEY_REGISTRY = [
     type: "int",
     description: "Cap git bundle history shipped to cloud sandboxes (daytona, hetzner). 0 = full history. Unset = adaptive default (last 200 commits; re-bundle at 100 if the bundle exceeds 20 MB). Ignored for docker (which bind-mounts .git/)."
   },
+  {
+    key: "box.vercelVcpus",
+    type: "int",
+    description: "vCPUs for new --provider vercel boxes (Vercel couples RAM at 2048 MB/vCPU). Default 2. Vercel only accepts specific counts (e.g. 1, 2, 4, 8) \u2014 an unsupported value fails create with a 400. Vercel-only; ignored by other providers."
+  },
+  {
+    key: "box.vercelTimeoutMs",
+    type: "int",
+    description: "Max session length (ms) for new --provider vercel boxes before the VM auto-snapshots; persistent mode auto-resumes on the next call. Default 2700000 (45 min, the Hobby ceiling). Vercel-only."
+  },
+  {
+    key: "box.vercelNetworkPolicy",
+    type: "string",
+    description: "Egress lock for new --provider vercel boxes: 'allow-all' (default, unset), 'deny-all', or a comma-separated domain allowlist (e.g. 'github.com,*.npmjs.org') that denies everything else. Vercel-only; ignored by other providers."
+  },
   {
     key: "claude.sessionName",
     type: "string",
     description: "tmux session name for `agentbox claude`."
   },
+  {
+    key: "claude.dangerouslySkipPermissions",
+    type: "bool",
+    description: "Launch claude in new boxes with --dangerously-skip-permissions (auto-accept tool use). Safe because boxes are isolated; on by default. Override per-box with --no-dangerously-skip-permissions."
+  },
   {
     key: "codex.sessionName",
     type: "string",
     description: "tmux session name for `agentbox codex`."
   },
+  {
+    key: "codex.dangerouslySkipPermissions",
+    type: "bool",
+    description: "Launch codex in new boxes with --dangerously-bypass-approvals-and-sandbox (never prompt for approval). Safe because boxes are isolated; on by default. Override per-box with --no-dangerously-skip-permissions."
+  },
   {
     key: "opencode.sessionName",
     type: "string",
@@ -1031,6 +1073,21 @@ var KEY_REGISTRY = [
     type: "int",
     description: "Max number of simultaneously-running boxes (across providers) before background `-i` jobs queue up instead of starting immediately. Per-invocation override: `--max-running <n>`."
   },
+  {
+    key: "queue.maxWorking",
+    type: "int",
+    description: "Max agents actively working/thinking (quota-consuming) at once before background `-i` jobs queue. 0 = disabled (use the queue.maxConcurrent running-box gate). Counts all boxes, foreground + queued. Per-invocation override: `--max-working <n>`."
+  },
+  {
+    key: "queue.idleGraceSeconds",
+    type: "int",
+    description: "Seconds an agent must stay non-working before it frees its working slot (debounce against brief idle flaps between turns). Only used when queue.maxWorking > 0."
+  },
+  {
+    key: "cloud.useCurrentBranch",
+    type: "bool",
+    description: "On cloud providers (daytona/hetzner), start new boxes on the host's current branch instead of forking a new agentbox/<box-name> branch. Overridden by an explicit --use-branch / --from-branch."
+  },
   {
     key: "maintenance.pruneProjectConfigs",
     type: "bool",
@@ -1386,7 +1443,7 @@ function writeLeaf(obj, branch, leaf, value) {
   b[leaf] = value;
 }
 function resolveDefaultCheckpoint(cfg, provider) {
-  const perProvider = provider === "daytona" ? cfg.box.defaultCheckpointDaytona : provider === "hetzner" ? cfg.box.defaultCheckpointHetzner : cfg.box.defaultCheckpointDocker;
+  const perProvider = provider === "daytona" ? cfg.box.defaultCheckpointDaytona : provider === "hetzner" ? cfg.box.defaultCheckpointHetzner : provider === "vercel" ? cfg.box.defaultCheckpointVercel : cfg.box.defaultCheckpointDocker;
   if (perProvider && perProvider.length > 0) return perProvider;
   return cfg.box.defaultCheckpoint;
 }
@@ -1394,6 +1451,7 @@ function defaultCheckpointConfigKey(provider) {
   if (provider === "docker") return "box.defaultCheckpointDocker";
   if (provider === "daytona") return "box.defaultCheckpointDaytona";
   if (provider === "hetzner") return "box.defaultCheckpointHetzner";
+  if (provider === "vercel") return "box.defaultCheckpointVercel";
   return "box.defaultCheckpoint";
 }
 async function setConfigValue(scope, key, value, cwd, opts = {}) {
@@ -1591,7 +1649,7 @@ async function touchProjectMeta(absPath) {
 
 // ../../packages/sandbox-docker/dist/index.js
 import { chmod, mkdir as mkdir32, readFile as readFile32 } from "fs/promises";
-import { join as join32 } from "path";
+import { basename as basename2, join as join32 } from "path";
 import { execa as execa4 } from "execa";
 import { spawnSync as spawnSync2 } from "child_process";
 import { stat as stat22 } from "fs/promises";
@@ -1616,7 +1674,7 @@ import { homedir as homedir6, platform } from "os";
 import { join as join7, resolve as resolve2 } from "path";
 import { mkdir as mkdir5, mkdtemp as mkdtemp2, readFile as readFile5, readdir as readdir32, rm as rm3, writeFile as writeFile22 } from "fs/promises";
 import { homedir as homedir7, tmpdir as tmpdir2 } from "os";
-import { basename as basename3, join as join8 } from "path";
+import { basename as basename22, join as join8 } from "path";
 import { execa as execa10 } from "execa";
 import { stat as stat5 } from "fs/promises";
 import { execa as execa11 } from "execa";
@@ -1624,10 +1682,11 @@ import { execa as execa12 } from "execa";
 import { spawn } from "child_process";
 import { randomBytes as randomBytes22 } from "crypto";
 import { existsSync as existsSync2, openSync } from "fs";
-import { mkdir as mkdir6, readFile as readFile6, unlink as unlink2, writeFile as writeFile32 } from "fs/promises";
+import { cp, mkdir as mkdir6, readFile as readFile6, readdir as readdir4, rename as rename3, rm as rm4, unlink as unlink2, writeFile as writeFile32 } from "fs/promises";
 import { request as httpRequest } from "http";
+import { createRequire } from "module";
 import { homedir as homedir8 } from "os";
-import { dirname as dirname3, join as join9, resolve as resolve22 } from "path";
+import { dirname as dirname3, join as join9, resolve as resolve22, sep } from "path";
 import { setTimeout as delay2 } from "timers/promises";
 import { fileURLToPath } from "url";
 
@@ -1676,6 +1735,15 @@ var GH_PR_OPS = [
   "close",
   "reopen"
 ];
+function injectPrCreateHead(op, branch, args) {
+  if (op !== "create") return args;
+  if (!branch || branch === "HEAD") return args;
+  if (hasHeadArg(args)) return args;
+  return ["--head", branch, ...args];
+}
+function hasHeadArg(args) {
+  return args.some((a) => a === "--head" || a.startsWith("--head=") || a.startsWith("-H"));
+}
 var MAX_BODY_BYTES = 1024 * 1024;
 var QUEUE_DIR = join3(STATE_DIR, "queue");
 async function loadQueueConfig() {
@@ -1688,7 +1756,9 @@ async function loadQueueConfig() {
   const q = global.queue ?? {};
   return {
     enabled: q.enabled ?? d.enabled,
-    maxConcurrent: q.maxConcurrent ?? d.maxConcurrent
+    maxConcurrent: q.maxConcurrent ?? d.maxConcurrent,
+    maxWorking: q.maxWorking ?? d.maxWorking,
+    idleGraceMs: (q.idleGraceSeconds ?? d.idleGraceSeconds) * 1e3
   };
 }
 async function writeJob(job) {
@@ -1807,7 +1877,7 @@ function queueLogPath(id) {
 
 // ../../packages/sandbox-docker/dist/index.js
 import { execa as execa15 } from "execa";
-import { readdir as readdir4, rm as rm4, stat as stat7 } from "fs/promises";
+import { readdir as readdir5, rm as rm5, stat as stat7 } from "fs/promises";
 import { join as join12 } from "path";
 
 // ../../packages/core/dist/index.js
@@ -1868,11 +1938,11 @@ import { homedir as homedir10 } from "os";
 import { join as join13 } from "path";
 import { execa as execa16 } from "execa";
 import { existsSync as existsSync3, mkdirSync, renameSync, statSync } from "fs";
-import { basename as basename32, dirname as dirname22, posix, resolve as resolve4 } from "path";
+import { basename as basename4, dirname as dirname22, posix, resolve as resolve4 } from "path";
 import { execa as execa17 } from "execa";
-import { copyFile, mkdtemp as mkdtemp3, readdir as readdir5, readFile as readFile7, rm as rm5, stat as stat8, writeFile as writeFile4 } from "fs/promises";
+import { copyFile, mkdtemp as mkdtemp3, readdir as readdir6, readFile as readFile7, rm as rm6, stat as stat8, writeFile as writeFile4 } from "fs/promises";
 import { homedir as homedir11, tmpdir as tmpdir3 } from "os";
-import { basename as basename4, join as join14, relative as relative2 } from "path";
+import { basename as basename5, join as join14, relative as relative2 } from "path";
 import { execa as execa18 } from "execa";
 function isHostPathHookCommand(command, hostHome) {
   if (typeof command !== "string" || command.length === 0) return false;
@@ -2671,13 +2741,13 @@ async function copyOneEntry(container, entry) {
     throw new Error(`mkdir -p ${parentDir} failed: ${String(mkdir8.stderr).slice(0, 300)}`);
   }
   if (entry.kind === "file") {
-    const cp = await execa22(
+    const cp2 = await execa22(
       "docker",
       ["cp", entry.absSrc, `${container}:${boxDest}`],
       { reject: false }
     );
-    if (cp.exitCode !== 0) {
-      throw new Error(`docker cp failed: ${String(cp.stderr).slice(0, 300)}`);
+    if (cp2.exitCode !== 0) {
+      throw new Error(`docker cp failed: ${String(cp2.stderr).slice(0, 300)}`);
     }
   } else {
     const packed = await execa22(
@@ -3671,6 +3741,70 @@ async function pullClaudeExtras(spec, opts) {
   return { newItems, mergedRegistries };
 }
 var CREDENTIALS_BACKUP_FILE = join32(STATE_DIR, "claude-credentials.json");
+var CODEX_CREDENTIALS_BACKUP_FILE = join32(STATE_DIR, "codex-credentials.json");
+var OPENCODE_CREDENTIALS_BACKUP_FILE = join32(STATE_DIR, "opencode-credentials.json");
+function isRealAgentCredential(agent, text) {
+  let parsed;
+  try {
+    parsed = JSON.parse(text);
+  } catch {
+    return false;
+  }
+  if (typeof parsed !== "object" || parsed === null) return false;
+  if (agent === "claude") {
+    const rt = parsed.claudeAiOauth?.refreshToken;
+    return typeof rt === "string" && rt.length > 0;
+  }
+  return Object.keys(parsed).length > 0;
+}
+async function hostClaudeBackupExpired(path = CREDENTIALS_BACKUP_FILE, now = Date.now()) {
+  try {
+    const parsed = JSON.parse(await readFile32(path, "utf8"));
+    const exp = parsed?.claudeAiOauth?.expiresAt;
+    return typeof exp === "number" && Number.isFinite(exp) && exp < now;
+  } catch {
+    return false;
+  }
+}
+function parseExtractResult(stdout) {
+  return { copied: /\bCOPIED=yes\b/.test(stdout) };
+}
+async function extractVolumeAuthToBackup(opts) {
+  try {
+    await mkdir32(STATE_DIR, { recursive: true });
+    const script = 'COPIED=no; if [ -s /dst/auth.json ]; then cp -a /dst/auth.json "/host-state/$DEST" && COPIED=yes; fi; echo "COPIED=$COPIED"';
+    const { stdout } = await execa4("docker", [
+      "run",
+      "--rm",
+      "--user",
+      "0",
+      "-v",
+      `${opts.volume}:/dst`,
+      "-v",
+      `${STATE_DIR}:/host-state`,
+      "-e",
+      // Pass the destination filename via env so the path isn't interpolated
+      // into the script string (keeps the docker arg list static + injection-safe).
+      `DEST=${basename2(opts.backupFile)}`,
+      opts.image,
+      "sh",
+      "-c",
+      script
+    ]);
+    const result = parseExtractResult(stdout);
+    if (result.copied) await chmod(opts.backupFile, 384).catch(() => {
+    });
+    return result;
+  } catch {
+    return { copied: false };
+  }
+}
+function extractCodexCredentials(volume, image) {
+  return extractVolumeAuthToBackup({ volume, image, backupFile: CODEX_CREDENTIALS_BACKUP_FILE });
+}
+function extractOpencodeCredentials(volume, image) {
+  return extractVolumeAuthToBackup({ volume, image, backupFile: OPENCODE_CREDENTIALS_BACKUP_FILE });
+}
 async function hostBackupHasCredentials(path = CREDENTIALS_BACKUP_FILE) {
   try {
     const parsed = JSON.parse(await readFile32(path, "utf8"));
@@ -4571,23 +4705,10 @@ async function seedWorkspace(opts) {
     const main = r.repo.hostMainRepo;
     const wt = r.gitWorktreePath;
     const baseRef = r.repo.kind === "root" ? opts.fromBranch ?? "HEAD" : "HEAD";
+    const addArgs = r.reuseBranch ? ["worktree", "add", wt, r.branch] : ["worktree", "add", "-b", r.branch, wt, baseRef];
     const add = await execa7(
       "docker",
-      [
-        "exec",
-        "--user",
-        "vscode",
-        opts.container,
-        "git",
-        "-C",
-        main,
-        "worktree",
-        "add",
-        "-b",
-        r.branch,
-        wt,
-        baseRef
-      ],
+      ["exec", "--user", "vscode", opts.container, "git", "-C", main, ...addArgs],
       { reject: false }
     );
     if (add.exitCode !== 0) {
@@ -4938,7 +5059,7 @@ async function createSnapshot(opts) {
 var CHECKPOINTS_ROOT = join8(homedir7(), ".agentbox", "checkpoints");
 var CHECKPOINT_IMAGE_PREFIX = "agentbox-ckpt-";
 function checkpointImageTag(projectRoot, name) {
-  const mnemonic = sanitizeMnemonic(basename3(projectRoot));
+  const mnemonic = sanitizeMnemonic(basename22(projectRoot));
   return `${CHECKPOINT_IMAGE_PREFIX}${hashProjectPath(projectRoot)}_${mnemonic}:${name}`;
 }
 function projectCheckpointsDir(projectRoot) {
@@ -5288,6 +5409,7 @@ async function ensureHomeOwnedByVscode(container) {
 var STATE_DIR22 = join9(homedir8(), ".agentbox");
 var PID_FILE = join9(STATE_DIR22, "relay.pid");
 var LOG_FILE = join9(STATE_DIR22, "relay.log");
+var RELAY_HOME_DIR = join9(STATE_DIR22, "relay");
 var PORT = DEFAULT_RELAY_PORT;
 var ENDPOINT = {
   // host.docker.internal is the Docker Desktop / OrbStack-supplied alias for
@@ -5298,6 +5420,13 @@ var ENDPOINT = {
   hostUrl: `http://127.0.0.1:${String(PORT)}`,
   port: PORT
 };
+function shouldReclaimForVersion(health, currentVersion) {
+  if (health.cliEntry === false) return true;
+  if (typeof health.version === "string" && health.version.length > 0 && typeof currentVersion === "string" && currentVersion.length > 0 && health.version !== currentVersion) {
+    return true;
+  }
+  return false;
+}
 async function ensureRelay(opts = {}) {
   const log = opts.onLog ?? (() => {
   });
@@ -5306,25 +5435,80 @@ async function ensureRelay(opts = {}) {
     await removeContainer(RELAY_CONTAINER_NAME);
     log(`removed legacy relay container ${RELAY_CONTAINER_NAME}`);
   }
-  if (await pingHealthz(500)) {
-    return ENDPOINT;
-  }
-  const existingPid = await readPidFile();
-  if (existingPid !== null && await processAlive(existingPid)) {
-    for (let i = 0; i < 10; i++) {
-      if (await pingHealthz(300)) return ENDPOINT;
-      await delay2(200);
+  const currentVersion = process.env.AGENTBOX_CLI_VERSION;
+  const health = await fetchHealthz(500);
+  if (health !== null) {
+    if (!shouldReclaimForVersion(health, currentVersion)) {
+      return ENDPOINT;
+    }
+    if (health.cliEntry === false) {
+      log("relay is alive but lacks AGENTBOX_CLI_ENTRY (cp/download/checkpoint would fail) \u2014 reclaiming");
+    } else {
+      log(
+        `relay was spawned by agentbox ${health.version ?? "?"} but this CLI is ${currentVersion ?? "?"} \u2014 reclaiming to keep the relay version-consistent`
+      );
+    }
+    await reclaimRelay(health.pid, log);
+  } else {
+    const existingPid = await readPidFile();
+    if (existingPid !== null && await processAlive(existingPid)) {
+      for (let i = 0; i < 10; i++) {
+        if (await pingHealthz(300)) return ENDPOINT;
+        await delay2(200);
+      }
+      log(`relay pid ${String(existingPid)} alive but /healthz unresponsive \u2014 proceeding anyway`);
+      return ENDPOINT;
+    }
+    if (existingPid !== null) {
+      await unlink2(PID_FILE).catch(() => {
+      });
     }
-    log(`relay pid ${String(existingPid)} alive but /healthz unresponsive \u2014 proceeding anyway`);
-    return ENDPOINT;
   }
-  if (existingPid !== null) {
-    await unlink2(PID_FILE).catch(() => {
-    });
+  const staged = await stageRelayHome(currentVersion ?? "", log).catch(() => null);
+  const relayBin = staged?.relayBin ?? resolveRelayBin();
+  const cliEntry = staged?.cliEntry ?? resolveCliEntry();
+  if (cliEntry === null) {
+    throw new Error(
+      "cannot start the host relay: agentbox CLI entry not found (is the build complete / dist present?). Set AGENTBOX_CLI_ENTRY to override."
+    );
+  }
+  return spawnRelay(relayBin, cliEntry, log);
+}
+async function reclaimRelay(reportedPid, log) {
+  const pidFromFile = await readPidFile();
+  const seen = /* @__PURE__ */ new Set();
+  for (const pid of [reportedPid, pidFromFile]) {
+    if (typeof pid !== "number" || pid <= 0 || seen.has(pid)) continue;
+    seen.add(pid);
+    if (!await processAlive(pid)) continue;
+    log(`stopping crippled relay pid ${String(pid)}`);
+    await killPid(pid);
+  }
+  await unlink2(PID_FILE).catch(() => {
+  });
+  if (await pingHealthz(300)) {
+    throw new Error(
+      `a relay is still listening on :${String(PORT)} and could not be stopped (reported pid ${String(reportedPid ?? "unknown")}); kill it manually and retry`
+    );
+  }
+}
+async function killPid(pid) {
+  try {
+    process.kill(pid, "SIGTERM");
+  } catch {
+    return;
+  }
+  for (let i = 0; i < 20; i++) {
+    if (!await processAlive(pid)) return;
+    await delay2(100);
+  }
+  try {
+    process.kill(pid, "SIGKILL");
+  } catch {
   }
-  const relayBin = resolveRelayBin();
+}
+async function spawnRelay(relayBin, cliEntry, log) {
   const logFd = openSync(LOG_FILE, "a");
-  const cliEntry = resolveCliEntry();
   const child = spawn(
     process.execPath,
     [relayBin, "serve", "--port", String(PORT), "--host", "0.0.0.0"],
@@ -5333,7 +5517,7 @@ async function ensureRelay(opts = {}) {
       stdio: ["ignore", logFd, logFd],
       env: {
         ...process.env,
-        ...cliEntry ? { AGENTBOX_CLI_ENTRY: cliEntry } : {}
+        AGENTBOX_CLI_ENTRY: cliEntry
       }
     }
   );
@@ -5387,6 +5571,80 @@ function resolveCliEntry() {
   }
   return null;
 }
+async function stageRelayHome(version, log) {
+  if (!version || version === "0.0.0-dev") return null;
+  if (process.env.AGENTBOX_RELAY_BIN || process.env.AGENTBOX_CLI_ENTRY) return null;
+  const cliRoot = findCliRoot(dirname3(fileURLToPath(import.meta.url)));
+  if (cliRoot === null) return null;
+  const homeDir = join9(RELAY_HOME_DIR, version);
+  const stagedEntry = join9(homeDir, "dist", "index.js");
+  const stagedBin = join9(homeDir, "runtime", "relay", "bin.cjs");
+  if (existsSync2(stagedEntry) && existsSync2(stagedBin)) {
+    return { relayBin: stagedBin, cliEntry: stagedEntry };
+  }
+  const nodeModules = resolveDepRoot(join9(cliRoot, "dist", "index.js"));
+  if (nodeModules === null) return null;
+  const tmpDir = `${homeDir}.tmp-${String(process.pid)}`;
+  try {
+    await mkdir6(RELAY_HOME_DIR, { recursive: true });
+    await rm4(tmpDir, { recursive: true, force: true });
+    await mkdir6(tmpDir, { recursive: true });
+    for (const sub of ["dist", "runtime", "share"]) {
+      const src = join9(cliRoot, sub);
+      if (existsSync2(src)) await cp(src, join9(tmpDir, sub), { recursive: true });
+    }
+    await cp(nodeModules, join9(tmpDir, "node_modules"), { recursive: true, dereference: true });
+    await rm4(homeDir, { recursive: true, force: true });
+    await rename3(tmpDir, homeDir);
+  } catch (err) {
+    await rm4(tmpDir, { recursive: true, force: true }).catch(() => {
+    });
+    if (existsSync2(stagedEntry) && existsSync2(stagedBin)) {
+      return { relayBin: stagedBin, cliEntry: stagedEntry };
+    }
+    log(`relay home staging failed (${err instanceof Error ? err.message : String(err)}); using bundle paths`);
+    return null;
+  }
+  log(`staged relay home for ${version} at ${homeDir}`);
+  await gcOldRelayHomes(version).catch(() => {
+  });
+  return { relayBin: stagedBin, cliEntry: stagedEntry };
+}
+function findCliRoot(moduleDir) {
+  for (const root of [resolve22(moduleDir, ".."), resolve22(moduleDir, "..", "..")]) {
+    if (existsSync2(join9(root, "dist", "index.js")) && existsSync2(join9(root, "runtime", "relay", "bin.cjs"))) {
+      return root;
+    }
+  }
+  return null;
+}
+function resolveDepRoot(fromFile) {
+  try {
+    const req = createRequire(fromFile);
+    const main = req.resolve("commander");
+    if (main.includes(`${sep}.pnpm${sep}`)) return null;
+    const marker = `${sep}node_modules${sep}`;
+    const idx = main.lastIndexOf(marker);
+    if (idx === -1) return null;
+    const nm = main.slice(0, idx + marker.length - 1);
+    return existsSync2(join9(nm, "commander")) ? nm : null;
+  } catch {
+    return null;
+  }
+}
+async function gcOldRelayHomes(keepVersion) {
+  let entries;
+  try {
+    entries = await readdir4(RELAY_HOME_DIR);
+  } catch {
+    return;
+  }
+  for (const name of entries) {
+    if (name === keepVersion) continue;
+    await rm4(join9(RELAY_HOME_DIR, name), { recursive: true, force: true }).catch(() => {
+    });
+  }
+}
 async function stopRelay() {
   const pid = await readPidFile();
   if (pid === null) {
@@ -5425,7 +5683,7 @@ async function getRelayStatus() {
     pidAlive: pidAlive2,
     port: PORT,
     endpoint: ENDPOINT,
-    health: health === null ? null : { boxes: health.boxes, events: health.events },
+    health: health === null ? null : { boxes: health.boxes, events: health.events, version: health.version, commit: health.commit },
     pidFile: PID_FILE,
     logFile: LOG_FILE
   };
@@ -5465,7 +5723,15 @@ function fetchHealthz(timeoutMs) {
           try {
             const parsed = JSON.parse(Buffer.concat(chunks).toString("utf8"));
             if (typeof parsed.ok === "boolean" && typeof parsed.boxes === "number" && typeof parsed.events === "number") {
-              resolveP({ ok: parsed.ok, boxes: parsed.boxes, events: parsed.events });
+              resolveP({
+                ok: parsed.ok,
+                boxes: parsed.boxes,
+                events: parsed.events,
+                pid: typeof parsed.pid === "number" ? parsed.pid : void 0,
+                cliEntry: typeof parsed.cliEntry === "boolean" ? parsed.cliEntry : void 0,
+                version: typeof parsed.version === "string" && parsed.version.length > 0 ? parsed.version : void 0,
+                commit: typeof parsed.commit === "string" && parsed.commit.length > 0 ? parsed.commit : void 0
+              });
             } else {
               resolveP(null);
             }
@@ -5817,7 +6083,7 @@ function generateBoxId() {
   return randomBytes3(4).toString("hex");
 }
 function sanitizeBasename(workspacePath) {
-  const raw = basename2(resolve3(workspacePath));
+  const raw = basename3(resolve3(workspacePath));
   return raw.toLowerCase().replace(/[^a-z0-9._-]+/g, "-").replace(/-+/g, "-").replace(/^[-._]+|[-._]+$/g, "").slice(0, 30).replace(/[-._]+$/, "");
 }
 function defaultBoxName(workspacePath, id) {
@@ -5944,9 +6210,33 @@ async function createBox(opts) {
       );
     }
     for (const r of repos) {
+      const containerPath = r.kind === "root" ? "/workspace" : `/workspace/${r.relPathFromWorkspace}`;
+      const reuseBranch = r.kind === "root" && opts.useBranch !== void 0;
+      if (reuseBranch) {
+        const branch2 = opts.useBranch;
+        const gitWorktreePath2 = gitWorktreePathFor(branch2);
+        repoCarryOvers.push({
+          repo: r,
+          containerPath,
+          gitWorktreePath: gitWorktreePath2,
+          branch: branch2,
+          stashSha: null,
+          untrackedNul: "",
+          hostSource: r.hostMainRepo,
+          reuseBranch: true
+        });
+        gitWorktreeRecords.push({
+          kind: r.kind,
+          hostMainRepo: r.hostMainRepo,
+          containerPath,
+          gitWorktreePath: gitWorktreePath2,
+          branch: branch2,
+          relPathFromWorkspace: r.relPathFromWorkspace
+        });
+        continue;
+      }
       const branchBase = r.kind === "root" ? `agentbox/${name}` : `agentbox/${name}--${r.relPathFromWorkspace.replace(/[^A-Za-z0-9._-]+/g, "_")}`;
       const branch = await pickFreshBranch(r.hostMainRepo, branchBase);
-      const containerPath = r.kind === "root" ? "/workspace" : `/workspace/${r.relPathFromWorkspace}`;
       const gitWorktreePath = gitWorktreePathFor(branch);
       const carry = await collectRepoCarryOver(r, branch, containerPath, gitWorktreePath);
       repoCarryOvers.push(carry);
@@ -6191,9 +6481,18 @@ async function createBox(opts) {
         });
         log("seeded /workspace from in-container git worktree(s)");
       } catch (err) {
-        log(
-          `seedWorkspace failed; leaving ${containerName} running so you can inspect it`
-        );
+        if (opts.useBranch !== void 0) {
+          log(`seedWorkspace failed for --use-branch ${opts.useBranch}; cleaning up the box`);
+          await execa13("docker", ["rm", "-f", containerName], { reject: false });
+          for (const w of gitWorktreeRecords) {
+            await removeInBoxWorktree({
+              hostMainRepo: w.hostMainRepo,
+              gitWorktreePath: w.gitWorktreePath
+            });
+          }
+        } else {
+          log(`seedWorkspace failed; leaving ${containerName} running so you can inspect it`);
+        }
         throw err;
       }
     } else {
@@ -6625,10 +6924,11 @@ async function listBoxes() {
         };
         return {
           ...b,
-          state: "running",
+          state: b.cloud?.lastState ?? "running",
           endpoints: endpoints2,
           claudeActivity: persisted2?.claude.state,
           claudeSessionTitle: persisted2?.claude.sessionTitle,
+          claudeQuestion: persisted2?.claude.state === "question" ? persisted2.claude.question : void 0,
           codexActivity: persisted2?.codex?.state,
           codexSessionTitle: persisted2?.codex?.sessionTitle,
           opencodeSessionTitle: persisted2?.opencode?.sessionTitle,
@@ -6649,6 +6949,7 @@ async function listBoxes() {
         endpoints,
         claudeActivity: persisted?.claude.state,
         claudeSessionTitle: persisted?.claude.sessionTitle,
+        claudeQuestion: persisted?.claude.state === "question" ? persisted.claude.question : void 0,
         codexActivity: persisted?.codex?.state,
         codexSessionTitle: persisted?.codex?.sessionTitle,
         opencodeSessionTitle: persisted?.opencode?.sessionTitle,
@@ -6919,14 +7220,14 @@ async function destroyBox(idOrName, opts = {}) {
   let removedSnapshot = null;
   if (box.snapshotDir && !opts.keepSnapshot) {
     try {
-      await rm4(box.snapshotDir, { recursive: true, force: true });
+      await rm5(box.snapshotDir, { recursive: true, force: true });
       removedSnapshot = box.snapshotDir;
     } catch {
       removedSnapshot = null;
     }
   }
   try {
-    await rm4(boxRunDirFor(box), { recursive: true, force: true });
+    await rm5(boxRunDirFor(box), { recursive: true, force: true });
   } catch {
   }
   await removeBoxRecord(box.id);
@@ -6934,7 +7235,7 @@ async function destroyBox(idOrName, opts = {}) {
 }
 async function listSnapshotDirs() {
   try {
-    const entries = await readdir4(SNAPSHOTS_ROOT, { withFileTypes: true });
+    const entries = await readdir5(SNAPSHOTS_ROOT, { withFileTypes: true });
     return entries.filter((e) => e.isDirectory()).map((e) => join12(SNAPSHOTS_ROOT, e.name));
   } catch {
     return [];
@@ -6942,7 +7243,7 @@ async function listSnapshotDirs() {
 }
 async function listBoxDirs() {
   try {
-    const entries = await readdir4(BOXES_ROOT, { withFileTypes: true });
+    const entries = await readdir5(BOXES_ROOT, { withFileTypes: true });
     return entries.filter((e) => e.isDirectory()).map((e) => join12(BOXES_ROOT, e.name));
   } catch {
     return [];
@@ -7038,13 +7339,13 @@ async function pruneBoxes(opts = {}) {
   for (const v of orphanVolumes) await removeVolume(v);
   for (const d of orphanSnapshots) {
     try {
-      await rm4(d, { recursive: true, force: true });
+      await rm5(d, { recursive: true, force: true });
     } catch {
     }
   }
   for (const d of orphanBoxDirs) {
     try {
-      await rm4(d, { recursive: true, force: true });
+      await rm5(d, { recursive: true, force: true });
     } catch {
     }
   }
@@ -7309,7 +7610,7 @@ function asText(s) {
 async function uploadToBox(box, hostSrc, boxDst) {
   const srcAbs = resolve4(hostSrc);
   if (!existsSync3(srcAbs)) throw new Error(`source not found: ${hostSrc}`);
-  const srcBasename = basename32(srcAbs);
+  const srcBasename = basename4(srcAbs);
   const srcParent = dirname22(srcAbs);
   let boxParent;
   let finalName;
@@ -7393,7 +7694,7 @@ async function downloadFromBox(box, boxSrc, hostDst) {
     finalName = srcBasename;
   } else {
     hostParent = dirname22(dstAbs);
-    finalName = basename32(dstAbs);
+    finalName = basename4(dstAbs);
   }
   mkdirSync(hostParent, { recursive: true });
   const finalPath = posix.join(hostParent, finalName);
@@ -7427,6 +7728,7 @@ var dockerProvider = {
       useSnapshot: po.useSnapshot ?? false,
       checkpointRef: req.checkpointRef,
       fromBranch: req.fromBranch,
+      useBranch: req.useBranch,
       image: req.image,
       onLog: req.onLog,
       claudeConfig: po.claudeConfig,
@@ -7561,7 +7863,7 @@ async function findBrokenSymlinks2(root) {
   async function walk(dir) {
     let entries;
     try {
-      entries = await readdir5(dir, { withFileTypes: true });
+      entries = await readdir6(dir, { withFileTypes: true });
     } catch {
       return;
     }
@@ -7589,7 +7891,7 @@ function emptyResult(warnings = []) {
   }, warnings };
 }
 async function tarballFromDir(stageDir, agent) {
-  const tarballPath = join14(tmpdir3(), `agentbox-${agent}-${basename4(stageDir)}.tar.gz`);
+  const tarballPath = join14(tmpdir3(), `agentbox-${agent}-${basename5(stageDir)}.tar.gz`);
   await execa18("tar", ["-czf", tarballPath, "-C", stageDir, "."], {
     env: { ...process.env, COPYFILE_DISABLE: "1" }
   });
@@ -7598,7 +7900,7 @@ async function tarballFromDir(stageDir, agent) {
 function makeCleanup(paths) {
   return async () => {
     for (const p of paths) {
-      await rm5(p, { recursive: true, force: true });
+      await rm6(p, { recursive: true, force: true });
     }
   };
 }
@@ -7614,8 +7916,8 @@ async function stageSingleFileTarball(agent, sourcePath, tarballEntryName) {
       warnings: []
     };
   } catch (err) {
-    await rm5(stageDir, { recursive: true, force: true });
-    if (tarballPath) await rm5(tarballPath, { force: true });
+    await rm6(stageDir, { recursive: true, force: true });
+    if (tarballPath) await rm6(tarballPath, { force: true });
     throw err;
   }
 }
@@ -7698,7 +8000,7 @@ async function stageClaudeStaticForUpload(opts = {}) {
     const pluginsDir = join14(stageDir, "plugins");
     if (await pathExists7(pluginsDir)) {
       try {
-        const entries = await readdir5(pluginsDir, { withFileTypes: true });
+        const entries = await readdir6(pluginsDir, { withFileTypes: true });
         for (const ent of entries) {
           if (!ent.isFile() || !ent.name.endsWith(".json")) continue;
           const file = join14(pluginsDir, ent.name);
@@ -7716,8 +8018,8 @@ async function stageClaudeStaticForUpload(opts = {}) {
       warnings: []
     };
   } catch (err) {
-    await rm5(stageDir, { recursive: true, force: true });
-    if (tarballPath) await rm5(tarballPath, { force: true });
+    await rm6(stageDir, { recursive: true, force: true });
+    if (tarballPath) await rm6(tarballPath, { force: true });
     throw err;
   }
 }
@@ -7777,13 +8079,17 @@ async function stageCodexStaticForUpload(opts = {}) {
       warnings: []
     };
   } catch (err) {
-    await rm5(stageDir, { recursive: true, force: true });
-    if (tarballPath) await rm5(tarballPath, { force: true });
+    await rm6(stageDir, { recursive: true, force: true });
+    if (tarballPath) await rm6(tarballPath, { force: true });
     throw err;
   }
 }
 async function stageCodexCredentialsForUpload(opts = {}) {
   const hostHome = opts.hostHome ?? homedir11();
+  const cloudBackup = join14(hostHome, ".agentbox", "codex-credentials.json");
+  if (await pathExists7(cloudBackup)) {
+    return stageSingleFileTarball("codex-creds", cloudBackup, "auth.json");
+  }
   const hostAuth = join14(hostHome, ".codex", "auth.json");
   if (!await pathExists7(hostAuth)) return emptyResult([CODEX_KEYCHAIN_WARNING]);
   return stageSingleFileTarball("codex-creds", hostAuth, "auth.json");
@@ -7841,13 +8147,17 @@ async function stageOpencodeStaticForUpload(opts = {}) {
       warnings: []
     };
   } catch (err) {
-    await rm5(stageDir, { recursive: true, force: true });
-    if (tarballPath) await rm5(tarballPath, { force: true });
+    await rm6(stageDir, { recursive: true, force: true });
+    if (tarballPath) await rm6(tarballPath, { force: true });
     throw err;
   }
 }
 async function stageOpencodeCredentialsForUpload(opts = {}) {
   const hostHome = opts.hostHome ?? homedir11();
+  const cloudBackup = join14(hostHome, ".agentbox", "opencode-credentials.json");
+  if (await pathExists7(cloudBackup)) {
+    return stageSingleFileTarball("opencode-creds", cloudBackup, "auth.json");
+  }
   const hostAuth = join14(hostHome, ".local", "share", "opencode", "auth.json");
   if (!await pathExists7(hostAuth)) return emptyResult();
   return stageSingleFileTarball("opencode-creds", hostAuth, "auth.json");
@@ -7908,6 +8218,7 @@ export {
   RELAY_IMAGE_REF,
   hashRpcParams,
   GH_PR_OPS,
+  injectPrCreateHead,
   loadQueueConfig,
   writeJob,
   readJob,
@@ -7966,6 +8277,14 @@ export {
   claudeSessionInfo,
   pullClaudeExtras,
   CREDENTIALS_BACKUP_FILE,
+  CODEX_CREDENTIALS_BACKUP_FILE,
+  OPENCODE_CREDENTIALS_BACKUP_FILE,
+  isRealAgentCredential,
+  hostClaudeBackupExpired,
+  parseExtractResult,
+  extractVolumeAuthToBackup,
+  extractCodexCredentials,
+  extractOpencodeCredentials,
   hostBackupHasCredentials,
   parseSyncResult,
   syncClaudeCredentials,
@@ -8111,4 +8430,4 @@ export {
   browserSessionActive,
   ensureBoxBrowser
 };
-//# sourceMappingURL=chunk-6OZDFNBF.js.map
+//# sourceMappingURL=chunk-7UIAO7PC.js.map