dsh-sessions-manager 3.7.7 → 3.7.8

package/lib/client.js

@@ -178,6 +178,19 @@ function noticeToastPlan(raw, seenIds, max = 2) {
     ackIds: shown.map((n) => String(n.id))
   };
 }
+function foldOrphanSubagents(items, lineage) {
+  const list = Array.isArray(items) ? items : [];
+  const table = lineage && typeof lineage === "object" ? lineage : {};
+  const rows = [];
+  const orphans = [];
+  for (const it of list) {
+    const id = it && it.sessionId != null ? String(it.sessionId) : "";
+    const info = id ? table[id] : null;
+    if (info && info.origin === "subagent") orphans.push(it);
+    else rows.push(it);
+  }
+  return { rows, orphans };
+}
 function branchTimeKey(item) {
   const c = Number(item && item.createdAt);
   if (Number.isFinite(c) && c > 0) return c;
@@ -322,6 +335,13 @@ function remainingRows(visibleTotal, renderedVisible) {
   const shownCount = Number.isFinite(shown) ? Math.max(0, Math.floor(shown)) : 0;
   return Math.max(0, Math.max(0, Math.floor(total)) - shownCount);
 }
+function collapsedVisibleTotal(groupCount, trashInGroup) {
+  if (groupCount == null || trashInGroup == null) return null;
+  const total = Number(groupCount);
+  const trash = Number(trashInGroup);
+  if (!Number.isFinite(total) || !Number.isFinite(trash)) return null;
+  return Math.max(0, Math.floor(total) - Math.max(0, Math.floor(trash)));
+}
 function countRenderedVisible(rows, visibleIds) {
   if (!Array.isArray(rows) || !visibleIds || typeof visibleIds.has !== "function") return 0;
   let n = 0;
@@ -554,6 +574,10 @@ body[data-ds-dark-theme] .archv{color-scheme:dark}
 .dlg{width:min(420px,92vw);background:var(--dsw-alias-bg-layer-2);border:1px solid var(--dsw-alias-border-l3);border-radius:14px;padding:18px;box-shadow:0 16px 48px rgb(0 0 0/.28);display:flex;flex-direction:column;gap:12px}
 .dlg-title{font-size:15px;font-weight:650;color:var(--dsw-alias-label-primary);margin:0}
 .dlg-text{font-size:13px;line-height:1.6;color:var(--dsw-alias-label-secondary);margin:0;word-break:break-all}
+/* issue #18 \u7B2C 4 \u6761\uFF1A\u5220\u9664\u786E\u8BA4\u6846\u91CC\u7684\u300C\u8FDE\u5E26\u5B50\u4EE3\u7406\u300D\u52FE\u9009\u884C\u3002\u4E0E\u9762\u677F\u5176\u5B83\u52FE\u9009\u9879
+   \u540C\u4E00\u5957\u89C6\u89C9\u8BED\u8A00\uFF0813px / \u4E2D\u6027\u6807\u7B7E\u8272 / 8px \u95F4\u8DDD\uFF09\uFF0C\u4E0D\u81EA\u9020\u6309\u94AE\u6837\u5F0F\u3002 */
+.dlg-check{display:flex;align-items:flex-start;gap:8px;font-size:13px;line-height:1.55;color:var(--dsw-alias-label-secondary);cursor:pointer}
+.dlg-check input{margin:2px 0 0;flex:none}
 .dlg-actions{display:flex;justify-content:flex-end;gap:8px;margin-top:2px}
 /* ---- T4 \u6807\u7B7E\u7F16\u8F91/\u7BA1\u7406 sheet \u4E0E\u7B5B\u9009\u4FDD\u5B58\u63A7\u4EF6\uFF08\u5168\u90E8\u8D70 --dsw token\uFF09 ---- */
 .dsm-taglist{display:flex;flex-direction:column;gap:2px;max-height:240px;overflow:auto}
@@ -793,6 +817,10 @@ function SessionPanel({ workspacesSvc }) {
   const [sortBy, setSortBy] = (0, import_react.useState)(() => ["newest", "oldest", "title"].includes(initialPrefs.sortBy) ? initialPrefs.sortBy : "newest");
   const [selected, setSelected] = (0, import_react.useState)({});
   const [delTarget, setDelTarget] = (0, import_react.useState)(null);
+  const [cascadeSub, setCascadeSub] = (0, import_react.useState)(true);
+  (0, import_react.useEffect)(() => {
+    if (delTarget) setCascadeSub(true);
+  }, [delTarget]);
   const [confirmBatch, setConfirmBatch] = (0, import_react.useState)(false);
   const [batchMoveOpen, setBatchMoveOpen] = (0, import_react.useState)(false);
   const [busy, setBusy] = (0, import_react.useState)(null);
@@ -861,6 +889,7 @@ function SessionPanel({ workspacesSvc }) {
     return next;
   });
   const [groupByLineage, setGroupByLineage] = (0, import_react.useState)(() => initialPrefs.groupByLineage !== false);
+  const [openOrphans, setOpenOrphans] = (0, import_react.useState)(false);
   const [tagDefs, setTagDefs] = (0, import_react.useState)([]);
   const [assignments, setAssignments] = (0, import_react.useState)({});
   const [tagsState, setTagsState] = (0, import_react.useState)("loading");
@@ -1320,19 +1349,30 @@ function SessionPanel({ workspacesSvc }) {
   const canPurge = actionCapability("physicalPurge", "purge");
   const canMove = actionCapability("relocateSession", "move");
   const canRestoreTrash = actionCapability("restoreIndexedSession", "restoreTrash");
-  const archivedList = sessions ? sessions.filter((x) => x.archived) : [];
-  const activeList = sessions ? sessions.filter((x) => !x.archived) : [];
-  const starredList = starredOf(sessions);
-  const emptyList = (0, import_react.useMemo)(() => {
-    if (!sessions) return [];
-    return sessions.filter((x) => {
+  const isSubagentItem = (0, import_react.useCallback)((item) => {
+    const li = item ? lineage[String(item.sessionId)] : null;
+    return !!(li && li.origin === "subagent");
+  }, [lineage]);
+  const { archivedAll, activeAll, starredAll, emptyAll } = (0, import_react.useMemo)(() => ({
+    archivedAll: sessions ? sessions.filter((x) => x.archived) : [],
+    activeAll: sessions ? sessions.filter((x) => !x.archived) : [],
+    starredAll: starredOf(sessions),
+    // issue #6 之三：空白会话单分一类。空白判定来自宿主血缘快照（sizeBytes 阈值
+    // 实测校准），与侧栏「空白」标记同源——两处永远不会各说各话。
+    emptyAll: sessions ? sessions.filter((x) => {
       const li = lineage[String(x.sessionId)];
       return !!(li && li.empty);
-    });
-  }, [sessions, lineage]);
+    }) : []
+  }), [sessions, lineage]);
+  const topOnly = (0, import_react.useCallback)((arr) => groupByLineage ? arr.filter((x) => !isSubagentItem(x)) : arr, [groupByLineage, isSubagentItem]);
+  const archivedList = (0, import_react.useMemo)(() => topOnly(archivedAll), [topOnly, archivedAll]);
+  const activeList = (0, import_react.useMemo)(() => topOnly(activeAll), [topOnly, activeAll]);
+  const starredList = (0, import_react.useMemo)(() => topOnly(starredAll), [topOnly, starredAll]);
+  const emptyList = (0, import_react.useMemo)(() => topOnly(emptyAll), [topOnly, emptyAll]);
+  const totalTopCount = (0, import_react.useMemo)(() => topOnly(sessions || []).length, [topOnly, sessions]);
   const list = (0, import_react.useMemo)(() => {
     if (filter === "trash") return [];
-    const base = filter === "archived" ? archivedList : filter === "active" ? activeList : filter === "starred" ? starredList : filter === "empty" ? emptyList : sessions || [];
+    const base = filter === "archived" ? archivedAll : filter === "active" ? activeAll : filter === "starred" ? starredAll : filter === "empty" ? emptyAll : sessions || [];
     const tagPassed = applyTagFilter(base, tagsReady ? tagFilter : "");
     const needle = query.trim().toLocaleLowerCase();
     const filtered = tagPassed.filter((item) => {
@@ -1345,14 +1385,15 @@ function SessionPanel({ workspacesSvc }) {
       if (sortBy === "title") return effectiveTitleOf(a, dsmAuthoritativeTitles).localeCompare(effectiveTitleOf(b, dsmAuthoritativeTitles), "zh-CN");
       return Number(b.createdAt || 0) - Number(a.createdAt || 0);
     });
-  }, [sessions, filter, query, workspaceFilter, sortBy, emptyList, starredList, tagFilter, tagsReady]);
+  }, [sessions, archivedAll, activeAll, starredAll, emptyAll, filter, query, workspaceFilter, sortBy, tagFilter, tagsReady]);
   const selIds = Object.keys(selected).filter((k) => selected[k]);
   const showSessionList = filter !== "trash";
-  const { topList, kidsOf, foldedCount, branchGroupsOf, branchFolded, branchGroupCount } = (0, import_react.useMemo)(() => {
-    if (!groupByLineage) return { topList: list, kidsOf: /* @__PURE__ */ new Map(), foldedCount: 0, branchGroupsOf: /* @__PURE__ */ new Map(), branchFolded: 0, branchGroupCount: 0 };
+  const { topList, kidsOf, foldedCount, branchGroupsOf, branchFolded, branchGroupCount, orphanSubagents } = (0, import_react.useMemo)(() => {
+    if (!groupByLineage) return { topList: list, kidsOf: /* @__PURE__ */ new Map(), foldedCount: 0, branchGroupsOf: /* @__PURE__ */ new Map(), branchFolded: 0, branchGroupCount: 0, orphanSubagents: [] };
     const kids = foldSubagents(list, lineage);
     const br = foldBranches(kids.topList, lineage);
-    return { topList: br.topList, kidsOf: kids.kidsOf, foldedCount: kids.foldedCount, branchGroupsOf: br.branchGroupsOf, branchFolded: br.foldedCount, branchGroupCount: br.groupCount };
+    const { rows, orphans } = foldOrphanSubagents(br.topList, lineage);
+    return { topList: rows, kidsOf: kids.kidsOf, foldedCount: kids.foldedCount, branchGroupsOf: br.branchGroupsOf, branchFolded: br.foldedCount, branchGroupCount: br.groupCount, orphanSubagents: orphans };
   }, [list, lineage, groupByLineage]);
   const matchIds = (0, import_react.useMemo)(() => {
     const needle = query.trim().toLocaleLowerCase();
@@ -1361,6 +1402,8 @@ function SessionPanel({ workspacesSvc }) {
   }, [sessions, query]);
   const kidsHit = (parentId) => !!(matchIds && (kidsOf.get(String(parentId)) || []).some((k) => matchIds.has(String(k.sessionId))));
   const branchHit = (rootId) => !!(matchIds && (branchGroupsOf.get(String(rootId)) || []).some((m) => matchIds.has(String(m.sessionId))));
+  const orphanHit = !!(matchIds && orphanSubagents.some((k) => matchIds.has(String(k.sessionId))));
+  const orphanOpen = openOrphans || orphanHit;
   const syntheticCount = groupByLineage ? topList.reduce((n, it) => n + (it && it.syntheticRoot ? 1 : 0), 0) : 0;
   const kidsBadge = (sessionId) => {
     if (!groupByLineage) return null;
@@ -1385,6 +1428,29 @@ function SessionPanel({ workspacesSvc }) {
     );
   };
   const sessionsById = (0, import_react.useMemo)(() => new Map((sessions || []).map((x) => [String(x.sessionId), x])), [sessions]);
+  const delCascadeCount = (0, import_react.useMemo)(() => {
+    if (!delTarget) return 0;
+    const childMap = /* @__PURE__ */ new Map();
+    for (const [id, li] of Object.entries(lineage || {})) {
+      if (!li || li.origin !== "subagent" || !li.parentSession) continue;
+      const p = String(li.parentSession);
+      if (!childMap.has(p)) childMap.set(p, []);
+      childMap.get(p).push(String(id));
+    }
+    const seen = /* @__PURE__ */ new Set([String(delTarget.sessionId)]);
+    const queue = [String(delTarget.sessionId)];
+    let n = 0;
+    while (queue.length) {
+      const cur = queue.shift();
+      for (const kid of childMap.get(cur) || []) {
+        if (seen.has(kid)) continue;
+        seen.add(kid);
+        n++;
+        queue.push(kid);
+      }
+    }
+    return n;
+  }, [delTarget, lineage]);
   const branchBadge = (sessionId) => {
     const li = lineage[String(sessionId)];
     if (!li || li.origin === "subagent" || !li.parentSession) return null;
@@ -1494,8 +1560,8 @@ function SessionPanel({ workspacesSvc }) {
   const clearSel = () => setSelected({});
   const selectAll = () => {
     const o = {};
-    list.forEach((x) => {
-      o[x.sessionId] = true;
+    topList.forEach((x) => {
+      if (x && x.sessionId != null && !x.syntheticRoot) o[x.sessionId] = true;
     });
     setSelected(o);
   };
@@ -1515,13 +1581,14 @@ function SessionPanel({ workspacesSvc }) {
   const doDeleteConfirmed = () => {
     if (!delTarget || busy) return;
     setBusy(delTarget.sessionId);
-    postJSON("/archived-sessions/delete", { sessionId: delTarget.sessionId }).then(() => {
+    postJSON("/archived-sessions/delete", { sessionId: delTarget.sessionId, cascadeSubagents: cascadeSub }).then((r) => {
       setBusy(null);
       const n = delTarget.title || delTarget.sessionId;
-      showToast(`\u5DF2\u5220\u9664 ${n}\uFF08\u5DF2\u79FB\u5165\u56DE\u6536\u7AD9\uFF09`);
-      const sid = String(delTarget.sessionId);
+      const cascaded = Number(r && r.cascaded || 0);
+      showToast(`\u5DF2\u5220\u9664 ${n}${cascaded ? `\uFF08\u8FDE\u540C ${cascaded} \u4E2A\u5B50\u4EE3\u7406\u4F1A\u8BDD\uFF09` : ""}\uFF08\u5DF2\u79FB\u5165\u56DE\u6536\u7AD9\uFF09`);
+      const gone = /* @__PURE__ */ new Set([String(delTarget.sessionId), ...(r && r.cascadedIds || []).map(String)]);
       setDelTarget(null);
-      setSessions((s) => s && s.filter((x) => String(x.sessionId) !== sid));
+      setSessions((s) => s && s.filter((x) => !gone.has(String(x.sessionId))));
       loadTrash();
       dsmLoadTrashIds();
     }).catch((e) => {
@@ -1612,7 +1679,9 @@ function SessionPanel({ workspacesSvc }) {
     setTrashBusy(sid);
     postJSON("/archived-sessions/trash/restore", { sessionId: sid }).then((r) => {
       setTrashBusy(null);
-      showToast(r && r.workspaceGone ? "\u5DF2\u6062\u590D\u4F1A\u8BDD\uFF08\u539F\u5DE5\u4F5C\u533A\u5DF2\u5220\u9664\uFF0C\u4F1A\u8BDD\u6682\u5F52\u300C\u672A\u5206\u7EC4\u300D\uFF09" : "\u5DF2\u6062\u590D\u4F1A\u8BDD");
+      const cascaded = Number(r && r.cascaded || 0);
+      const base = r && r.workspaceGone ? "\u5DF2\u6062\u590D\u4F1A\u8BDD\uFF08\u539F\u5DE5\u4F5C\u533A\u5DF2\u5220\u9664\uFF0C\u4F1A\u8BDD\u6682\u5F52\u300C\u672A\u5206\u7EC4\u300D\uFF09" : "\u5DF2\u6062\u590D\u4F1A\u8BDD";
+      showToast(base + (cascaded ? `\uFF0C\u8FDE\u540C ${cascaded} \u4E2A\u5B50\u4EE3\u7406\u4F1A\u8BDD` : ""));
       loadTrash();
       refresh();
     }).catch((e) => {
@@ -1701,7 +1770,8 @@ function SessionPanel({ workspacesSvc }) {
     postJSON("/archived-sessions/" + action, { sessionIds: selIds }).then((r) => {
       setBusy(null);
       const n = r && (r.archived || r.restored || r.deleted) || selIds.length;
-      showToast(`\u5DF2\u5904\u7406 ${n} \u4E2A\u4F1A\u8BDD`);
+      const cascaded = Number(r && r.cascaded || 0);
+      showToast(`\u5DF2\u5904\u7406 ${n} \u4E2A\u4F1A\u8BDD${cascaded ? `\uFF08\u8FDE\u540C ${cascaded} \u4E2A\u5B50\u4EE3\u7406\u4F1A\u8BDD\uFF09` : ""}`);
       refresh();
     }).catch((e) => {
       setBusy(null);
@@ -1906,7 +1976,7 @@ function SessionPanel({ workspacesSvc }) {
           ]
         }
       ) : null,
-      sessions !== null && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "archv-count", "aria-label": `${sessions.length} \u4E2A\u4F1A\u8BDD`, children: sessions.length })
+      sessions !== null && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "archv-count", title: groupByLineage ? "\u5B50\u4EE3\u7406\u4F1A\u8BDD\u6298\u53E0\u5728\u7236\u4F1A\u8BDD\u4E0B\uFF0C\u4E0D\u8BA1\u5165\u6B64\u6570" : void 0, "aria-label": `${totalTopCount} \u4E2A\u4F1A\u8BDD`, children: totalTopCount })
     ] }),
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { className: "archv-sub", children: "\u7EDF\u4E00\u7BA1\u7406\u5168\u90E8\u4F1A\u8BDD\uFF1A\u5F52\u6863 / \u6062\u590D / \u79FB\u52A8\u5230\u5176\u4ED6\u5DE5\u4F5C\u533A / \u4F1A\u8BDD\u8BE6\u60C5 / \u6279\u91CF\u64CD\u4F5C\uFF0C\u5220\u9664\u4F1A\u5148\u8FDB\u5165\u56DE\u6536\u7AD9\uFF0C\u53EF\u5728\u56DE\u6536\u7AD9\u5185\u6062\u590D\u6216\u5F7B\u5E95\u6E05\u7406\u3002" }),
     error && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "archv-err", role: "alert", children: [
@@ -1935,7 +2005,7 @@ function SessionPanel({ workspacesSvc }) {
           setConfirmBatch(false);
         }, children: [
           "\u5168\u90E8 (",
-          sessions.length,
+          totalTopCount,
           ")"
         ] }),
         /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("button", { type: "button", role: "tab", "aria-selected": filter === "active", className: "sess-fbtn" + (filter === "active" ? " sess-fbtn-on" : ""), onClick: () => {
@@ -2261,7 +2331,7 @@ function SessionPanel({ workspacesSvc }) {
             "\u663E\u793A ",
             topList.length - syntheticCount,
             " \u4E2A\u4F1A\u8BDD",
-            foldedCount || branchFolded ? `\uFF0C\u53E6\u6709 ${[foldedCount ? `${foldedCount} \u4E2A\u5B50\u4EE3\u7406\u6298\u53E0\u5728\u7236\u4F1A\u8BDD\u4E0B` : "", branchFolded ? `${branchFolded} \u4E2A\u5206\u652F\u805A\u6210 ${branchGroupCount} \u7EC4` : ""].filter(Boolean).join("\u3001")}` : query || workspaceFilter !== "all" || tagFilter ? `\uFF0C\u5171 ${filter === "archived" ? archivedList.length : filter === "active" ? activeList.length : filter === "starred" ? starredList.length : filter === "empty" ? emptyList.length : sessions.length} \u4E2A` : topList.length !== list.length ? `\uFF0C\u5171 ${list.length} \u4E2A` : ""
+            foldedCount || branchFolded ? `\uFF0C\u53E6\u6709 ${[foldedCount ? `${foldedCount} \u4E2A\u5B50\u4EE3\u7406\u6298\u53E0\u5728\u7236\u4F1A\u8BDD\u4E0B` : "", branchFolded ? `${branchFolded} \u4E2A\u5206\u652F\u805A\u6210 ${branchGroupCount} \u7EC4` : ""].filter(Boolean).join("\u3001")}` : query || workspaceFilter !== "all" || tagFilter ? `\uFF0C\u5171 ${filter === "archived" ? archivedList.length : filter === "active" ? activeList.length : filter === "starred" ? starredList.length : filter === "empty" ? emptyList.length : totalTopCount} \u4E2A` : topList.length !== list.length ? `\uFF0C\u5171 ${list.length} \u4E2A` : ""
           ] }),
           /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", { className: "dsm-fbar", children: [
             saveFilterOpen ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
@@ -2334,9 +2404,9 @@ function SessionPanel({ workspacesSvc }) {
           ] })
         ] })
       ] }),
-      showSessionList && list.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "sess-batch" + (selIds.length > 0 ? " sess-batch-pin" : ""), children: [
-        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "sess-btntext", children: selIds.length ? `\u5DF2\u9009 ${selIds.length} \u9879` : filter === "archived" ? `\u5171 ${archivedList.length} \u4E2A\u5F52\u6863\u4F1A\u8BDD` : filter === "starred" ? `\u5171 ${starredList.length} \u4E2A\u6536\u85CF\u4F1A\u8BDD` : `\u5171 ${sessions.length} \u4E2A\u4F1A\u8BDD\uFF08\u6D3B\u52A8 ${activeList.length} / \u5DF2\u5F52\u6863 ${archivedList.length}\uFF09` }),
-        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", className: "archv-btn", disabled: list.length === 0, onClick: selectAll, children: "\u5168\u9009" }),
+      showSessionList && (topList.length > 0 || orphanSubagents.length > 0) && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "sess-batch" + (selIds.length > 0 ? " sess-batch-pin" : ""), children: [
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "sess-btntext", children: selIds.length ? `\u5DF2\u9009 ${selIds.length} \u9879` : filter === "archived" ? `\u5171 ${archivedList.length} \u4E2A\u5F52\u6863\u4F1A\u8BDD` : filter === "starred" ? `\u5171 ${starredList.length} \u4E2A\u6536\u85CF\u4F1A\u8BDD` : `\u5171 ${totalTopCount} \u4E2A\u4F1A\u8BDD\uFF08\u6D3B\u52A8 ${activeList.length} / \u5DF2\u5F52\u6863 ${archivedList.length}\uFF09` }),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", className: "archv-btn", disabled: topList.length === 0, title: groupByLineage ? "\u9009\u4E2D\u5F53\u524D\u5217\u8868\u7684\u4F1A\u8BDD\u884C\uFF08\u6298\u53E0\u4E2D\u7684\u5B50\u4EE3\u7406\u4E0E\u5206\u652F\u6210\u5458\u4E0D\u4F1A\u88AB\u9009\u4E2D\uFF09" : void 0, onClick: selectAll, children: "\u5168\u9009" }),
         selIds.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
           filter === "archived" && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
             /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", className: "archv-btn", disabled: busy !== null, onClick: () => doBatch("restore-many"), children: "\u6062\u590D\u6240\u9009" }),
@@ -2414,311 +2484,372 @@ function SessionPanel({ workspacesSvc }) {
           ] })
         ] })
       ] }),
