opencode-subagent-magazine 1.6.0 → 1.7.0

package/dist/v2.js

@@ -2,6 +2,274 @@
 import { createComponent as _$createComponent2 } from "@opentui/solid";
 import { createSignal as createSignal3 } from "solid-js";
 
+// src/core/kv.ts
+var KV_PREFIX = "subagent_magazine";
+var SESSION_DATA_KEY = `${KV_PREFIX}.session_data`;
+var SETTING_KEYS = {
+  lang: `${KV_PREFIX}.lang`,
+  maxEntries: `${KV_PREFIX}.max_entries`,
+  order: `${KV_PREFIX}.order`,
+  scrollMode: `${KV_PREFIX}.scroll_mode`,
+  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`,
+  dbSync: `${KV_PREFIX}.db_sync`
+};
+function loadSessionData(kv) {
+  try {
+    const raw = kv.get(SESSION_DATA_KEY, "{}");
+    return JSON.parse(String(raw));
+  } catch {
+    return {};
+  }
+}
+function updateSessionData(kv, mutator) {
+  try {
+    if (typeof kv.update === "function") {
+      return kv.update(SESSION_DATA_KEY, (raw) => {
+        const data2 = parseSessionData(raw);
+        mutator(data2);
+        return JSON.stringify(data2);
+      });
+    }
+    const data = loadSessionData(kv);
+    mutator(data);
+    kv.set(SESSION_DATA_KEY, JSON.stringify(data));
+  } catch {
+  }
+}
+function parseSessionData(raw) {
+  try {
+    return JSON.parse(String(raw ?? "{}"));
+  } catch {
+    return {};
+  }
+}
+function readTTLDays(kv) {
+  const ttlDaysRaw = parseInt(String(kv.get(SETTING_KEYS.ttlDays, "3")), 10);
+  return Number.isNaN(ttlDaysRaw) ? 3 : ttlDaysRaw;
+}
+
+// src/v2/db.ts
+import { homedir } from "node:os";
+var BUN_SQLITE = "bun:sqlite";
+function modelIdOf(value) {
+  if (typeof value === "string") {
+    const s = value.trim();
+    if (s.length === 0) return void 0;
+    if (s.startsWith("{")) {
+      try {
+        return modelIdOf(JSON.parse(s));
+      } catch {
+        return void 0;
+      }
+    }
+    return s;
+  }
+  if (value && typeof value === "object") {
+    const id = value.id;
+    if (id === void 0) return void 0;
+    const direct = modelIdOf(id);
+    if (direct !== void 0) return direct;
+    const s = String(id);
+    return s.length > 0 ? s : void 0;
+  }
+  return void 0;
+}
+function contextTokens(tokens) {
+  if (!tokens || typeof tokens !== "object") return void 0;
+  const t = tokens;
+  const cache = t.cache && typeof t.cache === "object" ? t.cache : {};
+  const sum = (Number(t.input) || 0) + (Number(t.output) || 0) + (Number(t.reasoning) || 0) + (Number(cache.read) || 0) + (Number(cache.write) || 0);
+  return sum > 0 ? sum : void 0;
+}
+function statusOfChild(info) {
+  if (!info || info.timeIdle == null) return void 0;
+  return info.idleOutcome === "interrupted" ? "cancelled" : "done";
+}
+function findDbPath(env = process.env, home = safeHomedir()) {
+  if (env.OPENCODE_DB) return env.OPENCODE_DB;
+  const base = env.XDG_DATA_HOME && env.XDG_DATA_HOME.length > 0 ? env.XDG_DATA_HOME : `${home}/.local/share`;
+  if (!base || base === "/.local/share") return void 0;
+  return `${base}/opencode/opencode.db`;
+}
+function safeHomedir() {
+  try {
+    return homedir();
+  } catch {
+    return "";
+  }
+}
+var CALL_MAP_SQL = `
+  SELECT json_extract(p.value, '$.id') AS call_id,
+         json_extract(p.value, '$.state.metadata.sessionID') AS child_sid
+  FROM session_message m, json_each(m.data, '$.content') p
+  WHERE m.session_id = ? AND m.type = 'assistant'
+    AND json_extract(p.value, '$.id') LIKE 'call_%'
+    AND json_extract(p.value, '$.state.metadata.sessionID') IS NOT NULL`;
+var CHILD_INFO_SQL = `
+  SELECT parent_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 id = ?`;
+var LAST_ASSISTANT_SQL = `
+  SELECT json_extract(data, '$.tokens.input') AS input,
+         json_extract(data, '$.tokens.output') AS output,
+         json_extract(data, '$.tokens.reasoning') AS reasoning,
+         json_extract(data, '$.tokens.cache.read') AS cache_read,
+         json_extract(data, '$.tokens.cache.write') AS cache_write,
+         json_extract(data, '$.model.id') AS model_id
+  FROM session_message
+  WHERE session_id = ? AND type = 'assistant' AND json_extract(data, '$.tokens.output') > 0
+  ORDER BY seq DESC LIMIT 1`;
+var 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'`;
+var CHILDREN_SQL = `
+  SELECT id, agent, time_created FROM session_v2 WHERE parent_id = ? ORDER BY time_created`;
+var num = (v) => {
+  const n = Number(v);
+  return Number.isFinite(n) ? n : void 0;
+};
+var str = (v) => typeof v === "string" && v.length > 0 ? v : void 0;
+function createSessionDbIndex(enabled) {
+  const dbPath = findDbPath();
+  if (!dbPath) return void 0;
+  let db;
+  let failed = false;
+  void (async () => {
+    try {
+      const mod2 = await import(BUN_SQLITE);
+      const Database = mod2?.Database;
+      if (!Database) {
+        failed = true;
+        return;
+      }
+      db = new Database(dbPath, { readonly: true });
+      try {
+        db.query("pragma query_only = on").all();
+      } catch {
+      }
+    } catch {
+      failed = true;
+      db = void 0;
+    }
+  })();
+  const CALL_MAP_TTL_MS = 15e3;
+  const CALL_MAP_RETRY_MS = 2e3;
+  const INFO_TTL_MS = 5e3;
+  const callMaps = /* @__PURE__ */ new Map();
+  const infos = /* @__PURE__ */ new Map();
+  const childrenCache = /* @__PURE__ */ new Map();
+  const ready = () => {
+    if (failed || db === void 0) return false;
+    try {
+      return enabled();
+    } catch {
+      return false;
+    }
+  };
+  const buildCallMap = (parentId) => {
+    const now = Date.now();
+    const prev = callMaps.get(parentId);
+    if (prev && now - prev.at < CALL_MAP_RETRY_MS) return prev.map;
+    const map = /* @__PURE__ */ new Map();
+    try {
+      for (const row of db.query(CALL_MAP_SQL).all(parentId)) {
+        const id = str(row.call_id);
+        const sid = str(row.child_sid);
+        if (id && sid) map.set(id, sid);
+      }
+    } catch {
+    }
+    callMaps.set(parentId, { map, at: now });
+    return map;
+  };
+  const resolveCall = (parentId, callId) => {
+    if (!ready() || !parentId || !callId) return void 0;
+    const prev = callMaps.get(parentId);
+    const map = prev && Date.now() - prev.at < CALL_MAP_TTL_MS ? prev.map : buildCallMap(parentId);
+    return map.get(callId) ?? buildCallMap(parentId).get(callId);
+  };
+  const matchChild = (parentId, agent, startedAt) => {
+    if (!ready() || !parentId || startedAt === void 0) return void 0;
+    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);
+    }
+    let best;
+    let bestAt = Number.POSITIVE_INFINITY;
+    for (const row of cached.list) {
+      const sid = str(row.id);
+      const t = num(row.time_created);
+      if (!sid || t === void 0) continue;
+      if (t < startedAt - 2e3) continue;
+      if (agent !== void 0 && str(row.agent) !== agent) continue;
+      if (t < bestAt) {
+        bestAt = t;
+        best = sid;
+      }
+    }
+    return best;
+  };
+  const info = (sid) => {
+    if (!sid) return void 0;
+    const hit = infos.get(sid);
+    if (hit && Date.now() - hit.at < INFO_TTL_MS) return hit.info;
+    if (!ready()) return void 0;
+    let result;
+    try {
+      const row = db.query(CHILD_INFO_SQL).get(sid);
+      if (row) {
+        const last = db.query(LAST_ASSISTANT_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 }
+        } : void 0);
+        if (tokens === void 0) {
+          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);
+          if (agg > 0) tokens = agg;
+        }
+        let cost = num(row.cost);
+        if (!(typeof cost === "number" && cost > 0)) {
+          const aggCost = db.query(ASSISTANT_COST_SQL).get(sid);
+          if (aggCost && Number(aggCost.n) > 0) cost = Number(aggCost.total) || 0;
+        }
+        result = {
+          id: sid,
+          parentId: str(row.parent_id),
+          agent: str(row.agent),
+          title: str(row.title),
+          model: modelIdOf(last?.model_id) ?? modelIdOf(row.model),
+          cost,
+          tokens,
+          timeCreated: num(row.time_created),
+          timeIdle: num(row.time_idle),
+          idleOutcome: str(row.idle_outcome)
+        };
+      }
+    } catch {
+      result = void 0;
+    }
+    infos.set(sid, { info: result, at: Date.now() });
+    return result;
+  };
+  return { enabled: ready, resolveCall, matchChild, info };
+}
+
 // src/v2/v2-panel-api.ts
 var SUBAGENT_TOOL_V2 = "subagent";
 function normalizeMeta(meta) {
@@ -18,7 +286,11 @@ function toV1Part(p) {
     if (st.output === void 0 && Array.isArray(st.content)) {
       st.output = st.content.map((c) => c.type === "text" ? c.text : c.type === "file" ? String(c.path ?? c.filename ?? "") : JSON.stringify(c)).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) };
+    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 ?? "") };
   if (p.type === "file") return { type: "file", source: p.source ?? {} };
@@ -55,7 +327,60 @@ function createPanelApi(context, settings) {
       d.value = value;
     });
   };
+  const kvUpdate = (key, updater) => {
+    let entry = kvStore.get(key);
+    if (!entry) {
+      const created = context.storage.store(`subagent_magazine.${key}`, {
+        initial: { value: void 0 }
+      });
+      entry = created;
+      kvStore.set(key, entry);
+    }
+    const [, mutate] = entry;
+    return mutate((d) => {
+      d.value = updater(d.value);
+    });
+  };
+  const dbIndex = createSessionDbIndex(() => kvGet(SETTING_KEYS.dbSync, true) !== false);
+  const withResolvedSid = (data, meta) => {
+    if (meta.sessionID !== void 0) return meta;
+    try {
+      const parent = data.sessionID !== void 0 ? String(data.sessionID) : "";
+      const callId = data.id !== void 0 ? String(data.id) : "";
+      const sid = parent && callId ? dbIndex?.resolveCall(parent, callId) : void 0;
+      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";
+  const findToolPart = (data) => {
+    const sid = data.sessionID;
+    const msgID = data.assistantMessageID;
+    const partID = data.id;
+    if (sid === void 0 || msgID === void 0 || partID === void 0) return void 0;
+    try {
+      const raw = context.data.session.message.list(String(sid));
+      if (!raw) return void 0;
+      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 : void 0;
+            const name = pp.name ?? pp.tool;
+            return { name: name !== void 0 ? String(name) : void 0, input };
+          }
+        }
+        break;
+      }
+    } catch {
+    }
+    return void 0;
+  };
   const toolEventToPart = (event) => {
     const type = event.type;
     const data = event.data;
@@ -73,20 +398,29 @@ 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 === void 0) input = resolved.input;
+        }
+      }
       if (name && !isSubagentTool(name)) return void 0;
       if (!name) return void 0;
-      if (key) toolInfo.set(key, { name: String(name), input: data.input ?? {} });
+      if (key) 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: {} }
+        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 void 0;
       if (!name) return void 0;
       return {
@@ -94,24 +428,42 @@ function createPanelApi(context, settings) {
         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 === void 0) return void 0;
+      const eventMeta = normalizeMeta(data.metadata);
+      const meta = withResolvedSid(data, eventMeta);
       if (type === "session.tool.failed" && meta.status === "running") return void 0;
-      const name = data.name ?? info?.name;
+      let name = data.name ?? info?.name;
+      let input = info?.input ?? data.input;
+      if (!name || input === void 0) {
+        const resolved = findToolPart(data);
+        if (!name && resolved?.name) name = resolved.name;
+        if (input === void 0 && resolved?.input) input = resolved.input;
+      }
       if (name && !isSubagentTool(name)) return void 0;
-      const input = info?.input ?? data.input ?? {};
+      if (key && name) toolInfo.set(key, { name: String(name), input: input ?? info?.input ?? {} });
+      const finalInput = input ?? {};
+      if (meta.sessionID === void 0 && (finalInput.background === true || finalInput.run_in_background === true)) {
+        return void 0;
+      }
+      let status = type === "session.tool.failed" ? "error" : "completed";
+      if (meta.sessionID !== void 0 && meta.sessionID !== eventMeta.sessionID) {
+        try {
+          const childInfo = dbIndex?.info(String(meta.sessionID));
+          if (childInfo && statusOfChild(childInfo) === void 0) status = "running";
+        } catch {
+        }
+      }
       return {
         type: "tool",
         tool: normName(String(name ?? "task")),
         id: String(data.id),
-        subagent_type: agentOf(input),
+        subagent_type: agentOf(finalInput),
         state: {
-          status: type === "session.tool.failed" ? "error" : "completed",
-          input,
+          status,
+          input: finalInput,
           metadata: meta
         }
       };
@@ -133,14 +485,55 @@ function createPanelApi(context, settings) {
     }
     return out;
   };
