opencode-subagent-magazine 1.1.1 → 1.1.3

package/README.md

@@ -1,8 +1,9 @@
 <div align="center">
 <strong>
     <h1>OpenCode SubAgent Magazine</h1>
+    像弹匣一样装填！发射！<br><br>
     实时子代理监控 · TUI 侧边栏可视化<br>
-    自适应主题色 · 中/英双语 · 数据持久化
+    自适应主题色 · 低饱和设计语言 · 中/英双语 · 数据持久化
 </strong>
 <br>
 <br>
@@ -39,13 +40,15 @@
 
 - **实时状态**：运行中（呼吸动画）、已完成、错误，彩色圆点一目了然
 - **Token & 费用追踪**：每个子代理的 Token 消耗和费用汇总，标题栏全局显示
-- **展开详情**：点击展开查看 agent 类型、耗时、Token、费用、模型、进度，字段值右对齐
+- **展开详情**：点击展开查看 agent 类型、状态、耗时、Token、费用、模型、进度，字段值右对齐
 - **一键进入会话**：展开后点 `→ 进入会话` 跳转子代理的完整对话
+- **手动标记完成**：展开区右侧 `- 标记完成` 按钮可手动终结卡住的僵尸条目；`/subagent-clear-running` 批量清理
+- **状态字段显示**：展开区 `状态: 运行中/已完成/错误`，颜色与圆点一致，一目了然
 - **折叠面板**：标题栏点击折叠/展开，状态持久化，重启后保持
 - **滚动回顶**：列表底部 `↑ 回顶` 按钮一键回到顶部
 - **TTL 自动清理**：超过 3 天的旧数据自动从 KV 中清除
 - **语言适配**：支持 `/subagent-lang` 运行时切换中/英文，偏好持久化
-- **斜杠命令**：`/subagent-lang` `/subagent-max` `/subagent-session` `/subagent-version` 动态配置
+- **斜杠命令**：`/subagent-lang` `/subagent-max` `/subagent-session` `/subagent-version` `/subagent-clear-running` 动态配置
 
 ---
 
@@ -98,6 +101,7 @@ npm install -g opencode-subagent-magazine@latest
 | `/subagent-max` | 调整最大可见条目数 | 输入数字（默认 10），控制面板最多显示多少个子代理条目 |
 | `/subagent-session` | 查看当前会话 ID | 弹出当前 OpenCode 会话 ID |
 | `/subagent-version` | 查看插件版本 | 弹出当前插件版本号 |
+| `/subagent-clear-running` | 批量清理僵尸条目 | 一键将所有运行中的条目标记为完成，清理卡住的旧数据 |
 
 <div align="center">
   <img src="https://raw.githubusercontent.com/Hotakus/opencode-subagent-magazine/master/assets/slash_cmds.png" alt="斜杠命令" width="49%"></img>
@@ -113,6 +117,7 @@ npm install -g opencode-subagent-magazine@latest
 | 滚动列表 | 翻页查看更多子代理 |
 | 点击 `↑ 回顶` | 跳转到列表顶部 |
 | 点击 `→ 进入会话` | 跳转子代理完整对话 |
+| 点击 `- 标记完成` | 手动终结该条目（仅运行中时显示） |
 
 ### 4.3 状态颜色
 

package/dist/_version.d.ts

@@ -1 +1 @@
-export declare const PLUGIN_VERSION = "1.1.1";
+export declare const PLUGIN_VERSION = "1.1.3";

package/dist/_version.js

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

package/dist/index.js