-      showSessionList && list.length === 0 ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "archv-empty", children: query || workspaceFilter !== "all" || tagFilter ? "\u6CA1\u6709\u5339\u914D\u7684\u4F1A\u8BDD\u3002\u8BF7\u8C03\u6574\u641C\u7D22\u8BCD\u3001\u6807\u7B7E\u6216\u5DE5\u4F5C\u533A\u7B5B\u9009\u3002" : filter === "archived" ? "\u76EE\u524D\u6CA1\u6709\u5F52\u6863\u4F1A\u8BDD\u3002\u5728\u201C\u5168\u90E8\u201D\u91CC\u9009\u4E2D\u4F1A\u8BDD\u70B9\u201C\u5F52\u6863\u201D\u5373\u53EF\u6536\u7EB3\u8FDB\u6765\u3002" : filter === "active" ? "\u76EE\u524D\u6CA1\u6709\u6D3B\u52A8\u4F1A\u8BDD\u3002" : filter === "starred" ? "\u8FD8\u6CA1\u6709\u6536\u85CF\u7684\u4F1A\u8BDD\u3002\u70B9\u51FB\u4F1A\u8BDD\u5DE6\u4FA7\u7684\u661F\u6807\u5373\u53EF\u6536\u85CF\u3002" : filter === "empty" ? "\u6CA1\u6709\u7A7A\u767D\u4F1A\u8BDD\u3002\u65B0\u5F00\u4F1A\u8BDD\u8FD8\u6CA1\u4EA7\u751F\u5185\u5BB9\u65F6\u4F1A\u5F52\u5230\u8FD9\u91CC\uFF0C\u4FA7\u680F\u4F1A\u81EA\u52A8\u9690\u85CF\u5B83\u4EEC\u3002" : "\u6682\u65E0\u53EF\u7BA1\u7406\u7684\u4F1A\u8BDD\u3002" }) : showSessionList ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "archv-list", role: "list", children: topList.map((it) => {
-        if (it && it.syntheticRoot) {
-          const root = String(it.syntheticRoot);
-          const members = branchGroupsOf.get(root) || [];
-          const open = !!openBranches[root] || branchHit(root);
-          const srcTitle = dsmAuthoritativeTitles.get(root);
-          return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dsm-src-head", role: "listitem", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(
-              "button",
-              {
-                type: "button",
-                className: "dsm-kids-toggle",
-                "aria-expanded": open,
-                title: (open ? "\u6536\u8D77 " : "\u5C55\u5F00 ") + members.length + " \u4E2A\u5206\u652F\u4F1A\u8BDD\uFF08\u6765\u6E90\u4F1A\u8BDD\u4E0D\u5728\u5F53\u524D\u5217\u8868\uFF09",
-                onClick: () => toggleBranch(root),
-                children: [
-                  open ? "\u25BE" : "\u25B8",
-                  " ",
-                  members.length,
-                  " \u5206\u652F"
-                ]
-              }
-            ),
-            /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "dsm-src-name", title: root, children: "\u6765\u6E90\uFF1A" + (srcTitle || shortId(root)) })
-          ] }, it.sessionId);
-        }
-        const date = fmtDate(it.createdAt);
-        const expanded = openMove === it.sessionId || openTags === it.sessionId;
-        return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "archv-card" + (expanded ? " archv-card-exp" : ""), role: "listitem", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "archv-row", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-              "input",
-              {
-                type: "checkbox",
-                className: "archv-check",
-                checked: !!selected[it.sessionId],
-                onChange: () => toggle(it.sessionId),
-                "aria-label": "\u9009\u62E9 " + (it.title || it.sessionId)
-              }
-            ),
-            /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-              "button",
-              {
-                type: "button",
-                className: "archv-star" + (it.starred ? " archv-star-on" : ""),
-                "aria-pressed": !!it.starred,
-                "aria-label": (it.starred ? "\u53D6\u6D88\u6536\u85CF " : "\u6536\u85CF ") + (it.title || it.sessionId),
-                title: it.starred ? "\u53D6\u6D88\u6536\u85CF" : "\u6536\u85CF",
-                onClick: (e) => {
-                  e.stopPropagation();
-                  toggleStar(it);
-                },
-                children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("svg", { viewBox: "0 0 24 24", width: "18", height: "18", "aria-hidden": "true", focusable: "false", children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("path", { d: "M12 2.5l2.9 5.9 6.6.9-4.8 4.6 1.2 6.5-5.9-3.1-5.9 3.1 1.2-6.5L2.5 9.3l6.6-.9z" }) })
-              }
-            ),
-            /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "archv-body", children: [
-              /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "archv-main", children: [
-                /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "archv-titlerow", children: [
-                  /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "archv-name", title: it.title || "", children: it.title || "(\u65E0\u6807\u9898)" }),
-                  branchBadge(it.sessionId),
-                  emptyBadge(it.sessionId),
-                  tagChips(it.sessionId),
-                  kidsBadge(it.sessionId),
-                  branchGroupBadge(it.sessionId),
-                  /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", className: "archv-id" + (copiedId === it.sessionId ? " archv-id-copied" : ""), title: it.sessionId + "\uFF08\u70B9\u51FB\u590D\u5236\u5B8C\u6574 ID\uFF09", "aria-label": "\u590D\u5236\u4F1A\u8BDD ID " + it.sessionId, onClick: (e) => {
-                    e.stopPropagation();
-                    copySessionId(it.sessionId);
-                  }, children: copiedId === it.sessionId ? "\u5DF2\u590D\u5236" : shortId(it.sessionId) })
+      showSessionList && topList.length === 0 && orphanSubagents.length === 0 ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "archv-empty", children: query || workspaceFilter !== "all" || tagFilter ? "\u6CA1\u6709\u5339\u914D\u7684\u4F1A\u8BDD\u3002\u8BF7\u8C03\u6574\u641C\u7D22\u8BCD\u3001\u6807\u7B7E\u6216\u5DE5\u4F5C\u533A\u7B5B\u9009\u3002" : filter === "archived" ? "\u76EE\u524D\u6CA1\u6709\u5F52\u6863\u4F1A\u8BDD\u3002\u5728\u201C\u5168\u90E8\u201D\u91CC\u9009\u4E2D\u4F1A\u8BDD\u70B9\u201C\u5F52\u6863\u201D\u5373\u53EF\u6536\u7EB3\u8FDB\u6765\u3002" : filter === "active" ? "\u76EE\u524D\u6CA1\u6709\u6D3B\u52A8\u4F1A\u8BDD\u3002" : filter === "starred" ? "\u8FD8\u6CA1\u6709\u6536\u85CF\u7684\u4F1A\u8BDD\u3002\u70B9\u51FB\u4F1A\u8BDD\u5DE6\u4FA7\u7684\u661F\u6807\u5373\u53EF\u6536\u85CF\u3002" : filter === "empty" ? "\u6CA1\u6709\u7A7A\u767D\u4F1A\u8BDD\u3002\u65B0\u5F00\u4F1A\u8BDD\u8FD8\u6CA1\u4EA7\u751F\u5185\u5BB9\u65F6\u4F1A\u5F52\u5230\u8FD9\u91CC\uFF0C\u4FA7\u680F\u4F1A\u81EA\u52A8\u9690\u85CF\u5B83\u4EEC\u3002" : "\u6682\u65E0\u53EF\u7BA1\u7406\u7684\u4F1A\u8BDD\u3002" }) : showSessionList ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "archv-list", role: "list", children: [
+        topList.map((it) => {
+          if (it && it.syntheticRoot) {
+            const root = String(it.syntheticRoot);
+            const members = branchGroupsOf.get(root) || [];
+            const open = !!openBranches[root] || branchHit(root);
+            const srcTitle = dsmAuthoritativeTitles.get(root);
+            return (
+              // issue #18 第 2 条：合成头先前在这里提前 return，只渲染按钮与
+              // 「来源：」，展开时什么都不会出现（成员列表只挂在普通卡片的
+              // renderBranchGroup 上）。这里补上同一个成员渲染器——按钮、
+              // 展开状态、搜索命中展开都复用分支组的既有语义。
+              /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_react.default.Fragment, { children: [
+                /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dsm-src-head", role: "listitem", children: [
+                  /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(
+                    "button",
+                    {
+                      type: "button",
+                      className: "dsm-kids-toggle",
+                      "aria-expanded": open,
+                      title: (open ? "\u6536\u8D77 " : "\u5C55\u5F00 ") + members.length + " \u4E2A\u5206\u652F\u4F1A\u8BDD\uFF08\u6765\u6E90\u4F1A\u8BDD\u4E0D\u5728\u5F53\u524D\u5217\u8868\uFF09",
+                      onClick: () => toggleBranch(root),
+                      children: [
+                        open ? "\u25BE" : "\u25B8",
+                        " ",
+                        members.length,
+                        " \u5206\u652F"
+                      ]
+                    }
+                  ),
+                  /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "dsm-src-name", title: root, children: "\u6765\u6E90\uFF1A" + (srcTitle || shortId(root)) })
                 ] }),
-                /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "archv-meta", children: [
-                  it.archived ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "archv-wtag archv-wgone", children: "\u5DF2\u5F52\u6863" }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "archv-wtag archv-active", children: "\u6D3B\u52A8" }),
-                  workspaceTag(it),
-                  date && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
-                    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "archv-dot", children: "\xB7" }),
-                    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "archv-date", children: date })
+                renderBranchGroup(root)
+              ] }, it.sessionId)
+            );
+          }
+          const date = fmtDate(it.createdAt);
+          const expanded = openMove === it.sessionId || openTags === it.sessionId;
+          return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "archv-card" + (expanded ? " archv-card-exp" : ""), role: "listitem", children: [
+            /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "archv-row", children: [
+              /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+                "input",
+                {
+                  type: "checkbox",
+                  className: "archv-check",
+                  checked: !!selected[it.sessionId],
+                  onChange: () => toggle(it.sessionId),
+                  "aria-label": "\u9009\u62E9 " + (it.title || it.sessionId)
+                }
+              ),
+              /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+                "button",
+                {
+                  type: "button",
+                  className: "archv-star" + (it.starred ? " archv-star-on" : ""),
+                  "aria-pressed": !!it.starred,
+                  "aria-label": (it.starred ? "\u53D6\u6D88\u6536\u85CF " : "\u6536\u85CF ") + (it.title || it.sessionId),
+                  title: it.starred ? "\u53D6\u6D88\u6536\u85CF" : "\u6536\u85CF",
+                  onClick: (e) => {
+                    e.stopPropagation();
+                    toggleStar(it);
+                  },
+                  children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("svg", { viewBox: "0 0 24 24", width: "18", height: "18", "aria-hidden": "true", focusable: "false", children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("path", { d: "M12 2.5l2.9 5.9 6.6.9-4.8 4.6 1.2 6.5-5.9-3.1-5.9 3.1 1.2-6.5L2.5 9.3l6.6-.9z" }) })
+                }
+              ),
+              /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "archv-body", children: [
+                /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "archv-main", children: [
+                  /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "archv-titlerow", children: [
+                    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "archv-name", title: it.title || "", children: it.title || "(\u65E0\u6807\u9898)" }),
+                    branchBadge(it.sessionId),
+                    emptyBadge(it.sessionId),
+                    tagChips(it.sessionId),
+                    kidsBadge(it.sessionId),
+                    branchGroupBadge(it.sessionId),
+                    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", className: "archv-id" + (copiedId === it.sessionId ? " archv-id-copied" : ""), title: it.sessionId + "\uFF08\u70B9\u51FB\u590D\u5236\u5B8C\u6574 ID\uFF09", "aria-label": "\u590D\u5236\u4F1A\u8BDD ID " + it.sessionId, onClick: (e) => {
+                      e.stopPropagation();
+                      copySessionId(it.sessionId);
+                    }, children: copiedId === it.sessionId ? "\u5DF2\u590D\u5236" : shortId(it.sessionId) })
+                  ] }),
+                  /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "archv-meta", children: [
+                    it.archived ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "archv-wtag archv-wgone", children: "\u5DF2\u5F52\u6863" }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "archv-wtag archv-active", children: "\u6D3B\u52A8" }),
+                    workspaceTag(it),
+                    date && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
+                      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "archv-dot", children: "\xB7" }),
+                      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "archv-date", children: date })
+                    ] })
                   ] })
