opencode-subagent-magazine 1.3.0 → 1.4.1

package/README.md

@@ -46,15 +46,17 @@
 - **Token & 费用追踪**：每个子代理的 Token 消耗和费用汇总，标题栏全局显示
 - **展开详情**：点击展开查看 agent 类型、状态、耗时、Token、费用、模型、进度，字段值右对齐
 - **一键进入会话**：展开后点 `→ 进入会话` 跳转子代理的完整对话
+- **会话 ID 展示**：展开明细显示子代理 Session ID，点击弹窗查看完整 ID 便于复制
 - **手动标记完成**：展开区右侧 `- 标记完成` 按钮可手动终结卡住的僵尸条目；`/subagent-clear-running` 批量清理
 - **状态字段显示**：展开区 `状态: 运行中/已完成/错误`，颜色与圆点一致，一目了然
 - **折叠面板**：标题栏点击折叠/展开，状态持久化，重启后保持
 - **滚动回顶/回底**：列表底部 `↑ 回顶` / `↓ 回底` 按钮一键跳转到最新条目位置，方向随排序自适应
 - **可配置排序**：`/subagent-order` 支持「降序（最新在前）」和「升序（最早在前）」两种排列方式
 - **翻页模式切换**：`/subagent-scroll` 可选「滚轮翻页」或「点击 more 翻页」，解决侧边栏与全局滚动冲突
-- **TTL 自动清理**：超过 3 天的旧数据自动从 KV 中清除
+- **TTL 自动清理**：可配置数据保留期限（3/7/14/30 天/无期限），每次访问自动续期，过期自动清除
+- **手动清除条目**：`/subagent-clear-entries` 清除当前会话所有记录，防止历史条目扫描重建
 - **语言适配**：支持 `/subagent-lang` 运行时切换中/英文，偏好持久化
-- **斜杠命令**：`/subagent-lang` `/subagent-max` `/subagent-order` `/subagent-scroll` `/subagent-session` `/subagent-version` `/subagent-clear-running` 动态配置
+- **斜杠命令**：`/subagent-lang` `/subagent-max` `/subagent-order` `/subagent-scroll` `/subagent-ttl` `/subagent-clear-entries` `/subagent-session` `/subagent-version` `/subagent-clear-running` 动态配置
 
 ---
 
@@ -107,6 +109,8 @@ npm install -g opencode-subagent-magazine@latest
 | `/subagent-max` | 调整最大可见条目数 | 输入数字（默认 10），控制面板最多显示多少个子代理条目 |
 | `/subagent-order` | 切换排序方式 | 选择「降序（最新在前）」或「升序（最早在前）」，即时重排并跳转到最新条目 |
 | `/subagent-scroll` | 切换翻页模式 | 选择「滚轮翻页」或「点击 more 翻页」，解决与全局滚动冲突 |
+| `/subagent-ttl` | 设置数据保留期限 | 选择 3 天 / 7 天 / 14 天 / 30 天 / 无期限，控制 KV 自动清理间隔 |
+| `/subagent-clear-entries` | 清除当前会话记录 | 确认后删除所有子代理记录，阻止扫描重建历史条目 |
 | `/subagent-session` | 查看当前会话 ID | 弹出当前 OpenCode 会话 ID |
 | `/subagent-version` | 查看插件版本 | 弹出当前插件版本号 |
 | `/subagent-clear-running` | 批量清理僵尸条目 | 一键将所有运行中的条目标记为完成，清理卡住的旧数据 |
@@ -125,6 +129,7 @@ npm install -g opencode-subagent-magazine@latest
 | 滚轮 / 点击 `↑ more` `↓ more` | 翻页查看更多子代理（`/subagent-scroll` 切换翻页模式） |
 | 点击 `↑ 回顶` / `↓ 回底` | 跳转到最新条目位置（方向随排序自适应） |
 | 点击 `→ 进入会话` | 跳转子代理完整对话 |
+| 点击 `ses_xxx… ⎘` | 弹窗显示完整 Session ID，可手动复制 |
 | 点击 `- 标记完成` | 手动终结该条目（仅运行中时显示） |
 
 ### 4.3 状态颜色

