opencode-subagent-magazine 1.7.1 → 1.7.3

package/dist/_version.d.ts

@@ -1 +1 @@
-export declare const PLUGIN_VERSION = "1.7.1";
+export declare const PLUGIN_VERSION = "1.7.3";

package/dist/panel/entry-map.d.ts

@@ -21,3 +21,32 @@ export declare function mergeSubEntry(base: SubEntry, incoming: SubEntry): SubEn
  * 互相丢弃对方的条目。
  */
 export declare function mergeSubEntries(base: Iterable<SubEntry>, incoming: Iterable<SubEntry>): Map<string, SubEntry>;
+/** 持久化保留的 prompt 前缀长度。prompt 只用于生成 title，不参与渲染；
+ *  写入前截断，避免单条 10KB+ 的提示词把 KV 撑大（实测存量 prompt 占 2.9MB/4.4MB）。 */
+export declare const PERSISTED_PROMPT_MAX = 128;
+/** 压缩条目载荷（当前仅截断 prompt）。已达标时原样返回，避免无谓复制。 */
+export declare function compactSubEntry(entry: SubEntry): SubEntry;
+/**
+ * 持久化合并——所有 KV 写入路径的唯一入口：
+ * 1. 剔除 id 已进入 `clearedIds` 的条目（手动清除名单是持久化层权威，
+ *    过期快照/debounce 写入都不得把它们合并回去）；
+ * 2. 压缩载荷（prompt 截断），base 里的存量胖数据也顺带清理。
+ */
+export declare function mergeSubEntriesForPersist(base: Iterable<SubEntry>, incoming: Iterable<SubEntry>, clearedIds: readonly string[] | undefined): Map<string, SubEntry>;
+/**
+ * 从清除名单中筛出可安全移除的 id——它们不会再被扫描/轮询重建：
+ * - `tool:`：对应 part 已确认状态为 error（扫描从不为 error part 建条目）；
+ * - `sub:`：子会话已不在权威存活列表里（轮询只重建存活子会话）。
+ * `liveChildIds` 未提供（本地库不可用）时不碰 `sub:` id。
+ */
+export declare function prunableClearedIds(input: {
+    clearedIds: Iterable<string>;
+    errorToolIds?: ReadonlySet<string>;
+    liveChildIds?: ReadonlySet<string>;
+}): string[];
+/**
+ * 从条目集合中移除 id 已清除的条目（保留原有 Map 键）。
+ * 扫描入口调用：防止 `globalEntryCache` / KV 中残留的已清除
+ * 条目在 replace=false 的合并扫描中继续存活。
+ */
+export declare function withoutClearedEntries(entries: ReadonlyMap<string, SubEntry>, clearedIds: ReadonlySet<string> | undefined): Map<string, SubEntry>;

package/dist/tui.js

@@ -6,7 +6,7 @@ import { createComponent as _$createComponent2 } from "@opentui/solid";
 import { createSignal as createSignal3 } from "solid-js";
 
 // src/_version.ts
-var PLUGIN_VERSION = "1.7.1";
+var PLUGIN_VERSION = "1.7.3";
 
 // src/i18n.ts
 var ZH_T = {
@@ -749,6 +749,39 @@ function mergeSubEntries(base, incoming) {
   }
   return out;
 }
+var PERSISTED_PROMPT_MAX = 128;
+function compactSubEntry(entry) {
+  const prompt = entry.prompt ?? "";
+  if (prompt.length <= PERSISTED_PROMPT_MAX) return entry;
+  return { ...entry, prompt: prompt.slice(0, PERSISTED_PROMPT_MAX) };
+}
+function mergeSubEntriesForPersist(base, incoming, clearedIds) {
+  const cleared = new Set(clearedIds ?? []);
+  const keep = (entry) => !cleared.has(entry.id);
+  return mergeSubEntries(
+    [...base].filter(keep).map(compactSubEntry),
+    [...incoming].filter(keep).map(compactSubEntry)
+  );
+}
+function prunableClearedIds(input) {
+  const out = [];
+  for (const id of input.clearedIds) {
+    if (id.startsWith("tool:")) {
+      if (input.errorToolIds?.has(id)) out.push(id);
+    } else if (id.startsWith("sub:")) {
+      if (input.liveChildIds !== void 0 && !input.liveChildIds.has(id.slice(4))) out.push(id);
+    }
+  }
+  return out;
+}
+function withoutClearedEntries(entries, clearedIds) {
+  const next = new Map(entries);
+  if (!clearedIds || clearedIds.size === 0) return next;
+  for (const [key, entry] of next) {
+    if (clearedIds.has(entry.id)) next.delete(key);
+  }
+  return next;
+}
 
 // src/panel/SubAgentPanel.tsx
 var LEFT_PAD = 4;
