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

package/README.md

@@ -56,7 +56,8 @@
 - **TTL 自动清理**：可配置数据保留期限（3/7/14/30 天/无期限），每次访问自动续期，过期自动清除
 - **手动清除条目**：`/subagent-clear-entries` 清除当前会话所有记录，防止历史条目扫描重建
 - **语言适配**：支持 `/subagent-lang` 运行时切换中/英文，偏好持久化
-- **斜杠命令**：`/subagent-lang` `/subagent-max` `/subagent-order` `/subagent-scroll` `/subagent-ttl` `/subagent-clear-entries` `/subagent-session` `/subagent-version` `/subagent-clear-running` 动态配置
+- **可切换边框**：`/subagent-border` 控制面板外边框显隐（默认隐藏），开启后与缓存统计面板风格统一
+- **斜杠命令**：`/subagent-lang` `/subagent-max` `/subagent-order` `/subagent-scroll` `/subagent-ttl` `/subagent-clear-entries` `/subagent-session` `/subagent-version` `/subagent-clear-running` `/subagent-border` 动态配置
 
 ---
 
@@ -114,6 +115,7 @@ npm install -g opencode-subagent-magazine@latest
 | `/subagent-session` | 查看当前会话 ID | 弹出当前 OpenCode 会话 ID |
 | `/subagent-version` | 查看插件版本 | 弹出当前插件版本号 |
 | `/subagent-clear-running` | 批量清理僵尸条目 | 一键将所有运行中的条目标记为完成，清理卡住的旧数据 |
+| `/subagent-border` | 开关面板边框 | 切换面板外边框显隐（默认隐藏），即时生效并持久化 |
 
 <div align="center">
   <img src="https://raw.githubusercontent.com/Hotakus/opencode-subagent-magazine/master/assets/slash_cmds.png" alt="斜杠命令" width="49%"></img>

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.4";

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.4";

package/dist/core/kv.d.ts

@@ -14,6 +14,7 @@ export declare const SETTING_KEYS: {
     readonly scrollMode: "subagent_magazine.scroll_mode";
     readonly open: "subagent_magazine.open";
     readonly ttlDays: "subagent_magazine.ttl_days";
+    readonly border: "subagent_magazine.border";
 };
 export declare function loadSessionData(kv: KVApi): Record<string, SessionRecord>;
 export declare function saveSessionData(kv: KVApi, data: Record<string, SessionRecord>): void;

package/dist/core/kv.js

