@usepowerplant/cli 0.4.11 → 0.4.13

package/dist/cli.js

@@ -1,4 +1,6 @@
 #!/usr/bin/env node
+
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="66f773d5-e0b2-5538-a184-3ee15c3a469a")}catch(e){}}();
 const __cliNodeMajor = Number(process.versions.node.split('.')[0]);
 if (__cliNodeMajor < 20) {
   console.error(`powerplant needs Node 20 or newer — this is Node ${process.versions.node}.`);
@@ -56698,12 +56700,13 @@ function boundRedactedText(raw, maxBytes) {
   return boundText(redactSecrets(raw), maxBytes);
 }
 function boundText(redacted, maxBytes) {
-  const bytes = utf8Encoder.encode(redacted);
+  const text = redacted.includes("\0") ? redacted.replaceAll("\0", "\uFFFD") : redacted;
+  const bytes = utf8Encoder.encode(text);
   if (bytes.length <= maxBytes) {
-    return { text: redacted, truncated: false, originalBytes: bytes.length };
+    return { text, truncated: false, originalBytes: bytes.length };
   }
-  const text = utf8Decoder.decode(bytes.subarray(0, maxBytes)).replace(/�+$/u, "");
-  return { text, truncated: true, originalBytes: bytes.length };
+  const cut = utf8Decoder.decode(bytes.subarray(0, maxBytes)).replace(/�+$/u, "");
+  return { text: cut, truncated: true, originalBytes: bytes.length };
 }
 
 // ../core/src/codeHost.ts
@@ -56755,18 +56758,35 @@ function pullRequestRefsInText(text) {
   }
   return refs;
 }
