@pleri/olam-cli 0.1.142 → 0.1.144

package/dist/index.js

@@ -3,12 +3,6 @@ var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
-  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
-}) : x)(function(x) {
-  if (typeof require !== "undefined") return require.apply(this, arguments);
-  throw Error('Dynamic require of "' + x + '" is not supported');
-});
 var __esm = (fn, res) => function __init() {
   return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
 };
@@ -8933,7 +8927,7 @@ function carryUncommittedEdits(repos, workspacePath, deps = {}) {
   const exec = deps.exec ?? ((cmd, args, opts) => execFileSync4(cmd, args, opts));
   const homedir36 = deps.homedir ?? (() => os9.homedir());
   const existsSync64 = deps.existsSync ?? ((p) => fs15.existsSync(p));
-  const copyFileSync9 = deps.copyFileSync ?? ((src, dest) => fs15.copyFileSync(src, dest));
+  const copyFileSync8 = deps.copyFileSync ?? ((src, dest) => fs15.copyFileSync(src, dest));
   const mkdirSync36 = deps.mkdirSync ?? ((dirPath, opts) => {
     fs15.mkdirSync(dirPath, opts);
   });
@@ -9009,7 +9003,7 @@ function carryUncommittedEdits(repos, workspacePath, deps = {}) {
         continue;
       try {
         mkdirSync36(path16.dirname(dest), { recursive: true });
-        copyFileSync9(src, dest);
+        copyFileSync8(src, dest);
       } catch (err) {
         const msg = err instanceof Error ? err.message : String(err);
         console.warn(`[carry] ${plan.name}: copy untracked ${rel} failed: ${msg}`);
@@ -9056,125 +9050,103 @@ ${stderr.trim()}` : "";
   }
 });
 
+// ../core/dist/world/templates/_generated.js
+var GH_PR_CREATE, LANE_ORCHESTRATION, WORLD_CLAUDE_MD;
+var init_generated = __esm({
+  "../core/dist/world/templates/_generated.js"() {
+    "use strict";
+    GH_PR_CREATE = '# Creating PRs from inside an Olam world\n\n## The problem\n\nCalling `gh pr create` directly inside an Olam container **hangs forever** on a\nTTY confirmation prompt that the agent cannot answer. This is a known, reproduced issue.\n\n## The fix\n\nAlways use this exact pattern:\n\n```bash\necho y | timeout 30 gh pr create \\\n  --base main \\\n  --head <branch> \\\n  --title "<title>" \\\n  --body-file /tmp/pr-body.md\n```\n\n## Why each part matters\n\n- **`echo y |`** \u2014 answers the "Submit?" confirmation prompt up front so `gh` never pauses.\n- **`timeout 30`** \u2014 hard deadline. If `gh` hangs anyway, the command exits non-zero so the\n  agent can react instead of stalling the world indefinitely.\n- **`--body-file /tmp/pr-body.md`** \u2014 write the PR body to a temp file first. Avoids\n  shell-escaping bugs that occur with `--body "..."` for long or multi-line bodies.\n- **`--head` and `--base` explicitly** \u2014 removes all interactive prompts; `gh` has nothing to ask.\n\n## Troubleshooting\n\n**"no commits" or "branch not found" error:**\n\n```bash\ngit push -u origin <branch>\n# then retry:\necho y | timeout 30 gh pr create --base main --head <branch> --title "..." --body-file /tmp/pr-body.md\n```\n\n**Timeout exceeded (command exits 124):**\n\n- Check if the branch was pushed: `git log origin/<branch> --oneline -1`\n- Check GitHub CLI auth: `gh auth status`\n- Retry once; if it hangs again, open the PR via the GitHub web UI.\n';
+    LANE_ORCHESTRATION = '# Lane Orchestration\n\nOlam worlds support parallel work via **lanes** \u2014 independent Claude Code sessions\nrunning in isolated git worktrees inside the same container.\n\nUse lanes when a task has 2+ independent scopes that can work simultaneously\nwithout file conflicts.\n\n## Container API\n\nBase URL: `http://localhost:8080`\n\n### Create a lane\n\n```bash\ncurl -s -X POST \\\n  -H \'Content-Type: application/json\' \\\n  -d \'{"name":"auth-fix","task":"Fix auth bugs","scope":["src/auth/**"],"avoids":["tests/**"]}\' \\\n  http://localhost:8080/lanes/create\n```\n\n### List lanes\n\n```bash\ncurl -s http://localhost:8080/lanes\n```\n\n### Dispatch a prompt to a lane\n\n```bash\ncurl -s -X POST \\\n  -H \'Content-Type: application/json\' \\\n  -d \'{"prompt":"Start by reviewing..."}\' \\\n  http://localhost:8080/lanes/auth-fix/dispatch\n```\n\n### Check lane status\n\n```bash\ncurl -s http://localhost:8080/lanes/auth-fix\n```\n\n### Merge a lane\n\n```bash\ncurl -s -X POST http://localhost:8080/lanes/auth-fix/merge\n```\n\n### Destroy a lane\n\n```bash\ncurl -s -X DELETE http://localhost:8080/lanes/auth-fix\n```\n\n## When to use lanes\n\n- Task has 2+ independent scopes (different directories/modules)\n- Work can be done simultaneously without file conflicts\n- Estimated effort > ~30 tool calls per scope\n\n## When NOT to use lanes\n\n- Simple tasks touching few files\n- Sequential work where each step depends on the previous\n- Everything is in one directory\n\n## Orchestration workflow\n\n1. Analyze the task \u2014 identify independent work streams\n2. Create lanes with non-overlapping scope globs\n3. Dispatch initial prompts to each lane\n4. **Monitor progress** \u2014 poll lane status every 30 seconds:\n   ```bash\n   while true; do\n     STATUS=$(curl -s http://localhost:8080/lanes)\n     RUNNING=$(echo "$STATUS" | jq \'[.lanes[] | select(.status == "running")] | length\')\n     echo "Running lanes: $RUNNING"\n     if [ "$RUNNING" = "0" ]; then echo "All lanes complete!"; break; fi\n     sleep 30\n   done\n   ```\n5. **When a lane completes** (status is "completed" or no longer "running"):\n   - Check its output: `curl -s http://localhost:8080/lanes/<name>`\n   - If satisfactory, merge it: `curl -s -X POST http://localhost:8080/lanes/<name>/merge`\n   - The merge automatically triggers a Codex adversarial review\n6. **After ALL lanes are merged**:\n   - Run tests: `npm test` or equivalent\n   - Review combined changes: `git diff main...HEAD --stat`\n   - Create a PR: see `~/.olam/docs/gh-pr-create.md`\n7. Clean up: `curl -s -X DELETE http://localhost:8080/lanes/<name>`\n\n## Act on completion immediately\n\nWhen all lanes are done, immediately start merging and creating the PR.\nDo not wait for the user to tell you to merge. The workflow is:\n**lanes complete \u2192 merge each \u2192 run tests \u2192 create PR \u2192 report to user.**\n';
+    WORLD_CLAUDE_MD = '# Olam World: {{worldName}}\n\n{{taskBlock}}\n\n## Environment\n- World ID: {{worldId}}\n- Branch: {{branch}}{{servicesLine}}{{pleriPlaneLine}}\n\n## Repos in this World\n{{reposList}}\n\n{{planFileBlock}}## Instructions\n1. Work on the task described above\n2. Write tests first (TDD)\n3. Commit frequently to the world branch\n4. When done, push and the work will be available for review\n5. Your `AskUserQuestion` calls are intercepted and surfaced to the operator\'s host CP automatically. The operator answers in the SPA; claude resumes when keys are injected.\n\n## Sandbox & network \u2014 what is actually true\n\nThe olam-devbox container has FULL outbound internet. Confirm any time:\n\n```bash\ncurl -sI https://registry.npmjs.org/  # \u2192 HTTP 200\ncurl -sI https://github.com/         # \u2192 HTTP 200\n```\n\nRules:\n\n- **Never claim "the sandbox blocks X" without proving it.** Capture the actual `npm install` / `curl` error verbatim. A flaky postinstall is not a network block.\n- **Retry transient failures at least once** before falling back to a manual workaround. `npm install <pkg>` flakes happen; one retry catches >90%.\n- **If you genuinely need a workaround**, say so explicitly with the error message and the retry count, NOT "sandbox network blocked it." Truthful attribution = trustable telemetry.\n- **Playwright `chromium` downloads ~140 MB** from playwright.azureedge.net. Disk-space failures (not network) are the usual cause. Check `df -h` before blaming the network.\n\n## Halt semantics \u2014 when to stop and surface\n\nStop and call `AskUserQuestion` (which surfaces in the host CP) when you hit:\n\n- **Halt-N (new pattern)**: a new dep family, framework, or architectural pattern not in the existing codebase. Don\'t silently adopt it \u2014 surface the choice.\n- **Halt-B (business deal-breaker)**: a breaking constraint that makes the task\'s goal unsatisfiable as stated. Surface the conflict; let the operator re-scope.\n- **Halt-C (complexity blowup)**: the diff is exceeding 1.5x of what the task implied. Surface for re-scoping before continuing.\n\nDon\'t halt on every uncertainty \u2014 only on these three classes. Style/naming/error-handling choices are non-load-bearing; pick the simplest option that works and continue.\n\n## Lane Orchestration (advanced \u2014 read on demand)\n\nThis world supports parallel work lanes via the container API at http://localhost:8080.\nUse only when the task has 2+ independent scopes that can run simultaneously.\n\n**Full lane API + workflow**: see `~/.olam/docs/lane-orchestration.md` (mounted into the world).\n\n## Creating PRs from inside this world\n\n`gh pr create` hangs on a TTY prompt inside the container. Always use:\n\n```bash\necho y | timeout 30 gh pr create --base main --head <branch> --title "..." --body-file /tmp/pr-body.md\n```\n\n**Why + full troubleshooting**: see `~/.olam/docs/gh-pr-create.md`.\n\n## Available Skills & Plugins\n\nYour Claude Code session includes the invoker\'s plugins, rules, and skills.\nThese are copied from the host at world creation time.\nUse `/codex:review` or `/codex:adversarial-review` for code reviews.\nUse `/codex:rescue` to delegate tasks to Codex.\n{{extraContextBlock}}';
+  }
+});
+
 // ../core/dist/world/context-injection.js
 import * as fs16 from "node:fs";
 import * as path17 from "node:path";
