opencode-subagent-magazine 1.7.0 → 1.7.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-subagent-magazine",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "OpenCode TUI plugin monitoring sub-agent invocation status in real time",
   "type": "module",
   "types": "dist/index.d.ts",

package/src/_version.ts

@@ -1,2 +1,2 @@
 // auto-generated
-export const PLUGIN_VERSION="1.7.0";
+export const PLUGIN_VERSION="1.7.1";

package/src/core/kv.ts

@@ -29,6 +29,7 @@ export const SETTING_KEYS = {
   showEntryTime: `${KV_PREFIX}.show_entry_time`,
   showEntryTokens: `${KV_PREFIX}.show_entry_tokens`,
   timeFormat: `${KV_PREFIX}.time_format`,
+  showOrigin: `${KV_PREFIX}.show_origin`,
   dbSync: `${KV_PREFIX}.db_sync`,
 } as const
 

package/src/core/types.ts

@@ -20,6 +20,10 @@ export interface SubEntry {
   cancelRequestedAt?: number
   abortAccepted?: boolean
   cancelReason?: "manual"
+  /** 来源：工具调用条目 / 衍生会话条目（spawn）。 */
+  origin?: "tool" | "sub"
+  /** 工具输入带 background/run_in_background（后台衍生会话）。 */
+  background?: boolean
 }
 
 export type Lang = LangCode
@@ -31,6 +35,13 @@ export type TimeFormat = "decimal" | "short" | "clock" | "compact" | "seconds"
 /** OpenCode built-in tool names that spawn sub-agents or delegate tasks. */
 export const SUBAGENT_TOOLS = new Set(["task", "subagent", "delegate", "call_omo_agent"])
 
