opencode-subagent-magazine 1.6.1 → 1.7.1

package/dist/tui.js

@@ -6,13 +6,17 @@ import { createComponent as _$createComponent2 } from "@opentui/solid";
 import { createSignal as createSignal3 } from "solid-js";
 
 // src/_version.ts
-var PLUGIN_VERSION = "1.6.1";
+var PLUGIN_VERSION = "1.7.1";
 
 // src/i18n.ts
 var ZH_T = {
   "panel.title": "\u5B50\u4EE3\u7406",
   "status.none": "\u6682\u65E0\u5B50\u4EE3\u7406",
   "agent.label": "\u4EE3\u7406",
+  "origin.label": "\u6765\u6E90",
+  "origin.tool": "\u5B50\u4EE3\u7406\u8C03\u7528",
+  "origin.sub": "\u884D\u751F\u4F1A\u8BDD",
+  "origin.background": "\u540E\u53F0",
   "status.label": "\u72B6\u6001",
   "time.label": "\u8017\u65F6",
   "tokens.label": "\u4E0A\u4E0B\u6587",
@@ -50,6 +54,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",
@@ -60,12 +65,35 @@ 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.showOrigin": "\u5217\u8868\u663E\u793A\u6765\u6E90\u6807\u8BB0",
+  "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",
   "status.none": "No sub-agents yet",
   "agent.label": "agent",
+  "origin.label": "origin",
+  "origin.tool": "sub-agent call",
+  "origin.sub": "spawned session",
+  "origin.background": "background",
   "status.label": "status",
   "time.label": "time",
   "tokens.label": "tokens",
@@ -103,6 +131,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",
@@ -113,12 +142,35 @@ 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.showOrigin": "Origin indicators in list",
+  "settings.timeFormat": "Time format",
+  "settings.dbSync": "Local database enrichment",
+  "settings.on": "on",
+  "settings.off": "off",
+  "settings.saved": "Saved {item}: {value}",
+  "settings.invalid": "Invalid value",
+  "settings.close": "Close"
 };
 var JA_T = {
   "panel.title": "\u30B5\u30D6\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8",
   "status.none": "\u30B5\u30D6\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u306A\u3057",
   "agent.label": "\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8",
+  "origin.label": "\u767A\u751F\u5143",
+  "origin.tool": "\u30B5\u30D6\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u547C\u3073\u51FA\u3057",
+  "origin.sub": "\u751F\u6210\u3055\u308C\u305F\u30BB\u30C3\u30B7\u30E7\u30F3",
+  "origin.background": "\u30D0\u30C3\u30AF\u30B0\u30E9\u30A6\u30F3\u30C9",
   "status.label": "\u72B6\u614B",
   "time.label": "\u6642\u9593",
   "tokens.label": "\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8",
@@ -156,6 +208,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",
@@ -166,12 +219,35 @@ 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.showOrigin": "\u4E00\u89A7\u306B\u7531\u6765\u30DE\u30FC\u30AF\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",
   "status.none": "\uC11C\uBE0C \uC5D0\uC774\uC804\uD2B8 \uC5C6\uC74C",
   "agent.label": "\uC5D0\uC774\uC804\uD2B8",
+  "origin.label": "\uCD9C\uCC98",
+  "origin.tool": "\uD558\uC704 \uC5D0\uC774\uC804\uD2B8 \uD638\uCD9C",
+  "origin.sub": "\uC0DD\uC131\uB41C \uC138\uC158",
+  "origin.background": "\uBC31\uADF8\uB77C\uC6B4\uB4DC",
   "status.label": "\uC0C1\uD0DC",
   "time.label": "\uC2DC\uAC04",
   "tokens.label": "\uCEE8\uD14D\uC2A4\uD2B8",
@@ -209,6 +285,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",
@@ -219,7 +296,26 @@ 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.showOrigin": "\uBAA9\uB85D\uC5D0 \uCD9C\uCC98 \uC544\uC774\uCF58 \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 = [
@@ -260,8 +356,126 @@ var SETTING_KEYS = {
   scrollMode: `${KV_PREFIX}.scroll_mode`,
   open: `${KV_PREFIX}.open`,
   ttlDays: `${KV_PREFIX}.ttl_days`,
-  border: `${KV_PREFIX}.border`
+  border: `${KV_PREFIX}.border`,
+  showEntryCost: `${KV_PREFIX}.show_entry_cost`,
+  showEntryTime: `${KV_PREFIX}.show_entry_time`,
+  showEntryTokens: `${KV_PREFIX}.show_entry_tokens`,
+  timeFormat: `${KV_PREFIX}.time_format`,
+  showOrigin: `${KV_PREFIX}.show_origin`,
+  dbSync: `${KV_PREFIX}.db_sync`
 };
+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 {};
+  }
+}
+
+// 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`;
+}
+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 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/panel/SubAgentPanel.tsx
 import { createTextNode as _$createTextNode } from "@opentui/solid";
@@ -375,52 +589,10 @@ 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 "";
+function isBackgroundInput(input) {
+  if (!input || typeof input !== "object") return false;
+  const i = input;
+  return i.background === true || i.run_in_background === true;
 }
 
 // src/core/color.ts
