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

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
@@ -38,6 +39,7 @@ export function SubAgentPanel(props: {
   maxEntries: () => number
   sortOrder: () => SortOrder
   scrollMode: () => ScrollMode
+  borderVisible: () => boolean
   sessionId: string
 }): JSX.Element {
   const t = createT(() => props.lang())
@@ -87,14 +89,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 +260,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 +388,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 +794,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 +811,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 +827,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 +855,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 +868,7 @@ export function SubAgentPanel(props: {
                       startedAt: exists?.startedAt || Date.now(),
                       endedAt: ended ? (exists?.endedAt || Date.now()) : undefined,
                     })
+                    if (entryKey !== id) next.delete(id)
                   }
                 }
               }
@@ -1012,7 +1018,21 @@ export function SubAgentPanel(props: {
     })
   }
 
-  const sep = () => "\u2500".repeat(Math.max(1, panelWidth()))
+  /** Horizontal space eaten by the panel border (1+1) and its padding (2+2). */
+  const gutter = createMemo(() => (props.borderVisible() ? 6 : 0))
+
+  const sep = () => "\u2500".repeat(Math.max(1, panelWidth() - gutter()))
+
+  // The border toggling shifts the box dimensions, which may not reliably
+  // re-fire onSizeChange across (re)mount cycles; re-sync panelWidth with the
+  // live box so the content width stays correct.
+  createEffect(() => {
+    props.borderVisible()
+    if (boxEl && typeof boxEl.width === "number" && boxEl.width > 0) {
+      const w = Math.max(20, boxEl.width)
+      setPanelWidth((prev) => (prev === w ? prev : w))
+    }
+  })
 
   // ── expanded detail right-align ──
   const expandedMaxLabelW = createMemo(() => {
@@ -1025,7 +1045,7 @@ export function SubAgentPanel(props: {
 
   const expandedPad = (label: string) => Math.max(0, expandedMaxLabelW() - visualWidth(label + ": "))
 
-  const expandedValAvail = () => Math.max(6, panelWidth() - INDENT - expandedMaxLabelW())
+  const expandedValAvail = () => Math.max(6, panelWidth() - gutter() - INDENT - expandedMaxLabelW())
 
   // ── header parts for colored spans ──
   const summaryParts = createMemo(() => {
@@ -1059,7 +1079,7 @@ export function SubAgentPanel(props: {
     if (!open()) return false
     const icon = "\u25bc"
     const need = visualWidth(icon) + 1 + visualWidth(t("panel.title")) + versionW + summaryCols()
-    return need <= panelWidth()
+    return need <= panelWidth() - gutter()
   })
 
   const leftCols = createMemo(() => {
@@ -1071,17 +1091,19 @@ export function SubAgentPanel(props: {
 
   const spacerCols = createMemo(() => {
     if (!anyEntry()) return 0
-    return Math.max(0, panelWidth() - leftCols() - summaryCols())
+    return Math.max(0, panelWidth() - gutter() - leftCols() - summaryCols())
   })
 
   const valueCols = (label: string) =>
-    Math.max(4, panelWidth() - INDENT - visualWidth(label + ": "))
+    Math.max(4, panelWidth() - gutter() - INDENT - visualWidth(label + ": "))
 
   // ── render ──
   return (
     <box
-      border={false}
-      paddingTop={0} paddingBottom={0} paddingLeft={0} paddingRight={0}
+      border={props.borderVisible()}
+      {...(props.borderVisible() ? { borderColor: pal().border } : {})}
+      paddingTop={0} paddingBottom={0}
+      paddingLeft={props.borderVisible() ? 2 : 0} paddingRight={props.borderVisible() ? 2 : 0}
       flexDirection="column" gap={0}
       ref={boxEl}
       onSizeChange={() => {
@@ -1218,7 +1240,7 @@ export function SubAgentPanel(props: {
                 if (tk) w += visualWidth(tk)
                 return w
               }
-              const labelAvail = () => Math.max(6, panelWidth() - LEFT_PAD - suffixW())
+              const labelAvail = () => Math.max(6, panelWidth() - gutter() - LEFT_PAD - suffixW())
               const labelText = () => {
                 const max = labelAvail()
                 const text = entry.title || entry.agent
@@ -1360,7 +1382,7 @@ export function SubAgentPanel(props: {
                         const cancelLabel = () => ` ${t("cancel.label")}`
                         const dismissLabel = () => ` ${t("dismiss.label")}`
                         const rightW = (isRunning ? visualWidth(dismissLabel()) : 0) + (isRunning && entry.sessionId ? visualWidth(cancelLabel()) : 0)
-                        const spacerW = () => Math.max(1, panelWidth() - openW() - rightW - 2)
+                        const spacerW = () => Math.max(1, panelWidth() - gutter() - openW() - rightW - 2)
                         return (
                           <box flexDirection="row">
                             <Show when={entry.sessionId}>
@@ -1417,7 +1439,7 @@ export function SubAgentPanel(props: {
                 const right = props.sortOrder() === "desc"
                   ? `\u2191 ${t("scroll.top")}`
                   : `\u2193 ${t("scroll.bottom")}`
-                const pad = showTop ? Math.max(1, panelWidth() - visualWidth(left) - visualWidth(right)) : 0
+                const pad = showTop ? Math.max(1, panelWidth() - gutter() - visualWidth(left) - visualWidth(right)) : 0
                 return (
                   <box flexDirection="row">
                     <text

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/store.ts

@@ -1,8 +1,8 @@
-import { createSignal } from "solid-js"
-import type { SubEntry } from "../core/types"
-
-/** 模块级缓存：各 session 的 entry 状态独立存储，不随当前视图切换而清除。 */
-export const globalEntryCache = new Map<string, Map<string, SubEntry>>()
-
-/** 模块级刷新信号：外部（如斜杠命令）触发清除后 +1，组件 scan 依赖它以重扫。 */
-export const [clearTick, setClearTick] = createSignal(0)
+import { createSignal } from "solid-js"
+import type { SubEntry } from "../core/types"
+
+/** 模块级缓存：各 session 的 entry 状态独立存储，不随当前视图切换而清除。 */
+export const globalEntryCache = new Map<string, Map<string, SubEntry>>()
+
+/** 模块级刷新信号：外部（如斜杠命令）触发清除后 +1，组件 scan 依赖它以重扫。 */
+export const [clearTick, setClearTick] = createSignal(0)