-                ] })
-              ] }),
-              rowMenu(it)
-            ] })
-          ] }),
-          groupByLineage && renderKids(it.sessionId, 0),
-          groupByLineage && renderBranchGroup(it.sessionId),
-          expanded && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "mv-sheet", role: "region", "aria-label": "\u79FB\u52A8\u5230\u5DE5\u4F5C\u533A", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "mv-sheet-head", children: [
-              /* @__PURE__ */ (0, import_jsx_runtime.jsx)("h3", { className: "mv-sheet-title", children: "\u79FB\u52A8\u5230\u5DE5\u4F5C\u533A" }),
-              /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", className: "mv-sheet-close", "aria-label": "\u5173\u95ED", onClick: () => setOpenMove(null), children: "\xD7" })
-            ] }),
-            /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "mv-seg", role: "tablist", children: [
-              /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", role: "tab", "aria-selected": moveMode === "existing", className: "mv-segbtn" + (moveMode === "existing" ? " mv-segbtn-on" : ""), onClick: () => setMoveMode("existing"), children: "\u5DF2\u6709\u5DE5\u4F5C\u533A" }),
-              /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", role: "tab", "aria-selected": moveMode === "new", className: "mv-segbtn" + (moveMode === "new" ? " mv-segbtn-on" : ""), onClick: () => setMoveMode("new"), children: "\u65B0\u5EFA\u76EE\u5F55" })
-            ] }),
-            moveMode === "existing" ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "mv-field", children: [
-              /* @__PURE__ */ (0, import_jsx_runtime.jsx)("label", { className: "mv-field-label", htmlFor: "mv-target-ws", children: "\u76EE\u6807\u5DE5\u4F5C\u533A" }),
-              /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("select", { id: "mv-target-ws", value: targetWs, onChange: (e) => setTargetWs(e.target.value), children: [
-                workspaces.length === 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("option", { value: "", children: "\uFF08\u6682\u65E0\u5DE5\u4F5C\u533A\uFF09" }),
-                workspaces.map((w) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("option", { value: w.workspaceId, children: [
-                  w.title,
-                  " \xB7 ",
-                  w.path
-                ] }, w.workspaceId))
-              ] })
-            ] }) : /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "mv-field", children: [
-              /* @__PURE__ */ (0, import_jsx_runtime.jsx)("label", { className: "mv-field-label", htmlFor: "mv-new-path", children: "\u65B0\u5DE5\u4F5C\u533A\u76EE\u5F55\u8DEF\u5F84" }),
-              /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "mv-browse-row", children: [
-                /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-                  "input",
-                  {
-                    id: "mv-new-path",
-                    type: "text",
-                    value: newPath,
-                    onChange: (e) => setNewPath(e.target.value),
-                    placeholder: "\u4F8B\u5982 /Users/you/Projects/demo \u6216 ~/demo"
-                  }
-                ),
-                /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-                  "button",
-                  {
-                    type: "button",
-                    className: "archv-btn",
-                    onClick: pickDirectory,
-                    disabled: busy !== null || picking || !workspacesSvc,
-                    title: !workspacesSvc ? "\u5F53\u524D\u8FD0\u884C\u73AF\u5883\u4E0D\u652F\u6301\u7CFB\u7EDF\u76EE\u5F55\u9009\u62E9" : "\u6253\u5F00\u7CFB\u7EDF\u76EE\u5F55\u9009\u62E9\u7A97\u53E3",
-                    children: picking ? "\u9009\u62E9\u4E2D\u2026" : "\u6D4F\u89C8\u2026"
-                  }
-                )
+                ] }),
+                rowMenu(it)
               ] })
             ] }),
