@sechroom/cli 2026.7.29 → 2026.7.30

package/dist/index.js

@@ -2371,245 +2371,605 @@ function dynamicToolDefinitions() {
   ];
 }
 
-// src/executor-run/fleet.ts
-import { readFile } from "fs/promises";
-import { resolve } from "path";
-import { spawn as spawn2 } from "child_process";
-async function readFleetConfig(path) {
-  const parsed = JSON.parse(await readFile(resolve(path), "utf8"));
-  if (!Array.isArray(parsed.instances) || parsed.instances.length === 0)
-    throw new Error("fleet config must contain a non-empty 'instances' array");
-  const keys = /* @__PURE__ */ new Set();
-  for (const entry of parsed.instances) {
-    if (!entry || typeof entry.root !== "string" || typeof entry.instanceKey !== "string")
-      throw new Error("each fleet instance requires string 'root' and 'instanceKey'");
-    if (keys.has(entry.instanceKey)) throw new Error(`duplicate fleet instanceKey '${entry.instanceKey}'`);
-    keys.add(entry.instanceKey);
-  }
-  return parsed;
+// src/executor-run/delivery.ts
+import { execFile as execFile2 } from "child_process";
+function createGitRunner(rootDir) {
+  return (bin, args) => new Promise((resolve5) => {
+    execFile2(
+      bin,
+      bin === "git" ? ["-C", rootDir, ...args] : args,
+      { cwd: rootDir, maxBuffer: 10 * 1024 * 1024 },
+      (error, stdout, stderr) => resolve5({ ok: !error, stdout: String(stdout), stderr: String(stderr) })
+    );
+  });
 }
-function entryArgs(entry) {
-  const args = ["executor", "run", "--root", resolve(entry.root), "--instance-key", entry.instanceKey];
-  const value = (flag, v) => {
-    if (v !== void 0) args.push(flag, String(v));
+function porcelainPaths(stdout) {
+  return stdout.split("\n").map((line) => line.trimEnd()).filter((line) => line.length > 3).map((line) => {
+    const path = line.slice(3);
+    const arrow = path.indexOf(" -> ");
+    return arrow >= 0 ? path.slice(arrow + 4) : path;
+  });
+}
+async function snapshotRoot(git) {
+  const branch = await git("git", ["rev-parse", "--abbrev-ref", "HEAD"]);
+  const status = await git("git", ["status", "--porcelain"]);
+  return {
+    baseBranch: branch.ok ? branch.stdout.trim() : "HEAD",
+    dirtyPaths: status.ok ? porcelainPaths(status.stdout) : []
   };
-  value("--lane", entry.lane);
-  value("--model", entry.model);
-  value("--connector", entry.connector);
-  value("--ttl", entry.ttl);
-  value("--poll-interval", entry.pollInterval);
-  value("--heartbeat-interval", entry.heartbeatInterval);
-  value("--turn-timeout", entry.turnTimeout);
-  value("--resume-turn-timeout", entry.resumeTurnTimeout);
-  value("--drain-timeout", entry.drainTimeout);
-  value("--codex-bin", entry.codexBin);
-  value("--sandbox", entry.sandbox);
-  value("--usage-reserve", entry.usageReserve);
-  return args;
 }
-function superviseFleet(config2, options = {}) {
-  const log = options.log ?? ((line) => process.stderr.write(`${line}
-`));
-  const states = /* @__PURE__ */ new Map();
-  const children = /* @__PURE__ */ new Map();
-  let stopping = false;
-  let resolveDone;
-  const done = new Promise((resolvePromise) => {
-    resolveDone = resolvePromise;
-  });
-  const status = () => log(`[fleet] ${[...states].map(([key, state]) => `${key}=${state}`).join(" ")}`);
-  const spawnEntry = options.spawnEntry ?? ((entry, args) => {
-    const script = process.argv[1];
-    if (!script) throw new Error("cannot locate the sechroom CLI entrypoint");
-    return spawn2(process.execPath, [script, ...args], {
-      cwd: resolve(entry.root),
-      stdio: ["ignore", "pipe", "pipe"],
-      env: process.env
-    });
-  });
-  for (const entry of config2.instances) {
-    const child = spawnEntry(entry, entryArgs(entry));
-    children.set(entry.instanceKey, child);
-    states.set(entry.instanceKey, "live");
-    const prefix = (text2) => {
-      for (const line of text2.replace(/\n$/, "").split("\n")) log(`[${entry.instanceKey}] ${line}`);
-    };
-    const concrete = child;
-    concrete.stdout?.on("data", (chunk) => prefix(String(chunk)));
-    concrete.stderr?.on("data", (chunk) => prefix(String(chunk)));
-    child.on("exit", (code, signal) => {
-      states.set(entry.instanceKey, "exited");
-      log(`[${entry.instanceKey}] exited (${signal ?? code ?? "unknown"})`);
-      status();
-      if ([...states.values()].every((state) => state === "exited")) resolveDone();
-    });
-  }
-  status();
+async function checkRootReady(git, allowDirty) {
+  const snapshot = await snapshotRoot(git);
+  if (snapshot.dirtyPaths.length === 0 || allowDirty)
+    return { ok: true, snapshot };
   return {
-    done,
-    shutdown(signal = "SIGINT") {
-      if (stopping) return done;
-      stopping = true;
-      for (const [key, child] of children) {
-        if (states.get(key) !== "exited") {
-          states.set(key, "stopping");
-          child.kill(signal);
-        }
-      }
-      status();
-      return done;
-    },
-    states
+    ok: false,
+    snapshot,
+    reason: `root has ${snapshot.dirtyPaths.length} uncommitted path(s) (e.g. ${snapshot.dirtyPaths[0]}) \u2014 refusing to claim; commit/clean it or pass --allow-dirty-root`
   };
 }
+async function deliverTurn(git, options) {
+  const status = await git("git", ["status", "--porcelain"]);
+  if (!status.ok)
+    return { delivered: false, note: `delivery skipped \u2014 git status failed: ${status.stderr.trim()}` };
+  const preDirty = new Set(options.snapshot.dirtyPaths);
+  const turnPaths = porcelainPaths(status.stdout).filter((p) => !preDirty.has(p));
+  if (turnPaths.length === 0)
+    return { delivered: false, note: "no file changes produced by the turn \u2014 nothing to deliver" };
+  const branch = await freeBranchName(git, `task/${slug(options.taskId)}`);
+  const created = await git("git", ["checkout", "-b", branch]);
+  if (!created.ok)
+    return {
+      delivered: false,
+      note: `delivery FAILED \u2014 could not create branch ${branch}: ${created.stderr.trim()} (changes remain uncommitted in the root)`
+    };
+  const notes = [];
+  try {
+    const added = await git("git", ["add", "--", ...turnPaths]);
+    if (!added.ok) return failBack(`git add failed: ${added.stderr.trim()}`);
+    const committed = await git("git", [
+      "commit",
+      "-m",
+      commitMessage(options)
+    ]);
+    if (!committed.ok) return failBack(`git commit failed: ${committed.stderr.trim()}`);
+    const sha = (await git("git", ["rev-parse", "--short", "HEAD"])).stdout.trim();
+    const pushed = await git("git", ["push", "-u", "origin", branch]);
+    if (!pushed.ok)
+      notes.push(`push failed (${firstLine(pushed.stderr)}) \u2014 branch is local-only`);
+    let prUrl;
+    if (options.raisePr && pushed.ok) {
+      const pr = await git("gh", [
+        "pr",
+        "create",
+        "--head",
+        branch,
+        "--title",
+        `task(${options.taskId}): ${options.title}`,
+        "--body",
+        prBody(options, sha)
+      ]);
+      if (pr.ok) prUrl = firstLine(pr.stdout);
+      else notes.push(`PR raise failed (${firstLine(pr.stderr)}) \u2014 raise manually from ${branch}`);
+    }
+    notes.unshift(
+      `delivered ${turnPaths.length} path(s) to ${branch} @ ${sha}${prUrl ? ` \u2014 PR ${prUrl}` : ""}`
+    );
+    return { delivered: true, branch, sha, prUrl, note: notes.join("; ") };
+  } finally {
+    const back = await git("git", ["checkout", options.snapshot.baseBranch]);
+    if (!back.ok)
+      options.log(
+        `delivery: could not return root to ${options.snapshot.baseBranch}: ${back.stderr.trim()}`
+      );
+  }
+  function failBack(reason) {
+    return { delivered: false, branch, note: `delivery FAILED \u2014 ${reason}` };
+  }
+}
+async function freeBranchName(git, base) {
+  for (let i = 0; ; i++) {
+    const candidate = i === 0 ? base : `${base}-${i + 1}`;
+    const exists = await git("git", [
+      "rev-parse",
+      "--verify",
+      "--quiet",
+      `refs/heads/${candidate}`
+    ]);
+    if (!exists.ok) return candidate;
+  }
+}
+function slug(taskId) {
+  return taskId.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
+}
+function commitMessage(options) {
+  return `task(${options.taskId}): ${options.title} [verdict:${options.verdict}]
 
-// src/commands/telemetry.ts
-import {
-  existsSync as existsSync7,
-  mkdirSync as mkdirSync7,
-  readFileSync as readFileSync5,
-  rmSync as rmSync3,
-  writeFileSync as writeFileSync6
-} from "fs";
-import { dirname as dirname6, join as join8 } from "path";
+Driven-executor delivery (FR-sechroom-496): work produced by the sandboxed codex turn, landed by the driver.
 
-// src/commands/hook-install.ts
-import { existsSync as existsSync6, mkdirSync as mkdirSync6, readFileSync as readFileSync4, writeFileSync as writeFileSync5 } from "fs";
-import { delimiter, dirname as dirname5, join as join7 } from "path";
+Delivered-By: sechroom executor run (${options.deliveredBy})`;
+}
+function prBody(options, sha) {
+  return `Driven-executor delivery for WLP task \`${options.taskId}\` (verdict: ${options.verdict}, commit ${sha}).
 
-// src/setup/clients.ts
-import { existsSync as existsSync5 } from "fs";
-import { homedir as homedir3 } from "os";
-import { dirname as dirname4, join as join6 } from "path";
-function claudeDesktopConfigPath(home) {
-  switch (process.platform) {
-    case "darwin":
-      return join6(home, "Library", "Application Support", "Claude", "claude_desktop_config.json");
-    case "win32":
-      return join6(process.env.APPDATA ?? join6(home, "AppData", "Roaming"), "Claude", "claude_desktop_config.json");
-    default:
-      return join6(home, ".config", "Claude", "claude_desktop_config.json");
-  }
+Work produced by a sandboxed codex turn and landed by the unsandboxed driver (FR-sechroom-496). Review against the task's acceptance before merge.`;
 }
-function clientTargets(cwd, opts = {}) {
-  const home = homedir3();
-  const claudeDir = opts.claudeDir ?? join6(home, ".claude");
-  const codexHome = opts.codexHome ?? join6(home, ".codex");
-  return {
-    "claude-code": {
-      key: "claude-code",
-      label: "Claude Code",
-      mcp: { surfaceKey: "claude-code", sectionType: SectionType.McpConfig, path: join6(cwd, ".mcp.json"), format: "json" },
-      instruction: { surfaceKey: "claude-code", path: join6(cwd, "CLAUDE.md") }
-    },
-    "claude-desktop": {
-      key: "claude-desktop",
-      label: "Claude Desktop",
-      mcp: { surfaceKey: "claude-desktop", sectionType: SectionType.McpConfig, path: claudeDesktopConfigPath(home), format: "json" },
-      instruction: { surfaceKey: "claude-desktop", path: join6(claudeDir, "CLAUDE.md") }
-    },
-    codex: {
-      key: "codex",
-      label: "Codex CLI",
-      mcp: { surfaceKey: "chatgpt", sectionType: SectionType.McpConfigToml, path: join6(codexHome, "config.toml"), format: "toml" },
-      instruction: { surfaceKey: "chatgpt", path: join6(cwd, "AGENTS.md") }
-    },
-    cursor: {
-      key: "cursor",
-      label: "Cursor",
-      mcp: { surfaceKey: "claude-code", sectionType: SectionType.McpConfig, path: join6(cwd, ".cursor", "mcp.json"), format: "json" },
-      instruction: { surfaceKey: "chatgpt", path: join6(cwd, "AGENTS.md") }
-    },
-    antigravity: {
-      key: "antigravity",
-      label: "Google Antigravity",
-      // FR-sechroom-247 — Antigravity reads MCP from a GLOBAL, home-relative
-      // `~/.gemini/config/mcp_config.json` (not cwd; not affected by
-      // CLAUDE_CONFIG_DIR / CODEX_HOME). The snippet — `serverUrl`-shaped, no
-      // `type` — comes from the `antigravity` server surface, so we don't
-      // hardcode it here. Instructions go in the project `AGENTS.md`
-      // (cross-tool, shared with Codex/Cursor).
-      mcp: { surfaceKey: "antigravity", sectionType: SectionType.McpConfig, path: join6(home, ".gemini", "config", "mcp_config.json"), format: "json" },
-      instruction: { surfaceKey: "antigravity", path: join6(cwd, "AGENTS.md") }
-    }
-  };
-}
-var ALL_CLIENT_KEYS = ["claude-code", "claude-desktop", "codex", "cursor", "antigravity"];
-var DEFAULT_CLIENT_KEY = "claude-code";
-function detectInstalledClients(cwd) {
-  const home = homedir3();
-  const detected = [];
-  if (resolveClaudeTargets({}).some((t) => existsSync5(t.dir))) detected.push("claude-code");
-  if (existsSync5(dirname4(claudeDesktopConfigPath(home)))) detected.push("claude-desktop");
-  if (resolveCodexHomes({}).some((d) => existsSync5(d))) detected.push("codex");
-  if (existsSync5(join6(home, ".cursor")) || existsSync5(join6(cwd, ".cursor"))) detected.push("cursor");
-  if (existsSync5(join6(home, ".gemini"))) detected.push("antigravity");
-  return detected;
+function firstLine(text2) {
+  return text2.trim().split("\n")[0] ?? "";
 }
 
-// src/commands/hook-install.ts
-var CLAUDE_HOOK_COMMANDS = {
-  SessionStart: "sechroom hook session-start",
-  PreCompact: "sechroom hook pre-compact",
-  SessionEnd: "sechroom hook session-end",
-  // WLP telemetry tap (D-WLP-10 + FR-352 Tier 1) — per-turn executor self-report. The one
-  // `telemetry hook` verb dispatches on hook_event_name: Stop/SubagentStop → parsed (token/context) +
-  // terminal (turn end), Notification/PermissionDenied → approval. No-op (exit 0) unless this checkout
-  // is bound via `sechroom telemetry bind`, so it's safe to wire for every Claude install; an event a
-  // given Claude Code version doesn't know is inert (never fires). Claude-only.
-  Stop: "sechroom telemetry hook",
-  SubagentStop: "sechroom telemetry hook",
-  Notification: "sechroom telemetry hook",
-  PermissionDenied: "sechroom telemetry hook"
+// src/executor-run/request.ts
+var AuthExpiredError = class extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "AuthExpiredError";
+  }
 };
-var CODEX_HOOK_COMMANDS = {
-  SessionStart: "sechroom hook session-start",
-  PreCompact: "sechroom hook pre-compact",
-  Stop: "sechroom hook session-end --debounce-minutes 10"
+var HttpError = class extends Error {
+  constructor(status, method, path, body) {
+    super(`${method} ${path} failed (${status}): ${body}`);
+    this.status = status;
+    this.method = method;
+    this.path = path;
+    this.body = body;
+    this.name = "HttpError";
+  }
+  status;
+  method;
+  path;
+  body;
 };
-function hookCommandsForSurface(surface) {
-  return surface === "claude" ? CLAUDE_HOOK_COMMANDS : CODEX_HOOK_COMMANDS;
-}
-function hasHookCommand(config2, event, command) {
-  const groups = config2.hooks?.[event] ?? [];
-  return groups.some((g) => (g.hooks ?? []).some((h) => h.type === "command" && h.command === command));
+function createAuthedRequest(cfg, deps = {}) {
+  const getToken = deps.getToken ?? requireToken;
+  const refresh = deps.refreshToken ?? forceRefreshToken;
+  const doFetch = deps.fetch ?? fetch;
+  const call = async (path, init, token) => doFetch(`${cfg.baseUrl}${path}`, {
+    ...init,
+    headers: {
+      authorization: `Bearer ${token}`,
+      tenant: cfg.tenant,
+      "content-type": "application/json",
+      "x-sechroom-surface": "cli",
+      ...init?.headers
+    }
+  });
+  return async (path, init) => {
+    const method = init?.method ?? "GET";
+    let token;
+    try {
+      token = await getToken(cfg);
+    } catch (error) {
+      throw new AuthExpiredError(
+        error instanceof Error ? error.message : String(error)
+      );
+    }
+    let response = await call(path, init, token);
+    if (response.status === 401) {
+      let fresh;
+      try {
+        fresh = await refresh(cfg);
+      } catch (error) {
+        throw new AuthExpiredError(
+          error instanceof Error ? error.message : String(error)
+        );
+      }
+      response = await call(path, init, fresh);
+      if (response.status === 401)
+        throw new AuthExpiredError(
+          `${method} ${path} still 401 after token refresh \u2014 re-authenticate (\`sechroom login\`).`
+        );
+    }
+    if (!response.ok)
+      throw new HttpError(
+        response.status,
+        method,
+        path,
+        await safeText(response)
+      );
+    return await response.json();
+  };
 }
-function mergeHooks(config2, commands) {
-  config2.hooks ??= {};
-  let added = 0;
-  for (const [event, command] of Object.entries(commands)) {
-    if (hasHookCommand(config2, event, command)) continue;
-    const groups = config2.hooks[event] ??= [];
-    groups.push({ hooks: [{ type: "command", command }] });
-    added += 1;
+async function safeText(response) {
+  try {
+    return await response.text();
+  } catch {
+    return "";
   }
-  return added;
 }
-function readJsonConfig2(path) {
-  if (!existsSync6(path)) return {};
-  const raw = readFileSync4(path, "utf8");
-  if (!raw.trim()) return {};
-  return JSON.parse(raw);
+
+// src/executor-run/driver.ts
+function verdictFor(terminalStatus) {
+  switch (terminalStatus) {
+    case "completed":
+      return "pass";
+    case "needs_approval":
+    case "cancelled":
+    case "canceled":
+      return "blocked";
+    case "error":
+    default:
+      return "soft-fail";
+  }
 }
-function installHooksJson(path, commands, dryRun) {
-  const existed = existsSync6(path) && readFileSync4(path, "utf8").trim().length > 0;
-  const config2 = readJsonConfig2(path);
-  const added = mergeHooks(config2, commands);
-  if (added === 0 && existed) return { path, status: "current" };
-  if (!dryRun) {
-    mkdirSync6(dirname5(path), { recursive: true });
-    writeFileSync5(path, JSON.stringify(config2, null, 2) + "\n");
+async function runDriverLoop(ports, options) {
+  const summary = { processed: 0, completed: 0, abandoned: 0 };
+  let admissionDeferred = false;
+  while (!options.stopping()) {
+    if (ports.checkAdmission) {
+      const admission = await ports.checkAdmission();
+      if (!admission.ok) {
+        admissionDeferred = true;
+        ports.log(
+          `ADMISSION DEFERRED \u2014 not claiming: ${admission.reason ?? "usage budget exhausted"}`
+        );
+        await ports.waitForWake(options.pollMs);
+        continue;
+      }
+      if (admissionDeferred) {
+        admissionDeferred = false;
+        ports.log("admission recovered \u2014 resuming claims");
+      }
+    }
+    if (ports.checkRootReady) {
+      const ready = await ports.checkRootReady();
+      if (!ready.ok) {
+        ports.log(`root not ready \u2014 not claiming: ${ready.reason ?? "unknown"}`);
+        await ports.waitForWake(options.pollMs);
+        continue;
+      }
+    }
+    const claim = await ports.claimNext();
+    if (!claim) {
+      await ports.waitForWake(options.pollMs);
+      continue;
+    }
+    summary.processed++;
+    ports.log(`claimed ${claim.memoryId} (lease ${claim.leaseId})`);
+    const task = await ports.loadTask(claim.memoryId);
+    const stopHeartbeat = ports.startLeaseHeartbeat(claim);
+    let result;
+    try {
+      result = await ports.runTurn(task, claim);
+    } catch (e) {
+      if (e instanceof AuthExpiredError) throw e;
+      result = { status: "crashed", reason: String(e) };
+    } finally {
+      stopHeartbeat();
+    }
+    if (result.status === "crashed" || result.status === "timeout") {
+      summary.abandoned++;
+      ports.log(
+        `ABANDONED ${claim.memoryId}: ${result.status === "timeout" ? "turn timed out" : result.reason} \u2014 lease will expire and the task re-offers (work may re-run).`
+      );
+    } else {
+      const verdict = verdictFor(result.packet?.terminal_status);
+      let text2 = closeoutText(task, result);
+      if (ports.deliver) {
+        try {
+          const delivery = await ports.deliver(claim, task, verdict);
+          ports.log(`delivery: ${delivery.note}`);
+          text2 += `
+
+Delivery: ${delivery.note}`;
+        } catch (e) {
+          if (e instanceof AuthExpiredError) throw e;
+          ports.log(`delivery threw (continuing to completion): ${String(e)}`);
+          text2 += `
+
+Delivery: FAILED unexpectedly (${String(e)}) \u2014 changes remain in the executor root.`;
+        }
+      }
+      try {
+        const done = await ports.completeLease(
+          claim,
+          verdict,
+          text2,
+          `${task.title} \u2014 driven closeout`
+        );
+        summary.completed++;
+        ports.log(
+          `completed ${claim.memoryId} verdict:${verdict} \u2192 ${done.completionMemoryId ?? done.outcome}`
+        );
+      } catch (e) {
+        if (e instanceof AuthExpiredError) throw e;
+        summary.abandoned++;
+        ports.log(
+          `COMPLETE REJECTED for ${claim.memoryId} (${String(e)}) \u2014 task will re-offer; investigate the heartbeat gap.`
+        );
+      }
+    }
+    if (options.once) break;
   }
-  return { path, status: existed ? "merged" : "created" };
+  return summary;
 }
-function installClaudeCommands(claudeDir, commands, dryRun) {
-  return installHooksJson(join7(claudeDir, "settings.json"), commands, dryRun);
+function closeoutText(task, result) {
+  if (!result.packet)
+    return `Driven codex run ended without a sechroom_closeout packet (soft-fail). Last agent message:
+
+${result.lastAgentMessage || "(none)"}`;
+  const evidence = result.packet.evidence?.length ? `
+
+Evidence:
+${result.packet.evidence.map((e) => `- ${e}`).join("\n")}` : "";
+  return `${result.packet.summary}${evidence}
+
+(terminal_status: ${result.packet.terminal_status}; driven by sechroom executor run.)`;
 }
-function installCodexCommands(codexHome, commands, dryRun) {
-  return [
-    installHooksJson(join7(codexHome, "hooks.json"), commands, dryRun),
-    installCodexFeatureFlag(join7(codexHome, "config.toml"), dryRun)
-  ];
+function startLeaseHeartbeat(beat, log, intervalMs = 3e4, timers = {}) {
+  const schedule = timers.setInterval ?? setInterval;
+  const cancel = timers.clearInterval ?? clearInterval;
+  const timer = schedule(() => {
+    void beat().catch(
+      (e) => log(`lease heartbeat failed (retrying next beat): ${String(e)}`)
+    );
+  }, intervalMs);
+  timer.unref?.();
+  return () => cancel(timer);
+}
+
+// src/executor-run/fleet.ts
+import { spawn as spawn2 } from "child_process";
+import { readFile } from "fs/promises";
+import { resolve } from "path";
+async function readFleetConfig(path) {
+  const parsed = JSON.parse(
+    await readFile(resolve(path), "utf8")
+  );
+  if (!Array.isArray(parsed.instances) || parsed.instances.length === 0)
+    throw new Error("fleet config must contain a non-empty 'instances' array");
+  const keys = /* @__PURE__ */ new Set();
+  for (const entry of parsed.instances) {
+    if (!entry || typeof entry.root !== "string" || typeof entry.instanceKey !== "string")
+      throw new Error(
+        "each fleet instance requires string 'root' and 'instanceKey'"
+      );
+    if (keys.has(entry.instanceKey))
+      throw new Error(`duplicate fleet instanceKey '${entry.instanceKey}'`);
+    keys.add(entry.instanceKey);
+  }
+  if (parsed.node !== void 0) {
+    const node = parsed.node;
+    if (!node || typeof node.instanceKey !== "string" || typeof node.connector !== "string")
+      throw new Error(
+        "fleet 'node' requires string 'instanceKey' and 'connector'"
+      );
+  }
+  return parsed;
+}
+function entryArgs(entry, parentId) {
+  const args = [
+    "executor",
+    "run",
+    "--root",
+    resolve(entry.root),
+    "--instance-key",
+    entry.instanceKey
+  ];
+  const value = (flag, v) => {
+    if (v !== void 0) args.push(flag, String(v));
+  };
+  value("--parent-id", parentId);
+  value("--lane", entry.lane);
+  value("--model", entry.model);
+  value("--connector", entry.connector);
+  value("--ttl", entry.ttl);
+  value("--poll-interval", entry.pollInterval);
+  value("--heartbeat-interval", entry.heartbeatInterval);
+  value("--turn-timeout", entry.turnTimeout);
+  value("--resume-turn-timeout", entry.resumeTurnTimeout);
+  value("--drain-timeout", entry.drainTimeout);
+  value("--codex-bin", entry.codexBin);
+  value("--sandbox", entry.sandbox);
+  value("--usage-reserve", entry.usageReserve);
+  return args;
+}
+function superviseFleet(config2, options = {}) {
+  const log = options.log ?? ((line) => process.stderr.write(`${line}
+`));
+  const states = /* @__PURE__ */ new Map();
+  const children = /* @__PURE__ */ new Map();
+  let stopping = false;
+  let resolveDone;
+  const done = new Promise((resolvePromise) => {
+    resolveDone = resolvePromise;
+  });
+  const status = () => log(
+    `[fleet] ${[...states].map(([key, state]) => `${key}=${state}`).join(" ")}`
+  );
+  const spawnEntry = options.spawnEntry ?? ((entry, args) => {
+    const script = process.argv[1];
+    if (!script) throw new Error("cannot locate the sechroom CLI entrypoint");
+    return spawn2(process.execPath, [script, ...args], {
+      cwd: resolve(entry.root),
+      stdio: ["ignore", "pipe", "pipe"],
+      env: process.env
+    });
+  });
+  for (const entry of config2.instances) {
+    const child = spawnEntry(entry, entryArgs(entry, options.parentId));
+    children.set(entry.instanceKey, child);
+    states.set(entry.instanceKey, "live");
+    const prefix = (text2) => {
+      for (const line of text2.replace(/\n$/, "").split("\n"))
+        log(`[${entry.instanceKey}] ${line}`);
+    };
+    const concrete = child;
+    concrete.stdout?.on("data", (chunk) => prefix(String(chunk)));
+    concrete.stderr?.on("data", (chunk) => prefix(String(chunk)));
+    child.on("exit", (code, signal) => {
+      states.set(entry.instanceKey, "exited");
+      log(`[${entry.instanceKey}] exited (${signal ?? code ?? "unknown"})`);
+      status();
+      if ([...states.values()].every((state) => state === "exited"))
+        resolveDone();
+    });
+  }
+  status();
+  return {
+    done,
+    shutdown(signal = "SIGINT") {
+      if (stopping) return done;
+      stopping = true;
+      for (const [key, child] of children) {
+        if (states.get(key) !== "exited") {
+          states.set(key, "stopping");
+          child.kill(signal);
+        }
+      }
+      status();
+      return done;
+    },
+    states
+  };
+}
+
+// src/commands/telemetry.ts
+import {
+  existsSync as existsSync7,
+  mkdirSync as mkdirSync7,
+  readFileSync as readFileSync5,
+  rmSync as rmSync3,
+  writeFileSync as writeFileSync6
+} from "fs";
+import { dirname as dirname6, join as join8 } from "path";
+
+// src/commands/hook-install.ts
+import { existsSync as existsSync6, mkdirSync as mkdirSync6, readFileSync as readFileSync4, writeFileSync as writeFileSync5 } from "fs";
+import { delimiter, dirname as dirname5, join as join7 } from "path";
+
+// src/setup/clients.ts
+import { existsSync as existsSync5 } from "fs";
+import { homedir as homedir3 } from "os";
+import { dirname as dirname4, join as join6 } from "path";
+function claudeDesktopConfigPath(home) {
+  switch (process.platform) {
+    case "darwin":
+      return join6(home, "Library", "Application Support", "Claude", "claude_desktop_config.json");
+    case "win32":
+      return join6(process.env.APPDATA ?? join6(home, "AppData", "Roaming"), "Claude", "claude_desktop_config.json");
+    default:
+      return join6(home, ".config", "Claude", "claude_desktop_config.json");
+  }
+}
+function clientTargets(cwd, opts = {}) {
+  const home = homedir3();
+  const claudeDir = opts.claudeDir ?? join6(home, ".claude");
+  const codexHome = opts.codexHome ?? join6(home, ".codex");
+  return {
+    "claude-code": {
+      key: "claude-code",
+      label: "Claude Code",
+      mcp: { surfaceKey: "claude-code", sectionType: SectionType.McpConfig, path: join6(cwd, ".mcp.json"), format: "json" },
+      instruction: { surfaceKey: "claude-code", path: join6(cwd, "CLAUDE.md") }
+    },
+    "claude-desktop": {
+      key: "claude-desktop",
+      label: "Claude Desktop",
+      mcp: { surfaceKey: "claude-desktop", sectionType: SectionType.McpConfig, path: claudeDesktopConfigPath(home), format: "json" },
+      instruction: { surfaceKey: "claude-desktop", path: join6(claudeDir, "CLAUDE.md") }
+    },
+    codex: {
+      key: "codex",
+      label: "Codex CLI",
+      mcp: { surfaceKey: "chatgpt", sectionType: SectionType.McpConfigToml, path: join6(codexHome, "config.toml"), format: "toml" },
+      instruction: { surfaceKey: "chatgpt", path: join6(cwd, "AGENTS.md") }
+    },
+    cursor: {
+      key: "cursor",
+      label: "Cursor",
+      mcp: { surfaceKey: "claude-code", sectionType: SectionType.McpConfig, path: join6(cwd, ".cursor", "mcp.json"), format: "json" },
+      instruction: { surfaceKey: "chatgpt", path: join6(cwd, "AGENTS.md") }
+    },
+    antigravity: {
+      key: "antigravity",
+      label: "Google Antigravity",
+      // FR-sechroom-247 — Antigravity reads MCP from a GLOBAL, home-relative
+      // `~/.gemini/config/mcp_config.json` (not cwd; not affected by
+      // CLAUDE_CONFIG_DIR / CODEX_HOME). The snippet — `serverUrl`-shaped, no
+      // `type` — comes from the `antigravity` server surface, so we don't
+      // hardcode it here. Instructions go in the project `AGENTS.md`
+      // (cross-tool, shared with Codex/Cursor).
+      mcp: { surfaceKey: "antigravity", sectionType: SectionType.McpConfig, path: join6(home, ".gemini", "config", "mcp_config.json"), format: "json" },
+      instruction: { surfaceKey: "antigravity", path: join6(cwd, "AGENTS.md") }
+    }
+  };
+}
+var ALL_CLIENT_KEYS = ["claude-code", "claude-desktop", "codex", "cursor", "antigravity"];
+var DEFAULT_CLIENT_KEY = "claude-code";
+function detectInstalledClients(cwd) {
+  const home = homedir3();
+  const detected = [];
+  if (resolveClaudeTargets({}).some((t) => existsSync5(t.dir))) detected.push("claude-code");
+  if (existsSync5(dirname4(claudeDesktopConfigPath(home)))) detected.push("claude-desktop");
+  if (resolveCodexHomes({}).some((d) => existsSync5(d))) detected.push("codex");
+  if (existsSync5(join6(home, ".cursor")) || existsSync5(join6(cwd, ".cursor"))) detected.push("cursor");
+  if (existsSync5(join6(home, ".gemini"))) detected.push("antigravity");
+  return detected;
+}
+
+// src/commands/hook-install.ts
+var CLAUDE_HOOK_COMMANDS = {
+  SessionStart: "sechroom hook session-start",
+  PreCompact: "sechroom hook pre-compact",
+  SessionEnd: "sechroom hook session-end",
+  // WLP telemetry tap (D-WLP-10 + FR-352 Tier 1) — per-turn executor self-report. The one
+  // `telemetry hook` verb dispatches on hook_event_name: Stop/SubagentStop → parsed (token/context) +
+  // terminal (turn end), Notification/PermissionDenied → approval. No-op (exit 0) unless this checkout
+  // is bound via `sechroom telemetry bind`, so it's safe to wire for every Claude install; an event a
+  // given Claude Code version doesn't know is inert (never fires). Claude-only.
+  Stop: "sechroom telemetry hook",
+  SubagentStop: "sechroom telemetry hook",
+  Notification: "sechroom telemetry hook",
+  PermissionDenied: "sechroom telemetry hook"
+};
+var CODEX_HOOK_COMMANDS = {
+  SessionStart: "sechroom hook session-start",
+  PreCompact: "sechroom hook pre-compact",
+  Stop: "sechroom hook session-end --debounce-minutes 10"
+};
+function hookCommandsForSurface(surface) {
+  return surface === "claude" ? CLAUDE_HOOK_COMMANDS : CODEX_HOOK_COMMANDS;
+}
+function hasHookCommand(config2, event, command) {
+  const groups = config2.hooks?.[event] ?? [];
+  return groups.some((g) => (g.hooks ?? []).some((h) => h.type === "command" && h.command === command));
+}
+function mergeHooks(config2, commands) {
+  config2.hooks ??= {};
+  let added = 0;
+  for (const [event, command] of Object.entries(commands)) {
+    if (hasHookCommand(config2, event, command)) continue;
+    const groups = config2.hooks[event] ??= [];
+    groups.push({ hooks: [{ type: "command", command }] });
+    added += 1;
+  }
+  return added;
+}
+function readJsonConfig2(path) {
+  if (!existsSync6(path)) return {};
+  const raw = readFileSync4(path, "utf8");
+  if (!raw.trim()) return {};
+  return JSON.parse(raw);
+}
+function installHooksJson(path, commands, dryRun) {
+  const existed = existsSync6(path) && readFileSync4(path, "utf8").trim().length > 0;
+  const config2 = readJsonConfig2(path);
+  const added = mergeHooks(config2, commands);
+  if (added === 0 && existed) return { path, status: "current" };
+  if (!dryRun) {
+    mkdirSync6(dirname5(path), { recursive: true });
+    writeFileSync5(path, JSON.stringify(config2, null, 2) + "\n");
+  }
+  return { path, status: existed ? "merged" : "created" };
+}
+function installClaudeCommands(claudeDir, commands, dryRun) {
+  return installHooksJson(join7(claudeDir, "settings.json"), commands, dryRun);
+}
+function installCodexCommands(codexHome, commands, dryRun) {
+  return [
+    installHooksJson(join7(codexHome, "hooks.json"), commands, dryRun),
+    installCodexFeatureFlag(join7(codexHome, "config.toml"), dryRun)
+  ];
 }
 function ensureCodexFeaturesHooks(content) {
   const lines = content.split("\n");
@@ -2632,764 +2992,447 @@ function ensureCodexFeaturesHooks(content) {
   return { next: lines.join("\n"), changed: true };
 }
 function installCodexFeatureFlag(path, dryRun) {
-  const existed = existsSync6(path);
-  const content = existed ? readFileSync4(path, "utf8") : "";
-  const { next, changed } = ensureCodexFeaturesHooks(content);
-  if (!changed) return { path, status: "current" };
-  if (!dryRun) {
-    mkdirSync6(dirname5(path), { recursive: true });
-    writeFileSync5(path, next);
-  }
-  return { path, status: existed ? "merged" : "created" };
-}
-function resolveSurfaces(surface, cwd) {
-  if (surface === "claude") return ["claude"];
-  if (surface === "codex") return ["codex"];
-  if (surface === "both") return ["claude", "codex"];
-  if (surface) throw new Error(`--surface must be one of claude | codex | both (got '${surface}')`);
-  const surfaces = detectHookSurfaces(cwd);
-  return surfaces.length > 0 ? surfaces : ["claude", "codex"];
-}
-function describe(result, dryRun) {
-  if (result.status === "current") return `  \u2713 ${result.path} (already configured)`;
-  const verb = dryRun ? "would" : result.status === "created" ? "created" : "updated";
-  return `  \u2713 ${result.path} (${dryRun ? `${verb} ${result.status === "created" ? "create" : "update"}` : verb})`;
-}
-var HOOK_SURFACE_LABEL = {
-  claude: "Claude Code",
-  codex: "Codex"
-};
-function installHookSurfaces(surfaces, opts) {
-  const out = [];
-  for (const surface of surfaces) {
-    if (surface === "claude") {
-      const path = join7(opts.claudeDir, "settings.json");
-      out.push({ surface, results: [installHooksJson(path, CLAUDE_HOOK_COMMANDS, opts.dryRun)] });
-    } else {
-      const hooksJson = installHooksJson(join7(opts.codexHome, "hooks.json"), CODEX_HOOK_COMMANDS, opts.dryRun);
-      const featureFlag = installCodexFeatureFlag(join7(opts.codexHome, "config.toml"), opts.dryRun);
-      out.push({ surface, results: [hooksJson, featureFlag] });
-    }
-  }
-  return out;
-}
-function detectHookSurfaces(cwd) {
-  const detected = detectInstalledClients(cwd);
-  const surfaces = [];
-  if (detected.includes("claude-code")) surfaces.push("claude");
-  if (detected.includes("codex")) surfaces.push("codex");
-  return surfaces;
-}
-function isSechroomOnPath() {
-  const pathEnv = process.env.PATH ?? "";
-  if (!pathEnv) return false;
-  const names = process.platform === "win32" ? ["sechroom.cmd", "sechroom.exe", "sechroom.bat", "sechroom"] : ["sechroom"];
-  for (const dir of pathEnv.split(delimiter)) {
-    if (!dir) continue;
-    for (const name of names) {
-      if (existsSync6(join7(dir, name))) return true;
-    }
-  }
-  return false;
-}
-function warnIfSechroomNotOnPath(write = (s) => void process.stderr.write(s)) {
-  if (isSechroomOnPath()) return false;
-  write(
-    "\n\u26A0  `sechroom` isn't on your PATH. The hooks run a bare `sechroom hook \u2026` command\n   when your agent fires them, so a non-global install (npx / local) will fail at\n   that point. Install globally so the command resolves:\n     npm i -g @sechroom/cli\n"
-  );
-  return true;
-}
-
-// src/commands/telemetry.ts
-function registerTelemetry(program2) {
-  const telemetry = program2.command("telemetry").description(
-    "Emit WLP run telemetry (an executor leg's progress events) into a decomposition run"
-  );
-  telemetry.command("emit").description(
-    "POST one progress event to /decompositions/{id}/run/telemetry (the 5a ingest)"
-  ).requiredOption(
-    "--decomposition <id>",
-    "Decomposition id whose run this event belongs to"
-  ).requiredOption("--task <id>", "Task id this event belongs to").requiredOption(
-    "--kind <kind>",
-    "Event kind: raw | parsed | approval | terminal"
-  ).option(
-    "--tokens-in <n>",
-    "Cumulative input tokens (spend meter)",
-    parseIntOpt
-  ).option(
-    "--tokens-out <n>",
-    "Cumulative output tokens (spend meter)",
-    parseIntOpt
-  ).option(
-    "--context-used <n>",
-    "Context tokens currently used (occupancy meter)",
-    parseIntOpt
-  ).option(
-    "--context-window <n>",
-    "Context window size (occupancy meter)",
-    parseIntOpt
-  ).option("--text <s>", "Raw/parsed payload text").option("--approval <state>", "Approval gate state (approval events)").option(
-    "--verdict <v>",
-    "Typed verdict (terminal events): pass | soft-fail | plan-invalid | blocked"
-  ).action(async (opts, cmd) => {
-    const json = Boolean(cmd.optsWithGlobals().json);
-    const cfg = resolveConfig(cmd.optsWithGlobals());
-    const event = {
-      taskId: opts.task,
-      kind: normalizeKind(opts.kind),
-      tokensIn: opts.tokensIn ?? null,
-      tokensOut: opts.tokensOut ?? null,
-      contextUsed: opts.contextUsed ?? null,
-      contextWindow: opts.contextWindow ?? null,
-      text: opts.text ?? null,
-      approvalState: opts.approval ?? null,
-      verdict: opts.verdict ?? null
-    };
-    let body;
-    try {
-      body = await postTelemetry(cfg, opts.decomposition, [event]);
-    } catch (e) {
-      return fail(`Telemetry emit failed: ${e.message}`);
-    }
-    if (json) {
-      emit(body, true);
-    } else {
-      process.stderr.write(
-        style.green("telemetry emitted") + style.dim(
-          ` \u2014 ${event.kind} for task ${opts.task}; run now carries ${body.eventCount} event${body.eventCount === 1 ? "" : "s"}
-`
-        )
-      );
-    }
-  });
-  telemetry.command("show <decompositionId>").description(
-    "Read a run's telemetry \u2014 per-task meters + the raw/parsed/approval/terminal timeline (GET /decompositions/{id}/run/telemetry). Returns hasTelemetry:false, not an error, before any event is ingested \u2014 so an unstarted run and a stalled one read differently. The read side of this group; `emit` is the source side. (FR-sechroom-442 slice 1 step 4; mirrors the work_plan_run_telemetry MCP tool.)"
-  ).action(async (decompositionId, _opts, cmd) => {
-    const globals = cmd.optsWithGlobals();
-    const cfg = resolveConfig(globals);
-    const data = await runApi("Reading run telemetry", async () => {
-      const client = await makeClient(cfg);
-      return client.GET("/decompositions/{id}/run/telemetry", {
-        params: { path: { id: decompositionId } }
-      });
-    });
-    emitAction(
-      data.hasTelemetry ? `read telemetry for ${style.bold(decompositionId)}` : `no telemetry yet for ${style.bold(decompositionId)} (run not started or not yet reporting)`,
-      data,
-      globals.json
-    );
-  });
-  telemetry.command("bind").description(
-    "Bind this checkout to a decomposition+task so the Stop hook auto-emits per-turn telemetry"
-  ).requiredOption(
-    "--decomposition <id>",
-    "Decomposition id this session executes"
-  ).requiredOption("--task <id>", "Task id this session executes").action((opts, cmd) => {
-    const json = Boolean(cmd.optsWithGlobals().json);
-    const dir = join8(process.cwd(), ".sechroom");
-    mkdirSync7(dir, { recursive: true });
-    const path = join8(dir, BINDING_FILE);
-    const binding = {
-      decompositionId: opts.decomposition,
-      taskId: opts.task
-    };
-    writeFileSync6(path, JSON.stringify(binding, null, 2) + "\n");
-    ensureStateDirIgnored(process.cwd());
-    if (json) {
-      emit({ bound: true, ...binding, path }, true);
-    } else {
-      process.stdout.write(
-        style.green("telemetry bound") + style.dim(
-          ` \u2014 decomposition ${binding.decompositionId}, task ${binding.taskId} (${path})
-`
-        )
-      );
-    }
-  });
-  telemetry.command("unbind").description("Clear this checkout's telemetry binding").action((_opts, cmd) => {
-    const json = Boolean(cmd.optsWithGlobals().json);
-    const path = join8(process.cwd(), ".sechroom", BINDING_FILE);
-    const existed = existsSync7(path);
-    if (existed) rmSync3(path);
-    if (json) emit({ unbound: existed, path }, true);
-    else
-      process.stdout.write(
-        existed ? "telemetry binding cleared\n" : "no telemetry binding to clear\n"
-      );
-  });
-  telemetry.command("hook").description(
-    "Per-turn telemetry self-report for Claude Code hooks \u2014 Stop/SubagentStop \u2192 parsed + terminal, Notification/PermissionDenied \u2192 approval (reads stdin; no-op unless bound). Fail-soft."
-  ).action(async (_opts, cmd) => {
-    try {
-      const raw = await readStdin();
-      const input = parseHookInput(raw);
-      const cwd = input.cwd ?? process.cwd();
-      const binding = findBinding(cwd);
-      if (!binding) return process.exit(0);
-      const usage = input.transcript_path ? parseTranscript(input.transcript_path) : null;
-      const events = buildHookEvents(input, usage, binding.taskId);
-      if (events.length === 0) return process.exit(0);
-      const cfg = resolveConfig(cmd.optsWithGlobals());
-      await postTelemetry(cfg, binding.decompositionId, events);
-      return process.exit(0);
-    } catch {
-      return process.exit(0);
-    }
-  });
-  telemetry.command("install").description(
-    "Wire the per-turn telemetry Stop hook into Claude Code settings (also folded into `sechroom hook install`)"
-  ).option(
-    "--scope <scope>",
-    "global (config dir / CLAUDE_CONFIG_DIR) or project (<cwd>/.claude) \u2014 default global"
-  ).option("--local", "alias for --scope project").option("--dry-run", "Print what would change; write nothing").action((opts, cmd) => {
-    const g = cmd.optsWithGlobals();
-    const dryRun = Boolean(opts.dryRun);
-    const cwd = process.cwd();
-    let scope;
-    try {
-      scope = opts.local ? "project" : resolveScope(opts.scope);
-    } catch (err2) {
-      process.stderr.write(`${err2.message}
-`);
-      return process.exit(2);
-    }
-    const targets = resolveClaudeTargets({
-      override: g.claudeConfigDir,
-      scope,
-      cwd
-    });
-    const commands = {
-      Stop: "sechroom telemetry hook",
-      SubagentStop: "sechroom telemetry hook",
-      Notification: "sechroom telemetry hook",
-      PermissionDenied: "sechroom telemetry hook"
-    };
-    try {
-      const multi = targets.length > 1;
-      const results = targets.map((t) => {
-        const r = installClaudeCommands(t.dir, commands, dryRun);
-        process.stdout.write(
-          `${HOOK_SURFACE_LABEL.claude}${multi ? ` (${t.label})` : ""}:
-`
-        );
-        process.stdout.write(describe(r, dryRun) + "\n");
-        return r;
-      });
-      if (dryRun) {
-        process.stdout.write("\n(dry run \u2014 no files were written.)\n");
-      } else if (results.every((r) => r.status === "current")) {
-        process.stdout.write("\nAlready up to date \u2014 nothing to change.\n");
-      } else {
-        process.stdout.write(
-          "\nRestart your agent for the hook to take effect, then bind a task with `sechroom telemetry bind`.\n"
-        );
-      }
-    } catch (err2) {
-      process.stderr.write(
-        `telemetry install failed: ${err2.message}
-`
-      );
-      return process.exit(1);
-    }
-    warnIfSechroomNotOnPath();
-    return process.exit(0);
-  });
-}
-var BINDING_FILE = "telemetry.json";
-async function postTelemetry(cfg, decompositionId, events) {
-  const token = await requireToken(cfg);
-  const resp = await fetch(
-    `${cfg.baseUrl}/decompositions/${encodeURIComponent(decompositionId)}/run/telemetry`,
-    {
-      method: "POST",
-      headers: {
-        authorization: `Bearer ${token}`,
-        tenant: cfg.tenant,
-        "content-type": "application/json",
-        "x-sechroom-surface": "cli"
-      },
-      body: JSON.stringify({ events })
-    }
-  );
-  if (!resp.ok) throw new Error(`HTTP ${resp.status}: ${await resp.text()}`);
-  return await resp.json();
-}
-function findBinding(start) {
-  let dir = start;
-  for (; ; ) {
-    const path = join8(dir, ".sechroom", BINDING_FILE);
-    if (existsSync7(path)) {
-      try {
-        const b = JSON.parse(
-          readFileSync5(path, "utf8")
-        );
-        if (b.decompositionId && b.taskId)
-          return { decompositionId: b.decompositionId, taskId: b.taskId };
-      } catch {
-      }
-      return null;
-    }
-    const parent = dirname6(dir);
-    if (parent === dir) return null;
-    dir = parent;
-  }
-}
-function parseTranscript(path) {
-  if (!existsSync7(path)) return null;
-  let tokensIn = 0;
-  let tokensOut = 0;
-  let contextUsed = 0;
-  let model = "";
-  for (const line of readFileSync5(path, "utf8").split("\n")) {
-    if (!line.trim()) continue;
-    let obj;
-    try {
-      obj = JSON.parse(line);
-    } catch {
-      continue;
-    }
-    const usage = obj.type === "assistant" ? obj.message?.usage : void 0;
-    if (!usage) continue;
-    const input = (usage.input_tokens ?? 0) + (usage.cache_creation_input_tokens ?? 0) + (usage.cache_read_input_tokens ?? 0);
-    tokensIn += input;
-    tokensOut += usage.output_tokens ?? 0;
-    contextUsed = input;
-    if (obj.message?.model) model = obj.message.model;
-  }
-  if (tokensIn === 0 && tokensOut === 0) return null;
-  return { tokensIn, tokensOut, contextUsed, contextWindow: windowFor(model, contextUsed), modelId: model || null };
-}
-function windowFor(model, contextUsed = 0) {
-  const m = model.toLowerCase();
-  if (m.includes("[1m]") || m.includes("-1m")) return 1e6;
-  return contextUsed > 2e5 ? 1e6 : 2e5;
-}
-function buildHookEvents(input, usage, taskId) {
-  const events = [];
-  const base = (kind, over) => ({
-    taskId,
-    kind,
-    tokensIn: null,
-    tokensOut: null,
-    contextUsed: null,
-    contextWindow: null,
-    text: null,
-    approvalState: null,
-    verdict: null,
-    modelId: null,
-    ...over
-  });
-  if (usage) {
-    events.push(
-      base("Parsed", {
-        tokensIn: usage.tokensIn,
-        tokensOut: usage.tokensOut,
-        contextUsed: usage.contextUsed,
-        contextWindow: usage.contextWindow,
-        modelId: usage.modelId
-      })
-    );
-  }
-  switch (input.hook_event_name) {
-    case "PermissionDenied":
-      events.push(
-        base("Approval", {
-          approvalState: "denied",
-          text: input.tool_name ?? input.message ?? null
-        })
-      );
-      break;
-    case "Notification":
-      if (isPermissionNotification(input))
-        events.push(base("Approval", { text: input.message ?? null }));
-      break;
-    case "Stop":
-    case "SubagentStop":
-      events.push(base("Terminal", { text: input.last_assistant_message ?? null }));
-      break;
+  const existed = existsSync6(path);
+  const content = existed ? readFileSync4(path, "utf8") : "";
+  const { next, changed } = ensureCodexFeaturesHooks(content);
+  if (!changed) return { path, status: "current" };
+  if (!dryRun) {
+    mkdirSync6(dirname5(path), { recursive: true });
+    writeFileSync5(path, next);
   }
-  return events;
+  return { path, status: existed ? "merged" : "created" };
 }
-function isPermissionNotification(input) {
-  const t = (input.notification_type ?? input.type ?? "").toLowerCase();
-  if (t) return t.includes("permission");
-  return (input.message ?? "").toLowerCase().includes("permission");
+function resolveSurfaces(surface, cwd) {
+  if (surface === "claude") return ["claude"];
+  if (surface === "codex") return ["codex"];
+  if (surface === "both") return ["claude", "codex"];
+  if (surface) throw new Error(`--surface must be one of claude | codex | both (got '${surface}')`);
+  const surfaces = detectHookSurfaces(cwd);
+  return surfaces.length > 0 ? surfaces : ["claude", "codex"];
 }
-async function readStdin() {
-  if (process.stdin.isTTY) return "";
-  const chunks = [];
-  for await (const chunk of process.stdin) chunks.push(chunk);
-  return Buffer.concat(chunks).toString("utf8");
+function describe(result, dryRun) {
+  if (result.status === "current") return `  \u2713 ${result.path} (already configured)`;
+  const verb = dryRun ? "would" : result.status === "created" ? "created" : "updated";
+  return `  \u2713 ${result.path} (${dryRun ? `${verb} ${result.status === "created" ? "create" : "update"}` : verb})`;
 }
-function parseHookInput(raw) {
-  if (!raw.trim()) return {};
-  try {
-    return JSON.parse(raw);
-  } catch {
-    return {};
+var HOOK_SURFACE_LABEL = {
+  claude: "Claude Code",
+  codex: "Codex"
+};
+function installHookSurfaces(surfaces, opts) {
+  const out = [];
+  for (const surface of surfaces) {
+    if (surface === "claude") {
+      const path = join7(opts.claudeDir, "settings.json");
+      out.push({ surface, results: [installHooksJson(path, CLAUDE_HOOK_COMMANDS, opts.dryRun)] });
+    } else {
+      const hooksJson = installHooksJson(join7(opts.codexHome, "hooks.json"), CODEX_HOOK_COMMANDS, opts.dryRun);
+      const featureFlag = installCodexFeatureFlag(join7(opts.codexHome, "config.toml"), opts.dryRun);
+      out.push({ surface, results: [hooksJson, featureFlag] });
+    }
   }
+  return out;
 }
-var KINDS = {
-  raw: "Raw",
-  parsed: "Parsed",
-  approval: "Approval",
-  terminal: "Terminal"
-};
-function normalizeKind(k) {
-  const v = KINDS[k.toLowerCase()];
-  if (!v)
-    fail(
-      `Unknown --kind '${k}'. Expected one of: raw, parsed, approval, terminal.`
-    );
-  return v;
+function detectHookSurfaces(cwd) {
+  const detected = detectInstalledClients(cwd);
+  const surfaces = [];
+  if (detected.includes("claude-code")) surfaces.push("claude");
+  if (detected.includes("codex")) surfaces.push("codex");
+  return surfaces;
 }
-function parseIntOpt(v) {
-  const n = Number.parseInt(v, 10);
-  if (Number.isNaN(n)) fail(`Expected an integer, got '${v}'.`);
-  return n;
+function isSechroomOnPath() {
+  const pathEnv = process.env.PATH ?? "";
+  if (!pathEnv) return false;
+  const names = process.platform === "win32" ? ["sechroom.cmd", "sechroom.exe", "sechroom.bat", "sechroom"] : ["sechroom"];
+  for (const dir of pathEnv.split(delimiter)) {
+    if (!dir) continue;
+    for (const name of names) {
+      if (existsSync6(join7(dir, name))) return true;
+    }
+  }
+  return false;
+}
+function warnIfSechroomNotOnPath(write = (s) => void process.stderr.write(s)) {
+  if (isSechroomOnPath()) return false;
+  write(
+    "\n\u26A0  `sechroom` isn't on your PATH. The hooks run a bare `sechroom hook \u2026` command\n   when your agent fires them, so a non-global install (npx / local) will fail at\n   that point. Install globally so the command resolves:\n     npm i -g @sechroom/cli\n"
+  );
+  return true;
 }
 
-// src/executor-run/delivery.ts
-import { execFile as execFile2 } from "child_process";
-function createGitRunner(rootDir) {
-  return (bin, args) => new Promise((resolve5) => {
-    execFile2(
-      bin,
-      bin === "git" ? ["-C", rootDir, ...args] : args,
-      { cwd: rootDir, maxBuffer: 10 * 1024 * 1024 },
-      (error, stdout, stderr) => resolve5({ ok: !error, stdout: String(stdout), stderr: String(stderr) })
-    );
+// src/commands/telemetry.ts
+function registerTelemetry(program2) {
+  const telemetry = program2.command("telemetry").description(
+    "Emit WLP run telemetry (an executor leg's progress events) into a decomposition run"
+  );
+  telemetry.command("emit").description(
+    "POST one progress event to /decompositions/{id}/run/telemetry (the 5a ingest)"
+  ).requiredOption(
+    "--decomposition <id>",
+    "Decomposition id whose run this event belongs to"
+  ).requiredOption("--task <id>", "Task id this event belongs to").requiredOption(
+    "--kind <kind>",
+    "Event kind: raw | parsed | approval | terminal"
+  ).option(
+    "--tokens-in <n>",
+    "Cumulative input tokens (spend meter)",
+    parseIntOpt
+  ).option(
+    "--tokens-out <n>",
+    "Cumulative output tokens (spend meter)",
+    parseIntOpt
+  ).option(
+    "--context-used <n>",
+    "Context tokens currently used (occupancy meter)",
+    parseIntOpt
+  ).option(
+    "--context-window <n>",
+    "Context window size (occupancy meter)",
+    parseIntOpt
+  ).option("--text <s>", "Raw/parsed payload text").option("--approval <state>", "Approval gate state (approval events)").option(
+    "--verdict <v>",
+    "Typed verdict (terminal events): pass | soft-fail | plan-invalid | blocked"
+  ).action(async (opts, cmd) => {
+    const json = Boolean(cmd.optsWithGlobals().json);
+    const cfg = resolveConfig(cmd.optsWithGlobals());
+    const event = {
+      taskId: opts.task,
+      kind: normalizeKind(opts.kind),
+      tokensIn: opts.tokensIn ?? null,
+      tokensOut: opts.tokensOut ?? null,
+      contextUsed: opts.contextUsed ?? null,
+      contextWindow: opts.contextWindow ?? null,
+      text: opts.text ?? null,
+      approvalState: opts.approval ?? null,
+      verdict: opts.verdict ?? null
+    };
+    let body;
+    try {
+      body = await postTelemetry(cfg, opts.decomposition, [event]);
+    } catch (e) {
+      return fail(`Telemetry emit failed: ${e.message}`);
+    }
+    if (json) {
+      emit(body, true);
+    } else {
+      process.stderr.write(
+        style.green("telemetry emitted") + style.dim(
+          ` \u2014 ${event.kind} for task ${opts.task}; run now carries ${body.eventCount} event${body.eventCount === 1 ? "" : "s"}
+`
+        )
+      );
+    }
   });
-}
-function porcelainPaths(stdout) {
-  return stdout.split("\n").map((line) => line.trimEnd()).filter((line) => line.length > 3).map((line) => {
-    const path = line.slice(3);
-    const arrow = path.indexOf(" -> ");
-    return arrow >= 0 ? path.slice(arrow + 4) : path;
+  telemetry.command("show <decompositionId>").description(
+    "Read a run's telemetry \u2014 per-task meters + the raw/parsed/approval/terminal timeline (GET /decompositions/{id}/run/telemetry). Returns hasTelemetry:false, not an error, before any event is ingested \u2014 so an unstarted run and a stalled one read differently. The read side of this group; `emit` is the source side. (FR-sechroom-442 slice 1 step 4; mirrors the work_plan_run_telemetry MCP tool.)"
+  ).action(async (decompositionId, _opts, cmd) => {
+    const globals = cmd.optsWithGlobals();
+    const cfg = resolveConfig(globals);
+    const data = await runApi("Reading run telemetry", async () => {
+      const client = await makeClient(cfg);
+      return client.GET("/decompositions/{id}/run/telemetry", {
+        params: { path: { id: decompositionId } }
+      });
+    });
+    emitAction(
+      data.hasTelemetry ? `read telemetry for ${style.bold(decompositionId)}` : `no telemetry yet for ${style.bold(decompositionId)} (run not started or not yet reporting)`,
+      data,
+      globals.json
+    );
   });
-}
-async function snapshotRoot(git) {
-  const branch = await git("git", ["rev-parse", "--abbrev-ref", "HEAD"]);
-  const status = await git("git", ["status", "--porcelain"]);
-  return {
-    baseBranch: branch.ok ? branch.stdout.trim() : "HEAD",
-    dirtyPaths: status.ok ? porcelainPaths(status.stdout) : []
-  };
-}
-async function checkRootReady(git, allowDirty) {
-  const snapshot = await snapshotRoot(git);
-  if (snapshot.dirtyPaths.length === 0 || allowDirty)
-    return { ok: true, snapshot };
-  return {
-    ok: false,
-    snapshot,
-    reason: `root has ${snapshot.dirtyPaths.length} uncommitted path(s) (e.g. ${snapshot.dirtyPaths[0]}) \u2014 refusing to claim; commit/clean it or pass --allow-dirty-root`
-  };
-}
-async function deliverTurn(git, options) {
-  const status = await git("git", ["status", "--porcelain"]);
-  if (!status.ok)
-    return { delivered: false, note: `delivery skipped \u2014 git status failed: ${status.stderr.trim()}` };
-  const preDirty = new Set(options.snapshot.dirtyPaths);
-  const turnPaths = porcelainPaths(status.stdout).filter((p) => !preDirty.has(p));
-  if (turnPaths.length === 0)
-    return { delivered: false, note: "no file changes produced by the turn \u2014 nothing to deliver" };
-  const branch = await freeBranchName(git, `task/${slug(options.taskId)}`);
-  const created = await git("git", ["checkout", "-b", branch]);
-  if (!created.ok)
-    return {
-      delivered: false,
-      note: `delivery FAILED \u2014 could not create branch ${branch}: ${created.stderr.trim()} (changes remain uncommitted in the root)`
-    };
-  const notes = [];
-  try {
-    const added = await git("git", ["add", "--", ...turnPaths]);
-    if (!added.ok) return failBack(`git add failed: ${added.stderr.trim()}`);
-    const committed = await git("git", [
-      "commit",
-      "-m",
-      commitMessage(options)
-    ]);
-    if (!committed.ok) return failBack(`git commit failed: ${committed.stderr.trim()}`);
-    const sha = (await git("git", ["rev-parse", "--short", "HEAD"])).stdout.trim();
-    const pushed = await git("git", ["push", "-u", "origin", branch]);
-    if (!pushed.ok)
-      notes.push(`push failed (${firstLine(pushed.stderr)}) \u2014 branch is local-only`);
-    let prUrl;
-    if (options.raisePr && pushed.ok) {
-      const pr = await git("gh", [
-        "pr",
-        "create",
-        "--head",
-        branch,
-        "--title",
-        `task(${options.taskId}): ${options.title}`,
-        "--body",
-        prBody(options, sha)
-      ]);
-      if (pr.ok) prUrl = firstLine(pr.stdout);
-      else notes.push(`PR raise failed (${firstLine(pr.stderr)}) \u2014 raise manually from ${branch}`);
+  telemetry.command("bind").description(
+    "Bind this checkout to a decomposition+task so the Stop hook auto-emits per-turn telemetry"
+  ).requiredOption(
+    "--decomposition <id>",
+    "Decomposition id this session executes"
+  ).requiredOption("--task <id>", "Task id this session executes").action((opts, cmd) => {
+    const json = Boolean(cmd.optsWithGlobals().json);
+    const dir = join8(process.cwd(), ".sechroom");
+    mkdirSync7(dir, { recursive: true });
+    const path = join8(dir, BINDING_FILE);
+    const binding = {
+      decompositionId: opts.decomposition,
+      taskId: opts.task
+    };
+    writeFileSync6(path, JSON.stringify(binding, null, 2) + "\n");
+    ensureStateDirIgnored(process.cwd());
+    if (json) {
+      emit({ bound: true, ...binding, path }, true);
+    } else {
+      process.stdout.write(
+        style.green("telemetry bound") + style.dim(
+          ` \u2014 decomposition ${binding.decompositionId}, task ${binding.taskId} (${path})
+`
+        )
+      );
     }
-    notes.unshift(
-      `delivered ${turnPaths.length} path(s) to ${branch} @ ${sha}${prUrl ? ` \u2014 PR ${prUrl}` : ""}`
-    );
-    return { delivered: true, branch, sha, prUrl, note: notes.join("; ") };
-  } finally {
-    const back = await git("git", ["checkout", options.snapshot.baseBranch]);
-    if (!back.ok)
-      options.log(
-        `delivery: could not return root to ${options.snapshot.baseBranch}: ${back.stderr.trim()}`
+  });
+  telemetry.command("unbind").description("Clear this checkout's telemetry binding").action((_opts, cmd) => {
+    const json = Boolean(cmd.optsWithGlobals().json);
+    const path = join8(process.cwd(), ".sechroom", BINDING_FILE);
+    const existed = existsSync7(path);
+    if (existed) rmSync3(path);
+    if (json) emit({ unbound: existed, path }, true);
+    else
+      process.stdout.write(
+        existed ? "telemetry binding cleared\n" : "no telemetry binding to clear\n"
       );
-  }
-  function failBack(reason) {
-    return { delivered: false, branch, note: `delivery FAILED \u2014 ${reason}` };
-  }
-}
-async function freeBranchName(git, base) {
-  for (let i = 0; ; i++) {
-    const candidate = i === 0 ? base : `${base}-${i + 1}`;
-    const exists = await git("git", [
-      "rev-parse",
-      "--verify",
-      "--quiet",
-      `refs/heads/${candidate}`
-    ]);
-    if (!exists.ok) return candidate;
-  }
-}
-function slug(taskId) {
-  return taskId.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
-}
-function commitMessage(options) {
-  return `task(${options.taskId}): ${options.title} [verdict:${options.verdict}]
-
-Driven-executor delivery (FR-sechroom-496): work produced by the sandboxed codex turn, landed by the driver.
-
-Delivered-By: sechroom executor run (${options.deliveredBy})`;
-}
-function prBody(options, sha) {
-  return `Driven-executor delivery for WLP task \`${options.taskId}\` (verdict: ${options.verdict}, commit ${sha}).
-
-Work produced by a sandboxed codex turn and landed by the unsandboxed driver (FR-sechroom-496). Review against the task's acceptance before merge.`;
-}
-function firstLine(text2) {
-  return text2.trim().split("\n")[0] ?? "";
-}
-
-// src/executor-run/request.ts
-var AuthExpiredError = class extends Error {
-  constructor(message) {
-    super(message);
-    this.name = "AuthExpiredError";
-  }
-};
-var HttpError = class extends Error {
-  constructor(status, method, path, body) {
-    super(`${method} ${path} failed (${status}): ${body}`);
-    this.status = status;
-    this.method = method;
-    this.path = path;
-    this.body = body;
-    this.name = "HttpError";
-  }
-  status;
-  method;
-  path;
-  body;
-};
-function createAuthedRequest(cfg, deps = {}) {
-  const getToken = deps.getToken ?? requireToken;
-  const refresh = deps.refreshToken ?? forceRefreshToken;
-  const doFetch = deps.fetch ?? fetch;
-  const call = async (path, init, token) => doFetch(`${cfg.baseUrl}${path}`, {
-    ...init,
-    headers: {
-      authorization: `Bearer ${token}`,
-      tenant: cfg.tenant,
-      "content-type": "application/json",
-      "x-sechroom-surface": "cli",
-      ...init?.headers
+  });
+  telemetry.command("hook").description(
+    "Per-turn telemetry self-report for Claude Code hooks \u2014 Stop/SubagentStop \u2192 parsed + terminal, Notification/PermissionDenied \u2192 approval (reads stdin; no-op unless bound). Fail-soft."
+  ).action(async (_opts, cmd) => {
+    try {
+      const raw = await readStdin();
+      const input = parseHookInput(raw);
+      const cwd = input.cwd ?? process.cwd();
+      const binding = findBinding(cwd);
+      if (!binding) return process.exit(0);
+      const usage = input.transcript_path ? parseTranscript(input.transcript_path) : null;
+      const events = buildHookEvents(input, usage, binding.taskId);
+      if (events.length === 0) return process.exit(0);
+      const cfg = resolveConfig(cmd.optsWithGlobals());
+      await postTelemetry(cfg, binding.decompositionId, events);
+      return process.exit(0);
+    } catch {
+      return process.exit(0);
     }
   });
-  return async (path, init) => {
-    const method = init?.method ?? "GET";
-    let token;
+  telemetry.command("install").description(
+    "Wire the per-turn telemetry Stop hook into Claude Code settings (also folded into `sechroom hook install`)"
+  ).option(
+    "--scope <scope>",
+    "global (config dir / CLAUDE_CONFIG_DIR) or project (<cwd>/.claude) \u2014 default global"
+  ).option("--local", "alias for --scope project").option("--dry-run", "Print what would change; write nothing").action((opts, cmd) => {
+    const g = cmd.optsWithGlobals();
+    const dryRun = Boolean(opts.dryRun);
+    const cwd = process.cwd();
+    let scope;
     try {
-      token = await getToken(cfg);
-    } catch (error) {
-      throw new AuthExpiredError(
-        error instanceof Error ? error.message : String(error)
-      );
+      scope = opts.local ? "project" : resolveScope(opts.scope);
+    } catch (err2) {
+      process.stderr.write(`${err2.message}
+`);
+      return process.exit(2);
     }
-    let response = await call(path, init, token);
-    if (response.status === 401) {
-      let fresh;
-      try {
-        fresh = await refresh(cfg);
-      } catch (error) {
-        throw new AuthExpiredError(
-          error instanceof Error ? error.message : String(error)
+    const targets = resolveClaudeTargets({
+      override: g.claudeConfigDir,
+      scope,
+      cwd
+    });
+    const commands = {
+      Stop: "sechroom telemetry hook",
+      SubagentStop: "sechroom telemetry hook",
+      Notification: "sechroom telemetry hook",
+      PermissionDenied: "sechroom telemetry hook"
+    };
+    try {
+      const multi = targets.length > 1;
+      const results = targets.map((t) => {
+        const r = installClaudeCommands(t.dir, commands, dryRun);
+        process.stdout.write(
+          `${HOOK_SURFACE_LABEL.claude}${multi ? ` (${t.label})` : ""}:
+`
         );
-      }
-      response = await call(path, init, fresh);
-      if (response.status === 401)
-        throw new AuthExpiredError(
-          `${method} ${path} still 401 after token refresh \u2014 re-authenticate (\`sechroom login\`).`
+        process.stdout.write(describe(r, dryRun) + "\n");
+        return r;
+      });
+      if (dryRun) {
+        process.stdout.write("\n(dry run \u2014 no files were written.)\n");
+      } else if (results.every((r) => r.status === "current")) {
+        process.stdout.write("\nAlready up to date \u2014 nothing to change.\n");
+      } else {
+        process.stdout.write(
+          "\nRestart your agent for the hook to take effect, then bind a task with `sechroom telemetry bind`.\n"
         );
-    }
-    if (!response.ok)
-      throw new HttpError(
-        response.status,
-        method,
-        path,
-        await safeText(response)
+      }
+    } catch (err2) {
+      process.stderr.write(
+        `telemetry install failed: ${err2.message}
+`
       );
-    return await response.json();
-  };
-}
-async function safeText(response) {
-  try {
-    return await response.text();
-  } catch {
-    return "";
-  }
-}
-
-// src/executor-run/driver.ts
-function verdictFor(terminalStatus) {
-  switch (terminalStatus) {
-    case "completed":
-      return "pass";
-    case "needs_approval":
-    case "cancelled":
-    case "canceled":
-      return "blocked";
-    case "error":
-    default:
-      return "soft-fail";
-  }
+      return process.exit(1);
+    }
+    warnIfSechroomNotOnPath();
+    return process.exit(0);
+  });
 }
-async function runDriverLoop(ports, options) {
-  const summary = { processed: 0, completed: 0, abandoned: 0 };
-  let admissionDeferred = false;
-  while (!options.stopping()) {
-    if (ports.checkAdmission) {
-      const admission = await ports.checkAdmission();
-      if (!admission.ok) {
-        admissionDeferred = true;
-        ports.log(
-          `ADMISSION DEFERRED \u2014 not claiming: ${admission.reason ?? "usage budget exhausted"}`
-        );
-        await ports.waitForWake(options.pollMs);
-        continue;
-      }
-      if (admissionDeferred) {
-        admissionDeferred = false;
-        ports.log("admission recovered \u2014 resuming claims");
-      }
+var BINDING_FILE = "telemetry.json";
+async function postTelemetry(cfg, decompositionId, events) {
+  const token = await requireToken(cfg);
+  const resp = await fetch(
+    `${cfg.baseUrl}/decompositions/${encodeURIComponent(decompositionId)}/run/telemetry`,
+    {
+      method: "POST",
+      headers: {
+        authorization: `Bearer ${token}`,
+        tenant: cfg.tenant,
+        "content-type": "application/json",
+        "x-sechroom-surface": "cli"
+      },
+      body: JSON.stringify({ events })
     }
-    if (ports.checkRootReady) {
-      const ready = await ports.checkRootReady();
-      if (!ready.ok) {
-        ports.log(`root not ready \u2014 not claiming: ${ready.reason ?? "unknown"}`);
-        await ports.waitForWake(options.pollMs);
-        continue;
+  );
+  if (!resp.ok) throw new Error(`HTTP ${resp.status}: ${await resp.text()}`);
+  return await resp.json();
+}
+function findBinding(start) {
+  let dir = start;
+  for (; ; ) {
+    const path = join8(dir, ".sechroom", BINDING_FILE);
+    if (existsSync7(path)) {
+      try {
+        const b = JSON.parse(
+          readFileSync5(path, "utf8")
+        );
+        if (b.decompositionId && b.taskId)
+          return { decompositionId: b.decompositionId, taskId: b.taskId };
+      } catch {
       }
+      return null;
     }
-    const claim = await ports.claimNext();
-    if (!claim) {
-      await ports.waitForWake(options.pollMs);
-      continue;
-    }
-    summary.processed++;
-    ports.log(`claimed ${claim.memoryId} (lease ${claim.leaseId})`);
-    const task = await ports.loadTask(claim.memoryId);
-    const stopHeartbeat = ports.startLeaseHeartbeat(claim);
-    let result;
+    const parent = dirname6(dir);
+    if (parent === dir) return null;
+    dir = parent;
+  }
+}
+function parseTranscript(path) {
+  if (!existsSync7(path)) return null;
+  let tokensIn = 0;
+  let tokensOut = 0;
+  let contextUsed = 0;
+  let model = "";
+  for (const line of readFileSync5(path, "utf8").split("\n")) {
+    if (!line.trim()) continue;
+    let obj;
     try {
-      result = await ports.runTurn(task, claim);
-    } catch (e) {
-      if (e instanceof AuthExpiredError) throw e;
-      result = { status: "crashed", reason: String(e) };
-    } finally {
-      stopHeartbeat();
+      obj = JSON.parse(line);
+    } catch {
+      continue;
     }
-    if (result.status === "crashed" || result.status === "timeout") {
-      summary.abandoned++;
-      ports.log(
-        `ABANDONED ${claim.memoryId}: ${result.status === "timeout" ? "turn timed out" : result.reason} \u2014 lease will expire and the task re-offers (work may re-run).`
+    const usage = obj.type === "assistant" ? obj.message?.usage : void 0;
+    if (!usage) continue;
+    const input = (usage.input_tokens ?? 0) + (usage.cache_creation_input_tokens ?? 0) + (usage.cache_read_input_tokens ?? 0);
+    tokensIn += input;
+    tokensOut += usage.output_tokens ?? 0;
+    contextUsed = input;
+    if (obj.message?.model) model = obj.message.model;
+  }
+  if (tokensIn === 0 && tokensOut === 0) return null;
+  return { tokensIn, tokensOut, contextUsed, contextWindow: windowFor(model, contextUsed), modelId: model || null };
+}
+function windowFor(model, contextUsed = 0) {
+  const m = model.toLowerCase();
+  if (m.includes("[1m]") || m.includes("-1m")) return 1e6;
+  return contextUsed > 2e5 ? 1e6 : 2e5;
+}
+function buildHookEvents(input, usage, taskId) {
+  const events = [];
+  const base = (kind, over) => ({
+    taskId,
+    kind,
+    tokensIn: null,
+    tokensOut: null,
+    contextUsed: null,
+    contextWindow: null,
+    text: null,
+    approvalState: null,
+    verdict: null,
+    modelId: null,
+    ...over
+  });
+  if (usage) {
+    events.push(
+      base("Parsed", {
+        tokensIn: usage.tokensIn,
+        tokensOut: usage.tokensOut,
+        contextUsed: usage.contextUsed,
+        contextWindow: usage.contextWindow,
+        modelId: usage.modelId
+      })
+    );
+  }
+  switch (input.hook_event_name) {
+    case "PermissionDenied":
+      events.push(
+        base("Approval", {
+          approvalState: "denied",
+          text: input.tool_name ?? input.message ?? null
+        })
       );
-    } else {
-      const verdict = verdictFor(result.packet?.terminal_status);
-      let text2 = closeoutText(task, result);
-      if (ports.deliver) {
-        try {
-          const delivery = await ports.deliver(claim, task, verdict);
-          ports.log(`delivery: ${delivery.note}`);
-          text2 += `
-
-Delivery: ${delivery.note}`;
-        } catch (e) {
-          if (e instanceof AuthExpiredError) throw e;
-          ports.log(`delivery threw (continuing to completion): ${String(e)}`);
-          text2 += `
-
-Delivery: FAILED unexpectedly (${String(e)}) \u2014 changes remain in the executor root.`;
-        }
-      }
-      try {
-        const done = await ports.completeLease(
-          claim,
-          verdict,
-          text2,
-          `${task.title} \u2014 driven closeout`
-        );
-        summary.completed++;
-        ports.log(
-          `completed ${claim.memoryId} verdict:${verdict} \u2192 ${done.completionMemoryId ?? done.outcome}`
-        );
-      } catch (e) {
-        if (e instanceof AuthExpiredError) throw e;
-        summary.abandoned++;
-        ports.log(
-          `COMPLETE REJECTED for ${claim.memoryId} (${String(e)}) \u2014 task will re-offer; investigate the heartbeat gap.`
-        );
-      }
-    }
-    if (options.once) break;
+      break;
+    case "Notification":
+      if (isPermissionNotification(input))
+        events.push(base("Approval", { text: input.message ?? null }));
+      break;
+    case "Stop":
+    case "SubagentStop":
+      events.push(base("Terminal", { text: input.last_assistant_message ?? null }));
+      break;
   }
-  return summary;
+  return events;
 }
-function closeoutText(task, result) {
-  if (!result.packet)
-    return `Driven codex run ended without a sechroom_closeout packet (soft-fail). Last agent message:
-
-${result.lastAgentMessage || "(none)"}`;
-  const evidence = result.packet.evidence?.length ? `
-
-Evidence:
-${result.packet.evidence.map((e) => `- ${e}`).join("\n")}` : "";
-  return `${result.packet.summary}${evidence}
-
-(terminal_status: ${result.packet.terminal_status}; driven by sechroom executor run.)`;
+function isPermissionNotification(input) {
+  const t = (input.notification_type ?? input.type ?? "").toLowerCase();
+  if (t) return t.includes("permission");
+  return (input.message ?? "").toLowerCase().includes("permission");
 }
-function startLeaseHeartbeat(beat, log, intervalMs = 3e4, timers = {}) {
-  const schedule = timers.setInterval ?? setInterval;
-  const cancel = timers.clearInterval ?? clearInterval;
-  const timer = schedule(() => {
-    void beat().catch(
-      (e) => log(`lease heartbeat failed (retrying next beat): ${String(e)}`)
+async function readStdin() {
+  if (process.stdin.isTTY) return "";
+  const chunks = [];
+  for await (const chunk of process.stdin) chunks.push(chunk);
+  return Buffer.concat(chunks).toString("utf8");
+}
+function parseHookInput(raw) {
+  if (!raw.trim()) return {};
+  try {
+    return JSON.parse(raw);
+  } catch {
+    return {};
+  }
+}
+var KINDS = {
+  raw: "Raw",
+  parsed: "Parsed",
+  approval: "Approval",
+  terminal: "Terminal"
+};
+function normalizeKind(k) {
+  const v = KINDS[k.toLowerCase()];
+  if (!v)
+    fail(
+      `Unknown --kind '${k}'. Expected one of: raw, parsed, approval, terminal.`
     );
-  }, intervalMs);
-  timer.unref?.();
-  return () => cancel(timer);
+  return v;
+}
+function parseIntOpt(v) {
+  const n = Number.parseInt(v, 10);
+  if (Number.isNaN(n)) fail(`Expected an integer, got '${v}'.`);
+  return n;
 }
 
 // src/commands/executor-run.ts
 function registerExecutorRunCommand(executor) {
-  executor.command("fleet").description("Run multiple isolated driven codex executors from one config file").requiredOption("--config <file>", "JSON fleet config").action(async (opts) => {
-    const fleet = superviseFleet(await readFleetConfig(String(opts.config)));
+  executor.command("fleet").description(
+    "Run multiple isolated driven codex executors from one config file"
+  ).requiredOption("--config <file>", "JSON fleet config").action(async (opts, cmd) => {
+    const config2 = await readFleetConfig(String(opts.config));
+    const cfg = resolveConfig(cmd.optsWithGlobals());
+    const log = (line) => process.stderr.write(style.dim(`[fleet] ${line}
+`));
+    let nodeId;
+    let stopNodeHeartbeat;
+    if (config2.node) {
+      const node = await registerFleetNode(cfg, config2.node);
+      nodeId = node.id;
+      const nodeTtl = config2.node.ttl ?? 120;
+      log(`node registered \u2014 ${node.id} (${config2.node.instanceKey})`);
+      stopNodeHeartbeat = startExecutorHeartbeat(
+        () => refreshExecutorInstance(cfg, node.id, nodeTtl),
+        Math.max(10, Math.floor(nodeTtl * 0.66)) * 1e3,
+        { onError: (e) => log(`node refresh failed: ${String(e)}`) }
+      );
+    }
+    const fleet = superviseFleet(config2, { parentId: nodeId });
     const stop = () => void fleet.shutdown("SIGINT");
     process.once("SIGINT", stop);
     process.once("SIGTERM", stop);
@@ -3398,6 +3441,17 @@ function registerExecutorRunCommand(executor) {
     } finally {
       process.off("SIGINT", stop);
       process.off("SIGTERM", stop);
+      stopNodeHeartbeat?.();
+      if (nodeId) {
+        try {
+          await deregisterInstance(cfg, nodeId);
+          log(`node deregistered \u2014 ${nodeId}`);
+        } catch (e) {
+          log(
+            `node deregister failed (${String(e)}) \u2014 advertisement will expire by TTL`
+          );
+        }
+      }
     }
   });
   executor.command("run").description(
@@ -3419,6 +3473,9 @@ function registerExecutorRunCommand(executor) {
   ).option(
     "--connector <id>",
     "Approved connector id (defaults to installed executor.json)"
+  ).option(
+    "--parent-id <id>",
+    "Fleet node this child enrolls under (D-WLP-55 containment; set by the fleet supervisor)"
   ).option("--ttl <seconds>", "Advertisement TTL (30-600)").option("--once", "Process a single task, then exit", false).option(
     "--no-deliver",
     "Skip driver-side delivery (branch/commit/push of the turn's changes)"
@@ -3426,11 +3483,7 @@ function registerExecutorRunCommand(executor) {
     "--allow-dirty-root",
     "Claim even when the root has uncommitted changes (they are fenced out of the delivery commit)",
     false
-  ).option("--no-pr", "Deliver without raising a PR (branch + push only)").option("--poll-interval <seconds>", "Offer reconciliation interval", "5").option(
-    "--heartbeat-interval <seconds>",
-    "Lease heartbeat cadence",
-    "30"
-  ).option("--turn-timeout <seconds>", "Fresh turn timeout", "300").option("--resume-turn-timeout <seconds>", "Resumed turn timeout", "1200").option(
+  ).option("--no-pr", "Deliver without raising a PR (branch + push only)").option("--poll-interval <seconds>", "Offer reconciliation interval", "5").option("--heartbeat-interval <seconds>", "Lease heartbeat cadence", "30").option("--turn-timeout <seconds>", "Fresh turn timeout", "300").option("--resume-turn-timeout <seconds>", "Resumed turn timeout", "1200").option(
     "--drain-timeout <seconds>",
     "On shutdown, seconds to let an in-flight turn finish before interrupting",
     "30"
@@ -3440,7 +3493,9 @@ function registerExecutorRunCommand(executor) {
     "2"
   ).action(async (opts, cmd) => {
     if (String(opts.runtime).toLowerCase() !== "codex")
-      fail("executor run drives runtime codex only (claude-code stays attached)");
+      fail(
+        "executor run drives runtime codex only (claude-code stays attached)"
+      );
     const located = readExecutorState();
     if (!located)
       fail(
@@ -3455,6 +3510,7 @@ function registerExecutorRunCommand(executor) {
       instanceKey: opts.instanceKey ? String(opts.instanceKey) : located.state.instanceKey,
       laneId: opts.lane ? String(opts.lane) : located.state.laneId,
       connectorId: opts.connector ? String(opts.connector) : located.state.connectorId,
+      parentId: opts.parentId ? String(opts.parentId) : located.state.parentId,
       ttlSeconds: opts.ttl ? Number.parseInt(String(opts.ttl), 10) : located.state.ttlSeconds
     };
     const heartbeatMs = Number.parseInt(String(opts.heartbeatInterval), 10) * 1e3;
@@ -3650,14 +3706,20 @@ function registerExecutorRunCommand(executor) {
         );
         log("deregistered");
       } catch (e) {
-        log(`deregister failed (${String(e)}) \u2014 advertisement will expire by TTL`);
+        log(
+          `deregister failed (${String(e)}) \u2014 advertisement will expire by TTL`
+        );
       }
       appServer.stop();
     }
   });
 }
 async function claimNext(request, instanceId, log) {
-  const claimed = await claimNextTask({ request, executorInstanceId: instanceId, log });
+  const claimed = await claimNextTask({
+    request,
+    executorInstanceId: instanceId,
+    log
+  });
   if (!claimed) return void 0;
   return {
     memoryId: claimed.memoryId,
@@ -3686,7 +3748,10 @@ ${c.body}`).join("\n\n");
       );
     }
   }
-  return { title: card.title ?? memoryId, text: assemblePrompt(card, packText) };
+  return {
+    title: card.title ?? memoryId,
+    text: assemblePrompt(card, packText)
+  };
 }
 function assemblePrompt(card, packText) {
   const sections = [
@@ -3730,7 +3795,10 @@ function executorRegistrationInput(state, deliverySubscriptionId) {
     deliverySubscriptionId,
     connectorId: state.connectorId,
     claimedCapabilityKeys: state.capabilityKeys,
+    claimPolicy: parseClaimPolicy(state.claimPolicy),
+    claimTags: state.claimTags ?? [],
     toolSetRef: null,
+    parentId: state.parentId ?? null,
     ttlSeconds: state.ttlSeconds
   };
 }
@@ -3765,6 +3833,13 @@ function registerExecutor(program2) {
   ).option("--runtime <kind>", "claude-code | codex").option("--surface <surface>", "claude | codex").option(
     "--capability <key...>",
     "Capability operation keys claimed by this instance"
+  ).option(
+    "--claim-policy <policy>",
+    "open | restricted (restricted only claims preferred/own-lane/allow-listed-tag work)",
+    "open"
+  ).option(
+    "--claim-tag <tag...>",
+    "Task tag this instance accepts under --claim-policy restricted"
   ).option(
     "--relay <id>",
     "Relay identity shared by sibling instances",
@@ -3835,6 +3910,7 @@ function registerExecutor(program2) {
     if (!opts.yes && !canPrompt())
       fail("non-interactive executor install requires --yes");
     parseRuntimeKind(runtime);
+    parseClaimPolicy(opts.claimPolicy);
     if (!["claude", "codex"].includes(surface))
       fail("surface must be claude or codex");
     if (opts.refreshAfter >= opts.ttl)
@@ -3849,6 +3925,8 @@ function registerExecutor(program2) {
       runtime: runtime.toLowerCase() === "codex" ? "codex" : "claude-code",
       connectorId: connector,
       capabilityKeys: capabilities ?? [],
+      claimPolicy: (opts.claimPolicy ?? "open").toLowerCase() === "restricted" ? "restricted" : "open",
+      claimTags: opts.claimTag ?? [],
       relayId: opts.relay,
       subscriptionName: opts.subscriptionName,
       ttlSeconds: opts.ttl,
@@ -3962,7 +4040,17 @@ function registerExecutor(program2) {
   ).option(
     "--capability <key...>",
     "Capability operation keys claimed by this instance"
-  ).option("--tool-set-ref <ref>", "Optional governed tool-set reference").option("--ttl <seconds>", "Advertisement TTL (30-600)", parseInteger, 120).action(async (opts, cmd) => {
+  ).option(
+    "--claim-policy <policy>",
+    "open | restricted (restricted only claims preferred/own-lane/allow-listed-tag work)",
+    "open"
+  ).option(
+    "--claim-tag <tag...>",
+    "Task tag this instance accepts under --claim-policy restricted"
+  ).option("--tool-set-ref <ref>", "Optional governed tool-set reference").option(
+    "--parent-id <id>",
+    "Fleet node this instance enrolls under (D-WLP-55 containment; sets the roster parentId)"
+  ).option("--ttl <seconds>", "Advertisement TTL (30-600)", parseInteger, 120).action(async (opts, cmd) => {
     const cfg = resolveConfig(cmd.optsWithGlobals());
     const subscription = await api(
       cfg,
@@ -3992,7 +4080,10 @@ function registerExecutor(program2) {
           deliverySubscriptionId: subscription.id,
           connectorId: opts.connector,
           claimedCapabilityKeys: opts.capability ?? [],
+          claimPolicy: parseClaimPolicy(opts.claimPolicy),
+          claimTags: opts.claimTag ?? [],
           toolSetRef: opts.toolSetRef ?? null,
+          parentId: opts.parentId ?? null,
           ttlSeconds: opts.ttl
         })
       }
@@ -4058,6 +4149,17 @@ function parseRuntimeKind(value) {
       return fail("runtime must be claude-code or codex");
   }
 }
+function parseClaimPolicy(value) {
+  switch ((value ?? "open").trim().toLowerCase()) {
+    case "":
+    case "open":
+      return "Open";
+    case "restricted":
+      return "Restricted";
+    default:
+      return fail("claim-policy must be open or restricted");
+  }
+}
 function parseTransport(value) {
   switch (value.trim().toLowerCase()) {
     case "push":
@@ -4092,6 +4194,41 @@ async function registerInstance(cfg, state) {
     body: JSON.stringify(executorRegistrationInput(state, subscription.id))
   });
 }
+async function registerFleetNode(cfg, node) {
+  const subscriptionName = node.subscriptionName ?? "executor-dispatch";
+  const subscription = await api(
+    cfg,
+    "/me/delivery-subscriptions/signalr",
+    {
+      method: "POST",
+      body: JSON.stringify(executorSubscriptionInput(subscriptionName))
+    }
+  );
+  return api(cfg, "/me/executor-instances", {
+    method: "POST",
+    body: JSON.stringify({
+      relayId: node.relay ?? "sechroom-cli-fleet",
+      instanceKey: node.instanceKey,
+      laneId: node.lane ?? node.instanceKey,
+      runtimeKind: "Node",
+      activationMode: "Attached",
+      deliverySubscriptionId: subscription.id,
+      connectorId: node.connector,
+      claimedCapabilityKeys: [],
+      claimPolicy: "Open",
+      claimTags: [],
+      toolSetRef: null,
+      parentId: null,
+      ttlSeconds: node.ttl ?? 120
+    })
+  });
+}
+async function deregisterInstance(cfg, id) {
+  await api(cfg, `/me/executor-instances/${encodeURIComponent(id)}`, {
+    method: "DELETE",
+    body: JSON.stringify({})
+  });
+}
 async function ensureExecutorInstance(cfg, located) {
   const { state, path } = located;
   state.laneId ??= state.instanceKey;