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

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.4";
 
 // src/i18n.ts
 var ZH_T = {
@@ -58,7 +58,9 @@ var ZH_T = {
   "cancel.already_ended": "\u4F1A\u8BDD\u5DF2\u7ED3\u675F\uFF0C\u65E0\u9700\u53D6\u6D88",
   "cancel.status_error": "\u65E0\u6CD5\u67E5\u8BE2\u4F1A\u8BDD\u72B6\u6001",
   "cancel.sent": "\u5DF2\u53D1\u9001\u53D6\u6D88\u6307\u4EE4",
-  "cancel.failed": "\u53D6\u6D88\u5931\u8D25"
+  "cancel.failed": "\u53D6\u6D88\u5931\u8D25",
+  "borderShown": "\u9762\u677F\u8FB9\u6846 \u5DF2\u663E\u793A",
+  "borderHidden": "\u9762\u677F\u8FB9\u6846 \u5DF2\u9690\u85CF"
 };
 var EN_T = {
   "panel.title": "SubAgent",
@@ -109,7 +111,9 @@ var EN_T = {
   "cancel.already_ended": "Session already ended, no need to cancel",
   "cancel.status_error": "Cannot query session status",
   "cancel.sent": "Cancel instruction sent",
-  "cancel.failed": "Cancellation failed"
+  "cancel.failed": "Cancellation failed",
+  "borderShown": "Panel border shown",
+  "borderHidden": "Panel border hidden"
 };
 var JA_T = {
   "panel.title": "\u30B5\u30D6\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8",
@@ -160,7 +164,9 @@ var JA_T = {
   "cancel.already_ended": "\u30BB\u30C3\u30B7\u30E7\u30F3\u306F\u65E2\u306B\u7D42\u4E86\u3057\u3066\u3044\u307E\u3059",
   "cancel.status_error": "\u30BB\u30C3\u30B7\u30E7\u30F3\u72B6\u614B\u3092\u7167\u4F1A\u3067\u304D\u307E\u305B\u3093",
   "cancel.sent": "\u30AD\u30E3\u30F3\u30BB\u30EB\u6307\u793A\u3092\u9001\u4FE1\u3057\u307E\u3057\u305F",
-  "cancel.failed": "\u30AD\u30E3\u30F3\u30BB\u30EB\u306B\u5931\u6557\u3057\u307E\u3057\u305F"
+  "cancel.failed": "\u30AD\u30E3\u30F3\u30BB\u30EB\u306B\u5931\u6557\u3057\u307E\u3057\u305F",
+  "borderShown": "\u30D1\u30CD\u30EB\u67A0\u7DDA \u8868\u793A",
+  "borderHidden": "\u30D1\u30CD\u30EB\u67A0\u7DDA \u975E\u8868\u793A"
 };
 var KO_T = {
   "panel.title": "\uC11C\uBE0C \uC5D0\uC774\uC804\uD2B8",
@@ -211,7 +217,9 @@ var KO_T = {
   "cancel.already_ended": "\uC138\uC158\uC774 \uC774\uBBF8 \uC885\uB8CC\uB418\uC5C8\uC2B5\uB2C8\uB2E4",
   "cancel.status_error": "\uC138\uC158 \uC0C1\uD0DC\uB97C \uC870\uD68C\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4",
   "cancel.sent": "\uCDE8\uC18C \uC9C0\uC2DC\uB97C \uBCF4\uB0C8\uC2B5\uB2C8\uB2E4",
-  "cancel.failed": "\uCDE8\uC18C\uC5D0 \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4"
+  "cancel.failed": "\uCDE8\uC18C\uC5D0 \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4",
+  "borderShown": "\uD328\uB110 \uD14C\uB450\uB9AC \uD45C\uC2DC",
+  "borderHidden": "\uD328\uB110 \uD14C\uB450\uB9AC \uC228\uAE40"
 };
 var LANGS = { zh: ZH_T, en: EN_T, ja: JA_T, ko: KO_T };
 var LANG_META = [
@@ -251,7 +259,8 @@ var SETTING_KEYS = {
   order: `${KV_PREFIX}.order`,
   scrollMode: `${KV_PREFIX}.scroll_mode`,
   open: `${KV_PREFIX}.open`,
-  ttlDays: `${KV_PREFIX}.ttl_days`
+  ttlDays: `${KV_PREFIX}.ttl_days`,
+  border: `${KV_PREFIX}.border`
 };
 
 // src/panel/SubAgentPanel.tsx
@@ -260,9 +269,11 @@ import { insertNode as _$insertNode } from "@opentui/solid";
 import { createComponent as _$createComponent } from "@opentui/solid";
 import { effect as _$effect } from "@opentui/solid";
 import { insert as _$insert } from "@opentui/solid";
-import { memo as _$memo } from "@opentui/solid";
-import { use as _$use } from "@opentui/solid";
 import { setProp as _$setProp } from "@opentui/solid";
+import { use as _$use } from "@opentui/solid";
+import { spread as _$spread } from "@opentui/solid";
+import { mergeProps as _$mergeProps } from "@opentui/solid";
+import { memo as _$memo } from "@opentui/solid";
 import { createElement as _$createElement } from "@opentui/solid";
 import { createMemo, createSignal as createSignal2, createEffect, onMount, onCleanup, untrack, Show, For } from "solid-js";
 
@@ -490,6 +501,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 +565,7 @@ function SubAgentPanel(props) {
     };
   };
   const loadEntries = (sid) => {
-    const m = /* @__PURE__ */ new Map();
+    let m = /* @__PURE__ */ new Map();
     try {
       const {
         parentSid,
@@ -539,7 +575,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 +815,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 +959,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 +1356,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 +1375,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 +1400,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 +1415,7 @@ function SubAgentPanel(props) {
                       startedAt: exists?.startedAt || Date.now(),
                       endedAt: ended ? exists?.endedAt || Date.now() : void 0
                     });
+                    if (entryKey !== id) next.delete(id);
                   }
                 }
               }
@@ -1531,13 +1561,21 @@ function SubAgentPanel(props) {
       return next;
     });
   };
-  const sep = () => "\u2500".repeat(Math.max(1, panelWidth()));
+  const gutter = createMemo(() => props.borderVisible() ? 6 : 0);
+  const sep = () => "\u2500".repeat(Math.max(1, panelWidth() - gutter()));
+  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);
+    }
+  });
   const expandedMaxLabelW = createMemo(() => {
     const labels = [t("agent.label"), t("status.label"), t("time.label"), t("tokens.label"), t("error.label"), t("cost.label"), t("model.label"), t("todo.label"), t("session.label")];
     return Math.max(...labels.map((l) => visualWidth(l + ": ")));
   });
   const expandedPad = (label) => Math.max(0, expandedMaxLabelW() - visualWidth(label + ": "));
