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

package/dist/_version.d.ts

@@ -1 +1 @@
-export declare const PLUGIN_VERSION = "1.6.0-beta.2";
+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.2";
+export const PLUGIN_VERSION = "1.6.0-beta.3";

package/dist/panel/SubAgentPanel.js

@@ -9,6 +9,7 @@ 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 */
@@ -51,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);
+                    }
                 }
             }
         }
@@ -232,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) => {
@@ -370,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;
             }
@@ -778,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;
@@ -789,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;
                                         }
@@ -805,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.
@@ -834,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,
@@ -850,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/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.2";
+var PLUGIN_VERSION = "1.6.0-beta.3";
 
 // src/i18n.ts
 var ZH_T = {
@@ -490,6 +490,31 @@ 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;
@@ -529,7 +554,7 @@ function SubAgentPanel(props) {
     };
   };
   const loadEntries = (sid) => {
-    const m = /* @__PURE__ */ new Map();
+    let m = /* @__PURE__ */ new Map();
     try {
       const {
         parentSid,
@@ -539,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 {
@@ -777,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();
@@ -936,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"
           });
         }
@@ -1329,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()
@@ -1345,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;
@@ -1370,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,
@@ -1386,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.js

@@ -329,7 +329,7 @@ function readTTLDays(kv) {
 }
 
 // src/_version.ts
-var PLUGIN_VERSION = "1.6.0-beta.2";
+var PLUGIN_VERSION = "1.6.0-beta.3";
 
 // src/i18n.ts
 var ZH_T = {
@@ -1057,6 +1057,31 @@ 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;
@@ -1096,7 +1121,7 @@ function SubAgentPanel(props) {
     };
   };
   const loadEntries = (sid) => {
-    const m = /* @__PURE__ */ new Map();
+    let m = /* @__PURE__ */ new Map();
     try {
       const {
         parentSid,
@@ -1106,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 {
@@ -1344,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();
@@ -1503,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"
           });
         }
@@ -1896,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()
@@ -1912,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;
@@ -1937,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,
@@ -1953,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.2",
+  "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",

package/src/_version.ts

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

package/src/panel/SubAgentPanel.tsx

@@ -22,6 +22,7 @@ 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
@@ -87,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 {}
@@ -256,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 ──
@@ -397,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
       }
@@ -791,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
@@ -803,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
                     }
@@ -819,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") {
@@ -847,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,
@@ -863,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
+}