-            /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "mv-foot", children: [
-              /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", className: "archv-btn", onClick: () => setOpenMove(null), children: "\u53D6\u6D88" }),
-              /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("button", { type: "button", className: "archv-btn archv-go", disabled: busy !== null, onClick: () => doMove(it), children: [
-                busy === it.sessionId && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "archv-spin", "aria-hidden": "true" }),
-                "\u786E\u8BA4\u79FB\u52A8"
-              ] })
-            ] })
-          ] }),
-          openTags === it.sessionId && (() => {
-            const cur = Array.isArray(assignments[String(it.sessionId)]) ? assignments[String(it.sessionId)] : [];
-            const locked = tagBusy !== null || !tagsReady;
-            return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "mv-sheet", role: "region", "aria-label": "\u4F1A\u8BDD\u6807\u7B7E", children: [
+            groupByLineage && renderKids(it.sessionId, 0),
+            groupByLineage && renderBranchGroup(it.sessionId),
+            expanded && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "mv-sheet", role: "region", "aria-label": "\u79FB\u52A8\u5230\u5DE5\u4F5C\u533A", children: [
               /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "mv-sheet-head", children: [
-                /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("h3", { className: "mv-sheet-title", children: [
-                  "\u4F1A\u8BDD\u6807\u7B7E \xB7 ",
-                  it.title || shortId(it.sessionId)
-                ] }),
-                /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", className: "mv-sheet-close", "aria-label": "\u5173\u95ED", onClick: () => setOpenTags(null), children: "\xD7" })
+                /* @__PURE__ */ (0, import_jsx_runtime.jsx)("h3", { className: "mv-sheet-title", children: "\u79FB\u52A8\u5230\u5DE5\u4F5C\u533A" }),
+                /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", className: "mv-sheet-close", "aria-label": "\u5173\u95ED", onClick: () => setOpenMove(null), children: "\xD7" })
+              ] }),
+              /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "mv-seg", role: "tablist", children: [
+                /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", role: "tab", "aria-selected": moveMode === "existing", className: "mv-segbtn" + (moveMode === "existing" ? " mv-segbtn-on" : ""), onClick: () => setMoveMode("existing"), children: "\u5DF2\u6709\u5DE5\u4F5C\u533A" }),
+                /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", role: "tab", "aria-selected": moveMode === "new", className: "mv-segbtn" + (moveMode === "new" ? " mv-segbtn-on" : ""), onClick: () => setMoveMode("new"), children: "\u65B0\u5EFA\u76EE\u5F55" })
               ] }),
