opencode-subagent-magazine 1.7.0 → 1.7.1

package/dist/v2/commands.js

@@ -121,6 +121,7 @@ export function makeCommands(context, api, signals) {
                     `${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");
@@ -195,6 +196,19 @@ export function makeCommands(context, api, signals) {
                 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",

package/dist/v2/db.d.ts

@@ -22,6 +22,8 @@ export interface ChildSessionInfo {
     timeCreated?: number;
     timeIdle?: number;
     idleOutcome?: string;
+    /** 仍在运行：最后一条消息晚于 time_idle（会话被恢复时 time_idle 不会被清空）。 */
+    active?: boolean;
 }
 export interface SessionDbIndex {
     /** 数据库可用且设置项开启时为 true。 */
@@ -32,6 +34,8 @@ export interface SessionDbIndex {
     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 字符串
@@ -39,7 +43,16 @@ export interface SessionDbIndex {
 export declare function modelIdOf(value: unknown): string | undefined;
 /** 宿主 readSessionTokens 同语义：最后一条 assistant 消息的上下文规模。 */
 export declare function contextTokens(tokens: unknown): number | undefined;
-/** 子会话终态：time_idle 存在才算结束；interrupted 视为取消。
+/** 子会话是否仍在运行。
+ *  恢复过的会话会保留旧的 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）。 */

package/dist/v2/db.js

@@ -58,10 +58,28 @@ export function contextTokens(tokens) {
         (Number(cache.write) || 0);
     return sum > 0 ? sum : undefined;
 }
-/** 子会话终态：time_idle 存在才算结束；interrupted 视为取消。
+/** 子会话是否仍在运行。
+ *  恢复过的会话会保留旧的 time_idle（host 不清空），因此以
+ *  「最后一条消息是否晚于 time_idle」为准；最后一条是 idle
+ *  消息则视为已停止。 */
+export function isSessionActive(input) {
+    const { timeIdle, lastMessageType, lastMessageAt } = input;
+    if (lastMessageType === "idle")
+        return false;
+    if (lastMessageAt === undefined)
+        return false;
+    if (timeIdle === undefined)
+        return true;
+    return lastMessageAt > timeIdle;
+}
+/** 子会话终态：time_idle 存在且没有恢复活动才算结束；interrupted 视为取消。
  *  没有 time_idle 时不作判断（交给宿主实时状态）——避免时间阈值猜测。 */
 export function statusOfChild(info) {
-    if (!info || info.timeIdle == null)
+    if (!info)
+        return undefined;
+    if (info.active === true)
+        return undefined;
+    if (info.timeIdle == null)
         return undefined;
     return info.idleOutcome === "interrupted" ? "cancelled" : "done";
 }
@@ -104,11 +122,19 @@ const LAST_ASSISTANT_SQL = `
   FROM session_message
   WHERE session_id = ? AND type = 'assistant' AND json_extract(data, '$.tokens.output') > 0
   ORDER BY seq DESC LIMIT 1`;
+const LAST_MESSAGE_SQL = `
+  SELECT type, COALESCE(time_updated, time_created) AS at
+  FROM session_message WHERE session_id = ? ORDER BY seq DESC LIMIT 1`;
 const ASSISTANT_COST_SQL = `
   SELECT COUNT(*) AS n, SUM(COALESCE(json_extract(data, '$.cost'), 0)) AS total
   FROM session_message WHERE session_id = ? AND type = 'assistant'`;
 const CHILDREN_SQL = `
-  SELECT id, agent, time_created FROM session_v2 WHERE parent_id = ? ORDER BY time_created`;
+  SELECT id, agent, title, model, cost,
+         tokens_input, tokens_output, tokens_reasoning, tokens_cache_read, tokens_cache_write,
+         time_created, time_idle, idle_outcome
+  FROM session_v2
+  WHERE parent_id = ? AND (fork_session_id IS NULL OR fork_session_id = '')
+  ORDER BY time_created`;
 const num = (v) => {
     const n = Number(v);
     return Number.isFinite(n) ? n : undefined;
@@ -225,6 +251,7 @@ export function createSessionDbIndex(enabled) {
             const row = db.query(CHILD_INFO_SQL).get(sid);
             if (row) {
                 const last = db.query(LAST_ASSISTANT_SQL).get(sid);
+                const lastMsg = db.query(LAST_MESSAGE_SQL).get(sid);
                 let tokens = contextTokens(last ? {
                     input: last.input, output: last.output, reasoning: last.reasoning,
                     cache: { read: last.cache_read, write: last.cache_write },
@@ -254,6 +281,11 @@ export function createSessionDbIndex(enabled) {
                     timeCreated: num(row.time_created),
                     timeIdle: num(row.time_idle),
                     idleOutcome: str(row.idle_outcome),
+                    active: isSessionActive({
+                        timeIdle: num(row.time_idle),
+                        lastMessageType: str(lastMsg?.type),
+                        lastMessageAt: num(lastMsg?.at),
+                    }),
                 };
             }
         }
@@ -263,5 +295,47 @@ export function createSessionDbIndex(enabled) {
         infos.set(sid, { info: result, at: Date.now() });
         return result;
     };
-    return { enabled: ready, resolveCall, matchChild, info };
+    const children = (parentId) => {
+        if (!ready() || !parentId)
+            return undefined;
+        const now = Date.now();
+        let cached = childrenCache.get(parentId);
+        if (!cached || now - cached.at > CALL_MAP_TTL_MS) {
+            let list = [];
+            try {
+                list = db.query(CHILDREN_SQL).all(parentId);
+            }
+            catch { }
+            cached = { list, at: now };
+            childrenCache.set(parentId, cached);
+        }
+        const out = [];
+        for (const row of cached.list) {
+            const sid = str(row.id);
+            if (!sid)
+                continue;
+            const full = info(sid);
+            if (full) {
+                out.push(full);
+                continue;
+            }
+            // info 缓存未命中时不丢字段：用列表行自身的汇总兜底。
+            const agg = (num(row.tokens_input) || 0) + (num(row.tokens_output) || 0) + (num(row.tokens_reasoning) || 0) +
+                (num(row.tokens_cache_read) || 0) + (num(row.tokens_cache_write) || 0);
+            out.push({
+                id: sid,
+                parentId,
+                agent: str(row.agent),
+                title: str(row.title),
+                model: modelIdOf(row.model),
+                cost: num(row.cost),
+                tokens: agg > 0 ? agg : undefined,
+                timeCreated: num(row.time_created),
+                timeIdle: num(row.time_idle),
+                idleOutcome: str(row.idle_outcome),
+            });
+        }
+        return out;
+    };
+    return { enabled: ready, resolveCall, matchChild, info, children };
 }

package/dist/v2/index.js

@@ -18,7 +18,7 @@ function CommandRoot(props) {
 }
 /** 面板根组件：渲染共享 SubAgentPanel（命令层见 CommandRoot）。 */
 function PluginRoot(props) {
-    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, showEntryCost: props.signals.showEntryCost, showEntryTime: props.signals.showEntryTime, showEntryTokens: props.signals.showEntryTokens, timeFormat: props.signals.timeFormat, 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, showEntryCost: props.signals.showEntryCost, showEntryTime: props.signals.showEntryTime, showEntryTokens: props.signals.showEntryTokens, timeFormat: props.signals.timeFormat, showOrigin: props.signals.showOrigin, sessionId: props.sessionID }));
 }
 /** V2 入口：setup 创建共享信号 + PanelApi + 命令 layer + 侧边栏槽位。
  *  行为对齐 V1 tui()（信号初始值从 KV 恢复；侧边栏渲染共享 SubAgentPanel）。 */
