pi-crew 0.9.39 → 0.9.41

package/CHANGELOG.md

@@ -1,5 +1,53 @@
 # Changelog
 
+## [0.9.41] — communication-layer optimization (2026-07-16)
+
+### Performance
+
+- **Eliminated double `JSON.parse` in `child-pi.ts` `emitLine` hot path** — `src/runtime/child-pi.ts`. The observer previously parsed each stdout line twice (once for raw assistant-text extraction, once inside `compactChildPiLine`). Now parses once and passes the result to both paths via a `preParsed` parameter. Benchmark: **2.0 → 1.0 JSON.parse/line** (~25% faster at 1000 events). Extracted shared `nonJsonLineResult` helper for the non-JSON fallback.
+- **Batched transcript writes** — `src/runtime/child-pi.ts`. Replaced per-line `open/write/close` (3 syscalls × N lines) with a module-scoped batch buffer that flushes all accumulated lines per path in a single `open/write/close` every 50ms or on lifecycle boundaries. Added `resetTranscriptBatchState()` for test isolation.
+- **Migrated non-terminal event writes to fire-and-forget** — `src/runtime/adaptive-plan.ts`. 4 diagnostic `adaptive.plan_*` events migrated to `appendEventFireAndForget`; 1 audit-critical event (`plan_injected`) upgraded to `await appendEventAsync` to prevent ordering inversion with subsequent task events.
+
+### Cleanup
+
+- **Removed dead code in `live-agent-manager.ts`** — deleted `drainIrcMessages`, `removeLiveAgentHandle`, and `listActiveLiveAgentsByWorkspace`, three internal functions with zero callers (verified via repo-wide grep; `removeLiveAgentHandle` logic was already inlined into `terminateLiveAgent`). Updated stale test comments.
+- **Stale-comment cleanup in `child-pi.ts`** — 3 comments still referenced the removed `pendingTranscriptWrites` Set after the Phase 3 batching change; updated to describe the new batch-buffer mechanism.
+
+### Documentation
+
+- **Added `docs/optimization-plan-2026-07.md`** — detailed 8-phase communication-layer optimization plan with verification gates, risk assessments, and rollback procedures.
+- **Added `docs/phase4-triage.md`** — documents the sync/async event-log migration triage, including the ordering risk between sync (filesystem lock) and async (in-process promise chain) write paths.
+- **Added `bench/child-pi-parse.bench.ts`** + baseline/final/session-verify measurement files — reproducible benchmark for the parse-count optimization.
+
+### Notes
+
+- Phase 5 (`pollRunToTerminal` → fs.watch) was attempted but reverted before review rounds. The async watcher coordination is too risky for a small win. Documented as a follow-up in `docs/optimization-plan-2026-07.md`.
+- Phases 6 (steer+control poll coalesce) and 7 (redaction trust-boundary) were skipped per the plan — Phase 6 is optional, Phase 7 was explicitly DEFER until a benchmark proves redaction is a bottleneck.
+
+### Tests
+
+- 6072 unit tests pass (was 6038 before)
+- 15+ integration tests pass
+- Lint + format:check clean (CI green on ubuntu + windows + macos)
+- New regression tests:
+  - `test/unit/child-pi-single-parse.test.ts` — 6 tests verifying single-parse invariant and preParsed path equivalence
+  - `test/unit/transcript-batch.test.ts` — 5 tests verifying batched write correctness, ordering, and timer-path flush
+- Updated `test/unit/live-agent-manager-cov.test.ts` — stale comments removed
+
+## [0.9.40] — stale-reconciler fix + async dispatch + gitignore cleanup (2026-07-16)
+
+### Fixes
+
+- **Stale-reconciler `needs_attention` status inference** — `src/runtime/stale-reconciler.ts`. When all tasks end in `needs_attention` (no explicit failure), `reconcileStaleRun` previously marked the run `completed`. This contradicted the codebase convention in `chain-executor.ts:147` (treating `needs_attention` as a non-clean terminal). Now includes `needs_attention` in the `hasFailed` predicate, marking the run `failed` instead. Tests cover: all-`needs_attention` → failed; mix `needs_attention`+completed → failed.
+
+### Performance
+
+- **Async `saveRunTasks` in `runCoalescedTaskGroup`** — `src/runtime/run-coalesced-task-group.ts`. Replaced 4 synchronous `saveRunTasks` calls with `await saveRunTasksAsync` (from `state-store.ts:493`). The heartbeat `setInterval` callback was promoted to `async () =>` to support the await. With many coalesced groups running in parallel these sync writes blocked the event loop briefly; the async version uses `withRunLock` (non-blocking). No behavioral change.
+
+### Cleanup
+
+- **`src/**/*.js` gitignored** — `.gitignore`. 290 strip-types companion files in `src/` were untracked noise in `git status`. Added `src/**/*.js` rule. No runtime impact.
+
 ## [0.9.39] — foreground abort fix + security hardening (2026-07-15)
 
 ### Fixes

