@usepowerplant/cli 0.4.6 → 0.4.7

package/dist/cli.js

@@ -55700,10 +55700,21 @@ function createDigestTurnParser(options = {}) {
   const turns = [];
   let pendingTools = [];
   let pendingUsage = null;
+  let pendingAt = null;
   let currentId = null;
   let currentCarrier = null;
   let currentBase = null;
   let currentCounted = false;
+  const envelopes = [];
+  let pendingEnvelopes = [];
+  let currentEnvelope = null;
+  const landPending = (turn) => {
+    for (const envelope of pendingEnvelopes) {
+      envelope.turn = turn;
+      envelopes.push(envelope);
+    }
+    pendingEnvelopes = [];
+  };
   return {
     pushLine(line) {
       const trimmed = line.trim();
@@ -55717,14 +55728,16 @@ function createDigestTurnParser(options = {}) {
         return;
       }
       if (record2.isMeta === true) return;
+      const at = recordTime(record2);
       if (record2.type === "user") {
         const text = userText(record2);
-        if (text) turns.push({ kind: "human_prompt", text, toolCalls: [], usage: null });
+        if (text) turns.push({ kind: "human_prompt", text, toolCalls: [], usage: null, at });
         return;
       }
       if (record2.type !== "assistant") return;
       const message2 = record2.message;
       if (!message2 || message2.model === "<synthetic>" || !Array.isArray(message2.content)) return;
+      pendingAt ??= at;
       const id = messageIdOf(record2, message2);
       if (id === null || id !== currentId) {
         currentId = id;
@@ -55738,12 +55751,17 @@ function createDigestTurnParser(options = {}) {
           const updated = mergeUsage(currentBase, parsedUsage);
           if (currentCarrier) currentCarrier.usage = updated;
           else pendingUsage = updated;
+          if (currentEnvelope) currentEnvelope.usage = parsedUsage;
         } else if (currentCarrier) {
           currentCarrier.usage = mergeUsage(currentCarrier.usage, parsedUsage);
           currentCounted = true;
+          currentEnvelope = { turn: turns.indexOf(currentCarrier), at, usage: parsedUsage };
+          envelopes.push(currentEnvelope);
         } else {
           pendingUsage = mergeUsage(pendingUsage, parsedUsage);
           currentCounted = true;
+          currentEnvelope = { turn: -1, at, usage: parsedUsage };
+          pendingEnvelopes.push(currentEnvelope);
         }
       }
       const model = typeof message2.model === "string" ? message2.model : null;
@@ -55758,32 +55776,50 @@ function createDigestTurnParser(options = {}) {
         }
         if (part.type === "text" && typeof part.text === "string" && part.text.trim() !== "") {
           if (currentCarrier === null) {
-            const turn = { kind: "agent_text", text: part.text, toolCalls: pendingTools, usage: pendingUsage };
+            const turn = {
+              kind: "agent_text",
+              text: part.text,
+              toolCalls: pendingTools,
+              usage: pendingUsage,
+              at: pendingAt
+            };
             turns.push(turn);
             currentCarrier = turn;
             pendingUsage = null;
+            landPending(turns.length - 1);
           } else {
             turns.push({
               kind: "agent_text",
               text: part.text,
               toolCalls: pendingTools,
-              usage: currentCounted ? zeroUsage(model) : null
+              usage: currentCounted ? zeroUsage(model) : null,
+              // A sibling block of the same record began when the record did.
+              at: pendingAt ?? at
             });
           }
           pendingTools = [];
+          pendingAt = null;
         }
       }
     },
     finish() {
       if (pendingTools.length > 0 || pendingUsage !== null) {
-        turns.push({ kind: "agent_text", text: "", toolCalls: pendingTools, usage: pendingUsage });
+        turns.push({ kind: "agent_text", text: "", toolCalls: pendingTools, usage: pendingUsage, at: pendingAt });
+        landPending(turns.length - 1);
         pendingTools = [];
         pendingUsage = null;
+        pendingAt = null;
       }
       return turns;
+    },
+    usageEnvelopes() {
+      return envelopes;
     }
   };
 }
