opencode-subagent-magazine 1.6.0-beta.1 → 1.6.0-beta.3

package/dist/_version.d.ts

@@ -1 +1 @@
-export declare const PLUGIN_VERSION = "1.6.0-beta.1";
+export declare const PLUGIN_VERSION = "1.6.0-beta.3";

package/dist/_version.js

@@ -1,2 +1,2 @@
 // auto-generated
-export const PLUGIN_VERSION = "1.6.0-beta.1";
+export const PLUGIN_VERSION = "1.6.0-beta.3";

package/dist/panel/SubAgentPanel.js

@@ -8,6 +8,8 @@ import { visualWidth, truncate, fmtDurationShort, fmtTokens, safeErrorMsg } from
 import { rgb, desaturateTo, dimColor, FALLBACK, MAX_SAT } from "../core/color";
 import { KV_PREFIX } from "../core/kv";
 import { globalEntryCache, clearTick } from "./store";
+import { isDirectChildSession } from "./session-routing";
+import { findSubEntryKey, upsertSubEntry } from "./entry-map";
 /** Entry line left prefix: icon + space + status dot + space */
 const LEFT_PAD = 4;
 /** Detail row indent: two spaces */
@@ -50,15 +52,16 @@ export function SubAgentPanel(props) {
         return { parentSid: sid, isChild: false };
     };
     const loadEntries = (sid) => {
-        const m = new Map();
+        let m = new Map();
         try {
             const { parentSid, isChild } = resolveParent(sid);
             const rec = loadSessionData()[parentSid];
             if (rec) {
                 const source = isChild ? rec.children?.[sid]?.entries : rec.entries;
                 if (source) {
-                    for (const e of source)
-                        m.set(e.id, e);
+                    for (const e of source) {
+                        m = upsertSubEntry(m, e);
+                    }
                 }
             }
         }
@@ -231,20 +234,7 @@ export function SubAgentPanel(props) {
     let disposed = false;
     // ── upsert ──
     const upsertEntry = (partial) => {
-        setEntryMap((prev) => {
-            const existing = prev.get(partial.id);
-            const next = new Map(prev);
-            const nowTs = Date.now();
-            const e = partial.status;
-            const ended = e === "done" || e === "error" || e === "cancelled";
-            next.set(partial.id, {
-                ...(existing ?? { startedAt: nowTs }),
-                ...partial,
-                startedAt: existing?.startedAt || partial.startedAt || nowTs,
-                endedAt: ended ? (existing?.endedAt || nowTs) : undefined,
-            });
-            return next;
-        });
+        setEntryMap((prev) => upsertSubEntry(prev, partial));
     };
     // ── cancel helpers ──
     const isDescendantOf = (childId, rootId) => {
@@ -337,7 +327,7 @@ export function SubAgentPanel(props) {
         // V2 事件流是全局的——若 payload 带发起会话 ID，则只归账到正在查看的会话，
         // 避免其他会话的子代理写进当前侧边栏；V1 宿主已按会话 scope，不传 sessionID。
         const eventSid = event.payload?.sessionID !== undefined ? String(event.payload.sessionID) : undefined;
-        if (eventSid !== undefined && eventSid !== props.sessionId)
+        if (event.scope === "global" && eventSid !== props.sessionId)
             return;
         // SubtaskPart
         if (part.type === "subtask") {
@@ -369,9 +359,21 @@ export function SubAgentPanel(props) {
                 const id = `tool:${String(part.id ?? "")}`;
                 if (!part.id)
                     return;
-                const existing = entryMap().get(id);
+                const stMeta = st?.metadata;
+                const errorSid = stMeta?.session_id !== undefined ? String(stMeta.session_id)
+                    : stMeta?.sessionId !== undefined ? String(stMeta.sessionId)
+                        : undefined;
+                const key = findSubEntryKey(entryMap(), id, errorSid);
+                const existing = key ? entryMap().get(key) : undefined;
                 if (existing) {
-                    upsertEntry({ id, title: existing.title, agent: existing.agent, prompt: existing.prompt, status: "error" });
+                    upsertEntry({
+                        id: existing.id,
+                        title: existing.title,
+                        agent: existing.agent,
+                        prompt: existing.prompt,
+                        sessionId: existing.sessionId ?? errorSid,
+                        status: "error",
+                    });
                 }
                 return;
             }
@@ -408,6 +410,17 @@ export function SubAgentPanel(props) {
         const sid = String(props_?.sessionID ?? "");
         if (!sid)
             return;
+        const isGlobalEvent = event.scope === "global";
+        let eventSession;
+        if (isGlobalEvent) {
+            try {
+                eventSession = props.api.session.get(sid);
+            }
+            catch {
+                eventSession = undefined;
+            }
+        }
+        const isCurrentChild = !isGlobalEvent || isDirectChildSession(props.sessionId, sid, eventSession);
         const sessionTokens = props.api.usage.readSessionTokens(sid);
         const sessionCost = props.api.usage.readSessionCost(sid);
         const sessionModel = props.api.usage.readSessionModel(sid);
@@ -501,7 +514,7 @@ export function SubAgentPanel(props) {
             let changed = false;
             const next = new Map(prev);
             for (const [id, entry] of next) {
-                if (entry.sessionId !== sid)
+                if (!isCurrentChild || entry.sessionId !== sid)
                     continue;
                 if (entry.status !== "running" && entry.status !== "done" && entry.status !== "cancel_requested")
                     continue;
@@ -523,7 +536,7 @@ export function SubAgentPanel(props) {
                 });
                 changed = true;
             }
-            if (!changed && sessionAgent) {
+            if (!changed && sessionAgent && isCurrentChild) {
                 const nowTs = Date.now();
                 const normalize = (s) => s.toLowerCase().replace(/[^a-z0-9-]/g, "");
                 const saNorm = normalize(sessionAgent);
@@ -572,8 +585,7 @@ export function SubAgentPanel(props) {
         // 当子代理所属的父 session 与当前视图不同时，通过模块级缓存定位
         // 并更新父 session 的 entry 状态，随后写回 KV。
         try {
-            const sessionObj = props.api.session.get(sid);
-            const parentSid = sessionObj?.parentID;
+            const parentSid = (isGlobalEvent ? eventSession : props.api.session.get(sid))?.parentID;
             if (parentSid && parentSid !== props.sessionId) {
                 // 优先从模块级缓存获取父 session 的 entries，不受当前视图切换影响
                 const parentCache = globalEntryCache.get(parentSid);
@@ -767,7 +779,12 @@ export function SubAgentPanel(props) {
                                             continue;
                                         const st = part.state;
                                         const rawStatus = String(st?.status ?? "");
-                                        const exists = next.get(id);
+                                        const scanStMeta = st?.metadata;
+                                        const scanSubSid = scanStMeta?.session_id !== undefined ? String(scanStMeta.session_id)
+                                            : scanStMeta?.sessionId !== undefined ? String(scanStMeta.sessionId)
+                                                : undefined;
+                                        const existingKey = findSubEntryKey(next, id, scanSubSid);
+                                        const exists = existingKey ? next.get(existingKey) : undefined;
                                         // 已手动清除的条目：scan 发现但不在内存 → 跳过重建
                                         if (!exists && clearedIds.has(id))
                                             continue;
@@ -778,7 +795,7 @@ export function SubAgentPanel(props) {
                                         // "error": only update existing, never create a new entry
                                         if (rawStatus === "error") {
                                             if (exists && exists.status === "running") {
-                                                next.set(id, { ...exists, status: "error", endedAt: Date.now() });
+                                                next.set(existingKey ?? id, { ...exists, status: "error", endedAt: Date.now() });
                                             }
                                             continue;
                                         }
@@ -794,7 +811,7 @@ export function SubAgentPanel(props) {
                                                 status = "running";
                                         }
                                         // Already settled → skip
-                                        if (exists && exists.status !== "running" && exists.status !== "cancel_requested")
+                                        if (exists && existingKey === id && exists.status !== "running" && exists.status !== "cancel_requested")
                                             continue;
                                         // Running entry with no explicit status improvement from part:
                                         // try message-level heuristics first, then time-based fallback.
@@ -823,15 +840,12 @@ export function SubAgentPanel(props) {
                                         const desc = input?.description !== undefined ? String(input.description) : "";
                                         const title = desc || truncate(prompt.replace(/\n/g, " ").trim(), 40);
                                         let tokens;
-                                        const scanStMeta2 = st?.metadata;
-                                        const scanSubSid = scanStMeta2?.session_id !== undefined ? String(scanStMeta2.session_id)
-                                            : scanStMeta2?.sessionId !== undefined ? String(scanStMeta2.sessionId)
-                                                : undefined;
                                         if (scanSubSid)
                                             tokens = props.api.usage.readSessionTokens(scanSubSid);
                                         const ended = status === "done"; // "error" handled above, never reaches here
-                                        next.set(id, {
-                                            id, title, agent, prompt,
+                                        const entryKey = existingKey ?? id;
+                                        next.set(entryKey, {
+                                            id: exists?.id ?? id, title, agent, prompt,
                                             // Preserve existing values (from handleSessionEnd / KV) — scan must not overwrite
                                             tokens: exists?.tokens ?? tokens,
                                             sessionId: exists?.sessionId ?? scanSubSid,
@@ -839,6 +853,8 @@ export function SubAgentPanel(props) {
                                             startedAt: exists?.startedAt || Date.now(),
                                             endedAt: ended ? (exists?.endedAt || Date.now()) : undefined,
                                         });
+                                        if (entryKey !== id)
+                                            next.delete(id);
                                     }
                                 }
                             }

package/dist/panel/entry-map.d.ts

@@ -0,0 +1,6 @@
+import type { SubEntry } from "../core/types";
+export type SubEntryPatch = Omit<SubEntry, "startedAt" | "endedAt"> & {
+    startedAt?: number;
+};
+export declare function findSubEntryKey(entries: ReadonlyMap<string, SubEntry>, id: string, sessionId?: string): string | undefined;
+export declare function upsertSubEntry(entries: ReadonlyMap<string, SubEntry>, partial: SubEntryPatch, now?: number): Map<string, SubEntry>;

package/dist/panel/entry-map.js

@@ -0,0 +1,25 @@
+export function findSubEntryKey(entries, id, sessionId) {
+    if (sessionId) {
+        for (const [key, entry] of entries) {
+            if (entry.sessionId === sessionId)
+                return key;
+        }
+    }
+    return entries.has(id) ? id : undefined;
+}
+export function upsertSubEntry(entries, partial, now = Date.now()) {
+    const key = findSubEntryKey(entries, partial.id, partial.sessionId) ?? partial.id;
+    const existing = entries.get(key);
+    const next = new Map(entries);
+    if (key !== partial.id)
+        next.delete(partial.id);
+    const ended = partial.status === "done" || partial.status === "error" || partial.status === "cancelled";
+    next.set(key, {
+        ...(existing ?? { startedAt: now }),
+        ...partial,
+        id: existing?.id ?? partial.id,
+        startedAt: existing?.startedAt || partial.startedAt || now,
+        endedAt: ended ? (existing?.endedAt || now) : undefined,
+    });
+    return next;
+}

package/dist/panel/panel-api.d.ts

@@ -16,8 +16,11 @@ export interface SessionStatusLike {
  * into these shapes so the panel component never touches host APIs directly.
  */
 export type PanelEventType = "part.updated" | "message.updated" | "session.idle" | "session.error";
+export type PanelEventScope = "session" | "global";
 export interface PanelEvent {
     type: PanelEventType;
+    /** Global V2 events need explicit session ownership checks. */
+    scope?: PanelEventScope;
     /** part payload for part.updated; session properties for idle/error. */
     payload?: Record<string, unknown>;
 }

package/dist/panel/session-routing.d.ts

@@ -0,0 +1,3 @@
+import type { SessionLike } from "./panel-api";
+/** Whether an end event belongs to a child tracked by the current panel. */
+export declare function isDirectChildSession(currentSessionId: string, eventSessionId: string, eventSession: SessionLike | undefined): boolean;

package/dist/panel/session-routing.js

@@ -0,0 +1,4 @@
+/** Whether an end event belongs to a child tracked by the current panel. */
+export function isDirectChildSession(currentSessionId, eventSessionId, eventSession) {
+    return eventSessionId !== currentSessionId && eventSession?.parentID === currentSessionId;
+}

package/dist/tui.js

@@ -6,7 +6,7 @@ import { createComponent as _$createComponent2 } from "@opentui/solid";
 import { createSignal as createSignal3 } from "solid-js";
 
 // src/_version.ts
-var PLUGIN_VERSION = "1.6.0-beta.1";
+var PLUGIN_VERSION = "1.6.0-beta.3";
 
 // src/i18n.ts
 var ZH_T = {
@@ -485,6 +485,36 @@ import { createSignal } from "solid-js";
 var globalEntryCache = /* @__PURE__ */ new Map();
 var [clearTick, setClearTick] = createSignal(0);
 
+// src/panel/session-routing.ts
+function isDirectChildSession(currentSessionId, eventSessionId, eventSession) {
+  return eventSessionId !== currentSessionId && eventSession?.parentID === currentSessionId;
+}
+
+// src/panel/entry-map.ts
+function findSubEntryKey(entries, id, sessionId) {
+  if (sessionId) {
+    for (const [key, entry] of entries) {
+      if (entry.sessionId === sessionId) return key;
+    }
+  }
+  return entries.has(id) ? id : void 0;
+}
+function upsertSubEntry(entries, partial, now = Date.now()) {
+  const key = findSubEntryKey(entries, partial.id, partial.sessionId) ?? partial.id;
+  const existing = entries.get(key);
+  const next = new Map(entries);
+  if (key !== partial.id) next.delete(partial.id);
+  const ended = partial.status === "done" || partial.status === "error" || partial.status === "cancelled";
+  next.set(key, {
+    ...existing ?? { startedAt: now },
+    ...partial,
+    id: existing?.id ?? partial.id,
+    startedAt: existing?.startedAt || partial.startedAt || now,
+    endedAt: ended ? existing?.endedAt || now : void 0
+  });
+  return next;
+}
+
 // src/panel/SubAgentPanel.tsx
 var LEFT_PAD = 4;
 var INDENT = 2;
@@ -524,7 +554,7 @@ function SubAgentPanel(props) {
     };
   };
   const loadEntries = (sid) => {
-    const m = /* @__PURE__ */ new Map();
+    let m = /* @__PURE__ */ new Map();
     try {
       const {
         parentSid,
@@ -534,7 +564,9 @@ function SubAgentPanel(props) {
       if (rec) {
         const source = isChild ? rec.children?.[sid]?.entries : rec.entries;
         if (source) {
-          for (const e of source) m.set(e.id, e);
+          for (const e of source) {
+            m = upsertSubEntry(m, e);
+          }
         }
       }
     } catch {
@@ -772,22 +804,7 @@ function SubAgentPanel(props) {
   let boxEl;
   let disposed = false;
   const upsertEntry = (partial) => {
-    setEntryMap((prev) => {
-      const existing = prev.get(partial.id);
-      const next = new Map(prev);
-      const nowTs = Date.now();
-      const e = partial.status;
-      const ended = e === "done" || e === "error" || e === "cancelled";
-      next.set(partial.id, {
-        ...existing ?? {
-          startedAt: nowTs
-        },
-        ...partial,
-        startedAt: existing?.startedAt || partial.startedAt || nowTs,
-        endedAt: ended ? existing?.endedAt || nowTs : void 0
-      });
-      return next;
-    });
+    setEntryMap((prev) => upsertSubEntry(prev, partial));
   };
   const isDescendantOf = (childId, rootId) => {
     const visited = /* @__PURE__ */ new Set();
@@ -902,7 +919,7 @@ function SubAgentPanel(props) {
     const part = event.payload?.part;
     if (!part) return;
     const eventSid = event.payload?.sessionID !== void 0 ? String(event.payload.sessionID) : void 0;
-    if (eventSid !== void 0 && eventSid !== props.sessionId) return;
+    if (event.scope === "global" && eventSid !== props.sessionId) return;
     if (part.type === "subtask") {
       const agent = String(part.agent ?? "?");
       const prompt = String(part.prompt ?? "");
@@ -931,13 +948,17 @@ function SubAgentPanel(props) {
       if (rawStatus === "error") {
         const id2 = `tool:${String(part.id ?? "")}`;
         if (!part.id) return;
-        const existing = entryMap().get(id2);
+        const stMeta2 = st?.metadata;
+        const errorSid = stMeta2?.session_id !== void 0 ? String(stMeta2.session_id) : stMeta2?.sessionId !== void 0 ? String(stMeta2.sessionId) : void 0;
+        const key = findSubEntryKey(entryMap(), id2, errorSid);
+        const existing = key ? entryMap().get(key) : void 0;
         if (existing) {
           upsertEntry({
-            id: id2,
+            id: existing.id,
             title: existing.title,
             agent: existing.agent,
             prompt: existing.prompt,
+            sessionId: existing.sessionId ?? errorSid,
             status: "error"
           });
         }
@@ -972,6 +993,16 @@ function SubAgentPanel(props) {
     const props_ = event.payload;
     const sid = String(props_?.sessionID ?? "");
     if (!sid) return;
+    const isGlobalEvent = event.scope === "global";
+    let eventSession;
+    if (isGlobalEvent) {
+      try {
+        eventSession = props.api.session.get(sid);
+      } catch {
+        eventSession = void 0;
+      }
+    }
+    const isCurrentChild = !isGlobalEvent || isDirectChildSession(props.sessionId, sid, eventSession);
     const sessionTokens = props.api.usage.readSessionTokens(sid);
     const sessionCost = props.api.usage.readSessionCost(sid);
     const sessionModel = props.api.usage.readSessionModel(sid);
@@ -1060,7 +1091,7 @@ function SubAgentPanel(props) {
       let changed = false;
       const next = new Map(prev);
       for (const [id, entry] of next) {
-        if (entry.sessionId !== sid) continue;
+        if (!isCurrentChild || entry.sessionId !== sid) continue;
         if (entry.status !== "running" && entry.status !== "done" && entry.status !== "cancel_requested") continue;
         if (sid === props.sessionId) continue;
         const alreadySettled = entry.status !== "running" && entry.status !== "cancel_requested";
@@ -1080,7 +1111,7 @@ function SubAgentPanel(props) {
         });
         changed = true;
       }
-      if (!changed && sessionAgent) {
+      if (!changed && sessionAgent && isCurrentChild) {
         const nowTs = Date.now();
         const normalize = (s) => s.toLowerCase().replace(/[^a-z0-9-]/g, "");
         const saNorm = normalize(sessionAgent);
@@ -1125,8 +1156,7 @@ function SubAgentPanel(props) {
       return changed ? next : prev;
     });
     try {
-      const sessionObj = props.api.session.get(sid);
-      const parentSid = sessionObj?.parentID;
+      const parentSid = (isGlobalEvent ? eventSession : props.api.session.get(sid))?.parentID;
       if (parentSid && parentSid !== props.sessionId) {
         const parentCache = globalEntryCache.get(parentSid);
         const nowTs = Date.now();
@@ -1315,12 +1345,15 @@ function SubAgentPanel(props) {
                     if (!part.id) continue;
                     const st = part.state;
                     const rawStatus = String(st?.status ?? "");
-                    const exists = next.get(id);
+                    const scanStMeta = st?.metadata;
+                    const scanSubSid = scanStMeta?.session_id !== void 0 ? String(scanStMeta.session_id) : scanStMeta?.sessionId !== void 0 ? String(scanStMeta.sessionId) : void 0;
+                    const existingKey = findSubEntryKey(next, id, scanSubSid);
+                    const exists = existingKey ? next.get(existingKey) : void 0;
                     if (!exists && clearedIds.has(id)) continue;
                     if ((rawStatus === "pending" || rawStatus === "") && !exists) continue;
                     if (rawStatus === "error") {
                       if (exists && exists.status === "running") {
-                        next.set(id, {
+                        next.set(existingKey ?? id, {
                           ...exists,
                           status: "error",
                           endedAt: Date.now()
@@ -1331,11 +1364,11 @@ function SubAgentPanel(props) {
                     let status = "running";
                     if (rawStatus === "completed") status = "done";
                     if ((st?.input?.run_in_background === true || st?.input?.background === true) && status === "done") {
-                      const scanStMeta = st?.metadata;
-                      const scanHasChild = scanStMeta?.session_id !== void 0 || scanStMeta?.sessionId !== void 0;
+                      const scanStMeta2 = st?.metadata;
+                      const scanHasChild = scanStMeta2?.session_id !== void 0 || scanStMeta2?.sessionId !== void 0;
                       if (scanHasChild) status = "running";
                     }
-                    if (exists && exists.status !== "running" && exists.status !== "cancel_requested") continue;
+                    if (exists && existingKey === id && exists.status !== "running" && exists.status !== "cancel_requested") continue;
                     if (exists && status === "running") {
                       if (!rawStatus) {
                         const msgTokens = msg?.tokens;
@@ -1356,12 +1389,11 @@ function SubAgentPanel(props) {
                     const desc = input?.description !== void 0 ? String(input.description) : "";
                     const title = desc || truncate(prompt.replace(/\n/g, " ").trim(), 40);
                     let tokens;
-                    const scanStMeta2 = st?.metadata;
-                    const scanSubSid = scanStMeta2?.session_id !== void 0 ? String(scanStMeta2.session_id) : scanStMeta2?.sessionId !== void 0 ? String(scanStMeta2.sessionId) : void 0;
                     if (scanSubSid) tokens = props.api.usage.readSessionTokens(scanSubSid);
                     const ended = status === "done";
-                    next.set(id, {
-                      id,
+                    const entryKey = existingKey ?? id;
+                    next.set(entryKey, {
+                      id: exists?.id ?? id,
                       title,
                       agent,
                       prompt,
@@ -1372,6 +1404,7 @@ function SubAgentPanel(props) {
                       startedAt: exists?.startedAt || Date.now(),
                       endedAt: ended ? exists?.endedAt || Date.now() : void 0
                     });
+                    if (entryKey !== id) next.delete(id);
                   }
                 }
               }

package/dist/v2/v2-panel-api.js

@@ -295,7 +295,9 @@ export function createPanelApi(context, settings) {
                                 // 让面板只归账到正在查看的会话（V1 宿主已按会话 scope，无需该字段）。
                                 const evt = e.data;
                                 const sid = evt?.sessionID !== undefined ? String(evt.sessionID) : undefined;
-                                cb({ type, payload: { part, sessionID: sid } });
+                                if (!sid)
+                                    return;
+                                cb({ type, scope: "global", payload: { part, sessionID: sid } });
                             }));
                         }
                         return () => { for (const u of unsubs)
@@ -317,7 +319,7 @@ export function createPanelApi(context, settings) {
                             unsubs.push(context.data.on(evt, (e) => {
                                 const sid = String(e.data?.sessionID ?? "");
                                 if (sid)
-                                    cb({ type, payload: { sessionID: sid } });
+                                    cb({ type, scope: "global", payload: { sessionID: sid } });
                             }));
                         }
                         return () => { for (const u of unsubs)
@@ -328,7 +330,7 @@ export function createPanelApi(context, settings) {
                             const evt = e.data;
                             const sid = String(evt?.sessionID ?? "");
                             if (sid)
-                                cb({ type, payload: { sessionID: sid, error: evt?.error } });
+                                cb({ type, scope: "global", payload: { sessionID: sid, error: evt?.error } });
                         });
                     default:
                         return () => { };

package/dist/v2.js

@@ -242,7 +242,8 @@ function createPanelApi(context, settings) {
                 if (!part) return;
                 const evt2 = e.data;
                 const sid = evt2?.sessionID !== void 0 ? String(evt2.sessionID) : void 0;
-                cb({ type, payload: { part, sessionID: sid } });
+                if (!sid) return;
+                cb({ type, scope: "global", payload: { part, sessionID: sid } });
               }));
             }
             return () => {
@@ -263,7 +264,7 @@ function createPanelApi(context, settings) {
             for (const evt of ["session.execution.succeeded", "session.execution.interrupted"]) {
               unsubs.push(context.data.on(evt, (e) => {
                 const sid = String(e.data?.sessionID ?? "");
-                if (sid) cb({ type, payload: { sessionID: sid } });
+                if (sid) cb({ type, scope: "global", payload: { sessionID: sid } });
               }));
             }
             return () => {
@@ -274,7 +275,7 @@ function createPanelApi(context, settings) {
             return context.data.on("session.execution.failed", (e) => {
               const evt = e.data;
               const sid = String(evt?.sessionID ?? "");
-              if (sid) cb({ type, payload: { sessionID: sid, error: evt?.error } });
+              if (sid) cb({ type, scope: "global", payload: { sessionID: sid, error: evt?.error } });
             });
           default:
             return () => {
@@ -328,7 +329,7 @@ function readTTLDays(kv) {
 }
 
 // src/_version.ts
-var PLUGIN_VERSION = "1.6.0-beta.1";
+var PLUGIN_VERSION = "1.6.0-beta.3";
 
 // src/i18n.ts
 var ZH_T = {
@@ -1051,6 +1052,36 @@ var FALLBACK = {
 };
 var MAX_SAT = 0.28;
 
+// src/panel/session-routing.ts
+function isDirectChildSession(currentSessionId, eventSessionId, eventSession) {
+  return eventSessionId !== currentSessionId && eventSession?.parentID === currentSessionId;
+}
+
+// src/panel/entry-map.ts
+function findSubEntryKey(entries, id, sessionId) {
+  if (sessionId) {
+    for (const [key, entry] of entries) {
+      if (entry.sessionId === sessionId) return key;
+    }
+  }
+  return entries.has(id) ? id : void 0;
+}
+function upsertSubEntry(entries, partial, now = Date.now()) {
+  const key = findSubEntryKey(entries, partial.id, partial.sessionId) ?? partial.id;
+  const existing = entries.get(key);
+  const next = new Map(entries);
+  if (key !== partial.id) next.delete(partial.id);
+  const ended = partial.status === "done" || partial.status === "error" || partial.status === "cancelled";
+  next.set(key, {
+    ...existing ?? { startedAt: now },
+    ...partial,
+    id: existing?.id ?? partial.id,
+    startedAt: existing?.startedAt || partial.startedAt || now,
+    endedAt: ended ? existing?.endedAt || now : void 0
+  });
+  return next;
+}
+
 // src/panel/SubAgentPanel.tsx
 var LEFT_PAD = 4;
 var INDENT = 2;
@@ -1090,7 +1121,7 @@ function SubAgentPanel(props) {
     };
   };
   const loadEntries = (sid) => {
-    const m = /* @__PURE__ */ new Map();
+    let m = /* @__PURE__ */ new Map();
     try {
       const {
         parentSid,
@@ -1100,7 +1131,9 @@ function SubAgentPanel(props) {
       if (rec) {
         const source = isChild ? rec.children?.[sid]?.entries : rec.entries;
         if (source) {
-          for (const e of source) m.set(e.id, e);
+          for (const e of source) {
+            m = upsertSubEntry(m, e);
+          }
         }
       }
     } catch {
@@ -1338,22 +1371,7 @@ function SubAgentPanel(props) {
   let boxEl;
   let disposed = false;
   const upsertEntry = (partial) => {
-    setEntryMap((prev) => {
-      const existing = prev.get(partial.id);
-      const next = new Map(prev);
-      const nowTs = Date.now();
-      const e = partial.status;
-      const ended = e === "done" || e === "error" || e === "cancelled";
-      next.set(partial.id, {
-        ...existing ?? {
-          startedAt: nowTs
-        },
-        ...partial,
-        startedAt: existing?.startedAt || partial.startedAt || nowTs,
-        endedAt: ended ? existing?.endedAt || nowTs : void 0
-      });
-      return next;
-    });
+    setEntryMap((prev) => upsertSubEntry(prev, partial));
   };
   const isDescendantOf = (childId, rootId) => {
     const visited = /* @__PURE__ */ new Set();
@@ -1468,7 +1486,7 @@ function SubAgentPanel(props) {
     const part = event.payload?.part;
     if (!part) return;
     const eventSid = event.payload?.sessionID !== void 0 ? String(event.payload.sessionID) : void 0;
-    if (eventSid !== void 0 && eventSid !== props.sessionId) return;
+    if (event.scope === "global" && eventSid !== props.sessionId) return;
     if (part.type === "subtask") {
       const agent = String(part.agent ?? "?");
       const prompt = String(part.prompt ?? "");
@@ -1497,13 +1515,17 @@ function SubAgentPanel(props) {
       if (rawStatus === "error") {
         const id2 = `tool:${String(part.id ?? "")}`;
         if (!part.id) return;
-        const existing = entryMap().get(id2);
+        const stMeta2 = st?.metadata;
+        const errorSid = stMeta2?.session_id !== void 0 ? String(stMeta2.session_id) : stMeta2?.sessionId !== void 0 ? String(stMeta2.sessionId) : void 0;
+        const key = findSubEntryKey(entryMap(), id2, errorSid);
+        const existing = key ? entryMap().get(key) : void 0;
         if (existing) {
           upsertEntry({
-            id: id2,
+            id: existing.id,
             title: existing.title,
             agent: existing.agent,
             prompt: existing.prompt,
+            sessionId: existing.sessionId ?? errorSid,
             status: "error"
           });
         }
@@ -1538,6 +1560,16 @@ function SubAgentPanel(props) {
     const props_ = event.payload;
     const sid = String(props_?.sessionID ?? "");
     if (!sid) return;
+    const isGlobalEvent = event.scope === "global";
+    let eventSession;
+    if (isGlobalEvent) {
+      try {
+        eventSession = props.api.session.get(sid);
+      } catch {
+        eventSession = void 0;
+      }
+    }
+    const isCurrentChild = !isGlobalEvent || isDirectChildSession(props.sessionId, sid, eventSession);
     const sessionTokens = props.api.usage.readSessionTokens(sid);
     const sessionCost = props.api.usage.readSessionCost(sid);
     const sessionModel = props.api.usage.readSessionModel(sid);
@@ -1626,7 +1658,7 @@ function SubAgentPanel(props) {
       let changed = false;
       const next = new Map(prev);
       for (const [id, entry] of next) {
-        if (entry.sessionId !== sid) continue;
+        if (!isCurrentChild || entry.sessionId !== sid) continue;
         if (entry.status !== "running" && entry.status !== "done" && entry.status !== "cancel_requested") continue;
         if (sid === props.sessionId) continue;
         const alreadySettled = entry.status !== "running" && entry.status !== "cancel_requested";
@@ -1646,7 +1678,7 @@ function SubAgentPanel(props) {
         });
         changed = true;
       }
-      if (!changed && sessionAgent) {
+      if (!changed && sessionAgent && isCurrentChild) {
         const nowTs = Date.now();
         const normalize = (s) => s.toLowerCase().replace(/[^a-z0-9-]/g, "");
         const saNorm = normalize(sessionAgent);
@@ -1691,8 +1723,7 @@ function SubAgentPanel(props) {
       return changed ? next : prev;
     });
     try {
-      const sessionObj = props.api.session.get(sid);
-      const parentSid = sessionObj?.parentID;
+      const parentSid = (isGlobalEvent ? eventSession : props.api.session.get(sid))?.parentID;
       if (parentSid && parentSid !== props.sessionId) {
         const parentCache = globalEntryCache.get(parentSid);
         const nowTs = Date.now();
@@ -1881,12 +1912,15 @@ function SubAgentPanel(props) {
                     if (!part.id) continue;
                     const st = part.state;
                     const rawStatus = String(st?.status ?? "");
-                    const exists = next.get(id);
+                    const scanStMeta = st?.metadata;
+                    const scanSubSid = scanStMeta?.session_id !== void 0 ? String(scanStMeta.session_id) : scanStMeta?.sessionId !== void 0 ? String(scanStMeta.sessionId) : void 0;
+                    const existingKey = findSubEntryKey(next, id, scanSubSid);
+                    const exists = existingKey ? next.get(existingKey) : void 0;
                     if (!exists && clearedIds.has(id)) continue;
                     if ((rawStatus === "pending" || rawStatus === "") && !exists) continue;
                     if (rawStatus === "error") {
                       if (exists && exists.status === "running") {
-                        next.set(id, {
+                        next.set(existingKey ?? id, {
                           ...exists,
                           status: "error",
                           endedAt: Date.now()
@@ -1897,11 +1931,11 @@ function SubAgentPanel(props) {
                     let status = "running";
                     if (rawStatus === "completed") status = "done";
                     if ((st?.input?.run_in_background === true || st?.input?.background === true) && status === "done") {
-                      const scanStMeta = st?.metadata;
-                      const scanHasChild = scanStMeta?.session_id !== void 0 || scanStMeta?.sessionId !== void 0;
+                      const scanStMeta2 = st?.metadata;
+                      const scanHasChild = scanStMeta2?.session_id !== void 0 || scanStMeta2?.sessionId !== void 0;
                       if (scanHasChild) status = "running";
                     }
-                    if (exists && exists.status !== "running" && exists.status !== "cancel_requested") continue;
+                    if (exists && existingKey === id && exists.status !== "running" && exists.status !== "cancel_requested") continue;
                     if (exists && status === "running") {
                       if (!rawStatus) {
                         const msgTokens = msg?.tokens;
@@ -1922,12 +1956,11 @@ function SubAgentPanel(props) {
                     const desc = input?.description !== void 0 ? String(input.description) : "";
                     const title = desc || truncate(prompt.replace(/\n/g, " ").trim(), 40);
                     let tokens;
-                    const scanStMeta2 = st?.metadata;
-                    const scanSubSid = scanStMeta2?.session_id !== void 0 ? String(scanStMeta2.session_id) : scanStMeta2?.sessionId !== void 0 ? String(scanStMeta2.sessionId) : void 0;
                     if (scanSubSid) tokens = props.api.usage.readSessionTokens(scanSubSid);
                     const ended = status === "done";
-                    next.set(id, {
-                      id,
+                    const entryKey = existingKey ?? id;
+                    next.set(entryKey, {
+                      id: exists?.id ?? id,
                       title,
                       agent,
                       prompt,
@@ -1938,6 +1971,7 @@ function SubAgentPanel(props) {
                       startedAt: exists?.startedAt || Date.now(),
                       endedAt: ended ? exists?.endedAt || Date.now() : void 0
                     });
+                    if (entryKey !== id) next.delete(id);
                   }
                 }
               }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-subagent-magazine",
-  "version": "1.6.0-beta.1",
+  "version": "1.6.0-beta.3",
   "description": "OpenCode TUI plugin monitoring sub-agent invocation status in real time",
   "type": "module",
   "types": "dist/index.d.ts",
@@ -30,6 +30,7 @@
     "build": "tsc && node build.tui.mjs",
     "build:tui": "node build.tui.mjs",
     "typecheck": "tsc --noEmit",
+    "test": "tsx --test tests/*.test.ts",
     "version": "node -e \"require('fs').writeFileSync('src/_version.ts','// auto-generated\\nexport const PLUGIN_VERSION='+JSON.stringify(require('./package.json').version)+';\\n')\"",
     "prepublishOnly": "tsc"
   },

package/src/_version.ts

@@ -1,2 +1,2 @@
 // auto-generated
-export const PLUGIN_VERSION="1.6.0-beta.1";
+export const PLUGIN_VERSION="1.6.0-beta.3";

package/src/panel/SubAgentPanel.tsx

@@ -21,6 +21,8 @@ import { rgb, desaturateTo, dimColor, FALLBACK, MAX_SAT } from "../core/color"
 import { KV_PREFIX } from "../core/kv"
 import type { PanelApi, PanelEvent } from "./panel-api"
 import { globalEntryCache, clearTick } from "./store"
+import { isDirectChildSession } from "./session-routing"
+import { findSubEntryKey, upsertSubEntry } from "./entry-map"
 
 /** Entry line left prefix: icon + space + status dot + space */
 const LEFT_PAD = 4
@@ -86,14 +88,16 @@ export function SubAgentPanel(props: {
   }
 
   const loadEntries = (sid: string): Map<string, SubEntry> => {
-    const m = new Map<string, SubEntry>()
+    let m = new Map<string, SubEntry>()
     try {
       const { parentSid, isChild } = resolveParent(sid)
       const rec = loadSessionData()[parentSid]
       if (rec) {
         const source = isChild ? rec.children?.[sid]?.entries : rec.entries
         if (source) {
-          for (const e of source) m.set(e.id, e)
+          for (const e of source) {
+            m = upsertSubEntry(m, e)
+          }
         }
       }
     } catch {}
@@ -255,20 +259,7 @@ export function SubAgentPanel(props: {
   const upsertEntry = (
     partial: Omit<SubEntry, "startedAt" | "endedAt"> & { startedAt?: number }
   ) => {
-    setEntryMap((prev) => {
-      const existing = prev.get(partial.id)
-      const next = new Map(prev)
-      const nowTs = Date.now()
-      const e = partial.status
-      const ended = e === "done" || e === "error" || e === "cancelled"
-      next.set(partial.id, {
-        ...(existing ?? { startedAt: nowTs }),
-        ...partial,
-        startedAt: existing?.startedAt || partial.startedAt || nowTs,
-        endedAt: ended ? (existing?.endedAt || nowTs) : undefined,
-      })
-      return next
-    })
+    setEntryMap((prev) => upsertSubEntry(prev, partial))
   }
 
   // ── cancel helpers ──
@@ -363,7 +354,7 @@ export function SubAgentPanel(props: {
     // V2 事件流是全局的——若 payload 带发起会话 ID，则只归账到正在查看的会话，
     // 避免其他会话的子代理写进当前侧边栏；V1 宿主已按会话 scope，不传 sessionID。
     const eventSid = event.payload?.sessionID !== undefined ? String(event.payload.sessionID) : undefined
-    if (eventSid !== undefined && eventSid !== props.sessionId) return
+    if (event.scope === "global" && eventSid !== props.sessionId) return
 
     // SubtaskPart
     if (part.type === "subtask") {
@@ -396,9 +387,21 @@ export function SubAgentPanel(props: {
       if (rawStatus === "error") {
         const id = `tool:${String(part.id ?? "")}`
         if (!part.id) return
-        const existing = entryMap().get(id)
+        const stMeta = st?.metadata as Record<string, unknown> | undefined
+        const errorSid = stMeta?.session_id !== undefined ? String(stMeta.session_id)
+          : stMeta?.sessionId !== undefined ? String(stMeta.sessionId)
+          : undefined
+        const key = findSubEntryKey(entryMap(), id, errorSid)
+        const existing = key ? entryMap().get(key) : undefined
         if (existing) {
-          upsertEntry({ id, title: existing.title, agent: existing.agent, prompt: existing.prompt, status: "error" })
+          upsertEntry({
+            id: existing.id,
+            title: existing.title,
+            agent: existing.agent,
+            prompt: existing.prompt,
+            sessionId: existing.sessionId ?? errorSid,
+            status: "error",
+          })
         }
         return
       }
@@ -437,6 +440,13 @@ export function SubAgentPanel(props: {
     const sid = String(props_?.sessionID ?? "")
     if (!sid) return
 
+    const isGlobalEvent = event.scope === "global"
+    let eventSession: ReturnType<PanelApi["session"]["get"]>
+    if (isGlobalEvent) {
+      try { eventSession = props.api.session.get(sid) } catch { eventSession = undefined }
+    }
+    const isCurrentChild = !isGlobalEvent || isDirectChildSession(props.sessionId, sid, eventSession)
+
     const sessionTokens = props.api.usage.readSessionTokens(sid)
     const sessionCost = props.api.usage.readSessionCost(sid)
     const sessionModel = props.api.usage.readSessionModel(sid)
@@ -529,7 +539,7 @@ export function SubAgentPanel(props: {
       let changed = false
       const next = new Map(prev)
       for (const [id, entry] of next) {
-        if (entry.sessionId !== sid) continue
+        if (!isCurrentChild || entry.sessionId !== sid) continue
         if (entry.status !== "running" && entry.status !== "done" && entry.status !== "cancel_requested") continue
         // Skip parent session idle — subagent entries belong to child sessions only
         if (sid === props.sessionId) continue
@@ -548,7 +558,7 @@ export function SubAgentPanel(props: {
         })
         changed = true
       }
-      if (!changed && sessionAgent) {
+      if (!changed && sessionAgent && isCurrentChild) {
         const nowTs = Date.now()
         const normalize = (s: string) => s.toLowerCase().replace(/[^a-z0-9-]/g, "")
         const saNorm = normalize(sessionAgent)
@@ -594,8 +604,7 @@ export function SubAgentPanel(props: {
     // 当子代理所属的父 session 与当前视图不同时，通过模块级缓存定位
     // 并更新父 session 的 entry 状态，随后写回 KV。
     try {
-      const sessionObj = props.api.session.get(sid)
-      const parentSid = sessionObj?.parentID
+      const parentSid = (isGlobalEvent ? eventSession : props.api.session.get(sid))?.parentID
       if (parentSid && parentSid !== props.sessionId) {
         // 优先从模块级缓存获取父 session 的 entries，不受当前视图切换影响
         const parentCache = globalEntryCache.get(parentSid)
@@ -784,7 +793,12 @@ export function SubAgentPanel(props: {
 
                     const st = (part as any).state as Record<string, unknown> | undefined
                     const rawStatus = String(st?.status ?? "")
-                    const exists = next.get(id)
+                    const scanStMeta = st?.metadata as Record<string, unknown> | undefined
+                    const scanSubSid = scanStMeta?.session_id !== undefined ? String(scanStMeta.session_id)
+                      : scanStMeta?.sessionId !== undefined ? String(scanStMeta.sessionId)
+                      : undefined
+                    const existingKey = findSubEntryKey(next, id, scanSubSid)
+                    const exists = existingKey ? next.get(existingKey) : undefined
 
                     // 已手动清除的条目：scan 发现但不在内存 → 跳过重建
                     if (!exists && clearedIds.has(id)) continue
@@ -796,7 +810,7 @@ export function SubAgentPanel(props: {
                     // "error": only update existing, never create a new entry
                     if (rawStatus === "error") {
                       if (exists && exists.status === "running") {
-                        next.set(id, { ...exists, status: "error", endedAt: Date.now() })
+                        next.set(existingKey ?? id, { ...exists, status: "error", endedAt: Date.now() })
                       }
                       continue
                     }
@@ -812,7 +826,7 @@ export function SubAgentPanel(props: {
                     }
 
                     // Already settled → skip
-                    if (exists && exists.status !== "running" && exists.status !== "cancel_requested") continue
+                    if (exists && existingKey === id && exists.status !== "running" && exists.status !== "cancel_requested") continue
                     // Running entry with no explicit status improvement from part:
                     // try message-level heuristics first, then time-based fallback.
                     if (exists && status === "running") {
@@ -840,15 +854,12 @@ export function SubAgentPanel(props: {
                     const title = desc || truncate(prompt.replace(/\n/g, " ").trim(), 40)
 
                     let tokens: number | undefined
-                    const scanStMeta2 = st?.metadata as Record<string, unknown> | undefined
-                    const scanSubSid = scanStMeta2?.session_id !== undefined ? String(scanStMeta2.session_id)
-                      : scanStMeta2?.sessionId !== undefined ? String(scanStMeta2.sessionId)
-                      : undefined
                     if (scanSubSid) tokens = props.api.usage.readSessionTokens(scanSubSid)
 
                     const ended = status === "done"  // "error" handled above, never reaches here
-                    next.set(id, {
-                      id, title, agent, prompt,
+                    const entryKey = existingKey ?? id
+                    next.set(entryKey, {
+                      id: exists?.id ?? id, title, agent, prompt,
                       // Preserve existing values (from handleSessionEnd / KV) — scan must not overwrite
                       tokens: exists?.tokens ?? tokens,
                       sessionId: exists?.sessionId ?? scanSubSid,
@@ -856,6 +867,7 @@ export function SubAgentPanel(props: {
                       startedAt: exists?.startedAt || Date.now(),
                       endedAt: ended ? (exists?.endedAt || Date.now()) : undefined,
                     })
+                    if (entryKey !== id) next.delete(id)
                   }
                 }
               }

package/src/panel/entry-map.ts

@@ -0,0 +1,39 @@
+import type { SubEntry } from "../core/types"
+
+export type SubEntryPatch = Omit<SubEntry, "startedAt" | "endedAt"> & {
+  startedAt?: number
+}
+
+export function findSubEntryKey(
+  entries: ReadonlyMap<string, SubEntry>,
+  id: string,
+  sessionId?: string,
+) {
+  if (sessionId) {
+    for (const [key, entry] of entries) {
+      if (entry.sessionId === sessionId) return key
+    }
+  }
+  return entries.has(id) ? id : undefined
+}
+
+export function upsertSubEntry(
+  entries: ReadonlyMap<string, SubEntry>,
+  partial: SubEntryPatch,
+  now = Date.now(),
+) {
+  const key = findSubEntryKey(entries, partial.id, partial.sessionId) ?? partial.id
+  const existing = entries.get(key)
+  const next = new Map(entries)
+  if (key !== partial.id) next.delete(partial.id)
+
+  const ended = partial.status === "done" || partial.status === "error" || partial.status === "cancelled"
+  next.set(key, {
+    ...(existing ?? { startedAt: now }),
+    ...partial,
+    id: existing?.id ?? partial.id,
+    startedAt: existing?.startedAt || partial.startedAt || now,
+    endedAt: ended ? (existing?.endedAt || now) : undefined,
+  })
+  return next
+}

package/src/panel/panel-api.ts

@@ -1,72 +1,75 @@
-import type { KVApi } from "../core/kv"
-import type { UsageReader, TodoStats } from "../core/usage"
-import type { Lang, SortOrder, ScrollMode } from "../core/types"
-
-/** Minimal session shape the panel reads from the host SDK. */
-export interface SessionLike {
-  id?: string
-  parentID?: string
-  agent?: string
-  cost?: number
-}
-
-export interface SessionStatusLike {
-  type: string
-}
-
-/**
- * Standardized panel events. Adapter layers (V1/V2) translate host events
- * into these shapes so the panel component never touches host APIs directly.
- */
-export type PanelEventType = "part.updated" | "message.updated" | "session.idle" | "session.error"
-
-export interface PanelEvent {
-  type: PanelEventType
-  /** part payload for part.updated; session properties for idle/error. */
-  payload?: Record<string, unknown>
-}
-
-export interface ToastOptions {
-  variant?: "success" | "warning" | "error"
-  title?: string
-  duration?: number
-}
-
-/**
- * The full surface the SubAgentPanel component consumes.
- * V1 and V2 each implement this against their host SDK; the panel is agnostic.
- * Theme is slot-scoped in both hosts, so it is passed as a panel prop,
- * not part of the API.
- */
-export interface PanelApi {
-  kv: KVApi
-  usage: UsageReader
-  session: {
-    get(sid: string): SessionLike | undefined
-    status(sid: string): SessionStatusLike | undefined
-    /** Raw message list for a session (scan / error extraction). */
-    messages(sid: string): unknown[] | undefined
-    /** Raw parts of a message (scan). */
-    part(messageID: string): unknown[] | undefined
-  }
-  event: {
-    on(type: PanelEventType, cb: (e: PanelEvent) => void): () => void
-  }
-  client: {
-    abort(input: { sessionID: string }): Promise<void>
-  }
-  route: {
-    navigateSession(sessionID: string): void
-  }
-  ui: {
-    toast(message: string, opts?: ToastOptions): void
-  }
-  settings: {
-    lang: () => Lang
-    maxEntries: () => number
-    sortOrder: () => SortOrder
-    scrollMode: () => ScrollMode
-  }
-}
-
-export type { TodoStats }
+import type { KVApi } from "../core/kv"
+import type { UsageReader, TodoStats } from "../core/usage"
+import type { Lang, SortOrder, ScrollMode } from "../core/types"
+
+/** Minimal session shape the panel reads from the host SDK. */
+export interface SessionLike {
+  id?: string
+  parentID?: string
+  agent?: string
+  cost?: number
+}
+
+export interface SessionStatusLike {
+  type: string
+}
+
+/**
+ * Standardized panel events. Adapter layers (V1/V2) translate host events
+ * into these shapes so the panel component never touches host APIs directly.
+ */
+export type PanelEventType = "part.updated" | "message.updated" | "session.idle" | "session.error"
+export type PanelEventScope = "session" | "global"
+
+export interface PanelEvent {
+  type: PanelEventType
+  /** Global V2 events need explicit session ownership checks. */
+  scope?: PanelEventScope
+  /** part payload for part.updated; session properties for idle/error. */
+  payload?: Record<string, unknown>
+}
+
+export interface ToastOptions {
+  variant?: "success" | "warning" | "error"
+  title?: string
+  duration?: number
+}
+
+/**
+ * The full surface the SubAgentPanel component consumes.
+ * V1 and V2 each implement this against their host SDK; the panel is agnostic.
+ * Theme is slot-scoped in both hosts, so it is passed as a panel prop,
+ * not part of the API.
+ */
+export interface PanelApi {
+  kv: KVApi
+  usage: UsageReader
+  session: {
+    get(sid: string): SessionLike | undefined
+    status(sid: string): SessionStatusLike | undefined
+    /** Raw message list for a session (scan / error extraction). */
+    messages(sid: string): unknown[] | undefined
+    /** Raw parts of a message (scan). */
+    part(messageID: string): unknown[] | undefined
+  }
+  event: {
+    on(type: PanelEventType, cb: (e: PanelEvent) => void): () => void
+  }
+  client: {
+    abort(input: { sessionID: string }): Promise<void>
+  }
+  route: {
+    navigateSession(sessionID: string): void
+  }
+  ui: {
+    toast(message: string, opts?: ToastOptions): void
+  }
+  settings: {
+    lang: () => Lang
+    maxEntries: () => number
+    sortOrder: () => SortOrder
+    scrollMode: () => ScrollMode
+  }
+}
+
+export type { TodoStats }

package/src/panel/session-routing.ts

@@ -0,0 +1,10 @@
+import type { SessionLike } from "./panel-api"
+
+/** Whether an end event belongs to a child tracked by the current panel. */
+export function isDirectChildSession(
+  currentSessionId: string,
+  eventSessionId: string,
+  eventSession: SessionLike | undefined,
+): boolean {
+  return eventSessionId !== currentSessionId && eventSession?.parentID === currentSessionId
+}

package/src/v2/v2-panel-api.ts

@@ -256,7 +256,8 @@ export function createPanelApi(context: Context, settings: PanelApi["settings"])
                 // 让面板只归账到正在查看的会话（V1 宿主已按会话 scope，无需该字段）。
                 const evt = (e as Record<string, any>).data as Record<string, any> | undefined
                 const sid = evt?.sessionID !== undefined ? String(evt.sessionID) : undefined
-                cb({ type, payload: { part, sessionID: sid } })
+                if (!sid) return
+                cb({ type, scope: "global", payload: { part, sessionID: sid } })
               }))
             }
             return () => { for (const u of unsubs) u() }
@@ -275,7 +276,7 @@ export function createPanelApi(context: Context, settings: PanelApi["settings"])
             for (const evt of ["session.execution.succeeded", "session.execution.interrupted"]) {
               unsubs.push(context.data.on(evt, (e) => {
                 const sid = String(((e as Record<string, any>).data as Record<string, any> | undefined)?.sessionID ?? "")
-                if (sid) cb({ type, payload: { sessionID: sid } })
+                if (sid) cb({ type, scope: "global", payload: { sessionID: sid } })
               }))
             }
             return () => { for (const u of unsubs) u() }
@@ -284,7 +285,7 @@ export function createPanelApi(context: Context, settings: PanelApi["settings"])
             return context.data.on("session.execution.failed", (e) => {
               const evt = (e as Record<string, any>).data as Record<string, any> | undefined
               const sid = String(evt?.sessionID ?? "")
-              if (sid) cb({ type, payload: { sessionID: sid, error: evt?.error } })
+              if (sid) cb({ type, scope: "global", payload: { sessionID: sid, error: evt?.error } })
             })
           default:
             return () => {}