-              tagDefs.length === 0 ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "dtl-note", children: "\u8FD8\u6CA1\u6709\u6807\u7B7E\uFF0C\u5728\u4E0B\u65B9\u65B0\u5EFA\u7B2C\u4E00\u4E2A\u3002" }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "dsm-taglist", children: tagDefs.map((t) => {
-                const checked = cur.some((id) => String(id) === String(t.id));
-                return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("label", { className: "dsm-tagcheck", children: [
-                  /* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { type: "checkbox", checked, disabled: locked, onChange: () => toggleTagFor(it.sessionId, t.id) }),
-                  /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "dsm-tagcheck-name", title: t.name, children: t.name })
-                ] }, String(t.id));
-              }) }),
-              /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "mv-field", children: [
-                /* @__PURE__ */ (0, import_jsx_runtime.jsx)("label", { className: "mv-field-label", htmlFor: "dsm-tag-attach-" + String(it.sessionId), children: "\u65B0\u5EFA\u6807\u7B7E\u5E76\u8D34\u4E0A" }),
+              moveMode === "existing" ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "mv-field", children: [
+                /* @__PURE__ */ (0, import_jsx_runtime.jsx)("label", { className: "mv-field-label", htmlFor: "mv-target-ws", children: "\u76EE\u6807\u5DE5\u4F5C\u533A" }),
+                /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("select", { id: "mv-target-ws", value: targetWs, onChange: (e) => setTargetWs(e.target.value), children: [
+                  workspaces.length === 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("option", { value: "", children: "\uFF08\u6682\u65E0\u5DE5\u4F5C\u533A\uFF09" }),
+                  workspaces.map((w) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("option", { value: w.workspaceId, children: [
+                    w.title,
+                    " \xB7 ",
+                    w.path
+                  ] }, w.workspaceId))
+                ] })
+              ] }) : /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "mv-field", children: [
+                /* @__PURE__ */ (0, import_jsx_runtime.jsx)("label", { className: "mv-field-label", htmlFor: "mv-new-path", children: "\u65B0\u5DE5\u4F5C\u533A\u76EE\u5F55\u8DEF\u5F84" }),
                 /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "mv-browse-row", children: [
                   /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
                     "input",
                     {
-                      id: "dsm-tag-attach-" + String(it.sessionId),
+                      id: "mv-new-path",
                       type: "text",
-                      value: cardTagName,
-                      disabled: locked,
-                      maxLength: 24,
-                      placeholder: "\u6807\u7B7E\u540D\uFF08\u4E0D\u80FD\u542B\u659C\u6760\uFF0C\u6700\u957F 24 \u5B57\uFF09",
-                      onChange: (e) => setCardTagName(e.target.value),
-                      onKeyDown: (e) => {
-                        if (e.key === "Enter") {
-                          e.preventDefault();
-                          createTagAndAttach(it.sessionId);
-                        }
-                      }
+                      value: newPath,
+                      onChange: (e) => setNewPath(e.target.value),
+                      placeholder: "\u4F8B\u5982 /Users/you/Projects/demo \u6216 ~/demo"
                     }
                   ),
-                  /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", className: "archv-btn", disabled: locked || !cardTagName.trim(), title: locked && !tagsReady ? "\u6807\u7B7E\u6570\u636E\u672A\u80FD\u52A0\u8F7D\uFF0C\u6682\u65F6\u65E0\u6CD5\u65B0\u5EFA\u6807\u7B7E" : "\u65B0\u5EFA\u8FD9\u4E2A\u6807\u7B7E\u5E76\u7ACB\u5373\u8D34\u5230\u5F53\u524D\u4F1A\u8BDD", onClick: () => createTagAndAttach(it.sessionId), children: "\u8D34\u4E0A" })
+                  /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+                    "button",
+                    {
+                      type: "button",
+                      className: "archv-btn",
+                      onClick: pickDirectory,
+                      disabled: busy !== null || picking || !workspacesSvc,
+                      title: !workspacesSvc ? "\u5F53\u524D\u8FD0\u884C\u73AF\u5883\u4E0D\u652F\u6301\u7CFB\u7EDF\u76EE\u5F55\u9009\u62E9" : "\u6253\u5F00\u7CFB\u7EDF\u76EE\u5F55\u9009\u62E9\u7A97\u53E3",
+                      children: picking ? "\u9009\u62E9\u4E2D\u2026" : "\u6D4F\u89C8\u2026"
+                    }
+                  )
                 ] })
               ] }),
-              /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "dtl-note", children: "\u52FE\u9009\u5373\u65F6\u751F\u6548\uFF1B\u5355\u4E2A\u4F1A\u8BDD\u7684\u6807\u7B7E\u6570\u91CF\u4EE5\u670D\u52A1\u7AEF\u4E0A\u9650\u4E3A\u51C6\uFF0C\u8D85\u65F6\u4F1A\u63D0\u793A\u5E76\u56DE\u9000\u3002" })
-            ] });
-          })(),
-          openDetails === it.sessionId && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dtl-sheet", role: "region", "aria-label": "\u4F1A\u8BDD\u8BE6\u60C5", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dtl-sheet-head", children: [
-              /* @__PURE__ */ (0, import_jsx_runtime.jsx)("h3", { className: "dtl-sheet-title", children: "\u4F1A\u8BDD\u8BE6\u60C5" }),
-              /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", className: "mv-sheet-close", "aria-label": "\u5173\u95ED\u8BE6\u60C5", onClick: () => setOpenDetails(null), children: "\xD7" })
+              /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "mv-foot", children: [
+                /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", className: "archv-btn", onClick: () => setOpenMove(null), children: "\u53D6\u6D88" }),
+                /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("button", { type: "button", className: "archv-btn archv-go", disabled: busy !== null, onClick: () => doMove(it), children: [
+                  busy === it.sessionId && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "archv-spin", "aria-hidden": "true" }),
+                  "\u786E\u8BA4\u79FB\u52A8"
+                ] })
+              ] })
             ] }),
