opencode-subagent-magazine 1.6.1 → 1.7.1

package/dist/v2/v2-panel-api.js

@@ -1,3 +1,5 @@
+import { SETTING_KEYS } from "../core/kv";
+import { createSessionDbIndex, modelIdOf, statusOfChild } from "./db";
 const SUBAGENT_TOOL_V2 = "subagent";
 /** V2 tool metadata → V1 形状（V1 逻辑读 session_id/sessionId——双写保证命中）。 */
 function normalizeMeta(meta) {
@@ -22,7 +24,12 @@ function toV1Part(p) {
                 .filter((t) => typeof t === "string" && t.length > 0)
                 .join("\n");
         }
-        return { type: "tool", tool: p.tool ?? p.name, state: st, subagent_type: p.subagent_type, metadata: normalizeMeta(p.metadata) };
+        // TUI 数据层把子代理 metadata 放在 part 级，旧缓存形状可能嵌在 state 里——两处合并后再双写。
+        const meta = normalizeMeta({
+            ...(st.metadata ?? {}),
+            ...(p.metadata ?? {}),
+        });
+        return { type: "tool", id: p.id, tool: p.tool ?? p.name, state: st, subagent_type: p.subagent_type, metadata: meta };
     }
     if (p.type === "text")
         return { type: "text", text: String(p.text ?? "") };
@@ -71,7 +78,73 @@ export function createPanelApi(context, settings) {
         const [, mutate] = entry;
         return mutate((d) => { d.value = value; });
     };
+    // 原子 read-modify-write：宿主在存储锁内基于最新磁盘值
+    // 应用 updater，因此并发 TUI 实例会 merge，
+    // 而不是用过期快照互相覆盖。
+    const kvUpdate = (key, updater) => {
+        let entry = kvStore.get(key);
+        if (!entry) {
+            const created = context.storage.store(`subagent_magazine.${key}`, {
+                initial: { value: undefined },
+            });
+            entry = created;
+            kvStore.set(key, entry);
+        }
+        const [, mutate] = entry;
+        return mutate((d) => { d.value = updater(d.value); });
+    };
+    // 本地 opencode.db 索引：补全前台子代理缺失的 sessionId 与用量字段。
+    // 数据库不可用、库结构不符或设置项 dbSync 关闭时静默禁用（回退宿主 API）。
+    const dbIndex = createSessionDbIndex(() => kvGet(SETTING_KEYS.dbSync, true) !== false);
+    /** 事件 metadata 缺少子会话 id 时用本地库按 call id 回填（前台/后台通用）。 */
+    const withResolvedSid = (data, meta) => {
+        if (meta.sessionID !== undefined)
+            return meta;
+        try {
+            const parent = data.sessionID !== undefined ? String(data.sessionID) : "";
+            const callId = data.id !== undefined ? String(data.id) : "";
+            const sid = parent && callId ? dbIndex?.resolveCall(parent, callId) : undefined;
+            if (sid)
+                return normalizeMeta({ ...meta, sessionID: sid });
+        }
+        catch { }
+        return meta;
+    };
     const isSubagentTool = (name) => name === SUBAGENT_TOOL_V2 || name === "task" || name === "delegate" || name === "call_omo_agent";