package/dist/build-meta.json

@@ -6175,7 +6175,7 @@
       "format": "esm"
     },
     "src/state/locks.ts": {
-      "bytes": 15906,
+      "bytes": 17045,
       "imports": [
         {
           "path": "node:crypto",
@@ -6598,7 +6598,7 @@
       "format": "esm"
     },
     "src/state/state-store.ts": {
-      "bytes": 40339,
+      "bytes": 40424,
       "imports": [
         {
           "path": "node:fs",
@@ -6751,7 +6751,7 @@
       "format": "esm"
     },
     "src/runtime/live-agent-manager.ts": {
-      "bytes": 24685,
+      "bytes": 23837,
       "imports": [
         {
           "path": "src/utils/internal-error.ts",
@@ -6794,7 +6794,7 @@
       "format": "esm"
     },
     "src/runtime/stale-reconciler.ts": {
-      "bytes": 28660,
+      "bytes": 28694,
       "imports": [
         {
           "path": "node:fs",
@@ -7387,7 +7387,7 @@
       "format": "esm"
     },
     "src/runtime/child-pi.ts": {
-      "bytes": 71886,
+      "bytes": 73980,
       "imports": [
         {
           "path": "node:child_process",
@@ -14343,7 +14343,7 @@
       "format": "esm"
     },
     "src/runtime/run-coalesced-task-group.ts": {
-      "bytes": 9226,
+      "bytes": 9281,
       "imports": [
         {
           "path": "node:fs/promises",
@@ -15133,7 +15133,7 @@
       "format": "esm"
     },
     "src/runtime/adaptive-plan.ts": {
-      "bytes": 18288,
+      "bytes": 18395,
       "imports": [
         {
           "path": "node:fs",
@@ -17643,7 +17643,7 @@
       "format": "esm"
     },
     "src/runtime/heartbeat-watcher.ts": {
-      "bytes": 8071,
+      "bytes": 8429,
       "imports": [
         {
           "path": "node:fs",
@@ -18003,7 +18003,7 @@
       "format": "esm"
     },
     "src/extension/register.ts": {
-      "bytes": 68063,
+      "bytes": 70731,
       "imports": [
         {
           "path": "node:fs",
@@ -18425,7 +18425,7 @@
       "imports": [],
       "exports": [],
       "inputs": {},
-      "bytes": 6704580
+      "bytes": 6712404
     },
     "dist/index.mjs": {
       "imports": [
@@ -20704,7 +20704,7 @@
           "bytesInOutput": 1803
         },
         "src/state/state-store.ts": {
-          "bytesInOutput": 20386
+          "bytesInOutput": 20475
         },
         "src/utils/file-coalescer.ts": {
           "bytesInOutput": 1204
@@ -20725,7 +20725,7 @@
           "bytesInOutput": 4162
         },
         "src/runtime/stale-reconciler.ts": {
-          "bytesInOutput": 16497
+          "bytesInOutput": 16532
         },
         "src/runtime/worker-heartbeat.ts": {
           "bytesInOutput": 580
@@ -20815,7 +20815,7 @@
           "bytesInOutput": 1801
         },
         "src/runtime/child-pi.ts": {
-          "bytesInOutput": 47895
+          "bytesInOutput": 48865
         },
         "src/runtime/heartbeat-gradient.ts": {
           "bytesInOutput": 953
@@ -21472,7 +21472,7 @@
           "bytesInOutput": 4743
         },
         "src/runtime/live-session-runtime.ts": {
-          "bytesInOutput": 30989
+          "bytesInOutput": 30987
         },
         "src/subagents/live/session-runtime.ts": {
           "bytesInOutput": 140
@@ -21733,7 +21733,7 @@
           "bytesInOutput": 7286
         },
         "src/runtime/run-coalesced-task-group.ts": {
-          "bytesInOutput": 6313
+          "bytesInOutput": 6363
         },
         "src/runtime/runtime-policy.ts": {
           "bytesInOutput": 575
@@ -21820,7 +21820,7 @@
           "bytesInOutput": 3799
         },
         "src/runtime/adaptive-plan.ts": {
-          "bytesInOutput": 15447
+          "bytesInOutput": 15523
         },
         "src/workflows/topology-analyzer.ts": {
           "bytesInOutput": 4262
@@ -22009,7 +22009,7 @@
           "bytesInOutput": 2463
         },
         "src/runtime/heartbeat-watcher.ts": {
-          "bytesInOutput": 5931
+          "bytesInOutput": 5993
         },
         "src/extension/registration/observability.ts": {
           "bytesInOutput": 7512
@@ -22030,7 +22030,7 @@
           "bytesInOutput": 3150
         },
         "src/extension/register.ts": {
-          "bytesInOutput": 45555
+          "bytesInOutput": 47211
         },
         "src/runtime/batch-barrier.ts": {
           "bytesInOutput": 3060
@@ -22135,7 +22135,7 @@
           "bytesInOutput": 81
         }
       },
-      "bytes": 3175900
+      "bytes": 3178836
     }
   }
 }

package/dist/index.mjs

@@ -13483,6 +13483,9 @@ function validateRunManifestPaths(cwd, runId, manifest, stateRoot, tasksPath) {
   return true;
 }
 function createRunPaths(cwd, runId = createRunId()) {
+  if (!cwd || typeof cwd !== "string") {
+    throw new Error(`Invalid cwd: ${cwd}`);
+  }
   assertSafePathId("runId", runId);
   const baseRoot = scopeBaseRoot(cwd);
   const stateRoot = resolveContainedRelativePath(path11.join(baseRoot, DEFAULT_PATHS.state.runsSubdir), runId, "runId");
@@ -14998,7 +15001,7 @@ function checkResultFile(manifest, tasks) {
     (t2) => t2.status === "completed" || t2.status === "failed" || t2.status === "cancelled" || t2.status === "skipped" || t2.status === "needs_attention"
   );
   if (allTerminal) {
-    const hasFailed = tasks.some((t2) => t2.status === "failed");
+    const hasFailed = tasks.some((t2) => t2.status === "failed" || t2.status === "needs_attention");
     const onlyCancelledOrSkipped = tasks.every((t2) => t2.status === "cancelled" || t2.status === "skipped");
     manifest.status = hasFailed ? "failed" : onlyCancelledOrSkipped ? "cancelled" : "completed";
     saveRunManifest(manifest);
@@ -18696,34 +18699,56 @@ function appendTranscript(input, line4) {
   }
   trackTranscriptWrite(safePath, line4);
 }
-async function appendTranscriptAsync(safePath, line4) {
+function scheduleTranscriptFlush() {
+  if (transcriptFlushTimer) return;
+  transcriptFlushTimer = setTimeout(() => {
+    transcriptFlushTimer = void 0;
+    void flushTranscriptBatches();
+  }, TRANSCRIPT_FLUSH_MS);
+  transcriptFlushTimer.unref?.();
+}
+async function flushTranscriptBatches() {
+  const entries = [...transcriptBatches.entries()];
+  transcriptBatches.clear();
+  await Promise.allSettled(
+    entries.map(async ([safePath, lines]) => {
+      if (lines.length === 0) return;
+      const content = lines.join("");
+      try {
+        const fd = await fs28.promises.open(
+          safePath,
+          fs28.constants.O_WRONLY | fs28.constants.O_NOFOLLOW | fs28.constants.O_CREAT | fs28.constants.O_APPEND,
+          384
+        );
+        try {
+          await fd.write(content, void 0, "utf-8");
+        } finally {
+          await fd.close();
+        }
+      } catch (error) {
+        logInternalError("child-pi.transcript-write-failed", error, `path=${safePath}`);
+      }
+    })
+  );
+}
+function trackTranscriptWrite(safePath, line4) {
   const content = `${redactJsonLine(line4)}
 `;
-  try {
-    const fd = await fs28.promises.open(
-      safePath,
-      fs28.constants.O_WRONLY | fs28.constants.O_NOFOLLOW | fs28.constants.O_CREAT | fs28.constants.O_APPEND,
-      384
-    );
-    try {
-      await fd.write(content, void 0, "utf-8");
-    } finally {
-      await fd.close();
-    }
-  } catch (error) {
-    logInternalError("child-pi.transcript-write-failed", error, `path=${safePath}`);
+  let batch = transcriptBatches.get(safePath);
+  if (!batch) {
+    batch = [];
+    transcriptBatches.set(safePath, batch);
   }
-}
-function trackTranscriptWrite(safePath, line4) {
-  const p = appendTranscriptAsync(safePath, line4).finally(() => {
-    pendingTranscriptWrites.delete(p);
-  });
-  pendingTranscriptWrites.add(p);
+  batch.push(content);
+  scheduleTranscriptFlush();
 }
 async function flushPendingTranscriptWrites() {
-  while (pendingTranscriptWrites.size > 0) {
-    const drained = [...pendingTranscriptWrites];
-    await Promise.allSettled(drained);
+  if (transcriptFlushTimer) {
+    clearTimeout(transcriptFlushTimer);
+    transcriptFlushTimer = void 0;
+  }
+  while (transcriptBatches.size > 0) {
+    await flushTranscriptBatches();
   }
 }
 function compactString(value, maxChars = MAX_COMPACT_CONTENT_CHARS, opts = {}) {
@@ -18829,19 +18854,27 @@ function displayTextFromCompactEvent(event) {
   }).join("\n").trim();
   return text || (typeof record.text === "string" ? record.text : void 0);
 }
-function compactChildPiLine(line4) {
-  try {
-    const parsed = JSON.parse(line4);
-    const compact = compactChildPiEvent(parsed);
-    return {
-      json: true,
-      event: compact,
-      persistedLine: compact ? JSON.stringify(compact) : "",
-      displayLine: displayTextFromCompactEvent(compact)
-    };
-  } catch {
-    return { json: false, persistedLine: line4, displayLine: line4 };
+function nonJsonLineResult(line4) {
+  return { json: false, persistedLine: line4, displayLine: line4 };
+}
+function compactChildPiLine(line4, preParsed) {
+  let parsed;
+  if (preParsed !== void 0) {
+    parsed = preParsed;
+  } else {
+    try {
+      parsed = JSON.parse(line4);
+    } catch {
+      return nonJsonLineResult(line4);
+    }
   }
+  const compact = compactChildPiEvent(parsed);
+  return {
+    json: true,
+    event: compact,
+    persistedLine: compact ? JSON.stringify(compact) : "",
+    displayLine: displayTextFromCompactEvent(compact)
+  };
 }
 async function observeStdoutChunk(input, text) {
   const observer = new ChildPiLineObserver(input);
@@ -19608,7 +19641,7 @@ ${JSON.stringify({ type: "message_end", usage: { input: 10, output: 5, cost: 1e-
     }
   }
 }
-var POST_EXIT_STDIO_GUARD_MS, FINAL_DRAIN_MS, HARD_KILL_MS, RESPONSE_TIMEOUT_MS, MAX_CAPTURE_BYTES, MAX_ASSISTANT_TEXT_CHARS, MAX_TOOL_RESULT_CHARS, MAX_TOOL_INPUT_CHARS, MAX_COMPACT_CONTENT_CHARS, activeChildProcesses, childHardKillTimers, BASE_ALLOWLIST, pendingTranscriptWrites, ChildPiLineObserver;
+var POST_EXIT_STDIO_GUARD_MS, FINAL_DRAIN_MS, HARD_KILL_MS, RESPONSE_TIMEOUT_MS, MAX_CAPTURE_BYTES, MAX_ASSISTANT_TEXT_CHARS, MAX_TOOL_RESULT_CHARS, MAX_TOOL_INPUT_CHARS, MAX_COMPACT_CONTENT_CHARS, activeChildProcesses, childHardKillTimers, BASE_ALLOWLIST, transcriptBatches, transcriptFlushTimer, TRANSCRIPT_FLUSH_MS, ChildPiLineObserver;
 var init_child_pi = __esm({
   "src/runtime/child-pi.ts"() {
     "use strict";
@@ -19690,7 +19723,8 @@ var init_child_pi = __esm({
       "PI_CREW_MAX_OUTPUT",
       "PI_CREW_STEERING_FILE"
     ];
-    pendingTranscriptWrites = /* @__PURE__ */ new Set();
+    transcriptBatches = /* @__PURE__ */ new Map();
+    TRANSCRIPT_FLUSH_MS = 50;
     ChildPiLineObserver = class _ChildPiLineObserver {
       buffer = "";
       input;
@@ -19750,9 +19784,14 @@ var init_child_pi = __esm({
       }
       emitLine(line4) {
         if (!line4.trim()) return;
+        let parsed;
         try {
-          const rawParsed = JSON.parse(line4);
-          const rawTexts = extractText(rawParsed);
+          parsed = JSON.parse(line4);
+        } catch {
+          parsed = void 0;
+        }
+        if (parsed !== void 0) {
+          const rawTexts = extractText(parsed);
           if (rawTexts.length > 0) {
             this.rawTextEvents.push(...rawTexts);
             const rawOverflow = this.rawTextEvents.length - _ChildPiLineObserver.MAX_RAW_TEXT_EVENTS;
@@ -19764,9 +19803,8 @@ var init_child_pi = __esm({
               if (findingsOverflow > 0) this.intermediateFindings.splice(0, findingsOverflow);
             }
           }
-        } catch {
         }
-        const compact = compactChildPiLine(line4);
+        const compact = parsed !== void 0 ? compactChildPiLine(line4, parsed) : nonJsonLineResult(line4);
         if (compact.event !== void 0) {
           try {
             this.input.onJsonEvent?.(compact.event);
@@ -42508,9 +42546,9 @@ function loadLiveSessionModule() {
 }
 function appendTranscript2(filePath, event) {
   if (!filePath) return;
-  void appendTranscriptAsync2(filePath, event);
+  void appendTranscriptAsync(filePath, event);
 }
-async function appendTranscriptAsync2(filePath, event) {
+async function appendTranscriptAsync(filePath, event) {
   try {
     await fs49.promises.mkdir(path42.dirname(filePath), { recursive: true });
     const content = `${JSON.stringify(redactSecrets(event))}
@@ -55557,7 +55595,7 @@ async function runCoalescedTaskGroup(input) {
     }
     return t2;
   });
-  saveRunTasks(manifest, updatedTasks);
+  await saveRunTasksAsync(manifest, updatedTasks);
   await appendEventAsync(manifest.eventsPath, {
     type: "task.coalesced_dispatch_start",
     runId: manifest.runId,
@@ -55572,14 +55610,14 @@ async function runCoalescedTaskGroup(input) {
       heartbeat: t2.heartbeat ?? createWorkerHeartbeat(t2.id)
     };
   });
-  saveRunTasks(manifest, updatedTasks);
+  await saveRunTasksAsync(manifest, updatedTasks);
   let rawOutput = "";
   let success = false;
   if (!executeWorkers) {
     rawOutput = buildScaffoldOutput(groupTasks);
     success = true;
   } else {
-    const heartbeatTimer = setInterval(() => {
+    const heartbeatTimer = setInterval(async () => {
       const now = (/* @__PURE__ */ new Date()).toISOString();
       updatedTasks = updatedTasks.map((t2) => {
         if (!taskIds.includes(t2.id)) return t2;
@@ -55589,7 +55627,7 @@ async function runCoalescedTaskGroup(input) {
         };
       });
       try {
-        saveRunTasks(manifest, updatedTasks);
+        await saveRunTasksAsync(manifest, updatedTasks);
       } catch {
       }
     }, 15e3);
@@ -55639,7 +55677,7 @@ async function runCoalescedTaskGroup(input) {
       resultArtifact
     };
   });
-  saveRunTasks(manifest, updatedTasks);
+  await saveRunTasksAsync(manifest, updatedTasks);
   let updatedManifest = {
     ...manifest,
     artifacts: mergeArtifacts([...manifest.artifacts, ...newArtifacts])
@@ -60051,7 +60089,7 @@ async function injectAdaptivePlanIfReady(input) {
       missingPlan: false
     };
   if (!completedAssess.resultArtifact?.path) {
-    appendEvent(input.manifest.eventsPath, {
+    appendEventFireAndForget(input.manifest.eventsPath, {
       type: "adaptive.plan_missing",
       runId: input.manifest.runId,
       taskId: completedAssess.id,
@@ -60070,7 +60108,7 @@ async function injectAdaptivePlanIfReady(input) {
   try {
     text = fs85.readFileSync(resultPath, "utf-8");
   } catch {
-    appendEvent(input.manifest.eventsPath, {
+    appendEventFireAndForget(input.manifest.eventsPath, {
       type: "adaptive.plan_missing",
       runId: input.manifest.runId,
       taskId: assessTask.id,
@@ -60101,7 +60139,7 @@ async function injectAdaptivePlanIfReady(input) {
         updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
         artifacts: [...input.manifest.artifacts, repairArtifact]
       });
-      appendEvent(input.manifest.eventsPath, {
+      appendEventFireAndForget(input.manifest.eventsPath, {
         type: "adaptive.plan_repaired",
         runId: input.manifest.runId,
         taskId: assessTask.id,
@@ -60109,14 +60147,14 @@ async function injectAdaptivePlanIfReady(input) {
         data: { reason: repair.reason }
       });
     } else {
-      appendEvent(input.manifest.eventsPath, {
+      appendEventFireAndForget(input.manifest.eventsPath, {
         type: "adaptive.plan_repair_failed",
         runId: input.manifest.runId,
         taskId: assessTask.id,
         message: "Adaptive planner output could not be repaired.",
         data: { reason: repair.reason }
       });
-      appendEvent(input.manifest.eventsPath, {
+      appendEventFireAndForget(input.manifest.eventsPath, {
         type: "adaptive.plan_missing",
         runId: input.manifest.runId,
         taskId: assessTask.id,
@@ -60183,7 +60221,7 @@ async function injectAdaptivePlanIfReady(input) {
     } : task.graph
   }));
   const allTasks = refreshTaskGraphQueues([...input.tasks, ...withGraph]);
-  appendEvent(input.manifest.eventsPath, {
+  await appendEventAsync(input.manifest.eventsPath, {
     type: "adaptive.plan_injected",
     runId: input.manifest.runId,
     taskId: assessTask.id,
@@ -79029,6 +79067,7 @@ var init_heartbeat_watcher = __esm({
           if (!fs99.existsSync(run.stateRoot)) continue;
           const loaded = loadRunManifestById(this.opts.cwd, run.runId);
           if (!loaded) continue;
+          if (loaded.manifest.status !== "running") continue;
           for (const task of loaded.tasks) {
             if (task.status !== "running") continue;
             const key = `${run.runId}:${task.id}`;
@@ -85061,6 +85100,45 @@ Subagent may need manual intervention.`
       return loaded.tasks.some((t2) => t2.status === "running" || t2.status === "queued");
     };
   });
+  const cleanupSessionResourcesOnly = () => {
+    if (cleanedUp) return;
+    cleanedUp = true;
+    if (preloadTimer) {
+      clearTimeout(preloadTimer);
+      preloadTimer = void 0;
+    }
+    crewRunWatchers?.closeAll();
+    crewRunWatchers = void 0;
+    userCrewWatchers?.closeAll();
+    userCrewWatchers = void 0;
+    stopSessionBoundSubagents();
+    crewScheduler?.stop();
+    stopAsyncRunNotifier(notifierState);
+    purgeStaleActiveRunIndexSyncIfLoaded();
+    stopCrewWidget(currentCtx, widgetState, currentCtx ? loadConfig(currentCtx.cwd).config.ui : void 0);
+    clearPiCrewPowerbar(pi.events);
+    disposePowerbarCoalescer();
+    disposeObservability(observabilityState, cleanedUp);
+    lifecycleState.deliveryCoordinator?.dispose();
+    clearHooksScoped();
+    uninstallCrewGlobalRegistry();
+    lifecycleState.overflowTracker?.dispose();
+    lifecycleState.deliveryCoordinator = void 0;
+    lifecycleState.overflowTracker = void 0;
+    manifestCache2.dispose();
+    runSnapshotCache.dispose?.();
+    clearProjectRootCache();
+    renderScheduler?.dispose();
+    renderScheduler = void 0;
+    autoRecoveryLast.clear();
+    disposeNotifications(lifecycleState);
+    rpcHandle?.unsubscribe();
+    rpcHandle = void 0;
+    disposeI18n();
+    sessionGeneration += 1;
+    currentCtx = void 0;
+    if (globalStore[runtimeCleanupStoreKey] === cleanupSessionResourcesOnly) delete globalStore[runtimeCleanupStoreKey];
+  };
   const cleanupRuntime = () => {
     if (cleanedUp) return;
     cleanedUp = true;
@@ -85103,6 +85181,14 @@ Subagent may need manual intervention.`
     if (globalStore[runtimeCleanupStoreKey] === cleanupRuntime) delete globalStore[runtimeCleanupStoreKey];
   };
   globalStore[runtimeCleanupStoreKey] = cleanupRuntime;
+  pi.on("session_shutdown", (event) => {
+    const reason = typeof event === "object" && event !== null && "reason" in event ? event.reason : void 0;
+    if (reason === "quit" || reason === "reload") {
+      cleanupRuntime();
+    } else {
+      cleanupSessionResourcesOnly();
+    }
+  });
   pi.on("session_start", (_event, ctx) => {
     runArtifactCleanup(ctx.cwd);
     try {
@@ -85583,7 +85669,6 @@ Subagent may need manual intervention.`
     stopAsyncRunNotifier(notifierState);
     stopSessionBoundSubagents();
   });
-  pi.on("session_shutdown", () => cleanupRuntime());
   try {
     pi.on("resources_discover", () => {
       const sessionCwd = currentCtx?.cwd ?? process.cwd();