@@ -853,12 +886,12 @@ function SubAgentPanel(props) {
           if (isChild) {
             const parent = ensureRootRecord(data, parentSid);
             const child = ensureChildRecord(data, parentSid, sid);
-            child.entries = [...mergeSubEntries(child.entries ?? [], entries2.values()).values()];
+            child.entries = [...mergeSubEntriesForPersist(child.entries ?? [], entries2.values(), child.clearedIds).values()];
             parent.ts = Date.now();
           } else {
             const rec = ensureRootRecord(data, sid);
             rec.ts = Date.now();
-            rec.entries = [...mergeSubEntries(rec.entries ?? [], entries2.values()).values()];
+            rec.entries = [...mergeSubEntriesForPersist(rec.entries ?? [], entries2.values(), rec.clearedIds).values()];
           }
         });
       } catch {
@@ -913,7 +946,62 @@ function SubAgentPanel(props) {
     } catch {
     }
   };
+  const recordNeedsCompaction = (rec) => {
+    const cleared = new Set(rec.clearedIds ?? []);
+    for (const entry of rec.entries ?? []) {
+      if ((entry.prompt ?? "").length > PERSISTED_PROMPT_MAX) return true;
+      if (cleared.has(entry.id)) return true;
+    }
+    return false;
+  };
+  const compactStoredPayloads = () => {
+    try {
+      const data = loadSessionData2();
+      let needed = false;
+      for (const rec of Object.values(data)) {
+        if (recordNeedsCompaction(rec)) {
+          needed = true;
+          break;
+        }
+        for (const child of Object.values(rec.children ?? {})) {
+          if (recordNeedsCompaction(child)) {
+            needed = true;
+            break;
+          }
+        }
+        if (needed) break;
+      }
+      if (!needed) return;
+      mutateSessionData((latest) => {
+        for (const rec of Object.values(latest)) {
+          rec.entries = [...mergeSubEntriesForPersist(rec.entries ?? [], [], rec.clearedIds).values()];
+          for (const child of Object.values(rec.children ?? {})) {
+            child.entries = [...mergeSubEntriesForPersist(child.entries ?? [], [], child.clearedIds).values()];
+          }
+        }
+      });
+    } catch {
+    }
+  };
   cleanupOldSessions();
+  compactStoredPayloads();
+  const pruneClearedIds = (sid, ids) => {
+    if (ids.length === 0) return;
+    const remove = new Set(ids);
+    try {
+      mutateSessionData((data) => {
+        const {
+          parentSid,
+          isChild
+        } = resolveParent(sid);
+        const rec = isChild ? data[parentSid]?.children?.[sid] : data[parentSid];
+        if (!rec?.clearedIds?.length) return;
+        const next = rec.clearedIds.filter((id) => !remove.has(id));
+        if (next.length !== rec.clearedIds.length) rec.clearedIds = next;
+      });
+    } catch {
+    }
+  };
   const [entryMap, setEntryMapRaw] = createSignal2(loadEntries(props.sessionId));
   const setEntryMap = (arg) => {
     setEntryMapRaw((prev) => {
@@ -937,12 +1025,12 @@ function SubAgentPanel(props) {
             if (isChild) {
               const parent = ensureRootRecord(data, parentSid);
               const child = ensureChildRecord(data, parentSid, props.sessionId);
-              child.entries = [...mergeSubEntries(child.entries ?? [], next.values()).values()];
+              child.entries = [...mergeSubEntriesForPersist(child.entries ?? [], next.values(), child.clearedIds).values()];
               parent.ts = Date.now();
             } else {
               const rec = ensureRootRecord(data, props.sessionId);
               rec.ts = Date.now();
-              rec.entries = [...mergeSubEntries(rec.entries ?? [], next.values()).values()];
+              rec.entries = [...mergeSubEntriesForPersist(rec.entries ?? [], next.values(), rec.clearedIds).values()];
             }
           });
         } catch {
@@ -1377,7 +1465,7 @@ function SubAgentPanel(props) {
                 latest[parentSid] = {
                   ...latestRec ?? rec,
                   ts: nowTs,
-                  entries: [...mergeSubEntries(latestRec?.entries ?? [], fallbackMap.values()).values()]
+                  entries: [...mergeSubEntriesForPersist(latestRec?.entries ?? [], fallbackMap.values(), latestRec?.clearedIds).values()]
                 };
               });
             }
