pi-crew 0.9.58 → 0.9.59

package/CHANGELOG.md

@@ -3,6 +3,23 @@
 > **Note:** `atomic-write-v2.ts` / `AtomicWriter` mentioned in historical entries below was consolidated into `atomic-write.ts` as of v0.9.42. This changelog is preserved as historical record — the migration was completed (the v2 class was never adopted; v1 won on simplicity + symlink-safety + link+unlink atomicity). See `docs/migration/atomic-write-v2-migration.md` for the decision rationale.
 
 
+## [0.9.59] — cross-session isolation: stop leak of runs/subagents between concurrent pi sessions + stop false-reap of live sessions (2026-08-05)
+
+### Bug fixes
+
+- **Chạy 2 pi session trên cùng repo → thông tin run/subagent của session A rò rỉ sang B, và crash-recovery của B giết foreground work đang chạy của A.** Hai lỗi gốc: (1) `extractSessionId()` đọc `ctx.sessionId` (own property) — không tồn tại trên pi 0.83.0 `ExtensionContext` → trả `undefined` → mọi session filter vô hiệu thầm lặng; (2) crash-recovery + shared-state listings không có session component, nên session đang sống-but-bận không phân biệt được với session đã crash.
+  - **`extractSessionId` (`src/utils/session-utils.ts`)**: giờ dùng `ctx.sessionManager.getSessionId()` (WeakMap cache keyed bởi `sessionManager` ref ổn định — `ctx` được tạo mới mỗi event nên không thể làm cache key), giữ descriptor lookup làm fallback cho test mock/pi cũ.
+  - **Crash-recovery (`src/runtime/recovery/crash-recovery.ts`)**: `reconcileAllStaleRuns` / `purgeStaleActiveRunIndex` / `detectInterruptedRuns` nhận `currentSessionId?` và **skip run của chính session đang sống** (`===`, theo pattern `cancelOrphanedRuns`). Session chết vẫn được dọn; back-compat giữ nguyên khi `currentSessionId` undefined. Thread qua tất cả caller incl. path tần suất cao `observability` (`before_agent_start` + interval 5-min) và `lazy-configurers`.
+  - **Subagents (`src/runtime/subagent-manager.ts`, `subagent-tools.ts`, `subagent-manager-setup.ts`)**: `SubagentRecord` thêm `ownerSessionId`; `get_subagent_result` từ chối record của session khác (record cũ vẫn serve); `resultConsumed` không còn bị clobber chéo session; agent id thêm entropy tránh collision cross-process; `isOwnerSessionCurrent` check `ownerSessionId` cross-process (giữ generation cho in-process switch).
+  - **UI (`src/ui/run-dashboard.ts`, `widget/*`, `powerbar-publisher.ts`)**: dashboard `refreshRuns`, widget render, powerbar re-apply filter `workspaceId` mỗi frame. Powerbar self-derive `workspaceId` qua `extractSessionId(ctx)` nên mọi caller hiện tại đều được.
+  - **Notifier/session-summary (`src/extension/async-notifier.ts`, `session-summary.ts`)**: filter `listRuns` theo `ownerSessionId` trước notify — session B không còn toast về run của A.
+  - **Health filter (#3)**: `ctx.currentCtx?.sessionManager?.getSessionId()` + bỏ dead clause `ownerSessionGeneration` (field không tồn tại trên `TeamRunManifest`) — trước đó silently drop tất cả owned runs.
+  - Verified end-to-end theo skill `real-test-pi-crew`: `test:critical` 101/101, 3-path kill-switch green, typecheck + bundle + md5 sync OK, live TUI (tmux + pty) render không crash, smoke verifier 52s (<300s, no hang), full feature battery (team tool 9a–9f + subagent tools) clean — zero `Unknown type`/`Validation failed`. 6837 unit + 214 integration tests pass.
+- Lưu ý: `#12` (DeliveryCoordinator) infrastructure staged nhưng inert — `deliver*` không có production caller, nên queue không bao giờ được feed. Documented trong `docs/cross-session-leak-fix-plan.md`.
+
+### Docs
+- `docs/cross-session-leak-audit.md` (audit re-verify: 2/2 root cause CONFIRMED, 12/13 vector CONFIRMED, #3 REFUTED) + `docs/cross-session-leak-fix-plan.md` (phased plan, reviewed).
+
 ## [0.9.58] — fix load crash on stale hoisted typebox: defensive guard + bundle vendoring (survives `pi update`) + round-1/round-2 fixes (2026-08-04)
 
 ### Bug fixes

package/dist/index.mjs

@@ -12871,14 +12871,23 @@ function toPiSessionId(runId) {
 }
 function extractSessionId(ctx) {
   if (typeof ctx !== "object" || ctx === null) return void 0;
-  let raw;
   try {
-    raw = Object.getOwnPropertyDescriptor(ctx, "sessionId")?.value;
+    const sm = ctx.sessionManager;
+    if (sm && typeof sm === "object") {
+      const cached2 = sessionIdCache.get(sm);
+      if (cached2) return cached2;
+      const id = sm.getSessionId?.();
+      if (typeof id === "string" && id.length > 0) {
+        sessionIdCache.set(sm, id);
+        return id;
+      }
+    }
+    const direct = Object.getOwnPropertyDescriptor(ctx, "sessionId")?.value;
+    if (typeof direct === "string" && direct.length > 0) return direct;
   } catch {
     return void 0;
   }
-  if (typeof raw !== "string" || raw.length === 0) return void 0;
-  return raw;
+  return void 0;
 }
 function extractBrokerSessionId(ctx) {
   if (typeof ctx !== "object" || ctx === null) return void 0;
@@ -12893,9 +12902,11 @@ function extractBrokerSessionId(ctx) {
     return void 0;
   }
 }
+var sessionIdCache;
 var init_session_utils = __esm({
   "src/utils/session-utils.ts"() {
     "use strict";
+    sessionIdCache = /* @__PURE__ */ new WeakMap();
   }
 });
 
@@ -42694,8 +42705,8 @@ function registerPiCrewPowerbarSegments(events, config) {
     label: "pi-crew workflow steps"
   });
 }