@@ -521,21 +693,84 @@ function upsertSubEntry(entries, partial, now = Date.now()) {
     ...partial,
     id: existing?.id ?? partial.id,
     startedAt: existing?.startedAt || partial.startedAt || now,
-    endedAt: ended ? existing?.endedAt || now : void 0
+    endedAt: ended ? existing?.endedAt ?? partial.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/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`;
   const ttlDaysRaw = parseInt(String(props.api.kv.get(`${KV_PREFIX}.ttl_days`, "3")), 10);
   const ttlDays = Number.isNaN(ttlDaysRaw) ? 3 : ttlDaysRaw;
   const TTL_MS = ttlDays * 24 * 60 * 60 * 1e3;
-  const loadSessionData = () => {
+  const loadSessionData2 = () => {
     try {
       const raw = props.api.kv.get(SESSION_DATA_KEY2, "{}");
       return JSON.parse(String(raw));
@@ -543,11 +778,32 @@ function SubAgentPanel(props) {
       return {};
     }
   };
-  const saveSessionData = (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 {
@@ -571,7 +827,7 @@ function SubAgentPanel(props) {
         parentSid,
         isChild
       } = resolveParent(sid);
-      const rec = loadSessionData()[parentSid];
+      const rec = loadSessionData2()[parentSid];
       if (rec) {
         const source = isChild ? rec.children?.[sid]?.entries : rec.entries;
         if (source) {
@@ -589,129 +845,71 @@ function SubAgentPanel(props) {
     clearTimeout(persistTimer);
     persistTimer = setTimeout(() => {
       try {
-        const data = loadSessionData();
+        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;
         }
-        saveSessionData(data);
-      } catch {
-      }
-    }, 200);
-  };
-  const persistScroll = (sid, scroll) => {
-    try {
-      const data = loadSessionData();
-      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 ?? {}
-        };
-      }
-      saveSessionData(data);
+      });
     } catch {
     }
   };
   const persistExpanded = (sid, expanded2) => {
     try {
-      const data = loadSessionData();
-      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 ?? {}
-        };
-      }
-      saveSessionData(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 = loadSessionData();
       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) saveSessionData(data);
+      });
     } catch {
     }
   };
@@ -731,38 +929,22 @@ function SubAgentPanel(props) {
       if (needsImmediateFlush) {
         clearTimeout(persistTimer);
         try {
-          const data = loadSessionData();
-          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 ?? {}
-            };
-          }
-          saveSessionData(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 {
@@ -786,7 +968,7 @@ function SubAgentPanel(props) {
         parentSid,
         isChild
       } = resolveParent(props.sessionId);
-      const rec = loadSessionData()[parentSid];
+      const rec = loadSessionData2()[parentSid];
       if (rec) return isChild ? rec.children?.[props.sessionId]?.expanded || void 0 : rec.expanded || void 0;
     } catch {
     }
@@ -804,7 +986,7 @@ function SubAgentPanel(props) {
         parentSid,
         isChild
       } = resolveParent(props.sessionId);
-      const rec = loadSessionData()[parentSid];
+      const rec = loadSessionData2()[parentSid];
       return isChild ? rec?.children?.[props.sessionId]?.scroll ?? 0 : rec?.scroll ?? 0;
     } catch {
       return 0;
@@ -930,7 +1112,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 ?? "");
@@ -947,7 +1131,8 @@ function SubAgentPanel(props) {
         prompt,
         sessionId: subSid,
         status: "running",
-        model: modelId
+        model: modelId,
+        origin: "sub"
       });
     }
     if (part.type === "tool") {
@@ -959,7 +1144,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;
@@ -970,7 +1155,9 @@ function SubAgentPanel(props) {
             agent: existing.agent,
             prompt: existing.prompt,
             sessionId: existing.sessionId ?? errorSid,
-            status: "error"
+            status: "error",
+            origin: "tool",
+            background: isBackgroundInput(st?.input)
           });
         }
         return;
@@ -978,8 +1165,8 @@ function SubAgentPanel(props) {
       const input = st?.input;
       let status = "running";
       if (rawStatus === "completed") status = "done";
-      if ((input?.run_in_background === true || input?.background === true) && status === "done") {
-        const stMetaCheck = st?.metadata;
+      if (isBackgroundInput(input) && status === "done") {
+        const stMetaCheck = partMetadata(part, st);
         const hasChild = stMetaCheck?.session_id !== void 0 || stMetaCheck?.sessionId !== void 0;
         if (hasChild) status = "running";
       }
@@ -988,7 +1175,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,
@@ -996,7 +1183,9 @@ function SubAgentPanel(props) {
         agent,
         prompt,
         sessionId: subSid,
-        status
+        status,
+        origin: "tool",
+        background: isBackgroundInput(input)
       });
     }
   };
@@ -1176,30 +1365,39 @@ function SubAgentPanel(props) {
           found = tryMatchAndUpdate(parentCache, sid, status, nowTs);
         }
         if (!found) {
-          const data = loadSessionData();
+          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()]
-              };
-              saveSessionData(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 = loadSessionData();
-          data[parentSid] = {
-            ...data[parentSid],
-            ts: nowTs,
-            entries: [...parentCache.values()]
-          };
-          saveSessionData(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 {
@@ -1234,56 +1432,417 @@ function SubAgentPanel(props) {
         }
         return changed ? next : prev;
       });
-      bump();
-    }, 150);
+      bump();
+    }, 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 (isBackgroundInput(scanInput) && 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),
+                origin: "tool",
+                background: isBackgroundInput(scanInput) || exists?.background === true
+              });
+              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 = isBackgroundInput(input);
+          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);
   };
-  const bump = () => setRenderTick((v) => v + 1);
+  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);
+          if (tick % 4 === 0) {
+            try {
+              const children = props.api.session.listChildren?.(props.sessionId);
+              if (children) {
+                const linked = /* @__PURE__ */ new Set();
+                for (const e of next.values()) if (e.sessionId) linked.add(e.sessionId);
+                const {
+                  parentSid,
+                  isChild
+                } = resolveParent(props.sessionId);
+                const rec = loadSessionData2()[parentSid];
+                const cleared = new Set(isChild ? rec?.children?.[props.sessionId]?.clearedIds : rec?.clearedIds);
+                for (const child of children) {
+                  if (!child.id || linked.has(child.id)) continue;
+                  const id = `sub:${child.id}`;
+                  if (cleared.has(id)) continue;
+                  const finished = child.timeIdle != null && child.active !== true;
+                  const status = finished ? child.idleOutcome === "interrupted" ? "cancelled" : "done" : "running";
+                  next.set(id, {
+                    id,
+                    title: child.title ?? child.agent ?? "",
+                    agent: child.agent ?? "?",
+                    prompt: "",
+                    status,
+                    sessionId: child.id,
+                    startedAt: child.timeCreated ?? Date.now(),
+                    endedAt: finished ? child.timeIdle : void 0,
+                    tokens: child.tokens,
+                    cost: child.cost,
+                    model: child.model,
+                    origin: "sub"
+                  });
+                  changed = true;
+                }
+              }
+            } catch {
+            }
+            for (const [id, entry] of next) {
+              if (entry.status !== "done" && entry.status !== "error") continue;
+              const sid = entry.sessionId;
+              if (!sid) continue;
+              try {
+                if (props.api.session.status(sid)?.type === "busy") {
+                  next.set(id, {
+                    ...entry,
+                    status: "running",
+                    endedAt: void 0
+                  });
+                  changed = true;
+                }
+              } catch {
+              }
+            }
+          }
+          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();
@@ -1291,7 +1850,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();
@@ -1302,6 +1864,7 @@ function SubAgentPanel(props) {
     });
     onCleanup(() => {
       disposed = true;
+      clearTimeout(rescanTimer);
       clearInterval(clock);
       clearInterval(tokenTimer);
       unsubPart();
@@ -1319,139 +1882,38 @@ 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 {
             parentSid,
             isChild
           } = resolveParent(sid);
-          const data = loadSessionData();
+          const data = loadSessionData2();
           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();
-            saveSessionData(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 = loadSessionData()[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;
@@ -1830,17 +2292,26 @@ 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 originMark = () => {
+                  if (!props.showOrigin()) return "";
+                  if (entry.origin === "sub") return "\u21B3";
+                  return entry.background === true ? "\u21E2" : "";
+                };
+                const originW = () => originMark() ? 2 : 0;
                 const suffixW = () => {
                   let w = 0;
                   const 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());
+                const labelAvail = () => Math.max(6, panelWidth() - gutter() - LEFT_PAD - originW() - suffixW());
                 const labelText = () => {
                   const max2 = labelAvail();
                   const text = entry.title || entry.agent;
@@ -1858,27 +2329,49 @@ function SubAgentPanel(props) {
                   _$setProp(_el$25, "onMouseUp", () => toggleExpand(entry.id));
                   _$insert(_el$26, () => isExpanded() ? "\u25BC" : "\u25B6");
                   _$insert(_el$28, statusDot);
+                  _$insert(_el$25, (() => {
+                    var _c$2 = _$memo(() => !!originMark());
+                    return () => _c$2() ? (() => {
+                      var _el$88 = _$createElement("span");
+                      _$insert(_el$88, () => originMark() + " ");
+                      _$effect((_$p) => _$setProp(_el$88, "style", {
+                        fg: pal().muted
+                      }, _$p));
+                      return _el$88;
+                    })() : null;
+                  })(), _el$30);
                   _$insert(_el$30, labelText);
                   _$insert(_el$25, (() => {
-                    var _c$2 = _$memo(() => !!timeText());
-                    return () => _c$2() ? [" ", (() => {
-                      var _el$82 = _$createElement("span");
-                      _$insert(_el$82, timeText);
-                      _$effect((_$p) => _$setProp(_el$82, "style", {
+                    var _c$3 = _$memo(() => !!timeText());
+                    return () => _c$3() ? [" ", (() => {
+                      var _el$89 = _$createElement("span");
+                      _$insert(_el$89, timeText);
+                      _$effect((_$p) => _$setProp(_el$89, "style", {
                         fg: timeColor()
                       }, _$p));
-                      return _el$82;
+                      return _el$89;
                     })()] : null;
                   })(), null);
                   _$insert(_el$25, (() => {
-                    var _c$3 = _$memo(() => !!tokenText());
-                    return () => _c$3() ? (() => {
-                      var _el$83 = _$createElement("span");
-                      _$insert(_el$83, tokenText);
-                      _$effect((_$p) => _$setProp(_el$83, "style", {
+                    var _c$4 = _$memo(() => !!tokenText());
+                    return () => _c$4() ? (() => {
+                      var _el$90 = _$createElement("span");
+                      _$insert(_el$90, tokenText);
+                      _$effect((_$p) => _$setProp(_el$90, "style", {
                         fg: pal().muted
                       }, _$p));
-                      return _el$83;
+                      return _el$90;
+                    })() : null;
+                  })(), null);
+                  _$insert(_el$25, (() => {
+                    var _c$5 = _$memo(() => !!costText());
+                    return () => _c$5() ? (() => {
+                      var _el$91 = _$createElement("span");
+                      _$insert(_el$91, costText);
+                      _$effect((_$p) => _$setProp(_el$91, "style", {
+                        fg: pal().warning
+                      }, _$p));
+                      return _el$91;
                     })() : null;
                   })(), null);
                   _$effect((_p$) => {
@@ -1932,70 +2425,77 @@ function SubAgentPanel(props) {
                         a: void 0
                       });
                       return _el$31;
-                    })(), (() => {
-                      var _el$37 = _$createElement("text"), _el$38 = _$createTextNode(`  `), _el$39 = _$createElement("span"), _el$40 = _$createTextNode(`: `), _el$41 = _$createElement("span"), _el$42 = _$createElement("span");
-                      _$insertNode(_el$37, _el$38);
-                      _$insertNode(_el$37, _el$39);
-                      _$insertNode(_el$37, _el$41);
-                      _$insertNode(_el$37, _el$42);
-                      _$insertNode(_el$39, _el$40);
-                      _$insert(_el$39, () => t("status.label"), _el$40);
-                      _$insert(_el$41, () => " ".repeat(expandedPad(t("status.label"))));
-                      _$insert(_el$42, () => isActiveRunning ? t("status.running") : isCancelled ? t("status.cancelled") : isError ? t("status.error") : t("status.done"));
-                      _$effect((_p$) => {
-                        var _v$9 = {
-                          fg: pal().primary
-                        }, _v$0 = {
-                          fg: pal().muted
-                        }, _v$1 = {
-                          fg: isActiveRunning ? pal().warning : isCancelled ? pal().muted : isError ? pal().error : pal().success
-                        };
-                        _v$9 !== _p$.e && (_p$.e = _$setProp(_el$39, "style", _v$9, _p$.e));
-                        _v$0 !== _p$.t && (_p$.t = _$setProp(_el$41, "style", _v$0, _p$.t));
-                        _v$1 !== _p$.a && (_p$.a = _$setProp(_el$42, "style", _v$1, _p$.a));
-                        return _p$;
-                      }, {
-                        e: void 0,
-                        t: void 0,
-                        a: void 0
-                      });
-                      return _el$37;
                     })(), _$createComponent(Show, {
                       get when() {
-                        return elapsed() >= 2e3 || entry.endedAt !== void 0;
+                        return props.showOrigin();
                       },
                       get children() {
-                        var _el$43 = _$createElement("text"), _el$44 = _$createTextNode(`  `), _el$45 = _$createElement("span"), _el$46 = _$createTextNode(`: `), _el$47 = _$createElement("span"), _el$48 = _$createElement("span");
-                        _$insertNode(_el$43, _el$44);
-                        _$insertNode(_el$43, _el$45);
-                        _$insertNode(_el$43, _el$47);
-                        _$insertNode(_el$43, _el$48);
-                        _$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));
+                        var _el$37 = _$createElement("text"), _el$38 = _$createTextNode(`  `), _el$39 = _$createElement("span"), _el$40 = _$createTextNode(`: `), _el$41 = _$createElement("span"), _el$42 = _$createElement("span");
+                        _$insertNode(_el$37, _el$38);
+                        _$insertNode(_el$37, _el$39);
+                        _$insertNode(_el$37, _el$41);
+                        _$insertNode(_el$37, _el$42);
+                        _$insertNode(_el$39, _el$40);
+                        _$insert(_el$39, () => t("origin.label"), _el$40);
+                        _$insert(_el$41, () => " ".repeat(expandedPad(t("origin.label"))));
+                        _$insert(_el$42, (() => {
+                          var _c$6 = _$memo(() => entry.origin === "sub");
+                          return () => _c$6() ? t("origin.sub") : t("origin.tool");
+                        })(), null);
+                        _$insert(_el$42, (() => {
+                          var _c$7 = _$memo(() => entry.background === true);
+                          return () => _c$7() ? ` (${t("origin.background")})` : "";
+                        })(), null);
                         _$effect((_p$) => {
-                          var _v$10 = {
+                          var _v$9 = {
                             fg: pal().primary
-                          }, _v$11 = {
+                          }, _v$0 = {
                             fg: pal().muted
-                          }, _v$12 = {
+                          }, _v$1 = {
                             fg: pal().muted
                           };
-                          _v$10 !== _p$.e && (_p$.e = _$setProp(_el$45, "style", _v$10, _p$.e));
-                          _v$11 !== _p$.t && (_p$.t = _$setProp(_el$47, "style", _v$11, _p$.t));
-                          _v$12 !== _p$.a && (_p$.a = _$setProp(_el$48, "style", _v$12, _p$.a));
+                          _v$9 !== _p$.e && (_p$.e = _$setProp(_el$39, "style", _v$9, _p$.e));
+                          _v$0 !== _p$.t && (_p$.t = _$setProp(_el$41, "style", _v$0, _p$.t));
+                          _v$1 !== _p$.a && (_p$.a = _$setProp(_el$42, "style", _v$1, _p$.a));
                           return _p$;
                         }, {
                           e: void 0,
                           t: void 0,
                           a: void 0
                         });
-                        return _el$43;
+                        return _el$37;
                       }
-                    }), _$createComponent(Show, {
+                    }), (() => {
+                      var _el$43 = _$createElement("text"), _el$44 = _$createTextNode(`  `), _el$45 = _$createElement("span"), _el$46 = _$createTextNode(`: `), _el$47 = _$createElement("span"), _el$48 = _$createElement("span");
+                      _$insertNode(_el$43, _el$44);
+                      _$insertNode(_el$43, _el$45);
+                      _$insertNode(_el$43, _el$47);
+                      _$insertNode(_el$43, _el$48);
+                      _$insertNode(_el$45, _el$46);
+                      _$insert(_el$45, () => t("status.label"), _el$46);
+                      _$insert(_el$47, () => " ".repeat(expandedPad(t("status.label"))));
+                      _$insert(_el$48, () => isActiveRunning ? t("status.running") : isCancelled ? t("status.cancelled") : isError ? t("status.error") : t("status.done"));
+                      _$effect((_p$) => {
+                        var _v$10 = {
+                          fg: pal().primary
+                        }, _v$11 = {
+                          fg: pal().muted
+                        }, _v$12 = {
+                          fg: isActiveRunning ? pal().warning : isCancelled ? pal().muted : isError ? pal().error : pal().success
+                        };
+                        _v$10 !== _p$.e && (_p$.e = _$setProp(_el$45, "style", _v$10, _p$.e));
+                        _v$11 !== _p$.t && (_p$.t = _$setProp(_el$47, "style", _v$11, _p$.t));
+                        _v$12 !== _p$.a && (_p$.a = _$setProp(_el$48, "style", _v$12, _p$.a));
+                        return _p$;
+                      }, {
+                        e: void 0,
+                        t: void 0,
+                        a: void 0
+                      });
+                      return _el$43;
+                    })(), _$createComponent(Show, {
                       get when() {
-                        return entry.tokens !== void 0;
+                        return elapsed() >= 2e3 || entry.endedAt !== void 0;
                       },
                       get children() {
                         var _el$49 = _$createElement("text"), _el$50 = _$createTextNode(`  `), _el$51 = _$createElement("span"), _el$52 = _$createTextNode(`: `), _el$53 = _$createElement("span"), _el$54 = _$createElement("span");
@@ -2004,9 +2504,9 @@ function SubAgentPanel(props) {
                         _$insertNode(_el$49, _el$53);
                         _$insertNode(_el$49, _el$54);
                         _$insertNode(_el$51, _el$52);
-                        _$insert(_el$51, () => t("tokens.label"), _el$52);
-                        _$insert(_el$53, () => " ".repeat(expandedPad(t("tokens.label"))));
-                        _$insert(_el$54, () => fmtTokens(entry.tokens));
+                        _$insert(_el$51, () => t("time.label"), _el$52);
+                        _$insert(_el$53, () => " ".repeat(expandedPad(t("time.label"))));
+                        _$insert(_el$54, () => fmtDuration(elapsed(), isActiveRunning, props.timeFormat()));
                         _$effect((_p$) => {
                           var _v$13 = {
                             fg: pal().primary
@@ -2028,7 +2528,7 @@ function SubAgentPanel(props) {
                       }
                     }), _$createComponent(Show, {
                       get when() {
-                        return entry.error;
+                        return entry.tokens !== void 0;
                       },
                       get children() {
                         var _el$55 = _$createElement("text"), _el$56 = _$createTextNode(`  `), _el$57 = _$createElement("span"), _el$58 = _$createTextNode(`: `), _el$59 = _$createElement("span"), _el$60 = _$createElement("span");
@@ -2037,16 +2537,16 @@ function SubAgentPanel(props) {
                         _$insertNode(_el$55, _el$59);
                         _$insertNode(_el$55, _el$60);
                         _$insertNode(_el$57, _el$58);
-                        _$insert(_el$57, () => t("error.label"), _el$58);
-                        _$insert(_el$59, () => " ".repeat(expandedPad(t("error.label"))));
-                        _$insert(_el$60, () => truncate(String(entry.error), expandedValAvail()));
+                        _$insert(_el$57, () => t("tokens.label"), _el$58);
+                        _$insert(_el$59, () => " ".repeat(expandedPad(t("tokens.label"))));
+                        _$insert(_el$60, () => fmtTokens(entry.tokens));
                         _$effect((_p$) => {
                           var _v$16 = {
-                            fg: pal().error
+                            fg: pal().primary
                           }, _v$17 = {
                             fg: pal().muted
                           }, _v$18 = {
-                            fg: pal().error
+                            fg: pal().muted
                           };
                           _v$16 !== _p$.e && (_p$.e = _$setProp(_el$57, "style", _v$16, _p$.e));
                           _v$17 !== _p$.t && (_p$.t = _$setProp(_el$59, "style", _v$17, _p$.t));
@@ -2061,46 +2561,7 @@ function SubAgentPanel(props) {
                       }
                     }), _$createComponent(Show, {
                       get when() {
-                        return entry.cost !== void 0;
-                      },
-                      get children() {
-                        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);
-                            _$effect((_p$) => {
-                              var _v$29 = {
-                                fg: pal().primary
-                              }, _v$30 = {
-                                fg: pal().muted
-                              }, _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));
-                              return _p$;
-                            }, {
-                              e: void 0,
-                              t: void 0,
-                              a: void 0
-                            });
-                            return _el$84;
-                          })();
-                        })();
-                      }
-                    }), _$createComponent(Show, {
-                      get when() {
-                        return entry.model;
+                        return entry.error;
                       },
                       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");
@@ -2109,16 +2570,16 @@ function SubAgentPanel(props) {
                         _$insertNode(_el$61, _el$65);
                         _$insertNode(_el$61, _el$66);
                         _$insertNode(_el$63, _el$64);
-                        _$insert(_el$63, () => t("model.label"), _el$64);
-                        _$insert(_el$65, () => " ".repeat(expandedPad(t("model.label"))));
-                        _$insert(_el$66, () => truncate(entry.model, expandedValAvail()));
+                        _$insert(_el$63, () => t("error.label"), _el$64);
+                        _$insert(_el$65, () => " ".repeat(expandedPad(t("error.label"))));
+                        _$insert(_el$66, () => truncate(String(entry.error), expandedValAvail()));
                         _$effect((_p$) => {
                           var _v$19 = {
-                            fg: pal().primary
+                            fg: pal().error
                           }, _v$20 = {
                             fg: pal().muted
                           }, _v$21 = {
-                            fg: pal().muted
+                            fg: pal().error
                           };
                           _v$19 !== _p$.e && (_p$.e = _$setProp(_el$63, "style", _v$19, _p$.e));
                           _v$20 !== _p$.t && (_p$.t = _$setProp(_el$65, "style", _v$20, _p$.t));
@@ -2133,20 +2594,57 @@ function SubAgentPanel(props) {
                       }
                     }), _$createComponent(Show, {
                       get when() {
-                        return entry.todoTotal !== void 0;
+                        return entry.cost !== void 0;
+                      },
+                      get children() {
+                        return (() => {
+                          const cost = entry.cost;
+                          return (() => {
+                            var _el$92 = _$createElement("text"), _el$93 = _$createTextNode(`  `), _el$94 = _$createElement("span"), _el$95 = _$createTextNode(`: `), _el$96 = _$createElement("span"), _el$97 = _$createElement("span"), _el$98 = _$createTextNode(`$`);
+                            _$insertNode(_el$92, _el$93);
+                            _$insertNode(_el$92, _el$94);
+                            _$insertNode(_el$92, _el$96);
+                            _$insertNode(_el$92, _el$97);
+                            _$insertNode(_el$94, _el$95);
+                            _$insert(_el$94, () => t("cost.label"), _el$95);
+                            _$insert(_el$96, () => " ".repeat(expandedPad(t("cost.label"))));
+                            _$insertNode(_el$97, _el$98);
+                            _$insert(_el$97, () => cost.toFixed(4), null);
+                            _$effect((_p$) => {
+                              var _v$32 = {
+                                fg: pal().primary
+                              }, _v$33 = {
+                                fg: pal().muted
+                              }, _v$34 = {
+                                fg: pal().muted
+                              };
+                              _v$32 !== _p$.e && (_p$.e = _$setProp(_el$94, "style", _v$32, _p$.e));
+                              _v$33 !== _p$.t && (_p$.t = _$setProp(_el$96, "style", _v$33, _p$.t));
+                              _v$34 !== _p$.a && (_p$.a = _$setProp(_el$97, "style", _v$34, _p$.a));
+                              return _p$;
+                            }, {
+                              e: void 0,
+                              t: void 0,
+                              a: void 0
+                            });
+                            return _el$92;
+                          })();
+                        })();
+                      }
+                    }), _$createComponent(Show, {
+                      get when() {
+                        return _$memo(() => !!validModel(entry.model))() ? entry.model : void 0;
                       },
                       get children() {
-                        var _el$67 = _$createElement("text"), _el$68 = _$createTextNode(`  `), _el$69 = _$createElement("span"), _el$70 = _$createTextNode(`: `), _el$71 = _$createElement("span"), _el$72 = _$createElement("span"), _el$73 = _$createTextNode(`/`);
+                        var _el$67 = _$createElement("text"), _el$68 = _$createTextNode(`  `), _el$69 = _$createElement("span"), _el$70 = _$createTextNode(`: `), _el$71 = _$createElement("span"), _el$72 = _$createElement("span");
                         _$insertNode(_el$67, _el$68);
                         _$insertNode(_el$67, _el$69);
                         _$insertNode(_el$67, _el$71);
                         _$insertNode(_el$67, _el$72);
                         _$insertNode(_el$69, _el$70);
-                        _$insert(_el$69, () => t("todo.label"), _el$70);
-                        _$insert(_el$71, () => " ".repeat(expandedPad(t("todo.label"))));
-                        _$insertNode(_el$72, _el$73);
-                        _$insert(_el$72, () => entry.todoDone, _el$73);
-                        _$insert(_el$72, () => entry.todoTotal, null);
+                        _$insert(_el$69, () => t("model.label"), _el$70);
+                        _$insert(_el$71, () => " ".repeat(expandedPad(t("model.label"))));
+                        _$insert(_el$72, () => truncate(entry.model, expandedValAvail()));
                         _$effect((_p$) => {
                           var _v$22 = {
                             fg: pal().primary
@@ -2166,18 +2664,53 @@ function SubAgentPanel(props) {
                         });
                         return _el$67;
                       }
+                    }), _$createComponent(Show, {
+                      get when() {
+                        return entry.todoTotal !== void 0;
+                      },
+                      get children() {
+                        var _el$73 = _$createElement("text"), _el$74 = _$createTextNode(`  `), _el$75 = _$createElement("span"), _el$76 = _$createTextNode(`: `), _el$77 = _$createElement("span"), _el$78 = _$createElement("span"), _el$79 = _$createTextNode(`/`);
+                        _$insertNode(_el$73, _el$74);
+                        _$insertNode(_el$73, _el$75);
+                        _$insertNode(_el$73, _el$77);
+                        _$insertNode(_el$73, _el$78);
+                        _$insertNode(_el$75, _el$76);
+                        _$insert(_el$75, () => t("todo.label"), _el$76);
+                        _$insert(_el$77, () => " ".repeat(expandedPad(t("todo.label"))));
+                        _$insertNode(_el$78, _el$79);
+                        _$insert(_el$78, () => entry.todoDone, _el$79);
+                        _$insert(_el$78, () => entry.todoTotal, null);
+                        _$effect((_p$) => {
+                          var _v$25 = {
+                            fg: pal().primary
+                          }, _v$26 = {
+                            fg: pal().muted
+                          }, _v$27 = {
+                            fg: pal().muted
+                          };
+                          _v$25 !== _p$.e && (_p$.e = _$setProp(_el$75, "style", _v$25, _p$.e));
+                          _v$26 !== _p$.t && (_p$.t = _$setProp(_el$77, "style", _v$26, _p$.t));
+                          _v$27 !== _p$.a && (_p$.a = _$setProp(_el$78, "style", _v$27, _p$.a));
+                          return _p$;
+                        }, {
+                          e: void 0,
+                          t: void 0,
+                          a: void 0
+                        });
+                        return _el$73;
+                      }
                     }), _$createComponent(Show, {
                       get when() {
                         return entry.sessionId;
                       },
                       get children() {
-                        var _el$74 = _$createElement("text"), _el$75 = _$createTextNode(`  `), _el$76 = _$createElement("span"), _el$77 = _$createTextNode(`: `), _el$78 = _$createElement("span"), _el$79 = _$createElement("span"), _el$80 = _$createElement("span");
-                        _$insertNode(_el$74, _el$75);
-                        _$insertNode(_el$74, _el$76);
-                        _$insertNode(_el$74, _el$78);
-                        _$insertNode(_el$74, _el$79);
-                        _$insertNode(_el$74, _el$80);
-                        _$setProp(_el$74, "onMouseUp", async () => {
+                        var _el$80 = _$createElement("text"), _el$81 = _$createTextNode(`  `), _el$82 = _$createElement("span"), _el$83 = _$createTextNode(`: `), _el$84 = _$createElement("span"), _el$85 = _$createElement("span"), _el$86 = _$createElement("span");
+                        _$insertNode(_el$80, _el$81);
+                        _$insertNode(_el$80, _el$82);
+                        _$insertNode(_el$80, _el$84);
+                        _$insertNode(_el$80, _el$85);
+                        _$insertNode(_el$80, _el$86);
+                        _$setProp(_el$80, "onMouseUp", async () => {
                           const sessionId = entry.sessionId;
                           if (!sessionId) return;
                           const result = await copyText(sessionId);
@@ -2197,25 +2730,25 @@ ${t("session.toast.copy_failed")}`, {
                             duration: 8e3
                           });
                         });