@@ -8,6 +8,7 @@ export const SETTING_KEYS = {
     scrollMode: `${KV_PREFIX}.scroll_mode`,
     open: `${KV_PREFIX}.open`,
     ttlDays: `${KV_PREFIX}.ttl_days`,
+    border: `${KV_PREFIX}.border`,
 };
 export function loadSessionData(kv) {
     try {

package/dist/core/types.d.ts

@@ -47,5 +47,7 @@ export interface SharedSignals {
     setSortOrder: (o: SortOrder) => void;
     scrollMode: () => ScrollMode;
     setScrollMode: (m: ScrollMode) => void;
+    borderVisible: () => boolean;
+    setBorderVisible: (v: boolean) => void;
     sessionId: string;
 }

package/dist/i18n.d.ts

@@ -49,6 +49,8 @@ declare const ZH_T: {
     readonly "cancel.status_error": "无法查询会话状态";
     readonly "cancel.sent": "已发送取消指令";
     readonly "cancel.failed": "取消失败";
+    readonly borderShown: "面板边框 已显示";
+    readonly borderHidden: "面板边框 已隐藏";
 };
 /** 结构约束：值放宽为 string，键集合来自中文表（新增语言缺 key 会编译报错）。 */
 export type Translation = {

package/dist/i18n.js

@@ -53,6 +53,8 @@ const ZH_T = {
     "cancel.status_error": "无法查询会话状态",
     "cancel.sent": "已发送取消指令",
     "cancel.failed": "取消失败",
+    "borderShown": "面板边框 已显示",
+    "borderHidden": "面板边框 已隐藏",
 };
 const EN_T = {
     "panel.title": "SubAgent",
@@ -104,6 +106,8 @@ const EN_T = {
     "cancel.status_error": "Cannot query session status",
     "cancel.sent": "Cancel instruction sent",
     "cancel.failed": "Cancellation failed",
+    "borderShown": "Panel border shown",
+    "borderHidden": "Panel border hidden",
 };
 const JA_T = {
     "panel.title": "サブエージェント",
@@ -155,6 +159,8 @@ const JA_T = {
     "cancel.status_error": "セッション状態を照会できません",
     "cancel.sent": "キャンセル指示を送信しました",
     "cancel.failed": "キャンセルに失敗しました",
+    "borderShown": "パネル枠線 表示",
+    "borderHidden": "パネル枠線 非表示",
 };
 const KO_T = {
     "panel.title": "서브 에이전트",
@@ -206,6 +212,8 @@ const KO_T = {
     "cancel.status_error": "세션 상태를 조회할 수 없습니다",
     "cancel.sent": "취소 지시를 보냈습니다",
     "cancel.failed": "취소에 실패했습니다",
+    "borderShown": "패널 테두리 표시",
+    "borderHidden": "패널 테두리 숨김",
 };
 export const LANGS = { zh: ZH_T, en: EN_T, ja: JA_T, ko: KO_T };
 /** 语言元数据：/subagent-lang 选项与自动检测共用。 */

package/dist/index.js

@@ -13,7 +13,7 @@ function createSidebarSlot(api, panelApi, sig) {
         slots: {
             sidebar_content(ctx, input) {
                 sig.sessionId = input.session_id;
-                return (_jsx(SubAgentPanel, { api: panelApi, theme: ctx.theme.current, lang: sig.lang, maxEntries: sig.maxEntries, sortOrder: sig.sortOrder, scrollMode: sig.scrollMode, sessionId: input.session_id }));
+                return (_jsx(SubAgentPanel, { api: panelApi, theme: ctx.theme.current, lang: sig.lang, maxEntries: sig.maxEntries, sortOrder: sig.sortOrder, scrollMode: sig.scrollMode, borderVisible: sig.borderVisible, sessionId: input.session_id }));
             },
         },
     };
@@ -26,7 +26,8 @@ const tui = async (api) => {
     const [maxEntries, setMaxEntries] = createSignal(parseInt(String(api.kv.get(`${KV_PREFIX}.max_entries`, "10")), 10) || 10);
     const [sortOrder, setSortOrder] = createSignal(String(api.kv.get(`${KV_PREFIX}.order`, "desc")) === "asc" ? "asc" : "desc");
     const [scrollMode, setScrollMode] = createSignal(String(api.kv.get(`${KV_PREFIX}.scroll_mode`, "wheel")) === "click" ? "click" : "wheel");
-    const signals = { lang, setLang, maxEntries, setMaxEntries, sortOrder, setSortOrder, scrollMode, setScrollMode, sessionId: "" };
+    const [borderVisible, setBorderVisible] = createSignal(api.kv.get(`${KV_PREFIX}.border`, false) === true);
+    const signals = { lang, setLang, maxEntries, setMaxEntries, sortOrder, setSortOrder, scrollMode, setScrollMode, borderVisible, setBorderVisible, sessionId: "" };
     // ── V1 PanelApi adapter: wraps the V1 host API into the shared panel contract ──
     const v1Api = {
         kv: api.kv,
@@ -416,6 +417,20 @@ const 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();
+            },
+        },
     ]);
 };
 const mod = {

package/dist/panel/SubAgentPanel.d.ts

@@ -9,5 +9,6 @@ export declare function SubAgentPanel(props: {
     maxEntries: () => number;
     sortOrder: () => SortOrder;
     scrollMode: () => ScrollMode;
+    borderVisible: () => boolean;
     sessionId: string;
 }): JSX.Element;

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);
                                     }
                                 }
                             }
@@ -1012,7 +1017,19 @@ export function SubAgentPanel(props) {
             return next;
         });
     };
-    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(() => {
         const labels = [
@@ -1022,7 +1039,7 @@ export function SubAgentPanel(props) {
         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());
     // ── header parts for colored spans ──
     const summaryParts = createMemo(() => {
         if (!anyEntry())
@@ -1057,7 +1074,7 @@ export function SubAgentPanel(props) {
             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";
@@ -1069,11 +1086,11 @@ 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) => Math.max(4, panelWidth() - INDENT - visualWidth(label + ": "));
+    const valueCols = (label) => Math.max(4, panelWidth() - gutter() - INDENT - visualWidth(label + ": "));
     // ── render ──
-    return (_jsxs("box", { border: false, paddingTop: 0, paddingBottom: 0, paddingLeft: 0, paddingRight: 0, flexDirection: "column", gap: 0, ref: boxEl, onSizeChange: () => {
+    return (_jsxs("box", { 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: () => {
             const w = boxEl ? Math.max(20, boxEl.width ?? 0) : 28;
             setPanelWidth((prev) => (prev === w ? prev : w));
         }, children: [_jsxs("text", { onMouseUp: () => {
@@ -1165,7 +1182,7 @@ export function SubAgentPanel(props) {
                                                 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;
@@ -1201,7 +1218,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 (_jsxs("box", { flexDirection: "row", children: [_jsx(Show, { when: entry.sessionId, children: _jsxs("text", { onMouseOver: () => setHoveredOpen(entry.id), onMouseOut: () => setHoveredOpen(undefined), onMouseUp: () => {
                                                                                     if (entry.sessionId) {
                                                                                         props.api.route.navigateSession(entry.sessionId);
@@ -1219,7 +1236,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 (_jsxs("box", { flexDirection: "row", children: [_jsx("text", { onMouseOver: () => showMore && setHoveredMoreBelow(true), onMouseOut: () => setHoveredMoreBelow(false), onMouseUp: () => {
                                                         if (!showMore)
                                                             return;

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;
+}