-function updatePiCrewPowerbar(events, cwd, config, manifestCache2, snapshotCache, ctx, notificationCount = 0, preloadedManifests) {
-  powerbarPublisher.update(events, cwd, config, manifestCache2, snapshotCache, ctx, notificationCount, preloadedManifests);
+function updatePiCrewPowerbar(events, cwd, config, manifestCache2, snapshotCache, ctx, notificationCount = 0, preloadedManifests, workspaceId) {
+  powerbarPublisher.update(events, cwd, config, manifestCache2, snapshotCache, ctx, notificationCount, preloadedManifests, workspaceId);
 }
 function powerbarKey(payload) {
   return `${payload.text ?? ""}|${payload.suffix ?? ""}|${payload.bar ?? ""}|${payload.color ?? ""}|${payload.icon ?? ""}|${payload.barSegments ?? ""}`;
@@ -42739,8 +42750,8 @@ function buildStepsPayload(active, allTasks) {
     color
   };
 }
-function requestPowerbarUpdate(events, cwd, config, manifestCache2, snapshotCache, ctx, notificationCount = 0, preloadedManifests) {
-  powerbarPublisher.request(events, cwd, config, manifestCache2, snapshotCache, ctx, notificationCount, preloadedManifests);
+function requestPowerbarUpdate(events, cwd, config, manifestCache2, snapshotCache, ctx, notificationCount = 0, preloadedManifests, workspaceId) {
+  powerbarPublisher.request(events, cwd, config, manifestCache2, snapshotCache, ctx, notificationCount, preloadedManifests, workspaceId);
 }
 function disposePowerbarCoalescer() {
   powerbarPublisher.dispose();
@@ -42762,6 +42773,7 @@ var init_powerbar_publisher = __esm({
     init_usage();
     init_file_coalescer();
     init_internal_error();
+    init_session_utils();
     init_discover_workflows();
     init_render_coalescer();
     init_widget_formatters();
@@ -42777,13 +42789,25 @@ var init_powerbar_publisher = __esm({
           const a = this.#latestArgs;
           this.#latestArgs = null;
           if (!a) return;
-          this.update(a.events, a.cwd, a.config, a.manifestCache, a.snapshotCache, a.ctx, a.notificationCount, a.preloadedManifests);
+          this.update(
+            a.events,
+            a.cwd,
+            a.config,
+            a.manifestCache,
+            a.snapshotCache,
+            a.ctx,
+            a.notificationCount,
+            a.preloadedManifests,
+            a.workspaceId
+          );
         }, 200);
       }
-      update(events, cwd, config, manifestCache2, snapshotCache, ctx, notificationCount = 0, preloadedManifests) {
+      update(events, cwd, config, manifestCache2, snapshotCache, ctx, notificationCount = 0, preloadedManifests, workspaceId) {
         if (config?.powerbar === false) return;
         const useStatusFallback = !hasPowerbarConsumer(events);
-        const runs = preloadedManifests ?? (manifestCache2 ? manifestCache2.list(20) : listRecentRuns(cwd, 20));
+        const effectiveWorkspaceId = workspaceId ?? extractSessionId(ctx);
+        const allRuns = preloadedManifests ?? (manifestCache2 ? manifestCache2.list(20) : listRecentRuns(cwd, 20));
+        const runs = effectiveWorkspaceId ? allRuns.filter((run) => !run.ownerSessionId || run.ownerSessionId === effectiveWorkspaceId) : allRuns;
         const active = runs.map((run) => {
           let snapshot;
           try {
@@ -42839,7 +42863,8 @@ var init_powerbar_publisher = __esm({
         const tokenTotal = hasUsage ? (usage.input ?? 0) + (usage.output ?? 0) + (usage.cacheRead ?? 0) + (usage.cacheWrite ?? 0) : snapshotTokens;
         const model = config?.showModel === false ? void 0 : agents.find((agent) => agent.model)?.model?.split("/").at(-1);
         const tokenText = config?.showTokens === false || !tokenTotal ? void 0 : compactTokens(tokenTotal);
-        const liveRunning = listLiveAgents().filter((a) => a.status === "running").length;
+        const liveAgents2 = effectiveWorkspaceId ? listLiveAgentsByWorkspace(effectiveWorkspaceId) : listLiveAgents();
+        const liveRunning = liveAgents2.filter((a) => a.status === "running").length;
         const runningCount = agents.filter((a) => a.status === "running").length;
         const queuedCount = active.reduce(
           (sum, item) => sum + item.tasks.reduce((s, t2) => s + (t2.status === "queued" || t2.status === "waiting" ? 1 : 0), 0),
@@ -42893,7 +42918,7 @@ var init_powerbar_publisher = __esm({
        * into a single render pass within 200ms, preventing UI flicker from
        * event bursts.
        */
-      request(events, cwd, config, manifestCache2, snapshotCache, ctx, notificationCount = 0, preloadedManifests) {
+      request(events, cwd, config, manifestCache2, snapshotCache, ctx, notificationCount = 0, preloadedManifests, workspaceId) {
         if (config?.powerbar === false) return;
         this.#latestArgs = {
           events,
@@ -42903,7 +42928,8 @@ var init_powerbar_publisher = __esm({
           snapshotCache,
           ctx,
           notificationCount,
-          preloadedManifests
+          preloadedManifests,
+          workspaceId
         };
         this.#coalescer.request();
       }
@@ -44611,12 +44637,13 @@ function shouldRecoverTask(task, deadMs) {
   if (!task.heartbeat) return true;
   return task.heartbeat.alive === false || isWorkerHeartbeatStale(task.heartbeat, deadMs);
 }
-function detectInterruptedRuns(cwd, manifestCache2, deadMs = 3e5) {
+function detectInterruptedRuns(cwd, manifestCache2, deadMs = 3e5, currentSessionId) {
   const plans = [];
   for (const manifest of manifestCache2.list(50)) {
     if (manifest.status !== "running" && manifest.status !== "blocked") continue;
     if (isPlanApprovalPending(manifest)) continue;
     if (manifest.async?.pid !== void 0 && checkProcessLiveness(manifest.async.pid).alive) continue;
+    if (currentSessionId && manifest.ownerSessionId && manifest.ownerSessionId === currentSessionId) continue;
     const loaded = loadRunManifestById(cwd, manifest.runId);
     if (!loaded) continue;
     const resumableTasks = loaded.tasks.filter((task) => shouldRecoverTask(task, deadMs)).map((task) => task.id);
@@ -44788,7 +44815,7 @@ function hasRecentLifeEvidence(entry, manifestUpdatedAt, now, staleThresholdMs)
   if (Number.isFinite(hbAge) && hbAge <= staleThresholdMs) return true;
   return false;
 }
-function purgeStaleActiveRunIndex(staleThresholdMs = 3e5, now = Date.now()) {
+function purgeStaleActiveRunIndex(staleThresholdMs = 3e5, now = Date.now(), currentSessionId) {
   const purged = [];
   const kept = [];
   const entries = readActiveRunRegistry();
@@ -44830,6 +44857,10 @@ function purgeStaleActiveRunIndex(staleThresholdMs = 3e5, now = Date.now()) {
       purged.push(entry.runId);
       continue;
     }
+    if (currentSessionId && manifest?.ownerSessionId && manifest.ownerSessionId === currentSessionId) {
+      kept.push(entry.runId);
+      continue;
+    }
     if (manifest?.status === "running" && manifest.async?.pid !== void 0) {
       const pidAlive = checkProcessLiveness(manifest.async.pid).alive;
       if (!pidAlive && !hasRecentLifeEvidence(entry, manifest.updatedAt, now, staleThresholdMs)) {
@@ -44930,9 +44961,13 @@ function purgeStaleActiveRunIndex(staleThresholdMs = 3e5, now = Date.now()) {
   }
   return { purged, kept };
 }
-function reconcileAllStaleRuns(cwd, manifestCache2, now = Date.now()) {
+function reconcileAllStaleRuns(cwd, manifestCache2, now = Date.now(), currentSessionId) {
   const results = [];
-  const runIds = manifestCache2.list(50).filter((m) => m.status === "running" || m.status === "blocked").map((m) => m.runId);
+  const runIds = manifestCache2.list(50).filter((m) => {
+    if (m.status !== "running" && m.status !== "blocked") return false;
+    if (currentSessionId && m.ownerSessionId && m.ownerSessionId === currentSessionId) return false;
+    return true;
+  }).map((m) => m.runId);
   for (const runId of runIds) {
     const cached2 = manifestCache2.get(runId);
     if (!cached2) continue;
@@ -45016,7 +45051,7 @@ function activeWidgetRuns(cwd, manifestCache2, snapshotCache, preloadedManifests
   if (now - lastStaleReconcileAt > STALE_RECONCILE_INTERVAL_MS && manifestCache2) {
     lastStaleReconcileAt = now;
     try {
-      reconcileAllStaleRuns(cwd, manifestCache2);
+      reconcileAllStaleRuns(cwd, manifestCache2, Date.now(), workspaceId);
     } catch {
     }
   }
@@ -45458,7 +45493,8 @@ function updateCrewWidget(ctx, state, config, manifestCache2, snapshotCache, pre
       notificationCount: state.notificationCount ?? 0,
       manifestCache: manifestCache2,
       snapshotCache,
-      preloadManifests: preloadedManifests
+      preloadManifests: preloadedManifests,
+      workspaceId
     };
   else {
     state.model.cwd = ctx.cwd;
@@ -45468,6 +45504,7 @@ function updateCrewWidget(ctx, state, config, manifestCache2, snapshotCache, pre
     state.model.manifestCache = manifestCache2;
     state.model.snapshotCache = snapshotCache;
     state.model.preloadManifests = preloadedManifests;
+    state.model.workspaceId = workspaceId;
   }
   if (needsWidgetInstall) {
     const model = state.model;
@@ -45603,7 +45640,13 @@ var init_widget = __esm({
         if (activeResizeTarget === this) activeResizeTarget = void 0;
       }
       render(width) {
-        const runs = activeWidgetRuns(this.model.cwd, this.model.manifestCache, this.model.snapshotCache, this.model.preloadManifests);
+        const runs = activeWidgetRuns(
+          this.model.cwd,
+          this.model.manifestCache,
+          this.model.snapshotCache,
+          this.model.preloadManifests,
+          this.model.workspaceId
+        );
         const now = Date.now();
         let sigBase;
         if (this.cachedBuildSignature !== "" && now - this.cachedBuildSignatureAt < SIGNATURE_CACHE_TTL_MS) {
@@ -64582,7 +64625,8 @@ var init_run_dashboard = __esm({
         if (!this.options.runProvider) return;
         const selectedRunId = this.selectedRunId();
         const next = this.options.runProvider();
-        this.runs = Array.isArray(next) ? next : this.runs;
+        const unfiltered = Array.isArray(next) ? next : this.runs;
+        this.runs = this.options.workspaceId ? unfiltered.filter((run) => !run.ownerSessionId || run.ownerSessionId === this.options.workspaceId) : unfiltered;
         if (selectedRunId) {
           const nextIndex = groupedRuns(this.runs, this.options.snapshotCache).filter((row) => row.run).findIndex((row) => row.run?.runId === selectedRunId);
           if (nextIndex >= 0) this.selected = nextIndex;
@@ -67808,6 +67852,7 @@ var init_commands = __esm({
 });
 
 // src/runtime/subagent-manager.ts
+import { randomUUID as randomUUID8 } from "node:crypto";
 import * as fs100 from "node:fs";
 import * as path81 from "node:path";
 function isValidSubagentId(id) {
@@ -67926,6 +67971,7 @@ var init_subagent_manager = __esm({
       "resultConsumed",
       "background",
       "ownerSessionGeneration",
+      "ownerSessionId",
       "stuckNotified",
       "blockedAt",
       "turnCount",
@@ -67952,7 +67998,7 @@ var init_subagent_manager = __esm({
       }
       spawn(options, runner, signal) {
         const record = {
-          id: `agent_${Date.now().toString(36)}_${(++this.counter).toString(36)}`,
+          id: `agent_${Date.now().toString(36)}_${randomUUID8().slice(0, 8)}_${(++this.counter).toString(36)}`,
           type: options.type,
           description: options.description,
           prompt: options.prompt,
@@ -67962,6 +68008,7 @@ var init_subagent_manager = __esm({
           skill: options.skill,
           background: options.background,
           ownerSessionGeneration: options.ownerSessionGeneration,
+          ownerSessionId: options.ownerSessionId,
           batchId: options.batchId
         };
         this.records.set(record.id, record);
@@ -68214,7 +68261,8 @@ var init_subagent_manager = __esm({
             id: current.id,
             runId: current.runId,
             durationMs: Math.max(0, Date.now() - current.blockedAt),
-            ownerSessionGeneration: current.ownerSessionGeneration
+            ownerSessionGeneration: current.ownerSessionGeneration,
+            ownerSessionId: current.ownerSessionId
           });
           savePersistedSubagentRecord(cwd, current);
         };
@@ -68878,7 +68926,9 @@ function startAsyncRunNotifier(ctx, state, intervalMs = 5e3, options = {}) {
   state.generation = generation;
   const startedAtMs = Date.now();
   const staleBeforeMs = state.lastStoppedAtMs ?? startedAtMs;
-  for (const run of listRuns(ctx.cwd)) {
+  const sid = extractSessionId(ctx);
+  const ownsRun = (run) => !sid || !run.ownerSessionId || run.ownerSessionId === sid;
+  for (const run of listRuns(ctx.cwd).filter(ownsRun)) {
     const updatedAtMs = timeMs(run.updatedAt) ?? 0;
     if (isFinished2(run.status) && updatedAtMs < staleBeforeMs) state.seenFinishedRunIds.add(run.runId);
   }
@@ -68888,7 +68938,7 @@ function startAsyncRunNotifier(ctx, state, intervalMs = 5e3, options = {}) {
       if (options.isCurrent && !options.isCurrent(generation)) return;
       const nowMs3 = Date.now();
       if (cachedRuns === void 0 || nowMs3 - (state.lastListRunsMs ?? 0) > LIST_RUNS_DEBOUNCE_MS) {
-        cachedRuns = listRuns(ctx.cwd).slice(0, 20);
+        cachedRuns = listRuns(ctx.cwd).filter(ownsRun).slice(0, 20);
         state.lastListRunsMs = nowMs3;
       }
       for (const run of cachedRuns) {
@@ -68925,6 +68975,7 @@ var init_async_notifier = __esm({
     init_event_log();
     init_state_store();
     init_internal_error();
+    init_session_utils();
     init_run_index();
     LIST_RUNS_DEBOUNCE_MS = 3e4;
   }
@@ -69137,11 +69188,15 @@ var init_delivery_coordinator = __esm({
       deps;
       ttlTimer;
       timerStarted = false;
+      /** The session id passed to the most recent activate(); used by flushQueuedResults
+       * to park deliveries owned by a different session (vector #12). */
+      activeSessionId;
       constructor(deps) {
         this.deps = deps;
       }
       activate(sessionId) {
         this.active = true;
+        this.activeSessionId = sessionId;
         this.flushQueuedResults();
       }
       deactivate() {
@@ -69154,7 +69209,7 @@ var init_delivery_coordinator = __esm({
       getPendingCount() {
         return this.pending.length;
       }
-      deliverResult(runId, result4) {
+      deliverResult(runId, result4, ownerSessionId) {
         if (this.active && this.deps.emit) {
           try {
             this.deps.emit("pi-crew:run-result", result4);
@@ -69168,10 +69223,11 @@ var init_delivery_coordinator = __esm({
             runId,
             payload: result4,
             timestamp: Date.now(),
-            type: "result"
+            type: "result",
+            ownerSessionId
           });
       }
-      deliverNotification(notification) {
+      deliverNotification(notification, ownerSessionId) {
         let delivered = false;
         if (this.active && this.deps.sendFollowUp) {
           try {
@@ -69195,10 +69251,11 @@ var init_delivery_coordinator = __esm({
             runId: notification.runId ?? "",
             payload: notification,
             timestamp: Date.now(),
-            type: "notification"
+            type: "notification",
+            ownerSessionId
           });
       }
-      deliverSteer(runId, message) {
+      deliverSteer(runId, message, ownerSessionId) {
         if (this.active && this.deps.sendWakeUp) {
           try {
             this.deps.sendWakeUp(message);
@@ -69212,7 +69269,8 @@ var init_delivery_coordinator = __esm({
             runId,
             payload: message,
             timestamp: Date.now(),
-            type: "steer"
+            type: "steer",
+            ownerSessionId
           });
       }
       flushQueuedResults() {
@@ -69223,6 +69281,10 @@ var init_delivery_coordinator = __esm({
         try {
           const retryLater = [];
           for (const delivery of batch) {
+            if (delivery.ownerSessionId && this.activeSessionId && delivery.ownerSessionId !== this.activeSessionId) {
+              retryLater.push(delivery);
+              continue;
+            }
             if (delivery.type === "steer" && delivery.generation !== void 0 && delivery.generation !== this.generation) {
               logInternalError("delivery-coordinator.flush.stale", void 0, `runId=${delivery.runId} type=${delivery.type}`);
               continue;
@@ -70659,7 +70721,7 @@ async function configureObservability(ctx, state, deps) {
     deps.pi.on?.("before_agent_start", () => {
       if (deps.isCleanedUp()) return;
       try {
-        deps.reconcileStaleRuns(ctx.cwd, deps.getManifestCache(ctx.cwd));
+        deps.reconcileStaleRuns(ctx.cwd, deps.getManifestCache(ctx.cwd), extractSessionId(ctx));
       } catch (error) {
         logInternalError("register.autoRepair.turnHook", error);
       }
@@ -70671,7 +70733,7 @@ async function configureObservability(ctx, state, deps) {
     state.autoRepairTimer = setInterval(() => {
       if (deps.isCleanedUp()) return;
       try {
-        const staleResults = deps.reconcileStaleRuns(ctx.cwd, deps.getManifestCache(ctx.cwd));
+        const staleResults = deps.reconcileStaleRuns(ctx.cwd, deps.getManifestCache(ctx.cwd), extractSessionId(ctx));
         if (Array.isArray(staleResults) && staleResults.length > 0) {
           for (const result4 of staleResults) {
             const repaired = result4.repaired;
@@ -70729,7 +70791,8 @@ async function configureObservability(ctx, state, deps) {
     const cacheSnapshot = deps.getManifestCache(cwdSnapshot);
     void deps.importCrashRecovery().then(({ detectInterruptedRuns: detectInterruptedRuns2 }) => {
       if (deps.isCleanedUp()) return;
-      for (const plan of detectInterruptedRuns2(cwdSnapshot, cacheSnapshot)) {
+      const sid = extractSessionId(ctx);
+      for (const plan of detectInterruptedRuns2(cwdSnapshot, cacheSnapshot, 3e5, sid)) {
         deps.notifyOperator({
           id: `recovery_prompt_${plan.runId}`,
           severity: "warning",
@@ -70769,6 +70832,7 @@ var init_observability = __esm({
     init_config();
     init_internal_error();
     init_paths();
+    init_session_utils();
   }
 });
 
@@ -74346,7 +74410,10 @@ function buildRegistrationContext(pi) {
     globalStore: globalThis,
     runtimeCleanupStoreKey: RUNTIME_CLEANUP_STORE_KEY,
     captureSessionGeneration: () => ctx.sessionGeneration,
-    isOwnerSessionCurrent: (gen) => !ctx.cleanedUp && (gen === void 0 || gen === ctx.sessionGeneration),
+    isOwnerSessionCurrent: (gen, oid) => {
+      const currentSid = ctx.currentCtx?.sessionManager?.getSessionId?.();
+      return !ctx.cleanedUp && (oid === void 0 || oid === currentSid) && (gen === void 0 || gen === ctx.sessionGeneration);
+    },
     isContextCurrent: (c, gen) => !ctx.cleanedUp && ctx.currentCtx === c && ctx.sessionGeneration === gen,
     telemetryEnabled: () => loadConfig(ctx.currentCtx?.cwd ?? process.cwd()).config.telemetry?.enabled !== false,
     notifyOperator: void 0,
@@ -74358,7 +74425,7 @@ function buildRegistrationContext(pi) {
     configureObservability: () => void 0,
     configureDeliveryCoordinator: () => void 0,
     importCrashRecovery: void 0,
-    purgeStaleActiveRunIndexSyncIfLoaded: () => void 0,
+    purgeStaleActiveRunIndexSyncIfLoaded: (_currentSessionId) => void 0,
     startForegroundRun: void 0,
     abortForegroundRun: () => false,
     openLiveSidebar: () => void 0,
@@ -74405,10 +74472,10 @@ async function importCrashRecovery() {
   }
   return _cachedCrashRecovery;
 }
-function purgeStaleActiveRunIndexSyncIfLoaded() {
+function purgeStaleActiveRunIndexSyncIfLoaded(currentSessionId) {
   if (!_cachedCrashRecovery) return;
   try {
-    _cachedCrashRecovery.purgeStaleActiveRunIndex();
+    _cachedCrashRecovery.purgeStaleActiveRunIndex(3e5, Date.now(), currentSessionId);
   } catch (error) {
     logInternalError("register.cleanupRuntime.purgeStale", error);
   }
@@ -74761,7 +74828,7 @@ async function configureObservabilityImpl(pi, ctx, extCtx) {
       getManifestCache: ctx.getManifestCache,
       notifyOperator: ctx.notifyOperator,
       isCleanedUp: () => ctx.cleanedUp,
-      reconcileStaleRuns: (cwd, cache3) => reconcileAllStaleRuns(cwd, cache3),
+      reconcileStaleRuns: (cwd, cache3, currentSessionId) => reconcileAllStaleRuns(cwd, cache3, void 0, currentSessionId),
       reconcileOrphanedTempWorkspaces: (now, opts) => reconcileOrphanedTempWorkspaces(now, opts),
       cleanupOrphanTempDirs,
       cleanupLegacyOrphanTempDirs,
@@ -74805,9 +74872,9 @@ import * as fsp3 from "node:fs/promises";
 import * as net2 from "node:net";
 
 // src/runtime/broker/crew-broker-tokens.ts
-import { randomUUID as randomUUID8, timingSafeEqual as timingSafeEqual3 } from "node:crypto";
+import { randomUUID as randomUUID9, timingSafeEqual as timingSafeEqual3 } from "node:crypto";
 function newBrokerToken() {
-  return randomUUID8();
+  return randomUUID9();
 }
 var BrokerTokenRegistry = class _BrokerTokenRegistry {
   map = /* @__PURE__ */ new Map();
@@ -76312,9 +76379,12 @@ function registerCrewAutocomplete(ctx) {
 // src/extension/session-summary.ts
 init_crew_agent_records();
 init_process_status();
+init_session_utils();
 init_run_index();
 function notifyActiveRuns(ctx) {
+  const sid = extractSessionId(ctx);
   const active = listRuns(ctx.cwd).filter((run) => {
+    if (sid && run.ownerSessionId && run.ownerSessionId !== sid) return false;
     if (run.status !== "queued" && run.status !== "planning" && run.status !== "running") return false;
     const agents = readCrewAgents(run);
     return isDisplayActiveRun(run, agents);
@@ -76537,7 +76607,7 @@ async function runDeferredSessionCleanup(pi, ctx, ownerGeneration, currentSessio
     logInternalError("register.sessionStart.orphanWorkers", error);
   }
   try {
-    const { purged } = purgeStaleActiveRunIndexFn();
+    const { purged } = purgeStaleActiveRunIndexFn(3e5, Date.now(), currentSessionId);
     if (purged.length > 0) {
       ctx.notifyOperator({
         id: `active_index_purge`,
@@ -76551,7 +76621,7 @@ async function runDeferredSessionCleanup(pi, ctx, ownerGeneration, currentSessio
     logInternalError("register.sessionStart.globalIndexPurge", error);
   }
   try {
-    const staleResults = reconcileAllStaleRuns(extensionCtx.cwd, ctx.getManifestCache(extensionCtx.cwd)) ?? [];
+    const staleResults = reconcileAllStaleRuns(extensionCtx.cwd, ctx.getManifestCache(extensionCtx.cwd), Date.now(), currentSessionId) ?? [];
     if (staleResults.length > 0) {
       ctx.notifyOperator({
         id: "stale_reconcile",
@@ -76671,6 +76741,9 @@ function setupCrewScheduler(pi, ctx, extensionCtx, sessionId) {
   });
   return crewScheduler;
 }
+function filterManifestsForHealthNotifications(manifests, currentSessionId) {
+  return manifests.filter((run) => !run.ownerSessionId || run.ownerSessionId === currentSessionId);
+}
 function setupRenderLoop(pi, ctx, extensionCtx, loadedConfig) {
   ctx.disposeRenderSchedulerSubscriptions();
   ctx.renderScheduler?.dispose();
@@ -76764,11 +76837,8 @@ function setupRenderLoop(pi, ctx, extensionCtx, loadedConfig) {
       ctx.widgetState.notificationCount ?? 0,
       manifests
     );
-    const currentSessionGen = ctx.sessionGeneration;
-    const currentSessionId = ctx.currentCtx ? ctx.currentCtx.sessionId : void 0;
-    const sessionManifests = manifests.filter(
-      (run) => !run.ownerSessionId || run.ownerSessionId === currentSessionId || run.ownerSessionGeneration === currentSessionGen
-    );
+    const currentSessionId = ctx.currentCtx?.sessionManager?.getSessionId();
+    const sessionManifests = filterManifestsForHealthNotifications(manifests, currentSessionId);
     const now = Date.now();
     for (const run of sessionManifests) {
       if (run.status !== "running") continue;
@@ -76998,6 +77068,7 @@ init_powerbar_publisher();
 init_widget();
 init_internal_error();
 init_paths();
+init_session_utils();
 init_async_notifier();
 init_team_tool2();
 init_lifecycle();
@@ -77021,6 +77092,7 @@ function buildCleanupSessionResourcesOnly(ctx) {
   return () => {
     if (ctx.cleanedUp) return;
     ctx.cleanedUp = true;
+    const sid = extractSessionId(ctx.currentCtx);
     if (ctx.preloadTimer) {
       clearTimeout(ctx.preloadTimer);
       ctx.preloadTimer = void 0;
@@ -77032,7 +77104,7 @@ function buildCleanupSessionResourcesOnly(ctx) {
     ctx.stopSessionBoundSubagents();
     ctx.crewScheduler?.stop();
     stopAsyncRunNotifier(ctx.notifierState);
-    ctx.purgeStaleActiveRunIndexSyncIfLoaded();
+    ctx.purgeStaleActiveRunIndexSyncIfLoaded(sid);
     stopCrewWidget(ctx.currentCtx, ctx.widgetState, ctx.currentCtx ? loadConfig(ctx.currentCtx.cwd).config.ui : void 0);
     clearPiCrewPowerbar(ctx.pi.events);
     disposePowerbarCoalescer();
@@ -77064,6 +77136,7 @@ function buildCleanupRuntime(ctx) {
   return () => {
     if (ctx.cleanedUp) return;
     ctx.cleanedUp = true;
+    const sid = extractSessionId(ctx.currentCtx);
     if (ctx.preloadTimer) {
       clearTimeout(ctx.preloadTimer);
       ctx.preloadTimer = void 0;
@@ -77078,7 +77151,7 @@ function buildCleanupRuntime(ctx) {
     stopAllWatchdogs();
     ctx.crewScheduler?.stop();
     stopAsyncRunNotifier(ctx.notifierState);
-    ctx.purgeStaleActiveRunIndexSyncIfLoaded();
+    ctx.purgeStaleActiveRunIndexSyncIfLoaded(sid);
     stopCrewWidget(ctx.currentCtx, ctx.widgetState, ctx.currentCtx ? loadConfig(ctx.currentCtx.cwd).config.ui : void 0);
     clearPiCrewPowerbar(ctx.pi.events);
     disposePowerbarCoalescer();
@@ -77155,7 +77228,7 @@ function createCompletionCoalescer(pi, ctx) {
     const f = ctx.subagentManager.getRecord(c.agentId);
     const p = ctx.currentCtx ? readPersistedSubagentRecord(ctx.currentCtx.cwd, c.agentId) : void 0;
     if (f?.resultConsumed || p?.resultConsumed) return false;
-    if (!ctx.isOwnerSessionCurrent(f?.ownerSessionGeneration ?? c.ownerGen)) return false;
+    if (!ctx.isOwnerSessionCurrent(f?.ownerSessionGeneration ?? c.ownerGen, f?.ownerSessionId)) return false;
     return true;
   };
   const flush = () => {
@@ -77263,7 +77336,7 @@ function onTerminalStatus(pi, ctx, record, coalescer) {
     });
   }
   if (!record.background) return;
-  if (!ctx.isOwnerSessionCurrent(record.ownerSessionGeneration)) return;
+  if (!ctx.isOwnerSessionCurrent(record.ownerSessionGeneration, record.ownerSessionId)) return;
   if (record.status !== "completed" && record.status !== "failed" && record.status !== "cancelled" && record.status !== "blocked" && record.status !== "error")
     return;
   const agentId = record.id;
@@ -77279,7 +77352,7 @@ function onTerminalStatus(pi, ctx, record, coalescer) {
       const fresh = ctx.subagentManager.getRecord(agentId);
       const persisted = ctx.currentCtx ? readPersistedSubagentRecord(ctx.currentCtx.cwd, agentId) : void 0;
       if (fresh?.resultConsumed || persisted?.resultConsumed) return;
-      if (!ctx.isOwnerSessionCurrent(fresh?.ownerSessionGeneration ?? ownerGen)) return;
+      if (!ctx.isOwnerSessionCurrent(fresh?.ownerSessionGeneration ?? ownerGen, fresh?.ownerSessionId)) return;
       const member = {
         id: agentId,
         description: agentDescription,
@@ -77314,7 +77387,8 @@ function onTerminalStatus(pi, ctx, record, coalescer) {
 }
 function onInternalEvent(pi, ctx, event, payload) {
   const ownerGeneration = typeof payload?.ownerSessionGeneration === "number" ? payload.ownerSessionGeneration : void 0;
-  if (ownerGeneration !== void 0 && !ctx.isOwnerSessionCurrent(ownerGeneration)) return;
+  const ownerSessionId = typeof payload?.ownerSessionId === "string" ? payload.ownerSessionId : void 0;
+  if (ownerGeneration !== void 0 && !ctx.isOwnerSessionCurrent(ownerGeneration, ownerSessionId)) return;
   if (event === "subagent.stuck-blocked") {
     const p = payload;
     const id = typeof p.id === "string" ? p.id : "unknown";
@@ -77428,6 +77502,7 @@ function registerSubagentTools(pi, subagentManager, options = {}) {
       spawnOptions.ownerSessionGeneration = options.ownerSessionGeneration?.();
       if (!spawnOptions.prompt.trim()) return subagentToolResult(t("agent.requiresPrompt"), {}, true);
       const ctxWithSession = withSessionId(ctx);
+      spawnOptions.ownerSessionId = ctxWithSession.sessionId;
       const runner = async (currentOptions, childSignal) => handleTeamTool6(
         {
           action: "run",
@@ -77549,6 +77624,10 @@ function registerSubagentTools(pi, subagentManager, options = {}) {
       const inMemory = subagentManager.getRecord(p.agent_id);
       const record = inMemory ?? readPersistedSubagentRecord(ctx.cwd, p.agent_id);
       if (!record) return subagentToolResult(t("result.notFound", { id: p.agent_id }), {}, true);
+      const currentSessionId = withSessionId(ctx).sessionId;
+      if (record.ownerSessionId && record.ownerSessionId !== currentSessionId) {
+        return subagentToolResult("Agent belongs to another session.", {}, true);
+      }
       let current = refreshPersistedSubagentRecord(ctx, record);
       if (inMemory && current !== inMemory) Object.assign(inMemory, current);
       if (!inMemory && !current.runId && (current.status === "running" || current.status === "queued")) {
@@ -77599,9 +77678,11 @@ function registerSubagentTools(pi, subagentManager, options = {}) {
       }
       const output = readSubagentRunResult(ctx, current);
       if (current.status !== "running" && current.status !== "queued" && current.status !== "blocked") {
-        current.resultConsumed = true;
-        if (inMemory) inMemory.resultConsumed = true;
-        savePersistedSubagentRecord(ctx.cwd, current);
+        if (!current.ownerSessionId || current.ownerSessionId === currentSessionId) {
+          current.resultConsumed = true;
+          if (inMemory) inMemory.resultConsumed = true;
+          savePersistedSubagentRecord(ctx.cwd, current);
+        }
       }
       const text = [
         p.verbose ? formatSubagentRecord(current) : void 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-crew",
-  "version": "0.9.58",
+  "version": "0.9.59",
   "description": "Pi extension for coordinated AI teams, workflows, worktrees, and async task orchestration",
   "author": "baphuongna",
   "license": "MIT",