+/** 工具输入是否声明后台执行（V1/V2 两种字段名）。 */
+export function isBackgroundInput(input: unknown): boolean {
+  if (!input || typeof input !== "object") return false
+  const i = input as Record<string, unknown>
+  return i.background === true || i.run_in_background === true
+}
+
 export interface ChildRecord {
   scroll: number
   expanded: string
@@ -66,6 +77,8 @@ export interface SharedSignals {
   setShowEntryTokens: (v: boolean) => void
   timeFormat: () => TimeFormat
   setTimeFormat: (f: TimeFormat) => void
+  showOrigin: () => boolean
+  setShowOrigin: (v: boolean) => void
   dbSync: () => boolean
   setDbSync: (v: boolean) => void
   sessionId: string

package/src/i18n.ts

@@ -10,6 +10,10 @@ const ZH_T = {
   "panel.title": "子代理",
   "status.none": "暂无子代理",
   "agent.label": "代理",
+  "origin.label": "来源",
+  "origin.tool": "子代理调用",
+  "origin.sub": "衍生会话",
+  "origin.background": "后台",
   "status.label": "状态",
   "time.label": "耗时",
   "tokens.label": "上下文",
@@ -71,6 +75,7 @@ const ZH_T = {
   "settings.showEntryTime": "列表中显示耗时",
   "settings.showEntryTokens": "列表中显示 Token 数",
   "settings.timeFormat": "时间格式",
+  "settings.showOrigin": "列表显示来源标记",
   "settings.dbSync": "本地数据库补全",
   "settings.on": "开",
   "settings.off": "关",
@@ -86,6 +91,10 @@ const EN_T: Translation = {
   "panel.title": "SubAgent",
   "status.none": "No sub-agents yet",
   "agent.label": "agent",
+  "origin.label": "origin",
+  "origin.tool": "sub-agent call",
+  "origin.sub": "spawned session",
+  "origin.background": "background",
   "status.label": "status",
   "time.label": "time",
   "tokens.label": "tokens",
@@ -146,6 +155,7 @@ const EN_T: Translation = {
   "settings.showEntryCost": "Cost per sub-agent",
   "settings.showEntryTime": "Elapsed time in list",
   "settings.showEntryTokens": "Token count in list",
+  "settings.showOrigin": "Origin indicators in list",
   "settings.timeFormat": "Time format",
   "settings.dbSync": "Local database enrichment",
   "settings.on": "on",
@@ -159,6 +169,10 @@ const JA_T: Translation = {
   "panel.title": "サブエージェント",
   "status.none": "サブエージェントなし",
   "agent.label": "エージェント",
+  "origin.label": "発生元",
+  "origin.tool": "サブエージェント呼び出し",
+  "origin.sub": "生成されたセッション",
+  "origin.background": "バックグラウンド",
   "status.label": "状態",
   "time.label": "時間",
   "tokens.label": "コンテキスト",
@@ -219,6 +233,7 @@ const JA_T: Translation = {
   "settings.showEntryCost": "サブエージェント毎の費用",
   "settings.showEntryTime": "一覧に所要時間を表示",
   "settings.showEntryTokens": "一覧にトークン数を表示",
+  "settings.showOrigin": "一覧に由来マークを表示",
   "settings.timeFormat": "時間形式",
   "settings.dbSync": "ローカルDB補完",
   "settings.on": "オン",
@@ -232,6 +247,10 @@ const KO_T: Translation = {
   "panel.title": "서브 에이전트",
   "status.none": "서브 에이전트 없음",
   "agent.label": "에이전트",
+  "origin.label": "출처",
+  "origin.tool": "하위 에이전트 호출",
+  "origin.sub": "생성된 세션",
+  "origin.background": "백그라운드",
   "status.label": "상태",
   "time.label": "시간",
   "tokens.label": "컨텍스트",
@@ -292,6 +311,7 @@ const KO_T: Translation = {
   "settings.showEntryCost": "하위 에이전트별 비용",
   "settings.showEntryTime": "목록에 소요 시간 표시",
   "settings.showEntryTokens": "목록에 토큰 수 표시",
+  "settings.showOrigin": "목록에 출처 아이콘 표시",
   "settings.timeFormat": "시간 형식",
   "settings.dbSync": "로컬 DB 보완",
   "settings.on": "켬",

package/src/index.tsx

@@ -40,6 +40,7 @@ function createSidebarSlot(api: TuiPluginApi, panelApi: PanelApi, sig: SharedSig
             showEntryTime={sig.showEntryTime}
             showEntryTokens={sig.showEntryTokens}
             timeFormat={sig.timeFormat}
+            showOrigin={sig.showOrigin}
             sessionId={input.session_id}
           />
         )
@@ -79,11 +80,14 @@ const tui: TuiPlugin = async (api: TuiPluginApi) => {
   const [timeFormat, setTimeFormat] = createSignal<TimeFormat>(
     (TIME_FORMATS as readonly string[]).includes(storedTimeFormat) ? (storedTimeFormat as TimeFormat) : "short"
   )
+  const [showOrigin, setShowOrigin] = createSignal<boolean>(
+    (api.kv.get(`${KV_PREFIX}.show_origin`, false) as boolean) === true
+  )
   const [dbSync, setDbSync] = createSignal<boolean>(
     (api.kv.get(`${KV_PREFIX}.db_sync`, true) as boolean) !== false
   )
 
-  const signals: SharedSignals = { lang, setLang, maxEntries, setMaxEntries, sortOrder, setSortOrder, scrollMode, setScrollMode, borderVisible, setBorderVisible, showEntryCost, setShowEntryCost, showEntryTime, setShowEntryTime, showEntryTokens, setShowEntryTokens, timeFormat, setTimeFormat, dbSync, setDbSync, sessionId: "" }
+  const signals: SharedSignals = { lang, setLang, maxEntries, setMaxEntries, sortOrder, setSortOrder, scrollMode, setScrollMode, borderVisible, setBorderVisible, showEntryCost, setShowEntryCost, showEntryTime, setShowEntryTime, showEntryTokens, setShowEntryTokens, timeFormat, setTimeFormat, showOrigin, setShowOrigin, dbSync, setDbSync, sessionId: "" }
 
   // ── V1 PanelApi adapter: wraps the V1 host API into the shared panel contract ──
   const v1Api: PanelApi = {
@@ -553,6 +557,22 @@ const tui: TuiPlugin = async (api: TuiPluginApi) => {
         ))
       },
     },
+    {
+      title: "SubAgent Magazine: Origin Indicators",
+      value: "subagent-origin",
+      description: "Show or hide origin markers (⇢/↳) in the sidebar list",
+      slash: { name: "subagent-origin" },
+      onSelect: (dialog) => {
+        const t = createT(() => signals.lang())
+        const cur = Boolean(api.kv.get(`${KV_PREFIX}.show_origin`, false))
+        api.kv.set(`${KV_PREFIX}.show_origin`, !cur)
+        signals.setShowOrigin(!cur)
+        api.ui.toast({
+          message: `${t("settings.showOrigin")}: ${!cur ? t("settings.on") : t("settings.off")}`,
+        })
+        dialog?.clear()
+      },
+    },
   ])
 }
 

package/src/panel/SubAgentPanel.tsx

@@ -15,7 +15,7 @@ import { PLUGIN_VERSION } from "../_version"
 import { copyText } from "../clipboard"
 import { createT } from "../i18n"
 import type { Lang, SortOrder, ScrollMode, SubEntry, SubStatus, SessionRecord, TimeFormat } from "../core/types"
-import { SUBAGENT_TOOLS } from "../core/types"
+import { SUBAGENT_TOOLS, isBackgroundInput } from "../core/types"
 import { visualWidth, truncate, fmtDuration, fmtTokens, safeErrorMsg } from "../core/format"
 import { rgb, desaturateTo, dimColor, FALLBACK, MAX_SAT } from "../core/color"
 import { KV_PREFIX, updateSessionData } from "../core/kv"
@@ -63,6 +63,7 @@ export function SubAgentPanel(props: {
   showEntryTime: () => boolean
   showEntryTokens: () => boolean
   timeFormat: () => TimeFormat
+  showOrigin: () => boolean
   sessionId: string
 }): JSX.Element {
   const t = createT(() => props.lang())
@@ -417,7 +418,7 @@ export function SubAgentPanel(props: {
       const subSid = part.sessionID !== undefined ? String(part.sessionID) : undefined
       const partModel = part.model as { modelID?: string } | undefined
       const modelId = partModel?.modelID ? String(partModel.modelID) : undefined
-      upsertEntry({ id, title, agent, prompt, sessionId: subSid, status: "running", model: modelId })
+      upsertEntry({ id, title, agent, prompt, sessionId: subSid, status: "running", model: modelId, origin: "sub" })
     }
 
     // ToolPart
@@ -451,6 +452,8 @@ export function SubAgentPanel(props: {
             prompt: existing.prompt,
             sessionId: existing.sessionId ?? errorSid,
             status: "error",
+            origin: "tool",
+            background: isBackgroundInput(st?.input),
           })
         }
         return
@@ -463,7 +466,7 @@ export 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 || input?.background === true) && status === "done") {
+      if (isBackgroundInput(input) && status === "done") {
         const stMetaCheck = partMetadata(part as Record<string, any>, st)
         const hasChild = stMetaCheck?.session_id !== undefined || stMetaCheck?.sessionId !== undefined
         if (hasChild) status = "running"
@@ -481,7 +484,7 @@ export function SubAgentPanel(props: {
       const subSid = stMeta?.session_id !== undefined ? String(stMeta.session_id)
         : stMeta?.sessionId !== undefined ? String(stMeta.sessionId)
         : undefined
-      upsertEntry({ id, title, agent, prompt, sessionId: subSid, status })
+      upsertEntry({ id, title, agent, prompt, sessionId: subSid, status, origin: "tool", background: isBackgroundInput(input) })
     }
   }
 
@@ -869,7 +872,7 @@ export function SubAgentPanel(props: {
               if (rawStatus === "completed") status = "done"
               // Background tasks: tool completion ≠ agent completion — keep running until session.idle
               // 仅在 metadata 确认已派生子会话时保持 running。
-              if ((scanInput?.run_in_background === true || scanInput?.background === true) && status === "done") {
+              if (isBackgroundInput(scanInput) && status === "done") {
                 if (scanSubSid !== undefined) status = "running"
               }
               // 子会话存活判定：工具调用已完成但子会话仍 busy，
@@ -930,6 +933,8 @@ export function SubAgentPanel(props: {
                 status,
                 startedAt: exists?.startedAt || Date.now(),
                 endedAt: exists?.endedAt ?? (status === "done" ? Date.now() : undefined),
+                origin: "tool",
+                background: isBackgroundInput(scanInput) || exists?.background === true,
               })
               if (entryKey !== id) next.delete(id)
             }
@@ -987,7 +992,7 @@ export function SubAgentPanel(props: {
           // 非后台 tool 已完成、条目却仍停在 running：补一次 scan 收尾
           // （success 事件可能因缺少 metadata 被适配层丢弃）。
           const input = st?.input as Record<string, unknown> | undefined
-          const isBackground = input?.background === true || input?.run_in_background === true
+          const isBackground = isBackgroundInput(input)
           const stillRunning = entry.status === "running" || entry.status === "cancel_requested"
           if (rawStatus === "completed" && !isBackground && stillRunning) return true
         }
@@ -1027,6 +1032,57 @@ export function SubAgentPanel(props: {
         setEntryMapRaw((prev) => {
           let changed = false
           const next = new Map(prev)
+          // 每 ~2s 从本地库同步衍生会话（spawn）：没有对应工具条目的
+          // 子会话补成 sub: 条目（标题/agent/用量/终态都来自数据库）。
+          if (tick % 4 === 0) {
+            try {
+              const children = props.api.session.listChildren?.(props.sessionId)
+              if (children) {
+                const linked = new Set<string>()
+                for (const e of next.values()) if (e.sessionId) linked.add(e.sessionId)
+                const { parentSid, isChild } = resolveParent(props.sessionId)
+                const rec = loadSessionData()[parentSid]
+                const cleared = new Set<string>(isChild ? rec?.children?.[props.sessionId]?.clearedIds : rec?.clearedIds)
+                for (const child of children) {
+                  if (!child.id || linked.has(child.id)) continue
+                  const id = `sub:${child.id}`
+                  if (cleared.has(id)) continue
+                  const finished = child.timeIdle != null && child.active !== true
+                  const status: SubStatus = finished
+                    ? (child.idleOutcome === "interrupted" ? "cancelled" : "done")
+                    : "running"
+                  next.set(id, {
+                    id,
+                    title: child.title ?? child.agent ?? "",
+                    agent: child.agent ?? "?",
+                    prompt: "",
+                    status,
+                    sessionId: child.id,
+                    startedAt: child.timeCreated ?? Date.now(),
+                    endedAt: finished ? child.timeIdle : undefined,
+                    tokens: child.tokens,
+                    cost: child.cost,
+                    model: child.model,
+                    origin: "sub",
+                  })
+                  changed = true
+                }
+              }
+            } catch {}
+            // 恢复运行：终态条目若子会话被 resume（宿主或本地库回报 busy），
+            // 回到 running，等下一次真实 idle 再落定。
+            for (const [id, entry] of next) {
+              if (entry.status !== "done" && entry.status !== "error") continue
+              const sid = entry.sessionId
+              if (!sid) continue
+              try {
+                if (props.api.session.status(sid)?.type === "busy") {
+                  next.set(id, { ...entry, status: "running", endedAt: undefined })
+                  changed = true
+                }
+              } catch {}
+            }
+          }
           // 候选：仍缺 usage 数据的条目。以 round-robin 遍历，
           // 避免一串读不到数据的会话（如 free-model 子会话）
           // 饿死列表其余部分；每个 tick 只读取少数会话。
@@ -1535,6 +1591,13 @@ export function SubAgentPanel(props: {
                 !isExpanded() && props.showEntryTime() && (elapsed() >= 2000 || entry.endedAt !== undefined)
                   ? fmtDuration(elapsed(), isActiveRunning, props.timeFormat())
                   : ""
+              // 来源标记：⇢ = 后台衍生（工具输入 background），↳ = 衍生会话（spawn）。
+              const originMark = () => {
+                if (!props.showOrigin()) return ""
+                if (entry.origin === "sub") return "\u21b3"
+                return entry.background === true ? "\u21e2" : ""
+              }
+              const originW = () => (originMark() ? 2 : 0)
               const suffixW = () => {
                 let w = 0
                 const t = timeText()
@@ -1545,7 +1608,7 @@ export function SubAgentPanel(props: {
                 if (c) w += visualWidth(c)
                 return w
               }
-              const labelAvail = () => Math.max(6, panelWidth() - gutter() - LEFT_PAD - suffixW())
+              const labelAvail = () => Math.max(6, panelWidth() - gutter() - LEFT_PAD - originW() - suffixW())
               const labelText = () => {
                 const max = labelAvail()
                 const text = entry.title || entry.agent
@@ -1564,6 +1627,7 @@ export function SubAgentPanel(props: {
                     {" "}
                     <span style={{ fg: statusColor() }}>{statusDot()}</span>
                     {" "}
+                    {originMark() ? <span style={{ fg: pal().muted }}>{originMark() + " "}</span> : null}
                     <span style={{ fg: pal().text }}>{labelText()}</span>
                     {timeText() ? (
                       <>
@@ -1587,6 +1651,17 @@ export function SubAgentPanel(props: {
                       <span style={{ fg: pal().muted }}>{" ".repeat(expandedPad(t("agent.label")))}</span>
                       <span style={{ fg: pal().muted }}>{entry.agent}</span>
                     </text>
+                    <Show when={props.showOrigin()}>
+                      <text>
+                        {"  "}
+                        <span style={{ fg: pal().primary }}>{t("origin.label")}: </span>
+                        <span style={{ fg: pal().muted }}>{" ".repeat(expandedPad(t("origin.label")))}</span>
+                        <span style={{ fg: pal().muted }}>
+                          {entry.origin === "sub" ? t("origin.sub") : t("origin.tool")}
+                          {entry.background === true ? ` (${t("origin.background")})` : ""}
+                        </span>
+                      </text>
+                    </Show>
                     <text>
                       {"  "}
                       <span style={{ fg: pal().primary }}>{t("status.label")}: </span>

package/src/panel/entry-map.ts

@@ -2,6 +2,7 @@ import type { SubEntry, SubStatus } from "../core/types"
 
 export type SubEntryPatch = Omit<SubEntry, "startedAt" | "endedAt"> & {
   startedAt?: number
+  endedAt?: number
 }
 
 export function findSubEntryKey(
@@ -33,7 +34,7 @@ export function upsertSubEntry(
     ...partial,
     id: existing?.id ?? partial.id,
     startedAt: existing?.startedAt || partial.startedAt || now,
-    endedAt: ended ? (existing?.endedAt || now) : undefined,
+    endedAt: ended ? (existing?.endedAt ?? partial.endedAt ?? now) : undefined,
   })
   return next
 }

package/src/panel/panel-api.ts

@@ -10,6 +10,21 @@ export interface SessionLike {
   cost?: number
 }
 
+/** Spawned child session summary (V2 reads it from the local database). */
+export interface ChildSessionLike {
+  id: string
+  agent?: string
+  title?: string
+  model?: string
+  cost?: number
+  tokens?: number
+  timeCreated?: number
+  timeIdle?: number
+  idleOutcome?: string
+  /** Still running: last message is newer than time_idle (resume keeps the old value). */
+  active?: boolean
+}
+
 export interface SessionStatusLike {
   type: string
 }
@@ -59,6 +74,8 @@ export interface PanelApi {
       agent?: string
       startedAt?: number
     }): string | undefined
+    /** Optional host-side listing of spawned child sessions. */
+    listChildren?(parentId: string): ChildSessionLike[] | undefined
   }
   event: {
     on(type: PanelEventType, cb: (e: PanelEvent) => void): () => void

package/src/v2/commands.ts

@@ -125,6 +125,7 @@ export function makeCommands(
           `${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")
@@ -198,6 +199,19 @@ export function makeCommands(
         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/src/v2/db.ts

@@ -25,6 +25,8 @@ export interface ChildSessionInfo {
   timeCreated?: number
   timeIdle?: number
   idleOutcome?: string
+  /** 仍在运行：最后一条消息晚于 time_idle（会话被恢复时 time_idle 不会被清空）。 */
+  active?: boolean
 }
 
 export interface SessionDbIndex {
@@ -36,6 +38,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
 }
 
 type SqlRow = Record<string, unknown>
@@ -89,10 +93,28 @@ export function contextTokens(tokens: unknown): number | undefined {
   return sum > 0 ? sum : undefined
 }
 
-/** 子会话终态：time_idle 存在才算结束；interrupted 视为取消。
+/** 子会话是否仍在运行。
+ *  恢复过的会话会保留旧的 time_idle（host 不清空），因此以
+ *  「最后一条消息是否晚于 time_idle」为准；最后一条是 idle
+ *  消息则视为已停止。 */
+export function isSessionActive(input: {
+  timeIdle?: number
+  lastMessageType?: string
+  lastMessageAt?: number
+}): boolean {
+  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: ChildSessionInfo | undefined): "done" | "cancelled" | undefined {
-  if (!info || info.timeIdle == null) return undefined
+  if (!info) return undefined
+  if (info.active === true) return undefined
+  if (info.timeIdle == null) return undefined
   return info.idleOutcome === "interrupted" ? "cancelled" : "done"
 }
 
@@ -136,12 +158,21 @@ const LAST_ASSISTANT_SQL = `
   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: unknown): number | undefined => {
   const n = Number(v)
@@ -236,6 +267,7 @@ export function createSessionDbIndex(enabled: () => boolean): SessionDbIndex | u
       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 },
@@ -263,6 +295,11 @@ export function createSessionDbIndex(enabled: () => boolean): SessionDbIndex | u
           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),
+          }),
         }
       }
     } catch { result = undefined }
@@ -270,5 +307,40 @@ export function createSessionDbIndex(enabled: () => boolean): SessionDbIndex | u
     return result
   }
 
-  return { enabled: ready, resolveCall, matchChild, info }
+  const children = (parentId: string): ChildSessionInfo[] | undefined => {
+    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: SqlRow[] = []
+      try { list = db!.query(CHILDREN_SQL).all(parentId) } catch {}
+      cached = { list, at: now }
+      childrenCache.set(parentId, cached)
+    }
+    const out: ChildSessionInfo[] = []
+    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/src/v2/index.tsx

@@ -45,6 +45,7 @@ function PluginRoot(props: {
       showEntryTime={props.signals.showEntryTime}
       showEntryTokens={props.signals.showEntryTokens}
       timeFormat={props.signals.timeFormat}
+      showOrigin={props.signals.showOrigin}
       sessionId={props.sessionID}
     />
   )
@@ -95,6 +96,9 @@ const mod: PluginModule & { server: () => Promise<Record<string, never>> } = {
     const [timeFormatSignal, setTimeFormat] = createSignal<TimeFormat>(
       (TIME_FORMATS as readonly string[]).includes(storedTimeFormat) ? (storedTimeFormat as TimeFormat) : "short",
     )
+    const [showOriginSignal, setShowOrigin] = createSignal<boolean>(
+      (api.kv.get(SETTING_KEYS.showOrigin, false) as boolean) === true,
+    )
     const [dbSyncSignal, setDbSync] = createSignal<boolean>(
       (api.kv.get(SETTING_KEYS.dbSync, true) as boolean) !== false,
     )
@@ -109,6 +113,7 @@ const mod: PluginModule & { server: () => Promise<Record<string, never>> } = {
       showEntryTime: showEntryTimeSignal, setShowEntryTime,
       showEntryTokens: showEntryTokensSignal, setShowEntryTokens,
       timeFormat: timeFormatSignal, setTimeFormat,
+      showOrigin: showOriginSignal, setShowOrigin,
       dbSync: dbSyncSignal, setDbSync,
       sessionId: "",
     }

package/src/v2/settings-menu.ts

@@ -49,6 +49,7 @@ async function runSettingsMenu(context: Context, api: PanelApi, signals: SharedS
         { 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" },
       ],
@@ -218,6 +219,23 @@ async function runSettingsMenu(context: Context, api: PanelApi, signals: SharedS
       }
     }
 
+    // ── Origin indicators ──
+    if (choice === "origin") {
+      const picked = await context.ui.dialog.select<boolean>({
+        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<boolean>({

package/src/v2/v2-panel-api.ts

@@ -423,9 +423,11 @@ export function createPanelApi(context: Context, settings: PanelApi["settings"])
           }
         } catch {}
         // 宿主没有该子会话的实时状态（未加载缓存）时用本地库终态兜底：
-        // time_idle 存在即已结束；不存在则不猜测（交给事件/扫描）。
+        // time_idle 存在且没有恢复活动即已结束；仍在运行则回报 busy。
         try {
-          if (statusOfChild(dbIndex?.info(sid)) !== undefined) return { type: "idle" }
+          const info = dbIndex?.info(sid)
+          if (info?.active === true) return { type: "busy" }
+          if (statusOfChild(info) !== undefined) return { type: "idle" }
         } catch {}
         return undefined
       },
@@ -448,6 +450,9 @@ export function createPanelApi(context: Context, settings: PanelApi["settings"])
           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: PanelEventType, cb: (e: PanelEvent) => void) => {