-import { fileURLToPath as fileURLToPath3 } from "node:url";
 function injectWorldContext(opts) {
-  const { world, task, linearTicketId, claudeMdExtra, taskContext, services, pleriPlaneUrl } = opts;
+  const { world } = opts;
   const claudeDir = path17.join(world.workspacePath, ".claude");
   fs16.mkdirSync(claudeDir, { recursive: true });
-  const sections = [];
-  sections.push(`# Olam World: ${world.name}`);
-  sections.push("");
+  const content = WORLD_CLAUDE_MD.replace("{{worldName}}", world.name).replace("{{worldId}}", world.id).replace("{{branch}}", world.branch).replace("{{taskBlock}}", buildTaskBlock(opts)).replace("{{reposList}}", buildReposList(world)).replace("{{servicesLine}}", buildServicesLine(opts.services)).replace("{{pleriPlaneLine}}", buildPleriPlaneLine(opts.pleriPlaneUrl)).replace("{{planFileBlock}}", buildPlanFileBlock(world)).replace("{{extraContextBlock}}", buildExtraContextBlock(opts.claudeMdExtra));
+  fs16.writeFileSync(path17.join(claudeDir, "CLAUDE.md"), content);
+  writeOlamDocs(world.workspacePath);
+}
+function buildTaskBlock(opts) {
+  const { task, linearTicketId, taskContext, world } = opts;
   if (taskContext) {
-    sections.push("## Task");
-    sections.push(`**Source:** ${formatTaskSource(taskContext)}`);
-    if (taskContext.title) {
-      sections.push(`**Title:** ${taskContext.title}`);
-    }
-    sections.push(`**Branch:** ${world.branch}`);
-    sections.push("");
+    const lines = ["## Task"];
+    lines.push(`**Source:** ${formatTaskSource(taskContext)}`);
+    if (taskContext.title)
+      lines.push(`**Title:** ${taskContext.title}`);
+    lines.push(`**Branch:** ${world.branch}`);
+    lines.push("");
     if (taskContext.description) {
-      sections.push("### Description");
-      sections.push(taskContext.description);
-      sections.push("");
+      lines.push("### Description", taskContext.description, "");
     }
     if (taskContext.acceptanceCriteria) {
-      sections.push("### Acceptance Criteria");
-      sections.push(taskContext.acceptanceCriteria);
-      sections.push("");
+      lines.push("### Acceptance Criteria", taskContext.acceptanceCriteria, "");
     }
     if (taskContext.labels && taskContext.labels.length > 0) {
-      sections.push(`### Labels`);
-      sections.push(taskContext.labels.join(", "));
-      sections.push("");
+      lines.push("### Labels", taskContext.labels.join(", "), "");
     }
     if (taskContext.assignee) {
-      sections.push(`### Assignee`);
-      sections.push(taskContext.assignee);
-      sections.push("");
-    }
-  } else if (task) {
-    sections.push("## Task");
-    sections.push(task);
-    sections.push("");
-  }
-  if (linearTicketId && !taskContext) {
-    sections.push("## Linear Ticket");
-    sections.push(`- ID: ${linearTicketId}`);
-    sections.push("- (Fetch full details with Linear MCP tools)");
-    sections.push("");
-  }
-  sections.push("## Environment");
-  sections.push(`- World ID: ${world.id}`);
-  sections.push(`- Branch: ${world.branch}`);
-  if (services && services.length > 0) {
-    const svcList = services.map((s) => `${s.name} (${s.port})`).join(", ");
-    sections.push(`- Services: ${svcList}`);
-  }
-  if (pleriPlaneUrl) {
-    sections.push(`- Pleri Plane: ${pleriPlaneUrl}`);
-  }
-  sections.push("");
-  sections.push("## Repos in this World");
-  for (const repoName of world.repos) {
-    sections.push(`- \`${repoName}\` \u2192 \`/home/olam/workspace/${repoName}\``);
-  }
-  sections.push("");
-  if (hasPlanFile(world)) {
-    sections.push("## Plan");
-    sections.push("A plan file has been provided at `docs/plans/`. Review it before starting work.");
-    sections.push("");
-  }
-  sections.push("## Instructions");
-  sections.push("1. Work on the task described above");
-  sections.push("2. Write tests first (TDD)");
-  sections.push("3. Commit frequently to the world branch");
-  sections.push("4. When done, push and the work will be available for review");
-  sections.push("5. Your `AskUserQuestion` calls are intercepted and surfaced to the operator's host CP automatically. The operator answers in the SPA; claude resumes when keys are injected.");
-  sections.push("");
-  sections.push("## Lane Orchestration (advanced \u2014 read on demand)");
-  sections.push("");
-  sections.push("This world supports parallel work lanes via the container API at http://localhost:8080.");
-  sections.push("Use only when the task has 2+ independent scopes that can run simultaneously.");
-  sections.push("");
-  sections.push("**Full lane API + workflow**: see `~/.olam/docs/lane-orchestration.md` (mounted into the world).");
-  sections.push("");
-  sections.push("## Creating PRs from inside this world");
-  sections.push("");
-  sections.push("`gh pr create` hangs on a TTY prompt inside the container. Always use:");
-  sections.push("");
-  sections.push("```bash");
-  sections.push('echo y | timeout 30 gh pr create --base main --head <branch> --title "..." --body-file /tmp/pr-body.md');
-  sections.push("```");
-  sections.push("");
-  sections.push("**Why + full troubleshooting**: see `~/.olam/docs/gh-pr-create.md`.");
-  sections.push("");
-  sections.push("## Available Skills & Plugins");
-  sections.push("");
-  sections.push("Your Claude Code session includes the invoker's plugins, rules, and skills.");
-  sections.push("These are copied from the host at world creation time.");
-  sections.push("Use `/codex:review` or `/codex:adversarial-review` for code reviews.");
-  sections.push("Use `/codex:rescue` to delegate tasks to Codex.");
-  sections.push("");
-  if (claudeMdExtra) {
-    sections.push("## Additional Context");
-    sections.push(claudeMdExtra);
-    sections.push("");
-  }
-  const content = sections.join("\n");
-  fs16.writeFileSync(path17.join(claudeDir, "CLAUDE.md"), content);
-  writeOlamDocs(world.workspacePath);
+      lines.push("### Assignee", taskContext.assignee, "");
+    }
+    return lines.join("\n").trimEnd();
+  }
+  if (task) {
+    return `## Task
+${task}`;
+  }
+  if (linearTicketId) {
+    return [
+      "## Linear Ticket",
+      `- ID: ${linearTicketId}`,
+      "- (Fetch full details with Linear MCP tools)"
+    ].join("\n");
+  }
+  return "## Task\n_(no task description provided)_";
+}
+function buildReposList(world) {
+  return world.repos.map((repoName) => `- \`${repoName}\` \u2192 \`/home/olam/workspace/${repoName}\``).join("\n");
+}
+function buildServicesLine(services) {
+  if (!services || services.length === 0)
+    return "";
+  const svcList = services.map((s) => `${s.name} (${s.port})`).join(", ");
+  return `
+- Services: ${svcList}`;
+}
+function buildPleriPlaneLine(pleriPlaneUrl) {
+  if (!pleriPlaneUrl)
+    return "";
+  return `
+- Pleri Plane: ${pleriPlaneUrl}`;
+}
+function buildPlanFileBlock(world) {
+  if (!hasPlanFile(world))
+    return "";
+  return [
+    "## Plan",
+    "A plan file has been provided at `docs/plans/`. Review it before starting work.",
+    "",
+    ""
+  ].join("\n");
+}
+function buildExtraContextBlock(extra) {
+  if (!extra)
+    return "";
+  return `
+
+## Additional Context
+${extra}`;
 }
 function writeOlamDocs(workspacePath) {
   const docsDir = path17.join(workspacePath, ".olam", "docs");
   fs16.mkdirSync(docsDir, { recursive: true });
-  for (const filename of ["lane-orchestration.md", "gh-pr-create.md"]) {
-    const src = path17.join(TEMPLATES_DIR, filename);
-    const dest = path17.join(docsDir, filename);
-    fs16.copyFileSync(src, dest);
-  }
+  fs16.writeFileSync(path17.join(docsDir, "gh-pr-create.md"), GH_PR_CREATE);
+  fs16.writeFileSync(path17.join(docsDir, "lane-orchestration.md"), LANE_ORCHESTRATION);
 }
 function formatTaskSource(ctx) {
   if (ctx.source === "linear" && ctx.ticketId) {
@@ -9195,11 +9167,10 @@ function hasPlanFile(world) {
     return false;
   }
 }
-var TEMPLATES_DIR;
 var init_context_injection = __esm({
   "../core/dist/world/context-injection.js"() {
     "use strict";
-    TEMPLATES_DIR = fileURLToPath3(new URL("./templates", import.meta.url));
+    init_generated();
   }
 });
 
@@ -11306,8 +11277,7 @@ ${stderr.split("\n").slice(0, 3).join(" ")}`);
     if (!olamUserPresent) {
       const imageName = (() => {
         try {
-          const { execSync: execSync14 } = __require("node:child_process");
-          return execSync14(`docker inspect ${containerName} --format '{{.Config.Image}}'`, {
+          return execSync5(`docker inspect ${containerName} --format '{{.Config.Image}}'`, {
             encoding: "utf8",
             timeout: 5e3
           }).trim() || "(unknown)";
@@ -13687,7 +13657,7 @@ var init_session_aggregator = __esm({
 import * as http from "node:http";
 import * as fs24 from "node:fs";
 import * as path26 from "node:path";
-import { fileURLToPath as fileURLToPath4 } from "node:url";
+import { fileURLToPath as fileURLToPath3 } from "node:url";
 function jsonResponse(res, data, status2 = 200) {
   res.writeHead(status2, { "Content-Type": "application/json; charset=utf-8" });
   res.end(JSON.stringify(data));
@@ -13868,7 +13838,7 @@ function findSessionInWorld(registry, sessionId) {
 }
 function createDashboardServer(opts) {
   const { port: port2, registry } = opts;
-  const thisDir = path26.dirname(fileURLToPath4(import.meta.url));
+  const thisDir = path26.dirname(fileURLToPath3(import.meta.url));
   const defaultPublicDir = path26.resolve(thisDir, "../../../control-plane/public");
   const publicDir = opts.publicDir ?? defaultPublicDir;
   let hasPublicDir = fs24.existsSync(publicDir);
@@ -15223,9 +15193,9 @@ __export(install_root_exports, {
 });
 import { existsSync as existsSync24 } from "node:fs";
 import { dirname as dirname18, join as join30, resolve as resolve10 } from "node:path";
-import { fileURLToPath as fileURLToPath5 } from "node:url";
+import { fileURLToPath as fileURLToPath4 } from "node:url";
 function installRoot(metaUrl = import.meta.url) {
-  const here3 = fileURLToPath5(metaUrl);
+  const here3 = fileURLToPath4(metaUrl);
   return resolve10(dirname18(here3), "..");
 }
 function isDevMode(env = process.env, installRootDir = installRoot()) {
@@ -25101,22 +25071,48 @@ async function runUpgradePullByDigest(deps = {}) {
     return { exitCode: EXIT_GENERIC_ERROR, summary: "socket-proxy recreate failed" };
   }
   proxySpinner.succeed("docker-socket-proxy recreated");
-  const composeSpinner = ora7("docker compose recreate host-cp").start();
+  const inspectContainer = deps.inspectContainerImpl ?? defaultInspectContainerLabels;
+  const removeContainer = deps.removeContainerImpl ?? defaultRemoveContainer;
+  const orphanCheck = inspectContainer("olam-host-cp");
+  if (!orphanCheck.ok) {
+    process.stderr.write(
+      `${pc18.red("error")} docker inspect olam-host-cp failed:
+  ${orphanCheck.stderr.split("\n").slice(0, 3).join("\n  ")}
+`
+    );
+    return { exitCode: EXIT_GENERIC_ERROR, summary: "orphan inspect failed" };
+  }
+  if (orphanCheck.exists && orphanCheck.service !== "olam-host-cp") {
+    process.stderr.write(
+      `${pc18.yellow("info")} Removing pre-rename orphan container olam-host-cp (old project=${orphanCheck.project || "<none>"}, old service=${orphanCheck.service || "<none>"})
+`
+    );
+    const rm = removeContainer("olam-host-cp");
+    if (!rm.ok) {
+      process.stderr.write(
+        `${pc18.red("error")} docker rm -f olam-host-cp failed:
+  ${rm.stderr.split("\n").slice(0, 3).join("\n  ")}
+`
+      );
+      return { exitCode: EXIT_GENERIC_ERROR, summary: "orphan cleanup failed" };
+    }
+  }
+  const composeSpinner = ora7("docker compose recreate olam-host-cp").start();
   const composeResult = composeRunner(
-    ["up", "-d", "--force-recreate", "--no-deps", "host-cp"],
+    ["up", "-d", "--force-recreate", "--no-deps", "olam-host-cp"],
     composeFile,
     buildComposeEnv(authSecret, captureGhToken())
   );
   if (!composeResult.ok) {
     composeSpinner.fail("compose recreate failed");
     process.stderr.write(
-      `${pc18.red("error")} docker compose up --force-recreate host-cp failed:
+      `${pc18.red("error")} docker compose up --force-recreate olam-host-cp failed:
   ${composeResult.stderr.split("\n").slice(0, 3).join("\n  ")}
 `
     );
     return { exitCode: EXIT_GENERIC_ERROR, summary: "compose recreate failed" };
   }