package/dist/_version.d.ts

@@ -1 +1 @@
-export declare const PLUGIN_VERSION = "1.3.0";
+export declare const PLUGIN_VERSION = "1.4.1";

package/dist/_version.js

@@ -1,2 +1,2 @@
 // auto-generated
-export const PLUGIN_VERSION = "1.3.0";
+export const PLUGIN_VERSION = "1.4.1";

package/dist/index.js

@@ -32,6 +32,19 @@ const I18N = {
         "order.asc": "升序（最早在前）",
         "scroll.wheel": "滚轮翻页",
         "scroll.click": "点击翻页",
+        "ttl.label": "清理周期",
+        "ttl.3d": "3 天",
+        "ttl.7d": "7 天",
+        "ttl.14d": "14 天",
+        "ttl.30d": "30 天",
+        "ttl.unlimited": "无期限",
+        "ttl.toast": "清理周期已设为 {n} 天",
+        "ttl.toast_unlimited": "清理周期已设为无期限",
+        "clear.title": "确认清除",
+        "clear.prompt": "确定清除当前会话所有子代理记录？此操作不可撤销。",
+        "clear.prompt_running": "当前有 {n} 个运行中的子代理，清除后将不可恢复。确定继续？",
+        "clear.done": "已清除 {n} 条子代理记录",
+        "clear.empty": "当前会话无子代理记录",
     },
     en: {
         "panel.title": "SubAgent",
@@ -58,6 +71,19 @@ const I18N = {
         "order.asc": "Asc (oldest first)",
         "scroll.wheel": "Wheel Scroll",
         "scroll.click": "Click Scroll",
+        "ttl.label": "TTL (Time to Live)",
+        "ttl.3d": "3 days",
+        "ttl.7d": "7 days",
+        "ttl.14d": "14 days",
+        "ttl.30d": "30 days",
+        "ttl.unlimited": "Never",
+        "ttl.toast": "TTL set to {n} days",
+        "ttl.toast_unlimited": "TTL set to Never",
+        "clear.title": "Confirm",
+        "clear.prompt": "Clear all sub-agent records for this session? This cannot be undone.",
+        "clear.prompt_running": "{n} sub-agent(s) are still running. Clearing will discard them permanently. Continue?",
+        "clear.done": "Cleared {n} sub-agent record(s)",
+        "clear.empty": "No sub-agent records in this session",
     },
 };
 function detectLang() {
@@ -214,11 +240,15 @@ function safeErrorMsg(err) {
 // ===================================================================
 // 模块级缓存：各 session 的 entry 状态独立存储，不随当前视图切换而清除。
 const globalEntryCache = new Map();
+// 模块级刷新信号：外部（如斜杠命令）触发清除后 +1，组件 scan 依赖它以重扫。
+const [clearTick, setClearTick] = createSignal(0);
 function SubAgentPanel(props) {
     const t = (key) => I18N[props.lang()][key] ?? key;
     // ── session data (single-key, true deletion on cleanup) ──
     const SESSION_DATA_KEY = `${KV_PREFIX}.session_data`;
-    const TTL_MS = 3 * 24 * 60 * 60 * 1000;
+    const ttlDaysRaw = parseInt(String(props.api.kv.get(`${KV_PREFIX}.ttl_days`, "3")), 10);
+    const ttlDays = Number.isNaN(ttlDaysRaw) ? 3 : ttlDaysRaw;
+    const TTL_MS = ttlDays * 24 * 60 * 60 * 1000;
     const loadSessionData = () => {
         try {
             const raw = props.api.kv.get(SESSION_DATA_KEY, "{}");
@@ -234,13 +264,29 @@ function SubAgentPanel(props) {
         }
         catch { }
     };
+    /** 将任意 session ID 解析为父会话 ID + 是否子会话。
+     *  通过 SDK session.get(sid).parentID 判断，无 parentID 即为主会话。 */
+    const resolveParent = (sid) => {
+        try {
+            const session = props.api.state.session.get(sid);
+            const parentID = session?.parentID;
+            if (parentID)
+                return { parentSid: parentID, isChild: true };
+        }
+        catch { }
+        return { parentSid: sid, isChild: false };
+    };
     const loadEntries = (sid) => {
         const m = new Map();
         try {
-            const rec = loadSessionData()[sid];
-            if (rec?.entries) {
-                for (const e of rec.entries)
-                    m.set(e.id, e);
+            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);
+                }
             }
         }
         catch { }
@@ -252,7 +298,19 @@ function SubAgentPanel(props) {
         persistTimer = setTimeout(() => {
             try {
                 const data = loadSessionData();
-                data[sid] = { ...data[sid], ts: Date.now(), entries: [...entries.values()] };
+                const { parentSid, isChild } = resolveParent(sid);
+                if (isChild) {
+                    if (!data[parentSid])
+                        data[parentSid] = { ts: Date.now(), entries: [], scroll: 0, expanded: "", children: {} };
+                    if (!data[parentSid].children)
+                        data[parentSid].children = {};
+                    if (!data[parentSid].children[sid])
+                        data[parentSid].children[sid] = { scroll: 0, expanded: "", entries: [] };
+                    data[parentSid].children[sid] = { ...data[parentSid].children[sid], entries: [...entries.values()] };
+                }
+                else {
+                    data[sid] = { ...data[sid], ts: Date.now(), entries: [...entries.values()], children: data[sid]?.children ?? {} };
+                }
                 saveSessionData(data);
             }
             catch { }
@@ -261,7 +319,19 @@ function SubAgentPanel(props) {
     const persistScroll = (sid, scroll) => {
         try {
             const data = loadSessionData();
-            data[sid] = { ...data[sid], ts: Date.now(), scroll };
+            const { parentSid, isChild } = resolveParent(sid);
+            if (isChild) {
+                if (!data[parentSid])
+                    data[parentSid] = { ts: Date.now(), entries: [], scroll: 0, expanded: "", children: {} };
+                if (!data[parentSid].children)
+                    data[parentSid].children = {};
+                if (!data[parentSid].children[sid])
+                    data[parentSid].children[sid] = { scroll: 0, expanded: "", entries: [] };
+                data[parentSid].children[sid] = { ...data[parentSid].children[sid], scroll };
+            }
+            else {
+                data[sid] = { ...data[sid], ts: Date.now(), scroll, children: data[sid]?.children ?? {} };
+            }
             saveSessionData(data);
         }
         catch { }
@@ -269,12 +339,26 @@ function SubAgentPanel(props) {
     const persistExpanded = (sid, expanded) => {
         try {
             const data = loadSessionData();
-            data[sid] = { ...data[sid], ts: Date.now(), expanded };
+            const { parentSid, isChild } = resolveParent(sid);
+            if (isChild) {
+                if (!data[parentSid])
+                    data[parentSid] = { ts: Date.now(), entries: [], scroll: 0, expanded: "", children: {} };
+                if (!data[parentSid].children)
+                    data[parentSid].children = {};
+                if (!data[parentSid].children[sid])
+                    data[parentSid].children[sid] = { scroll: 0, expanded: "", entries: [] };
+                data[parentSid].children[sid] = { ...data[parentSid].children[sid], expanded };
+            }
+            else {
+                data[sid] = { ...data[sid], ts: Date.now(), expanded, children: data[sid]?.children ?? {} };
+            }
             saveSessionData(data);
         }
         catch { }
     };
     const cleanupOldSessions = () => {
+        if (ttlDays <= 0)
+            return; // 无期限，跳过清理
         try {
             const data = loadSessionData();
             const cutoff = Date.now() - TTL_MS;
@@ -310,7 +394,19 @@ function SubAgentPanel(props) {
                 clearTimeout(persistTimer);
                 try {
                     const data = loadSessionData();
-                    data[props.sessionId] = { ...data[props.sessionId], ts: Date.now(), entries: [...next.values()] };
+                    const { parentSid, isChild } = resolveParent(props.sessionId);
+                    if (isChild) {
+                        if (!data[parentSid])
+                            data[parentSid] = { ts: Date.now(), entries: [], scroll: 0, expanded: "", children: {} };
+                        if (!data[parentSid].children)
+                            data[parentSid].children = {};
+                        if (!data[parentSid].children[props.sessionId])
+                            data[parentSid].children[props.sessionId] = { scroll: 0, expanded: "", entries: [] };
+                        data[parentSid].children[props.sessionId] = { ...data[parentSid].children[props.sessionId], entries: [...next.values()] };
+                    }
+                    else {
+                        data[props.sessionId] = { ...data[props.sessionId], ts: Date.now(), entries: [...next.values()], children: data[props.sessionId]?.children ?? {} };
+                    }
                     saveSessionData(data);
                 }
                 catch { }
@@ -330,23 +426,31 @@ function SubAgentPanel(props) {
     catch {
         return true;
     } })());
-    const [expanded, setExpanded] = createSignal((() => { try {
-        return loadSessionData()[props.sessionId]?.expanded || undefined;
-    }
-    catch {
+    const [expanded, setExpanded] = createSignal((() => {
+        try {
+            const { parentSid, isChild } = resolveParent(props.sessionId);
+            const rec = loadSessionData()[parentSid];
+            if (rec)
+                return isChild ? rec.children?.[props.sessionId]?.expanded || undefined : rec.expanded || undefined;
+        }
+        catch { }
         return undefined;
-    } })());
+    })());
     const [hoveredOpen, setHoveredOpen] = createSignal(undefined);
     const [hoveredDismiss, setHoveredDismiss] = createSignal(undefined);
     const [hoveredTop, setHoveredTop] = createSignal(false);
     const [hoveredMoreAbove, setHoveredMoreAbove] = createSignal(false);
     const [hoveredMoreBelow, setHoveredMoreBelow] = createSignal(false);
-    const [scrollOffset, setScrollOffset] = createSignal((() => { try {
-        return loadSessionData()[props.sessionId]?.scroll ?? 0;
-    }
-    catch {
-        return 0;
-    } })());
+    const [scrollOffset, setScrollOffset] = createSignal((() => {
+        try {
+            const { parentSid, isChild } = resolveParent(props.sessionId);
+            const rec = loadSessionData()[parentSid];
+            return isChild ? rec?.children?.[props.sessionId]?.scroll ?? 0 : rec?.scroll ?? 0;
+        }
+        catch {
+            return 0;
+        }
+    })());
     const [now, setNow] = createSignal(Date.now());
     const [renderTick, setRenderTick] = createSignal(0);
     let boxEl;
@@ -510,7 +614,7 @@ function SubAgentPanel(props) {
             // Background tasks: tool completion ≠ agent completion — keep running until session.idle
             // Only keep running if state metadata confirms a child session was spawned;
             // otherwise (failed spawn, invalid agent) mark as done so the entry isn't stuck forever.
-            if (input?.run_in_background === true && status === "done") {
+            if ((input?.run_in_background === true || input?.background === true) && status === "done") {
                 const stMetaCheck = st?.metadata;
                 const hasChild = stMetaCheck?.session_id !== undefined || stMetaCheck?.sessionId !== undefined;
                 if (hasChild)
@@ -839,23 +943,40 @@ function SubAgentPanel(props) {
     // On session change: load from kv (entries survive component unmount), then scan+merge.
     // On same session: only scan+merge (keep event‑driven running entries).
     let lastSid = props.sessionId;
+    let lastTick = 0;
     createEffect(() => {
         const sid = props.sessionId;
         const switched = sid !== lastSid;
         lastSid = sid;
+        const tick = clearTick(); // 外部触发清除时 +1，effect 重跑
+        const forceReload = tick !== lastTick && !switched;
+        lastTick = tick;
         const t = setTimeout(() => {
             untrack(() => {
                 if (switched) {
-                    const saved = loadSessionData()[sid]?.scroll ?? 0;
+                    const { parentSid, isChild } = resolveParent(sid);
+                    const data = loadSessionData();
+                    const saved = isChild
+                        ? data[parentSid]?.children?.[sid]?.scroll ?? 0
+                        : data[sid]?.scroll ?? 0;
                     setScrollOffset(saved);
+                    // 刷新父会话的访问时间 TTL，防止活跃会话的数据过期
+                    if (!isChild && data[sid]?.entries?.length) {
+                        data[sid].ts = Date.now();
+                        saveSessionData(data);
+                    }
                 }
                 // scan uses setEntryMapRaw — ephemeral data, not persisted to kv.
                 // Only event-driven changes (handlePartUpdated, handleSessionEnd) persist.
                 setEntryMapRaw((prev) => {
                     // 优先从模块级缓存加载，KV 仅作缓存未命中时的回退
-                    const next = switched
+                    const next = (switched || forceReload)
                         ? new Map(globalEntryCache.get(sid) ?? loadEntries(sid))
                         : new Map(prev);
+                    // 从 KV 加载当前会话的清除名单，扫描时跳过被手动清除的历史条目
+                    const { parentSid: scanPSid, isChild: scanChild } = resolveParent(sid);
+                    const scanRec = loadSessionData()[scanPSid];
+                    const clearedIds = new Set(scanChild ? scanRec?.children?.[sid]?.clearedIds : scanRec?.clearedIds);
                     try {
                         const msgs = props.api.state.session.messages(sid);
                         if (msgs && msgs.length) {
@@ -875,6 +996,9 @@ function SubAgentPanel(props) {
                                         const st = part.state;
                                         const rawStatus = String(st?.status ?? "");
                                         const exists = next.get(id);
+                                        // 已手动清除的条目：scan 发现但不在内存 → 跳过重建
+                                        if (!exists && clearedIds.has(id))
+                                            continue;
                                         // Only create entries for tool calls that entered execution.
                                         // "pending" / empty: skip new entries; allow heuristics for existing ones below.
                                         if ((rawStatus === "pending" || rawStatus === "") && !exists)
@@ -891,7 +1015,7 @@ function SubAgentPanel(props) {
                                             status = "done";
                                         // Background tasks: tool completion ≠ agent completion — keep running until session.idle
                                         // Only keep running if state metadata confirms a child session was spawned.
-                                        if (st?.input?.run_in_background === true && status === "done") {
+                                        if ((st?.input?.run_in_background === true || st?.input?.background === true) && status === "done") {
                                             const scanStMeta = st?.metadata;
                                             const scanHasChild = scanStMeta?.session_id !== undefined || scanStMeta?.sessionId !== undefined;
                                             if (scanHasChild)
@@ -1443,7 +1567,8 @@ const tui = async (api) => {
             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);
+                const sid = signals.sessionId;
+                const entries = globalEntryCache.get(sid);
                 if (!entries || entries.size === 0) {
                     const msg = signals.lang() === "zh" ? "暂无子代理条目" : "No sub-agent entries found";
                     api.ui.toast({ message: msg });
@@ -1462,12 +1587,26 @@ const tui = async (api) => {
                     // 立即写 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 ?? "",
-                        };
+                        const sessionObj = api.state.session.get(sid);
+                        const parentID = sessionObj?.parentID;
+                        if (parentID) {
+                            if (!data[parentID])
+                                data[parentID] = { ts: Date.now(), entries: [], scroll: 0, expanded: "", children: {} };
+                            if (!data[parentID].children)
+                                data[parentID].children = {};
+                            if (!data[parentID].children[sid])
+                                data[parentID].children[sid] = { scroll: 0, expanded: "", entries: [] };
+                            data[parentID].children[sid] = { ...data[parentID].children[sid], entries: [...entries.values()] };
+                        }
+                        else {
+                            data[sid] = {
+                                ts: Date.now(),
+                                entries: [...entries.values()],
+                                scroll: data[sid]?.scroll ?? 0,
+                                expanded: data[sid]?.expanded ?? "",
+                                children: data[sid]?.children ?? {},
+                            };
+                        }
                         api.kv.set(`${KV_PREFIX}.session_data`, JSON.stringify(data));
                     }
                     catch { }
@@ -1485,6 +1624,89 @@ const tui = async (api) => {
                 dialog?.clear();
             },
         },
+        {
+            title: "SubAgent Magazine: TTL",
+            value: "subagent-ttl",
+            description: "Set session data retention period (days before auto-cleanup)",
+            slash: { name: "subagent-ttl" },
+            onSelect: (dialog) => {
+                const t = (k) => I18N[signals.lang()][k] ?? k;
+                const curRaw = parseInt(String(api.kv.get(`${KV_PREFIX}.ttl_days`, "3")), 10);
+                const curDays = Number.isNaN(curRaw) ? 3 : curRaw;
+                const curLabel = curDays === 0 ? t("ttl.unlimited") : `${curDays}d`;
+                dialog?.replace(() => (_jsx(api.ui.DialogSelect, { title: `${t("ttl.label")}  (${curLabel})`, options: [
+                        { title: t("ttl.3d"), value: "3" },
+                        { title: t("ttl.7d"), value: "7" },
+                        { title: t("ttl.14d"), value: "14" },
+                        { title: t("ttl.30d"), value: "30" },
+                        { title: t("ttl.unlimited"), value: "0" },
+                    ], onSelect: (opt) => {
+                        const days = parseInt(opt.value, 10);
+                        api.kv.set(`${KV_PREFIX}.ttl_days`, String(days));
+                        const msg = days === 0 ? t("ttl.toast_unlimited") : t("ttl.toast").replace("{n}", String(days));
+                        api.ui.toast({ message: msg });
+                        dialog?.clear();
+                    } })));
+            },
+        },
+        {
+            title: "SubAgent Magazine: Clear Entries",
+            value: "subagent-clear-entries",
+            description: "Delete all sub-agent records for the current session (cannot be undone)",
+            slash: { name: "subagent-clear-entries" },
+            onSelect: (dialog) => {
+                const t = (k) => I18N[signals.lang()][k] ?? k;
+                const sid = signals.sessionId;
+                const sessionObj = api.state.session.get(sid);
+                const parentID = sessionObj?.parentID;
+                // 检查是否存在运行中的条目
+                const cached = globalEntryCache.get(sid);
+                let runningCount = 0;
+                if (cached) {
+                    for (const [, e] of cached) {
+                        if (e.status === "running")
+                            runningCount++;
+                    }
+                }
+                const msg = runningCount > 0
+                    ? t("clear.prompt_running").replace("{n}", String(runningCount))
+                    : t("clear.prompt");
+                dialog?.replace(() => (_jsx(api.ui.DialogConfirm, { title: t("clear.title"), message: msg, onConfirm: () => {
+                        try {
+                            const data = JSON.parse(String(api.kv.get(`${KV_PREFIX}.session_data`, "{}")));
+                            let count = 0;
+                            if (parentID) {
+                                if (data[parentID]?.children?.[sid]) {
+                                    const child = data[parentID].children[sid];
+                                    const ids = child.entries?.map((e) => e.id) ?? [];
+                                    count = ids.length;
+                                    child.entries = [];
+                                    child.scroll = 0;
+                                    child.expanded = "";
+                                    child.clearedIds = [...new Set([...(child.clearedIds ?? []), ...ids])];
+                                }
+                            }
+                            else {
+                                count = data[sid]?.entries?.length ?? 0;
+                                if (data[sid]) {
+                                    const ids = data[sid].entries?.map((e) => e.id) ?? [];
+                                    data[sid].entries = [];
+                                    data[sid].scroll = 0;
+                                    data[sid].expanded = "";
+                                    data[sid].clearedIds = [...new Set([...(data[sid].clearedIds ?? []), ...ids])];
+                                }
+                            }
+                            api.kv.set(`${KV_PREFIX}.session_data`, JSON.stringify(data));
+                            globalEntryCache.delete(sid);
+                            setClearTick((v) => v + 1);
+                            const msg = t("clear.done").replace("{n}", String(count));
+                            api.ui.toast({ message: msg });
+                        }
+                        catch { }
+                        dialog?.clear();
+                    } })));
+            },
+        },
     ]);
 };
 const mod = {