opencode-subagent-magazine 1.1.1 → 1.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-subagent-magazine",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "OpenCode TUI plugin monitoring sub-agent invocation status in real time",
   "type": "module",
   "main": "dist/index.js",
@@ -11,7 +11,7 @@
       "types": "./dist/index.d.ts"
     },
     "./tui": {
-      "import": "./src/index.tsx",
+      "import": "./dist/tui.js",
       "config": {
         "enabled": true
       }
@@ -27,7 +27,8 @@
     "opencode-subagent-magazine": "install.mjs"
   },
   "scripts": {
-    "build": "tsc",
+    "build": "tsc && node build.tui.mjs",
+    "build:tui": "node build.tui.mjs",
     "typecheck": "tsc --noEmit",
     "version": "node -e \"require('fs').writeFileSync('src/_version.ts','// auto-generated\\nexport const PLUGIN_VERSION='+JSON.stringify(require('./package.json').version)+';\\n')\"",
     "prepublishOnly": "tsc"
@@ -54,6 +55,8 @@
   "devDependencies": {
     "@opencode-ai/plugin": "^1.14.50",
     "@opencode-ai/sdk": "^1.14.50",
+    "esbuild": "^0.25.0",
+    "esbuild-plugin-solid": "^0.5.0",
     "tsx": "^4.22.3",
     "typescript": "^5.8.0"
   }

package/src/_version.ts

@@ -1,2 +1,2 @@
 // auto-generated
-export const PLUGIN_VERSION="1.1.1";
+export const PLUGIN_VERSION="1.1.3";

package/src/index.tsx

@@ -58,6 +58,7 @@ const I18N: Record<Lang, Record<string, string>> = {
     "panel.title": "子代理",
     "status.none": "暂无子代理",
     "agent.label": "代理",
+    "status.label": "状态",
     "time.label": "耗时",
     "tokens.label": "上下文",
     "error.label": "错误",
@@ -67,11 +68,16 @@ const I18N: Record<Lang, Record<string, string>> = {
     "cost.label": "费用",
     "scroll.more": "更多",
     "scroll.top": "回顶",
+    "dismiss.label": "标记完成",
+    "status.running": "运行中",
+    "status.done": "已完成",
+    "status.error": "错误",
   },
   en: {
     "panel.title": "SubAgent",
     "status.none": "No sub-agents yet",
     "agent.label": "agent",
+    "status.label": "status",
     "time.label": "time",
     "tokens.label": "tokens",
     "error.label": "error",
@@ -81,6 +87,10 @@ const I18N: Record<Lang, Record<string, string>> = {
     "cost.label": "cost",
     "scroll.more": "more",
     "scroll.top": "Top",
+    "dismiss.label": "dismiss",
+    "status.running": "running",
+    "status.done": "done",
+    "status.error": "error",
   },
 }
 
@@ -237,8 +247,7 @@ function safeErrorMsg(err: unknown): string {
 // Sidebar component
 // ===================================================================
 
-// 模块级缓存：保留各 session 的最新 entryMap，不随组件内 session 切换而丢失。
-// 当用户在子 session 内部时，handleSessionEnd 可通过此缓存找到父 session 的 entries。
+// 模块级缓存：各 session 的 entry 状态独立存储，不随当前视图切换而清除。
 const globalEntryCache = new Map<string, Map<string, SubEntry>>()
 
 function SubAgentPanel(props: {
@@ -337,8 +346,8 @@ function SubAgentPanel(props: {
     setEntryMapRaw((prev) => {
       const next = typeof arg === "function" ? (arg as Function)(prev) : arg
 
-      // 检测是否有 entry 从 running 变为 done/error → 立即写 KV
-      // 避免 session 切换时 KV 仍是旧状态，导致 scan 用 Date.now() 覆盖正确的 endedAt
+      // entry 状态落定（done/error）时立即持久化到 KV，跳过常规 debounce，
+      // 确保跨视图的状态一致性。
       let needsImmediateFlush = false
       for (const [id, entry] of next) {
         const prevEntry = prev.get(id)
@@ -359,7 +368,7 @@ function SubAgentPanel(props: {
         persistEntries(props.sessionId, next)
       }
 
-      // 同步到全局缓存，确保跨 session 查找时数据可用
+      // 同步到模块级缓存，供其他视图读取当前 session 的最新状态
       globalEntryCache.set(props.sessionId, new Map(next))
 
       return next
@@ -374,6 +383,7 @@ function SubAgentPanel(props: {
     (() => { try { return loadSessionData()[props.sessionId]?.expanded || undefined } catch { return undefined } })()
   )
   const [hoveredOpen, setHoveredOpen] = createSignal<string | undefined>(undefined)
+  const [hoveredDismiss, setHoveredDismiss] = createSignal<string | undefined>(undefined)
   const [hoveredTop, setHoveredTop] = createSignal(false)
   const [scrollOffset, setScrollOffset] = createSignal(
     (() => { try { return loadSessionData()[props.sessionId]?.scroll ?? 0 } catch { return 0 } })()
@@ -712,14 +722,13 @@ function SubAgentPanel(props: {
       return changed ? next : prev
     })
 
-    // 跨 session 完成事件：用户正在查看子 session 内部时，其他子代理 done。
-    // 上面的 setEntryMap 在子 session 的 entries 中找不到父 session 的 entry。
-    // 通过全局缓存（切换前保留的父 session entries）查找并更新，再同步回 KV。
+    // 当子代理所属的父 session 与当前视图不同时，通过模块级缓存定位
+    // 并更新父 session 的 entry 状态，随后写回 KV。
     try {
       const sessionObj = props.api.state.session.get(sid)
       const parentSid = sessionObj?.parentID
       if (parentSid && parentSid !== props.sessionId) {
-        // 优先全局缓存——切换 session 时不会被替换，始终保留父 session 的最新 entries
+        // 优先从模块级缓存获取父 session 的 entries，不受当前视图切换影响
         const parentCache = globalEntryCache.get(parentSid)
         const nowTs = Date.now()
         let found = false
@@ -728,7 +737,7 @@ function SubAgentPanel(props: {
           found = tryMatchAndUpdate(parentCache, sid, status, nowTs)
         }
 
-        // 缓存未命中时回退到 KV（极端情况：session 切换前缓存未建立）
+        // 缓存未命中时回退到 KV 读取
         if (!found) {
           const data = loadSessionData()
           const rec = data[parentSid]
@@ -736,7 +745,7 @@ function SubAgentPanel(props: {
             const fallbackMap = new Map(rec.entries.map((e: SubEntry) => [e.id, e]))
             found = tryMatchAndUpdate(fallbackMap, sid, status, nowTs)
             if (found) {
-              // 回退命中了也要写回 KV，并回填缓存
+              // 回退命中后写入 KV 并回填缓存
               data[parentSid] = { ...rec, ts: nowTs, entries: [...fallbackMap.values()] }
               saveSessionData(data)
               globalEntryCache.set(parentSid, fallbackMap)
@@ -744,7 +753,7 @@ function SubAgentPanel(props: {
           }
         }
 
-        // KV 同步：以全局缓存（最新的内存状态）为准写回 KV
+        // 将模块级缓存中的最新状态同步到 KV
         if (found && parentCache) {
           const data = loadSessionData()
           data[parentSid] = { ...data[parentSid], ts: nowTs, entries: [...parentCache.values()] }
@@ -867,7 +876,10 @@ function SubAgentPanel(props: {
         // scan uses setEntryMapRaw — ephemeral data, not persisted to kv.
         // Only event-driven changes (handlePartUpdated, handleSessionEnd) persist.
         setEntryMapRaw((prev) => {
-          const next = switched ? loadEntries(sid) : new Map(prev)
+          // 优先从模块级缓存加载，KV 仅作缓存未命中时的回退
+          const next = switched
+            ? new Map(globalEntryCache.get(sid) ?? loadEntries(sid))
+            : new Map(prev)
           try {
             const msgs = props.api.state.session.messages(sid)
             if (msgs && (msgs as any[]).length) {
@@ -1060,7 +1072,7 @@ function SubAgentPanel(props: {
   // ── expanded detail right-align ──
   const expandedMaxLabelW = createMemo(() => {
     const labels = [
-      t("agent.label"), t("time.label"), t("tokens.label"),
+      t("agent.label"), t("status.label"), t("time.label"), t("tokens.label"),
       t("error.label"), t("cost.label"), t("model.label"), t("todo.label"),
     ]
     return Math.max(...labels.map(l => visualWidth(l + ": ")))
@@ -1275,6 +1287,14 @@ function SubAgentPanel(props: {
                       <span style={{ fg: pal().muted }}>{" ".repeat(expandedPad(t("agent.label")))}</span>
                       <span style={{ fg: pal().muted }}>{entry.agent}</span>
                     </text>
+                    <text>
+                      {"  "}
+                      <span style={{ fg: pal().primary }}>{t("status.label")}: </span>
+                      <span style={{ fg: pal().muted }}>{" ".repeat(expandedPad(t("status.label")))}</span>
+                      <span style={{ fg: isRunning ? pal().warning : isError ? pal().error : pal().success }}>
+                        {isRunning ? t("status.running") : isError ? t("status.error") : t("status.done")}
+                      </span>
+                    </text>
                     <Show when={elapsed() >= 2000 || entry.endedAt !== undefined}>
                       <text>
                         {"  "}
@@ -1325,20 +1345,49 @@ function SubAgentPanel(props: {
                         <span style={{ fg: pal().muted }}>{entry.todoDone}/{entry.todoTotal}</span>
                       </text>
                     </Show>
-                    <Show when={entry.sessionId}>
-                      <text
-                        onMouseOver={() => setHoveredOpen(entry.id)}
-                        onMouseOut={() => setHoveredOpen(undefined)}
-                        onMouseUp={() => {
-                          if (entry.sessionId) {
-                            props.api.route.navigate("session", { sessionID: entry.sessionId })
-                          }
-                        }}
-                      >
-                        {"  "}
-                        <span style={{ fg: hoveredOpen() === entry.id ? pal().warning : pal().primary }}>{"\u2192 "}</span>
-                        <span style={{ fg: hoveredOpen() === entry.id ? pal().warning : pal().primary }}>{t("open.label")}</span>
-                      </text>
+                    {/* 进入会话 + 标记完成：同排左右两端，空间隔离防误触 */}
+                    <Show when={entry.sessionId || isRunning}>
+                      {(() => {
+                        const dismissLabel = () => `- ${t("dismiss.label")}`
+                        const openPrefix = () => "  \u2192 "
+                        const openFull = () => entry.sessionId ? openPrefix() + t("open.label") : ""
+                        const openW = () => entry.sessionId ? visualWidth(openFull()) : 0
+                        const spacerW = () => Math.max(1, panelWidth() - openW() - visualWidth(dismissLabel()) - 2 /* indent */)
+                        return (
+                          <box flexDirection="row">
+                            <Show when={entry.sessionId}
+                              fallback={<text>{"  "}</text>}
+                            >
+                              <text
+                                onMouseOver={() => setHoveredOpen(entry.id)}
+                                onMouseOut={() => setHoveredOpen(undefined)}
+                                onMouseUp={() => {
+                                  if (entry.sessionId) {
+                                    props.api.route.navigate("session", { sessionID: entry.sessionId })
+                                  }
+                                }}
+                              >
+                                <span style={{ fg: hoveredOpen() === entry.id ? pal().warning : pal().primary }}>{openPrefix()}</span>
+                                <span style={{ fg: hoveredOpen() === entry.id ? pal().warning : pal().primary }}>{t("open.label")}</span>
+                              </text>
+                            </Show>
+                            <Show when={isRunning}>
+                              <>
+                                <text style={{ fg: pal().muted }}>{" ".repeat(spacerW())}</text>
+                                <text
+                                  onMouseOver={() => setHoveredDismiss(entry.id)}
+                                  onMouseOut={() => setHoveredDismiss(undefined)}
+                                  onMouseUp={() => {
+                                    upsertEntry({ id: entry.id, title: entry.title, agent: entry.agent, prompt: entry.prompt, status: "done" })
+                                  }}
+                                >
+                                  <span style={{ fg: hoveredDismiss() === entry.id ? pal().warning : pal().muted }}>{dismissLabel()}</span>
+                                </text>
+                              </>
+                            </Show>
+                          </box>
+                        )
+                      })()}
                     </Show>
                   </Show>
                 </>
@@ -1498,6 +1547,52 @@ const tui: TuiPlugin = async (api: TuiPluginApi) => {
         dialog?.clear()
       },
     },
+    {
+      title: "SubAgent Magazine: Clear Running",
+      value: "subagent-clear-running",
+      description: "Mark all running sub-agent entries as done (for stuck/zombie entries)",
+      slash: { name: "subagent-clear-running" },
+      onSelect: (dialog) => {
+        const entries = globalEntryCache.get(signals.sessionId)
+        if (!entries || entries.size === 0) {
+          const msg = signals.lang() === "zh" ? "暂无子代理条目" : "No sub-agent entries found"
+          api.ui.toast({ message: msg })
+          dialog?.clear()
+          return
+        }
+        let count = 0
+        for (const [, entry] of entries) {
+          if (entry.status === "running") {
+            entry.status = "done" as SubStatus
+            entry.endedAt = Date.now()
+            count++
+          }
+        }
+        if (count > 0) {
+          // 立即写 KV
+          try {
+            const data = JSON.parse(String(api.kv.get(`${KV_PREFIX}.session_data`, "{}")))
+            data[signals.sessionId] = {
+              ts: Date.now(),
+              entries: [...entries.values()],
+              scroll: data[signals.sessionId]?.scroll ?? 0,
+              expanded: data[signals.sessionId]?.expanded ?? "",
+            }
+            api.kv.set(`${KV_PREFIX}.session_data`, JSON.stringify(data))
+          } catch {}
+          const msg = signals.lang() === "zh"
+            ? `已标记 ${count} 个运行中的条目为完成`
+            : `Marked ${count} running entries as done`
+          api.ui.toast({ message: msg })
+        } else {
+          const msg = signals.lang() === "zh"
+            ? "没有需要清理的运行中条目"
+            : "No running entries to clear"
+          api.ui.toast({ message: msg })
+        }
+        dialog?.clear()
+      },
+    },
   ])
 }