-            detailsLoading === it.sessionId ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "archv-skel", "aria-label": "\u52A0\u8F7D\u4E2D", children: [0, 1].map((i) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "archv-skel-card" }, i)) }) : (() => {
-              const d = details[it.sessionId];
-              if (!d) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "dtl-paths", children: "\u6682\u65E0\u8BE6\u60C5" });
-              const st = d.stats || {};
-              const tools = st.toolCounts ? Object.entries(st.toolCounts).sort((a, b) => b[1] - a[1]).slice(0, 10) : [];
-              return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { children: [
-                /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dtl-grid", children: [
-                  /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dtl-cell", children: [
-                    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "dtl-k", children: "\u78C1\u76D8\u5360\u7528" }),
-                    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "dtl-v", children: fmtBytes(d.sizeBytes) || "\u2014" })
+            openTags === it.sessionId && (() => {
+              const cur = Array.isArray(assignments[String(it.sessionId)]) ? assignments[String(it.sessionId)] : [];
+              const locked = tagBusy !== null || !tagsReady;
+              return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "mv-sheet", role: "region", "aria-label": "\u4F1A\u8BDD\u6807\u7B7E", children: [
+                /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "mv-sheet-head", children: [
+                  /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("h3", { className: "mv-sheet-title", children: [
+                    "\u4F1A\u8BDD\u6807\u7B7E \xB7 ",
+                    it.title || shortId(it.sessionId)
                   ] }),
-                  /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dtl-cell", children: [
-                    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "dtl-k", children: "\u8F6E\u6B21 / \u6B65\u9AA4" }),
-                    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", { className: "dtl-v", children: [
-                      st.turns ?? 0,
-                      " / ",
-                      st.steps ?? 0
+                  /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", className: "mv-sheet-close", "aria-label": "\u5173\u95ED", onClick: () => setOpenTags(null), children: "\xD7" })
+                ] }),
+                tagDefs.length === 0 ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "dtl-note", children: "\u8FD8\u6CA1\u6709\u6807\u7B7E\uFF0C\u5728\u4E0B\u65B9\u65B0\u5EFA\u7B2C\u4E00\u4E2A\u3002" }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "dsm-taglist", children: tagDefs.map((t) => {
+                  const checked = cur.some((id) => String(id) === String(t.id));
+                  return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("label", { className: "dsm-tagcheck", children: [
+                    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { type: "checkbox", checked, disabled: locked, onChange: () => toggleTagFor(it.sessionId, t.id) }),
+                    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "dsm-tagcheck-name", title: t.name, children: t.name })
+                  ] }, String(t.id));
+                }) }),
+                /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "mv-field", children: [
+                  /* @__PURE__ */ (0, import_jsx_runtime.jsx)("label", { className: "mv-field-label", htmlFor: "dsm-tag-attach-" + String(it.sessionId), children: "\u65B0\u5EFA\u6807\u7B7E\u5E76\u8D34\u4E0A" }),
+                  /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "mv-browse-row", children: [
+                    /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+                      "input",
+                      {
+                        id: "dsm-tag-attach-" + String(it.sessionId),
+                        type: "text",
+                        value: cardTagName,
+                        disabled: locked,
+                        maxLength: 24,
+                        placeholder: "\u6807\u7B7E\u540D\uFF08\u4E0D\u80FD\u542B\u659C\u6760\uFF0C\u6700\u957F 24 \u5B57\uFF09",
+                        onChange: (e) => setCardTagName(e.target.value),
+                        onKeyDown: (e) => {
+                          if (e.key === "Enter") {
+                            e.preventDefault();
+                            createTagAndAttach(it.sessionId);
+                          }
+                        }
+                      }
+                    ),
+                    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", className: "archv-btn", disabled: locked || !cardTagName.trim(), title: locked && !tagsReady ? "\u6807\u7B7E\u6570\u636E\u672A\u80FD\u52A0\u8F7D\uFF0C\u6682\u65F6\u65E0\u6CD5\u65B0\u5EFA\u6807\u7B7E" : "\u65B0\u5EFA\u8FD9\u4E2A\u6807\u7B7E\u5E76\u7ACB\u5373\u8D34\u5230\u5F53\u524D\u4F1A\u8BDD", onClick: () => createTagAndAttach(it.sessionId), children: "\u8D34\u4E0A" })
+                  ] })
+                ] }),
+                /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "dtl-note", children: "\u52FE\u9009\u5373\u65F6\u751F\u6548\uFF1B\u5355\u4E2A\u4F1A\u8BDD\u7684\u6807\u7B7E\u6570\u91CF\u4EE5\u670D\u52A1\u7AEF\u4E0A\u9650\u4E3A\u51C6\uFF0C\u8D85\u65F6\u4F1A\u63D0\u793A\u5E76\u56DE\u9000\u3002" })
+              ] });
+            })(),
+            openDetails === it.sessionId && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dtl-sheet", role: "region", "aria-label": "\u4F1A\u8BDD\u8BE6\u60C5", children: [
+              /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dtl-sheet-head", children: [
+                /* @__PURE__ */ (0, import_jsx_runtime.jsx)("h3", { className: "dtl-sheet-title", children: "\u4F1A\u8BDD\u8BE6\u60C5" }),
+                /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", className: "mv-sheet-close", "aria-label": "\u5173\u95ED\u8BE6\u60C5", onClick: () => setOpenDetails(null), children: "\xD7" })
+              ] }),
+              detailsLoading === it.sessionId ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "archv-skel", "aria-label": "\u52A0\u8F7D\u4E2D", children: [0, 1].map((i) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "archv-skel-card" }, i)) }) : (() => {
+                const d = details[it.sessionId];
+                if (!d) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "dtl-paths", children: "\u6682\u65E0\u8BE6\u60C5" });
+                const st = d.stats || {};
+                const tools = st.toolCounts ? Object.entries(st.toolCounts).sort((a, b) => b[1] - a[1]).slice(0, 10) : [];
+                return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { children: [
+                  /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dtl-grid", children: [
+                    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dtl-cell", children: [
+                      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "dtl-k", children: "\u78C1\u76D8\u5360\u7528" }),
+                      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "dtl-v", children: fmtBytes(d.sizeBytes) || "\u2014" })
+                    ] }),
+                    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dtl-cell", children: [
+                      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "dtl-k", children: "\u8F6E\u6B21 / \u6B65\u9AA4" }),
+                      /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", { className: "dtl-v", children: [
+                        st.turns ?? 0,
+                        " / ",
+                        st.steps ?? 0
+                      ] })
+                    ] }),
+                    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dtl-cell", children: [
+                      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "dtl-k", children: "\u7528\u6237 / \u52A9\u624B" }),
+                      /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", { className: "dtl-v", children: [
+                        st.userMessages ?? 0,
+                        " / ",
+                        st.assistantMessages ?? 0
+                      ] })
+                    ] }),
+                    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dtl-cell", children: [
+                      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "dtl-k", children: "\u5DE5\u5177\u8C03\u7528" }),
+                      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "dtl-v", children: st.toolCalls ?? 0 })
+                    ] }),
+                    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dtl-cell", children: [
+                      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "dtl-k", children: "\u56FE\u7247\u9644\u4EF6" }),
+                      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "dtl-v", children: st.attachments ?? 0 })
+                    ] }),
+                    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dtl-cell", children: [
+                      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "dtl-k", children: "\u521B\u5EFA / \u66F4\u65B0" }),
+                      /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", { className: "dtl-v", children: [
+                        fmtDate(d.createdAt) || "\u2014",
+                        " \xB7 ",
+                        fmtDate(d.updatedAt) || "\u2014"
+                      ] })
                     ] })
                   ] }),
-                  /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dtl-cell", children: [
-                    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "dtl-k", children: "\u7528\u6237 / \u52A9\u624B" }),
-                    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", { className: "dtl-v", children: [
-                      st.userMessages ?? 0,
-                      " / ",
-                      st.assistantMessages ?? 0
-                    ] })
+                  tools.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dtl-sec", children: [
+                    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "dtl-sec-t", children: "\u5DE5\u5177\u4F7F\u7528" }),
+                    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "dtl-tags", children: tools.map(([t, c]) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", { className: "dtl-tag", children: [
+                      t,
+                      " \xD7",
+                      c
+                    ] }, t)) })
                   ] }),
-                  /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dtl-cell", children: [
-                    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "dtl-k", children: "\u5DE5\u5177\u8C03\u7528" }),
-                    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "dtl-v", children: st.toolCalls ?? 0 })
+                  st.fetches && st.fetches.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dtl-sec", children: [
+                    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "dtl-sec-t", children: "\u641C\u7D22 / \u6293\u53D6" }),
+                    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("ul", { className: "dtl-list", children: st.fetches.map((f, i) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("li", { children: [
+                      f.tool,
+                      f.query ? ` \u300C${f.query}\u300D` : ""
+                    ] }, i)) })
                   ] }),
-                  /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dtl-cell", children: [
-                    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "dtl-k", children: "\u56FE\u7247\u9644\u4EF6" }),
-                    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "dtl-v", children: st.attachments ?? 0 })
+                  d.files && d.files.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dtl-sec", children: [
+                    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dtl-sec-t", children: [
+                      "\u5199\u8FC7\u7684\u6587\u4EF6\uFF08",
+                      d.files.length,
+                      "\uFF09"
+                    ] }),
+                    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("ul", { className: "dtl-list", children: d.files.map((f, i) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("li", { children: [
+                      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("code", { children: f.path }),
+                      " ",
+                      /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", { className: "dtl-filetool", children: [
+                        "(",
+                        f.tool,
+                        ")"
+                      ] })
+                    ] }, i)) })
                   ] }),
-                  /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dtl-cell", children: [
-                    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "dtl-k", children: "\u521B\u5EFA / \u66F4\u65B0" }),
-                    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", { className: "dtl-v", children: [
-                      fmtDate(d.createdAt) || "\u2014",
-                      " \xB7 ",
-                      fmtDate(d.updatedAt) || "\u2014"
+                  d.lineage && (d.lineage.parentSessionId || d.lineage.children && d.lineage.children.length > 0 || d.lineage.subagents && d.lineage.subagents.length > 0) && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dtl-sec", children: [
+                    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "dtl-sec-t", children: "\u8840\u7F18" }),
+                    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dtl-paths", children: [
+                      d.lineage.parentSessionId && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { children: [
+                        "\u7236\u4F1A\u8BDD: ",
+                        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("code", { children: d.lineage.parentSessionId })
+                      ] }),
+                      d.lineage.children && d.lineage.children.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { children: [
+                        "\u5B50\u4F1A\u8BDD (",
+                        d.lineage.children.length,
+                        "): ",
+                        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("code", { children: d.lineage.children.join(", ") })
+                      ] }),
+                      d.lineage.subagents && d.lineage.subagents.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { children: [
+                        "\u5B50\u4EE3\u7406 (",
+                        d.lineage.subagents.length,
+                        "): ",
+                        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("code", { children: d.lineage.subagents.join(", ") })
+                      ] })
                     ] })
-                  ] })
-                ] }),
-                tools.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dtl-sec", children: [
-                  /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "dtl-sec-t", children: "\u5DE5\u5177\u4F7F\u7528" }),
-                  /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "dtl-tags", children: tools.map(([t, c]) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", { className: "dtl-tag", children: [
-                    t,
-                    " \xD7",
-                    c
-                  ] }, t)) })
-                ] }),
-                st.fetches && st.fetches.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dtl-sec", children: [
-                  /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "dtl-sec-t", children: "\u641C\u7D22 / \u6293\u53D6" }),
-                  /* @__PURE__ */ (0, import_jsx_runtime.jsx)("ul", { className: "dtl-list", children: st.fetches.map((f, i) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("li", { children: [
-                    f.tool,
-                    f.query ? ` \u300C${f.query}\u300D` : ""
-                  ] }, i)) })
-                ] }),
-                d.files && d.files.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dtl-sec", children: [
-                  /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dtl-sec-t", children: [
-                    "\u5199\u8FC7\u7684\u6587\u4EF6\uFF08",
-                    d.files.length,
-                    "\uFF09"
                   ] }),
