opencode-subagent-magazine 1.6.1 → 1.7.1

package/dist/v2/commands.js

@@ -1,12 +1,16 @@
-import { KV_PREFIX, SETTING_KEYS, loadSessionData, saveSessionData, readTTLDays } from "../core/kv";
+import { TIME_FORMATS, TIME_FORMAT_SAMPLES } from "../core/format";
+import { KV_PREFIX, SETTING_KEYS, updateSessionData, readTTLDays } from "../core/kv";
 import { PLUGIN_VERSION } from "../_version";
 import { LANG_META, createT } from "../i18n";
 import { globalEntryCache, setClearTick } from "../panel/store";
+import { mergeSubEntries } from "../panel/entry-map";
+import { openSettingsMenu } from "./settings-menu";
 /** V2 命令（对齐 V1 的 9 个斜杠命令——promise 式对话框）。 */
 export function makeCommands(context, api, signals) {
     const t = createT(() => signals.lang());
     const kv = api.kv;
     const clampMax = (n) => Math.max(1, Math.min(50, n));
+    const onOff = (v) => (v ? t("settings.on") : t("settings.off"));
     const resolveParent = (sid) => {
         try {
             const session = api.session.get(sid);
@@ -98,6 +102,126 @@ export function makeCommands(context, api, signals) {
                 api.ui.toast(`Max entries: ${n}`);
             },
         },
+        {
+            id: "opencode-subagent-magazine.subagent.config",
+            title: "SubAgent Magazine: Settings",
+            description: "Show current settings (change each via its own command)",
+            slash: { name: "subagent-config" },
+            palette: true,
+            run: () => {
+                const ttl = readTTLDays(kv);
+                const langLabel = LANG_META.find((m) => m.code === signals.lang())?.label ?? signals.lang();
+                const message = [
+                    `${t("settings.lang")}: ${langLabel}`,
+                    `${t("settings.max")}: ${signals.maxEntries()}`,
+                    `${t("settings.order")}: ${signals.sortOrder() === "desc" ? t("order.desc") : t("order.asc")}`,
+                    `${t("settings.scroll")}: ${signals.scrollMode() === "wheel" ? t("scroll.wheel") : t("scroll.click")}`,
+                    `${t("settings.ttl")}: ${ttl === 0 ? t("ttl.unlimited") : `${ttl}d`}`,
+                    `${t("settings.border")}: ${onOff(signals.borderVisible())}`,
+                    `${t("settings.showEntryCost")}: ${onOff(signals.showEntryCost())}`,
+                    `${t("settings.showEntryTime")}: ${onOff(signals.showEntryTime())}`,
+                    `${t("settings.showEntryTokens")}: ${onOff(signals.showEntryTokens())}`,
+                    `${t("settings.showOrigin")}: ${onOff(signals.showOrigin())}`,
+                    `${t("settings.timeFormat")}: ${TIME_FORMAT_SAMPLES[signals.timeFormat()]}`,
+                    `${t("settings.dbSync")}: ${onOff(signals.dbSync())}`,
+                ].join("\n");
+                context.ui.toast.show({ title: t("settings.title"), message });
+            },
+        },
+        {
+            id: "opencode-subagent-magazine.subagent.sections",
+            title: "SubAgent Magazine: Settings Menu",
+            description: "Open the interactive settings menu (Esc to close)",
+            slash: { name: "subagent-sections" },
+            palette: true,
+            run: () => {
+                openSettingsMenu(context, api, signals);
+            },
+        },
+        {
+            id: "opencode-subagent-magazine.subagent.cost",
+            title: "SubAgent Magazine: Toggle Entry Cost",
+            description: "Show or hide the per-sub-agent cost in the sidebar",
+            slash: { name: "subagent-cost" },
+            palette: true,
+            run: () => {
+                const v = !signals.showEntryCost();
+                signals.setShowEntryCost(v);
+                kv.set(SETTING_KEYS.showEntryCost, v);
+                api.ui.toast(`${t("settings.showEntryCost")}: ${onOff(v)}`);
+            },
+        },
+        {
+            id: "opencode-subagent-magazine.subagent.time",
+            title: "SubAgent Magazine: Toggle Entry Time",
+            description: "Show or hide the elapsed time in the sidebar list",
+            slash: { name: "subagent-time" },
+            palette: true,
+            run: () => {
+                const v = !signals.showEntryTime();
+                signals.setShowEntryTime(v);
+                kv.set(SETTING_KEYS.showEntryTime, v);
+                api.ui.toast(`${t("settings.showEntryTime")}: ${onOff(v)}`);
+            },
+        },
+        {
+            id: "opencode-subagent-magazine.subagent.time-format",
+            title: "SubAgent Magazine: Time Format",
+            description: "Set how elapsed time is displayed (short / decimal / clock / compact / seconds)",
+            slash: { name: "subagent-time-format" },
+            palette: true,
+            run: async () => {
+                const picked = await context.ui.dialog.select({
+                    title: t("settings.timeFormat"),
+                    options: TIME_FORMATS.map((f) => ({ title: `${f} — ${TIME_FORMAT_SAMPLES[f]}`, value: f })),
+                    current: signals.timeFormat(),
+                });
+                if (!picked)
+                    return;
+                signals.setTimeFormat(picked);
+                kv.set(SETTING_KEYS.timeFormat, picked);
+                api.ui.toast(`${t("settings.timeFormat")}: ${TIME_FORMAT_SAMPLES[picked]}`);
+            },
+        },
+        {
+            id: "opencode-subagent-magazine.subagent.tokens",
+            title: "SubAgent Magazine: Toggle Entry Tokens",
+            description: "Show or hide the token count in the sidebar list",
+            slash: { name: "subagent-tokens" },
+            palette: true,
+            run: () => {
+                const v = !signals.showEntryTokens();
+                signals.setShowEntryTokens(v);
+                kv.set(SETTING_KEYS.showEntryTokens, v);
+                api.ui.toast(`${t("settings.showEntryTokens")}: ${onOff(v)}`);
+            },
+        },
+        {
+            id: "opencode-subagent-magazine.subagent.origin",
+            title: "SubAgent Magazine: Toggle Origin Indicators",
+            description: "Show or hide origin markers (⇢ background / ↳ spawned) in the sidebar list",
+            slash: { name: "subagent-origin" },
+            palette: true,
+            run: () => {
+                const v = !signals.showOrigin();
+                signals.setShowOrigin(v);
+                kv.set(SETTING_KEYS.showOrigin, v);
+                api.ui.toast(`${t("settings.showOrigin")}: ${onOff(v)}`);
+            },
+        },
+        {
+            id: "opencode-subagent-magazine.subagent.db",
+            title: "SubAgent Magazine: Toggle Local DB",
+            description: "Enrich sub-agent entries from the local OpenCode database (V2)",
+            slash: { name: "subagent-db" },
+            palette: true,
+            run: () => {
+                const v = !signals.dbSync();
+                signals.setDbSync(v);
+                kv.set(SETTING_KEYS.dbSync, v);
+                api.ui.toast(`${t("settings.dbSync")}: ${onOff(v)}`);
+            },
+        },
         {
             id: "opencode-subagent-magazine.subagent.version",
             title: "SubAgent Magazine: Version",
@@ -140,33 +264,53 @@ export function makeCommands(context, api, signals) {
                     }
                 }
                 if (count > 0) {
+                    const ok = () => api.ui.toast(signals.lang() === "zh"
+                        ? `已标记 ${count} 个运行中的条目为完成`
+                        : `Marked ${count} running entries as done`);
+                    const fail = () => {
+                        try {
+                            api.ui.toast(t("clear.failed"));
+                        }
+                        catch { }
+                    };
                     try {
-                        const data = loadSessionData(kv);
                         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()] };
+                        const done = updateSessionData(kv, (data) => {
+                            // 落定前先把（可能过期的）模块缓存与持久化记录
+                            // merge：其他实例可能有本实例从未见过的条目，
+                            // 这次写入不能把它们丢掉。
+                            if (isChild) {
+                                if (!data[parentSid])
+                                    data[parentSid] = { ts: Date.now(), entries: [], scroll: 0, expanded: "", children: {} };
+                                if (!data[parentSid].children)
+                                    data[parentSid].children = {};
+                                const prev = data[parentSid].children[sid]?.entries ?? [];
+                                const merged = [...mergeSubEntries(prev, entries.values()).values()].map((e) => e.status === "running" || e.status === "cancel_requested"
+                                    ? { ...e, status: "done", endedAt: e.endedAt ?? Date.now() }
+                                    : e);
+                                data[parentSid].children[sid] = {
+                                    ...(data[parentSid].children[sid] ?? { scroll: 0, expanded: "" }),
+                                    entries: merged,
+                                };
+                            }
+                            else {
+                                const rec = data[parentSid] ?? { ts: Date.now(), entries: [], scroll: 0, expanded: "", children: {} };
+                                const merged = [...mergeSubEntries(rec.entries ?? [], entries.values()).values()].map((e) => e.status === "running" || e.status === "cancel_requested"
+                                    ? { ...e, status: "done", endedAt: e.endedAt ?? Date.now() }
+                                    : e);
+                                data[parentSid] = { ...rec, ts: Date.now(), entries: merged, children: rec.children ?? {} };
+                            }
+                        });
+                        if (done && typeof done.then === "function") {
+                            void done.then(ok, fail);
                         }
                         else {
-                            data[sid] = {
-                                ts: Date.now(),
-                                entries: [...entries.values()],
-                                scroll: data[sid]?.scroll ?? 0,
-                                expanded: data[sid]?.expanded ?? "",
-                                children: data[sid]?.children ?? {},
-                            };
+                            ok();
                         }
-                        saveSessionData(kv, data);
                     }
-                    catch { }
-                    api.ui.toast(signals.lang() === "zh"
-                        ? `已标记 ${count} 个运行中的条目为完成`
-                        : `Marked ${count} running entries as done`);
+                    catch {
+                        fail();
+                    }
                 }
                 else {
                     api.ui.toast(signals.lang() === "zh" ? "没有需要清理的运行中条目" : "No running entries to clear");
@@ -227,33 +371,47 @@ export function makeCommands(context, api, signals) {
                 if (choice !== "yes")
                     return;
                 try {
-                    const data = loadSessionData(kv);
                     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])];
