opencode-subagent-magazine 1.6.0-beta.0 → 1.6.0-beta.2

package/dist/_version.d.ts

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

package/dist/_version.js

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

package/dist/core/types.js

@@ -1,2 +1,2 @@
 /** OpenCode built-in tool names that spawn sub-agents or delegate tasks. */
-export const SUBAGENT_TOOLS = new Set(["task", "delegate", "call_omo_agent"]);
+export const SUBAGENT_TOOLS = new Set(["task", "subagent", "delegate", "call_omo_agent"]);

package/dist/panel/SubAgentPanel.js

@@ -8,6 +8,7 @@ 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";
 /** Entry line left prefix: icon + space + status dot + space */
 const LEFT_PAD = 4;
 /** Detail row indent: two spaces */
@@ -334,6 +335,11 @@ export function SubAgentPanel(props) {
         const part = event.payload?.part;
         if (!part)
             return;
+        // V2 事件流是全局的——若 payload 带发起会话 ID，则只归账到正在查看的会话，
+        // 避免其他会话的子代理写进当前侧边栏；V1 宿主已按会话 scope，不传 sessionID。
+        const eventSid = event.payload?.sessionID !== undefined ? String(event.payload.sessionID) : undefined;
+        if (event.scope === "global" && eventSid !== props.sessionId)
+            return;
         // SubtaskPart
         if (part.type === "subtask") {
             const agent = String(part.agent ?? "?");
@@ -384,7 +390,7 @@ export function SubAgentPanel(props) {
                 if (hasChild)
                     status = "running";
             }
-            const agent = String(part.subagent_type ?? input?.subagent_type ?? input?.category ?? tool);
+            const agent = String(part.subagent_type ?? input?.agent ?? input?.subagent_type ?? input?.category ?? tool);
             const prompt = String(input?.prompt ?? part.description ?? "");
             const desc = input?.description !== undefined ? String(input.description) : "";
             const title = desc || truncate(prompt.replace(/\n/g, " ").replace(/\s+/g, " ").trim(), 40);
@@ -403,6 +409,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);
@@ -496,7 +513,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;
@@ -518,7 +535,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);
@@ -567,8 +584,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);
@@ -813,7 +829,7 @@ export function SubAgentPanel(props) {
                                         // If already tracked as running but tool state says completed/error → update
                                         // If not tracked → add fresh
                                         const input = st?.input;
-                                        const agent = String(part.subagent_type ?? input?.subagent_type ?? tool);
+                                        const agent = String(part.subagent_type ?? input?.agent ?? input?.subagent_type ?? tool);
                                         const prompt = String(input?.prompt ?? part.description ?? "");
                                         const desc = input?.description !== undefined ? String(input.description) : "";
                                         const title = desc || truncate(prompt.replace(/\n/g, " ").trim(), 40);

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.0";
+var PLUGIN_VERSION = "1.6.0-beta.2";
 
 // src/i18n.ts
 var ZH_T = {
@@ -363,7 +363,7 @@ async function copyText(text) {
 }
 
 // src/core/types.ts
-var SUBAGENT_TOOLS = /* @__PURE__ */ new Set(["task", "delegate", "call_omo_agent"]);
+var SUBAGENT_TOOLS = /* @__PURE__ */ new Set(["task", "subagent", "delegate", "call_omo_agent"]);
 
 // src/core/format.ts
 function charColumns(c) {
@@ -485,6 +485,11 @@ 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/SubAgentPanel.tsx
 var LEFT_PAD = 4;
 var INDENT = 2;
@@ -901,6 +906,8 @@ function SubAgentPanel(props) {
   const handlePartUpdated = (event) => {
     const part = event.payload?.part;
     if (!part) return;
+    const eventSid = event.payload?.sessionID !== void 0 ? String(event.payload.sessionID) : void 0;
+    if (event.scope === "global" && eventSid !== props.sessionId) return;
     if (part.type === "subtask") {
       const agent = String(part.agent ?? "?");
       const prompt = String(part.prompt ?? "");
@@ -949,7 +956,7 @@ function SubAgentPanel(props) {
         const hasChild = stMetaCheck?.session_id !== void 0 || stMetaCheck?.sessionId !== void 0;
         if (hasChild) status = "running";
       }
-      const agent = String(part.subagent_type ?? input?.subagent_type ?? input?.category ?? tool);
+      const agent = String(part.subagent_type ?? input?.agent ?? input?.subagent_type ?? input?.category ?? tool);
       const prompt = String(input?.prompt ?? part.description ?? "");
       const desc = input?.description !== void 0 ? String(input.description) : "";
       const title = desc || truncate(prompt.replace(/\n/g, " ").replace(/\s+/g, " ").trim(), 40);
@@ -970,6 +977,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);
@@ -1058,7 +1075,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";
@@ -1078,7 +1095,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);
@@ -1123,8 +1140,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();
@@ -1349,7 +1365,7 @@ function SubAgentPanel(props) {
                       }
                     }
                     const input = st?.input;
-                    const agent = String(part.subagent_type ?? input?.subagent_type ?? tool);
+                    const agent = String(part.subagent_type ?? input?.agent ?? input?.subagent_type ?? tool);
                     const prompt = String(input?.prompt ?? part.description ?? "");
                     const desc = input?.description !== void 0 ? String(input.description) : "";
                     const title = desc || truncate(prompt.replace(/\n/g, " ").trim(), 40);

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

@@ -289,8 +289,15 @@ export function createPanelApi(context, settings) {
                         for (const evt of ["session.tool.input.started", "session.tool.called", "session.tool.progress", "session.tool.success", "session.tool.failed"]) {
                             unsubs.push(context.data.on(evt, (e) => {
                                 const part = toolEventToPart(e);
-                                if (part)
-                                    cb({ type, payload: { part } });
+                                if (!part)
+                                    return;
+                                // V2 事件流是全局的（跨所有会话）；把发起会话 ID 一并传给面板，
+                                // 让面板只归账到正在查看的会话（V1 宿主已按会话 scope，无需该字段）。
+                                const evt = e.data;
+                                const sid = evt?.sessionID !== undefined ? String(evt.sessionID) : undefined;
+                                if (!sid)
+                                    return;
+                                cb({ type, scope: "global", payload: { part, sessionID: sid } });
                             }));
                         }
                         return () => { for (const u of unsubs)
@@ -312,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)
@@ -323,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

@@ -239,7 +239,11 @@ function createPanelApi(context, settings) {
             for (const evt of ["session.tool.input.started", "session.tool.called", "session.tool.progress", "session.tool.success", "session.tool.failed"]) {
               unsubs.push(context.data.on(evt, (e) => {
                 const part = toolEventToPart(e);
-                if (part) cb({ type, payload: { part } });
+                if (!part) return;
+                const evt2 = e.data;
+                const sid = evt2?.sessionID !== void 0 ? String(evt2.sessionID) : void 0;
+                if (!sid) return;
+                cb({ type, scope: "global", payload: { part, sessionID: sid } });
               }));
             }
             return () => {
@@ -260,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 () => {
@@ -271,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 () => {
@@ -325,7 +329,7 @@ function readTTLDays(kv) {
 }
 
 // src/_version.ts
-var PLUGIN_VERSION = "1.6.0-beta.0";
+var PLUGIN_VERSION = "1.6.0-beta.2";
 
 // src/i18n.ts
 var ZH_T = {
@@ -931,7 +935,7 @@ async function copyText(text) {
 }
 
 // src/core/types.ts
-var SUBAGENT_TOOLS = /* @__PURE__ */ new Set(["task", "delegate", "call_omo_agent"]);
+var SUBAGENT_TOOLS = /* @__PURE__ */ new Set(["task", "subagent", "delegate", "call_omo_agent"]);
 
 // src/core/format.ts
 function charColumns(c) {
@@ -1048,6 +1052,11 @@ 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/SubAgentPanel.tsx
 var LEFT_PAD = 4;
 var INDENT = 2;
@@ -1464,6 +1473,8 @@ function SubAgentPanel(props) {
   const handlePartUpdated = (event) => {
     const part = event.payload?.part;
     if (!part) return;
+    const eventSid = event.payload?.sessionID !== void 0 ? String(event.payload.sessionID) : void 0;
+    if (event.scope === "global" && eventSid !== props.sessionId) return;
     if (part.type === "subtask") {
       const agent = String(part.agent ?? "?");
       const prompt = String(part.prompt ?? "");
@@ -1512,7 +1523,7 @@ function SubAgentPanel(props) {
         const hasChild = stMetaCheck?.session_id !== void 0 || stMetaCheck?.sessionId !== void 0;
         if (hasChild) status = "running";
       }
-      const agent = String(part.subagent_type ?? input?.subagent_type ?? input?.category ?? tool);
+      const agent = String(part.subagent_type ?? input?.agent ?? input?.subagent_type ?? input?.category ?? tool);
       const prompt = String(input?.prompt ?? part.description ?? "");
       const desc = input?.description !== void 0 ? String(input.description) : "";
       const title = desc || truncate(prompt.replace(/\n/g, " ").replace(/\s+/g, " ").trim(), 40);
@@ -1533,6 +1544,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);
@@ -1621,7 +1642,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";
@@ -1641,7 +1662,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);
@@ -1686,8 +1707,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();
@@ -1912,7 +1932,7 @@ function SubAgentPanel(props) {
                       }
                     }
                     const input = st?.input;
-                    const agent = String(part.subagent_type ?? input?.subagent_type ?? tool);
+                    const agent = String(part.subagent_type ?? input?.agent ?? input?.subagent_type ?? tool);
                     const prompt = String(input?.prompt ?? part.description ?? "");
                     const desc = input?.description !== void 0 ? String(input.description) : "";
                     const title = desc || truncate(prompt.replace(/\n/g, " ").trim(), 40);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-subagent-magazine",
-  "version": "1.6.0-beta.0",
+  "version": "1.6.0-beta.2",
   "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.0";
+export const PLUGIN_VERSION="1.6.0-beta.2";

package/src/core/types.ts

@@ -1,58 +1,58 @@
-import type { LangCode } from "../i18n"
-
-export type SubStatus = "running" | "done" | "error" | "cancel_requested" | "cancelled"
-
-export interface SubEntry {
-  id: string
-  title: string
-  agent: string
-  prompt: string
-  error?: string
-  tokens?: number
-  cost?: number
-  status: SubStatus
-  sessionId?: string
-  startedAt: number
-  endedAt?: number
-  model?: string
-  todoTotal?: number
-  todoDone?: number
-  cancelRequestedAt?: number
-  abortAccepted?: boolean
-  cancelReason?: "manual"
-}
-
-export type Lang = LangCode
-export type SortOrder = "desc" | "asc"
-export type ScrollMode = "wheel" | "click"
-
-/** OpenCode built-in tool names that spawn sub-agents or delegate tasks. */
-export const SUBAGENT_TOOLS = new Set(["task", "delegate", "call_omo_agent"])
-
-export interface ChildRecord {
-  scroll: number
-  expanded: string
-  entries: SubEntry[]
-  clearedIds?: string[]
-}
-
-export interface SessionRecord {
-  ts: number
-  entries: SubEntry[]
-  scroll: number
-  expanded: string
-  children: Record<string, ChildRecord>
-  clearedIds?: string[]
-}
-
-export interface SharedSignals {
-  lang: () => Lang
-  setLang: (l: Lang) => void
-  maxEntries: () => number
-  setMaxEntries: (n: number) => void
-  sortOrder: () => SortOrder
-  setSortOrder: (o: SortOrder) => void
-  scrollMode: () => ScrollMode
-  setScrollMode: (m: ScrollMode) => void
-  sessionId: string
-}
+import type { LangCode } from "../i18n"
+
+export type SubStatus = "running" | "done" | "error" | "cancel_requested" | "cancelled"
+
+export interface SubEntry {
+  id: string
+  title: string
+  agent: string
+  prompt: string
+  error?: string
+  tokens?: number
+  cost?: number
+  status: SubStatus
+  sessionId?: string
+  startedAt: number
+  endedAt?: number
+  model?: string
+  todoTotal?: number
+  todoDone?: number
+  cancelRequestedAt?: number
+  abortAccepted?: boolean
+  cancelReason?: "manual"
+}
+
+export type Lang = LangCode
+export type SortOrder = "desc" | "asc"
+export type ScrollMode = "wheel" | "click"
+
+/** OpenCode built-in tool names that spawn sub-agents or delegate tasks. */
+export const SUBAGENT_TOOLS = new Set(["task", "subagent", "delegate", "call_omo_agent"])
+
+export interface ChildRecord {
+  scroll: number
+  expanded: string
+  entries: SubEntry[]
+  clearedIds?: string[]
+}
+
+export interface SessionRecord {
+  ts: number
+  entries: SubEntry[]
+  scroll: number
+  expanded: string
+  children: Record<string, ChildRecord>
+  clearedIds?: string[]
+}
+
+export interface SharedSignals {
+  lang: () => Lang
+  setLang: (l: Lang) => void
+  maxEntries: () => number
+  setMaxEntries: (n: number) => void
+  sortOrder: () => SortOrder
+  setSortOrder: (o: SortOrder) => void
+  scrollMode: () => ScrollMode
+  setScrollMode: (m: ScrollMode) => void
+  sessionId: string
+}

package/src/panel/SubAgentPanel.tsx

@@ -21,6 +21,7 @@ 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"
 
 /** Entry line left prefix: icon + space + status dot + space */
 const LEFT_PAD = 4
@@ -360,6 +361,11 @@ export function SubAgentPanel(props: {
     const part = event.payload?.part as Record<string, unknown> | undefined
     if (!part) return
 
+    // V2 事件流是全局的——若 payload 带发起会话 ID，则只归账到正在查看的会话，
+    // 避免其他会话的子代理写进当前侧边栏；V1 宿主已按会话 scope，不传 sessionID。
+    const eventSid = event.payload?.sessionID !== undefined ? String(event.payload.sessionID) : undefined
+    if (event.scope === "global" && eventSid !== props.sessionId) return
+
     // SubtaskPart
     if (part.type === "subtask") {
       const agent = String(part.agent ?? "?")
@@ -411,7 +417,7 @@ export function SubAgentPanel(props: {
         if (hasChild) status = "running"
       }
 
-      const agent = String((part as any).subagent_type ?? input?.subagent_type ?? input?.category ?? tool)
+      const agent = String((part as any).subagent_type ?? input?.agent ?? input?.subagent_type ?? input?.category ?? tool)
       const prompt = String(input?.prompt ?? (part as any).description ?? "")
       const desc = input?.description !== undefined ? String(input.description) : ""
       const title = desc || truncate(prompt.replace(/\n/g, " ").replace(/\s+/g, " ").trim(), 40)
@@ -432,6 +438,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)
@@ -524,7 +537,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
@@ -543,7 +556,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)
@@ -589,8 +602,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)
@@ -829,7 +841,7 @@ export function SubAgentPanel(props: {
                     // If not tracked → add fresh
 
                     const input = st?.input as Record<string, unknown> | undefined
-                    const agent = String((part as any).subagent_type ?? input?.subagent_type ?? tool)
+                    const agent = String((part as any).subagent_type ?? input?.agent ?? input?.subagent_type ?? tool)
                     const prompt = String(input?.prompt ?? (part as any).description ?? "")
                     const desc = input?.description !== undefined ? String(input.description) : ""
                     const title = desc || truncate(prompt.replace(/\n/g, " ").trim(), 40)