-                        _$insertNode(_el$76, _el$77);
-                        _$insert(_el$76, () => t("session.label"), _el$77);
-                        _$insert(_el$78, () => " ".repeat(expandedPad(t("session.label"))));
-                        _$insert(_el$79, () => truncate(entry.sessionId, expandedValAvail() - visualWidth(" \u2398")));
-                        _$insertNode(_el$80, _$createTextNode(` \u2398`));
+                        _$insertNode(_el$82, _el$83);
+                        _$insert(_el$82, () => t("session.label"), _el$83);
+                        _$insert(_el$84, () => " ".repeat(expandedPad(t("session.label"))));
+                        _$insert(_el$85, () => truncate(entry.sessionId, expandedValAvail() - visualWidth(" \u2398")));
+                        _$insertNode(_el$86, _$createTextNode(` \u2398`));
                         _$effect((_p$) => {
-                          var _v$25 = {
+                          var _v$28 = {
                             fg: pal().primary
-                          }, _v$26 = {
+                          }, _v$29 = {
                             fg: pal().muted
-                          }, _v$27 = {
+                          }, _v$30 = {
                             fg: pal().muted
-                          }, _v$28 = {
+                          }, _v$31 = {
                             fg: pal().warning
                           };
-                          _v$25 !== _p$.e && (_p$.e = _$setProp(_el$76, "style", _v$25, _p$.e));
-                          _v$26 !== _p$.t && (_p$.t = _$setProp(_el$78, "style", _v$26, _p$.t));
-                          _v$27 !== _p$.a && (_p$.a = _$setProp(_el$79, "style", _v$27, _p$.a));
-                          _v$28 !== _p$.o && (_p$.o = _$setProp(_el$80, "style", _v$28, _p$.o));
+                          _v$28 !== _p$.e && (_p$.e = _$setProp(_el$82, "style", _v$28, _p$.e));
+                          _v$29 !== _p$.t && (_p$.t = _$setProp(_el$84, "style", _v$29, _p$.t));
+                          _v$30 !== _p$.a && (_p$.a = _$setProp(_el$85, "style", _v$30, _p$.a));
+                          _v$31 !== _p$.o && (_p$.o = _$setProp(_el$86, "style", _v$31, _p$.o));
                           return _p$;
                         }, {
                           e: void 0,
@@ -2223,7 +2756,7 @@ ${t("session.toast.copy_failed")}`, {
                           a: void 0,
                           o: void 0
                         });
-                        return _el$74;
+                        return _el$80;
                       }
                     }), _$createComponent(Show, {
                       get when() {
@@ -2239,68 +2772,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$99 = _$createElement("box"), _el$103 = _$createElement("text");
+                            _$insertNode(_el$99, _el$103);
+                            _$setProp(_el$99, "flexDirection", "row");
+                            _$insert(_el$99, _$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$100 = _$createElement("text"), _el$101 = _$createElement("span"), _el$102 = _$createElement("span");
+                                _$insertNode(_el$100, _el$101);
+                                _$insertNode(_el$100, _el$102);
+                                _$setProp(_el$100, "onMouseOver", () => setHoveredOpen(entry.id));
+                                _$setProp(_el$100, "onMouseOut", () => setHoveredOpen(void 0));
+                                _$setProp(_el$100, "onMouseUp", () => {
                                   if (entry.sessionId) {
                                     props.api.route.navigateSession(entry.sessionId);
                                   }
                                 });
-                                _$insert(_el$93, openPrefix);
-                                _$insert(_el$94, () => t("open.label"));
+                                _$insert(_el$101, openPrefix);
+                                _$insert(_el$102, () => t("open.label"));
                                 _$effect((_p$) => {
-                                  var _v$32 = {
+                                  var _v$35 = {
                                     fg: hoveredOpen() === entry.id ? pal().warning : pal().primary
-                                  }, _v$33 = {
+                                  }, _v$36 = {
                                     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$35 !== _p$.e && (_p$.e = _$setProp(_el$101, "style", _v$35, _p$.e));
+                                  _v$36 !== _p$.t && (_p$.t = _$setProp(_el$102, "style", _v$36, _p$.t));
                                   return _p$;
                                 }, {
                                   e: void 0,
                                   t: void 0
                                 });
-                                return _el$92;
+                                return _el$100;
                               }
-                            }), _el$95);
-                            _$insert(_el$95, () => " ".repeat(spacerW()));
-                            _$insert(_el$91, _$createComponent(Show, {
+                            }), _el$103);
+                            _$insert(_el$103, () => " ".repeat(spacerW()));
+                            _$insert(_el$99, _$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$104 = _$createElement("text"), _el$105 = _$createElement("span");
+                                _$insertNode(_el$104, _el$105);
+                                _$setProp(_el$104, "onMouseOver", () => setHoveredCancel(entry.id));
+                                _$setProp(_el$104, "onMouseOut", () => setHoveredCancel(void 0));
+                                _$setProp(_el$104, "onMouseUp", () => cancelEntry(entry));
+                                _$insert(_el$105, cancelLabel);
+                                _$effect((_$p) => _$setProp(_el$105, "style", {
                                   fg: hoveredCancel() === entry.id ? pal().warning : pal().error
                                 }, _$p));
-                                return _el$96;
+                                return _el$104;
                               }
                             }), null);
-                            _$insert(_el$91, _$createComponent(Show, {
+                            _$insert(_el$99, _$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$106 = _$createElement("text"), _el$107 = _$createElement("span");
+                                _$insertNode(_el$106, _el$107);
+                                _$setProp(_el$106, "onMouseOver", () => setHoveredDismiss(entry.id));
+                                _$setProp(_el$106, "onMouseOut", () => setHoveredDismiss(void 0));
+                                _$setProp(_el$106, "onMouseUp", () => {
                                   upsertEntry({
                                     id: entry.id,
                                     title: entry.title,
@@ -2309,17 +2842,17 @@ ${t("session.toast.copy_failed")}`, {
                                     status: "done"
                                   });
                                 });