-  composeSpinner.succeed("host-cp recreated");
+  composeSpinner.succeed("olam-host-cp recreated");
   const authSpinner = ora7("recreate auth-service").start();
   const authRecreate = deps.recreateAuth ?? defaultRecreateAuthForUpgrade;
   const authResult = await authRecreate();
@@ -25205,6 +25201,37 @@ async function defaultRecreateAuthForUpgrade() {
     };
   }
 }
+function defaultInspectContainerLabels(containerName) {
+  const result = spawnSync15(
+    "docker",
+    [
+      "inspect",
+      "--format",
+      '{{index .Config.Labels "com.docker.compose.project"}}|{{index .Config.Labels "com.docker.compose.service"}}',
+      containerName
+    ],
+    { encoding: "utf-8", stdio: ["ignore", "pipe", "pipe"] }
+  );
+  const stderr = result.stderr ?? "";
+  if (result.status === 0) {
+    const [project = "", service = ""] = (result.stdout ?? "").trim().split("|");
+    return { ok: true, exists: true, project, service, stderr: "" };
+  }
+  if (/No such (object|container)/i.test(stderr)) {
+    return { ok: true, exists: false, project: "", service: "", stderr: "" };
+  }
+  if (result.status === null) {
+    return { ok: true, exists: false, project: "", service: "", stderr: "" };
+  }
+  return { ok: false, exists: false, project: "", service: "", stderr };
+}
+function defaultRemoveContainer(containerName) {
+  const result = spawnSync15("docker", ["rm", "-f", containerName], {
+    encoding: "utf-8",
+    stdio: ["ignore", "pipe", "pipe"]
+  });
+  return { ok: result.status === 0, stderr: result.stderr ?? "" };
+}
 async function handleUpgrade(opts) {
   const cwd = process.cwd();
   const rootCheck = validateRepoRoot(cwd);
@@ -25230,7 +25257,7 @@ async function handleUpgrade(opts) {
       "bash build-host-cp.sh (host-cp image)",
       "smoke (docker create + inspect)",
       "atomic 6-tag swap (canonical -> :olam-rollback; :olam-next -> canonical)",
-      "docker compose --force-recreate host-cp + AuthContainerController.start auth",
+      "docker compose --force-recreate olam-host-cp + AuthContainerController.start auth",
       "poll /api/version/status until SHAs match"
     ]
   ];