@@ -11,6 +11,7 @@ const I18N = {
         "panel.title": "子代理",
         "status.none": "暂无子代理",
         "agent.label": "代理",
+        "status.label": "状态",
         "time.label": "耗时",
         "tokens.label": "上下文",
         "error.label": "错误",
@@ -20,11 +21,16 @@ const I18N = {
         "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",
@@ -34,6 +40,10 @@ const I18N = {
         "cost.label": "cost",
         "scroll.more": "more",
         "scroll.top": "Top",
+        "dismiss.label": "dismiss",
+        "status.running": "running",
+        "status.done": "done",
+        "status.error": "error",
     },
 };
 function detectLang() {
@@ -188,8 +198,7 @@ function safeErrorMsg(err) {
 // ===================================================================
 // Sidebar component
 // ===================================================================
-// 模块级缓存：保留各 session 的最新 entryMap，不随组件内 session 切换而丢失。
-// 当用户在子 session 内部时，handleSessionEnd 可通过此缓存找到父 session 的 entries。
+// 模块级缓存：各 session 的 entry 状态独立存储，不随当前视图切换而清除。
 const globalEntryCache = new Map();
 function SubAgentPanel(props) {
     const t = (key) => I18N[props.lang()][key] ?? key;
@@ -273,8 +282,8 @@ function SubAgentPanel(props) {
     const setEntryMap = (arg) => {
         setEntryMapRaw((prev) => {
             const next = typeof arg === "function" ? arg(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);
@@ -295,7 +304,7 @@ function SubAgentPanel(props) {
             else {
                 persistEntries(props.sessionId, next);
             }
-            // 同步到全局缓存，确保跨 session 查找时数据可用
+            // 同步到模块级缓存，供其他视图读取当前 session 的最新状态
             globalEntryCache.set(props.sessionId, new Map(next));
             return next;
         });
@@ -314,6 +323,7 @@ function SubAgentPanel(props) {
         return undefined;
     } })());
     const [hoveredOpen, setHoveredOpen] = createSignal(undefined);
+    const [hoveredDismiss, setHoveredDismiss] = createSignal(undefined);
     const [hoveredTop, setHoveredTop] = createSignal(false);
     const [scrollOffset, setScrollOffset] = createSignal((() => { try {
         return loadSessionData()[props.sessionId]?.scroll ?? 0;
@@ -667,21 +677,20 @@ 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;
                 if (parentCache) {
                     found = tryMatchAndUpdate(parentCache, sid, status, nowTs);
                 }
-                // 缓存未命中时回退到 KV（极端情况：session 切换前缓存未建立）
+                // 缓存未命中时回退到 KV 读取
                 if (!found) {
                     const data = loadSessionData();
                     const rec = data[parentSid];
@@ -689,14 +698,14 @@ function SubAgentPanel(props) {
                         const fallbackMap = new Map(rec.entries.map((e) => [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);
                         }
                     }
                 }
-                // KV 同步：以全局缓存（最新的内存状态）为准写回 KV
+                // 将模块级缓存中的最新状态同步到 KV
                 if (found && parentCache) {
                     const data = loadSessionData();
                     data[parentSid] = { ...data[parentSid], ts: nowTs, entries: [...parentCache.values()] };
@@ -827,7 +836,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.length) {
@@ -1024,7 +1036,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 + ": ")));
@@ -1152,11 +1164,20 @@ function SubAgentPanel(props) {
                                             const pad = Math.max(0, max - visualWidth(truncated));
                                             return truncated + " ".repeat(pad);
                                         };
-                                        return (_jsxs(_Fragment, { children: [_jsxs("text", { onMouseUp: () => toggleExpand(entry.id), children: [_jsx("span", { style: { fg: pal().muted }, children: isExpanded() ? "\u25bc" : "\u25b6" }), " ", _jsx("span", { style: { fg: statusColor() }, children: statusDot() }), " ", _jsx("span", { style: { fg: pal().text }, children: labelText() }), timeText() ? (_jsxs(_Fragment, { children: [" ", _jsx("span", { style: { fg: timeColor() }, children: timeText() })] })) : null, tokenText() ? (_jsx("span", { style: { fg: pal().muted }, children: tokenText() })) : null] }), _jsxs(Show, { when: isExpanded(), children: [_jsxs("text", { children: ["  ", _jsxs("span", { style: { fg: pal().primary }, children: [t("agent.label"), ": "] }), _jsx("span", { style: { fg: pal().muted }, children: " ".repeat(expandedPad(t("agent.label"))) }), _jsx("span", { style: { fg: pal().muted }, children: entry.agent })] }), _jsx(Show, { when: elapsed() >= 2000 || entry.endedAt !== undefined, children: _jsxs("text", { children: ["  ", _jsxs("span", { style: { fg: pal().primary }, children: [t("time.label"), ": "] }), _jsx("span", { style: { fg: pal().muted }, children: " ".repeat(expandedPad(t("time.label"))) }), _jsx("span", { style: { fg: pal().muted }, children: fmtDurationShort(elapsed(), isRunning) })] }) }), _jsx(Show, { when: entry.tokens !== undefined, children: _jsxs("text", { children: ["  ", _jsxs("span", { style: { fg: pal().primary }, children: [t("tokens.label"), ": "] }), _jsx("span", { style: { fg: pal().muted }, children: " ".repeat(expandedPad(t("tokens.label"))) }), _jsx("span", { style: { fg: pal().muted }, children: fmtTokens(entry.tokens) })] }) }), _jsx(Show, { when: entry.error, children: _jsxs("text", { children: ["  ", _jsxs("span", { style: { fg: pal().error }, children: [t("error.label"), ": "] }), _jsx("span", { style: { fg: pal().muted }, children: " ".repeat(expandedPad(t("error.label"))) }), _jsx("span", { style: { fg: pal().error }, children: truncate(String(entry.error), expandedValAvail()) })] }) }), _jsx(Show, { when: entry.cost !== undefined, children: _jsxs("text", { children: ["  ", _jsxs("span", { style: { fg: pal().primary }, children: [t("cost.label"), ": "] }), _jsx("span", { style: { fg: pal().muted }, children: " ".repeat(expandedPad(t("cost.label"))) }), _jsxs("span", { style: { fg: pal().muted }, children: ["$", entry.cost.toFixed(4)] })] }) }), _jsx(Show, { when: entry.model, children: _jsxs("text", { children: ["  ", _jsxs("span", { style: { fg: pal().primary }, children: [t("model.label"), ": "] }), _jsx("span", { style: { fg: pal().muted }, children: " ".repeat(expandedPad(t("model.label"))) }), _jsx("span", { style: { fg: pal().muted }, children: truncate(entry.model, expandedValAvail()) })] }) }), _jsx(Show, { when: entry.todoTotal !== undefined, children: _jsxs("text", { children: ["  ", _jsxs("span", { style: { fg: pal().primary }, children: [t("todo.label"), ": "] }), _jsx("span", { style: { fg: pal().muted }, children: " ".repeat(expandedPad(t("todo.label"))) }), _jsxs("span", { style: { fg: pal().muted }, children: [entry.todoDone, "/", entry.todoTotal] })] }) }), _jsx(Show, { when: entry.sessionId, children: _jsxs("text", { onMouseOver: () => setHoveredOpen(entry.id), onMouseOut: () => setHoveredOpen(undefined), onMouseUp: () => {
-                                                                    if (entry.sessionId) {
-                                                                        props.api.route.navigate("session", { sessionID: entry.sessionId });
-                                                                    }
-                                                                }, children: ["  ", _jsx("span", { style: { fg: hoveredOpen() === entry.id ? pal().warning : pal().primary }, children: "\u2192 " }), _jsx("span", { style: { fg: hoveredOpen() === entry.id ? pal().warning : pal().primary }, children: t("open.label") })] }) })] })] }));
+                                        return (_jsxs(_Fragment, { children: [_jsxs("text", { onMouseUp: () => toggleExpand(entry.id), children: [_jsx("span", { style: { fg: pal().muted }, children: isExpanded() ? "\u25bc" : "\u25b6" }), " ", _jsx("span", { style: { fg: statusColor() }, children: statusDot() }), " ", _jsx("span", { style: { fg: pal().text }, children: labelText() }), timeText() ? (_jsxs(_Fragment, { children: [" ", _jsx("span", { style: { fg: timeColor() }, children: timeText() })] })) : null, tokenText() ? (_jsx("span", { style: { fg: pal().muted }, children: tokenText() })) : null] }), _jsxs(Show, { when: isExpanded(), children: [_jsxs("text", { children: ["  ", _jsxs("span", { style: { fg: pal().primary }, children: [t("agent.label"), ": "] }), _jsx("span", { style: { fg: pal().muted }, children: " ".repeat(expandedPad(t("agent.label"))) }), _jsx("span", { style: { fg: pal().muted }, children: entry.agent })] }), _jsxs("text", { children: ["  ", _jsxs("span", { style: { fg: pal().primary }, children: [t("status.label"), ": "] }), _jsx("span", { style: { fg: pal().muted }, children: " ".repeat(expandedPad(t("status.label"))) }), _jsx("span", { style: { fg: isRunning ? pal().warning : isError ? pal().error : pal().success }, children: isRunning ? t("status.running") : isError ? t("status.error") : t("status.done") })] }), _jsx(Show, { when: elapsed() >= 2000 || entry.endedAt !== undefined, children: _jsxs("text", { children: ["  ", _jsxs("span", { style: { fg: pal().primary }, children: [t("time.label"), ": "] }), _jsx("span", { style: { fg: pal().muted }, children: " ".repeat(expandedPad(t("time.label"))) }), _jsx("span", { style: { fg: pal().muted }, children: fmtDurationShort(elapsed(), isRunning) })] }) }), _jsx(Show, { when: entry.tokens !== undefined, children: _jsxs("text", { children: ["  ", _jsxs("span", { style: { fg: pal().primary }, children: [t("tokens.label"), ": "] }), _jsx("span", { style: { fg: pal().muted }, children: " ".repeat(expandedPad(t("tokens.label"))) }), _jsx("span", { style: { fg: pal().muted }, children: fmtTokens(entry.tokens) })] }) }), _jsx(Show, { when: entry.error, children: _jsxs("text", { children: ["  ", _jsxs("span", { style: { fg: pal().error }, children: [t("error.label"), ": "] }), _jsx("span", { style: { fg: pal().muted }, children: " ".repeat(expandedPad(t("error.label"))) }), _jsx("span", { style: { fg: pal().error }, children: truncate(String(entry.error), expandedValAvail()) })] }) }), _jsx(Show, { when: entry.cost !== undefined, children: _jsxs("text", { children: ["  ", _jsxs("span", { style: { fg: pal().primary }, children: [t("cost.label"), ": "] }), _jsx("span", { style: { fg: pal().muted }, children: " ".repeat(expandedPad(t("cost.label"))) }), _jsxs("span", { style: { fg: pal().muted }, children: ["$", entry.cost.toFixed(4)] })] }) }), _jsx(Show, { when: entry.model, children: _jsxs("text", { children: ["  ", _jsxs("span", { style: { fg: pal().primary }, children: [t("model.label"), ": "] }), _jsx("span", { style: { fg: pal().muted }, children: " ".repeat(expandedPad(t("model.label"))) }), _jsx("span", { style: { fg: pal().muted }, children: truncate(entry.model, expandedValAvail()) })] }) }), _jsx(Show, { when: entry.todoTotal !== undefined, children: _jsxs("text", { children: ["  ", _jsxs("span", { style: { fg: pal().primary }, children: [t("todo.label"), ": "] }), _jsx("span", { style: { fg: pal().muted }, children: " ".repeat(expandedPad(t("todo.label"))) }), _jsxs("span", { style: { fg: pal().muted }, children: [entry.todoDone, "/", entry.todoTotal] })] }) }), _jsx(Show, { when: entry.sessionId || isRunning, children: (() => {
+                                                                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 (_jsxs("box", { flexDirection: "row", children: [_jsx(Show, { when: entry.sessionId, fallback: _jsx("text", { children: "  " }), children: _jsxs("text", { onMouseOver: () => setHoveredOpen(entry.id), onMouseOut: () => setHoveredOpen(undefined), onMouseUp: () => {
+                                                                                    if (entry.sessionId) {
+                                                                                        props.api.route.navigate("session", { sessionID: entry.sessionId });
+                                                                                    }
+                                                                                }, children: [_jsx("span", { style: { fg: hoveredOpen() === entry.id ? pal().warning : pal().primary }, children: openPrefix() }), _jsx("span", { style: { fg: hoveredOpen() === entry.id ? pal().warning : pal().primary }, children: t("open.label") })] }) }), _jsx(Show, { when: isRunning, children: _jsxs(_Fragment, { children: [_jsx("text", { style: { fg: pal().muted }, children: " ".repeat(spacerW()) }), _jsx("text", { onMouseOver: () => setHoveredDismiss(entry.id), onMouseOut: () => setHoveredDismiss(undefined), onMouseUp: () => {
+                                                                                            upsertEntry({ id: entry.id, title: entry.title, agent: entry.agent, prompt: entry.prompt, status: "done" });
+                                                                                        }, children: _jsx("span", { style: { fg: hoveredDismiss() === entry.id ? pal().warning : pal().muted }, children: dismissLabel() }) })] }) })] }));
+                                                            })() })] })] }));
                                     } }), _jsx(Show, { when: hiddenBelow() > 0 || scrollOffset() > 0, children: (() => {
                                         const showMore = hiddenBelow() > 0;
                                         const showTop = scrollOffset() > 0;
@@ -1243,6 +1264,54 @@ const tui = async (api) => {
                 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";
+                        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();
+            },
+        },
     ]);
 };
 const mod = {