@@ -49,6 +49,7 @@ const mod = {
         const [showEntryTokensSignal, setShowEntryTokens] = createSignal(api.kv.get(SETTING_KEYS.showEntryTokens, true) !== false);
         const storedTimeFormat = String(api.kv.get(SETTING_KEYS.timeFormat, "short"));
         const [timeFormatSignal, setTimeFormat] = createSignal(TIME_FORMATS.includes(storedTimeFormat) ? storedTimeFormat : "short");
+        const [showOriginSignal, setShowOrigin] = createSignal(api.kv.get(SETTING_KEYS.showOrigin, false) === true);
         const [dbSyncSignal, setDbSync] = createSignal(api.kv.get(SETTING_KEYS.dbSync, true) !== false);
         lang = langSignal;
         maxEntries = maxSignal;
@@ -60,6 +61,7 @@ const mod = {
             showEntryTime: showEntryTimeSignal, setShowEntryTime,
             showEntryTokens: showEntryTokensSignal, setShowEntryTokens,
             timeFormat: timeFormatSignal, setTimeFormat,
+            showOrigin: showOriginSignal, setShowOrigin,
             dbSync: dbSyncSignal, setDbSync,
             sessionId: "",
         };

package/dist/v2/settings-menu.js

@@ -43,6 +43,7 @@ async function runSettingsMenu(context, api, signals) {
                 { title: t("settings.showEntryTime"), value: "time", description: onOff(signals.showEntryTime()), category },
                 { title: t("settings.timeFormat"), value: "timefmt", description: TIME_FORMAT_SAMPLES[signals.timeFormat()], category },
                 { title: t("settings.showEntryTokens"), value: "tokens", description: onOff(signals.showEntryTokens()), category },
+                { title: t("settings.showOrigin"), value: "origin", description: onOff(signals.showOrigin()), category },
                 { title: t("settings.dbSync"), value: "dbsync", description: onOff(signals.dbSync()), category },
                 { title: t("settings.close"), value: "close" },
             ],
@@ -203,6 +204,22 @@ async function runSettingsMenu(context, api, signals) {
                 toast(t("settings.showEntryTokens"), onOff(picked));
             }
         }