+function recordTime(record2) {
+  return typeof record2.timestamp === "string" && record2.timestamp !== "" ? record2.timestamp : null;
+}
 function isRecord(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
@@ -55920,10 +55956,12 @@ function promptText(content) {
 function createCodexTurnParser(options = {}) {
   const turns = [];
   let pendingTools = [];
+  let pendingAt = null;
   const flushPendingTools = () => {
     if (pendingTools.length === 0) return;
-    turns.push({ kind: "agent_text", text: "", toolCalls: pendingTools, usage: null });
+    turns.push({ kind: "agent_text", text: "", toolCalls: pendingTools, usage: null, at: pendingAt });
     pendingTools = [];
+    pendingAt = null;
   };
   return {
     pushLine(line) {
@@ -55938,6 +55976,7 @@ function createCodexTurnParser(options = {}) {
         return;
       }
       if (record2.type !== "response_item") return;
+      const at = typeof record2.timestamp === "string" && record2.timestamp !== "" ? record2.timestamp : null;
       const item = record2.payload;
       if (item === null || typeof item !== "object" || Array.isArray(item)) return;
       const responseItem = item;
@@ -55949,6 +55988,7 @@ function createCodexTurnParser(options = {}) {
           if (args !== null) call.input = boundedToolInput(args);
         }
         pendingTools.push(call);
+        pendingAt ??= at;
         return;
       }
       if (responseItem.type !== "message") return;
@@ -55956,15 +55996,16 @@ function createCodexTurnParser(options = {}) {
         const text2 = promptText(responseItem.content);
         if (text2 !== null) {
           flushPendingTools();
-          turns.push({ kind: "human_prompt", text: text2, toolCalls: [], usage: null });
+          turns.push({ kind: "human_prompt", text: text2, toolCalls: [], usage: null, at });
         }
         return;
       }
       if (responseItem.role !== "assistant") return;
       const text = outputTextBlocks(responseItem.content).join("\n");
       if (text.trim() === "") return;
-      turns.push({ kind: "agent_text", text, toolCalls: pendingTools, usage: null });
+      turns.push({ kind: "agent_text", text, toolCalls: pendingTools, usage: null, at: pendingAt ?? at });
       pendingTools = [];
+      pendingAt = null;
     },
     finish() {
       flushPendingTools();
@@ -55977,10 +56018,12 @@ function createCodexTurnParser(options = {}) {
 function createCursorTurnParser(options = {}) {
   const turns = [];
   let pendingTools = [];
+  let pendingAt = null;
   const flushPendingTools = () => {
     if (pendingTools.length === 0) return;
-    turns.push({ kind: "agent_text", text: "", toolCalls: pendingTools, usage: null });
+    turns.push({ kind: "agent_text", text: "", toolCalls: pendingTools, usage: null, at: pendingAt });
     pendingTools = [];
+    pendingAt = null;
   };
   return {
     pushLine(line) {
@@ -55994,9 +56037,10 @@ function createCursorTurnParser(options = {}) {
       } catch {
         return;
       }
+      const at = typeof record2.createdAt === "string" && record2.createdAt !== "" ? record2.createdAt : null;
       if (record2.type === "user" && typeof record2.text === "string" && record2.text.trim() !== "") {
         flushPendingTools();
-        turns.push({ kind: "human_prompt", text: record2.text, toolCalls: [], usage: null });
+        turns.push({ kind: "human_prompt", text: record2.text, toolCalls: [], usage: null, at });
         return;
       }
       if (record2.type === "tool" && typeof record2.name === "string") {
@@ -56006,11 +56050,13 @@ function createCursorTurnParser(options = {}) {
           call.input = boundedToolInput(record2.args);
         }
         pendingTools.push(call);
+        pendingAt ??= at;
         return;
       }
       if (record2.type === "agent" && typeof record2.text === "string" && record2.text.trim() !== "") {
-        turns.push({ kind: "agent_text", text: record2.text, toolCalls: pendingTools, usage: null });
+        turns.push({ kind: "agent_text", text: record2.text, toolCalls: pendingTools, usage: null, at: pendingAt ?? at });
         pendingTools = [];
+        pendingAt = null;
       }
     },
     finish() {
@@ -56076,7 +56122,7 @@ function parseCursorRunEventsDetailed(runs, options = {}) {
   let text = "";
   const flush2 = () => {
     if (text !== "" || pendingTools.length > 0 || pendingTokens > 0) {
-      turns.push({ kind: "agent_text", text, toolCalls: pendingTools, usage: null });
+      turns.push({ kind: "agent_text", text, toolCalls: pendingTools, usage: null, at: null });
       turnTokens.push(pendingTokens);
     }
     text = "";
@@ -56126,7 +56172,7 @@ function parseCursorRunEventsDetailed(runs, options = {}) {
         const prompt = stringField(asRecord3(data?.userMessage), "text");
         if (!prompt) continue;
         if (text !== "") flush2();
-        turns.push({ kind: "human_prompt", text: prompt, toolCalls: [], usage: null });
+        turns.push({ kind: "human_prompt", text: prompt, toolCalls: [], usage: null, at: null });
         turnTokens.push(0);
         continue;
       }
@@ -56183,10 +56229,16 @@ function normalizeUrl(raw) {
 
 // ../core/src/sessionTurns.ts
 function parseSessionTurns(source, transcript, options = {}) {
-  if (source === "cursor-cloud") return parseCursorRunEvents(envelopeRuns(transcript), options);
+  return parseSessionTurnsDetailed(source, transcript, options).turns;
+}
+function parseSessionTurnsDetailed(source, transcript, options = {}) {
+  if (source === "cursor-cloud") {
+    return { turns: parseCursorRunEvents(envelopeRuns(transcript), options), envelopes: [] };
+  }
   const parser = createSessionTurnParser(source, options);
   for (const line of transcript.split("\n")) parser.pushLine(line);
-  return parser.finish();
+  const turns = parser.finish();
+  return { turns, envelopes: parser.usageEnvelopes?.() ?? [] };
 }
 function createSessionTurnParser(source, options = {}) {
   if (source === "codex") return createCodexTurnParser(options);
@@ -83371,7 +83423,7 @@ import os6 from "node:os";
 // ../../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.6" : "0.0.0-checkout";
+var cliVersion = true ? "0.4.7" : "0.0.0-checkout";
 function cliVersionHeaders() {
   return { [CLI_VERSION_HEADER]: cliVersion, "user-agent": `powerplant-cli/${cliVersion}` };
 }
@@ -85071,6 +85123,7 @@ function readCodexTranscriptHints(home, roots) {
 }
 
 // ../../apps/collector/src/codexCli.ts
+import { closeSync as closeSync3, mkdirSync as mkdirSync2, openSync as openSync3, renameSync, rmSync, utimesSync, writeSync } from "node:fs";
 import os8 from "node:os";
 import path7 from "node:path";
 import { setImmediate as yieldToEventLoop2 } from "node:timers/promises";
@@ -85145,19 +85198,96 @@ function parseCodexRollout(text) {
     ...typeof git?.repository_url === "string" && repoFullNameFrom(git.repository_url)
   };
 }
-function parseRolloutFile(rolloutPath) {
-  const text = readIfExists(rolloutPath);
-  return text === null ? null : parseCodexRollout(text);
-}
+function foldRolloutPages(pages) {
+  const first = (key) => pages.find((page) => page[key] !== void 0)?.[key];
+  const last = (key) => [...pages].reverse().find((page) => page[key] !== void 0)?.[key];
+  const sum2 = (measured2) => measured2.length === 0 ? null : measured2.reduce((total, page) => addCodexTotals(total, page));
+  const measured = pages.map((page) => page.totals).filter((totals) => totals !== null);
+  const measuredFast = pages.filter((page) => page.totals !== null).map((page) => page.fastTotals);
+  const sessionId = first("sessionId");
+  const startedAt = first("startedAt");
+  const endedAt = last("endedAt");
+  const model = last("model");
+  const speedMode = last("speedMode");
+  const cwd = first("cwd");
+  const gitBranch = first("gitBranch");
+  const repoName = first("repoName");
+  const repoFullName = first("repoFullName");
+  return {
+    kind: pages[0].kind,
+    ...sessionId !== void 0 && { sessionId },
+    ...startedAt !== void 0 && { startedAt },
+    ...endedAt !== void 0 && { endedAt },
+    ...model !== void 0 && { model },
+    totals: sum2(measured),
+    fastTotals: measuredFast.every((fast) => fast !== null) ? sum2(measuredFast) : null,
+    ...speedMode !== void 0 && { speedMode },
+    ...cwd !== void 0 && { cwd },
+    ...gitBranch !== void 0 && { gitBranch },
+    ...repoName !== void 0 && { repoName },
+    ...repoFullName !== void 0 && { repoFullName }
+  };
+}
+function rolloutIdentity(rolloutPath) {
+  const name = path7.basename(rolloutPath, ".jsonl");
+  const [head, pageId, ...rest] = name.split("_");
+  const threadId2 = head.slice(-36);
+  const conventional = rest.length === 0 && head.startsWith("rollout-") && head.at(-37) === "-" && SESSION_UUID.test(threadId2) && (pageId === void 0 || SESSION_UUID.test(pageId));
+  if (!conventional) return { threadId: name, page: false };
+  return { threadId: threadId2.toLowerCase(), page: pageId !== void 0 };
+}
+function codexSpoolDir(home) {
+  return path7.join(home, ".config", "powerplant", "codex");
+}
+function mergedSpoolIsFresh(spoolPath, mtimeMs) {
+  const existing = statIfExists(spoolPath);
+  return existing !== null && Math.abs(existing.mtimeMs - mtimeMs) < 1;
+}
+var MergedSpoolWriter = class {
+  constructor(spoolPath) {
+    this.spoolPath = spoolPath;
+    mkdirSync2(path7.dirname(spoolPath), { recursive: true, mode: 448 });
+    this.tmpPath = `${spoolPath}.${process.pid}.tmp`;
+    this.fd = openSync3(this.tmpPath, "w", 384);
+  }
+  spoolPath;
+  tmpPath;
+  fd;
+  bytes = 0;
+  append(pageText) {
+    if (this.fd === void 0) throw new Error("merged transcript already closed");
+    const text = pageText.endsWith("\n") ? pageText : `${pageText}
+`;
+    this.bytes += writeSync(this.fd, text);
+  }
+  /** Stamps the newest page's mtime and publishes the file; returns its size. */
+  finish(mtimeMs) {
+    this.close();
+    utimesSync(this.tmpPath, mtimeMs / 1e3, mtimeMs / 1e3);
+    renameSync(this.tmpPath, this.spoolPath);
+    return this.bytes;
+  }
+  abandon() {
+    this.close();
+    rmSync(this.tmpPath, { force: true });
+  }
+  close() {
+    if (this.fd === void 0) return;
+    closeSync3(this.fd);
+    this.fd = void 0;
+  }
+};
 function rolloutLocation(rolloutPath) {
   const record2 = readFirstRecord(rolloutPath, (candidate) => candidate.type === "session_meta");
   const meta3 = record2?.payload;
   if (!meta3 || typeof meta3 !== "object" || Array.isArray(meta3)) return { kind: "session", totals: null, fastTotals: null };
   const { cwd, id, session_id: fallbackId } = meta3;
   const sessionId = id ?? fallbackId;
+  const startedAt = record2?.timestamp;
   return {
     kind: isSidecarThread(meta3) ? "subagent" : "session",
     ...typeof sessionId === "string" && { sessionId },
+    ...typeof startedAt === "string" && { startedAt },
     totals: null,
     fastTotals: null,
     ...typeof cwd === "string" && cwd !== "" && { cwd }
@@ -85212,89 +85342,128 @@ 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 ?? os8.homedir());
   const items = [];
   const candidates = [];
   const unreadable = [];
   const skips = { skippedOutOfScope: 0, skippedNoRepo: 0 };
   let skippedSubagentThreads = 0;
   let skippedTooLarge = 0;
+  let mergedThreads = 0;
+  let largestMergedBytes = 0;
   const externalIdOf = (rolloutPath) => path7.basename(rolloutPath, ".jsonl");
-  const seen = /* @__PURE__ */ new Set();
-  const admitFrom = async (files, archived, sessionId) => {
-    for (const rolloutPath of files) {
-      if (seen.has(rolloutPath)) continue;
+  const files = /* @__PURE__ */ new Map();
+  const observe = async (paths, archived, hintSessionId) => {
+    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);
+        continue;
+      }
       await yieldToEventLoop2();
       const stat = statIfExists(rolloutPath);
       if (!stat) continue;
-      seen.add(rolloutPath);
-      if (options.sinceMs !== void 0 && Math.max(stat.mtimeMs, stat.ctimeMs) < options.sinceMs)
-        continue;
-      if (stat.size > maxBytes) {
+      files.set(rolloutPath, {
+        rolloutPath,
+        archived,
+        identity: rolloutIdentity(rolloutPath),
+        mtimeMs: stat.mtimeMs,
+        changedMs: Math.max(stat.mtimeMs, stat.ctimeMs),
+        sizeBytes: stat.size,
+        ...hintSessionId !== void 0 && { hintSessionIds: [hintSessionId] }
+      });
+    }
+  };
+  const archiveDir = codexArchivedSessionsDir(sessionsDir);
+  const hintHome = options.homeDir ?? (options.codexDir === void 0 ? os8.homedir() : void 0);
+  if (hintHome !== void 0) {
+    for (const hint of readCodexTranscriptHints(hintHome, [sessionsDir, archiveDir])) {
+      await observe([hint.rolloutPath], hint.archived, hint.sessionId);
+    }
+  }
+  await observe(rolloutFiles(sessionsDir), false);
+  await observe(rolloutFiles(archiveDir), true);
+  const byThread = /* @__PURE__ */ new Map();
+  for (const file2 of files.values()) {
+    const thread = byThread.get(file2.identity.threadId);
+    if (thread === void 0) byThread.set(file2.identity.threadId, [file2]);
+    else thread.push(file2);
+  }
+  for (const [threadId2, observed] of byThread) {
+    const stored = dedupeStoreCopies(observed);
+    let externalId = externalIdOf((stored.find((file2) => !file2.identity.page) ?? stored[0]).rolloutPath);
+    try {
+      const spoolPath = stored.length > 1 ? path7.join(spoolDir, `${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;
+        if (!neverMerged) continue;
+      }
+      await yieldToEventLoop2();
+      const named = stored.filter((file2) => {
+        if (file2.hintSessionIds === void 0) return true;
+        const { sessionId } = rolloutLocation(file2.rolloutPath);
+        return sessionId !== void 0 && file2.hintSessionIds.includes(sessionId);
+      });
+      if (named.length === 0) continue;
+      const threadFiles = named.length > 1 ? orderPages(named) : named;
+      const base = threadFiles[0];
+      externalId = externalIdOf(base.rolloutPath);
+      const mtimeMs = Math.max(...threadFiles.map((file2) => file2.mtimeMs));
+      const sizeBytes = threadFiles.reduce((sum2, file2) => sum2 + file2.sizeBytes, 0);
+      if (sizeBytes > maxBytes) {
         skippedTooLarge += 1;
         observeFileDiagnostic(options.onFileDiagnostic, {
-          path: rolloutPath,
+          path: base.rolloutPath,
           reason: "too_large",
-          sizeBytes: stat.size
+          sizeBytes
         });
         continue;
       }
-      try {
-        const location = rolloutLocation(rolloutPath);
-        if (sessionId !== void 0 && location.sessionId !== sessionId) {
-          seen.delete(rolloutPath);
-          continue;
-        }
-        if (location.kind === "subagent") {
-          skippedSubagentThreads += 1;
-          continue;
-        }
-        const decision = captureDecision(location.cwd, capture);
-        if (!decision.capture) {
-          countCaptureSkip(skips, decision.reason);
-          continue;
-        }
-        if (options.locationsOnly) {
-          items.push({
-            mtimeMs: stat.mtimeMs,
-            transcriptPath: rolloutPath,
-            ...location.cwd && { cwd: location.cwd },
-            item: {
-              source: "codex",
-              externalId: externalIdOf(rolloutPath),
-              status: now - stat.mtimeMs < ACTIVE_GRACE_MS ? "active" : "inactive",
-              archived,
-              capturedVia: decision.via
-            }
-          });
-          continue;
-        }
-        candidates.push({
-          rolloutPath,
-          archived,
-          mtimeMs: stat.mtimeMs,
+      const location = rolloutLocation(base.rolloutPath);
+      if (location.kind === "subagent") {
+        skippedSubagentThreads += 1;
+        continue;
+      }
+      const decision = captureDecision(location.cwd, capture);
+      if (!decision.capture) {
+        countCaptureSkip(skips, decision.reason);
+        continue;
+      }
+      const thread = {
+        externalId,
+        files: threadFiles,
+        ...threadFiles.length > 1 && spoolPath !== void 0 && { spoolPath },
+        mtimeMs,
+        archived: threadFiles.every((file2) => file2.archived)
+      };
+      if (options.locationsOnly) {
+        items.push({
+          mtimeMs,
+          transcriptPath: base.rolloutPath,
           ...location.cwd && { cwd: location.cwd },
-          decision
-        });
-      } catch (error62) {
-        unreadable.push(`${externalIdOf(rolloutPath)}: ${describeReadError(error62)}`);
-        observeFileDiagnostic(options.onFileDiagnostic, {
-          path: rolloutPath,
-          reason: "unreadable",
-          sizeBytes: null,
-          errorCode: diagnosticErrorCode(error62)
+          item: {
+            source: "codex",
+            externalId,
+            status: now - mtimeMs < ACTIVE_GRACE_MS ? "active" : "inactive",
+            archived: thread.archived,
+            capturedVia: decision.via
+          }
         });
+        continue;
       }
-    }
-  };
-  const archiveDir = codexArchivedSessionsDir(sessionsDir);
-  const hintHome = options.homeDir ?? (options.codexDir === void 0 ? os8.homedir() : void 0);
-  if (hintHome !== void 0) {
-    for (const hint of readCodexTranscriptHints(hintHome, [sessionsDir, archiveDir])) {
-      await admitFrom([hint.rolloutPath], hint.archived, hint.sessionId);
+      candidates.push({ thread, ...location.cwd && { cwd: location.cwd }, decision });
+    } catch (error62) {
+      unreadable.push(`${externalId}: ${describeReadError(error62)}`);
+      observeFileDiagnostic(options.onFileDiagnostic, {
+        path: stored[0].rolloutPath,
+        reason: "unreadable",
+        sizeBytes: null,
+        errorCode: diagnosticErrorCode(error62)
+      });
     }
   }
-  await admitFrom(rolloutFiles(sessionsDir), false);
-  await admitFrom(rolloutFiles(archiveDir), true);
   if (options.locationsOnly) {
     return {
       sessions: items.sort((a, b2) => b2.mtimeMs - a.mtimeMs),
@@ -85302,30 +85471,59 @@ async function collectCodexSessions(options = {}) {
       skippedSubagentThreads,
       skippedTooLarge,
       unreadable,
-      heldBack: 0
+      heldBack: 0,
+      mergedThreads: 0,
+      largestMergedBytes: 0
     };
   }
-  candidates.sort((a, b2) => b2.mtimeMs - a.mtimeMs);
+  candidates.sort((a, b2) => b2.thread.mtimeMs - a.thread.mtimeMs);
   const chosen = options.maxSessions === void 0 ? candidates : candidates.slice(0, options.maxSessions);
   const threadNames = chosen.length > 0 ? loadThreadNames(sessionsDir) : /* @__PURE__ */ new Map();
   for (const candidate of chosen) {
     await yieldToEventLoop2();
-    const { rolloutPath, archived, mtimeMs, cwd, decision } = candidate;
+    const { thread, cwd, decision } = candidate;
+    let writer;
     try {
-      const summary = parseRolloutFile(rolloutPath);
-      if (!summary) continue;
+      const rewrite = thread.spoolPath !== void 0 && !mergedSpoolIsFresh(thread.spoolPath, thread.mtimeMs);
+      if (thread.spoolPath !== void 0 && rewrite) writer = new MergedSpoolWriter(thread.spoolPath);
+      const pages = [];
+      let vanished = false;
+      for (const file2 of thread.files) {
+        const text = readIfExists(file2.rolloutPath);
+        if (text === null) {
+          vanished = true;
+          break;
+        }
+        const page = parseCodexRollout(text);
+        if (page === null) continue;
+        pages.push(page);
+        writer?.append(text);
+      }
+      if (vanished || pages.length === 0) {
+        writer?.abandon();
+        continue;
+      }
+      const summary = foldRolloutPages(pages);
+      let transcriptPath = thread.files[0].rolloutPath;
+      if (thread.spoolPath !== void 0) {
+        const mergedBytes = writer ? writer.finish(thread.mtimeMs) : statIfExists(thread.spoolPath)?.size ?? 0;
+        writer = void 0;
+        transcriptPath = thread.spoolPath;
+        mergedThreads += 1;
+        largestMergedBytes = Math.max(largestMergedBytes, mergedBytes);
+      }
       const repoDir = summary.repoName ?? (cwd ? path7.basename(cwd) : void 0);
       const repoFullName = decision.repoFullName ?? summary.repoFullName;
       const title = summary.sessionId ? threadNames.get(summary.sessionId) : void 0;
       items.push({
-        mtimeMs,
-        transcriptPath: rolloutPath,
+        mtimeMs: thread.mtimeMs,
+        transcriptPath,
         ...cwd && { cwd },
         item: {
           source: "codex",
-          externalId: externalIdOf(rolloutPath),
-          status: now - mtimeMs < ACTIVE_GRACE_MS ? "active" : "inactive",
-          archived,
+          externalId: thread.externalId,
+          status: now - thread.mtimeMs < ACTIVE_GRACE_MS ? "active" : "inactive",
+          archived: thread.archived,
           ...summary.startedAt && { startedAt: summary.startedAt },
           ...summary.endedAt && { endedAt: summary.endedAt },
           ...summary.model && { model: summary.model },
@@ -85350,9 +85548,10 @@ async function collectCodexSessions(options = {}) {
         }
       });
     } catch (error62) {
-      unreadable.push(`${externalIdOf(rolloutPath)}: ${describeReadError(error62)}`);
+      writer?.abandon();
+      unreadable.push(`${thread.externalId}: ${describeReadError(error62)}`);
       observeFileDiagnostic(options.onFileDiagnostic, {
-        path: rolloutPath,
+        path: thread.files[0].rolloutPath,
         reason: "unreadable",
         sizeBytes: null,
         errorCode: diagnosticErrorCode(error62)
@@ -85365,15 +85564,32 @@ async function collectCodexSessions(options = {}) {
     skippedSubagentThreads,
     skippedTooLarge,
     unreadable,
-    heldBack: candidates.length - chosen.length
+    heldBack: candidates.length - chosen.length,
+    mergedThreads,
+    largestMergedBytes
   };
 }
+function dedupeStoreCopies(threadFiles) {
+  const byName = /* @__PURE__ */ new Map();
+  for (const file2 of threadFiles) {
+    const name = path7.basename(file2.rolloutPath);
+    const known = byName.get(name);
+    if (known === void 0 || file2.archived) byName.set(name, file2);
+  }
+  return [...byName.values()];
+}
+function orderPages(threadFiles) {
+  const orderOf = (file2) => rolloutLocation(file2.rolloutPath).startedAt ?? "";
+  return threadFiles.map((file2) => ({ file: file2, order: orderOf(file2) })).sort(
+    (a, b2) => Number(a.file.identity.page) - Number(b2.file.identity.page) || a.order.localeCompare(b2.order) || a.file.rolloutPath.localeCompare(b2.file.rolloutPath)
+  ).map((entry) => entry.file);
+}
 function codexThreadCwd(threadId2, sessionsDir = path7.join(os8.homedir(), ".codex", "sessions")) {
   if (!SESSION_UUID.test(threadId2)) return void 0;
-  const suffix = `-${threadId2.toLowerCase()}.jsonl`;
+  const wanted = threadId2.toLowerCase();
   for (const root of [sessionsDir, codexArchivedSessionsDir(sessionsDir)]) {
     for (const rolloutPath of rolloutFiles(root)) {
-      if (!path7.basename(rolloutPath).toLowerCase().endsWith(suffix)) continue;
+      if (rolloutIdentity(rolloutPath).threadId !== wanted) continue;
       const cwd = rolloutLocation(rolloutPath).cwd;
       if (cwd !== void 0) return cwd;
     }
@@ -85387,7 +85603,7 @@ import path10 from "node:path";
 
 // ../../apps/collector/src/cursorLocal.ts
 import { createHash as createHash4 } from "node:crypto";
-import { existsSync as existsSync2, mkdirSync as mkdirSync3, utimesSync as utimesSync2, writeFileSync as writeFileSync3 } from "node:fs";
+import { existsSync as existsSync2, mkdirSync as mkdirSync4, utimesSync as utimesSync3, writeFileSync as writeFileSync3 } from "node:fs";
 import os10 from "node:os";
 import path9 from "node:path";
 import { fileURLToPath } from "node:url";
@@ -85395,15 +85611,15 @@ import { fileURLToPath } from "node:url";
 // ../../apps/collector/src/cursorTranscriptFile.ts
 import { createHash as createHash3 } from "node:crypto";
 import {
-  closeSync as closeSync3,
+  closeSync as closeSync4,
   existsSync,
   lstatSync as lstatSync2,
-  mkdirSync as mkdirSync2,
-  openSync as openSync3,
+  mkdirSync as mkdirSync3,
+  openSync as openSync4,
   readSync as readSync3,
   readdirSync as readdirSync3,
   realpathSync as realpathSync2,
-  utimesSync,
+  utimesSync as utimesSync2,
   writeFileSync as writeFileSync2
 } from "node:fs";
 import os9 from "node:os";
@@ -85472,7 +85688,7 @@ var hintSchema2 = external_exports.object({
   model: external_exports.string().max(256).optional()
 });
 function readBounded(file2, maxBytes) {
-  const fd = openSync3(file2, "r");
+  const fd = openSync4(file2, "r");
   try {
     const chunks = [];
     let bytes = 0;
@@ -85485,7 +85701,7 @@ function readBounded(file2, maxBytes) {
     }
     return null;
   } finally {
-    closeSync3(fd);
+    closeSync4(fd);
   }
 }
 function collectCursorTranscriptFiles(options, isDatabaseSession, result, databaseSpoolDir, spoolName) {
@@ -85589,9 +85805,9 @@ function collectCursorTranscriptFiles(options, isDatabaseSession, result, databa
           result.skippedTooLarge++;
           continue;
         }
-        mkdirSync2(spoolDir, { recursive: true, mode: 448 });
+        mkdirSync3(spoolDir, { recursive: true, mode: 448 });
         writeFileSync2(spool, body, { mode: 384 });
-        utimesSync(spool, stat.atime, stat.mtime);
+        utimesSync2(spool, stat.atime, stat.mtime);
       }
       result.sessions.push({
         cwd,
@@ -85942,13 +86158,13 @@ function collectFromStore(db, userDir, options, result, knownIds) {
           ...transcript.bubblesOmitted > 0 && { bubblesOmitted: transcript.bubblesOmitted }
         };
         if (!spoolDirReady) {
-          mkdirSync3(spoolDir, { recursive: true });
+          mkdirSync4(spoolDir, { recursive: true });
           spoolDirReady = true;
         }
         const body = [meta3, ...transcript.lines].map((line) => JSON.stringify(line)).join("\n");
         writeFileSync3(spoolPath, `${body}
 `, "utf8");
-        utimesSync2(spoolPath, new Date(lastUpdatedAt), new Date(lastUpdatedAt));
+        utimesSync3(spoolPath, new Date(lastUpdatedAt), new Date(lastUpdatedAt));
       }
       const repoSourceDir = facts.repoPath ?? cwd;
       const startBranch = facts.branches[0];
@@ -86165,7 +86381,7 @@ function allowProtectedRepoDiscovery(config2, found, environment = {}, deps = de
 }
 
 // ../../apps/collector/src/hookInstall.ts
-import { existsSync as existsSync3, mkdirSync as mkdirSync4, readFileSync as readFileSync6, rmSync, writeFileSync as writeFileSync4 } from "node:fs";
+import { existsSync as existsSync3, mkdirSync as mkdirSync5, readFileSync as readFileSync6, rmSync as rmSync2, writeFileSync as writeFileSync4 } from "node:fs";
 import os12 from "node:os";
 import path11 from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
@@ -86233,7 +86449,7 @@ function hookSourcePath(script) {
 }
 function installCollectorHooks(homeDir = os12.homedir()) {
   const hookDir = path11.join(homeDir, ".config", "powerplant", "hooks");
-  mkdirSync4(hookDir, { recursive: true });
+  mkdirSync5(hookDir, { recursive: true });
   for (const script of HOOK_SCRIPTS) {
     writeFileSync4(path11.join(hookDir, script), readFileSync6(hookSourcePath(script), "utf8"), {
       mode: 493
@@ -86249,12 +86465,12 @@ function installCollectorHooks(homeDir = os12.homedir()) {
   }
   const merged = mergeCollectorHooks(settingsText, (script) => `node "${path11.join(hookDir, script)}"`);
   if (merged.action === "write") {
-    mkdirSync4(settingsDir, { recursive: true });
+    mkdirSync5(settingsDir, { recursive: true });
     writeFileSync4(settingsPath, merged.text);
   }
   if (merged.action !== "skip") {
     for (const retired of RETIRED_HOOK_WIRINGS) {
-      rmSync(path11.join(hookDir, retired.script), { force: true });
+      rmSync2(path11.join(hookDir, retired.script), { force: true });
     }
   }
   return {
@@ -86266,7 +86482,7 @@ function installCollectorHooks(homeDir = os12.homedir()) {
 
 // ../../apps/collector/src/service.ts
 import { execFileSync as execFileSync3 } from "node:child_process";
-import { chmodSync as chmodSync2, existsSync as existsSync4, mkdirSync as mkdirSync5, readFileSync as readFileSync7, rmSync as rmSync2, unlinkSync as unlinkSync2, writeFileSync as writeFileSync5 } from "node:fs";
+import { chmodSync as chmodSync2, existsSync as existsSync4, mkdirSync as mkdirSync6, readFileSync as readFileSync7, rmSync as rmSync3, unlinkSync as unlinkSync2, writeFileSync as writeFileSync5 } from "node:fs";
 import os13 from "node:os";
 import path12 from "node:path";
 var RESTART_THROTTLE_SECONDS = 60;
@@ -86346,11 +86562,11 @@ function installService(config2, command) {
     );
   }
   const launcher = launcherPath(config2.appEnv);
-  mkdirSync5(path12.dirname(launcher), { recursive: true });
+  mkdirSync6(path12.dirname(launcher), { recursive: true });
   writeFileSync5(launcher, buildLauncherScript(command));
   chmodSync2(launcher, 493);
   const file2 = plistPath(config2.appEnv);
-  mkdirSync5(path12.dirname(file2), { recursive: true });
+  mkdirSync6(path12.dirname(file2), { recursive: true });
   writeFileSync5(file2, buildLaunchdPlist(config2.appEnv, installerPathValue()));
   runLaunchctl(["bootstrap", `gui/${uid()}`, file2]);
   return `${file2} (watching for session changes; log: ${logPath(config2.appEnv)})`;
@@ -86388,7 +86604,7 @@ function serviceUpToDate(config2, command) {
 function uninstallService(config2) {
   requireMacos();
   const existed = bootout(config2.appEnv);
-  rmSync2(launcherPath(config2.appEnv), { force: true });
+  rmSync3(launcherPath(config2.appEnv), { force: true });
   if (existsSync4(plistPath(config2.appEnv))) {
     unlinkSync2(plistPath(config2.appEnv));
     return true;
@@ -86458,7 +86674,7 @@ function xmlEscape(value) {
 }
 
 // ../../apps/collector/src/status.ts
-import { mkdirSync as mkdirSync6, readFileSync as readFileSync8, renameSync, rmSync as rmSync3, writeFileSync as writeFileSync6 } from "node:fs";
+import { mkdirSync as mkdirSync7, readFileSync as readFileSync8, renameSync as renameSync2, rmSync as rmSync4, writeFileSync as writeFileSync6 } from "node:fs";
 import os14 from "node:os";
 import path13 from "node:path";
 var HEARTBEAT_INTERVAL_MS = 6e4;
@@ -86524,10 +86740,10 @@ function controlFilePath(appEnv, homeDir) {
   return path13.join(collectorStateDir(homeDir), `collector-control-${appEnv}.json`);
 }
 function writeAtomically(file2, payload) {
-  mkdirSync6(path13.dirname(file2), { recursive: true });
+  mkdirSync7(path13.dirname(file2), { recursive: true });
   const tmp = `${file2}.${process.pid}.tmp`;
   writeFileSync6(tmp, payload);
-  renameSync(tmp, file2);
+  renameSync2(tmp, file2);
 }
 function writeCollectorStatus(appEnv, status, homeDir) {
   writeAtomically(statusFilePath(appEnv, homeDir), JSON.stringify(status, null, 2));
@@ -86568,10 +86784,10 @@ function writeCollectorControl(appEnv, control, homeDir) {
   writeAtomically(controlFilePath(appEnv, homeDir), JSON.stringify(control, null, 2));
 }
 function clearCollectorControl(appEnv, homeDir) {
-  rmSync3(controlFilePath(appEnv, homeDir), { force: true });
+  rmSync4(controlFilePath(appEnv, homeDir), { force: true });
 }
 function clearCollectorStatus(appEnv, homeDir) {
-  rmSync3(statusFilePath(appEnv, homeDir), { force: true });
+  rmSync4(statusFilePath(appEnv, homeDir), { force: true });
 }
 function describeDaemonState(read, probes = {}) {
   if (read.file === "invalid") return { state: "unreadable" };
@@ -86944,7 +87160,10 @@ async function runSyncPassInternal(config2, options, diagnostic) {
   const active = items.filter((s) => s.status === "active").length;
   const tooLarge = (count2, what) => count2 > 0 ? ` \xB7 ${count2} ${what} skipped (over ${MAX_TRANSCRIPT_FILE_BYTES / (1024 * 1024)}MB, too large to read)` : "";
   log3(
-    `Found ${inWindow.length} local session(s) (${claude.sessions.length} claude, ${codex.sessions.length} codex, ${cursor.sessions.length} cursor) ` + describeScanReach(window2, options.narrowSinceMs) + (active > 0 ? ` (${active} still active)` : "") + (skippedOutOfScope > 0 ? ` \xB7 ${skippedOutOfScope} ${describeSkipReason(capture)}` : "") + (skippedNoRepo > 0 ? ` \xB7 ${skippedNoRepo} ${describeNoRepoSkipReason(capture)}` : "") + (codex.skippedSubagentThreads > 0 ? ` \xB7 ${codex.skippedSubagentThreads} codex subagent thread(s) skipped (spend unmeasured)` : "") + (cursor.skippedSubagentComposers > 0 ? ` \xB7 ${cursor.skippedSubagentComposers} cursor subagent thread(s) skipped` : "") + (cursor.skippedNonLocalComposers > 0 ? ` \xB7 ${cursor.skippedNonLocalComposers} cursor session(s) skipped (not local to this machine)` : "") + (cursor.skippedUnreadable > 0 ? ` \xB7 ${cursor.skippedUnreadable} cursor session(s) unreadable, skipped` : "") + tooLarge(claude.skippedTooLarge, "claude transcript(s)") + (claude.unreadable.length > 0 ? ` \xB7 ${claude.unreadable.length} claude transcript(s) unreadable, skipped` : "") + tooLarge(codex.skippedTooLarge, "codex rollout(s)") + (codex.unreadable.length > 0 ? ` \xB7 ${codex.unreadable.length} codex rollout(s) unreadable, skipped` : "") + tooLarge(cursor.skippedTooLarge, "cursor transcript(s)") + (cursor.truncatedTranscripts > 0 ? ` \xB7 ${cursor.truncatedTranscripts} cursor transcript(s) cut at ${MAX_TRANSCRIPT_FILE_BYTES / (1024 * 1024)}MB (the rest of the conversation stays local)` : "") + (heldBack > 0 ? ` \xB7 ${heldBack} older session(s) held back, the first sync backfills the ${DEEP_FIRST_SYNC_MAX_SESSIONS} most recently active` : "") + "."
+    `Found ${inWindow.length} local session(s) (${claude.sessions.length} claude, ${codex.sessions.length} codex, ${cursor.sessions.length} cursor) ` + describeScanReach(window2, options.narrowSinceMs) + (active > 0 ? ` (${active} still active)` : "") + (skippedOutOfScope > 0 ? ` \xB7 ${skippedOutOfScope} ${describeSkipReason(capture)}` : "") + (skippedNoRepo > 0 ? ` \xB7 ${skippedNoRepo} ${describeNoRepoSkipReason(capture)}` : "") + (codex.skippedSubagentThreads > 0 ? ` \xB7 ${codex.skippedSubagentThreads} codex subagent thread(s) skipped (spend unmeasured)` : "") + (cursor.skippedSubagentComposers > 0 ? ` \xB7 ${cursor.skippedSubagentComposers} cursor subagent thread(s) skipped` : "") + (cursor.skippedNonLocalComposers > 0 ? ` \xB7 ${cursor.skippedNonLocalComposers} cursor session(s) skipped (not local to this machine)` : "") + (cursor.skippedUnreadable > 0 ? ` \xB7 ${cursor.skippedUnreadable} cursor session(s) unreadable, skipped` : "") + tooLarge(claude.skippedTooLarge, "claude transcript(s)") + (claude.unreadable.length > 0 ? ` \xB7 ${claude.unreadable.length} claude transcript(s) unreadable, skipped` : "") + tooLarge(codex.skippedTooLarge, "codex rollout(s)") + (codex.unreadable.length > 0 ? ` \xB7 ${codex.unreadable.length} codex rollout(s) unreadable, skipped` : "") + // The measure for POW-79's follow-up: a merged thread re-uploads whole
+    // on every change, so once the largest nears the cap, per-page upload
+    // is due.
+    (codex.mergedThreads > 0 ? ` \xB7 ${codex.mergedThreads} codex thread(s) merged from split rollouts (largest ${(codex.largestMergedBytes / (1024 * 1024)).toFixed(1)}MB of the ${MAX_TRANSCRIPT_FILE_BYTES / (1024 * 1024)}MB cap)` : "") + tooLarge(cursor.skippedTooLarge, "cursor transcript(s)") + (cursor.truncatedTranscripts > 0 ? ` \xB7 ${cursor.truncatedTranscripts} cursor transcript(s) cut at ${MAX_TRANSCRIPT_FILE_BYTES / (1024 * 1024)}MB (the rest of the conversation stays local)` : "") + (heldBack > 0 ? ` \xB7 ${heldBack} older session(s) held back, the first sync backfills the ${DEEP_FIRST_SYNC_MAX_SESSIONS} most recently active` : "") + "."
   );
   for (const failure of claude.unreadable) log3(`  claude transcript skipped, ${failure}`);
   for (const failure of codex.unreadable) log3(`  codex rollout skipped, ${failure}`);
@@ -87191,10 +87410,10 @@ import path16 from "node:path";
 import {
   existsSync as existsSync5,
   lstatSync as lstatSync3,
-  mkdirSync as mkdirSync7,
+  mkdirSync as mkdirSync8,
   readFileSync as readFileSync10,
-  renameSync as renameSync2,
-  rmSync as rmSync4,
+  renameSync as renameSync3,
+  rmSync as rmSync5,
   writeFileSync as writeFileSync7
 } from "node:fs";
 import path15 from "node:path";
@@ -87275,7 +87494,7 @@ function installProviderHook(provider, home) {
     `${shellQuote2(process.execPath)} ${shellQuote2(scriptPath)}`
   );
   if (merged.action === "skip") return { provider, settings: "skip", detail: merged.reason };
-  mkdirSync7(hookDir, { recursive: true });
+  mkdirSync8(hookDir, { recursive: true });
   writeAtomic(scriptPath, readFileSync10(hookSourcePath(script), "utf8"), 448);
   if (merged.action === "write") {
     const current = existsSync5(configPath) ? readFileSync10(configPath, "utf8") : null;
@@ -87293,9 +87512,9 @@ function writeAtomic(file2, text, mode) {
   const temporary = `${file2}.${randomUUID()}.tmp`;
   try {
     writeFileSync7(temporary, text, { mode, flag: "wx" });
-    renameSync2(temporary, file2);
+    renameSync3(temporary, file2);
   } finally {
-    rmSync4(temporary, { force: true });
+    rmSync5(temporary, { force: true });
   }
 }
 function installProviderHooks(home) {
@@ -87844,7 +88063,7 @@ import os16 from "node:os";
 import path18 from "node:path";
 
 // ../../apps/collector/src/codexReviewFacts.ts
-import { closeSync as closeSync4, lstatSync as lstatSync4, openSync as openSync4, readSync as readSync4, realpathSync as realpathSync3 } from "node:fs";
+import { closeSync as closeSync5, lstatSync as lstatSync4, openSync as openSync5, readSync as readSync4, realpathSync as realpathSync3 } from "node:fs";
 import path17 from "node:path";
 var pointerSchema = external_exports.object({
   source: external_exports.unknown().optional(),
@@ -87882,7 +88101,7 @@ function readCodexReviewFacts(row, id, home) {
   }
 }
 function readPrefix(file2) {
-  const fd = openSync4(file2, "r");
+  const fd = openSync5(file2, "r");
   const buffer = Buffer.alloc(MAX_PREFIX_BYTES);
   let used = 0;
   let first = -1;
@@ -87903,7 +88122,7 @@ function readPrefix(file2) {
       used = end;
     }
   } finally {
-    closeSync4(fd);
+    closeSync5(fd);
   }
   if (first < 0 || second < 0) return null;
   try {
@@ -88283,7 +88502,7 @@ async function probeClaudeDesktopSessions(wanted, installed, reportFault, root =
 
 // src/cli.ts
 import { spawn as spawn2, spawnSync as spawnSync5 } from "node:child_process";
-import { existsSync as existsSync12, mkdirSync as mkdirSync11, openSync as openSync6, realpathSync as realpathSync5, rmSync as rmSync6 } from "node:fs";
+import { existsSync as existsSync12, mkdirSync as mkdirSync12, openSync as openSync7, realpathSync as realpathSync5, rmSync as rmSync7 } from "node:fs";
 import path28 from "node:path";
 import { parseArgs } from "node:util";
 
@@ -88291,7 +88510,7 @@ import { parseArgs } from "node:util";
 import { execFileSync as execFileSync5, spawnSync } from "node:child_process";
 import {
   existsSync as existsSync9,
-  mkdirSync as mkdirSync8,
+  mkdirSync as mkdirSync9,
   mkdtempSync,
   readdirSync as readdirSync5,
   readFileSync as readFileSync11,
@@ -89330,7 +89549,7 @@ function realReadTextFileStrict(filePath) {
   }
 }
 function realWriteTextFile(filePath, content) {
-  mkdirSync8(path21.dirname(filePath), { recursive: true });
+  mkdirSync9(path21.dirname(filePath), { recursive: true });
   writeFileSync8(filePath, content);
 }
 function codexConfigPath(homeDir = os19.homedir()) {
@@ -89395,7 +89614,7 @@ function realRunInteractive(bin, args, env) {
 
 // src/connections.ts
 import { execFileSync as execFileSync6, spawnSync as spawnSync2 } from "node:child_process";
-import { mkdirSync as mkdirSync9, writeFileSync as writeFileSync9 } from "node:fs";
+import { mkdirSync as mkdirSync10, writeFileSync as writeFileSync9 } from "node:fs";
 import path22 from "node:path";
 function probeConnections(clients, deps) {
   const reports = [];
@@ -89524,7 +89743,7 @@ function detectedClientsPath(homeDir) {
 function saveDetectedClients(clients, pathValue, homeDir) {
   try {
     const file2 = detectedClientsPath(homeDir);
-    mkdirSync9(path22.dirname(file2), { recursive: true });
+    mkdirSync10(path22.dirname(file2), { recursive: true });
     const record2 = {
       detectedAt: (/* @__PURE__ */ new Date()).toISOString(),
       path: pathValue,
@@ -89608,7 +89827,7 @@ function whichAllWith(pathValue) {
 }
 
 // src/doctor.ts
-import { closeSync as closeSync5, fstatSync, openSync as openSync5, readSync as readSync5 } from "node:fs";
+import { closeSync as closeSync6, fstatSync, openSync as openSync6, readSync as readSync5 } from "node:fs";
 
 // src/update.ts
 import path24 from "node:path";
@@ -89633,7 +89852,7 @@ import { accessSync, constants as constants2 } from "node:fs";
 import path23 from "node:path";
 
 // src/version.ts
-var CLI_VERSION = true ? "0.4.6" : "0.0.0-checkout";
+var CLI_VERSION = true ? "0.4.7" : "0.0.0-checkout";
 var CLI_RELEASE_BUILD = true ? true : false;
 var CLI_PACKAGE_NAME = "@usepowerplant/cli";
 
@@ -89937,7 +90156,7 @@ function redactedLogTail(raw) {
 function readDoctorLogTail(path29) {
   let fd;
   try {
-    fd = openSync5(path29, "r");
+    fd = openSync6(path29, "r");
   } catch (error62) {
     if (error62.code === "ENOENT") return { path: path29, lines: null };
     return { path: path29, lines: null, readError: error62 instanceof Error ? error62.message : String(error62) };
@@ -89953,7 +90172,7 @@ function readDoctorLogTail(path29) {
   } catch (error62) {
     return { path: path29, lines: null, readError: error62 instanceof Error ? error62.message : String(error62) };
   } finally {
-    closeSync5(fd);
+    closeSync6(fd);
   }
 }
 function renderDoctorReport(i) {
@@ -90489,6 +90708,8 @@ function renderMenu(i) {
   }
   if (items.length > 0) items.push({ type: "separator" });
   const progress = updateProgressView(i.update.progress, i.cliVersion, i.now);
+  let updateStart;
+  let updateCount = 0;
   const unsupported = isUnsupportedVersion(i.cliVersion, i.oldestSupportedVersion);
   if (unsupported) {
     items.push(
@@ -90497,7 +90718,9 @@ function renderMenu(i) {
         `You have ${i.cliVersion}; the oldest supported is ${i.oldestSupportedVersion}. Update now.`
       )
     );
+    updateStart ??= items.length;
     items.push(...updateItems(i, progress, envArgs, problem));
+    updateCount = items.length - updateStart;
     items.push({ type: "separator" });
   }
   if (i.credentialsError !== void 0) {
@@ -90530,6 +90753,7 @@ function renderMenu(i) {
   }
   if (!unsupported && (isUpdateAvailable(i.cliVersion, i.latestVersion) || progress.kind !== "none")) {
     items.push({ type: "separator" });
+    updateStart = items.length;
     if (progress.kind === "none") {
       items.push({
         type: "status",
@@ -90539,6 +90763,7 @@ function renderMenu(i) {
       });
     }
     items.push(...updateItems(i, progress, envArgs, problem));
+    updateCount = items.length - updateStart;
   }
   items.push({ type: "separator" });
   items.push({ type: "action", title: "Open Powerplant", url: i.config.webUrl });
@@ -90548,6 +90773,17 @@ function renderMenu(i) {
   const icon = attention ? "attention" : i.control.paused ? "paused" : "running";
   return {
     contract: MENU_CONTRACT,
+    ...i.update.inPlace && updateStart !== void 0 && {
+      cliUpdate: {
+        startIndex: updateStart,
+        itemCount: updateCount,
+        state: progress.kind === "none" ? "available" : progress.kind,
+        target: progress.kind === "none" ? i.latestVersion : progress.target,
+        ...progress.kind === "failed" && { detail: progress.detail },
+        run: ["update", "--background", ...envArgs],
+        logPath: updateLogPath()
+      }
+    },
     ...i.desktopDiagnostic && { desktopDiagnostic: i.desktopDiagnostic },
     appEnv: i.config.appEnv,
     cliVersion: i.cliVersion,
@@ -91315,7 +91551,7 @@ function createTerminalOutput(options) {
 }
 
 // src/menubarApp.ts
-import { existsSync as existsSync11, mkdirSync as mkdirSync10, renameSync as renameSync3, rmSync as rmSync5 } from "node:fs";
+import { existsSync as existsSync11, mkdirSync as mkdirSync11, renameSync as renameSync4, rmSync as rmSync6 } from "node:fs";
 import os21 from "node:os";
 import path27 from "node:path";
 import { spawnSync as spawnSync4 } from "node:child_process";
@@ -91383,11 +91619,11 @@ function realMenubarAppOps(input2) {
     },
     replace: (zip, appPath) => {
       const parent = path27.dirname(appPath);
-      mkdirSync10(parent, { recursive: true });
+      mkdirSync11(parent, { recursive: true });
       const staging = path27.join(parent, `.${MENUBAR_APP_NAME}.swap-${process.pid}`);
       const retired = path27.join(parent, `.${MENUBAR_APP_NAME}.old-${process.pid}`);
-      rmSync5(staging, { recursive: true, force: true });
-      rmSync5(retired, { recursive: true, force: true });
+      rmSync6(staging, { recursive: true, force: true });
+      rmSync6(retired, { recursive: true, force: true });
       try {
         const extract = spawnSync4("ditto", ["-xk", zip, staging]);
         if (extract.status !== 0) {
@@ -91400,16 +91636,16 @@ function realMenubarAppOps(input2) {
           throw new Error(`${zip} does not contain ${MENUBAR_APP_NAME}`);
         }
         const hadOld = existsSync11(appPath);
-        if (hadOld) renameSync3(appPath, retired);
+        if (hadOld) renameSync4(appPath, retired);
         try {
-          renameSync3(extracted, appPath);
+          renameSync4(extracted, appPath);
         } catch (error62) {
-          if (hadOld) renameSync3(retired, appPath);
+          if (hadOld) renameSync4(retired, appPath);
           throw error62;
         }
       } finally {
-        rmSync5(staging, { recursive: true, force: true });
-        rmSync5(retired, { recursive: true, force: true });
+        rmSync6(staging, { recursive: true, force: true });
+        rmSync6(retired, { recursive: true, force: true });
       }
     },
     launch: (appPath) => {
@@ -92139,8 +92375,8 @@ function startBackgroundUpdate(config2, target) {
     readProgress: updateProgress.read,
     writeProgress: updateProgress.write,
     spawnChild: () => {
-      mkdirSync11(path28.dirname(updateLogPath()), { recursive: true });
-      const log3 = openSync6(updateLogPath(), "a");
+      mkdirSync12(path28.dirname(updateLogPath()), { recursive: true });
+      const log3 = openSync7(updateLogPath(), "a");
       const child = spawn2(process.execPath, [entryPath(), "update", ...envArgsFor(config2)], {
         detached: true,
         stdio: ["ignore", log3, log3],
@@ -92202,7 +92438,7 @@ function restartSyncOnNewCode(config2) {
 var updateProgress = {
   read: () => readUpdateProgress(realReadTextFile),
   write: (record2) => realWriteTextFile(updateProgressPath(), JSON.stringify(record2, null, 2)),
-  clear: () => rmSync6(updateProgressPath(), { force: true })
+  clear: () => rmSync7(updateProgressPath(), { force: true })
 };
 function envArgsFor(config2) {
   return config2.appEnv === "production" ? [] : ["--env", config2.appEnv];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@usepowerplant/cli",
-  "version": "0.4.6",
+  "version": "0.4.7",
   "publishConfig": {
     "access": "public"
   },