+var PULL_REQUEST_ALREADY_EXISTS = /a pull request for branch \S+ into branch \S+ already exists:/;
+function pullRequestAlreadyExistsInText(text) {
+  return PULL_REQUEST_ALREADY_EXISTS.test(text);
+}
 function pullRequestRefFromUrl(url2) {
   return pullRequestRefsInText(url2)[0] ?? null;
 }
 var MAY_TOUCH_HOST = /\b(?:git|gh)\b/;
 function readCodeHostCommands(command, currentBranch) {
+  return readCommands(command, currentBranch, 0);
+}
+var SUBSTITUTION_DEPTH_MAX = 4;
+function readCommands(command, currentBranch, depth) {
   const result = { pushes: [], pullRequestCreates: [] };
   if (!MAY_TOUCH_HOST.test(command)) return result;
   const chain = shellCommands(command);
   let branch = currentBranch;
   chain.forEach((simple, i) => {
     const program = programOf(simple.words);
-    if (program === null) return;
+    if (program === null) {
+      if (depth >= SUBSTITUTION_DEPTH_MAX) return;
+      const alone = simple.words.length === 1 && simple.next === null;
+      for (const substituted of simple.assignedSubstitutions) {
+        for (const create of readCommands(substituted, branch, depth + 1).pullRequestCreates) {
+          result.pullRequestCreates.push({ ...create, ownExitStatus: create.ownExitStatus && alone });
+        }
+      }
+      return;
+    }
     if (program.name === "git") {
       const git = gitSubcommand(program.args);
       if (git === null) return;
@@ -56799,6 +56819,7 @@ function pushOutcomeInText(text, branch) {
   return /Everything up-to-date/.test(text) ? true : null;
 }
 var ENV_ASSIGNMENT = /^[A-Za-z_][A-Za-z0-9_]*=/;
+var ASSIGNMENT_NAME = /^[A-Za-z_][A-Za-z0-9_]*=$/;
 function programOf(words) {
   let i = 0;
   while (i < words.length && (ENV_ASSIGNMENT.test(words[i]) || words[i] === "env")) i += 1;
@@ -56895,6 +56916,7 @@ function exitStatusIsOwn(chain, index) {
 function shellCommands(text) {
   const commands = [];
   let words = [];
+  let assignedSubstitutions = [];
   let word = "";
   let inWord = false;
   let quote = null;
@@ -56906,8 +56928,9 @@ function shellCommands(text) {
   };
   const endCommand = (next) => {
     endWord();
-    if (words.length > 0) commands.push({ words: withoutRedirections(words), next });
+    if (words.length > 0) commands.push({ words: withoutRedirections(words), assignedSubstitutions, next });
     words = [];
+    assignedSubstitutions = [];
   };
   for (let i = 0; i < text.length; i++) {
     const ch = text[i];
@@ -56927,6 +56950,11 @@ function shellCommands(text) {
       inWord = true;
     } else if (ch === "$" && text[i + 1] === "(" || ch === "`") {
       const end = substitutionEnd(text, i);
+      const after = text[end + 1];
+      const endsWord = after === void 0 || /[\s;&|)]/.test(after);
+      if (ch === "$" && text[end] === ")" && ASSIGNMENT_NAME.test(word) && endsWord) {
+        assignedSubstitutions.push(text.slice(i + 2, end));
+      }
       word += text.slice(i, end + 1);
       inWord = true;
       i = end;
@@ -57037,6 +57065,9 @@ var PrEvidenceCollector = class {
   evidence = [];
   seen = /* @__PURE__ */ new Set();
   watched = /* @__PURE__ */ new Map();
+  /** By process id: what a watched call left unsettled when its result said
+   * the process still runs. */
+  running = /* @__PURE__ */ new Map();
   dropped = 0;
   /** The harness recorded the pull request for this session. Repeats (a
    * record per turn while a PR stays bound) keep the first time. */
@@ -57045,15 +57076,50 @@ var PrEvidenceCollector = class {
   }
   /** A shell command the session ran: watched until its result arrives when
    * it pushes a branch or creates a pull request, ignored otherwise. */
-  command(callId, command, currentBranch) {
-    this.watch(callId, readCodeHostCommands(command, currentBranch));
+  command(callId, command, currentBranch, startedAt = null) {
+    this.watch(callId, readCodeHostCommands(command, currentBranch), startedAt);
   }
   /** A tool call that would push or create a pull request, in the code host
    * adapter's terms (a harness's own pull request tool, for example). */
-  watch(callId, commands) {
+  watch(callId, commands, startedAt = null) {
     if (commands.pushes.length === 0 && commands.pullRequestCreates.length === 0) return;
-    this.watched.set(callId, commands);
-    if (this.watched.size > WATCHED_CALLS_MAX) this.watched.delete(this.watched.keys().next().value);
+    keepBounded(this.watched, callId, { ...commands, startedAt });
+  }
+  /** A call that reads more output of a running process (Codex's
+   * write_stdin poll; Claude Code's TaskOutput, or a read of a background
+   * task's output file): its result is read as the rest of the watched call
+   * that started the process. */
+  follow(callId, process2) {
+    const unsettled = this.running.get(process2);
+    if (unsettled === void 0) return;
+    this.running.delete(process2);
+    this.watch(callId, unsettled, unsettled.startedAt);
+  }
+  /** Whether any process is followed, so a parser reads an unwatched
+   * call's output only while it could matter. */
+  following() {
+    return this.running.size > 0;
+  }
+  /** Another call now runs a process under this id: a later poll of the id
+   * is no longer the rest of the watched call that left it running. */
+  forget(process2) {
+    this.running.delete(process2);
+  }
+  /** Watches several watched calls as one, in the order given: the parts of
+   * a call whose output cannot be told apart, read once as a whole. The
+   * parts are one call's, so they started together and the first part's
+   * time is the whole's. */
+  merge(callIds, into) {
+    const parts = callIds.flatMap((callId) => this.watched.get(callId) ?? []);
+    for (const callId of callIds) this.watched.delete(callId);
+    this.watch(
+      into,
+      {
+        pushes: parts.flatMap((part) => part.pushes),
+        pullRequestCreates: parts.flatMap((part) => part.pullRequestCreates)
+      },
+      parts[0]?.startedAt ?? null
+    );
   }
   watching(callId) {
     return this.watched.has(callId);
@@ -57070,7 +57136,16 @@ var PrEvidenceCollector = class {
    * result names the pull request: gh prints the created PR's URL last, so
    * a call with one creation takes the last URL and a call with several
    * only when the text names exactly as many; a failed call whose status
-   * is the creation's own counts nothing.
+   * is the creation's own counts nothing, and neither does a call whose
+   * text carries gh's refusal because the pull request exists (the URL it
+   * prints is that pull request's, and a result read from a file states no
+   * status). A text cut to the URL alone (`| tail -1`, a `grep` of the
+   * output file) hides the refusal, and the URL then counts.
+   *
+   * When the result says one process still runs, whatever it settled
+   * neither way waits for that process's later output (`follow`). A push
+   * git rejected, or a command whose own status failed, is settled: a
+   * later output never revives it.
    */
   result(callId, outcome) {
     const commands = this.watched.get(callId);
@@ -57079,35 +57154,45 @@ var PrEvidenceCollector = class {
     const destinations = pushDestinationsInText(outcome.text);
     const oneRemote = new Set(commands.pushes.map((push) => push.remote)).size === 1;
     const shared = oneRemote && new Set(destinations).size === 1 ? destinations[0] : null;
+    const unsettled = { pushes: [], pullRequestCreates: [], startedAt: commands.startedAt };
     for (const [i, push] of commands.pushes.entries()) {
       if (push.branch === null) continue;
-      const pushed = pushOutcomeInText(outcome.text, push.branch) ?? (push.ownExitStatus && outcome.succeeded === true);
-      if (!pushed) continue;
+      const pushed = pushOutcomeInText(outcome.text, push.branch) ?? (push.ownExitStatus ? outcome.succeeded : null);
+      if (pushed === null) unsettled.pushes.push(push);
+      if (pushed !== true) continue;
       const repository = destinations.length === commands.pushes.length ? destinations[i] : shared;
       this.addPush({ kind: "branch-pushed", at: outcome.at, prId: null, repository, branch: push.branch, line: outcome.line });
     }
     const creates = commands.pullRequestCreates;
-    if (creates.length === 0) return;
     const refs = pullRequestRefsInText(outcome.text);
     const paired = creates.length === 1 ? [refs.at(-1)] : refs.length === creates.length ? refs : [];
+    const refused = pullRequestAlreadyExistsInText(outcome.text);
     creates.forEach((create, i) => {
       const ref = paired[i];
-      if (ref === void 0 || outcome.succeeded === false && create.ownExitStatus) return;
+      if (refused || outcome.succeeded === false && create.ownExitStatus) return;
+      if (ref === void 0) {
+        unsettled.pullRequestCreates.push(create);
+        return;
+      }
       this.add({
         kind: "pull-request-created",
         at: outcome.at,
         prId: pullRequestId(ref),
         repository: null,
         branch: create.head,
-        line: outcome.line
+        line: outcome.line,
+        commandStartedAt: commands.startedAt
       });
     });
+    if (outcome.running === null || unsettled.pushes.length === 0 && unsettled.pullRequestCreates.length === 0) return;
+    keepBounded(this.running, outcome.running, unsettled);
   }
   /** The evidence collected, in transcript order, with pushes past the cap
-   * dropped oldest first. Calls still watched are dropped: their results
-   * never arrived. */
+   * dropped oldest first. Calls still watched and processes still followed
+   * are dropped: their results never arrived. */
   finish() {
     this.watched.clear();
+    this.running.clear();
     const pushes = this.evidence.filter((item) => item.kind === "branch-pushed");
     if (pushes.length <= PUSH_EVIDENCE_MAX) return this.evidence;
     const cut = new Set(pushes.slice(0, pushes.length - PUSH_EVIDENCE_MAX));
@@ -57119,10 +57204,13 @@ var PrEvidenceCollector = class {
   droppedPushes() {
     return this.dropped;
   }
-  /** A link or a creation is one fact per pull request: repeats keep the
-   * first. */
+  /** A link is one fact per pull request, and so is a creation per command:
+   * repeats keep the first. Two commands that each named the pull request
+   * are two facts (a refused retry read before the first command's own
+   * output), because the match keeps only the one whose command can have
+   * opened it. */
   add(item) {
-    const key = `${item.kind}|${item.prId ?? ""}|${item.branch ?? ""}`;
+    const key = `${item.kind}|${item.prId ?? ""}|${item.branch ?? ""}|${item.commandStartedAt ?? ""}`;
     if (this.seen.has(key)) return;
     this.seen.add(key);
     this.evidence.push(item);
@@ -57136,6 +57224,11 @@ var PrEvidenceCollector = class {
     this.evidence.push(item);
   }
 };
+function keepBounded(map2, key, value) {
+  map2.delete(key);
+  map2.set(key, value);
+  if (map2.size > WATCHED_CALLS_MAX) map2.delete(map2.keys().next().value);
+}
 
 // ../core/src/digest.ts
 var TOOL_CALL_INPUT_MAX_BYTES = 65536;
@@ -57155,6 +57248,7 @@ function createDigestTurnParser(options = {}) {
   let pendingEnvelopes = [];
   let currentEnvelope = null;
   const evidence = new PrEvidenceCollector();
+  const backgroundTasks = { started: /* @__PURE__ */ new Map(), reads: /* @__PURE__ */ new Map() };
   let line = -1;
   const landPending = (turn) => {
     for (const envelope of pendingEnvelopes) {
@@ -57184,7 +57278,7 @@ function createDigestTurnParser(options = {}) {
       if (record2.isMeta === true) return;
       const at = recordTime(record2);
       if (record2.type === "user") {
-        toolResults(record2, evidence, line);
+        toolResults(record2, evidence, backgroundTasks, line);
         const text = userText(record2);
         if (text) {
           const origin = claudeCodeMessageOrigin(originFacts(record2), text);
@@ -57233,8 +57327,9 @@ function createDigestTurnParser(options = {}) {
           }
           pendingTools.push(call);
           if (part.name === "Bash" && typeof part.id === "string" && typeof part.input?.command === "string") {
-            evidence.command(part.id, part.input.command, recordBranch(record2));
+            evidence.command(part.id, part.input.command, recordBranch(record2), at);
           }
+          if (typeof part.id === "string") followBackgroundTask(part.id, part.name, part.input, evidence, backgroundTasks);
         }
         if (part.type === "text" && typeof part.text === "string" && part.text.trim() !== "") {
           const origin = claudeCodeMessageOrigin(facts, part.text);
@@ -57311,16 +57406,38 @@ function isRecord(value) {
 function recordBranch(record2) {
   return typeof record2.gitBranch === "string" && record2.gitBranch !== "" ? record2.gitBranch : null;
 }
-function toolResults(record2, evidence, line) {
+function followBackgroundTask(callId, tool, input2, evidence, tasks) {
+  if (tasks.started.size === 0 || evidence.watching(callId)) return;
+  const named = tool === "TaskOutput" ? input2?.task_id : tool === "Read" ? input2?.file_path : tool === "Bash" ? input2?.command : void 0;
+  if (typeof named !== "string" || tool === "Bash" && RUNS_GH.test(named)) return;
+  const read = new Set(
+    [...tasks.started].filter(([task]) => tool === "TaskOutput" ? named === task : named.includes(`/${task}.output`)).map(([, followed2]) => followed2)
+  );
+  if (read.size !== 1) return;
+  const [followed] = read;
+  evidence.follow(callId, followed);
+  if (evidence.watching(callId)) keepBounded(tasks.reads, callId, followed);
+}
+var RUNS_GH = /(?:^|[\s;&|(])gh\s/;
+function toolResults(record2, evidence, tasks, line) {
   const content = isRecord(record2.message) ? record2.message.content : void 0;
   if (!Array.isArray(content)) return;
   const result = isRecord(record2.toolUseResult) ? record2.toolUseResult : {};
+  const file2 = isRecord(result.file) ? result.file : {};
+  const task = isRecord(result.task) ? result.task : {};
   for (const block of content) {
     if (!isRecord(block) || block.type !== "tool_result" || typeof block.tool_use_id !== "string") continue;
     if (!evidence.watching(block.tool_use_id)) continue;
+    const reads = tasks.reads.get(block.tool_use_id);
+    tasks.reads.delete(block.tool_use_id);
+    const started = typeof result.backgroundTaskId === "string" ? result.backgroundTaskId : null;
+    if (started !== null) keepBounded(tasks.started, started, reads ?? started);
+    const failed2 = block.is_error === true || result.interrupted === true;
+    const taskExited = typeof task.exitCode === "number" && task.task_id === reads;
+    const status = reads !== void 0 ? { succeeded: taskExited ? task.exitCode === 0 : null, running: taskExited ? null : reads } : { succeeded: failed2 ? false : started !== null ? null : true, running: started };
     evidence.result(block.tool_use_id, {
-      succeeded: block.is_error !== true && result.interrupted !== true && result.backgroundTaskId === void 0,
-      text: [result.stdout, result.stderr].filter((part) => typeof part === "string").concat(contentText(block.content)).join("\n"),
+      ...status,
+      text: [result.stdout, result.stderr, file2.content, task.output].filter((part) => typeof part === "string").concat(contentText(block.content)).join("\n"),
       at: recordTime(record2),
       line
     });
@@ -57988,6 +58105,8 @@ function createCodexTurnParser(options = {}) {
   let pendingTools = [];
   let pendingAt = null;
   const evidence = new PrEvidenceCollector();
+  const scripts = /* @__PURE__ */ new Map();
+  const runningScripts = /* @__PURE__ */ new Map();
   let line = -1;
   const envelopes = [];
   let pendingEnvelopes = [];
@@ -58047,9 +58166,24 @@ function createCodexTurnParser(options = {}) {
       const responseItem = item;
       const callId = typeof responseItem.call_id === "string" ? responseItem.call_id : null;
       if (callId !== null && isToolOutput(responseItem)) {
-        if (evidence.watching(callId)) {
+        const script = scripts.get(callId);
+        scripts.delete(callId);
+        if (script !== void 0) {
+          const [header = "", ...blocks] = outputBlocks(responseItem.output);
+          const cell = SCRIPT_STILL_RUNNING.exec(header)?.[1];
+          if (cell === void 0) scriptResult(evidence, script, header, blocks, at, line);
+          else keepBounded(runningScripts, cell, script);
+        } else if (evidence.watching(callId)) {
           const text2 = contentText(responseItem.output);
-          evidence.result(callId, { succeeded: codexExitStatus(text2), text: text2, at, line });
+          evidence.result(callId, { succeeded: codexExitStatus(text2), text: text2, running: codexRunningProcess(text2), at, line });
+        } else if (runningScripts.size > 0 || evidence.following()) {
+          const [header = "", ...blocks] = outputBlocks(responseItem.output);
+          const cell = SCRIPT_STILL_RUNNING.exec(header)?.[1];
+          if (cell !== void 0) runningScripts.delete(cell);
+          for (const text2 of [header, ...blocks]) {
+            const process2 = codexRunningProcess(text2);
+            if (process2 !== null) evidence.forget(process2);
+          }
         }
         return;
       }
@@ -58062,7 +58196,10 @@ function createCodexTurnParser(options = {}) {
         }
         pendingTools.push(call);
         pendingAt ??= at;
-        if (callId !== null) watchCodexCall(evidence, callId, responseItem);
+        if (callId !== null) {
+          const script = watchCodexCall(evidence, callId, responseItem, at, runningScripts);
+          if (script !== null) keepBounded(scripts, callId, script);
+        }
         return;
       }
       if (responseItem.type !== "message") return;
@@ -58105,27 +58242,76 @@ function createCodexTurnParser(options = {}) {
     }
   };
 }
-function watchCodexCall(evidence, callId, item) {
+var stepKey = (callId, step) => `${callId}#${step}`;
+function watchCodexCall(evidence, callId, item, at, runningScripts) {
   if (item.type === "custom_tool_call" && item.name === "exec" && typeof item.input === "string") {
-    evidence.command(callId, execCommandStrings(item.input).join("\n"), null);
-    return;
+    const steps = execScriptSteps(item.input);
+    const commands = [];
+    let seen = { pushes: 0, pullRequestCreates: 0 };
+    steps.forEach((step, i) => {
+      if (step.polls !== null) evidence.follow(stepKey(callId, i), step.polls);
+      if (step.command === null) return;
+      commands.push(step.command);
+      const read = readCodeHostCommands(commands.join("\n"), null);
+      evidence.watch(
+        stepKey(callId, i),
+        {
+          pushes: read.pushes.slice(seen.pushes),
+          pullRequestCreates: read.pullRequestCreates.slice(seen.pullRequestCreates)
+        },
+        at
+      );
+      seen = { pushes: read.pushes.length, pullRequestCreates: read.pullRequestCreates.length };
+    });
+    const watched = steps.some((_, i) => evidence.watching(stepKey(callId, i)));
+    return watched ? { callId, polls: steps.map((step) => step.polls), printsEachStep: printsEachStep(item.input, steps) } : null;
   }
   if (item.type === "local_shell_call") {
     const command = argvCommand(asRecord2(item.action)?.command);
-    if (command !== null) evidence.command(callId, command, null);
-    return;
+    if (command !== null) evidence.command(callId, command, null, at);
+    return null;
   }
-  if (item.type !== "function_call" || typeof item.arguments !== "string") return;
+  if (item.type !== "function_call" || typeof item.arguments !== "string") return null;
   const args = safeJsonRecord(item.arguments);
   if (item.name === "exec_command" && typeof args?.cmd === "string") {
-    evidence.command(callId, args.cmd, null);
+    evidence.command(callId, args.cmd, null, at);
   } else if (item.name === "shell") {
     const command = argvCommand(args?.command);
-    if (command !== null) evidence.command(callId, command, null);
+    if (command !== null) evidence.command(callId, command, null, at);
+  } else if (item.name === "write_stdin" && typeof args?.session_id === "number") {
+    evidence.follow(callId, String(args.session_id));
+  } else if (item.name === "wait" && (typeof args?.cell_id === "string" || typeof args?.cell_id === "number")) {
+    const script = runningScripts.get(String(args.cell_id)) ?? null;
+    runningScripts.delete(String(args.cell_id));
+    return script;
   } else if (item.name === "_create_pull_request") {
     const head = typeof args?.head === "string" ? args.head : null;
-    evidence.watch(callId, { pushes: [], pullRequestCreates: [{ head, ownExitStatus: true }] });
+    evidence.watch(callId, { pushes: [], pullRequestCreates: [{ head, ownExitStatus: true }] }, at);
   }
+  return null;
+}
+function scriptResult(evidence, script, header, blocks, at, line) {
+  const paired = script.printsEachStep && blocks.length === script.polls.length;
+  const keys = script.polls.map((_, i) => stepKey(script.callId, i));
+  if (!paired) {
+    evidence.merge(keys.filter((_, i) => script.polls[i] === null), script.callId);
+    evidence.result(script.callId, { succeeded: null, text: [header, ...blocks].join("\n"), running: null, at, line });
+  }
+  script.polls.forEach((polls, i) => {
+    if (!evidence.watching(keys[i])) return;
+    const text = paired ? blocks[i] : "";
+    const succeeded = paired ? codexExitStatus(text) : null;
+    const running = (paired ? codexRunningProcess(text) : null) ?? (succeeded === null ? polls : null);
+    evidence.result(keys[i], { succeeded, text, running, at, line });
+  });
+}
+function outputBlocks(output2) {
+  if (typeof output2 === "string") return [output2];
+  if (!Array.isArray(output2)) return [];
+  return output2.map((block) => {
+    const text = asRecord2(block)?.text;
+    return typeof text === "string" ? text : "";
+  });
 }
 function argvCommand(argv) {
   if (typeof argv === "string") return argv;
@@ -58134,22 +58320,56 @@ function argvCommand(argv) {
   if (argv.length === 3 && /(?:^|\/)(?:ba|z|da|k)?sh$/.test(shell) && /^-[a-z]*c[a-z]*$/.test(flag)) return script;
   return argv.map((word) => /^[A-Za-z0-9._/:=@+-]+$/.test(word) ? word : `'${word.replaceAll("'", "'\\''")}'`).join(" ");
 }
-var EXEC_COMMAND_CALL = /exec_command\(\{\s*"?cmd"?\s*:\s*("(?:[^"\\]|\\.)*")/g;
-function execCommandStrings(script) {
-  const commands = [];
-  for (const match of script.matchAll(EXEC_COMMAND_CALL)) {
-    try {
-      const parsed = JSON.parse(match[1]);
-      if (typeof parsed === "string") commands.push(parsed);
-    } catch {
-      continue;
-    }
+var SCRIPT_TOOL_CALL = /tools\.(\w+)\(/g;
+var COMMAND_ARGUMENT = /\{\s*"?cmd"?\s*:\s*("(?:[^"\\]|\\.)*")/y;
+var SESSION_ARGUMENT = /\{\s*"?session_id"?\s*:\s*(\d+)/y;
+function execScriptSteps(script) {
+  const steps = [];
+  const call = new RegExp(SCRIPT_TOOL_CALL);
+  for (let match = call.exec(script); match !== null; match = call.exec(script)) {
+    const argument = match[1] === "exec_command" ? COMMAND_ARGUMENT : match[1] === "write_stdin" ? SESSION_ARGUMENT : null;
+    if (argument !== null) argument.lastIndex = call.lastIndex;
+    const value = argument?.exec(script) ?? null;
+    if (value !== null) call.lastIndex += value[0].length;
+    steps.push({
+      command: value !== null && match[1] === "exec_command" ? jsonString(value[1]) : null,
+      polls: value !== null && match[1] === "write_stdin" ? value[1] : null
+    });
+  }
+  return steps;
+}
+var STRING_LITERAL = /"(?:[^"\\]|\\.)*"/g;
+var TEXT_CALL = /\btext\(/g;
+var TEXT_OF_TOOL_CALL = /\btext\(\s*await\s+tools\.\w+\(/g;
+var DEFERRED_CODE = /\bfunction\b|=>|\.then\(/;
+function printsEachStep(script, steps) {
+  if (steps.length === 1) return true;
+  const code = script.replace(STRING_LITERAL, '""');
+  if (DEFERRED_CODE.test(code)) return false;
+  const printed = [...code.matchAll(TEXT_OF_TOOL_CALL)].length;
+  return printed === steps.length && [...code.matchAll(TEXT_CALL)].length === steps.length;
+}
+function jsonString(literal2) {
+  try {
+    const parsed = JSON.parse(literal2);
+    return typeof parsed === "string" ? parsed : null;
+  } catch {
+    return null;
   }
-  return commands;
 }
 function isToolOutput(item) {
   return item.type === "custom_tool_call_output" || item.type === "function_call_output" || item.type === "local_shell_call_output";
 }
+var SCRIPT_STILL_RUNNING = /^Script running with cell ID (\d+)/;
+var RUNNING_CHUNK = /^\s*\{[^\n]*?"session_id"\s*:\s*(\d+)/;
+var RUNNING_PROCESS_LINE = /^Process running with session ID (\d+)$/m;
+function codexRunningProcess(output2) {
+  const chunk = RUNNING_CHUNK.exec(output2);
+  if (chunk !== null) return chunk[1];
+  const outputLine = output2.search(/^Output:/m);
+  const header = outputLine === -1 ? output2 : output2.slice(0, outputLine);
+  return RUNNING_PROCESS_LINE.exec(header)?.[1] ?? null;
+}
 var EXIT_STATUS = /"exit_code"\s*:\s*(\d+)|Process exited with code (\d+)/g;
 function codexExitStatus(output2) {
   const codes = [...output2.matchAll(EXIT_STATUS)].map((match) => Number(match[1] ?? match[2]));
@@ -85663,11 +85883,11 @@ import path12 from "node:path";
 import { existsSync as existsSync6, lstatSync as lstatSync4 } from "node:fs";
 import path11 from "node:path";
 
-// ../../apps/collector/src/codexTranscriptHints.ts
+// ../../apps/collector/src/codexTranscriptDiscovery.ts
 import { createHash } from "node:crypto";
 import { closeSync, lstatSync, openSync, readSync, readdirSync, realpathSync } from "node:fs";
 import path2 from "node:path";
-var hintSchema = external_exports.object({
+var transcriptDiscoveryRecordSchema = external_exports.object({
   sessionId: external_exports.string().regex(/^[a-zA-Z0-9_-]{1,200}$/),
   transcriptPath: external_exports.string().max(4096).nullable()
 });
@@ -85680,7 +85900,7 @@ function codexTranscriptRecordPath(home, sessionId) {
     `${createHash("sha256").update(sessionId).digest("hex")}.json`
   );
 }
-function readCodexTranscriptHints(home, roots) {
+function readCodexTranscriptDiscoveryRecords(home, roots) {
   const dir = codexTranscriptRecordsDir(home);
   let files;
   try {
@@ -85692,9 +85912,9 @@ function readCodexTranscriptHints(home, roots) {
   for (const file2 of files) {
     if (!/^[a-f0-9]{64}\.json$/.test(file2)) continue;
     try {
-      const hintPath = path2.join(dir, file2);
-      if (!lstatSync(hintPath).isFile()) continue;
-      const fd = openSync(hintPath, "r");
+      const recordPath = path2.join(dir, file2);
+      if (!lstatSync(recordPath).isFile()) continue;
+      const fd = openSync(recordPath, "r");
       let text;
       try {
         const buffer = Buffer.alloc(32 * 1024 + 1);
@@ -85704,10 +85924,10 @@ function readCodexTranscriptHints(home, roots) {
       } finally {
         closeSync(fd);
       }
-      const hint = hintSchema.parse(JSON.parse(text));
-      if (file2 !== `${createHash("sha256").update(hint.sessionId).digest("hex")}.json`) continue;
-      if (hint.transcriptPath === null || !path2.isAbsolute(hint.transcriptPath)) continue;
-      const rolloutPath = path2.normalize(hint.transcriptPath);
+      const record2 = transcriptDiscoveryRecordSchema.parse(JSON.parse(text));
+      if (file2 !== `${createHash("sha256").update(record2.sessionId).digest("hex")}.json`) continue;
+      if (record2.transcriptPath === null || !path2.isAbsolute(record2.transcriptPath)) continue;
+      const rolloutPath = path2.normalize(record2.transcriptPath);
       if (path2.extname(rolloutPath) !== ".jsonl") continue;
       const rootIndex = roots.findIndex((root2) => {
         const relative2 = path2.relative(root2, rolloutPath);
@@ -85717,7 +85937,7 @@ function readCodexTranscriptHints(home, roots) {
       const root = roots[rootIndex];
       if (realpathSync(rolloutPath) !== path2.join(realpathSync(root), path2.relative(root, rolloutPath)))
         continue;
-      result.push({ rolloutPath, sessionId: hint.sessionId, archived: rootIndex === 1 });
+      result.push({ rolloutPath, sessionId: record2.sessionId, archived: rootIndex === 1 });
     } catch {
     }
   }
@@ -85730,7 +85950,7 @@ import { createHmac } from "node:crypto";
 // ../../apps/collector/src/http.ts
 var import_undici = __toESM(require_undici(), 1);
 var CLI_VERSION_HEADER = "x-powerplant-cli-version";
-var cliVersion = true ? "0.4.11" : "0.0.0-checkout";
+var cliVersion = true ? "0.4.13" : "0.0.0-checkout";
 function cliVersionHeaders() {
   return { [CLI_VERSION_HEADER]: cliVersion, "user-agent": `powerplant-cli/${cliVersion}` };
 }
@@ -86037,7 +86257,7 @@ function bindDiagnosticEnrollment(diagnostic, token) {
   passEnrollments.set(diagnostic, token);
 }
 
-// ../../apps/collector/src/codexCli.ts
+// ../../apps/collector/src/codexSessions.ts
 import { closeSync as closeSync3, mkdirSync as mkdirSync2, openSync as openSync3, renameSync, rmSync as rmSync2, utimesSync, writeSync } from "node:fs";
 import os6 from "node:os";
 import path5 from "node:path";
@@ -86477,13 +86697,17 @@ function isPathWithinScopes(resolved, scopePaths) {
   );
 }
 
-// ../../apps/collector/src/codexCli.ts
+// ../../apps/collector/src/codexSessions.ts
 function parseCodexRollout(text, sharedUsage) {
   let meta3 = null;
+  let initialEvent;
+  let records = 0;
   let model;
   const timestamps = [];
   const usage = sharedUsage ?? createCodexUsageReader();
   for (const line of parseJsonl(text)) {
+    records += 1;
+    if (records === 2 && meta3 !== null) initialEvent = line;
     if (typeof line.timestamp === "string") timestamps.push(line.timestamp);
     usage.pushRecord(line);
     const payload = line.payload;
@@ -86499,8 +86723,10 @@ function parseCodexRollout(text, sharedUsage) {
   if (meta3 === null && timestamps.length === 0) return null;
   const git = meta3?.git ?? null;
   const sessionId = meta3?.id ?? meta3?.session_id;
+  const facts = meta3 === null ? {} : harnessSessionFacts("codex", { ...meta3, initialEvent });
   return {
-    kind: meta3 !== null && isSidecarThread(meta3) ? "subagent" : "session",
+    kind: facts.subagent ? "subagent" : "session",
+    ...facts.standaloneReview && { standaloneReview: true },
     ...typeof sessionId === "string" && sessionId !== "" && { sessionId },
     startedAt: timestamps[0],
     endedAt: timestamps[timestamps.length - 1],
@@ -86536,6 +86762,7 @@ function foldRolloutPages(pages, usage) {
   const repoFullName = first("repoFullName");
   return {
     kind: pages[0].kind,
+    ...pages[0].standaloneReview && { standaloneReview: true },
     ...sessionId !== void 0 && { sessionId },
     ...startedAt !== void 0 && { startedAt },
     ...endedAt !== void 0 && { endedAt },
@@ -86557,27 +86784,27 @@ function rolloutIdentity(rolloutPath) {
   if (!conventional) return { threadId: name, page: false };
   return { threadId: threadId2.toLowerCase(), page: pageId !== void 0 };
 }
-function codexSpoolDir(home) {
+function codexMergedTranscriptsDir(home) {
   return path5.join(home, ".config", "powerplant", "codex");
 }
-function mergedSpoolIsFresh(spoolPath, mtimeMs) {
-  const existing = statIfExists(spoolPath);
+function mergedTranscriptIsFresh(mergedTranscriptPath, mtimeMs) {
+  const existing = statIfExists(mergedTranscriptPath);
   return existing !== null && Math.abs(existing.mtimeMs - mtimeMs) < 1;
 }
-var MergedSpoolWriter = class {
-  constructor(spoolPath) {
-    this.spoolPath = spoolPath;
-    mkdirSync2(path5.dirname(spoolPath), { recursive: true, mode: 448 });
-    this.tmpPath = `${spoolPath}.${process.pid}.tmp`;
+var MergedTranscriptWriter = class {
+  constructor(mergedTranscriptPath) {
+    this.mergedTranscriptPath = mergedTranscriptPath;
+    mkdirSync2(path5.dirname(mergedTranscriptPath), { recursive: true, mode: 448 });
+    this.tmpPath = `${mergedTranscriptPath}.${process.pid}.tmp`;
     this.fd = openSync3(this.tmpPath, "w", 384);
   }
-  spoolPath;
+  mergedTranscriptPath;
   tmpPath;
   fd;
   bytes = 0;
-  append(pageText) {
+  append(pageText2) {
     if (this.fd === void 0) throw new Error("merged transcript already closed");
-    const text = pageText.endsWith("\n") ? pageText : `${pageText}
+    const text = pageText2.endsWith("\n") ? pageText2 : `${pageText2}
 `;
     this.bytes += writeSync(this.fd, text);
   }
@@ -86585,7 +86812,7 @@ var MergedSpoolWriter = class {
   finish(mtimeMs) {
     this.close();
     utimesSync(this.tmpPath, mtimeMs / 1e3, mtimeMs / 1e3);
-    renameSync(this.tmpPath, this.spoolPath);
+    renameSync(this.tmpPath, this.mergedTranscriptPath);
     return this.bytes;
   }
   abandon() {
@@ -86655,7 +86882,7 @@ async function collectCodexSessions(options = {}) {
   const now = options.now ?? Date.now();
   const capture = options.capture ?? captureEverythingUnresolved;
   const maxBytes = options.maxTranscriptBytes ?? MAX_TRANSCRIPT_FILE_BYTES;
-  const spoolDir = options.spoolDir ?? codexSpoolDir(options.homeDir ?? os6.homedir());
+  const mergedTranscriptsDir = options.mergedTranscriptsDir ?? codexMergedTranscriptsDir(options.homeDir ?? os6.homedir());
   const items = [];
   const candidates = [];
   const unreadable = [];
@@ -86666,12 +86893,12 @@ async function collectCodexSessions(options = {}) {
   let largestMergedBytes = 0;
   const externalIdOf = (rolloutPath) => path5.basename(rolloutPath, ".jsonl");
   const files = /* @__PURE__ */ new Map();
-  const observe = async (paths, archived, hintSessionId) => {
+  const observe = async (paths, archived, discoverySessionId) => {
     for (const rolloutPath of paths) {
       const known = files.get(rolloutPath);
       if (known !== void 0) {
-        if (hintSessionId === void 0) delete known.hintSessionIds;
-        else known.hintSessionIds?.push(hintSessionId);
+        if (discoverySessionId === void 0) delete known.discoverySessionIds;
+        else known.discoverySessionIds?.push(discoverySessionId);
         continue;
       }
       await yieldToEventLoop();
@@ -86684,15 +86911,15 @@ async function collectCodexSessions(options = {}) {
         mtimeMs: stat.mtimeMs,
         changedMs: Math.max(stat.mtimeMs, stat.ctimeMs),
         sizeBytes: stat.size,
-        ...hintSessionId !== void 0 && { hintSessionIds: [hintSessionId] }
+        ...discoverySessionId !== void 0 && { discoverySessionIds: [discoverySessionId] }
       });
     }
   };
   const archiveDir = codexArchivedSessionsDir(sessionsDir);
-  const hintHome = options.homeDir ?? (options.codexDir === void 0 ? os6.homedir() : void 0);
-  if (hintHome !== void 0) {
-    for (const hint of readCodexTranscriptHints(hintHome, [sessionsDir, archiveDir])) {
-      await observe([hint.rolloutPath], hint.archived, hint.sessionId);
+  const discoveryHome = options.homeDir ?? (options.codexDir === void 0 ? os6.homedir() : void 0);
+  if (discoveryHome !== void 0) {
+    for (const record2 of readCodexTranscriptDiscoveryRecords(discoveryHome, [sessionsDir, archiveDir])) {
+      await observe([record2.rolloutPath], record2.archived, record2.sessionId);
     }
   }
   await observe(rolloutFiles(sessionsDir), false);
@@ -86707,17 +86934,17 @@ async function collectCodexSessions(options = {}) {
     const stored = dedupeStoreCopies(observed);
     let externalId = externalIdOf((stored.find((file2) => !file2.identity.page) ?? stored[0]).rolloutPath);
     try {
-      const spoolPath = stored.length > 1 ? path5.join(spoolDir, `${threadId2}.jsonl`) : void 0;
+      const mergedTranscriptPath = stored.length > 1 ? path5.join(mergedTranscriptsDir, `${threadId2}.jsonl`) : void 0;
       const changedMs = Math.max(...stored.map((file2) => file2.changedMs));
       if (options.sinceMs !== void 0 && changedMs < options.sinceMs) {
-        const neverMerged = spoolPath !== void 0 && !options.locationsOnly && statIfExists(spoolPath) === null;
+        const neverMerged = mergedTranscriptPath !== void 0 && !options.locationsOnly && statIfExists(mergedTranscriptPath) === null;
         if (!neverMerged) continue;
       }
       await yieldToEventLoop();
       const named = stored.filter((file2) => {
-        if (file2.hintSessionIds === void 0) return true;
+        if (file2.discoverySessionIds === void 0) return true;
         const { sessionId } = rolloutLocation(file2.rolloutPath);
-        return sessionId !== void 0 && file2.hintSessionIds.includes(sessionId);
+        return sessionId !== void 0 && file2.discoverySessionIds.includes(sessionId);
       });
       if (named.length === 0) continue;
       const threadFiles = named.length > 1 ? orderPages(named) : named;
@@ -86747,7 +86974,7 @@ async function collectCodexSessions(options = {}) {
       const thread = {
         externalId,
         files: threadFiles,
-        ...threadFiles.length > 1 && spoolPath !== void 0 && { spoolPath },
+        ...threadFiles.length > 1 && mergedTranscriptPath !== void 0 && { mergedTranscriptPath },
         mtimeMs,
         archived: threadFiles.every((file2) => file2.archived)
       };
@@ -86797,8 +87024,8 @@ async function collectCodexSessions(options = {}) {
     const { thread, cwd, decision } = candidate;
     let writer;
     try {
-      const rewrite = thread.spoolPath !== void 0 && !mergedSpoolIsFresh(thread.spoolPath, thread.mtimeMs);
-      if (thread.spoolPath !== void 0 && rewrite) writer = new MergedSpoolWriter(thread.spoolPath);
+      const rewrite = thread.mergedTranscriptPath !== void 0 && !mergedTranscriptIsFresh(thread.mergedTranscriptPath, thread.mtimeMs);
+      if (thread.mergedTranscriptPath !== void 0 && rewrite) writer = new MergedTranscriptWriter(thread.mergedTranscriptPath);
       const pages = [];
       const usage = createCodexUsageReader();
       let vanished = false;
@@ -86819,11 +87046,11 @@ async function collectCodexSessions(options = {}) {
         continue;
       }
       const summary = foldRolloutPages(pages, usage.finish());
-      let transcriptPath = thread.files[0].rolloutPath;
-      if (thread.spoolPath !== void 0) {
-        const mergedBytes = writer ? writer.finish(thread.mtimeMs) : statIfExists(thread.spoolPath)?.size ?? 0;
+      let transcriptUploadSourcePath = thread.files[0].rolloutPath;
+      if (thread.mergedTranscriptPath !== void 0) {
+        const mergedBytes = writer ? writer.finish(thread.mtimeMs) : statIfExists(thread.mergedTranscriptPath)?.size ?? 0;
         writer = void 0;
-        transcriptPath = thread.spoolPath;
+        transcriptUploadSourcePath = thread.mergedTranscriptPath;
         mergedThreads += 1;
         largestMergedBytes = Math.max(largestMergedBytes, mergedBytes);
       }
@@ -86832,13 +87059,14 @@ async function collectCodexSessions(options = {}) {
       const title = summary.sessionId ? threadNames.get(summary.sessionId) : void 0;
       items.push({
         mtimeMs: thread.mtimeMs,
-        transcriptPath,
+        transcriptPath: transcriptUploadSourcePath,
         ...cwd && { cwd },
         item: {
           source: "codex",
           externalId: thread.externalId,
           status: now - thread.mtimeMs < ACTIVE_GRACE_MS ? "active" : "inactive",
           archived: thread.archived,
+          ...summary.standaloneReview && { automation: true },
           ...summary.startedAt && { startedAt: summary.startedAt },
           ...summary.endedAt && { endedAt: summary.endedAt },
           ...summary.model && { model: summary.model },
@@ -86999,7 +87227,7 @@ function defaultCursorUserDir(home) {
 function cursorGlobalStorageDir(home) {
   return path6.join(defaultCursorUserDir(home), "globalStorage");
 }
-function cursorSpoolDir(home) {
+function cursorExtractedTranscriptsDir(home) {
   return path6.join(home, ".config", "powerplant", "cursor");
 }
 var emptyResult = () => ({
@@ -87055,7 +87283,7 @@ var cachedMetaSchema = external_exports.object({
   model: external_exports.string().optional(),
   ...cursorTranscriptMetaDisclosureSchema.shape
 });
-function spoolFileName(composerId) {
+function extractedTranscriptFileName(composerId) {
   const sanitized = composerId.replace(/[^A-Za-z0-9._-]/g, "_").slice(0, 80);
   const hash2 = createHash2("sha256").update(composerId).digest("hex").slice(0, 8);
   return `${sanitized}-${hash2}.jsonl`;
@@ -87118,7 +87346,7 @@ function toolFilePathOf(args) {
   }
   return void 0;
 }
-var SPOOL_META_RESERVE_BYTES = 64 * 1024;
+var EXTRACTED_TRANSCRIPT_META_RESERVE_BYTES = 64 * 1024;
 var BUBBLE_FIELDS_SHARED = ["_v", "type", "bubbleId", "serverBubbleId", "text", "createdAt"];
 var USER_BUBBLE_FIELDS = /* @__PURE__ */ new Set([...BUBBLE_FIELDS_SHARED, "context"]);
 var ASSISTANT_BUBBLE_FIELDS = /* @__PURE__ */ new Set([
@@ -87362,7 +87590,7 @@ function extractTranscript(db, composerId, maxBytes) {
   const spine = Array.isArray(data?.fullConversationHeadersOnly) ? data.fullConversationHeadersOnly : [];
   if (spine.length === 0) return null;
   const recorder = createOmissionRecorder();
-  const budget = maxBytes - SPOOL_META_RESERVE_BYTES;
+  const budget = maxBytes - EXTRACTED_TRANSCRIPT_META_RESERVE_BYTES;
   const serialized = [];
   const modelCounts = /* @__PURE__ */ new Map();
   let bytes = 0;
@@ -87443,7 +87671,7 @@ async function collectCursorSessions(options = {}) {
       collectCursorTranscriptFiles(options, (id) => {
         if (knownIds.has(id)) return true;
         return db?.prepare("select composerId from composerHeaders where composerId = ?").get(id) != null;
-      }, result, options.spoolDir ?? cursorSpoolDir(options.homeDir ?? os7.homedir()), spoolFileName);
+      }, result, options.extractedTranscriptsDir ?? cursorExtractedTranscriptsDir(options.homeDir ?? os7.homedir()), extractedTranscriptFileName);
     }
   } finally {
     try {
@@ -87457,9 +87685,9 @@ async function collectCursorSessions(options = {}) {
 function collectFromStore(db, userDir, options, result, knownIds) {
   const now = options.now ?? Date.now();
   const capture = options.capture ?? captureEverythingUnresolved;
-  const spoolDir = options.spoolDir ?? cursorSpoolDir(options.homeDir ?? os7.homedir());
+  const extractedTranscriptsDir = options.extractedTranscriptsDir ?? cursorExtractedTranscriptsDir(options.homeDir ?? os7.homedir());
   const maxBytes = options.maxTranscriptBytes ?? MAX_TRANSCRIPT_FILE_BYTES;
-  let spoolDirReady = false;
+  let extractedTranscriptsDirReady = false;
   const columns = new Set(
     db.prepare("pragma table_info(composerHeaders)").all().map((row) => isRecord2(row) ? row.name : void 0)
   );
@@ -87509,15 +87737,15 @@ function collectFromStore(db, userDir, options, result, knownIds) {
         });
         continue;
       }
-      const spoolPath = path6.join(spoolDir, spoolFileName(raw.composerId));
-      const spoolStat = statIfExists(spoolPath);
+      const transcriptUploadSourcePath = path6.join(extractedTranscriptsDir, extractedTranscriptFileName(raw.composerId));
+      const extractedTranscriptStat = statIfExists(transcriptUploadSourcePath);
       let model;
-      const sourceUnchanged = spoolStat !== null && Math.abs(spoolStat.mtimeMs - lastUpdatedAt) < 1;
-      if (sourceUnchanged && spoolStat.size > maxBytes) {
+      const sourceUnchanged = extractedTranscriptStat !== null && Math.abs(extractedTranscriptStat.mtimeMs - lastUpdatedAt) < 1;
+      if (sourceUnchanged && extractedTranscriptStat.size > maxBytes) {
         result.skippedTooLarge += 1;
         continue;
       }
-      const cached3 = sourceUnchanged ? readFirstRecord(spoolPath, () => true) : null;
+      const cached3 = sourceUnchanged ? readFirstRecord(transcriptUploadSourcePath, () => true) : null;
       const cachedMeta = cachedMetaSchema.safeParse(cached3);
       const preparationCurrent = cachedMeta.success && cachedMeta.data.composerId === raw.composerId;
       let omissions;
@@ -87550,15 +87778,15 @@ function collectFromStore(db, userDir, options, result, knownIds) {
           ...counted && { omissions: transcript.omissions },
           ...unhandled.length > 0 && { unhandled }
         };
-        if (!spoolDirReady) {
-          mkdirSync3(spoolDir, { recursive: true, mode: 448 });
-          chmodSync2(spoolDir, 448);
-          spoolDirReady = true;
+        if (!extractedTranscriptsDirReady) {
+          mkdirSync3(extractedTranscriptsDir, { recursive: true, mode: 448 });
+          chmodSync2(extractedTranscriptsDir, 448);
+          extractedTranscriptsDirReady = true;
         }
         const body = [JSON.stringify(meta3), ...transcript.serialized, ""].join("\n");
-        if (spoolStat !== null) chmodSync2(spoolPath, 384);
-        writeFileSync2(spoolPath, body, { encoding: "utf8", mode: 384 });
-        utimesSync2(spoolPath, new Date(lastUpdatedAt), new Date(lastUpdatedAt));
+        if (extractedTranscriptStat !== null) chmodSync2(transcriptUploadSourcePath, 384);
+        writeFileSync2(transcriptUploadSourcePath, body, { encoding: "utf8", mode: 384 });
+        utimesSync2(transcriptUploadSourcePath, new Date(lastUpdatedAt), new Date(lastUpdatedAt));
       }
       if (hasCaptureGaps(omissions)) result.partiallyInterpreted += 1;
       for (const observation of unhandledObservations(unhandled, raw.composerId)) {
@@ -87577,7 +87805,7 @@ function collectFromStore(db, userDir, options, result, knownIds) {
       const startBranch = facts.branches[0];
       result.sessions.push({
         mtimeMs: lastUpdatedAt,
-        transcriptPath: spoolPath,
+        transcriptPath: transcriptUploadSourcePath,
         ...cwd && { cwd },
         item: {
           source: "cursor",
@@ -87711,7 +87939,7 @@ function parseCursorTranscriptFile(text) {
   if (!lines.some((line) => CONTENT_LINE_TYPES2.has(line.type))) return null;
   return { lines, omissions: recorder.omissions(), unhandled: recorder.unhandled() };
 }
-function spoolBody(metaFor, lines, maxBytes) {
+function extractedTranscriptBody(metaFor, lines, maxBytes) {
   for (const keepPayloads of [true, false]) {
     const payloadsDropped = keepPayloads ? 0 : lines.filter((line) => line.type === "unsupported" && line.payload !== void 0).length;
     const records = [
@@ -87730,7 +87958,7 @@ function spoolBody(metaFor, lines, maxBytes) {
   }
   return null;
 }
-var spoolMetaSchema = external_exports.object({
+var extractedTranscriptMetaSchema = external_exports.object({
   type: external_exports.literal("meta"),
   format: external_exports.literal("cursor-local-transcript"),
   version: external_exports.literal(1),
@@ -87742,7 +87970,7 @@ var spoolMetaSchema = external_exports.object({
   model: external_exports.string().optional(),
   ...cursorTranscriptMetaDisclosureSchema.shape
 });
-var hintSchema2 = external_exports.object({
+var transcriptDiscoveryRecordSchema2 = external_exports.object({
   sessionId: external_exports.string().regex(/^[a-zA-Z0-9_-]{1,200}$/),
   transcriptPath: external_exports.string().max(4096).nullable(),
   workspaceRoots: external_exports.array(external_exports.string().max(4096)).max(8),
@@ -87774,15 +88002,15 @@ function cursorTranscriptRecordPath(home, sessionId) {
     `${createHash3("sha256").update(sessionId).digest("hex")}.json`
   );
 }
-function collectCursorTranscriptFiles(options, isDatabaseSession, result, databaseSpoolDir, spoolName) {
+function collectCursorTranscriptFiles(options, isDatabaseSession, result, databaseExtractedTranscriptsDir, extractedTranscriptFileName2) {
   const home = options.homeDir ?? os8.homedir();
-  const hintsDir = cursorTranscriptRecordsDir(home);
-  if (!existsSync3(hintsDir)) return;
+  const recordsDir = cursorTranscriptRecordsDir(home);
+  if (!existsSync3(recordsDir)) return;
   const maxBytes = options.maxTranscriptBytes ?? MAX_TRANSCRIPT_FILE_BYTES;
-  const spoolDir = path7.join(databaseSpoolDir, "native");
+  const nativeExtractedTranscriptsDir = path7.join(databaseExtractedTranscriptsDir, "native");
   let files;
   try {
-    files = readdirSync3(hintsDir);
+    files = readdirSync3(recordsDir);
   } catch {
     result.skippedUnreadable++;
     return;
@@ -87790,15 +88018,15 @@ function collectCursorTranscriptFiles(options, isDatabaseSession, result, databa
   for (const file2 of files) {
     if (!/^[a-f0-9]{64}\.json$/.test(file2)) continue;
     try {
-      const hintPath = path7.join(hintsDir, file2);
-      if (!lstatSync2(hintPath).isFile()) continue;
-      const text = readBounded(hintPath, 40 * 1024);
-      const hint = hintSchema2.parse(text === null ? null : JSON.parse(text));
-      if (file2 !== `${createHash3("sha256").update(hint.sessionId).digest("hex")}.json`) continue;
-      if (isDatabaseSession(hint.sessionId) || existsSync3(path7.join(databaseSpoolDir, spoolName(hint.sessionId))))
+      const recordPath = path7.join(recordsDir, file2);
+      if (!lstatSync2(recordPath).isFile()) continue;
+      const text = readBounded(recordPath, 40 * 1024);
+      const record2 = transcriptDiscoveryRecordSchema2.parse(text === null ? null : JSON.parse(text));
+      if (file2 !== `${createHash3("sha256").update(record2.sessionId).digest("hex")}.json`) continue;
+      if (isDatabaseSession(record2.sessionId) || existsSync3(path7.join(databaseExtractedTranscriptsDir, extractedTranscriptFileName2(record2.sessionId))))
         continue;
-      if (hint.transcriptPath === null || hint.workspaceRoots.length !== 1) continue;
-      const cwd = hint.workspaceRoots[0];
+      if (record2.transcriptPath === null || record2.workspaceRoots.length !== 1) continue;
+      const cwd = record2.workspaceRoots[0];
       if (!path7.isAbsolute(cwd)) continue;
       const decision = captureDecision(cwd, options.capture ?? captureEverythingUnresolved);
       if (!decision.capture) {
@@ -87808,14 +88036,14 @@ function collectCursorTranscriptFiles(options, isDatabaseSession, result, databa
       const projects = path7.join(home, ".cursor", "projects");
       const project = cwd.replace(/[^a-zA-Z0-9]/g, "-").replace(/^-+/, "");
       const base = path7.join(projects, project, "agent-transcripts");
-      const basename2 = `${hint.sessionId}.jsonl`;
-      const allowed = [path7.join(base, basename2), path7.join(base, hint.sessionId, basename2)];
-      if (!allowed.includes(hint.transcriptPath)) {
+      const basename2 = `${record2.sessionId}.jsonl`;
+      const allowed = [path7.join(base, basename2), path7.join(base, record2.sessionId, basename2)];
+      if (!allowed.includes(record2.transcriptPath)) {
         result.skippedUnreadable++;
         continue;
       }
-      const stat = lstatSync2(hint.transcriptPath);
-      if (!stat.isFile() || realpathSync2(hint.transcriptPath) !== path7.join(realpathSync2(projects), path7.relative(projects, hint.transcriptPath))) {
+      const stat = lstatSync2(record2.transcriptPath);
+      if (!stat.isFile() || realpathSync2(record2.transcriptPath) !== path7.join(realpathSync2(projects), path7.relative(projects, record2.transcriptPath))) {
         result.skippedUnreadable++;
         continue;
       }
@@ -87826,7 +88054,7 @@ function collectCursorTranscriptFiles(options, isDatabaseSession, result, databa
       }
       const common = {
         source: "cursor",
-        externalId: hint.sessionId,
+        externalId: record2.sessionId,
         status: (options.now ?? Date.now()) - stat.mtimeMs < ACTIVE_GRACE_MS ? "active" : "inactive",
         ...decision.repoFullName && { repoFullName: decision.repoFullName },
         capturedVia: decision.via
@@ -87835,15 +88063,15 @@ function collectCursorTranscriptFiles(options, isDatabaseSession, result, databa
         result.sessions.push({
           cwd,
           mtimeMs: stat.mtimeMs,
-          transcriptPath: hint.transcriptPath,
+          transcriptPath: record2.transcriptPath,
           item: common
         });
         continue;
       }
-      const spool = path7.join(spoolDir, spoolName(hint.sessionId));
-      const spoolStat = statIfExists(spool);
-      const cached3 = spoolStat !== null && spoolStat.size <= maxBytes && Math.abs(spoolStat.mtimeMs - stat.mtimeMs) < 1 ? spoolMetaSchema.safeParse(readFirstRecord(spool, () => true)) : null;
-      const fresh = cached3?.success && cached3.data.composerId === hint.sessionId && cached3.data.workspacePath === cwd && cached3.data.nativeSourceSize === stat.size && cached3.data.model === hint.model;
+      const transcriptUploadSourcePath = path7.join(nativeExtractedTranscriptsDir, extractedTranscriptFileName2(record2.sessionId));
+      const extractedTranscriptStat = statIfExists(transcriptUploadSourcePath);
+      const cached3 = extractedTranscriptStat !== null && extractedTranscriptStat.size <= maxBytes && Math.abs(extractedTranscriptStat.mtimeMs - stat.mtimeMs) < 1 ? extractedTranscriptMetaSchema.safeParse(readFirstRecord(transcriptUploadSourcePath, () => true)) : null;
+      const fresh = cached3?.success && cached3.data.composerId === record2.sessionId && cached3.data.workspacePath === cwd && cached3.data.nativeSourceSize === stat.size && cached3.data.model === record2.model;
       let title;
       let omissions;
       let unhandled = [];
@@ -87852,7 +88080,7 @@ function collectCursorTranscriptFiles(options, isDatabaseSession, result, databa
         omissions = cached3.data.omissions;
         unhandled = cached3.data.unhandled ?? [];
       } else {
-        const raw = readBounded(hint.transcriptPath, maxBytes);
+        const raw = readBounded(record2.transcriptPath, maxBytes);
         if (raw === null) {
           result.skippedTooLarge++;
           continue;
@@ -87873,40 +88101,40 @@ function collectCursorTranscriptFiles(options, isDatabaseSession, result, databa
             format: "cursor-local-transcript",
             version: 1,
             preparationVersion: CURSOR_TRANSCRIPT_PREPARATION_VERSION,
-            composerId: hint.sessionId,
+            composerId: record2.sessionId,
             workspacePath: cwd,
             nativeSourceSize: stat.size,
             ...title !== void 0 && { name: title },
-            ...hint.model && { model: hint.model },
+            ...record2.model && { model: record2.model },
             ...Object.keys(written).length > 0 && { omissions: written },
             ...prepared.unhandled.length > 0 && { unhandled: prepared.unhandled }
           };
         };
-        const body = spoolBody(metaFor, prepared.lines, maxBytes);
+        const body = extractedTranscriptBody(metaFor, prepared.lines, maxBytes);
         if (body === null) {
           result.skippedTooLarge++;
           continue;
         }
-        mkdirSync4(spoolDir, { recursive: true, mode: 448 });
-        if (spoolStat !== null) chmodSync3(spool, 384);
-        writeFileSync3(spool, body, { mode: 384 });
-        utimesSync3(spool, stat.atime, stat.mtime);
+        mkdirSync4(nativeExtractedTranscriptsDir, { recursive: true, mode: 448 });
+        if (extractedTranscriptStat !== null) chmodSync3(transcriptUploadSourcePath, 384);
+        writeFileSync3(transcriptUploadSourcePath, body, { mode: 384 });
+        utimesSync3(transcriptUploadSourcePath, stat.atime, stat.mtime);
         omissions = Object.keys(written).length > 0 ? written : void 0;
         unhandled = prepared.unhandled;
       }
       if (hasCaptureGaps(omissions)) result.partiallyInterpreted++;
-      for (const observation of unhandledObservations(unhandled, hint.sessionId)) {
+      for (const observation of unhandledObservations(unhandled, record2.sessionId)) {
         observeStructure(options.onStructureDiagnostic, observation);
       }
       result.sessions.push({
         cwd,
         mtimeMs: stat.mtimeMs,
-        transcriptPath: spool,
+        transcriptPath: transcriptUploadSourcePath,
         item: {
           ...common,
           endedAt: stat.mtime.toISOString(),
           repoDir: path7.basename(cwd),
-          ...hint.model && { model: hint.model },
+          ...record2.model && { model: record2.model },
           ...title !== void 0 && { title }
         }
       });
@@ -88070,7 +88298,7 @@ function observedSessionEnd(entry, mtimeMs) {
   return entry.at;
 }
 
-// ../../apps/collector/src/providerHooks.ts
+// ../../apps/collector/src/harnessHooks.ts
 import {
   existsSync as existsSync5,
   lstatSync as lstatSync3,
@@ -88086,26 +88314,39 @@ var SESSION_CHANGE_HOOK = "powerplant-session-change.mjs";
 var CODEX_TRANSCRIPT_HOOK = "powerplant-codex-transcript.mjs";
 var CURSOR_TRANSCRIPT_HOOK = "powerplant-cursor-transcript.mjs";
 var SESSION_CHANGE_FILENAME = "session-change";
+var SUPPORTED_HOOK_HARNESSES = ["codex-local", "cursor-local"];
 var jsonObject = external_exports.record(external_exports.string(), external_exports.json());
-function providerEvents(provider) {
-  return provider === "cursor" ? ["sessionStart", "sessionEnd", "stop"] : ["SessionStart", "SessionEnd", "Stop"];
+function nativeHarnessName(harness) {
+  switch (harness) {
+    case "codex-local":
+      return "codex";
+    case "cursor-local":
+      return "cursor";
+    default:
+      throw new Error(`unsupported hook harness: ${String(harness)}`);
+  }
+}
+function harnessEvents(harness) {
+  return nativeHarnessName(harness) === "cursor" ? ["sessionStart", "sessionEnd", "stop"] : ["SessionStart", "SessionEnd", "Stop"];
 }
-function providerConfigPath(provider, home) {
-  return path10.join(home, `.${provider}`, "hooks.json");
+function harnessHookConfigPath(harness, home) {
+  const nativeName = nativeHarnessName(harness);
+  return path10.join(home, `.${nativeName}`, "hooks.json");
 }
 var UNUSABLE_CONFIG = "hooks.json contains invalid JSON or an unsupported hook structure";
 var NON_REGULAR_CONFIG = "hooks.json is not a regular file; configure the hook manually";
-function providerHookCommands(provider, text) {
+function harnessHookCommands(harness, text) {
   try {
+    const nativeName = nativeHarnessName(harness);
     const settings = jsonObject.parse(text === null ? {} : JSON.parse(text));
-    if (provider === "cursor" && settings.version !== void 0 && settings.version !== 1) {
+    if (nativeName === "cursor" && settings.version !== void 0 && settings.version !== 1) {
       return { kind: "unusable", reason: "Unsupported Cursor hooks version" };
     }
     const hooks = jsonObject.parse(settings.hooks === void 0 ? {} : settings.hooks);
     const commands = [];
-    for (const event of providerEvents(provider)) {
+    for (const event of harnessEvents(harness)) {
       const entries = external_exports.array(jsonObject).parse(hooks[event] === void 0 ? [] : hooks[event]);
-      const handlers2 = provider === "cursor" ? entries : entries.flatMap((entry) => external_exports.array(jsonObject).parse(entry.hooks));
+      const handlers2 = nativeName === "cursor" ? entries : entries.flatMap((entry) => external_exports.array(jsonObject).parse(entry.hooks));
       const ours = handlers2.filter(isOurHook);
       if (ours.length === 0) return { kind: "missing" };
       for (const hook of ours) {
@@ -88121,20 +88362,21 @@ function isOurHook(hook) {
   const command = hook.command;
   return typeof command === "string" && [SESSION_CHANGE_HOOK, CODEX_TRANSCRIPT_HOOK, CURSOR_TRANSCRIPT_HOOK].some((script) => command.endsWith(`/${script}'`) || command.endsWith(`/${script}"`));
 }
-function mergeProviderHooks(provider, text, command) {
+function mergeHarnessHooks(harness, text, command) {
   try {
+    const nativeName = nativeHarnessName(harness);
     const settings = jsonObject.parse(text === null ? {} : JSON.parse(text));
-    if (provider === "cursor" && settings.version !== void 0 && settings.version !== 1) {
+    if (nativeName === "cursor" && settings.version !== void 0 && settings.version !== 1) {
       return { action: "skip", reason: "Unsupported Cursor hooks version" };
     }
     const hooks = jsonObject.parse(settings.hooks === void 0 ? {} : settings.hooks);
-    for (const event of providerEvents(provider)) {
+    for (const event of harnessEvents(harness)) {
       const entries = external_exports.array(jsonObject).parse(hooks[event] === void 0 ? [] : hooks[event]);
-      const handler = provider === "cursor" ? { command, timeout: 2 } : { type: "command", command, timeout: 2 };
-      const ours = provider === "cursor" ? handler : { hooks: [handler] };
+      const handler = nativeName === "cursor" ? { command, timeout: 2 } : { type: "command", command, timeout: 2 };
+      const ours = nativeName === "cursor" ? handler : { hooks: [handler] };
       const kept = [];
       for (const entry of entries) {
-        if (provider === "cursor") {
+        if (nativeName === "cursor") {
           if (!isOurHook(entry)) kept.push(entry);
           continue;
         }
@@ -88145,7 +88387,7 @@ function mergeProviderHooks(provider, text, command) {
       }
       hooks[event] = [...kept, ours];
     }
-    const next = { ...settings, ...provider === "cursor" ? { version: 1 } : {}, hooks };
+    const next = { ...settings, ...nativeName === "cursor" ? { version: 1 } : {}, hooks };
     if (JSON.stringify(next) === JSON.stringify(settings)) return { action: "unchanged" };
     return { action: "write", text: `${JSON.stringify(next, null, 2)}
 ` };
@@ -88156,42 +88398,47 @@ function mergeProviderHooks(provider, text, command) {
 function shellQuote2(value) {
   return `'${value.replaceAll("'", "'\\''")}'`;
 }
-function installProviderHook(provider, home) {
-  const configDir = path10.join(home, `.${provider}`);
-  if (!existsSync5(configDir)) return { provider, settings: "absent" };
-  const configPath = providerConfigPath(provider, home);
+function installHarnessHook(harness, home) {
+  const nativeName = nativeHarnessName(harness);
+  const configDir = path10.join(home, `.${nativeName}`);
+  if (!existsSync5(configDir)) return { provider: nativeName, settings: "absent" };
+  const configPath = harnessHookConfigPath(harness, home);
   let original = null;
   let mode = 384;
   try {
     const stat = lstatSync3(configPath);
-    if (!stat.isFile()) return { provider, settings: "skip", detail: NON_REGULAR_CONFIG };
+    if (!stat.isFile()) {
+      return { provider: nativeName, settings: "skip", detail: NON_REGULAR_CONFIG };
+    }
     mode = stat.mode & 511;
     original = readFileSync6(configPath, "utf8");
   } catch (error63) {
     if (!(error63 instanceof Error && "code" in error63 && error63.code === "ENOENT")) throw error63;
   }
   const hookDir = path10.join(home, ".config", "powerplant", "hooks");
-  const script = provider === "cursor" ? CURSOR_TRANSCRIPT_HOOK : CODEX_TRANSCRIPT_HOOK;
+  const script = nativeName === "cursor" ? CURSOR_TRANSCRIPT_HOOK : CODEX_TRANSCRIPT_HOOK;
   const scriptPath = path10.join(hookDir, script);
-  const merged = mergeProviderHooks(
-    provider,
+  const merged = mergeHarnessHooks(
+    harness,
     original,
     `${shellQuote2(process.execPath)} ${shellQuote2(scriptPath)}`
   );
-  if (merged.action === "skip") return { provider, settings: "skip", detail: merged.reason };
+  if (merged.action === "skip") {
+    return { provider: nativeName, settings: "skip", detail: merged.reason };
+  }
   mkdirSync6(hookDir, { recursive: true });
   writeAtomic(scriptPath, readFileSync6(hookSourcePath(script), "utf8"), 448);
   if (merged.action === "write") {
     const current = existsSync5(configPath) ? readFileSync6(configPath, "utf8") : null;
     if (current !== original)
       return {
-        provider,
+        provider: nativeName,
         settings: "skip",
         detail: "hooks.json changed during installation; restart the collector to retry"
       };
     writeAtomic(configPath, merged.text, mode);
   }
-  return { provider, settings: merged.action };
+  return { provider: nativeName, settings: merged.action };
 }
 function writeAtomic(file2, text, mode) {
   const temporary = `${file2}.${randomUUID()}.tmp`;
@@ -88202,13 +88449,13 @@ function writeAtomic(file2, text, mode) {
     rmSync4(temporary, { force: true });
   }
 }
-function installProviderHooks(home) {
-  return ["codex", "cursor"].map((provider) => {
+function installHarnessHooks(home) {
+  return SUPPORTED_HOOK_HARNESSES.map((harness) => {
     try {
-      return installProviderHook(provider, home);
+      return installHarnessHook(harness, home);
     } catch (error63) {
       return {
-        provider,
+        provider: nativeHarnessName(harness),
         settings: "skip",
         detail: error63 instanceof Error ? error63.message : String(error63)
       };
@@ -88220,7 +88467,7 @@ function installProviderHooks(home) {
 var HOOK_OBSERVATION_GRACE_MS = 2 * 6e4;
 var hookHealthSchema = external_exports.object({
   harness: hookHarnessSchema,
-  /** What this daemon's boot-time install did (installCollectorHooks / installProviderHooks). */
+  /** What this daemon's boot-time install did (installCollectorHooks / installHarnessHooks). */
   install: hookInstallOutcomeSchema,
   /** unverified: no in-scope session started since the install has been
    * judged yet. firing: one carried a hook record. silent: one had none. */
@@ -88249,7 +88496,10 @@ var HARNESS_NAMES = {
   cursor: "Cursor"
 };
 function configPathOf(harness, home) {
-  return harness === "claude" ? claudeSettingsPath(home) : providerConfigPath(harness, home);
+  return harness === "claude" ? claudeSettingsPath(home) : harnessHookConfigPath(localHookHarness(harness), home);
+}
+function localHookHarness(harness) {
+  return harness === "codex" ? "codex-local" : "cursor-local";
 }
 function commandPaths(command) {
   const paths = [];
@@ -88284,7 +88534,7 @@ function inspectHookConfig(harness, home) {
       detail: error63 instanceof Error ? error63.message : String(error63)
     };
   }
-  const read = harness === "claude" ? collectorHookCommands(text) : providerHookCommands(harness, text);
+  const read = harness === "claude" ? collectorHookCommands(text) : harnessHookCommands(localHookHarness(harness), text);
   if (read.kind === "unusable") return { kind: "config-unusable", configPath, detail: read.reason };
   if (read.kind === "missing") return { kind: "entries-missing", configPath };
   for (const command of read.commands) {
@@ -89186,7 +89436,7 @@ async function uploadPreviewRegistration(apiUrl, machineToken, registration) {
 function encodeRawTranscript(text) {
   return gzipSync(redactJsonl(text));
 }
-async function uploadRawSessions(apiUrl, machineToken, collected, readTranscript = (p) => readFileSync9(p, "utf8"), shipped, progress) {
+async function uploadRawSessions(apiUrl, machineToken, transcriptUploadSources, readTranscript = (p) => readFileSync9(p, "utf8"), shipped, progress) {
   const summary = {
     uploaded: 0,
     skippedTooLarge: 0,
@@ -89197,18 +89447,19 @@ async function uploadRawSessions(apiUrl, machineToken, collected, readTranscript
   };
   const initiallyShipped = new Map(shipped);
   let rateLimited;
-  for (const session of collected) {
+  for (const session of transcriptUploadSources) {
     summary.uploaded += await progress?.beforeUpload?.() ?? 0;
-    const acknowledged = shipped?.get(session.transcriptPath);
-    if (acknowledged === session.mtimeMs || acknowledged !== void 0 && acknowledged !== initiallyShipped.get(session.transcriptPath)) {
+    const transcriptUploadSourcePath = session.transcriptPath;
+    const acknowledged = shipped?.get(transcriptUploadSourcePath);
+    if (acknowledged === session.mtimeMs || acknowledged !== void 0 && acknowledged !== initiallyShipped.get(transcriptUploadSourcePath)) {
       summary.skippedUnchanged += 1;
       continue;
     }
     try {
-      const body = encodeRawTranscript(readTranscript(session.transcriptPath));
+      const body = encodeRawTranscript(readTranscript(transcriptUploadSourcePath));
       if (body.byteLength > MAX_RAW_UPLOAD_BYTES) {
         summary.skippedTooLarge += 1;
-        shipped?.set(session.transcriptPath, session.mtimeMs);
+        shipped?.set(transcriptUploadSourcePath, session.mtimeMs);
         continue;
       }
       const query = `source=${session.item.source}&externalId=${encodeURIComponent(session.item.externalId)}`;
@@ -89241,7 +89492,7 @@ async function uploadRawSessions(apiUrl, machineToken, collected, readTranscript
       }
       summary.uploaded += 1;
       progress?.onUploaded?.();
-      shipped?.set(session.transcriptPath, session.mtimeMs);
+      shipped?.set(transcriptUploadSourcePath, session.mtimeMs);
     } catch (error63) {
       if (error63 instanceof RateLimitedError) rateLimited ??= error63;
       summary.failed.push(
@@ -91112,7 +91363,7 @@ function startWatch(config2, homeDir, runtime = { version: "checkout" }) {
     );
     reportCollectorError(error63, "watch-hook-install");
   }
-  for (const hook of installProviderHooks(home)) {
+  for (const hook of installHarnessHooks(home)) {
     hookInstalls[hook.provider] = hook.settings;
     if (hook.settings === "absent") continue;
     if (hook.settings === "skip") {
@@ -91861,7 +92112,7 @@ function belowVersionFloor(client, versionText) {
 }
 
 // src/connect.ts
-var MCP_SERVER_NAME = "powerplant";
+var mcpServerNameFor = (appEnv) => appEnv === "production" ? "powerplant" : `powerplant-${appEnv}`;
 var AGENT_DISPLAY_NAMES = {
   claude: "Claude Code",
   codex: "Codex",
@@ -92298,7 +92549,7 @@ function realCheckboxPrompt(question, choices, seams = {}) {
 function claudeAddArgs(deps) {
   const official = deps.officialClients?.["claude-code"];
   const credentialArgs = official ? ["--client-id", official.clientId, "--callback-port", String(official.callbackPort)] : [];
-  return ["mcp", "add", "--transport", "http", "--scope", "user", ...credentialArgs, MCP_SERVER_NAME, deps.mcpUrl];
+  return ["mcp", "add", "--transport", "http", "--scope", "user", ...credentialArgs, deps.serverName, deps.mcpUrl];
 }
 function parseClaudeProbe(result) {
   const output2 = result.stdout + result.stderr;
@@ -92319,7 +92570,7 @@ function claudeEnv(client) {
 function connectClaude(client, name, deps) {
   const { bin } = client;
   const env = claudeEnv(client);
-  const probe = parseClaudeProbe(deps.run(bin, ["mcp", "get", MCP_SERVER_NAME], env));
+  const probe = parseClaudeProbe(deps.run(bin, ["mcp", "get", deps.serverName], env));
   if (probe.broken) {
     return failed(`probing for the Powerplant MCP failed, ${probe.detail}`);
   }
@@ -92327,7 +92578,7 @@ function connectClaude(client, name, deps) {
   if (missing || registeredUrl !== void 0 && registeredUrl !== deps.mcpUrl) {
     if (!missing) {
       deps.log(`${name}: registered against ${registeredUrl}, re-registering for ${deps.mcpUrl}.`);
-      deps.run(bin, ["mcp", "remove", "--scope", "user", MCP_SERVER_NAME], env);
+      deps.run(bin, ["mcp", "remove", "--scope", "user", deps.serverName], env);
     }
     const add = deps.run(bin, claudeAddArgs(deps), env);
     if (add.status !== 0) {
@@ -92339,7 +92590,7 @@ function connectClaude(client, name, deps) {
     return { state: "connected", unchanged: true };
   } else if (deps.officialClients?.["claude-code"]) {
     deps.log(`${name}: re-registering with the pre-registered client before sign-in.`);
-    deps.run(bin, ["mcp", "remove", "--scope", "user", MCP_SERVER_NAME], env);
+    deps.run(bin, ["mcp", "remove", "--scope", "user", deps.serverName], env);
     const add = deps.run(bin, claudeAddArgs(deps), env);
     if (add.status !== 0) {
       return failed(`registering the Powerplant MCP failed, ${describeFailure(add)}`);
@@ -92347,7 +92598,7 @@ function connectClaude(client, name, deps) {
   } else {
     deps.log(`${name}: Powerplant MCP already registered.`);
   }
-  return login(bin, name, ["mcp", "login", MCP_SERVER_NAME], deps, env);
+  return login(bin, name, ["mcp", "login", deps.serverName], deps, env);
 }
 function codexOauthHeaderPattern(serverName) {
   return new RegExp(
@@ -92514,7 +92765,7 @@ function parseCodexServers(stdout) {
   }
 }
 var CODEX_AUTHENTICATED_STATUSES = /* @__PURE__ */ new Set(["o_auth", "bearer_token"]);
-function parseCodexProbe(result) {
+function parseCodexProbe(result, serverName) {
   if (result.status !== 0) {
     return {
       broken: true,
@@ -92532,7 +92783,7 @@ function parseCodexProbe(result) {
       authenticated: false
     };
   }
-  const existing = servers.find((server) => server.name === MCP_SERVER_NAME);
+  const existing = servers.find((server) => server.name === serverName);
   if (!existing) return { broken: false, missing: true, authenticated: false };
   return {
     broken: false,
@@ -92544,7 +92795,7 @@ function parseCodexProbe(result) {
 function codexAddArgs(deps, options) {
   const official = deps.officialClients?.codex;
   const credentialArgs = options.withOfficialClientId && official ? ["--oauth-client-id", official.clientId] : [];
-  return ["mcp", "add", MCP_SERVER_NAME, ...credentialArgs, "--url", deps.mcpUrl];
+  return ["mcp", "add", deps.serverName, ...credentialArgs, "--url", deps.mcpUrl];
 }
 function codexAddLogsIn(bin, deps) {
   const help = deps.run(bin, ["mcp", "add", "--help"]);
@@ -92559,9 +92810,9 @@ function codexServerEntryPattern(serverName) {
 function healOrphanCodexOauthTable(name, deps) {
   const existing = deps.readTextFile(deps.codexConfigPath);
   if (existing === null) return;
-  if (!codexOauthHeaderPattern(MCP_SERVER_NAME).test(existing)) return;
-  if (codexServerEntryPattern(MCP_SERVER_NAME).test(existing)) return;
-  const { content, changed } = unpatchCodexConfigToml(existing, MCP_SERVER_NAME);
+  if (!codexOauthHeaderPattern(deps.serverName).test(existing)) return;
+  if (codexServerEntryPattern(deps.serverName).test(existing)) return;
+  const { content, changed } = unpatchCodexConfigToml(existing, deps.serverName);
   if (!changed) return;
   deps.writeTextFile(deps.codexConfigPath, content);
   deps.log(
@@ -92570,7 +92821,7 @@ function healOrphanCodexOauthTable(name, deps) {
 }
 function connectCodex(bin, name, deps) {
   healOrphanCodexOauthTable(name, deps);
-  const probe = parseCodexProbe(deps.run(bin, ["mcp", "list", "--json"]));
+  const probe = parseCodexProbe(deps.run(bin, ["mcp", "list", "--json"]), deps.serverName);
   if (probe.broken) {
     return failed(probe.detail ?? "probing for the Powerplant MCP failed");
   }
@@ -92597,7 +92848,7 @@ function connectCodex(bin, name, deps) {
   }
   ensureCodexOfficialClient(name, deps);
   if (alreadyConnected) return { state: "connected", unchanged: true };
-  return login(bin, name, ["mcp", "login", MCP_SERVER_NAME], deps);
+  return login(bin, name, ["mcp", "login", deps.serverName], deps);
 }
 function applyCodexConfigPatch(name, deps, patch, successLine) {
   if (patch.conflict !== void 0) {
@@ -92629,7 +92880,7 @@ function ensureCodexOfficialClient(name, deps) {
     deps,
     patchCodexConfigToml(
       deps.readTextFile(deps.codexConfigPath),
-      MCP_SERVER_NAME,
+      deps.serverName,
       official.clientId,
       official.callbackPort
     ),
@@ -92640,7 +92891,7 @@ function connectCursor(mcpJsonPath, name, deps) {
   const official = deps.officialClients?.cursor;
   const patch = patchCursorMcpJson(
     deps.readTextFile(mcpJsonPath),
-    MCP_SERVER_NAME,
+    deps.serverName,
     deps.mcpUrl,
     official?.clientId ?? null
   );
@@ -92651,12 +92902,12 @@ function connectCursor(mcpJsonPath, name, deps) {
   }
   if (patch.changed) deps.writeTextFile(mcpJsonPath, patch.content);
   const configured = patch.changed ? "configured" : "already configured";
-  if (deps.openUrl(cursorInstallDeeplink(MCP_SERVER_NAME, patch.entry))) {
+  if (deps.openUrl(cursorInstallDeeplink(deps.serverName, patch.entry))) {
     deps.log(`\u2192 ${name}  ${configured}, approve inside Cursor when it asks.`);
     return { state: "configured", unchanged: !patch.changed };
   }
   deps.log(
-    `\u2192 ${name}  ${configured}, could not open Cursor; in Cursor's MCP settings, enable the powerplant server and sign in.`
+    `\u2192 ${name}  ${configured}, could not open Cursor; in Cursor's MCP settings, enable the ${deps.serverName} server and sign in.`
   );
   return { state: "pending", unchanged: false };
 }
@@ -92717,7 +92968,7 @@ function disconnectClaude(client, deps) {
   const { bin } = client;
   const name = describeClaudeTarget(client);
   const env = claudeEnv(client);
-  const get = deps.run(bin, ["mcp", "get", MCP_SERVER_NAME], env);
+  const get = deps.run(bin, ["mcp", "get", deps.serverName], env);
   const output2 = get.stdout + get.stderr;
   if (/No MCP server named/i.test(output2)) {
     deps.log(`${name}: not connected.`);
@@ -92727,7 +92978,7 @@ function disconnectClaude(client, deps) {
     deps.log(`\u2717 ${name}: probing for the Powerplant MCP failed, ${describeFailure(get)}`);
     return "failed";
   }
-  const remove = deps.run(bin, ["mcp", "remove", "--scope", "user", MCP_SERVER_NAME], env);
+  const remove = deps.run(bin, ["mcp", "remove", "--scope", "user", deps.serverName], env);
   if (remove.status !== 0) {
     deps.log(`\u2717 ${name}: removing the Powerplant MCP failed, ${describeFailure(remove)}`);
     return "failed";
@@ -92747,15 +92998,15 @@ function disconnectCodex(bin, deps) {
     deps.log(`\u2717 ${name}: could not read its MCP server list, is this codex version very old?`);
     return "failed";
   }
-  const registered = servers.some((server) => server.name === MCP_SERVER_NAME);
-  const patch = unpatchCodexConfigToml(deps.readTextFile(deps.codexConfigPath), MCP_SERVER_NAME);
+  const registered = servers.some((server) => server.name === deps.serverName);
+  const patch = unpatchCodexConfigToml(deps.readTextFile(deps.codexConfigPath), deps.serverName);
   if (patch.changed) deps.writeTextFile(deps.codexConfigPath, patch.content);
   if (!registered) {
     deps.log(`${name}: not connected.`);
     return "notConnected";
   }
-  deps.run(bin, ["mcp", "logout", MCP_SERVER_NAME]);
-  const remove = deps.run(bin, ["mcp", "remove", MCP_SERVER_NAME]);
+  deps.run(bin, ["mcp", "logout", deps.serverName]);
+  const remove = deps.run(bin, ["mcp", "remove", deps.serverName]);
   if (remove.status !== 0) {
     deps.log(`\u2717 ${name}: removing the Powerplant MCP failed, ${describeFailure(remove)}`);
     return "failed";
@@ -92765,9 +93016,9 @@ function disconnectCodex(bin, deps) {
 }
 function disconnectCursor(mcpJsonPath, deps) {
   const name = `Cursor (${mcpJsonPath.replace(os20.homedir(), "~")})`;
-  const patch = unpatchCursorMcpJson(deps.readTextFile(mcpJsonPath), MCP_SERVER_NAME);
+  const patch = unpatchCursorMcpJson(deps.readTextFile(mcpJsonPath), deps.serverName);
   if (patch.error !== void 0) {
-    deps.log(`\u2717 ${name}: mcp.json is ${patch.error}, fix it by hand, then re-run powerplant disconnect.`);
+    deps.log(`\u2717 ${name}: mcp.json is ${patch.error}, fix it by hand, then re-run ${deps.disconnectCommand}.`);
     return "failed";
   }
   if (!patch.changed) {
@@ -92781,15 +93032,15 @@ function disconnectCursor(mcpJsonPath, deps) {
 function anyClientStillConnected(clients, deps) {
   return clients.some((client) => {
     if (client.client === "claude") {
-      const get = deps.run(client.bin, ["mcp", "get", MCP_SERVER_NAME], claudeEnv(client));
+      const get = deps.run(client.bin, ["mcp", "get", deps.serverName], claudeEnv(client));
       return get.status === 0 && !/No MCP server named/i.test(get.stdout + get.stderr);
     }
     if (client.client === "codex") {
       const list = deps.run(client.bin, ["mcp", "list", "--json"]);
       if (list.status !== 0) return false;
-      return parseCodexServers(list.stdout)?.some((server) => server.name === MCP_SERVER_NAME) ?? false;
+      return parseCodexServers(list.stdout)?.some((server) => server.name === deps.serverName) ?? false;
     }
-    const patch = unpatchCursorMcpJson(deps.readTextFile(client.bin), MCP_SERVER_NAME);
+    const patch = unpatchCursorMcpJson(deps.readTextFile(client.bin), deps.serverName);
     return patch.error === void 0 && patch.changed;
   });
 }
@@ -92974,10 +93225,10 @@ function probeClient(client, deps) {
   return report(
     kind,
     kind === "claude" ? parseClaudeProbe(
-      deps.run(bin, ["mcp", "get", MCP_SERVER_NAME], {
+      deps.run(bin, ["mcp", "get", deps.serverName], {
         CLAUDE_CONFIG_DIR: client.configDir
       })
-    ) : parseCodexProbe(deps.run(bin, ["mcp", "list", "--json"])),
+    ) : parseCodexProbe(deps.run(bin, ["mcp", "list", "--json"]), deps.serverName),
     deps.mcpUrl
   );
 }
@@ -93000,7 +93251,7 @@ function probeCursor(mcpJsonPath, deps) {
       detail: error63 instanceof Error ? error63.message : String(error63)
     };
   }
-  const registration = readCursorRegistration(raw, MCP_SERVER_NAME);
+  const registration = readCursorRegistration(raw, deps.serverName);
   if (registration.error !== void 0) {
     return { client: "cursor", state: "check-failed", detail: `mcp.json is ${registration.error}` };
   }
@@ -93158,7 +93409,7 @@ import { accessSync, constants as constants2, readFileSync as readFileSync12 } f
 import path25 from "node:path";
 
 // src/version.ts
-var CLI_VERSION = true ? "0.4.11" : "0.0.0-checkout";
+var CLI_VERSION = true ? "0.4.13" : "0.0.0-checkout";
 var CLI_RELEASE_BUILD = true ? true : false;
 var CLI_PACKAGE_NAME = "@usepowerplant/cli";
 
@@ -93278,7 +93529,13 @@ function realInspectEnvironment() {
 
 // src/update.ts
 var updateProgressSchema = external_exports.object({
-  state: external_exports.enum(["installing", "failed"]),
+  /** "up-to-date": the last run installed nothing, because this build is
+   * already at or past the release. That record is kept only so the menu
+   * bar app that started the run can stop showing "Updating CLI…"
+   * (menu.ts cliUpToDateAt); to every other reader it is no update at all.
+   * A CLI from before this state rejects the record, which it reads as no
+   * record. */
+  state: external_exports.enum(["installing", "failed", "up-to-date"]),
   /** The release aimed at; null when the registry couldn't be asked (its latest). */
   target: external_exports.string().nullable(),
   startedAt: external_exports.string(),
@@ -93318,7 +93575,7 @@ function readUpdateProgress(readTextFile, file2 = updateProgressPath()) {
   }
 }
 function updateProgressView(progress, cliVersion2, now) {
-  if (progress === null) return { kind: "none" };
+  if (progress === null || progress.state === "up-to-date") return { kind: "none" };
   const reached = progress.target === null ? null : compareReleaseVersions(cliVersion2, progress.target);
   if (reached === 0 || reached === 1) return { kind: "none" };
   if (progress.state === "failed") {
@@ -93351,13 +93608,29 @@ async function runUpdate(deps) {
   const reserved = running?.state === "installing" ? running.target : null;
   const attempts = (release2) => running?.target === release2 && running.attempts !== void 0 ? { attempts: running.attempts } : {};
   deps.writeProgress({ state: "installing", target: reserved, startedAt, pid: deps.pid, ...attempts(reserved) });
-  const target = await deps.resolveTarget() ?? reserved;
+  const resolved = await deps.resolveTarget();
+  if (resolved !== null) deps.recordAvailableVersion(resolved);
+  const target = resolved ?? reserved;
   if (target === null && deps.targetRequired) {
     deps.clearProgress();
     throw new ExpectedCliError(
       "No release is promoted for production right now (or the API couldn't be reached), so there is nothing to update to. Production machines only install the promoted release."
     );
   }
+  const reached = target === null ? null : compareReleaseVersions(deps.cliVersion, target);
+  if (reached === 0 || reached === 1) {
+    deps.writeProgress({
+      state: "up-to-date",
+      target,
+      startedAt,
+      pid: deps.pid,
+      finishedAt: new Date(deps.now()).toISOString()
+    });
+    deps.log(
+      reached === 0 ? `Already up to date (v${deps.cliVersion}).` : `Already on v${deps.cliVersion}, newer than the available release (v${target}). Nothing was installed.`
+    );
+    return;
+  }
   deps.writeProgress({ state: "installing", target, startedAt, pid: deps.pid, ...attempts(target) });
   const { bin, args } = updateCommand(manager, target, inspection.prefix, deps.channel);
   deps.log(`Updating ${CLI_PACKAGE_NAME}${target === null ? "" : ` to ${target}`} via ${manager}\u2026`);
@@ -94202,6 +94475,7 @@ function renderMenu(i) {
         logPath: updateLogPath()
       }
     },
+    ...i.update.progress?.state === "up-to-date" && { cliUpToDateAt: i.update.progress.finishedAt },
     ...i.desktopDiagnostic && { desktopDiagnostic: i.desktopDiagnostic },
     appEnv: i.config.appEnv,
     cliVersion: i.cliVersion,
@@ -94505,14 +94779,17 @@ async function cachedLatestVersion(options) {
     }
   }
   const version2 = await options.fetchLatest();
+  writeVersionCache({ ...options, version: version2 });
+  return version2;
+}
+function writeVersionCache(options) {
   try {
     options.writeTextFile(
       options.cacheFile,
-      JSON.stringify({ checkedAt: new Date(options.now).toISOString(), version: version2 })
+      JSON.stringify({ checkedAt: new Date(options.now).toISOString(), version: options.version })
     );
   } catch {
   }
-  return version2;
 }
 
 // src/liveTerminalSessions.ts
@@ -95569,6 +95846,7 @@ ${USAGE}`);
     log: log3
   });
   const connectCommand = withEnv("powerplant connect");
+  const disconnectCommand = withEnv("powerplant disconnect");
   const clientFilter = parseClientFilter(values.client);
   const pickerOn = pickerAllowed({
     yes: values.yes,
@@ -95618,6 +95896,7 @@ ${USAGE}`);
     }
     const outcome = runConnect(clients, {
       mcpUrl: `${config2.apiUrl}/mcp`,
+      serverName: mcpServerNameFor(config2.appEnv),
       connectCommand,
       officialClients: await fetchOfficialClients(config2.apiUrl, log3),
       log: log3,
@@ -95705,6 +95984,8 @@ ${USAGE}`);
       }
       const outcome = runDisconnect(clients, {
         log: console.log,
+        serverName: mcpServerNameFor(config2.appEnv),
+        disconnectCommand,
         run: realRun,
         readTextFile: realReadTextFileStrict,
         writeTextFile: realWriteTextFile,
@@ -95837,6 +96118,7 @@ The access you granted these agents stays on your Powerplant account until you r
         oldestSupportedVersion,
         connections: probeConnections(clients, {
           mcpUrl: `${config2.apiUrl}/mcp`,
+          serverName: mcpServerNameFor(config2.appEnv),
           run: runWithPath(probePath, budget),
           readTextFile: realReadTextFileStrict,
           grantedClientIds
@@ -95886,7 +96168,14 @@ The access you granted these agents stays on your Powerplant account until you r
       }
       await runUpdate({
         inspection,
+        cliVersion: CLI_VERSION,
         resolveTarget: () => fetchAvailableVersion(config2, loadCredentialsSafely(config2).credentials),
+        recordAvailableVersion: (version2) => writeVersionCache({
+          now: Date.now(),
+          cacheFile: versionCachePath(void 0, releaseSource(config2.appEnv)),
+          writeTextFile: realWriteTextFile,
+          version: version2
+        }),
         channel: releaseSource(config2.appEnv) === "npm" ? "next" : "latest",
         targetRequired: releaseSource(config2.appEnv) === "promoted",
         claimsReservation: process.env[UPDATE_CHILD_ENV] === "1",
@@ -95984,9 +96273,13 @@ The access you granted these agents stays on your Powerplant account until you r
           "Credentials kept, `powerplant init` re-installs without re-enrolling. (--forget deletes them.)"
         );
       }
-      if (anyClientStillConnected(detectClients(), { run: realRun, readTextFile: realReadTextFile })) {
+      if (anyClientStillConnected(detectClients(), {
+        run: realRun,
+        readTextFile: realReadTextFile,
+        serverName: mcpServerNameFor(config2.appEnv)
+      })) {
         console.log(
-          "Your coding agents are still connected to the Powerplant MCP server, remove those connections with: powerplant disconnect"
+          `Your coding agents are still connected to the Powerplant MCP server, remove those connections with: ${disconnectCommand}`
         );
       }
       return;
@@ -96168,3 +96461,5 @@ undici/lib/web/fetch/body.js:
 undici/lib/web/websocket/frame.js:
   (*! ws. MIT License. Einar Otto Stangvik <einaros@gmail.com> *)
 */
+
+//# debugId=66f773d5-e0b2-5538-a184-3ee15c3a469a