opencode-subagent-magazine 1.6.1 → 1.7.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-subagent-magazine",
-  "version": "1.6.1",
+  "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.6.1";
+export const PLUGIN_VERSION="1.7.1";

package/src/core/format.ts

@@ -1,3 +1,5 @@
+import type { TimeFormat } from "./types"
+
 /** Visual width of a single character (CJK/wide chars count as 2). */
 function charColumns(c: string): number {
   const code = c.codePointAt(0) ?? 0
@@ -47,6 +49,48 @@ export function fmtDurationShort(ms: number, running: boolean): string {
   return `${m}m${s}s`
 }
 
+/** All supported elapsed-time display modes, in picker order. */
+export const TIME_FORMATS: readonly TimeFormat[] = ["short", "decimal", "clock", "compact", "seconds"]
+
+/** Neutral samples shown in the time-format picker (language independent). */
+export const TIME_FORMAT_SAMPLES: Record<TimeFormat, string> = {
+  decimal: "45.3s · 9.5m · 1.9h",
+  short: "45.32s · 112m35s",
+  clock: "0:45 · 1:52:35",
+  compact: "45s · 1h52m",
+  seconds: "45s · 6755s",
+}
+
+/** Formats elapsed milliseconds using the configured display mode. */
+export function fmtDuration(ms: number, running: boolean, mode: TimeFormat = "short"): string {
+  if (running && ms < 2000) return ""
+  const t = Number.isFinite(ms) && ms > 0 ? ms : 0
+  switch (mode) {
+    case "short":
+      return fmtDurationShort(t, false)
+    case "compact": {
+      if (t < 60000) return `${Math.floor(t / 1000)}s`
+      if (t < 3600000) return `${Math.floor(t / 60000)}m${Math.floor((t % 60000) / 1000)}s`
+      return `${Math.floor(t / 3600000)}h${Math.floor((t % 3600000) / 60000)}m`
+    }
+    case "clock": {
+      const s = Math.floor((t % 60000) / 1000)
+      if (t < 3600000) return `${Math.floor(t / 60000)}:${String(s).padStart(2, "0")}`
+      const m = Math.floor((t % 3600000) / 60000)
+      return `${Math.floor(t / 3600000)}:${String(m).padStart(2, "0")}:${String(s).padStart(2, "0")}`
+    }
+    case "seconds":
+      return `${Math.floor(t / 1000)}s`
+    case "decimal":
+    default: {
+      // Promote units when rounding would show "60.0s" / "60.0m".
+      if (t < 59950) return `${(t / 1000).toFixed(1)}s`
+      if (t < 3597000) return `${(t / 60000).toFixed(1)}m`
+      return `${(t / 3600000).toFixed(1)}h`
+    }
+  }
+}
+
 export function fmtTokens(n: number): string {
   if (n < 1000) return `${n}`
   if (n < 1000000) return `${(n / 1000).toFixed(1)}k`

package/src/core/kv.ts

@@ -7,6 +7,13 @@ export const SESSION_DATA_KEY = `${KV_PREFIX}.session_data`
 export interface KVApi {
   get(key: string, fallback?: unknown): unknown
   set(key: string, value: unknown): void
+  /**
+   * Optional atomic read-modify-write. When the host exposes it (V2), the
+   * updater runs under the host storage lock against the latest on-disk value,
+   * which is what makes concurrent TUI instances safe: no instance can
+   * overwrite another one's fresh writes with a stale in-memory snapshot.
+   */
+  update?(key: string, updater: (current: unknown) => unknown): void | Promise<void>
 }
 
 /** Setting keys shared by V1/V2 (values are raw strings in KV). */
@@ -18,6 +25,12 @@ export const SETTING_KEYS = {
   open: `${KV_PREFIX}.open`,
   ttlDays: `${KV_PREFIX}.ttl_days`,
   border: `${KV_PREFIX}.border`,
+  showEntryCost: `${KV_PREFIX}.show_entry_cost`,
+  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
 
 export function loadSessionData(kv: KVApi): Record<string, SessionRecord> {
@@ -27,8 +40,36 @@ export function loadSessionData(kv: KVApi): Record<string, SessionRecord> {
   } catch { return {} }
 }
 
-export function saveSessionData(kv: KVApi, data: Record<string, SessionRecord>) {
-  try { kv.set(SESSION_DATA_KEY, JSON.stringify(data)) } catch {}
+/**
+ * Atomic read-merge-write of the session store.
+ *
+ * `mutator` receives the latest persisted map (read under the host lock when
+ * `kv.update` is available) and may mutate it freely; the result is written
+ * back. Every writer must go through here: writing a whole in-memory snapshot
+ * directly would silently drop entries created by the other TUIs.
+ */
+export function updateSessionData(
+  kv: KVApi,
+  mutator: (data: Record<string, SessionRecord>) => void,
+): void | Promise<void> {
+  try {
+    if (typeof kv.update === "function") {
+      return kv.update(SESSION_DATA_KEY, (raw) => {
+        const data = parseSessionData(raw)
+        mutator(data)
+        return JSON.stringify(data)
+      })
+    }
+    // Fallback (V1 hosts without atomic update): read-modify-write. The window
+    // is small and the mutation is merged against the value we just read.
+    const data = loadSessionData(kv)
+    mutator(data)
+    kv.set(SESSION_DATA_KEY, JSON.stringify(data))
+  } catch {}
+}
+
+function parseSessionData(raw: unknown): Record<string, SessionRecord> {
+  try { return JSON.parse(String(raw ?? "{}")) } catch { return {} }
 }
 
 export function readTTLDays(kv: KVApi): number {

package/src/core/types.ts

@@ -20,15 +20,28 @@ export interface SubEntry {
   cancelRequestedAt?: number
   abortAccepted?: boolean
   cancelReason?: "manual"
+  /** 来源：工具调用条目 / 衍生会话条目（spawn）。 */
+  origin?: "tool" | "sub"
+  /** 工具输入带 background/run_in_background（后台衍生会话）。 */
+  background?: boolean
 }
 
 export type Lang = LangCode
 export type SortOrder = "desc" | "asc"
 export type ScrollMode = "wheel" | "click"
+/** How elapsed time is rendered in the sidebar (see TIME_FORMAT_SAMPLES). */
+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
@@ -56,5 +69,17 @@ export interface SharedSignals {
   setScrollMode: (m: ScrollMode) => void
   borderVisible: () => boolean
   setBorderVisible: (v: boolean) => void
+  showEntryCost: () => boolean
+  setShowEntryCost: (v: boolean) => void
+  showEntryTime: () => boolean
+  setShowEntryTime: (v: boolean) => void
+  showEntryTokens: () => boolean
+  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": "上下文",
@@ -47,6 +51,7 @@ const ZH_T = {
   "clear.prompt": "确定清除当前会话所有子代理记录？此操作不可撤销。",
   "clear.prompt_running": "当前有 {n} 个运行中的子代理，清除后将不可恢复。确定继续？",
   "clear.done": "已清除 {n} 条子代理记录",
+  "clear.failed": "清除失败",
   "clear.empty": "当前会话无子代理记录",
   "cancel.no_session": "子会话 ID 不可用",
   "cancel.not_child": "目标不是子会话",
@@ -58,6 +63,25 @@ const ZH_T = {
   "cancel.failed": "取消失败",
   "borderShown": "面板边框 已显示",
   "borderHidden": "面板边框 已隐藏",
+  "settings.title": "SubAgent Magazine — 设置",
+  "settings.section.general": "通用",
+  "settings.lang": "语言",
+  "settings.max": "最大条目数",
+  "settings.order": "排序方式",
+  "settings.scroll": "滚动模式",
+  "settings.ttl": "保留期限",
+  "settings.border": "面板边框",
+  "settings.showEntryCost": "每条子代理显示费用",
+  "settings.showEntryTime": "列表中显示耗时",
+  "settings.showEntryTokens": "列表中显示 Token 数",
+  "settings.timeFormat": "时间格式",
+  "settings.showOrigin": "列表显示来源标记",
+  "settings.dbSync": "本地数据库补全",
+  "settings.on": "开",
+  "settings.off": "关",
+  "settings.saved": "已保存 {item}：{value}",
+  "settings.invalid": "无效的数值",
+  "settings.close": "关闭",
 } as const
 
 /** 结构约束：值放宽为 string，键集合来自中文表（新增语言缺 key 会编译报错）。 */
@@ -67,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",
@@ -104,6 +132,7 @@ const EN_T: Translation = {
   "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.failed": "Clear failed",
   "clear.empty": "No sub-agent records in this session",
   "cancel.no_session": "Child session ID is unavailable",
   "cancel.not_child": "Target is not a child session",
@@ -115,12 +144,35 @@ const EN_T: Translation = {
   "cancel.failed": "Cancellation failed",
   "borderShown": "Panel border shown",
   "borderHidden": "Panel border hidden",
+  "settings.title": "SubAgent Magazine — Settings",
+  "settings.section.general": "General",
+  "settings.lang": "Language",
+  "settings.max": "Max entries",
+  "settings.order": "Sort order",
+  "settings.scroll": "Scroll mode",
+  "settings.ttl": "Retention",
+  "settings.border": "Panel border",
+  "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",
+  "settings.off": "off",
+  "settings.saved": "Saved {item}: {value}",
+  "settings.invalid": "Invalid value",
+  "settings.close": "Close",
 }
 
 const JA_T: Translation = {
   "panel.title": "サブエージェント",
   "status.none": "サブエージェントなし",
   "agent.label": "エージェント",
+  "origin.label": "発生元",
+  "origin.tool": "サブエージェント呼び出し",
+  "origin.sub": "生成されたセッション",
+  "origin.background": "バックグラウンド",
   "status.label": "状態",
   "time.label": "時間",
   "tokens.label": "コンテキスト",
@@ -158,6 +210,7 @@ const JA_T: Translation = {
   "clear.prompt": "このセッションの全サブエージェント記録を削除しますか？この操作は元に戻せません。",
   "clear.prompt_running": "実行中のサブエージェントが {n} 個あります。削除すると復元できません。続行しますか？",
   "clear.done": "{n} 件のサブエージェント記録を削除しました",
+  "clear.failed": "クリアに失敗しました",
   "clear.empty": "このセッションにサブエージェント記録はありません",
   "cancel.no_session": "子セッション ID が利用できません",
   "cancel.not_child": "対象は子セッションではありません",
@@ -169,12 +222,35 @@ const JA_T: Translation = {
   "cancel.failed": "キャンセルに失敗しました",
   "borderShown": "パネル枠線 表示",
   "borderHidden": "パネル枠線 非表示",
+  "settings.title": "SubAgent Magazine — 設定",
+  "settings.section.general": "一般",
+  "settings.lang": "言語",
+  "settings.max": "最大表示数",
+  "settings.order": "並び順",
+  "settings.scroll": "スクロール",
+  "settings.ttl": "保持期間",
+  "settings.border": "パネル枠",
+  "settings.showEntryCost": "サブエージェント毎の費用",
+  "settings.showEntryTime": "一覧に所要時間を表示",
+  "settings.showEntryTokens": "一覧にトークン数を表示",
+  "settings.showOrigin": "一覧に由来マークを表示",
+  "settings.timeFormat": "時間形式",
+  "settings.dbSync": "ローカルDB補完",
+  "settings.on": "オン",
+  "settings.off": "オフ",
+  "settings.saved": "保存しました {item}：{value}",
+  "settings.invalid": "無効な値です",
+  "settings.close": "閉じる",
 }
 
 const KO_T: Translation = {
   "panel.title": "서브 에이전트",
   "status.none": "서브 에이전트 없음",
   "agent.label": "에이전트",
+  "origin.label": "출처",
+  "origin.tool": "하위 에이전트 호출",
+  "origin.sub": "생성된 세션",
+  "origin.background": "백그라운드",
   "status.label": "상태",
   "time.label": "시간",
   "tokens.label": "컨텍스트",
@@ -212,6 +288,7 @@ const KO_T: Translation = {
   "clear.prompt": "이 세션의 모든 서브 에이전트 기록을 삭제하시겠습니까? 이 작업은 되돌릴 수 없습니다.",
   "clear.prompt_running": "실행 중인 서브 에이전트가 {n}개 있습니다. 삭제하면 복구할 수 없습니다. 계속하시겠습니까?",
   "clear.done": "서브 에이전트 기록 {n}개를 삭제했습니다",
+  "clear.failed": "지우기에 실패했습니다",
   "clear.empty": "이 세션에 서브 에이전트 기록이 없습니다",
   "cancel.no_session": "하위 세션 ID를 사용할 수 없습니다",
   "cancel.not_child": "대상이 하위 세션이 아닙니다",
@@ -223,6 +300,25 @@ const KO_T: Translation = {
   "cancel.failed": "취소에 실패했습니다",
   "borderShown": "패널 테두리 표시",
   "borderHidden": "패널 테두리 숨김",
+  "settings.title": "SubAgent Magazine — 설정",
+  "settings.section.general": "일반",
+  "settings.lang": "언어",
+  "settings.max": "최대 항목 수",
+  "settings.order": "정렬 순서",
+  "settings.scroll": "스크롤 모드",
+  "settings.ttl": "보존 기간",
+  "settings.border": "패널 테두리",
+  "settings.showEntryCost": "하위 에이전트별 비용",
+  "settings.showEntryTime": "목록에 소요 시간 표시",
+  "settings.showEntryTokens": "목록에 토큰 수 표시",
+  "settings.showOrigin": "목록에 출처 아이콘 표시",
+  "settings.timeFormat": "시간 형식",
+  "settings.dbSync": "로컬 DB 보완",
+  "settings.on": "켬",
+  "settings.off": "끔",
+  "settings.saved": "저장됨 {item}: {value}",
+  "settings.invalid": "잘못된 값",
+  "settings.close": "닫기",
 }
 
 export const LANGS: Record<LangCode, Translation> = { zh: ZH_T, en: EN_T, ja: JA_T, ko: KO_T }

package/src/index.tsx

@@ -11,8 +11,9 @@ import type {
 import { createSignal } from "solid-js"
 import { PLUGIN_VERSION } from "./_version"
 import { LANG_META, createT, detectLang } from "./i18n"
-import type { Lang, SortOrder, ScrollMode, SubStatus, SharedSignals } from "./core/types"
+import type { Lang, SortOrder, ScrollMode, SubStatus, SharedSignals, TimeFormat } from "./core/types"
 import { KV_PREFIX } from "./core/kv"
+import { TIME_FORMATS, TIME_FORMAT_SAMPLES } from "./core/format"
 import type { PanelApi } from "./panel/panel-api"
 import { SubAgentPanel } from "./panel/SubAgentPanel"
 import { globalEntryCache, setClearTick } from "./panel/store"
@@ -35,6 +36,11 @@ function createSidebarSlot(api: TuiPluginApi, panelApi: PanelApi, sig: SharedSig
             sortOrder={sig.sortOrder}
             scrollMode={sig.scrollMode}
             borderVisible={sig.borderVisible}
+            showEntryCost={sig.showEntryCost}
+            showEntryTime={sig.showEntryTime}
+            showEntryTokens={sig.showEntryTokens}
+            timeFormat={sig.timeFormat}
+            showOrigin={sig.showOrigin}
             sessionId={input.session_id}
           />
         )
@@ -61,8 +67,27 @@ const tui: TuiPlugin = async (api: TuiPluginApi) => {
   const [borderVisible, setBorderVisible] = createSignal<boolean>(
     (api.kv.get(`${KV_PREFIX}.border`, false) as boolean) === true
   )
+  const [showEntryCost, setShowEntryCost] = createSignal<boolean>(
+    (api.kv.get(`${KV_PREFIX}.show_entry_cost`, false) as boolean) === true
+  )
+  const [showEntryTime, setShowEntryTime] = createSignal<boolean>(
+    (api.kv.get(`${KV_PREFIX}.show_entry_time`, true) as boolean) !== false
+  )
+  const [showEntryTokens, setShowEntryTokens] = createSignal<boolean>(
+    (api.kv.get(`${KV_PREFIX}.show_entry_tokens`, true) as boolean) !== false
+  )
+  const storedTimeFormat = String(api.kv.get(`${KV_PREFIX}.time_format`, "short"))
+  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, 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 = {
@@ -462,6 +487,92 @@ const tui: TuiPlugin = async (api: TuiPluginApi) => {
         dialog?.clear()
       },
     },
+    {
+      title: "SubAgent Magazine: Entry Cost",
+      value: "subagent-cost",
+      description: "Show or hide the per-sub-agent cost in the sidebar",
+      slash: { name: "subagent-cost" },
+      onSelect: (dialog) => {
+        const t = createT(() => signals.lang())
+        const cur = Boolean(api.kv.get(`${KV_PREFIX}.show_entry_cost`, false))
+        api.kv.set(`${KV_PREFIX}.show_entry_cost`, !cur)
+        signals.setShowEntryCost(!cur)
+        api.ui.toast({
+          message: `${t("settings.showEntryCost")}: ${!cur ? t("settings.on") : t("settings.off")}`,
+        })
+        dialog?.clear()
+      },
+    },
+    {
+      title: "SubAgent Magazine: Entry Time",
+      value: "subagent-time",
+      description: "Show or hide the elapsed time in the sidebar list",
+      slash: { name: "subagent-time" },
+      onSelect: (dialog) => {
+        const t = createT(() => signals.lang())
+        const cur = Boolean(api.kv.get(`${KV_PREFIX}.show_entry_time`, true))
+        api.kv.set(`${KV_PREFIX}.show_entry_time`, !cur)
+        signals.setShowEntryTime(!cur)
+        api.ui.toast({
+          message: `${t("settings.showEntryTime")}: ${!cur ? t("settings.on") : t("settings.off")}`,
+        })
+        dialog?.clear()
+      },
+    },
+    {
+      title: "SubAgent Magazine: Entry Tokens",
+      value: "subagent-tokens",
+      description: "Show or hide the token count in the sidebar list",
+      slash: { name: "subagent-tokens" },
+      onSelect: (dialog) => {
+        const t = createT(() => signals.lang())
+        const cur = Boolean(api.kv.get(`${KV_PREFIX}.show_entry_tokens`, true))
+        api.kv.set(`${KV_PREFIX}.show_entry_tokens`, !cur)
+        signals.setShowEntryTokens(!cur)
+        api.ui.toast({
+          message: `${t("settings.showEntryTokens")}: ${!cur ? t("settings.on") : t("settings.off")}`,
+        })
+        dialog?.clear()
+      },
+    },
+    {
+      title: "SubAgent Magazine: Time Format",
+      value: "subagent-time-format",
+      description: "Set how elapsed time is displayed",
+      slash: { name: "subagent-time-format" },
+      onSelect: (dialog) => {
+        dialog?.replace(() => (
+          <api.ui.DialogSelect
+            title="Time Format / 时间格式"
+            options={TIME_FORMATS.map((f) => ({ title: `${f} — ${TIME_FORMAT_SAMPLES[f]}`, value: f }))}
+            onSelect={(opt) => {
+              const f = opt.value as TimeFormat
+              setTimeFormat(f)
+              api.kv.set(`${KV_PREFIX}.time_format`, f)
+              const t = createT(() => lang())
+              api.ui.toast({ message: `${t("settings.timeFormat")}: ${TIME_FORMAT_SAMPLES[f]}` })
+              dialog?.clear()
+            }}
+          />
+        ))
+      },
+    },
+    {
+      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()
+      },
+    },
   ])
 }