+                    const finish = () => {
+                        globalEntryCache.delete(sid);
+                        setClearTick((v) => v + 1);
+                        api.ui.toast(t("clear.done", { n: count }));
+                    };
+                    const done = updateSessionData(kv, (data) => {
+                        if (parentID) {
+                            const child = data[parentID]?.children?.[sid];
+                            if (child) {
+                                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 {
+                            const rec = data[sid];
+                            if (rec) {
+                                const ids = rec.entries?.map((e) => e.id) ?? [];
+                                count = ids.length;
+                                rec.entries = [];
+                                rec.scroll = 0;
+                                rec.expanded = "";
+                                rec.clearedIds = [...new Set([...(rec.clearedIds ?? []), ...ids])];
+                            }
+                        }
+                    });
+                    if (done && typeof done.then === "function") {
+                        void done.then(finish, () => {
+                            try {
+                                api.ui.toast(t("clear.failed"));
+                            }
+                            catch { }
+                        });
                     }
                     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])];
-                        }
+                        finish();
                     }
-                    saveSessionData(kv, data);
-                    globalEntryCache.delete(sid);
-                    setClearTick((v) => v + 1);
-                    api.ui.toast(t("clear.done", { n: count }));
                 }
                 catch { }
             },

package/dist/v2/db.d.ts