-                                _$insert(_el$99, dismissLabel);
-                                _$effect((_$p) => _$setProp(_el$99, "style", {
+                                _$insert(_el$107, dismissLabel);
+                                _$effect((_$p) => _$setProp(_el$107, "style", {
                                   fg: hoveredDismiss() === entry.id ? pal().warning : pal().muted
                                 }, _$p));
-                                return _el$98;
+                                return _el$106;
                               }
                             }), null);
-                            _$effect((_$p) => _$setProp(_el$95, "style", {
+                            _$effect((_$p) => _$setProp(_el$103, "style", {
                               fg: pal().muted
                             }, _$p));
-                            return _el$91;
+                            return _el$99;
                           })();
                         })();
                       }
@@ -2340,13 +2873,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");
-                    _$insertNode(_el$101, _el$102);
-                    _$setProp(_el$101, "onMouseOver", () => showMore && setHoveredMoreBelow(true));
-                    _$setProp(_el$101, "onMouseOut", () => setHoveredMoreBelow(false));
-                    _$setProp(_el$101, "onMouseUp", () => {
+                    var _el$108 = _$createElement("box"), _el$109 = _$createElement("text"), _el$110 = _$createElement("span");
+                    _$insertNode(_el$108, _el$109);
+                    _$setProp(_el$108, "flexDirection", "row");
+                    _$insertNode(_el$109, _el$110);
+                    _$setProp(_el$109, "onMouseOver", () => showMore && setHoveredMoreBelow(true));
+                    _$setProp(_el$109, "onMouseOut", () => setHoveredMoreBelow(false));
+                    _$setProp(_el$109, "onMouseUp", () => {
                       if (!showMore) return;
                       const total = entryList().length;
                       const m = max();
@@ -2358,20 +2891,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$110, left);
+                    _$insert(_el$108, showTop ? [(() => {
+                      var _el$111 = _$createElement("text");
+                      _$insert(_el$111, () => " ".repeat(pad));
+                      _$effect((_$p) => _$setProp(_el$111, "style", {
                         fg: pal().muted
                       }, _$p));
-                      return _el$103;
+                      return _el$111;
                     })(), (() => {
-                      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$112 = _$createElement("text"), _el$113 = _$createElement("span");
+                      _$insertNode(_el$112, _el$113);
+                      _$setProp(_el$112, "onMouseOver", () => setHoveredTop(true));
+                      _$setProp(_el$112, "onMouseOut", () => setHoveredTop(false));
+                      _$setProp(_el$112, "onMouseUp", () => {
                         const total = entryList().length;
                         const m = max();
                         if (props.sortOrder() === "desc") {
@@ -2381,16 +2914,16 @@ ${t("session.toast.copy_failed")}`, {
                         }
                         setHoveredTop(false);
                       });
-                      _$insert(_el$105, right);
-                      _$effect((_$p) => _$setProp(_el$105, "style", {
+                      _$insert(_el$113, right);
+                      _$effect((_$p) => _$setProp(_el$113, "style", {
                         fg: hoveredTop() ? pal().warning : pal().muted
                       }, _$p));
-                      return _el$104;
+                      return _el$112;
                     })()] : null, null);
-                    _$effect((_$p) => _$setProp(_el$102, "style", {
+                    _$effect((_$p) => _$setProp(_el$110, "style", {
                       fg: showMore && hoveredMoreBelow() ? pal().warning : pal().muted
                     }, _$p));
-                    return _el$100;
+                    return _el$108;
                   })();
                 })();
               }
@@ -2444,6 +2977,21 @@ function createSidebarSlot(api, panelApi, sig) {
           get borderVisible() {
             return sig.borderVisible;
           },
+          get showEntryCost() {
+            return sig.showEntryCost;
+          },
+          get showEntryTime() {
+            return sig.showEntryTime;
+          },
+          get showEntryTokens() {
+            return sig.showEntryTokens;
+          },
+          get timeFormat() {
+            return sig.timeFormat;
+          },
+          get showOrigin() {
+            return sig.showOrigin;
+          },
           get sessionId() {
             return input.session_id;
           }
@@ -2460,6 +3008,13 @@ var tui = async (api) => {
   const [sortOrder, setSortOrder] = createSignal3(String(api.kv.get(`${KV_PREFIX}.order`, "desc")) === "asc" ? "asc" : "desc");
   const [scrollMode, setScrollMode] = createSignal3(String(api.kv.get(`${KV_PREFIX}.scroll_mode`, "wheel")) === "click" ? "click" : "wheel");
   const [borderVisible, setBorderVisible] = createSignal3(api.kv.get(`${KV_PREFIX}.border`, false) === true);
+  const [showEntryCost, setShowEntryCost] = createSignal3(api.kv.get(`${KV_PREFIX}.show_entry_cost`, false) === true);
+  const [showEntryTime, setShowEntryTime] = createSignal3(api.kv.get(`${KV_PREFIX}.show_entry_time`, true) !== false);
+  const [showEntryTokens, setShowEntryTokens] = createSignal3(api.kv.get(`${KV_PREFIX}.show_entry_tokens`, true) !== false);
+  const storedTimeFormat = String(api.kv.get(`${KV_PREFIX}.time_format`, "short"));
+  const [timeFormat, setTimeFormat] = createSignal3(TIME_FORMATS.includes(storedTimeFormat) ? storedTimeFormat : "short");
+  const [showOrigin, setShowOrigin] = createSignal3(api.kv.get(`${KV_PREFIX}.show_origin`, false) === true);
+  const [dbSync, setDbSync] = createSignal3(api.kv.get(`${KV_PREFIX}.db_sync`, true) !== false);
   const signals = {
     lang,
     setLang,
@@ -2471,6 +3026,18 @@ var tui = async (api) => {
     setScrollMode,
     borderVisible,
     setBorderVisible,
+    showEntryCost,
+    setShowEntryCost,
+    showEntryTime,
+    setShowEntryTime,
+    showEntryTokens,
+    setShowEntryTokens,
+    timeFormat,
+    setTimeFormat,
+    showOrigin,
+    setShowOrigin,
+    dbSync,
+    setDbSync,
     sessionId: ""
   };
   const v1Api = {
@@ -2971,6 +3538,102 @@ var tui = async (api) => {
       });
       dialog?.clear();
     }
+  }, {
+    title: "SubAgent Magazine: Entry Cost",
+    value: "subagent-cost",
+    description: "Show or hide the per-sub-agent cost in the sidebar",
+    slash: {
+      name: "subagent-cost"
+    },
+    onSelect: (dialog) => {
+      const t = createT(() => signals.lang());
+      const cur = Boolean(api.kv.get(`${KV_PREFIX}.show_entry_cost`, false));
+      api.kv.set(`${KV_PREFIX}.show_entry_cost`, !cur);
+      signals.setShowEntryCost(!cur);
+      api.ui.toast({
+        message: `${t("settings.showEntryCost")}: ${!cur ? t("settings.on") : t("settings.off")}`
+      });
+      dialog?.clear();
+    }
+  }, {
+    title: "SubAgent Magazine: Entry Time",
+    value: "subagent-time",
+    description: "Show or hide the elapsed time in the sidebar list",
+    slash: {
+      name: "subagent-time"
+    },
+    onSelect: (dialog) => {
+      const t = createT(() => signals.lang());
+      const cur = Boolean(api.kv.get(`${KV_PREFIX}.show_entry_time`, true));
+      api.kv.set(`${KV_PREFIX}.show_entry_time`, !cur);
+      signals.setShowEntryTime(!cur);
+      api.ui.toast({
+        message: `${t("settings.showEntryTime")}: ${!cur ? t("settings.on") : t("settings.off")}`
+      });
+      dialog?.clear();
+    }
+  }, {
+    title: "SubAgent Magazine: Entry Tokens",
+    value: "subagent-tokens",
+    description: "Show or hide the token count in the sidebar list",
+    slash: {
+      name: "subagent-tokens"
+    },
+    onSelect: (dialog) => {
+      const t = createT(() => signals.lang());
+      const cur = Boolean(api.kv.get(`${KV_PREFIX}.show_entry_tokens`, true));
+      api.kv.set(`${KV_PREFIX}.show_entry_tokens`, !cur);
+      signals.setShowEntryTokens(!cur);
+      api.ui.toast({
+        message: `${t("settings.showEntryTokens")}: ${!cur ? t("settings.on") : t("settings.off")}`
+      });
+      dialog?.clear();
+    }
+  }, {
+    title: "SubAgent Magazine: Time Format",
+    value: "subagent-time-format",
+    description: "Set how elapsed time is displayed",
+    slash: {
+      name: "subagent-time-format"
+    },
+    onSelect: (dialog) => {
+      dialog?.replace(() => _$createComponent2(api.ui.DialogSelect, {
+        title: "Time Format / \u65F6\u95F4\u683C\u5F0F",
+        get options() {
+          return TIME_FORMATS.map((f) => ({
+            title: `${f} \u2014 ${TIME_FORMAT_SAMPLES[f]}`,
+            value: f
+          }));
+        },
+        onSelect: (opt) => {
+          const f = opt.value;
+          setTimeFormat(f);
+          api.kv.set(`${KV_PREFIX}.time_format`, f);
+          const t = createT(() => lang());
+          api.ui.toast({
+            message: `${t("settings.timeFormat")}: ${TIME_FORMAT_SAMPLES[f]}`
+          });
+          dialog?.clear();
+        }
+      }));
+    }
+  }, {
+    title: "SubAgent Magazine: Origin Indicators",
+    value: "subagent-origin",
+    description: "Show or hide origin markers (\u21E2/\u21B3) in the sidebar list",
+    slash: {
+      name: "subagent-origin"
+    },
+    onSelect: (dialog) => {
+      const t = createT(() => signals.lang());
+      const cur = Boolean(api.kv.get(`${KV_PREFIX}.show_origin`, false));
+      api.kv.set(`${KV_PREFIX}.show_origin`, !cur);
+      signals.setShowOrigin(!cur);
+      api.ui.toast({
+        message: `${t("settings.showOrigin")}: ${!cur ? t("settings.on") : t("settings.off")}`
+      });
+      dialog?.clear();
+    }
   }]);
 };
 var mod = {