+        // ── Origin indicators ──
+        if (choice === "origin") {
+            const picked = await context.ui.dialog.select({
+                title: t("settings.showOrigin"),
+                options: [
+                    { title: t("settings.on"), value: true },
+                    { title: t("settings.off"), value: false },
+                ],
+                current: signals.showOrigin(),
+            });
+            if (picked !== undefined) {
+                signals.setShowOrigin(picked);
+                kv.set(SETTING_KEYS.showOrigin, picked);
+                toast(t("settings.showOrigin"), onOff(picked));
+            }
+        }
         // ── 本地数据库补全 ──
         if (choice === "dbsync") {
             const picked = await context.ui.dialog.select({

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

@@ -502,9 +502,12 @@ export function createPanelApi(context, settings) {
                 }
                 catch { }
                 // 宿主没有该子会话的实时状态（未加载缓存）时用本地库终态兜底：
-                // time_idle 存在即已结束；不存在则不猜测（交给事件/扫描）。
+                // time_idle 存在且没有恢复活动即已结束；仍在运行则回报 busy。
                 try {
-                    if (statusOfChild(dbIndex?.info(sid)) !== undefined)
+                    const info = dbIndex?.info(sid);
+                    if (info?.active === true)
+                        return { type: "busy" };
+                    if (statusOfChild(info) !== undefined)
                         return { type: "idle" };
                 }
                 catch { }
@@ -539,6 +542,14 @@ export function createPanelApi(context, settings) {
                     return undefined;
                 }
             },
+            listChildren: (parentId) => {
+                try {
+                    return dbIndex?.enabled() ? dbIndex.children(parentId) : undefined;
+                }
+                catch {
+                    return undefined;
+                }
+            },
         },
         event: {
             on: (type, cb) => {