-                  /* @__PURE__ */ (0, import_jsx_runtime.jsx)("ul", { className: "dtl-list", children: d.files.map((f, i) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("li", { children: [
-                    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("code", { children: f.path }),
-                    " ",
-                    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", { className: "dtl-filetool", children: [
-                      "(",
-                      f.tool,
-                      ")"
-                    ] })
-                  ] }, i)) })
-                ] }),
-                d.lineage && (d.lineage.parentSessionId || d.lineage.children && d.lineage.children.length > 0 || d.lineage.subagents && d.lineage.subagents.length > 0) && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dtl-sec", children: [
-                  /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "dtl-sec-t", children: "\u8840\u7F18" }),
-                  /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dtl-paths", children: [
-                    d.lineage.parentSessionId && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { children: [
-                      "\u7236\u4F1A\u8BDD: ",
-                      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("code", { children: d.lineage.parentSessionId })
-                    ] }),
-                    d.lineage.children && d.lineage.children.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { children: [
-                      "\u5B50\u4F1A\u8BDD (",
-                      d.lineage.children.length,
-                      "): ",
-                      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("code", { children: d.lineage.children.join(", ") })
+                  /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dtl-sec", children: [
+                    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "dtl-sec-t", children: "\u5BFC\u51FA" }),
+                    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dtl-export", children: [
+                      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+                        "a",
+                        {
+                          className: "archv-btn",
+                          href: `/api/session.export?sessionId=${encodeURIComponent(it.sessionId)}&includeDescendants=true`,
+                          onClick: (e) => e.stopPropagation(),
+                          style: zipOk ? void 0 : { pointerEvents: "none", opacity: 0.45 },
+                          title: zipOk ? "\u542B\u5B50\u4F1A\u8BDD\u4E0E\u9644\u4EF6\uFF0C\u7531 DSH \u63D0\u4F9B" : "\u5F53\u524D\u6301\u4E45\u5316\u540E\u7AEF\u4E0D\u652F\u6301\u539F\u59CB\u65E5\u5FD7\u5BFC\u51FA",
+                          children: "\u4E0B\u8F7D\u539F\u59CB\u65E5\u5FD7 (ZIP)"
+                        }
+                      ),
+                      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", className: "archv-btn", disabled: mdBusy === it.sessionId, onClick: () => exportMarkdown(it), children: mdBusy === it.sessionId ? "\u751F\u6210\u4E2D\u2026" : "\u5BFC\u51FA Markdown" })
                     ] }),
-                    d.lineage.subagents && d.lineage.subagents.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { children: [
-                      "\u5B50\u4EE3\u7406 (",
-                      d.lineage.subagents.length,
-                      "): ",
-                      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("code", { children: d.lineage.subagents.join(", ") })
-                    ] })
+                    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "dtl-note", children: "ZIP \u542B\u5B50\u4F1A\u8BDD\u4E0E\u9644\u4EF6\uFF0C\u7531 DSH \u63D0\u4F9B \xB7 Markdown \u4E3A\u672C\u63D2\u4EF6\u751F\u6210\u7684\u53EF\u8BFB\u5BF9\u8BDD\u8BB0\u5F55" })
                   ] })
-                ] }),
-                /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dtl-sec", children: [
-                  /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "dtl-sec-t", children: "\u5BFC\u51FA" }),
-                  /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dtl-export", children: [
-                    /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-                      "a",
-                      {
-                        className: "archv-btn",
-                        href: `/api/session.export?sessionId=${encodeURIComponent(it.sessionId)}&includeDescendants=true`,
-                        onClick: (e) => e.stopPropagation(),
-                        style: zipOk ? void 0 : { pointerEvents: "none", opacity: 0.45 },
-                        title: zipOk ? "\u542B\u5B50\u4F1A\u8BDD\u4E0E\u9644\u4EF6\uFF0C\u7531 DSH \u63D0\u4F9B" : "\u5F53\u524D\u6301\u4E45\u5316\u540E\u7AEF\u4E0D\u652F\u6301\u539F\u59CB\u65E5\u5FD7\u5BFC\u51FA",
-                        children: "\u4E0B\u8F7D\u539F\u59CB\u65E5\u5FD7 (ZIP)"
-                      }
-                    ),
-                    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", className: "archv-btn", disabled: mdBusy === it.sessionId, onClick: () => exportMarkdown(it), children: mdBusy === it.sessionId ? "\u751F\u6210\u4E2D\u2026" : "\u5BFC\u51FA Markdown" })
-                  ] }),
-                  /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "dtl-note", children: "ZIP \u542B\u5B50\u4F1A\u8BDD\u4E0E\u9644\u4EF6\uFF0C\u7531 DSH \u63D0\u4F9B \xB7 Markdown \u4E3A\u672C\u63D2\u4EF6\u751F\u6210\u7684\u53EF\u8BFB\u5BF9\u8BDD\u8BB0\u5F55" })
-                ] })
-              ] });
-            })()
-          ] })
-        ] }, it.sessionId);
-      }) }) : null
+                ] });
+              })()
+            ] })
+          ] }, it.sessionId);
+        }),
+        groupByLineage && orphanSubagents.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "archv-card dsm-orphan-card", role: "listitem", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "archv-row", children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "archv-body", children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "archv-main", children: [
+            /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "archv-titlerow", children: [
+              /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(
+                "button",
+                {
+                  type: "button",
+                  className: "dsm-kids-toggle",
+                  "aria-expanded": orphanOpen,
+                  title: (orphanOpen ? "\u6536\u8D77 " : "\u5C55\u5F00 ") + orphanSubagents.length + " \u4E2A\u672A\u5F52\u5C5E\u7684\u5B50\u4EE3\u7406\u4F1A\u8BDD",
+                  onClick: () => setOpenOrphans(!openOrphans),
+                  children: [
+                    orphanOpen ? "\u25BE" : "\u25B8",
+                    " ",
+                    orphanSubagents.length,
+                    " \u5B50\u4EE3\u7406"
+                  ]
+                }
+              ),
+              /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "archv-name", children: "\u672A\u5F52\u5C5E\u7684\u5B50\u4EE3\u7406\u4F1A\u8BDD" })
+            ] }),
+            /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "archv-meta", children: [
+              /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "archv-wtag archv-wgone", children: "\u7236\u4F1A\u8BDD\u4E0D\u5728\u5F53\u524D\u5217\u8868" }),
+              /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "archv-dot", children: "\xB7" }),
+              /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "archv-date", children: "\u4E0D\u518D\u6DF7\u8FDB\u4E0A\u9762\u7684\u4F1A\u8BDD\u5217\u8868\uFF1B\u5C55\u5F00\u540E\u53EF\u6253\u5F00 / \u5F52\u6863 / \u5220\u9664" })
+            ] })
+          ] }) }) }),
+          orphanOpen && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "dsm-kids", "aria-label": "\u672A\u5F52\u5C5E\u5B50\u4EE3\u7406\u4F1A\u8BDD", children: orphanSubagents.map((k) => {
+            const li = lineage[String(k.sessionId)];
+            return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "dsm-kid", children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dsm-kid-row", children: [
+              /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "dsm-kid-name", title: k.title || k.sessionId, children: k.title || "(\u65E0\u6807\u9898)" }),
+              emptyBadge(k.sessionId),
+              tagChips(k.sessionId),
+              /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", { className: "dsm-kid-meta", children: [
+                k.archived ? "\u5DF2\u5F52\u6863" : "\u6D3B\u52A8",
+                fmtDate(k.createdAt) ? ` \xB7 ${fmtDate(k.createdAt)}` : ""
+              ] }),
+              /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", { className: "dsm-kid-acts", children: [
+                /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", className: "archv-btn", disabled: busy !== null, title: "\u5207\u6362\u5230\u8FD9\u4E2A\u5B50\u4EE3\u7406\u4F1A\u8BDD\uFF08\u8BBE\u7F6E\u9762\u677F\u6321\u7740\u4F1A\u8BDD\u533A\uFF0C\u5173\u6389\u5373\u53EF\u770B\u5230\uFF09", onClick: async () => {
+                  const name = k.title || String(k.sessionId).slice(0, 8) + "\u2026";
+                  const res = await dsmOpenSessionById(k.sessionId, li && li.parentSession || null);
+                  const msg = openSubagentToast(res, name, "panel");
+                  showToast(msg.text, msg.kind);
+                }, children: "\u6253\u5F00" }),
+                /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", className: "archv-btn", disabled: busy !== null, onClick: () => act(k.archived ? "restore" : "archive", k), children: k.archived ? "\u6062\u590D" : "\u5F52\u6863" }),
+                /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", className: "archv-btn archv-del", disabled: busy !== null, title: "\u79FB\u5165\u56DE\u6536\u7AD9\uFF0C\u53EF\u5728\u56DE\u6536\u7AD9\u6062\u590D", onClick: () => setDelTarget(k), children: "\u5220\u9664" })
+              ] })
+            ] }) }, k.sessionId);
+          }) })
+        ] })
+      ] }) : null
     ] }),
     toast && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "archv-status" + (toast.kind === "err" ? " archv-status-err" : "") + (String(toast.msg).length > 28 ? " archv-status-long" : ""), role: "status", title: "\u70B9\u51FB\u5173\u95ED", onClick: () => setToast(null), children: toast.msg }),
     delTarget && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "dlg-backdrop", onClick: () => setDelTarget(null), children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { ref: dialogRef, className: "dlg", role: "alertdialog", "aria-modal": "true", "aria-label": "\u5220\u9664\u4F1A\u8BDD", onClick: (e) => e.stopPropagation(), children: [
@@ -2728,6 +2859,14 @@ function SessionPanel({ workspacesSvc }) {
         delTarget.title || delTarget.sessionId,
         "\u300D\uFF1F\u5C06\u79FB\u5165\u56DE\u6536\u7AD9\uFF0C\u53EF\u5728\u672C\u9875\u5E95\u90E8\u300C\u56DE\u6536\u7AD9\u300D\u4E2D\u6062\u590D\u6216\u5F7B\u5E95\u5220\u9664\u3002"
       ] }),