+  const usageCache = /* @__PURE__ */ new Map();
+  const syncRequestedAt = /* @__PURE__ */ new Map();
+  const USAGE_CACHE_TTL_MS = 5e3;
+  const SYNC_THROTTLE_MS = 3e4;
+  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 void 0;
+    if (Date.now() - hit.at > USAGE_CACHE_TTL_MS) return void 0;
+    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 void 0;
+    }
+  };
   return {
     kv: {
       get: kvGet,
-      set: kvSet
+      set: kvSet,
+      update: kvUpdate
     },
     usage: {
       readSessionTokens: (sid) => {
         if (!sid) return void 0;
+        try {
+          const dbTokens = dbIndex?.info(sid)?.tokens;
+          if (dbTokens !== void 0) {
+            rememberUsage(sid, { tokens: dbTokens });
+            return dbTokens;
+          }
+        } catch {
+        }
         try {
           const msgs = context.data.session.message.list(sid);
           if (msgs) {
@@ -150,9 +543,15 @@ function createPanelApi(context, settings) {
               const t = m.tokens;
               if (!t || !(Number(t.output) > 0)) continue;
               const ctx = (Number(t.input) || 0) + (Number(t.output) || 0) + (Number(t.reasoning) || 0) + (Number(t.cache?.read) || 0) + (Number(t.cache?.write) || 0);
-              if (ctx > 0) return ctx;
+              if (ctx > 0) {
+                rememberUsage(sid, { tokens: ctx });
+                return ctx;
+              }
             }
           }
+          const cached = cachedUsage(sid)?.tokens;
+          if (cached !== void 0) return cached;
+          requestMessageSync(sid);
           return void 0;
         } catch {
           return void 0;
@@ -160,33 +559,91 @@ function createPanelApi(context, settings) {
       },
       readSessionCost: (sid) => {
         if (!sid) return void 0;
+        try {
+          const dbCost = dbIndex?.info(sid)?.cost;
+          if (dbCost !== void 0) {
+            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) return session.cost;
+          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 void 0;
-          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;
+            }
+            if (sawAssistant) {
+              rememberUsage(sid, { cost: total });
+              return total;
+            }
           }
-          return total > 0 ? total : void 0;
+          const cached = cachedUsage(sid)?.cost;
+          if (cached !== void 0) return cached;
+          requestMessageSync(sid);
+          return void 0;
         } catch {
           return void 0;
         }
       },
       readSessionModel: (sid) => {
         if (!sid) return void 0;
+        try {
+          const dbModel = dbIndex?.info(sid)?.model;
+          if (dbModel !== void 0) {
+            rememberUsage(sid, { model: dbModel });
+            return dbModel;
+          }
+        } catch {
+        }
         try {
           const msgs = context.data.session.message.list(sid);
           if (msgs) {
             for (let i = msgs.length - 1; i >= 0; i--) {
               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 !== void 0) return cached;
+          requestMessageSync(sid);
           return void 0;
         } catch {
           return void 0;
@@ -198,7 +655,14 @@ function createPanelApi(context, settings) {
     session: {
       get: (sid) => {
         try {
-          return context.data.session.get(sid);
+          const direct = context.data.session.get(sid);
+          if (direct) return direct;
+          const list = context.data.session.list?.();
+          if (Array.isArray(list)) {
+            const found = list.find((s) => s?.id === sid);
+            if (found) return found;
+          }
+          return void 0;
         } catch {
           return void 0;
         }
@@ -206,11 +670,17 @@ function createPanelApi(context, settings) {
       status: (sid) => {
         try {
           const st = context.data.session.status(sid);
-          const type = st === "running" ? "busy" : st ?? "";
-          return { type };
+          if (st) {
+            const type = st === "running" ? "busy" : st;
+            return { type };
+          }
         } catch {
-          return void 0;
         }
+        try {
+          if (statusOfChild(dbIndex?.info(sid)) !== void 0) return { type: "idle" };
+        } catch {
+        }
+        return void 0;
       },
       messages: (sid) => {
         try {
@@ -229,6 +699,15 @@ function createPanelApi(context, settings) {
           return [];
         }
         return msg.content.map((p) => toV1Part(p));
+      },
+      resolveChild: (input) => {
+        try {
+          const sid = input.callId ? dbIndex?.resolveCall(input.parentId, input.callId) : void 0;
+          if (sid) return sid;
+          return dbIndex?.matchChild(input.parentId, input.agent, input.startedAt);
+        } catch {
+          return void 0;
+        }
       }
     },
     event: {
@@ -239,9 +718,11 @@ 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) return;
-                const evt2 = e.data;
-                const sid = evt2?.sessionID !== void 0 ? String(evt2.sessionID) : void 0;
+                const evtData = e.data;
+                if (!part) {
+                  return;
+                }
+                const sid = evtData?.sessionID !== void 0 ? String(evtData.sessionID) : void 0;
                 if (!sid) return;
                 cb({ type, scope: "global", payload: { part, sessionID: sid } });
               }));
@@ -298,39 +779,90 @@ function createPanelApi(context, settings) {
   };
 }
 
-// src/core/kv.ts
-var KV_PREFIX = "subagent_magazine";
-var SESSION_DATA_KEY = `${KV_PREFIX}.session_data`;
-var SETTING_KEYS = {
-  lang: `${KV_PREFIX}.lang`,
-  maxEntries: `${KV_PREFIX}.max_entries`,
-  order: `${KV_PREFIX}.order`,
-  scrollMode: `${KV_PREFIX}.scroll_mode`,
-  open: `${KV_PREFIX}.open`,
-  ttlDays: `${KV_PREFIX}.ttl_days`,
-  border: `${KV_PREFIX}.border`
-};
-function loadSessionData(kv) {
-  try {
-    const raw = kv.get(SESSION_DATA_KEY, "{}");
-    return JSON.parse(String(raw));
-  } catch {
-    return {};
+// src/core/format.ts
+function charColumns(c) {
+  const code = c.codePointAt(0) ?? 0;
+  if (code < 32) return 0;
+  if (code < 127) return 1;
+  if (code < 160) return 0;
+  if (code >= 4352 && code <= 4447 || code >= 11904 && code <= 42191 || code >= 44032 && code <= 55203 || code >= 63744 && code <= 64255 || code >= 65040 && code <= 65135 || code >= 65281 && code <= 65376 || code >= 65504 && code <= 65510 || code >= 127744 && code <= 128591 || code >= 131072 && code <= 262141)
+    return 2;
+  return 1;
+}
+function visualWidth(s) {
+  let w = 0;
+  for (const c of s) w += charColumns(c);
+  return w;
+}
+function truncate(text, maxCols) {
+  if (visualWidth(text) <= maxCols) return text;
+  let cols = 0;
+  let i = 0;
+  for (const c of text) {
+    const w = charColumns(c);
+    if (cols + w > maxCols - 1) break;
+    cols += w;
+    i += c.length;
   }
+  return text.slice(0, i) + "\u2026";
 }
-function saveSessionData(kv, data) {
-  try {
-    kv.set(SESSION_DATA_KEY, JSON.stringify(data));
-  } catch {
+function fmtDurationShort(ms, running) {
+  if (running && ms < 2e3) return "";
+  if (ms < 1e3) return (ms / 1e3).toFixed(2) + "s";
+  if (ms < 6e4) return (ms / 1e3).toFixed(2) + "s";
+  const m = Math.floor(ms / 6e4);
+  const s = Math.round(ms % 6e4 / 1e3);
+  return `${m}m${s}s`;
+}
+var TIME_FORMATS = ["short", "decimal", "clock", "compact", "seconds"];
+var TIME_FORMAT_SAMPLES = {
+  decimal: "45.3s \xB7 9.5m \xB7 1.9h",
+  short: "45.32s \xB7 112m35s",
+  clock: "0:45 \xB7 1:52:35",
+  compact: "45s \xB7 1h52m",
+  seconds: "45s \xB7 6755s"
+};
+function fmtDuration(ms, running, mode = "short") {
+  if (running && ms < 2e3) return "";
+  const t = Number.isFinite(ms) && ms > 0 ? ms : 0;
+  switch (mode) {
+    case "short":
+      return fmtDurationShort(t, false);
+    case "compact": {
+      if (t < 6e4) return `${Math.floor(t / 1e3)}s`;
+      if (t < 36e5) return `${Math.floor(t / 6e4)}m${Math.floor(t % 6e4 / 1e3)}s`;
+      return `${Math.floor(t / 36e5)}h${Math.floor(t % 36e5 / 6e4)}m`;
+    }
+    case "clock": {
+      const s = Math.floor(t % 6e4 / 1e3);
+      if (t < 36e5) return `${Math.floor(t / 6e4)}:${String(s).padStart(2, "0")}`;
+      const m = Math.floor(t % 36e5 / 6e4);
+      return `${Math.floor(t / 36e5)}:${String(m).padStart(2, "0")}:${String(s).padStart(2, "0")}`;
+    }
+    case "seconds":
+      return `${Math.floor(t / 1e3)}s`;
+    case "decimal":
+    default: {
+      if (t < 59950) return `${(t / 1e3).toFixed(1)}s`;
+      if (t < 3597e3) return `${(t / 6e4).toFixed(1)}m`;
+      return `${(t / 36e5).toFixed(1)}h`;
+    }
   }
 }
-function readTTLDays(kv) {
-  const ttlDaysRaw = parseInt(String(kv.get(SETTING_KEYS.ttlDays, "3")), 10);
-  return Number.isNaN(ttlDaysRaw) ? 3 : ttlDaysRaw;
+function fmtTokens(n) {
+  if (n < 1e3) return `${n}`;
+  if (n < 1e6) return `${(n / 1e3).toFixed(1)}k`;
+  return `${(n / 1e6).toFixed(1)}M`;
+}
+function safeErrorMsg(err) {
+  if (!err) return "";
+  if (typeof err === "string") return err;
+  if (typeof err === "object") return String(err.message || err.code || "");
+  return "";
 }
 
 // src/_version.ts
-var PLUGIN_VERSION = "1.6.0";
+var PLUGIN_VERSION = "1.7.0";
 
 // src/i18n.ts
 var ZH_T = {
@@ -374,6 +906,7 @@ var ZH_T = {
   "clear.prompt": "\u786E\u5B9A\u6E05\u9664\u5F53\u524D\u4F1A\u8BDD\u6240\u6709\u5B50\u4EE3\u7406\u8BB0\u5F55\uFF1F\u6B64\u64CD\u4F5C\u4E0D\u53EF\u64A4\u9500\u3002",
   "clear.prompt_running": "\u5F53\u524D\u6709 {n} \u4E2A\u8FD0\u884C\u4E2D\u7684\u5B50\u4EE3\u7406\uFF0C\u6E05\u9664\u540E\u5C06\u4E0D\u53EF\u6062\u590D\u3002\u786E\u5B9A\u7EE7\u7EED\uFF1F",
   "clear.done": "\u5DF2\u6E05\u9664 {n} \u6761\u5B50\u4EE3\u7406\u8BB0\u5F55",
+  "clear.failed": "\u6E05\u9664\u5931\u8D25",
   "clear.empty": "\u5F53\u524D\u4F1A\u8BDD\u65E0\u5B50\u4EE3\u7406\u8BB0\u5F55",
   "cancel.no_session": "\u5B50\u4F1A\u8BDD ID \u4E0D\u53EF\u7528",
   "cancel.not_child": "\u76EE\u6807\u4E0D\u662F\u5B50\u4F1A\u8BDD",
@@ -384,7 +917,25 @@ var ZH_T = {
   "cancel.sent": "\u5DF2\u53D1\u9001\u53D6\u6D88\u6307\u4EE4",
   "cancel.failed": "\u53D6\u6D88\u5931\u8D25",
   "borderShown": "\u9762\u677F\u8FB9\u6846 \u5DF2\u663E\u793A",
-  "borderHidden": "\u9762\u677F\u8FB9\u6846 \u5DF2\u9690\u85CF"
+  "borderHidden": "\u9762\u677F\u8FB9\u6846 \u5DF2\u9690\u85CF",
+  "settings.title": "SubAgent Magazine \u2014 \u8BBE\u7F6E",
+  "settings.section.general": "\u901A\u7528",
+  "settings.lang": "\u8BED\u8A00",
+  "settings.max": "\u6700\u5927\u6761\u76EE\u6570",
+  "settings.order": "\u6392\u5E8F\u65B9\u5F0F",
+  "settings.scroll": "\u6EDA\u52A8\u6A21\u5F0F",
+  "settings.ttl": "\u4FDD\u7559\u671F\u9650",
+  "settings.border": "\u9762\u677F\u8FB9\u6846",
+  "settings.showEntryCost": "\u6BCF\u6761\u5B50\u4EE3\u7406\u663E\u793A\u8D39\u7528",
+  "settings.showEntryTime": "\u5217\u8868\u4E2D\u663E\u793A\u8017\u65F6",
+  "settings.showEntryTokens": "\u5217\u8868\u4E2D\u663E\u793A Token \u6570",
+  "settings.timeFormat": "\u65F6\u95F4\u683C\u5F0F",
+  "settings.dbSync": "\u672C\u5730\u6570\u636E\u5E93\u8865\u5168",
+  "settings.on": "\u5F00",
+  "settings.off": "\u5173",
+  "settings.saved": "\u5DF2\u4FDD\u5B58 {item}\uFF1A{value}",
+  "settings.invalid": "\u65E0\u6548\u7684\u6570\u503C",
+  "settings.close": "\u5173\u95ED"
 };
 var EN_T = {
   "panel.title": "SubAgent",
@@ -427,6 +978,7 @@ var EN_T = {
   "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",
@@ -437,7 +989,25 @@ var EN_T = {
   "cancel.sent": "Cancel instruction sent",
   "cancel.failed": "Cancellation failed",
   "borderShown": "Panel border shown",
-  "borderHidden": "Panel border hidden"
+  "borderHidden": "Panel border hidden",
+  "settings.title": "SubAgent Magazine \u2014 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.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"
 };
 var JA_T = {
   "panel.title": "\u30B5\u30D6\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8",
@@ -480,6 +1050,7 @@ var JA_T = {
   "clear.prompt": "\u3053\u306E\u30BB\u30C3\u30B7\u30E7\u30F3\u306E\u5168\u30B5\u30D6\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u8A18\u9332\u3092\u524A\u9664\u3057\u307E\u3059\u304B\uFF1F\u3053\u306E\u64CD\u4F5C\u306F\u5143\u306B\u623B\u305B\u307E\u305B\u3093\u3002",
   "clear.prompt_running": "\u5B9F\u884C\u4E2D\u306E\u30B5\u30D6\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u304C {n} \u500B\u3042\u308A\u307E\u3059\u3002\u524A\u9664\u3059\u308B\u3068\u5FA9\u5143\u3067\u304D\u307E\u305B\u3093\u3002\u7D9A\u884C\u3057\u307E\u3059\u304B\uFF1F",
   "clear.done": "{n} \u4EF6\u306E\u30B5\u30D6\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u8A18\u9332\u3092\u524A\u9664\u3057\u307E\u3057\u305F",
+  "clear.failed": "\u30AF\u30EA\u30A2\u306B\u5931\u6557\u3057\u307E\u3057\u305F",
   "clear.empty": "\u3053\u306E\u30BB\u30C3\u30B7\u30E7\u30F3\u306B\u30B5\u30D6\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u8A18\u9332\u306F\u3042\u308A\u307E\u305B\u3093",
   "cancel.no_session": "\u5B50\u30BB\u30C3\u30B7\u30E7\u30F3 ID \u304C\u5229\u7528\u3067\u304D\u307E\u305B\u3093",
   "cancel.not_child": "\u5BFE\u8C61\u306F\u5B50\u30BB\u30C3\u30B7\u30E7\u30F3\u3067\u306F\u3042\u308A\u307E\u305B\u3093",
@@ -490,7 +1061,25 @@ var JA_T = {
   "cancel.sent": "\u30AD\u30E3\u30F3\u30BB\u30EB\u6307\u793A\u3092\u9001\u4FE1\u3057\u307E\u3057\u305F",
   "cancel.failed": "\u30AD\u30E3\u30F3\u30BB\u30EB\u306B\u5931\u6557\u3057\u307E\u3057\u305F",
   "borderShown": "\u30D1\u30CD\u30EB\u67A0\u7DDA \u8868\u793A",
-  "borderHidden": "\u30D1\u30CD\u30EB\u67A0\u7DDA \u975E\u8868\u793A"
+  "borderHidden": "\u30D1\u30CD\u30EB\u67A0\u7DDA \u975E\u8868\u793A",
+  "settings.title": "SubAgent Magazine \u2014 \u8A2D\u5B9A",
+  "settings.section.general": "\u4E00\u822C",
+  "settings.lang": "\u8A00\u8A9E",
+  "settings.max": "\u6700\u5927\u8868\u793A\u6570",
+  "settings.order": "\u4E26\u3073\u9806",
+  "settings.scroll": "\u30B9\u30AF\u30ED\u30FC\u30EB",
+  "settings.ttl": "\u4FDD\u6301\u671F\u9593",
+  "settings.border": "\u30D1\u30CD\u30EB\u67A0",
+  "settings.showEntryCost": "\u30B5\u30D6\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u6BCE\u306E\u8CBB\u7528",
+  "settings.showEntryTime": "\u4E00\u89A7\u306B\u6240\u8981\u6642\u9593\u3092\u8868\u793A",
+  "settings.showEntryTokens": "\u4E00\u89A7\u306B\u30C8\u30FC\u30AF\u30F3\u6570\u3092\u8868\u793A",
+  "settings.timeFormat": "\u6642\u9593\u5F62\u5F0F",
+  "settings.dbSync": "\u30ED\u30FC\u30AB\u30EBDB\u88DC\u5B8C",
+  "settings.on": "\u30AA\u30F3",
+  "settings.off": "\u30AA\u30D5",
+  "settings.saved": "\u4FDD\u5B58\u3057\u307E\u3057\u305F {item}\uFF1A{value}",
+  "settings.invalid": "\u7121\u52B9\u306A\u5024\u3067\u3059",
+  "settings.close": "\u9589\u3058\u308B"
 };
 var KO_T = {
   "panel.title": "\uC11C\uBE0C \uC5D0\uC774\uC804\uD2B8",
@@ -533,6 +1122,7 @@ var KO_T = {
   "clear.prompt": "\uC774 \uC138\uC158\uC758 \uBAA8\uB4E0 \uC11C\uBE0C \uC5D0\uC774\uC804\uD2B8 \uAE30\uB85D\uC744 \uC0AD\uC81C\uD558\uC2DC\uACA0\uC2B5\uB2C8\uAE4C? \uC774 \uC791\uC5C5\uC740 \uB418\uB3CC\uB9B4 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.",
   "clear.prompt_running": "\uC2E4\uD589 \uC911\uC778 \uC11C\uBE0C \uC5D0\uC774\uC804\uD2B8\uAC00 {n}\uAC1C \uC788\uC2B5\uB2C8\uB2E4. \uC0AD\uC81C\uD558\uBA74 \uBCF5\uAD6C\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. \uACC4\uC18D\uD558\uC2DC\uACA0\uC2B5\uB2C8\uAE4C?",
   "clear.done": "\uC11C\uBE0C \uC5D0\uC774\uC804\uD2B8 \uAE30\uB85D {n}\uAC1C\uB97C \uC0AD\uC81C\uD588\uC2B5\uB2C8\uB2E4",
+  "clear.failed": "\uC9C0\uC6B0\uAE30\uC5D0 \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4",
   "clear.empty": "\uC774 \uC138\uC158\uC5D0 \uC11C\uBE0C \uC5D0\uC774\uC804\uD2B8 \uAE30\uB85D\uC774 \uC5C6\uC2B5\uB2C8\uB2E4",
   "cancel.no_session": "\uD558\uC704 \uC138\uC158 ID\uB97C \uC0AC\uC6A9\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4",
   "cancel.not_child": "\uB300\uC0C1\uC774 \uD558\uC704 \uC138\uC158\uC774 \uC544\uB2D9\uB2C8\uB2E4",
@@ -543,7 +1133,25 @@ var KO_T = {
   "cancel.sent": "\uCDE8\uC18C \uC9C0\uC2DC\uB97C \uBCF4\uB0C8\uC2B5\uB2C8\uB2E4",
   "cancel.failed": "\uCDE8\uC18C\uC5D0 \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4",
   "borderShown": "\uD328\uB110 \uD14C\uB450\uB9AC \uD45C\uC2DC",
-  "borderHidden": "\uD328\uB110 \uD14C\uB450\uB9AC \uC228\uAE40"
+  "borderHidden": "\uD328\uB110 \uD14C\uB450\uB9AC \uC228\uAE40",
+  "settings.title": "SubAgent Magazine \u2014 \uC124\uC815",
+  "settings.section.general": "\uC77C\uBC18",
+  "settings.lang": "\uC5B8\uC5B4",
+  "settings.max": "\uCD5C\uB300 \uD56D\uBAA9 \uC218",
+  "settings.order": "\uC815\uB82C \uC21C\uC11C",
+  "settings.scroll": "\uC2A4\uD06C\uB864 \uBAA8\uB4DC",
+  "settings.ttl": "\uBCF4\uC874 \uAE30\uAC04",
+  "settings.border": "\uD328\uB110 \uD14C\uB450\uB9AC",
+  "settings.showEntryCost": "\uD558\uC704 \uC5D0\uC774\uC804\uD2B8\uBCC4 \uBE44\uC6A9",
+  "settings.showEntryTime": "\uBAA9\uB85D\uC5D0 \uC18C\uC694 \uC2DC\uAC04 \uD45C\uC2DC",
+  "settings.showEntryTokens": "\uBAA9\uB85D\uC5D0 \uD1A0\uD070 \uC218 \uD45C\uC2DC",
+  "settings.timeFormat": "\uC2DC\uAC04 \uD615\uC2DD",
+  "settings.dbSync": "\uB85C\uCEEC DB \uBCF4\uC644",
+  "settings.on": "\uCF2C",
+  "settings.off": "\uB054",
+  "settings.saved": "\uC800\uC7A5\uB428 {item}: {value}",
+  "settings.invalid": "\uC798\uBABB\uB41C \uAC12",
+  "settings.close": "\uB2EB\uAE30"
 };
 var LANGS = { zh: ZH_T, en: EN_T, ja: JA_T, ko: KO_T };
 var LANG_META = [
@@ -579,11 +1187,292 @@ import { createSignal } from "solid-js";
 var globalEntryCache = /* @__PURE__ */ new Map();
 var [clearTick, setClearTick] = createSignal(0);
 
+// src/panel/entry-map.ts
+function findSubEntryKey(entries, id, sessionId) {
+  if (sessionId) {
+    for (const [key, entry] of entries) {
+      if (entry.sessionId === sessionId) return key;
+    }
+  }
+  return entries.has(id) ? id : void 0;
+}
+function upsertSubEntry(entries, partial, now = Date.now()) {
+  const key = findSubEntryKey(entries, partial.id, partial.sessionId) ?? partial.id;
+  const existing = entries.get(key);
+  const next = new Map(entries);
+  if (key !== partial.id) next.delete(partial.id);
+  const ended = partial.status === "done" || partial.status === "error" || partial.status === "cancelled";
+  next.set(key, {
+    ...existing ?? { startedAt: now },
+    ...partial,
+    id: existing?.id ?? partial.id,
+    startedAt: existing?.startedAt || partial.startedAt || now,
+    endedAt: ended ? existing?.endedAt || now : void 0
+  });
+  return next;
+}
+function statusRank(status) {
+  if (status === "running") return 0;
+  if (status === "cancel_requested") return 1;
+  return 2;
+}
+var isTerminalStatus = (status) => statusRank(status) === 2;
+function minDefined(a, b) {
+  if (a === void 0) return b;
+  if (b === void 0) return a;
+  return Math.min(a, b);
+}
+function maxDefined(a, b) {
+  if (a === void 0) return b;
+  if (b === void 0) return a;
+  return Math.max(a, b);
+}
+function mergeSubEntry(base, incoming) {
+  const successor = statusRank(incoming.status) > statusRank(base.status) ? incoming : base;
+  const status = successor.status;
+  const ended = isTerminalStatus(status);
+  return {
+    ...base,
+    ...incoming,
+    id: base.id,
+    status,
+    sessionId: incoming.sessionId ?? base.sessionId,
+    startedAt: minDefined(base.startedAt, incoming.startedAt) ?? base.startedAt,
+    endedAt: ended ? base.endedAt ?? incoming.endedAt ?? Date.now() : void 0,
+    tokens: maxDefined(base.tokens, incoming.tokens),
+    cost: maxDefined(base.cost, incoming.cost),
+    model: incoming.model ?? base.model,
+    todoTotal: maxDefined(base.todoTotal, incoming.todoTotal),
+    todoDone: maxDefined(base.todoDone, incoming.todoDone),
+    error: incoming.error ?? base.error,
+    cancelRequestedAt: minDefined(base.cancelRequestedAt, incoming.cancelRequestedAt),
+    abortAccepted: base.abortAccepted || incoming.abortAccepted || void 0,
+    cancelReason: incoming.cancelReason ?? base.cancelReason
+  };
+}
+function mergeSubEntries(base, incoming) {
+  const out = /* @__PURE__ */ new Map();
+  for (const entry of base) out.set(entry.id, entry);
+  for (const entry of incoming) {
+    const key = findSubEntryKey(out, entry.id, entry.sessionId);
+    if (!key) {
+      out.set(entry.id, entry);
+      continue;
+    }
+    out.set(key, mergeSubEntry(out.get(key), entry));
+  }
+  return out;
+}
+
+// src/v2/settings-menu.ts
+var TTL_VALUES = [3, 7, 14, 30, 0];
+var nextTick = () => new Promise((resolve) => setTimeout(resolve, 0));
+function openSettingsMenu(context, api, signals) {
+  runSettingsMenu(context, api, signals).catch((err) => {
+    try {
+      context.ui.toast.show({ message: String(err), variant: "error" });
+    } catch {
+    }
+  });
+}
+async function runSettingsMenu(context, api, signals) {
+  const t = createT(() => signals.lang());
+  const kv = api.kv;
+  const onOff = (v) => v ? t("settings.on") : t("settings.off");
+  const langLabel = () => LANG_META.find((m) => m.code === signals.lang())?.label ?? signals.lang();
+  const ttlTitle = (d) => d === 0 ? t("ttl.unlimited") : t(d === 3 ? "ttl.3d" : d === 7 ? "ttl.7d" : d === 14 ? "ttl.14d" : "ttl.30d");
+  const ttlLabel = () => ttlTitle(readTTLDays(kv));
+  const orderLabel = () => signals.sortOrder() === "desc" ? t("order.desc") : t("order.asc");
+  const scrollLabel = () => signals.scrollMode() === "wheel" ? t("scroll.wheel") : t("scroll.click");
+  const toast = (item, value) => context.ui.toast.show({ message: t("settings.saved", { item, value }) });
+  while (true) {
+    const category = t("settings.section.general");
+    const choice = await context.ui.dialog.select({
+      title: t("settings.title"),
+      options: [
+        { title: t("settings.lang"), value: "lang", description: langLabel(), category },
+        { title: t("settings.max"), value: "max", description: String(signals.maxEntries()), category },
+        { title: t("settings.order"), value: "order", description: orderLabel(), category },
+        { title: t("settings.scroll"), value: "scroll", description: scrollLabel(), category },
+        { title: t("settings.ttl"), value: "ttl", description: ttlLabel(), category },
+        { title: t("settings.border"), value: "border", description: onOff(signals.borderVisible()), category },
+        { title: t("settings.showEntryCost"), value: "cost", description: onOff(signals.showEntryCost()), category },
+        { 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.dbSync"), value: "dbsync", description: onOff(signals.dbSync()), category },
+        { title: t("settings.close"), value: "close" }
+      ]
+    });
+    if (choice === void 0 || choice === "close") return;
+    if (choice === "lang") {
+      const picked = await context.ui.dialog.select({
+        title: t("settings.lang"),
+        options: LANG_META.map((m) => ({ title: m.label, value: m.code })),
+        current: signals.lang()
+      });
+      if (picked) {
+        signals.setLang(picked);
+        kv.set(SETTING_KEYS.lang, picked);
+        toast(t("settings.lang"), LANG_META.find((m) => m.code === picked)?.label ?? picked);
+      }
+    }
+    if (choice === "max") {
+      const val = await context.ui.dialog.prompt({
+        title: t("settings.max"),
+        message: "1\u201350",
+        placeholder: String(signals.maxEntries())
+      });
+      if (val !== void 0) {
+        const n = parseInt(val.trim(), 10);
+        if (Number.isNaN(n)) {
+          context.ui.toast.show({ message: t("settings.invalid"), variant: "warning" });
+        } else {
+          const clamped = Math.max(1, Math.min(50, n));
+          signals.setMaxEntries(clamped);
+          kv.set(SETTING_KEYS.maxEntries, clamped);
+          toast(t("settings.max"), String(clamped));
+        }
+      }
+    }
+    if (choice === "order") {
+      const picked = await context.ui.dialog.select({
+        title: t("settings.order"),
+        options: [
+          { title: t("order.desc"), value: "desc" },
+          { title: t("order.asc"), value: "asc" }
+        ],
+        current: signals.sortOrder()
+      });
+      if (picked) {
+        signals.setSortOrder(picked);
+        kv.set(SETTING_KEYS.order, picked);
+        toast(t("settings.order"), picked === "desc" ? t("order.desc") : t("order.asc"));
+      }
+    }
+    if (choice === "scroll") {
+      const picked = await context.ui.dialog.select({
+        title: t("settings.scroll"),
+        options: [
+          { title: t("scroll.wheel"), value: "wheel" },
+          { title: t("scroll.click"), value: "click" }
+        ],
+        current: signals.scrollMode()
+      });
+      if (picked) {
+        signals.setScrollMode(picked);
+        kv.set(SETTING_KEYS.scrollMode, picked);
+        toast(t("settings.scroll"), picked === "wheel" ? t("scroll.wheel") : t("scroll.click"));
+      }
+    }
+    if (choice === "ttl") {
+      const picked = await context.ui.dialog.select({
+        title: t("settings.ttl"),
+        options: TTL_VALUES.map((d) => ({ title: ttlTitle(d), value: d })),
+        current: readTTLDays(kv)
+      });
+      if (picked !== void 0) {
+        kv.set(SETTING_KEYS.ttlDays, String(picked));
+        toast(t("settings.ttl"), ttlTitle(picked));
+      }
+    }
+    if (choice === "border") {
+      const picked = await context.ui.dialog.select({
+        title: t("settings.border"),
+        options: [
+          { title: t("settings.on"), value: true },
+          { title: t("settings.off"), value: false }
+        ],
+        current: signals.borderVisible()
+      });
+      if (picked !== void 0) {
+        signals.setBorderVisible(picked);
+        kv.set(SETTING_KEYS.border, picked);
+        toast(t("settings.border"), onOff(picked));
+      }
+    }
+    if (choice === "cost") {
+      const picked = await context.ui.dialog.select({
+        title: t("settings.showEntryCost"),
+        options: [
+          { title: t("settings.on"), value: true },
+          { title: t("settings.off"), value: false }
+        ],
+        current: signals.showEntryCost()
+      });
+      if (picked !== void 0) {
+        signals.setShowEntryCost(picked);
+        kv.set(SETTING_KEYS.showEntryCost, picked);
+        toast(t("settings.showEntryCost"), onOff(picked));
+      }
+    }
+    if (choice === "time") {
+      const picked = await context.ui.dialog.select({
+        title: t("settings.showEntryTime"),
+        options: [
+          { title: t("settings.on"), value: true },
+          { title: t("settings.off"), value: false }
+        ],
+        current: signals.showEntryTime()
+      });
+      if (picked !== void 0) {
+        signals.setShowEntryTime(picked);
+        kv.set(SETTING_KEYS.showEntryTime, picked);
+        toast(t("settings.showEntryTime"), onOff(picked));
+      }
+    }
+    if (choice === "timefmt") {
+      const picked = await context.ui.dialog.select({
+        title: t("settings.timeFormat"),
+        options: TIME_FORMATS.map((f) => ({ title: `${f} \u2014 ${TIME_FORMAT_SAMPLES[f]}`, value: f })),
+        current: signals.timeFormat()
+      });
+      if (picked) {
+        signals.setTimeFormat(picked);
+        kv.set(SETTING_KEYS.timeFormat, picked);
+        toast(t("settings.timeFormat"), TIME_FORMAT_SAMPLES[picked]);
+      }
+    }
+    if (choice === "tokens") {
+      const picked = await context.ui.dialog.select({
+        title: t("settings.showEntryTokens"),
+        options: [
+          { title: t("settings.on"), value: true },
+          { title: t("settings.off"), value: false }
+        ],
+        current: signals.showEntryTokens()
+      });
+      if (picked !== void 0) {
+        signals.setShowEntryTokens(picked);
+        kv.set(SETTING_KEYS.showEntryTokens, picked);
+        toast(t("settings.showEntryTokens"), onOff(picked));
+      }
+    }
+    if (choice === "dbsync") {
+      const picked = await context.ui.dialog.select({
+        title: t("settings.dbSync"),
+        options: [
+          { title: t("settings.on"), value: true },
+          { title: t("settings.off"), value: false }
+        ],
+        current: signals.dbSync()
+      });
+      if (picked !== void 0) {
+        signals.setDbSync(picked);
+        kv.set(SETTING_KEYS.dbSync, picked);
+        toast(t("settings.dbSync"), onOff(picked));
+      }
+    }
+    await nextTick();
+  }
+}
+
 // src/v2/commands.ts
 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);
@@ -670,6 +1559,111 @@ 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.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} \u2014 ${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.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",
@@ -712,27 +1706,43 @@ function makeCommands(context, api, signals) {
           }
         }
         if (count > 0) {
+          const ok = () => api.ui.toast(signals.lang() === "zh" ? `\u5DF2\u6807\u8BB0 ${count} \u4E2A\u8FD0\u884C\u4E2D\u7684\u6761\u76EE\u4E3A\u5B8C\u6210` : `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) => {
+              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 {
+            fail();
           }
-          api.ui.toast(signals.lang() === "zh" ? `\u5DF2\u6807\u8BB0 ${count} \u4E2A\u8FD0\u884C\u4E2D\u7684\u6761\u76EE\u4E3A\u5B8C\u6210` : `Marked ${count} running entries as done`);
         } else {
           api.ui.toast(signals.lang() === "zh" ? "\u6CA1\u6709\u9700\u8981\u6E05\u7406\u7684\u8FD0\u884C\u4E2D\u6761\u76EE" : "No running entries to clear");
         }
@@ -789,32 +1799,45 @@ 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 = [.../* @__PURE__ */ 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 = [.../* @__PURE__ */ 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 = [.../* @__PURE__ */ 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 = [.../* @__PURE__ */ 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 {
         }
       }
@@ -961,53 +1984,6 @@ async function copyText(text) {
 // src/core/types.ts
 var SUBAGENT_TOOLS = /* @__PURE__ */ new Set(["task", "subagent", "delegate", "call_omo_agent"]);
 
-// src/core/format.ts
-function charColumns(c) {
-  const code = c.codePointAt(0) ?? 0;
-  if (code < 32) return 0;
-  if (code < 127) return 1;
-  if (code < 160) return 0;
-  if (code >= 4352 && code <= 4447 || code >= 11904 && code <= 42191 || code >= 44032 && code <= 55203 || code >= 63744 && code <= 64255 || code >= 65040 && code <= 65135 || code >= 65281 && code <= 65376 || code >= 65504 && code <= 65510 || code >= 127744 && code <= 128591 || code >= 131072 && code <= 262141)
-    return 2;
-  return 1;
-}
-function visualWidth(s) {
-  let w = 0;
-  for (const c of s) w += charColumns(c);
-  return w;
-}
-function truncate(text, maxCols) {
-  if (visualWidth(text) <= maxCols) return text;
-  let cols = 0;
-  let i = 0;
-  for (const c of text) {
-    const w = charColumns(c);
-    if (cols + w > maxCols - 1) break;
-    cols += w;
-    i += c.length;
-  }
-  return text.slice(0, i) + "\u2026";
-}
-function fmtDurationShort(ms, running) {
-  if (running && ms < 2e3) return "";
-  if (ms < 1e3) return (ms / 1e3).toFixed(2) + "s";
-  if (ms < 6e4) return (ms / 1e3).toFixed(2) + "s";
-  const m = Math.floor(ms / 6e4);
-  const s = Math.round(ms % 6e4 / 1e3);
-  return `${m}m${s}s`;
-}
-function fmtTokens(n) {
-  if (n < 1e3) return `${n}`;
-  if (n < 1e6) return `${(n / 1e3).toFixed(1)}k`;
-  return `${(n / 1e6).toFixed(1)}M`;
-}
-function safeErrorMsg(err) {
-  if (!err) return "";
-  if (typeof err === "string") return err;
-  if (typeof err === "object") return String(err.message || err.code || "");
-  return "";
-}
-
 // src/core/color.ts
 function rgb(raw) {
   if (typeof raw === "string" && raw.startsWith("#")) {
@@ -1063,52 +2039,38 @@ function dimColor(hex, factor = 0.5) {
   const r = Math.round(c.r * factor);
   const g = Math.round(c.g * factor);
   const b = Math.round(c.b * factor);
-  return "#" + [r, g, b].map((v) => Math.max(0, Math.min(255, v)).toString(16).padStart(2, "0")).join("");
-}
-var FALLBACK = {
-  primary: "#8B9DAF",
-  text: "#C5C5BB",
-  muted: "#7A7A72",
-  success: "#9CAF8B",
-  warning: "#C5B88D",
-  error: "#B08A8A",
-  border: "#6B6B63"
-};
-var MAX_SAT = 0.28;
-
-// src/panel/session-routing.ts
-function isDirectChildSession(currentSessionId, eventSessionId, eventSession) {
-  return eventSessionId !== currentSessionId && eventSession?.parentID === currentSessionId;
-}
-
-// src/panel/entry-map.ts
-function findSubEntryKey(entries, id, sessionId) {
-  if (sessionId) {
-    for (const [key, entry] of entries) {
-      if (entry.sessionId === sessionId) return key;
-    }
-  }
-  return entries.has(id) ? id : void 0;
-}
-function upsertSubEntry(entries, partial, now = Date.now()) {
-  const key = findSubEntryKey(entries, partial.id, partial.sessionId) ?? partial.id;
-  const existing = entries.get(key);
-  const next = new Map(entries);
-  if (key !== partial.id) next.delete(partial.id);
-  const ended = partial.status === "done" || partial.status === "error" || partial.status === "cancelled";
-  next.set(key, {
-    ...existing ?? { startedAt: now },
-    ...partial,
-    id: existing?.id ?? partial.id,
-    startedAt: existing?.startedAt || partial.startedAt || now,
-    endedAt: ended ? existing?.endedAt || now : void 0
-  });
-  return next;
+  return "#" + [r, g, b].map((v) => Math.max(0, Math.min(255, v)).toString(16).padStart(2, "0")).join("");
+}
+var FALLBACK = {
+  primary: "#8B9DAF",
+  text: "#C5C5BB",
+  muted: "#7A7A72",
+  success: "#9CAF8B",
+  warning: "#C5B88D",
+  error: "#B08A8A",
+  border: "#6B6B63"
+};
+var MAX_SAT = 0.28;
+
+// src/panel/session-routing.ts
+function isDirectChildSession(currentSessionId, eventSessionId, eventSession) {
+  return eventSessionId !== currentSessionId && eventSession?.parentID === currentSessionId;
 }
 
 // src/panel/SubAgentPanel.tsx
 var LEFT_PAD = 4;
 var INDENT = 2;
+function partMetadata(part, st) {
+  const partMeta = part?.metadata;
+  if (partMeta && Object.keys(partMeta).length > 0) return partMeta;
+  const stateMeta = st?.metadata;
+  return stateMeta && Object.keys(stateMeta).length > 0 ? stateMeta : void 0;
+}
+function validModel(model) {
+  if (typeof model !== "string") return false;
+  const s = model.trim();
+  return s.length > 0 && s !== "[object Object]" && !s.startsWith("{");
+}
 function SubAgentPanel(props) {
   const t = createT(() => props.lang());
   const SESSION_DATA_KEY2 = `${KV_PREFIX}.session_data`;
@@ -1123,11 +2085,32 @@ function SubAgentPanel(props) {
       return {};
     }
   };
-  const saveSessionData2 = (data) => {
-    try {
-      props.api.kv.set(SESSION_DATA_KEY2, JSON.stringify(data));
-    } catch {
-    }
+  const mutateSessionData = (mutator) => {
+    void Promise.resolve(updateSessionData(props.api.kv, mutator)).catch(() => {
+    });
+  };
+  const ensureRootRecord = (data, sid) => {
+    const rec = data[sid];
+    if (rec) return rec;
+    const created = {
+      ts: Date.now(),
+      entries: [],
+      scroll: 0,
+      expanded: "",
+      children: {}
+    };
+    data[sid] = created;
+    return created;
+  };
+  const ensureChildRecord = (data, parentSid, sid) => {
+    const parent = ensureRootRecord(data, parentSid);
+    if (!parent.children) parent.children = {};
+    if (!parent.children[sid]) parent.children[sid] = {
+      scroll: 0,
+      expanded: "",
+      entries: []
+    };
+    return parent.children[sid];
   };
   const resolveParent = (sid) => {
     try {
@@ -1169,129 +2152,71 @@ function SubAgentPanel(props) {
     clearTimeout(persistTimer);
     persistTimer = setTimeout(() => {
       try {
-        const data = loadSessionData2();
+        mutateSessionData((data) => {
+          const {
+            parentSid,
+            isChild
+          } = resolveParent(sid);
+          if (isChild) {
+            const parent = ensureRootRecord(data, parentSid);
+            const child = ensureChildRecord(data, parentSid, sid);
+            child.entries = [...mergeSubEntries(child.entries ?? [], entries2.values()).values()];
+            parent.ts = Date.now();
+          } else {
+            const rec = ensureRootRecord(data, sid);
+            rec.ts = Date.now();
+            rec.entries = [...mergeSubEntries(rec.entries ?? [], entries2.values()).values()];
+          }
+        });
+      } catch {
+      }
+    }, 200);
+  };
+  const persistScroll = (sid, scroll) => {
+    try {
+      mutateSessionData((data) => {
         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: [...entries2.values()]
-          };
+          ensureChildRecord(data, parentSid, sid).scroll = scroll;
         } else {
-          data[sid] = {
-            ...data[sid],
-            ts: Date.now(),
-            entries: [...entries2.values()],
-            children: data[sid]?.children ?? {}
-          };
+          const rec = ensureRootRecord(data, sid);
+          rec.ts = Date.now();
+          rec.scroll = scroll;
         }
-        saveSessionData2(data);
-      } catch {
-      }
-    }, 200);
-  };
-  const persistScroll = (sid, scroll) => {
-    try {
-      const data = loadSessionData2();
-      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],
-          scroll
-        };
-      } else {
-        data[sid] = {
-          ...data[sid],
-          ts: Date.now(),
-          scroll,
-          children: data[sid]?.children ?? {}
-        };
-      }
-      saveSessionData2(data);
+      });
     } catch {
     }
   };
   const persistExpanded = (sid, expanded2) => {
     try {
-      const data = loadSessionData2();
-      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],
-          expanded: expanded2
-        };
-      } else {
-        data[sid] = {
-          ...data[sid],
-          ts: Date.now(),
-          expanded: expanded2,
-          children: data[sid]?.children ?? {}
-        };
-      }
-      saveSessionData2(data);
+      mutateSessionData((data) => {
+        const {
+          parentSid,
+          isChild
+        } = resolveParent(sid);
+        if (isChild) {
+          ensureChildRecord(data, parentSid, sid).expanded = expanded2;
+        } else {
+          const rec = ensureRootRecord(data, sid);
+          rec.ts = Date.now();
+          rec.expanded = expanded2;
+        }
+      });
     } catch {
     }
   };
   const cleanupOldSessions = () => {
     if (ttlDays <= 0) return;
     try {
-      const data = loadSessionData2();
       const cutoff = Date.now() - TTL_MS;
-      let changed = false;
-      for (const sid of Object.keys(data)) {
-        if (data[sid].ts < cutoff) {
-          delete data[sid];
-          changed = true;
+      mutateSessionData((data) => {
+        for (const sid of Object.keys(data)) {
+          if (data[sid].ts < cutoff) delete data[sid];
         }
-      }
-      if (changed) saveSessionData2(data);
+      });
     } catch {
     }
   };
@@ -1311,38 +2236,22 @@ function SubAgentPanel(props) {
       if (needsImmediateFlush) {
         clearTimeout(persistTimer);
         try {
-          const data = loadSessionData2();
-          const {
-            parentSid,
-            isChild
-          } = resolveParent(props.sessionId);
-          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[props.sessionId]) data[parentSid].children[props.sessionId] = {
-              scroll: 0,
-              expanded: "",
-              entries: []
-            };
-            data[parentSid].children[props.sessionId] = {
-              ...data[parentSid].children[props.sessionId],
-              entries: [...next.values()]
-            };
-          } else {
-            data[props.sessionId] = {
-              ...data[props.sessionId],
-              ts: Date.now(),
-              entries: [...next.values()],
-              children: data[props.sessionId]?.children ?? {}
-            };
-          }
-          saveSessionData2(data);
+          mutateSessionData((data) => {
+            const {
+              parentSid,
+              isChild
+            } = resolveParent(props.sessionId);
+            if (isChild) {
+              const parent = ensureRootRecord(data, parentSid);
+              const child = ensureChildRecord(data, parentSid, props.sessionId);
+              child.entries = [...mergeSubEntries(child.entries ?? [], next.values()).values()];
+              parent.ts = Date.now();
+            } else {
+              const rec = ensureRootRecord(data, props.sessionId);
+              rec.ts = Date.now();
+              rec.entries = [...mergeSubEntries(rec.entries ?? [], next.values()).values()];
+            }
+          });
         } catch {
         }
       } else {
@@ -1510,7 +2419,9 @@ function SubAgentPanel(props) {
     const part = event.payload?.part;
     if (!part) return;
     const eventSid = event.payload?.sessionID !== void 0 ? String(event.payload.sessionID) : void 0;
-    if (event.scope === "global" && eventSid !== props.sessionId) return;
+    if (event.scope === "global" && eventSid !== props.sessionId) {
+      return;
+    }
     if (part.type === "subtask") {
       const agent = String(part.agent ?? "?");
       const prompt = String(part.prompt ?? "");
@@ -1539,7 +2450,7 @@ function SubAgentPanel(props) {
       if (rawStatus === "error") {
         const id2 = `tool:${String(part.id ?? "")}`;
         if (!part.id) return;
-        const stMeta2 = st?.metadata;
+        const stMeta2 = partMetadata(part, st);
         const errorSid = stMeta2?.session_id !== void 0 ? String(stMeta2.session_id) : stMeta2?.sessionId !== void 0 ? String(stMeta2.sessionId) : void 0;
         const key = findSubEntryKey(entryMap(), id2, errorSid);
         const existing = key ? entryMap().get(key) : void 0;
@@ -1559,7 +2470,7 @@ function SubAgentPanel(props) {
       let status = "running";
       if (rawStatus === "completed") status = "done";
       if ((input?.run_in_background === true || input?.background === true) && status === "done") {
-        const stMetaCheck = st?.metadata;
+        const stMetaCheck = partMetadata(part, st);
         const hasChild = stMetaCheck?.session_id !== void 0 || stMetaCheck?.sessionId !== void 0;
         if (hasChild) status = "running";
       }
@@ -1568,7 +2479,7 @@ function SubAgentPanel(props) {
       const desc = input?.description !== void 0 ? String(input.description) : "";
       const title = desc || truncate(prompt.replace(/\n/g, " ").replace(/\s+/g, " ").trim(), 40);
       const id = `tool:${String(part.id ?? crypto.randomUUID())}`;
-      const stMeta = st?.metadata;
+      const stMeta = partMetadata(part, st);
       const subSid = stMeta?.session_id !== void 0 ? String(stMeta.session_id) : stMeta?.sessionId !== void 0 ? String(stMeta.sessionId) : void 0;
       upsertEntry({
         id,
@@ -1758,28 +2669,37 @@ function SubAgentPanel(props) {
         if (!found) {
           const data = loadSessionData2();
           const rec = data[parentSid];
-          if (rec?.entries) {
+          if (rec?.entries?.length) {
             const fallbackMap = new Map(rec.entries.map((e) => [e.id, e]));
             found = tryMatchAndUpdate(fallbackMap, sid, status, nowTs);
             if (found) {
-              data[parentSid] = {
-                ...rec,
-                ts: nowTs,
-                entries: [...fallbackMap.values()]
-              };
-              saveSessionData2(data);
               globalEntryCache.set(parentSid, fallbackMap);
+              mutateSessionData((latest) => {
+                const latestRec = latest[parentSid];
+                latest[parentSid] = {
+                  ...latestRec ?? rec,
+                  ts: nowTs,
+                  entries: [...mergeSubEntries(latestRec?.entries ?? [], fallbackMap.values()).values()]
+                };
+              });
             }
           }
         }
         if (found && parentCache) {
-          const data = loadSessionData2();
-          data[parentSid] = {
-            ...data[parentSid],
-            ts: nowTs,
-            entries: [...parentCache.values()]
-          };
-          saveSessionData2(data);
+          mutateSessionData((data) => {
+            const rec = data[parentSid];
+            data[parentSid] = {
+              ...rec ?? {
+                entries: [],
+                scroll: 0,
+                expanded: "",
+                children: {},
+                ts: nowTs
+              },
+              ts: nowTs,
+              entries: [...mergeSubEntries(rec?.entries ?? [], parentCache.values()).values()]
+            };
+          });
         }
       }
     } catch {
@@ -1818,52 +2738,357 @@ function SubAgentPanel(props) {
     }, 150);
   };
   const bump = () => setRenderTick((v) => v + 1);
+  const settleIdleEntries = (prev) => {
+    let changed = false;
+    const next = new Map(prev);
+    for (const [id, entry] of next) {
+      if (entry.status !== "running" && entry.status !== "cancel_requested") continue;
+      let sid = entry.sessionId;
+      if (!sid) {
+        try {
+          const callId = String(entry.id).replace(/^tool:/, "");
+          sid = props.api.session.resolveChild?.({
+            parentId: props.sessionId,
+            callId,
+            agent: entry.agent,
+            startedAt: entry.startedAt
+          });
+        } catch {
+        }
+        if (!sid) continue;
+        next.set(id, {
+          ...entry,
+          sessionId: sid
+        });
+        changed = true;
+      }
+      try {
+        const st = props.api.session.status(sid);
+        if (!st || st.type !== "idle") continue;
+        const tokens = props.api.usage.readSessionTokens(sid);
+        const cost = props.api.usage.readSessionCost(sid);
+        const finalStatus = entry.status === "cancel_requested" && entry.abortAccepted ? "cancelled" : "done";
+        next.set(id, {
+          ...entry,
+          sessionId: sid,
+          status: finalStatus,
+          endedAt: Date.now(),
+          tokens: tokens ?? entry.tokens,
+          cost: cost ?? entry.cost
+        });
+        changed = true;
+      } catch {
+      }
+    }
+    return changed ? next : prev;
+  };
+  const reconcileIdleEntries = () => {
+    try {
+      const before = entryMap();
+      const after = settleIdleEntries(before);
+      if (after !== before) setEntryMap(after);
+    } catch {
+    }
+  };
+  const runSessionScan = (sid, replace) => {
+    let msgs;
+    try {
+      msgs = props.api.session.messages(sid);
+    } catch {
+    }
+    if (!msgs || msgs.length === 0) return false;
+    setEntryMapRaw((prev) => {
+      const next = replace ? new Map(globalEntryCache.get(sid) ?? loadEntries(sid)) : new Map(prev);
+      const {
+        parentSid: scanPSid,
+        isChild: scanChild
+      } = resolveParent(sid);
+      const scanRec = loadSessionData2()[scanPSid];
+      const clearedIds = new Set(scanChild ? scanRec?.children?.[sid]?.clearedIds : scanRec?.clearedIds);
+      try {
+        for (const msg of msgs) {
+          const parts = props.api.session.part(msg.id) ?? [];
+          for (const partRaw of parts) {
+            const part = partRaw;
+            if (part.type === "tool") {
+              const tool = String(part.tool ?? "");
+              if (!SUBAGENT_TOOLS.has(tool)) continue;
+              const id = `tool:${String(part.id ?? "")}`;
+              if (!part.id) continue;
+              const st = part.state;
+              const rawStatus = String(st?.status ?? "");
+              const scanInput = st?.input;
+              const scanMeta = partMetadata(part, st);
+              let scanSubSid = scanMeta?.session_id !== void 0 ? String(scanMeta.session_id) : scanMeta?.sessionId !== void 0 ? String(scanMeta.sessionId) : scanMeta?.sessionID !== void 0 ? String(scanMeta.sessionID) : void 0;
+              if (!scanSubSid) {
+                try {
+                  scanSubSid = props.api.session.resolveChild?.({
+                    parentId: sid,
+                    callId: String(part.id)
+                  });
+                } catch {
+                }
+              }
+              const existingKey = findSubEntryKey(next, id, scanSubSid);
+              const exists = existingKey ? next.get(existingKey) : void 0;
+              if (!exists && clearedIds.has(id)) continue;
+              if ((rawStatus === "pending" || rawStatus === "") && !exists) continue;
+              if (rawStatus === "error") {
+                if (exists && exists.status === "running") {
+                  next.set(existingKey ?? id, {
+                    ...exists,
+                    status: "error",
+                    endedAt: Date.now()
+                  });
+                }
+                continue;
+              }
+              const settled = exists !== void 0 && exists.status !== "running" && exists.status !== "cancel_requested";
+              const needsRepair = settled && (exists.sessionId === void 0 || exists.tokens === void 0 || exists.cost === void 0 || !validModel(exists.model));
+              if (settled && !needsRepair) continue;
+              let status = "running";
+              if (rawStatus === "completed") status = "done";
+              if ((scanInput?.run_in_background === true || scanInput?.background === true) && status === "done") {
+                if (scanSubSid !== void 0) status = "running";
+              }
+              if (status === "done" && scanSubSid) {
+                try {
+                  const childStatus = props.api.session.status(scanSubSid);
+                  if (childStatus && childStatus.type !== "idle") status = "running";
+                } catch {
+                }
+              }
+              if (settled) {
+                status = exists.status;
+              } else if (exists && status === "running") {
+                if (!rawStatus) {
+                  const msgTokens = msg?.tokens;
+                  if (msgTokens && (Number(msgTokens.input) > 0 || Number(msgTokens.output) > 0)) {
+                    status = "done";
+                  } else {
+                    continue;
+                  }
+                } else {
+                  continue;
+                }
+              }
+              const agent = String(part.subagent_type ?? scanInput?.agent ?? scanInput?.subagent_type ?? tool);
+              const prompt = String(scanInput?.prompt ?? part.description ?? "");
+              const desc = scanInput?.description !== void 0 ? String(scanInput.description) : "";
+              const title = desc || truncate(prompt.replace(/\n/g, " ").trim(), 40);
+              let tokens;
+              if (scanSubSid) tokens = props.api.usage.readSessionTokens(scanSubSid);
+              let cost;
+              if (scanSubSid) cost = props.api.usage.readSessionCost(scanSubSid);
+              let model;
+              if (scanSubSid) model = props.api.usage.readSessionModel(scanSubSid);
+              const entryKey = existingKey ?? id;
+              next.set(entryKey, {
+                ...exists ?? {
+                  id
+                },
+                title: title || exists?.title || "",
+                agent: exists?.agent ?? agent,
+                prompt: prompt || exists?.prompt || "",
+                // Preserve existing values (from handleSessionEnd / KV) — scan must not overwrite
+                tokens: exists?.tokens ?? tokens,
+                cost: exists?.cost ?? cost,
+                model: validModel(exists?.model) ? exists.model : model,
+                sessionId: exists?.sessionId ?? scanSubSid,
+                status,
+                startedAt: exists?.startedAt || Date.now(),
+                endedAt: exists?.endedAt ?? (status === "done" ? Date.now() : void 0)
+              });
+              if (entryKey !== id) next.delete(id);
+            }
+          }
+        }
+      } catch {
+      }
+      return next;
+    });
+    setEntryMapRaw((prev) => settleIdleEntries(prev));
+    const snapshot = entryMap();
+    if (snapshot.size > 0) {
+      globalEntryCache.set(sid, new Map(snapshot));
+      persistEntries(sid, snapshot);
+    }
+    return true;
+  };
+  let rescanTimer;
+  const missingNewestToolPart = () => {
+    try {
+      const msgs = props.api.session.messages(props.sessionId);
+      if (!msgs || msgs.length === 0) return false;
+      const map = entryMap();
+      const from = Math.max(0, msgs.length - 6);
+      for (let i = msgs.length - 1; i >= from; i--) {
+        const parts = props.api.session.part(msgs[i]?.id) ?? [];
+        for (const part of parts) {
+          if (!part || part.type !== "tool") continue;
+          if (!SUBAGENT_TOOLS.has(String(part.tool ?? ""))) continue;
+          const partId = String(part.id ?? "");
+          if (!partId) continue;
+          const st = part.state;
+          const rawStatus = String(st?.status ?? "");
+          if (rawStatus !== "running" && rawStatus !== "completed") continue;
+          const id = `tool:${partId}`;
+          const meta = partMetadata(part, st);
+          const subSid = meta?.session_id !== void 0 ? String(meta.session_id) : meta?.sessionId !== void 0 ? String(meta.sessionId) : void 0;
+          const key = findSubEntryKey(map, id, subSid);
+          const entry = key ? map.get(key) : void 0;
+          if (!entry) return true;
+          const input = st?.input;
+          const isBackground = input?.background === true || input?.run_in_background === true;
+          const stillRunning = entry.status === "running" || entry.status === "cancel_requested";
+          if (rawStatus === "completed" && !isBackground && stillRunning) return true;
+        }
+      }
+    } catch {
+    }
+    return false;
+  };
+  const scheduleRescan = () => {
+    if (disposed) return;
+    clearTimeout(rescanTimer);
+    rescanTimer = setTimeout(() => {
+      if (disposed) return;
+      untrack(() => {
+        if (!missingNewestToolPart()) return;
+        runSessionScan(props.sessionId, false);
+        bump();
+      });
+    }, 400);
+  };
+  let enrichCursor = 0;
   onMount(() => {
     const clock = setInterval(() => {
       setNow(Date.now());
       bump();
     }, 100);
+    let tick = 0;
     const tokenTimer = setInterval(() => {
+      tick++;
       untrack(() => {
+        let enriched;
+        let attempted = 0;
         setEntryMapRaw((prev) => {
           let changed = false;
           const next = new Map(prev);
+          const candidates = [];
           for (const [id, entry] of next) {
-            if (entry.status === "running" && entry.sessionId) {
+            const running = entry.status === "running" || entry.status === "cancel_requested";
+            const missing = entry.tokens === void 0 || entry.cost === void 0 || !validModel(entry.model);
+            if (entry.sessionId && !running && !missing) continue;
+            candidates.push(id);
+          }
+          if (candidates.length > 0) {
+            const start = enrichCursor % candidates.length;
+            let budget = 4;
+            for (let k = 0; k < candidates.length && budget > 0; k++) {
+              const id = candidates[(start + k) % candidates.length];
+              let entry = next.get(id);
+              if (!entry) continue;
+              if (!entry.sessionId) {
+                try {
+                  const callId = String(entry.id).replace(/^tool:/, "");
+                  const sid = props.api.session.resolveChild?.({
+                    parentId: props.sessionId,
+                    callId,
+                    agent: entry.agent,
+                    startedAt: entry.startedAt
+                  });
+                  if (sid) {
+                    entry = {
+                      ...entry,
+                      sessionId: sid
+                    };
+                    next.set(id, entry);
+                    changed = true;
+                  }
+                } catch {
+                }
+              }
+              if (!entry.sessionId) continue;
+              const childSid = entry.sessionId;
               let isChild = false;
               try {
-                const s = props.api.session.get(entry.sessionId);
-                isChild = s?.parentID === props.sessionId;
+                const s = props.api.session.get(childSid);
+                isChild = !s || s.parentID === props.sessionId;
               } catch {
+                isChild = true;
               }
               if (!isChild) continue;
-              const total = props.api.usage.readSessionTokens(entry.sessionId);
-              const todo = props.api.usage.readSessionTodo(entry.sessionId);
-              const model = entry.model ?? props.api.usage.readSessionModel(entry.sessionId);
+              budget--;
+              attempted++;
+              const running = entry.status === "running" || entry.status === "cancel_requested";
+              let entryChanged = false;
               const nextEntry = {
                 ...entry
               };
-              if (total !== void 0 && total !== entry.tokens) {
-                nextEntry.tokens = total;
-                changed = true;
+              if (running || entry.tokens === void 0) {
+                const total = props.api.usage.readSessionTokens(childSid);
+                if (total !== void 0 && total !== entry.tokens) {
+                  nextEntry.tokens = total;
+                  entryChanged = true;
+                }
+              }
+              if (running || entry.cost === void 0) {
+                const cost = props.api.usage.readSessionCost(childSid);
+                if (cost !== void 0 && cost !== entry.cost) {
+                  nextEntry.cost = cost;
+                  entryChanged = true;
+                }
               }
-              if (todo !== void 0) {
-                if (todo.total !== entry.todoTotal || todo.done !== entry.todoDone) {
+              if (running || !validModel(entry.model)) {
+                const model = props.api.usage.readSessionModel(childSid);
+                if (model && model !== entry.model) {
+                  nextEntry.model = model;
+                  entryChanged = true;
+                }
+              }
+              if (running) {
+                const todo = props.api.usage.readSessionTodo(childSid);
+                if (todo !== void 0 && (todo.total !== entry.todoTotal || todo.done !== entry.todoDone)) {
                   nextEntry.todoTotal = todo.total;
                   nextEntry.todoDone = todo.done;
-                  changed = true;
+                  entryChanged = true;
                 }
               }
-              if (model && !entry.model) {
-                nextEntry.model = model;
+              if (entryChanged) {
+                next.set(id, nextEntry);
                 changed = true;
               }
-              if (changed) next.set(id, nextEntry);
             }
+            enrichCursor = (start + Math.max(1, attempted)) % candidates.length;
           }
-          return changed ? next : prev;
+          if (!changed) return prev;
+          enriched = next;
+          return next;
         });
+        if (enriched) {
+          globalEntryCache.set(props.sessionId, new Map(enriched));
+          persistEntries(props.sessionId, enriched);
+        }
       });
+      reconcileIdleEntries();
+      if (tick % 4 === 0) {
+        untrack(() => {
+          if (missingNewestToolPart()) {
+            runSessionScan(props.sessionId, false);
+            bump();
+          }
+        });
+      }
+      if (tick % 60 === 0) {
+        untrack(() => {
+          const hasRunning = entryList().some((e) => e.status === "running" || e.status === "cancel_requested");
+          if (hasRunning) {
+            runSessionScan(props.sessionId, false);
+            bump();
+          }
+        });
+      }
       bump();
     }, 500);
     bump();
@@ -1871,7 +3096,10 @@ function SubAgentPanel(props) {
       handlePartUpdated(e);
       bump();
     });
-    const unsubMsg = props.api.event.on("message.updated", () => bump());
+    const unsubMsg = props.api.event.on("message.updated", () => {
+      bump();
+      scheduleRescan();
+    });
     const unsubIdle = props.api.event.on("session.idle", (e) => {
       handleSessionEnd(e, "done");
       bump();
@@ -1882,6 +3110,7 @@ function SubAgentPanel(props) {
     });
     onCleanup(() => {
       disposed = true;
+      clearTimeout(rescanTimer);
       clearInterval(clock);
       clearInterval(tokenTimer);
       unsubPart();
@@ -1899,7 +3128,9 @@ function SubAgentPanel(props) {
     const tick = clearTick();
     const forceReload = tick !== lastTick && !switched;
     lastTick = tick;
-    const t2 = setTimeout(() => {
+    let attempts = 0;
+    let retryTimer;
+    const run = () => {
       untrack(() => {
         if (switched) {
           const {
@@ -1910,128 +3141,25 @@ function SubAgentPanel(props) {
           const saved = isChild ? data[parentSid]?.children?.[sid]?.scroll ?? 0 : data[sid]?.scroll ?? 0;
           setScrollOffset(saved);
           if (!isChild && data[sid]?.entries?.length) {
-            data[sid].ts = Date.now();
-            saveSessionData2(data);
+            void Promise.resolve(updateSessionData(props.api.kv, (latest) => {
+              if (latest[sid]?.entries?.length) latest[sid].ts = Date.now();
+            })).catch(() => {
+            });
           }
         }
-        setEntryMapRaw((prev) => {
-          const next = switched || forceReload ? new Map(globalEntryCache.get(sid) ?? loadEntries(sid)) : new Map(prev);
-          const {
-            parentSid: scanPSid,
-            isChild: scanChild
-          } = resolveParent(sid);
-          const scanRec = loadSessionData2()[scanPSid];
-          const clearedIds = new Set(scanChild ? scanRec?.children?.[sid]?.clearedIds : scanRec?.clearedIds);
-          try {
-            const msgs = props.api.session.messages(sid);
-            if (msgs && msgs.length) {
-              for (const msg of msgs) {
-                const parts = props.api.session.part(msg.id) ?? [];
-                for (const partRaw of parts) {
-                  const part = partRaw;
-                  if (part.type === "tool") {
-                    const tool = String(part.tool ?? "");
-                    if (!SUBAGENT_TOOLS.has(tool)) continue;
-                    const id = `tool:${String(part.id ?? "")}`;
-                    if (!part.id) continue;
-                    const st = part.state;
-                    const rawStatus = String(st?.status ?? "");
-                    const scanStMeta = st?.metadata;
-                    const scanSubSid = scanStMeta?.session_id !== void 0 ? String(scanStMeta.session_id) : scanStMeta?.sessionId !== void 0 ? String(scanStMeta.sessionId) : void 0;
-                    const existingKey = findSubEntryKey(next, id, scanSubSid);
-                    const exists = existingKey ? next.get(existingKey) : void 0;
-                    if (!exists && clearedIds.has(id)) continue;
-                    if ((rawStatus === "pending" || rawStatus === "") && !exists) continue;
-                    if (rawStatus === "error") {
-                      if (exists && exists.status === "running") {
-                        next.set(existingKey ?? id, {
-                          ...exists,
-                          status: "error",
-                          endedAt: Date.now()
-                        });
-                      }
-                      continue;
-                    }
-                    let status = "running";
-                    if (rawStatus === "completed") status = "done";
-                    if ((st?.input?.run_in_background === true || st?.input?.background === true) && status === "done") {
-                      const scanStMeta2 = st?.metadata;
-                      const scanHasChild = scanStMeta2?.session_id !== void 0 || scanStMeta2?.sessionId !== void 0;
-                      if (scanHasChild) status = "running";
-                    }
-                    if (exists && existingKey === id && exists.status !== "running" && exists.status !== "cancel_requested") continue;
-                    if (exists && status === "running") {
-                      if (!rawStatus) {
-                        const msgTokens = msg?.tokens;
-                        if (msgTokens && (Number(msgTokens.input) > 0 || Number(msgTokens.output) > 0)) {
-                          status = "done";
-                        } else if (Date.now() - exists.startedAt > 30 * 60 * 1e3) {
-                          status = "done";
-                        } else {
-                          continue;
-                        }
-                      } else {
-                        continue;
-                      }
-                    }
-                    const input = st?.input;
-                    const agent = String(part.subagent_type ?? input?.agent ?? input?.subagent_type ?? tool);
-                    const prompt = String(input?.prompt ?? part.description ?? "");
-                    const desc = input?.description !== void 0 ? String(input.description) : "";
-                    const title = desc || truncate(prompt.replace(/\n/g, " ").trim(), 40);
-                    let tokens;
-                    if (scanSubSid) tokens = props.api.usage.readSessionTokens(scanSubSid);
-                    const ended = status === "done";
-                    const entryKey = existingKey ?? id;
-                    next.set(entryKey, {
-                      id: exists?.id ?? id,
-                      title,
-                      agent,
-                      prompt,
-                      // Preserve existing values (from handleSessionEnd / KV) — scan must not overwrite
-                      tokens: exists?.tokens ?? tokens,
-                      sessionId: exists?.sessionId ?? scanSubSid,
-                      status,
-                      startedAt: exists?.startedAt || Date.now(),
-                      endedAt: ended ? exists?.endedAt || Date.now() : void 0
-                    });
-                    if (entryKey !== id) next.delete(id);
-                  }
-                }
-              }
-            }
-          } catch {
-          }
-          return next;
-        });
-        setEntryMapRaw((prev) => {
-          let changed = false;
-          const next = new Map(prev);
-          for (const [id, entry] of next) {
-            if (entry.status !== "running" && entry.status !== "cancel_requested" || !entry.sessionId) continue;
-            try {
-              const st = props.api.session.status(entry.sessionId);
-              if (!st || st.type !== "idle") continue;
-              const tokens = props.api.usage.readSessionTokens(entry.sessionId);
-              const cost = props.api.usage.readSessionCost(entry.sessionId);
-              const finalStatus = entry.status === "cancel_requested" && entry.abortAccepted ? "cancelled" : "done";
-              next.set(id, {
-                ...entry,
-                status: finalStatus,
-                endedAt: Date.now(),
-                tokens: tokens ?? entry.tokens,
-                cost: cost ?? entry.cost
-              });
-              changed = true;
-            } catch {
-            }
-          }
-          return changed ? next : prev;
-        });
-        bump();
+        const ok = runSessionScan(sid, switched || forceReload);
+        if (!ok && attempts < 4) {
+          attempts++;
+          retryTimer = setTimeout(run, 400);
+        }
       });
-    }, 150);
-    onCleanup(() => clearTimeout(t2));
+      bump();
+    };
+    const t2 = setTimeout(run, 150);
+    onCleanup(() => {
+      clearTimeout(t2);
+      if (retryTimer) clearTimeout(retryTimer);
+    });
   });
   const pal = createMemo(() => {
     const th = props.theme;
@@ -2410,14 +3538,17 @@ function SubAgentPanel(props) {
                   return "#" + [r, g, bl].map((v) => Math.max(0, Math.min(255, v)).toString(16).padStart(2, "0")).join("");
                 };
                 const timeColor = () => isActiveRunning ? pal().warning : isError ? pal().error : pal().muted;
-                const tokenText = () => !isExpanded() && entry.tokens !== void 0 && entry.tokens > 0 ? ` ${fmtTokens(entry.tokens)}` : "";
-                const timeText = () => !isExpanded() && (elapsed() >= 2e3 || entry.endedAt !== void 0) ? fmtDurationShort(elapsed(), isActiveRunning) : "";
+                const tokenText = () => !isExpanded() && props.showEntryTokens() && entry.tokens !== void 0 && entry.tokens > 0 ? ` ${fmtTokens(entry.tokens)}` : "";
+                const costText = () => !isExpanded() && props.showEntryCost() && entry.cost !== void 0 && entry.cost > 0 ? ` $${entry.cost.toFixed(4)}` : "";
+                const timeText = () => !isExpanded() && props.showEntryTime() && (elapsed() >= 2e3 || entry.endedAt !== void 0) ? fmtDuration(elapsed(), isActiveRunning, props.timeFormat()) : "";
                 const suffixW = () => {
                   let w = 0;
                   const t2 = timeText();
                   if (t2) w += 1 + visualWidth(t2);
                   const tk = tokenText();
                   if (tk) w += visualWidth(tk);
+                  const c = costText();
+                  if (c) w += visualWidth(c);
                   return w;
                 };
                 const labelAvail = () => Math.max(6, panelWidth() - gutter() - LEFT_PAD - suffixW());
@@ -2461,6 +3592,17 @@ function SubAgentPanel(props) {
                       return _el$83;
                     })() : null;
                   })(), null);
+                  _$insert(_el$25, (() => {
+                    var _c$4 = _$memo(() => !!costText());
+                    return () => _c$4() ? (() => {
+                      var _el$84 = _$createElement("span");
+                      _$insert(_el$84, costText);
+                      _$effect((_$p) => _$setProp(_el$84, "style", {
+                        fg: pal().warning
+                      }, _$p));
+                      return _el$84;
+                    })() : null;
+                  })(), null);
                   _$effect((_p$) => {
                     var _v$3 = {
                       fg: pal().muted
@@ -2553,7 +3695,7 @@ function SubAgentPanel(props) {
                         _$insertNode(_el$45, _el$46);
                         _$insert(_el$45, () => t("time.label"), _el$46);
                         _$insert(_el$47, () => " ".repeat(expandedPad(t("time.label"))));
-                        _$insert(_el$48, () => fmtDurationShort(elapsed(), isActiveRunning));
+                        _$insert(_el$48, () => fmtDuration(elapsed(), isActiveRunning, props.timeFormat()));
                         _$effect((_p$) => {
                           var _v$10 = {
                             fg: pal().primary
@@ -2647,16 +3789,16 @@ function SubAgentPanel(props) {
                         return (() => {
                           const cost = entry.cost;
                           return (() => {
-                            var _el$84 = _$createElement("text"), _el$85 = _$createTextNode(`  `), _el$86 = _$createElement("span"), _el$87 = _$createTextNode(`: `), _el$88 = _$createElement("span"), _el$89 = _$createElement("span"), _el$90 = _$createTextNode(`$`);
-                            _$insertNode(_el$84, _el$85);
-                            _$insertNode(_el$84, _el$86);
-                            _$insertNode(_el$84, _el$88);
-                            _$insertNode(_el$84, _el$89);
-                            _$insertNode(_el$86, _el$87);
-                            _$insert(_el$86, () => t("cost.label"), _el$87);
-                            _$insert(_el$88, () => " ".repeat(expandedPad(t("cost.label"))));
-                            _$insertNode(_el$89, _el$90);
-                            _$insert(_el$89, () => cost.toFixed(4), null);
+                            var _el$85 = _$createElement("text"), _el$86 = _$createTextNode(`  `), _el$87 = _$createElement("span"), _el$88 = _$createTextNode(`: `), _el$89 = _$createElement("span"), _el$90 = _$createElement("span"), _el$91 = _$createTextNode(`$`);
+                            _$insertNode(_el$85, _el$86);
+                            _$insertNode(_el$85, _el$87);
+                            _$insertNode(_el$85, _el$89);
+                            _$insertNode(_el$85, _el$90);
+                            _$insertNode(_el$87, _el$88);
+                            _$insert(_el$87, () => t("cost.label"), _el$88);
+                            _$insert(_el$89, () => " ".repeat(expandedPad(t("cost.label"))));
+                            _$insertNode(_el$90, _el$91);
+                            _$insert(_el$90, () => cost.toFixed(4), null);
                             _$effect((_p$) => {
                               var _v$29 = {
                                 fg: pal().primary
@@ -2665,22 +3807,22 @@ function SubAgentPanel(props) {
                               }, _v$31 = {
                                 fg: pal().muted
                               };
-                              _v$29 !== _p$.e && (_p$.e = _$setProp(_el$86, "style", _v$29, _p$.e));
-                              _v$30 !== _p$.t && (_p$.t = _$setProp(_el$88, "style", _v$30, _p$.t));
-                              _v$31 !== _p$.a && (_p$.a = _$setProp(_el$89, "style", _v$31, _p$.a));
+                              _v$29 !== _p$.e && (_p$.e = _$setProp(_el$87, "style", _v$29, _p$.e));
+                              _v$30 !== _p$.t && (_p$.t = _$setProp(_el$89, "style", _v$30, _p$.t));
+                              _v$31 !== _p$.a && (_p$.a = _$setProp(_el$90, "style", _v$31, _p$.a));
                               return _p$;
                             }, {
                               e: void 0,
                               t: void 0,
                               a: void 0
                             });
-                            return _el$84;
+                            return _el$85;
                           })();
                         })();
                       }
                     }), _$createComponent(Show, {
                       get when() {
-                        return entry.model;
+                        return _$memo(() => !!validModel(entry.model))() ? entry.model : void 0;
                       },
                       get children() {
                         var _el$61 = _$createElement("text"), _el$62 = _$createTextNode(`  `), _el$63 = _$createElement("span"), _el$64 = _$createTextNode(`: `), _el$65 = _$createElement("span"), _el$66 = _$createElement("span");
@@ -2819,68 +3961,68 @@ ${t("session.toast.copy_failed")}`, {
                           const rightW = (isRunning ? visualWidth(dismissLabel()) : 0) + (isRunning && entry.sessionId ? visualWidth(cancelLabel()) : 0);
                           const spacerW = () => Math.max(1, panelWidth() - gutter() - openW() - rightW - 2);
                           return (() => {
-                            var _el$91 = _$createElement("box"), _el$95 = _$createElement("text");
-                            _$insertNode(_el$91, _el$95);
-                            _$setProp(_el$91, "flexDirection", "row");
-                            _$insert(_el$91, _$createComponent(Show, {
+                            var _el$92 = _$createElement("box"), _el$96 = _$createElement("text");
+                            _$insertNode(_el$92, _el$96);
+                            _$setProp(_el$92, "flexDirection", "row");
+                            _$insert(_el$92, _$createComponent(Show, {
                               get when() {
                                 return entry.sessionId;
                               },
                               get children() {
-                                var _el$92 = _$createElement("text"), _el$93 = _$createElement("span"), _el$94 = _$createElement("span");
-                                _$insertNode(_el$92, _el$93);
-                                _$insertNode(_el$92, _el$94);
-                                _$setProp(_el$92, "onMouseOver", () => setHoveredOpen(entry.id));
-                                _$setProp(_el$92, "onMouseOut", () => setHoveredOpen(void 0));
-                                _$setProp(_el$92, "onMouseUp", () => {
+                                var _el$93 = _$createElement("text"), _el$94 = _$createElement("span"), _el$95 = _$createElement("span");
+                                _$insertNode(_el$93, _el$94);
+                                _$insertNode(_el$93, _el$95);
+                                _$setProp(_el$93, "onMouseOver", () => setHoveredOpen(entry.id));
+                                _$setProp(_el$93, "onMouseOut", () => setHoveredOpen(void 0));
+                                _$setProp(_el$93, "onMouseUp", () => {
                                   if (entry.sessionId) {
                                     props.api.route.navigateSession(entry.sessionId);
                                   }
                                 });
-                                _$insert(_el$93, openPrefix);
-                                _$insert(_el$94, () => t("open.label"));
+                                _$insert(_el$94, openPrefix);
+                                _$insert(_el$95, () => t("open.label"));
                                 _$effect((_p$) => {
                                   var _v$32 = {
                                     fg: hoveredOpen() === entry.id ? pal().warning : pal().primary
                                   }, _v$33 = {
                                     fg: hoveredOpen() === entry.id ? pal().warning : pal().primary
                                   };
-                                  _v$32 !== _p$.e && (_p$.e = _$setProp(_el$93, "style", _v$32, _p$.e));
-                                  _v$33 !== _p$.t && (_p$.t = _$setProp(_el$94, "style", _v$33, _p$.t));
+                                  _v$32 !== _p$.e && (_p$.e = _$setProp(_el$94, "style", _v$32, _p$.e));
+                                  _v$33 !== _p$.t && (_p$.t = _$setProp(_el$95, "style", _v$33, _p$.t));
                                   return _p$;
                                 }, {
                                   e: void 0,
                                   t: void 0
                                 });
-                                return _el$92;
+                                return _el$93;
                               }
-                            }), _el$95);
-                            _$insert(_el$95, () => " ".repeat(spacerW()));
-                            _$insert(_el$91, _$createComponent(Show, {
+                            }), _el$96);
+                            _$insert(_el$96, () => " ".repeat(spacerW()));
+                            _$insert(_el$92, _$createComponent(Show, {
                               get when() {
                                 return isRunning && entry.sessionId;
                               },
                               get children() {
-                                var _el$96 = _$createElement("text"), _el$97 = _$createElement("span");
-                                _$insertNode(_el$96, _el$97);
-                                _$setProp(_el$96, "onMouseOver", () => setHoveredCancel(entry.id));
-                                _$setProp(_el$96, "onMouseOut", () => setHoveredCancel(void 0));
-                                _$setProp(_el$96, "onMouseUp", () => cancelEntry(entry));
-                                _$insert(_el$97, cancelLabel);
-                                _$effect((_$p) => _$setProp(_el$97, "style", {
+                                var _el$97 = _$createElement("text"), _el$98 = _$createElement("span");
+                                _$insertNode(_el$97, _el$98);
+                                _$setProp(_el$97, "onMouseOver", () => setHoveredCancel(entry.id));
+                                _$setProp(_el$97, "onMouseOut", () => setHoveredCancel(void 0));
+                                _$setProp(_el$97, "onMouseUp", () => cancelEntry(entry));
+                                _$insert(_el$98, cancelLabel);
+                                _$effect((_$p) => _$setProp(_el$98, "style", {
                                   fg: hoveredCancel() === entry.id ? pal().warning : pal().error
                                 }, _$p));
-                                return _el$96;
+                                return _el$97;
                               }
                             }), null);
-                            _$insert(_el$91, _$createComponent(Show, {
+                            _$insert(_el$92, _$createComponent(Show, {
                               when: isRunning,
                               get children() {
-                                var _el$98 = _$createElement("text"), _el$99 = _$createElement("span");
-                                _$insertNode(_el$98, _el$99);
-                                _$setProp(_el$98, "onMouseOver", () => setHoveredDismiss(entry.id));
-                                _$setProp(_el$98, "onMouseOut", () => setHoveredDismiss(void 0));
-                                _$setProp(_el$98, "onMouseUp", () => {
+                                var _el$99 = _$createElement("text"), _el$100 = _$createElement("span");
+                                _$insertNode(_el$99, _el$100);
+                                _$setProp(_el$99, "onMouseOver", () => setHoveredDismiss(entry.id));
+                                _$setProp(_el$99, "onMouseOut", () => setHoveredDismiss(void 0));
+                                _$setProp(_el$99, "onMouseUp", () => {
                                   upsertEntry({
                                     id: entry.id,
                                     title: entry.title,
@@ -2889,17 +4031,17 @@ ${t("session.toast.copy_failed")}`, {
                                     status: "done"
                                   });
                                 });
-                                _$insert(_el$99, dismissLabel);
-                                _$effect((_$p) => _$setProp(_el$99, "style", {
+                                _$insert(_el$100, dismissLabel);
+                                _$effect((_$p) => _$setProp(_el$100, "style", {
                                   fg: hoveredDismiss() === entry.id ? pal().warning : pal().muted
                                 }, _$p));
-                                return _el$98;
+                                return _el$99;
                               }
                             }), null);
-                            _$effect((_$p) => _$setProp(_el$95, "style", {
+                            _$effect((_$p) => _$setProp(_el$96, "style", {
                               fg: pal().muted
                             }, _$p));
-                            return _el$91;
+                            return _el$92;
                           })();
                         })();
                       }
@@ -2920,13 +4062,13 @@ ${t("session.toast.copy_failed")}`, {
                   const right = props.sortOrder() === "desc" ? `\u2191 ${t("scroll.top")}` : `\u2193 ${t("scroll.bottom")}`;
                   const pad = showTop ? Math.max(1, panelWidth() - gutter() - visualWidth(left) - visualWidth(right)) : 0;
                   return (() => {
-                    var _el$100 = _$createElement("box"), _el$101 = _$createElement("text"), _el$102 = _$createElement("span");
-                    _$insertNode(_el$100, _el$101);
-                    _$setProp(_el$100, "flexDirection", "row");
+                    var _el$101 = _$createElement("box"), _el$102 = _$createElement("text"), _el$103 = _$createElement("span");
                     _$insertNode(_el$101, _el$102);
-                    _$setProp(_el$101, "onMouseOver", () => showMore && setHoveredMoreBelow(true));
-                    _$setProp(_el$101, "onMouseOut", () => setHoveredMoreBelow(false));
-                    _$setProp(_el$101, "onMouseUp", () => {
+                    _$setProp(_el$101, "flexDirection", "row");
+                    _$insertNode(_el$102, _el$103);
+                    _$setProp(_el$102, "onMouseOver", () => showMore && setHoveredMoreBelow(true));
+                    _$setProp(_el$102, "onMouseOut", () => setHoveredMoreBelow(false));
+                    _$setProp(_el$102, "onMouseUp", () => {
                       if (!showMore) return;
                       const total = entryList().length;
                       const m = max();
@@ -2938,20 +4080,20 @@ ${t("session.toast.copy_failed")}`, {
                       }
                       setHoveredMoreBelow(false);
                     });
-                    _$insert(_el$102, left);
-                    _$insert(_el$100, showTop ? [(() => {
-                      var _el$103 = _$createElement("text");
-                      _$insert(_el$103, () => " ".repeat(pad));
-                      _$effect((_$p) => _$setProp(_el$103, "style", {
+                    _$insert(_el$103, left);
+                    _$insert(_el$101, showTop ? [(() => {
+                      var _el$104 = _$createElement("text");
+                      _$insert(_el$104, () => " ".repeat(pad));
+                      _$effect((_$p) => _$setProp(_el$104, "style", {
                         fg: pal().muted
                       }, _$p));
-                      return _el$103;
+                      return _el$104;
                     })(), (() => {
-                      var _el$104 = _$createElement("text"), _el$105 = _$createElement("span");
-                      _$insertNode(_el$104, _el$105);
-                      _$setProp(_el$104, "onMouseOver", () => setHoveredTop(true));
-                      _$setProp(_el$104, "onMouseOut", () => setHoveredTop(false));
-                      _$setProp(_el$104, "onMouseUp", () => {
+                      var _el$105 = _$createElement("text"), _el$106 = _$createElement("span");
+                      _$insertNode(_el$105, _el$106);
+                      _$setProp(_el$105, "onMouseOver", () => setHoveredTop(true));
+                      _$setProp(_el$105, "onMouseOut", () => setHoveredTop(false));
+                      _$setProp(_el$105, "onMouseUp", () => {
                         const total = entryList().length;
                         const m = max();
                         if (props.sortOrder() === "desc") {
@@ -2961,16 +4103,16 @@ ${t("session.toast.copy_failed")}`, {
                         }
                         setHoveredTop(false);
                       });
-                      _$insert(_el$105, right);
-                      _$effect((_$p) => _$setProp(_el$105, "style", {
+                      _$insert(_el$106, right);
+                      _$effect((_$p) => _$setProp(_el$106, "style", {
                         fg: hoveredTop() ? pal().warning : pal().muted
                       }, _$p));
-                      return _el$104;
+                      return _el$105;
                     })()] : null, null);
-                    _$effect((_$p) => _$setProp(_el$102, "style", {
+                    _$effect((_$p) => _$setProp(_el$103, "style", {
                       fg: showMore && hoveredMoreBelow() ? pal().warning : pal().muted
                     }, _$p));
-                    return _el$100;
+                    return _el$101;
                   })();
                 })();
               }
@@ -2998,11 +4140,14 @@ ${t("session.toast.copy_failed")}`, {
 }
 
 // src/v2/index.tsx
-function PluginRoot(props) {
+function CommandRoot(props) {
   props.context.keymap.layer(() => ({
     mode: "global",
     commands: makeCommands(props.context, props.api, props.signals)
   }));
+  return null;
+}
+function PluginRoot(props) {
   return _$createComponent2(SubAgentPanel, {
     get api() {
       return props.api;
@@ -3025,6 +4170,18 @@ function PluginRoot(props) {
     get borderVisible() {
       return props.signals.borderVisible;
     },
+    get showEntryCost() {
+      return props.signals.showEntryCost;
+    },
+    get showEntryTime() {
+      return props.signals.showEntryTime;
+    },
+    get showEntryTokens() {
+      return props.signals.showEntryTokens;
+    },
+    get timeFormat() {
+      return props.signals.timeFormat;
+    },
     get sessionId() {
       return props.sessionID;
     }
@@ -3050,6 +4207,12 @@ var mod = {
     const [orderSignal, setSortOrder] = createSignal3(String(api.kv.get(SETTING_KEYS.order, "desc")) === "asc" ? "asc" : "desc");
     const [scrollSignal, setScrollMode] = createSignal3(String(api.kv.get(SETTING_KEYS.scrollMode, "wheel")) === "click" ? "click" : "wheel");
     const [borderSignal, setBorderVisible] = createSignal3(api.kv.get(SETTING_KEYS.border, false) === true);
+    const [showEntryCostSignal, setShowEntryCost] = createSignal3(api.kv.get(SETTING_KEYS.showEntryCost, false) === true);
+    const [showEntryTimeSignal, setShowEntryTime] = createSignal3(api.kv.get(SETTING_KEYS.showEntryTime, true) !== false);
+    const [showEntryTokensSignal, setShowEntryTokens] = createSignal3(api.kv.get(SETTING_KEYS.showEntryTokens, true) !== false);
+    const storedTimeFormat = String(api.kv.get(SETTING_KEYS.timeFormat, "short"));
+    const [timeFormatSignal, setTimeFormat] = createSignal3(TIME_FORMATS.includes(storedTimeFormat) ? storedTimeFormat : "short");
+    const [dbSyncSignal, setDbSync] = createSignal3(api.kv.get(SETTING_KEYS.dbSync, true) !== false);
     lang = langSignal;
     maxEntries = maxSignal;
     sortOrder = orderSignal;
@@ -3065,8 +4228,26 @@ var mod = {
       setScrollMode,
       borderVisible: borderSignal,
       setBorderVisible,
+      showEntryCost: showEntryCostSignal,
+      setShowEntryCost,
+      showEntryTime: showEntryTimeSignal,
+      setShowEntryTime,
+      showEntryTokens: showEntryTokensSignal,
+      setShowEntryTokens,
+      timeFormat: timeFormatSignal,
+      setTimeFormat,
+      dbSync: dbSyncSignal,
+      setDbSync,
       sessionId: ""
     };
+    context.ui.slot({
+      append: "app",
+      render: () => _$createComponent2(CommandRoot, {
+        context,
+        api,
+        signals
+      })
+    });
     context.ui.slot({
       prepend: "sidebar.content",
       render: (props) => {