-  const expandedValAvail = () => Math.max(6, panelWidth() - INDENT - expandedMaxLabelW());
+  const expandedValAvail = () => Math.max(6, panelWidth() - gutter() - INDENT - expandedMaxLabelW());
   const summaryParts = createMemo(() => {
     if (!anyEntry()) return null;
     const dot = "\u25CF";
@@ -1566,7 +1604,7 @@ 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(() => {
     const icon = open() ? "\u25BC" : "\u25B6";
@@ -1576,25 +1614,36 @@ 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) => Math.max(4, panelWidth() - INDENT - visualWidth(label + ": "));
+  const valueCols = (label) => Math.max(4, panelWidth() - gutter() - INDENT - visualWidth(label + ": "));
   return (() => {
     var _el$ = _$createElement("box"), _el$2 = _$createElement("text"), _el$3 = _$createElement("span"), _el$4 = _$createElement("span");
     _$insertNode(_el$, _el$2);
     var _ref$ = boxEl;
     typeof _ref$ === "function" ? _$use(_ref$, _el$) : boxEl = _el$;
-    _$setProp(_el$, "border", false);
-    _$setProp(_el$, "paddingTop", 0);
-    _$setProp(_el$, "paddingBottom", 0);
-    _$setProp(_el$, "paddingLeft", 0);
-    _$setProp(_el$, "paddingRight", 0);
-    _$setProp(_el$, "flexDirection", "column");
-    _$setProp(_el$, "gap", 0);
-    _$setProp(_el$, "onSizeChange", () => {
-      const w = boxEl ? Math.max(20, boxEl.width ?? 0) : 28;
-      setPanelWidth((prev) => prev === w ? prev : w);
-    });
+    _$spread(_el$, _$mergeProps({
+      get border() {
+        return props.borderVisible();
+      }
+    }, () => props.borderVisible() ? {
+      borderColor: pal().border
+    } : {}, {
+      "paddingTop": 0,
+      "paddingBottom": 0,
+      get paddingLeft() {
+        return props.borderVisible() ? 2 : 0;
+      },
+      get paddingRight() {
+        return props.borderVisible() ? 2 : 0;
+      },
+      "flexDirection": "column",
+      "gap": 0,
+      "onSizeChange": () => {
+        const w = boxEl ? Math.max(20, boxEl.width ?? 0) : 28;
+        setPanelWidth((prev) => prev === w ? prev : w);
+      }
+    }), true);
     _$insertNode(_el$2, _el$3);
     _$insertNode(_el$2, _el$4);
     _$setProp(_el$2, "onMouseUp", () => {
@@ -1791,7 +1840,7 @@ 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 max2 = labelAvail();
                   const text = entry.title || entry.agent;
@@ -2188,7 +2237,7 @@ ${t("session.toast.copy_failed")}`, {
                           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 (() => {
                             var _el$91 = _$createElement("box"), _el$95 = _$createElement("text");
                             _$insertNode(_el$91, _el$95);
@@ -2289,7 +2338,7 @@ ${t("session.toast.copy_failed")}`, {
                   const showTop = props.sortOrder() === "desc" ? scrollOffset() > 0 : entryList().length > max() && clampedOffset() < entryList().length - max();
                   const left = showMore ? `  \u2193 ${hiddenBelow()} ${t("scroll.more")}` : "  ";
                   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 (() => {
                     var _el$100 = _$createElement("box"), _el$101 = _$createElement("text"), _el$102 = _$createElement("span");
                     _$insertNode(_el$100, _el$101);
@@ -2392,6 +2441,9 @@ function createSidebarSlot(api, panelApi, sig) {
           get scrollMode() {
             return sig.scrollMode;
           },
+          get borderVisible() {
+            return sig.borderVisible;
+          },
           get sessionId() {
             return input.session_id;
           }
@@ -2407,6 +2459,7 @@ var tui = async (api) => {
   const [maxEntries, setMaxEntries] = createSignal3(parseInt(String(api.kv.get(`${KV_PREFIX}.max_entries`, "10")), 10) || 10);
   const [sortOrder, setSortOrder] = createSignal3(String(api.kv.get(`${KV_PREFIX}.order`, "desc")) === "asc" ? "asc" : "desc");
   const [scrollMode, setScrollMode] = createSignal3(String(api.kv.get(`${KV_PREFIX}.scroll_mode`, "wheel")) === "click" ? "click" : "wheel");
+  const [borderVisible, setBorderVisible] = createSignal3(api.kv.get(`${KV_PREFIX}.border`, false) === true);
   const signals = {
     lang,
     setLang,
@@ -2416,6 +2469,8 @@ var tui = async (api) => {
     setSortOrder,
     scrollMode,
     setScrollMode,
+    borderVisible,
+    setBorderVisible,
     sessionId: ""
   };
   const v1Api = {
@@ -2899,6 +2954,23 @@ var tui = async (api) => {
         }
       }));
     }
+  }, {
+    title: "SubAgent Magazine: Border",
+    value: "subagent-border",
+    description: "Show or hide the panel border",
+    slash: {
+      name: "subagent-border"
+    },
+    onSelect: (dialog) => {
+      const t = createT(() => signals.lang());
+      const cur = Boolean(api.kv.get(`${KV_PREFIX}.border`, false));
+      api.kv.set(`${KV_PREFIX}.border`, !cur);
+      signals.setBorderVisible(!cur);
+      api.ui.toast({
+        message: !cur ? t("borderShown") : t("borderHidden")
+      });
+      dialog?.clear();
+    }
   }]);
 };
 var mod = {

package/dist/v2/commands.js

@@ -258,6 +258,19 @@ export function makeCommands(context, api, signals) {
                 catch { }
             },
         },
+        {
+            id: "opencode-subagent-magazine.subagent.border",
+            title: "SubAgent Magazine: Border",
+            description: "Show or hide the panel border",
+            slash: { name: "subagent-border" },
+            palette: true,
+            run: () => {
+                const cur = Boolean(kv.get(SETTING_KEYS.border, false));
+                kv.set(SETTING_KEYS.border, !cur);
+                signals.setBorderVisible(!cur);
+                api.ui.toast(!cur ? t("borderShown") : t("borderHidden"));
+            },
+        },
     ];
 }
 export { KV_PREFIX };

package/dist/v2/index.js

@@ -14,7 +14,7 @@ function PluginRoot(props) {
         mode: "global",
         commands: makeCommands(props.context, props.api, props.signals),
     }));
-    return (_jsx(SubAgentPanel, { api: props.api, theme: mapTheme(props.context.theme), lang: props.signals.lang, maxEntries: props.signals.maxEntries, sortOrder: props.signals.sortOrder, scrollMode: props.signals.scrollMode, sessionId: props.sessionID }));
+    return (_jsx(SubAgentPanel, { api: props.api, theme: mapTheme(props.context.theme), lang: props.signals.lang, maxEntries: props.signals.maxEntries, sortOrder: props.signals.sortOrder, scrollMode: props.signals.scrollMode, borderVisible: props.signals.borderVisible, sessionId: props.sessionID }));
 }
 /** V2 入口：setup 创建共享信号 + PanelApi + 命令 layer + 侧边栏槽位。
  *  行为对齐 V1 tui()（信号初始值从 KV 恢复；侧边栏渲染共享 SubAgentPanel）。 */
@@ -39,12 +39,13 @@ const mod = {
         const [maxSignal, setMaxEntries] = createSignal(Number(api.kv.get(SETTING_KEYS.maxEntries, "10")) || 10);
         const [orderSignal, setSortOrder] = createSignal(String(api.kv.get(SETTING_KEYS.order, "desc")) === "asc" ? "asc" : "desc");
         const [scrollSignal, setScrollMode] = createSignal(String(api.kv.get(SETTING_KEYS.scrollMode, "wheel")) === "click" ? "click" : "wheel");
+        const [borderSignal, setBorderVisible] = createSignal(api.kv.get(SETTING_KEYS.border, false) === true);
         lang = langSignal;
         maxEntries = maxSignal;
         sortOrder = orderSignal;
         scrollMode = scrollSignal;
         const signals = {
-            lang, setLang, maxEntries, setMaxEntries, sortOrder, setSortOrder, scrollMode, setScrollMode, sessionId: "",
+            lang, setLang, maxEntries, setMaxEntries, sortOrder, setSortOrder, scrollMode, setScrollMode, borderVisible: borderSignal, setBorderVisible, sessionId: "",
         };
         // 命令 layer（组件内注册——见 PluginRoot）
         // 侧边栏面板（共享 SubAgentPanel——V1/V2 同一组件）