@@ -0,0 +1,60 @@
+/**
+ * 本地 opencode.db 只读索引（V2）。
+ *
+ * 宿主数据层只为当前 TUI 已加载的会话缓存消息：前台子代理（非 background）
+ * 的 success 事件经常拿不到 metadata.sessionID，条目会一直停在 running，
+ * model/tokens/cost 也无法回填。这些数据在宿主数据库里是完整的：
+ * - 父会话 assistant 消息中，工具 part 的 state.metadata.sessionID 指向子会话（前台/后台都有）；
+ * - session_v2 保存子会话的 agent/model/tokens/cost 与 time_idle/idle_outcome。
+ *
+ * 本模块以只读方式查询该库作为补充数据源；bun:sqlite 不可用、库不存在或
+ * 设置项 dbSync 关闭时静默禁用（回退宿主 API）。库结构属于宿主内部实现，
+ * 任何读取失败都返回 undefined，绝不影响面板其余功能。
+ */
+export interface ChildSessionInfo {
+    id: string;
+    parentId?: string;
+    agent?: string;
+    title?: string;
+    model?: string;
+    cost?: number;
+    tokens?: number;
+    timeCreated?: number;
+    timeIdle?: number;
+    idleOutcome?: string;
+    /** 仍在运行：最后一条消息晚于 time_idle（会话被恢复时 time_idle 不会被清空）。 */
+    active?: boolean;
+}
+export interface SessionDbIndex {
+    /** 数据库可用且设置项开启时为 true。 */
+    enabled(): boolean;
+    /** call id → 子会话 id（前台/后台通用）。 */
+    resolveCall(parentId: string, callId: string): string | undefined;
+    /** 无 call id 时的兜底：按 agent + 起始时间匹配子会话。 */
+    matchChild(parentId: string, agent: string | undefined, startedAt: number | undefined): string | undefined;
+    /** 子会话汇总（model/tokens/cost/time_idle）。 */
+    info(sid: string): ChildSessionInfo | undefined;
+    /** 该会话派生的子会话（spawn），用于补全没有工具条目的衍生会话。 */
+    children(parentId: string): ChildSessionInfo[] | undefined;
+}
+/** 从宿主 model 字段提取模型 id。
+ *  兼容三种形态：名字字符串、{ id } 对象，以及序列化后的 JSON 字符串
+ *  （session_v2.model 列存的就是 `{"id":...}` 文本）。 */
+export declare function modelIdOf(value: unknown): string | undefined;
+/** 宿主 readSessionTokens 同语义：最后一条 assistant 消息的上下文规模。 */
+export declare function contextTokens(tokens: unknown): number | undefined;
+/** 子会话是否仍在运行。
+ *  恢复过的会话会保留旧的 time_idle（host 不清空），因此以
+ *  「最后一条消息是否晚于 time_idle」为准；最后一条是 idle
+ *  消息则视为已停止。 */
+export declare function isSessionActive(input: {
+    timeIdle?: number;
+    lastMessageType?: string;
+    lastMessageAt?: number;
+}): boolean;
+/** 子会话终态：time_idle 存在且没有恢复活动才算结束；interrupted 视为取消。
+ *  没有 time_idle 时不作判断（交给宿主实时状态）——避免时间阈值猜测。 */
+export declare function statusOfChild(info: ChildSessionInfo | undefined): "done" | "cancelled" | undefined;
+/** 定位宿主数据库（可用 OPENCODE_DB 覆盖，遵循 XDG_DATA_HOME）。 */
+export declare function findDbPath(env?: Record<string, string | undefined>, home?: string): string | undefined;
+export declare function createSessionDbIndex(enabled: () => boolean): SessionDbIndex | undefined;