@@ -25343,9 +25370,9 @@ manually inspect images with \`docker images olam-*:olam-rollback\`.`
     printInfo("Rollback", swapResult.summary);
     const composeFile = findComposeFile();
     const authSecret = readAuthSecret2();
-    process.stdout.write(`  ${pc18.dim("docker compose recreate host-cp".padEnd(34))}`);
+    process.stdout.write(`  ${pc18.dim("docker compose recreate olam-host-cp".padEnd(34))}`);
     const composeStart = Date.now();
-    const composeResult = runCompose(["up", "-d", "--force-recreate", "--no-deps", "host-cp"], composeFile, buildComposeEnv(authSecret, captureGhToken()));
+    const composeResult = runCompose(["up", "-d", "--force-recreate", "--no-deps", "olam-host-cp"], composeFile, buildComposeEnv(authSecret, captureGhToken()));
     const composeDur = `${((Date.now() - composeStart) / 1e3).toFixed(1)}s`;
     process.stdout.write(`${composeResult.ok ? pc18.green("\u2713") : pc18.red("\u2717")} ${composeDur}
 `);
@@ -25353,7 +25380,7 @@ manually inspect images with \`docker images olam-*:olam-rollback\`.`
       printError(
         `Rollback compose recreate failed:
 ${composeResult.stderr}
-Canonical tags are at :olam-rollback (good); container restart pending. Manually: \`docker compose -f packages/host-cp/compose.yaml up -d --force-recreate host-cp\`.`
+Canonical tags are at :olam-rollback (good); container restart pending. Manually: \`docker compose -f packages/host-cp/compose.yaml up -d --force-recreate olam-host-cp\`.`
       );
       process.exitCode = 1;
       return;
