@oxagen/cli 2.1.4-447 → 2.1.4-460

package/oxagen.mjs

@@ -7838,6 +7838,7 @@ function sessionScopeForEnrollment(next, previous) {
 function harnessFilesRecord(paths) {
   return {
     claude_settings: paths.claudeSettings,
+    claude_user_config: paths.claudeUserConfig,
     codex_hooks: paths.codexHooks,
     cursor_hooks: [...paths.cursorHooks],
     stella_toml: paths.stellaToml,
@@ -7852,6 +7853,9 @@ function withRecordedHarnessFiles(paths, host) {
   return {
     ...paths,
     claudeSettings,
+    // A record from before #5287 has no entry, and the host it describes
+    // never had the Oxagen MCP server written, so this process's path stands.
+    claudeUserConfig: record.claude_user_config ?? paths.claudeUserConfig,
     claudeProjects: record.claude_settings !== void 0 ? join3(dirname3(claudeSettings), "projects") : paths.claudeProjects,
     codexHooks: record.codex_hooks ?? paths.codexHooks,
     cursorHooks: record.cursor_hooks ?? paths.cursorHooks,
@@ -8022,6 +8026,8 @@ var init_host_file = __esm({
     HOST_FILE_SCHEMA = "tacho.host.v1";
     harnessFilesRecordSchema = external_exports.object({
       claude_settings: external_exports.string().min(1),
+      /** Claude Code's user config, which holds the Oxagen MCP server entry. */
+      claude_user_config: external_exports.string().min(1),
       codex_hooks: external_exports.string().min(1),
       cursor_hooks: external_exports.array(external_exports.string().min(1)),
       stella_toml: external_exports.string().min(1),
@@ -8161,6 +8167,22 @@ var init_host_file = __esm({
        * beside ours; this is the `displaced_env` of the connected tier.
        */
       displaced_mcp_servers: external_exports.record(external_exports.string(), external_exports.record(external_exports.string(), external_exports.unknown())).default({}),
+      /**
+       * When this enrollment last wrote the `oxagen` server into a wrapped
+       * harness's user MCP config, by harness (#5287). Today that is only
+       * `claude-code`. Two readers use it:
+       *
+       *   - `oxagen agent status` adds the server once to a live enrollment
+       *     made before enroll wrote it, and an entry here says it already
+       *     did. A person who later removes the server keeps it removed until
+       *     they enroll again.
+       *   - The Stop hook asks only a session that started after this time.
+       *     Claude Code loads MCP servers when a session starts, so a session
+       *     already running when the entry was written does not have the tool.
+       *
+       * Optional: a host enrolled before #5287 has none.
+       */
+      mcp_registered_at: external_exports.record(external_exports.string(), external_exports.string()).optional(),
       /**
        * Where the harness files were when this host enrolled
        * (`harnessFilesRecord`). Optional: a host enrolled before this field
@@ -9022,6 +9044,9 @@ import { join as join6 } from "node:path";
 function claudeConfigDirFor(env, home) {
   return env["CLAUDE_CONFIG_DIR"] ?? join6(home, ".claude");
 }
+function claudeUserConfigFor(env, home) {
+  return join6(env["CLAUDE_CONFIG_DIR"] ?? home, ".claude.json");
+}
 function codexHomeFor(env, home) {
   return env["CODEX_HOME"] ?? join6(home, ".codex");
 }
@@ -9044,6 +9069,7 @@ function tachoHome(env = process.env, home = homedir(), platform = process.platf
     log: join6(tachoDir, "tachod.log"),
     daemonLauncher: join6(tachoDir, "tachod.cmd"),
     claudeSettings: join6(claudeConfigDir, "settings.json"),
+    claudeUserConfig: claudeUserConfigFor(env, home),
     claudeProjects: join6(claudeConfigDir, "projects"),
     codexHooks: join6(codexHome, "hooks.json"),
     cursorHooks: cursorHooksPaths(home, platform, env),
@@ -9060,6 +9086,7 @@ function homeOf(paths) {
     log: paths.log,
     daemonLauncher: paths.daemonLauncher,
     claudeSettings: paths.claudeSettings,
+    claudeUserConfig: paths.claudeUserConfig,
     claudeProjects: paths.claudeProjects,
     codexHooks: paths.codexHooks,
     cursorHooks: paths.cursorHooks,
@@ -20367,6 +20394,304 @@ var init_backfill3 = __esm({
   }
 });
 
+// ../../packages/tacho/src/host/claude-code-mcp-writer.ts
+function mergeClaudeCodeMcpConfig(existing, config) {
+  return mergeOxagenMcpServer(existing, config, "stdio");
+}
+function stripClaudeCodeMcpConfig(existing, enrollmentId, restore = {}) {
+  return stripOxagenMcpServer(existing, enrollmentId, restore);
+}
+function claudeCodeSessionHasOxagenTools(check2) {
+  if (!check2.hasGatewayKey || check2.registeredAt === void 0) return false;
+  const registered = Date.parse(check2.registeredAt);
+  const started = Date.parse(check2.sessionStartedAt);
+  if (!Number.isFinite(registered) || !Number.isFinite(started)) return false;
+  if (started < registered) return false;
+  return oxagenMcpPresence(check2.readUserConfig(), check2.enrollmentId).present;
+}
+function claudeUserConfigShapeProblem(document) {
+  return mcpConfigShapeProblem(document);
+}
+var init_claude_code_mcp_writer = __esm({
+  "../../packages/tacho/src/host/claude-code-mcp-writer.ts"() {
+    "use strict";
+    init_mcp_config_writer();
+  }
+});
+
+// ../../packages/tacho/src/host/install-lock.ts
+import { randomBytes as randomBytes3 } from "node:crypto";
+import {
+  closeSync as closeSync3,
+  existsSync as existsSync4,
+  linkSync,
+  mkdirSync as mkdirSync4,
+  openSync as openSync3,
+  readdirSync as readdirSync5,
+  readFileSync as readFileSync5,
+  renameSync as renameSync3,
+  rmdirSync as rmdirSync3,
+  unlinkSync as unlinkSync3,
+  writeSync as writeSync2
+} from "node:fs";
+import { dirname as dirname4, join as join12 } from "node:path";
+function readLock(path2) {
+  try {
+    return readFileSync5(path2, "utf8");
+  } catch {
+    return void 0;
+  }
+}
+function holderOf(text4) {
+  try {
+    return JSON.parse(text4 ?? "");
+  } catch {
+    return {};
+  }
+}
+function removeQuietly(path2) {
+  try {
+    unlinkSync3(path2);
+  } catch {
+  }
+}
+function pidAlive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (error) {
+    return error.code === "EPERM";
+  }
+}
+function acquireInstallLock(root, now = Date.now, alive = pidAlive) {
+  const path2 = join12(root, "install.lock");
+  const created = [];
+  let dir = root;
+  while (!existsSync4(dir) && dirname4(dir) !== dir) {
+    created.unshift(dir);
+    dir = dirname4(dir);
+  }
+  mkdirSync4(root, { recursive: true, mode: 448 });
+  const token = randomBytes3(12).toString("hex");
+  const liveHolder = (holder) => typeof holder.pid === "number" && typeof holder.at === "number" && now() - holder.at < STALE_AFTER_MS && alive(holder.pid) ? holder.pid : void 0;
+  for (let attempt = 0; attempt < 2; attempt += 1) {
+    try {
+      const fd2 = openSync3(path2, "wx", 384);
+      writeSync2(fd2, JSON.stringify({ pid: process.pid, at: now(), token }));
+      closeSync3(fd2);
+      return {
+        release: () => {
+          if (holderOf(readLock(path2)).token === token) removeQuietly(path2);
+          for (const made of [...created].reverse()) {
+            try {
+              if (readdirSync5(made).length === 0) rmdirSync3(made);
+            } catch {
+            }
+          }
+        }
+      };
+    } catch (error) {
+      if (error.code !== "EEXIST") throw error;
+      const live = liveHolder(holderOf(readLock(path2)));
+      if (live !== void 0) return { heldBy: live };
+      const aside = `${path2}.${process.pid}.${token}.stale`;
+      try {
+        renameSync3(path2, aside);
+      } catch (renameError) {
+        if (renameError.code === "ENOENT") continue;
+        throw renameError;
+      }
+      const moved = liveHolder(holderOf(readLock(aside)));
+      if (moved !== void 0) {
+        try {
+          linkSync(aside, path2);
+        } catch {
+        }
+        removeQuietly(aside);
+        return { heldBy: moved };
+      }
+      removeQuietly(aside);
+    }
+  }
+  return { heldBy: -1 };
+}
+var STALE_AFTER_MS;
+var init_install_lock = __esm({
+  "../../packages/tacho/src/host/install-lock.ts"() {
+    "use strict";
+    STALE_AFTER_MS = 10 * 6e4;
+  }
+});
+
+// ../../packages/tacho/src/cli/agent-deps.ts
+function agentDeps(deps, paths) {
+  if (JSON.stringify(paths) === JSON.stringify(deps.paths)) return deps;
+  const rebound = deps.atAgent?.(paths) ?? { ...deps, paths };
+  return {
+    ...deps,
+    ...rebound,
+    paths,
+    serviceManager: deps.serviceManager,
+    out: deps.out,
+    err: deps.err
+  };
+}
+function depsForHarness(deps, harness) {
+  const agent = agentHolding(deps.paths, harness);
+  return agent === void 0 ? deps : depsForAgent(deps, agent);
+}
+function depsForAgent(deps, agent) {
+  const host = agent.host ?? readHostFileLenient(agent.paths.hostFile).salvaged;
+  return agentDeps(deps, withRecordedHarnessFiles(agent.paths, host));
+}
+var init_agent_deps = __esm({
+  "../../packages/tacho/src/cli/agent-deps.ts"() {
+    "use strict";
+    init_agents();
+    init_host_file();
+  }
+});
+
+// ../../packages/tacho/src/cli/claude-code-mcp.ts
+function canServeOxagenTools(host) {
+  return host.gateway_api_key !== void 0;
+}
+function registerClaudeCodeMcp(host, deps) {
+  const edit = deps.editClaudeUserConfig;
+  if (edit === void 0)
+    return {
+      host,
+      result: "skipped",
+      reason: "this build cannot edit Claude Code's user config",
+      displaced: false
+    };
+  if (!canServeOxagenTools(host))
+    return {
+      host,
+      result: "skipped",
+      reason: "this enrollment has no gateway key, so the collector cannot serve Oxagen's tools. Run `oxagen agent enroll --force` to enroll this machine again with one",
+      displaced: false
+    };
+  const path2 = deps.paths.claudeUserConfig;
+  const shim = host.mcp_stdio_command ?? deps.runtime.mcpStdioCommand;
+  let current = host;
+  if (current.harness_files?.claude_user_config !== path2) {
+    current = {
+      ...current,
+      harness_files: { ...current.harness_files, claude_user_config: path2 }
+    };
+    writeHostFile(deps.paths.hostFile, current);
+  }
+  let result2 = "present";
+  let displaced = false;
+  let wroteEntry = false;
+  edit((document) => {
+    const problem = claudeUserConfigShapeProblem(document);
+    if (problem !== void 0) throw new HarnessFileError(path2, problem);
+    const merged = mergeClaudeCodeMcpConfig(document, {
+      enrollmentId: current.host_enrollment_id,
+      port: current.port,
+      localToken: current.local_token,
+      shimCommand: shim[0],
+      shimArgs: shim.slice(1, -1),
+      ...deps.env["TACHO_HOME"] !== void 0 ? { tachoHome: deps.env["TACHO_HOME"] } : {}
+    });
+    if (!merged.changed) return void 0;
+    if (Object.keys(merged.displaced).length > 0) {
+      displaced = true;
+      current = {
+        ...current,
+        displaced_mcp_servers: {
+          ...current.displaced_mcp_servers,
+          [HARNESS]: {
+            ...current.displaced_mcp_servers[HARNESS],
+            // The server the person put under the name most recently wins:
+            // one there now replaced whatever an earlier run moved aside.
+            ...merged.displaced
+          }
+        }
+      };
+      writeHostFile(deps.paths.hostFile, current);
+    }
+    result2 = "written";
+    wroteEntry = true;
+    return merged.config;
+  });
+  if (wroteEntry || current.mcp_registered_at?.[HARNESS] === void 0) {
+    current = {
+      ...current,
+      mcp_registered_at: {
+        ...current.mcp_registered_at,
+        [HARNESS]: new Date(deps.now()).toISOString()
+      }
+    };
+    writeHostFile(deps.paths.hostFile, current);
+  }
+  return { host: current, result: result2, displaced };
+}
+function needsClaudeCodeMcp(host) {
+  return host.revoked_at === null && host.harnesses.includes(HARNESS) && canServeOxagenTools(host) && host.mcp_registered_at?.[HARNESS] === void 0;
+}
+function addMissingClaudeCodeMcp(deps) {
+  if (deps.editClaudeUserConfig === void 0) return [];
+  const pending = listAgents(deps.paths).filter(
+    (agent) => agentIsLive(agent) && needsClaudeCodeMcp(agent.host)
+  );
+  if (pending.length === 0) return [];
+  const lock = acquireInstallLock(deps.paths.tachoDir, deps.now);
+  if ("heldBy" in lock) return [];
+  const added = [];
+  try {
+    for (const agent of pending) {
+      const own = depsForAgent(deps, agent);
+      const host = readHostFile(own.paths.hostFile);
+      if (host === void 0 || !needsClaudeCodeMcp(host)) continue;
+      const recorded = host.harness_files;
+      if (recorded?.claude_user_config === void 0 && recorded?.claude_settings !== void 0 && recorded.claude_settings !== agent.paths.claudeSettings) {
+        added.push({
+          agentKey: host.agent_key,
+          path: own.paths.claudeUserConfig,
+          ok: false,
+          problem: `this agent was enrolled with Claude Code's settings at ${recorded.claude_settings}, and this command finds them at ${agent.paths.claudeSettings}, so it cannot tell which .claude.json Claude Code reads. Run \`oxagen agent enroll\` from a shell with the CLAUDE_CONFIG_DIR you enrolled with`
+        });
+        continue;
+      }
+      try {
+        const outcome = registerClaudeCodeMcp(host, own);
+        added.push({
+          agentKey: host.agent_key,
+          path: own.paths.claudeUserConfig,
+          ok: outcome.result !== "skipped",
+          ...outcome.reason !== void 0 ? { problem: outcome.reason } : {}
+        });
+      } catch (error) {
+        added.push({
+          agentKey: host.agent_key,
+          path: own.paths.claudeUserConfig,
+          ok: false,
+          problem: error instanceof Error ? error.message : String(error)
+        });
+      }
+    }
+  } finally {
+    lock.release();
+  }
+  return added;
+}
+var HARNESS;
+var init_claude_code_mcp = __esm({
+  "../../packages/tacho/src/cli/claude-code-mcp.ts"() {
+    "use strict";
+    init_agents();
+    init_claude_code_mcp_writer();
+    init_harness_file();
+    init_host_file();
+    init_install_lock();
+    init_agent_deps();
+    HARNESS = "claude-code";
+  }
+});
+
 // ../../packages/tacho/src/host/model-base-url-toml.ts
 function splitLines(text4) {
   const lines = [];
@@ -20480,13 +20805,13 @@ var init_model_base_url_toml = __esm({
 import { createHash as createHash5 } from "node:crypto";
 import {
   chmodSync as chmodSync3,
-  existsSync as existsSync4,
-  mkdirSync as mkdirSync4,
-  readFileSync as readFileSync5,
+  existsSync as existsSync5,
+  mkdirSync as mkdirSync5,
+  readFileSync as readFileSync6,
   statSync as statSync3,
-  unlinkSync as unlinkSync3
+  unlinkSync as unlinkSync4
 } from "node:fs";
-import { basename as basename3, dirname as dirname4, join as join12 } from "node:path";
+import { basename as basename3, dirname as dirname5, join as join13 } from "node:path";
 function claudeToolSearchEnabled(value) {
   return typeof value === "string" && /^(true|auto(:\d+)?)$/i.test(value);
 }
@@ -20500,19 +20825,19 @@ function isModelProxyBaseUrl(harness, value) {
 }
 function modelBaseUrlFile(harness, homes) {
   if (harness === "claude-code")
-    return join12(
+    return join13(
       homes.claudeConfigDir ?? harnessConfigDirs(homes.home).claudeConfigDir,
       "settings.json"
     );
   if (harness === "codex")
-    return join12(
+    return join13(
       homes.codexHome ?? harnessConfigDirs(homes.home).codexHome,
       "config.toml"
     );
-  const stellaHome = homes.stellaHome ?? join12(homes.home, ".stella");
-  const toml = join12(stellaHome, "stella.toml");
-  const json2 = join12(stellaHome, "settings.json");
-  return !existsSync4(toml) && existsSync4(json2) ? json2 : toml;
+  const stellaHome = homes.stellaHome ?? join13(homes.home, ".stella");
+  const toml = join13(stellaHome, "stella.toml");
+  const json2 = join13(stellaHome, "settings.json");
+  return !existsSync5(toml) && existsSync5(json2) ? json2 : toml;
 }
 function keyLabel(harness) {
   if (harness === "claude-code") return `env.${CLAUDE_KEY}`;
@@ -20522,7 +20847,7 @@ function isJsonFile(file) {
   return file.endsWith(".json");
 }
 function sidecarFor(file) {
-  return join12(dirname4(file), `.${basename3(file)}.oxagen-model-base-url.json`);
+  return join13(dirname5(file), `.${basename3(file)}.oxagen-model-base-url.json`);
 }
 function modelBaseUrlBackupPath(harness, home, stellaHome, dirs = {}) {
   return sidecarFor(fileFor(harness, homesOf(home, stellaHome, dirs)));
@@ -20539,9 +20864,9 @@ function sha256(text4) {
   return createHash5("sha256").update(text4, "utf8").digest("hex");
 }
 function readSidecar(path2) {
-  if (!existsSync4(path2)) return void 0;
+  if (!existsSync5(path2)) return void 0;
   try {
-    const parsed = JSON.parse(readFileSync5(path2, "utf8"));
+    const parsed = JSON.parse(readFileSync6(path2, "utf8"));
     if (parsed.schema !== SIDECAR_SCHEMA) return void 0;
     if (typeof parsed.written_sha256 !== "string") return void 0;
     return {
@@ -20566,7 +20891,7 @@ function readSidecar(path2) {
   }
 }
 function writeAtomicPreserving(path2, data) {
-  mkdirSync4(dirname4(path2), { recursive: true });
+  mkdirSync5(dirname5(path2), { recursive: true });
   let mode = 384;
   let owner;
   try {
@@ -20582,7 +20907,7 @@ function writeAtomicPreserving(path2, data) {
 }
 function readTextIfExists(path2) {
   try {
-    return readFileSync5(path2, "utf8");
+    return readFileSync6(path2, "utf8");
   } catch (error) {
     if (error.code === "ENOENT") return void 0;
     throw error;
@@ -20673,9 +20998,9 @@ function stellaManagedSettingsPath(platform = process.platform, env = process.en
   const named = env["STELLA_MANAGED_SETTINGS"];
   if (named !== void 0 && named.length > 0) return named;
   const dir = platform === "darwin" ? "/Library/Application Support/stella" : "/etc/stella";
-  const toml = join12(dir, "stella.toml");
-  const json2 = join12(dir, "settings.json");
-  return !existsSync4(toml) && existsSync4(json2) ? json2 : toml;
+  const toml = join13(dir, "stella.toml");
+  const json2 = join13(dir, "settings.json");
+  return !existsSync5(toml) && existsSync5(json2) ? json2 : toml;
 }
 function managedShadow(harness, managedFile, expected) {
   try {
@@ -20934,7 +21259,7 @@ function applyOne(harness, options) {
     original_base64: orphan ? "" : (
       // The raw bytes, not the decoded text: restore is byte-exact even
       // for a file that is not clean UTF-8.
-      (text4 === void 0 ? Buffer.alloc(0) : readFileSync5(file)).toString("base64")
+      (text4 === void 0 ? Buffer.alloc(0) : readFileSync6(file)).toString("base64")
     ),
     written_sha256: orphan ? "" : sha256(next),
     previous,
@@ -20955,7 +21280,7 @@ function restoreOne(harness, options) {
   const sidecar = readSidecar(backup);
   const text4 = readTextIfExists(file);
   const dropSidecar = () => {
-    if (existsSync4(backup)) unlinkSync3(backup);
+    if (existsSync5(backup)) unlinkSync4(backup);
   };
   if (text4 === void 0) {
     dropSidecar();
@@ -20968,7 +21293,7 @@ function restoreOne(harness, options) {
         Buffer.from(sidecar.original_base64, "base64")
       );
     } else {
-      unlinkSync3(file);
+      unlinkSync4(file);
     }
     dropSidecar();
     return true;
@@ -21070,8 +21395,8 @@ var init_model_base_url = __esm({
 });
 
 // ../../packages/tacho/src/host/run-token.ts
-import { createHmac, randomBytes as randomBytes3, timingSafeEqual } from "node:crypto";
-import { readFileSync as readFileSync6 } from "node:fs";
+import { createHmac, randomBytes as randomBytes4, timingSafeEqual } from "node:crypto";
+import { readFileSync as readFileSync7 } from "node:fs";
 function keyFromBytes(bytes) {
   if (bytes.length !== KEY_BYTES)
     throw new Error(
@@ -21081,7 +21406,7 @@ function keyFromBytes(bytes) {
   return { bytes, id };
 }
 function generateRunTokenKey() {
-  return keyFromBytes(randomBytes3(KEY_BYTES));
+  return keyFromBytes(randomBytes4(KEY_BYTES));
 }
 function runTokenKeyFromHex(hex) {
   const trimmed = hex.trim();
@@ -21092,7 +21417,7 @@ function runTokenKeyFromHex(hex) {
 function loadOrCreateRunTokenKey(path2) {
   try {
     return {
-      key: runTokenKeyFromHex(readFileSync6(path2, "utf8")),
+      key: runTokenKeyFromHex(readFileSync7(path2, "utf8")),
       created: false
     };
   } catch (error) {
@@ -21105,7 +21430,7 @@ function loadOrCreateRunTokenKey(path2) {
 }
 function readRunTokenKey(path2) {
   try {
-    return runTokenKeyFromHex(readFileSync6(path2, "utf8"));
+    return runTokenKeyFromHex(readFileSync7(path2, "utf8"));
   } catch (error) {
     if (error.code === "ENOENT") return void 0;
     throw error;
@@ -21128,7 +21453,7 @@ function mintRunToken(options) {
     throw new Error("run token would already be expired when minted");
   const claims = {
     v: 1,
-    tid: `rt_${randomBytes3(10).toString("hex")}`,
+    tid: `rt_${randomBytes4(10).toString("hex")}`,
     host: options.host,
     harness: options.harness,
     provider: options.provider,
@@ -21239,14 +21564,14 @@ var init_run_token = __esm({
 import { createHash as createHash6 } from "node:crypto";
 import {
   chmodSync as chmodSync4,
-  existsSync as existsSync5,
+  existsSync as existsSync6,
   lstatSync as lstatSync2,
-  mkdirSync as mkdirSync5,
-  readFileSync as readFileSync7,
+  mkdirSync as mkdirSync6,
+  readFileSync as readFileSync8,
   statSync as statSync4,
-  unlinkSync as unlinkSync4
+  unlinkSync as unlinkSync5
 } from "node:fs";
-import { basename as basename4, dirname as dirname5, join as join13 } from "node:path";
+import { basename as basename4, dirname as dirname6, join as join14 } from "node:path";
 function isTachoHelper(value) {
   return typeof value === "string" && HELPER_MARK.test(value);
 }
@@ -21254,16 +21579,16 @@ function helperCommandFor(tachoCommand) {
   return `${tachoCommand} credential issue --harness claude-code`;
 }
 function fileFor2(harness, homes) {
-  return harness === "claude-code" ? join13(
+  return harness === "claude-code" ? join14(
     homes.claudeConfigDir ?? harnessConfigDirs(homes.home).claudeConfigDir,
     "settings.json"
-  ) : join13(
+  ) : join14(
     homes.codexHome ?? harnessConfigDirs(homes.home).codexHome,
     "auth.json"
   );
 }
 function sidecarFor2(file) {
-  return join13(dirname5(file), `.${basename4(file)}.oxagen-model-credential.json`);
+  return join14(dirname6(file), `.${basename4(file)}.oxagen-model-credential.json`);
 }
 function modelCredentialBackupPath(harness, home, dirs = {}) {
   return sidecarFor2(fileFor2(harness, { ...dirs, home }));
@@ -21272,9 +21597,9 @@ function sha2562(text4) {
   return createHash6("sha256").update(text4, "utf8").digest("hex");
 }
 function readSidecar2(path2) {
-  if (!existsSync5(path2)) return void 0;
+  if (!existsSync6(path2)) return void 0;
   try {
-    const parsed = JSON.parse(readFileSync7(path2, "utf8"));
+    const parsed = JSON.parse(readFileSync8(path2, "utf8"));
     if (parsed.schema !== SIDECAR_SCHEMA2) return void 0;
     if (typeof parsed.written_sha256 !== "string") return void 0;
     return {
@@ -21294,7 +21619,7 @@ function readSidecar2(path2) {
   }
 }
 function writeAtomicPreserving2(path2, data) {
-  mkdirSync5(dirname5(path2), { recursive: true });
+  mkdirSync6(dirname6(path2), { recursive: true });
   let mode = 384;
   let owner;
   try {
@@ -21310,7 +21635,7 @@ function writeAtomicPreserving2(path2, data) {
 }
 function readTextIfExists2(path2) {
   try {
-    return readFileSync7(path2, "utf8");
+    return readFileSync8(path2, "utf8");
   } catch (error) {
     if (error.code === "ENOENT") return void 0;
     throw error;
@@ -21543,7 +21868,7 @@ function restoreClaude(options, released) {
   const sidecar = readSidecar2(backup);
   const text4 = readTextIfExists2(file);
   const dropSidecar = () => {
-    if (existsSync5(backup)) unlinkSync4(backup);
+    if (existsSync6(backup)) unlinkSync5(backup);
   };
   if (text4 === void 0) {
     if (released !== void 0) {
@@ -21600,7 +21925,7 @@ function restoreCodex(options, released) {
   const sidecar = readSidecar2(backup);
   const text4 = readTextIfExists2(file);
   const dropSidecar = () => {
-    if (existsSync5(backup)) unlinkSync4(backup);
+    if (existsSync6(backup)) unlinkSync5(backup);
   };
   if (text4 === void 0) {
     if (released !== void 0) {
@@ -21627,7 +21952,7 @@ function restoreCodex(options, released) {
   if (released !== void 0) auth[CODEX_KEY2] = released.secret;
   else delete auth[CODEX_KEY2];
   if (sidecar !== void 0 && !sidecar.existed && Object.keys(auth).length === 0) {
-    unlinkSync4(file);
+    unlinkSync5(file);
     dropSidecar();
     return { changed: true, secretRestored: released !== void 0 };
   }
@@ -21772,42 +22097,13 @@ var init_model_credential = __esm({
   }
 });
 
-// ../../packages/tacho/src/cli/agent-deps.ts
-function agentDeps(deps, paths) {
-  if (JSON.stringify(paths) === JSON.stringify(deps.paths)) return deps;
-  const rebound = deps.atAgent?.(paths) ?? { ...deps, paths };
-  return {
-    ...deps,
-    ...rebound,
-    paths,
-    serviceManager: deps.serviceManager,
-    out: deps.out,
-    err: deps.err
-  };
-}
-function depsForHarness(deps, harness) {
-  const agent = agentHolding(deps.paths, harness);
-  return agent === void 0 ? deps : depsForAgent(deps, agent);
-}
-function depsForAgent(deps, agent) {
-  const host = agent.host ?? readHostFileLenient(agent.paths.hostFile).salvaged;
-  return agentDeps(deps, withRecordedHarnessFiles(agent.paths, host));
-}
-var init_agent_deps = __esm({
-  "../../packages/tacho/src/cli/agent-deps.ts"() {
-    "use strict";
-    init_agents();
-    init_host_file();
-  }
-});
-
 // ../../packages/tacho/src/cli/credential.ts
-import { existsSync as existsSync6 } from "node:fs";
-import { dirname as dirname6 } from "node:path";
+import { existsSync as existsSync7 } from "node:fs";
+import { dirname as dirname7 } from "node:path";
 function harnessDirsOf(deps) {
   return {
-    claudeConfigDir: dirname6(deps.paths.claudeSettings),
-    codexHome: dirname6(deps.paths.codexHooks)
+    claudeConfigDir: dirname7(deps.paths.claudeSettings),
+    codexHome: dirname7(deps.paths.codexHooks)
   };
 }
 function parseCredentialMode(value) {
@@ -22058,7 +22354,7 @@ async function restoreCredentials(host, deps, mode = "unenroll", only) {
     try {
       if (host !== void 0 && !host.harnesses.includes(harness)) {
         const dirs = harnessDirsOf(deps);
-        const hasReceipt = existsSync6(
+        const hasReceipt = existsSync7(
           modelCredentialBackupPath(harness, deps.home, dirs)
         );
         if (!hasReceipt && !hasOrphanedModelCredential(harness, deps.home, dirs))
@@ -22289,20 +22585,20 @@ var init_codex_app_server = __esm({
 });
 
 // ../../packages/tacho/src/host/credential-store.ts
-import { createCipheriv, createDecipheriv, randomBytes as randomBytes4 } from "node:crypto";
+import { createCipheriv, createDecipheriv, randomBytes as randomBytes5 } from "node:crypto";
 import {
-  closeSync as closeSync3,
-  existsSync as existsSync7,
+  closeSync as closeSync4,
+  existsSync as existsSync8,
   fsyncSync as fsyncSync2,
-  openSync as openSync3,
-  readFileSync as readFileSync8,
+  openSync as openSync4,
+  readFileSync as readFileSync9,
   statSync as statSync5,
-  unlinkSync as unlinkSync5,
-  writeSync as writeSync2
+  unlinkSync as unlinkSync6,
+  writeSync as writeSync3
 } from "node:fs";
 function readKey(path2) {
   try {
-    const hex = readFileSync8(path2, "utf8").trim();
+    const hex = readFileSync9(path2, "utf8").trim();
     if (!/^[0-9a-f]{64}$/i.test(hex))
       throw new Error(`${path2} does not hold a 32-byte key`);
     return Buffer.from(hex, "hex");
@@ -22314,7 +22610,7 @@ function readKey(path2) {
 function loadOrCreateKey(path2) {
   const existing = readKey(path2);
   if (existing !== void 0) return existing;
-  const key = randomBytes4(KEY_BYTES2);
+  const key = randomBytes5(KEY_BYTES2);
   writeSensitiveFileAtomic(path2, `${key.toString("hex")}
 `);
   return key;
@@ -22331,16 +22627,16 @@ function overwriteInPlace(path2) {
   let fd2;
   try {
     const size = statSync5(path2).size;
-    fd2 = openSync3(path2, "r+");
-    writeSync2(fd2, randomBytes4(Math.max(size, KEY_BYTES2 * 2)), 0, void 0, 0);
+    fd2 = openSync4(path2, "r+");
+    writeSync3(fd2, randomBytes5(Math.max(size, KEY_BYTES2 * 2)), 0, void 0, 0);
     fsyncSync2(fd2);
   } catch {
   } finally {
-    if (fd2 !== void 0) closeSync3(fd2);
+    if (fd2 !== void 0) closeSync4(fd2);
   }
 }
 function seal(key, secret, aad) {
-  const nonce = randomBytes4(12);
+  const nonce = randomBytes5(12);
   const cipher = createCipheriv("aes-256-gcm", key, nonce);
   cipher.setAAD(Buffer.from(aad, "utf8"));
   const ciphertext = Buffer.concat([
@@ -22385,7 +22681,7 @@ function openCredentialStore(paths) {
   function readAll() {
     let text4;
     try {
-      text4 = readFileSync8(paths.file, "utf8");
+      text4 = readFileSync9(paths.file, "utf8");
     } catch (error) {
       if (error.code === "ENOENT") return [];
       throw error;
@@ -22399,7 +22695,7 @@ function openCredentialStore(paths) {
   }
   function writeAll2(entries2) {
     if (entries2.length === 0) {
-      if (existsSync7(paths.file)) unlinkSync5(paths.file);
+      if (existsSync8(paths.file)) unlinkSync6(paths.file);
       return;
     }
     writeSensitiveFileAtomic(
@@ -22454,9 +22750,9 @@ function openCredentialStore(paths) {
     },
     status: () => readAll().map(custodyOf),
     shred: () => {
-      if (existsSync7(paths.key)) overwriteInPlace(paths.key);
+      if (existsSync8(paths.key)) overwriteInPlace(paths.key);
       for (const path2 of [paths.file, paths.key])
-        if (existsSync7(path2)) unlinkSync5(path2);
+        if (existsSync8(path2)) unlinkSync6(path2);
     }
   };
 }
@@ -22500,16 +22796,87 @@ var init_credential_store = __esm({
   }
 });
 
+// ../../packages/tacho/src/host/claude-config-lock.ts
+import { mkdirSync as mkdirSync7, rmdirSync as rmdirSync4, statSync as statSync6 } from "node:fs";
+function sleepSync(ms) {
+  Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
+}
+function claudeConfigLockPath(file) {
+  return `${file}.lock`;
+}
+function withClaudeConfigLock(file, edit, options = {}) {
+  const lock = claudeConfigLockPath(file);
+  const now = options.now ?? Date.now;
+  const sleep3 = options.sleep ?? sleepSync;
+  const staleMs = options.staleMs ?? CLAUDE_CONFIG_LOCK_STALE_MS;
+  const waitMs = options.waitMs ?? CLAUDE_CONFIG_LOCK_WAIT_MS;
+  const deadline = now() + waitMs;
+  let held = false;
+  for (; ; ) {
+    try {
+      mkdirSync7(lock);
+      held = true;
+      break;
+    } catch (error) {
+      const code = error.code;
+      if (code === "ENOENT") break;
+      if (code !== "EEXIST") throw error;
+    }
+    let modified;
+    try {
+      modified = statSync6(lock).mtimeMs;
+    } catch {
+      modified = void 0;
+    }
+    let retryNow = modified === void 0;
+    if (modified !== void 0 && now() - modified > staleMs) {
+      try {
+        if (statSync6(lock).mtimeMs === modified) {
+          rmdirSync4(lock);
+          retryNow = true;
+        }
+      } catch {
+      }
+    }
+    if (now() >= deadline)
+      throw new HarnessFileError(
+        file,
+        `is being saved by Claude Code, which held its lock (${lock}) for more than ${Math.round(waitMs / 1e3)} seconds; nothing was written, so run the command again in a moment`
+      );
+    if (!retryNow) sleep3(RETRY_MS);
+  }
+  try {
+    return edit();
+  } finally {
+    if (held) {
+      try {
+        rmdirSync4(lock);
+      } catch {
+      }
+    }
+  }
+}
+var CLAUDE_CONFIG_LOCK_STALE_MS, CLAUDE_CONFIG_LOCK_WAIT_MS, RETRY_MS;
+var init_claude_config_lock = __esm({
+  "../../packages/tacho/src/host/claude-config-lock.ts"() {
+    "use strict";
+    init_harness_file();
+    CLAUDE_CONFIG_LOCK_STALE_MS = 1e4;
+    CLAUDE_CONFIG_LOCK_WAIT_MS = 3e3;
+    RETRY_MS = 25;
+  }
+});
+
 // ../../packages/tacho/src/host/service.ts
-import { join as join14 } from "node:path";
+import { join as join15 } from "node:path";
 import {
-  existsSync as existsSync8,
-  readdirSync as readdirSync5,
-  readFileSync as readFileSync9,
-  rmdirSync as rmdirSync3,
-  unlinkSync as unlinkSync6
+  existsSync as existsSync9,
+  readdirSync as readdirSync6,
+  readFileSync as readFileSync10,
+  rmdirSync as rmdirSync5,
+  unlinkSync as unlinkSync7
 } from "node:fs";
-import { randomBytes as randomBytes5 } from "node:crypto";
+import { randomBytes as randomBytes6 } from "node:crypto";
 function xmlEscape(value) {
   return value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
@@ -22581,8 +22948,8 @@ function blockingSleep(ms) {
 }
 function launchdManager(options) {
   const sleep3 = options.sleep ?? blockingSleep;
-  const dir = join14(options.home, "Library", "LaunchAgents");
-  const unitPath = join14(dir, `${SERVICE_LABEL}.plist`);
+  const dir = join15(options.home, "Library", "LaunchAgents");
+  const unitPath = join15(dir, `${SERVICE_LABEL}.plist`);
   const domain = `gui/${options.uid ?? process.getuid?.() ?? 501}`;
   const target2 = `${domain}/${SERVICE_LABEL}`;
   const loaded = () => options.exec("launchctl", ["print", target2]).status === 0;
@@ -22601,7 +22968,7 @@ function launchdManager(options) {
     unitPath,
     install: (spec) => {
       const plist = renderLaunchdPlist(spec);
-      const unchanged = existsSync8(unitPath) && readFileSync9(unitPath, "utf8") === plist;
+      const unchanged = existsSync9(unitPath) && readFileSync10(unitPath, "utf8") === plist;
       if (unchanged && loaded()) {
         const kicked = options.exec("launchctl", ["kickstart", "-k", target2]);
         if (kicked.status === 0 && loaded()) return;
@@ -22630,10 +22997,10 @@ function launchdManager(options) {
     uninstall: () => {
       options.exec("launchctl", ["bootout", target2]);
       if (!waitUntilGone()) throw stillLoaded("unenroll");
-      if (existsSync8(unitPath)) unlinkSync6(unitPath);
+      if (existsSync9(unitPath)) unlinkSync7(unitPath);
     },
     status: () => {
-      const installed = existsSync8(unitPath);
+      const installed = existsSync9(unitPath);
       const result2 = options.exec("launchctl", [
         "print",
         `${domain}/${SERVICE_LABEL}`
@@ -22650,8 +23017,8 @@ function noUserManager(result2) {
 }
 function stopByPidFile(options) {
   const { pidPath } = options;
-  if (pidPath === void 0 || !existsSync8(pidPath)) return;
-  const record = parseDaemonPid(readFileSync9(pidPath, "utf8"));
+  if (pidPath === void 0 || !existsSync9(pidPath)) return;
+  const record = parseDaemonPid(readFileSync10(pidPath, "utf8"));
   if (record === void 0) return;
   const sleep3 = options.sleep ?? blockingSleep;
   const processes = options.processes ?? {
@@ -22683,9 +23050,9 @@ function stopByPidFile(options) {
     );
 }
 function systemdManager(options) {
-  const dir = join14(options.home, ".config", "systemd", "user");
-  const unitPath = join14(dir, "tachod.service");
-  const wants = join14(dir, "default.target.wants");
+  const dir = join15(options.home, ".config", "systemd", "user");
+  const unitPath = join15(dir, "tachod.service");
+  const wants = join15(dir, "default.target.wants");
   return {
     kind: "systemd",
     unitPath,
@@ -22695,8 +23062,8 @@ function systemdManager(options) {
         throw new Error(
           `no systemd user manager is available (${probe.stderr.trim().split("\n")[0] ?? ""})`
         );
-      const previous = existsSync8(unitPath) ? readFileSync9(unitPath, "utf8") : void 0;
-      const createsWants = previous === void 0 ? !existsSync8(wants) : previous.includes(CREATED_WANTS_MARK);
+      const previous = existsSync9(unitPath) ? readFileSync10(unitPath, "utf8") : void 0;
+      const createsWants = previous === void 0 ? !existsSync9(wants) : previous.includes(CREATED_WANTS_MARK);
       ensureDir(dir, 493);
       writeSensitiveFileAtomic(
         unitPath,
@@ -22736,7 +23103,7 @@ function systemdManager(options) {
       ]);
       if (noUserManager(disabled)) {
         stopByPidFile(options);
-        if (existsSync8(unitPath)) unlinkSync6(unitPath);
+        if (existsSync9(unitPath)) unlinkSync7(unitPath);
         return;
       }
       const active2 = options.exec("systemctl", [
@@ -22745,13 +23112,13 @@ function systemdManager(options) {
         "tachod.service"
       ]);
       const stopped2 = active2.status === 3 && ["inactive", "failed"].includes(active2.stdout.trim()) || active2.status === 4 && active2.stdout.trim() === "unknown";
-      if (!stopped2 || disabled.status !== 0 && existsSync8(unitPath)) {
+      if (!stopped2 || disabled.status !== 0 && existsSync9(unitPath)) {
         throw new Error(
           `systemctl could not remove tachod.service: ${disabled.stderr.trim() || active2.stderr.trim() || active2.stdout.trim() || "service state is unknown"}`
         );
       }
-      const unit = existsSync8(unitPath) ? readFileSync9(unitPath, "utf8") : void 0;
-      if (unit !== void 0) unlinkSync6(unitPath);
+      const unit = existsSync9(unitPath) ? readFileSync10(unitPath, "utf8") : void 0;
+      if (unit !== void 0) unlinkSync7(unitPath);
       try {
         const reload = options.exec("systemctl", ["--user", "daemon-reload"]);
         if (reload.status !== 0)
@@ -22764,13 +23131,13 @@ function systemdManager(options) {
       }
       if (unit?.includes(CREATED_WANTS_MARK) === true) {
         try {
-          if (readdirSync5(wants).length === 0) rmdirSync3(wants);
+          if (readdirSync6(wants).length === 0) rmdirSync5(wants);
         } catch {
         }
       }
     },
     status: () => {
-      const installed = existsSync8(unitPath);
+      const installed = existsSync9(unitPath);
       const result2 = options.exec("systemctl", [
         "--user",
         "is-active",
@@ -22822,11 +23189,11 @@ function tasklistImage(listing, pid) {
   return void 0;
 }
 function schtasksManager(options) {
-  const launcher = options.launcherPath ?? join14(options.home, "tachod.cmd");
-  const pidPath = options.pidPath ?? join14(launcher, "..", "tachod.pid");
+  const launcher = options.launcherPath ?? join15(options.home, "tachod.cmd");
+  const pidPath = options.pidPath ?? join15(launcher, "..", "tachod.pid");
   const livePid = () => {
-    if (!existsSync8(pidPath)) return void 0;
-    const record = parseDaemonPid(readFileSync9(pidPath, "utf8"));
+    if (!existsSync9(pidPath)) return void 0;
+    const record = parseDaemonPid(readFileSync10(pidPath, "utf8"));
     if (record === void 0) return void 0;
     const { pid } = record;
     const query = options.exec("tasklist", [
@@ -22865,7 +23232,7 @@ function schtasksManager(options) {
     unitPath: launcher,
     install: (spec) => {
       stopDaemon();
-      ensureDir(join14(launcher, ".."), 493);
+      ensureDir(join15(launcher, ".."), 493);
       writeSensitiveFileAtomic(
         launcher,
         renderWindowsLauncher(
@@ -22877,7 +23244,7 @@ function schtasksManager(options) {
           // an empty directory stayed behind (#4317). The daemon uses
           // absolute paths only.
           { ...spec, workingDirectory: options.home },
-          randomBytes5(8).toString("hex")
+          randomBytes6(8).toString("hex")
         ),
         384
       );
@@ -22919,7 +23286,7 @@ function schtasksManager(options) {
           `schtasks /Delete failed: ${deleted.stderr.trim() || "task removal was not confirmed"}`
         );
       }
-      if (existsSync8(launcher)) unlinkSync6(launcher);
+      if (existsSync9(launcher)) unlinkSync7(launcher);
     },
     status: () => {
       const result2 = options.exec("schtasks", [
@@ -22992,15 +23359,15 @@ var init_service = __esm({
 });
 
 // ../../packages/tacho/src/version.ts
-import { readFileSync as readFileSync10 } from "node:fs";
-import { dirname as dirname7, resolve as resolve2 } from "node:path";
+import { readFileSync as readFileSync11 } from "node:fs";
+import { dirname as dirname8, resolve as resolve2 } from "node:path";
 import { fileURLToPath } from "node:url";
 function readVersion() {
-  if (true) return "2.1.4-447";
+  if (true) return "2.1.4-460";
   try {
-    const here = dirname7(fileURLToPath(import.meta.url));
+    const here = dirname8(fileURLToPath(import.meta.url));
     const pkg = JSON.parse(
-      readFileSync10(resolve2(here, "..", "package.json"), "utf8")
+      readFileSync11(resolve2(here, "..", "package.json"), "utf8")
     );
     return pkg.version ?? "0.0.0";
   } catch {
@@ -23017,8 +23384,8 @@ var init_version = __esm({
 
 // ../../packages/tacho/src/cli/deps.ts
 import { spawnSync as spawnSync4 } from "node:child_process";
-import { randomBytes as randomBytes6 } from "node:crypto";
-import { existsSync as existsSync9 } from "node:fs";
+import { randomBytes as randomBytes7 } from "node:crypto";
+import { existsSync as existsSync10 } from "node:fs";
 import { get as httpGet, request as httpRequest } from "node:http";
 import { createServer } from "node:net";
 import {
@@ -23029,7 +23396,7 @@ import {
   userInfo
 } from "node:os";
 import { createRequire } from "node:module";
-import { dirname as dirname8, posix as posix2, resolve as resolve3, win32 as win323 } from "node:path";
+import { dirname as dirname9, posix as posix2, resolve as resolve3, win32 as win323 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 function configPicker(env, home) {
   let config = {};
@@ -23095,7 +23462,7 @@ function isNativeBuild() {
 function exeName(name, platform) {
   return platform === "win32" ? `${name}.exe` : name;
 }
-function stableExecutablePath(executable, platform, exists = existsSync9) {
+function stableExecutablePath(executable, platform, exists = existsSync10) {
   const stable = platform === "win32" ? executable.replace(
     /^(.*\\apps\\[^\\]+\\)(?!current\\)[^\\]+(\\.*)$/i,
     "$1current$2"
@@ -23105,7 +23472,7 @@ function stableExecutablePath(executable, platform, exists = existsSync9) {
   );
   return stable !== executable && exists(stable) ? stable : executable;
 }
-function runtimeCommands(entry2 = process.argv[1], env = process.env, nodePath = process.execPath, platform = process.platform, native = isNativeBuild(), exists = existsSync9) {
+function runtimeCommands(entry2 = process.argv[1], env = process.env, nodePath = process.execPath, platform = process.platform, native = isNativeBuild(), exists = existsSync10) {
   const P = platform === "win32" ? win323 : posix2;
   const named = env["TACHO_BIN_DIR"];
   let binDir = named;
@@ -23113,7 +23480,7 @@ function runtimeCommands(entry2 = process.argv[1], env = process.env, nodePath =
     if (native) {
       binDir = P.dirname(nodePath);
     } else {
-      const here = dirname8(fileURLToPath2(import.meta.url));
+      const here = dirname9(fileURLToPath2(import.meta.url));
       const entryDir = entry2 !== void 0 ? P.dirname(P.resolve(entry2)) : void 0;
       if (entryDir !== void 0 && exists(P.join(entryDir, "tachod.mjs")))
         binDir = entryDir;
@@ -23154,7 +23521,7 @@ function runtimeCommands(entry2 = process.argv[1], env = process.env, nodePath =
     ...flagged
   };
 }
-function oxagenRuntimeCommands(entry2 = process.argv[1], env = process.env, nodePath = process.execPath, platform = process.platform, native = isNativeBuild(), exists = existsSync9) {
+function oxagenRuntimeCommands(entry2 = process.argv[1], env = process.env, nodePath = process.execPath, platform = process.platform, native = isNativeBuild(), exists = existsSync10) {
   const P = platform === "win32" ? win323 : posix2;
   const named = env["TACHO_BIN_DIR"];
   let prefix;
@@ -23241,7 +23608,7 @@ function whereExecutable(result2) {
 function shellExecutable(result2) {
   return outputLines(result2).reverse().find((line) => line.startsWith("/"));
 }
-function harnessFacts(exec4, name, platform = process.platform, env = process.env, home = env["HOME"] ?? env["USERPROFILE"] ?? "", exists = existsSync9) {
+function harnessFacts(exec4, name, platform = process.platform, env = process.env, home = env["HOME"] ?? env["USERPROFILE"] ?? "", exists = existsSync10) {
   let path2;
   if (platform === "win32") {
     path2 = whereExecutable(exec4("where", [name]));
@@ -23269,7 +23636,7 @@ function harnessFacts(exec4, name, platform = process.platform, env = process.en
   const match = /(\d+\.\d+\.\d+)/.exec(version2.stdout);
   return { path: path2, ...match?.[1] !== void 0 ? { version: match[1] } : {} };
 }
-function claudeDesktopFacts(platform = process.platform, home = homedir3(), env = process.env, exists = existsSync9) {
+function claudeDesktopFacts(platform = process.platform, home = homedir3(), env = process.env, exists = existsSync10) {
   const candidates = platform === "darwin" ? ["/Applications/Claude.app", `${home}/Applications/Claude.app`] : platform === "win32" ? [
     `${env["LOCALAPPDATA"] ?? `${home}\\AppData\\Local`}\\AnthropicClaude`,
     `${env["LOCALAPPDATA"] ?? `${home}\\AppData\\Local`}\\Programs\\Claude`
@@ -23279,7 +23646,7 @@ function claudeDesktopFacts(platform = process.platform, home = homedir3(), env
   }
   return { installed: false };
 }
-function cursorAppFacts(platform = process.platform, home = homedir3(), env = process.env, exists = existsSync9) {
+function cursorAppFacts(platform = process.platform, home = homedir3(), env = process.env, exists = existsSync10) {
   const local = env["LOCALAPPDATA"] ?? `${home}\\AppData\\Local`;
   const programs = env["PROGRAMFILES"] ?? "C:\\Program Files";
   const candidates = platform === "darwin" ? ["/Applications/Cursor.app", `${home}/Applications/Cursor.app`] : platform === "win32" ? [`${local}\\Programs\\cursor`, `${programs}\\Cursor`] : [];
@@ -23323,8 +23690,8 @@ function defaultCliDeps(overrides = {}, managed = {}) {
   const paths = overrides.paths ?? defaultAgentPaths(tachoHome(env, home, platform));
   const harnessFiles = new HarnessFiles(paths.dir);
   const harnessDirs = {
-    claudeConfigDir: dirname8(paths.claudeSettings),
-    codexHome: dirname8(paths.codexHooks)
+    claudeConfigDir: dirname9(paths.claudeSettings),
+    codexHome: dirname9(paths.codexHooks)
   };
   const daemonGet = async (path2) => {
     const host = readHostFile(paths.hostFile);
@@ -23432,6 +23799,21 @@ function defaultCliDeps(overrides = {}, managed = {}) {
 `
       );
     },
+    // Claude Code rewrites this file all the time, so the read is taken
+    // inside its lock, not before it. proper-lockfile resolves a file's real
+    // path before it locks it, so Claude Code holds no lock on a file that
+    // does not exist yet, and neither does this.
+    editClaudeUserConfig: (edit) => {
+      const file = paths.claudeUserConfig;
+      const apply = () => {
+        const next = edit(harnessFiles.readJson(file));
+        if (next !== void 0)
+          harnessFiles.write(file, `${JSON.stringify(next, null, 2)}
+`);
+      };
+      if (existsSync10(file)) withClaudeConfigLock(file, apply);
+      else apply();
+    },
     harnessWriteProblem: (path2) => harnessFiles.writeProblem(path2),
     settleHarnessFiles: () => settleOrThrow(harnessFiles),
     // The base URL and the vendor key live in the files the hooks went into,
@@ -23542,7 +23924,7 @@ function defaultCliDeps(overrides = {}, managed = {}) {
         server.close(() => resolvePromise(port));
       });
     }),
-    randomToken: () => randomBytes6(24).toString("hex"),
+    randomToken: () => randomBytes7(24).toString("hex"),
     sleep: (ms) => new Promise((resolvePromise) => setTimeout(resolvePromise, ms)),
     wrapperVersion: TACHO_VERSION,
     atAgent: (agentPaths2) => defaultCliDeps({ ...overrides, paths: agentPaths2 }, managed),
@@ -23556,6 +23938,7 @@ var init_deps = __esm({
     init_hook_client();
     init_codex_app_server();
     init_credential_store();
+    init_claude_config_lock();
     init_fs();
     init_harness_file();
     init_host_file();
@@ -24074,7 +24457,7 @@ import {
   sign as sign2,
   verify as verify2
 } from "node:crypto";
-import { readFileSync as readFileSync11 } from "node:fs";
+import { readFileSync as readFileSync12 } from "node:fs";
 function encodePublicKey(privateKey) {
   const spki = createPublicKey2(privateKey).export({
     type: "spki",
@@ -24112,7 +24495,7 @@ function deviceKeyPem(key) {
 function loadOrCreateDeviceKey(path2) {
   try {
     return {
-      key: deviceKeyFromPem(readFileSync11(path2, "utf8")),
+      key: deviceKeyFromPem(readFileSync12(path2, "utf8")),
       created: false
     };
   } catch (error) {
@@ -24150,110 +24533,6 @@ var init_device_key = __esm({
   }
 });
 
-// ../../packages/tacho/src/host/install-lock.ts
-import { randomBytes as randomBytes7 } from "node:crypto";
-import {
-  closeSync as closeSync4,
-  existsSync as existsSync10,
-  linkSync,
-  mkdirSync as mkdirSync6,
-  openSync as openSync4,
-  readdirSync as readdirSync6,
-  readFileSync as readFileSync12,
-  renameSync as renameSync3,
-  rmdirSync as rmdirSync4,
-  unlinkSync as unlinkSync7,
-  writeSync as writeSync3
-} from "node:fs";
-import { dirname as dirname9, join as join15 } from "node:path";
-function readLock(path2) {
-  try {
-    return readFileSync12(path2, "utf8");
-  } catch {
-    return void 0;
-  }
-}
-function holderOf(text4) {
-  try {
-    return JSON.parse(text4 ?? "");
-  } catch {
-    return {};
-  }
-}
-function removeQuietly(path2) {
-  try {
-    unlinkSync7(path2);
-  } catch {
-  }
-}
-function pidAlive(pid) {
-  try {
-    process.kill(pid, 0);
-    return true;
-  } catch (error) {
-    return error.code === "EPERM";
-  }
-}
-function acquireInstallLock(root, now = Date.now, alive = pidAlive) {
-  const path2 = join15(root, "install.lock");
-  const created = [];
-  let dir = root;
-  while (!existsSync10(dir) && dirname9(dir) !== dir) {
-    created.unshift(dir);
-    dir = dirname9(dir);
-  }
-  mkdirSync6(root, { recursive: true, mode: 448 });
-  const token = randomBytes7(12).toString("hex");
-  const liveHolder = (holder) => typeof holder.pid === "number" && typeof holder.at === "number" && now() - holder.at < STALE_AFTER_MS && alive(holder.pid) ? holder.pid : void 0;
-  for (let attempt = 0; attempt < 2; attempt += 1) {
-    try {
-      const fd2 = openSync4(path2, "wx", 384);
-      writeSync3(fd2, JSON.stringify({ pid: process.pid, at: now(), token }));
-      closeSync4(fd2);
-      return {
-        release: () => {
-          if (holderOf(readLock(path2)).token === token) removeQuietly(path2);
-          for (const made of [...created].reverse()) {
-            try {
-              if (readdirSync6(made).length === 0) rmdirSync4(made);
-            } catch {
-            }
-          }
-        }
-      };
-    } catch (error) {
-      if (error.code !== "EEXIST") throw error;
-      const live = liveHolder(holderOf(readLock(path2)));
-      if (live !== void 0) return { heldBy: live };
-      const aside = `${path2}.${process.pid}.${token}.stale`;
-      try {
-        renameSync3(path2, aside);
-      } catch (renameError) {
-        if (renameError.code === "ENOENT") continue;
-        throw renameError;
-      }
-      const moved = liveHolder(holderOf(readLock(aside)));
-      if (moved !== void 0) {
-        try {
-          linkSync(aside, path2);
-        } catch {
-        }
-        removeQuietly(aside);
-        return { heldBy: moved };
-      }
-      removeQuietly(aside);
-    }
-  }
-  return { heldBy: -1 };
-}
-var STALE_AFTER_MS;
-var init_install_lock = __esm({
-  "../../packages/tacho/src/host/install-lock.ts"() {
-    "use strict";
-    STALE_AFTER_MS = 10 * 6e4;
-  }
-});
-
 // ../../packages/tacho/src/host/wal-index.ts
 import {
   appendFileSync,
@@ -24261,7 +24540,7 @@ import {
   existsSync as existsSync11,
   openSync as openSync5,
   readSync as readSync2,
-  statSync as statSync6,
+  statSync as statSync7,
   unlinkSync as unlinkSync8
 } from "node:fs";
 import { open as open2 } from "node:fs/promises";
@@ -24279,7 +24558,7 @@ function parseStoredBody(text4) {
     return void 0;
   return stored;
 }
-function readTailLine(path2, size = statSync6(path2).size, window2 = SCAN_CHUNK_BYTES) {
+function readTailLine(path2, size = statSync7(path2).size, window2 = SCAN_CHUNK_BYTES) {
   if (size === 0) return void 0;
   const fd2 = openSync5(path2, "r");
   try {
@@ -24496,7 +24775,7 @@ var init_wal_index = __esm({
       }
       /** The index to extend, and the byte the scan starts from. */
       base(sessionUuid2, bodiesPath) {
-        const size = statSync6(bodiesPath).size;
+        const size = statSync7(bodiesPath).size;
         const held = this.cached.get(sessionUuid2) ?? this.load(sessionUuid2);
         if (held !== void 0 && held.covered <= size) return held;
         this.discard(sessionUuid2);
@@ -24570,7 +24849,7 @@ ${lines.join("\n")}
        * answers undefined.
        */
       covering(sessionUuid2, bodiesPath) {
-        const size = statSync6(bodiesPath).size;
+        const size = statSync7(bodiesPath).size;
         const held = this.cached.get(sessionUuid2) ?? this.load(sessionUuid2);
         if (held === void 0 || held.covered !== size) return void 0;
         this.remember(sessionUuid2, held);
@@ -24584,7 +24863,7 @@ ${lines.join("\n")}
        * file.
        */
       held(sessionUuid2, bodiesPath) {
-        const size = statSync6(bodiesPath).size;
+        const size = statSync7(bodiesPath).size;
         const held = this.cached.get(sessionUuid2) ?? this.load(sessionUuid2);
         if (held === void 0 || held.covered > size) return void 0;
         this.remember(sessionUuid2, held);
@@ -24593,7 +24872,7 @@ ${lines.join("\n")}
       /** The index of a body file, built or extended to cover the whole file. */
       ensure(sessionUuid2, bodiesPath, onInvalidRecord, onWriteFailure) {
         const index = this.base(sessionUuid2, bodiesPath);
-        const size = statSync6(bodiesPath).size;
+        const size = statSync7(bodiesPath).size;
         if (index.covered < size) {
           const result2 = {
             added: [],
@@ -24647,7 +24926,7 @@ ${lines.join("\n")}
         for (let attempt = 0; ; attempt += 1) {
           const generation = this.generationOf(sessionUuid2);
           const index = this.base(sessionUuid2, bodiesPath);
-          const size = statSync6(bodiesPath).size;
+          const size = statSync7(bodiesPath).size;
           if (index.covered >= size) {
             this.remember(sessionUuid2, index);
             return index;
@@ -24687,7 +24966,7 @@ import {
   readSync as readSync3,
   truncateSync,
   renameSync as renameSync4,
-  statSync as statSync7,
+  statSync as statSync8,
   unlinkSync as unlinkSync9,
   writeSync as writeSync4
 } from "node:fs";
@@ -24698,7 +24977,7 @@ function activityAt(event) {
   return Number.isFinite(at) ? at : Number.NEGATIVE_INFINITY;
 }
 function sizeOf(path2) {
-  return statSync7(path2, { throwIfNoEntry: false })?.size ?? 0;
+  return statSync8(path2, { throwIfNoEntry: false })?.size ?? 0;
 }
 var BODY_READ_SLICE, BODY_DROP_SLICE_BYTES, BODY_DROP_SCANS, NEWLINE, EVENT_TAIL_WINDOW, WalRecoveryConflict, Wal;
 var init_wal = __esm({
@@ -25058,7 +25337,7 @@ ${lines.join("\n")}
         for (const session of sessions) {
           if (sizes.has(session)) continue;
           const path2 = pathOf2(session);
-          sizes.set(session, existsSync12(path2) ? statSync7(path2).size : void 0);
+          sizes.set(session, existsSync12(path2) ? statSync8(path2).size : void 0);
         }
         return sizes;
       }
@@ -25074,7 +25353,7 @@ ${lines.join("\n")}
           try {
             if (!existsSync12(path2)) continue;
             if (size === void 0) unlinkSync9(path2);
-            else if (statSync7(path2).size !== size) truncateSync(path2, size);
+            else if (statSync8(path2).size !== size) truncateSync(path2, size);
           } catch (error) {
             onFailure(session, error);
           }
@@ -25737,7 +26016,7 @@ ${lines.join("\n")}
         const lastSeq = this.lastWrittenSeq(sessionUuid2);
         if (lastSeq === void 0) return 0;
         const path2 = this.bodyFileFor(sessionUuid2);
-        const size = statSync7(path2).size;
+        const size = statSync8(path2).size;
         let keep = size;
         let cut2 = 0;
         while (keep > 0) {
@@ -25770,7 +26049,7 @@ ${lines.join("\n")}
        */
       lastWrittenSeq(sessionUuid2) {
         const path2 = this.fileFor(sessionUuid2);
-        if (!existsSync12(path2) || statSync7(path2).size === 0) return -1;
+        if (!existsSync12(path2) || statSync8(path2).size === 0) return -1;
         return this.lastEvent(sessionUuid2)?.seq;
       }
       /**
@@ -25801,7 +26080,7 @@ ${lines.join("\n")}
       *eventsBackward(sessionUuid2) {
         const path2 = this.fileFor(sessionUuid2);
         if (!existsSync12(path2)) return;
-        let end = statSync7(path2).size;
+        let end = statSync8(path2).size;
         while (end > 0) {
           const line = readTailLine(path2, end, EVENT_TAIL_WINDOW);
           if (line === void 0) return;
@@ -25832,7 +26111,7 @@ ${lines.join("\n")}
         this.unverifiedResume.delete(sessionUuid2);
         let holds2 = false;
         try {
-          if (mark.offset <= statSync7(path2).size) {
+          if (mark.offset <= statSync8(path2).size) {
             const line = readTailLine(path2, mark.offset, EVENT_TAIL_WINDOW);
             holds2 = line !== void 0 && line.terminated && line.end === mark.offset && JSON.parse(line.text).seq === mark.afterSeq;
           }
@@ -26228,7 +26507,7 @@ ${lines.join("\n")}
           if (sealedAt === void 0) continue;
           const path2 = this.fileFor(session);
           try {
-            const age = now - Math.max(Date.parse(sealedAt), statSync7(path2).mtimeMs);
+            const age = now - Math.max(Date.parse(sealedAt), statSync8(path2).mtimeMs);
             if (age < retainMs) continue;
             const last = this.lastSeqOf(session);
             if (last < 0 || last > this.shippedThrough(session)) continue;
@@ -26250,7 +26529,7 @@ ${lines.join("\n")}
           if (removed.includes(session) || existsSync12(this.fileFor(session)))
             continue;
           try {
-            if (now - statSync7(this.bodyFileFor(session)).mtimeMs < retainMs)
+            if (now - statSync8(this.bodyFileFor(session)).mtimeMs < retainMs)
               continue;
           } catch (error) {
             this.bodyFailure(session, "cleanup", error);
@@ -27304,7 +27583,7 @@ import {
   existsSync as existsSync15,
   lstatSync as lstatSync3,
   readdirSync as readdirSync8,
-  rmdirSync as rmdirSync5,
+  rmdirSync as rmdirSync6,
   rmSync as rmSync2,
   unlinkSync as unlinkSync10
 } from "node:fs";
@@ -27541,6 +27820,24 @@ async function stripEnrollmentHooks(host, deps, settle3 = false) {
       }
     });
   }
+  let claudeCodeMcpChanged;
+  const editUserConfig = deps.editClaudeUserConfig;
+  if (editUserConfig !== void 0 && (host?.harnesses === void 0 || host.harnesses.includes("claude-code"))) {
+    const userConfig = deps.paths.claudeUserConfig;
+    attempt(userConfig, () => {
+      editUserConfig((current) => {
+        if (current === void 0) return void 0;
+        const stripped = stripClaudeCodeMcpConfig(
+          current,
+          host?.host_enrollment_id,
+          host?.displaced_mcp_servers?.["claude-code"] ?? {}
+        );
+        if (!stripped.changed) return void 0;
+        claudeCodeMcpChanged = userConfig;
+        return stripped.config;
+      });
+    });
+  }
   if (settle3 && failed3.length === 0) {
     try {
       deps.settleHarnessFiles?.();
@@ -27558,6 +27855,7 @@ async function stripEnrollmentHooks(host, deps, settle3 = false) {
     cursorChanged,
     stellaChanged,
     claudeDesktopChanged,
+    ...claudeCodeMcpChanged !== void 0 ? { claudeCodeMcpChanged } : {},
     failed: failed3
   };
 }
@@ -27670,7 +27968,7 @@ function restartForRemaining(installed, deps) {
 }
 function removeIfEmpty(dir) {
   try {
-    if (readdirSync8(dir).length === 0) rmdirSync5(dir);
+    if (readdirSync8(dir).length === 0) rmdirSync6(dir);
   } catch {
   }
 }
@@ -27760,6 +28058,11 @@ async function unenrollLocked(options, deps) {
       "      Quit Claude Desktop and open it again for the change to take effect"
     );
   }
+  if (stripped.claudeCodeMcpChanged !== void 0) {
+    deps.out(
+      `      Oxagen's MCP server removed from ${stripped.claudeCodeMcpChanged}`
+    );
+  }
   for (const failure2 of stripped.failed) {
     incomplete = true;
     warnings.push(
@@ -27891,6 +28194,7 @@ var init_unenroll = __esm({
   "../../packages/tacho/src/cli/unenroll.ts"() {
     "use strict";
     init_install_lock();
+    init_claude_code_mcp_writer();
     init_claude_desktop_writer();
     init_codex_hook_trust();
     init_codex_writer();
@@ -28639,6 +28943,32 @@ ${problems.map((problem) => `  ${problem}`).join("\n")}`
         deps.out("      already present; nothing to change");
       }
     });
+    if (harnesses.includes("claude-code") && !unhooked.includes("claude-code") && deps.editClaudeUserConfig !== void 0) {
+      deps.out(`      Claude Code MCP server: ${deps.paths.claudeUserConfig}`);
+      try {
+        const registered = registerClaudeCodeMcp(host, deps);
+        host = registered.host;
+        if (registered.result === "skipped")
+          warnings.push(
+            `Claude Code was not given Oxagen's tools: ${registered.reason ?? "unknown reason"}. Until it has them, the Stop hook asks Claude Code for no reflection.`
+          );
+        else if (registered.result === "written")
+          deps.out(
+            "      `oxagen` server written; a new Claude Code session lists Oxagen's tools"
+          );
+        else deps.out("      already present; nothing to change");
+        if (registered.displaced)
+          warnings.push(
+            "an MCP server already used the name `oxagen` in Claude Code; it was moved aside and unenroll restores it"
+          );
+      } catch (error) {
+        host = readHostFile(deps.paths.hostFile) ?? host;
+        warnings.push(
+          `Claude Code was not given Oxagen's tools: ${error instanceof Error ? error.message : String(error)}. The hooks are written. Run \`oxagen agent enroll\` again to add the tools; until then the Stop hook asks Claude Code for no reflection.`
+        );
+        deps.out("      not written (see the warning below)");
+      }
+    }
     hook("codex", () => {
       deps.out(`      Codex: ${deps.paths.codexHooks}`);
       const merged = mergeCodexHooks(deps.readCodexHooks(), hookConfig);
@@ -29013,6 +29343,7 @@ var init_enroll = __esm({
     init_credential();
     init_github();
     init_agent_deps();
+    init_claude_code_mcp();
     init_daemon_service();
     init_policy_mode();
     init_status();
@@ -29915,9 +30246,9 @@ import {
   readFileSync as readFileSync14,
   readlinkSync as readlinkSync3,
   realpathSync as realpathSync2,
-  rmdirSync as rmdirSync6,
+  rmdirSync as rmdirSync7,
   rmSync as rmSync4,
-  statSync as statSync8,
+  statSync as statSync9,
   unlinkSync as unlinkSync11
 } from "node:fs";
 import { dirname as dirname13, isAbsolute, join as join19, relative, resolve as resolve6, sep } from "node:path";
@@ -30073,7 +30404,7 @@ function removeFile(path2, tally2, note = "") {
 function removeDirIfEmpty(dir) {
   try {
     if (readdirSync9(dir).length > 0) return false;
-    rmdirSync6(dir);
+    rmdirSync7(dir);
     return true;
   } catch {
     return false;
@@ -30092,7 +30423,7 @@ function removeProfileBlock(path2, tally2) {
   if (updated === text4) return;
   try {
     const real = realpathSync2(path2);
-    writeFileAtomic(real, updated, { mode: statSync8(real).mode & 4095 });
+    writeFileAtomic(real, updated, { mode: statSync9(real).mode & 4095 });
     tally2.removed.push(`the Oxagen PATH lines in ${path2}`);
   } catch (error) {
     tally2.left.push(`cannot rewrite ${path2}: ${reasonOf3(error)}`);
@@ -31163,10 +31494,12 @@ __export(cli_exports, {
   MODEL_CREDENTIAL_HARNESSES: () => MODEL_CREDENTIAL_HARNESSES,
   SHIPPING_STALL_MS: () => SHIPPING_STALL_MS,
   STATIC_TOKEN_RENEW_WINDOW_MS: () => STATIC_TOKEN_RENEW_WINDOW_MS,
+  addMissingClaudeCodeMcp: () => addMissingClaudeCodeMcp,
   agentNameFromCommand: () => agentNameFromCommand,
   backfillCommand: () => backfillCommand,
   brokerCredentials: () => brokerCredentials,
   brokerEnvVar: () => brokerEnvVar,
+  canServeOxagenTools: () => canServeOxagenTools,
   claudeDesktopFacts: () => claudeDesktopFacts,
   claudeFacts: () => claudeFacts,
   credentialIssue: () => credentialIssue,
@@ -31192,6 +31525,7 @@ __export(cli_exports, {
   isNativeBuild: () => isNativeBuild,
   moveOffTachoNames: () => moveOffTachoNames,
   namesTachoExecutable: () => namesTachoExecutable,
+  needsClaudeCodeMcp: () => needsClaudeCodeMcp,
   observedTiers: () => observedTiers,
   oxagenRuntimeCommands: () => oxagenRuntimeCommands,
   parseCredentialMode: () => parseCredentialMode,
@@ -31200,6 +31534,7 @@ __export(cli_exports, {
   readDesktopRecord: () => readDesktopRecord,
   reassign: () => reassign,
   reassignTarget: () => reassignTarget,
+  registerClaudeCodeMcp: () => registerClaudeCodeMcp,
   removePathBlocks: () => removePathBlocks,
   repointCommands: () => repointCommands,
   resolveApiUrl: () => resolveApiUrl,
@@ -31242,6 +31577,7 @@ var init_cli = __esm({
   "../../packages/tacho/src/cli/index.ts"() {
     "use strict";
     init_backfill3();
+    init_claude_code_mcp();
     init_credential();
     init_deps();
     init_detect();
@@ -37378,6 +37714,7 @@ function reflectionAsk(record, options) {
   const state = states.get(record);
   if (state === void 0 || state.asked || state.reflected || state.signals.size === 0)
     return void 0;
+  if (!options.toolRegistered()) return void 0;
   state.asked = true;
   const full = askText(state, true);
   return full.length <= REFLECTION_ASK_MAX_CHARS ? full : askText(state, false);
@@ -38683,7 +39020,10 @@ async function routeHook(raw, env, deps, replay, harness, agent, hookId) {
       const ask = input.agent_id !== void 0 ? void 0 : reflectionAsk(record, {
         harness: record.customAgent !== void 0 ? void 0 : record.harness ?? "claude-code",
         stopHookActive: input["stop_hook_active"] === true,
-        replayed: replay !== void 0
+        replayed: replay !== void 0,
+        toolRegistered: () => deps.reflectionToolRegistered?.({
+          startedAt: record.startedAt
+        }) ?? false
       });
       const texts = [
         ...drainMidTurn(input, record, deps, events, replay, ask?.length ?? 0),
@@ -45688,7 +46028,7 @@ var init_model_proxy_listener = __esm({
 import {
   createServer as createServer4
 } from "node:http";
-import { chmodSync as chmodSync7, existsSync as existsSync18, statSync as statSync9, unlinkSync as unlinkSync12 } from "node:fs";
+import { chmodSync as chmodSync7, existsSync as existsSync18, statSync as statSync10, unlinkSync as unlinkSync12 } from "node:fs";
 import { randomBytes as randomBytes10 } from "node:crypto";
 import { createConnection } from "node:net";
 function readBody(req) {
@@ -45960,7 +46300,7 @@ function createRequestHandler(api, log, options = {}) {
 }
 async function removeStaleSocket(socketPath) {
   if (!existsSync18(socketPath)) return;
-  if (!statSync9(socketPath).isSocket()) {
+  if (!statSync10(socketPath).isSocket()) {
     throw new Error(`collector socket path is not a socket: ${socketPath}`);
   }
   const stale = await new Promise((resolve20, reject) => {
@@ -46748,7 +47088,7 @@ import {
   readdirSync as readdirSync12,
   readFileSync as readFileSync18,
   renameSync as renameSync5,
-  statSync as statSync10,
+  statSync as statSync11,
   unlinkSync as unlinkSync13,
   writeFileSync as writeFileSync3
 } from "node:fs";
@@ -46923,6 +47263,22 @@ async function initializeDaemon(options, server, port, ready) {
     ))
       memoryUses.note({ ...file, ...run });
   };
+  const reflectionToolRegistered = (session) => {
+    try {
+      const current = readHostFile(paths.hostFile) ?? host;
+      return claudeCodeSessionHasOxagenTools({
+        enrollmentId: current.host_enrollment_id,
+        hasGatewayKey: current.gateway_api_key !== void 0,
+        registeredAt: current.mcp_registered_at?.["claude-code"],
+        sessionStartedAt: session.startedAt,
+        readUserConfig: () => readJsonFileIfExists(
+          withRecordedHarnessFiles(paths, current).claudeUserConfig
+        )
+      });
+    } catch {
+      return false;
+    }
+  };
   const localServers = options.localServers === true ? createMachineLoop({
     host: () => host,
     fetch: options.fetch ?? globalThis.fetch,
@@ -46988,7 +47344,7 @@ async function initializeDaemon(options, server, port, ready) {
     processStarts: hookProcessStarts,
     adoptedChain: (sessionUuid2) => backfillLedger.chainHead(sessionUuid2)
   });
-  const priorStateWrittenAt = existsSync20(paths.daemonState) ? statSync10(paths.daemonState).mtimeMs : void 0;
+  const priorStateWrittenAt = existsSync20(paths.daemonState) ? statSync11(paths.daemonState).mtimeMs : void 0;
   const sealedState = parseSealedState(
     readJsonStateFile(
       paths.daemonSealedState,
@@ -48064,7 +48420,8 @@ async function initializeDaemon(options, server, port, ready) {
           cedar: loadCedarRuntime,
           skills,
           ...recallMemories !== void 0 ? { recallMemories } : {},
-          ...noteMemoryReads !== void 0 ? { noteMemoryReads } : {}
+          ...noteMemoryReads !== void 0 ? { noteMemoryReads } : {},
+          reflectionToolRegistered
         },
         envelope2.replay,
         envelope2.harness,
@@ -49013,7 +49370,7 @@ async function initializeDaemon(options, server, port, ready) {
       if (!name.endsWith(".json")) continue;
       const file = join34(paths.quarantine, name);
       try {
-        if (at - statSync10(file).mtimeMs < retainMs) continue;
+        if (at - statSync11(file).mtimeMs < retainMs) continue;
         unlinkSync13(file);
         removed += 1;
       } catch {
@@ -49443,6 +49800,7 @@ var init_daemon = __esm({
     init_device_key();
     init_fs();
     init_host_file();
+    init_claude_code_mcp_writer();
     init_model_base_url();
     init_model_credential();
     init_run_token();
@@ -49878,7 +50236,7 @@ import {
   constants as constants3,
   fstatSync as fstatSync2,
   lstatSync as lstatSync7,
-  mkdirSync as mkdirSync7,
+  mkdirSync as mkdirSync8,
   openSync as openSync7,
   readSync as readSync4,
   realpathSync as realpathSync5,
@@ -49887,7 +50245,7 @@ import {
 import { dirname as dirname20, join as join35, resolve as resolve13 } from "node:path";
 function bundlePath(root, relative10, create2 = false) {
   const absolute = resolve13(root);
-  if (create2) mkdirSync7(absolute, { recursive: true, mode: 448 });
+  if (create2) mkdirSync8(absolute, { recursive: true, mode: 448 });
   if (lstatSync7(absolute).isSymbolicLink() || !lstatSync7(absolute).isDirectory()) {
     throw new Error("ARP bundle root must be a directory, not a symlink");
   }
@@ -49903,7 +50261,7 @@ function bundlePath(root, relative10, create2 = false) {
       }
     } catch (error) {
       if (error.code !== "ENOENT") throw error;
-      if (create2 && i2 < parts.length - 1) mkdirSync7(current, { mode: 448 });
+      if (create2 && i2 < parts.length - 1) mkdirSync8(current, { mode: 448 });
       else if (i2 < parts.length - 1) throw error;
     }
   }
@@ -50767,7 +51125,7 @@ import {
   constants as constants4,
   fstatSync as fstatSync3,
   lstatSync as lstatSync8,
-  mkdirSync as mkdirSync8,
+  mkdirSync as mkdirSync9,
   openSync as openSync8,
   readSync as readSync5,
   realpathSync as realpathSync6,
@@ -50897,7 +51255,7 @@ function captureCheckpoint(options) {
       executable: (file.mode & 73) !== 0
     });
   }
-  mkdirSync8(out, { mode: 448 });
+  mkdirSync9(out, { mode: 448 });
   try {
     const blob = (value) => storeBlob(out, Buffer.from(jcs(value)), "application/json");
     const entries2 = [];
@@ -51084,16 +51442,16 @@ function prepareCheckpoint(options) {
     }
     return { entry: entry2, bytes: null };
   });
-  mkdirSync8(destination, { mode: 448 });
+  mkdirSync9(destination, { mode: 448 });
   try {
     const restored = join36(destination, "workspace");
-    mkdirSync8(restored, { mode: 448 });
+    mkdirSync9(restored, { mode: 448 });
     for (const { entry: entry2, bytes } of files2) {
       const path2 = join36(restored, entry2.path);
       if (entry2.kind === "directory")
-        mkdirSync8(path2, { recursive: true, mode: 448 });
+        mkdirSync9(path2, { recursive: true, mode: 448 });
       else {
-        mkdirSync8(dirname21(path2), { recursive: true, mode: 448 });
+        mkdirSync9(dirname21(path2), { recursive: true, mode: 448 });
         if (bytes === null) fail2("Workspace file has no bytes.");
         writeFileSync6(path2, bytes, {
           flag: "wx",
@@ -51102,7 +51460,7 @@ function prepareCheckpoint(options) {
       }
     }
     const promptDir = join36(restored, ".arp");
-    mkdirSync8(promptDir, { mode: 448 });
+    mkdirSync9(promptDir, { mode: 448 });
     const promptFile = join36(promptDir, "handoff.json");
     const prompt = {
       checkpoint_digest: checkpointDigest,
@@ -51677,7 +52035,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@oxagen/cli",
-      version: "2.1.4-447",
+      version: "2.1.4-460",
       description: "Oxagen governance CLI \u2014 spend, lineage, grounding, credentials, and audit (agentic coding lives in the stella CLI)",
       type: "module",
       main: "./dist/index.js",
@@ -51788,7 +52146,7 @@ var init_atomic_write = __esm({
 // src/lib/config.ts
 import { homedir as homedir8 } from "os";
 import { join as join38 } from "path";
-import { readFileSync as readFileSync21, mkdirSync as mkdirSync9, existsSync as existsSync22 } from "fs";
+import { readFileSync as readFileSync21, mkdirSync as mkdirSync10, existsSync as existsSync22 } from "fs";
 function getConfigDir() {
   return CONFIG_DIR;
 }
@@ -51809,7 +52167,7 @@ Run \`oxagen login\` to re-authenticate.
 function writeConfig(patch) {
   const current = readConfig();
   const next = { ...current, ...patch };
-  if (!existsSync22(CONFIG_DIR)) mkdirSync9(CONFIG_DIR, { recursive: true });
+  if (!existsSync22(CONFIG_DIR)) mkdirSync10(CONFIG_DIR, { recursive: true });
   atomicWriteFileSync(CONFIG_FILE, JSON.stringify(next, null, 2));
 }
 function clearConfig() {
@@ -52364,6 +52722,34 @@ var init_api = __esm({
   }
 });
 
+// src/commands/add-claude-code-mcp.ts
+async function addClaudeCodeMcp(writer) {
+  const { addMissingClaudeCodeMcp: addMissingClaudeCodeMcp2, defaultCliDeps: defaultCliDeps2, oxagenRuntimeCommands: oxagenRuntimeCommands2 } = await Promise.resolve().then(() => (init_cli(), cli_exports));
+  let added;
+  try {
+    added = addMissingClaudeCodeMcp2(
+      defaultCliDeps2({
+        out: () => void 0,
+        err: (line) => writer.writeErr(line),
+        runtime: oxagenRuntimeCommands2()
+      })
+    );
+  } catch (error) {
+    writer.writeErr(
+      `Could not check Claude Code for Oxagen's MCP server: ${error instanceof Error ? error.message : String(error)}. Run \`oxagen agent enroll\` to add it.`
+    );
+    return;
+  }
+  for (const agent of added)
+    writer.writeErr(
+      agent.ok ? `Added Oxagen's MCP server to Claude Code for ${agent.agentKey} in ${agent.path}. New Claude Code sessions list Oxagen's tools.` : `Could not add Oxagen's MCP server to Claude Code for ${agent.agentKey}: ${agent.problem ?? "unknown reason"}. The hooks keep working. Run \`oxagen agent enroll\` to try again.`
+    );
+}
+var init_add_claude_code_mcp = __esm({
+  "src/commands/add-claude-code-mcp.ts"() {
+  }
+});
+
 // src/commands/move-off-tacho.ts
 async function moveOffTacho(writer) {
   const { defaultCliDeps: defaultCliDeps2, moveOffTachoNames: moveOffTachoNames2, oxagenRuntimeCommands: oxagenRuntimeCommands2 } = await Promise.resolve().then(() => (init_cli(), cli_exports));
@@ -52463,6 +52849,7 @@ async function handleTachoEnroll(opts, writer = stdoutWriter) {
 async function handleTachoStatus(opts, writer = stdoutWriter) {
   const { status: status2 } = await Promise.resolve().then(() => (init_cli(), cli_exports));
   await moveOffTacho(writer);
+  await addClaudeCodeMcp(writer);
   const report = await status2(opts, await tachoDeps(writer));
   const reports = [report, ...report.enrollments ?? []];
   return report.enrolled && !reports.some((entry2) => entry2.shipping?.healthy === false);
@@ -52679,6 +53066,7 @@ var init_tacho = __esm({
     init_config();
     init_capture_writer();
     init_api();
+    init_add_claude_code_mcp();
     init_move_off_tacho();
   }
 });
@@ -56809,7 +57197,7 @@ var init_src2 = __esm({
 // src/commands/workspace-link.ts
 import {
   existsSync as existsSync23,
-  mkdirSync as mkdirSync10,
+  mkdirSync as mkdirSync11,
   readFileSync as readFileSync22,
   rmSync as rmSync9,
   writeFileSync as writeFileSync8
@@ -56834,7 +57222,7 @@ function readWorkspaceLink(cwd) {
 }
 function writeWorkspaceLink(cwd, link) {
   const dir = join44(cwd, ".oxagen");
-  mkdirSync10(dir, { recursive: true });
+  mkdirSync11(dir, { recursive: true });
   writeFileSync8(workspaceLinkPath(cwd), JSON.stringify(link, null, 2), "utf8");
 }
 var init_workspace_link = __esm({
@@ -58284,7 +58672,7 @@ var init_runtime_shared = __esm({
 function spanDays(from, to) {
   return (Date.parse(`${to}T00:00:00Z`) - Date.parse(`${from}T00:00:00Z`)) / DAY_MS + 1;
 }
-var costBasisSchema, microsSchema, moneySchema, costSchema, daySchema, monthSchema, SPEND_RANGE_DAYS_MAX, DAY_MS, dayRangeSchema, principalPublicIdSchema, tokenCountsSchema, spendGroupKindSchema, ratioSchema, spendFigureSchema, spendDaySchema, unmeteredRunsSchema;
+var costBasisSchema, microsSchema, moneySchema, costSchema, daySchema, monthSchema, SPEND_RANGE_DAYS_MAX, DAY_MS, dayRangeSchema, principalPublicIdSchema, tokenCountsSchema, standingTokensSchema, spendGroupKindSchema, ratioSchema, spendFigureSchema, spendDaySchema, unmeteredRunsSchema;
 var init_spend_shared = __esm({
   "../../packages/oxagen/src/contracts/spend.shared.ts"() {
     "use strict";
@@ -58333,6 +58721,11 @@ var init_spend_shared = __esm({
        */
       server_tool_request: external_exports.number().int().nonnegative()
     }).strict();
+    standingTokensSchema = external_exports.object({
+      toolDefinitionTokens: external_exports.number().int().nonnegative().nullable(),
+      contextFrameTokens: external_exports.number().int().nonnegative().nullable(),
+      steeringTokens: external_exports.number().int().nonnegative().nullable()
+    }).strict();
     spendGroupKindSchema = external_exports.enum([
       "operator",
       "agent",
@@ -73697,6 +74090,17 @@ async function runContext(runId, opts = {}, writer = stdoutWriter) {
       })
     ])
   ];
+  const composition = result2.composition ?? null;
+  if (composition !== null)
+    rows.push([
+      "All",
+      `${count5(composition.requests)} request(s)`,
+      count5(composition.promptTokens),
+      ...BLOCKS.map((kind) => {
+        const tokens = composition.blocks[kind];
+        return tokens === null ? "-" : count5(tokens);
+      })
+    ]);
   const widths = (rows[0] ?? []).map(
     (_, col) => Math.max(...rows.map((r) => (r[col] ?? "").length))
   );
@@ -74221,7 +74625,7 @@ __export(verify_exports, {
   readBundle: () => readBundle,
   verifyBundle: () => verifyBundle3
 });
-import { existsSync as existsSync25, readFileSync as readFileSync23, statSync as statSync11 } from "node:fs";
+import { existsSync as existsSync25, readFileSync as readFileSync23, statSync as statSync12 } from "node:fs";
 import { join as join47 } from "node:path";
 function readDirectory(dir) {
   const read2 = (name) => {
@@ -74267,7 +74671,7 @@ function readBundle(path2) {
   if (!existsSync25(path2)) {
     throw new BundleReadError(`${path2} does not exist.`);
   }
-  return statSync11(path2).isDirectory() ? readDirectory(path2) : readZip(path2);
+  return statSync12(path2).isDirectory() ? readDirectory(path2) : readZip(path2);
 }
 function digestLabel(state) {
   return state === "not_carried" ? "not carried" : state;
@@ -75161,7 +75565,7 @@ import {
   appendFileSync as appendFileSync4,
   existsSync as existsSync26,
   lstatSync as lstatSync9,
-  mkdirSync as mkdirSync11,
+  mkdirSync as mkdirSync12,
   readFileSync as readFileSync24,
   readdirSync as readdirSync13,
   realpathSync as realpathSync8,
@@ -75258,7 +75662,7 @@ function machineId(configDir = getConfigDir()) {
     }
     if (secret === null) {
       secret = randomBytes11(32).toString("hex");
-      mkdirSync11(configDir, { recursive: true });
+      mkdirSync12(configDir, { recursive: true });
       writeFileSync10(file, `${secret}
 `, { encoding: "utf8", mode: 384 });
     }
@@ -75810,12 +76214,12 @@ __export(pull_exports, {
 import { createHash as createHash19 } from "node:crypto";
 import {
   lstatSync as lstatSync10,
-  mkdirSync as mkdirSync12,
+  mkdirSync as mkdirSync13,
   readFileSync as readFileSync25,
   readdirSync as readdirSync14,
   realpathSync as realpathSync9,
   rmSync as rmSync10,
-  rmdirSync as rmdirSync7
+  rmdirSync as rmdirSync8
 } from "node:fs";
 import {
   dirname as dirname27,
@@ -75986,7 +76390,7 @@ function pruneEmptyDirs(root, path2) {
   while (dir.startsWith(stop + sep7)) {
     try {
       if (readdirSync14(dir).length > 0) return;
-      rmdirSync7(dir);
+      rmdirSync8(dir);
     } catch {
       return;
     }
@@ -75998,7 +76402,7 @@ function applyPlan(root, plan) {
   for (const d of plan.deletes) assertInsideOxagen(root, d);
   for (const w of plan.writes) {
     const abs = join49(root, ...w.path.split("/"));
-    mkdirSync12(dirname27(abs), { recursive: true });
+    mkdirSync13(dirname27(abs), { recursive: true });
     atomicWriteFileSync(abs, w.content);
   }
   for (const d of plan.deletes) {
@@ -113384,10 +113788,10 @@ import { execFileSync as execFileSync2 } from "node:child_process";
 import { createHash as createHash20 } from "node:crypto";
 import {
   lstatSync as lstatSync11,
-  mkdirSync as mkdirSync13,
+  mkdirSync as mkdirSync14,
   readFileSync as readFileSync26,
   readlinkSync as readlinkSync4,
-  statSync as statSync12
+  statSync as statSync13
 } from "node:fs";
 import { dirname as dirname28, isAbsolute as isAbsolute14, join as join50, relative as relative9, resolve as resolve19, sep as sep8 } from "node:path";
 function git5(cwd, args, input) {
@@ -113495,14 +113899,14 @@ function chooseBase(root, ref2) {
 }
 function isFile(path2) {
   try {
-    return statSync12(path2).isFile();
+    return statSync13(path2).isFile();
   } catch {
     return false;
   }
 }
 function isDir(path2) {
   try {
-    return statSync12(path2).isDirectory();
+    return statSync13(path2).isDirectory();
   } catch {
     return false;
   }
@@ -113618,7 +114022,7 @@ async function publishedInputs(root, deps, refresh, out) {
   }
   if (file !== null) {
     try {
-      mkdirSync13(dirname28(file), { recursive: true });
+      mkdirSync14(dirname28(file), { recursive: true });
       atomicWriteFileSync(
         file,
         JSON.stringify({