+      delCascadeCount > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("label", { className: "dlg-check", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { type: "checkbox", checked: cascadeSub, disabled: busy !== null, onChange: (e) => setCascadeSub(e.target.checked) }),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", { children: [
+          "\u540C\u65F6\u5220\u9664\u5B83\u7684 ",
+          delCascadeCount,
+          " \u4E2A\u5B50\u4EE3\u7406\u4F1A\u8BDD\uFF08\u5B50\u4EE3\u7406\u751F\u547D\u5468\u671F\u8DDF\u968F\u7236\u4F1A\u8BDD\uFF09\u3002\u53D6\u6D88\u52FE\u9009\u5219\u4FDD\u7559\uFF0C\u5B83\u4EEC\u4F1A\u6536\u8FDB\u300C\u672A\u5F52\u5C5E\u7684\u5B50\u4EE3\u7406\u4F1A\u8BDD\u300D\u5361\u7247\uFF0C\u4ECD\u53EF\u5355\u72EC\u5904\u7406\u3002"
+        ] })
+      ] }),
       /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dlg-actions", children: [
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", className: "archv-btn", disabled: busy !== null, onClick: () => setDelTarget(null), children: "\u53D6\u6D88" }),
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", className: "archv-btn archv-del", disabled: busy !== null, onClick: doDeleteConfirmed, children: "\u79FB\u5165\u56DE\u6536\u7AD9" })
@@ -2933,6 +3072,7 @@ function dsmToggleManual(id) {
   if (dsmRepaintDots) dsmRepaintDots();
 }
 var dsmTrashIds = null;
+var dsmTrashCountByCwd = null;
 var dsmServerPurgedIds = /* @__PURE__ */ new Set();
 var dsmAuthoritativeTitles = /* @__PURE__ */ new Map();
 var dsmTrashTick = 0;
@@ -3008,6 +3148,7 @@ async function dsmLoadTrashIds() {
   try {
     const r = await postJSON("/archived-sessions/sidebar-state", {});
     dsmTrashIds = new Set((r && r.trashedSessionIds || []).map(String));
+    dsmTrashCountByCwd = r && r.trashedCountByCwd && typeof r.trashedCountByCwd === "object" ? new Map(Object.entries(r.trashedCountByCwd).map(([k, v]) => [String(k), Number(v) || 0])) : null;
     dsmServerPurgedIds = new Set((r && r.purgedSessionIds || []).map(String));
     for (const id of [...dsmPendingPurged]) {
       if (dsmServerPurgedIds.has(id)) dsmPendingPurged.delete(id);
@@ -3489,6 +3630,44 @@ function installSidebarStatusDots() {
     }
     return true;
   };
+  const groupSessionRows = (scope, btn) => {
+    const out = [];
+    if (!scope || !scope.children) return out;
+    for (const el of scope.children) {
+      if (el === btn || !el.getAttribute) continue;
+      const k = el.getAttribute("data-row-key") || "";
+      if (el.getAttribute("role") === "treeitem" && k.startsWith("session:")) out.push(el);
+    }
+    if (out.length) return out;
+    let rows = null;
+    try {
+      rows = scope.querySelectorAll('[role="treeitem"][data-row-key^="session:"]');
+    } catch (e) {
+      return out;
+    }
+    for (const el of rows) {
+      let owner = el.parentElement;
+      let ok = true;
+      while (owner && owner !== scope) {
+        if (owner.getAttribute && owner.getAttribute("role") === "group") {
+          ok = false;
+          break;
+        }
+        owner = owner.parentElement;
+      }
+      if (ok) out.push(el);
+    }
+    return out;
+  };
+  const groupContainerOf = (row) => {
+    let el = row ? row.parentElement : null;
+    for (let depth = 0; el && depth < 4; depth++) {
+      if (typeof el.getAttribute !== "function") return null;
+      if (!el.getAttribute("role")) return el;
+      el = el.parentElement;
+    }
+    return null;
+  };
   function dsmSyncEmptyGroups(purgedNow) {
     let rows = null;
     try {
@@ -3509,14 +3688,10 @@ function installSidebarStatusDots() {
     };
     rows.forEach((row) => {
       try {
-        const scope = row.parentElement;
+        const scope = groupContainerOf(row);
         if (!scope || scope === document.body) return;
-        if (typeof scope.getAttribute !== "function" || scope.getAttribute("role")) return;
         let rendered = 0;
-        for (const el of scope.children) {
-          if (el === row || !el.getAttribute) continue;
-          if (el.getAttribute("role") !== "treeitem") continue;
-          if (!(el.getAttribute("data-row-key") || "").startsWith("session:")) continue;
+        for (const el of groupSessionRows(scope, row)) {
           if (el.hasAttribute(DSM_HIDDEN_ATTR)) continue;
           rendered++;
         }
@@ -3542,12 +3717,10 @@ function installSidebarStatusDots() {
     let n = 0;
     let firstKey = "";
     let lastKey = "";
-    for (const el of scope.children) {
-      if (el === btn || !el.getAttribute) continue;
-      const k = el.getAttribute("data-row-key") || "";
-      if (!k.startsWith("session:")) continue;
+    for (const el of groupSessionRows(scope, btn)) {
       if (el.hasAttribute(DSM_HIDDEN_ATTR)) continue;
       n++;
+      const k = el.getAttribute("data-row-key") || "";
       if (!firstKey) firstKey = k;
       lastKey = k;
     }
@@ -3568,13 +3741,21 @@ function installSidebarStatusDots() {
         const sig = overflowSignature(scope, btn, purgedNow);
         if (OVERFLOW_SIGS.get(btn) === sig) return;
         const key = (btn.getAttribute("data-row-key") || "").slice("overflow:".length);
+        const wsKey = "workspace:" + key;
         let wsRow = null;
         for (const el of scope.children) {
-          if (el.getAttribute && el.getAttribute("data-row-key") === "workspace:" + key) {
+          if (el.getAttribute && el.getAttribute("data-row-key") === wsKey) {
             wsRow = el;
             break;
           }
         }
+        if (!wsRow) {
+          try {
+            wsRow = scope.querySelector('[data-row-key="' + wsKey.replace(/"/g, '\\"') + '"]');
+          } catch (e) {
+            wsRow = null;
+          }
+        }
         const group = wsRow ? sidebarAdapter.recognizeGroupQuiet(wsRow) : null;
         const nodes = group && Array.isArray(group.sessions) ? group.sessions : null;
         if (!nodes) {
@@ -3582,8 +3763,10 @@ function installSidebarStatusDots() {
           OVERFLOW_SIGS.set(btn, overflowSignature(scope, btn, purgedNow));
           return;
         }
+        const groupCount = group && typeof group.sessionCount === "number" ? group.sessionCount : null;
+        const collapsed = !nodes.length && groupCount != null && groupCount > 0;
         const ids = /* @__PURE__ */ new Set();
-        for (const node of nodes) {
+        for (const node of nodes && nodes.length ? nodes : []) {
           if (!node || node.blank) continue;
           const id = node.id != null ? String(node.id) : "";
           if (!id) continue;
@@ -3593,18 +3776,34 @@ function installSidebarStatusDots() {
           ids.add(id);
         }
         const rendered = [];
-        for (const el of scope.children) {
-          if (el === btn || !el.getAttribute) continue;
-          if (el.getAttribute("role") !== "treeitem") continue;
+        for (const el of groupSessionRows(scope, btn)) {
           const k = el.getAttribute("data-row-key") || "";
-          if (!k.startsWith("session:")) continue;
           rendered.push({ id: k.slice("session:".length), pluginHidden: el.hasAttribute(DSM_HIDDEN_ATTR) });
         }
-        if (!nodes.length || !ids.size && rendered.length) {
+        if (!nodes.length && !collapsed) {
+          restoreOverflowButton(btn);
+          OVERFLOW_SIGS.set(btn, overflowSignature(scope, btn, purgedNow));
+          return;
+        }
+        if (!ids.size && rendered.length) {
           restoreOverflowButton(btn);
           OVERFLOW_SIGS.set(btn, overflowSignature(scope, btn, purgedNow));
           return;
         }
+        if (collapsed) {
+          const wsCwd = group && typeof group.cwd === "string" ? group.cwd : null;
+          const trashInGroup = wsCwd != null && dsmTrashCountByCwd ? dsmTrashCountByCwd.get(wsCwd) || 0 : null;
+          const visibleTotal = collapsedVisibleTotal(groupCount, trashInGroup);
+          if (visibleTotal == null) {
+            restoreOverflowButton(btn);
+            OVERFLOW_SIGS.set(btn, overflowSignature(scope, btn, purgedNow));
+            return;
+          }
+          const more2 = remainingRows(visibleTotal, 0);
+          applyOverflowPlan(btn, more2, "\u6298\u53E0 \u603B\u6570 " + groupCount + " / \u56DE\u6536\u7AD9 " + trashInGroup);
+          OVERFLOW_SIGS.set(btn, overflowSignature(scope, btn, purgedNow));
+          return;
+        }
         const renderedVisible = countRenderedVisible(rendered, ids);
         const more = remainingRows(ids.size, renderedVisible);
         applyOverflowPlan(btn, more, "\u53EF\u89C1 " + ids.size + " / \u5DF2\u6E32\u67D3 " + renderedVisible);