@@ -27328,7 +27355,7 @@ import path46 from "node:path";
 import { createInterface as createInterface3 } from "node:readline";
 
 // src/lib/shell-rc.ts
-import { copyFileSync as copyFileSync6, existsSync as existsSync46, readFileSync as readFileSync33, renameSync as renameSync5, writeFileSync as writeFileSync21 } from "node:fs";
+import { copyFileSync as copyFileSync5, existsSync as existsSync46, readFileSync as readFileSync33, renameSync as renameSync5, writeFileSync as writeFileSync21 } from "node:fs";
 import path45 from "node:path";
 function appendIdempotent(opts) {
   const { rcPath, marker, contentLine, clock = () => /* @__PURE__ */ new Date() } = opts;
@@ -27341,7 +27368,7 @@ function appendIdempotent(opts) {
   }
   const timestamp = clock().toISOString().replace(/[:.]/g, "-");
   const backupPath = `${rcPath}.olam-bak.${timestamp}`;
-  copyFileSync6(rcPath, backupPath);
+  copyFileSync5(rcPath, backupPath);
   const separator = content.length === 0 || content.endsWith("\n") ? "" : "\n";
   const trailing = contentLine.endsWith("\n") ? "" : "\n";
   const nextContent = `${content}${separator}${contentLine}${trailing}`;
@@ -28361,8 +28388,8 @@ function registerWorldUpgrade(program2) {
 init_output();
 import { existsSync as existsSync52 } from "node:fs";
 import { dirname as dirname27, resolve as resolve13 } from "node:path";
-import { fileURLToPath as fileURLToPath6 } from "node:url";
-var here = dirname27(fileURLToPath6(import.meta.url));
+import { fileURLToPath as fileURLToPath5 } from "node:url";
+var here = dirname27(fileURLToPath5(import.meta.url));
 var BUNDLE_PATH_CANDIDATES = [
   // bundled (`dist/index.js` after bundle-cli.mjs) — sibling
   resolve13(here, "mcp-server.js"),
@@ -29116,7 +29143,7 @@ import { pathToFileURL } from "node:url";
 // src/commands/memory/_paths.ts
 import { homedir as homedir30 } from "node:os";
 import { join as join51, dirname as dirname28 } from "node:path";
-import { fileURLToPath as fileURLToPath7 } from "node:url";
+import { fileURLToPath as fileURLToPath6 } from "node:url";
 var OLAM_HOME = join51(homedir30(), ".olam");
 var OLAM_BIN_DIR = join51(OLAM_HOME, "bin");
 var III_BINARY_PATH = join51(OLAM_BIN_DIR, "iii");
@@ -29125,14 +29152,17 @@ var MEMORY_LOG_PATH = join51(OLAM_HOME, "memory-service.log");
 var MEMORY_DATA_DIR = join51(OLAM_HOME, "memory-data");
 var MEMORY_REST_PORT = 3111;
 var MEMORY_LIVEZ_URL = `http://localhost:${MEMORY_REST_PORT}/agentmemory/livez`;
-var here2 = dirname28(fileURLToPath7(import.meta.url));
+var here2 = dirname28(fileURLToPath6(import.meta.url));
 var candidates = [
-  // Workspace dev: packages/cli/src/commands/memory/_paths.ts (run via tsx) — unlikely
-  // Workspace built: packages/cli/dist/commands/memory/_paths.js → packages/cli → packages/memory-service
+  // 1. Workspace dev (built): packages/cli/dist/commands/memory/_paths.js → packages/cli → packages/memory-service
   join51(here2, "..", "..", "..", "..", "memory-service"),
-  // Bundled: dist/index.js (esbuild) → packages/cli → packages/memory-service
+  // 2a. Workspace bundled: packages/cli/dist/index.js → packages/cli → packages/memory-service
   join51(here2, "..", "..", "memory-service"),
-  // Fallback: cwd-relative
+  // 2b. Published tarball: <prefix>/node_modules/@pleri/olam-cli/dist/index.js
+  //     → <prefix>/node_modules/@pleri/olam-cli/memory-service-bundle
+  //     (copied at publish time by bundle-cli.mjs)
+  join51(here2, "..", "memory-service-bundle"),
+  // 3. CWD fallback
   join51(process.cwd(), "packages", "memory-service")
 ];
 var MEMORY_SERVICE_CANDIDATES = candidates;
@@ -29844,6 +29874,9 @@ function kgServiceStatusUrl() {
 function kgServiceBuildUrl() {
   return url("/build");
 }
+function kgServiceSavingsUrl() {
+  return url("/savings");
+}
 var KgServiceUnreachableError = class extends Error {
   cause;
   constructor(message, cause) {
@@ -29895,6 +29928,9 @@ async function status(opts = {}) {
 async function build(req, opts = {}) {
   return postJson(kgServiceBuildUrl(), req, opts.timeoutMs ?? 9e5);
 }
+async function savings(opts = {}) {
+  return getJson(kgServiceSavingsUrl(), opts.timeoutMs);
+}
 
 // src/commands/kg-build.ts
 init_output();
@@ -30567,19 +30603,26 @@ function defaultUrl(flavor) {
 function buildHookCommand(opts) {
   const url2 = opts.url ?? defaultUrl(opts.flavor);
   const extractCmd = `python3 -c "import json,sys; d=json.load(sys.stdin); print(d.get('tool_input',d).get('command',''))" 2>/dev/null`;
-  const emitContext = `python3 -c 'import json,sys
+  const emitContext = `python3 -c 'import json,sys,os
 try:
   d=json.loads(sys.stdin.read())
   if d.get("route") and d["route"] != "grep":
     label=d.get("top_match") or d.get("reason","")
-    print(json.dumps({"hookSpecificOutput":{"hookEventName":"PreToolUse","additionalContext":f"[kg-classifier L{d.get(\\"layer\\",\\"?\\")}|{d[\\"route\\"]}] {label[:160]}"}}))
+    layer=d.get("layer","?")
+    route=d["route"]
+    nodes=d.get("nodes_matched",0)
+    saved=(d.get("savings") or {}).get("saved_tokens_est",0)
+    saved_k=round(saved/1000)
+    q=os.environ.get("KG_QUERY","")[:60]
+    sys.stderr.write(f"\\x1b[32m\\u2713 KG hit\\x1b[0m  \\"{q}\\"  \\u2192  L{layer}/{route} \\u00b7 {nodes} nodes \\u00b7 ~{saved_k}k tokens saved\\n")
+    print(json.dumps({"hookSpecificOutput":{"hookEventName":"PreToolUse","additionalContext":f"[kg-classifier L{layer}|{route}] {label[:160]}"}}))
 except Exception: pass' 2>/dev/null`;
+  const curlPost = `RESP=$(curl -s --max-time 1 -X POST -H 'Content-Type: application/json' -d "{\\"q\\":\\"$(echo \\"$CMD\\" | head -c 200 | tr '\\"' ' ')\\"}" ${url2} 2>/dev/null)`;
   return [
     `KG_SENTINEL=${KG_HOOK_SENTINEL}`,
     `CMD=$(${extractCmd})`,
-    `case "$CMD" in *grep*|*rg\\ *|*ripgrep*|*find\\ *|*fd\\ *|*ack\\ *|*ag\\ *)`,
-    `RESP=$(curl -s --max-time 1 -X POST -H 'Content-Type: application/json' -d "{\\"q\\":\\"$(echo \\"$CMD\\" | head -c 200 | tr '\\"' ' ')\\"}" ${url2} 2>/dev/null)`,
-    `echo "$RESP" | ${emitContext}`,
+    `case "$CMD" in *grep*|*rg\\ *|*ripgrep*|*find\\ *|*fd\\ *|*ack\\ *|*ag\\ *) ${curlPost}`,
+    `KG_QUERY="$(echo \\"$CMD\\" | head -c 60 | tr '\\"' ' ')" echo "$RESP" | ${emitContext}`,
     `;; esac`
   ].join("; ");
 }
@@ -30752,6 +30795,67 @@ function registerKgUninstallHookCommand(kg) {
   });
 }
 
+// src/commands/kg-savings.ts
+init_output();
+function formatTokens(n) {
+  if (n >= 1e6) return `~${(n / 1e6).toFixed(1)}M`;
+  if (n >= 1e3) return `~${Math.round(n / 1e3)}k`;
+  return `~${n}`;
+}
+function renderHumanReadable(stats) {
+  if (stats.total_hits === 0) {
+    printInfo("savings", "no KG hits logged yet \u2014 run some grep/find Bash invocations to populate /kg-data/savings.jsonl");
+    return;
+  }
+  printSuccess(`KG hits: ${stats.total_hits} \xB7 estimated savings: ${formatTokens(stats.total_saved_tokens_est)} tokens`);
+  printInfo("first hit", stats.first_hit_at ?? "(unknown)");
+  printInfo("last hit", stats.last_hit_at ?? "(unknown)");
+  const layerPairs = Object.entries(stats.by_layer).map(
+    ([k, v]) => [k, v ?? 0]
+  );
+  const layers = [...layerPairs].sort((a, b) => a[0].localeCompare(b[0]));
+  if (layers.length > 0) {
+    printInfo("by layer", layers.map(([k, v]) => `L${k}=${formatTokens(v)}`).join(" \xB7 "));
+  }
+  const workspacePairs = Object.entries(
+    stats.by_workspace
+  ).map(([k, v]) => [k, v ?? 0]);
+  const workspaces = [...workspacePairs].sort((a, b) => b[1] - a[1]).slice(0, 5);
+  if (workspaces.length > 0) {
+    printInfo(
+      "top workspaces",
+      workspaces.map(([k, v]) => `${k || "(none)"}=${formatTokens(v)}`).join(" \xB7 ")
+    );
+  }
+  if (stats.parse_errors > 0) {
+    printWarning(`savings.jsonl had ${stats.parse_errors} unparseable lines (skipped)`);
+  }
+  printInfo("note", "savings are a heuristic, not a measurement. See SAVINGS_HEURISTIC in server.py for the per-layer model.");
+}
+function registerKgSavingsCommand(kg) {
+  kg.command("savings").description("Show cumulative KG-hit savings tallied by the kg-service container").option("--json", "emit raw response JSON instead of human-readable summary").action(async (opts) => {
+    let stats;
+    try {
+      stats = await savings();
+    } catch (err) {
+      if (err instanceof KgServiceUnreachableError) {
+        printError(err.message);
+        printInfo("remedy", "`olam services up` to start kg-service, then re-run");
+        process.exitCode = 3;
+        return;
+      }
+      printError(`kg-service /savings failed: ${err instanceof Error ? err.message : String(err)}`);
+      process.exitCode = 1;
+      return;
+    }
+    if (opts.json) {
+      process.stdout.write(JSON.stringify(stats, null, 2) + "\n");
+      return;
+    }
+    renderHumanReadable(stats);
+  });
+}
+
 // src/commands/kg-build.ts
 function resolveWorkspace(arg) {
   const cwd = process.cwd();
@@ -30849,6 +30953,7 @@ function registerKg(program2) {
   registerKgDoctorCommand(kg);
   registerKgInstallHookCommand(kg);
   registerKgUninstallHookCommand(kg);
+  registerKgSavingsCommand(kg);
 }
 
 // src/commands/seed.ts