+    /** 事件未携带工具名/input 时，从宿主消息缓存中恢复。
+     *  V2 的 called/progress/success 事件没有 `name`，且
+     *  input.started 可能被错过（TUI 启动、插件重载、流抖动）——
+     *  没有这个回退，运行中的子代理要到完成时才会出现。 */
+    const findToolPart = (data) => {
+        const sid = data.sessionID;
+        const msgID = data.assistantMessageID;
+        const partID = data.id;
+        if (sid === undefined || msgID === undefined || partID === undefined)
+            return undefined;
+        try {
+            const raw = context.data.session.message.list(String(sid));
+            if (!raw)
+                return undefined;
+            for (let i = raw.length - 1; i >= 0; i--) {
+                const m = raw[i];
+                if (!m || String(m.id) !== String(msgID))
+                    continue;
+                const content = Array.isArray(m.content) ? m.content : [];
+                for (const p of content) {
+                    const pp = p;
+                    if (pp && pp.type === "tool" && String(pp.id) === String(partID)) {
+                        const st = (pp.state ?? {});
+                        const input = (st.input && typeof st.input === "object") ? st.input : undefined;
+                        const name = pp.name ?? pp.tool;
+                        return { name: name !== undefined ? String(name) : undefined, input };
+                    }
+                }
+                break;
+            }
+        }
+        catch { }
+        return undefined;
+    };
     /** V2 tool 事件 → V1 ToolPart（非 subagent 工具返回 undefined——面板只关心子代理）。
      *  识别规则（对齐 V2 官方 stream-v2.subagent.ts）：
      *  - input.started/called：工具名在 subagent 集合（subagent/task/delegate/call_omo_agent）
@@ -100,47 +173,83 @@ export function createPanelApi(context, settings) {
             return { type: "tool", tool: normName(String(data.name)), id: String(data.id), state: { status: "pending", input: {} } };
         }
         if (type === "session.tool.called") {
-            const name = data.name ?? info?.name;
+            let name = data.name ?? info?.name;
+            let input = data.input ?? info?.input;
+            if (!name) {
+                const resolved = findToolPart(data);
+                if (resolved?.name) {
+                    name = resolved.name;
+                    if (input === undefined)
+                        input = resolved.input;
+                }
+            }
             if (name && !isSubagentTool(name))
                 return undefined;
             if (!name)
                 return undefined;
             if (key)
-                toolInfo.set(key, { name: String(name), input: data.input ?? {} });
+                toolInfo.set(key, { name: String(name), input: input ?? {} });
             return {
-                type: "tool", tool: normName(String(name)), id: String(data.id), subagent_type: agentOf(data.input),
-                state: { status: "running", input: data.input ?? {}, metadata: {} },
+                type: "tool", tool: normName(String(name)), id: String(data.id), subagent_type: agentOf(input),
+                state: { status: "running", input: input ?? {}, metadata: withResolvedSid(data, {}) },
             };
         }
         if (type === "session.tool.progress") {
-            const name = data.name ?? info?.name;
+            let name = data.name ?? info?.name;
+            if (!name)
+                name = findToolPart(data)?.name;
             if (name && !isSubagentTool(name))
                 return undefined;
             if (!name)
                 return undefined;
             return {
                 type: "tool", tool: normName(String(name)), id: String(data.id), subagent_type: agentOf(info?.input),
-                state: { status: "running", input: info?.input ?? {}, metadata: normalizeMeta(data.metadata) },
+                state: { status: "running", input: info?.input ?? {}, metadata: withResolvedSid(data, normalizeMeta(data.metadata)) },
             };
         }
         if (type === "session.tool.success" || type === "session.tool.failed") {
-            const meta = normalizeMeta(data.metadata);
-            if (meta.sessionID === undefined)
-                return undefined;
+            const eventMeta = normalizeMeta(data.metadata);
+            const meta = withResolvedSid(data, eventMeta);
             // 取消导致的工具失败：metadata.status 是工具被打断时的状态（"running"）——不是真错误。
             // 忽略——最终状态由 execution.interrupted → settleOnIdle 裁定 cancelled
             // （否则 handlePartUpdated 的 error 分支会把 cancel_requested 覆盖成 error）
             if (type === "session.tool.failed" && meta.status === "running")
                 return undefined;
-            const name = data.name ?? info?.name;
+            let name = data.name ?? info?.name;
+            let input = info?.input ?? data.input;
+            if (!name || input === undefined) {
+                const resolved = findToolPart(data);
+                if (!name && resolved?.name)
+                    name = resolved.name;
+                if (input === undefined && resolved?.input)
+                    input = resolved.input;
+            }
             if (name && !isSubagentTool(name))
                 return undefined;
-            const input = info?.input ?? data.input ?? {};
+            if (key && name)
+                toolInfo.set(key, { name: String(name), input: input ?? info?.input ?? {} });
+            const finalInput = input ?? {};
+            // 后台任务缺少子会话 metadata 时无法判定终态，交给扫描/轮询兜底；
+            // 前台任务没有 sessionID 也必须回传 completed，否则条目会一直停在 running。
+            if (meta.sessionID === undefined && (finalInput.background === true || finalInput.run_in_background === true)) {
+                return undefined;
+            }
+            // sid 来自本地库（事件没带）时以库里的 time_idle 为准：库里会话仍在运行
+            // 就不提前收尾，交给周期性 reconcile 按真实状态落定（无时间阈值猜测）。
+            let status = type === "session.tool.failed" ? "error" : "completed";
+            if (meta.sessionID !== undefined && meta.sessionID !== eventMeta.sessionID) {
+                try {
+                    const childInfo = dbIndex?.info(String(meta.sessionID));
+                    if (childInfo && statusOfChild(childInfo) === undefined)
+                        status = "running";
+                }
+                catch { }
+            }
             return {
-                type: "tool", tool: normName(String(name ?? "task")), id: String(data.id), subagent_type: agentOf(input),
+                type: "tool", tool: normName(String(name ?? "task")), id: String(data.id), subagent_type: agentOf(finalInput),
                 state: {
-                    status: type === "session.tool.failed" ? "error" : "completed",
-                    input,
+                    status,
+                    input: finalInput,
                     metadata: meta,
                 },
             };
@@ -163,15 +272,66 @@ export function createPanelApi(context, settings) {
         }
         return out;
     };
+    // ── usage enrichment（用量补全）──
+    // TUI 数据层只为已加载的会话缓存 messages。从 KV 恢复的
+    // 子会话通常没有缓存，因此读取依次回退到
+    // 会话级聚合值、最后是（限流的）message sync——
+    // 结果写入本地缓存，供面板的周期性 enrichment 读取。
+    const usageCache = new Map();
+    const syncRequestedAt = new Map();
+    const USAGE_CACHE_TTL_MS = 5000;
+    const SYNC_THROTTLE_MS = 30000;
+    const rememberUsage = (sid, patch) => {
+        const prev = usageCache.get(sid);
+        usageCache.set(sid, { ...prev, ...patch, at: Date.now() });
+    };
+    const cachedUsage = (sid) => {
+        const hit = usageCache.get(sid);
+        if (!hit)
+            return undefined;
+        if (Date.now() - hit.at > USAGE_CACHE_TTL_MS)
+            return undefined;
+        return hit;
+    };
+    const requestMessageSync = (sid) => {
+        const last = syncRequestedAt.get(sid) ?? 0;
+        if (Date.now() - last < SYNC_THROTTLE_MS)
+            return;
+        syncRequestedAt.set(sid, Date.now());
+        try {
+            const sync = context.data.session.message.sync;
+            if (typeof sync === "function")
+                void sync.call(context.data.session.message, sid).catch(() => { });
+        }
+        catch { }
+    };
+    const listedSession = (sid) => {
+        try {
+            return context.data.session.list()?.find((s) => s.id === sid);
+        }
+        catch {
+            return undefined;
+        }
+    };
     return {
         kv: {
             get: kvGet,
             set: kvSet,
+            update: kvUpdate,
         },
         usage: {
             readSessionTokens: (sid) => {
                 if (!sid)
                     return undefined;
+                // 本地库优先：宿主数据层缺少该子会话缓存时也能给出用量。
+                try {
+                    const dbTokens = dbIndex?.info(sid)?.tokens;
+                    if (dbTokens !== undefined) {
+                        rememberUsage(sid, { tokens: dbTokens });
+                        return dbTokens;
+                    }
+                }
+                catch { }
                 try {
                     const msgs = context.data.session.message.list(sid);
                     if (msgs) {
@@ -187,10 +347,18 @@ export function createPanelApi(context, settings) {
                                 (Number(t.reasoning) || 0) +
                                 (Number(t.cache?.read) || 0) +
                                 (Number(t.cache?.write) || 0);
-                            if (ctx > 0)
+                            if (ctx > 0) {
+                                rememberUsage(sid, { tokens: ctx });
                                 return ctx;
+                            }
                         }
                     }
+                    // 本地无消息（子会话尚未加载）：使用最近同步的值，
+                    // 否则请数据层同步，稍后重试。
+                    const cached = cachedUsage(sid)?.tokens;
+                    if (cached !== undefined)
+                        return cached;
+                    requestMessageSync(sid);
                     return undefined;
                 }
                 catch {
@@ -200,19 +368,56 @@ export function createPanelApi(context, settings) {
             readSessionCost: (sid) => {
                 if (!sid)
                     return undefined;
+                try {
+                    const dbCost = dbIndex?.info(sid)?.cost;
+                    if (dbCost !== undefined) {
+                        rememberUsage(sid, { cost: dbCost });
+                        return dbCost;
+                    }
+                }
+                catch { }
+                try {
+                    const direct = context.data.session.cost(sid);
+                    if (typeof direct === "number" && direct > 0) {
+                        rememberUsage(sid, { cost: direct });
+                        return direct;
+                    }
+                }
+                catch { }
                 try {
                     const session = context.data.session.get(sid);
-                    if (session?.cost != null && session.cost > 0)
+                    if (session?.cost != null && session.cost > 0) {
+                        rememberUsage(sid, { cost: session.cost });
                         return session.cost;
+                    }
+                    const listed = listedSession(sid);
+                    if (listed?.cost != null && listed.cost > 0) {
+                        rememberUsage(sid, { cost: listed.cost });
+                        return listed.cost;
+                    }
                     const msgs = context.data.session.message.list(sid);
-                    if (!msgs)
-                        return undefined;
-                    let total = 0;
-                    for (const m of msgs) {
-                        if (m.type === "assistant" && typeof m.cost === "number")
-                            total += m.cost;
+                    if (Array.isArray(msgs) && msgs.length > 0) {
+                        let total = 0;
+                        let sawAssistant = false;
+                        for (const m of msgs) {
+                            if (m.type !== "assistant")
+                                continue;
+                            sawAssistant = true;
+                            if (typeof m.cost === "number")
+                                total += m.cost;
+                        }
+                        // 已加载的历史是权威来源：assistant 消息 cost 为 0 表示
+                        // 该会话确实免费（如 budget/test 模型），而非未知。
+                        if (sawAssistant) {
+                            rememberUsage(sid, { cost: total });
+                            return total;
+                        }
                     }
-                    return total > 0 ? total : undefined;
+                    const cached = cachedUsage(sid)?.cost;
+                    if (cached !== undefined)
+                        return cached;
+                    requestMessageSync(sid);
+                    return undefined;
                 }
                 catch {
                     return undefined;
@@ -221,6 +426,14 @@ export function createPanelApi(context, settings) {
             readSessionModel: (sid) => {
                 if (!sid)
                     return undefined;
+                try {
+                    const dbModel = dbIndex?.info(sid)?.model;
+                    if (dbModel !== undefined) {
+                        rememberUsage(sid, { model: dbModel });
+                        return dbModel;
+                    }
+                }
+                catch { }
                 try {
                     const msgs = context.data.session.message.list(sid);
                     if (msgs) {
@@ -228,13 +441,27 @@ export function createPanelApi(context, settings) {
                             const m = msgs[i];
                             if (m.type !== "assistant")
                                 continue;
-                            const model = m.model;
-                            if (typeof model === "string")
-                                return model;
-                            if (model?.id)
-                                return String(model.id);
+                            const id = modelIdOf(m.model);
+                            if (id) {
+                                rememberUsage(sid, { model: id });
+                                return id;
+                            }
                         }
                     }
+                    const sessionModel = modelIdOf(context.data.session.get(sid)?.model);
+                    if (sessionModel) {
+                        rememberUsage(sid, { model: sessionModel });
+                        return sessionModel;
+                    }
+                    const listedModel = modelIdOf(listedSession(sid)?.model);
+                    if (listedModel) {
+                        rememberUsage(sid, { model: listedModel });
+                        return listedModel;
+                    }
+                    const cached = cachedUsage(sid)?.model;
+                    if (cached !== undefined)
+                        return cached;
+                    requestMessageSync(sid);
                     return undefined;
                 }
                 catch {
@@ -244,24 +471,48 @@ export function createPanelApi(context, settings) {
             readSessionTodo: () => undefined, // V2 无 todo 数据源
         },
         session: {
-            get: (sid) => { try {
-                return context.data.session.get(sid);
-            }
-            catch {
-                return undefined;
-            } },
-            status: (sid) => {
+            get: (sid) => {
                 try {
-                    const st = context.data.session.status(sid);
-                    // V2 的 "running" 等价 V1 的 "busy"（cancelEntry 检查 `st.type !== "busy"`——
-                    // 不映射会跳过取消流程直接标记 done）
-                    const type = st === "running" ? "busy" : st ?? "";
-                    return { type };
+                    const direct = context.data.session.get(sid);
+                    if (direct)
+                        return direct;
+                    // 较旧的子会话可能未注入本地缓存；回退到
+                    // 会话列表，保证基于 parentID 的路由继续工作。
+                    const list = context.data.session.list?.();
+                    if (Array.isArray(list)) {
+                        const found = list.find((s) => s?.id === sid);
+                        if (found)
+                            return found;
+                    }
+                    return undefined;
                 }
                 catch {
                     return undefined;
                 }
             },
+            status: (sid) => {
+                try {
+                    const st = context.data.session.status(sid);
+                    if (st) {
+                        // V2 的 "running" 等价 V1 的 "busy"（cancelEntry 检查 `st.type !== "busy"`——
+                        // 不映射会跳过取消流程直接标记 done）
+                        const type = st === "running" ? "busy" : st;
+                        return { type };
+                    }
+                }
+                catch { }
+                // 宿主没有该子会话的实时状态（未加载缓存）时用本地库终态兜底：
+                // time_idle 存在且没有恢复活动即已结束；仍在运行则回报 busy。
+                try {
+                    const info = dbIndex?.info(sid);
+                    if (info?.active === true)
+                        return { type: "busy" };
+                    if (statusOfChild(info) !== undefined)
+                        return { type: "idle" };
+                }
+                catch { }
+                return undefined;
+            },
             messages: (sid) => { try {
                 return normalizeMessages(sid);
             }
@@ -280,6 +531,25 @@ export function createPanelApi(context, settings) {
                 }
                 return msg.content.map((p) => toV1Part(p));
             },
+            resolveChild: (input) => {
+                try {
+                    const sid = input.callId ? dbIndex?.resolveCall(input.parentId, input.callId) : undefined;
+                    if (sid)
+                        return sid;
+                    return dbIndex?.matchChild(input.parentId, input.agent, input.startedAt);
+                }
+                catch {
+                    return undefined;
+                }
+            },
+            listChildren: (parentId) => {
+                try {
+                    return dbIndex?.enabled() ? dbIndex.children(parentId) : undefined;
+                }
+                catch {
+                    return undefined;
+                }
+            },
         },
         event: {
             on: (type, cb) => {
@@ -289,12 +559,13 @@ export function createPanelApi(context, settings) {
                         for (const evt of ["session.tool.input.started", "session.tool.called", "session.tool.progress", "session.tool.success", "session.tool.failed"]) {
                             unsubs.push(context.data.on(evt, (e) => {
                                 const part = toolEventToPart(e);
-                                if (!part)
+                                const evtData = e.data;
+                                if (!part) {
                                     return;
+                                }
                                 // V2 事件流是全局的（跨所有会话）；把发起会话 ID 一并传给面板，
                                 // 让面板只归账到正在查看的会话（V1 宿主已按会话 scope，无需该字段）。
-                                const evt = e.data;
-                                const sid = evt?.sessionID !== undefined ? String(evt.sessionID) : undefined;
+                                const sid = evtData?.sessionID !== undefined ? String(evtData.sessionID) : undefined;
                                 if (!sid)
                                     return;
                                 cb({ type, scope: "global", payload: { part, sessionID: sid } });