@@ -1395,7 +1483,7 @@ function SubAgentPanel(props) {
                 ts: nowTs
               },
               ts: nowTs,
-              entries: [...mergeSubEntries(rec?.entries ?? [], parentCache.values()).values()]
+              entries: [...mergeSubEntriesForPersist(rec?.entries ?? [], parentCache.values(), rec?.clearedIds).values()]
             };
           });
         }
@@ -1495,14 +1583,17 @@ function SubAgentPanel(props) {
     } catch {
     }
     if (!msgs || msgs.length === 0) return false;
+    const seenErrorIds = /* @__PURE__ */ new Set();
+    let scanClearedIds = /* @__PURE__ */ new Set();
     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);
+      scanClearedIds = clearedIds;
+      const next = withoutClearedEntries(replace ? new Map(globalEntryCache.get(sid) ?? loadEntries(sid)) : new Map(prev), clearedIds);
       try {
         for (const msg of msgs) {
           const parts = props.api.session.part(msg.id) ?? [];
@@ -1529,7 +1620,10 @@ function SubAgentPanel(props) {
               }
               const existingKey = findSubEntryKey(next, id, scanSubSid);
               const exists = existingKey ? next.get(existingKey) : void 0;
-              if (!exists && clearedIds.has(id)) continue;
+              if (!exists && clearedIds.has(id)) {
+                if (rawStatus === "error") seenErrorIds.add(id);
+                continue;
+              }
               if ((rawStatus === "pending" || rawStatus === "") && !exists) continue;
               if (rawStatus === "error") {
                 if (exists && exists.status === "running") {
@@ -1612,6 +1706,22 @@ function SubAgentPanel(props) {
     if (snapshot.size > 0) {
       globalEntryCache.set(sid, new Map(snapshot));
       persistEntries(sid, snapshot);
+    } else if (globalEntryCache.has(sid)) {
+      globalEntryCache.set(sid, new Map(snapshot));
+    }
+    if (scanClearedIds.size > 0) {
+      let liveChildIds;
+      try {
+        const children = props.api.session.listChildren?.(sid);
+        if (children) liveChildIds = new Set(children.map((c) => c.id).filter((id) => Boolean(id)));
+      } catch {
+      }
+      const prunable = prunableClearedIds({
+        clearedIds: scanClearedIds,
+        errorToolIds: seenErrorIds,
+        liveChildIds
+      });
+      if (prunable.length > 0) pruneClearedIds(sid, prunable);
     }
     return true;
   };
@@ -1882,6 +1992,7 @@ function SubAgentPanel(props) {
     const tick = clearTick();
     const forceReload = tick !== lastTick && !switched;
     lastTick = tick;
+    if (forceReload) clearTimeout(persistTimer);
     let attempts = 0;
     let retryTimer;
     const run = () => {
@@ -2039,7 +2150,15 @@ function SubAgentPanel(props) {
   const expandedPad = (label) => Math.max(0, expandedMaxLabelW() - visualWidth(label + ": "));
   const expandedValAvail = () => Math.max(6, panelWidth() - gutter() - INDENT - expandedMaxLabelW());
   const summaryParts = createMemo(() => {
-    if (!anyEntry()) return null;
+    if (!anyEntry()) {
+      return {
+        done: "",
+        running: null,
+        err: null,
+        duration: "",
+        cost: ""
+      };
+    }
     const dot = "\u25CF";
     const cost = totalCost();
     return {
@@ -2052,7 +2171,6 @@ function SubAgentPanel(props) {
   });
   const summaryCols = createMemo(() => {
     const p = summaryParts();
-    if (!p) return 0;
     let w = visualWidth(p.done);
     if (p.running) w += 1 + visualWidth(p.running);
     if (p.err) w += 1 + visualWidth(p.err);
@@ -3380,14 +3498,16 @@ var tui = async (api) => {
               expanded: "",
               entries: []
             };
+            const child = data[parentID].children[sid];
             data[parentID].children[sid] = {
-              ...data[parentID].children[sid],
-              entries: [...entries.values()]
+              ...child,
+              entries: [...mergeSubEntriesForPersist(child.entries ?? [], entries.values(), child.clearedIds).values()]
             };
           } else {
             data[sid] = {
+              ...data[sid] ?? {},
               ts: Date.now(),
-              entries: [...entries.values()],
+              entries: [...mergeSubEntriesForPersist(data[sid]?.entries ?? [], entries.values(), data[sid]?.clearedIds).values()],
               scroll: data[sid]?.scroll ?? 0,
               expanded: data[sid]?.expanded ?? "",
               children: data[sid]?.children ?? {}
@@ -3485,11 +3605,29 @@ var tui = async (api) => {
         onConfirm: () => {
           try {
             const data = JSON.parse(String(api.kv.get(`${KV_PREFIX}.session_data`, "{}")));
+            const cachedIds = [...globalEntryCache.get(sid)?.values() ?? []].map((e) => e.id);
             let count = 0;
             if (parentID) {
-              if (data[parentID]?.children?.[sid]) {
+              if (data[parentID]?.children?.[sid] || cachedIds.length > 0) {
+                if (!data[parentID]) {
+                  data[parentID] = {
+                    ts: Date.now(),
+                    entries: [],
+                    scroll: 0,
+                    expanded: "",
+                    children: {}
+                  };
+                }
+                if (!data[parentID].children) data[parentID].children = {};
+                if (!data[parentID].children[sid]) {
+                  data[parentID].children[sid] = {
+                    scroll: 0,
+                    expanded: "",
+                    entries: []
+                  };
+                }
                 const child = data[parentID].children[sid];
-                const ids = child.entries?.map((e) => e.id) ?? [];
+                const ids = [.../* @__PURE__ */ new Set([...child.entries?.map((e) => e.id) ?? [], ...cachedIds])];
                 count = ids.length;
                 child.entries = [];
                 child.scroll = 0;
@@ -3497,9 +3635,18 @@ var tui = async (api) => {
                 child.clearedIds = [.../* @__PURE__ */ new Set([...child.clearedIds ?? [], ...ids])];
               }
             } else {
-              count = data[sid]?.entries?.length ?? 0;
-              if (data[sid]) {
-                const ids = data[sid].entries?.map((e) => e.id) ?? [];
+              if (data[sid] || cachedIds.length > 0) {
+                if (!data[sid]) {
+                  data[sid] = {
+                    ts: Date.now(),
+                    entries: [],
+                    scroll: 0,
+                    expanded: "",
+                    children: {}
+                  };
+                }
+                const ids = [.../* @__PURE__ */ new Set([...data[sid].entries?.map((e) => e.id) ?? [], ...cachedIds])];
+                count = ids.length;
                 data[sid].entries = [];
                 data[sid].scroll = 0;
                 data[sid].expanded = "";

package/dist/v2.js

@@ -933,7 +933,7 @@ function safeErrorMsg(err) {
 }
 
 // src/_version.ts
-var PLUGIN_VERSION = "1.7.1";
+var PLUGIN_VERSION = "1.7.3";
 
 // src/i18n.ts
 var ZH_T = {
@@ -1354,6 +1354,39 @@ function mergeSubEntries(base, incoming) {
   }
   return out;
 }
+var PERSISTED_PROMPT_MAX = 128;
+function compactSubEntry(entry) {
+  const prompt = entry.prompt ?? "";
+  if (prompt.length <= PERSISTED_PROMPT_MAX) return entry;
+  return { ...entry, prompt: prompt.slice(0, PERSISTED_PROMPT_MAX) };
+}
+function mergeSubEntriesForPersist(base, incoming, clearedIds) {
+  const cleared = new Set(clearedIds ?? []);
+  const keep = (entry) => !cleared.has(entry.id);
+  return mergeSubEntries(
+    [...base].filter(keep).map(compactSubEntry),
+    [...incoming].filter(keep).map(compactSubEntry)
+  );
+}
+function prunableClearedIds(input) {
+  const out = [];
+  for (const id of input.clearedIds) {
+    if (id.startsWith("tool:")) {
+      if (input.errorToolIds?.has(id)) out.push(id);
+    } else if (id.startsWith("sub:")) {
+      if (input.liveChildIds !== void 0 && !input.liveChildIds.has(id.slice(4))) out.push(id);
+    }
+  }
+  return out;
+}
+function withoutClearedEntries(entries, clearedIds) {
+  const next = new Map(entries);
+  if (!clearedIds || clearedIds.size === 0) return next;
+  for (const [key, entry] of next) {
+    if (clearedIds.has(entry.id)) next.delete(key);
+  }
+  return next;
+}
 
 // src/v2/settings-menu.ts
 var TTL_VALUES = [3, 7, 14, 30, 0];
@@ -1841,7 +1874,7 @@ function makeCommands(context, api, signals) {
                 if (!data[parentSid]) data[parentSid] = { ts: Date.now(), entries: [], scroll: 0, expanded: "", children: {} };
                 if (!data[parentSid].children) data[parentSid].children = {};
                 const prev = data[parentSid].children[sid]?.entries ?? [];
-                const merged = [...mergeSubEntries(prev, entries.values()).values()].map(
+                const merged = [...mergeSubEntriesForPersist(prev, entries.values(), data[parentSid].children[sid]?.clearedIds).values()].map(
                   (e) => e.status === "running" || e.status === "cancel_requested" ? { ...e, status: "done", endedAt: e.endedAt ?? Date.now() } : e
                 );
                 data[parentSid].children[sid] = {
@@ -1850,7 +1883,7 @@ function makeCommands(context, api, signals) {
                 };
               } else {
                 const rec = data[parentSid] ?? { ts: Date.now(), entries: [], scroll: 0, expanded: "", children: {} };
-                const merged = [...mergeSubEntries(rec.entries ?? [], entries.values()).values()].map(
+                const merged = [...mergeSubEntriesForPersist(rec.entries ?? [], entries.values(), rec.clearedIds).values()].map(
                   (e) => e.status === "running" || e.status === "cancel_requested" ? { ...e, status: "done", endedAt: e.endedAt ?? Date.now() } : e
                 );
                 data[parentSid] = { ...rec, ts: Date.now(), entries: merged, children: rec.children ?? {} };
@@ -1919,6 +1952,7 @@ function makeCommands(context, api, signals) {
           ]
         });
         if (choice !== "yes") return;
+        const cachedIds = [...globalEntryCache.get(sid)?.values() ?? []].map((e) => e.id);
         try {
           let count = 0;
           const finish = () => {
@@ -1928,9 +1962,12 @@ function makeCommands(context, api, signals) {
           };
           const done = updateSessionData(kv, (data) => {
             if (parentID) {
-              const child = data[parentID]?.children?.[sid];
-              if (child) {
-                const ids = child.entries?.map((e) => e.id) ?? [];
+              const parent = data[parentID];
+              if (parent?.children?.[sid] || cachedIds.length > 0) {
+                const parentRec = parent ?? (data[parentID] = { ts: Date.now(), entries: [], scroll: 0, expanded: "", children: {} });
+                if (!parentRec.children) parentRec.children = {};
+                const child = parentRec.children[sid] ?? (parentRec.children[sid] = { scroll: 0, expanded: "", entries: [] });
+                const ids = [.../* @__PURE__ */ new Set([...(child.entries ?? []).map((e) => e.id), ...cachedIds])];
                 count = ids.length;
                 child.entries = [];
                 child.scroll = 0;
@@ -1939,13 +1976,14 @@ function makeCommands(context, api, signals) {
               }
             } else {
               const rec = data[sid];
-              if (rec) {
-                const ids = rec.entries?.map((e) => e.id) ?? [];
+              if (rec || cachedIds.length > 0) {
+                const target = rec ?? (data[sid] = { ts: Date.now(), entries: [], scroll: 0, expanded: "", children: {} });
+                const ids = [.../* @__PURE__ */ new Set([...(target.entries ?? []).map((e) => e.id), ...cachedIds])];
                 count = ids.length;
-                rec.entries = [];
-                rec.scroll = 0;
-                rec.expanded = "";
-                rec.clearedIds = [.../* @__PURE__ */ new Set([...rec.clearedIds ?? [], ...ids])];
+                target.entries = [];
+                target.scroll = 0;
+                target.expanded = "";
+                target.clearedIds = [.../* @__PURE__ */ new Set([...target.clearedIds ?? [], ...ids])];
               }
             }
           });
@@ -2286,12 +2324,12 @@ function SubAgentPanel(props) {
           if (isChild) {
             const parent = ensureRootRecord(data, parentSid);
             const child = ensureChildRecord(data, parentSid, sid);
-            child.entries = [...mergeSubEntries(child.entries ?? [], entries2.values()).values()];
+            child.entries = [...mergeSubEntriesForPersist(child.entries ?? [], entries2.values(), child.clearedIds).values()];
             parent.ts = Date.now();
           } else {
             const rec = ensureRootRecord(data, sid);
             rec.ts = Date.now();
-            rec.entries = [...mergeSubEntries(rec.entries ?? [], entries2.values()).values()];
+            rec.entries = [...mergeSubEntriesForPersist(rec.entries ?? [], entries2.values(), rec.clearedIds).values()];
           }
         });
       } catch {
@@ -2346,7 +2384,62 @@ function SubAgentPanel(props) {
     } catch {
     }
   };
+  const recordNeedsCompaction = (rec) => {
+    const cleared = new Set(rec.clearedIds ?? []);
+    for (const entry of rec.entries ?? []) {
+      if ((entry.prompt ?? "").length > PERSISTED_PROMPT_MAX) return true;
+      if (cleared.has(entry.id)) return true;
+    }
+    return false;
+  };
+  const compactStoredPayloads = () => {
+    try {
+      const data = loadSessionData2();
+      let needed = false;
+      for (const rec of Object.values(data)) {
+        if (recordNeedsCompaction(rec)) {
+          needed = true;
+          break;
+        }
+        for (const child of Object.values(rec.children ?? {})) {
+          if (recordNeedsCompaction(child)) {
+            needed = true;
+            break;
+          }
+        }
+        if (needed) break;
+      }
+      if (!needed) return;
+      mutateSessionData((latest) => {
+        for (const rec of Object.values(latest)) {
+          rec.entries = [...mergeSubEntriesForPersist(rec.entries ?? [], [], rec.clearedIds).values()];
+          for (const child of Object.values(rec.children ?? {})) {
+            child.entries = [...mergeSubEntriesForPersist(child.entries ?? [], [], child.clearedIds).values()];
+          }
+        }
+      });
+    } catch {
+    }
+  };
   cleanupOldSessions();
+  compactStoredPayloads();
+  const pruneClearedIds = (sid, ids) => {
+    if (ids.length === 0) return;
+    const remove = new Set(ids);
+    try {
+      mutateSessionData((data) => {
+        const {
+          parentSid,
+          isChild
+        } = resolveParent(sid);
+        const rec = isChild ? data[parentSid]?.children?.[sid] : data[parentSid];
+        if (!rec?.clearedIds?.length) return;
+        const next = rec.clearedIds.filter((id) => !remove.has(id));
+        if (next.length !== rec.clearedIds.length) rec.clearedIds = next;
+      });
+    } catch {
+    }
+  };
   const [entryMap, setEntryMapRaw] = createSignal2(loadEntries(props.sessionId));
   const setEntryMap = (arg) => {
     setEntryMapRaw((prev) => {
@@ -2370,12 +2463,12 @@ function SubAgentPanel(props) {
             if (isChild) {
               const parent = ensureRootRecord(data, parentSid);
               const child = ensureChildRecord(data, parentSid, props.sessionId);
-              child.entries = [...mergeSubEntries(child.entries ?? [], next.values()).values()];
+              child.entries = [...mergeSubEntriesForPersist(child.entries ?? [], next.values(), child.clearedIds).values()];
               parent.ts = Date.now();
             } else {
               const rec = ensureRootRecord(data, props.sessionId);
               rec.ts = Date.now();
-              rec.entries = [...mergeSubEntries(rec.entries ?? [], next.values()).values()];
+              rec.entries = [...mergeSubEntriesForPersist(rec.entries ?? [], next.values(), rec.clearedIds).values()];
             }
           });
         } catch {
@@ -2810,7 +2903,7 @@ function SubAgentPanel(props) {
                 latest[parentSid] = {
                   ...latestRec ?? rec,
                   ts: nowTs,
-                  entries: [...mergeSubEntries(latestRec?.entries ?? [], fallbackMap.values()).values()]
+                  entries: [...mergeSubEntriesForPersist(latestRec?.entries ?? [], fallbackMap.values(), latestRec?.clearedIds).values()]
                 };
               });
             }
@@ -2828,7 +2921,7 @@ function SubAgentPanel(props) {
                 ts: nowTs
               },
               ts: nowTs,
-              entries: [...mergeSubEntries(rec?.entries ?? [], parentCache.values()).values()]
+              entries: [...mergeSubEntriesForPersist(rec?.entries ?? [], parentCache.values(), rec?.clearedIds).values()]
             };
           });
         }
@@ -2928,14 +3021,17 @@ function SubAgentPanel(props) {
     } catch {
     }
     if (!msgs || msgs.length === 0) return false;
+    const seenErrorIds = /* @__PURE__ */ new Set();
+    let scanClearedIds = /* @__PURE__ */ new Set();
     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);
+      scanClearedIds = clearedIds;
+      const next = withoutClearedEntries(replace ? new Map(globalEntryCache.get(sid) ?? loadEntries(sid)) : new Map(prev), clearedIds);
       try {
         for (const msg of msgs) {
           const parts = props.api.session.part(msg.id) ?? [];
@@ -2962,7 +3058,10 @@ function SubAgentPanel(props) {
               }
               const existingKey = findSubEntryKey(next, id, scanSubSid);
               const exists = existingKey ? next.get(existingKey) : void 0;
-              if (!exists && clearedIds.has(id)) continue;
+              if (!exists && clearedIds.has(id)) {
+                if (rawStatus === "error") seenErrorIds.add(id);
+                continue;
+              }
               if ((rawStatus === "pending" || rawStatus === "") && !exists) continue;
               if (rawStatus === "error") {
                 if (exists && exists.status === "running") {
@@ -3045,6 +3144,22 @@ function SubAgentPanel(props) {
     if (snapshot.size > 0) {
       globalEntryCache.set(sid, new Map(snapshot));
       persistEntries(sid, snapshot);
+    } else if (globalEntryCache.has(sid)) {
+      globalEntryCache.set(sid, new Map(snapshot));
+    }
+    if (scanClearedIds.size > 0) {
+      let liveChildIds;
+      try {
+        const children = props.api.session.listChildren?.(sid);
+        if (children) liveChildIds = new Set(children.map((c) => c.id).filter((id) => Boolean(id)));
+      } catch {
+      }
+      const prunable = prunableClearedIds({
+        clearedIds: scanClearedIds,
+        errorToolIds: seenErrorIds,
+        liveChildIds
+      });
+      if (prunable.length > 0) pruneClearedIds(sid, prunable);
     }
     return true;
   };
@@ -3315,6 +3430,7 @@ function SubAgentPanel(props) {
     const tick = clearTick();
     const forceReload = tick !== lastTick && !switched;
     lastTick = tick;
+    if (forceReload) clearTimeout(persistTimer);
     let attempts = 0;
     let retryTimer;
     const run = () => {
@@ -3472,7 +3588,15 @@ function SubAgentPanel(props) {
   const expandedPad = (label) => Math.max(0, expandedMaxLabelW() - visualWidth(label + ": "));
   const expandedValAvail = () => Math.max(6, panelWidth() - gutter() - INDENT - expandedMaxLabelW());
   const summaryParts = createMemo(() => {
-    if (!anyEntry()) return null;
+    if (!anyEntry()) {
+      return {
+        done: "",
+        running: null,
+        err: null,
+        duration: "",
+        cost: ""
+      };
+    }
     const dot = "\u25CF";
     const cost = totalCost();
     return {
@@ -3485,7 +3609,6 @@ function SubAgentPanel(props) {
   });
   const summaryCols = createMemo(() => {
     const p = summaryParts();
-    if (!p) return 0;
     let w = visualWidth(p.done);
     if (p.running) w += 1 + visualWidth(p.running);
     if (p.err) w += 1 + visualWidth(p.err);