@mifune/agro 0.10.0 → 0.11.0

package/dist/agro.js

@@ -2,8 +2,8 @@
 
 // src/cli.ts
 import { fileURLToPath } from "node:url";
-import { dirname as dirname8, join as join11, resolve as resolve10 } from "node:path";
-import { existsSync as existsSync17, mkdtempSync as mkdtempSync3, readFileSync as readFileSync12, rmSync as rmSync3 } from "node:fs";
+import { dirname as dirname8, join as join10, resolve as resolve10 } from "node:path";
+import { existsSync as existsSync16, mkdtempSync as mkdtempSync3, readFileSync as readFileSync11, rmSync as rmSync3 } from "node:fs";
 import { tmpdir as tmpdir3 } from "node:os";
 
 // src/commands/update.ts
@@ -315,17 +315,53 @@ import {
   copyFileSync
 } from "node:fs";
 import path2 from "node:path";
+
+// src/lib/product.ts
+import { basename } from "node:path";
+var AGRO_PRODUCT = {
+  name: "agro",
+  bin: "agro",
+  title: "AGRO CLI",
+  packageName: "@mifune/agro",
+  generation: "agro"
+};
+var LEGACY_PRODUCT = {
+  name: "oh",
+  bin: "oh",
+  title: "Open Harness CLI",
+  packageName: "@mifune/openharness",
+  generation: "legacy"
+};
+var FILE_EXTENSION = /\.[^.]*$/;
+function invokedName(argv1) {
+  if (argv1 === void 0) return "";
+  return basename(argv1.replace(/\\/g, "/")).replace(FILE_EXTENSION, "");
+}
+function resolveProduct(argv1) {
+  return invokedName(argv1) === LEGACY_PRODUCT.bin ? LEGACY_PRODUCT : AGRO_PRODUCT;
+}
+function activeBin() {
+  return resolveProduct(process.argv[1]).bin;
+}
+function productFor(bin) {
+  return bin === LEGACY_PRODUCT.bin ? LEGACY_PRODUCT : AGRO_PRODUCT;
+}
+function stateNames(bin) {
+  return GENERATIONS[productFor(bin).generation];
+}
+
+// src/lib/vendor.ts
 function assertDestInTarget(dest, targetOh, sep5) {
   if (dest === targetOh || dest.startsWith(targetOh + sep5)) {
     return;
   }
-  throw new Error("oh: refusing to write outside target .oh: " + dest);
+  throw new Error(`${activeBin()}: refusing to write outside target .oh: ` + dest);
 }
 function assertDestInRoot(dest, targetRoot, sep5) {
   if (dest === targetRoot || dest.startsWith(targetRoot + sep5)) {
     return;
   }
-  throw new Error("oh: refusing to write outside target root: " + dest);
+  throw new Error(`${activeBin()}: refusing to write outside target root: ` + dest);
 }
 function walkFiles(root, dir, acc) {
   const entries = readdirSync2(dir, { withFileTypes: true });
@@ -467,12 +503,12 @@ function readCliVersion(ohDir) {
   return "0.0.0";
 }
 async function runUpdate(opts, io) {
-  const { targetDir, fromDir, force, dryRun } = opts;
+  const { bin, targetDir, fromDir, force, dryRun } = opts;
   const dryPrefix = dryRun ? "[dry-run] " : "";
   const source = resolveControlDir(fromDir);
   if (source.kind === "absent") {
     io.stderr(
-      "oh update: update source not found at " + source.agroPath + " or " + source.legacyPath + ". Pass --from <built-AGRO-checkout> or --from-remote [--ref <ref>].\n"
+      bin + " update: update source not found at " + source.agroPath + " or " + source.legacyPath + ". Pass --from <built-AGRO-checkout> or --from-remote [--ref <ref>].\n"
     );
     return 1;
   }
@@ -482,7 +518,7 @@ async function runUpdate(opts, io) {
   const targetOh = target.kind === "absent" ? path3.resolve(targetDir, controlName) : target.path;
   const targetName = path3.basename(targetOh);
   if (fromOh === targetOh) {
-    io.stderr("oh update: source and target are the same " + targetName + "; nothing to update.\n");
+    io.stderr(bin + " update: source and target are the same " + targetName + "; nothing to update.\n");
     return 1;
   }
   const available = readCliVersion(fromOh);
@@ -492,25 +528,25 @@ async function runUpdate(opts, io) {
     io.stdout(dryPrefix + "updating " + targetName + ": " + current + " -> " + available + "\n");
   } else if (cmp === 0) {
     if (!force) {
-      io.stdout(dryPrefix + "oh update: already up to date (v" + current + ")\n");
+      io.stdout(dryPrefix + bin + " update: already up to date (v" + current + ")\n");
       return 0;
     }
-    io.stdout(dryPrefix + "oh update: re-overlay (v" + current + ", --force)\n");
+    io.stdout(dryPrefix + bin + " update: re-overlay (v" + current + ", --force)\n");
   } else {
     if (!force) {
       io.stderr(
-        "oh update: refusing downgrade (current v" + current + " > source v" + available + "); pass --force to override\n"
+        bin + " update: refusing downgrade (current v" + current + " > source v" + available + "); pass --force to override\n"
       );
       return 1;
     }
     io.stdout(
-      dryPrefix + "oh update: downgrading " + targetName + ": " + current + " -> " + available + " (--force)\n"
+      dryPrefix + bin + " update: downgrading " + targetName + ": " + current + " -> " + available + " (--force)\n"
     );
   }
   const manifest = loadManifest(fromOh);
   if (manifest === null) {
     io.stdout(
-      dryPrefix + "oh update: no " + controlName + "/manifest.json in source; overlaying all of " + controlName + "/ (legacy mode)\n"
+      dryPrefix + bin + " update: no " + controlName + "/manifest.json in source; overlaying all of " + controlName + "/ (legacy mode)\n"
     );
   }
   let created = 0;
@@ -548,12 +584,12 @@ async function runUpdate(opts, io) {
     const stranded = path3.join(targetOh, dir);
     if (existsSync3(stranded)) {
       io.stdout(
-        dryPrefix + "oh update: " + path3.join(targetName, dir) + " still exists from a pre-move install and is no longer read; move any local edits into " + dir + "/ and delete it\n"
+        dryPrefix + bin + " update: " + path3.join(targetName, dir) + " still exists from a pre-move install and is no longer read; move any local edits into " + dir + "/ and delete it\n"
       );
     }
   }
   io.stdout(
-    dryPrefix + "oh update: " + created + " created, " + overwritten + " overwritten, " + (skipped + rootResult.skipped) + " skipped\n"
+    dryPrefix + bin + " update: " + created + " created, " + overwritten + " overwritten, " + (skipped + rootResult.skipped) + " skipped\n"
   );
   return 0;
 }
@@ -571,39 +607,6 @@ import {
   writeFileSync
 } from "node:fs";
 import { basename as basename2, delimiter, dirname, extname, join as join2 } from "node:path";
-
-// src/lib/product.ts
-import { basename } from "node:path";
-var AGRO_PRODUCT = {
-  name: "agro",
-  bin: "agro",
-  title: "AGRO CLI",
-  packageName: "@mifune/agro",
-  generation: "agro"
-};
-var LEGACY_PRODUCT = {
-  name: "oh",
-  bin: "oh",
-  title: "Open Harness CLI",
-  packageName: "@mifune/openharness",
-  generation: "legacy"
-};
-var FILE_EXTENSION = /\.[^.]*$/;
-function invokedName(argv1) {
-  if (argv1 === void 0) return "";
-  return basename(argv1.replace(/\\/g, "/")).replace(FILE_EXTENSION, "");
-}
-function resolveProduct(argv1) {
-  return invokedName(argv1) === LEGACY_PRODUCT.bin ? LEGACY_PRODUCT : AGRO_PRODUCT;
-}
-function productFor(bin) {
-  return bin === LEGACY_PRODUCT.bin ? LEGACY_PRODUCT : AGRO_PRODUCT;
-}
-function stateNames(bin) {
-  return GENERATIONS[productFor(bin).generation];
-}
-
-// src/commands/self-upgrade.ts
 var DEFAULT_ARTIFACT_URL = "https://github.com/mifunedev/agro/releases/latest/download/agro.js";
 var PREFIX = `${AGRO_PRODUCT.bin} update`;
 var PACKAGE = AGRO_PRODUCT.packageName;
@@ -701,13 +704,13 @@ function compareSemver(a, b) {
 function versionOf(result) {
   return result.status === 0 ? result.stdout.trim() : "";
 }
-function refuseUnsupported(installation) {
+function refuseUnsupported(installation, bin) {
   const { kind, target, reason } = installation;
   const at = `${kind} installation at ${target}`;
   switch (kind) {
     case "image":
       return new Error(
-        `${at} \u2014 the sandbox image ships this CLI; pull a newer image on the host (oh/agro stop, then agro sandbox install docker --name <name>)`
+        `${at} \u2014 the sandbox image ships this CLI; pull a newer image on the host (${bin} stop, then ${bin} sandbox install docker --name <name>)`
       );
     case "source":
       return new Error(`${at} \u2014 rebuild from the checkout: npm --prefix .agro/cli run build`);
@@ -890,7 +893,7 @@ async function runSelfUpgrade(opts, deps, io) {
   try {
     const installation = classifyInstallation(opts.argv1, deps);
     if (installation.kind !== "npm" && installation.kind !== "standalone") {
-      throw refuseUnsupported(installation);
+      throw refuseUnsupported(installation, resolveProduct(opts.argv1).bin);
     }
     io.stdout(`${PREFIX}: ${installation.kind} installation at ${installation.target}
 `);
@@ -1505,212 +1508,64 @@ function runMigrate(args, io, deps = defaultMigrateDeps()) {
   }
 }
 
-// src/commands/cloud.ts
-import { readFile } from "node:fs/promises";
-import { existsSync as existsSync9, readFileSync as readFileSync9 } from "node:fs";
-import { join as join4 } from "node:path";
-
-// src/lib/prompt.ts
-import { createInterface } from "node:readline";
-var COLORS = {
-  reset: "\x1B[0m",
-  bold: "\x1B[1m",
-  dim: "\x1B[2m",
-  green: "\x1B[32m",
-  yellow: "\x1B[33m",
-  red: "\x1B[31m",
-  cyan: "\x1B[36m"
-};
-function header(msg) {
-  process.stdout.write(`
-${COLORS.bold}${msg}${COLORS.reset}
-
-`);
-}
-function bold(s) {
-  return `${COLORS.bold}${s}${COLORS.reset}`;
-}
-function redact(token) {
-  if (token.length <= 8) return "****";
-  return token.slice(0, 5) + "*".repeat(token.length - 5);
-}
-async function ask(question) {
-  const rl = createInterface({ input: process.stdin, output: process.stdout });
-  try {
-    return await new Promise((resolve11) => {
-      rl.question(`  ${question} `, (answer) => resolve11(answer.trim()));
-    });
-  } finally {
-    rl.close();
-  }
-}
-async function askSecret(question) {
-  if (!process.stdin.isTTY) return askSecretPiped(question);
-  process.stdout.write(`  ${question} `);
-  process.stdin.setRawMode(true);
-  process.stdin.resume();
-  const bytes = [];
-  return await new Promise((resolve11) => {
-    const cleanup = () => {
-      try {
-        process.stdin.setRawMode(false);
-      } catch {
-      }
-      process.stdin.pause();
-      process.stdin.removeListener("data", onData);
-    };
-    const onData = (data) => {
-      for (const byte of data) {
-        if (byte === 3) {
-          cleanup();
-          process.stdout.write("\n");
-          process.exit(130);
-        } else if (byte === 13 || byte === 10) {
-          cleanup();
-          process.stdout.write("\n");
-          resolve11(Buffer.from(bytes).toString("utf8").trim());
-          return;
-        } else if (byte === 127 || byte === 8) {
-          if (bytes.length > 0) {
-            bytes.pop();
-            process.stdout.write("\b \b");
-          }
-        } else if (byte === 21) {
-          while (bytes.length > 0) {
-            bytes.pop();
-            process.stdout.write("\b \b");
-          }
-        } else if (byte >= 32) {
-          bytes.push(byte);
-          process.stdout.write("\u25CF");
-        }
-      }
-    };
-    process.stdin.on("data", onData);
-  });
-}
-async function askSecretPiped(question) {
-  const rl = createInterface({ input: process.stdin, output: process.stdout });
-  const stdoutWrite = process.stdout.write.bind(process.stdout);
-  let prompted = false;
-  const patched = (chunk) => {
-    if (!prompted) {
-      prompted = true;
-      return stdoutWrite(chunk);
-    }
-    return true;
-  };
-  process.stdout.write = patched;
-  let restored = false;
-  const restore = () => {
-    if (restored) return;
-    restored = true;
-    process.stdout.write = stdoutWrite;
-    try {
-      rl.close();
-    } catch {
-    }
+// src/lib/execution/runner.ts
+import { spawnSync as spawnSync2 } from "node:child_process";
+import { existsSync as existsSync5 } from "node:fs";
+import { basename as basename3, join as join4 } from "node:path";
+var spawnRunner = (cmd, args, opts) => {
+  const common = {
+    env: opts.env,
+    ...opts.cwd !== void 0 ? { cwd: opts.cwd } : {},
+    ...opts.timeoutMs !== void 0 ? { timeout: opts.timeoutMs } : {}
   };
-  const onSigint = () => {
-    restore();
-    process.stdout.write("\n");
-    process.exit(130);
+  const r = opts.stdio === "capture" ? spawnSync2(cmd, args, { ...common, stdio: ["ignore", "pipe", "pipe"], encoding: "utf8" }) : spawnSync2(cmd, args, { ...common, stdio: "inherit" });
+  const err = r.error;
+  return {
+    status: r.status,
+    error: err ? { code: err.code, message: err.message } : void 0,
+    stdout: typeof r.stdout === "string" ? r.stdout : void 0,
+    stderr: typeof r.stderr === "string" ? r.stderr : void 0
   };
-  process.on("SIGINT", onSigint);
-  try {
-    return await new Promise((resolve11) => {
-      rl.question(`  ${question} `, (answer) => {
-        process.stdout.write("\n");
-        resolve11(answer.trim());
-      });
-    });
-  } finally {
-    process.removeListener("SIGINT", onSigint);
-    restore();
+};
+var ExecutionSpawnError = class extends Error {
+  code;
+  constructor(what, error) {
+    super(`failed to run ${what}${error?.message ? ` (${error.message})` : ""}`);
+    this.name = "ExecutionSpawnError";
+    this.code = error?.code;
   }
-}
-async function confirm(question, defaultYes = true) {
-  const suffix = defaultYes ? "[Y/n]" : "[y/N]";
-  const answer = (await ask(`${question} ${suffix}`)).toLowerCase();
-  if (answer === "") return defaultYes;
-  return /^y/.test(answer);
-}
-
-// src/lib/oh-config.ts
-import { existsSync as existsSync6, mkdirSync as mkdirSync3, readFileSync as readFileSync6, renameSync as renameSync3, unlinkSync as unlinkSync3, writeFileSync as writeFileSync3 } from "node:fs";
-import { basename as basename3, dirname as dirname4, resolve as resolve5 } from "node:path";
-
-// src/lib/env-file.ts
-import { existsSync as existsSync5 } from "node:fs";
-import { resolve as resolve4, sep as sep2 } from "node:path";
-function assertInRoot(dest, root) {
-  if (!(dest === root || dest.startsWith(root + sep2))) {
-    throw new Error(`refusing to write outside the project root: ${dest}`);
+};
+var ExecutionExitError = class extends Error {
+  exitCode;
+  constructor(what, exitCode) {
+    super(`${what} exited ${exitCode}`);
+    this.name = "ExecutionExitError";
+    this.exitCode = exitCode;
   }
-}
-function stripQuotes(s) {
-  if (s.length >= 2 && (s[0] === '"' && s.endsWith('"') || s[0] === "'" && s.endsWith("'"))) {
-    return s.slice(1, -1);
+};
+function assertSpawned(r, what) {
+  if (r.error) {
+    throw new ExecutionSpawnError(what, r.error);
   }
-  return s;
 }
-var CONFIG_FIELD_BY_ENV_KEY = {
-  DOCKER_SOCKET: "access.dockerSocket"
-};
-function setEnvValue(root, key, value) {
-  const path4 = CONFIG_FIELD_BY_ENV_KEY[key];
-  if (path4 === void 0) {
+function requireLifecycleScript(root, rel) {
+  const { controlDir } = resolveProjectLayout(root);
+  const script = join4(controlDir, "scripts", rel);
+  if (!existsSync5(script)) {
     throw new Error(
-      `${key} is not a settable oh.json field \u2014 run \`oh config set\` for a non-secret, \`oh secret set\` for a credential`
+      `missing lifecycle script ${script} \u2014 the vendored ${basename3(controlDir)}/ payload looks incomplete; run \`${activeBin()} update\` to re-vendor it`
     );
   }
-  return setConfigField(root, path4, value);
-}
-function setConfigField(root, path4, value) {
-  const file = ohConfigPath(root);
-  assertInRoot(file, resolve4(root));
-  const config = readOhConfig(file);
-  const before = getOhConfigValue(config, path4);
-  const next = setOhConfigValue(config, path4, value);
-  const after = getOhConfigValue(next, path4);
-  if (existsSync5(file) && JSON.stringify(before) === JSON.stringify(after)) {
-    return "already-set";
-  }
-  writeOhConfig(root, next);
-  return before === void 0 ? "added" : "updated";
-}
-function setKeyInEnv(content, key, value) {
-  const lines = content.split("\n");
-  const live = new RegExp(`^${escapeRegExp(key)}=(.*)$`);
-  const commented = new RegExp(`^[ \\t]*#[ \\t]*${escapeRegExp(key)}=(.*)$`);
-  for (let i = 0; i < lines.length; i++) {
-    const m = live.exec(lines[i]);
-    if (m) {
-      if (stripQuotes(m[1].trim()) === value) return { content, outcome: "already-set" };
-      lines[i] = `${key}=${value}`;
-      return { content: lines.join("\n"), outcome: "updated" };
-    }
-  }
-  for (let i = 0; i < lines.length; i++) {
-    if (commented.test(lines[i])) {
-      lines[i] = `${key}=${value}`;
-      return { content: lines.join("\n"), outcome: "uncommented" };
-    }
-  }
-  const body = content.replace(/\n+$/, "");
-  return {
-    content: body === "" ? `${key}=${value}
-` : `${body}
-${key}=${value}
-`,
-    outcome: "added"
-  };
-}
-function escapeRegExp(s) {
-  return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  return script;
 }
 
+// src/lib/env-file.ts
+import { existsSync as existsSync7 } from "node:fs";
+import { resolve as resolve5, sep as sep2 } from "node:path";
+
 // src/lib/oh-config.ts
+import { existsSync as existsSync6, mkdirSync as mkdirSync3, readFileSync as readFileSync6, renameSync as renameSync3, unlinkSync as unlinkSync3, writeFileSync as writeFileSync3 } from "node:fs";
+import { basename as basename4, dirname as dirname4, resolve as resolve4 } from "node:path";
 var OH_CONFIG_FILE = GENERATIONS.legacy.configFile;
 var OH_CONFIG_MODE = 420;
 var RESERVED_HOME_PATHS = [
@@ -1739,6 +1594,10 @@ var LANGFUSE_PRIVACY_PRESETS = [
   "full-debug"
 ];
 var SANDBOX_RUNTIMES = ["docker"];
+function configCheckout(config) {
+  const value = config.checkout ?? config.repo;
+  return typeof value === "string" && value !== "" ? value : void 0;
+}
 function ohConfigPath(root) {
   return resolveProjectLayout(root).configFile;
 }
@@ -1759,13 +1618,12 @@ function defaultOhConfig(name) {
     cron: { agentBin: "claude" },
     build: { skipPnpmInstall: false },
     image: { mode: "build", pullPolicy: "missing" },
-    cloud: {},
     langfuse: {},
     composeOverrides: []
   };
 }
 function readOhConfig(path4) {
-  if (!existsSync6(path4)) return defaultOhConfig(basename3(dirname4(resolve5(path4))));
+  if (!existsSync6(path4)) return defaultOhConfig(basename4(dirname4(resolve4(path4))));
   let raw;
   try {
     raw = readFileSync6(path4, "utf8");
@@ -1777,13 +1635,13 @@ function readOhConfig(path4) {
   try {
     parsed = JSON.parse(raw);
   } catch {
-    throw new Error(`${basename3(path4)} is not valid JSON: ${path4}`);
+    throw new Error(`${basename4(path4)} is not valid JSON: ${path4}`);
   }
   return validateOhConfig(parsed);
 }
 function writeOhConfig(root, config) {
   const path4 = ohConfigPath(root);
-  assertInRoot(path4, resolve5(root));
+  assertInRoot(path4, resolve4(root));
   const validated = validateOhConfig({ ...config, version: 1 });
   const body = `${JSON.stringify(validated, null, 2)}
 `;
@@ -1808,6 +1666,7 @@ function validateOhConfig(value) {
   expectString(record, "name");
   expectEnum(record, "runtime", "", SANDBOX_RUNTIMES);
   expectString(record, "repo");
+  expectString(record, "checkout");
   expectString(record, "timezone");
   const storage = expectSection(record, "storage");
   if (storage) {
@@ -1854,8 +1713,6 @@ function validateOhConfig(value) {
     expectEnum(image, "mode", "image.", ["build", "image"]);
     expectEnum(image, "pullPolicy", "image.", ["missing", "always", "never"]);
   }
-  const cloud = expectSection(record, "cloud");
-  if (cloud) expectString(cloud, "apiUrl", "cloud.");
   const langfuse = expectSection(record, "langfuse");
   if (langfuse) {
     expectString(langfuse, "baseUrl", "langfuse.");
@@ -1916,6 +1773,7 @@ var OH_CONFIG_FIELDS = [
   { path: "name", type: "string" },
   { path: "runtime", type: "enum", values: SANDBOX_RUNTIMES },
   { path: "repo", type: "string" },
+  { path: "checkout", type: "string" },
   { path: "timezone", type: "string" },
   { path: "git.userName", type: "string" },
   { path: "git.userEmail", type: "string" },
@@ -1932,7 +1790,6 @@ var OH_CONFIG_FIELDS = [
   { path: "image.mode", type: "enum", values: ["build", "image"] },
   { path: "image.pullPolicy", type: "enum", values: ["missing", "always", "never"] },
   { path: "storage.homePath", type: "string" },
-  { path: "cloud.apiUrl", type: "string" },
   { path: "langfuse.baseUrl", type: "string" },
   { path: "langfuse.privacyPreset", type: "enum", values: LANGFUSE_PRIVACY_PRESETS },
   { path: "composeOverrides", type: "list" }
@@ -1993,6 +1850,74 @@ function coerceFieldValue(field, raw) {
   return raw;
 }
 
+// src/lib/env-file.ts
+function assertInRoot(dest, root) {
+  if (!(dest === root || dest.startsWith(root + sep2))) {
+    throw new Error(`refusing to write outside the project root: ${dest}`);
+  }
+}
+function stripQuotes(s) {
+  if (s.length >= 2 && (s[0] === '"' && s.endsWith('"') || s[0] === "'" && s.endsWith("'"))) {
+    return s.slice(1, -1);
+  }
+  return s;
+}
+var CONFIG_FIELD_BY_ENV_KEY = {
+  DOCKER_SOCKET: "access.dockerSocket"
+};
+function setEnvValue(root, key, value, bin) {
+  const path4 = CONFIG_FIELD_BY_ENV_KEY[key];
+  if (path4 === void 0) {
+    throw new Error(
+      `${key} is not a settable oh.json field \u2014 run \`${bin} config set\` for a non-secret, \`${bin} secret set\` for a credential`
+    );
+  }
+  return setConfigField(root, path4, value);
+}
+function setConfigField(root, path4, value) {
+  const file = ohConfigPath(root);
+  assertInRoot(file, resolve5(root));
+  const config = readOhConfig(file);
+  const before = getOhConfigValue(config, path4);
+  const next = setOhConfigValue(config, path4, value);
+  const after = getOhConfigValue(next, path4);
+  if (existsSync7(file) && JSON.stringify(before) === JSON.stringify(after)) {
+    return "already-set";
+  }
+  writeOhConfig(root, next);
+  return before === void 0 ? "added" : "updated";
+}
+function setKeyInEnv(content, key, value) {
+  const lines = content.split("\n");
+  const live = new RegExp(`^${escapeRegExp(key)}=(.*)$`);
+  const commented = new RegExp(`^[ \\t]*#[ \\t]*${escapeRegExp(key)}=(.*)$`);
+  for (let i = 0; i < lines.length; i++) {
+    const m = live.exec(lines[i]);
+    if (m) {
+      if (stripQuotes(m[1].trim()) === value) return { content, outcome: "already-set" };
+      lines[i] = `${key}=${value}`;
+      return { content: lines.join("\n"), outcome: "updated" };
+    }
+  }
+  for (let i = 0; i < lines.length; i++) {
+    if (commented.test(lines[i])) {
+      lines[i] = `${key}=${value}`;
+      return { content: lines.join("\n"), outcome: "uncommented" };
+    }
+  }
+  const body = content.replace(/\n+$/, "");
+  return {
+    content: body === "" ? `${key}=${value}
+` : `${body}
+${key}=${value}
+`,
+    outcome: "added"
+  };
+}
+function escapeRegExp(s) {
+  return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+
 // src/lib/project.ts
 import { dirname as dirname5, resolve as resolve6 } from "node:path";
 function resolveProjectRoot(startDir = process.cwd()) {
@@ -2001,628 +1926,141 @@ function resolveProjectRoot(startDir = process.cwd()) {
     if (resolveControlDir(dir).kind !== "absent") return dir;
     const parent = dirname5(dir);
     if (parent === dir) {
-      throw new Error("not an OpenHarness-equipped repo \u2014 run `oh update` first");
+      throw new Error(`not an OpenHarness-equipped repo \u2014 run \`${activeBin()} update\` first`);
     }
     dir = parent;
   }
 }
 
-// src/lib/secrets.ts
-import { existsSync as existsSync8, readFileSync as readFileSync8 } from "node:fs";
-import { resolve as resolve7 } from "node:path";
+// src/lib/prompt.ts
+import { createInterface } from "node:readline";
+var COLORS = {
+  reset: "\x1B[0m",
+  bold: "\x1B[1m",
+  dim: "\x1B[2m",
+  green: "\x1B[32m",
+  yellow: "\x1B[33m",
+  red: "\x1B[31m",
+  cyan: "\x1B[36m"
+};
+function header(msg) {
+  process.stdout.write(`
+${COLORS.bold}${msg}${COLORS.reset}
 
-// src/lib/env.ts
-import {
-  readFileSync as readFileSync7,
-  writeFileSync as writeFileSync4,
-  existsSync as existsSync7,
-  fsyncSync as fsyncSync2,
-  renameSync as renameSync4,
-  unlinkSync as unlinkSync4,
-  openSync as openSync2,
-  closeSync as closeSync2
-} from "node:fs";
-function loadEnvInto(envPath, env) {
-  if (!existsSync7(envPath)) return;
-  const content = readFileSync7(envPath, "utf8");
-  for (const rawLine of content.split("\n")) {
-    const line = rawLine.trimEnd();
-    if (line === "" || /^\s*#/.test(line)) continue;
-    const eqIdx = line.indexOf("=");
-    if (eqIdx < 1) continue;
-    const key = line.slice(0, eqIdx).trim();
-    const value = line.slice(eqIdx + 1);
-    if (key === "") continue;
-    if (env[key] === void 0) env[key] = value;
-  }
+`);
 }
-function writeEnvFile(envPath, content) {
-  const tmpPath = `${envPath}.tmp.${process.pid}`;
-  let fd;
+function bold(s) {
+  return `${COLORS.bold}${s}${COLORS.reset}`;
+}
+function redact(token) {
+  if (token.length <= 8) return "****";
+  return token.slice(0, 5) + "*".repeat(token.length - 5);
+}
+async function ask(question) {
+  const rl = createInterface({ input: process.stdin, output: process.stdout });
   try {
-    fd = openSync2(tmpPath, "w", 384);
-    writeFileSync4(tmpPath, content, "utf8");
-    fsyncSync2(fd);
-    closeSync2(fd);
-    fd = void 0;
-    renameSync4(tmpPath, envPath);
-  } catch (err) {
-    if (fd !== void 0) {
+    return await new Promise((resolve11) => {
+      rl.question(`  ${question} `, (answer) => resolve11(answer.trim()));
+    });
+  } finally {
+    rl.close();
+  }
+}
+async function askSecret(question) {
+  if (!process.stdin.isTTY) return askSecretPiped(question);
+  process.stdout.write(`  ${question} `);
+  process.stdin.setRawMode(true);
+  process.stdin.resume();
+  const bytes = [];
+  return await new Promise((resolve11) => {
+    const cleanup = () => {
       try {
-        closeSync2(fd);
+        process.stdin.setRawMode(false);
       } catch {
       }
+      process.stdin.pause();
+      process.stdin.removeListener("data", onData);
+    };
+    const onData = (data) => {
+      for (const byte of data) {
+        if (byte === 3) {
+          cleanup();
+          process.stdout.write("\n");
+          process.exit(130);
+        } else if (byte === 13 || byte === 10) {
+          cleanup();
+          process.stdout.write("\n");
+          resolve11(Buffer.from(bytes).toString("utf8").trim());
+          return;
+        } else if (byte === 127 || byte === 8) {
+          if (bytes.length > 0) {
+            bytes.pop();
+            process.stdout.write("\b \b");
+          }
+        } else if (byte === 21) {
+          while (bytes.length > 0) {
+            bytes.pop();
+            process.stdout.write("\b \b");
+          }
+        } else if (byte >= 32) {
+          bytes.push(byte);
+          process.stdout.write("\u25CF");
+        }
+      }
+    };
+    process.stdin.on("data", onData);
+  });
+}
+async function askSecretPiped(question) {
+  const rl = createInterface({ input: process.stdin, output: process.stdout });
+  const stdoutWrite = process.stdout.write.bind(process.stdout);
+  let prompted = false;
+  const patched = (chunk) => {
+    if (!prompted) {
+      prompted = true;
+      return stdoutWrite(chunk);
     }
+    return true;
+  };
+  process.stdout.write = patched;
+  let restored = false;
+  const restore = () => {
+    if (restored) return;
+    restored = true;
+    process.stdout.write = stdoutWrite;
     try {
-      unlinkSync4(tmpPath);
+      rl.close();
     } catch {
     }
-    throw err;
+  };
+  const onSigint = () => {
+    restore();
+    process.stdout.write("\n");
+    process.exit(130);
+  };
+  process.on("SIGINT", onSigint);
+  try {
+    return await new Promise((resolve11) => {
+      rl.question(`  ${question} `, (answer) => {
+        process.stdout.write("\n");
+        resolve11(answer.trim());
+      });
+    });
+  } finally {
+    process.removeListener("SIGINT", onSigint);
+    restore();
   }
-}
-
-// src/lib/secrets.ts
-var SECRETS_FILE = ".env";
-var SECRET_KEYS = [
-  "GH_TOKEN",
-  "XAI_API_KEY",
-  "META_API_KEY",
-  "SANDBOX_PASSWORD",
-  "PI_SLACK_APP_TOKEN",
-  "PI_SLACK_BOT_TOKEN",
-  "LANGFUSE_PUBLIC_KEY",
-  "LANGFUSE_SECRET_KEY",
-  "OH_CLOUD_PROVISION_KEY"
-];
-var ALLOWED = new Set(SECRET_KEYS);
-function secretsFilePath(root) {
-  return resolve7(root, SECRETS_FILE);
-}
-function isSecretKey(key) {
-  return ALLOWED.has(key);
-}
-function assertSecretKey(key) {
-  if (ALLOWED.has(key)) return;
-  throw new Error(
-    `${key} is not a secret \u2014 non-secret settings live in oh.json; use \`oh config set\` instead`
-  );
-}
-function readSecret(root, key) {
-  assertSecretKey(key);
-  const file = secretsFilePath(root);
-  if (!existsSync8(file)) return void 0;
-  const env = {};
-  loadEnvInto(file, env);
-  const value = env[key]?.trim();
-  return value === void 0 || value === "" ? void 0 : stripQuotes2(value);
-}
-function setSecret(root, key, value) {
-  assertSecretKey(key);
-  if (/[\r\n]/.test(value)) {
-    throw new Error(`${key} value must not contain a newline`);
-  }
-  const file = secretsFilePath(root);
-  assertInRoot(file, resolve7(root));
-  const original = existsSync8(file) ? readFileSync8(file, "utf8") : "";
-  const { content } = setKeyInEnv(original, key, value);
-  writeEnvFile(file, content);
-}
-function listSecretKeys(root) {
-  const file = secretsFilePath(root);
-  if (!existsSync8(file)) return [];
-  const env = {};
-  loadEnvInto(file, env);
-  return SECRET_KEYS.filter((key) => {
-    const value = env[key]?.trim();
-    return value !== void 0 && value !== "";
-  });
-}
-function stripQuotes2(s) {
-  if (s.length >= 2 && (s[0] === '"' && s.endsWith('"') || s[0] === "'" && s.endsWith("'"))) {
-    return s.slice(1, -1);
-  }
-  return s;
-}
-
-// src/commands/cloud.ts
-var DEFAULT_API_URL = "http://127.0.0.1:3000";
-var DEFAULT_TERMINAL_STATUSES = ["running", "failed", "destroyed"];
-var PROVISION_KEY_SECRET = "OH_CLOUD_PROVISION_KEY";
-var CLOUD_HELP = `oh cloud \u2014 Manage OpenHarness Cloud nodes
-
-Usage:
-  oh cloud config [--api-url <url>] [--provision-key <key>]
-  oh cloud config show
-  oh cloud [global options] nodes list
-  oh cloud [global options] nodes get <node-id>
-  oh cloud [global options] nodes create --ssh-key-id <id> [--name <name>]
-  oh cloud [global options] nodes events <node-id>
-  oh cloud [global options] nodes watch <node-id> [--interval <seconds>] [--until <statuses>]
-  oh cloud [global options] nodes destroy <node-id>
-  oh cloud [global options] nodes restart <node-id>
-  oh cloud [global options] nodes rebuild <node-id>
-  oh cloud [global options] ssh-keys list
-  oh cloud [global options] ssh-keys create --name <name> (--public-key <key> | --public-key-file <path>)
-
-Global options:
-  --api-url <url>          API base URL (default: OH_CLOUD_API_URL, OH_API_URL,
-                           oh.json cloud.apiUrl, or http://127.0.0.1:3000)
-  --provision-key <key>    Admin key (default: OH_CLOUD_PROVISION_KEY in the
-                           environment or in the root .env)
-  --output <field>         Print one top-level response field instead of JSON
-  -h, --help               Show this help
-
-Configuration:
-  oh cloud config writes cloud.apiUrl to the repository oh.json and securely
-  prompts for the current provisioner key, which it stores as
-  ${PROVISION_KEY_SECRET} in the gitignored root .env. This is the temporary
-  credential model until OpenHarness Cloud issues user API tokens.
-
-  Both settings are repository-local, so oh cloud runs inside an
-  OpenHarness-equipped repo. Outside one, pass --api-url and --provision-key.
-
-Environment:
-  OH_CLOUD_API_URL         Override the OpenHarness Cloud API base URL
-  OH_CLOUD_PROVISION_KEY   Override the stored key (OH_PROVISION_KEY and
-                           PROVISION_KEY are also accepted)
-
-Examples:
-  oh cloud config
-  oh cloud ssh-keys create --name laptop --public-key-file ~/.ssh/openharness_node.pub
-  oh cloud nodes create --name smoke-1 --ssh-key-id <ssh-key-id>
-  oh cloud nodes watch <node-id>
-`;
-var CloudCliError = class extends Error {
-  status;
-  payload;
-  constructor(message, options = {}) {
-    super(message);
-    this.name = "CloudCliError";
-    this.status = options.status;
-    this.payload = options.payload;
-  }
-};
-function takeOption(args, name, alias) {
-  const names = alias ? [name, alias] : [name];
-  for (const candidate of names) {
-    const index = args.indexOf(candidate);
-    if (index === -1) continue;
-    const value = args[index + 1];
-    if (value === void 0 || value.startsWith("-")) {
-      throw new CloudCliError(`${candidate} requires a value`);
-    }
-    args.splice(index, 2);
-    return value;
-  }
-  return void 0;
-}
-function requireOption(value, name) {
-  if (!value) throw new CloudCliError(`${name} is required`);
-  return value;
-}
-function requirePositional(value, name) {
-  if (!value || value.startsWith("-")) throw new CloudCliError(`${name} is required`);
-  return value;
-}
-function assertNoExtraArgs(args) {
-  if (args.length > 0) {
-    throw new CloudCliError(
-      `unexpected argument${args.length === 1 ? "" : "s"}: ${args.join(" ")}`
-    );
-  }
-}
-function normalizeApiUrl(value) {
-  let url;
-  try {
-    url = new URL(value);
-  } catch {
-    throw new CloudCliError(`invalid API URL: ${value}`);
-  }
-  if (url.protocol !== "http:" && url.protocol !== "https:") {
-    throw new CloudCliError(`API URL must use http or https: ${value}`);
-  }
-  return url.toString().replace(/\/$/, "");
-}
-function formatJson(value) {
-  return `${JSON.stringify(value, null, 2)}
-`;
-}
-function bodyPreview(body) {
-  const compact = body.replace(/\s+/g, " ").trim();
-  return compact.length > 180 ? `${compact.slice(0, 177)}...` : compact;
-}
-function responseKind(contentType) {
-  return contentType?.split(";", 1)[0]?.trim() || "non-JSON content";
-}
-function formatApiFailure(status, payload, contentType) {
-  if (payload && typeof payload === "object") {
-    const record = payload;
-    const message = record.error ?? record.message;
-    const code = typeof record.code === "string" ? ` (${record.code})` : "";
-    if (typeof message === "string") {
-      return `API request failed with ${status}${code}: ${message}`;
-    }
-  }
-  if (typeof payload === "string" && payload.length > 0) {
-    return `API request failed with ${status}: server returned ${responseKind(contentType)} instead of JSON (${bodyPreview(payload)})`;
-  }
-  return `API request failed with ${status}`;
-}
-async function parseResponse(response) {
-  const text = await response.text();
-  const contentType = response.headers.get("content-type");
-  if (!text) return { payload: null, isJson: true, contentType };
-  try {
-    return { payload: JSON.parse(text), isJson: true, contentType };
-  } catch {
-    return { payload: text, isJson: false, contentType };
-  }
-}
-function createCloudApiClient(options) {
-  const fetchImpl = options.fetch ?? globalThis.fetch;
-  if (typeof fetchImpl !== "function") {
-    throw new CloudCliError(
-      "the cloud CLI requires Node.js 20 or newer (global fetch is unavailable)"
-    );
-  }
-  return async (method, pathname, body) => {
-    let response;
-    try {
-      response = await fetchImpl(`${options.apiUrl}${pathname}`, {
-        method,
-        headers: {
-          "x-provision-key": options.provisionKey,
-          ...body === void 0 ? {} : { "content-type": "application/json" }
-        },
-        ...body === void 0 ? {} : { body: JSON.stringify(body) }
-      });
-    } catch (error) {
-      const detail = error instanceof Error ? error.message : String(error);
-      throw new CloudCliError(`could not reach ${options.apiUrl}: ${detail}`);
-    }
-    const parsed = await parseResponse(response);
-    if (!response.ok) {
-      throw new CloudCliError(
-        formatApiFailure(response.status, parsed.payload, parsed.contentType),
-        {
-          status: response.status,
-          payload: parsed.payload
-        }
-      );
-    }
-    if (!parsed.isJson) {
-      throw new CloudCliError(
-        `API returned ${response.status} ${responseKind(parsed.contentType)}; expected JSON (${bodyPreview(parsed.payload)})`,
-        { status: response.status, payload: parsed.payload }
-      );
-    }
-    return parsed.payload;
-  };
-}
-function nodePath(nodeId, suffix = "") {
-  return `/api/nodes/${encodeURIComponent(nodeId)}${suffix}`;
-}
-async function readPublicKey(args, readFileImpl) {
-  const inline = takeOption(args, "--public-key");
-  const file = takeOption(args, "--public-key-file");
-  if (inline && file) {
-    throw new CloudCliError("use only one of --public-key or --public-key-file");
-  }
-  if (!inline && !file) {
-    throw new CloudCliError("--public-key or --public-key-file is required");
-  }
-  if (inline) return inline.trim();
-  try {
-    const value = (await readFileImpl(file, "utf8")).trim();
-    if (!value) throw new CloudCliError(`SSH public key file is empty: ${file}`);
-    return value;
-  } catch (error) {
-    if (error instanceof CloudCliError) throw error;
-    const detail = error instanceof Error ? error.message : String(error);
-    throw new CloudCliError(`could not read SSH public key file ${file}: ${detail}`);
-  }
-}
-async function dispatch(args, options) {
-  const resource = args.shift();
-  const action = args.shift();
-  if (!resource || !action) {
-    throw new CloudCliError("a resource and action are required. Run `oh cloud --help` for usage.");
-  }
-  if (resource === "ssh-keys") {
-    if (action === "list") {
-      assertNoExtraArgs(args);
-      return options.request("GET", "/api/ssh-keys");
-    }
-    if (action === "create") {
-      const name = requireOption(takeOption(args, "--name"), "--name");
-      const publicKey = await readPublicKey(args, options.readFile);
-      assertNoExtraArgs(args);
-      return options.request("POST", "/api/ssh-keys", { name, publicKey });
-    }
-    throw new CloudCliError(`unknown ssh-keys action: ${action}`);
-  }
-  if (resource !== "nodes") throw new CloudCliError(`unknown resource: ${resource}`);
-  if (action === "list") {
-    assertNoExtraArgs(args);
-    return options.request("GET", "/api/nodes");
-  }
-  if (action === "create") {
-    const name = takeOption(args, "--name");
-    const sshKeyId = requireOption(takeOption(args, "--ssh-key-id"), "--ssh-key-id");
-    assertNoExtraArgs(args);
-    return options.request("POST", "/api/nodes", {
-      ...name ? { name } : {},
-      sshKeyId
-    });
-  }
-  const nodeIdActions = ["get", "events", "destroy", "restart", "rebuild", "watch"];
-  if (!nodeIdActions.includes(action)) {
-    throw new CloudCliError(`unknown nodes action: ${action}`);
-  }
-  const nodeId = requirePositional(args.shift(), "<node-id>");
-  if (action === "get") {
-    assertNoExtraArgs(args);
-    return options.request("GET", nodePath(nodeId));
-  }
-  if (action === "events") {
-    assertNoExtraArgs(args);
-    return options.request("GET", nodePath(nodeId, "/events"));
-  }
-  if (action === "destroy") {
-    assertNoExtraArgs(args);
-    return options.request("DELETE", nodePath(nodeId));
-  }
-  if (action === "restart" || action === "rebuild") {
-    assertNoExtraArgs(args);
-    return options.request("POST", nodePath(nodeId, `/${action}`));
-  }
-  if (action === "watch") {
-    const intervalValue = takeOption(args, "--interval") ?? "5";
-    const intervalSeconds = Number(intervalValue);
-    if (!Number.isFinite(intervalSeconds) || intervalSeconds < 0) {
-      throw new CloudCliError(`--interval must be a non-negative number: ${intervalValue}`);
-    }
-    const untilValue = takeOption(args, "--until");
-    const terminalStatuses = new Set(
-      (untilValue ? untilValue.split(",") : DEFAULT_TERMINAL_STATUSES).map((status) => status.trim()).filter(Boolean)
-    );
-    if (terminalStatuses.size === 0) {
-      throw new CloudCliError("--until must contain at least one status");
-    }
-    assertNoExtraArgs(args);
-    let lastStatus;
-    while (true) {
-      const node = await options.request("GET", nodePath(nodeId));
-      if (!node || typeof node !== "object" || typeof node.status !== "string") {
-        throw new CloudCliError("node response did not include a status");
-      }
-      const status = node.status;
-      if (status !== lastStatus) {
-        options.write(node);
-        lastStatus = status;
-      }
-      if (terminalStatuses.has(status)) return void 0;
-      await options.sleep(intervalSeconds * 1e3);
-    }
-  }
-  throw new CloudCliError(`unknown nodes action: ${action}`);
-}
-var OUTSIDE_REPO_HINT = "; pass --api-url and --provision-key to run `oh cloud` outside a repo";
-function requireRoot(io) {
-  try {
-    return resolveProjectRoot(io.cwd);
-  } catch (error) {
-    const detail = error instanceof Error ? error.message : String(error);
-    throw new CloudCliError(`${detail}${OUTSIDE_REPO_HINT}`);
-  }
-}
-function legacyCloudConfigPath(env) {
-  const home = env.HOME ?? env.USERPROFILE;
-  if (!home) return void 0;
-  return join4(home, ".config", "openharness", "cloud.json");
-}
-function readLegacyCloudConfig(path4) {
-  let parsed;
-  try {
-    parsed = JSON.parse(readFileSync9(path4, "utf8"));
-  } catch {
-    return void 0;
-  }
-  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return void 0;
-  const record = parsed;
-  return {
-    ...typeof record.apiUrl === "string" ? { apiUrl: record.apiUrl } : {},
-    ...typeof record.provisionKey === "string" ? { provisionKey: record.provisionKey } : {}
-  };
-}
-function migrateLegacyCloudConfig(root, io, env) {
-  const path4 = legacyCloudConfigPath(env);
-  if (!path4 || !existsSync9(path4)) return;
-  const config = readOhConfig(ohConfigPath(root));
-  if (config.cloud?.apiUrl !== void 0) return;
-  if (readSecret(root, PROVISION_KEY_SECRET) !== void 0) return;
-  const legacy = readLegacyCloudConfig(path4);
-  if (!legacy || !legacy.apiUrl && !legacy.provisionKey) return;
-  if (legacy.apiUrl) {
-    const next = {
-      ...config,
-      cloud: { ...config.cloud, apiUrl: normalizeApiUrl(legacy.apiUrl) }
-    };
-    writeOhConfig(root, next);
-  }
-  if (legacy.provisionKey) setSecret(root, PROVISION_KEY_SECRET, legacy.provisionKey);
-  io.stdout(`Migrated OpenHarness Cloud settings out of ${path4}
-`);
-  if (legacy.apiUrl) io.stdout(`  cloud.apiUrl -> ${ohConfigPath(root)}
-`);
-  if (legacy.provisionKey) io.stdout(`  ${PROVISION_KEY_SECRET} -> ${join4(root, ".env")}
-`);
-  io.stdout(`${path4} is no longer read; delete it when you no longer need the copy.
-`);
-}
-function loadCloudSettings(root, io, env) {
-  migrateLegacyCloudConfig(root, io, env);
-  const config = readOhConfig(ohConfigPath(root));
-  return {
-    ...config.cloud?.apiUrl ? { apiUrl: config.cloud.apiUrl } : {},
-    ...(() => {
-      const key = readSecret(root, PROVISION_KEY_SECRET);
-      return key ? { provisionKey: key } : {};
-    })()
-  };
-}
-function envProvisionKey(env) {
-  return env.OH_CLOUD_PROVISION_KEY ?? env.OH_PROVISION_KEY ?? env.PROVISION_KEY;
-}
-async function configureCloud(args, io, env) {
-  const root = requireRoot(io);
-  const current = loadCloudSettings(root, io, env);
-  if (args[0] === "show") {
-    args.shift();
-    assertNoExtraArgs(args);
-    io.stdout(`Config: ${ohConfigPath(root)}
-`);
-    io.stdout(`Secrets: ${join4(root, ".env")}
-`);
-    io.stdout(`API URL: ${current.apiUrl ?? DEFAULT_API_URL}
-`);
-    io.stdout(
-      `Provision credential: ${current.provisionKey ? redact(current.provisionKey) : "not configured"}
-`
-    );
-    return;
-  }
-  const apiUrl = normalizeApiUrl(
-    takeOption(args, "--api-url") ?? current.apiUrl ?? env.OH_CLOUD_API_URL ?? env.OH_API_URL ?? DEFAULT_API_URL
-  );
-  const providedKey = takeOption(args, "--provision-key");
-  assertNoExtraArgs(args);
-  const provisionKey = (providedKey ?? await (io.askSecret ?? askSecret)("OpenHarness Cloud provisioner key:")).trim();
-  if (!provisionKey) throw new CloudCliError("provisioner key cannot be empty");
-  const config = readOhConfig(ohConfigPath(root));
-  writeOhConfig(root, { ...config, cloud: { ...config.cloud, apiUrl } });
-  setSecret(root, PROVISION_KEY_SECRET, provisionKey);
-  io.stdout(`Saved cloud.apiUrl to ${ohConfigPath(root)}
-`);
-  io.stdout(`Saved ${PROVISION_KEY_SECRET} to ${join4(root, ".env")}
-`);
-  io.stdout("Provision credential: configured\n");
-}
-async function executeCloud(argv, io) {
-  const args = [...argv];
-  const env = io.env ?? process.env;
-  if (args.includes("--help") || args.includes("-h") || args[0] === "help") {
-    io.stdout(CLOUD_HELP);
-    return;
-  }
-  if (args[0] === "config") {
-    args.shift();
-    await configureCloud(args, io, env);
-    return;
-  }
-  const flagApiUrl = takeOption(args, "--api-url");
-  const flagProvisionKey = takeOption(args, "--provision-key");
-  const stored = flagProvisionKey && flagApiUrl ? {} : loadCloudSettings(requireRoot(io), io, env);
-  const apiUrl = normalizeApiUrl(
-    flagApiUrl ?? env.OH_CLOUD_API_URL ?? env.OH_API_URL ?? stored.apiUrl ?? DEFAULT_API_URL
-  );
-  const provisionKey = flagProvisionKey ?? envProvisionKey(env) ?? stored.provisionKey;
-  if (!provisionKey) {
-    throw new CloudCliError(
-      `no provision credential found. Run \`oh cloud config\`, set ${PROVISION_KEY_SECRET}, or pass --api-url and --provision-key.`
-    );
-  }
-  const outputField = takeOption(args, "--output");
-  const request = createCloudApiClient({
-    apiUrl,
-    provisionKey,
-    fetch: io.fetch
-  });
-  const write = (value) => io.stdout(formatJson(value));
-  const result = await dispatch(args, {
-    request,
-    readFile: io.readFile ?? readFile,
-    sleep: io.sleep ?? ((milliseconds) => new Promise((resolve11) => setTimeout(resolve11, milliseconds))),
-    write
-  });
-  if (result === void 0) return;
-  if (outputField) {
-    if (!result || typeof result !== "object" || !(outputField in result)) {
-      throw new CloudCliError(`response does not contain top-level field: ${outputField}`);
-    }
-    const value = result[outputField];
-    io.stdout(typeof value === "object" ? formatJson(value) : `${String(value)}
-`);
-    return;
-  }
-  write(result);
-}
-async function runCloud(argv, io) {
-  try {
-    await executeCloud(argv, io);
-    return 0;
-  } catch (error) {
-    const message = error instanceof Error ? error.message : String(error);
-    io.stderr(`oh cloud: ${message}
-`);
-    return 1;
-  }
-}
-
-// src/lib/execution/runner.ts
-import { spawnSync as spawnSync2 } from "node:child_process";
-import { existsSync as existsSync10 } from "node:fs";
-import { basename as basename4, join as join5 } from "node:path";
-var spawnRunner = (cmd, args, opts) => {
-  const common = {
-    env: opts.env,
-    ...opts.cwd !== void 0 ? { cwd: opts.cwd } : {},
-    ...opts.timeoutMs !== void 0 ? { timeout: opts.timeoutMs } : {}
-  };
-  const r = opts.stdio === "capture" ? spawnSync2(cmd, args, { ...common, stdio: ["ignore", "pipe", "pipe"], encoding: "utf8" }) : spawnSync2(cmd, args, { ...common, stdio: "inherit" });
-  const err = r.error;
-  return {
-    status: r.status,
-    error: err ? { code: err.code, message: err.message } : void 0,
-    stdout: typeof r.stdout === "string" ? r.stdout : void 0,
-    stderr: typeof r.stderr === "string" ? r.stderr : void 0
-  };
-};
-var ExecutionSpawnError = class extends Error {
-  code;
-  constructor(what, error) {
-    super(`failed to run ${what}${error?.message ? ` (${error.message})` : ""}`);
-    this.name = "ExecutionSpawnError";
-    this.code = error?.code;
-  }
-};
-var ExecutionExitError = class extends Error {
-  exitCode;
-  constructor(what, exitCode) {
-    super(`${what} exited ${exitCode}`);
-    this.name = "ExecutionExitError";
-    this.exitCode = exitCode;
-  }
-};
-function assertSpawned(r, what) {
-  if (r.error) {
-    throw new ExecutionSpawnError(what, r.error);
-  }
-}
-function requireLifecycleScript(root, rel) {
-  const { controlDir } = resolveProjectLayout(root);
-  const script = join5(controlDir, "scripts", rel);
-  if (!existsSync10(script)) {
-    throw new Error(
-      `missing lifecycle script ${script} \u2014 the vendored ${basename4(controlDir)}/ payload looks incomplete; run \`oh update\` to re-vendor it`
-    );
-  }
-  return script;
+}
+async function confirm(question, defaultYes = true) {
+  const suffix = defaultYes ? "[Y/n]" : "[y/N]";
+  const answer = (await ask(`${question} ${suffix}`)).toLowerCase();
+  if (answer === "") return defaultYes;
+  return /^y/.test(answer);
 }
 
 // src/lib/registry.ts
-import { existsSync as existsSync11, mkdirSync as mkdirSync4, readdirSync as readdirSync3, statSync as statSync3, writeFileSync as writeFileSync5 } from "node:fs";
-import { dirname as dirname6, join as join6, resolve as resolve8, sep as sep3 } from "node:path";
+import { existsSync as existsSync8, mkdirSync as mkdirSync4, readdirSync as readdirSync3, statSync as statSync3, writeFileSync as writeFileSync4 } from "node:fs";
+import { dirname as dirname6, join as join5, resolve as resolve7, sep as sep3 } from "node:path";
 
 // oh-asset:/home/runner/work/agro/agro/.devcontainer/docker-compose.yml
 var docker_compose_default = 'name: ${SANDBOX_NAME:-agro}\n\nservices:\n  sandbox:\n    image: ${AGRO_SANDBOX_IMAGE:-${OH_SANDBOX_IMAGE:-sandbox-${SANDBOX_NAME:-agro}}}\n    pull_policy: ${AGRO_PULL_POLICY:-${OH_PULL_POLICY:-missing}}\n    container_name: ${SANDBOX_NAME:-agro}\n    build:\n      context: ${AGRO_REPO_DIR:-${OH_REPO_DIR:-..}}\n      dockerfile: .devcontainer/Dockerfile\n    volumes:\n      - ${AGRO_HOME_MOUNT:-${OH_HOME_MOUNT:-workspace}}:/home/sandbox\n      - ${AGRO_REPO_DIR:-${OH_REPO_DIR:-..}}:/home/sandbox/harness\n    extra_hosts:\n      - "host.docker.internal:host-gateway"\n    environment:\n      - SANDBOX_NAME=${SANDBOX_NAME:-agro}\n      - SANDBOX_PASSWORD=${SANDBOX_PASSWORD:-test1234}\n      - TZ=${TZ:-America/Los_Angeles}\n      - CLAUDE_DANGEROUSLY_SKIP_PERMISSIONS=true\n      - CC_SAFETY_NET_STRICT=1\n      - CC_SAFETY_NET_WORKTREE=1\n      - GIT_USER_NAME=${GIT_USER_NAME:-}\n      - GIT_USER_EMAIL=${GIT_USER_EMAIL:-}\n      - GH_TOKEN=${GH_TOKEN:-}\n    stdin_open: true\n    tty: true\n    cgroup: private\n    cap_add:\n      - SYS_ADMIN\n    security_opt:\n      - apparmor=unconfined\n    tmpfs:\n      - /run\n      - /run/lock\n      - /sys/fs\n    healthcheck:\n      test: ["CMD", "bash", "-c", "if [ -d /home/sandbox/harness/.agro ]; then exec bash /home/sandbox/harness/.agro/scripts/sandbox-healthcheck.sh; fi; exec bash /home/sandbox/harness/.oh/scripts/sandbox-healthcheck.sh"]\n      interval: 30s\n      timeout: 10s\n      retries: 3\n      start_period: 600s\n    restart: unless-stopped\n\nvolumes:\n  workspace:\n';
@@ -3087,7 +2525,7 @@ function ohHome() {
   return resolveUserStateHome(process.env);
 }
 function registryRoot() {
-  return join6(ohHome(), "sandboxes");
+  return join5(ohHome(), "sandboxes");
 }
 function assertSandboxName(name) {
   if (!SANDBOX_NAME_PATTERN.test(name)) {
@@ -3098,7 +2536,7 @@ function assertSandboxName(name) {
 }
 function entryRoot(name) {
   assertSandboxName(name);
-  return join6(registryRoot(), name);
+  return join5(registryRoot(), name);
 }
 function isDirectory(path4) {
   return statSync3(path4, { throwIfNoEntry: false })?.isDirectory() === true;
@@ -3106,12 +2544,12 @@ function isDirectory(path4) {
 function listEntries() {
   const root = registryRoot();
   if (!isDirectory(root)) return [];
-  return readdirSync3(root, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => entry.name).filter((name) => SANDBOX_NAME_PATTERN.test(name)).filter((name) => existsSync11(ohConfigPath(join6(root, name)))).sort();
+  return readdirSync3(root, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => entry.name).filter((name) => SANDBOX_NAME_PATTERN.test(name)).filter((name) => existsSync8(ohConfigPath(join5(root, name)))).sort();
 }
 function entryRepo(name) {
   const config = readOhConfig(ohConfigPath(entryRoot(name)));
-  const repo = config.repo;
-  return typeof repo === "string" && repo !== "" ? resolve8(repo) : void 0;
+  const checkout = configCheckout(config);
+  return checkout === void 0 ? void 0 : resolve7(checkout);
 }
 function runningContainerNames(run) {
   const names = /* @__PURE__ */ new Set();
@@ -3137,27 +2575,27 @@ function nextDefaultName(run = spawnRunner) {
   }
 }
 function materialize(root, opts = {}) {
-  const entry = resolve8(root);
-  const scripts = join6(resolveProjectLayout(entry).controlDir, "scripts");
+  const entry = resolve7(root);
+  const scripts = join5(resolveProjectLayout(entry).controlDir, "scripts");
   const files = [
     {
-      dest: join6(entry, ".devcontainer", "docker-compose.yml"),
-      body: opts.repo === void 0 ? docker_compose_image_only_default : docker_compose_default,
+      dest: join5(entry, ".devcontainer", "docker-compose.yml"),
+      body: (opts.checkout ?? opts.repo) === void 0 ? docker_compose_image_only_default : docker_compose_default,
       mode: 420
     },
-    { dest: join6(entry, ".devcontainer", "docker-compose.ssh.yml"), body: docker_compose_ssh_default, mode: 420 },
-    { dest: join6(entry, ".devcontainer", "docker-compose.docker-sock.yml"), body: docker_compose_docker_sock_default, mode: 420 },
-    { dest: join6(scripts, "docker-compose.sh"), body: docker_compose_default2, mode: 493 },
-    { dest: join6(scripts, "compat.sh"), body: compat_default, mode: 420 },
-    { dest: join6(scripts, "check-host-port.sh"), body: check_host_port_default, mode: 493 }
+    { dest: join5(entry, ".devcontainer", "docker-compose.ssh.yml"), body: docker_compose_ssh_default, mode: 420 },
+    { dest: join5(entry, ".devcontainer", "docker-compose.docker-sock.yml"), body: docker_compose_docker_sock_default, mode: 420 },
+    { dest: join5(scripts, "docker-compose.sh"), body: docker_compose_default2, mode: 493 },
+    { dest: join5(scripts, "compat.sh"), body: compat_default, mode: 420 },
+    { dest: join5(scripts, "check-host-port.sh"), body: check_host_port_default, mode: 493 }
   ];
   for (const file of files) {
-    const dest = resolve8(file.dest);
+    const dest = resolve7(file.dest);
     if (!dest.startsWith(entry + sep3)) {
       throw new Error(`refusing to materialize outside the sandbox entry: ${dest}`);
     }
     mkdirSync4(dirname6(dest), { recursive: true });
-    writeFileSync5(dest, file.body, { mode: file.mode, encoding: "utf8" });
+    writeFileSync4(dest, file.body, { mode: file.mode, encoding: "utf8" });
   }
 }
 function resolveSandboxRoot(opts = {}) {
@@ -3165,14 +2603,14 @@ function resolveSandboxRoot(opts = {}) {
     const root = entryRoot(opts.name);
     if (!isDirectory(root)) {
       throw new Error(
-        `no sandbox named \`${opts.name}\` in ${registryRoot()} \u2014 create one with \`oh sandbox install docker --name ${opts.name}\``
+        `no sandbox named \`${opts.name}\` in ${registryRoot()} \u2014 create one with \`${activeBin()} sandbox install docker --name ${opts.name}\``
       );
     }
     return root;
   }
   const names = listEntries();
   if (names.length === 1) return entryRoot(names[0]);
-  const cwd = resolve8(opts.cwd ?? process.cwd());
+  const cwd = resolve7(opts.cwd ?? process.cwd());
   for (const name of names) {
     const repo = entryRepo(name);
     if (repo !== void 0 && (cwd === repo || cwd.startsWith(repo + sep3))) {
@@ -3181,7 +2619,7 @@ function resolveSandboxRoot(opts = {}) {
   }
   if (names.length === 0) {
     throw new Error(
-      `no sandbox is registered in ${registryRoot()} \u2014 create one with \`oh sandbox install docker\``
+      `no sandbox is registered in ${registryRoot()} \u2014 create one with \`${activeBin()} sandbox install docker\``
     );
   }
   throw new Error(
@@ -3189,333 +2627,131 @@ function resolveSandboxRoot(opts = {}) {
   );
 }
 
-// src/commands/config.ts
-function configRoot(opts) {
-  return opts.sandbox === void 0 ? resolveProjectRoot(opts.cwd) : resolveSandboxRoot({ name: opts.sandbox });
-}
-function configFieldList() {
-  return ohConfigFieldPaths().map((path4) => `  ${path4}`).join("\n");
-}
-async function runConfigShow(opts, io) {
-  const root = configRoot(opts);
-  const config = readOhConfig(ohConfigPath(root));
-  io.stdout(`${JSON.stringify(config, null, 2)}
-`);
-  return 0;
-}
-async function runConfigSet(key, value, opts, io) {
-  if (isSecretKey(key) || isSecretKey(key.toUpperCase())) {
-    io.stderr(
-      `oh config set: ${key.toUpperCase()} is a secret \u2014 oh.json is tracked by git.
-Set it with \`oh secret set ${key.toUpperCase()}\` instead.
-`
-    );
-    return 1;
-  }
-  if (!findOhConfigField(key)) {
-    io.stderr(`oh config set: unknown field "${key}"
+// src/lib/secrets.ts
+import { existsSync as existsSync10, readFileSync as readFileSync8 } from "node:fs";
+import { resolve as resolve8 } from "node:path";
 
-Fields:
-${configFieldList()}
-`);
-    return 1;
-  }
-  const root = configRoot(opts);
-  let outcome;
-  try {
-    outcome = setConfigField(root, key, value);
-  } catch (error) {
-    io.stderr(`oh config set: ${error instanceof Error ? error.message : String(error)}
-`);
-    return 1;
-  }
-  io.stdout(
-    outcome === "already-set" ? `oh.json: ${key} already ${value}
-` : `oh.json: set ${key}=${value} (${outcome})
-`
-  );
-  return 0;
-}
-var UPSTREAM_REMOTE = "openharness";
-function repoUrl(owner, name) {
-  return `git@github.com:${owner}/${name}.git`;
-}
-function shellLine(step) {
-  return `${step.cmd} ${step.args.join(" ")}`;
-}
-function manualSteps(owner, name, visibility) {
-  return [
-    { cmd: "gh", args: ["repo", "create", `${owner}/${name}`, `--${visibility}`] },
-    { cmd: "git", args: ["remote", "rename", "origin", UPSTREAM_REMOTE] },
-    { cmd: "git", args: ["remote", "add", "origin", repoUrl(owner, name)] },
-    { cmd: "git", args: ["push", "-u", "origin", "HEAD"] }
-  ];
-}
-function printManual(io, steps, lead) {
-  io.stdout(`
-${lead}
-
-`);
-  for (const step of steps) io.stdout(`    ${shellLine(step)}
-`);
-  io.stdout("\n");
-}
-function validateSegment(kind, value) {
-  if (value === "") return `${kind} is required`;
-  if (value.startsWith("-")) return `invalid ${kind} "${value}" (must not start with "-")`;
-  if (!/^[A-Za-z0-9._-]+$/.test(value)) {
-    return `invalid ${kind} "${value}" (use letters, digits, ".", "_" or "-")`;
-  }
-  return void 0;
-}
-async function askOn(io, question) {
-  const askFn = io.ask ?? ask;
-  return (await askFn(question)).trim();
-}
-async function confirmOn(io, question, defaultYes) {
-  const answer = (await askOn(io, `${question} ${defaultYes ? "[Y/n]" : "[y/N]"}`)).toLowerCase();
-  if (answer === "") return defaultYes;
-  return /^y/.test(answer);
-}
-async function askVisibility(io) {
-  io.stdout("  Repository visibility\n    1) private (recommended)\n    2) public\n");
-  for (; ; ) {
-    const answer = await askOn(io, "Choose [1-2] (default 1):");
-    if (answer === "" || answer === "1") return "private";
-    if (answer === "2") return "public";
-    io.stderr("  Invalid choice. Pick 1 or 2.\n");
+// src/lib/env.ts
+import {
+  readFileSync as readFileSync7,
+  writeFileSync as writeFileSync5,
+  existsSync as existsSync9,
+  fsyncSync as fsyncSync2,
+  renameSync as renameSync4,
+  unlinkSync as unlinkSync4,
+  openSync as openSync2,
+  closeSync as closeSync2
+} from "node:fs";
+function loadEnvInto(envPath, env) {
+  if (!existsSync9(envPath)) return;
+  const content = readFileSync7(envPath, "utf8");
+  for (const rawLine of content.split("\n")) {
+    const line = rawLine.trimEnd();
+    if (line === "" || /^\s*#/.test(line)) continue;
+    const eqIdx = line.indexOf("=");
+    if (eqIdx < 1) continue;
+    const key = line.slice(0, eqIdx).trim();
+    const value = line.slice(eqIdx + 1);
+    if (key === "") continue;
+    if (env[key] === void 0) env[key] = value;
   }
 }
-async function runConfigRepo(opts, io) {
-  const run = opts.run ?? spawnRunner;
-  const isTTY = io.isTTY ?? process.stdin.isTTY === true;
-  if (!isTTY) {
-    io.stderr(
-      "oh config repo: creating a repo on your GitHub account needs an interactive terminal; re-run it from a TTY.\n"
-    );
-    return 1;
-  }
-  io.stdout(`
-${bold("Version this harness in your own repo")}
-`);
-  io.stdout(
-    `  Creates a repo on your GitHub account, keeps the upstream you cloned from
-  as the "${UPSTREAM_REMOTE}" remote, and pushes this branch to yours.
-`
-  );
-  if (!await confirmOn(io, "Version this harness in your own repo?", false)) {
-    printManual(
-      io,
-      manualSteps("<your-user>", "<repo>", "private"),
-      "Skipped \u2014 nothing was created and no remote was touched. To do it later, run `oh config repo`, or by hand:"
-    );
-    return 0;
-  }
-  const owner = await askOn(io, "GitHub owner (user or org):");
-  const ownerError = validateSegment("GitHub owner", owner);
-  if (ownerError) {
-    io.stderr(`oh config repo: ${ownerError}
-`);
-    return 1;
-  }
-  const name = await askOn(io, "Repository name [openharness]:");
-  const repoName = name === "" ? "openharness" : name;
-  const nameError = validateSegment("repository name", repoName);
-  if (nameError) {
-    io.stderr(`oh config repo: ${nameError}
-`);
-    return 1;
-  }
-  const visibility = await askVisibility(io);
-  const url = repoUrl(owner, repoName);
-  const manual = manualSteps(owner, repoName, visibility);
-  let root;
+function writeEnvFile(envPath, content) {
+  const tmpPath = `${envPath}.tmp.${process.pid}`;
+  let fd;
   try {
-    root = resolveProjectRoot(opts.cwd);
-  } catch (error) {
-    io.stderr(`oh config repo: ${error instanceof Error ? error.message : String(error)}
-`);
-    printManual(io, manual, "Nothing was changed. Finish this by hand from your checkout:");
-    return 1;
-  }
-  const capture2 = { stdio: "capture", cwd: root };
-  const auth = run("gh", ["auth", "status"], capture2);
-  if (auth.error?.code === "ENOENT") {
-    printManual(io, manual, "gh is not on PATH \u2014 finish this by hand:");
-    return 0;
-  }
-  assertSpawned(auth, "gh auth status");
-  if (auth.status !== 0) {
-    printManual(
-      io,
-      manual,
-      "gh is not authenticated (`gh auth login`) \u2014 finish this by hand once it is:"
-    );
-    return 0;
-  }
-  const remotesResult = run("git", ["remote"], capture2);
-  assertSpawned(remotesResult, "git remote");
-  if (remotesResult.status !== 0) {
-    printManual(io, manual, "`git remote` failed \u2014 is this a git repo? Finish this by hand:");
-    return 0;
-  }
-  const remotes = (remotesResult.stdout ?? "").split("\n").map((line) => line.trim()).filter((line) => line !== "");
-  let originUrl = "";
-  if (remotes.includes("origin")) {
-    const shown = run("git", ["remote", "get-url", "origin"], capture2);
-    assertSpawned(shown, "git remote get-url origin");
-    originUrl = (shown.stdout ?? "").trim();
-  }
-  const originIsTarget = originUrl !== "" && sameRemote(originUrl, owner, repoName);
-  if (!originIsTarget && remotes.includes("origin") && remotes.includes(UPSTREAM_REMOTE)) {
-    io.stderr(
-      `oh config repo: origin already points at ${originUrl} and a "${UPSTREAM_REMOTE}" remote already exists \u2014 nothing was changed. Sort the remotes out by hand:
-`
-    );
-    printManual(io, manual.slice(2), "Remaining steps:");
-    return 1;
-  }
-  const steps = [];
-  const exists = run("gh", ["repo", "view", `${owner}/${repoName}`], capture2);
-  assertSpawned(exists, "gh repo view");
-  if (exists.status === 0) {
-    io.stdout(`  ${owner}/${repoName} already exists \u2014 skipping creation.
-`);
-  } else {
-    steps.push(manual[0]);
-  }
-  if (originIsTarget) {
-    io.stdout("  origin already points at your repo \u2014 leaving the remotes alone.\n");
-  } else {
-    if (remotes.includes("origin")) steps.push(manual[1]);
-    steps.push(manual[2]);
-  }
-  steps.push(manual[3]);
-  for (let i = 0; i < steps.length; i++) {
-    const step = steps[i];
-    io.stdout(`  $ ${shellLine(step)}
-`);
-    const result = run(step.cmd, step.args, { stdio: "inherit", cwd: root });
-    if (result.error || result.status !== 0) {
-      const detail = result.error?.message ?? `exit ${result.status}`;
-      io.stderr(`oh config repo: ${shellLine(step)} failed (${detail}) \u2014 stopping here.
-`);
-      const remaining = steps.slice(i + 1);
-      if (remaining.length > 0) {
-        printManual(io, remaining, "Not run. Finish by hand once the failure is fixed:");
+    fd = openSync2(tmpPath, "w", 384);
+    writeFileSync5(tmpPath, content, "utf8");
+    fsyncSync2(fd);
+    closeSync2(fd);
+    fd = void 0;
+    renameSync4(tmpPath, envPath);
+  } catch (err) {
+    if (fd !== void 0) {
+      try {
+        closeSync2(fd);
+      } catch {
       }
-      return 1;
     }
+    try {
+      unlinkSync4(tmpPath);
+    } catch {
+    }
+    throw err;
   }
-  io.stdout(
-    `
-  Done \u2014 origin is ${url}${remotes.includes("origin") && !originIsTarget ? `, upstream kept as "${UPSTREAM_REMOTE}"` : ""}.
-`
-  );
-  return 0;
-}
-function sameRemote(url, owner, name) {
-  const normalized = url.replace(/\.git$/, "").toLowerCase();
-  const slug = `${owner}/${name}`.toLowerCase();
-  return normalized.endsWith(`:${slug}`) || normalized.endsWith(`/${slug}`);
-}
-
-// src/commands/secret.ts
-import { existsSync as existsSync13 } from "node:fs";
-import { join as join8 } from "node:path";
-
-// src/lib/gitignore.ts
-import { existsSync as existsSync12, mkdirSync as mkdirSync5, readFileSync as readFileSync10, writeFileSync as writeFileSync6 } from "node:fs";
-import { dirname as dirname7, join as join7 } from "node:path";
-function appendGitignoreLines(root, lines) {
-  const target = join7(root, ".gitignore");
-  const existing = existsSync12(target) ? readFileSync10(target, "utf8") : "";
-  const present = new Set(existing.split("\n").map((line) => line.trimEnd()));
-  const added = [];
-  for (const line of lines) {
-    const key = line.trimEnd();
-    if (key === "" || present.has(key)) continue;
-    present.add(key);
-    added.push(line);
-  }
-  if (added.length === 0) return added;
-  let output = existing;
-  if (output.length > 0 && !output.endsWith("\n")) output += "\n";
-  output += `${added.join("\n")}
-`;
-  mkdirSync5(dirname7(target), { recursive: true });
-  writeFileSync6(target, output, "utf8");
-  return added;
 }
 
-// src/commands/secret.ts
-function secretsRoot(opts) {
-  return opts.sandbox === void 0 ? resolveProjectRoot(opts.cwd) : resolveSandboxRoot({ name: opts.sandbox });
-}
-function ignoreSecretsFile(root) {
-  if (!existsSync13(join8(root, ".git"))) return;
-  appendGitignoreLines(root, [".env"]);
+// src/lib/secrets.ts
+var SECRETS_FILE = ".env";
+var SECRET_KEYS = [
+  "GH_TOKEN",
+  "XAI_API_KEY",
+  "META_API_KEY",
+  "SANDBOX_PASSWORD",
+  "PI_SLACK_APP_TOKEN",
+  "PI_SLACK_BOT_TOKEN",
+  "LANGFUSE_PUBLIC_KEY",
+  "LANGFUSE_SECRET_KEY"
+];
+var ALLOWED = new Set(SECRET_KEYS);
+function secretsFilePath(root) {
+  return resolve8(root, SECRETS_FILE);
 }
-function secretKeyList() {
-  return SECRET_KEYS.map((key) => `  ${key}`).join("\n");
+function isSecretKey(key) {
+  return ALLOWED.has(key);
 }
-async function runSecretSet(key, opts, io) {
-  if (!isSecretKey(key)) {
-    io.stderr(
-      `oh secret set: ${key} is not a secret \u2014 non-secret settings live in oh.json.
-Set it with \`oh config set ${key}\` instead.
-
-Keys:
-${secretKeyList()}
-`
-    );
-    return 1;
-  }
-  const root = secretsRoot(opts);
-  const askSecret2 = io.askSecret ?? askSecret;
-  const value = (await askSecret2(`Value for ${bold(key)} (input hidden):`)).trim();
-  if (value === "") {
-    io.stderr(`oh secret set: no value entered \u2014 ${key} unchanged
-`);
-    return 1;
-  }
-  try {
-    setSecret(root, key, value);
-    ignoreSecretsFile(root);
-  } catch (error) {
-    io.stderr(`oh secret set: ${error instanceof Error ? error.message : String(error)}
-`);
-    return 1;
-  }
-  io.stdout(`.env: set ${key}=${redact(value)}
-`);
-  return 0;
+function assertSecretKey(key) {
+  if (ALLOWED.has(key)) return;
+  throw new Error(
+    `${key} is not a secret \u2014 non-secret settings live in oh.json; use \`${activeBin()} config set\` instead`
+  );
 }
-async function runSecretList(opts, io) {
-  const root = secretsRoot(opts);
-  const keys = listSecretKeys(root);
-  if (keys.length === 0) {
-    io.stdout("no secrets set \u2014 write one with `oh secret set <KEY>`\n");
-    return 0;
+function readSecret(root, key) {
+  assertSecretKey(key);
+  const file = secretsFilePath(root);
+  if (!existsSync10(file)) return void 0;
+  const env = {};
+  loadEnvInto(file, env);
+  const value = env[key]?.trim();
+  return value === void 0 || value === "" ? void 0 : stripQuotes2(value);
+}
+function setSecret(root, key, value) {
+  assertSecretKey(key);
+  if (/[\r\n]/.test(value)) {
+    throw new Error(`${key} value must not contain a newline`);
   }
-  const width = Math.max(...keys.map((key) => key.length));
-  for (const key of keys) {
-    const value = readSecret(root, key);
-    io.stdout(`${key.padEnd(width)}  ${value === void 0 ? "\u2014" : redact(value)}
-`);
+  const file = secretsFilePath(root);
+  assertInRoot(file, resolve8(root));
+  const original = existsSync10(file) ? readFileSync8(file, "utf8") : "";
+  const { content } = setKeyInEnv(original, key, value);
+  writeEnvFile(file, content);
+}
+function listSecretKeys(root) {
+  const file = secretsFilePath(root);
+  if (!existsSync10(file)) return [];
+  const env = {};
+  loadEnvInto(file, env);
+  return SECRET_KEYS.filter((key) => {
+    const value = env[key]?.trim();
+    return value !== void 0 && value !== "";
+  });
+}
+function stripQuotes2(s) {
+  if (s.length >= 2 && (s[0] === '"' && s.endsWith('"') || s[0] === "'" && s.endsWith("'"))) {
+    return s.slice(1, -1);
   }
-  return 0;
+  return s;
 }
 
 // src/commands/lifecycle.ts
-import { existsSync as existsSync15, mkdtempSync, readFileSync as readFileSync11, rmSync, writeFileSync as writeFileSync7 } from "node:fs";
+import { existsSync as existsSync12, mkdtempSync, readFileSync as readFileSync9, rmSync, writeFileSync as writeFileSync6 } from "node:fs";
 import { tmpdir } from "node:os";
-import { basename as basename5, join as join9, sep as sep4 } from "node:path";
+import { basename as basename5, join as join6, sep as sep4 } from "node:path";
 
 // src/lib/execution/detect.ts
-import { existsSync as existsSync14 } from "node:fs";
+import { existsSync as existsSync11 } from "node:fs";
 var SANDBOX_MARKER_FILE = "/.dockerenv";
-function runningInsideSandbox(env = process.env, fileExists = existsSync14) {
+function runningInsideSandbox(env = process.env, fileExists = existsSync11) {
   const override = resolveAliasedEnv(env, "EXECUTION_TARGET").value;
   if (override === "local") return true;
   if (override === "docker-compose") return false;
@@ -3672,10 +2908,10 @@ var LocalExecutionTarget = class {
     this.workspace = { hostRoot: opts.projectRoot, targetRoot: opts.projectRoot };
   }
   async provision() {
-    throw new HostOnlyError("`oh sandbox`");
+    throw new HostOnlyError(`\`${activeBin()} sandbox\``);
   }
   async destroy() {
-    throw new HostOnlyError("`oh destroy`");
+    throw new HostOnlyError(`\`${activeBin()} destroy\``);
   }
   async status() {
     return "ready";
@@ -3710,398 +2946,743 @@ var LocalExecutionTarget = class {
       env: this.childEnv(request),
       ...request.cwd !== void 0 ? { cwd: request.cwd } : {}
     });
-    assertSpawned(r, cmd);
-    return r.status ?? 1;
-  }
-  describe() {
-    return `local target inside the sandbox at ${this.projectRoot}`;
+    assertSpawned(r, cmd);
+    return r.status ?? 1;
+  }
+  describe() {
+    return `local target inside the sandbox at ${this.projectRoot}`;
+  }
+  argvFor(request, interactive) {
+    const argv = [...request.argv];
+    const user = request.user;
+    if (user === void 0) return argv;
+    const me = this.identity();
+    if (user === me.name) return argv;
+    if (user === "root" && me.uid === 0) return argv;
+    if (user === "root") {
+      return interactive ? ["sudo", "--", ...argv] : ["sudo", "-n", "--", ...argv];
+    }
+    if (me.uid === 0) return ["gosu", user, ...argv];
+    throw new Error(
+      `cannot run as user "${user}" from user "${me.name}" inside the sandbox`
+    );
+  }
+  childEnv(request) {
+    return { ...this.env ?? process.env, ...request.env ?? {} };
+  }
+};
+function defaultIdentity() {
+  const info = userInfo();
+  return { name: info.username, uid: info.uid };
+}
+
+// src/lib/execution/index.ts
+function resolveExecutionTarget(opts) {
+  if (runningInsideSandbox(opts.env ?? process.env)) {
+    return new LocalExecutionTarget({
+      projectRoot: opts.projectRoot,
+      ...opts.run ? { run: opts.run } : {},
+      ...opts.env ? { env: opts.env } : {}
+    });
+  }
+  return new DockerComposeExecutionTarget(opts);
+}
+
+// src/lib/config-render.ts
+var RETIRED_KEYS = [
+  "WORKTREES_DIR",
+  "PROJECTS_DIR",
+  "CRONS_DIR",
+  "OH_PROJECT_ROOT",
+  "AGRO_PROJECT_ROOT",
+  "INSTALL_DEEPAGENTS",
+  "INSTALL_OPENCODE",
+  "INSTALL_GROK_BUILD",
+  "INSTALL_HERMES",
+  "INSTALL_AGENT_BROWSER",
+  "INSTALL_TAILSCALE",
+  "SANDBOX_SSH_PASSWORD_AUTH",
+  "SANDBOX_SSH_AUTHORIZED_KEYS",
+  "HERMES_DASHBOARD",
+  "HERMES_DASHBOARD_PORT",
+  "CRON_AGENT_BIN",
+  "SKIP_PNPM_INSTALL",
+  "LANGFUSE_BASE_URL",
+  "LANGFUSE_PRIVACY_PRESET"
+];
+function renderComposeVars(config) {
+  const out = [];
+  const put = (key, value) => {
+    if (value === void 0) return;
+    out.push({ key, value: String(value) });
+  };
+  put("SANDBOX_NAME", config.name);
+  put("TZ", config.timezone);
+  put("AGRO_HOME_MOUNT", config.storage?.homePath);
+  put("AGRO_REPO_DIR", configCheckout(config));
+  put("GIT_USER_NAME", config.git?.userName);
+  put("GIT_USER_EMAIL", config.git?.userEmail);
+  put("DOCKER_SOCKET", config.access?.dockerSocket);
+  put("SANDBOX_SSH", config.access?.ssh);
+  put("SANDBOX_SSH_PORT", config.access?.sshPort);
+  put("AGRO_SANDBOX_IMAGE", config.image?.ref);
+  put("AGRO_PULL_POLICY", config.image?.pullPolicy);
+  for (const { key, value } of out) {
+    if (isSecretKey(key)) {
+      throw new Error(`refusing to render secret ${key} from the sandbox config`);
+    }
+    if (RETIRED_KEYS.includes(key)) {
+      throw new Error(`refusing to render retired variable ${key}`);
+    }
+    if (/[\r\n]/.test(value)) {
+      throw new Error(`config value for ${key} must not contain a newline`);
+    }
+  }
+  return out;
+}
+function renderComposeEnv(config) {
+  const vars = renderComposeVars(config);
+  return vars.length === 0 ? "" : `${vars.map(({ key, value }) => `${key}=${value}`).join("\n")}
+`;
+}
+
+// src/commands/lifecycle.ts
+var COMPOSE_ENV_DIR_PREFIX = "oh-compose-env-";
+function composeEnvDir() {
+  return mkdtempSync(join6(tmpdir(), COMPOSE_ENV_DIR_PREFIX));
+}
+function writeComposeEnv(root, dir) {
+  const file = join6(dir, "compose.env");
+  writeFileSync6(file, renderComposeEnv(readOhConfig(ohConfigPath(root))), {
+    mode: 384,
+    encoding: "utf8"
+  });
+  return file;
+}
+function withComposeEnvFile(root, fn) {
+  if (!existsSync12(ohConfigPath(root))) return fn([]);
+  const dir = composeEnvDir();
+  try {
+    return fn(["--extra-env-file", writeComposeEnv(root, dir)]);
+  } finally {
+    rmSync(dir, { recursive: true, force: true });
+  }
+}
+async function withComposeEnvFileAsync(root, fn) {
+  if (!existsSync12(ohConfigPath(root))) return await fn([]);
+  const dir = composeEnvDir();
+  try {
+    return await fn(["--extra-env-file", writeComposeEnv(root, dir)]);
+  } finally {
+    rmSync(dir, { recursive: true, force: true });
+  }
+}
+function sandboxRoot(opts) {
+  const root = resolveSandboxRoot({ name: opts.name, cwd: opts.cwd });
+  if (existsSync12(ohConfigPath(root))) {
+    const repo = configuredString(root, "repo");
+    materialize(root, repo === void 0 ? {} : { repo });
+  }
+  return root;
+}
+var DEFAULT_CONTAINER_NAME = DEFAULT_SANDBOX_NAME;
+var DEFAULT_SANDBOX_IMAGE = "ghcr.io/mifunedev/agro:latest";
+function configuredField(root, path4) {
+  const file = ohConfigPath(root);
+  if (!existsSync12(file)) return void 0;
+  try {
+    return getOhConfigValue(readOhConfig(file), path4);
+  } catch {
+    return void 0;
+  }
+}
+function configuredString(root, path4) {
+  const value = configuredField(root, path4);
+  return typeof value === "string" && value !== "" ? value : void 0;
+}
+function fromProcessEnv(key) {
+  const value = process.env[key];
+  return value !== void 0 && value !== "" ? value : void 0;
+}
+function dockerSocketConfigured(root) {
+  return configuredField(root, "access.dockerSocket") !== void 0;
+}
+async function maybePromptDockerSocket(root, io, bin) {
+  if (dockerSocketConfigured(root)) return;
+  const interactive = process.stdin.isTTY === true || io.ask !== void 0;
+  if (!interactive) return;
+  const envDir = join6(root, ".devcontainer");
+  if (!existsSync12(envDir)) return;
+  const askFn = io.ask ?? ask;
+  const answer = (await askFn(
+    "Mount host Docker socket into the sandbox? (effectively host root \u2014 enable only if the agent must drive Docker) [y/N]"
+  )).trim().toLowerCase();
+  const enabled = answer === "y" || answer === "yes";
+  setEnvValue(root, "DOCKER_SOCKET", enabled ? "true" : "false", bin);
+  io.stdout(
+    enabled ? "DOCKER_SOCKET=true \u2014 host Docker socket will be mounted\n" : "DOCKER_SOCKET=false \u2014 host Docker socket stays unmounted\n"
+  );
+}
+function configuredImage(root) {
+  return aliasedEnvValue(process.env, "SANDBOX_IMAGE") ?? configuredString(root, "image.ref");
+}
+async function runSandbox(opts, io) {
+  const run = opts.run ?? spawnRunner;
+  const root = resolveProjectRoot(opts.cwd);
+  const useImage = opts.image === true || opts.imageRef !== void 0;
+  const useNoBuild = useImage || opts.noBuild === true;
+  const imageRef = useImage ? opts.imageRef ?? configuredImage(root) ?? DEFAULT_SANDBOX_IMAGE : void 0;
+  const env = imageRef === void 0 ? void 0 : { ...process.env, ...aliasedEnvPair("SANDBOX_IMAGE", imageRef) };
+  if (opts.printArgv === true) {
+    const script = requireLifecycleScript(root, "docker-compose.sh");
+    return withComposeEnvFile(root, (extraArgs) => {
+      const r = run(
+        "bash",
+        [
+          script,
+          "--repo-dir",
+          root,
+          ...extraArgs,
+          "--print-argv",
+          "up",
+          "-d",
+          useNoBuild ? "--no-build" : "--build"
+        ],
+        { stdio: "inherit", ...env ? { env } : {} }
+      );
+      assertSpawned(r, `bash ${script}`);
+      return r.status ?? 1;
+    });
+  }
+  if (runningInsideSandbox()) {
+    io.stderr(`${new HostOnlyError(`\`${opts.bin} sandbox\``).message}
+`);
+    return 1;
+  }
+  await maybePromptDockerSocket(root, io, opts.bin);
+  requireLifecycleScript(root, "docker-compose.sh");
+  if (imageRef !== void 0) {
+    io.stdout(`image mode: ${imageRef} (skipping local build)
+`);
+  } else if (useNoBuild) {
+    io.stdout("no-build mode: reusing the existing image (skipping local build)\n");
+  }
+  try {
+    await withComposeEnvFileAsync(root, async (extraArgs) => {
+      const target = resolveExecutionTarget({
+        projectRoot: root,
+        run,
+        build: !useNoBuild,
+        ...extraArgs.length > 0 ? { extraEnvFile: extraArgs[1] } : {},
+        ...env ? { env } : {}
+      });
+      await target.provision();
+    });
+    return 0;
+  } catch (err) {
+    if (err instanceof ExecutionExitError) return err.exitCode;
+    if (err instanceof HostOnlyError) {
+      io.stderr(`${err.message}
+`);
+      return 1;
+    }
+    throw err;
   }
-  argvFor(request, interactive) {
-    const argv = [...request.argv];
-    const user = request.user;
-    if (user === void 0) return argv;
-    const me = this.identity();
-    if (user === me.name) return argv;
-    if (user === "root" && me.uid === 0) return argv;
-    if (user === "root") {
-      return interactive ? ["sudo", "--", ...argv] : ["sudo", "-n", "--", ...argv];
+}
+function configuredContainerName(root) {
+  return fromProcessEnv("SANDBOX_NAME") ?? configuredString(root, "name");
+}
+function runShell(opts, io) {
+  const run = opts.run ?? spawnRunner;
+  const root = sandboxRoot(opts);
+  const name = configuredContainerName(root) ?? DEFAULT_CONTAINER_NAME;
+  const target = resolveExecutionTarget({ projectRoot: root, container: name, run });
+  let code;
+  try {
+    code = target.attach({ argv: ["zsh"], user: "sandbox" });
+  } catch (err) {
+    if (err instanceof ExecutionSpawnError && err.code === "ENOENT") {
+      throw new Error(`docker is required for \`${opts.bin} shell\` but was not found on PATH`);
     }
-    if (me.uid === 0) return ["gosu", user, ...argv];
-    throw new Error(
-      `cannot run as user "${user}" from user "${me.name}" inside the sandbox`
-    );
+    throw err;
   }
-  childEnv(request) {
-    return { ...this.env ?? process.env, ...request.env ?? {} };
+  if (code !== 0) {
+    io.stderr(
+      `container \`${name}\` not running? start it with \`${opts.bin} sandbox install docker\`
+`
+    );
   }
-};
-function defaultIdentity() {
-  const info = userInfo();
-  return { name: info.username, uid: info.uid };
+  return code;
 }
-
-// src/lib/execution/index.ts
-function resolveExecutionTarget(opts) {
-  if (runningInsideSandbox(opts.env ?? process.env)) {
-    return new LocalExecutionTarget({
-      projectRoot: opts.projectRoot,
-      ...opts.run ? { run: opts.run } : {},
-      ...opts.env ? { env: opts.env } : {}
+var COMPOSE_VERBS = Object.freeze({
+  stop: Object.freeze(["stop"]),
+  restart: Object.freeze(["restart"]),
+  logs: Object.freeze(["logs", "-f"]),
+  ps: Object.freeze(["ps"]),
+  destroy: Object.freeze(["down", "-v"])
+});
+function composeVerbs() {
+  return Object.keys(COMPOSE_VERBS);
+}
+function runComposeVerb(verb, opts, extra = []) {
+  const run = opts.run ?? spawnRunner;
+  const root = sandboxRoot(opts);
+  const script = requireLifecycleScript(root, "docker-compose.sh");
+  return withComposeEnvFile(root, (extraArgs) => {
+    const r = run("bash", [script, ...extraArgs, ...COMPOSE_VERBS[verb], ...extra], {
+      stdio: "inherit"
     });
+    assertSpawned(r, `bash ${script} ${verb}`);
+    return r.status ?? 1;
+  });
+}
+function runComposeConfig(opts, extra = []) {
+  const run = opts.run ?? spawnRunner;
+  const root = sandboxRoot(opts);
+  const script = requireLifecycleScript(root, "docker-compose.sh");
+  return withComposeEnvFile(root, (extraArgs) => {
+    const r = run("bash", [script, ...extraArgs, "config", ...extra], { stdio: "inherit" });
+    assertSpawned(r, `bash ${script} config`);
+    return r.status ?? 1;
+  });
+}
+function namedVolumes(root) {
+  let text;
+  try {
+    text = readFileSync9(join6(root, ".devcontainer", "docker-compose.yml"), "utf8");
+  } catch {
+    return [];
   }
-  return new DockerComposeExecutionTarget(opts);
+  const lines = text.split("\n");
+  const start = lines.findIndex((line) => /^volumes:\s*$/.test(line));
+  if (start === -1) return [];
+  const names = [];
+  for (const line of lines.slice(start + 1)) {
+    if (/^\S/.test(line)) break;
+    const match = /^ {2}([A-Za-z0-9][A-Za-z0-9_.-]*):\s*$/.exec(line);
+    if (match) names.push(match[1]);
+  }
+  return names;
 }
-
-// src/lib/config-render.ts
-var RETIRED_KEYS = [
-  "WORKTREES_DIR",
-  "PROJECTS_DIR",
-  "CRONS_DIR",
-  "OH_PROJECT_ROOT",
-  "AGRO_PROJECT_ROOT",
-  "INSTALL_DEEPAGENTS",
-  "INSTALL_OPENCODE",
-  "INSTALL_GROK_BUILD",
-  "INSTALL_HERMES",
-  "INSTALL_AGENT_BROWSER",
-  "INSTALL_TAILSCALE",
-  "SANDBOX_SSH_PASSWORD_AUTH",
-  "SANDBOX_SSH_AUTHORIZED_KEYS",
-  "HERMES_DASHBOARD",
-  "HERMES_DASHBOARD_PORT",
-  "CRON_AGENT_BIN",
-  "SKIP_PNPM_INSTALL",
-  "LANGFUSE_BASE_URL",
-  "LANGFUSE_PRIVACY_PRESET"
-];
-function renderComposeVars(config) {
-  const out = [];
-  const put = (key, value) => {
-    if (value === void 0) return;
-    out.push({ key, value: String(value) });
-  };
-  put("SANDBOX_NAME", config.name);
-  put("TZ", config.timezone);
-  put("AGRO_HOME_MOUNT", config.storage?.homePath);
-  put("AGRO_REPO_DIR", config.repo);
-  put("GIT_USER_NAME", config.git?.userName);
-  put("GIT_USER_EMAIL", config.git?.userEmail);
-  put("DOCKER_SOCKET", config.access?.dockerSocket);
-  put("SANDBOX_SSH", config.access?.ssh);
-  put("SANDBOX_SSH_PORT", config.access?.sshPort);
-  put("AGRO_SANDBOX_IMAGE", config.image?.ref);
-  put("AGRO_PULL_POLICY", config.image?.pullPolicy);
-  for (const { key, value } of out) {
-    if (isSecretKey(key)) {
-      throw new Error(`refusing to render secret ${key} from the sandbox config`);
+function destroyConfirmationPhrase(root) {
+  return configuredContainerName(root) ?? DEFAULT_CONTAINER_NAME;
+}
+async function runDestroy(opts, io) {
+  const root = sandboxRoot(opts);
+  const name = destroyConfirmationPhrase(root);
+  if (opts.yes !== true) {
+    const interactive = process.stdin.isTTY === true || io.ask !== void 0;
+    if (!interactive) {
+      io.stderr(
+        `${opts.bin} destroy: refusing to destroy \`${name}\` without a terminal \u2014 re-run with --yes to confirm non-interactively
+`
+      );
+      return 1;
     }
-    if (RETIRED_KEYS.includes(key)) {
-      throw new Error(`refusing to render retired variable ${key}`);
+    const homePath = readOhConfig(ohConfigPath(root)).storage?.homePath;
+    io.stdout(`
+${bold(`${opts.bin} destroy \u2014 ${name}`)}
+
+`);
+    if (homePath !== void 0 && homePath !== "") {
+      io.stdout("`docker compose down -v` removes the containers.\n");
+      io.stdout(
+        `This sandbox keeps its home on a host bind at ${homePath}, which \`down -v\`
+does not touch \u2014 every agent CLI login, the gh CLI token, and the SSH keys
+stay there. Delete that directory yourself if you also want them gone.
+
+`
+      );
+    } else {
+      const volumes = namedVolumes(root).map((volume) => `${name}_${volume}`);
+      io.stdout("`docker compose down -v` removes the containers and deletes\n");
+      io.stdout(
+        volumes.length > 0 ? `these named volumes with everything in them:
+
+  ${volumes.join("\n  ")}
+
+` : "every named volume this project owns, with everything in them.\n\n"
+      );
+      io.stdout(
+        "That is the provider authentication those volumes hold \u2014 every agent CLI\nlogin, the gh CLI token, and the SSH keys. Sign-in starts over.\n\n"
+      );
     }
-    if (/[\r\n]/.test(value)) {
-      throw new Error(`config value for ${key} must not contain a newline`);
+    const askFn = io.ask ?? ask;
+    const answer = (await askFn(`Type the sandbox name \`${name}\` to destroy it:`)).trim();
+    if (answer !== name) {
+      io.stderr(`${opts.bin} destroy: aborted \u2014 nothing was removed
+`);
+      return 1;
     }
   }
-  return out;
+  const code = runComposeVerb("destroy", { ...opts, name: basename5(root) });
+  if (code === 0 && root.startsWith(registryRoot() + sep4)) {
+    rmSync(root, { recursive: true, force: true });
+    io.stdout(`removed the sandbox entry ${root}
+`);
+  }
+  return code;
 }
-function renderComposeEnv(config) {
-  const vars = renderComposeVars(config);
-  return vars.length === 0 ? "" : `${vars.map(({ key, value }) => `${key}=${value}`).join("\n")}
-`;
+function runGateway(args, opts) {
+  const run = opts.run ?? spawnRunner;
+  const root = resolveProjectRoot(opts.cwd);
+  const script = requireLifecycleScript(root, "gateway.sh");
+  const r = run("bash", [script, ...args], {
+    stdio: "inherit",
+    env: { ...process.env, ...aliasedEnvPair("PROJECT_ROOT", root) }
+  });
+  assertSpawned(r, `bash ${script}`);
+  return r.status ?? 1;
 }
 
-// src/commands/lifecycle.ts
-var COMPOSE_ENV_DIR_PREFIX = "oh-compose-env-";
-function composeEnvDir() {
-  return mkdtempSync(join9(tmpdir(), COMPOSE_ENV_DIR_PREFIX));
-}
-function writeComposeEnv(root, dir) {
-  const file = join9(dir, "compose.env");
-  writeFileSync7(file, renderComposeEnv(readOhConfig(ohConfigPath(root))), {
-    mode: 384,
-    encoding: "utf8"
-  });
-  return file;
+// src/commands/config.ts
+var HOME_PATH_FIELD = "storage.homePath";
+function currentHomePath(root) {
+  return readOhConfig(ohConfigPath(root)).storage?.homePath;
 }
-function withComposeEnvFile(root, fn) {
-  if (!existsSync15(ohConfigPath(root))) return fn([]);
-  const dir = composeEnvDir();
-  try {
-    return fn(["--extra-env-file", writeComposeEnv(root, dir)]);
-  } finally {
-    rmSync(dir, { recursive: true, force: true });
+function existingNamedVolume(root, run) {
+  const project = destroyConfirmationPhrase(root);
+  for (const volume of namedVolumes(root).map((name) => `${project}_${name}`)) {
+    const result = run("docker", ["volume", "inspect", volume], { stdio: "capture" });
+    if (result.error === void 0 && result.status === 0) return volume;
   }
+  return void 0;
+}
+function configRoot(opts) {
+  return opts.sandbox === void 0 ? resolveProjectRoot(opts.cwd) : resolveSandboxRoot({ name: opts.sandbox });
+}
+function configFieldList() {
+  return ohConfigFieldPaths().map((path4) => `  ${path4}`).join("\n");
+}
+async function runConfigShow(opts, io) {
+  const root = configRoot(opts);
+  const config = readOhConfig(ohConfigPath(root));
+  io.stdout(`${JSON.stringify(config, null, 2)}
+`);
+  return 0;
 }
-async function withComposeEnvFileAsync(root, fn) {
-  if (!existsSync15(ohConfigPath(root))) return await fn([]);
-  const dir = composeEnvDir();
-  try {
-    return await fn(["--extra-env-file", writeComposeEnv(root, dir)]);
-  } finally {
-    rmSync(dir, { recursive: true, force: true });
+async function runConfigSet(key, value, opts, io) {
+  if (isSecretKey(key) || isSecretKey(key.toUpperCase())) {
+    io.stderr(
+      `${opts.bin} config set: ${key.toUpperCase()} is a secret \u2014 oh.json is tracked by git.
+Set it with \`${opts.bin} secret set ${key.toUpperCase()}\` instead.
+`
+    );
+    return 1;
   }
-}
-function sandboxRoot(opts) {
-  const root = resolveSandboxRoot({ name: opts.name, cwd: opts.cwd });
-  if (existsSync15(ohConfigPath(root))) {
-    const repo = configuredString(root, "repo");
-    materialize(root, repo === void 0 ? {} : { repo });
+  if (!findOhConfigField(key)) {
+    io.stderr(`${opts.bin} config set: unknown field "${key}"
+
+Fields:
+${configFieldList()}
+`);
+    return 1;
   }
-  return root;
-}
-var DEFAULT_CONTAINER_NAME = DEFAULT_SANDBOX_NAME;
-var DEFAULT_SANDBOX_IMAGE = "ghcr.io/mifunedev/agro:latest";
-function configuredField(root, path4) {
-  const file = ohConfigPath(root);
-  if (!existsSync15(file)) return void 0;
+  const root = configRoot(opts);
+  if (key === HOME_PATH_FIELD && opts.force !== true && currentHomePath(root) !== value) {
+    const volume = existingNamedVolume(root, opts.run ?? spawnRunner);
+    if (volume !== void 0) {
+      io.stderr(
+        `${opts.bin} config set: ${HOME_PATH_FIELD} refused \u2014 the named volume ${volume} already exists.
+The next start would mount ${value} at /home/sandbox instead, and every file already in ${volume} would be orphaned there, invisible to the sandbox.
+Pass --force to change it anyway.
+`
+      );
+      return 1;
+    }
+  }
+  let outcome;
   try {
-    return getOhConfigValue(readOhConfig(file), path4);
-  } catch {
-    return void 0;
+    outcome = setConfigField(root, key, value);
+  } catch (error) {
+    io.stderr(`${opts.bin} config set: ${error instanceof Error ? error.message : String(error)}
+`);
+    return 1;
   }
+  io.stdout(
+    outcome === "already-set" ? `oh.json: ${key} already ${value}
+` : `oh.json: set ${key}=${value} (${outcome})
+`
+  );
+  return 0;
 }
-function configuredString(root, path4) {
-  const value = configuredField(root, path4);
-  return typeof value === "string" && value !== "" ? value : void 0;
+var UPSTREAM_REMOTE = "openharness";
+function repoUrl(owner, name) {
+  return `git@github.com:${owner}/${name}.git`;
 }
-function fromProcessEnv(key) {
-  const value = process.env[key];
-  return value !== void 0 && value !== "" ? value : void 0;
+function shellLine(step) {
+  return `${step.cmd} ${step.args.join(" ")}`;
 }
-function dockerSocketConfigured(root) {
-  return configuredField(root, "access.dockerSocket") !== void 0;
+function manualSteps(owner, name, visibility) {
+  return [
+    { cmd: "gh", args: ["repo", "create", `${owner}/${name}`, `--${visibility}`] },
+    { cmd: "git", args: ["remote", "rename", "origin", UPSTREAM_REMOTE] },
+    { cmd: "git", args: ["remote", "add", "origin", repoUrl(owner, name)] },
+    { cmd: "git", args: ["push", "-u", "origin", "HEAD"] }
+  ];
 }
-async function maybePromptDockerSocket(root, io) {
-  if (dockerSocketConfigured(root)) return;
-  const interactive = process.stdin.isTTY === true || io.ask !== void 0;
-  if (!interactive) return;
-  const envDir = join9(root, ".devcontainer");
-  if (!existsSync15(envDir)) return;
+function printManual(io, steps, lead) {
+  io.stdout(`
+${lead}
+
+`);
+  for (const step of steps) io.stdout(`    ${shellLine(step)}
+`);
+  io.stdout("\n");
+}
+function validateSegment(kind, value) {
+  if (value === "") return `${kind} is required`;
+  if (value.startsWith("-")) return `invalid ${kind} "${value}" (must not start with "-")`;
+  if (!/^[A-Za-z0-9._-]+$/.test(value)) {
+    return `invalid ${kind} "${value}" (use letters, digits, ".", "_" or "-")`;
+  }
+  return void 0;
+}
+async function askOn(io, question) {
   const askFn = io.ask ?? ask;
-  const answer = (await askFn(
-    "Mount host Docker socket into the sandbox? (effectively host root \u2014 enable only if the agent must drive Docker) [y/N]"
-  )).trim().toLowerCase();
-  const enabled = answer === "y" || answer === "yes";
-  setEnvValue(root, "DOCKER_SOCKET", enabled ? "true" : "false");
-  io.stdout(
-    enabled ? "DOCKER_SOCKET=true \u2014 host Docker socket will be mounted\n" : "DOCKER_SOCKET=false \u2014 host Docker socket stays unmounted\n"
-  );
+  return (await askFn(question)).trim();
 }
-function configuredImage(root) {
-  return aliasedEnvValue(process.env, "SANDBOX_IMAGE") ?? configuredString(root, "image.ref");
+async function confirmOn(io, question, defaultYes) {
+  const answer = (await askOn(io, `${question} ${defaultYes ? "[Y/n]" : "[y/N]"}`)).toLowerCase();
+  if (answer === "") return defaultYes;
+  return /^y/.test(answer);
 }
-async function runSandbox(opts, io) {
+async function askVisibility(io) {
+  io.stdout("  Repository visibility\n    1) private (recommended)\n    2) public\n");
+  for (; ; ) {
+    const answer = await askOn(io, "Choose [1-2] (default 1):");
+    if (answer === "" || answer === "1") return "private";
+    if (answer === "2") return "public";
+    io.stderr("  Invalid choice. Pick 1 or 2.\n");
+  }
+}
+async function runConfigRepo(opts, io) {
   const run = opts.run ?? spawnRunner;
-  const root = resolveProjectRoot(opts.cwd);
-  const useImage = opts.image === true || opts.imageRef !== void 0;
-  const useNoBuild = useImage || opts.noBuild === true;
-  const imageRef = useImage ? opts.imageRef ?? configuredImage(root) ?? DEFAULT_SANDBOX_IMAGE : void 0;
-  const env = imageRef === void 0 ? void 0 : { ...process.env, ...aliasedEnvPair("SANDBOX_IMAGE", imageRef) };
-  if (opts.printArgv === true) {
-    const script = requireLifecycleScript(root, "docker-compose.sh");
-    return withComposeEnvFile(root, (extraArgs) => {
-      const r = run(
-        "bash",
-        [
-          script,
-          "--repo-dir",
-          root,
-          ...extraArgs,
-          "--print-argv",
-          "up",
-          "-d",
-          useNoBuild ? "--no-build" : "--build"
-        ],
-        { stdio: "inherit", ...env ? { env } : {} }
-      );
-      assertSpawned(r, `bash ${script}`);
-      return r.status ?? 1;
-    });
+  const isTTY = io.isTTY ?? process.stdin.isTTY === true;
+  if (!isTTY) {
+    io.stderr(
+      `${opts.bin} config repo: creating a repo on your GitHub account needs an interactive terminal; re-run it from a TTY.
+`
+    );
+    return 1;
   }
-  if (runningInsideSandbox()) {
-    io.stderr(`${new HostOnlyError("`oh sandbox`").message}
+  io.stdout(`
+${bold("Version this harness in your own repo")}
+`);
+  io.stdout(
+    `  Creates a repo on your GitHub account, keeps the upstream you cloned from
+  as the "${UPSTREAM_REMOTE}" remote, and pushes this branch to yours.
+`
+  );
+  if (!await confirmOn(io, "Version this harness in your own repo?", false)) {
+    printManual(
+      io,
+      manualSteps("<your-user>", "<repo>", "private"),
+      `Skipped \u2014 nothing was created and no remote was touched. To do it later, run \`${opts.bin} config repo\`, or by hand:`
+    );
+    return 0;
+  }
+  const owner = await askOn(io, "GitHub owner (user or org):");
+  const ownerError = validateSegment("GitHub owner", owner);
+  if (ownerError) {
+    io.stderr(`${opts.bin} config repo: ${ownerError}
 `);
     return 1;
   }
-  await maybePromptDockerSocket(root, io);
-  requireLifecycleScript(root, "docker-compose.sh");
-  if (imageRef !== void 0) {
-    io.stdout(`image mode: ${imageRef} (skipping local build)
+  const name = await askOn(io, "Repository name [openharness]:");
+  const repoName = name === "" ? "openharness" : name;
+  const nameError = validateSegment("repository name", repoName);
+  if (nameError) {
+    io.stderr(`${opts.bin} config repo: ${nameError}
 `);
-  } else if (useNoBuild) {
-    io.stdout("no-build mode: reusing the existing image (skipping local build)\n");
+    return 1;
   }
+  const visibility = await askVisibility(io);
+  const url = repoUrl(owner, repoName);
+  const manual = manualSteps(owner, repoName, visibility);
+  let root;
   try {
-    await withComposeEnvFileAsync(root, async (extraArgs) => {
-      const target = resolveExecutionTarget({
-        projectRoot: root,
-        run,
-        build: !useNoBuild,
-        ...extraArgs.length > 0 ? { extraEnvFile: extraArgs[1] } : {},
-        ...env ? { env } : {}
-      });
-      await target.provision();
-    });
+    root = resolveProjectRoot(opts.cwd);
+  } catch (error) {
+    io.stderr(`${opts.bin} config repo: ${error instanceof Error ? error.message : String(error)}
+`);
+    printManual(io, manual, "Nothing was changed. Finish this by hand from your checkout:");
+    return 1;
+  }
+  const capture2 = { stdio: "capture", cwd: root };
+  const auth = run("gh", ["auth", "status"], capture2);
+  if (auth.error?.code === "ENOENT") {
+    printManual(io, manual, "gh is not on PATH \u2014 finish this by hand:");
     return 0;
-  } catch (err) {
-    if (err instanceof ExecutionExitError) return err.exitCode;
-    if (err instanceof HostOnlyError) {
-      io.stderr(`${err.message}
+  }
+  assertSpawned(auth, "gh auth status");
+  if (auth.status !== 0) {
+    printManual(
+      io,
+      manual,
+      "gh is not authenticated (`gh auth login`) \u2014 finish this by hand once it is:"
+    );
+    return 0;
+  }
+  const remotesResult = run("git", ["remote"], capture2);
+  assertSpawned(remotesResult, "git remote");
+  if (remotesResult.status !== 0) {
+    printManual(io, manual, "`git remote` failed \u2014 is this a git repo? Finish this by hand:");
+    return 0;
+  }
+  const remotes = (remotesResult.stdout ?? "").split("\n").map((line) => line.trim()).filter((line) => line !== "");
+  let originUrl = "";
+  if (remotes.includes("origin")) {
+    const shown = run("git", ["remote", "get-url", "origin"], capture2);
+    assertSpawned(shown, "git remote get-url origin");
+    originUrl = (shown.stdout ?? "").trim();
+  }
+  const originIsTarget = originUrl !== "" && sameRemote(originUrl, owner, repoName);
+  if (!originIsTarget && remotes.includes("origin") && remotes.includes(UPSTREAM_REMOTE)) {
+    io.stderr(
+      `${opts.bin} config repo: origin already points at ${originUrl} and a "${UPSTREAM_REMOTE}" remote already exists \u2014 nothing was changed. Sort the remotes out by hand:
+`
+    );
+    printManual(io, manual.slice(2), "Remaining steps:");
+    return 1;
+  }
+  const steps = [];
+  const exists = run("gh", ["repo", "view", `${owner}/${repoName}`], capture2);
+  assertSpawned(exists, "gh repo view");
+  if (exists.status === 0) {
+    io.stdout(`  ${owner}/${repoName} already exists \u2014 skipping creation.
+`);
+  } else {
+    steps.push(manual[0]);
+  }
+  if (originIsTarget) {
+    io.stdout("  origin already points at your repo \u2014 leaving the remotes alone.\n");
+  } else {
+    if (remotes.includes("origin")) steps.push(manual[1]);
+    steps.push(manual[2]);
+  }
+  steps.push(manual[3]);
+  for (let i = 0; i < steps.length; i++) {
+    const step = steps[i];
+    io.stdout(`  $ ${shellLine(step)}
+`);
+    const result = run(step.cmd, step.args, { stdio: "inherit", cwd: root });
+    if (result.error || result.status !== 0) {
+      const detail = result.error?.message ?? `exit ${result.status}`;
+      io.stderr(`${opts.bin} config repo: ${shellLine(step)} failed (${detail}) \u2014 stopping here.
 `);
+      const remaining = steps.slice(i + 1);
+      if (remaining.length > 0) {
+        printManual(io, remaining, "Not run. Finish by hand once the failure is fixed:");
+      }
       return 1;
     }
-    throw err;
   }
+  io.stdout(
+    `
+  Done \u2014 origin is ${url}${remotes.includes("origin") && !originIsTarget ? `, upstream kept as "${UPSTREAM_REMOTE}"` : ""}.
+`
+  );
+  return 0;
 }
-function configuredContainerName(root) {
-  return fromProcessEnv("SANDBOX_NAME") ?? configuredString(root, "name");
+function sameRemote(url, owner, name) {
+  const normalized = url.replace(/\.git$/, "").toLowerCase();
+  const slug = `${owner}/${name}`.toLowerCase();
+  return normalized.endsWith(`:${slug}`) || normalized.endsWith(`/${slug}`);
 }
-function runShell(opts, io) {
-  const run = opts.run ?? spawnRunner;
-  const root = sandboxRoot(opts);
-  const name = configuredContainerName(root) ?? DEFAULT_CONTAINER_NAME;
-  const target = resolveExecutionTarget({ projectRoot: root, container: name, run });
-  let code;
-  try {
-    code = target.attach({ argv: ["zsh"], user: "sandbox" });
-  } catch (err) {
-    if (err instanceof ExecutionSpawnError && err.code === "ENOENT") {
-      throw new Error("docker is required for `oh shell` but was not found on PATH");
-    }
-    throw err;
-  }
-  if (code !== 0) {
-    io.stderr(
-      `container \`${name}\` not running? start it with \`oh sandbox install docker\`
-`
-    );
+
+// src/commands/secret.ts
+import { existsSync as existsSync14 } from "node:fs";
+import { join as join8 } from "node:path";
+
+// src/lib/gitignore.ts
+import { existsSync as existsSync13, mkdirSync as mkdirSync5, readFileSync as readFileSync10, writeFileSync as writeFileSync7 } from "node:fs";
+import { dirname as dirname7, join as join7 } from "node:path";
+function appendGitignoreLines(root, lines) {
+  const target = join7(root, ".gitignore");
+  const existing = existsSync13(target) ? readFileSync10(target, "utf8") : "";
+  const present = new Set(existing.split("\n").map((line) => line.trimEnd()));
+  const added = [];
+  for (const line of lines) {
+    const key = line.trimEnd();
+    if (key === "" || present.has(key)) continue;
+    present.add(key);
+    added.push(line);
   }
-  return code;
+  if (added.length === 0) return added;
+  let output = existing;
+  if (output.length > 0 && !output.endsWith("\n")) output += "\n";
+  output += `${added.join("\n")}
+`;
+  mkdirSync5(dirname7(target), { recursive: true });
+  writeFileSync7(target, output, "utf8");
+  return added;
 }
-var COMPOSE_VERBS = Object.freeze({
-  stop: Object.freeze(["stop"]),
-  restart: Object.freeze(["restart"]),
-  logs: Object.freeze(["logs", "-f"]),
-  ps: Object.freeze(["ps"]),
-  destroy: Object.freeze(["down", "-v"])
-});
-function composeVerbs() {
-  return Object.keys(COMPOSE_VERBS);
+
+// src/commands/secret.ts
+function secretsRoot(opts) {
+  return opts.sandbox === void 0 ? resolveProjectRoot(opts.cwd) : resolveSandboxRoot({ name: opts.sandbox });
 }
-function runComposeVerb(verb, opts, extra = []) {
-  const run = opts.run ?? spawnRunner;
-  const root = sandboxRoot(opts);
-  const script = requireLifecycleScript(root, "docker-compose.sh");
-  return withComposeEnvFile(root, (extraArgs) => {
-    const r = run("bash", [script, ...extraArgs, ...COMPOSE_VERBS[verb], ...extra], {
-      stdio: "inherit"
-    });
-    assertSpawned(r, `bash ${script} ${verb}`);
-    return r.status ?? 1;
-  });
+function ignoreSecretsFile(root) {
+  if (!existsSync14(join8(root, ".git"))) return;
+  appendGitignoreLines(root, [".env"]);
 }
-function runComposeConfig(opts, extra = []) {
-  const run = opts.run ?? spawnRunner;
-  const root = sandboxRoot(opts);
-  const script = requireLifecycleScript(root, "docker-compose.sh");
-  return withComposeEnvFile(root, (extraArgs) => {
-    const r = run("bash", [script, ...extraArgs, "config", ...extra], { stdio: "inherit" });
-    assertSpawned(r, `bash ${script} config`);
-    return r.status ?? 1;
-  });
+function secretKeyList() {
+  return SECRET_KEYS.map((key) => `  ${key}`).join("\n");
 }
-function namedVolumes(root) {
-  let text;
-  try {
-    text = readFileSync11(join9(root, ".devcontainer", "docker-compose.yml"), "utf8");
-  } catch {
-    return [];
+async function runSecretSet(key, opts, io) {
+  if (!isSecretKey(key)) {
+    io.stderr(
+      `${opts.bin} secret set: ${key} is not a secret \u2014 non-secret settings live in oh.json.
+Set it with \`${opts.bin} config set ${key}\` instead.
+
+Keys:
+${secretKeyList()}
+`
+    );
+    return 1;
   }
-  const lines = text.split("\n");
-  const start = lines.findIndex((line) => /^volumes:\s*$/.test(line));
-  if (start === -1) return [];
-  const names = [];
-  for (const line of lines.slice(start + 1)) {
-    if (/^\S/.test(line)) break;
-    const match = /^ {2}([A-Za-z0-9][A-Za-z0-9_.-]*):\s*$/.exec(line);
-    if (match) names.push(match[1]);
+  const root = secretsRoot(opts);
+  const askSecret2 = io.askSecret ?? askSecret;
+  const value = (await askSecret2(`Value for ${bold(key)} (input hidden):`)).trim();
+  if (value === "") {
+    io.stderr(`${opts.bin} secret set: no value entered \u2014 ${key} unchanged
+`);
+    return 1;
   }
-  return names;
-}
-function destroyConfirmationPhrase(root) {
-  return configuredContainerName(root) ?? DEFAULT_CONTAINER_NAME;
+  try {
+    setSecret(root, key, value);
+    ignoreSecretsFile(root);
+  } catch (error) {
+    io.stderr(`${opts.bin} secret set: ${error instanceof Error ? error.message : String(error)}
+`);
+    return 1;
+  }
+  io.stdout(`.env: set ${key}=${redact(value)}
+`);
+  return 0;
 }
-async function runDestroy(opts, io) {
-  const root = sandboxRoot(opts);
-  const name = destroyConfirmationPhrase(root);
-  if (opts.yes !== true) {
-    const interactive = process.stdin.isTTY === true || io.ask !== void 0;
-    if (!interactive) {
-      io.stderr(
-        `oh destroy: refusing to destroy \`${name}\` without a terminal \u2014 re-run with --yes to confirm non-interactively
-`
-      );
-      return 1;
-    }
-    const homePath = readOhConfig(ohConfigPath(root)).storage?.homePath;
-    io.stdout(`
-${bold(`oh destroy \u2014 ${name}`)}
-
+async function runSecretList(opts, io) {
+  const root = secretsRoot(opts);
+  const keys = listSecretKeys(root);
+  if (keys.length === 0) {
+    io.stdout(`no secrets set \u2014 write one with \`${opts.bin} secret set <KEY>\`
 `);
-    if (homePath !== void 0 && homePath !== "") {
-      io.stdout("`docker compose down -v` removes the containers.\n");
-      io.stdout(
-        `This sandbox keeps its home on a host bind at ${homePath}, which \`down -v\`
-does not touch \u2014 every agent CLI login, the gh CLI token, and the SSH keys
-stay there. Delete that directory yourself if you also want them gone.
-
-`
-      );
-    } else {
-      const volumes = namedVolumes(root).map((volume) => `${name}_${volume}`);
-      io.stdout("`docker compose down -v` removes the containers and deletes\n");
-      io.stdout(
-        volumes.length > 0 ? `these named volumes with everything in them:
-
-  ${volumes.join("\n  ")}
-
-` : "every named volume this project owns, with everything in them.\n\n"
-      );
-      io.stdout(
-        "That is the provider authentication those volumes hold \u2014 every agent CLI\nlogin, the gh CLI token, and the SSH keys. Sign-in starts over.\n\n"
-      );
-    }
-    const askFn = io.ask ?? ask;
-    const answer = (await askFn(`Type the sandbox name \`${name}\` to destroy it:`)).trim();
-    if (answer !== name) {
-      io.stderr("oh destroy: aborted \u2014 nothing was removed\n");
-      return 1;
-    }
+    return 0;
   }
-  const code = runComposeVerb("destroy", { ...opts, name: basename5(root) });
-  if (code === 0 && root.startsWith(registryRoot() + sep4)) {
-    rmSync(root, { recursive: true, force: true });
-    io.stdout(`removed the sandbox entry ${root}
+  const width = Math.max(...keys.map((key) => key.length));
+  for (const key of keys) {
+    const value = readSecret(root, key);
+    io.stdout(`${key.padEnd(width)}  ${value === void 0 ? "\u2014" : redact(value)}
 `);
   }
-  return code;
-}
-function runGateway(args, opts) {
-  const run = opts.run ?? spawnRunner;
-  const root = resolveProjectRoot(opts.cwd);
-  const script = requireLifecycleScript(root, "gateway.sh");
-  const r = run("bash", [script, ...args], {
-    stdio: "inherit",
-    env: { ...process.env, ...aliasedEnvPair("PROJECT_ROOT", root) }
-  });
-  assertSpawned(r, `bash ${script}`);
-  return r.status ?? 1;
+  return 0;
 }
 
 // src/commands/sandbox.ts
-import { existsSync as existsSync16, mkdirSync as mkdirSync6, mkdtempSync as mkdtempSync2, rmSync as rmSync2 } from "node:fs";
+import { existsSync as existsSync15, mkdirSync as mkdirSync6, mkdtempSync as mkdtempSync2, rmSync as rmSync2, statSync as statSync4 } from "node:fs";
 import { tmpdir as tmpdir2 } from "node:os";
-import { join as join10, resolve as resolve9 } from "node:path";
+import { join as join9, resolve as resolve9 } from "node:path";
 
 // src/lib/runtimes/catalog.ts
 var RUNTIME_CATALOG = Object.freeze([
@@ -4119,7 +3700,7 @@ var RUNTIME_CATALOG = Object.freeze([
     tier: "microvm",
     state: "planned",
     provisionable: false,
-    notProvisionableReason: "microsandbox is not a provisionable runtime yet; see docs/rfcs/rfc-runtime-support.md. Inside a sandbox run `oh tool install microsandbox`.",
+    notProvisionableReason: (bin) => `microsandbox is not a provisionable runtime yet; see docs/rfcs/rfc-runtime-support.md. Inside a sandbox run \`${bin} tool install microsandbox\`.`,
     docsPath: "docs/runtimes/microsandbox.md"
   })
 ]);
@@ -4145,14 +3726,28 @@ function gitIdentity(run, key) {
   if (result.error || result.status !== 0) return "";
   return (result.stdout ?? "").trim();
 }
+function isBuildCapable(repo) {
+  return repo !== void 0 && existsSync15(join9(repo, ".devcontainer", "Dockerfile"));
+}
+function prepareHomeMount(value) {
+  const path4 = resolve9(value);
+  if (existsSync15(path4)) {
+    if (!statSync4(path4).isDirectory()) {
+      throw new Error(`--home-mount path exists and is not a directory: ${path4}`);
+    }
+    return path4;
+  }
+  mkdirSync6(path4, { recursive: true });
+  return path4;
+}
 function readSeedConfig(repo) {
   if (repo === void 0) return void 0;
   const file = ohConfigPath(repo);
-  return existsSync16(file) ? readOhConfig(file) : void 0;
+  return existsSync15(file) ? readOhConfig(file) : void 0;
 }
 function readEntryConfig(name) {
   const file = ohConfigPath(entryRoot(name));
-  return existsSync16(file) ? readOhConfig(file) : void 0;
+  return existsSync15(file) ? readOhConfig(file) : void 0;
 }
 function assignSetting(target, path4, value) {
   const segments = path4.split(".");
@@ -4182,11 +3777,11 @@ function mergeSettings(...sources) {
 function nonEmpty(value) {
   return value === void 0 || value === "" ? void 0 : value;
 }
-function seedConfig(name, repo, seed, run) {
+function seedConfig(name, checkout, seed, run) {
   const config = overlaySettings(defaultOhConfig(name), seed);
   config.name = name;
   config.runtime = "docker";
-  if (repo !== void 0) config.repo = repo;
+  if (checkout !== void 0) config.checkout = checkout;
   config.timezone = nonEmpty(seed?.timezone) ?? hostTimezone();
   config.git = {
     userName: nonEmpty(seed?.git?.userName) ?? gitIdentity(run, "user.name"),
@@ -4194,7 +3789,7 @@ function seedConfig(name, repo, seed, run) {
   };
   config.image = {
     ...config.image,
-    mode: seed?.image?.mode ?? (config.repo === void 0 ? "image" : "build")
+    mode: seed?.image?.mode ?? (isBuildCapable(configCheckout(config)) ? "build" : "image")
   };
   return config;
 }
@@ -4234,58 +3829,99 @@ async function runWizard(config, io) {
     config.access?.dockerSocket === true
   );
   config.access = access;
+  const homePath = await askDefaulted(
+    ask2,
+    "Host path for /home/sandbox (blank keeps the Docker-managed volume)",
+    config.storage?.homePath ?? ""
+  );
+  if (homePath !== "") config.storage = { ...config.storage, homePath: resolve9(homePath) };
 }
 async function runSandboxInstall(opts, io) {
   const run = opts.run ?? spawnRunner;
   const runtime = findRuntime(opts.runtime);
   if (runtime === void 0) {
     io.stderr(
-      `oh sandbox install: unknown runtime "${opts.runtime}" \u2014 known runtimes: ${runtimeIds().join(", ")}
+      `${opts.bin} sandbox install: unknown runtime "${opts.runtime}" \u2014 known runtimes: ${runtimeIds().join(", ")}
 `
     );
     return 1;
   }
   if (!runtime.provisionable) {
-    io.stderr(`oh sandbox install: ${runtime.notProvisionableReason}
+    io.stderr(`${opts.bin} sandbox install: ${runtime.notProvisionableReason?.(opts.bin) ?? ""}
 `);
     return 1;
   }
-  const repo = opts.repo === void 0 ? void 0 : resolve9(opts.repo);
-  if (repo !== void 0 && !existsSync16(repo)) {
-    io.stderr(`oh sandbox install: --repo directory does not exist: ${repo}
+  const checkout = opts.checkout === void 0 ? void 0 : resolve9(opts.checkout);
+  if (checkout !== void 0 && !existsSync15(checkout)) {
+    io.stderr(`${opts.bin} sandbox install: --checkout directory does not exist: ${checkout}
 `);
     return 1;
   }
-  const repoSeed = readSeedConfig(repo);
+  const repoSeed = readSeedConfig(checkout);
   const name = opts.name ?? repoSeed?.name ?? nextDefaultName(run);
   try {
     assertSandboxName(name);
   } catch (error) {
-    io.stderr(`oh sandbox install: ${error instanceof Error ? error.message : String(error)}
+    io.stderr(`${opts.bin} sandbox install: ${error instanceof Error ? error.message : String(error)}
 `);
     return 1;
   }
-  const config = seedConfig(name, repo, mergeSettings(readEntryConfig(name), repoSeed), run);
+  const config = seedConfig(name, checkout, mergeSettings(readEntryConfig(name), repoSeed), run);
+  const buildRequested = config.image?.mode === "build" && opts.noBuild !== true && opts.image !== true && opts.imageRef === void 0;
+  if (buildRequested && !isBuildCapable(configCheckout(config))) {
+    const target = configCheckout(config) ?? resolve9(opts.checkout ?? ".");
+    io.stderr(
+      `${opts.bin} sandbox install: image.mode is "build" but ${join9(target, ".devcontainer", "Dockerfile")} does not exist \u2014 point --checkout <dir> at a harness checkout that has .devcontainer/Dockerfile, or set image.mode to "image" to run the prebuilt image
+`
+    );
+    return 1;
+  }
+  if (opts.homeMount !== void 0) {
+    try {
+      config.storage = { ...config.storage, homePath: prepareHomeMount(opts.homeMount) };
+    } catch (error) {
+      io.stderr(`${opts.bin} sandbox install: ${error instanceof Error ? error.message : String(error)}
+`);
+      return 1;
+    }
+  }
   const interactive = opts.yes !== true && (process.stdin.isTTY === true || io.ask !== void 0);
+  const homePathBeforeWizard = config.storage?.homePath;
   if (interactive) {
     header("Configure the sandbox  (press Enter to accept the shown default)");
     await runWizard(config, io);
+    const chosen = config.storage?.homePath;
+    if (chosen !== void 0 && chosen !== homePathBeforeWizard) {
+      try {
+        config.storage = { ...config.storage, homePath: prepareHomeMount(chosen) };
+      } catch (error) {
+        io.stderr(
+          `${opts.bin} sandbox install: ${error instanceof Error ? error.message : String(error)}
+`
+        );
+        return 1;
+      }
+    }
   }
   if (opts.imageRef !== void 0) {
     config.image = { ...config.image, ref: opts.imageRef, mode: "image" };
   }
-  const useNoBuild = opts.noBuild === true || !(config.repo !== void 0 && config.image?.mode === "build");
+  if (configCheckout(config) !== void 0 && config.image?.mode === "image" && nonEmpty(config.image?.ref) === void 0) {
+    config.image = { ...config.image, ref: DEFAULT_SANDBOX_IMAGE };
+  }
+  const useNoBuild = opts.noBuild === true || !(configCheckout(config) !== void 0 && config.image?.mode === "build");
   const sandboxOpts = {
+    bin: opts.bin,
     run,
     ...opts.image === true ? { image: true } : {},
     ...opts.imageRef !== void 0 ? { imageRef: opts.imageRef } : {},
     ...useNoBuild ? { noBuild: true } : {}
   };
   if (opts.printArgv === true) {
-    const preview = mkdtempSync2(join10(tmpdir2(), "oh-sandbox-preview-"));
+    const preview = mkdtempSync2(join9(tmpdir2(), "oh-sandbox-preview-"));
     try {
       writeOhConfig(preview, config);
-      materialize(preview, { ...config.repo !== void 0 ? { repo: config.repo } : {} });
+      materialize(preview, { ...configCheckout(config) !== void 0 ? { checkout: configCheckout(config) } : {} });
       return await runSandbox({ ...sandboxOpts, cwd: preview, printArgv: true }, io);
     } finally {
       rmSync2(preview, { recursive: true, force: true });
@@ -4294,9 +3930,9 @@ async function runSandboxInstall(opts, io) {
   const root = entryRoot(config.name);
   mkdirSync6(root, { recursive: true });
   writeOhConfig(root, config);
-  materialize(root, { ...config.repo !== void 0 ? { repo: config.repo } : {} });
+  materialize(root, { ...configCheckout(config) !== void 0 ? { checkout: configCheckout(config) } : {} });
   const code = await runSandbox({ ...sandboxOpts, cwd: root }, io);
-  if (code === 0) io.stdout(`next: oh shell ${config.name}
+  if (code === 0) io.stdout(`next: ${opts.bin} shell ${config.name}
 `);
   return code;
 }
@@ -4314,10 +3950,12 @@ async function runSandboxList(opts, io) {
   for (const name of listEntries()) {
     const root = entryRoot(name);
     const config = readOhConfig(ohConfigPath(root));
+    const checkout = configCheckout(config) ?? "-";
     rows.push({
       name,
       runtime: config.runtime ?? "docker",
-      repo: config.repo ?? "-",
+      checkout,
+      repo: checkout,
       status: await entryStatus(root, name, run)
     });
   }
@@ -4328,7 +3966,7 @@ async function runSandboxList(opts, io) {
   }
   if (rows.length === 0) {
     io.stdout(
-      `no sandbox is registered in ${registryRoot()} \u2014 create one with \`oh sandbox install docker\`
+      `no sandbox is registered in ${registryRoot()} \u2014 create one with \`${opts.bin} sandbox install docker\`
 `
     );
     return 0;
@@ -4339,7 +3977,7 @@ async function runSandboxList(opts, io) {
   const statusWidth = width((row) => row.status);
   for (const row of rows) {
     io.stdout(
-      `${row.name.padEnd(nameWidth)}  ${row.runtime.padEnd(runtimeWidth)}  ${row.status.padEnd(statusWidth)}  ${row.repo}
+      `${row.name.padEnd(nameWidth)}  ${row.runtime.padEnd(runtimeWidth)}  ${row.status.padEnd(statusWidth)}  ${row.checkout}
 `
     );
   }
@@ -4469,6 +4107,20 @@ var HARNESS_CATALOG = [
     docsPath: "docs/harnesses/muse-code.md",
     kind: "installable"
   },
+  {
+    id: "antigravity-cli",
+    title: "Antigravity CLI",
+    binary: "agy",
+    installArgv: [
+      "bash",
+      "-lc",
+      'set -o pipefail; curl -fsSL https://antigravity.google/cli/install.sh | bash -s -- --dir "$HOME/.local/bin"'
+    ],
+    installUser: "sandbox",
+    verifyArgv: ["agy", "--version"],
+    docsPath: "docs/harnesses/antigravity-cli.md",
+    kind: "installable"
+  },
   {
     id: "t3code",
     title: "T3 Code",
@@ -4542,7 +4194,7 @@ function cell(value, absent) {
   if (value === null) return absent;
   return value ? "yes" : "no";
 }
-function renderTable(states, io) {
+function renderTable(states, io, bin) {
   const header2 = ["HARNESS", "KIND", "INSTALLED"];
   const rows = states.map((s) => [s.id, s.kind, cell(s.installed, "?")]);
   const widths = header2.map(
@@ -4552,7 +4204,9 @@ function renderTable(states, io) {
   io.stdout(line(header2));
   for (const row of rows) io.stdout(line(row));
   if (states.some((s) => s.installed === null)) {
-    io.stdout("\nINSTALLED is `?` \u2014 the sandbox is not running. Start it with `oh sandbox`.\n");
+    io.stdout(`
+INSTALLED is \`?\` \u2014 the sandbox is not running. Start it with \`${bin} sandbox\`.
+`);
   }
 }
 async function runHarnessList(opts, io) {
@@ -4563,12 +4217,12 @@ async function runHarnessList(opts, io) {
     io.stdout(`${JSON.stringify(states, null, 2)}
 `);
   } else {
-    renderTable(states, io);
+    renderTable(states, io, opts.bin);
   }
   return 0;
 }
-function unknownHarness(name, io) {
-  io.stderr(`oh harness: unknown harness "${name}"
+function unknownHarness(name, io, bin) {
+  io.stderr(`${bin} harness: unknown harness "${name}"
 
 `);
   io.stderr(`Known harnesses:
@@ -4582,21 +4236,21 @@ async function runHarnessStatus(name, opts, io) {
   let only;
   if (name !== void 0) {
     only = findHarness(name);
-    if (!only) return unknownHarness(name, io);
+    if (!only) return unknownHarness(name, io, opts.bin);
   }
   const states = await collectStates(root, run, opts.env, only ? [only] : void 0);
   if (opts.json) {
     io.stdout(`${JSON.stringify(only ? states[0] : states, null, 2)}
 `);
   } else {
-    renderTable(states, io);
+    renderTable(states, io, opts.bin);
   }
   return 0;
 }
 function hermesTargetRoot(target) {
   return target.kind === "docker-compose" ? "/home/sandbox/harness" : target.workspace.targetRoot;
 }
-async function reconcileHermes(target, io) {
+async function reconcileHermes(target, io, bin) {
   const root = hermesTargetRoot(target);
   const result = await target.exec({
     argv: remoteControlDirScript(root, "scripts/link-providers.sh", ["--init", "--hermes-only"]),
@@ -4605,7 +4259,7 @@ async function reconcileHermes(target, io) {
     stdio: "inherit"
   });
   if (result.exitCode !== 0) {
-    io.stderr(`oh harness: Hermes integration failed (exit ${result.exitCode}); no installation success reported.
+    io.stderr(`${bin} harness: Hermes integration failed (exit ${result.exitCode}); no installation success reported.
 `);
   }
   return result.exitCode;
@@ -4618,7 +4272,7 @@ async function runHarnessInstall(name, opts, io) {
     name === "hermes" && runningInsideSandbox(env) && projectRoot !== void 0 ? projectRoot : opts.cwd
   );
   const entry = findHarness(name);
-  if (!entry) return unknownHarness(name, io);
+  if (!entry) return unknownHarness(name, io, opts.bin);
   const target = targetFor(root, run, opts.env);
   let status;
   try {
@@ -4632,8 +4286,8 @@ async function runHarnessInstall(name, opts, io) {
   }
   if (!isReachable(status)) {
     io.stderr(
-      `oh harness: the sandbox is not running (${status}).
-Start it with \`oh sandbox\`, then re-run this command.
+      `${opts.bin} harness: the sandbox is not running (${status}).
+Start it with \`${opts.bin} sandbox\`, then re-run this command.
 `
     );
     return 1;
@@ -4644,7 +4298,7 @@ Start it with \`oh sandbox\`, then re-run this command.
     HERMES_HOME: `${hermesTargetRoot(target)}/.hermes`
   } : void 0;
   if (hermes) {
-    const code = await reconcileHermes(target, io);
+    const code = await reconcileHermes(target, io, opts.bin);
     if (code !== 0) return code;
   }
   const already = await probeInstalled(target, entry, installEnv);
@@ -4666,16 +4320,17 @@ Start it with \`oh sandbox\`, then re-run this command.
     ...installEnv ? { env: installEnv } : {}
   });
   if (r.exitCode !== 0) {
-    io.stderr(`oh harness: installing ${entry.id} failed (exit ${r.exitCode}).
+    io.stderr(`${opts.bin} harness: installing ${entry.id} failed (exit ${r.exitCode}).
 `);
     return r.exitCode;
   }
   if (hermes) {
     if (await probeInstalled(target, entry, installEnv) !== true) {
-      io.stderr("oh harness: Hermes installation finished but executable verification failed.\n");
+      io.stderr(`${opts.bin} harness: Hermes installation finished but executable verification failed.
+`);
       return 1;
     }
-    const code = await reconcileHermes(target, io);
+    const code = await reconcileHermes(target, io, opts.bin);
     if (code !== 0) return code;
   }
   io.stdout(`${entry.id}: installed \u2014 see ${sourceDocsUrl(entry.docsPath)} for authentication
@@ -4796,7 +4451,7 @@ var TOOL_CATALOG = Object.freeze([
     binary: "docker",
     verifyArgv: Object.freeze(["bash", "-lc", "command -v docker >/dev/null"]),
     versionArgv: Object.freeze(["docker", "--version"]),
-    notInstallableReason: "The Docker CLI is installed in the base image. Note that the CLI being present says nothing about whether a daemon is reachable \u2014 `oh ps <name>` answers that.",
+    notInstallableReason: (bin) => `The Docker CLI is installed in the base image. Note that the CLI being present says nothing about whether a daemon is reachable \u2014 \`${bin} ps <name>\` answers that.`,
     docsPath: TOOLS_DOC
   }),
   Object.freeze({
@@ -4806,7 +4461,7 @@ var TOOL_CATALOG = Object.freeze([
     binary: "gh",
     verifyArgv: Object.freeze(["bash", "-lc", "command -v gh >/dev/null"]),
     versionArgv: Object.freeze(["gh", "--version"]),
-    notInstallableReason: "The GitHub CLI is installed in the base image. Run `gh auth login` inside the sandbox to authenticate it.",
+    notInstallableReason: () => "The GitHub CLI is installed in the base image. Run `gh auth login` inside the sandbox to authenticate it.",
     docsPath: TOOLS_DOC
   }),
   Object.freeze({
@@ -4913,7 +4568,7 @@ function cell2(value, absent) {
   if (value === null) return absent;
   return value ? "yes" : "no";
 }
-function renderTable2(rows, io) {
+function renderTable2(rows, io, bin) {
   const header2 = ["TOOL", "KIND", "INSTALLED"];
   const body = rows.map((r) => [r.id, r.kind, cell2(r.installed, "?")]);
   const widths = header2.map(
@@ -4923,11 +4578,13 @@ function renderTable2(rows, io) {
   io.stdout(line(header2));
   for (const row of body) io.stdout(line(row));
   if (rows.some((r) => r.installed === null)) {
-    io.stdout("\nINSTALLED is `?` \u2014 the sandbox is not running. Start it with `oh sandbox`.\n");
+    io.stdout(`
+INSTALLED is \`?\` \u2014 the sandbox is not running. Start it with \`${bin} sandbox\`.
+`);
   }
 }
-function renderDetail(rows, io) {
-  renderTable2(rows, io);
+function renderDetail(rows, io, bin) {
+  renderTable2(rows, io, bin);
   for (const r of rows) {
     io.stdout(`
 ${r.id} \u2014 ${r.title}
@@ -4948,12 +4605,12 @@ async function runToolList(opts, io) {
     io.stdout(`${JSON.stringify(rows, null, 2)}
 `);
   } else {
-    renderTable2(rows, io);
+    renderTable2(rows, io, opts.bin);
   }
   return 0;
 }
-function unknownTool(name, io) {
-  io.stderr(`oh tool: unknown tool "${name}"
+function unknownTool(name, io, bin) {
+  io.stderr(`${bin} tool: unknown tool "${name}"
 
 `);
   io.stderr(`Known tools:
@@ -4967,14 +4624,14 @@ async function runToolStatus(name, opts, io) {
   let only;
   if (name !== void 0) {
     only = findTool(name);
-    if (!only) return unknownTool(name, io);
+    if (!only) return unknownTool(name, io, opts.bin);
   }
   const rows = await collectRows(root, run, opts.env, only ? [only] : void 0);
   if (opts.json) {
     io.stdout(`${JSON.stringify(only ? rows[0] : rows, null, 2)}
 `);
   } else {
-    renderDetail(rows, io);
+    renderDetail(rows, io, opts.bin);
   }
   return 0;
 }
@@ -4995,12 +4652,12 @@ async function runToolInstall(name, opts, io) {
   const run = opts.run ?? spawnRunner;
   const root = resolveProjectRoot(opts.cwd);
   const entry = findTool(name);
-  if (!entry) return unknownTool(name, io);
+  if (!entry) return unknownTool(name, io, opts.bin);
   if (entry.installArgv === void 0) {
-    io.stderr(`oh tool: ${entry.id} cannot be installed by this command.
+    io.stderr(`${opts.bin} tool: ${entry.id} cannot be installed by this command.
 
 `);
-    io.stderr(`${entry.notInstallableReason ?? ""}
+    io.stderr(`${entry.notInstallableReason?.(opts.bin) ?? ""}
 
 `);
     io.stderr(`Installable tools:
@@ -5021,8 +4678,8 @@ ${installableToolIds().map((t) => `  ${t}`).join("\n")}
   }
   if (!isReachable2(status)) {
     io.stderr(
-      `oh tool: the sandbox is not running (${status}).
-Start it with \`oh sandbox\`, then re-run this command.
+      `${opts.bin} tool: the sandbox is not running (${status}).
+Start it with \`${opts.bin} sandbox\`, then re-run this command.
 `
     );
     return 1;
@@ -5046,7 +4703,7 @@ Start it with \`oh sandbox\`, then re-run this command.
     stdio: "inherit"
   });
   if (r.exitCode !== 0) {
-    io.stderr(`oh tool: installing ${entry.id} failed (exit ${r.exitCode}).
+    io.stderr(`${opts.bin} tool: installing ${entry.id} failed (exit ${r.exitCode}).
 `);
     return r.exitCode;
   }
@@ -5119,7 +4776,7 @@ function fetchRemoteSource(opts) {
 }
 
 // src/cli.ts
-var VERSION = true ? "0.10.0" : "0.0.0-dev";
+var VERSION = true ? "0.11.0" : "0.0.0-dev";
 var DEFAULT_SOURCE_OH_DIR = resolve10(
   dirname8(fileURLToPath(import.meta.url)),
   "../.."
@@ -5163,7 +4820,6 @@ Usage:
   ${bin} harness <args...>      Install and inspect agent CLI harnesses
   ${bin} tool <args...>         Install and inspect sandbox tooling
   ${bin} gateway <args...>      Manage a messaging client session (pi|hermes)
-  ${bin} cloud <args...>        Manage OpenHarness Cloud nodes
   ${bin} --version              Print version
   ${bin} --help                 Show this help
 
@@ -5176,7 +4832,7 @@ function printConfigHelp(bin = LEGACY_PRODUCT.bin) {
 
 Usage:
   ${bin} config show [--sandbox <name>]
-  ${bin} config set <field> <value> [--sandbox <name>]
+  ${bin} config set <field> <value> [--sandbox <name>] [--force]
   ${bin} config repo                  Create your own GitHub repo and point origin at it
   ${bin} config <integration>         Run an integration wizard
   ${bin} config <integration> --help
@@ -5187,6 +4843,10 @@ change with \`${bin} stop <name> && ${bin} sandbox install docker --name <name>\
 reference:
 ${sourceDocsUrl("docs/configuration.md")}
 
+\`${bin} config set storage.homePath <dir>\` refuses the change when the sandbox's named
+volume already exists, because the next start would orphan every file in it. Pass
+--force to change it anyway.
+
 Fields:
 ${configFieldList()}
 
@@ -5287,24 +4947,34 @@ function printSandboxHelp(bin = LEGACY_PRODUCT.bin) {
   process.stdout.write(`${bin} sandbox \u2014 Create and list sandboxes
 
 Usage:
-  ${bin} sandbox install <runtime> [--name <name>] [--repo <dir>] [--yes]
+  ${bin} sandbox install <runtime> [--name <name>] [--checkout <dir>]
+                               [--home-mount <dir>] [--yes]
                                [--image[=<ref>]] [--no-build] [--print-argv]
   ${bin} sandbox list [--json]
 
 \`install\` writes a sandbox entry under \${${stateNames(bin).envPrefix}HOME:-~/${stateNames(bin).userStateDir}}/sandboxes/<name>/,
 materialises the compose files and the compose wrapper into it, then starts the
 container. It needs no project checkout and runs from any directory. Without
---repo the sandbox runs the prebuilt image; with --repo <dir> that checkout is
-bound at /home/sandbox/harness and can be built locally.
+--checkout the sandbox runs the prebuilt image; with --checkout <dir> that
+checkout is bound at /home/sandbox/harness; the sandbox builds locally only
+when that directory holds .devcontainer/Dockerfile.
 
 On a terminal without --yes it asks for the sandbox name, the timezone, the git
-identity, SSH (with its host port), and the host Docker socket. With --repo it
-seeds those answers from that checkout's ${stateNames(bin).configFile}.
+identity, SSH (with its host port), the host Docker socket, and the host path
+for /home/sandbox. With --checkout it seeds those answers from that
+checkout's ${stateNames(bin).configFile}.
 
 Flags:
   --name <name>    Registry entry name (default: the lowest free ${DEFAULT_NAME_PREFIX}<n>)
-  --repo <dir>     Bind this checkout into the sandbox and seed the defaults
-                   from its ${stateNames(bin).configFile}
+  --checkout <dir> Bind this checkout into the sandbox and seed the defaults
+                   from its ${stateNames(bin).configFile}. The sandbox builds
+                   locally only when that directory holds
+                   .devcontainer/Dockerfile
+  --repo <dir>     Deprecated alias for --checkout
+  --home-mount <dir>
+                   Bind this host directory at /home/sandbox instead of the
+                   Docker-managed volume. Relative paths resolve against the
+                   working directory. The directory is created when absent
   --yes            Non-interactive: keep every default and ask nothing
   --image[=<ref>]  Run the prebuilt image instead of building (implies
                    --no-build). Ref resolves last-wins: --image=<ref> >
@@ -5482,11 +5152,13 @@ var CONFIG_VERBS = ["show", "set", "repo"];
 function parseConfigArgs(input, bin = LEGACY_PRODUCT.bin) {
   const scoped = extractSandboxFlag(`${bin} config`, input);
   if (!scoped.ok) return scoped;
-  const rest = scoped.args.rest;
+  const forced = scoped.args.rest.includes("--force");
+  const rest = scoped.args.rest.filter((arg) => arg !== "--force");
   const args = {
     help: false,
     integrationHelp: false,
-    ...scoped.args.sandbox === void 0 ? {} : { sandbox: scoped.args.sandbox }
+    ...scoped.args.sandbox === void 0 ? {} : { sandbox: scoped.args.sandbox },
+    ...forced ? { force: true } : {}
   };
   if (rest.length === 0 || isHelpFlag(rest[0])) {
     return { ok: true, args: { ...args, help: true } };
@@ -5673,7 +5345,9 @@ function parseUpdateArgs(rest, bin = LEGACY_PRODUCT.bin) {
 }
 var SANDBOX_VALUE_FLAGS = {
   "--name": "name",
-  "--repo": "repo"
+  "--checkout": "checkout",
+  "--repo": "checkout",
+  "--home-mount": "homeMount"
 };
 function parseSandboxArgs(rest, bin = LEGACY_PRODUCT.bin) {
   const args = {
@@ -5698,6 +5372,7 @@ function parseSandboxArgs(rest, bin = LEGACY_PRODUCT.bin) {
   args.subcommand = head;
   if (isHelpFlag(tail[0])) return { ok: true, args: { ...args, help: true } };
   const positionals = [];
+  const checkoutSpellings = /* @__PURE__ */ new Set();
   for (let i = 0; i < tail.length; i++) {
     const token = tail[i];
     const valueFlag = SANDBOX_VALUE_FLAGS[token];
@@ -5706,6 +5381,7 @@ function parseSandboxArgs(rest, bin = LEGACY_PRODUCT.bin) {
       if (value === void 0) {
         return { ok: false, error: `${bin} sandbox ${head}: ${token} requires a value` };
       }
+      if (valueFlag === "checkout") checkoutSpellings.add(token);
       args[valueFlag] = value;
       i++;
     } else if (token === "--yes") {
@@ -5731,6 +5407,12 @@ function parseSandboxArgs(rest, bin = LEGACY_PRODUCT.bin) {
       positionals.push(token);
     }
   }
+  if (checkoutSpellings.has("--checkout") && checkoutSpellings.has("--repo")) {
+    return {
+      ok: false,
+      error: `${bin} sandbox ${head}: --checkout conflicts with --repo \u2014 pass exactly one, and prefer --checkout`
+    };
+  }
   if (head === "list") {
     if (positionals.length > 0) {
       return { ok: false, error: `${bin} sandbox list: unexpected argument "${positionals[0]}"` };
@@ -5843,11 +5525,11 @@ function parseGatewayArgs(rest) {
   }
   return { ok: true, args: { help: false, passthrough: [...rest] } };
 }
-function bundledPayloadExists(bundled, exists = existsSync17) {
-  return exists(join11(bundled.sourceOhDir, "manifest.json"));
+function bundledPayloadExists(bundled, exists = existsSync16) {
+  return exists(join10(bundled.sourceOhDir, "manifest.json"));
 }
 function resolveUpdateSource(args, bundled, bin = LEGACY_PRODUCT.bin) {
-  const exists = bundled.exists ?? existsSync17;
+  const exists = bundled.exists ?? existsSync16;
   if (args.fromDir !== void 0) {
     return { kind: "local", fromDir: resolve10(args.fromDir) };
   }
@@ -5867,7 +5549,7 @@ function resolveUpdateSource(args, bundled, bin = LEGACY_PRODUCT.bin) {
 function readPayloadVersion(checkoutDir) {
   try {
     const parsed = JSON.parse(
-      readFileSync12(join11(resolveControlDir(checkoutDir).path, "cli", "package.json"), "utf8")
+      readFileSync11(join10(resolveControlDir(checkoutDir).path, "cli", "package.json"), "utf8")
     );
     if (parsed && typeof parsed.version === "string") return parsed.version;
   } catch {
@@ -5876,7 +5558,7 @@ function readPayloadVersion(checkoutDir) {
 }
 async function runWithRemoteSource(hooks, fn) {
   const fetch2 = hooks.fetch ?? fetchRemoteSource;
-  const mkdtemp = hooks.mkdtemp ?? (() => mkdtempSync3(join11(tmpdir3(), "oh-remote-")));
+  const mkdtemp = hooks.mkdtemp ?? (() => mkdtempSync3(join10(tmpdir3(), "oh-remote-")));
   const rm = hooks.rm ?? ((dir) => rmSync3(dir, { recursive: true, force: true }));
   const out = hooks.stdout ?? ((s) => process.stdout.write(s));
   const checkoutDir = mkdtemp();
@@ -5920,9 +5602,13 @@ async function main(argv) {
         stdout: (s) => process.stdout.write(s),
         stderr: (s) => process.stderr.write(s)
       };
-      const scope = a.sandbox === void 0 ? {} : { sandbox: a.sandbox };
+      const scope = {
+        bin,
+        ...a.sandbox === void 0 ? {} : { sandbox: a.sandbox },
+        ...a.force === true ? { force: true } : {}
+      };
       if (a.verb === "show") return await runConfigShow(scope, io);
-      if (a.verb === "repo") return await runConfigRepo({}, io);
+      if (a.verb === "repo") return await runConfigRepo({ bin }, io);
       return await runConfigSet(a.key, a.value, scope, io);
     }
     const name = a.integration;
@@ -5957,7 +5643,7 @@ async function main(argv) {
       stdout: (s) => process.stdout.write(s),
       stderr: (s) => process.stderr.write(s)
     };
-    const scope = a.sandbox === void 0 ? {} : { sandbox: a.sandbox };
+    const scope = a.sandbox === void 0 ? { bin } : { bin, sandbox: a.sandbox };
     if (a.verb === "list") return await runSecretList(scope, io);
     return await runSecretSet(a.key, scope, io);
   }
@@ -6002,12 +5688,12 @@ async function main(argv) {
     const targetDir = process.cwd();
     const source = resolveUpdateSource(parsed.args, { sourceOhDir: DEFAULT_SOURCE_OH_DIR }, bin);
     if (source.kind === "local") {
-      return await runUpdate({ targetDir, fromDir: source.fromDir, force, dryRun }, io);
+      return await runUpdate({ bin, targetDir, fromDir: source.fromDir, force, dryRun }, io);
     }
     if (source.notice) process.stdout.write(source.notice);
     return await runWithRemoteSource(
       { ref: source.ref },
-      (checkoutDir) => runUpdate({ targetDir, fromDir: checkoutDir, force, dryRun }, io)
+      (checkoutDir) => runUpdate({ bin, targetDir, fromDir: checkoutDir, force, dryRun }, io)
     );
   }
   if (first === "sandbox") {
@@ -6024,12 +5710,14 @@ async function main(argv) {
       return a.subcommand === void 0 ? 1 : 0;
     }
     const io = lifecycleIo();
-    if (a.subcommand === "list") return await runSandboxList({ json: a.json }, io);
+    if (a.subcommand === "list") return await runSandboxList({ bin, json: a.json }, io);
     return await runSandboxInstall(
       {
+        bin,
         runtime: a.runtime,
         ...a.name !== void 0 ? { name: a.name } : {},
-        ...a.repo !== void 0 ? { repo: a.repo } : {},
+        ...a.checkout !== void 0 ? { checkout: a.checkout } : {},
+        ...a.homeMount !== void 0 ? { homeMount: a.homeMount } : {},
         yes: a.yes,
         image: a.image,
         ...a.imageRef !== void 0 ? { imageRef: a.imageRef } : {},
@@ -6051,7 +5739,7 @@ async function main(argv) {
       return 0;
     }
     return runShell(
-      parsed.args.name === void 0 ? {} : { name: parsed.args.name },
+      parsed.args.name === void 0 ? { bin } : { bin, name: parsed.args.name },
       lifecycleIo()
     );
   }
@@ -6068,6 +5756,7 @@ async function main(argv) {
     }
     return await runDestroy(
       {
+        bin,
         yes: parsed.args.yes,
         ...parsed.args.name !== void 0 ? { name: parsed.args.name } : {}
       },
@@ -6086,7 +5775,7 @@ async function main(argv) {
       printComposeHelp(bin);
       return 0;
     }
-    return runComposeConfig({}, parsed.args.passthrough);
+    return runComposeConfig({ bin }, parsed.args.passthrough);
   }
   if (composeVerbs().includes(first)) {
     const verb = first;
@@ -6110,7 +5799,7 @@ async function main(argv) {
       );
       return 1;
     }
-    return runComposeVerb(verb, head.length === 0 ? {} : { name: head[0] }, extra);
+    return runComposeVerb(verb, head.length === 0 ? { bin } : { bin, name: head[0] }, extra);
   }
   if (first === "harness") {
     const parsed = parseHarnessArgs(argv.slice(1), bin);
@@ -6130,12 +5819,12 @@ async function main(argv) {
       stderr: (s) => process.stderr.write(s)
     };
     if (a.subcommand === "list") {
-      return await runHarnessList({ json: a.json }, io);
+      return await runHarnessList({ bin, json: a.json }, io);
     }
     if (a.subcommand === "status") {
-      return await runHarnessStatus(a.name, { json: a.json }, io);
+      return await runHarnessStatus(a.name, { bin, json: a.json }, io);
     }
-    return await runHarnessInstall(a.name, {}, io);
+    return await runHarnessInstall(a.name, { bin }, io);
   }
   if (first === "tool") {
     const parsed = parseToolArgs(argv.slice(1), bin);
@@ -6155,18 +5844,12 @@ async function main(argv) {
       stderr: (s) => process.stderr.write(s)
     };
     if (a.subcommand === "list") {
-      return await runToolList({ json: a.json }, io);
+      return await runToolList({ bin, json: a.json }, io);
     }
     if (a.subcommand === "status") {
-      return await runToolStatus(a.name, { json: a.json }, io);
+      return await runToolStatus(a.name, { bin, json: a.json }, io);
     }
-    return await runToolInstall(a.name, { yes: a.yes }, io);
-  }
-  if (first === "cloud") {
-    return await runCloud(argv.slice(1), {
-      stdout: (s) => process.stdout.write(s),
-      stderr: (s) => process.stderr.write(s)
-    });
+    return await runToolInstall(a.name, { bin, yes: a.yes }, io);
   }
   if (first === "gateway") {
     const parsed = parseGatewayArgs(argv.slice(1));
@@ -6179,7 +5862,7 @@ async function main(argv) {
       printGatewayHelp(bin);
       return 0;
     }
-    return runGateway(parsed.args.passthrough, {});
+    return runGateway(parsed.args.passthrough, { bin });
   }
   process.stderr.write(`${bin}: unknown command "${first}"