From 3c5220b8a73e872a3de940764056d04a51179115 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 00:22:17 +0000
Subject: [PATCH 001/143] Side pane: find tabs by id without building CSS
 selectors

Code viewer tab ids carry the file path. On Windows the backslashes are
read as CSS escapes, so the selector never matched and keyboard focus
fell to <body> after cycling to, closing, or leaving the menu of such a
tab; a path containing a quote made the selector throw and the mount fail.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_016hW799u5Ji5k9khDAwu688
---
 .../side-pane/side-pane-controller.js         |  3 +-
 .../side-pane/side-pane-tab-strip.js          |  6 +-
 .../side-pane/side-pane-tab-utils.js          | 13 ++++
 tests/side-pane-tab-id-lookup.test.mjs        | 70 +++++++++++++++++++
 4 files changed, 88 insertions(+), 4 deletions(-)
 create mode 100644 tests/side-pane-tab-id-lookup.test.mjs

diff --git a/modules/ui-system/side-pane/side-pane-controller.js b/modules/ui-system/side-pane/side-pane-controller.js
index d90d60ad6..35dcb3306 100644
--- a/modules/ui-system/side-pane/side-pane-controller.js
+++ b/modules/ui-system/side-pane/side-pane-controller.js
@@ -15,6 +15,7 @@ import { createSidePaneShortcuts } from './side-pane-shortcuts.js';
 import { createSidePaneLayoutStore, parseLayout, rememberBounded, serializeLayout } from './side-pane-persistence.js';
 import { createSidePaneRootScope, createTabOccurrence } from './side-pane-occurrence.js';
 import { selectDormantViews } from './side-pane-dormancy.js';
+import { findByTabId } from './side-pane-tab-utils.js';
 
 /** @typedef {import('./side-pane-types.js').SidePaneTab} SidePaneTab */
 /** @typedef {import('./side-pane-types.js').SidePaneTabType} SidePaneTabType */
@@ -477,7 +478,7 @@ export function createSidePaneController({
 
         const pending = { promise: null, viewElement: null, canceled: false, onClosed };
         const mounting = (async () => {
-            let view = contentContainer?.querySelector(`[data-tab-id="${tabId}"]`);
+            let view = findByTabId(contentContainer, tabId);
             if (!view && contentContainer) {
                 view = doc.createElement('section');
                 view.className = 'side-pane-view';
diff --git a/modules/ui-system/side-pane/side-pane-tab-strip.js b/modules/ui-system/side-pane/side-pane-tab-strip.js
index 964f5fe82..0721a4ad1 100644
--- a/modules/ui-system/side-pane/side-pane-tab-strip.js
+++ b/modules/ui-system/side-pane/side-pane-tab-strip.js
@@ -2,7 +2,7 @@
 'use strict';
 
 import { createTabSortable } from './side-pane-tab-dnd.js';
-import { getTabIconName, resolveTabsOverflow } from './side-pane-tab-utils.js';
+import { findByTabId, getTabIconName, resolveTabsOverflow } from './side-pane-tab-utils.js';
 
 // 标签标题悬停提示、面板切换动画、可拖拽排序的标签
 const TAB_TOOLTIP_DELAY_MS = 1500;
@@ -133,7 +133,7 @@ export function createSidePaneTabStrip({
     function syncStatus() {
         const current = statusTabId ? getStatus() : null;
         if (!current) return;
-        const btn = tabListElement.querySelector(`.side-pane-tab[data-tab-id="${statusTabId}"]`);
+        const btn = findByTabId(tabListElement, statusTabId, '.side-pane-tab[data-tab-id]');
         const dot = btn?.querySelector('.side-pane-tab-status');
         if (!dot) return;
         const { status = 'unknown', text = '' } = current;
@@ -294,7 +294,7 @@ export function createSidePaneTabStrip({
         syncStatus,
         hideTooltip,
         focusTab(tabId) {
-            tabListElement.querySelector(`[role="tab"][data-tab-id="${tabId}"]`)?.focus?.();
+            findByTabId(tabListElement, tabId, '[role="tab"][data-tab-id]')?.focus?.();
         },
         dispose() {
             disposed = true;
diff --git a/modules/ui-system/side-pane/side-pane-tab-utils.js b/modules/ui-system/side-pane/side-pane-tab-utils.js
index 0da0acbcd..0c908b81c 100644
--- a/modules/ui-system/side-pane/side-pane-tab-utils.js
+++ b/modules/ui-system/side-pane/side-pane-tab-utils.js
@@ -145,3 +145,16 @@ export function moveIdBefore(ids, activeId, overId) {
     next.splice(to, 0, activeId);
     return next;
 }
+
+/**
+ * 按 data-tab-id 找元素。标签 id 里可能有 Windows 路径的反斜杠或引号（code-viewer:C:\proj\a.js），
+ * 拼进属性选择器会匹配不到甚至抛 SyntaxError，所以逐个比对属性值。
+ */
+export function findByTabId(container, tabId, selector = '[data-tab-id]') {
+    if (!container || tabId == null) return null;
+    const want = String(tabId);
+    for (const el of container.querySelectorAll(selector)) {
+        if (el.getAttribute('data-tab-id') === want) return el;
+    }
+    return null;
+}
diff --git a/tests/side-pane-tab-id-lookup.test.mjs b/tests/side-pane-tab-id-lookup.test.mjs
new file mode 100644
index 000000000..080a54146
--- /dev/null
+++ b/tests/side-pane-tab-id-lookup.test.mjs
@@ -0,0 +1,70 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { JSDOM } from 'jsdom';
+import { createSidePaneController } from '../modules/ui-system/side-pane/side-pane-controller.js';
+import { findByTabId } from '../modules/ui-system/side-pane/side-pane-tab-utils.js';
+
+// 代码查看器的标签 id 是 code-viewer:<文件路径>，Windows 路径带反斜杠，类 Unix 路径可以带引号
+const WINDOWS_ID = 'code-viewer:C:\\Users\\roxy\\proj\\a.js';
+const QUOTED_ID = 'code-viewer:/tmp/we"ird.js';
+
+function createPaneDom() {
+    const dom = new JSDOM(`
+        <div class="main-content"></div>
+        <div class="resizer" id="resizerRight"></div>
+        <aside id="vcpSidePane" class="vcp-side-pane">
+            <header class="side-pane-tab-bar"><div class="side-pane-tabs"></div></header>
+            <div class="side-pane-content-container"></div>
+        </aside>
+    `, { pretendToBeVisual: true });
+    const doc = dom.window.document;
+    const root = doc.getElementById('vcpSidePane');
+    return {
+        dom,
+        doc,
+        root,
+        options: {
+            root,
+            resizerHandle: doc.getElementById('resizerRight'),
+            tabListElement: root.querySelector('.side-pane-tabs'),
+            contentContainer: root.querySelector('.side-pane-content-container')
+        }
+    };
+}
+
+test('findByTabId matches ids with backslashes and quotes literally', () => {
+    const { dom, doc } = createPaneDom();
+    for (const id of [WINDOWS_ID, QUOTED_ID]) {
+        const el = doc.createElement('button');
+        el.setAttribute('data-tab-id', id);
+        doc.body.append(el);
+        assert.equal(findByTabId(doc.body, id), el);
+    }
+    assert.equal(findByTabId(doc.body, 'code-viewer:C:Usersroxyproja.js'), null);
+    dom.window.close();
+});
+
+for (const id of [WINDOWS_ID, QUOTED_ID]) {
+    test(`a tab whose id is ${JSON.stringify(id)} mounts and takes keyboard focus when cycled to`, async () => {
+        const { dom, doc, root, options } = createPaneDom();
+        const controller = createSidePaneController({
+            ...options,
+            providers: {
+                probe: { mountTab(tab, view) { view.textContent = tab.title; return { focus() {}, dispose() {} }; } }
+            }
+        });
+        try {
+            await controller.openTab({ id: 'other', kind: 'probe', title: 'Other', closable: true, scopeMode: 'global' });
+            await controller.openTab({ id, kind: 'probe', title: 'a.js', closable: true, scopeMode: 'global' });
+            assert.equal(findByTabId(root.querySelector('.side-pane-content-container'), id)?.textContent, 'a.js');
+
+            controller.activateTab('other');
+            controller.cycleTab(1);
+            assert.equal(controller.getSnapshot().activeTabId, id);
+            assert.equal(doc.activeElement?.getAttribute('data-tab-id'), id, 'focus lands on the tab, not on <body>');
+        } finally {
+            await controller.dispose();
+            dom.window.close();
+        }
+    });
+}

From 2200d12803ea515c9badd8727602ab052cfadaca Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 00:22:28 +0000
Subject: [PATCH 002/143] UI system gate: scope the tool presentation styles
 and drop the stray literal colour

check:ui-system was red on the side pane branch. tool-presentation.css had
101 selectors outside .vcp-ui-scope, an !important on the reduced-motion
rule and two fixed 11px sizes; components.css (from upstream #234) fell back
to a hard-coded indigo because --vcp-ui-primary is not a token.

Every tool presentation selector now sits under .vcp-ui-scope (the chat
messages container already carries it, and the file is alone in its layer,
so the uniform specificity bump changes no cascade). The reduced-motion rule
reuses the shimmer selector instead of !important, the 11px sizes use
--vcp-ui-text-xs, and the pinned window button uses the accent token.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01UCGGgmHsCToooXTgSXpmq9
---
 styles/ui-system/components.css        |   4 +-
 styles/ui-system/tool-presentation.css | 196 ++++++++++++-------------
 2 files changed, 100 insertions(+), 100 deletions(-)

diff --git a/styles/ui-system/components.css b/styles/ui-system/components.css
index 418b7df8b..ddff52098 100644
--- a/styles/ui-system/components.css
+++ b/styles/ui-system/components.css
@@ -541,8 +541,8 @@
     }
 
     :is(html, html.vcp-global-settings-host) .vcp-ui-scope .vcp-ui-window-control-pin.is-pinned {
-        color: var(--vcp-ui-primary, #6366f1);
-        background: var(--vcp-ui-primary-bg, rgba(99, 102, 241, 0.16));
+        color: var(--vcp-ui-accent);
+        background: color-mix(in srgb, var(--vcp-ui-accent) 16%, transparent);
     }
 
     :is(html, html.vcp-global-settings-host) .vcp-ui-scope .vcp-ui-window-control-pin.is-pinned .vcp-ui-icon,
diff --git a/styles/ui-system/tool-presentation.css b/styles/ui-system/tool-presentation.css
index 436a2e39c..be8a90316 100644
--- a/styles/ui-system/tool-presentation.css
+++ b/styles/ui-system/tool-presentation.css
@@ -1,12 +1,12 @@
 /* Optional presentation; Legacy is untouched. Theme and typography stay owned
  * by the existing appearance profile, including role wallpapers. */
-html[data-ui-mode="next"] [data-vcp-tool-presentation="compact"],
-html[data-ui-mode="next"] [data-vcp-tool-presentation="grouped"] {
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="compact"],
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="grouped"] {
     --vcp-tool-row-height: 38px;
 }
-html[data-ui-mode="next"][data-vcp-density="compact"] [data-vcp-tool-presentation] { --vcp-tool-row-height: 32px; }
-html[data-ui-mode="next"][data-vcp-density="relaxed"] [data-vcp-tool-presentation] { --vcp-tool-row-height: 44px; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented {
+html[data-ui-mode="next"][data-vcp-density="compact"] .vcp-ui-scope [data-vcp-tool-presentation] { --vcp-tool-row-height: 32px; }
+html[data-ui-mode="next"][data-vcp-density="relaxed"] .vcp-ui-scope [data-vcp-tool-presentation] { --vcp-tool-row-height: 44px; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented {
     --vcp-tool-presented-font-family: var(--vcp-tool-card-font-family, var(--vcp-chat-font-family));
     --vcp-tool-presented-font-size: var(--vcp-ui-text-caption, 13px);
     --vcp-tool-presented-white-space: normal;
@@ -32,11 +32,11 @@ html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented {
     color: var(--vcp-ui-text-primary);
     font-family: var(--vcp-tool-card-font-family, inherit);
 }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented::before,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented::after { display: none; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-summary,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-result-header,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-call-summary-header {
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented::before,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented::after { display: none; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-summary,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-result-header,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-call-summary-header {
     display: flex;
     gap: 5px;
     padding: 0;
@@ -47,7 +47,7 @@ html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vc
     min-width: 0;
     flex-wrap: nowrap;
 }
-html[data-ui-mode="next"] .vcp-tool-row-toggle, html[data-ui-mode="next"] .vcp-tool-process-toggle {
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-toggle, html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-toggle {
     display: flex;
     width: 100%;
     min-width: 0;
@@ -65,13 +65,13 @@ html[data-ui-mode="next"] .vcp-tool-row-toggle, html[data-ui-mode="next"] .vcp-t
     cursor: pointer;
     text-align: left;
 }
-html[data-ui-mode="next"] .vcp-tool-result-header > .vcp-tool-row-toggle {
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-result-header > .vcp-tool-row-toggle {
     width: auto;
     flex: 1;
 }
-html[data-ui-mode="next"] .vcp-tool-row-toggle:hover, html[data-ui-mode="next"] .vcp-tool-process-toggle:hover { background: var(--vcp-ui-bg-2); }
-html[data-ui-mode="next"] .vcp-tool-row-toggle:focus-visible, html[data-ui-mode="next"] .vcp-tool-process-toggle:focus-visible, html[data-ui-mode="next"] .vcp-tool-process-artifact:focus-visible { outline: 2px solid var(--vcp-ui-accent); outline-offset: -2px; }
-html[data-ui-mode="next"] .vcp-tool-row-chevron {
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-toggle:hover, html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-toggle:hover { background: var(--vcp-ui-bg-2); }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-toggle:focus-visible, html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-toggle:focus-visible, html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-artifact:focus-visible { outline: 2px solid var(--vcp-ui-accent); outline-offset: -2px; }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-chevron {
     width: 7px;
     height: 7px;
     flex: 0 0 7px;
@@ -79,44 +79,44 @@ html[data-ui-mode="next"] .vcp-tool-row-chevron {
     border-bottom: 1.5px solid currentColor;
     transform: rotate(-45deg);
 }
-html[data-ui-mode="next"] [aria-expanded="true"] > .vcp-tool-row-chevron { transform: rotate(45deg); }
-html[data-ui-mode="next"] .vcp-tool-row-title { overflow-wrap: anywhere; min-width: 0; color: var(--vcp-ui-text-primary); }
-html[data-ui-mode="next"] .vcp-tool-row-resource { overflow-wrap: anywhere; min-width: 0; font-size: var(--vcp-ui-text-sm, 12px); }
-html[data-ui-mode="next"] .vcp-tool-row-state { margin-left: auto; white-space: nowrap; font-size: var(--vcp-ui-text-sm, 12px); }
-html[data-ui-mode="next"] [data-vcp-tool-state="success"] .vcp-tool-row-state { color: var(--vcp-ui-success); }
-html[data-ui-mode="next"] [data-vcp-tool-state="failed"] .vcp-tool-row-state { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
-html[data-ui-mode="next"] [data-vcp-tool-state="waiting"] .vcp-tool-row-state,
-html[data-ui-mode="next"] [data-vcp-tool-state="stopped"] .vcp-tool-row-state { color: var(--vcp-ui-warning, var(--vcp-ui-palette-amber)); }
-html[data-ui-mode="next"] [data-vcp-tool-state="running"] .vcp-tool-row-state { color: var(--vcp-ui-accent); }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-delete-btn { flex: 0 0 24px; margin-right: 6px; opacity: 0; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-header:hover .vcp-tool-result-delete-btn,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-header:focus-within .vcp-tool-result-delete-btn { opacity: 1; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="compact"] .vcp-role-divider,
-html[data-ui-mode="next"] [data-vcp-tool-presentation="grouped"] .vcp-role-divider { margin: 4px 0; font-size: 11px; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-details { max-height: 360px; overflow: auto; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-details,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-result-collapsible-content,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-call-summary-content {
+html[data-ui-mode="next"] .vcp-ui-scope [aria-expanded="true"] > .vcp-tool-row-chevron { transform: rotate(45deg); }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-title { overflow-wrap: anywhere; min-width: 0; color: var(--vcp-ui-text-primary); }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-resource { overflow-wrap: anywhere; min-width: 0; font-size: var(--vcp-ui-text-sm, 12px); }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-state { margin-left: auto; white-space: nowrap; font-size: var(--vcp-ui-text-sm, 12px); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-state="success"] .vcp-tool-row-state { color: var(--vcp-ui-success); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-state="failed"] .vcp-tool-row-state { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-state="waiting"] .vcp-tool-row-state,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-state="stopped"] .vcp-tool-row-state { color: var(--vcp-ui-warning, var(--vcp-ui-palette-amber)); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-state="running"] .vcp-tool-row-state { color: var(--vcp-ui-accent); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-delete-btn { flex: 0 0 24px; margin-right: 6px; opacity: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-header:hover .vcp-tool-result-delete-btn,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-header:focus-within .vcp-tool-result-delete-btn { opacity: 1; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="compact"] .vcp-role-divider,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="grouped"] .vcp-role-divider { margin: 4px 0; font-size: var(--vcp-ui-text-xs, 11px); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-details { max-height: 360px; overflow: auto; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-details,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-result-collapsible-content,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-call-summary-content {
     margin: 0;
     padding: 6px 12px 12px 28px;
     background: transparent;
     border: 0;
     min-width: 0;
 }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-details,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-result-collapsible-content,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-call-summary-content { display: none; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-details,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-result-collapsible-content,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-call-summary-content { display: block; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented pre {
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-details,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-result-collapsible-content,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-call-summary-content { display: none; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-details,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-result-collapsible-content,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-call-summary-content { display: block; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented pre {
     white-space: pre-wrap;
     overflow-wrap: anywhere;
     min-width: 0;
     max-height: 320px;
     overflow: auto;
 }
-html[data-ui-mode="next"] .vcp-tool-process {
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process {
     border: 1px solid var(--vcp-ui-border);
     border-radius: var(--vcp-ui-radius-md, 8px);
     margin: 10px 0;
@@ -124,12 +124,12 @@ html[data-ui-mode="next"] .vcp-tool-process {
     overflow: hidden;
     background: var(--vcp-ui-bg-0);
 }
-html[data-ui-mode="next"] .vcp-tool-process-toggle { background: var(--vcp-ui-bg-1); border-radius: 0; }
-html[data-ui-mode="next"] .vcp-tool-process-title { min-width: 0; overflow-wrap: anywhere; }
-html[data-ui-mode="next"] .vcp-tool-process-stats { margin-left: auto; font-size: var(--vcp-ui-text-sm, 12px); overflow-wrap: anywhere; }
-html[data-ui-mode="next"] .vcp-tool-process-body[hidden] { display: none; }
-html[data-ui-mode="next"] .vcp-tool-process-body > .vcp-tool-presented { margin: 0; border-top: 1px solid var(--vcp-ui-border); }
-html[data-ui-mode="next"] .vcp-tool-process-artifact {
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-toggle { background: var(--vcp-ui-bg-1); border-radius: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-title { min-width: 0; overflow-wrap: anywhere; }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-stats { margin-left: auto; font-size: var(--vcp-ui-text-sm, 12px); overflow-wrap: anywhere; }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-body[hidden] { display: none; }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-body > .vcp-tool-presented { margin: 0; border-top: 1px solid var(--vcp-ui-border); }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-artifact {
     color: var(--vcp-ui-text-accent);
     background: transparent;
     border: 0;
@@ -142,20 +142,20 @@ html[data-ui-mode="next"] .vcp-tool-process-artifact {
     cursor: pointer;
 }
 @media (max-width: 640px) {
-    html[data-ui-mode="next"] .vcp-tool-row-toggle { flex-wrap: wrap; gap: 6px; }
-    html[data-ui-mode="next"] .vcp-tool-row-state { margin-left: auto; }
-    html[data-ui-mode="next"] .vcp-tool-process-toggle { flex-wrap: wrap; }
-    html[data-ui-mode="next"] .vcp-tool-process-stats { margin-left: 16px; }
+    html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-toggle { flex-wrap: wrap; gap: 6px; }
+    html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-state { margin-left: auto; }
+    html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-toggle { flex-wrap: wrap; }
+    html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-stats { margin-left: 16px; }
 }
 
 /* 单行合并 / 整轮折叠：无框单行，一次调用一行；紧跟的同名结果收进请求行，展开后才显示。 */
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) {
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) {
     --vcp-tool-call-color: var(--vcp-ui-text-3, var(--vcp-ui-text-secondary));
     --vcp-tool-call-hover: var(--vcp-ui-text-2, var(--vcp-ui-text-secondary));
 }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-role-divider { margin: 4px 0; font-size: 11px; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-presented { margin: 2px 0; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) {
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-role-divider { margin: 4px 0; font-size: var(--vcp-ui-text-xs, 11px); }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-presented { margin: 2px 0; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) {
     width: auto;
     max-width: 100%;
     min-height: 24px;
@@ -168,10 +168,10 @@ html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-t
     color: var(--vcp-tool-call-color);
     transition: color .1s;
 }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle):hover { background: transparent; color: var(--vcp-tool-call-hover); }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle .vcp-tool-row-title, .vcp-tool-process-title) { flex: none; color: inherit; white-space: nowrap; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-process-stats { min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; overflow-wrap: normal; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-toggle .vcp-tool-row-resource {
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle):hover { background: transparent; color: var(--vcp-tool-call-hover); }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle .vcp-tool-row-title, .vcp-tool-process-title) { flex: none; color: inherit; white-space: nowrap; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-process-stats { min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; overflow-wrap: normal; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-toggle .vcp-tool-row-resource {
     min-width: 0;
     overflow: hidden;
     text-overflow: ellipsis;
@@ -179,20 +179,20 @@ html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-t
     overflow-wrap: normal;
     font-size: inherit;
 }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-toggle .vcp-tool-row-state { flex: none; margin-left: 0; color: inherit; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-icon { display: inline-flex; flex: none; width: 16px; height: 16px; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-icon svg { width: 100%; height: 100%; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-diff { flex: none; font-family: var(--vcp-ui-font-mono, ui-monospace, Consolas, monospace); font-size: 11px; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle:hover, [aria-expanded="true"]) .vcp-tool-row-diff-add { color: var(--vcp-ui-success); }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle:hover, [aria-expanded="true"]) .vcp-tool-row-diff-del { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-toggle .vcp-tool-row-state { flex: none; margin-left: 0; color: inherit; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-icon { display: inline-flex; flex: none; width: 16px; height: 16px; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-icon svg { width: 100%; height: 100%; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-diff { flex: none; font-family: var(--vcp-ui-font-mono, ui-monospace, Consolas, monospace); font-size: var(--vcp-ui-text-xs, 11px); }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle:hover, [aria-expanded="true"]) .vcp-tool-row-diff-add { color: var(--vcp-ui-success); }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle:hover, [aria-expanded="true"]) .vcp-tool-row-diff-del { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
 /* 并入请求行的结果：收起时不占位，展开后只留一个小标题“输出”。
- * 旧层给结果气泡写了 display:block !important，这里只能藏标题、去掉外边距，正文由上面的收起规则隐藏。 */
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"]:not(.expanded) { margin: 0; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"]:not(.expanded) > .vcp-tool-result-header { display: none; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"] .vcp-tool-row-toggle { min-height: 20px; padding-left: 24px; font-size: var(--vcp-ui-text-sm, 12px); }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-presented > :is(.vcp-tool-details, .vcp-tool-result-collapsible-content, .vcp-tool-call-summary-content) { padding: 8px 0 4px 24px; }
+ * 旧层给结果气泡写了强制的 display:block（important 级），这里只能藏标题、去掉外边距，正文由上面的收起规则隐藏。 */
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"]:not(.expanded) { margin: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"]:not(.expanded) > .vcp-tool-result-header { display: none; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"] .vcp-tool-row-toggle { min-height: 20px; padding-left: 24px; font-size: var(--vcp-ui-text-sm, 12px); }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-presented > :is(.vcp-tool-details, .vcp-tool-result-collapsible-content, .vcp-tool-call-summary-content) { padding: 8px 0 4px 24px; }
 /* 等待结果时动作词的微光，只在回复生成中出现。 */
-html[data-ui-mode="next"] .message-item.streaming :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-pending="true"] .vcp-tool-row-title {
+html[data-ui-mode="next"] .vcp-ui-scope .message-item.streaming :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-pending="true"] .vcp-tool-row-title {
     background: linear-gradient(90deg, var(--vcp-tool-call-color) 0%, var(--vcp-ui-text-primary) 50%, var(--vcp-tool-call-color) 100%);
     background-size: 200% 100%;
     -webkit-background-clip: text;
@@ -202,33 +202,33 @@ html[data-ui-mode="next"] .message-item.streaming :is([data-vcp-tool-presentatio
 }
 @keyframes vcp-tool-call-shimmer { from { background-position: 100% 0; } to { background-position: -100% 0; } }
 @media (prefers-reduced-motion: reduce) {
-    html[data-ui-mode="next"] [data-vcp-tool-pending="true"] .vcp-tool-row-title { animation: none !important; }
+    html[data-ui-mode="next"] .vcp-ui-scope .message-item.streaming :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-pending="true"] .vcp-tool-row-title { animation: none; }
 }
 
 /* 单行合并：动作词加粗，箭头在行尾、悬停或展开时出现；问题状态用虚线下划线，悬停看报错。 */
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) { font-size: var(--vcp-ui-text-body, 14px); }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle .vcp-tool-row-title, .vcp-tool-process-title) { font-weight: 500; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) > .vcp-tool-row-chevron { order: 1; opacity: 0; transition: opacity .2s, transform .2s; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle):is(:hover, [aria-expanded="true"]) > .vcp-tool-row-chevron { opacity: 1; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] [data-vcp-tool-call-state] .vcp-tool-row-state { text-decoration: underline dotted; text-underline-offset: 2px; cursor: help; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] { margin: 2px 0; border: 0; border-radius: 0; background: transparent; overflow: visible; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] .vcp-tool-process-stats { margin-left: 0; font-size: inherit; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-body { margin: 4px 0 4px 8px; padding-left: 14px; border-left: 1px solid var(--vcp-ui-border); }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-body > .vcp-tool-presented { margin: 2px 0; border-top: 0; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-artifact { border-top: 0; padding: 4px 0 4px 22px; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) { font-size: var(--vcp-ui-text-body, 14px); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle .vcp-tool-row-title, .vcp-tool-process-title) { font-weight: 500; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) > .vcp-tool-row-chevron { order: 1; opacity: 0; transition: opacity .2s, transform .2s; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle):is(:hover, [aria-expanded="true"]) > .vcp-tool-row-chevron { opacity: 1; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] [data-vcp-tool-call-state] .vcp-tool-row-state { text-decoration: underline dotted; text-underline-offset: 2px; cursor: help; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] { margin: 2px 0; border: 0; border-radius: 0; background: transparent; overflow: visible; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] .vcp-tool-process-stats { margin-left: 0; font-size: inherit; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-body { margin: 4px 0 4px 8px; padding-left: 14px; border-left: 1px solid var(--vcp-ui-border); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-body > .vcp-tool-presented { margin: 2px 0; border-top: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-artifact { border-top: 0; padding: 4px 0 4px 22px; }
 
 /* 整轮折叠：图标悬停换成箭头，标题与摘要之间用小圆点分隔，失败时摘要显示红色报错首行。 */
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle { gap: 0; font-size: var(--vcp-ui-text-caption, 13px); }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-leading { position: relative; display: inline-flex; flex: none; width: 16px; height: 16px; margin-right: 6px; align-items: center; justify-content: center; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-leading .vcp-tool-row-icon { width: 14px; height: 14px; transition: opacity .1s; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-leading .vcp-tool-row-chevron { position: absolute; inset: 0; margin: auto; opacity: 0; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle:is(:hover, [aria-expanded="true"]) .vcp-tool-row-leading .vcp-tool-row-icon { opacity: 0; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle:is(:hover, [aria-expanded="true"]) .vcp-tool-row-leading .vcp-tool-row-chevron { opacity: 1; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-dot { flex: none; width: 2px; height: 2px; margin: 0 8px; border-radius: 1px; background: currentColor; opacity: .7; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle :is(.vcp-tool-row-state, .vcp-tool-row-diff) { margin-left: 10px; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] [data-vcp-tool-call-state="failed"] .vcp-tool-row-toggle .vcp-tool-row-resource { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] { margin: 4px 0 10px; border: 0; border-radius: 0; background: transparent; overflow: visible; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-toggle {
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle { gap: 0; font-size: var(--vcp-ui-text-caption, 13px); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-leading { position: relative; display: inline-flex; flex: none; width: 16px; height: 16px; margin-right: 6px; align-items: center; justify-content: center; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-leading .vcp-tool-row-icon { width: 14px; height: 14px; transition: opacity .1s; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-leading .vcp-tool-row-chevron { position: absolute; inset: 0; margin: auto; opacity: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle:is(:hover, [aria-expanded="true"]) .vcp-tool-row-leading .vcp-tool-row-icon { opacity: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle:is(:hover, [aria-expanded="true"]) .vcp-tool-row-leading .vcp-tool-row-chevron { opacity: 1; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-dot { flex: none; width: 2px; height: 2px; margin: 0 8px; border-radius: 1px; background: currentColor; opacity: .7; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle :is(.vcp-tool-row-state, .vcp-tool-row-diff) { margin-left: 10px; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] [data-vcp-tool-call-state="failed"] .vcp-tool-row-toggle .vcp-tool-row-resource { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] { margin: 4px 0 10px; border: 0; border-radius: 0; background: transparent; overflow: visible; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-toggle {
     width: 100%;
     min-height: 33px;
     padding: 0 0 8px;
@@ -236,8 +236,8 @@ html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-proce
     border-bottom: .5px solid var(--vcp-ui-border);
     font-size: var(--vcp-ui-text-body, 14px);
 }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-toggle > .vcp-tool-row-chevron { order: 1; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] .vcp-tool-process-stats { margin-left: 0; color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-body { padding-top: 8px; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-body > .vcp-tool-presented { margin: 2px 0; border-top: 0; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-artifact { border-top: 0; padding: 6px 0; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-toggle > .vcp-tool-row-chevron { order: 1; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] .vcp-tool-process-stats { margin-left: 0; color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-body { padding-top: 8px; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-body > .vcp-tool-presented { margin: 2px 0; border-top: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-artifact { border-top: 0; padding: 6px 0; }

From 58c8cf11e9c1eb70e201cba8a120e26cc1d325e9 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 00:24:56 +0000
Subject: [PATCH 003/143] Side pane: a tab whose view fails to mount shows an
 error and a retry

Before, a provider that threw during mount (a corrupt restored payload,
a failed lazy import, a bug) left its tab selected over a blank pane,
with the error only in the console. The view now says the tab could not
open, shows the error, and offers a retry; showing the tab again still
retries as before, and closing the tab removes the error view.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_016hW799u5Ji5k9khDAwu688
---
 .../contracts/generated/chat-event-graph.json | 27 ++++++---
 .../side-pane/side-pane-controller.js         | 56 ++++++++++++++++++-
 styles/ui-system/side-pane-shell.css          | 40 +++++++++++++
 tests/side-pane-controller.test.mjs           | 50 +++++++++++++++--
 tests/side-pane-leak.test.mjs                 |  5 +-
 5 files changed, 161 insertions(+), 17 deletions(-)

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 69770eda3..b0339c0ce 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -4304,17 +4304,22 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1023,
+          "line": 497,
+          "kind": "custom-event-listener"
+        },
+        {
+          "file": "modules/ui-system/side-pane/side-pane-controller.js",
+          "line": 1076,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1029,
+          "line": 1082,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1043,
+          "line": 1096,
           "kind": "custom-event-listener"
         },
         {
@@ -5885,19 +5890,25 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1023,
+          "line": 497,
+          "kind": "custom-event-listener",
+          "match": "retry.addEventListener('click'"
+        },
+        {
+          "file": "modules/ui-system/side-pane/side-pane-controller.js",
+          "line": 1076,
           "kind": "custom-event-listener",
           "match": "toggleNotificationsBtn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1029,
+          "line": 1082,
           "kind": "custom-event-listener",
           "match": "expandButton.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1043,
+          "line": 1096,
           "kind": "custom-event-listener",
           "match": "closeSidePaneBtn.addEventListener('click'"
         },
@@ -24914,7 +24925,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1063,
+          "line": 1116,
           "kind": "custom-event-listener"
         },
         {
@@ -25008,7 +25019,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1063,
+          "line": 1116,
           "kind": "custom-event-listener",
           "match": "win?.addEventListener?.('resize'"
         },
diff --git a/modules/ui-system/side-pane/side-pane-controller.js b/modules/ui-system/side-pane/side-pane-controller.js
index 35dcb3306..fe00be598 100644
--- a/modules/ui-system/side-pane/side-pane-controller.js
+++ b/modules/ui-system/side-pane/side-pane-controller.js
@@ -471,6 +471,50 @@ export function createSidePaneController({
         pendingTabMounts.delete(tabId);
     }
 
+    // 挂载失败的标签：tabId -> 显示出错提示的视图
+    const failedMounts = new Map();
+
+    function clearMountFailure(tabId) {
+        failedMounts.get(tabId)?.remove?.();
+        failedMounts.delete(tabId);
+    }
+
+    function showMountFailure(tabId, view, error, mountOptions) {
+        view.replaceChildren();
+        const box = doc.createElement('div');
+        box.className = 'side-pane-mount-error';
+        box.setAttribute('role', 'alert');
+        const title = doc.createElement('div');
+        title.className = 'side-pane-mount-error-title';
+        title.textContent = '这个标签没能打开';
+        const detail = doc.createElement('div');
+        detail.className = 'side-pane-mount-error-detail';
+        detail.textContent = error?.message || String(error || '未知错误');
+        const retry = doc.createElement('button');
+        retry.type = 'button';
+        retry.className = 'side-pane-mount-error-retry';
+        retry.textContent = '重试';
+        retry.addEventListener('click', () => {
+            if (isDisposed || failedMounts.get(tabId) !== view) return;
+            const refocus = view.contains(doc.activeElement);
+            ensureTabMounted(tabId, mountOptions)
+                .then(entry => {
+                    if (!entry || isDisposed) return;
+                    syncViewPanels();
+                    if (refocus && state.activeTabId === tabId) entry.handle?.focus?.();
+                })
+                .catch(retryError => {
+                    console.error(`[SidePaneController] Retrying the mount of tab "${tabId}" failed:`, retryError);
+                    if (!isDisposed) syncViewPanels();
+                    if (refocus) failedMounts.get(tabId)?.querySelector?.('.side-pane-mount-error-retry')?.focus?.();
+                });
+        });
+        box.append(title, detail, retry);
+        view.append(box);
+        failedMounts.set(tabId, view);
+        syncViewPanels();
+    }
+
     function ensureTabMounted(tabId, { provider, payload, kind = payload?.kind, ariaLabel = null, onClosed = null }) {
         const mounted = mountedTabMap.get(tabId);
         if (mounted) return Promise.resolve(mounted);
@@ -478,6 +522,8 @@ export function createSidePaneController({
 
         const pending = { promise: null, viewElement: null, canceled: false, onClosed };
         const mounting = (async () => {
+            // 上次挂载失败留下的提示页不复用，换一个干净的视图重新挂
+            clearMountFailure(tabId);
             let view = findByTabId(contentContainer, tabId);
             if (!view && contentContainer) {
                 view = doc.createElement('section');
@@ -505,9 +551,13 @@ export function createSidePaneController({
                     })
                     : null;
             } catch (error) {
-                // 挂载失败不留空的视图壳，下次显示时重新挂
                 await tabOccurrence.closeView('mount-failed').catch(() => {});
-                view.remove?.();
+                // 标签还在、侧栏没拆：留一页出错提示和重试按钮，不让用户对着空白页
+                if (!isDisposed && !pending.canceled && state.tabs.some(t => t.id === tabId)) {
+                    showMountFailure(tabId, view, error, { provider, payload, kind, ariaLabel, onClosed });
+                } else {
+                    view.remove?.();
+                }
                 throw error;
             }
             if (isDisposed || pending.canceled || !state.tabs.some(t => t.id === tabId)) {
@@ -601,6 +651,7 @@ export function createSidePaneController({
                 || entry?.viewElement?.contains(origin)
                 || origin?.closest?.('[data-tab-id]')?.getAttribute('data-tab-id') === tab.id;
             entry?.viewElement?.remove();
+            clearMountFailure(tab.id);
             if (mountedTabMap.get(tab.id) === entry) mountedTabMap.delete(tab.id);
             viewTimes.delete(tab.id);
             dormantTabs.delete(tab.id);
@@ -1005,6 +1056,7 @@ export function createSidePaneController({
                 entry.viewElement?.remove?.();
             });
             mountedTabMap.clear();
+            for (const tabId of [...failedMounts.keys()]) clearMountFailure(tabId);
             for (const tabId of pendingTabMounts.keys()) cancelPendingMount(tabId);
             tabRegistry.dispose();
             await Promise.allSettled([...disposePromises, tabCloseOwner.dispose()]);
diff --git a/styles/ui-system/side-pane-shell.css b/styles/ui-system/side-pane-shell.css
index 08368e2c4..f6271343e 100644
--- a/styles/ui-system/side-pane-shell.css
+++ b/styles/ui-system/side-pane-shell.css
@@ -161,3 +161,43 @@ html #vcpSidePane .notifications-sidebar.active:where(.vcp-ui-scope, .vcp-ui-sco
 }
 
 
+
+/* 标签挂载失败：出错提示和重试按钮，代替空白页 */
+html .side-pane-mount-error:where(.vcp-ui-scope, .vcp-ui-scope *) {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    gap: 8px;
+    height: 100%;
+    padding: 24px;
+    text-align: center;
+}
+
+html .side-pane-mount-error-title:where(.vcp-ui-scope, .vcp-ui-scope *) {
+    font-size: var(--vcp-ui-font-size);
+    font-weight: 600;
+}
+
+html .side-pane-mount-error-detail:where(.vcp-ui-scope, .vcp-ui-scope *) {
+    max-width: 90%;
+    font-size: calc(var(--vcp-ui-font-size) - 2px);
+    opacity: 0.65;
+    white-space: pre-line;
+    word-break: break-all;
+}
+
+html .side-pane-mount-error-retry:where(.vcp-ui-scope, .vcp-ui-scope *) {
+    margin-top: 6px;
+    padding: 5px 14px;
+    border: 1px solid var(--border-color, var(--vcp-ui-port-color-rgba-255-255-255-0-16));
+    border-radius: 6px;
+    background: transparent;
+    color: inherit;
+    font-size: calc(var(--vcp-ui-font-size) - 2px);
+    cursor: pointer;
+}
+
+html .side-pane-mount-error-retry:hover:where(.vcp-ui-scope, .vcp-ui-scope *) {
+    background: var(--vcp-ui-port-color-rgba-127-127-127-0-16);
+}
diff --git a/tests/side-pane-controller.test.mjs b/tests/side-pane-controller.test.mjs
index ed9cf096d..be3a3c843 100644
--- a/tests/side-pane-controller.test.mjs
+++ b/tests/side-pane-controller.test.mjs
@@ -291,29 +291,69 @@ for (const action of ['select another tab', 'hide the pane', 'focus the main inp
     });
 }
 
-test('SidePaneController does not leave an empty view behind when a mount fails', async () => {
+test('a failed mount shows an error with a retry instead of a blank pane', async () => {
     const { dom, root, options } = createPaneDom();
+    let attempts = 0;
     const controller = createSidePaneController({
         ...options,
         providers: {
-            broken: {
-                async mountTab() { throw new Error('mount failed'); }
+            flaky: {
+                async mountTab(tab, view) {
+                    attempts++;
+                    view.textContent = 'half drawn';
+                    if (attempts === 1) throw new Error('mount failed');
+                    view.textContent = 'ready';
+                    return { focus() {}, dispose() {} };
+                }
             }
         }
     });
     const originalError = console.error;
     console.error = () => {};
     try {
-        await controller.openTab({ id: 'broken', kind: 'broken', title: 'Broken', closable: true, scopeMode: 'global' }).catch(() => {});
+        await assert.rejects(controller.openTab({ id: 'flaky', kind: 'flaky', title: 'Flaky', closable: true, scopeMode: 'global' }), /mount failed/);
+        const views = root.querySelectorAll('.side-pane-view[data-tab-id="flaky"]');
+        assert.equal(views.length, 1);
+        assert.equal(views[0].hidden, false, 'the failed tab stays the visible one');
+        assert.equal(views[0].querySelector('[role="alert"]').textContent.includes('mount failed'), true);
+        assert.equal(views[0].textContent.includes('half drawn'), false, 'what the provider half drew is cleared');
+
+        views[0].querySelector('.side-pane-mount-error-retry').click();
+        await new Promise(resolve => setTimeout(resolve, 0));
+        assert.equal(attempts, 2);
+        const mounted = root.querySelectorAll('.side-pane-view[data-tab-id="flaky"]');
+        assert.equal(mounted.length, 1);
+        assert.equal(mounted[0].textContent, 'ready');
+        assert.equal(mounted[0].hidden, false);
+        assert.ok(controller.getTabHandle('flaky'));
     } finally {
         console.error = originalError;
     }
-    assert.equal(root.querySelector('.side-pane-view[data-tab-id="broken"]'), null);
 
     await controller.dispose();
     dom.window.close();
 });
 
+test('closing a tab whose mount failed removes its error view', async () => {
+    const { dom, root, options } = createPaneDom();
+    const controller = createSidePaneController({
+        ...options,
+        providers: { broken: { async mountTab() { throw new Error('mount failed'); } } }
+    });
+    const originalError = console.error;
+    console.error = () => {};
+    try {
+        await controller.openTab({ id: 'broken', kind: 'broken', title: 'Broken', closable: true, scopeMode: 'global' }).catch(() => {});
+        assert.ok(root.querySelector('.side-pane-view[data-tab-id="broken"]'));
+        await controller.closeTab('broken');
+        assert.equal(root.querySelector('.side-pane-view[data-tab-id="broken"]'), null);
+    } finally {
+        console.error = originalError;
+    }
+    await controller.dispose();
+    dom.window.close();
+});
+
 test('SidePaneController still closes a tab whose dispose throws', async () => {
     const { dom, root, options } = createPaneDom();
     const controller = createSidePaneController({
diff --git a/tests/side-pane-leak.test.mjs b/tests/side-pane-leak.test.mjs
index 05872b158..001fb1f40 100644
--- a/tests/side-pane-leak.test.mjs
+++ b/tests/side-pane-leak.test.mjs
@@ -203,7 +203,7 @@ function probeFixture() {
         residency: controller.getViewResidency()
     });
     return {
-        controller, mounts, measure,
+        controller, mounts, measure, root,
         hold() {
             let open;
             gate = { promise: new Promise(resolve => { open = resolve; }) };
@@ -255,7 +255,8 @@ test('a view whose mount throws releases what it had set up, and the tab can mou
             await settle();
             const failed = h.mounts.at(-1);
             assert.equal(failed.released, 1, 'what the provider put on the view scope is released');
-            assert.equal(h.measure().views, 0, 'no empty view shell is left');
+            assert.equal(h.measure().views, 1, 'only the error page is left, not an empty shell');
+            assert.ok(h.root.querySelector(`.side-pane-view[data-tab-id="${id}"] [role="alert"]`), 'the failed tab says it failed');
 
             // 标签还在：再显示一次就重新挂上
             h.controller.activateTab(id);

From e046c6efe33043904478e4269779f607ae2e24af Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 00:25:32 +0000
Subject: [PATCH 004/143] Renderer: a side pane that fails to start no longer
 takes the chat down with it

initWorkspaceSidePane ran inside the main startup try block ahead of the
filter manager and setupEventListeners, so any exception while building
the side pane skipped the rest of startup and left the send button and
the other main window bindings dead. It now runs in its own try/catch
and reports the failure as a toast.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_016hW799u5Ji5k9khDAwu688
---
 .../contracts/generated/chat-event-graph.json |  4 +-
 renderer.js                                   | 56 ++++++++++---------
 2 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index b0339c0ce..23efc5b40 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -30168,7 +30168,7 @@
       "producers": [
         {
           "file": "renderer.js",
-          "line": 1072,
+          "line": 1078,
           "kind": "custom-event-create"
         }
       ],
@@ -30176,7 +30176,7 @@
       "evidence": [
         {
           "file": "renderer.js",
-          "line": 1072,
+          "line": 1078,
           "kind": "custom-event-create",
           "match": "new CustomEvent('vcp-renderer-ready'"
         }
diff --git a/renderer.js b/renderer.js
index dde25c02c..b2d4b6790 100755
--- a/renderer.js
+++ b/renderer.js
@@ -981,31 +981,37 @@ mainChatSettingsPresentationOwner.configureStartup({
         }
 
         // 右侧工作区侧栏：通知 + 辅助对话
-        initWorkspaceSidePane({
-            document,
-            window,
-            elements: {
-                root: vcpSidePane,
-                resizerHandle: resizerRight,
-                tabList: sidePaneTabs,
-                contentContainer: sidePaneContentContainer,
-                toggleNotificationsBtn,
-                notificationsPanel: notificationsSidebar,
-                toggleChatBtn: toggleSidePaneChatBtn,
-                closeBtn: closeSidePaneBtn,
-                addBtn: addSidePaneChatBtn,
-            },
-            chatAPI,
-            chatRepository,
-            chatManager,
-            uiHelper: uiHelperFunctions,
-            createRenderer: createOwnedInternalChatRenderer,
-            settingsRef: mainChatSettingsOwner.ref,
-            selectedItemRef: currentSelectedItemRef,
-            topicIdRef: currentTopicIdRef,
-            historyRef: mainHistoryRef,
-            subscriptions: ownedRendererSubscriptions,
-        });
+        // 侧栏起不来只影响侧栏：后面的过滤器、事件绑定（发送按钮等）照常初始化
+        try {
+            initWorkspaceSidePane({
+                document,
+                window,
+                elements: {
+                    root: vcpSidePane,
+                    resizerHandle: resizerRight,
+                    tabList: sidePaneTabs,
+                    contentContainer: sidePaneContentContainer,
+                    toggleNotificationsBtn,
+                    notificationsPanel: notificationsSidebar,
+                    toggleChatBtn: toggleSidePaneChatBtn,
+                    closeBtn: closeSidePaneBtn,
+                    addBtn: addSidePaneChatBtn,
+                },
+                chatAPI,
+                chatRepository,
+                chatManager,
+                uiHelper: uiHelperFunctions,
+                createRenderer: createOwnedInternalChatRenderer,
+                settingsRef: mainChatSettingsOwner.ref,
+                selectedItemRef: currentSelectedItemRef,
+                topicIdRef: currentTopicIdRef,
+                historyRef: mainHistoryRef,
+                subscriptions: ownedRendererSubscriptions,
+            });
+        } catch (error) {
+            console.error('[RENDERER_INIT] Failed to initialize the side pane:', error);
+            uiHelperFunctions?.showToastNotification?.(`侧栏初始化失败：${error?.message || '未知错误'}`, 'error');
+        }
 
         // Initialize Filter Manager
         if (window.filterManager) {

From 4bc631ecf9f4a8273210b093e15936ec6f9ae141 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 00:28:27 +0000
Subject: [PATCH 005/143] Side browser: no local file pages, and downloads need
 a real click

A file:// page in the side browser runs with Electron's default file
privileges, so its script could fetch other local files (SSH keys,
VCPChat settings) and post them out. Like DeepSeek Harness
(browser-guests.ts onBeforeRequest) and ZCode (isAllowedBrowserUrl),
the side browser now only opens http, https and about pages, and its
session cancels file: and other non-web subresource requests.

Any page could also start downloads on its own, and each one opened the
system browser. A download now reaches the system browser only right
after a real input on that page, one per input, the same rule popups use.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_016hW799u5Ji5k9khDAwu688
---
 .../contracts/generated/chat-event-graph.json | 36 ++++++------
 modules/ipc/browserHandlers.js                | 56 +++++++++++++------
 .../side-pane/browserSideProvider.js          |  6 +-
 tests/browser-handlers.test.js                | 49 ++++++++++++++--
 4 files changed, 103 insertions(+), 44 deletions(-)

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 23efc5b40..89867b65b 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -1275,14 +1275,14 @@
       "consumers": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 139,
+          "line": 158,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 139,
+          "line": 158,
           "kind": "event-listener",
           "match": "guest.on('before-input-event'"
         }
@@ -1862,14 +1862,14 @@
       "consumers": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 165,
+          "line": 184,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 165,
+          "line": 184,
           "kind": "event-listener",
           "match": "ipcMain.handle('browser:clear-data'"
         },
@@ -1893,14 +1893,14 @@
       "consumers": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 154,
+          "line": 173,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 154,
+          "line": 173,
           "kind": "event-listener",
           "match": "ipcMain.handle('browser:open-external'"
         },
@@ -9976,14 +9976,14 @@
       "consumers": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 119,
+          "line": 142,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 119,
+          "line": 142,
           "kind": "event-listener",
           "match": "host.on('did-attach-webview'"
         }
@@ -15022,14 +15022,14 @@
       "consumers": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 122,
+          "line": 144,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 122,
+          "line": 144,
           "kind": "event-listener",
           "match": "guest.on('input-event'"
         }
@@ -31645,14 +31645,14 @@
       "consumers": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 102,
+          "line": 125,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 102,
+          "line": 125,
           "kind": "event-listener",
           "match": "host.on('will-attach-webview'"
         }
@@ -31664,14 +31664,14 @@
       "consumers": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 88,
+          "line": 109,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 88,
+          "line": 109,
           "kind": "event-listener",
           "match": "ses.on('will-download'"
         }
@@ -31688,7 +31688,7 @@
         },
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 137,
+          "line": 156,
           "kind": "event-listener"
         },
         {
@@ -31706,7 +31706,7 @@
         },
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 137,
+          "line": 156,
           "kind": "event-listener",
           "match": "guest.on('will-navigate'"
         },
@@ -31754,14 +31754,14 @@
       "consumers": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 138,
+          "line": 157,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 138,
+          "line": 157,
           "kind": "event-listener",
           "match": "guest.on('will-redirect'"
         }
diff --git a/modules/ipc/browserHandlers.js b/modules/ipc/browserHandlers.js
index 1f3c23c74..a3240afce 100644
--- a/modules/ipc/browserHandlers.js
+++ b/modules/ipc/browserHandlers.js
@@ -1,11 +1,14 @@
 // modules/ipc/browserHandlers.js
 // 侧栏「浏览器」标签的主进程部分。页面本身由渲染进程里的 <webview> 承载，这里只负责把它关进笼子：
 // - 只允许固定的 persist 分区，并强制去掉 preload / Node 集成，开启沙箱与上下文隔离；
-// - 只放行 http / https / file / about 地址，其它协议（data: 钓鱼页、vcp:// 等自定义协议）一律拦截；
+// - 只放行 http / https / about 地址，其它协议（file: 本地页、data: 钓鱼页、vcp:// 等自定义协议）一律拦截；
+//   子资源请求同样拦掉 file:——本地页面在 Electron 默认的 file 特权下能 fetch 任意本地文件再发出去
+//   （和 DeepSeek Harness browser-guests.ts 的 onBeforeRequest、ZCode isAllowedBrowserUrl 一致），本地文件用代码查看器看；
 // - 网页里的 window.open / target=_blank 转成「在侧栏新开一个浏览器标签」，但必须紧跟一次真实点击或按键，
 //   一次输入只换一个标签，网页自己连开弹窗刷不出标签；
-// - 弹窗只能开 http / https，本地 file 页面还可以开 file 页面；
-// - 页面权限请求（摄像头、定位、通知等）默认拒绝，下载交给系统默认浏览器处理；
+// - 弹窗只能开 http / https；
+// - 页面权限请求（摄像头、定位、通知等）默认拒绝；下载交给系统默认浏览器处理，但和弹窗一样要紧跟一次真实输入，
+//   网页不能自己连发下载把用户一次次弹到系统浏览器；
 // - 「在默认浏览器中打开」「清除浏览数据」两个命令只接受主窗口页面调用；
 // - 焦点在网页里时按键到不了主窗口，副屏快捷键在这里截下转给主窗口。
 'use strict';
@@ -17,7 +20,9 @@ let getMainWindow = () => null;
 let ipcMain = defaultIpcMain;
 
 const BROWSER_PARTITION = 'persist:vcp-side-browser';
-const ALLOWED_GUEST_PROTOCOLS = new Set(['http:', 'https:', 'file:', 'about:']);
+const ALLOWED_GUEST_PROTOCOLS = new Set(['http:', 'https:', 'about:']);
+// 网页里的子资源请求只放行网络和页面自己生成的内容，file: 等本地协议一律取消
+const ALLOWED_REQUEST_PROTOCOLS = new Set(['http:', 'https:', 'ws:', 'wss:', 'about:', 'data:', 'blob:']);
 const POPUP_PROTOCOLS = new Set(['http:', 'https:']);
 // 点击或按键之后这么久内允许开一个弹窗，和 Chromium 的瞬时用户激活差不多
 const POPUP_ACTIVATION_MS = 3000;
@@ -47,12 +52,25 @@ function isExternalUrl(raw) {
     return Boolean(url && EXTERNAL_PROTOCOLS.has(url.protocol));
 }
 
-// 弹窗地址：只认 http / https；本地 file 页面里的链接可以开另一个 file 页面
-function isAllowedPopupUrl(raw, openerUrl = '') {
+// 弹窗地址：只认 http / https
+function isAllowedPopupUrl(raw) {
     const url = parseUrl(raw);
-    if (!url) return false;
-    if (POPUP_PROTOCOLS.has(url.protocol)) return true;
-    return url.protocol === 'file:' && parseUrl(openerUrl)?.protocol === 'file:';
+    return Boolean(url && POPUP_PROTOCOLS.has(url.protocol));
+}
+
+function isAllowedGuestRequest(raw) {
+    const url = parseUrl(raw);
+    return Boolean(url && ALLOWED_REQUEST_PROTOCOLS.has(url.protocol));
+}
+
+// 每个网页最近一次真实输入的时间：弹窗和下载各凭一次输入放行一次
+const lastActivation = new WeakMap();
+
+function consumeActivation(guest) {
+    const activatedAt = guest ? lastActivation.get(guest) || 0 : 0;
+    if (!activatedAt || Date.now() - activatedAt > POPUP_ACTIVATION_MS) return false;
+    lastActivation.delete(guest);
+    return true;
 }
 
 /**
@@ -85,10 +103,15 @@ function configureGuestSession(ses) {
     configuredSessions.add(ses);
     ses.setPermissionRequestHandler((_webContents, _permission, callback) => callback(false));
     ses.setPermissionCheckHandler(() => false);
-    ses.on('will-download', (event, item) => {
+    ses.webRequest?.onBeforeRequest?.((details, callback) => {
+        callback({ cancel: !isAllowedGuestRequest(details?.url) });
+    });
+    ses.on('will-download', (event, item, guest) => {
         const url = item.getURL();
         event.preventDefault();
-        if (isExternalUrl(url)) shell.openExternal(url);
+        if (isExternalUrl(url) && consumeActivation(guest)) {
+            Promise.resolve(shell.openExternal(url)).catch(() => {});
+        }
     });
 }
 
@@ -117,16 +140,12 @@ function attachToWindow(mainWindow) {
     });
 
     host.on('did-attach-webview', (_event, guest) => {
-        // 最近一次真实输入的时间；开过一个弹窗就作废，下一个弹窗要等下一次输入
-        let activatedAt = 0;
+        // 最近一次真实输入；开过一个弹窗或交出一次下载就作废，下一个要等下一次输入
         guest.on('input-event', (_event, input) => {
-            if (ACTIVATION_INPUTS.has(input?.type)) activatedAt = Date.now();
+            if (ACTIVATION_INPUTS.has(input?.type)) lastActivation.set(guest, Date.now());
         });
         guest.setWindowOpenHandler(({ url }) => {
-            const activated = activatedAt > 0 && Date.now() - activatedAt <= POPUP_ACTIVATION_MS;
-            const openerUrl = typeof guest.getURL === 'function' ? guest.getURL() : '';
-            if (activated && isAllowedPopupUrl(url, openerUrl) && !host.isDestroyed()) {
-                activatedAt = 0;
+            if (isAllowedPopupUrl(url) && !host.isDestroyed() && consumeActivation(guest)) {
                 host.send('browser:open-tab', { url });
             }
             return { action: 'deny' };
@@ -185,6 +204,7 @@ module.exports = {
     attachToWindow,
     initialize,
     dispose,
+    isAllowedGuestRequest,
     isAllowedGuestUrl,
     isAllowedPopupUrl,
     matchSidePaneShortcut,
diff --git a/modules/ui-system/side-pane/browserSideProvider.js b/modules/ui-system/side-pane/browserSideProvider.js
index 92102dc76..b159da1e5 100644
--- a/modules/ui-system/side-pane/browserSideProvider.js
+++ b/modules/ui-system/side-pane/browserSideProvider.js
@@ -13,9 +13,9 @@
 import { createSidePaneRootScope } from './side-pane-occurrence.js';
 
 export const BROWSER_PARTITION = 'persist:vcp-side-browser';
-const ALLOWED_PROTOCOLS = new Set(['http:', 'https:', 'file:', 'about:']);
+const ALLOWED_PROTOCOLS = new Set(['http:', 'https:', 'about:']); // 同 browserHandlers.js：不开 file: 本地页
 const BLOCKED_ERROR_CODES = new Set([-3]); // ERR_ABORTED: a navigation replaced by another one
-const INVALID_URL_MESSAGE = '仅支持 http、https、file、about 地址';
+const INVALID_URL_MESSAGE = '仅支持 http、https、about 地址';
 // 网页弹窗最多把浏览器标签开到这么多，再多就只提示不开
 export const MAX_POPUP_BROWSER_TABS = 12;
 
@@ -255,7 +255,7 @@ export function createBrowserSideProvider({
                 const changed = Boolean(url) && url !== currentUrl;
                 currentUrl = url || '';
                 // 关掉后从「最近关闭」重新打开时回到最后看的页面
-                if (changed && /^https?:|^file:/i.test(currentUrl)) sidePaneController?.updateTab?.(tab.id, { payload: { url: currentUrl } });
+                if (changed && /^https?:/i.test(currentUrl)) sidePaneController?.updateTab?.(tab.id, { payload: { url: currentUrl } });
                 if (doc.activeElement !== address) address.value = currentUrl === 'about:blank' ? '' : currentUrl;
                 address.title = currentUrl;
             };
diff --git a/tests/browser-handlers.test.js b/tests/browser-handlers.test.js
index 3cc15e131..56d97e604 100644
--- a/tests/browser-handlers.test.js
+++ b/tests/browser-handlers.test.js
@@ -14,6 +14,7 @@ guestSession.setPermissionRequestHandler = (fn) => { guestSession.requestHandler
 guestSession.setPermissionCheckHandler = (fn) => { guestSession.checkHandler = fn; };
 guestSession.clearStorageData = async () => { guestSession.cleared += 1; };
 guestSession.clearCache = async () => { guestSession.cleared += 1; };
+guestSession.webRequest = { onBeforeRequest: (fn) => { guestSession.beforeRequest = fn; } };
 
 const originalLoad = Module._load;
 Module._load = function loadWithElectronMock(request, parent, isMain) {
@@ -38,19 +39,19 @@ const mainPage = require('./helpers/trusted-main-sender.cjs').createTrustedMainS
 const foreignPage = { senderFrame: { url: 'https://evil.example/' } };
 
 test('guest URL allowlist keeps custom protocols out', () => {
-    for (const ok of ['http://localhost:3000/', 'https://example.com', 'file:///tmp/a.html', 'about:blank']) {
+    for (const ok of ['http://localhost:3000/', 'https://example.com', 'about:blank']) {
         assert.equal(browserHandlers.isAllowedGuestUrl(ok), true, ok);
     }
-    for (const bad of ['data:text/html,hi', 'javascript:alert(1)', 'vcp://x', 'chrome://gpu', 'ftp://host/a', '', null, 'not a url']) {
+    for (const bad of ['file:///tmp/a.html', 'file:///C:/Users/me/.ssh/id_rsa', 'data:text/html,hi', 'javascript:alert(1)', 'vcp://x', 'chrome://gpu', 'ftp://host/a', '', null, 'not a url']) {
         assert.equal(browserHandlers.isAllowedGuestUrl(bad), false, String(bad));
     }
 });
 
-test('popups only open web pages, and file pages only from a file page', () => {
+test('popups only open web pages', () => {
     const allowed = browserHandlers.isAllowedPopupUrl;
     assert.equal(allowed('https://a.example/', 'https://b.example/'), true);
-    assert.equal(allowed('http://localhost:3000/', 'file:///tmp/a.html'), true);
-    assert.equal(allowed('file:///tmp/b.html', 'file:///tmp/a.html'), true);
+    assert.equal(allowed('http://localhost:3000/'), true);
+    assert.equal(allowed('file:///tmp/b.html', 'file:///tmp/a.html'), false);
     assert.equal(allowed('file:///C:/Windows/win.ini', 'https://evil.example/'), false);
     assert.equal(allowed('about:blank', 'https://a.example/'), false);
     assert.equal(allowed('data:text/html,<h1>login</h1>', 'https://a.example/'), false);
@@ -185,3 +186,41 @@ test('side pane shortcut matcher ignores AltGr, repeats and extra modifiers', ()
     assert.deepEqual(match({ type: 'keyDown', control: true, key: 'PageUp' }, { mac: false }), { action: 'cycle', delta: -1 });
     assert.equal(match({ type: 'keyDown', control: true, shift: true, key: 'PageUp' }, { mac: false }), null);
 });
+
+test('guest requests for local files are canceled, web and inline resources pass', () => {
+    browserHandlers.initialize();
+    const decide = (url) => {
+        let result = null;
+        guestSession.beforeRequest({ url }, (value) => { result = value; });
+        return result.cancel;
+    };
+    for (const url of ['file:///etc/passwd', 'file:///C:/Users/me/AppData/Roaming/VCPChat/settings.json', 'vcp://x', 'chrome://gpu']) {
+        assert.equal(decide(url), true, url);
+    }
+    for (const url of ['https://a.example/app.js', 'http://localhost:3000/', 'wss://a.example/ws', 'data:image/png;base64,AA==', 'blob:https://a.example/1', 'about:blank']) {
+        assert.equal(decide(url), false, url);
+    }
+});
+
+test('downloads only reach the system browser right after a real input on that page', () => {
+    browserHandlers.initialize();
+    const host = new EventEmitter();
+    host.isDestroyed = () => false;
+    host.send = () => {};
+    browserHandlers.attachToWindow({ webContents: host });
+    const guest = new EventEmitter();
+    guest.setWindowOpenHandler = () => {};
+    host.emit('did-attach-webview', {}, guest);
+    const download = (url) => {
+        let prevented = false;
+        guestSession.emit('will-download', { preventDefault: () => { prevented = true; } }, { getURL: () => url }, guest);
+        assert.equal(prevented, true);
+    };
+    opened.length = 0;
+    download('https://evil.example/a.exe');
+    assert.deepEqual(opened, [], 'a download the page started by itself is dropped');
+    guest.emit('input-event', {}, { type: 'mouseDown' });
+    download('https://ok.example/file.zip');
+    download('https://evil.example/b.exe');
+    assert.deepEqual(opened, ['https://ok.example/file.zip'], 'one click hands over one download');
+});

From 7da3ba3086164e1ab06923df00d2a66b4e9c1a65 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 00:30:02 +0000
Subject: [PATCH 006/143] Side pane tabs: arrow keys keep focus on the strip,
 Delete closes, visible focus ring

- Arrow keys re-rendered the strip and then focused the removed button,
  while activateTab moved focus into the panel, so each press threw a
  keyboard user out of the tablist. Keyboard switches now activate
  without moving focus and refocus the new button by id, as Radix Tabs
  (used by ZCode) does.
- While the new-tab page or hidden notifications was active, no tab had
  tabindex=0, so the strip had no Tab stop. The first tab now gets it.
- Delete closes the focused closable tab.
- Tabs and header buttons removed the outline with no replacement; they
  now get the same focus ring as the tab menu items.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_016hW799u5Ji5k9khDAwu688
---
 .../contracts/generated/chat-event-graph.json | 40 ++++-----
 .../side-pane/side-pane-controller.js         |  2 +-
 .../side-pane/side-pane-tab-strip.js          | 25 +++++-
 styles/ui-system/side-pane-tab-bar.css        |  7 ++
 tests/side-pane-tab-keyboard.test.mjs         | 90 +++++++++++++++++++
 5 files changed, 139 insertions(+), 25 deletions(-)
 create mode 100644 tests/side-pane-tab-keyboard.test.mjs

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 89867b65b..98d2d6e49 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -1244,7 +1244,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 200,
+          "line": 202,
           "kind": "custom-event-listener"
         }
       ],
@@ -1263,7 +1263,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 200,
+          "line": 202,
           "kind": "custom-event-listener",
           "match": "tabItem.addEventListener('auxclick'"
         }
@@ -4379,12 +4379,12 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 177,
+          "line": 179,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 189,
+          "line": 191,
           "kind": "custom-event-listener"
         },
         {
@@ -5980,13 +5980,13 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 177,
+          "line": 179,
           "kind": "custom-event-listener",
           "match": "btn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 189,
+          "line": 191,
           "kind": "custom-event-listener",
           "match": "closeBtn.addEventListener('click'"
         },
@@ -7276,7 +7276,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 212,
+          "line": 214,
           "kind": "custom-event-listener"
         },
         {
@@ -7414,7 +7414,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 212,
+          "line": 214,
           "kind": "custom-event-listener",
           "match": "tabItem.addEventListener('contextmenu'"
         },
@@ -15533,7 +15533,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 285,
+          "line": 302,
           "kind": "custom-event-listener"
         },
         {
@@ -15910,7 +15910,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 285,
+          "line": 302,
           "kind": "custom-event-listener",
           "match": "tabListElement.addEventListener('keydown'"
         },
@@ -18773,7 +18773,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 197,
+          "line": 199,
           "kind": "custom-event-listener"
         },
         {
@@ -18897,7 +18897,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 197,
+          "line": 199,
           "kind": "custom-event-listener",
           "match": "tabItem.addEventListener('mousedown'"
         },
@@ -18988,7 +18988,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 208,
+          "line": 210,
           "kind": "custom-event-listener"
         },
         {
@@ -19030,7 +19030,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 208,
+          "line": 210,
           "kind": "custom-event-listener",
           "match": "tabItem.addEventListener('mouseenter'"
         },
@@ -19103,7 +19103,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 209,
+          "line": 211,
           "kind": "custom-event-listener"
         },
         {
@@ -19186,7 +19186,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 209,
+          "line": 211,
           "kind": "custom-event-listener",
           "match": "tabItem.addEventListener('mouseleave'"
         },
@@ -22979,7 +22979,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 210,
+          "line": 212,
           "kind": "custom-event-listener"
         },
         {
@@ -23038,7 +23038,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 210,
+          "line": 212,
           "kind": "custom-event-listener",
           "match": "tabItem.addEventListener('pointerdown'"
         },
@@ -26418,7 +26418,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 254,
+          "line": 260,
           "kind": "custom-event-listener"
         },
         {
@@ -26482,7 +26482,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 254,
+          "line": 260,
           "kind": "custom-event-listener",
           "match": "tabListElement.addEventListener('scroll'"
         },
diff --git a/modules/ui-system/side-pane/side-pane-controller.js b/modules/ui-system/side-pane/side-pane-controller.js
index fe00be598..c24baef4d 100644
--- a/modules/ui-system/side-pane/side-pane-controller.js
+++ b/modules/ui-system/side-pane/side-pane-controller.js
@@ -246,7 +246,7 @@ export function createSidePaneController({
             isClosable: isClosableTab,
             statusTabId: SidePaneState.NOTIFICATIONS_TAB_ID,
             getStatus: readConnectionStatus,
-            onActivate: (tabId) => controller.activateTab(tabId),
+            onActivate: (tabId, options) => controller.activateTab(tabId, options),
             onClose: (tabId) => controller.closeTab(tabId),
             onReorder: (activeId, overId) => controller.reorderTab(activeId, overId),
             onContextMenu: (tabId, x, y) => tabMenu?.show(tabId, x, y),
diff --git a/modules/ui-system/side-pane/side-pane-tab-strip.js b/modules/ui-system/side-pane/side-pane-tab-strip.js
index 0721a4ad1..8d046f0e6 100644
--- a/modules/ui-system/side-pane/side-pane-tab-strip.js
+++ b/modules/ui-system/side-pane/side-pane-tab-strip.js
@@ -12,7 +12,8 @@ const TAB_TOOLTIP_DELAY_MS = 1500;
  *   getTabs() / getActiveTabId()   当前要显示的标签
  *   isClosable(tab)                是否画关闭按钮
  *   statusTabId / getStatus()      带状态圆点的标签（通知）和它的 { status, text }
- *   onActivate / onClose / onReorder / onContextMenu / onRendered
+ *   onActivate(tabId, { focus }) / onClose / onReorder / onContextMenu / onRendered
+ *     键盘切换时传 { focus: false }：焦点留在标签上，不挪进面板
  */
 export function createSidePaneTabStrip({
     tabListElement,
@@ -156,6 +157,7 @@ export function createSidePaneTabStrip({
         btn.setAttribute('aria-selected', String(isActive));
         btn.setAttribute('tabindex', isActive ? '0' : '-1');
         btn.setAttribute('data-tab-id', tab.id);
+        if (isClosable(tab)) btn.setAttribute('aria-keyshortcuts', 'Delete');
 
         const iconSpan = doc.createElement('span');
         iconSpan.className = 'tab-icon vcp-ui-icon';
@@ -230,6 +232,10 @@ export function createSidePaneTabStrip({
         getTabs().forEach(tab => {
             tabListElement.insertBefore(createTabItem(tab, tab.id === activeTabId), insertAnchor);
         });
+        // 激活的是新标签页或藏起来的通知时没有标签带 tabindex=0，给第一个，标签条仍能用 Tab 键进来
+        if (!tabListElement.querySelector('[role="tab"][tabindex="0"]')) {
+            tabListElement.querySelector('[role="tab"]')?.setAttribute('tabindex', '0');
+        }
         syncStatus();
         onRendered();
         layout();
@@ -259,10 +265,19 @@ export function createSidePaneTabStrip({
         cleanups.push(() => resizeObserver.disconnect());
     }
 
-    // 方向键 / Home / End 在标签之间移动并激活
+    // 方向键 / Home / End 在标签之间移动并激活（同 ZCode 用的 Radix Tabs：焦点跟着走、自动激活）；Delete 关掉聚焦的标签
     const onKeydown = (e) => {
         const tabButtons = Array.from(tabListElement.querySelectorAll('[role="tab"]'));
         if (tabButtons.length === 0) return;
+        if (e.key === 'Delete' && !e.ctrlKey && !e.altKey && !e.metaKey && !e.shiftKey) {
+            const focusedId = e.target?.closest?.('[role="tab"]')?.getAttribute('data-tab-id');
+            const focusedTab = focusedId ? getTabs().find(tab => tab.id === focusedId) : null;
+            if (focusedTab && isClosable(focusedTab)) {
+                e.preventDefault();
+                onClose(focusedId);
+            }
+            return;
+        }
         const currentIndex = tabButtons.findIndex(b => b.getAttribute('data-tab-id') === getActiveTabId());
         let targetIndex = currentIndex;
         if (e.key === 'ArrowRight' || e.key === 'ArrowDown') {
@@ -278,8 +293,10 @@ export function createSidePaneTabStrip({
         }
         e.preventDefault();
         if (targetIndex !== currentIndex && targetIndex >= 0 && targetIndex < tabButtons.length) {
-            onActivate(tabButtons[targetIndex].getAttribute('data-tab-id'));
-            tabButtons[targetIndex].focus();
+            const targetId = tabButtons[targetIndex].getAttribute('data-tab-id');
+            onActivate(targetId, { focus: false });
+            // 激活会重画标签条，原来的按钮已经不在了，按 id 找新的
+            findByTabId(tabListElement, targetId, '[role="tab"][data-tab-id]')?.focus?.();
         }
     };
     tabListElement.addEventListener('keydown', onKeydown);
diff --git a/styles/ui-system/side-pane-tab-bar.css b/styles/ui-system/side-pane-tab-bar.css
index 8edb319db..ded2b7360 100644
--- a/styles/ui-system/side-pane-tab-bar.css
+++ b/styles/ui-system/side-pane-tab-bar.css
@@ -326,3 +326,10 @@ html .side-pane-action-btn svg:where(.vcp-ui-scope, .vcp-ui-scope *) {
     line-height: 1;
 }
 
+
+/* 标签和标题栏按钮去掉了默认 outline，键盘聚焦时补一圈焦点环（同 .side-pane-menu-item） */
+html .side-pane-tab:focus-visible:where(.vcp-ui-scope, .vcp-ui-scope *),
+html .side-pane-action-btn:focus-visible:where(.vcp-ui-scope, .vcp-ui-scope *) {
+    outline: 2px solid var(--accent-bg, var(--vcp-ui-port-color-3b82f6));
+    outline-offset: -2px;
+}
diff --git a/tests/side-pane-tab-keyboard.test.mjs b/tests/side-pane-tab-keyboard.test.mjs
new file mode 100644
index 000000000..2c7763414
--- /dev/null
+++ b/tests/side-pane-tab-keyboard.test.mjs
@@ -0,0 +1,90 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { JSDOM } from 'jsdom';
+import { createSidePaneController } from '../modules/ui-system/side-pane/side-pane-controller.js';
+
+function setup() {
+    const dom = new JSDOM(`
+        <div class="main-content"></div>
+        <div class="resizer" id="resizerRight"></div>
+        <aside id="vcpSidePane" class="vcp-side-pane">
+            <header class="side-pane-tab-bar"><div class="side-pane-tabs"></div></header>
+            <div class="side-pane-content-container"></div>
+        </aside>
+    `, { pretendToBeVisual: true });
+    const doc = dom.window.document;
+    const root = doc.getElementById('vcpSidePane');
+    const tabList = root.querySelector('.side-pane-tabs');
+    const controller = createSidePaneController({
+        root,
+        resizerHandle: doc.getElementById('resizerRight'),
+        tabListElement: tabList,
+        contentContainer: root.querySelector('.side-pane-content-container'),
+        providers: {
+            probe: {
+                mountTab(tab, view) {
+                    const input = doc.createElement('input');
+                    view.append(input);
+                    return { focus() { input.focus(); }, dispose() {} };
+                }
+            }
+        }
+    });
+    const tab = id => tabList.querySelector(`[role="tab"][data-tab-id="${id}"]`);
+    const press = (target, key) => target.dispatchEvent(new dom.window.KeyboardEvent('keydown', { key, bubbles: true, cancelable: true }));
+    const open = id => controller.openTab({ id, kind: 'probe', title: id, closable: true, scopeMode: 'global' });
+    return { dom, doc, tabList, controller, tab, press, open };
+}
+
+test('arrow keys walk the tab strip and keep focus on the tabs', async () => {
+    const { dom, doc, controller, tab, press, open } = setup();
+    try {
+        await open('a');
+        await open('b');
+        await open('c');
+        tab('a').focus();
+        controller.activateTab('a', { focus: false });
+        tab('a').focus();
+        press(tab('a'), 'ArrowRight');
+        assert.equal(controller.getSnapshot().activeTabId, 'b');
+        assert.equal(doc.activeElement, tab('b'), 'focus stays in the strip after the strip re-renders');
+        press(doc.activeElement, 'ArrowRight');
+        assert.equal(controller.getSnapshot().activeTabId, 'c');
+        assert.equal(doc.activeElement, tab('c'));
+        press(doc.activeElement, 'Home');
+        assert.equal(doc.activeElement?.getAttribute('data-tab-id'), controller.getSnapshot().activeTabId);
+    } finally {
+        await controller.dispose();
+        dom.window.close();
+    }
+});
+
+test('Delete closes the focused tab and focus moves to the next active tab', async () => {
+    const { dom, doc, controller, tab, press, open } = setup();
+    try {
+        await open('a');
+        await open('b');
+        tab('b').focus();
+        press(tab('b'), 'Delete');
+        await new Promise(resolve => setTimeout(resolve, 0));
+        assert.equal(tab('b'), null);
+        assert.equal(controller.getSnapshot().activeTabId, 'a');
+        assert.equal(doc.activeElement, tab('a'));
+    } finally {
+        await controller.dispose();
+        dom.window.close();
+    }
+});
+
+test('the strip keeps a Tab stop while the new-tab page is showing', async () => {
+    const { dom, tabList, controller, open } = setup();
+    try {
+        await open('a');
+        controller.showLauncher();
+        const stops = tabList.querySelectorAll('[role="tab"][tabindex="0"]');
+        assert.equal(stops.length, 1);
+    } finally {
+        await controller.dispose();
+        dom.window.close();
+    }
+});

From 6757b37d1818a6c64bb90230023da80bbd513f92 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 00:35:11 +0000
Subject: [PATCH 007/143] Plan detail: keyboard focus survives the page's
 redraws

render() rebuilds the whole page, and it only put focus back on filter
inputs and page tabs. Toggling a section or a batch, opening filters,
picking a contributor, or any background refresh dropped focus to
<body>. Interactive buttons now carry a data-focus-key that render()
records and restores, the imperative equivalent of React keeping keyed
nodes in ZCode and DSH. Clearing the filters lands on the search box.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_016hW799u5Ji5k9khDAwu688
---
 .../contracts/generated/chat-event-graph.json | 60 +++++++++----------
 .../side-pane/planDetailSideProvider.js       | 22 ++++++-
 tests/side-pane-plan-detail.test.mjs          | 33 ++++++++++
 3 files changed, 84 insertions(+), 31 deletions(-)

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 98d2d6e49..0232725f7 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -2368,7 +2368,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 567,
+          "line": 569,
           "kind": "custom-event-listener"
         }
       ],
@@ -2543,7 +2543,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 567,
+          "line": 569,
           "kind": "custom-event-listener",
           "match": "el.addEventListener('change'"
         }
@@ -4239,67 +4239,67 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 334,
+          "line": 335,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 369,
+          "line": 371,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 406,
+          "line": 408,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 415,
+          "line": 417,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 528,
+          "line": 530,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 582,
+          "line": 585,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 586,
+          "line": 591,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 658,
+          "line": 664,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 685,
+          "line": 691,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 703,
+          "line": 710,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 723,
+          "line": 730,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 751,
+          "line": 760,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 765,
+          "line": 775,
           "kind": "custom-event-listener"
         },
         {
@@ -5812,79 +5812,79 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 334,
+          "line": 335,
           "kind": "custom-event-listener",
           "match": "btn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 369,
+          "line": 371,
           "kind": "custom-event-listener",
           "match": "crumbs.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 406,
+          "line": 408,
           "kind": "custom-event-listener",
           "match": "refreshBtn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 415,
+          "line": 417,
           "kind": "custom-event-listener",
           "match": "forgeBtn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 528,
+          "line": 530,
           "kind": "custom-event-listener",
           "match": "row.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 582,
+          "line": 585,
           "kind": "custom-event-listener",
           "match": "toggle.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 586,
+          "line": 591,
           "kind": "custom-event-listener",
           "match": "clear.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 658,
+          "line": 664,
           "kind": "custom-event-listener",
           "match": "headBtn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 685,
+          "line": 691,
           "kind": "custom-event-listener",
           "match": "pick.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 703,
+          "line": 710,
           "kind": "custom-event-listener",
           "match": "pick.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 723,
+          "line": 730,
           "kind": "custom-event-listener",
           "match": "link.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 751,
+          "line": 760,
           "kind": "custom-event-listener",
           "match": "retry.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 765,
+          "line": 775,
           "kind": "custom-event-listener",
           "match": "retry.addEventListener('click'"
         },
@@ -14812,7 +14812,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 542,
+          "line": 544,
           "kind": "custom-event-listener"
         },
         {
@@ -15004,7 +15004,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 542,
+          "line": 544,
           "kind": "custom-event-listener",
           "match": "el.addEventListener('input'"
         },
diff --git a/modules/ui-system/side-pane/planDetailSideProvider.js b/modules/ui-system/side-pane/planDetailSideProvider.js
index 53ea53ea1..a57775515 100644
--- a/modules/ui-system/side-pane/planDetailSideProvider.js
+++ b/modules/ui-system/side-pane/planDetailSideProvider.js
@@ -328,6 +328,7 @@ export function createPlanDetailSideProvider({
             const sectionTitle = (key, label, meta) => {
                 const btn = h('button', 'side-plan-section-title');
                 btn.type = 'button';
+                btn.dataset.focusKey = `section:${key}`;
                 btn.setAttribute('aria-expanded', String(!collapsed[key]));
                 btn.append(icon(collapsed[key] ? 'chevron_right' : 'expand_more'), h('span', 'side-plan-section-label', label));
                 if (meta) btn.appendChild(h('span', 'side-plan-section-meta', meta));
@@ -364,6 +365,7 @@ export function createPlanDetailSideProvider({
                 // 一行胶囊：面包屑（范围 › 工作区 › 工程名）、状态和更新时间、刷新/打开。
                 // 面包屑本身就是工程切换按钮，任何工程都能从这里换过去
                 const crumbs = button('side-plan-crumbs', null, '切换工程');
+                crumbs.dataset.focusKey = 'crumbs';
                 crumbs.setAttribute('aria-haspopup', 'listbox');
                 crumbs.setAttribute('aria-expanded', String(picker.isOpen()));
                 crumbs.addEventListener('click', () => {
@@ -577,12 +579,15 @@ export function createPlanDetailSideProvider({
                 const open = filtersOpen || advancedCount > 0;
                 const toggle = button(`side-plan-filter-toggle${advancedCount ? ' is-active' : ''}`, null, '筛选');
                 toggle.setAttribute('aria-expanded', String(open));
+                toggle.dataset.focusKey = 'filter-toggle';
                 toggle.appendChild(icon('filter_list'));
                 if (advancedCount) toggle.appendChild(h('span', 'side-plan-filter-count', String(advancedCount)));
                 toggle.addEventListener('click', () => { filtersOpen = !open; render(); });
                 row.append(search, toggle);
                 if (hasFilters(filters)) {
                     const clear = button('side-plan-filter-clear', '清除', '清除筛选');
+                    // 清除后按钮消失，焦点回到搜索框
+                    clear.dataset.focusKey = 'filter-clear';
                     clear.addEventListener('click', () => { filters = { ...EMPTY_FILTERS }; filtersOpen = false; runSearch(); });
                     row.appendChild(clear);
                 }
@@ -636,6 +641,7 @@ export function createPlanDetailSideProvider({
                         row.dataset.batchId = String(batch.id);
                         const headBtn = button('side-plan-batch-head');
                         headBtn.setAttribute('aria-expanded', String(open));
+                        headBtn.dataset.focusKey = `batch:${batch.id}`;
                         const mark = h('span', 'side-plan-batch-mark');
                         mark.appendChild(icon(KIND_ICON[batch.kind] || 'commit'));
                         const text = h('div', 'side-plan-batch-text');
@@ -700,6 +706,7 @@ export function createPlanDetailSideProvider({
                     const label = c.maid || '外部修改';
                     const pick = button(`side-plan-contributor-btn${c.maid && filters.maid === c.maid ? ' is-active' : ''}`, null, c.maid ? `只看 @${c.maid} 的改动` : '外部修改');
                     pick.append(icon('person'), h('span', 'side-plan-contributor-name', label), h('span', 'side-plan-contributor-batches', `${c.batches} 批`), diffStat(c.added, c.removed));
+                    pick.dataset.focusKey = `maid:${c.maid || ''}`;
                     if (c.maid) pick.addEventListener('click', () => applyFilter({ maid: c.maid }));
                     else pick.disabled = true;
                     row.appendChild(pick);
@@ -728,10 +735,12 @@ export function createPlanDetailSideProvider({
 
             function render() {
                 if (disposed() || nodeView) return;
-                // 输入框随整页重绘，记下焦点和光标位置
+                // 整页重绘会换掉所有节点：记下焦点所在的输入框（连同光标）、页签或带 data-focus-key 的按钮，画完找回来。
+                // ZCode / DSH 用 React，节点按 key 复用，焦点自然保留；这里手工做同一件事
                 const active = doc.activeElement;
                 const focusKey = active && body.contains(active) ? active.dataset?.filter : null;
                 const pageFocus = active && chrome.contains(active) ? active.dataset?.planPage : null;
+                const elementFocus = active && (body.contains(active) || chrome.contains(active)) ? active.dataset?.focusKey : null;
                 const caret = focusKey && typeof active.selectionStart === 'number' ? [active.selectionStart, active.selectionEnd] : null;
                 const scrollTop = body.scrollTop;
                 body.innerHTML = '';
@@ -756,6 +765,7 @@ export function createPlanDetailSideProvider({
                     body.appendChild(pages.panels);
                     body.scrollTop = scrollTop;
                     if (pageFocus) chrome.querySelector(`[data-plan-page="${navigation.selected}"]`)?.focus();
+                    restoreElementFocus(elementFocus);
                     return;
                 }
                 if (staleError) {
@@ -783,9 +793,19 @@ export function createPlanDetailSideProvider({
                     if (caret && again?.setSelectionRange) { try { again.setSelectionRange(caret[0], caret[1]); } catch (_e) { /* select 没有光标 */ } }
                 }
                 if (pageFocus) chrome.querySelector(`[data-plan-page="${navigation.selected}"]`)?.focus();
+                restoreElementFocus(elementFocus);
                 applyFocus();
             }
 
+            function restoreElementFocus(key) {
+                // 只在焦点因重绘掉出侧栏时补救；用户已经把焦点移到别处就不抢
+                const current = doc.activeElement;
+                if (!key || (current && current !== doc.body && current.isConnected)) return;
+                const same = [...viewElement.querySelectorAll('[data-focus-key]')].find(el => el.dataset.focusKey === key && !el.disabled);
+                const fallback = key === 'filter-clear' ? body.querySelector('[data-filter="keyword"]') : null;
+                (same || fallback)?.focus?.();
+            }
+
             /** 从状态面板点进来时定位到某条计划或某个区块。 */
             function applyFocus() {
                 if (!pendingFocus || !model) return;
diff --git a/tests/side-pane-plan-detail.test.mjs b/tests/side-pane-plan-detail.test.mjs
index 40349eb9a..214cab60c 100644
--- a/tests/side-pane-plan-detail.test.mjs
+++ b/tests/side-pane-plan-detail.test.mjs
@@ -366,3 +366,36 @@ test('a hidden plan tab reads the project once when shown again, not on every ch
     assert.equal(calls.get, 2);
     handle.dispose();
 });
+
+test('keyboard focus survives the redraws a section toggle, a batch toggle and a background refresh cause', async () => {
+    const { provider, view, dom, fire } = makeEnv();
+    const doc = dom.window.document;
+    const handle = await provider.mountTab({ id: planTabId('p1'), payload: { projectId: 'p1' } }, view);
+    try {
+        const sectionToggle = () => view.querySelector('button.side-plan-section-title');
+        const key = sectionToggle().dataset.focusKey;
+        sectionToggle().focus();
+        sectionToggle().click();
+        assert.equal(view.contains(doc.activeElement), true, 'focus is on a live element, not a removed one');
+        assert.equal(doc.activeElement?.dataset?.focusKey, key, 'the section toggle keeps focus after it collapses its section');
+
+        sectionToggle().click(); // 展开回来
+
+        view.querySelector('[data-plan-page="timeline"]').click();
+        const batchHead = () => view.querySelector('.side-plan-batch-head');
+        const batchKey = batchHead().dataset.focusKey;
+        batchHead().focus();
+        batchHead().click();
+        await new Promise(resolve => setTimeout(resolve, 20));
+        assert.equal(view.contains(doc.activeElement), true);
+        assert.equal(doc.activeElement?.dataset?.focusKey, batchKey, 'the batch header keeps focus after it expands');
+
+        fire({ projectId: 'p1' });
+        await new Promise(resolve => setTimeout(resolve, 320));
+        assert.equal(view.contains(doc.activeElement), true);
+        assert.equal(doc.activeElement?.dataset?.focusKey, batchKey, 'a background refresh does not throw focus to <body>');
+    } finally {
+        handle.dispose();
+        dom.window.close();
+    }
+});

From c8b5975d6a79aee1825f2b181e13d4f9e866eef6 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 00:36:37 +0000
Subject: [PATCH 008/143] Git page: the file context menu works from the
 keyboard

Shift+F10 on a change row opened the menu at (0,0) with focus left on
the row, no arrow navigation, and Escape dropped focus. Like the Radix
ContextMenu in ZCode's GitPaneChangeCard, the menu now opens beside the
row when there is no pointer, takes focus, moves with the arrow keys,
Home and End, and Escape, Tab or choosing an item returns focus to the
row. Icon ligature text is hidden from screen readers.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_016hW799u5Ji5k9khDAwu688
---
 .../contracts/generated/chat-event-graph.json | 16 +++----
 .../ui-system/side-pane/git/context-menu.js   | 44 ++++++++++++++++---
 tests/side-pane-git.test.mjs                  | 16 +++++++
 3 files changed, 63 insertions(+), 13 deletions(-)

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 0232725f7..93faa8968 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -1695,7 +1695,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/context-menu.js",
-          "line": 98,
+          "line": 132,
           "kind": "custom-event-listener"
         },
         {
@@ -1796,7 +1796,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/context-menu.js",
-          "line": 98,
+          "line": 132,
           "kind": "custom-event-listener",
           "match": "win.addEventListener('blur'"
         },
@@ -4179,7 +4179,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/context-menu.js",
-          "line": 90,
+          "line": 114,
           "kind": "custom-event-listener"
         },
         {
@@ -5740,7 +5740,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/context-menu.js",
-          "line": 90,
+          "line": 114,
           "kind": "custom-event-listener",
           "match": "btn.addEventListener('click'"
         },
@@ -15463,7 +15463,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/context-menu.js",
-          "line": 97,
+          "line": 131,
           "kind": "custom-event-listener"
         },
         {
@@ -15826,7 +15826,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/context-menu.js",
-          "line": 97,
+          "line": 131,
           "kind": "custom-event-listener",
           "match": "doc.addEventListener('keydown'"
         },
@@ -22954,7 +22954,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/context-menu.js",
-          "line": 96,
+          "line": 130,
           "kind": "custom-event-listener"
         },
         {
@@ -23008,7 +23008,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/context-menu.js",
-          "line": 96,
+          "line": 130,
           "kind": "custom-event-listener",
           "match": "doc.addEventListener('pointerdown'"
         },
diff --git a/modules/ui-system/side-pane/git/context-menu.js b/modules/ui-system/side-pane/git/context-menu.js
index 61b4f045c..512b8344d 100644
--- a/modules/ui-system/side-pane/git/context-menu.js
+++ b/modules/ui-system/side-pane/git/context-menu.js
@@ -27,6 +27,8 @@ export function createGitContextMenu({
     workspaceOf
 }) {
     let contextMenu = null;
+    // 打开菜单的那一行：Esc、Tab 或执行完菜单项后焦点回到这里
+    let returnFocusTo = null;
 
     async function copyText(text, label) {
         try {
@@ -55,10 +57,13 @@ export function createGitContextMenu({
         }
     }
 
-    function closeContextMenu() {
+    function closeContextMenu({ restoreFocus = false } = {}) {
         if (!contextMenu) return;
         contextMenu.remove();
         contextMenu = null;
+        const target = returnFocusTo;
+        returnFocusTo = null;
+        if (restoreFocus && target?.isConnected) target.focus?.({ preventScroll: true });
         doc.removeEventListener('pointerdown', onOutsidePointer, true);
         doc.removeEventListener('keydown', onMenuKey, true);
         win.removeEventListener('blur', closeContextMenu);
@@ -66,7 +71,26 @@ export function createGitContextMenu({
 
     function onOutsidePointer(event) { if (contextMenu && !contextMenu.contains(event.target)) closeContextMenu(); }
 
-    function onMenuKey(event) { if (event.key === 'Escape') closeContextMenu(); }
+    // 和 ZCode GitPaneChangeCard 用的 Radix ContextMenu 一样：上下键 / Home / End 在菜单项间移动，Esc 或 Tab 收起并把焦点还给那一行
+    function onMenuKey(event) {
+        if (!contextMenu) return;
+        if (event.key === 'Escape' || event.key === 'Tab') {
+            event.preventDefault();
+            closeContextMenu({ restoreFocus: true });
+            return;
+        }
+        if (!contextMenu.contains(doc.activeElement)) return;
+        if (!['ArrowDown', 'ArrowUp', 'Home', 'End'].includes(event.key)) return;
+        const items = [...contextMenu.querySelectorAll('[role="menuitem"]:not([disabled])')];
+        if (!items.length) return;
+        event.preventDefault();
+        const current = items.indexOf(doc.activeElement);
+        let next = 0;
+        if (event.key === 'End') next = items.length - 1;
+        else if (event.key === 'ArrowDown') next = current < 0 ? 0 : (current + 1) % items.length;
+        else if (event.key === 'ArrowUp') next = current < 0 ? items.length - 1 : (current - 1 + items.length) % items.length;
+        items[next].focus();
+    }
 
     function openContextMenu(event, item) {
         event.preventDefault();
@@ -85,14 +109,24 @@ export function createGitContextMenu({
             btn.className = 'side-git-context-item';
             btn.setAttribute('role', 'menuitem');
             btn.disabled = Boolean(entry.disabled);
-            btn.innerHTML = `<span class="vcp-ui-icon">${entry.icon}</span><span class="side-git-context-label"></span>`;
+            btn.innerHTML = `<span class="vcp-ui-icon" aria-hidden="true">${entry.icon}</span><span class="side-git-context-label"></span>`;
             btn.lastElementChild.textContent = entry.label;
-            btn.addEventListener('click', () => { closeContextMenu(); entry.run(); });
+            btn.addEventListener('click', () => { closeContextMenu({ restoreFocus: true }); entry.run(); });
             menu.appendChild(btn);
         });
         doc.body.appendChild(menu);
-        placeMenuAt(menu, event.clientX, event.clientY, win);
+        // 键盘（Shift+F10 / 菜单键）打开时没有指针坐标，贴着那一行出菜单
+        const anchor = typeof event.currentTarget?.getBoundingClientRect === 'function' ? event.currentTarget : null;
+        let { clientX: x, clientY: y } = event;
+        if (!x && !y && anchor?.getBoundingClientRect) {
+            const rect = anchor.getBoundingClientRect();
+            x = rect.left + 8;
+            y = rect.bottom;
+        }
+        placeMenuAt(menu, x, y, win);
         contextMenu = menu;
+        returnFocusTo = anchor || (doc.activeElement !== doc.body ? doc.activeElement : null);
+        menu.querySelector('[role="menuitem"]:not([disabled])')?.focus?.({ preventScroll: true });
         doc.addEventListener('pointerdown', onOutsidePointer, true);
         doc.addEventListener('keydown', onMenuKey, true);
         win.addEventListener('blur', closeContextMenu);
diff --git a/tests/side-pane-git.test.mjs b/tests/side-pane-git.test.mjs
index 95370260f..025ebc86f 100644
--- a/tests/side-pane-git.test.mjs
+++ b/tests/side-pane-git.test.mjs
@@ -97,6 +97,22 @@ test('the Git view has source select, flat change cards, expandable diff, contex
     await new Promise(resolve => setTimeout(resolve, 20));
     assert.deepEqual(cards().map(c => c.dataset.path), ['src/staged.js']);
 
+    // keyboard: Shift+F10 on a row opens the menu with focus inside, arrows move, Escape returns focus to the row
+    const kbRow = cards()[0].querySelector('.side-git-row');
+    kbRow.focus();
+    kbRow.dispatchEvent(new dom.window.MouseEvent('contextmenu', { bubbles: true, cancelable: true }));
+    const menuItems = () => [...doc.querySelectorAll('.side-git-context-item')];
+    assert.equal(doc.activeElement, menuItems()[0], 'focus moves into the menu');
+    assert.equal(menuItems()[0].querySelector('.vcp-ui-icon').getAttribute('aria-hidden'), 'true');
+    doc.activeElement.dispatchEvent(new dom.window.KeyboardEvent('keydown', { key: 'ArrowDown', bubbles: true }));
+    assert.equal(doc.activeElement, menuItems()[1]);
+    doc.activeElement.dispatchEvent(new dom.window.KeyboardEvent('keydown', { key: 'ArrowUp', bubbles: true }));
+    doc.activeElement.dispatchEvent(new dom.window.KeyboardEvent('keydown', { key: 'ArrowUp', bubbles: true }));
+    assert.equal(doc.activeElement, menuItems()[2], 'arrows wrap around');
+    doc.activeElement.dispatchEvent(new dom.window.KeyboardEvent('keydown', { key: 'Escape', bubbles: true }));
+    assert.equal(doc.querySelector('.side-git-context-menu'), null);
+    assert.equal(doc.activeElement, kbRow, 'Escape hands focus back to the row');
+
     // context menu: reveal / copy absolute / copy relative
     cards()[0].querySelector('.side-git-row').dispatchEvent(new dom.window.MouseEvent('contextmenu', { bubbles: true, cancelable: true, clientX: 10, clientY: 10 }));
     const items = [...doc.querySelectorAll('.side-git-context-item')];

From a53275a59e7f8a03e3ad24e8f5dcf7be6645191c Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 00:37:55 +0000
Subject: [PATCH 009/143] Code viewer: the file button shows the file in the
 file manager

The button called openPythonAttachmentInTextEditor, which only accepts
.py file URLs on Windows, so it failed silently for every file. Sending
the path to open-external-link instead would hand model-supplied paths
(.bat, .lnk) to shell.openExternal. The button now reveals workspace
files through the workspace-checked git:reveal-path and shows the path
for anything else.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_016hW799u5Ji5k9khDAwu688
---
 .../side-pane/codeViewerSideProvider.js       | 29 +++++++++++------
 tests/side-pane-code-viewer.test.mjs          | 31 +++++++++++++++++++
 2 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/modules/ui-system/side-pane/codeViewerSideProvider.js b/modules/ui-system/side-pane/codeViewerSideProvider.js
index e027db9c3..3e7eb8ddb 100644
--- a/modules/ui-system/side-pane/codeViewerSideProvider.js
+++ b/modules/ui-system/side-pane/codeViewerSideProvider.js
@@ -16,6 +16,7 @@ import { readFileForViewer } from './code-viewer/file-read.js';
 import { createCodeViewerDiffView } from './code-viewer/diff-view.js';
 import { computeLineDiff } from '../line-diff.js';
 import { detectLanguage } from './code-viewer/helpers.js';
+import { toWorkspaceRelative } from '../git-file-diff.js';
 import { createSidePaneRootScope } from './side-pane-occurrence.js';
 export { detectLanguage } from './code-viewer/helpers.js';
 export { escapeHtml } from '../text-escape.js';
@@ -156,9 +157,9 @@ export function createCodeViewerSideProvider({
                 externalBtn.type = 'button';
                 externalBtn.className = 'side-code-action-btn';
                 externalBtn.setAttribute('data-action', 'open-external');
-                externalBtn.title = '在外部编辑器中打开';
-                externalBtn.setAttribute('aria-label', '外部打开');
-                externalBtn.innerHTML = '<span class="vcp-ui-icon">open_in_new</span>';
+                externalBtn.title = '在文件管理器中显示';
+                externalBtn.setAttribute('aria-label', '在文件管理器中显示');
+                externalBtn.innerHTML = '<span class="vcp-ui-icon" aria-hidden="true">folder_open</span>';
             }
 
             // Reload Button（文件可能已在外部被修改或删除）
@@ -303,13 +304,21 @@ export function createCodeViewerSideProvider({
             if (reloadBtn) own.listen(reloadBtn, 'click', () => reload());
 
             if (externalBtn && filePath) {
-                own.listen(externalBtn, 'click', () => {
-                    if (api?.openPythonAttachmentInTextEditor) {
-                        api.openPythonAttachmentInTextEditor(filePath);
-                    } else if (api?.sendOpenExternalLink) {
-                        api.sendOpenExternalLink(filePath);
-                    } else {
-                        uiHelper?.showToastNotification?.(`文件路径: ${filePath}`, 'info');
+                // 只在文件管理器里定位，不按文件关联打开：路径可能来自模型的工具调用，.bat / .lnk 按关联打开就是执行。
+                // 已登记工作区里的文件走 gitRevealPath（主进程校验在工作区内）；别处的文件只提示路径。
+                own.listen(externalBtn, 'click', async () => {
+                    const toast = (message, type) => uiHelper?.showToastNotification?.(message, type);
+                    try {
+                        const listed = typeof api?.gitRevealPath === 'function' ? await api.gitListWorkspaces?.() : null;
+                        const match = listed?.success ? toWorkspaceRelative(filePath, listed.data?.workspaces) : null;
+                        if (!match) {
+                            toast(`文件路径：${filePath}`, 'info');
+                            return;
+                        }
+                        const res = await api.gitRevealPath(match.workspace.id, match.relPath);
+                        if (!res?.success) throw new Error(res?.error || '无法在文件管理器中显示');
+                    } catch (error) {
+                        toast(error?.message || String(error), 'error');
                     }
                 });
             }
diff --git a/tests/side-pane-code-viewer.test.mjs b/tests/side-pane-code-viewer.test.mjs
index 08a5e0715..95f381327 100644
--- a/tests/side-pane-code-viewer.test.mjs
+++ b/tests/side-pane-code-viewer.test.mjs
@@ -308,3 +308,34 @@ test('large files only render the first preview chunk, cut at a line end', async
         dom.window.close();
     }
 });
+
+test('the file button reveals a workspace file in the file manager and never opens it by association', async () => {
+    const dom = new JSDOM('<section id="view"></section>');
+    const doc = dom.window.document;
+    const revealed = [];
+    const toasts = [];
+    const opened = [];
+    const api = {
+        gitListWorkspaces: async () => ({ success: true, data: { workspaces: [{ id: 'ws1', path: 'C:\\proj' }] } }),
+        sourceReadFile: async () => ({ success: true, data: { content: 'x', encoding: 'utf8' } }),
+        gitRevealPath: async (wsId, rel) => { revealed.push([wsId, rel]); return { success: true }; },
+        openPythonAttachmentInTextEditor: (p) => opened.push(p),
+        sendOpenExternalLink: (p) => opened.push(p)
+    };
+    const provider = createCodeViewerSideProvider({ document: doc, api, uiHelper: { showToastNotification: (m, t) => toasts.push([m, t]) } });
+    const click = async (filePath) => {
+        const view = doc.createElement('section');
+        doc.body.append(view);
+        const handle = await provider.mountTab({ title: 'f', payload: { filePath } }, view);
+        view.querySelector('[data-action="open-external"]').click();
+        await new Promise(resolve => setTimeout(resolve, 10));
+        await handle?.dispose?.();
+    };
+    await click('C:\\proj\\src\\a.js');
+    assert.deepEqual(revealed, [['ws1', 'src/a.js']]);
+    await click('C:\\Users\\me\\payload.bat');
+    assert.deepEqual(revealed.length, 1, 'a file outside the workspaces is not revealed');
+    assert.equal(toasts.at(-1)[0].includes('payload.bat'), true, 'its path is shown instead');
+    assert.deepEqual(opened, [], 'nothing is opened through a file association');
+    dom.window.close();
+});

From ba0f44d783a6427396ea1aa2b1ed00f0738204a5 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 00:39:25 +0000
Subject: [PATCH 010/143] Side pane resizer: keyboard resizing saves the width
 once, after the keys stop

Each arrow, Home or End press wrote settings over IPC, about 30 writes a
second while an arrow key was held. The width still applies on every
press; the save now waits until the keys stop for 400 ms (the debounced
onLayoutChange ZCode's resizable.tsx uses), and runs at once when focus
leaves the handle or the pane is torn down. Pointer drags save on
release as before.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_016hW799u5Ji5k9khDAwu688
---
 .../contracts/generated/chat-event-graph.json | 15 ++++++-
 .../side-pane/side-pane-resizer-owner.js      | 37 ++++++++++++---
 tests/side-pane-resizer-owner.test.mjs        | 45 +++++++++++++++++++
 3 files changed, 90 insertions(+), 7 deletions(-)

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 93faa8968..3963b815c 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -1708,6 +1708,11 @@
           "line": 146,
           "kind": "custom-event-listener"
         },
+        {
+          "file": "modules/ui-system/side-pane/side-pane-resizer-owner.js",
+          "line": 168,
+          "kind": "custom-event-listener"
+        },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-menu.js",
           "line": 95,
@@ -1812,6 +1817,12 @@
           "kind": "custom-event-listener",
           "match": "profileName.addEventListener('blur'"
         },
+        {
+          "file": "modules/ui-system/side-pane/side-pane-resizer-owner.js",
+          "line": 168,
+          "kind": "custom-event-listener",
+          "match": "handle?.addEventListener?.('blur'"
+        },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-menu.js",
           "line": 95,
@@ -15498,7 +15509,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-resizer-owner.js",
-          "line": 143,
+          "line": 167,
           "kind": "custom-event-listener"
         },
         {
@@ -15868,7 +15879,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-resizer-owner.js",
-          "line": 143,
+          "line": 167,
           "kind": "custom-event-listener",
           "match": "handle?.addEventListener?.('keydown'"
         },
diff --git a/modules/ui-system/side-pane/side-pane-resizer-owner.js b/modules/ui-system/side-pane/side-pane-resizer-owner.js
index 901948886..69bbef078 100644
--- a/modules/ui-system/side-pane/side-pane-resizer-owner.js
+++ b/modules/ui-system/side-pane/side-pane-resizer-owner.js
@@ -12,7 +12,9 @@ export function createSidePaneResizerOwner({
     onWidthCommit = null,
     scope = null,
     documentRef = (typeof document !== 'undefined' ? document : null),
-    windowRef = (typeof window !== 'undefined' ? window : null)
+    windowRef = (typeof window !== 'undefined' ? window : null),
+    // 键盘调宽时按住方向键每秒几十次，宽度当场生效，写设置等停手后再写一次（同 ZCode resizable.tsx 走防抖的 onLayoutChange）
+    keyboardCommitDelayMs = 400
 }) {
     if (!handle || !paneElement) {
         throw new TypeError('SidePaneResizerOwner requires a handle and paneElement');
@@ -53,6 +55,27 @@ export function createSidePaneResizerOwner({
 
     let isDisposed = false;
     let dragStyles = null;
+    let keyboardCommit = null; // { timer, width }
+
+    function flushKeyboardCommit() {
+        if (!keyboardCommit) return;
+        const { timer, width } = keyboardCommit;
+        keyboardCommit = null;
+        win?.clearTimeout?.(timer);
+        onWidthCommit?.(width);
+    }
+
+    function commitWidth(width, fromKeyboard) {
+        if (!fromKeyboard) {
+            if (keyboardCommit) { win?.clearTimeout?.(keyboardCommit.timer); keyboardCommit = null; }
+            onWidthCommit?.(width);
+            return;
+        }
+        onWidthChange?.(width);
+        if (keyboardCommit) win?.clearTimeout?.(keyboardCommit.timer);
+        keyboardCommit = { width, timer: win?.setTimeout?.(flushKeyboardCommit, keyboardCommitDelayMs) };
+        if (!keyboardCommit.timer) flushKeyboardCommit();
+    }
 
     function restoreDragStyles() {
         if (!dragStyles) return;
@@ -108,11 +131,11 @@ export function createSidePaneResizerOwner({
             }
             handle.classList.add('active');
         },
-        onCommit: (width) => {
+        onCommit: (width, event) => {
             if (isDisposed) return;
             const finalWidth = Math.round(width);
             handle?.setAttribute?.('aria-valuenow', String(finalWidth));
-            onWidthCommit?.(finalWidth);
+            commitWidth(finalWidth, event?.type === 'keydown');
         }
     });
 
@@ -135,12 +158,14 @@ export function createSidePaneResizerOwner({
                 paneElement.style.width = `${finalWidth}px`;
             }
             handle?.setAttribute?.('aria-valuenow', String(finalWidth));
-            onWidthChange?.(finalWidth);
-            onWidthCommit?.(finalWidth);
+            commitWidth(finalWidth, true);
         }
     };
+    // 焦点离开分隔条时把没写的宽度写掉
+    const onBlur = () => flushKeyboardCommit();
 
     handle?.addEventListener?.('keydown', onKeydown);
+    handle?.addEventListener?.('blur', onBlur);
 
     const owner = Object.freeze({
         cancel() {
@@ -156,8 +181,10 @@ export function createSidePaneResizerOwner({
         },
         dispose() {
             if (isDisposed) return;
+            flushKeyboardCommit();
             isDisposed = true;
             handle?.removeEventListener?.('keydown', onKeydown);
+            handle?.removeEventListener?.('blur', onBlur);
             try {
                 resizer?.dispose?.();
             } finally {
diff --git a/tests/side-pane-resizer-owner.test.mjs b/tests/side-pane-resizer-owner.test.mjs
index 83a77e044..01cb99f01 100644
--- a/tests/side-pane-resizer-owner.test.mjs
+++ b/tests/side-pane-resizer-owner.test.mjs
@@ -132,3 +132,48 @@ test('one arrow key press moves the side pane once and commits once', async () =
     assert.equal(width, 780);
     assert.deepEqual(commits, [420, 400, 780]);
 });
+
+test('holding an arrow key resizes on every press but saves the width once, after the keys stop', async () => {
+    const { readFile } = await import('node:fs/promises');
+    const source = await readFile(new URL('../modules/ui-system/sidebar-resizer.js', import.meta.url), 'utf8');
+    const win = { requestAnimationFrame: fn => setTimeout(fn, 0), cancelAnimationFrame: clearTimeout };
+    new Function('window', source)(win);
+
+    const listeners = {};
+    const handle = {
+        setAttribute() {},
+        classList: { toggle() {} },
+        addEventListener(type, fn) { (listeners[type] ||= []).push(fn); },
+        removeEventListener() {},
+        ownerDocument: { body: { style: {}, classList: { toggle() {} } } },
+    };
+    let width = 400;
+    const pane = { style: {}, getBoundingClientRect: () => ({ width }) };
+    const commits = [];
+    const owner = createSidePaneResizerOwner({
+        handle,
+        paneElement: pane,
+        resizerFactory: win.VCPSidebarResizer.create,
+        documentRef: { querySelector: () => null, addEventListener() {}, removeEventListener() {} },
+        windowRef: { innerWidth: 1200, setTimeout, clearTimeout },
+        keyboardCommitDelayMs: 30,
+        onWidthChange: w => { width = w; },
+        onWidthCommit: w => commits.push(w),
+    });
+
+    const press = key => listeners.keydown.forEach(fn => fn({ type: 'keydown', key, preventDefault() {} }));
+    for (let i = 0; i < 5; i++) press('ArrowLeft');
+    assert.equal(width, 500, 'every press resizes right away');
+    assert.deepEqual(commits, [], 'nothing is saved while keys are still coming');
+    await new Promise(resolve => setTimeout(resolve, 60));
+    assert.deepEqual(commits, [500]);
+
+    press('End');
+    assert.equal(width, 780);
+    listeners.blur.forEach(fn => fn());
+    assert.deepEqual(commits, [500, 780], 'leaving the handle saves at once');
+
+    press('ArrowRight');
+    owner.dispose();
+    assert.deepEqual(commits, [500, 780, 760], 'disposing saves what is pending');
+});

From 6afd6086219d2d000b4ca1afce4589d114f77c12 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 00:40:06 +0000
Subject: [PATCH 011/143] Side pane: open/close animation, topic scope,
 dormancy quota and tab focus hold under real use

- Reopening while the close animation runs no longer leaves the pane collapsed with
  its expand button hidden; a repeated open no longer jumps back to zero width.
- With no current conversation (group selected, early startup) topic tabs of other
  conversations stay off the strip, so "close all" can no longer delete their side chats.
- Keep views (side chats) no longer take places under the live-view limit; browser tabs
  sleep only for the limit, not for being hidden; collapsing the pane no longer puts the
  current tab to sleep.
- Arrow keys on the tab strip keep focus on the tab; tab ids with Windows paths or
  quotes are looked up without building selectors.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DFRovoZHMzeheXKkLNWKG
---
 .../side-pane/side-pane-controller.js         | 10 +--
 .../ui-system/side-pane/side-pane-dormancy.js |  9 ++-
 .../ui-system/side-pane/side-pane-state.js    | 20 +++---
 .../side-pane/side-pane-tab-strip.js          | 15 +++--
 .../side-pane/side-pane-tab-utils.js          | 10 +++
 .../ui-system/side-pane/side-pane-types.js    |  5 +-
 .../side-pane/side-pane-visibility.js         | 37 ++++++++++-
 .../ui-system/side-pane/tab-types/browser.js  |  1 +
 tests/side-chat-audit-probes.test.mjs         |  1 +
 tests/side-chat-ephemeral-parity.test.mjs     |  1 +
 tests/side-chat-integration.test.mjs          |  1 +
 tests/side-pane-controller.test.mjs           |  1 +
 tests/side-pane-dormancy.test.mjs             | 42 ++++++++++++
 tests/side-pane-parent-scope.test.mjs         | 59 +++++++++++++++++
 tests/side-pane-state.test.mjs                |  9 +--
 tests/side-pane-tab-keyboard.test.mjs         | 63 ++++++++++++++++++
 tests/side-pane-terminal-lifecycle.test.mjs   | 11 ++--
 tests/side-pane-visibility-animation.test.mjs | 65 +++++++++++++++++++
 18 files changed, 325 insertions(+), 35 deletions(-)
 create mode 100644 tests/side-pane-parent-scope.test.mjs
 create mode 100644 tests/side-pane-tab-keyboard.test.mjs
 create mode 100644 tests/side-pane-visibility-animation.test.mjs

diff --git a/modules/ui-system/side-pane/side-pane-controller.js b/modules/ui-system/side-pane/side-pane-controller.js
index d90d60ad6..3d2358adf 100644
--- a/modules/ui-system/side-pane/side-pane-controller.js
+++ b/modules/ui-system/side-pane/side-pane-controller.js
@@ -15,6 +15,7 @@ import { createSidePaneShortcuts } from './side-pane-shortcuts.js';
 import { createSidePaneLayoutStore, parseLayout, rememberBounded, serializeLayout } from './side-pane-persistence.js';
 import { createSidePaneRootScope, createTabOccurrence } from './side-pane-occurrence.js';
 import { selectDormantViews } from './side-pane-dormancy.js';
+import { findByTabId } from './side-pane-tab-utils.js';
 
 /** @typedef {import('./side-pane-types.js').SidePaneTab} SidePaneTab */
 /** @typedef {import('./side-pane-types.js').SidePaneTabType} SidePaneTabType */
@@ -245,7 +246,7 @@ export function createSidePaneController({
             isClosable: isClosableTab,
             statusTabId: SidePaneState.NOTIFICATIONS_TAB_ID,
             getStatus: readConnectionStatus,
-            onActivate: (tabId) => controller.activateTab(tabId),
+            onActivate: (tabId, options) => controller.activateTab(tabId, options),
             onClose: (tabId) => controller.closeTab(tabId),
             onReorder: (activeId, overId) => controller.reorderTab(activeId, overId),
             onContextMenu: (tabId, x, y) => tabMenu?.show(tabId, x, y),
@@ -339,9 +340,10 @@ export function createSidePaneController({
     }
 
     // ---- 休眠 ----
-    // 计时看的是"在面板里是不是当前标签"，不看窗口有没有最小化：用户回来时看到的还是它，不该被换掉
+    // 计时看的是"在当前对话里是不是当前标签"，不看窗口有没有最小化，也不看面板是否收起：
+    // 用户重新展开时看到的还是它，不该被换掉（对照 ZCode shouldMountSidePaneContent、DSH TabLayout 收起时保留选中标签）
     function isTabPresented(tabId, { visibleTabIds, activeViewId } = getActiveView()) {
-        return !isDisposed && state.visible && tabId === activeViewId && visibleTabIds.has(tabId);
+        return !isDisposed && tabId === activeViewId && visibleTabIds.has(tabId);
     }
 
     function noteViewPresence(active = getActiveView()) {
@@ -477,7 +479,7 @@ export function createSidePaneController({
 
         const pending = { promise: null, viewElement: null, canceled: false, onClosed };
         const mounting = (async () => {
-            let view = contentContainer?.querySelector(`[data-tab-id="${tabId}"]`);
+            let view = findByTabId(contentContainer, '[data-tab-id]', tabId);
             if (!view && contentContainer) {
                 view = doc.createElement('section');
                 view.className = 'side-pane-view';
diff --git a/modules/ui-system/side-pane/side-pane-dormancy.js b/modules/ui-system/side-pane/side-pane-dormancy.js
index e2cb579b8..39c75f4d7 100644
--- a/modules/ui-system/side-pane/side-pane-dormancy.js
+++ b/modules/ui-system/side-pane/side-pane-dormancy.js
@@ -5,6 +5,9 @@
  *   - 同时挂着的视图超过 maxLiveViews 时，最久没显示的先休眠。
  * 不休眠：正在显示的、类型声明 dormancy 'keep' 的、视图报告自己正忙的（加载中、在放声音、命令还在跑……），
  * 忙的到期后隔 busyRetryMs 再看一次。
+ * 'limit-only' 的类型（浏览器）不按隐藏时长休眠，只在超过上限时参与淘汰：销毁网页会丢掉表单、登录和后退栈，
+ * 代价远高于重建其他视图（对照 ZCode browserTabResidencyPolicy.ts 只按数量淘汰）。
+ * 'keep' 的视图不占 maxLiveViews 的名额，否则它们攒多了会把其他标签一切走就挤去休眠。
  * 这里只做判断，不碰 DOM 和定时器，控制器负责执行和定时。
  */
 
@@ -19,7 +22,7 @@ export const DORMANCY_DEFAULTS = Object.freeze({
  * @typedef {object} DormancyCandidate
  * @property {string} tabId
  * @property {boolean} shown 正在显示
- * @property {'none' | 'detach' | 'keep'} dormancy
+ * @property {'none' | 'detach' | 'limit-only' | 'keep'} dormancy
  * @property {boolean} busy
  * @property {boolean} otherTopic 属于别的对话
  * @property {number | null} hiddenSince 从什么时候开始不显示；一直没显示过的用挂载时间
@@ -45,7 +48,7 @@ export function selectDormantViews(candidates, options) {
     const sleepable = candidate => !candidate.shown && candidate.dormancy !== 'keep';
 
     for (const candidate of candidates) {
-        if (!sleepable(candidate)) continue;
+        if (!sleepable(candidate) || candidate.dormancy === 'limit-only') continue;
         const reason = candidate.otherTopic ? 'other-topic' : 'hidden';
         const due = (candidate.hiddenSince ?? now) + (candidate.otherTopic ? otherTopicMs : hiddenMs);
         if (due > now) {
@@ -58,7 +61,7 @@ export function selectDormantViews(candidates, options) {
         }
     }
 
-    let live = candidates.length - released.size;
+    let live = candidates.filter(candidate => candidate.dormancy !== 'keep').length - released.size;
     if (live > maxLiveViews) {
         const victims = candidates
             .filter(candidate => sleepable(candidate) && !candidate.busy && !released.has(candidate.tabId))
diff --git a/modules/ui-system/side-pane/side-pane-state.js b/modules/ui-system/side-pane/side-pane-state.js
index 0824e86e5..58556e160 100644
--- a/modules/ui-system/side-pane/side-pane-state.js
+++ b/modules/ui-system/side-pane/side-pane-state.js
@@ -222,8 +222,7 @@ export function openTab(state, rawTab) {
     }
 
     const tabParent = getTabParent({ ...rawTab, scopeMode });
-    const isVisibleForCurrentParent = scopeMode === 'global' || !state.parent || !tabParent
-        || matchesConversation(tabParent, state.parent);
+    const isVisibleForCurrentParent = isTabVisibleForParent({ ...rawTab, scopeMode }, state.parent);
 
     return Object.freeze({
         ...state,
@@ -320,14 +319,17 @@ export function reorderTabs(state, activeId, overId) {
     return Object.freeze({ ...state, tabs: Object.freeze(next) });
 }
 
+// 话题级标签只在所属对话里可见；没有当前对话（群组、启动早期）时一律不可见，
+// 否则「关闭所有」会关掉、进而删除别的对话的辅助对话（对照 ZCode workspaceSidePane.ts isSidePaneTabVisibleForParent）
+function isTabVisibleForParent(tab, parentRef) {
+    if (tab.id === NOTIFICATIONS_TAB_ID || tab.scopeMode === 'global') return true;
+    const tabParent = getTabParent(tab);
+    if (!tabParent) return true;
+    return matchesConversation(tabParent, parentRef);
+}
+
 export function getVisibleTabs(state, parentRef = null) {
-    if (!parentRef) return state.tabs;
-    return state.tabs.filter(tab => {
-        if (tab.id === NOTIFICATIONS_TAB_ID) return true;
-        if (tab.scopeMode === 'global') return true;
-        const tabParent = getTabParent(tab);
-        return tabParent ? matchesConversation(tabParent, parentRef) : true;
-    });
+    return state.tabs.filter(tab => isTabVisibleForParent(tab, parentRef));
 }
 
 const api = Object.freeze({
diff --git a/modules/ui-system/side-pane/side-pane-tab-strip.js b/modules/ui-system/side-pane/side-pane-tab-strip.js
index 964f5fe82..f5c279ccc 100644
--- a/modules/ui-system/side-pane/side-pane-tab-strip.js
+++ b/modules/ui-system/side-pane/side-pane-tab-strip.js
@@ -2,7 +2,7 @@
 'use strict';
 
 import { createTabSortable } from './side-pane-tab-dnd.js';
-import { getTabIconName, resolveTabsOverflow } from './side-pane-tab-utils.js';
+import { findByTabId, getTabIconName, resolveTabsOverflow } from './side-pane-tab-utils.js';
 
 // 标签标题悬停提示、面板切换动画、可拖拽排序的标签
 const TAB_TOOLTIP_DELAY_MS = 1500;
@@ -133,7 +133,7 @@ export function createSidePaneTabStrip({
     function syncStatus() {
         const current = statusTabId ? getStatus() : null;
         if (!current) return;
-        const btn = tabListElement.querySelector(`.side-pane-tab[data-tab-id="${statusTabId}"]`);
+        const btn = findByTabId(tabListElement, '.side-pane-tab[data-tab-id]', statusTabId);
         const dot = btn?.querySelector('.side-pane-tab-status');
         if (!dot) return;
         const { status = 'unknown', text = '' } = current;
@@ -268,7 +268,8 @@ export function createSidePaneTabStrip({
         if (e.key === 'ArrowRight' || e.key === 'ArrowDown') {
             targetIndex = (currentIndex + 1) % tabButtons.length;
         } else if (e.key === 'ArrowLeft' || e.key === 'ArrowUp') {
-            targetIndex = (currentIndex - 1 + tabButtons.length) % tabButtons.length;
+            // 当前是新标签页（不在标签条上）时，往左落到最后一个
+            targetIndex = currentIndex < 0 ? tabButtons.length - 1 : (currentIndex - 1 + tabButtons.length) % tabButtons.length;
         } else if (e.key === 'Home') {
             targetIndex = 0;
         } else if (e.key === 'End') {
@@ -278,8 +279,10 @@ export function createSidePaneTabStrip({
         }
         e.preventDefault();
         if (targetIndex !== currentIndex && targetIndex >= 0 && targetIndex < tabButtons.length) {
-            onActivate(tabButtons[targetIndex].getAttribute('data-tab-id'));
-            tabButtons[targetIndex].focus();
+            // 激活会重建标签条，旧按钮随之离开文档；焦点留在标签上（WAI-ARIA Tabs），按 id 找重建后的按钮
+            const targetId = tabButtons[targetIndex].getAttribute('data-tab-id');
+            onActivate(targetId, { focus: false });
+            findByTabId(tabListElement, '[role="tab"][data-tab-id]', targetId)?.focus?.();
         }
     };
     tabListElement.addEventListener('keydown', onKeydown);
@@ -294,7 +297,7 @@ export function createSidePaneTabStrip({
         syncStatus,
         hideTooltip,
         focusTab(tabId) {
-            tabListElement.querySelector(`[role="tab"][data-tab-id="${tabId}"]`)?.focus?.();
+            findByTabId(tabListElement, '[role="tab"][data-tab-id]', tabId)?.focus?.();
         },
         dispose() {
             disposed = true;
diff --git a/modules/ui-system/side-pane/side-pane-tab-utils.js b/modules/ui-system/side-pane/side-pane-tab-utils.js
index 0da0acbcd..e5dd8f4aa 100644
--- a/modules/ui-system/side-pane/side-pane-tab-utils.js
+++ b/modules/ui-system/side-pane/side-pane-tab-utils.js
@@ -145,3 +145,13 @@ export function moveIdBefore(ids, activeId, overId) {
     next.splice(to, 0, activeId);
     return next;
 }
+
+// 按 data-tab-id 找元素，不把 id 拼进选择器：文件标签的 id 带 Windows 路径（反斜杠会被当成转义）或引号
+export function findByTabId(container, selector, tabId) {
+    if (!container || tabId == null) return null;
+    const id = String(tabId);
+    for (const element of container.querySelectorAll(selector)) {
+        if (element.getAttribute('data-tab-id') === id) return element;
+    }
+    return null;
+}
diff --git a/modules/ui-system/side-pane/side-pane-types.js b/modules/ui-system/side-pane/side-pane-types.js
index dfe5080dc..ba5553a89 100644
--- a/modules/ui-system/side-pane/side-pane-types.js
+++ b/modules/ui-system/side-pane/side-pane-types.js
@@ -93,10 +93,11 @@
  * @property {SidePaneProvider | null} [provider] 没有时只占位，不挂视图（比如通知）。
  *   可以是 tab-types/lazy-provider.js 的懒加载代理，第一次挂载或第一次调用 open 函数时才加载实现
  * @property {() => Promise<SidePaneProvider> | SidePaneProvider} [load] 没给 provider 时用它懒加载
- * @property {'none' | 'detach' | 'keep'} [dormancy] 隐藏太久时怎么休眠：
+ * @property {'none' | 'detach' | 'limit-only' | 'keep'} [dormancy] 隐藏太久时怎么休眠：
  *   none（默认）释放视图、保留标签，再显示时重新挂载；detach 同样释放视图，但 provider 把会话和画面
  *   挂在 occurrence 上，休眠时把画面收进暂存区，重新挂载时接回去（终端），会话不动；
- *   keep 不休眠（比如有没发出去的输入）
+ *   limit-only 不按隐藏时长休眠，只在挂着的视图超过上限时参与淘汰（浏览器）；
+ *   keep 不休眠，也不占视图上限的名额（比如有没发出去的输入）
  * @property {SidePaneOpenTabEntry | null} [entry] 有时出现在新标签页里
  * @property {(payload: object, tabs: readonly SidePaneTab[]) => SidePaneTab} [toTab]
  *   openTab(payload) 先经过它变成标签；可以返回已有标签的 id 让重复打开落到同一个标签上
diff --git a/modules/ui-system/side-pane/side-pane-visibility.js b/modules/ui-system/side-pane/side-pane-visibility.js
index 0a75f0d44..5d95088ad 100644
--- a/modules/ui-system/side-pane/side-pane-visibility.js
+++ b/modules/ui-system/side-pane/side-pane-visibility.js
@@ -26,6 +26,9 @@ export function createSidePaneVisibility({ root, resizerHandle = null, initialRa
     let animating = false;
     let animationTimer = null;
     let animationRafId = null;
+    // 当前这轮动画的目标（true 展开 / false 收起）和它的收尾撤销函数；新一轮开始前必须撤掉旧一轮的 transitionend 监听
+    let animationTarget = null;
+    let cancelTransition = null;
 
     const isJSDOM = (typeof navigator !== 'undefined' && navigator.userAgent && navigator.userAgent.includes('jsdom'))
         || (typeof win !== 'undefined' && win.name === 'nodejs');
@@ -42,6 +45,11 @@ export function createSidePaneVisibility({ root, resizerHandle = null, initialRa
     }
 
     function clearPendingAnimation() {
+        if (cancelTransition) {
+            const cancel = cancelTransition;
+            cancelTransition = null;
+            cancel();
+        }
         if (animationTimer) {
             clearTimeout(animationTimer);
             animationTimer = null;
@@ -75,6 +83,7 @@ export function createSidePaneVisibility({ root, resizerHandle = null, initialRa
     function applySynchronous(isVisible) {
         clearPendingAnimation();
         animating = false;
+        animationTarget = null;
         root.classList.remove('is-animating');
         root.classList.toggle('active', isVisible);
         root.classList.toggle('collapsed', !isVisible);
@@ -93,15 +102,25 @@ export function createSidePaneVisibility({ root, resizerHandle = null, initialRa
         const onTransitionEnd = (e) => {
             if (e.target === root && e.propertyName === 'width') done();
         };
+        let settled = false;
+        const detach = () => {
+            if (settled) return false;
+            settled = true;
+            root.removeEventListener('transitionend', onTransitionEnd);
+            return true;
+        };
         const done = () => {
+            if (!detach()) return;
+            cancelTransition = null;
             clearPendingAnimation();
             animating = false;
-            root.removeEventListener('transitionend', onTransitionEnd);
+            animationTarget = null;
             finish();
             unlockContentWidth();
             resizerHandle?.classList.remove('is-animating', 'is-animating-closing');
         };
         root.addEventListener('transitionend', onTransitionEnd);
+        cancelTransition = detach;
         animationTimer = setTimeout(done, ANIMATION_FALLBACK_MS);
         animationRafId = win.requestAnimationFrame(() => {
             animationRafId = null;
@@ -110,8 +129,11 @@ export function createSidePaneVisibility({ root, resizerHandle = null, initialRa
     }
 
     function animateOpen() {
+        // 收起动画还没走完就反向展开：从当前宽度接着走，不先跳回 0
+        const reversing = animating && animationTarget === false;
         clearPendingAnimation();
         animating = true;
+        animationTarget = true;
 
         const targetPercent = formattedPercent();
         lockContentWidth(readExpandedWidthPx());
@@ -120,8 +142,10 @@ export function createSidePaneVisibility({ root, resizerHandle = null, initialRa
         root.classList.remove('collapsed');
         root.removeAttribute('aria-hidden');
         root.classList.add('is-animating', 'active');
-        root.style.width = '0%';
-        root.style.opacity = '0';
+        if (!reversing) {
+            root.style.width = '0%';
+            root.style.opacity = '0';
+        }
         resizerHandle?.classList.add('is-animating', 'is-animating-closing');
         onSync(true);
 
@@ -139,6 +163,7 @@ export function createSidePaneVisibility({ root, resizerHandle = null, initialRa
     function animateClose() {
         clearPendingAnimation();
         animating = true;
+        animationTarget = false;
 
         const startPercent = root.style.width || formattedPercent();
         lockContentWidth(root.getBoundingClientRect().width);
@@ -197,6 +222,12 @@ export function createSidePaneVisibility({ root, resizerHandle = null, initialRa
                 return;
             }
 
+            // 正朝同一个方向动画时不重启，否则展开到一半会跳回 0 宽
+            if (animating && animationTarget === isVisible) {
+                onSync(isVisible);
+                return;
+            }
+
             const currentlyVisible = root.classList.contains('active') && !root.classList.contains('collapsed');
             if (isVisible === currentlyVisible && !animating) {
                 if (isVisible) root.style.width = formattedPercent();
diff --git a/modules/ui-system/side-pane/tab-types/browser.js b/modules/ui-system/side-pane/tab-types/browser.js
index 959325e4c..a8ebd0ad4 100644
--- a/modules/ui-system/side-pane/tab-types/browser.js
+++ b/modules/ui-system/side-pane/tab-types/browser.js
@@ -7,6 +7,7 @@ export function defineBrowserTabType({ document: doc, window: win, chatAPI, side
     }, ['openBrowserTab']);
     return Object.freeze({
         kind: 'browser', label: '浏览器', icon: 'public', searchHint: '浏览器', provider,
+        dormancy: 'limit-only',
         entry: { id: 'browser', order: 40, open: () => provider.openBrowserTab() }
     });
 }
diff --git a/tests/side-chat-audit-probes.test.mjs b/tests/side-chat-audit-probes.test.mjs
index dc56da949..88a26978f 100644
--- a/tests/side-chat-audit-probes.test.mjs
+++ b/tests/side-chat-audit-probes.test.mjs
@@ -87,6 +87,7 @@ test('R02: Reopening same child activates existing view without duplicate panels
         }
     });
 
+    ctrl.setParent(createDescriptor('s1').parent);
     await ctrl.openTab({ kind: 'chat', descriptor: createDescriptor('s1') });
     await ctrl.openTab({ kind: 'chat', descriptor: createDescriptor('s2') });
 
diff --git a/tests/side-chat-ephemeral-parity.test.mjs b/tests/side-chat-ephemeral-parity.test.mjs
index 1517acccd..9179e2046 100644
--- a/tests/side-chat-ephemeral-parity.test.mjs
+++ b/tests/side-chat-ephemeral-parity.test.mjs
@@ -83,6 +83,7 @@ test('Parity: Closing selection-side-chat destroys runtime and is explicitly exc
         title: 'Ephemeral Side Chat'
     });
 
+    ctrl.setParent(desc.parent);
     await ctrl.openTab({ kind: 'chat', descriptor: desc });
     assert.equal(ctrl.getSnapshot().tabs.length, 2); // notifications + side chat
     assert.equal(ctrl.getSnapshot().activeTabId, desc.id);
diff --git a/tests/side-chat-integration.test.mjs b/tests/side-chat-integration.test.mjs
index a6478a0d8..3fd40cddd 100644
--- a/tests/side-chat-integration.test.mjs
+++ b/tests/side-chat-integration.test.mjs
@@ -100,6 +100,7 @@ test('Full Side Chat lifecycle integration: open, refer, send, and close', async
             model: 'test-model'
         });
 
+        controller.setParent(desc.parent);
         const handle = await controller.openTab({ kind: 'chat', descriptor: desc });
         if (opts.reference) {
             handle.addReference(opts.reference);
diff --git a/tests/side-pane-controller.test.mjs b/tests/side-pane-controller.test.mjs
index ed9cf096d..eb03f75ae 100644
--- a/tests/side-pane-controller.test.mjs
+++ b/tests/side-pane-controller.test.mjs
@@ -95,6 +95,7 @@ test('SidePaneController showNotifications and openChat mount views and sync vis
         title: '测试侧聊',
     };
 
+    controller.setParent(desc.parent);
     await controller.openTab({ kind: 'chat', descriptor: desc });
     assert.equal(controller.getSnapshot().activeTabId, 'side-chat-test');
     assert.equal(tabListElement.children.length, 2);
diff --git a/tests/side-pane-dormancy.test.mjs b/tests/side-pane-dormancy.test.mjs
index 8c075bb0e..a057c345d 100644
--- a/tests/side-pane-dormancy.test.mjs
+++ b/tests/side-pane-dormancy.test.mjs
@@ -232,3 +232,45 @@ test('diagnostics count what each live view still holds, including what its prov
         await h.cleanup();
     }
 });
+
+test('policy: keep views do not take places under the live-view limit', () => {
+    const { release } = selectDormantViews([
+        candidate('chat-1', { dormancy: 'keep' }),
+        candidate('chat-2', { dormancy: 'keep' }),
+        candidate('chat-3', { dormancy: 'keep' }),
+        candidate('browser', { dormancy: 'limit-only', hiddenSince: 0, lastShownAt: 10 }),
+        candidate('plan', { shown: true, hiddenSince: null, lastShownAt: 20 })
+    ], { now: 0, maxLiveViews: 2 });
+    assert.deepEqual(release, []);
+});
+
+test('policy: limit-only views never sleep for being hidden, only for the live-view limit', () => {
+    const now = 60 * 60_000;
+    const hiddenLong = selectDormantViews([
+        candidate('browser', { dormancy: 'limit-only', hiddenSince: 0 })
+    ], { now });
+    assert.deepEqual(hiddenLong.release, []);
+
+    const overLimit = selectDormantViews([
+        candidate('browser-old', { dormancy: 'limit-only', lastShownAt: 1 }),
+        candidate('browser-new', { dormancy: 'limit-only', lastShownAt: 2 }),
+        candidate('shown', { shown: true, hiddenSince: null, lastShownAt: 3 })
+    ], { now, maxLiveViews: 2 });
+    assert.deepEqual(overLimit.release, [{ tabId: 'browser-old', reason: 'view-limit' }]);
+});
+
+test('collapsing the pane does not put the current tab to sleep', async () => {
+    const h = fixture({ hiddenMs: 30 });
+    try {
+        await h.controller.openTab(tab('probe:a'));
+        h.controller.setVisible(false);
+        await sleep(80);
+        await settle();
+
+        assert.deepEqual(h.residency().live, ['probe:a']);
+        assert.deepEqual(h.residency().dormant, []);
+        h.controller.setVisible(true);
+        await settle();
+        assert.equal(h.mounts.length, 1, 'expanding again shows the same view');
+    } finally { await h.cleanup(); }
+});
diff --git a/tests/side-pane-parent-scope.test.mjs b/tests/side-pane-parent-scope.test.mjs
new file mode 100644
index 000000000..ee2936122
--- /dev/null
+++ b/tests/side-pane-parent-scope.test.mjs
@@ -0,0 +1,59 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { JSDOM } from 'jsdom';
+import { createSidePaneController } from '../modules/ui-system/side-pane/side-pane-controller.js';
+import { defineChatTabType } from '../modules/ui-system/side-pane/tab-types/chat.js';
+
+const parentOf = topicId => ({ itemType: 'agent', itemId: 'agent', topicId });
+const descriptor = (id, topicId) => ({
+    id,
+    title: id,
+    parent: parentOf(topicId),
+    child: { itemType: 'agent', itemId: 'agent', topicId: `child-${id}` }
+});
+
+function createController() {
+    const dom = new JSDOM('<main class="main-content"></main><aside id="pane"><div id="tabs"></div><div id="content"><section class="side-pane-view" id="sidePaneViewNotifications"></section></div></aside>');
+    const doc = dom.window.document;
+    const closed = [];
+    const ctrl = createSidePaneController({
+        root: doc.getElementById('pane'),
+        tabListElement: doc.getElementById('tabs'),
+        contentContainer: doc.getElementById('content'),
+        tabTypes: [defineChatTabType({
+            provider: { mountTab: async () => ({ dispose: async () => {}, focus() {} }) },
+            onClosed: desc => closed.push(desc.id)
+        })]
+    });
+    return { doc, ctrl, closed };
+}
+
+test('without a current conversation, topic tabs of other conversations stay off the strip', async () => {
+    const { doc, ctrl } = createController();
+    ctrl.setParent(parentOf('a'));
+    await ctrl.openTab({ kind: 'chat', descriptor: descriptor('side-a', 'a') });
+    ctrl.setParent(parentOf('b'));
+    await ctrl.openTab({ kind: 'chat', descriptor: descriptor('side-b', 'b') });
+
+    ctrl.setParent(null);
+
+    const stripIds = [...doc.querySelectorAll('#tabs [data-tab-id]')].map(el => el.dataset.tabId);
+    assert.ok(!stripIds.includes('side-a'));
+    assert.ok(!stripIds.includes('side-b'));
+    ctrl.dispose?.();
+});
+
+test('close all without a current conversation does not delete other conversations\' side chats', async () => {
+    const { ctrl, closed } = createController();
+    ctrl.setParent(parentOf('a'));
+    await ctrl.openTab({ kind: 'chat', descriptor: descriptor('side-a', 'a') });
+    ctrl.setParent(parentOf('b'));
+    await ctrl.openTab({ kind: 'chat', descriptor: descriptor('side-b', 'b') });
+
+    ctrl.setParent(null);
+    await ctrl.closeAllTabs();
+
+    assert.deepEqual(closed, []);
+    assert.deepEqual(ctrl.getSnapshot().tabs.map(t => t.id).sort(), ['notifications', 'side-a', 'side-b']);
+    ctrl.dispose?.();
+});
diff --git a/tests/side-pane-state.test.mjs b/tests/side-pane-state.test.mjs
index 24a0da6c0..b6a05d841 100644
--- a/tests/side-pane-state.test.mjs
+++ b/tests/side-pane-state.test.mjs
@@ -64,7 +64,7 @@ test('chat tab type validates the descriptor and reuses the tab of an open child
         title: '侧聊 1',
     };
 
-    const s1 = openChat(s0, desc1);
+    const s1 = openChat(SidePaneState.setParent(s0, desc1.parent), desc1);
     assert.equal(s1.visible, true);
     assert.equal(s1.activeTabId, 'side-1');
     assert.equal(s1.tabs.length, 2);
@@ -97,7 +97,7 @@ test('closeTab handles fallback and protects notifications tab', () => {
         title: '侧聊 2',
     };
 
-    let state = openChat(s0, desc1);
+    let state = openChat(SidePaneState.setParent(s0, desc1.parent), desc1);
     state = openChat(state, desc2);
     assert.equal(state.tabs.length, 3);
     assert.equal(state.activeTabId, 'side-2');
@@ -139,8 +139,9 @@ test('getVisibleTabs filters chat tabs by parent conversation reference', () =>
     const visibleB = SidePaneState.getVisibleTabs(state, parentB);
     assert.deepEqual(visibleB.map(t => t.id), ['notifications', 'side-b1']);
 
-    const all = SidePaneState.getVisibleTabs(state, null);
-    assert.equal(all.length, 3);
+    const withoutParent = SidePaneState.getVisibleTabs(state, null);
+    assert.deepEqual(withoutParent.map(t => t.id), ['notifications']);
+    assert.deepEqual(SidePaneState.getClosableVisibleTabs(SidePaneState.setParent(state, null)), []);
 });
 
 test('global tools retain selection and visibility across topic changes', () => {
diff --git a/tests/side-pane-tab-keyboard.test.mjs b/tests/side-pane-tab-keyboard.test.mjs
new file mode 100644
index 000000000..8caba9c23
--- /dev/null
+++ b/tests/side-pane-tab-keyboard.test.mjs
@@ -0,0 +1,63 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { JSDOM } from 'jsdom';
+import { createSidePaneController } from '../modules/ui-system/side-pane/side-pane-controller.js';
+
+const settle = () => new Promise(resolve => setImmediate(resolve));
+
+function createController() {
+    const dom = new JSDOM('<main class="main-content"></main><aside id="pane"><div id="tabs"></div><div id="content"></div></aside>');
+    const doc = dom.window.document;
+    const provider = {
+        mountTab(_payload, view) {
+            const input = doc.createElement('input');
+            view.append(input);
+            return { focus: () => input.focus(), dispose() {} };
+        }
+    };
+    const ctrl = createSidePaneController({
+        root: doc.getElementById('pane'),
+        tabListElement: doc.getElementById('tabs'),
+        contentContainer: doc.getElementById('content')
+    });
+    ctrl.registerTabType({ kind: 'probe', label: 'Probe', provider });
+    const tab = id => ({ id, kind: 'probe', title: id, closable: true, scopeMode: 'global' });
+    const button = id => [...doc.querySelectorAll('#tabs [role="tab"]')].find(el => el.dataset.tabId === id);
+    const press = key => doc.activeElement.dispatchEvent(new dom.window.KeyboardEvent('keydown', { key, bubbles: true }));
+    return { dom, doc, ctrl, tab, button, press };
+}
+
+test('arrow keys move the active tab and keep focus on the tab strip', async () => {
+    const { doc, ctrl, tab, button, press } = createController();
+    try {
+        await ctrl.openTab(tab('probe:a'));
+        await ctrl.openTab(tab('probe:b'));
+        button('probe:b').focus();
+
+        press('ArrowLeft');
+        await settle();
+        assert.equal(ctrl.getSnapshot().activeTabId, 'probe:a');
+        assert.equal(doc.activeElement, button('probe:a'));
+
+        press('ArrowRight');
+        await settle();
+        assert.equal(ctrl.getSnapshot().activeTabId, 'probe:b');
+        assert.equal(doc.activeElement, button('probe:b'));
+    } finally { await ctrl.dispose(); }
+});
+
+test('tab ids carrying Windows paths and quotes mount, focus and close', async () => {
+    const { doc, ctrl, tab, button } = createController();
+    const windowsId = 'code-viewer:C:\\Users\\me\\proj\\a.js';
+    const quotedId = 'code-viewer:/tmp/a"b.js';
+    try {
+        await ctrl.openTab(tab(windowsId));
+        await ctrl.openTab(tab(quotedId));
+        assert.deepEqual(ctrl.getViewResidency().live.sort(), [quotedId, windowsId].sort());
+
+        await ctrl.closeTab(quotedId);
+        await settle();
+        assert.equal(ctrl.getSnapshot().activeTabId, windowsId);
+        assert.equal(doc.activeElement, button(windowsId), 'focus lands on the remaining file tab');
+    } finally { await ctrl.dispose(); }
+});
diff --git a/tests/side-pane-terminal-lifecycle.test.mjs b/tests/side-pane-terminal-lifecycle.test.mjs
index e3b82b72a..4fec7cec6 100644
--- a/tests/side-pane-terminal-lifecycle.test.mjs
+++ b/tests/side-pane-terminal-lifecycle.test.mjs
@@ -161,7 +161,8 @@ test('a sleeping terminal keeps its shell: the screen waits in the stash and com
     try {
         const handle = await h.provider.openTerminalTab();
         await until(() => handle.getSessionId() === 'view:1');
-        h.controller.setVisible(false);
+        // 切到别的标签让终端隐藏；面板收起时当前标签不休眠
+        h.controller.showNotifications();
         await new Promise(resolve => setTimeout(resolve, 60));
         await until(() => h.controller.getViewResidency().dormant.length === 1);
 
@@ -171,7 +172,7 @@ test('a sleeping terminal keeps its shell: the screen waits in the stash and com
         assert.equal(h.unsubscriptions, 0, 'output keeps flowing into the parked terminal');
         h.listeners.get('data')?.({ id: 'view:1', data: 'while asleep' });
 
-        h.controller.setVisible(true);
+        h.controller.activateTab('terminal:main');
         await until(() => h.controller.getViewResidency().live.includes('terminal:main'));
         const view = h.controller.getTabHandle('terminal:main');
         assert.equal(view.getSessionId(), 'view:1');
@@ -193,7 +194,8 @@ test('closing a terminal tab while it sleeps ends the parked session', async ()
     try {
         await h.provider.openTerminalTab();
         await until(() => h.status().dataset.state === 'connected');
-        h.controller.setVisible(false);
+        // 切到别的标签让终端隐藏；面板收起时当前标签不休眠
+        h.controller.showNotifications();
         await new Promise(resolve => setTimeout(resolve, 60));
         await until(() => h.stash()?.contains(h.screen()) === true);
         await h.controller.closeTab('terminal:main');
@@ -222,7 +224,8 @@ test('a live terminal view holds its buttons and size observer through the view
         assert.equal(live.byType.observer, 1);
         assert.equal(observers[0].targets.size, 1);
 
-        h.controller.setVisible(false);
+        // 切到别的标签让终端隐藏；面板收起时当前标签不休眠
+        h.controller.showNotifications();
         await new Promise(resolve => setTimeout(resolve, 60));
         await until(() => terminalTab().view === 'dormant');
         assert.equal(terminalTab().resources, null);
diff --git a/tests/side-pane-visibility-animation.test.mjs b/tests/side-pane-visibility-animation.test.mjs
new file mode 100644
index 000000000..68a75a83c
--- /dev/null
+++ b/tests/side-pane-visibility-animation.test.mjs
@@ -0,0 +1,65 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { JSDOM } from 'jsdom';
+import { createSidePaneVisibility } from '../modules/ui-system/side-pane/side-pane-visibility.js';
+
+function setup() {
+    const dom = new JSDOM('<div id="host"><aside id="pane"></aside></div>', { pretendToBeVisual: true });
+    const root = dom.window.document.getElementById('pane');
+    const synced = [];
+    const visibility = createSidePaneVisibility({ root, initialRatio: 0.45, onSync: v => synced.push(v) });
+    const transitionEnd = () => {
+        const event = new dom.window.Event('transitionend');
+        event.propertyName = 'width';
+        root.dispatchEvent(event);
+    };
+    const frame = () => new Promise(resolve => dom.window.requestAnimationFrame(() => resolve()));
+    return { dom, root, visibility, transitionEnd, frame, synced };
+}
+
+test('reopening while the close animation runs ends expanded, not collapsed', async () => {
+    const { root, visibility, transitionEnd, frame } = setup();
+    visibility.sync(true, { animate: false });
+
+    visibility.sync(false);
+    await frame();
+    visibility.sync(true);
+    await frame();
+    transitionEnd();
+
+    assert.ok(root.classList.contains('active'));
+    assert.ok(!root.classList.contains('collapsed'));
+    assert.equal(root.getAttribute('aria-hidden'), null);
+    assert.equal(visibility.isAnimating(), false);
+    visibility.dispose();
+});
+
+test('a second open request during the open animation does not restart from zero width', async () => {
+    const { root, visibility, frame } = setup();
+    visibility.sync(false, { animate: false });
+
+    visibility.sync(true);
+    await frame();
+    const midWidth = root.style.width;
+    visibility.sync(true);
+
+    assert.equal(root.style.width, midWidth);
+    assert.notEqual(root.style.width, '0%');
+    visibility.dispose();
+});
+
+test('closing while the open animation runs ends collapsed', async () => {
+    const { root, visibility, transitionEnd, frame } = setup();
+    visibility.sync(false, { animate: false });
+
+    visibility.sync(true);
+    await frame();
+    visibility.sync(false);
+    await frame();
+    transitionEnd();
+
+    assert.ok(root.classList.contains('collapsed'));
+    assert.ok(!root.classList.contains('active'));
+    assert.equal(root.getAttribute('aria-hidden'), 'true');
+    visibility.dispose();
+});

From 8d2d4295f07ca9e7385fe322ff6b6828edddfdc4 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 00:41:06 +0000
Subject: [PATCH 012/143] CI: run the side pane tests on every UI pull request

The 430-odd side pane, side chat, git and browser tests were not in any workflow;
test:side-pane gathers them and the Chat Kernel and UI job runs it. The PTY-backed
terminal handler tests need a real PowerShell and stay out until a Windows job exists.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DFRovoZHMzeheXKkLNWKG
---
 .github/workflows/chat_kernel_ui.yml | 3 +++
 package.json                         | 1 +
 2 files changed, 4 insertions(+)

diff --git a/.github/workflows/chat_kernel_ui.yml b/.github/workflows/chat_kernel_ui.yml
index a9adaaee3..ebf406d00 100644
--- a/.github/workflows/chat_kernel_ui.yml
+++ b/.github/workflows/chat_kernel_ui.yml
@@ -54,6 +54,9 @@ jobs:
       - name: Run Chat Kernel tests
         run: npm run test:chat-kernel
 
+      - name: Run side pane tests
+        run: npm run test:side-pane
+
       - name: Run Chat contract evidence gate
         env:
           VCPCHAT_PACKAGED_ARTIFACT_SMOKE_OUTPUT: ${{ runner.temp }}/packaged-artifact-smoke.json
diff --git a/package.json b/package.json
index 50c91de3a..70498447d 100644
--- a/package.json
+++ b/package.json
@@ -54,6 +54,7 @@
     "check:artifact-plane": "node scripts/check-artifact-plane.mjs",
     "test:built-artifact-smoke": "node scripts/test-built-artifact-smoke.mjs",
     "test:chat-transcript-snapshot": "node scripts/test-chat-transcript-snapshot.mjs",
+    "test:side-pane": "node --test tests/side-pane-*.test.mjs tests/side-chat-*.test.mjs tests/side-browser-address.test.mjs tests/side-plan-revert-confirmation.test.mjs tests/sidebar-resizer-lifecycle.test.mjs tests/conversation-status-panel.test.mjs tests/domain-activator.test.js tests/browser-handlers.test.js tests/git-service.test.js tests/git-watcher.test.js tests/git-file-diff.test.mjs tests/git-changes-source.test.mjs tests/git-workspace-source.test.mjs",
     "check:chat-evidence": "node scripts/check-chat-evidence.mjs",
     "check:chat-release-evidence": "node scripts/check-chat-release-evidence.mjs",
     "write:chat-evidence-manifest": "node scripts/write-chat-evidence-manifest.mjs",

From b6abbd08c89a3c5c637f6ac6ff0f02322fe504d7 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 00:41:17 +0000
Subject: [PATCH 013/143] Code viewer: render code in content-visibility chunks
 so big files open and re-show in constant time

Measured in the real Electron app (headless, 6000-line JS file): opening went
from 1215ms to 330ms and switching back to the tab from 752ms to ~110ms with no
long task. Before, focusing the re-shown view forced a full style and layout
pass over ~60k highlight nodes; now only the chunks in the viewport take part.

Gutter and code are split into 200-line blocks with content-visibility:auto and
an intrinsic height from the fixed 18px line height, so numbers stay aligned.
highlight.js still highlights the whole text once; its output is split per line
with spans that cross lines closed and reopened, so multi-line comments and
template strings keep their colours.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_017bCbRB3E9yajQ3HbdMrjiJ
---
 .../ui-system/side-pane/code-viewer/editor.js | 88 +++++++++++++++----
 styles/ui-system/side-pane-code-viewer.css    |  7 ++
 tests/side-pane-code-viewer.test.mjs          | 37 ++++++++
 3 files changed, 114 insertions(+), 18 deletions(-)

diff --git a/modules/ui-system/side-pane/code-viewer/editor.js b/modules/ui-system/side-pane/code-viewer/editor.js
index 57e2a8f06..9444ebd8e 100644
--- a/modules/ui-system/side-pane/code-viewer/editor.js
+++ b/modules/ui-system/side-pane/code-viewer/editor.js
@@ -8,6 +8,38 @@
 // 整段高亮和逐行行号的成本随文件大小线性增长；超过这个字符数只预览开头，复制和插入仍用完整内容
 export const PREVIEW_CHAR_LIMIT = 256 * 1024;
 
+// 每块的行数：块越小滚动时补排越勤，越大切回标签时要排的越多；200 行约 3600px，比侧栏高出几屏
+export const CODE_CHUNK_LINES = 200;
+
+/**
+ * 把 highlight.js 的整段输出按行切开：跨行的 <span>（多行注释、模板字符串）在行尾闭合、下一行重新打开，
+ * 这样每块都是合法的 HTML，又不必按块各自高亮（那样会丢掉跨块的语法状态）。
+ * highlight.js 只输出 <span class="…"> 和转义过的文本，所以按标签切分是安全的。
+ */
+export function splitHighlightedLines(html) {
+    const lines = [];
+    const open = [];
+    let current = '';
+    const token = /(<span[^>]*>)|(<\/span>)|(\r?\n)|([^<\r\n]+)/g;
+    let match;
+    while ((match = token.exec(html))) {
+        if (match[1]) {
+            open.push(match[1]);
+            current += match[1];
+        } else if (match[2]) {
+            open.pop();
+            current += match[2];
+        } else if (match[3]) {
+            lines.push(current + '</span>'.repeat(open.length));
+            current = open.join('');
+        } else {
+            current += match[4];
+        }
+    }
+    lines.push(current);
+    return lines;
+}
+
 // 文件末尾的换行只是行结束符，不算多出来的一行
 function countLines(text) {
     let count = 1;
@@ -82,33 +114,53 @@ export function createCodeViewerEditor({
         if (store.isWrapped) editorShell.classList.add('is-wrapped');
 
         // 文件末尾的换行只是行结束符，不算多出来的一行
-        const lines = shownCode ? shownCode.replace(/\r?\n$/, '').split(/\r?\n/) : [''];
+        const trimmed = shownCode.replace(/\r?\n$/, '');
+        const lineCount = shownCode ? trimmed.split(/\r?\n/).length : 1;
+        const win = doc.defaultView || (typeof window !== 'undefined' ? window : null);
+        let lineHtml = null;
+        if (win?.hljs?.highlight) {
+            try {
+                lineHtml = splitHighlightedLines(win.hljs.highlight(trimmed, { language: store.currentLang, ignoreIllegals: true }).value);
+            } catch {
+                lineHtml = null;
+            }
+        }
+        const lineText = lineHtml ? null : (shownCode ? trimmed.split(/\r?\n/) : ['']);
+
+        // 行号栏和代码各按 CODE_CHUNK_LINES 行分块，块用 content-visibility:auto：滚出视口的块不参与样式和布局。
+        // 大文件切回这个标签、聚焦时，浏览器只需要排视口里的那几块，开销不再随文件行数增长。
+        // 行高固定，两栏的块高度一致，行号仍然和代码对齐。
         const gutter = doc.createElement('div');
         gutter.className = 'side-code-gutter';
         gutter.setAttribute('aria-hidden', 'true');
-
-        for (let idx = 1; idx <= lines.length; idx++) {
-            const lineNum = doc.createElement('div');
-            lineNum.className = 'side-code-line-number';
-            lineNum.textContent = String(idx);
-            gutter.appendChild(lineNum);
-        }
-
         const pre = doc.createElement('pre');
         pre.className = 'side-code-pre';
         const code = doc.createElement('code');
         code.className = `side-code-highlighted language-${store.currentLang}`;
 
-        const win = doc.defaultView || (typeof window !== 'undefined' ? window : null);
-        if (win?.hljs?.highlight) {
-            try {
-                const highlighted = win.hljs.highlight(shownCode, { language: store.currentLang, ignoreIllegals: true });
-                code.innerHTML = highlighted.value;
-            } catch {
-                code.textContent = shownCode;
+        for (let start = 0; start < lineCount; start += CODE_CHUNK_LINES) {
+            const end = Math.min(lineCount, start + CODE_CHUNK_LINES);
+            const lines = String(end - start);
+
+            const numbers = doc.createElement('div');
+            numbers.className = 'side-code-chunk';
+            numbers.style.setProperty('--side-code-chunk-lines', lines);
+            for (let idx = start + 1; idx <= end; idx++) {
+                const lineNum = doc.createElement('div');
+                lineNum.className = 'side-code-line-number';
+                lineNum.textContent = String(idx);
+                numbers.appendChild(lineNum);
             }
-        } else {
-            code.textContent = shownCode;
+            gutter.appendChild(numbers);
+
+            const text = doc.createElement('div');
+            text.className = 'side-code-chunk';
+            text.style.setProperty('--side-code-chunk-lines', lines);
+            // 块末尾补一个换行：块尾的换行不会多画一行，但 textContent 和复制出来的文本保持原样
+            const tail = end < lineCount ? '\n' : '';
+            if (lineHtml) text.innerHTML = lineHtml.slice(start, end).join('\n') + tail;
+            else text.textContent = lineText.slice(start, end).join('\n') + tail;
+            code.appendChild(text);
         }
 
         pre.appendChild(code);
diff --git a/styles/ui-system/side-pane-code-viewer.css b/styles/ui-system/side-pane-code-viewer.css
index 1f4b5033a..b0dcc3efd 100644
--- a/styles/ui-system/side-pane-code-viewer.css
+++ b/styles/ui-system/side-pane-code-viewer.css
@@ -188,6 +188,13 @@ html body[data-vcp-theme="light"] .side-code-gutter:where(.vcp-ui-scope, .vcp-ui
     color: var(--secondary-text, var(--vcp-ui-port-color-rgba-0-0-0-0-35));
 }
 
+/* 行号栏和代码的分块（见 editor.js 的 CODE_CHUNK_LINES）：滚出视口时浏览器跳过它的样式和布局，占位高度按行数算 */
+html .side-code-chunk:where(.vcp-ui-scope, .vcp-ui-scope *) {
+    display: block;
+    content-visibility: auto;
+    contain-intrinsic-block-size: auto calc(var(--side-code-chunk-lines, 1) * 18px);
+}
+
 html .side-code-line-number:where(.vcp-ui-scope, .vcp-ui-scope *) {
     height: 18px;
     line-height: 18px;
diff --git a/tests/side-pane-code-viewer.test.mjs b/tests/side-pane-code-viewer.test.mjs
index 08a5e0715..04d42eea8 100644
--- a/tests/side-pane-code-viewer.test.mjs
+++ b/tests/side-pane-code-viewer.test.mjs
@@ -308,3 +308,40 @@ test('large files only render the first preview chunk, cut at a line end', async
         dom.window.close();
     }
 });
+
+test('code is rendered in chunks whose text and line numbers stay continuous', async () => {
+    const { CODE_CHUNK_LINES } = await import('../modules/ui-system/side-pane/code-viewer/editor.js');
+    const dom = new JSDOM('<section id="view"></section>');
+    const doc = dom.window.document;
+    const lineCount = CODE_CHUNK_LINES * 2 + 50;
+    const code = Array.from({ length: lineCount }, (_, i) => `line ${i + 1}`).join('\n');
+    const provider = createCodeViewerSideProvider({ document: doc, uiHelper: null, api: null });
+    const view = doc.getElementById('view');
+    const handle = await provider.mountTab({ title: 'chunks.txt', payload: { code, language: 'plaintext' } }, view);
+    try {
+        const codeChunks = view.querySelectorAll('.side-code-pre .side-code-chunk');
+        const gutterChunks = view.querySelectorAll('.side-code-gutter .side-code-chunk');
+        assert.equal(codeChunks.length, 3);
+        assert.deepEqual([...gutterChunks].map(chunk => chunk.children.length), [CODE_CHUNK_LINES, CODE_CHUNK_LINES, 50]);
+        assert.deepEqual([...codeChunks].map(chunk => chunk.style.getPropertyValue('--side-code-chunk-lines')), [String(CODE_CHUNK_LINES), String(CODE_CHUNK_LINES), '50']);
+        assert.equal(view.querySelector('.side-code-pre').textContent, code);
+        assert.equal(view.querySelectorAll('.side-code-line-number').length, lineCount);
+        assert.equal([...view.querySelectorAll('.side-code-line-number')].at(-1).textContent, String(lineCount));
+    } finally {
+        handle.dispose();
+        dom.window.close();
+    }
+});
+
+test('highlighted html is split per line with spans that cross lines closed and reopened', async () => {
+    const { splitHighlightedLines } = await import('../modules/ui-system/side-pane/code-viewer/editor.js');
+    const html = '<span class="hljs-comment">/* a\nb */</span> x\n<span class="hljs-string">`c\n<span class="hljs-subst">${d}\ne</span>`</span>';
+    assert.deepEqual(splitHighlightedLines(html), [
+        '<span class="hljs-comment">/* a</span>',
+        '<span class="hljs-comment">b */</span> x',
+        '<span class="hljs-string">`c</span>',
+        '<span class="hljs-string"><span class="hljs-subst">${d}</span></span>',
+        '<span class="hljs-string"><span class="hljs-subst">e</span>`</span>'
+    ]);
+    assert.deepEqual(splitHighlightedLines(''), ['']);
+});

From 04195c72c0fef3d7a12c6e2d2fd7f10164a937c5 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 00:42:17 +0000
Subject: [PATCH 014/143] Code viewer: ask before reading a file outside the
 workspaces

File paths shown as changed files come from the model's tool-call
arguments, and the viewer read any of them through get-text-content,
so a prompt-injected path such as ~/.ssh/id_rsa showed its content, one
click from being inserted back into the chat. Like the workspace-bound
previews in ZCode and DeepSeek Harness, a path outside every registered
workspace now shows where it is and is only read after the user clicks
to read it. Workspace files are read as before; windows without the
workspace service keep the old behaviour.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_016hW799u5Ji5k9khDAwu688
---
 .../contracts/generated/chat-event-graph.json | 11 ++++++
 .../ui-system/side-pane/code-viewer/editor.js | 30 ++++++++++++++--
 .../side-pane/code-viewer/file-read.js        | 31 +++++++++++------
 .../side-pane/codeViewerSideProvider.js       |  2 +-
 tests/side-pane-code-viewer.test.mjs          | 34 +++++++++++++++++++
 5 files changed, 95 insertions(+), 13 deletions(-)

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 3963b815c..057f50dc0 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -4183,6 +4183,11 @@
           "line": 79,
           "kind": "custom-event-listener"
         },
+        {
+          "file": "modules/ui-system/side-pane/code-viewer/editor.js",
+          "line": 54,
+          "kind": "custom-event-listener"
+        },
         {
           "file": "modules/ui-system/side-pane/git/cards.js",
           "line": 220,
@@ -5743,6 +5748,12 @@
           "kind": "custom-event-listener",
           "match": "more.addEventListener('click'"
         },
+        {
+          "file": "modules/ui-system/side-pane/code-viewer/editor.js",
+          "line": 54,
+          "kind": "custom-event-listener",
+          "match": "read.addEventListener('click'"
+        },
         {
           "file": "modules/ui-system/side-pane/git/cards.js",
           "line": 220,
diff --git a/modules/ui-system/side-pane/code-viewer/editor.js b/modules/ui-system/side-pane/code-viewer/editor.js
index 57e2a8f06..7d3c1d7c9 100644
--- a/modules/ui-system/side-pane/code-viewer/editor.js
+++ b/modules/ui-system/side-pane/code-viewer/editor.js
@@ -25,6 +25,8 @@ export function createCodeViewerEditor({
     // 只有按路径打开的文件标签才有 readFile；代码片段和差异是打开时的快照，不重新读取
     let fileLoaded = false;
     let readToken = 0;
+    // 用户点过「读取」后，工作区外的这个文件就不再问
+    let outsideWorkspaceAllowed = false;
 
     function setBodyMessage(text, isError = false) {
         body.innerHTML = '';
@@ -34,6 +36,29 @@ export function createCodeViewerEditor({
         body.appendChild(msg);
     }
 
+    function showConsent(notice) {
+        body.innerHTML = '';
+        const box = doc.createElement('div');
+        box.className = 'side-pane-mount-error side-code-consent';
+        const [title, ...rest] = String(notice || '').split('\n');
+        const titleEl = doc.createElement('div');
+        titleEl.className = 'side-pane-mount-error-title';
+        titleEl.textContent = title;
+        const detail = doc.createElement('div');
+        detail.className = 'side-pane-mount-error-detail';
+        detail.textContent = rest.join('\n');
+        const read = doc.createElement('button');
+        read.type = 'button';
+        read.className = 'side-pane-mount-error-retry';
+        read.textContent = '读取这个文件';
+        read.addEventListener('click', () => {
+            outsideWorkspaceAllowed = true;
+            void refreshView({ force: true });
+        });
+        box.append(titleEl, detail, read);
+        body.appendChild(box);
+    }
+
     /**
      * 读取文件内容到 store。返回 true 表示可以渲染；false 表示已显示错误/提示，或者被更新的读取取代。
      * force 用于重新打开或手动刷新：文件可能已在外部被修改或删除。
@@ -44,7 +69,7 @@ export function createCodeViewerEditor({
         body.innerHTML = '<div class="side-code-loading"><span class="vcp-ui-icon spin">sync</span> 加载文件中...</div>';
         let result;
         try {
-            result = await readFile();
+            result = await readFile({ allowOutsideWorkspace: outsideWorkspaceAllowed });
         } catch (err) {
             result = { ok: false, error: `读取文件失败: ${err?.message || err}` };
         }
@@ -53,7 +78,8 @@ export function createCodeViewerEditor({
             // 失败时不保留旧内容，免得复制/插入拿到已经不存在的文件内容
             store.currentCode = '';
             fileLoaded = false;
-            if (result?.notice) setBodyMessage(result.notice);
+            if (result?.needsConsent) showConsent(result.notice);
+            else if (result?.notice) setBodyMessage(result.notice);
             else setBodyMessage(result?.error || '读取文件失败', true);
             return false;
         }
diff --git a/modules/ui-system/side-pane/code-viewer/file-read.js b/modules/ui-system/side-pane/code-viewer/file-read.js
index dafa24f5f..6ae838f34 100644
--- a/modules/ui-system/side-pane/code-viewer/file-read.js
+++ b/modules/ui-system/side-pane/code-viewer/file-read.js
@@ -12,9 +12,18 @@ import { toWorkspaceRelative } from '../../git-file-diff.js';
 
 const UNREADABLE = '读取文件失败：文件不存在、无法访问，或不是可预览的文本文件';
 
-export async function readFileForViewer(api, filePath) {
+/**
+ * allowOutsideWorkspace：已登记工作区以外的路径要用户点过「读取」才读。路径可能来自模型的工具调用参数，
+ * 不先问就能把任意本地文件（SSH 私钥、配置里的密钥）显示出来再被「插入引用」送回模型。
+ * ZCode、DeepSeek Harness 的预览同样只认工作区内的路径（"outside the workspace" 直接拒绝），这里留一次确认给附件之类的文件。
+ */
+export async function readFileForViewer(api, filePath, { allowOutsideWorkspace = false } = {}) {
     const fromWorkspace = await readThroughWorkspace(api, filePath);
-    if (fromWorkspace) return fromWorkspace;
+    if (fromWorkspace?.result) return fromWorkspace.result;
+    // 没有工作区服务的窗口分不清内外，照旧读
+    if (fromWorkspace && !fromWorkspace.inWorkspace && !allowOutsideWorkspace) {
+        return { ok: false, needsConsent: true, notice: `这个文件不在任何已登记的工作区里：\n${filePath}` };
+    }
     if (typeof api?.getTextContent !== 'function') return { ok: false, error: '当前窗口不支持读取文件' };
     const res = await api.getTextContent(filePath);
     if (typeof res === 'string') return { ok: true, text: res };
@@ -24,25 +33,27 @@ export async function readFileForViewer(api, filePath) {
     return { ok: false, error: UNREADABLE };
 }
 
-// 已登记工作区里的文件走源码服务：能分清不存在、二进制和过大，并且读取有上限
+// 已登记工作区里的文件走源码服务：能分清不存在、二进制和过大，并且读取有上限。
+// 返回 { inWorkspace, result }：result 为空表示要交给附件读取（不在工作区，或不是 UTF-8）；读不到工作区列表时返回 null
 async function readThroughWorkspace(api, filePath) {
     if (typeof api?.gitListWorkspaces !== 'function' || typeof api?.sourceReadFile !== 'function') return null;
     let match = null;
     try {
         const res = await api.gitListWorkspaces();
-        match = res?.success ? toWorkspaceRelative(filePath, res.data?.workspaces) : null;
+        if (!res?.success) return null;
+        match = toWorkspaceRelative(filePath, res.data?.workspaces);
     } catch (_error) {
         return null;
     }
-    if (!match) return null;
+    if (!match) return { inWorkspace: false, result: null };
     const res = await api.sourceReadFile(match.workspace.id, match.relPath);
-    if (!res?.success) return { ok: false, error: res?.error || '读取文件失败' };
+    if (!res?.success) return { inWorkspace: true, result: { ok: false, error: res?.error || '读取文件失败' } };
     const file = res.data || {};
-    if (file.binary) return { ok: false, notice: '二进制文件，无法预览' };
+    if (file.binary) return { inWorkspace: true, result: { ok: false, notice: '二进制文件，无法预览' } };
     if (file.tooLarge) {
-        return { ok: false, notice: `文件过大（${Math.round((file.size || 0) / 1024)} KB），无法预览，请在外部编辑器中打开` };
+        return { inWorkspace: true, result: { ok: false, notice: `文件过大（${Math.round((file.size || 0) / 1024)} KB），无法预览，请在外部编辑器中打开` } };
     }
     // 不是 UTF-8（比如 GBK）时交给附件读取，它会按 GB18030 解码
-    if (file.encodingError) return null;
-    return { ok: true, text: typeof file.text === 'string' ? file.text : '' };
+    if (file.encodingError) return { inWorkspace: true, result: null };
+    return { inWorkspace: true, result: { ok: true, text: typeof file.text === 'string' ? file.text : '' } };
 }
diff --git a/modules/ui-system/side-pane/codeViewerSideProvider.js b/modules/ui-system/side-pane/codeViewerSideProvider.js
index 3e7eb8ddb..38968820f 100644
--- a/modules/ui-system/side-pane/codeViewerSideProvider.js
+++ b/modules/ui-system/side-pane/codeViewerSideProvider.js
@@ -236,7 +236,7 @@ export function createCodeViewerSideProvider({
                 store,
                 body,
                 doc,
-                readFile: isFileBacked ? () => readFileForViewer(api, filePath) : null,
+                readFile: isFileBacked ? (options) => readFileForViewer(api, filePath, options) : null,
                 renderDiffView: (...args) => renderDiffView(...args)
             });
             const { setBodyMessage, renderCodeView, refreshView, reload } = editorOwner;
diff --git a/tests/side-pane-code-viewer.test.mjs b/tests/side-pane-code-viewer.test.mjs
index 95f381327..34baf3515 100644
--- a/tests/side-pane-code-viewer.test.mjs
+++ b/tests/side-pane-code-viewer.test.mjs
@@ -339,3 +339,37 @@ test('the file button reveals a workspace file in the file manager and never ope
     assert.deepEqual(opened, [], 'nothing is opened through a file association');
     dom.window.close();
 });
+
+test('a path outside every workspace is only read after the user asks for it', async () => {
+    const dom = new JSDOM('<section id="view"></section>');
+    const doc = dom.window.document;
+    const reads = [];
+    const provider = createCodeViewerSideProvider({ document: doc, uiHelper: null, api: {
+        gitListWorkspaces: async () => ({ success: true, data: { workspaces: [{ id: 'ws1', path: 'C:\\proj' }] } }),
+        sourceReadFile: async () => ({ success: true, data: { text: 'in workspace' } }),
+        async getTextContent(filePath) { reads.push(filePath); return { text: 'PRIVATE KEY' }; }
+    } });
+    const view = doc.getElementById('view');
+    const handle = await provider.mountTab({ title: 'id_rsa', payload: { filePath: 'C:\\Users\\me\\.ssh\\id_rsa' } }, view);
+    try {
+        assert.deepEqual(reads, [], 'nothing is read before the user agrees');
+        assert.equal(handle.getCode(), '');
+        assert.match(view.textContent, /不在任何已登记的工作区里/);
+        assert.match(view.textContent, /\.ssh/);
+        const consent = [...view.querySelectorAll('button')].find(b => b.textContent === '读取这个文件');
+        consent.click();
+        await new Promise(resolve => setTimeout(resolve, 10));
+        assert.deepEqual(reads, ['C:\\Users\\me\\.ssh\\id_rsa']);
+        assert.equal(handle.getCode(), 'PRIVATE KEY');
+
+        // 工作区里的文件照常直接读
+        const inside = doc.createElement('section');
+        doc.body.append(inside);
+        const insideHandle = await provider.mountTab({ title: 'a.js', payload: { filePath: 'C:\\proj\\a.js' } }, inside);
+        assert.equal(insideHandle.getCode(), 'in workspace');
+        insideHandle.dispose();
+    } finally {
+        handle.dispose();
+        dom.window.close();
+    }
+});

From 43f6334b440a4b81b3b4945b2338ae33332c023b Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 00:43:14 +0000
Subject: [PATCH 015/143] Git service: never run the repo's own core.fsmonitor
 command

git status runs whatever command a repository's .git/config names in
core.fsmonitor. A project unzipped with a prepared .git folder could
therefore run code as soon as the Git page read its status. Every git
call now passes -c core.fsmonitor=false, as DeepSeek Harness does in
scripts/change-scope.ts.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_016hW799u5Ji5k9khDAwu688
---
 modules/services/gitService.js            |  2 ++
 tests/side-pane-git-real-backend.test.mjs | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/modules/services/gitService.js b/modules/services/gitService.js
index eee6f797a..ca3b01aba 100644
--- a/modules/services/gitService.js
+++ b/modules/services/gitService.js
@@ -64,6 +64,8 @@ function runGit(cwd, args, { timeout = DEFAULT_TIMEOUT, input = null } = {}) {
         const child = execFile('git', [
             '-c', 'core.quotepath=false',
             '-c', 'color.ui=false',
+            // 仓库自带的 .git/config 可以把 core.fsmonitor 设成任意命令，只读的 status 也会执行它（同 DeepSeek Harness scripts/change-scope.ts）
+            '-c', 'core.fsmonitor=false',
             '--literal-pathspecs', // 路径按字面匹配，禁用 glob / 魔法前缀
             ...args,
         ], {
diff --git a/tests/side-pane-git-real-backend.test.mjs b/tests/side-pane-git-real-backend.test.mjs
index 2cc68a541..416cafbc2 100644
--- a/tests/side-pane-git-real-backend.test.mjs
+++ b/tests/side-pane-git-real-backend.test.mjs
@@ -135,3 +135,21 @@ test('the Git view shows an add-workspace action when none are registered', asyn
         await handle.dispose();
     }
 });
+
+test('reading the status of a repo never runs the core.fsmonitor command its own config names', { skip: process.platform === 'win32' }, async () => {
+    const root = fs.mkdtempSync(path.join(os.tmpdir(), 'vcp-fsmonitor-'));
+    try {
+        const marker = path.join(root, 'ran');
+        const monitor = path.join(root, 'monitor.sh');
+        fs.writeFileSync(monitor, `#!/bin/sh\ntouch "${marker}"\n`, { mode: 0o755 });
+        const repo = path.join(root, 'repo');
+        fs.mkdirSync(repo);
+        execFileSync('git', ['init', '-q'], { cwd: repo });
+        execFileSync('git', ['config', 'core.fsmonitor', monitor], { cwd: repo });
+        fs.writeFileSync(path.join(repo, 'a.txt'), 'x');
+        await gitService.getStatus(repo);
+        assert.equal(fs.existsSync(marker), false, 'a prepared .git/config cannot run a command when the Git page opens');
+    } finally {
+        fs.rmSync(root, { recursive: true, force: true });
+    }
+});

From 768de2015881a99430b2436d6a62c91b79b6ae76 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 00:22:28 +0000
Subject: [PATCH 016/143] UI system gate: scope the tool presentation styles
 and drop the stray literal colour

check:ui-system was red on the side pane branch. tool-presentation.css had
101 selectors outside .vcp-ui-scope, an !important on the reduced-motion
rule and two fixed 11px sizes; components.css (from upstream #234) fell back
to a hard-coded indigo because --vcp-ui-primary is not a token.

Every tool presentation selector now sits under .vcp-ui-scope (the chat
messages container already carries it, and the file is alone in its layer,
so the uniform specificity bump changes no cascade). The reduced-motion rule
reuses the shimmer selector instead of !important, the 11px sizes use
--vcp-ui-text-xs, and the pinned window button uses the accent token.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01UCGGgmHsCToooXTgSXpmq9
---
 styles/ui-system/components.css        |   4 +-
 styles/ui-system/tool-presentation.css | 196 ++++++++++++-------------
 2 files changed, 100 insertions(+), 100 deletions(-)

diff --git a/styles/ui-system/components.css b/styles/ui-system/components.css
index 418b7df8b..ddff52098 100644
--- a/styles/ui-system/components.css
+++ b/styles/ui-system/components.css
@@ -541,8 +541,8 @@
     }
 
     :is(html, html.vcp-global-settings-host) .vcp-ui-scope .vcp-ui-window-control-pin.is-pinned {
-        color: var(--vcp-ui-primary, #6366f1);
-        background: var(--vcp-ui-primary-bg, rgba(99, 102, 241, 0.16));
+        color: var(--vcp-ui-accent);
+        background: color-mix(in srgb, var(--vcp-ui-accent) 16%, transparent);
     }
 
     :is(html, html.vcp-global-settings-host) .vcp-ui-scope .vcp-ui-window-control-pin.is-pinned .vcp-ui-icon,
diff --git a/styles/ui-system/tool-presentation.css b/styles/ui-system/tool-presentation.css
index 436a2e39c..be8a90316 100644
--- a/styles/ui-system/tool-presentation.css
+++ b/styles/ui-system/tool-presentation.css
@@ -1,12 +1,12 @@
 /* Optional presentation; Legacy is untouched. Theme and typography stay owned
  * by the existing appearance profile, including role wallpapers. */
-html[data-ui-mode="next"] [data-vcp-tool-presentation="compact"],
-html[data-ui-mode="next"] [data-vcp-tool-presentation="grouped"] {
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="compact"],
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="grouped"] {
     --vcp-tool-row-height: 38px;
 }
-html[data-ui-mode="next"][data-vcp-density="compact"] [data-vcp-tool-presentation] { --vcp-tool-row-height: 32px; }
-html[data-ui-mode="next"][data-vcp-density="relaxed"] [data-vcp-tool-presentation] { --vcp-tool-row-height: 44px; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented {
+html[data-ui-mode="next"][data-vcp-density="compact"] .vcp-ui-scope [data-vcp-tool-presentation] { --vcp-tool-row-height: 32px; }
+html[data-ui-mode="next"][data-vcp-density="relaxed"] .vcp-ui-scope [data-vcp-tool-presentation] { --vcp-tool-row-height: 44px; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented {
     --vcp-tool-presented-font-family: var(--vcp-tool-card-font-family, var(--vcp-chat-font-family));
     --vcp-tool-presented-font-size: var(--vcp-ui-text-caption, 13px);
     --vcp-tool-presented-white-space: normal;
@@ -32,11 +32,11 @@ html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented {
     color: var(--vcp-ui-text-primary);
     font-family: var(--vcp-tool-card-font-family, inherit);
 }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented::before,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented::after { display: none; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-summary,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-result-header,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-call-summary-header {
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented::before,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented::after { display: none; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-summary,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-result-header,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-call-summary-header {
     display: flex;
     gap: 5px;
     padding: 0;
@@ -47,7 +47,7 @@ html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vc
     min-width: 0;
     flex-wrap: nowrap;
 }
-html[data-ui-mode="next"] .vcp-tool-row-toggle, html[data-ui-mode="next"] .vcp-tool-process-toggle {
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-toggle, html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-toggle {
     display: flex;
     width: 100%;
     min-width: 0;
@@ -65,13 +65,13 @@ html[data-ui-mode="next"] .vcp-tool-row-toggle, html[data-ui-mode="next"] .vcp-t
     cursor: pointer;
     text-align: left;
 }
-html[data-ui-mode="next"] .vcp-tool-result-header > .vcp-tool-row-toggle {
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-result-header > .vcp-tool-row-toggle {
     width: auto;
     flex: 1;
 }
-html[data-ui-mode="next"] .vcp-tool-row-toggle:hover, html[data-ui-mode="next"] .vcp-tool-process-toggle:hover { background: var(--vcp-ui-bg-2); }
-html[data-ui-mode="next"] .vcp-tool-row-toggle:focus-visible, html[data-ui-mode="next"] .vcp-tool-process-toggle:focus-visible, html[data-ui-mode="next"] .vcp-tool-process-artifact:focus-visible { outline: 2px solid var(--vcp-ui-accent); outline-offset: -2px; }
-html[data-ui-mode="next"] .vcp-tool-row-chevron {
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-toggle:hover, html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-toggle:hover { background: var(--vcp-ui-bg-2); }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-toggle:focus-visible, html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-toggle:focus-visible, html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-artifact:focus-visible { outline: 2px solid var(--vcp-ui-accent); outline-offset: -2px; }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-chevron {
     width: 7px;
     height: 7px;
     flex: 0 0 7px;
@@ -79,44 +79,44 @@ html[data-ui-mode="next"] .vcp-tool-row-chevron {
     border-bottom: 1.5px solid currentColor;
     transform: rotate(-45deg);
 }
-html[data-ui-mode="next"] [aria-expanded="true"] > .vcp-tool-row-chevron { transform: rotate(45deg); }
-html[data-ui-mode="next"] .vcp-tool-row-title { overflow-wrap: anywhere; min-width: 0; color: var(--vcp-ui-text-primary); }
-html[data-ui-mode="next"] .vcp-tool-row-resource { overflow-wrap: anywhere; min-width: 0; font-size: var(--vcp-ui-text-sm, 12px); }
-html[data-ui-mode="next"] .vcp-tool-row-state { margin-left: auto; white-space: nowrap; font-size: var(--vcp-ui-text-sm, 12px); }
-html[data-ui-mode="next"] [data-vcp-tool-state="success"] .vcp-tool-row-state { color: var(--vcp-ui-success); }
-html[data-ui-mode="next"] [data-vcp-tool-state="failed"] .vcp-tool-row-state { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
-html[data-ui-mode="next"] [data-vcp-tool-state="waiting"] .vcp-tool-row-state,
-html[data-ui-mode="next"] [data-vcp-tool-state="stopped"] .vcp-tool-row-state { color: var(--vcp-ui-warning, var(--vcp-ui-palette-amber)); }
-html[data-ui-mode="next"] [data-vcp-tool-state="running"] .vcp-tool-row-state { color: var(--vcp-ui-accent); }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-delete-btn { flex: 0 0 24px; margin-right: 6px; opacity: 0; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-header:hover .vcp-tool-result-delete-btn,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-header:focus-within .vcp-tool-result-delete-btn { opacity: 1; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="compact"] .vcp-role-divider,
-html[data-ui-mode="next"] [data-vcp-tool-presentation="grouped"] .vcp-role-divider { margin: 4px 0; font-size: 11px; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-details { max-height: 360px; overflow: auto; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-details,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-result-collapsible-content,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-call-summary-content {
+html[data-ui-mode="next"] .vcp-ui-scope [aria-expanded="true"] > .vcp-tool-row-chevron { transform: rotate(45deg); }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-title { overflow-wrap: anywhere; min-width: 0; color: var(--vcp-ui-text-primary); }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-resource { overflow-wrap: anywhere; min-width: 0; font-size: var(--vcp-ui-text-sm, 12px); }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-state { margin-left: auto; white-space: nowrap; font-size: var(--vcp-ui-text-sm, 12px); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-state="success"] .vcp-tool-row-state { color: var(--vcp-ui-success); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-state="failed"] .vcp-tool-row-state { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-state="waiting"] .vcp-tool-row-state,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-state="stopped"] .vcp-tool-row-state { color: var(--vcp-ui-warning, var(--vcp-ui-palette-amber)); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-state="running"] .vcp-tool-row-state { color: var(--vcp-ui-accent); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-delete-btn { flex: 0 0 24px; margin-right: 6px; opacity: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-header:hover .vcp-tool-result-delete-btn,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-header:focus-within .vcp-tool-result-delete-btn { opacity: 1; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="compact"] .vcp-role-divider,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="grouped"] .vcp-role-divider { margin: 4px 0; font-size: var(--vcp-ui-text-xs, 11px); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-details { max-height: 360px; overflow: auto; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-details,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-result-collapsible-content,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-call-summary-content {
     margin: 0;
     padding: 6px 12px 12px 28px;
     background: transparent;
     border: 0;
     min-width: 0;
 }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-details,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-result-collapsible-content,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-call-summary-content { display: none; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-details,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-result-collapsible-content,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-call-summary-content { display: block; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented pre {
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-details,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-result-collapsible-content,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-call-summary-content { display: none; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-details,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-result-collapsible-content,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-call-summary-content { display: block; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented pre {
     white-space: pre-wrap;
     overflow-wrap: anywhere;
     min-width: 0;
     max-height: 320px;
     overflow: auto;
 }
-html[data-ui-mode="next"] .vcp-tool-process {
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process {
     border: 1px solid var(--vcp-ui-border);
     border-radius: var(--vcp-ui-radius-md, 8px);
     margin: 10px 0;
@@ -124,12 +124,12 @@ html[data-ui-mode="next"] .vcp-tool-process {
     overflow: hidden;
     background: var(--vcp-ui-bg-0);
 }
-html[data-ui-mode="next"] .vcp-tool-process-toggle { background: var(--vcp-ui-bg-1); border-radius: 0; }
-html[data-ui-mode="next"] .vcp-tool-process-title { min-width: 0; overflow-wrap: anywhere; }
-html[data-ui-mode="next"] .vcp-tool-process-stats { margin-left: auto; font-size: var(--vcp-ui-text-sm, 12px); overflow-wrap: anywhere; }
-html[data-ui-mode="next"] .vcp-tool-process-body[hidden] { display: none; }
-html[data-ui-mode="next"] .vcp-tool-process-body > .vcp-tool-presented { margin: 0; border-top: 1px solid var(--vcp-ui-border); }
-html[data-ui-mode="next"] .vcp-tool-process-artifact {
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-toggle { background: var(--vcp-ui-bg-1); border-radius: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-title { min-width: 0; overflow-wrap: anywhere; }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-stats { margin-left: auto; font-size: var(--vcp-ui-text-sm, 12px); overflow-wrap: anywhere; }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-body[hidden] { display: none; }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-body > .vcp-tool-presented { margin: 0; border-top: 1px solid var(--vcp-ui-border); }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-artifact {
     color: var(--vcp-ui-text-accent);
     background: transparent;
     border: 0;
@@ -142,20 +142,20 @@ html[data-ui-mode="next"] .vcp-tool-process-artifact {
     cursor: pointer;
 }
 @media (max-width: 640px) {
-    html[data-ui-mode="next"] .vcp-tool-row-toggle { flex-wrap: wrap; gap: 6px; }
-    html[data-ui-mode="next"] .vcp-tool-row-state { margin-left: auto; }
-    html[data-ui-mode="next"] .vcp-tool-process-toggle { flex-wrap: wrap; }
-    html[data-ui-mode="next"] .vcp-tool-process-stats { margin-left: 16px; }
+    html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-toggle { flex-wrap: wrap; gap: 6px; }
+    html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-state { margin-left: auto; }
+    html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-toggle { flex-wrap: wrap; }
+    html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-stats { margin-left: 16px; }
 }
 
 /* 单行合并 / 整轮折叠：无框单行，一次调用一行；紧跟的同名结果收进请求行，展开后才显示。 */
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) {
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) {
     --vcp-tool-call-color: var(--vcp-ui-text-3, var(--vcp-ui-text-secondary));
     --vcp-tool-call-hover: var(--vcp-ui-text-2, var(--vcp-ui-text-secondary));
 }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-role-divider { margin: 4px 0; font-size: 11px; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-presented { margin: 2px 0; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) {
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-role-divider { margin: 4px 0; font-size: var(--vcp-ui-text-xs, 11px); }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-presented { margin: 2px 0; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) {
     width: auto;
     max-width: 100%;
     min-height: 24px;
@@ -168,10 +168,10 @@ html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-t
     color: var(--vcp-tool-call-color);
     transition: color .1s;
 }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle):hover { background: transparent; color: var(--vcp-tool-call-hover); }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle .vcp-tool-row-title, .vcp-tool-process-title) { flex: none; color: inherit; white-space: nowrap; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-process-stats { min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; overflow-wrap: normal; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-toggle .vcp-tool-row-resource {
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle):hover { background: transparent; color: var(--vcp-tool-call-hover); }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle .vcp-tool-row-title, .vcp-tool-process-title) { flex: none; color: inherit; white-space: nowrap; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-process-stats { min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; overflow-wrap: normal; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-toggle .vcp-tool-row-resource {
     min-width: 0;
     overflow: hidden;
     text-overflow: ellipsis;
@@ -179,20 +179,20 @@ html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-t
     overflow-wrap: normal;
     font-size: inherit;
 }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-toggle .vcp-tool-row-state { flex: none; margin-left: 0; color: inherit; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-icon { display: inline-flex; flex: none; width: 16px; height: 16px; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-icon svg { width: 100%; height: 100%; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-diff { flex: none; font-family: var(--vcp-ui-font-mono, ui-monospace, Consolas, monospace); font-size: 11px; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle:hover, [aria-expanded="true"]) .vcp-tool-row-diff-add { color: var(--vcp-ui-success); }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle:hover, [aria-expanded="true"]) .vcp-tool-row-diff-del { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-toggle .vcp-tool-row-state { flex: none; margin-left: 0; color: inherit; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-icon { display: inline-flex; flex: none; width: 16px; height: 16px; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-icon svg { width: 100%; height: 100%; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-diff { flex: none; font-family: var(--vcp-ui-font-mono, ui-monospace, Consolas, monospace); font-size: var(--vcp-ui-text-xs, 11px); }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle:hover, [aria-expanded="true"]) .vcp-tool-row-diff-add { color: var(--vcp-ui-success); }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle:hover, [aria-expanded="true"]) .vcp-tool-row-diff-del { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
 /* 并入请求行的结果：收起时不占位，展开后只留一个小标题“输出”。
- * 旧层给结果气泡写了 display:block !important，这里只能藏标题、去掉外边距，正文由上面的收起规则隐藏。 */
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"]:not(.expanded) { margin: 0; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"]:not(.expanded) > .vcp-tool-result-header { display: none; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"] .vcp-tool-row-toggle { min-height: 20px; padding-left: 24px; font-size: var(--vcp-ui-text-sm, 12px); }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-presented > :is(.vcp-tool-details, .vcp-tool-result-collapsible-content, .vcp-tool-call-summary-content) { padding: 8px 0 4px 24px; }
+ * 旧层给结果气泡写了强制的 display:block（important 级），这里只能藏标题、去掉外边距，正文由上面的收起规则隐藏。 */
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"]:not(.expanded) { margin: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"]:not(.expanded) > .vcp-tool-result-header { display: none; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"] .vcp-tool-row-toggle { min-height: 20px; padding-left: 24px; font-size: var(--vcp-ui-text-sm, 12px); }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-presented > :is(.vcp-tool-details, .vcp-tool-result-collapsible-content, .vcp-tool-call-summary-content) { padding: 8px 0 4px 24px; }
 /* 等待结果时动作词的微光，只在回复生成中出现。 */
-html[data-ui-mode="next"] .message-item.streaming :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-pending="true"] .vcp-tool-row-title {
+html[data-ui-mode="next"] .vcp-ui-scope .message-item.streaming :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-pending="true"] .vcp-tool-row-title {
     background: linear-gradient(90deg, var(--vcp-tool-call-color) 0%, var(--vcp-ui-text-primary) 50%, var(--vcp-tool-call-color) 100%);
     background-size: 200% 100%;
     -webkit-background-clip: text;
@@ -202,33 +202,33 @@ html[data-ui-mode="next"] .message-item.streaming :is([data-vcp-tool-presentatio
 }
 @keyframes vcp-tool-call-shimmer { from { background-position: 100% 0; } to { background-position: -100% 0; } }
 @media (prefers-reduced-motion: reduce) {
-    html[data-ui-mode="next"] [data-vcp-tool-pending="true"] .vcp-tool-row-title { animation: none !important; }
+    html[data-ui-mode="next"] .vcp-ui-scope .message-item.streaming :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-pending="true"] .vcp-tool-row-title { animation: none; }
 }
 
 /* 单行合并：动作词加粗，箭头在行尾、悬停或展开时出现；问题状态用虚线下划线，悬停看报错。 */
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) { font-size: var(--vcp-ui-text-body, 14px); }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle .vcp-tool-row-title, .vcp-tool-process-title) { font-weight: 500; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) > .vcp-tool-row-chevron { order: 1; opacity: 0; transition: opacity .2s, transform .2s; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle):is(:hover, [aria-expanded="true"]) > .vcp-tool-row-chevron { opacity: 1; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] [data-vcp-tool-call-state] .vcp-tool-row-state { text-decoration: underline dotted; text-underline-offset: 2px; cursor: help; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] { margin: 2px 0; border: 0; border-radius: 0; background: transparent; overflow: visible; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] .vcp-tool-process-stats { margin-left: 0; font-size: inherit; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-body { margin: 4px 0 4px 8px; padding-left: 14px; border-left: 1px solid var(--vcp-ui-border); }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-body > .vcp-tool-presented { margin: 2px 0; border-top: 0; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-artifact { border-top: 0; padding: 4px 0 4px 22px; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) { font-size: var(--vcp-ui-text-body, 14px); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle .vcp-tool-row-title, .vcp-tool-process-title) { font-weight: 500; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) > .vcp-tool-row-chevron { order: 1; opacity: 0; transition: opacity .2s, transform .2s; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle):is(:hover, [aria-expanded="true"]) > .vcp-tool-row-chevron { opacity: 1; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] [data-vcp-tool-call-state] .vcp-tool-row-state { text-decoration: underline dotted; text-underline-offset: 2px; cursor: help; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] { margin: 2px 0; border: 0; border-radius: 0; background: transparent; overflow: visible; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] .vcp-tool-process-stats { margin-left: 0; font-size: inherit; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-body { margin: 4px 0 4px 8px; padding-left: 14px; border-left: 1px solid var(--vcp-ui-border); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-body > .vcp-tool-presented { margin: 2px 0; border-top: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-artifact { border-top: 0; padding: 4px 0 4px 22px; }
 
 /* 整轮折叠：图标悬停换成箭头，标题与摘要之间用小圆点分隔，失败时摘要显示红色报错首行。 */
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle { gap: 0; font-size: var(--vcp-ui-text-caption, 13px); }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-leading { position: relative; display: inline-flex; flex: none; width: 16px; height: 16px; margin-right: 6px; align-items: center; justify-content: center; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-leading .vcp-tool-row-icon { width: 14px; height: 14px; transition: opacity .1s; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-leading .vcp-tool-row-chevron { position: absolute; inset: 0; margin: auto; opacity: 0; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle:is(:hover, [aria-expanded="true"]) .vcp-tool-row-leading .vcp-tool-row-icon { opacity: 0; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle:is(:hover, [aria-expanded="true"]) .vcp-tool-row-leading .vcp-tool-row-chevron { opacity: 1; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-dot { flex: none; width: 2px; height: 2px; margin: 0 8px; border-radius: 1px; background: currentColor; opacity: .7; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle :is(.vcp-tool-row-state, .vcp-tool-row-diff) { margin-left: 10px; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] [data-vcp-tool-call-state="failed"] .vcp-tool-row-toggle .vcp-tool-row-resource { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] { margin: 4px 0 10px; border: 0; border-radius: 0; background: transparent; overflow: visible; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-toggle {
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle { gap: 0; font-size: var(--vcp-ui-text-caption, 13px); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-leading { position: relative; display: inline-flex; flex: none; width: 16px; height: 16px; margin-right: 6px; align-items: center; justify-content: center; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-leading .vcp-tool-row-icon { width: 14px; height: 14px; transition: opacity .1s; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-leading .vcp-tool-row-chevron { position: absolute; inset: 0; margin: auto; opacity: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle:is(:hover, [aria-expanded="true"]) .vcp-tool-row-leading .vcp-tool-row-icon { opacity: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle:is(:hover, [aria-expanded="true"]) .vcp-tool-row-leading .vcp-tool-row-chevron { opacity: 1; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-dot { flex: none; width: 2px; height: 2px; margin: 0 8px; border-radius: 1px; background: currentColor; opacity: .7; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle :is(.vcp-tool-row-state, .vcp-tool-row-diff) { margin-left: 10px; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] [data-vcp-tool-call-state="failed"] .vcp-tool-row-toggle .vcp-tool-row-resource { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] { margin: 4px 0 10px; border: 0; border-radius: 0; background: transparent; overflow: visible; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-toggle {
     width: 100%;
     min-height: 33px;
     padding: 0 0 8px;
@@ -236,8 +236,8 @@ html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-proce
     border-bottom: .5px solid var(--vcp-ui-border);
     font-size: var(--vcp-ui-text-body, 14px);
 }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-toggle > .vcp-tool-row-chevron { order: 1; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] .vcp-tool-process-stats { margin-left: 0; color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-body { padding-top: 8px; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-body > .vcp-tool-presented { margin: 2px 0; border-top: 0; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-artifact { border-top: 0; padding: 6px 0; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-toggle > .vcp-tool-row-chevron { order: 1; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] .vcp-tool-process-stats { margin-left: 0; color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-body { padding-top: 8px; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-body > .vcp-tool-presented { margin: 2px 0; border-top: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-artifact { border-top: 0; padding: 6px 0; }

From cb413eb2572b79c95bf9491e8a451eeefbe217fd Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 00:44:31 +0000
Subject: [PATCH 017/143] Side chat and plan: closing asks before deleting,
 message buttons respect the busy gate, the filter accepts input-method typing

- Closing a side chat that has messages deletes its child topic, so it now asks first
  (also for close others / close all); declining keeps the tab.
- A second send while a reply streams is refused, so the running reply keeps its stop
  button. A message button no longer overwrites or sends a typed draft, references or
  attachments.
- The plan history filter no longer rebuilds the page while an input method composes, so
  Chinese input works; the search runs once composition ends.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DFRovoZHMzeheXKkLNWKG
---
 modules/renderer/sideChatSurfaceOwner.js      | 22 ++++-
 .../side-pane/planDetailSideProvider.js       | 13 ++-
 tests/side-chat-interactive-submit.test.mjs   | 90 +++++++++++++++++++
 tests/side-chat-message-delete.test.mjs       | 20 ++++-
 tests/side-pane-plan-topic.test.mjs           | 31 +++++++
 5 files changed, 171 insertions(+), 5 deletions(-)
 create mode 100644 tests/side-chat-interactive-submit.test.mjs

diff --git a/modules/renderer/sideChatSurfaceOwner.js b/modules/renderer/sideChatSurfaceOwner.js
index 2238522e5..aa2a63c33 100644
--- a/modules/renderer/sideChatSurfaceOwner.js
+++ b/modules/renderer/sideChatSurfaceOwner.js
@@ -358,7 +358,8 @@ export async function mountSideChatSurface(container, {
 
     const onSubmit = async (event) => {
         event?.preventDefault?.();
-        if (isDisposed || !isHistoryLoaded || isDeletingMessage) return;
+        // 还在生成时不再起第二次发送：它失败后的清理会清掉正在进行的那次，停止按钮随之消失
+        if (isDisposed || !isHistoryLoaded || isDeletingMessage || activeSendController) return;
         if (!currentModel) {
             updateStatus('请先选择模型', 'error');
             return;
@@ -535,8 +536,18 @@ export async function mountSideChatSurface(container, {
         });
     }
 
+    // 消息里的交互按钮：和主聊一样只发这段文本，不覆盖、也不带上输入框里还没发出去的草稿、引用和附件
     submitInteractiveContent = (text) => {
         if (isDisposed) return;
+        const notify = (message) => chatCapabilities?.uiHelper?.showToastNotification?.(message, 'warning');
+        if (activeSendController || isDeletingMessage || !isHistoryLoaded) {
+            notify('辅助对话正在处理上一条消息，请稍后再点。');
+            return;
+        }
+        if (textarea.value.trim() || references.length > 0 || attachmentsOwner.count > 0) {
+            notify('输入框里还有没发出的内容，请先发送或清空后再点。');
+            return;
+        }
         textarea.value = String(text || '');
         form.requestSubmit();
     };
@@ -640,6 +651,15 @@ export async function mountSideChatSurface(container, {
                 chatCapabilities?.uiHelper?.showToastNotification?.('无法关闭标签页：存在未保存的历史记录。请点击保存徽标重试，或右键点击徽标放弃更改。', 'warning');
                 return { closed: false, reason: 'UNSAVED_CHANGES' };
             }
+            // 关闭会删掉子话题；有记录时先确认，免得误点（含「关闭其他 / 全部」）把对话永久删掉
+            const uiHelper = chatCapabilities?.uiHelper;
+            const history = liveConversation?.historyRef?.get?.() || [];
+            if (typeof uiHelper?.showConfirmDialog === 'function' && history.length > 0) {
+                const confirmed = await uiHelper.showConfirmDialog(
+                    `关闭「${descriptor.title || '辅助对话'}」会删除这段辅助对话的全部记录，无法恢复。`,
+                    '关闭辅助对话', '关闭并删除', '取消', true);
+                if (!confirmed) return { closed: false, reason: 'USER_CANCELED' };
+            }
             // Cancel active operation and wait for settlement
             if (activeSendController) {
                 activeSendController.abort('side-chat-closed');
diff --git a/modules/ui-system/side-pane/planDetailSideProvider.js b/modules/ui-system/side-pane/planDetailSideProvider.js
index 53ea53ea1..7a420ad01 100644
--- a/modules/ui-system/side-pane/planDetailSideProvider.js
+++ b/modules/ui-system/side-pane/planDetailSideProvider.js
@@ -248,6 +248,8 @@ export function createPlanDetailSideProvider({
             let filterRows = null;
             let filterError = '';
             let filterSeq = 0;
+            // 输入法组字期间整页重绘会替换输入框、打断组字：组字期间不画，组字结束按一次输入处理
+            let composingFilter = false;
             let cancelFilter = null;
             let nodeView = null;
             const navigation = createPlanPageNavigation({ h, button, id: tab.id, onChange: selectPage });
@@ -539,15 +541,23 @@ export function createPlanDetailSideProvider({
                     el.setAttribute('aria-label', placeholder);
                     el.dataset.filter = key;
                     el.value = key === 'file' ? (filters.exactFile || filters.file) : filters[key];
-                    el.addEventListener('input', () => {
+                    const onFilterInput = (event) => {
                         if (key === 'file') { filters.file = el.value.trim(); filters.exactFile = ''; } else filters[key] = el.value.trim();
                         // Invalidate on intent, before the debounce allows an old read to settle.
                         ++filterSeq;
                         filterRows = null;
                         filterError = '';
                         cancelFilter?.();
+                        cancelFilter = null;
+                        if (event?.isComposing || composingFilter) return;
                         cancelFilter = disposed() ? null : own.timeout(() => { cancelFilter = null; runSearch(); }, FILTER_DEBOUNCE_MS, 'filter-debounce');
                         render();
+                    };
+                    el.addEventListener('input', onFilterInput);
+                    el.addEventListener('compositionstart', () => { composingFilter = true; });
+                    el.addEventListener('compositionend', () => {
+                        composingFilter = false;
+                        onFilterInput(null);
                     });
                     return el;
                 };
@@ -728,6 +738,7 @@ export function createPlanDetailSideProvider({
 
             function render() {
                 if (disposed() || nodeView) return;
+                if (composingFilter) return;
                 // 输入框随整页重绘，记下焦点和光标位置
                 const active = doc.activeElement;
                 const focusKey = active && body.contains(active) ? active.dataset?.filter : null;
diff --git a/tests/side-chat-interactive-submit.test.mjs b/tests/side-chat-interactive-submit.test.mjs
new file mode 100644
index 000000000..2992f0d47
--- /dev/null
+++ b/tests/side-chat-interactive-submit.test.mjs
@@ -0,0 +1,90 @@
+// 消息里的交互按钮（renderer 的 handleSendMessage）不能绕过辅助对话的忙碌闸门，也不能吞掉输入框里的草稿
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { JSDOM } from 'jsdom';
+import { mountSideChatSurface } from '../modules/renderer/sideChatSurfaceOwner.js';
+
+const settle = () => new Promise(resolve => setTimeout(resolve, 10));
+
+async function fixture() {
+    const dom = new JSDOM('<div id="mount"></div>');
+    const doc = dom.window.document;
+    let history = [];
+    let sendFromMessage = null;
+    let release = null;
+    const sends = [];
+    const toasts = [];
+    const handle = await mountSideChatSurface(doc.getElementById('mount'), {
+        descriptor: {
+            id: 'side', title: '侧聊', model: 'model', contextMode: 'references-only',
+            parent: { itemId: 'agent', topicId: 'parent' }, child: { itemId: 'agent', topicId: 'child' }
+        },
+        chatCapabilities: {
+            repository: { getHistory: async () => history, saveHistory: async () => ({ success: true }) },
+            uiHelper: { showToastNotification: (message, type) => toasts.push({ message, type }) },
+            manager: {
+                async sendMessage(request) {
+                    sends.push(request);
+                    request.onOperation?.({ cancel: async () => true });
+                    await new Promise(resolve => { release = resolve; });
+                    return { terminal: { event: { type: 'completed' } } };
+                }
+            },
+            createRenderer({ conversation, handleSendMessage }) {
+                sendFromMessage = handleSendMessage;
+                return {
+                    renderer: { renderHistory: async () => {} },
+                    conversation: {
+                        selectedItemRef: { get: () => conversation.selectedItem },
+                        topicIdRef: { get: () => conversation.topicId },
+                        historyRef: { get: () => history, set: next => { history = next; } },
+                        replaceHistory: next => { history = next; }
+                    },
+                    dispose: async () => {}
+                };
+            }
+        }
+    });
+    await settle();
+    const textarea = doc.querySelector('.side-chat-textarea');
+    const stopBtn = doc.querySelector('.side-chat-stop-btn');
+    return {
+        dom, handle, textarea, stopBtn, sends, toasts,
+        clickMessageButton: text => sendFromMessage(text),
+        typeAndSend(text) { textarea.value = text; doc.querySelector('form').requestSubmit(); },
+        finish: () => release?.(),
+        async cleanup() { release?.(); await handle.dispose(); dom.window.close(); }
+    };
+}
+
+test('a message button clicked while a reply streams does not start a second send', async () => {
+    const f = await fixture();
+    try {
+        f.typeAndSend('first question');
+        await settle();
+        assert.equal(f.sends.length, 1);
+        assert.equal(f.stopBtn.hidden, false);
+
+        f.clickMessageButton('option A');
+        await settle();
+        assert.equal(f.sends.length, 1, 'no second send while the first one streams');
+        assert.equal(f.stopBtn.hidden, false, 'the running reply can still be stopped');
+        assert.ok(f.toasts.some(t => t.type === 'warning'));
+    } finally { await f.cleanup(); }
+});
+
+test('a message button does not overwrite or send a typed draft', async () => {
+    const f = await fixture();
+    try {
+        f.textarea.value = 'half-written thought';
+        f.clickMessageButton('option A');
+        await settle();
+        assert.equal(f.sends.length, 0);
+        assert.equal(f.textarea.value, 'half-written thought');
+
+        f.textarea.value = '';
+        f.clickMessageButton('option A');
+        await settle();
+        assert.equal(f.sends.length, 1);
+    } finally { await f.cleanup(); }
+});
diff --git a/tests/side-chat-message-delete.test.mjs b/tests/side-chat-message-delete.test.mjs
index 45f6bc229..e83e2ee4c 100644
--- a/tests/side-chat-message-delete.test.mjs
+++ b/tests/side-chat-message-delete.test.mjs
@@ -28,7 +28,8 @@ async function fixture(t) {
     const historyPath = queue.getHistoryPath(child.itemId, child.topicId);
     const backup = historyPath + '.backup';
     let blocked = false, gate, saveResult, history = [], sends = 0;
-    const toasts = [], removals = [], writes = [];
+    const toasts = [], removals = [], writes = [], confirms = [];
+    let confirmAnswer = true;
     const dom = new JSDOM('<div id="mount"></div>');
     const doc = dom.window.document;
     const repository = {
@@ -45,7 +46,7 @@ async function fixture(t) {
             parent: { itemId: 'agent', topicId: 'parent' }, child: { itemId: 'agent', topicId: 'child' } },
         chatCapabilities: {
             repository,
-            uiHelper: { showConfirmDialog: async () => true,
+            uiHelper: { showConfirmDialog: async message => { confirms.push(message); return confirmAnswer; },
                 showToastNotification: (message, type) => toasts.push({ message, type }) },
             manager: { sendMessage() { sends++; throw new Error('Unexpected generation'); } },
             createRenderer({ root: list, conversation }) {
@@ -96,7 +97,8 @@ async function fixture(t) {
             new dom.window.MouseEvent('contextmenu', { bubbles: true, cancelable: true }));
     }
     function remove(id) { menu(id); doc.querySelector('[data-side-chat-action="delete"]').click(); }
-    return { doc, handle, initial, toasts, writes, removals, menu, remove, repair,
+    return { doc, handle, initial, toasts, writes, removals, menu, remove, repair, confirms,
+        answerConfirm: answer => { confirmAnswer = answer; },
         history: () => history, read: () => queue.read(child), sends: () => sends,
         failWithResult(result) { saveResult = result; },
         holdSave(promise) { gate = promise; },
@@ -169,3 +171,15 @@ test('pending side deletion keeps typed drafts, blocks send and close, then pers
     assert.deepEqual(f.removals, [{ id: 'answer', persist: false }, { id: 'question', persist: false }]);
     assert.equal(f.writes.length, 2, 'one acknowledged save per deletion, no hidden renderer write');
 });
+
+test('closing a side chat that has messages asks first, and keeps it when declined', async t => {
+    const f = await fixture(t);
+    f.answerConfirm(false);
+    assert.deepEqual(await f.handle.requestClose(), { closed: false, reason: 'USER_CANCELED' });
+    assert.equal(f.confirms.length, 1);
+    assert.deepEqual(await f.read(), f.initial);
+
+    f.answerConfirm(true);
+    assert.deepEqual(await f.handle.requestClose(), { closed: true });
+    assert.equal(f.confirms.length, 2);
+});
diff --git a/tests/side-pane-plan-topic.test.mjs b/tests/side-pane-plan-topic.test.mjs
index 5ece4849f..92d4030b3 100644
--- a/tests/side-pane-plan-topic.test.mjs
+++ b/tests/side-pane-plan-topic.test.mjs
@@ -211,6 +211,37 @@ for (const settlement of ['resolve', 'reject']) {
     });
 }
 
+test('typing into the history filter with an input method keeps the same input element until composition ends', async () => {
+    const requests = [];
+    const { provider, tab, view, dom } = makeTopicEnv({ api: {
+        projectForgeSearchHistory(params) {
+            requests.push(params);
+            return Promise.resolve({ success: true, data: [] });
+        }
+    } });
+    const handle = await provider.mountTab(tab, view);
+    try {
+        const input = view.querySelector('[data-filter="keyword"]');
+        input.focus();
+        input.dispatchEvent(new dom.window.CompositionEvent('compositionstart'));
+        input.value = 'zhong';
+        input.dispatchEvent(new dom.window.InputEvent('input', { isComposing: true }));
+        await new Promise(resolve => setTimeout(resolve, 400));
+        assert.equal(view.querySelector('[data-filter="keyword"]'), input, 'the composing input is not replaced');
+        assert.equal(requests.length, 0, 'no search while composing');
+
+        input.value = '中';
+        input.dispatchEvent(new dom.window.CompositionEvent('compositionend'));
+        await new Promise(resolve => setTimeout(resolve, 400));
+        assert.equal(requests.length, 1);
+        assert.equal(requests[0].keyword, '中');
+        assert.equal(dom.window.document.activeElement.dataset.filter, 'keyword');
+    } finally {
+        handle.dispose();
+        dom.window.close();
+    }
+});
+
 test('a node opens its diff and can be reverted with a remembered signature; the revert joins the topic', async () => {
     const { provider, calls, tab, view, dom, storage } = makeTopicEnv();
     const handle = await provider.mountTab(tab, view);

From 195452dea6376ac1e4c961eb4fc65dac92721e8a Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 00:45:44 +0000
Subject: [PATCH 018/143] Terminal tab: OSC 8 links open in the side browser,
 Ctrl+C with a selection copies

- xterm's default OSC 8 handler showed a confirm and called window.open from the main
  window, which opened a bare window on the default session. The tab now passes a
  linkHandler that only opens http(s) through the side browser, as ZCode does.
- Ctrl/Cmd+C with a selection copies it instead of sending ^C to the PTY shared with the
  AI tools; without a selection Ctrl+C still interrupts.
- Ctrl/Cmd+Alt+B and Ctrl+PageUp/PageDown drive the side pane only and are no longer
  written to the shell as escape codes.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DFRovoZHMzeheXKkLNWKG
---
 .../side-pane/terminalSideProvider.js         | 29 +++++++++++-
 tests/side-pane-terminal-lifecycle.test.mjs   | 45 +++++++++++++++++--
 2 files changed, 70 insertions(+), 4 deletions(-)

diff --git a/modules/ui-system/side-pane/terminalSideProvider.js b/modules/ui-system/side-pane/terminalSideProvider.js
index 466adc795..492954f80 100644
--- a/modules/ui-system/side-pane/terminalSideProvider.js
+++ b/modules/ui-system/side-pane/terminalSideProvider.js
@@ -106,9 +106,36 @@ export function createTerminalSideProvider({
             fontSize: 13,
             scrollback: 5000,
             allowProposedApi: false,
-            theme: initialTheme
+            theme: initialTheme,
+            // OSC 8 超链接：不走 xterm 默认的 confirm + window.open（会在主窗口外开一个默认 session 的窗口），
+            // 和普通链接一样只开 http(s)，交给侧栏浏览器（对照 ZCode TerminalSession.tsx linkHandler）
+            linkHandler: {
+                allowNonHttpProtocols: false,
+                activate(event, text) {
+                    event?.preventDefault?.();
+                    if (!onOpenUrl || !/^https?:\/\//i.test(String(text || ''))) return;
+                    onOpenUrl(text);
+                }
+            }
         });
         session.term = term;
+        // 有选区时 Ctrl/Cmd+C 复制选区，不给共享 PTY 发 ^C（会打断 AI 正在跑的命令）；
+        // 副屏自己的快捷键（Ctrl/Cmd+Alt+B、Ctrl+PageUp/PageDown）不写进 shell（对照 ZCode attachCustomKeyEventHandler）
+        term.attachCustomKeyEventHandler?.((event) => {
+            if (event.type !== 'keydown') return true;
+            const mod = event.ctrlKey || event.metaKey;
+            if (!mod) return true;
+            const key = String(event.key || '').toLowerCase();
+            if (key === 'c' && !event.altKey && !event.shiftKey && term.hasSelection?.()) {
+                const text = term.getSelection();
+                const clipboard = doc.defaultView?.navigator?.clipboard;
+                clipboard?.writeText?.(text)?.catch?.(error => console.warn('[SideTerminal] Copy failed:', error));
+                return false;
+            }
+            if (event.altKey && key === 'b') return false;
+            if (event.ctrlKey && (event.key === 'PageUp' || event.key === 'PageDown')) return false;
+            return true;
+        });
         // 外框底色由 CSS 给出，xterm 从外框读取同一颜色，明暗主题切换时跟着换调色板。
         const applyTheme = () => {
             const theme = buildTerminalTheme(doc, screen);
diff --git a/tests/side-pane-terminal-lifecycle.test.mjs b/tests/side-pane-terminal-lifecycle.test.mjs
index 4fec7cec6..5fc0eaf88 100644
--- a/tests/side-pane-terminal-lifecycle.test.mjs
+++ b/tests/side-pane-terminal-lifecycle.test.mjs
@@ -12,7 +12,7 @@ async function until(predicate) {
     }
 }
 
-function fixture({ create = async () => ({ success: true, data: { id: 'view:1', pid: 42 } }), restart, dormancy } = {}) {
+function fixture({ create = async () => ({ success: true, data: { id: 'view:1', pid: 42 } }), restart, dormancy, onOpenUrl = null } = {}) {
     const dom = new JSDOM('<input id="mainInput"><aside><div class="side-pane-tabs"></div><div class="side-pane-content-container"></div></aside>');
     const doc = dom.window.document, root = doc.querySelector('aside');
     const controller = createSidePaneController({ root, tabListElement: root.querySelector('.side-pane-tabs'),
@@ -24,6 +24,9 @@ function fixture({ create = async () => ({ success: true, data: { id: 'view:1',
         constructor(options) { this.options = options; this.cols = 80; this.rows = 24; this.output = []; this.disposals = 0; terminals.push(this); }
         open(screen) { this.input = doc.createElement('textarea'); screen.append(this.input); }
         onData() {} onResize() {} loadAddon() {}
+        attachCustomKeyEventHandler(handler) { this.keyHandler = handler; }
+        hasSelection() { return Boolean(this.selection); }
+        getSelection() { return this.selection || ''; }
         focus() { this.input.focus(); }
         write(data) { this.output.push(data); }
         clear() {} reset() {}
@@ -41,9 +44,9 @@ function fixture({ create = async () => ({ success: true, data: { id: 'view:1',
         onTerminalData: subscribe('data'), onTerminalClear: subscribe('clear'), onTerminalExit: subscribe('exit')
     };
     const provider = createTerminalSideProvider({ document: doc, api, sidePaneController: controller,
-        xtermLoader: async () => ({ Terminal, FitAddon: null }) });
+        xtermLoader: async () => ({ Terminal, FitAddon: null }), onOpenUrl });
     controller.registerProvider('terminal', provider);
-    return { controller, provider, doc, terminals, killed, creates, restarts, listeners,
+    return { dom, controller, provider, doc, terminals, killed, creates, restarts, listeners,
         get unsubscriptions() { return unsubscriptions; }, get confirmations() { return confirmations; },
         status: () => root.querySelector('.side-terminal-status'),
         retry: () => root.querySelector('[aria-label="重新启动终端"]'),
@@ -233,3 +236,39 @@ test('a live terminal view holds its buttons and size observer through the view
         assert.deepEqual(h.killed, [], 'the shell itself keeps running');
     } finally { await h.cleanup(); }
 });
+
+test('OSC 8 hyperlinks open http(s) in the side browser and nothing else', async () => {
+    const opened = [];
+    const h = fixture({ onOpenUrl: url => opened.push(url) });
+    try {
+        await h.provider.openTerminalTab();
+        const { linkHandler } = h.terminals[0].options;
+        assert.equal(linkHandler.allowNonHttpProtocols, false);
+        const event = { prevented: false, preventDefault() { this.prevented = true; } };
+        linkHandler.activate(event, 'https://example.com/a');
+        linkHandler.activate(event, 'file:///etc/passwd');
+        linkHandler.activate(event, 'javascript:alert(1)');
+        assert.deepEqual(opened, ['https://example.com/a']);
+        assert.equal(event.prevented, true, 'xterm\'s confirm + window.open default never runs');
+    } finally { await h.cleanup(); }
+});
+
+test('Ctrl+C with a selection copies instead of interrupting the shared shell; pane shortcuts stay out of the shell', async () => {
+    const h = fixture();
+    const copied = [];
+    Object.defineProperty(h.dom.window.navigator, 'clipboard', { configurable: true,
+        value: { writeText: async text => { copied.push(text); } } });
+    try {
+        await h.provider.openTerminalTab();
+        const term = h.terminals[0];
+        const key = (fields) => term.keyHandler({ type: 'keydown', ctrlKey: false, metaKey: false, altKey: false, shiftKey: false, ...fields });
+
+        assert.equal(key({ key: 'c', ctrlKey: true }), true, 'without a selection Ctrl+C still reaches the shell');
+        term.selection = 'npm test';
+        assert.equal(key({ key: 'c', ctrlKey: true }), false);
+        assert.deepEqual(copied, ['npm test']);
+        assert.equal(key({ key: 'b', ctrlKey: true, altKey: true }), false);
+        assert.equal(key({ key: 'PageDown', ctrlKey: true }), false);
+        assert.equal(key({ key: 'a' }), true);
+    } finally { await h.cleanup(); }
+});

From f4f61ba7a6bc80dc3c3d105b30c5ef8ae1bc2ef7 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 00:46:50 +0000
Subject: [PATCH 019/143] Side pane: leave tab lookup and strip keyboard focus
 to the parallel fix branch

claude/project-thread-20fk2r (PR #3) already finds tabs by id without selectors and keeps
arrow-key focus on the strip, with its own tests. Drop the duplicate here so the two
branches do not conflict.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DFRovoZHMzeheXKkLNWKG
---
 .../side-pane/side-pane-controller.js         |  5 +-
 .../side-pane/side-pane-tab-strip.js          | 15 ++---
 .../side-pane/side-pane-tab-utils.js          | 10 ---
 tests/side-pane-tab-keyboard.test.mjs         | 63 -------------------
 4 files changed, 8 insertions(+), 85 deletions(-)
 delete mode 100644 tests/side-pane-tab-keyboard.test.mjs

diff --git a/modules/ui-system/side-pane/side-pane-controller.js b/modules/ui-system/side-pane/side-pane-controller.js
index 3d2358adf..6aec0369e 100644
--- a/modules/ui-system/side-pane/side-pane-controller.js
+++ b/modules/ui-system/side-pane/side-pane-controller.js
@@ -15,7 +15,6 @@ import { createSidePaneShortcuts } from './side-pane-shortcuts.js';
 import { createSidePaneLayoutStore, parseLayout, rememberBounded, serializeLayout } from './side-pane-persistence.js';
 import { createSidePaneRootScope, createTabOccurrence } from './side-pane-occurrence.js';
 import { selectDormantViews } from './side-pane-dormancy.js';
-import { findByTabId } from './side-pane-tab-utils.js';
 
 /** @typedef {import('./side-pane-types.js').SidePaneTab} SidePaneTab */
 /** @typedef {import('./side-pane-types.js').SidePaneTabType} SidePaneTabType */
@@ -246,7 +245,7 @@ export function createSidePaneController({
             isClosable: isClosableTab,
             statusTabId: SidePaneState.NOTIFICATIONS_TAB_ID,
             getStatus: readConnectionStatus,
-            onActivate: (tabId, options) => controller.activateTab(tabId, options),
+            onActivate: (tabId) => controller.activateTab(tabId),
             onClose: (tabId) => controller.closeTab(tabId),
             onReorder: (activeId, overId) => controller.reorderTab(activeId, overId),
             onContextMenu: (tabId, x, y) => tabMenu?.show(tabId, x, y),
@@ -479,7 +478,7 @@ export function createSidePaneController({
 
         const pending = { promise: null, viewElement: null, canceled: false, onClosed };
         const mounting = (async () => {
-            let view = findByTabId(contentContainer, '[data-tab-id]', tabId);
+            let view = contentContainer?.querySelector(`[data-tab-id="${tabId}"]`);
             if (!view && contentContainer) {
                 view = doc.createElement('section');
                 view.className = 'side-pane-view';
diff --git a/modules/ui-system/side-pane/side-pane-tab-strip.js b/modules/ui-system/side-pane/side-pane-tab-strip.js
index f5c279ccc..964f5fe82 100644
--- a/modules/ui-system/side-pane/side-pane-tab-strip.js
+++ b/modules/ui-system/side-pane/side-pane-tab-strip.js
@@ -2,7 +2,7 @@
 'use strict';
 
 import { createTabSortable } from './side-pane-tab-dnd.js';
-import { findByTabId, getTabIconName, resolveTabsOverflow } from './side-pane-tab-utils.js';
+import { getTabIconName, resolveTabsOverflow } from './side-pane-tab-utils.js';
 
 // 标签标题悬停提示、面板切换动画、可拖拽排序的标签
 const TAB_TOOLTIP_DELAY_MS = 1500;
@@ -133,7 +133,7 @@ export function createSidePaneTabStrip({
     function syncStatus() {
         const current = statusTabId ? getStatus() : null;
         if (!current) return;
-        const btn = findByTabId(tabListElement, '.side-pane-tab[data-tab-id]', statusTabId);
+        const btn = tabListElement.querySelector(`.side-pane-tab[data-tab-id="${statusTabId}"]`);
         const dot = btn?.querySelector('.side-pane-tab-status');
         if (!dot) return;
         const { status = 'unknown', text = '' } = current;
@@ -268,8 +268,7 @@ export function createSidePaneTabStrip({
         if (e.key === 'ArrowRight' || e.key === 'ArrowDown') {
             targetIndex = (currentIndex + 1) % tabButtons.length;
         } else if (e.key === 'ArrowLeft' || e.key === 'ArrowUp') {
-            // 当前是新标签页（不在标签条上）时，往左落到最后一个
-            targetIndex = currentIndex < 0 ? tabButtons.length - 1 : (currentIndex - 1 + tabButtons.length) % tabButtons.length;
+            targetIndex = (currentIndex - 1 + tabButtons.length) % tabButtons.length;
         } else if (e.key === 'Home') {
             targetIndex = 0;
         } else if (e.key === 'End') {
@@ -279,10 +278,8 @@ export function createSidePaneTabStrip({
         }
         e.preventDefault();
         if (targetIndex !== currentIndex && targetIndex >= 0 && targetIndex < tabButtons.length) {
-            // 激活会重建标签条，旧按钮随之离开文档；焦点留在标签上（WAI-ARIA Tabs），按 id 找重建后的按钮
-            const targetId = tabButtons[targetIndex].getAttribute('data-tab-id');
-            onActivate(targetId, { focus: false });
-            findByTabId(tabListElement, '[role="tab"][data-tab-id]', targetId)?.focus?.();
+            onActivate(tabButtons[targetIndex].getAttribute('data-tab-id'));
+            tabButtons[targetIndex].focus();
         }
     };
     tabListElement.addEventListener('keydown', onKeydown);
@@ -297,7 +294,7 @@ export function createSidePaneTabStrip({
         syncStatus,
         hideTooltip,
         focusTab(tabId) {
-            findByTabId(tabListElement, '[role="tab"][data-tab-id]', tabId)?.focus?.();
+            tabListElement.querySelector(`[role="tab"][data-tab-id="${tabId}"]`)?.focus?.();
         },
         dispose() {
             disposed = true;
diff --git a/modules/ui-system/side-pane/side-pane-tab-utils.js b/modules/ui-system/side-pane/side-pane-tab-utils.js
index e5dd8f4aa..0da0acbcd 100644
--- a/modules/ui-system/side-pane/side-pane-tab-utils.js
+++ b/modules/ui-system/side-pane/side-pane-tab-utils.js
@@ -145,13 +145,3 @@ export function moveIdBefore(ids, activeId, overId) {
     next.splice(to, 0, activeId);
     return next;
 }
-
-// 按 data-tab-id 找元素，不把 id 拼进选择器：文件标签的 id 带 Windows 路径（反斜杠会被当成转义）或引号
-export function findByTabId(container, selector, tabId) {
-    if (!container || tabId == null) return null;
-    const id = String(tabId);
-    for (const element of container.querySelectorAll(selector)) {
-        if (element.getAttribute('data-tab-id') === id) return element;
-    }
-    return null;
-}
diff --git a/tests/side-pane-tab-keyboard.test.mjs b/tests/side-pane-tab-keyboard.test.mjs
deleted file mode 100644
index 8caba9c23..000000000
--- a/tests/side-pane-tab-keyboard.test.mjs
+++ /dev/null
@@ -1,63 +0,0 @@
-import test from 'node:test';
-import assert from 'node:assert/strict';
-import { JSDOM } from 'jsdom';
-import { createSidePaneController } from '../modules/ui-system/side-pane/side-pane-controller.js';
-
-const settle = () => new Promise(resolve => setImmediate(resolve));
-
-function createController() {
-    const dom = new JSDOM('<main class="main-content"></main><aside id="pane"><div id="tabs"></div><div id="content"></div></aside>');
-    const doc = dom.window.document;
-    const provider = {
-        mountTab(_payload, view) {
-            const input = doc.createElement('input');
-            view.append(input);
-            return { focus: () => input.focus(), dispose() {} };
-        }
-    };
-    const ctrl = createSidePaneController({
-        root: doc.getElementById('pane'),
-        tabListElement: doc.getElementById('tabs'),
-        contentContainer: doc.getElementById('content')
-    });
-    ctrl.registerTabType({ kind: 'probe', label: 'Probe', provider });
-    const tab = id => ({ id, kind: 'probe', title: id, closable: true, scopeMode: 'global' });
-    const button = id => [...doc.querySelectorAll('#tabs [role="tab"]')].find(el => el.dataset.tabId === id);
-    const press = key => doc.activeElement.dispatchEvent(new dom.window.KeyboardEvent('keydown', { key, bubbles: true }));
-    return { dom, doc, ctrl, tab, button, press };
-}
-
-test('arrow keys move the active tab and keep focus on the tab strip', async () => {
-    const { doc, ctrl, tab, button, press } = createController();
-    try {
-        await ctrl.openTab(tab('probe:a'));
-        await ctrl.openTab(tab('probe:b'));
-        button('probe:b').focus();
-
-        press('ArrowLeft');
-        await settle();
-        assert.equal(ctrl.getSnapshot().activeTabId, 'probe:a');
-        assert.equal(doc.activeElement, button('probe:a'));
-
-        press('ArrowRight');
-        await settle();
-        assert.equal(ctrl.getSnapshot().activeTabId, 'probe:b');
-        assert.equal(doc.activeElement, button('probe:b'));
-    } finally { await ctrl.dispose(); }
-});
-
-test('tab ids carrying Windows paths and quotes mount, focus and close', async () => {
-    const { doc, ctrl, tab, button } = createController();
-    const windowsId = 'code-viewer:C:\\Users\\me\\proj\\a.js';
-    const quotedId = 'code-viewer:/tmp/a"b.js';
-    try {
-        await ctrl.openTab(tab(windowsId));
-        await ctrl.openTab(tab(quotedId));
-        assert.deepEqual(ctrl.getViewResidency().live.sort(), [quotedId, windowsId].sort());
-
-        await ctrl.closeTab(quotedId);
-        await settle();
-        assert.equal(ctrl.getSnapshot().activeTabId, windowsId);
-        assert.equal(doc.activeElement, button(windowsId), 'focus lands on the remaining file tab');
-    } finally { await ctrl.dispose(); }
-});

From 7b4d7659299edfb8ab6899f035e20f7ee8f2bd77 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 00:47:17 +0000
Subject: [PATCH 020/143] Plan detail: move the composition guard below the
 focus bookkeeping

Keeps the change clear of the focus-restore lines the parallel fix branch edits.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DFRovoZHMzeheXKkLNWKG
---
 modules/ui-system/side-pane/planDetailSideProvider.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ui-system/side-pane/planDetailSideProvider.js b/modules/ui-system/side-pane/planDetailSideProvider.js
index 7a420ad01..1f024a043 100644
--- a/modules/ui-system/side-pane/planDetailSideProvider.js
+++ b/modules/ui-system/side-pane/planDetailSideProvider.js
@@ -738,13 +738,13 @@ export function createPlanDetailSideProvider({
 
             function render() {
                 if (disposed() || nodeView) return;
-                if (composingFilter) return;
                 // 输入框随整页重绘，记下焦点和光标位置
                 const active = doc.activeElement;
                 const focusKey = active && body.contains(active) ? active.dataset?.filter : null;
                 const pageFocus = active && chrome.contains(active) ? active.dataset?.planPage : null;
                 const caret = focusKey && typeof active.selectionStart === 'number' ? [active.selectionStart, active.selectionEnd] : null;
                 const scrollTop = body.scrollTop;
+                if (composingFilter) return;
                 body.innerHTML = '';
                 chrome.innerHTML = '';
                 chrome.hidden = false;

From d490d9cff9e4e8bc5882ed99a44d71877eb98a90 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 00:48:29 +0000
Subject: [PATCH 021/143] Side pane: share findByTabId's signature with PR #4

PR #4 adds the same tab lookup as findByTabId(container, selector,
tabId). Use the same signature, text and keyboard comments so the two
branches merge without a semantic clash, and rename this branch's
keyboard test so the files don't collide.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_016hW799u5Ji5k9khDAwu688
---
 docs/contracts/generated/chat-event-graph.json      |  4 ++--
 modules/ui-system/side-pane/side-pane-controller.js |  2 +-
 modules/ui-system/side-pane/side-pane-tab-strip.js  | 11 ++++++-----
 modules/ui-system/side-pane/side-pane-tab-utils.js  | 13 +++++--------
 tests/side-pane-tab-id-lookup.test.mjs              |  6 +++---
 ...st.mjs => side-pane-tab-strip-keyboard.test.mjs} |  0
 6 files changed, 17 insertions(+), 19 deletions(-)
 rename tests/{side-pane-tab-keyboard.test.mjs => side-pane-tab-strip-keyboard.test.mjs} (100%)

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 057f50dc0..02390f040 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -15555,7 +15555,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 302,
+          "line": 303,
           "kind": "custom-event-listener"
         },
         {
@@ -15932,7 +15932,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 302,
+          "line": 303,
           "kind": "custom-event-listener",
           "match": "tabListElement.addEventListener('keydown'"
         },
diff --git a/modules/ui-system/side-pane/side-pane-controller.js b/modules/ui-system/side-pane/side-pane-controller.js
index c24baef4d..5c6b514cc 100644
--- a/modules/ui-system/side-pane/side-pane-controller.js
+++ b/modules/ui-system/side-pane/side-pane-controller.js
@@ -524,7 +524,7 @@ export function createSidePaneController({
         const mounting = (async () => {
             // 上次挂载失败留下的提示页不复用，换一个干净的视图重新挂
             clearMountFailure(tabId);
-            let view = findByTabId(contentContainer, tabId);
+            let view = findByTabId(contentContainer, '[data-tab-id]', tabId);
             if (!view && contentContainer) {
                 view = doc.createElement('section');
                 view.className = 'side-pane-view';
diff --git a/modules/ui-system/side-pane/side-pane-tab-strip.js b/modules/ui-system/side-pane/side-pane-tab-strip.js
index 8d046f0e6..9fd3a6ec8 100644
--- a/modules/ui-system/side-pane/side-pane-tab-strip.js
+++ b/modules/ui-system/side-pane/side-pane-tab-strip.js
@@ -134,7 +134,7 @@ export function createSidePaneTabStrip({
     function syncStatus() {
         const current = statusTabId ? getStatus() : null;
         if (!current) return;
-        const btn = findByTabId(tabListElement, statusTabId, '.side-pane-tab[data-tab-id]');
+        const btn = findByTabId(tabListElement, '.side-pane-tab[data-tab-id]', statusTabId);
         const dot = btn?.querySelector('.side-pane-tab-status');
         if (!dot) return;
         const { status = 'unknown', text = '' } = current;
@@ -283,7 +283,8 @@ export function createSidePaneTabStrip({
         if (e.key === 'ArrowRight' || e.key === 'ArrowDown') {
             targetIndex = (currentIndex + 1) % tabButtons.length;
         } else if (e.key === 'ArrowLeft' || e.key === 'ArrowUp') {
-            targetIndex = (currentIndex - 1 + tabButtons.length) % tabButtons.length;
+            // 当前是新标签页（不在标签条上）时，往左落到最后一个
+            targetIndex = currentIndex < 0 ? tabButtons.length - 1 : (currentIndex - 1 + tabButtons.length) % tabButtons.length;
         } else if (e.key === 'Home') {
             targetIndex = 0;
         } else if (e.key === 'End') {
@@ -293,10 +294,10 @@ export function createSidePaneTabStrip({
         }
         e.preventDefault();
         if (targetIndex !== currentIndex && targetIndex >= 0 && targetIndex < tabButtons.length) {
+            // 激活会重建标签条，旧按钮随之离开文档；焦点留在标签上（WAI-ARIA Tabs），按 id 找重建后的按钮
             const targetId = tabButtons[targetIndex].getAttribute('data-tab-id');
             onActivate(targetId, { focus: false });
-            // 激活会重画标签条，原来的按钮已经不在了，按 id 找新的
-            findByTabId(tabListElement, targetId, '[role="tab"][data-tab-id]')?.focus?.();
+            findByTabId(tabListElement, '[role="tab"][data-tab-id]', targetId)?.focus?.();
         }
     };
     tabListElement.addEventListener('keydown', onKeydown);
@@ -311,7 +312,7 @@ export function createSidePaneTabStrip({
         syncStatus,
         hideTooltip,
         focusTab(tabId) {
-            findByTabId(tabListElement, tabId, '[role="tab"][data-tab-id]')?.focus?.();
+            findByTabId(tabListElement, '[role="tab"][data-tab-id]', tabId)?.focus?.();
         },
         dispose() {
             disposed = true;
diff --git a/modules/ui-system/side-pane/side-pane-tab-utils.js b/modules/ui-system/side-pane/side-pane-tab-utils.js
index 0c908b81c..e5dd8f4aa 100644
--- a/modules/ui-system/side-pane/side-pane-tab-utils.js
+++ b/modules/ui-system/side-pane/side-pane-tab-utils.js
@@ -146,15 +146,12 @@ export function moveIdBefore(ids, activeId, overId) {
     return next;
 }
 
-/**
- * 按 data-tab-id 找元素。标签 id 里可能有 Windows 路径的反斜杠或引号（code-viewer:C:\proj\a.js），
- * 拼进属性选择器会匹配不到甚至抛 SyntaxError，所以逐个比对属性值。
- */
-export function findByTabId(container, tabId, selector = '[data-tab-id]') {
+// 按 data-tab-id 找元素，不把 id 拼进选择器：文件标签的 id 带 Windows 路径（反斜杠会被当成转义）或引号
+export function findByTabId(container, selector, tabId) {
     if (!container || tabId == null) return null;
-    const want = String(tabId);
-    for (const el of container.querySelectorAll(selector)) {
-        if (el.getAttribute('data-tab-id') === want) return el;
+    const id = String(tabId);
+    for (const element of container.querySelectorAll(selector)) {
+        if (element.getAttribute('data-tab-id') === id) return element;
     }
     return null;
 }
diff --git a/tests/side-pane-tab-id-lookup.test.mjs b/tests/side-pane-tab-id-lookup.test.mjs
index 080a54146..fd85233b1 100644
--- a/tests/side-pane-tab-id-lookup.test.mjs
+++ b/tests/side-pane-tab-id-lookup.test.mjs
@@ -38,9 +38,9 @@ test('findByTabId matches ids with backslashes and quotes literally', () => {
         const el = doc.createElement('button');
         el.setAttribute('data-tab-id', id);
         doc.body.append(el);
-        assert.equal(findByTabId(doc.body, id), el);
+        assert.equal(findByTabId(doc.body, '[data-tab-id]', id), el);
     }
-    assert.equal(findByTabId(doc.body, 'code-viewer:C:Usersroxyproja.js'), null);
+    assert.equal(findByTabId(doc.body, '[data-tab-id]', 'code-viewer:C:Usersroxyproja.js'), null);
     dom.window.close();
 });
 
@@ -56,7 +56,7 @@ for (const id of [WINDOWS_ID, QUOTED_ID]) {
         try {
             await controller.openTab({ id: 'other', kind: 'probe', title: 'Other', closable: true, scopeMode: 'global' });
             await controller.openTab({ id, kind: 'probe', title: 'a.js', closable: true, scopeMode: 'global' });
-            assert.equal(findByTabId(root.querySelector('.side-pane-content-container'), id)?.textContent, 'a.js');
+            assert.equal(findByTabId(root.querySelector('.side-pane-content-container'), '[data-tab-id]', id)?.textContent, 'a.js');
 
             controller.activateTab('other');
             controller.cycleTab(1);
diff --git a/tests/side-pane-tab-keyboard.test.mjs b/tests/side-pane-tab-strip-keyboard.test.mjs
similarity index 100%
rename from tests/side-pane-tab-keyboard.test.mjs
rename to tests/side-pane-tab-strip-keyboard.test.mjs

From bb9a89acdff2cf729f61302b06f96ceb112fc730 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 00:51:04 +0000
Subject: [PATCH 022/143] Contracts: regenerate the chat event graph after
 merging #3 and #4

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01UCGGgmHsCToooXTgSXpmq9
---
 .../contracts/generated/chat-event-graph.json | 142 ++++++++++--------
 1 file changed, 82 insertions(+), 60 deletions(-)

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 02390f040..44c400962 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -664,7 +664,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 243,
+          "line": 270,
           "kind": "custom-event-listener"
         },
         {
@@ -729,7 +729,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 243,
+          "line": 270,
           "kind": "custom-event-listener",
           "match": "signal?.addEventListener('abort'"
         },
@@ -2379,7 +2379,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 569,
+          "line": 579,
           "kind": "custom-event-listener"
         }
       ],
@@ -2554,7 +2554,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 569,
+          "line": 579,
           "kind": "custom-event-listener",
           "match": "el.addEventListener('change'"
         }
@@ -3685,12 +3685,12 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 551,
+          "line": 562,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 554,
+          "line": 565,
           "kind": "custom-event-listener"
         },
         {
@@ -4255,87 +4255,87 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 335,
+          "line": 337,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 371,
+          "line": 373,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 408,
+          "line": 410,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 417,
+          "line": 419,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 530,
+          "line": 532,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 585,
+          "line": 595,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 591,
+          "line": 601,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 664,
+          "line": 674,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 691,
+          "line": 701,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 710,
+          "line": 720,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 730,
+          "line": 740,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 760,
+          "line": 771,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 775,
+          "line": 786,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 497,
+          "line": 498,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1076,
+          "line": 1077,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1082,
+          "line": 1083,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1096,
+          "line": 1097,
           "kind": "custom-event-listener"
         },
         {
@@ -5150,13 +5150,13 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 551,
+          "line": 562,
           "kind": "custom-event-listener",
           "match": "stopBtn.addEventListener('click'"
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 554,
+          "line": 565,
           "kind": "custom-event-listener",
           "match": "persistenceBadge.addEventListener('click'"
         },
@@ -5834,103 +5834,103 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 335,
+          "line": 337,
           "kind": "custom-event-listener",
           "match": "btn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 371,
+          "line": 373,
           "kind": "custom-event-listener",
           "match": "crumbs.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 408,
+          "line": 410,
           "kind": "custom-event-listener",
           "match": "refreshBtn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 417,
+          "line": 419,
           "kind": "custom-event-listener",
           "match": "forgeBtn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 530,
+          "line": 532,
           "kind": "custom-event-listener",
           "match": "row.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 585,
+          "line": 595,
           "kind": "custom-event-listener",
           "match": "toggle.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 591,
+          "line": 601,
           "kind": "custom-event-listener",
           "match": "clear.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 664,
+          "line": 674,
           "kind": "custom-event-listener",
           "match": "headBtn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 691,
+          "line": 701,
           "kind": "custom-event-listener",
           "match": "pick.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 710,
+          "line": 720,
           "kind": "custom-event-listener",
           "match": "pick.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 730,
+          "line": 740,
           "kind": "custom-event-listener",
           "match": "link.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 760,
+          "line": 771,
           "kind": "custom-event-listener",
           "match": "retry.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 775,
+          "line": 786,
           "kind": "custom-event-listener",
           "match": "retry.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 497,
+          "line": 498,
           "kind": "custom-event-listener",
           "match": "retry.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1076,
+          "line": 1077,
           "kind": "custom-event-listener",
           "match": "toggleNotificationsBtn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1082,
+          "line": 1083,
           "kind": "custom-event-listener",
           "match": "expandButton.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1096,
+          "line": 1097,
           "kind": "custom-event-listener",
           "match": "closeSidePaneBtn.addEventListener('click'"
         },
@@ -7107,6 +7107,11 @@
           "file": "modules/renderer/sideChatSurfaceOwner.js",
           "line": 344,
           "kind": "custom-event-listener"
+        },
+        {
+          "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
+          "line": 560,
+          "kind": "custom-event-listener"
         }
       ],
       "evidence": [
@@ -7115,6 +7120,12 @@
           "line": 344,
           "kind": "custom-event-listener",
           "match": "textarea.addEventListener('compositionend'"
+        },
+        {
+          "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
+          "line": 560,
+          "kind": "custom-event-listener",
+          "match": "el.addEventListener('compositionend'"
         }
       ]
     },
@@ -7126,6 +7137,11 @@
           "file": "modules/renderer/sideChatSurfaceOwner.js",
           "line": 343,
           "kind": "custom-event-listener"
+        },
+        {
+          "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
+          "line": 559,
+          "kind": "custom-event-listener"
         }
       ],
       "evidence": [
@@ -7134,6 +7150,12 @@
           "line": 343,
           "kind": "custom-event-listener",
           "match": "textarea.addEventListener('compositionstart'"
+        },
+        {
+          "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
+          "line": 559,
+          "kind": "custom-event-listener",
+          "match": "el.addEventListener('compositionstart'"
         }
       ]
     },
@@ -7268,7 +7290,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 558,
+          "line": 569,
           "kind": "custom-event-listener"
         },
         {
@@ -7400,7 +7422,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 558,
+          "line": 569,
           "kind": "custom-event-listener",
           "match": "persistenceBadge.addEventListener('contextmenu'"
         },
@@ -12655,14 +12677,14 @@
       "consumers": [
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 152,
+          "line": 179,
           "kind": "custom-event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 152,
+          "line": 179,
           "kind": "custom-event-listener",
           "match": "screen.addEventListener('focusin'"
         }
@@ -14834,7 +14856,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 544,
+          "line": 558,
           "kind": "custom-event-listener"
         },
         {
@@ -15026,7 +15048,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 544,
+          "line": 558,
           "kind": "custom-event-listener",
           "match": "el.addEventListener('input'"
         },
@@ -21631,14 +21653,14 @@
       "consumers": [
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 157,
+          "line": 184,
           "kind": "preload-subscription"
         }
       ],
       "evidence": [
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 157,
+          "line": 184,
           "kind": "preload-subscription",
           "match": "api.onTerminalClear("
         }
@@ -21669,14 +21691,14 @@
       "consumers": [
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 154,
+          "line": 181,
           "kind": "preload-subscription"
         }
       ],
       "evidence": [
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 154,
+          "line": 181,
           "kind": "preload-subscription",
           "match": "api.onTerminalData("
         }
@@ -21688,14 +21710,14 @@
       "consumers": [
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 160,
+          "line": 187,
           "kind": "preload-subscription"
         }
       ],
       "evidence": [
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 160,
+          "line": 187,
           "kind": "preload-subscription",
           "match": "api.onTerminalExit("
         }
@@ -24947,7 +24969,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1116,
+          "line": 1117,
           "kind": "custom-event-listener"
         },
         {
@@ -25041,7 +25063,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1116,
+          "line": 1117,
           "kind": "custom-event-listener",
           "match": "win?.addEventListener?.('resize'"
         },
@@ -28037,7 +28059,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 550,
+          "line": 561,
           "kind": "custom-event-listener"
         },
         {
@@ -28097,7 +28119,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 550,
+          "line": 561,
           "kind": "custom-event-listener",
           "match": "form.addEventListener('submit'"
         },
@@ -29229,7 +29251,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-visibility.js",
-          "line": 104,
+          "line": 122,
           "kind": "custom-event-listener"
         },
         {
@@ -29247,7 +29269,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-visibility.js",
-          "line": 104,
+          "line": 122,
           "kind": "custom-event-listener",
           "match": "root.addEventListener('transitionend'"
         },

From 4292711e526f14c1b1833c14d67a03eb2abe990e Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 00:52:09 +0000
Subject: [PATCH 023/143] Side pane: tab context menu returns focus to the tab

Choosing an item hid the focused menu button and dropped focus to body;
closing a background tab left nothing to return to. Tab now closes the
menu like Radix Menu (ZCode uses Radix ContextMenu), and after an action
focus goes back to the tab, or to the active tab if that one was closed.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_016hW799u5Ji5k9khDAwu688
---
 .../contracts/generated/chat-event-graph.json | 20 +++++++++----------
 .../side-pane/side-pane-controller.js         |  2 +-
 .../ui-system/side-pane/side-pane-tab-menu.js | 14 +++++++++++--
 tests/side-pane-advanced-parity.test.mjs      | 16 +++++++++++++++
 4 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 02390f040..d7661e608 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -1715,7 +1715,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-menu.js",
-          "line": 95,
+          "line": 105,
           "kind": "custom-event-listener"
         },
         {
@@ -1825,7 +1825,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-menu.js",
-          "line": 95,
+          "line": 105,
           "kind": "custom-event-listener",
           "match": "win?.addEventListener('blur'"
         },
@@ -4370,7 +4370,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-menu.js",
-          "line": 60,
+          "line": 63,
           "kind": "custom-event-listener"
         },
         {
@@ -5972,7 +5972,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-menu.js",
-          "line": 60,
+          "line": 63,
           "kind": "custom-event-listener",
           "match": "menu.addEventListener('click'"
         },
@@ -15535,12 +15535,12 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-menu.js",
-          "line": 76,
+          "line": 86,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-menu.js",
-          "line": 94,
+          "line": 104,
           "kind": "custom-event-listener"
         },
         {
@@ -15908,13 +15908,13 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-menu.js",
-          "line": 76,
+          "line": 86,
           "kind": "custom-event-listener",
           "match": "menu.addEventListener('keydown'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-menu.js",
-          "line": 94,
+          "line": 104,
           "kind": "custom-event-listener",
           "match": "doc.addEventListener('keydown'"
         },
@@ -22991,7 +22991,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-menu.js",
-          "line": 93,
+          "line": 103,
           "kind": "custom-event-listener"
         },
         {
@@ -23048,7 +23048,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-menu.js",
-          "line": 93,
+          "line": 103,
           "kind": "custom-event-listener",
           "match": "doc.addEventListener('pointerdown'"
         },
diff --git a/modules/ui-system/side-pane/side-pane-controller.js b/modules/ui-system/side-pane/side-pane-controller.js
index 5c6b514cc..cf09f2f6c 100644
--- a/modules/ui-system/side-pane/side-pane-controller.js
+++ b/modules/ui-system/side-pane/side-pane-controller.js
@@ -280,7 +280,7 @@ export function createSidePaneController({
             menu: resolvedTabContextMenu,
             getClosableTabs: () => SidePaneState.getClosableVisibleTabs(state),
             onShow: () => overview?.hide(),
-            focusTab: (tabId) => strip?.focusTab(tabId),
+            focusTab: (tabId) => strip?.focusTab(state.tabs.some(t => t.id === tabId) ? tabId : state.activeTabId),
             onAction: async (action, tabId) => {
                 if (action === 'close-tab' && tabId) await controller.closeTab(tabId);
                 else if (action === 'close-others' && tabId) await controller.closeOtherTabs(tabId);
diff --git a/modules/ui-system/side-pane/side-pane-tab-menu.js b/modules/ui-system/side-pane/side-pane-tab-menu.js
index a72ddd2e9..d786d9f0a 100644
--- a/modules/ui-system/side-pane/side-pane-tab-menu.js
+++ b/modules/ui-system/side-pane/side-pane-tab-menu.js
@@ -8,7 +8,7 @@ import { placeMenuAt } from './menu-position.js';
  *   getClosableTabs()   当前对话里可关的标签，用来决定哪些项可点
  *   onAction(action, tabId)
  *   onShow()            菜单打开前调用，用来收起别的浮层
- *   focusTab(tabId)     Esc 关闭后把焦点还给标签
+ *   focusTab(tabId)     Esc/Tab 关闭或执行后把焦点还给标签；标签已关时由调用方退回当前标签
  */
 export function createSidePaneTabMenu({ menu, getClosableTabs, onAction, onShow = () => {}, focusTab = () => {} }) {
     const doc = menu.ownerDocument;
@@ -56,12 +56,22 @@ export function createSidePaneTabMenu({ menu, getClosableTabs, onAction, onShow
         const tabId = targetTabId;
         hide();
         await onAction(action, tabId);
+        // 被点的菜单项已经藏起来了，焦点会掉到 body：还给标签（标签被关了就给当前标签）
+        const active = doc.activeElement;
+        if (!active || active === doc.body || !active.isConnected || menu.contains(active)) focusTab(tabId);
     };
     menu.addEventListener('click', onClick);
     cleanups.push(() => menu.removeEventListener('click', onClick));
 
-    // 菜单内上下键移动焦点
+    // 菜单内上下键移动焦点；Tab 和 Radix Menu 一样直接收起，焦点回到标签
     const onMenuKeydown = (e) => {
+        if (e.key === 'Tab') {
+            e.preventDefault();
+            const returnTo = targetTabId;
+            hide();
+            focusTab(returnTo);
+            return;
+        }
         if (e.key !== 'ArrowDown' && e.key !== 'ArrowUp' && e.key !== 'Home' && e.key !== 'End') return;
         const items = Array.from(menu.querySelectorAll('[role="menuitem"]:not([disabled])'));
         if (!items.length) return;
diff --git a/tests/side-pane-advanced-parity.test.mjs b/tests/side-pane-advanced-parity.test.mjs
index e66a08a70..99874d48a 100644
--- a/tests/side-pane-advanced-parity.test.mjs
+++ b/tests/side-pane-advanced-parity.test.mjs
@@ -662,6 +662,22 @@ test('Parity: tab context menu is scoped, keyboard friendly and closes on Escape
     assert.equal(contextMenu.hidden, true);
     assert.deepEqual(ctrl.getSnapshot().tabs.map(t => t.id), ['notifications', 's1']);
     assert.equal(ctrl.getSnapshot().activeTabId, 's1');
+    assert.equal(doc.activeElement, tabList.querySelector('[role="tab"][data-tab-id="s1"]'), 'focus goes back to the tab, not body');
+
+    // Tab 收起菜单，焦点回到标签
+    openMenuOn('s1');
+    contextMenu.dispatchEvent(new dom.window.KeyboardEvent('keydown', { key: 'Tab', bubbles: true, cancelable: true }));
+    assert.equal(contextMenu.hidden, true);
+    assert.equal(doc.activeElement, tabList.querySelector('[role="tab"][data-tab-id="s1"]'));
+
+    // 关掉后台标签：那个标签没了，焦点落到当前标签
+    await ctrl.openTab({ kind: 'chat', descriptor: createDesc('s3', 'c3') });
+    await ctrl.activateTab('s1');
+    openMenuOn('s3');
+    contextMenu.querySelector('[data-action="close-tab"]').click();
+    await tick();
+    assert.deepEqual(ctrl.getSnapshot().tabs.map(t => t.id), ['notifications', 's1']);
+    assert.equal(doc.activeElement, tabList.querySelector('[role="tab"][data-tab-id="s1"]'));
 
     await ctrl.dispose();
     assert.notEqual(contextMenu.parentNode, doc.body, 'dispose puts the menu back');

From a1bc4c30ab52905eee67c309c9bdeffb64a01899 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 00:52:53 +0000
Subject: [PATCH 024/143] Git page: line counts and diffs follow later edits,
 subdirectory paths resolve, Linux skips the object store

- git status now carries per-file added/removed counts from git diff --numstat (as ZCode's
  git repo does). A file that is already modified and then edited again changes the status
  key, so cached diffs are dropped and the open file re-reads its diff while staying open.
  Rows no longer fetch one diff per file just to show counts. Diff requests started before
  an invalidation no longer write back into the cache.
- Status paths are relative to the repository root. In a workspace that is a subdirectory,
  "copy absolute path" and "show in file manager" now resolve against that root instead of
  doubling the subdirectory.
- On Linux the watcher no longer watches the whole git directory recursively, which made
  Node walk every object synchronously and use one inotify watch per file. It watches the
  directory itself and refs/ instead.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DFRovoZHMzeheXKkLNWKG
---
 modules/ipc/gitHandlers.js                    |  7 +-
 modules/services/gitService.js                | 60 ++++++++++++++-
 modules/services/gitWatcher.js                | 19 ++++-
 modules/ui-system/side-pane/git/cards.js      | 22 ++++--
 .../ui-system/side-pane/git/context-menu.js   |  9 ++-
 modules/ui-system/side-pane/git/git-view.js   |  5 +-
 tests/git-service.test.js                     | 31 ++++++++
 tests/git-watcher.test.js                     | 19 ++++-
 tests/side-pane-git-stale-diff.test.mjs       | 76 +++++++++++++++++++
 9 files changed, 226 insertions(+), 22 deletions(-)
 create mode 100644 tests/side-pane-git-stale-diff.test.mjs

diff --git a/modules/ipc/gitHandlers.js b/modules/ipc/gitHandlers.js
index 13ff70f0f..57c4d1d00 100644
--- a/modules/ipc/gitHandlers.js
+++ b/modules/ipc/gitHandlers.js
@@ -9,7 +9,6 @@
 //   监听降级（只看得到 .git 或挂不上）时推一次 degraded，订阅回执里也带着，渲染端退回到窗口获得焦点时补读。
 'use strict';
 
-const path = require('path');
 const { ipcMain, shell } = require('electron');
 const gitService = require('../services/gitService');
 const { createGitWatcher } = require('../services/gitWatcher');
@@ -162,10 +161,8 @@ function initialize({ workspaceService = null, mainWindow = null, getMainWindow:
     ), { mutates: true });
 
     // 在系统文件管理器中定位文件：只接受工作区内的相对路径，越界一律拒绝。
-    handle('git:reveal-path', (workspaceId, relPath) => {
-        const root = path.resolve(resolveWorkspaceRoot(workspaceId));
-        const target = path.resolve(root, typeof relPath === 'string' ? relPath : '');
-        if (target !== root && !target.startsWith(root + path.sep)) throw new Error('路径不在工作区内。');
+    handle('git:reveal-path', async (workspaceId, relPath) => {
+        const target = await gitService.resolveRevealTarget(resolveWorkspaceRoot(workspaceId), relPath);
         shell.showItemInFolder(target);
         return { revealed: true };
     });
diff --git a/modules/services/gitService.js b/modules/services/gitService.js
index eee6f797a..6c13550ec 100644
--- a/modules/services/gitService.js
+++ b/modules/services/gitService.js
@@ -341,13 +341,54 @@ async function listRemotes(repo) {
 
 // ============================ 状态 ============================
 
+/** 解析 `git diff --numstat -z --no-renames`：路径 → { added, removed }；二进制文件两项都是 null */
+function parseNumstat(buffer) {
+    const counts = new Map();
+    const text = Buffer.isBuffer(buffer) ? buffer.toString('utf8') : String(buffer || '');
+    for (const record of text.split('\0')) {
+        const match = /^(-|\d+)\t(-|\d+)\t(.+)$/s.exec(record);
+        if (!match) continue;
+        counts.set(match[3], {
+            added: match[1] === '-' ? null : Number(match[1]),
+            removed: match[2] === '-' ? null : Number(match[2]),
+        });
+    }
+    return counts;
+}
+
+/**
+ * 每个已跟踪文件的增删行数，和状态同一次读出（对照 ZCode gitCliRepo 的 diff --numstat）。
+ * 状态码不变、内容又被改了时，行数跟着变，渲染端据此知道哪些 diff 过期，也不用逐个拉 diff 来算行数。
+ */
+async function readDiffCounts(repo) {
+    const scope = repo.prefix ? ['--', repo.prefix] : [];
+    const base = ['diff', '--numstat', '-z', '--no-renames', '--no-ext-diff'];
+    const [unstaged, staged] = await Promise.all([
+        runGit(repo.toplevel, [...base, ...scope]).then(r => parseNumstat(r.stdout), () => new Map()),
+        runGit(repo.toplevel, [...base, '--cached', ...scope]).then(r => parseNumstat(r.stdout), () => new Map()),
+    ]);
+    return { unstaged, staged };
+}
+
+function withCounts(list, counts) {
+    return list.map(item => {
+        const count = item.untracked ? null : counts.get(item.path);
+        return count ? { ...item, added: count.added, removed: count.removed } : item;
+    });
+}
+
 async function readStatus(repo) {
     const args = ['status', '--porcelain=v2', '-z', '--branch', '--untracked-files=all'];
     if (repo.prefix) args.push('--', repo.prefix);
-    const [{ stdout }, remotes] = await Promise.all([runGit(repo.toplevel, args), listRemotes(repo)]);
+    const [{ stdout }, remotes, counts] = await Promise.all([runGit(repo.toplevel, args), listRemotes(repo), readDiffCounts(repo)]);
     const { branch, entries } = parsePorcelainV2(stdout);
     const truncated = entries.length > MAX_ENTRIES;
-    const groups = groupEntries(truncated ? entries.slice(0, MAX_ENTRIES) : entries);
+    const grouped = groupEntries(truncated ? entries.slice(0, MAX_ENTRIES) : entries);
+    const groups = {
+        staged: withCounts(grouped.staged, counts.staged),
+        changes: withCounts(grouped.changes, counts.unstaged),
+        conflicts: grouped.conflicts,
+    };
     return {
         isRepo: true,
         root: repo.root,
@@ -369,6 +410,19 @@ async function readStatus(repo) {
     };
 }
 
+/**
+ * 「在文件管理器中打开」的目标：状态条目的路径相对仓库根，工作区可能只是仓库的子目录，
+ * 所以按仓库根解析（对照 ZCode gitService.ts toAbsolutePath），再校验仍在工作区内。
+ */
+async function resolveRevealTarget(workspaceRoot, relPath) {
+    const repo = await openRepository(workspaceRoot);
+    if (repo) return absoluteInRepo(repo, resolveRepoPath(repo, relPath));
+    const root = path.resolve(workspaceRoot);
+    const target = path.resolve(root, typeof relPath === 'string' ? relPath : '');
+    if (target !== root && !target.startsWith(root + path.sep)) throw new Error('路径不在工作区内。');
+    return target;
+}
+
 async function getStatus(workspaceRoot) {
     const repo = await openRepository(workspaceRoot);
     if (!repo) return { isRepo: false, root: path.resolve(workspaceRoot) };
@@ -727,6 +781,7 @@ async function getChangeSummary(workspaceRoot) {
 module.exports = {
     getStatus,
     getWatchTargets,
+    resolveRevealTarget,
 
     getDiff,
     stage,
@@ -741,6 +796,7 @@ module.exports = {
     getChangeSummary,
     // 供测试使用
     parsePorcelainV2,
+    parseNumstat,
     groupEntries,
     resolveRepoPath,
     chunkPaths,
diff --git a/modules/services/gitWatcher.js b/modules/services/gitWatcher.js
index c84b4dfe8..ddf451282 100644
--- a/modules/services/gitWatcher.js
+++ b/modules/services/gitWatcher.js
@@ -5,6 +5,9 @@
 //   - 工作区文件：Windows / macOS 上递归监听整个工作区（系统原生递归监听，开销小）；
 //     Linux 上递归监听要给每个子目录单独挂 watcher，大仓库代价太高，只监听元数据，
 //     文件内容的改动靠窗口获得焦点、操作后刷新和 V工程 推送补上；
+//   - Linux 上元数据目录也不整棵递归：Node 在 Linux 上的递归监听是 JS 实现，会同步遍历整棵 .git、给每个文件挂一个
+//     inotify（objects 多的仓库一次挂上万个，主线程卡几百毫秒，还可能把系统的 inotify 名额用光）。只监听元数据目录本身
+//     （HEAD、index、packed-refs……）加递归的 refs/（对照 DSH fs-local 的 depth:0）；
 //   - 一批连续写入只触发一次：每来一个事件往后推一次。元数据从这批第一个元数据事件起最多等 maxWaitMs，
 //     文件内容最多等 contentMaxWaitMs（编辑器、构建一直在写时不用每几秒读一遍状态）；两者谁先到就报一次；
 //   - 应用自己改了仓库（暂存、提交……）会马上通知，absorb(id) 让监听不再为同一件事重复报：
@@ -49,6 +52,7 @@ function createGitWatcher({
     onChange,
     onDegraded = null,
     watch = fs.watch,
+    exists = fs.existsSync,
     platform = process.platform,
     delays = DEFAULT_DELAYS,
     logger = console,
@@ -56,9 +60,10 @@ function createGitWatcher({
     const { metadataMs, contentMs, maxWaitMs, contentMaxWaitMs, absorbMs } = { ...DEFAULT_DELAYS, ...delays };
     const entries = new Map(); // id → entry
 
-    function open(entry, dir, kind) {
+    function open(entry, dir, kind, { recursive = true, prefix = '' } = {}) {
         try {
-            const watcher = watch(dir, { recursive: true, persistent: false }, (_type, filename) => onEvent(entry, kind, filename));
+            const watcher = watch(dir, { recursive, persistent: false },
+                (_type, filename) => onEvent(entry, kind, filename && prefix ? `${prefix}${filename}` : filename));
             watcher.on?.('error', error => {
                 // 目录被删或失去权限：关掉这一路，其余照常
                 try { watcher.close(); } catch (_e) { /* 已关闭 */ }
@@ -140,7 +145,15 @@ function createGitWatcher({
                 if (entry.error) reportDegraded(entry);
                 return;
             }
-            for (const dir of outermostDirs(targets.gitDirs || [])) open(entry, dir, 'metadata');
+            for (const dir of outermostDirs(targets.gitDirs || [])) {
+                if (platform === 'linux') {
+                    open(entry, dir, 'metadata', { recursive: false });
+                    const refs = path.join(dir, 'refs');
+                    if (exists(refs)) open(entry, refs, 'metadata', { prefix: 'refs/' });
+                } else {
+                    open(entry, dir, 'metadata');
+                }
+            }
             const watchContent = platform !== 'linux' && targets.root;
             if (watchContent) open(entry, targets.root, 'content');
             const kinds = new Set(entry.watchers.map(item => item.kind));
diff --git a/modules/ui-system/side-pane/git/cards.js b/modules/ui-system/side-pane/git/cards.js
index 0cd302821..2027ff42a 100644
--- a/modules/ui-system/side-pane/git/cards.js
+++ b/modules/ui-system/side-pane/git/cards.js
@@ -34,6 +34,8 @@ export function createGitCards({
     const diffCache = new Map();
     let countQueue = [];
     let countWorkers = 0;
+    // 缓存作废一次加一；作废前发出的请求回来时不再写缓存（对照 ZCode GitPane diffGenerationRef）
+    let generation = 0;
 
     async function fetchDiff(item) {
         const key = keyOf(item);
@@ -41,6 +43,7 @@ export function createGitCards({
         if (cached && cached.state !== 'loading') return cached;
         if (cached?.promise) return cached.promise;
         const requestedWorkspace = store.currentWorkspaceId;
+        const requestedGeneration = generation;
         const promise = (async () => {
             let result;
             try {
@@ -64,17 +67,23 @@ export function createGitCards({
             } catch (err) {
                 result = { state: 'unavailable', message: err.message || '暂时无法预览这个 Diff。' };
             }
-            if (requestedWorkspace === store.currentWorkspaceId && !disposed && !store.isDisposed) diffCache.set(key, result);
+            if (requestedWorkspace === store.currentWorkspaceId && requestedGeneration === generation && !disposed && !store.isDisposed) diffCache.set(key, result);
             return result;
         })();
         diffCache.set(key, { state: 'loading', promise });
         return promise;
     }
 
+    // 已跟踪文件的行数随状态一起来（git diff --numstat）；未跟踪文件和二进制文件才靠拉 diff 算
+    const hasStatusCounts = item => Number.isFinite(item.added) && Number.isFinite(item.removed);
+
     function paintCounts(item, card) {
-        const cached = diffCache.get(keyOf(item));
         const countsEl = card.querySelector('.side-git-counts');
-        if (!countsEl || cached?.state !== 'ready') return;
+        if (!countsEl) return;
+        const cached = hasStatusCounts(item)
+            ? { state: 'ready', added: item.added, removed: item.removed, approximate: false }
+            : diffCache.get(keyOf(item));
+        if (cached?.state !== 'ready') return;
         countsEl.innerHTML = '';
         const add = doc.createElement('span');
         add.className = 'text-diff-added';
@@ -243,14 +252,15 @@ export function createGitCards({
     }
 
     function prefetch(items) {
-        countQueue = items.slice(0, COUNT_PREFETCH_LIMIT).filter(item => !diffCache.has(keyOf(item)));
+        countQueue = items.filter(item => !hasStatusCounts(item)).slice(0, COUNT_PREFETCH_LIMIT).filter(item => !diffCache.has(keyOf(item)));
         pumpCountQueue();
     }
     function clearExpanded() { expanded.clear(); }
-    function clearDiff() { expanded.clear(); diffCache.clear(); }
+    function clearDiff() { expanded.clear(); invalidate(); }
+    function invalidate() { generation += 1; diffCache.clear(); countQueue = []; }
     function reset() { clearDiff(); countQueue = []; }
     function expand(item) { expanded.clear(); expanded.add(keyOf(item)); }
     function hasExpanded() { return expanded.size > 0; }
 
-    return Object.freeze({ buildCard, cardFor, prefetch, reset, clearDiff, clearExpanded, expand, hasExpanded, dispose() { disposed = true; countQueue = []; expanded.clear(); diffCache.clear(); } });
+    return Object.freeze({ buildCard, cardFor, prefetch, reset, clearDiff, invalidate, clearExpanded, expand, hasExpanded, dispose() { disposed = true; countQueue = []; expanded.clear(); diffCache.clear(); } });
 }
diff --git a/modules/ui-system/side-pane/git/context-menu.js b/modules/ui-system/side-pane/git/context-menu.js
index 61b4f045c..315735fdc 100644
--- a/modules/ui-system/side-pane/git/context-menu.js
+++ b/modules/ui-system/side-pane/git/context-menu.js
@@ -40,10 +40,11 @@ export function createGitContextMenu({
     }
 
     function absolutePathOf(item) {
-        const ws = workspaceOf(store.currentWorkspaceId);
-        if (!ws) return item.path;
-        const sep = ws.path.includes('\\') ? '\\' : '/';
-        return ws.path.replace(/[\\/]+$/, '') + sep + item.path.split('/').join(sep);
+        // 条目路径相对仓库根（工作区可能是子目录），用仓库根拼；拿不到时才退回工作区根
+        const base = store.currentToplevel || workspaceOf(store.currentWorkspaceId)?.path;
+        if (!base) return item.path;
+        const sep = base.includes('\\') ? '\\' : '/';
+        return base.replace(/[\\/]+$/, '') + sep + item.path.split('/').join(sep);
     }
 
     async function revealInFileManager(item) {
diff --git a/modules/ui-system/side-pane/git/git-view.js b/modules/ui-system/side-pane/git/git-view.js
index 4fe3d20dd..f2c71a562 100644
--- a/modules/ui-system/side-pane/git/git-view.js
+++ b/modules/ui-system/side-pane/git/git-view.js
@@ -156,6 +156,8 @@ export function mountGitView(host, {
 
     const store = Object.freeze({
         get currentWorkspaceId() { return currentWorkspaceId; },
+        // 状态条目的路径相对仓库根；工作区可能只是仓库的一个子目录
+        get currentToplevel() { return currentStatus?.toplevel || null; },
         get isDisposed() { return disposed(); }
     });
 
@@ -315,9 +317,10 @@ export function mountGitView(host, {
             if (currentSource === AI_SOURCE && !aiBatchLoaded) await loadAiBatch();
             if (disposed() || requestedId !== currentWorkspaceId) return;
             // 推送触发的静默刷新：状态没变就不重绘（避免闪烁、丢 hover），有展开的 diff 时照常重绘。
+            // 状态里带着每个文件的增删行数，内容变了 key 也会变；变了就让缓存的 diff 作废（展开的那个保持展开，重新取）
             const statusKey = JSON.stringify(res.data);
             if (quiet && statusKey === lastStatusKey && !cardsOwner.hasExpanded()) { skipRender = true; return; }
-            if (statusKey !== lastStatusKey) { cardsOwner.clearDiff(); }
+            if (statusKey !== lastStatusKey) { cardsOwner.invalidate(); }
             lastStatusKey = statusKey;
         } catch (err) {
             if (quiet) return;
diff --git a/tests/git-service.test.js b/tests/git-service.test.js
index 09624728d..388ca2e10 100644
--- a/tests/git-service.test.js
+++ b/tests/git-service.test.js
@@ -384,3 +384,34 @@ test('git IPC accepts only exact application pages, including embedded query par
     assert.equal(isAllowedSenderUrl(mainPage),true);
     for(const url of ['file:///C:/attacker/main.html','file:///H:/VCP/VCPMain/VCPChat/ProjectForgemodules/projectforge.html','https://evil.example/main.html','']) assert.equal(isAllowedSenderUrl(url),false,url);
 });
+
+test('status carries per-file line counts that follow a second edit of an already modified file', { skip: SKIP_GIT }, async t => {
+    const root = createRepo(t);
+    write(root, 'src/app.js', 'const a = 1;\nconst b = 2;\n');
+    let status = await gitService.getStatus(root);
+    const first = status.changes.find(item => item.path === 'src/app.js');
+    assert.deepEqual([first.status, first.added, first.removed], ['M', 1, 0]);
+
+    write(root, 'src/app.js', 'const a = 1;\nconst b = 2;\nconst c = 3;\nconst d = 4;\n');
+    status = await gitService.getStatus(root);
+    const second = status.changes.find(item => item.path === 'src/app.js');
+    assert.deepEqual([second.status, second.added, second.removed], ['M', 3, 0]);
+
+    git(root, ['add', 'src/app.js']);
+    status = await gitService.getStatus(root);
+    const staged = status.staged.find(item => item.path === 'src/app.js');
+    assert.deepEqual([staged.added, staged.removed], [3, 0]);
+});
+
+test('reveal targets resolve against the repository root when the workspace is a subdirectory', { skip: SKIP_GIT }, async t => {
+    const root = createRepo(t);
+    const workspace = path.join(root, 'pkg');
+    write(root, 'pkg/sub/keep.txt', 'changed\n');
+    const status = await gitService.getStatus(workspace);
+    const item = status.changes.find(entry => entry.path.endsWith('keep.txt'));
+    assert.equal(item.path, 'pkg/sub/keep.txt');
+
+    const target = await gitService.resolveRevealTarget(workspace, item.path);
+    assert.equal(fs.realpathSync(target), fs.realpathSync(path.join(root, 'pkg', 'sub', 'keep.txt')));
+    await assert.rejects(gitService.resolveRevealTarget(workspace, 'README.md'), /不在工作区内/);
+});
diff --git a/tests/git-watcher.test.js b/tests/git-watcher.test.js
index 82f919399..567ff1074 100644
--- a/tests/git-watcher.test.js
+++ b/tests/git-watcher.test.js
@@ -116,7 +116,7 @@ test('on Linux only the git directories are watched, and that is reported as deg
         getTargets: async () => ({ root, gitDirs: [path.join(root, '.git')] }),
         onChange: () => {},
         onDegraded: (id, info) => degraded.push([id, info.mode]),
-        watch, platform: 'linux', logger: quiet,
+        watch, platform: 'linux', logger: quiet, exists: () => false,
     });
     await watcher.start('ws1');
     assert.deepEqual(opened.map(item => item.dir), [path.join(root, '.git')]);
@@ -394,3 +394,20 @@ test('a repository the app can only partly watch tells subscribed windows, and l
     const b = fakeWindow();
     assert.deepEqual(subscriptions.subscribe(b.sender, gitHandlers.STATUS_TOPIC, 'ws1'), { success: true, state: { degraded: true } });
 });
+
+test('on Linux the git directory is watched shallowly and refs/ recursively, never the whole object store', async () => {
+    const { watch, opened } = fakeWatch();
+    const root = path.resolve('/repo');
+    const gitDir = path.join(root, '.git');
+    const watcher = createGitWatcher({
+        getTargets: async () => ({ root, gitDirs: [gitDir] }),
+        onChange: () => {},
+        watch, platform: 'linux', logger: quiet, exists: dir => dir === path.join(gitDir, 'refs'),
+    });
+    await watcher.start('ws1');
+    assert.deepEqual(opened.map(item => [item.dir, item.options?.recursive]), [
+        [gitDir, false],
+        [path.join(gitDir, 'refs'), true]
+    ]);
+    watcher.dispose();
+});
diff --git a/tests/side-pane-git-stale-diff.test.mjs b/tests/side-pane-git-stale-diff.test.mjs
new file mode 100644
index 000000000..e5055e441
--- /dev/null
+++ b/tests/side-pane-git-stale-diff.test.mjs
@@ -0,0 +1,76 @@
+// Git 页：已修改的文件被再次编辑（状态码不变）时，行数和展开的 diff 要跟着变；作废前发出的 diff 请求不能写回缓存
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { JSDOM } from 'jsdom';
+import { mountGitView } from '../modules/ui-system/side-pane/git/git-view.js';
+import { getGitChangesSource } from '../modules/ui-system/sources/git-changes.js';
+
+const wait = ms => new Promise(resolve => setTimeout(resolve, ms));
+
+function fixture() {
+    const dom = new JSDOM('<section id="view"></section>', { pretendToBeVisual: true });
+    const doc = dom.window.document;
+    const listeners = new Set();
+    const state = { after: 'a\n', added: 1, diffs: 0, toplevel: '/repo' };
+    const api = {
+        async gitListWorkspaces() { return { success: true, data: { workspaces: [{ id: 'w', path: '/repo/pkg' }] } }; },
+        async gitStatus() {
+            return { success: true, data: { isRepo: true, toplevel: state.toplevel, prefix: 'pkg', staged: [], conflicts: [],
+                changes: [{ path: 'pkg/x.js', status: 'M', added: state.added, removed: 0 }] } };
+        },
+        async gitDiff() { state.diffs += 1; return { success: true, data: { before: { text: '' }, after: { text: state.after } } }; },
+        onGitChanged(cb) { listeners.add(cb); return () => listeners.delete(cb); },
+        async subscribeMainState() { return {}; },
+        async unsubscribeMainState() { return {}; }
+    };
+    getGitChangesSource(api, 'w', { graceMs: 0 });
+    const view = mountGitView(doc.getElementById('view'), { api });
+    Object.defineProperty(view.element, 'offsetParent', { get: () => doc.body });
+    return {
+        dom, doc, view, state,
+        counts: () => view.element.querySelector('.side-git-counts').textContent,
+        push: () => listeners.forEach(cb => cb({ workspaceId: 'w', reason: 'files' })),
+        cleanup() { view.dispose(); dom.window.close(); }
+    };
+}
+
+test('line counts and the expanded diff follow a second edit of a modified file', async () => {
+    const f = fixture();
+    try {
+        await f.view.ready;
+        await wait(20);
+        assert.equal(f.counts(), '+1-0');
+        assert.equal(f.state.diffs, 0, 'counts come with the status, not from one diff per file');
+
+        f.view.element.querySelector('.side-git-row').click();
+        await wait(20);
+        assert.equal(f.view.element.querySelectorAll('.side-git-diff-table .diff-line.add').length, 1);
+
+        f.state.after = 'a\nb\nc\nd\n';
+        f.state.added = 4;
+        f.push();
+        await wait(50);
+        assert.equal(f.counts(), '+4-0');
+        assert.equal(f.view.element.querySelector('.side-git-row').getAttribute('aria-expanded'), 'true', 'the open file stays open');
+        assert.equal(f.view.element.querySelectorAll('.side-git-diff-table .diff-line.add').length, 4);
+    } finally { f.cleanup(); }
+});
+
+test('copying the absolute path of a file in a subdirectory workspace uses the repository root', async () => {
+    const f = fixture();
+    const copied = [];
+    Object.defineProperty(f.dom.window.navigator, 'clipboard', { configurable: true,
+        value: { writeText: async text => { copied.push(text); } } });
+    try {
+        await f.view.ready;
+        await wait(20);
+        const row = f.view.element.querySelector('.side-git-row');
+        row.dispatchEvent(new f.dom.window.MouseEvent('contextmenu', { bubbles: true, cancelable: true, clientX: 5, clientY: 5 }));
+        const item = [...f.doc.querySelectorAll('[role="menuitem"], .side-git-context-menu button')]
+            .find(el => el.textContent.includes('复制绝对路径'));
+        assert.ok(item, 'the context menu offers the absolute path');
+        item.click();
+        await wait(10);
+        assert.deepEqual(copied, ['/repo/pkg/x.js']);
+    } finally { f.cleanup(); }
+});

From efbdd43f111c4b1c080fc2aea9ab8d4d9f386d1d Mon Sep 17 00:00:00 2001
From: RoxyAsahi <chrantebow@gmail.com>
Date: Wed, 7 Oct 2026 02:03:14 +0200
Subject: [PATCH 025/143] Contracts: follow the dynamic listener sites the tool
 card presentation moved

The listener helpers in messageRenderer and appearance-studio are unchanged;
only their line numbers shifted, which left the contract gate failing.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
(cherry picked from commit 1dd579e01e9b2ad896a459ad1942b414b1dbab7d)
---
 docs/contracts/chat-contracts.json            | 12 +--
 .../contracts/generated/chat-event-graph.json | 81 +++++++++++--------
 2 files changed, 55 insertions(+), 38 deletions(-)

diff --git a/docs/contracts/chat-contracts.json b/docs/contracts/chat-contracts.json
index d87c2196f..fce2fa754 100644
--- a/docs/contracts/chat-contracts.json
+++ b/docs/contracts/chat-contracts.json
@@ -588,19 +588,19 @@
     "dynamicSites": [
       {
         "file": "modules/messageRenderer.js",
-        "line": 599,
+        "line": 600,
         "kind": "custom-event-listener",
         "match": "target.addEventListener(type"
       },
       {
         "file": "modules/messageRenderer.js",
-        "line": 2585,
+        "line": 2589,
         "kind": "custom-event-listener",
         "match": "target.addEventListener(type"
       },
       {
         "file": "modules/messageRenderer.js",
-        "line": 3315,
+        "line": 3328,
         "kind": "custom-event-listener",
         "match": "target.addEventListener(type"
       }
@@ -776,19 +776,19 @@
     "dynamicSites": [
       {
         "file": "modules/ui-system/appearance-studio.js",
-        "line": 516,
+        "line": 524,
         "kind": "custom-event-listener",
         "match": "target.addEventListener(type"
       },
       {
         "file": "modules/ui-system/appearance-studio.js",
-        "line": 792,
+        "line": 815,
         "kind": "custom-event-listener",
         "match": "root.addEventListener(type"
       },
       {
         "file": "modules/ui-system/appearance-studio.js",
-        "line": 1552,
+        "line": 1579,
         "kind": "custom-event-listener",
         "match": "target.addEventListener(type"
       }
diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 841f2d5cd..4b5489dbb 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -32523,6 +32523,30 @@
       "match": "new CustomEvent(RESPONSE_EVENT",
       "contractId": "loom.comfyui.agent-response-bridge"
     },
+    {
+      "file": "modules/messageRenderer.js",
+      "line": 600,
+      "reason": "dynamic listener name: type",
+      "kind": "custom-event-listener",
+      "match": "target.addEventListener(type",
+      "contractId": "source.dynamic.modules.messagerenderer"
+    },
+    {
+      "file": "modules/messageRenderer.js",
+      "line": 2589,
+      "reason": "dynamic listener name: type",
+      "kind": "custom-event-listener",
+      "match": "target.addEventListener(type",
+      "contractId": "source.dynamic.modules.messagerenderer"
+    },
+    {
+      "file": "modules/messageRenderer.js",
+      "line": 3328,
+      "reason": "dynamic listener name: type",
+      "kind": "custom-event-listener",
+      "match": "target.addEventListener(type",
+      "contractId": "source.dynamic.modules.messagerenderer"
+    },
     {
       "file": "modules/notificationCenter.js",
       "line": 324,
@@ -32611,6 +32635,30 @@
       "match": "target?.addEventListener?.(type",
       "contractId": "source.dynamic.modules.topiclistmanager"
     },
+    {
+      "file": "modules/ui-system/appearance-studio.js",
+      "line": 524,
+      "reason": "dynamic listener name: type",
+      "kind": "custom-event-listener",
+      "match": "target.addEventListener(type",
+      "contractId": "source.dynamic.modules.ui-system.appearance-studio"
+    },
+    {
+      "file": "modules/ui-system/appearance-studio.js",
+      "line": 815,
+      "reason": "dynamic listener name: type",
+      "kind": "custom-event-listener",
+      "match": "root.addEventListener(type",
+      "contractId": "source.dynamic.modules.ui-system.appearance-studio"
+    },
+    {
+      "file": "modules/ui-system/appearance-studio.js",
+      "line": 1579,
+      "reason": "dynamic listener name: type",
+      "kind": "custom-event-listener",
+      "match": "target.addEventListener(type",
+      "contractId": "source.dynamic.modules.ui-system.appearance-studio"
+    },
     {
       "file": "modules/ui-system/ask-nova-modal.js",
       "line": 545,
@@ -33004,36 +33052,5 @@
       "contractId": "source.dynamic.preloads.loom"
     }
   ],
-  "undiscovered": [
-    {
-      "file": "modules/messageRenderer.js",
-      "line": 600,
-      "reason": "dynamic listener name: type"
-    },
-    {
-      "file": "modules/messageRenderer.js",
-      "line": 2589,
-      "reason": "dynamic listener name: type"
-    },
-    {
-      "file": "modules/messageRenderer.js",
-      "line": 3328,
-      "reason": "dynamic listener name: type"
-    },
-    {
-      "file": "modules/ui-system/appearance-studio.js",
-      "line": 524,
-      "reason": "dynamic listener name: type"
-    },
-    {
-      "file": "modules/ui-system/appearance-studio.js",
-      "line": 815,
-      "reason": "dynamic listener name: type"
-    },
-    {
-      "file": "modules/ui-system/appearance-studio.js",
-      "line": 1579,
-      "reason": "dynamic listener name: type"
-    }
-  ]
+  "undiscovered": []
 }

From 3b559e9550bd7f1ee11a15ede1e29d7e4bc72260 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 00:53:36 +0000
Subject: [PATCH 026/143] Code viewer: keep chunk placeholder height in the
 stylesheet, not inline

The ui-system guard rejects inline style mutation outside its allowlist. Every
chunk but the last holds exactly 200 lines, so the placeholder height is fixed
in CSS and the last chunk is laid out normally.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_017bCbRB3E9yajQ3HbdMrjiJ
---
 modules/ui-system/side-pane/code-viewer/editor.js | 8 +++-----
 styles/ui-system/side-pane-code-viewer.css        | 9 +++++++--
 tests/side-pane-code-viewer.test.mjs              | 1 -
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/modules/ui-system/side-pane/code-viewer/editor.js b/modules/ui-system/side-pane/code-viewer/editor.js
index 9444ebd8e..a0c9a70ac 100644
--- a/modules/ui-system/side-pane/code-viewer/editor.js
+++ b/modules/ui-system/side-pane/code-viewer/editor.js
@@ -8,7 +8,8 @@
 // 整段高亮和逐行行号的成本随文件大小线性增长；超过这个字符数只预览开头，复制和插入仍用完整内容
 export const PREVIEW_CHAR_LIMIT = 256 * 1024;
 
-// 每块的行数：块越小滚动时补排越勤，越大切回标签时要排的越多；200 行约 3600px，比侧栏高出几屏
+// 每块的行数：块越小滚动时补排越勤，越大切回标签时要排的越多；200 行约 3600px，比侧栏高出几屏。
+// 样式表里块的占位高度按 200 × 18px 写死（side-pane-code-viewer.css 的 .side-code-chunk），改这里要一起改
 export const CODE_CHUNK_LINES = 200;
 
 /**
@@ -129,7 +130,7 @@ export function createCodeViewerEditor({
 
         // 行号栏和代码各按 CODE_CHUNK_LINES 行分块，块用 content-visibility:auto：滚出视口的块不参与样式和布局。
         // 大文件切回这个标签、聚焦时，浏览器只需要排视口里的那几块，开销不再随文件行数增长。
-        // 行高固定，两栏的块高度一致，行号仍然和代码对齐。
+        // 行高固定，两栏的块高度一致，行号仍然和代码对齐。最后一块不满 200 行，总是正常排版，不用占位高度。
         const gutter = doc.createElement('div');
         gutter.className = 'side-code-gutter';
         gutter.setAttribute('aria-hidden', 'true');
@@ -140,11 +141,9 @@ export function createCodeViewerEditor({
 
         for (let start = 0; start < lineCount; start += CODE_CHUNK_LINES) {
             const end = Math.min(lineCount, start + CODE_CHUNK_LINES);
-            const lines = String(end - start);
 
             const numbers = doc.createElement('div');
             numbers.className = 'side-code-chunk';
-            numbers.style.setProperty('--side-code-chunk-lines', lines);
             for (let idx = start + 1; idx <= end; idx++) {
                 const lineNum = doc.createElement('div');
                 lineNum.className = 'side-code-line-number';
@@ -155,7 +154,6 @@ export function createCodeViewerEditor({
 
             const text = doc.createElement('div');
             text.className = 'side-code-chunk';
-            text.style.setProperty('--side-code-chunk-lines', lines);
             // 块末尾补一个换行：块尾的换行不会多画一行，但 textContent 和复制出来的文本保持原样
             const tail = end < lineCount ? '\n' : '';
             if (lineHtml) text.innerHTML = lineHtml.slice(start, end).join('\n') + tail;
diff --git a/styles/ui-system/side-pane-code-viewer.css b/styles/ui-system/side-pane-code-viewer.css
index b0dcc3efd..d95bcb61c 100644
--- a/styles/ui-system/side-pane-code-viewer.css
+++ b/styles/ui-system/side-pane-code-viewer.css
@@ -188,11 +188,16 @@ html body[data-vcp-theme="light"] .side-code-gutter:where(.vcp-ui-scope, .vcp-ui
     color: var(--secondary-text, var(--vcp-ui-port-color-rgba-0-0-0-0-35));
 }
 
-/* 行号栏和代码的分块（见 editor.js 的 CODE_CHUNK_LINES）：滚出视口时浏览器跳过它的样式和布局，占位高度按行数算 */
+/* 行号栏和代码的分块（见 editor.js 的 CODE_CHUNK_LINES = 200）：滚出视口时浏览器跳过它的样式和布局，
+   占位高度 = 200 行 × 18px 行高。最后一块行数不定，照常排版。 */
 html .side-code-chunk:where(.vcp-ui-scope, .vcp-ui-scope *) {
     display: block;
     content-visibility: auto;
-    contain-intrinsic-block-size: auto calc(var(--side-code-chunk-lines, 1) * 18px);
+    contain-intrinsic-block-size: auto 3600px;
+}
+
+html .side-code-chunk:last-child:where(.vcp-ui-scope, .vcp-ui-scope *) {
+    content-visibility: visible;
 }
 
 html .side-code-line-number:where(.vcp-ui-scope, .vcp-ui-scope *) {
diff --git a/tests/side-pane-code-viewer.test.mjs b/tests/side-pane-code-viewer.test.mjs
index 04d42eea8..ecc56e46f 100644
--- a/tests/side-pane-code-viewer.test.mjs
+++ b/tests/side-pane-code-viewer.test.mjs
@@ -323,7 +323,6 @@ test('code is rendered in chunks whose text and line numbers stay continuous', a
         const gutterChunks = view.querySelectorAll('.side-code-gutter .side-code-chunk');
         assert.equal(codeChunks.length, 3);
         assert.deepEqual([...gutterChunks].map(chunk => chunk.children.length), [CODE_CHUNK_LINES, CODE_CHUNK_LINES, 50]);
-        assert.deepEqual([...codeChunks].map(chunk => chunk.style.getPropertyValue('--side-code-chunk-lines')), [String(CODE_CHUNK_LINES), String(CODE_CHUNK_LINES), '50']);
         assert.equal(view.querySelector('.side-code-pre').textContent, code);
         assert.equal(view.querySelectorAll('.side-code-line-number').length, lineCount);
         assert.equal([...view.querySelectorAll('.side-code-line-number')].at(-1).textContent, String(lineCount));

From b956a7087bee23e6d3556b95d6d03ad059fee9a8 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 00:53:36 +0000
Subject: [PATCH 027/143] Side pane: stop restyling the whole page on every DOM
 change

Two things made the collapsed side pane cost the whole app style recalcs:

- The tab strip's add button was moved in and out of the strip every frame
  while the pane was collapsed (the strip keeps 4px of padding, so its width
  was not 0 and each placement judged the other one right). Measured 11 moves
  per second at idle. A viewport narrower than the button now counts as
  unknown and leaves the button where it is.
- Two body-level :has() rules (hide the bell, hide the resizer) made every
  node insertion anywhere schedule a whole-document style invalidation. The
  bell rule always matched in main.html; the resizer rule now asks its next
  sibling, the pane.

Selecting an agent with 1000 topics: style recalc 780ms -> 34ms, long tasks
~600ms -> 0 (traced). Side-pane self time during renderer boot 380ms -> 12ms.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_017bCbRB3E9yajQ3HbdMrjiJ
---
 .../side-pane/side-pane-tab-strip.js          | 12 ++++---
 styles/ui-system/side-pane-shell.css          | 13 +++++---
 tests/side-pane-tab-strip.test.mjs            | 31 +++++++++++++++++++
 3 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/modules/ui-system/side-pane/side-pane-tab-strip.js b/modules/ui-system/side-pane/side-pane-tab-strip.js
index 964f5fe82..8f56bbf9a 100644
--- a/modules/ui-system/side-pane/side-pane-tab-strip.js
+++ b/modules/ui-system/side-pane/side-pane-tab-strip.js
@@ -85,15 +85,17 @@ export function createSidePaneTabStrip({
         let overflowing = true;
         if (addButton && addButtonHome) {
             const addInside = addButton.parentElement === tabListElement;
-            const measured = addButton.getBoundingClientRect?.().width || 0;
+            const addButtonWidth = addButton.getBoundingClientRect?.().width || 28;
+            const viewportWidth = tabListElement.clientWidth || 0;
             const overflow = resolveTabsOverflow({
                 addButtonInside: addInside,
-                addButtonWidth: measured || 28,
+                addButtonWidth,
                 tabCount: items.length,
-                viewportWidth: tabListElement.clientWidth || 0
+                viewportWidth
             });
-            // 视口宽度未知（隐藏或无布局）时保持在右侧操作区，避免来回搬动
-            overflowing = tabListElement.clientWidth ? overflow : true;
+            // 视口放不下一个新增按钮（面板收起时只剩内边距那几像素，或没有布局）就当宽度未知，按钮留在右侧操作区。
+            // 否则收起状态下两种摆法互相判成对方，按钮每帧搬来搬去，每次搬动都让整页样式重算。
+            overflowing = viewportWidth > addButtonWidth ? overflow : true;
             if (!overflowing && !addInside) {
                 tabListElement.appendChild(addButton);
             } else if (overflowing && addInside) {
diff --git a/styles/ui-system/side-pane-shell.css b/styles/ui-system/side-pane-shell.css
index 08368e2c4..586f2f649 100644
--- a/styles/ui-system/side-pane-shell.css
+++ b/styles/ui-system/side-pane-shell.css
@@ -9,8 +9,11 @@ html body #floatingSelectionSideChatBtn[hidden]:where(.vcp-ui-scope, .vcp-ui-sco
     display: none;
 }
 
-/* 侧栏按钮取代铃铛：通知在新标签页里，右键监控面板和待审批角标都挪到侧栏按钮上 */
-html body:has(#vcpSidePane) #toggleNotificationsBtn:where(.vcp-ui-scope, .vcp-ui-scope *) {
+/* 侧栏按钮取代铃铛：通知在新标签页里，右键监控面板和待审批角标都挪到侧栏按钮上。
+   本样式只由带 #vcpSidePane 的 main.html 引入，不再用 body:has(#vcpSidePane) 判断：
+   挂在 body 上的 :has() 让页面里任何节点的增删都触发整页样式失效（切换助手时多出约 0.7s 的样式重算）。
+   :is(#vcpSidePane, *) 总能匹配 body，只为保留原来的优先级。 */
+html body:is(#vcpSidePane, *) #toggleNotificationsBtn:where(.vcp-ui-scope, .vcp-ui-scope *) {
     display: none;
 }
 
@@ -68,8 +71,10 @@ html #resizerRight.resizer.active:where(.vcp-ui-scope, .vcp-ui-scope *)::after {
     background-color: var(--vcp-ui-accent);
 }
 
-/* Without an open (or animating) side pane the handle has nothing to resize. */
-html body:not(:has(#vcpSidePane.active)):not(:has(#vcpSidePane.is-animating)) #resizerRight:not(.is-animating):where(.vcp-ui-scope, .vcp-ui-scope *) {
+/* Without an open (or animating) side pane the handle has nothing to resize.
+   The pane is the handle's next sibling, so ask the sibling instead of body:has(): a body-level :has()
+   makes every node insertion anywhere invalidate the whole page's styles. */
+html body #resizerRight:not(.is-animating):has(+ #vcpSidePane:not(.active):not(.is-animating)):where(.vcp-ui-scope, .vcp-ui-scope *) {
     display: none;
 }
 
diff --git a/tests/side-pane-tab-strip.test.mjs b/tests/side-pane-tab-strip.test.mjs
index 0993a161a..c29976ab4 100644
--- a/tests/side-pane-tab-strip.test.mjs
+++ b/tests/side-pane-tab-strip.test.mjs
@@ -250,3 +250,34 @@ test('controller: the 通知 tab mirrors the VCPLog connection status', async ()
     controller.dispose();
     dom.window.close();
 });
+
+test('tab strip: a collapsed pane (only padding left) keeps the add button home instead of moving it back and forth', async () => {
+    const { createSidePaneTabStrip } = await import('../modules/ui-system/side-pane/side-pane-tab-strip.js');
+    const dom = new JSDOM('<div id="tabs"></div><div id="actions"><button id="add"></button></div>');
+    const doc = dom.window.document;
+    const tabList = doc.getElementById('tabs');
+    const addButton = doc.getElementById('add');
+    const home = doc.getElementById('actions');
+    // 收起的面板宽度为 0，标签条只剩左右内边距那几像素
+    Object.defineProperty(tabList, 'clientWidth', { configurable: true, get: () => 4 });
+    addButton.getBoundingClientRect = () => ({ width: 28 });
+    let moves = 0;
+    new dom.window.MutationObserver(records => { moves += records.length; }).observe(home, { childList: true });
+    const strip = createSidePaneTabStrip({
+        tabListElement: tabList,
+        addButton,
+        getTabs: () => [],
+        getActiveTabId: () => null,
+        isClosable: () => true,
+        onActivate() {}, onClose() {}, onReorder() {}, onContextMenu() {}
+    });
+    try {
+        for (let i = 0; i < 6; i++) strip.layout();
+        await new Promise(resolve => setImmediate(resolve));
+        assert.equal(addButton.parentElement, home);
+        assert.equal(moves, 0);
+    } finally {
+        strip.dispose();
+        dom.window.close();
+    }
+});

From 39c3e00a2288cbe4b7f442e6f5fd6c34623f913d Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 00:53:43 +0000
Subject: [PATCH 028/143] Source IPC: use the shared top-level window sender
 guard

source:* (including source:write-file) only checked the URL a frame
reported, so a subframe or webview claiming an app page URL passed.
It now uses the Git handlers' createApplicationSenderGuard, like DSH
apps/desktop checks the sender before privileged IPC.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_016hW799u5Ji5k9khDAwu688
---
 .../contracts/generated/chat-event-graph.json | 32 +++++------
 modules/ipc/gitHandlers.js                    |  1 +
 modules/ipc/sourceHandlers.js                 |  8 +--
 tests/source-handlers-sender.test.js          | 56 +++++++++++++++++++
 4 files changed, 74 insertions(+), 23 deletions(-)
 create mode 100644 tests/source-handlers-sender.test.js

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index d7661e608..bbce95b77 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -27589,14 +27589,14 @@
       "consumers": [
         {
           "file": "modules/ipc/sourceHandlers.js",
-          "line": 74,
+          "line": 70,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/sourceHandlers.js",
-          "line": 74,
+          "line": 70,
           "kind": "event-listener",
           "match": "handle('source:check'"
         },
@@ -27620,14 +27620,14 @@
       "consumers": [
         {
           "file": "modules/ipc/sourceHandlers.js",
-          "line": 56,
+          "line": 52,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/sourceHandlers.js",
-          "line": 56,
+          "line": 52,
           "kind": "event-listener",
           "match": "handle('source:list-files'"
         },
@@ -27651,14 +27651,14 @@
       "consumers": [
         {
           "file": "modules/ipc/sourceHandlers.js",
-          "line": 58,
+          "line": 54,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/sourceHandlers.js",
-          "line": 58,
+          "line": 54,
           "kind": "event-listener",
           "match": "handle('source:read-file'"
         },
@@ -27682,14 +27682,14 @@
       "consumers": [
         {
           "file": "modules/ipc/sourceHandlers.js",
-          "line": 63,
+          "line": 59,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/sourceHandlers.js",
-          "line": 63,
+          "line": 59,
           "kind": "event-listener",
           "match": "handle('source:write-file'"
         },
@@ -32477,14 +32477,6 @@
       "match": "event.sender.send(channel",
       "contractId": "source.dynamic.modules.ipc.musichandlers"
     },
-    {
-      "file": "modules/ipc/sourceHandlers.js",
-      "line": 36,
-      "reason": "dynamic event listener name: channel",
-      "kind": "event-listener",
-      "match": "ipcMain.handle(channel",
-      "contractId": "source.dynamic.modules.ipc.sourcehandlers"
-    },
     {
       "file": "modules/ipc/stateSubscriptions.js",
       "line": 132,
@@ -33086,5 +33078,11 @@
       "contractId": "source.dynamic.preloads.loom"
     }
   ],
-  "undiscovered": []
+  "undiscovered": [
+    {
+      "file": "modules/ipc/sourceHandlers.js",
+      "line": 32,
+      "reason": "dynamic event listener name: channel"
+    }
+  ]
 }
diff --git a/modules/ipc/gitHandlers.js b/modules/ipc/gitHandlers.js
index 13ff70f0f..88d99be99 100644
--- a/modules/ipc/gitHandlers.js
+++ b/modules/ipc/gitHandlers.js
@@ -204,6 +204,7 @@ module.exports = {
     CHANNELS,
     STATUS_TOPIC,
     initialize,
+    isAllowedSender,
     isAllowedSenderUrl,
     watchSnapshot,
     dispose,
diff --git a/modules/ipc/sourceHandlers.js b/modules/ipc/sourceHandlers.js
index 305ce7e13..4a6b87872 100644
--- a/modules/ipc/sourceHandlers.js
+++ b/modules/ipc/sourceHandlers.js
@@ -7,7 +7,8 @@
 
 const { ipcMain } = require('electron');
 const sourceService = require('../services/sourceService');
-const { isAllowedSenderUrl } = require('./gitHandlers');
+// 和 Git 侧栏共用同一个守卫：只认应用页面的真实顶层窗口，子 frame 或 webview 自报的 URL 不算
+const { isAllowedSender } = require('./gitHandlers');
 
 const CHANNELS = [
     'source:list-files',
@@ -18,11 +19,6 @@ const CHANNELS = [
 
 let workspaceServiceRef = null;
 
-function isAllowedSender(event) {
-    const raw = event?.senderFrame?.url || event?.sender?.getURL?.() || '';
-    return isAllowedSenderUrl(raw);
-}
-
 function resolveWorkspaceRoot(workspaceId) {
     if (!workspaceServiceRef) throw new Error('工作区服务未初始化。');
     if (typeof workspaceId !== 'string' || !workspaceId) throw new Error('请先选择工作区。');
diff --git a/tests/source-handlers-sender.test.js b/tests/source-handlers-sender.test.js
new file mode 100644
index 000000000..9ce512de0
--- /dev/null
+++ b/tests/source-handlers-sender.test.js
@@ -0,0 +1,56 @@
+'use strict';
+
+// 源码侧栏能写文件，来源校验必须和 Git 侧栏一样严：子 frame、webview 自报应用页面 URL 都不能调用。
+const test = require('node:test');
+const assert = require('node:assert/strict');
+const fs = require('node:fs');
+const os = require('node:os');
+const path = require('node:path');
+const Module = require('node:module');
+const { createTrustedMainSender } = require('./helpers/trusted-main-sender.cjs');
+
+const handlers = new Map();
+const originalLoad = Module._load;
+Module._load = function loadWithElectronMock(request, parent, isMain) {
+    if (request === 'electron') {
+        return {
+            ipcMain: {
+                handle: (channel, fn) => handlers.set(channel, fn),
+                removeHandler: (channel) => handlers.delete(channel),
+                on: () => {},
+            },
+            BrowserWindow: class {},
+            shell: {},
+        };
+    }
+    return originalLoad.call(this, request, parent, isMain);
+};
+const sourceHandlers = require('../modules/ipc/sourceHandlers');
+Module._load = originalLoad;
+
+const root = fs.mkdtempSync(path.join(os.tmpdir(), 'vcp-source-ws-'));
+fs.writeFileSync(path.join(root, 'a.txt'), 'hello');
+test.before(() => sourceHandlers.initialize({ workspaceService: { list: () => [{ id: 'ws', alias: 'ws', path: root, enabled: true }] } }));
+test.after(() => fs.rmSync(root, { recursive: true, force: true }));
+
+const read = event => handlers.get('source:read-file')(event, 'ws', 'a.txt');
+
+test('source handlers accept the real top-level app window', async () => {
+    const { event } = createTrustedMainSender();
+    const result = await read(event);
+    assert.equal(result.success, true, result.error);
+});
+
+test('source handlers reject a subframe that reports an app page URL', async () => {
+    const { sender } = createTrustedMainSender();
+    const subframe = { url: sender.mainFrame.url, detached: false };
+    const result = await read({ sender, senderFrame: subframe });
+    assert.equal(result.success, false);
+});
+
+test('source handlers reject a webview guest that reports an app page URL', async () => {
+    const { sender, event } = createTrustedMainSender();
+    sender.getType = () => 'webview';
+    const result = await read(event);
+    assert.equal(result.success, false);
+});

From ca369fa6a057b8db023be6f966fac482e18ecc89 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 00:54:34 +0000
Subject: [PATCH 029/143] Contracts: follow the sourceHandlers dynamic site to
 its new line

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_016hW799u5Ji5k9khDAwu688
---
 docs/contracts/chat-contracts.json             |  2 +-
 docs/contracts/generated/chat-event-graph.json | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/docs/contracts/chat-contracts.json b/docs/contracts/chat-contracts.json
index c6e520d4a..37e3113db 100644
--- a/docs/contracts/chat-contracts.json
+++ b/docs/contracts/chat-contracts.json
@@ -469,7 +469,7 @@
     "dynamicSites": [
       {
         "file": "modules/ipc/sourceHandlers.js",
-        "line": 36,
+        "line": 32,
         "kind": "event-listener",
         "match": "ipcMain.handle(channel"
       }
diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index bbce95b77..26850224b 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -32477,6 +32477,14 @@
       "match": "event.sender.send(channel",
       "contractId": "source.dynamic.modules.ipc.musichandlers"
     },
+    {
+      "file": "modules/ipc/sourceHandlers.js",
+      "line": 32,
+      "reason": "dynamic event listener name: channel",
+      "kind": "event-listener",
+      "match": "ipcMain.handle(channel",
+      "contractId": "source.dynamic.modules.ipc.sourcehandlers"
+    },
     {
       "file": "modules/ipc/stateSubscriptions.js",
       "line": 132,
@@ -33078,11 +33086,5 @@
       "contractId": "source.dynamic.preloads.loom"
     }
   ],
-  "undiscovered": [
-    {
-      "file": "modules/ipc/sourceHandlers.js",
-      "line": 32,
-      "reason": "dynamic event listener name: channel"
-    }
-  ]
+  "undiscovered": []
 }

From b0e4a0275e6f52077c6ac814e0d481d4707c91a8 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 00:56:02 +0000
Subject: [PATCH 030/143] Stop the tooltip bridge and turn navigator from
 keeping removed nodes alive

The native tooltip bridge remembered every element that ever had a title in
a Map that is only cleared when the shell unmounts, so every side-pane tab
that was opened and closed left its whole subtree behind (53-275 DOM nodes
per cycle in a real Electron run). It now keys the original attributes in a
WeakMap and restores them from the elements still in the page on unmount.

The turn navigator's dirty set held system and removed messages that are
never read back; it is now a WeakSet.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01SADzqzusVz3S3z7qBUSy8M
---
 modules/ui-system/conversation-turn-navigator.js      |  4 ++--
 modules/ui-system/next-shell/next-shell-controller.js | 11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/modules/ui-system/conversation-turn-navigator.js b/modules/ui-system/conversation-turn-navigator.js
index ef4398681..6c60c513d 100644
--- a/modules/ui-system/conversation-turn-navigator.js
+++ b/modules/ui-system/conversation-turn-navigator.js
@@ -171,7 +171,7 @@ function readMessageText(messageItem) {
 
 /**
  * 把消息列表读成 buildTurnNavigatorItems 需要的 entries。
- * textCache（WeakMap）+ dirty（Set）让没有变化的消息不必每次都克隆一遍 DOM：
+ * textCache（WeakMap）+ dirty（WeakSet，不留住已经移出列表的消息）让没有变化的消息不必每次都克隆一遍 DOM：
  * 只有被标记为 dirty 的消息才会重新读取文字。
  */
 export function collectTurnEntries(messagesRoot, { textCache = null, dirty = null } = {}) {
@@ -243,7 +243,7 @@ export function createConversationTurnNavigator({
     let frame = null;
     let reducedMotion = false;
     const textCache = new WeakMap();
-    const dirty = new Set();
+    const dirty = new WeakSet();
 
     const h = (tag, className) => {
         const node = doc.createElement(tag);
diff --git a/modules/ui-system/next-shell/next-shell-controller.js b/modules/ui-system/next-shell/next-shell-controller.js
index 05b90a637..a144bb1c1 100644
--- a/modules/ui-system/next-shell/next-shell-controller.js
+++ b/modules/ui-system/next-shell/next-shell-controller.js
@@ -598,7 +598,8 @@
 
     function mountNativeTooltipBridge(scope) {
         if (!scope) return;
-        const converted = new Map();
+        // 只按元素记原始属性，不持有元素：被移出页面的节点要能回收。卸载时从页面上还在的节点里还原
+        const converted = new WeakMap();
         const isExcluded = element => element.closest?.('#nextUiInternalAppHost, #vchatAppTray') || (element.matches?.('input, select, textarea') && element.closest?.('.vcp-settings-schema-surface, .settings-sidebar-surface-view'));
         const convert = element => {
             if (!(element instanceof Element) || isExcluded(element) || !element.hasAttribute('title')) return;
@@ -702,8 +703,11 @@
             hide();
             host.remove();
             observer.disconnect();
-            converted.forEach(({ title, originalDataTooltip, originalAriaLabel, addedAriaLabel }, element) => {
-                if (!element.isConnected) return;
+            document.querySelectorAll('[data-tooltip]').forEach(element => {
+                const record = converted.get(element);
+                if (!record) return;
+                converted.delete(element);
+                const { title, originalDataTooltip, originalAriaLabel, addedAriaLabel } = record;
                 element.setAttribute('title', title);
                 if (originalDataTooltip === null) delete element.dataset.tooltip;
                 else element.setAttribute('data-tooltip', originalDataTooltip);
@@ -712,7 +716,6 @@
                     else element.setAttribute('aria-label', originalAriaLabel);
                 }
             });
-            converted.clear();
         }, 'next:native-tooltip-bridge', 'observer');
     }
 

From 2621979b80184ca1f6296b14efc01f2386b066c3 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 00:22:28 +0000
Subject: [PATCH 031/143] UI system gate: scope the tool presentation styles
 and drop the stray literal colour

check:ui-system was red on the side pane branch. tool-presentation.css had
101 selectors outside .vcp-ui-scope, an !important on the reduced-motion
rule and two fixed 11px sizes; components.css (from upstream #234) fell back
to a hard-coded indigo because --vcp-ui-primary is not a token.

Every tool presentation selector now sits under .vcp-ui-scope (the chat
messages container already carries it, and the file is alone in its layer,
so the uniform specificity bump changes no cascade). The reduced-motion rule
reuses the shimmer selector instead of !important, the 11px sizes use
--vcp-ui-text-xs, and the pinned window button uses the accent token.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01UCGGgmHsCToooXTgSXpmq9
---
 styles/ui-system/tool-presentation.css | 196 ++++++++++++-------------
 1 file changed, 98 insertions(+), 98 deletions(-)

diff --git a/styles/ui-system/tool-presentation.css b/styles/ui-system/tool-presentation.css
index 436a2e39c..be8a90316 100644
--- a/styles/ui-system/tool-presentation.css
+++ b/styles/ui-system/tool-presentation.css
@@ -1,12 +1,12 @@
 /* Optional presentation; Legacy is untouched. Theme and typography stay owned
  * by the existing appearance profile, including role wallpapers. */
-html[data-ui-mode="next"] [data-vcp-tool-presentation="compact"],
-html[data-ui-mode="next"] [data-vcp-tool-presentation="grouped"] {
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="compact"],
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="grouped"] {
     --vcp-tool-row-height: 38px;
 }
-html[data-ui-mode="next"][data-vcp-density="compact"] [data-vcp-tool-presentation] { --vcp-tool-row-height: 32px; }
-html[data-ui-mode="next"][data-vcp-density="relaxed"] [data-vcp-tool-presentation] { --vcp-tool-row-height: 44px; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented {
+html[data-ui-mode="next"][data-vcp-density="compact"] .vcp-ui-scope [data-vcp-tool-presentation] { --vcp-tool-row-height: 32px; }
+html[data-ui-mode="next"][data-vcp-density="relaxed"] .vcp-ui-scope [data-vcp-tool-presentation] { --vcp-tool-row-height: 44px; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented {
     --vcp-tool-presented-font-family: var(--vcp-tool-card-font-family, var(--vcp-chat-font-family));
     --vcp-tool-presented-font-size: var(--vcp-ui-text-caption, 13px);
     --vcp-tool-presented-white-space: normal;
@@ -32,11 +32,11 @@ html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented {
     color: var(--vcp-ui-text-primary);
     font-family: var(--vcp-tool-card-font-family, inherit);
 }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented::before,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented::after { display: none; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-summary,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-result-header,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-call-summary-header {
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented::before,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented::after { display: none; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-summary,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-result-header,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-call-summary-header {
     display: flex;
     gap: 5px;
     padding: 0;
@@ -47,7 +47,7 @@ html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vc
     min-width: 0;
     flex-wrap: nowrap;
 }
-html[data-ui-mode="next"] .vcp-tool-row-toggle, html[data-ui-mode="next"] .vcp-tool-process-toggle {
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-toggle, html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-toggle {
     display: flex;
     width: 100%;
     min-width: 0;
@@ -65,13 +65,13 @@ html[data-ui-mode="next"] .vcp-tool-row-toggle, html[data-ui-mode="next"] .vcp-t
     cursor: pointer;
     text-align: left;
 }
-html[data-ui-mode="next"] .vcp-tool-result-header > .vcp-tool-row-toggle {
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-result-header > .vcp-tool-row-toggle {
     width: auto;
     flex: 1;
 }
-html[data-ui-mode="next"] .vcp-tool-row-toggle:hover, html[data-ui-mode="next"] .vcp-tool-process-toggle:hover { background: var(--vcp-ui-bg-2); }
-html[data-ui-mode="next"] .vcp-tool-row-toggle:focus-visible, html[data-ui-mode="next"] .vcp-tool-process-toggle:focus-visible, html[data-ui-mode="next"] .vcp-tool-process-artifact:focus-visible { outline: 2px solid var(--vcp-ui-accent); outline-offset: -2px; }
-html[data-ui-mode="next"] .vcp-tool-row-chevron {
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-toggle:hover, html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-toggle:hover { background: var(--vcp-ui-bg-2); }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-toggle:focus-visible, html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-toggle:focus-visible, html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-artifact:focus-visible { outline: 2px solid var(--vcp-ui-accent); outline-offset: -2px; }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-chevron {
     width: 7px;
     height: 7px;
     flex: 0 0 7px;
@@ -79,44 +79,44 @@ html[data-ui-mode="next"] .vcp-tool-row-chevron {
     border-bottom: 1.5px solid currentColor;
     transform: rotate(-45deg);
 }
-html[data-ui-mode="next"] [aria-expanded="true"] > .vcp-tool-row-chevron { transform: rotate(45deg); }
-html[data-ui-mode="next"] .vcp-tool-row-title { overflow-wrap: anywhere; min-width: 0; color: var(--vcp-ui-text-primary); }
-html[data-ui-mode="next"] .vcp-tool-row-resource { overflow-wrap: anywhere; min-width: 0; font-size: var(--vcp-ui-text-sm, 12px); }
-html[data-ui-mode="next"] .vcp-tool-row-state { margin-left: auto; white-space: nowrap; font-size: var(--vcp-ui-text-sm, 12px); }
-html[data-ui-mode="next"] [data-vcp-tool-state="success"] .vcp-tool-row-state { color: var(--vcp-ui-success); }
-html[data-ui-mode="next"] [data-vcp-tool-state="failed"] .vcp-tool-row-state { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
-html[data-ui-mode="next"] [data-vcp-tool-state="waiting"] .vcp-tool-row-state,
-html[data-ui-mode="next"] [data-vcp-tool-state="stopped"] .vcp-tool-row-state { color: var(--vcp-ui-warning, var(--vcp-ui-palette-amber)); }
-html[data-ui-mode="next"] [data-vcp-tool-state="running"] .vcp-tool-row-state { color: var(--vcp-ui-accent); }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-delete-btn { flex: 0 0 24px; margin-right: 6px; opacity: 0; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-header:hover .vcp-tool-result-delete-btn,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-header:focus-within .vcp-tool-result-delete-btn { opacity: 1; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="compact"] .vcp-role-divider,
-html[data-ui-mode="next"] [data-vcp-tool-presentation="grouped"] .vcp-role-divider { margin: 4px 0; font-size: 11px; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-details { max-height: 360px; overflow: auto; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-details,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-result-collapsible-content,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-call-summary-content {
+html[data-ui-mode="next"] .vcp-ui-scope [aria-expanded="true"] > .vcp-tool-row-chevron { transform: rotate(45deg); }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-title { overflow-wrap: anywhere; min-width: 0; color: var(--vcp-ui-text-primary); }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-resource { overflow-wrap: anywhere; min-width: 0; font-size: var(--vcp-ui-text-sm, 12px); }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-state { margin-left: auto; white-space: nowrap; font-size: var(--vcp-ui-text-sm, 12px); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-state="success"] .vcp-tool-row-state { color: var(--vcp-ui-success); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-state="failed"] .vcp-tool-row-state { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-state="waiting"] .vcp-tool-row-state,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-state="stopped"] .vcp-tool-row-state { color: var(--vcp-ui-warning, var(--vcp-ui-palette-amber)); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-state="running"] .vcp-tool-row-state { color: var(--vcp-ui-accent); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-delete-btn { flex: 0 0 24px; margin-right: 6px; opacity: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-header:hover .vcp-tool-result-delete-btn,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-header:focus-within .vcp-tool-result-delete-btn { opacity: 1; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="compact"] .vcp-role-divider,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="grouped"] .vcp-role-divider { margin: 4px 0; font-size: var(--vcp-ui-text-xs, 11px); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-details { max-height: 360px; overflow: auto; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-details,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-result-collapsible-content,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-call-summary-content {
     margin: 0;
     padding: 6px 12px 12px 28px;
     background: transparent;
     border: 0;
     min-width: 0;
 }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-details,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-result-collapsible-content,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-call-summary-content { display: none; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-details,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-result-collapsible-content,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-call-summary-content { display: block; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented pre {
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-details,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-result-collapsible-content,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-call-summary-content { display: none; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-details,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-result-collapsible-content,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-call-summary-content { display: block; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented pre {
     white-space: pre-wrap;
     overflow-wrap: anywhere;
     min-width: 0;
     max-height: 320px;
     overflow: auto;
 }
-html[data-ui-mode="next"] .vcp-tool-process {
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process {
     border: 1px solid var(--vcp-ui-border);
     border-radius: var(--vcp-ui-radius-md, 8px);
     margin: 10px 0;
@@ -124,12 +124,12 @@ html[data-ui-mode="next"] .vcp-tool-process {
     overflow: hidden;
     background: var(--vcp-ui-bg-0);
 }
-html[data-ui-mode="next"] .vcp-tool-process-toggle { background: var(--vcp-ui-bg-1); border-radius: 0; }
-html[data-ui-mode="next"] .vcp-tool-process-title { min-width: 0; overflow-wrap: anywhere; }
-html[data-ui-mode="next"] .vcp-tool-process-stats { margin-left: auto; font-size: var(--vcp-ui-text-sm, 12px); overflow-wrap: anywhere; }
-html[data-ui-mode="next"] .vcp-tool-process-body[hidden] { display: none; }
-html[data-ui-mode="next"] .vcp-tool-process-body > .vcp-tool-presented { margin: 0; border-top: 1px solid var(--vcp-ui-border); }
-html[data-ui-mode="next"] .vcp-tool-process-artifact {
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-toggle { background: var(--vcp-ui-bg-1); border-radius: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-title { min-width: 0; overflow-wrap: anywhere; }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-stats { margin-left: auto; font-size: var(--vcp-ui-text-sm, 12px); overflow-wrap: anywhere; }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-body[hidden] { display: none; }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-body > .vcp-tool-presented { margin: 0; border-top: 1px solid var(--vcp-ui-border); }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-artifact {
     color: var(--vcp-ui-text-accent);
     background: transparent;
     border: 0;
@@ -142,20 +142,20 @@ html[data-ui-mode="next"] .vcp-tool-process-artifact {
     cursor: pointer;
 }
 @media (max-width: 640px) {
-    html[data-ui-mode="next"] .vcp-tool-row-toggle { flex-wrap: wrap; gap: 6px; }
-    html[data-ui-mode="next"] .vcp-tool-row-state { margin-left: auto; }
-    html[data-ui-mode="next"] .vcp-tool-process-toggle { flex-wrap: wrap; }
-    html[data-ui-mode="next"] .vcp-tool-process-stats { margin-left: 16px; }
+    html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-toggle { flex-wrap: wrap; gap: 6px; }
+    html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-state { margin-left: auto; }
+    html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-toggle { flex-wrap: wrap; }
+    html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-stats { margin-left: 16px; }
 }
 
 /* 单行合并 / 整轮折叠：无框单行，一次调用一行；紧跟的同名结果收进请求行，展开后才显示。 */
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) {
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) {
     --vcp-tool-call-color: var(--vcp-ui-text-3, var(--vcp-ui-text-secondary));
     --vcp-tool-call-hover: var(--vcp-ui-text-2, var(--vcp-ui-text-secondary));
 }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-role-divider { margin: 4px 0; font-size: 11px; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-presented { margin: 2px 0; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) {
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-role-divider { margin: 4px 0; font-size: var(--vcp-ui-text-xs, 11px); }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-presented { margin: 2px 0; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) {
     width: auto;
     max-width: 100%;
     min-height: 24px;
@@ -168,10 +168,10 @@ html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-t
     color: var(--vcp-tool-call-color);
     transition: color .1s;
 }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle):hover { background: transparent; color: var(--vcp-tool-call-hover); }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle .vcp-tool-row-title, .vcp-tool-process-title) { flex: none; color: inherit; white-space: nowrap; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-process-stats { min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; overflow-wrap: normal; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-toggle .vcp-tool-row-resource {
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle):hover { background: transparent; color: var(--vcp-tool-call-hover); }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle .vcp-tool-row-title, .vcp-tool-process-title) { flex: none; color: inherit; white-space: nowrap; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-process-stats { min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; overflow-wrap: normal; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-toggle .vcp-tool-row-resource {
     min-width: 0;
     overflow: hidden;
     text-overflow: ellipsis;
@@ -179,20 +179,20 @@ html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-t
     overflow-wrap: normal;
     font-size: inherit;
 }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-toggle .vcp-tool-row-state { flex: none; margin-left: 0; color: inherit; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-icon { display: inline-flex; flex: none; width: 16px; height: 16px; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-icon svg { width: 100%; height: 100%; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-diff { flex: none; font-family: var(--vcp-ui-font-mono, ui-monospace, Consolas, monospace); font-size: 11px; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle:hover, [aria-expanded="true"]) .vcp-tool-row-diff-add { color: var(--vcp-ui-success); }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle:hover, [aria-expanded="true"]) .vcp-tool-row-diff-del { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-toggle .vcp-tool-row-state { flex: none; margin-left: 0; color: inherit; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-icon { display: inline-flex; flex: none; width: 16px; height: 16px; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-icon svg { width: 100%; height: 100%; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-diff { flex: none; font-family: var(--vcp-ui-font-mono, ui-monospace, Consolas, monospace); font-size: var(--vcp-ui-text-xs, 11px); }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle:hover, [aria-expanded="true"]) .vcp-tool-row-diff-add { color: var(--vcp-ui-success); }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle:hover, [aria-expanded="true"]) .vcp-tool-row-diff-del { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
 /* 并入请求行的结果：收起时不占位，展开后只留一个小标题“输出”。
- * 旧层给结果气泡写了 display:block !important，这里只能藏标题、去掉外边距，正文由上面的收起规则隐藏。 */
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"]:not(.expanded) { margin: 0; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"]:not(.expanded) > .vcp-tool-result-header { display: none; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"] .vcp-tool-row-toggle { min-height: 20px; padding-left: 24px; font-size: var(--vcp-ui-text-sm, 12px); }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-presented > :is(.vcp-tool-details, .vcp-tool-result-collapsible-content, .vcp-tool-call-summary-content) { padding: 8px 0 4px 24px; }
+ * 旧层给结果气泡写了强制的 display:block（important 级），这里只能藏标题、去掉外边距，正文由上面的收起规则隐藏。 */
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"]:not(.expanded) { margin: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"]:not(.expanded) > .vcp-tool-result-header { display: none; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"] .vcp-tool-row-toggle { min-height: 20px; padding-left: 24px; font-size: var(--vcp-ui-text-sm, 12px); }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-presented > :is(.vcp-tool-details, .vcp-tool-result-collapsible-content, .vcp-tool-call-summary-content) { padding: 8px 0 4px 24px; }
 /* 等待结果时动作词的微光，只在回复生成中出现。 */
-html[data-ui-mode="next"] .message-item.streaming :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-pending="true"] .vcp-tool-row-title {
+html[data-ui-mode="next"] .vcp-ui-scope .message-item.streaming :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-pending="true"] .vcp-tool-row-title {
     background: linear-gradient(90deg, var(--vcp-tool-call-color) 0%, var(--vcp-ui-text-primary) 50%, var(--vcp-tool-call-color) 100%);
     background-size: 200% 100%;
     -webkit-background-clip: text;
@@ -202,33 +202,33 @@ html[data-ui-mode="next"] .message-item.streaming :is([data-vcp-tool-presentatio
 }
 @keyframes vcp-tool-call-shimmer { from { background-position: 100% 0; } to { background-position: -100% 0; } }
 @media (prefers-reduced-motion: reduce) {
-    html[data-ui-mode="next"] [data-vcp-tool-pending="true"] .vcp-tool-row-title { animation: none !important; }
+    html[data-ui-mode="next"] .vcp-ui-scope .message-item.streaming :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-pending="true"] .vcp-tool-row-title { animation: none; }
 }
 
 /* 单行合并：动作词加粗，箭头在行尾、悬停或展开时出现；问题状态用虚线下划线，悬停看报错。 */
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) { font-size: var(--vcp-ui-text-body, 14px); }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle .vcp-tool-row-title, .vcp-tool-process-title) { font-weight: 500; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) > .vcp-tool-row-chevron { order: 1; opacity: 0; transition: opacity .2s, transform .2s; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle):is(:hover, [aria-expanded="true"]) > .vcp-tool-row-chevron { opacity: 1; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] [data-vcp-tool-call-state] .vcp-tool-row-state { text-decoration: underline dotted; text-underline-offset: 2px; cursor: help; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] { margin: 2px 0; border: 0; border-radius: 0; background: transparent; overflow: visible; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] .vcp-tool-process-stats { margin-left: 0; font-size: inherit; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-body { margin: 4px 0 4px 8px; padding-left: 14px; border-left: 1px solid var(--vcp-ui-border); }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-body > .vcp-tool-presented { margin: 2px 0; border-top: 0; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-artifact { border-top: 0; padding: 4px 0 4px 22px; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) { font-size: var(--vcp-ui-text-body, 14px); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle .vcp-tool-row-title, .vcp-tool-process-title) { font-weight: 500; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) > .vcp-tool-row-chevron { order: 1; opacity: 0; transition: opacity .2s, transform .2s; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle):is(:hover, [aria-expanded="true"]) > .vcp-tool-row-chevron { opacity: 1; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] [data-vcp-tool-call-state] .vcp-tool-row-state { text-decoration: underline dotted; text-underline-offset: 2px; cursor: help; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] { margin: 2px 0; border: 0; border-radius: 0; background: transparent; overflow: visible; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] .vcp-tool-process-stats { margin-left: 0; font-size: inherit; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-body { margin: 4px 0 4px 8px; padding-left: 14px; border-left: 1px solid var(--vcp-ui-border); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-body > .vcp-tool-presented { margin: 2px 0; border-top: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-artifact { border-top: 0; padding: 4px 0 4px 22px; }
 
 /* 整轮折叠：图标悬停换成箭头，标题与摘要之间用小圆点分隔，失败时摘要显示红色报错首行。 */
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle { gap: 0; font-size: var(--vcp-ui-text-caption, 13px); }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-leading { position: relative; display: inline-flex; flex: none; width: 16px; height: 16px; margin-right: 6px; align-items: center; justify-content: center; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-leading .vcp-tool-row-icon { width: 14px; height: 14px; transition: opacity .1s; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-leading .vcp-tool-row-chevron { position: absolute; inset: 0; margin: auto; opacity: 0; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle:is(:hover, [aria-expanded="true"]) .vcp-tool-row-leading .vcp-tool-row-icon { opacity: 0; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle:is(:hover, [aria-expanded="true"]) .vcp-tool-row-leading .vcp-tool-row-chevron { opacity: 1; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-dot { flex: none; width: 2px; height: 2px; margin: 0 8px; border-radius: 1px; background: currentColor; opacity: .7; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle :is(.vcp-tool-row-state, .vcp-tool-row-diff) { margin-left: 10px; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] [data-vcp-tool-call-state="failed"] .vcp-tool-row-toggle .vcp-tool-row-resource { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] { margin: 4px 0 10px; border: 0; border-radius: 0; background: transparent; overflow: visible; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-toggle {
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle { gap: 0; font-size: var(--vcp-ui-text-caption, 13px); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-leading { position: relative; display: inline-flex; flex: none; width: 16px; height: 16px; margin-right: 6px; align-items: center; justify-content: center; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-leading .vcp-tool-row-icon { width: 14px; height: 14px; transition: opacity .1s; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-leading .vcp-tool-row-chevron { position: absolute; inset: 0; margin: auto; opacity: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle:is(:hover, [aria-expanded="true"]) .vcp-tool-row-leading .vcp-tool-row-icon { opacity: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle:is(:hover, [aria-expanded="true"]) .vcp-tool-row-leading .vcp-tool-row-chevron { opacity: 1; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-dot { flex: none; width: 2px; height: 2px; margin: 0 8px; border-radius: 1px; background: currentColor; opacity: .7; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle :is(.vcp-tool-row-state, .vcp-tool-row-diff) { margin-left: 10px; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] [data-vcp-tool-call-state="failed"] .vcp-tool-row-toggle .vcp-tool-row-resource { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] { margin: 4px 0 10px; border: 0; border-radius: 0; background: transparent; overflow: visible; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-toggle {
     width: 100%;
     min-height: 33px;
     padding: 0 0 8px;
@@ -236,8 +236,8 @@ html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-proce
     border-bottom: .5px solid var(--vcp-ui-border);
     font-size: var(--vcp-ui-text-body, 14px);
 }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-toggle > .vcp-tool-row-chevron { order: 1; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] .vcp-tool-process-stats { margin-left: 0; color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-body { padding-top: 8px; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-body > .vcp-tool-presented { margin: 2px 0; border-top: 0; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-artifact { border-top: 0; padding: 6px 0; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-toggle > .vcp-tool-row-chevron { order: 1; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] .vcp-tool-process-stats { margin-left: 0; color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-body { padding-top: 8px; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-body > .vcp-tool-presented { margin: 2px 0; border-top: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-artifact { border-top: 0; padding: 6px 0; }

From 0753805a95c23f90ba8badd942bd5e92e20bdb51 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 00:22:28 +0000
Subject: [PATCH 032/143] UI system gate: scope the tool presentation styles
 and drop the stray literal colour

check:ui-system was red on the side pane branch. tool-presentation.css had
101 selectors outside .vcp-ui-scope, an !important on the reduced-motion
rule and two fixed 11px sizes; components.css (from upstream #234) fell back
to a hard-coded indigo because --vcp-ui-primary is not a token.

Every tool presentation selector now sits under .vcp-ui-scope (the chat
messages container already carries it, and the file is alone in its layer,
so the uniform specificity bump changes no cascade). The reduced-motion rule
reuses the shimmer selector instead of !important, the 11px sizes use
--vcp-ui-text-xs, and the pinned window button uses the accent token.
(Ported from 2200d128 on the integration PR; components.css part dropped because the pin rule it touched is not on this branch.)

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01SADzqzusVz3S3z7qBUSy8M
---
 styles/ui-system/tool-presentation.css | 196 ++++++++++++-------------
 1 file changed, 98 insertions(+), 98 deletions(-)

diff --git a/styles/ui-system/tool-presentation.css b/styles/ui-system/tool-presentation.css
index 436a2e39c..be8a90316 100644
--- a/styles/ui-system/tool-presentation.css
+++ b/styles/ui-system/tool-presentation.css
@@ -1,12 +1,12 @@
 /* Optional presentation; Legacy is untouched. Theme and typography stay owned
  * by the existing appearance profile, including role wallpapers. */
-html[data-ui-mode="next"] [data-vcp-tool-presentation="compact"],
-html[data-ui-mode="next"] [data-vcp-tool-presentation="grouped"] {
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="compact"],
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="grouped"] {
     --vcp-tool-row-height: 38px;
 }
-html[data-ui-mode="next"][data-vcp-density="compact"] [data-vcp-tool-presentation] { --vcp-tool-row-height: 32px; }
-html[data-ui-mode="next"][data-vcp-density="relaxed"] [data-vcp-tool-presentation] { --vcp-tool-row-height: 44px; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented {
+html[data-ui-mode="next"][data-vcp-density="compact"] .vcp-ui-scope [data-vcp-tool-presentation] { --vcp-tool-row-height: 32px; }
+html[data-ui-mode="next"][data-vcp-density="relaxed"] .vcp-ui-scope [data-vcp-tool-presentation] { --vcp-tool-row-height: 44px; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented {
     --vcp-tool-presented-font-family: var(--vcp-tool-card-font-family, var(--vcp-chat-font-family));
     --vcp-tool-presented-font-size: var(--vcp-ui-text-caption, 13px);
     --vcp-tool-presented-white-space: normal;
@@ -32,11 +32,11 @@ html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented {
     color: var(--vcp-ui-text-primary);
     font-family: var(--vcp-tool-card-font-family, inherit);
 }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented::before,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented::after { display: none; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-summary,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-result-header,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-call-summary-header {
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented::before,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented::after { display: none; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-summary,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-result-header,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-call-summary-header {
     display: flex;
     gap: 5px;
     padding: 0;
@@ -47,7 +47,7 @@ html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vc
     min-width: 0;
     flex-wrap: nowrap;
 }
-html[data-ui-mode="next"] .vcp-tool-row-toggle, html[data-ui-mode="next"] .vcp-tool-process-toggle {
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-toggle, html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-toggle {
     display: flex;
     width: 100%;
     min-width: 0;
@@ -65,13 +65,13 @@ html[data-ui-mode="next"] .vcp-tool-row-toggle, html[data-ui-mode="next"] .vcp-t
     cursor: pointer;
     text-align: left;
 }
-html[data-ui-mode="next"] .vcp-tool-result-header > .vcp-tool-row-toggle {
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-result-header > .vcp-tool-row-toggle {
     width: auto;
     flex: 1;
 }
-html[data-ui-mode="next"] .vcp-tool-row-toggle:hover, html[data-ui-mode="next"] .vcp-tool-process-toggle:hover { background: var(--vcp-ui-bg-2); }
-html[data-ui-mode="next"] .vcp-tool-row-toggle:focus-visible, html[data-ui-mode="next"] .vcp-tool-process-toggle:focus-visible, html[data-ui-mode="next"] .vcp-tool-process-artifact:focus-visible { outline: 2px solid var(--vcp-ui-accent); outline-offset: -2px; }
-html[data-ui-mode="next"] .vcp-tool-row-chevron {
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-toggle:hover, html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-toggle:hover { background: var(--vcp-ui-bg-2); }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-toggle:focus-visible, html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-toggle:focus-visible, html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-artifact:focus-visible { outline: 2px solid var(--vcp-ui-accent); outline-offset: -2px; }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-chevron {
     width: 7px;
     height: 7px;
     flex: 0 0 7px;
@@ -79,44 +79,44 @@ html[data-ui-mode="next"] .vcp-tool-row-chevron {
     border-bottom: 1.5px solid currentColor;
     transform: rotate(-45deg);
 }
-html[data-ui-mode="next"] [aria-expanded="true"] > .vcp-tool-row-chevron { transform: rotate(45deg); }
-html[data-ui-mode="next"] .vcp-tool-row-title { overflow-wrap: anywhere; min-width: 0; color: var(--vcp-ui-text-primary); }
-html[data-ui-mode="next"] .vcp-tool-row-resource { overflow-wrap: anywhere; min-width: 0; font-size: var(--vcp-ui-text-sm, 12px); }
-html[data-ui-mode="next"] .vcp-tool-row-state { margin-left: auto; white-space: nowrap; font-size: var(--vcp-ui-text-sm, 12px); }
-html[data-ui-mode="next"] [data-vcp-tool-state="success"] .vcp-tool-row-state { color: var(--vcp-ui-success); }
-html[data-ui-mode="next"] [data-vcp-tool-state="failed"] .vcp-tool-row-state { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
-html[data-ui-mode="next"] [data-vcp-tool-state="waiting"] .vcp-tool-row-state,
-html[data-ui-mode="next"] [data-vcp-tool-state="stopped"] .vcp-tool-row-state { color: var(--vcp-ui-warning, var(--vcp-ui-palette-amber)); }
-html[data-ui-mode="next"] [data-vcp-tool-state="running"] .vcp-tool-row-state { color: var(--vcp-ui-accent); }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-delete-btn { flex: 0 0 24px; margin-right: 6px; opacity: 0; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-header:hover .vcp-tool-result-delete-btn,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-header:focus-within .vcp-tool-result-delete-btn { opacity: 1; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="compact"] .vcp-role-divider,
-html[data-ui-mode="next"] [data-vcp-tool-presentation="grouped"] .vcp-role-divider { margin: 4px 0; font-size: 11px; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-details { max-height: 360px; overflow: auto; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-details,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-result-collapsible-content,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-call-summary-content {
+html[data-ui-mode="next"] .vcp-ui-scope [aria-expanded="true"] > .vcp-tool-row-chevron { transform: rotate(45deg); }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-title { overflow-wrap: anywhere; min-width: 0; color: var(--vcp-ui-text-primary); }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-resource { overflow-wrap: anywhere; min-width: 0; font-size: var(--vcp-ui-text-sm, 12px); }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-state { margin-left: auto; white-space: nowrap; font-size: var(--vcp-ui-text-sm, 12px); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-state="success"] .vcp-tool-row-state { color: var(--vcp-ui-success); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-state="failed"] .vcp-tool-row-state { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-state="waiting"] .vcp-tool-row-state,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-state="stopped"] .vcp-tool-row-state { color: var(--vcp-ui-warning, var(--vcp-ui-palette-amber)); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-state="running"] .vcp-tool-row-state { color: var(--vcp-ui-accent); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-delete-btn { flex: 0 0 24px; margin-right: 6px; opacity: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-header:hover .vcp-tool-result-delete-btn,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-header:focus-within .vcp-tool-result-delete-btn { opacity: 1; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="compact"] .vcp-role-divider,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="grouped"] .vcp-role-divider { margin: 4px 0; font-size: var(--vcp-ui-text-xs, 11px); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-details { max-height: 360px; overflow: auto; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-details,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-result-collapsible-content,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-call-summary-content {
     margin: 0;
     padding: 6px 12px 12px 28px;
     background: transparent;
     border: 0;
     min-width: 0;
 }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-details,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-result-collapsible-content,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-call-summary-content { display: none; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-details,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-result-collapsible-content,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-call-summary-content { display: block; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented pre {
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-details,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-result-collapsible-content,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-call-summary-content { display: none; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-details,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-result-collapsible-content,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-call-summary-content { display: block; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented pre {
     white-space: pre-wrap;
     overflow-wrap: anywhere;
     min-width: 0;
     max-height: 320px;
     overflow: auto;
 }
-html[data-ui-mode="next"] .vcp-tool-process {
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process {
     border: 1px solid var(--vcp-ui-border);
     border-radius: var(--vcp-ui-radius-md, 8px);
     margin: 10px 0;
@@ -124,12 +124,12 @@ html[data-ui-mode="next"] .vcp-tool-process {
     overflow: hidden;
     background: var(--vcp-ui-bg-0);
 }
-html[data-ui-mode="next"] .vcp-tool-process-toggle { background: var(--vcp-ui-bg-1); border-radius: 0; }
-html[data-ui-mode="next"] .vcp-tool-process-title { min-width: 0; overflow-wrap: anywhere; }
-html[data-ui-mode="next"] .vcp-tool-process-stats { margin-left: auto; font-size: var(--vcp-ui-text-sm, 12px); overflow-wrap: anywhere; }
-html[data-ui-mode="next"] .vcp-tool-process-body[hidden] { display: none; }
-html[data-ui-mode="next"] .vcp-tool-process-body > .vcp-tool-presented { margin: 0; border-top: 1px solid var(--vcp-ui-border); }
-html[data-ui-mode="next"] .vcp-tool-process-artifact {
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-toggle { background: var(--vcp-ui-bg-1); border-radius: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-title { min-width: 0; overflow-wrap: anywhere; }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-stats { margin-left: auto; font-size: var(--vcp-ui-text-sm, 12px); overflow-wrap: anywhere; }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-body[hidden] { display: none; }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-body > .vcp-tool-presented { margin: 0; border-top: 1px solid var(--vcp-ui-border); }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-artifact {
     color: var(--vcp-ui-text-accent);
     background: transparent;
     border: 0;
@@ -142,20 +142,20 @@ html[data-ui-mode="next"] .vcp-tool-process-artifact {
     cursor: pointer;
 }
 @media (max-width: 640px) {
-    html[data-ui-mode="next"] .vcp-tool-row-toggle { flex-wrap: wrap; gap: 6px; }
-    html[data-ui-mode="next"] .vcp-tool-row-state { margin-left: auto; }
-    html[data-ui-mode="next"] .vcp-tool-process-toggle { flex-wrap: wrap; }
-    html[data-ui-mode="next"] .vcp-tool-process-stats { margin-left: 16px; }
+    html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-toggle { flex-wrap: wrap; gap: 6px; }
+    html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-state { margin-left: auto; }
+    html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-toggle { flex-wrap: wrap; }
+    html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-stats { margin-left: 16px; }
 }
 
 /* 单行合并 / 整轮折叠：无框单行，一次调用一行；紧跟的同名结果收进请求行，展开后才显示。 */
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) {
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) {
     --vcp-tool-call-color: var(--vcp-ui-text-3, var(--vcp-ui-text-secondary));
     --vcp-tool-call-hover: var(--vcp-ui-text-2, var(--vcp-ui-text-secondary));
 }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-role-divider { margin: 4px 0; font-size: 11px; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-presented { margin: 2px 0; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) {
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-role-divider { margin: 4px 0; font-size: var(--vcp-ui-text-xs, 11px); }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-presented { margin: 2px 0; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) {
     width: auto;
     max-width: 100%;
     min-height: 24px;
@@ -168,10 +168,10 @@ html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-t
     color: var(--vcp-tool-call-color);
     transition: color .1s;
 }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle):hover { background: transparent; color: var(--vcp-tool-call-hover); }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle .vcp-tool-row-title, .vcp-tool-process-title) { flex: none; color: inherit; white-space: nowrap; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-process-stats { min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; overflow-wrap: normal; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-toggle .vcp-tool-row-resource {
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle):hover { background: transparent; color: var(--vcp-tool-call-hover); }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle .vcp-tool-row-title, .vcp-tool-process-title) { flex: none; color: inherit; white-space: nowrap; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-process-stats { min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; overflow-wrap: normal; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-toggle .vcp-tool-row-resource {
     min-width: 0;
     overflow: hidden;
     text-overflow: ellipsis;
@@ -179,20 +179,20 @@ html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-t
     overflow-wrap: normal;
     font-size: inherit;
 }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-toggle .vcp-tool-row-state { flex: none; margin-left: 0; color: inherit; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-icon { display: inline-flex; flex: none; width: 16px; height: 16px; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-icon svg { width: 100%; height: 100%; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-diff { flex: none; font-family: var(--vcp-ui-font-mono, ui-monospace, Consolas, monospace); font-size: 11px; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle:hover, [aria-expanded="true"]) .vcp-tool-row-diff-add { color: var(--vcp-ui-success); }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle:hover, [aria-expanded="true"]) .vcp-tool-row-diff-del { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-toggle .vcp-tool-row-state { flex: none; margin-left: 0; color: inherit; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-icon { display: inline-flex; flex: none; width: 16px; height: 16px; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-icon svg { width: 100%; height: 100%; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-diff { flex: none; font-family: var(--vcp-ui-font-mono, ui-monospace, Consolas, monospace); font-size: var(--vcp-ui-text-xs, 11px); }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle:hover, [aria-expanded="true"]) .vcp-tool-row-diff-add { color: var(--vcp-ui-success); }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle:hover, [aria-expanded="true"]) .vcp-tool-row-diff-del { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
 /* 并入请求行的结果：收起时不占位，展开后只留一个小标题“输出”。
- * 旧层给结果气泡写了 display:block !important，这里只能藏标题、去掉外边距，正文由上面的收起规则隐藏。 */
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"]:not(.expanded) { margin: 0; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"]:not(.expanded) > .vcp-tool-result-header { display: none; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"] .vcp-tool-row-toggle { min-height: 20px; padding-left: 24px; font-size: var(--vcp-ui-text-sm, 12px); }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-presented > :is(.vcp-tool-details, .vcp-tool-result-collapsible-content, .vcp-tool-call-summary-content) { padding: 8px 0 4px 24px; }
+ * 旧层给结果气泡写了强制的 display:block（important 级），这里只能藏标题、去掉外边距，正文由上面的收起规则隐藏。 */
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"]:not(.expanded) { margin: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"]:not(.expanded) > .vcp-tool-result-header { display: none; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"] .vcp-tool-row-toggle { min-height: 20px; padding-left: 24px; font-size: var(--vcp-ui-text-sm, 12px); }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-presented > :is(.vcp-tool-details, .vcp-tool-result-collapsible-content, .vcp-tool-call-summary-content) { padding: 8px 0 4px 24px; }
 /* 等待结果时动作词的微光，只在回复生成中出现。 */
-html[data-ui-mode="next"] .message-item.streaming :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-pending="true"] .vcp-tool-row-title {
+html[data-ui-mode="next"] .vcp-ui-scope .message-item.streaming :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-pending="true"] .vcp-tool-row-title {
     background: linear-gradient(90deg, var(--vcp-tool-call-color) 0%, var(--vcp-ui-text-primary) 50%, var(--vcp-tool-call-color) 100%);
     background-size: 200% 100%;
     -webkit-background-clip: text;
@@ -202,33 +202,33 @@ html[data-ui-mode="next"] .message-item.streaming :is([data-vcp-tool-presentatio
 }
 @keyframes vcp-tool-call-shimmer { from { background-position: 100% 0; } to { background-position: -100% 0; } }
 @media (prefers-reduced-motion: reduce) {
-    html[data-ui-mode="next"] [data-vcp-tool-pending="true"] .vcp-tool-row-title { animation: none !important; }
+    html[data-ui-mode="next"] .vcp-ui-scope .message-item.streaming :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-pending="true"] .vcp-tool-row-title { animation: none; }
 }
 
 /* 单行合并：动作词加粗，箭头在行尾、悬停或展开时出现；问题状态用虚线下划线，悬停看报错。 */
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) { font-size: var(--vcp-ui-text-body, 14px); }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle .vcp-tool-row-title, .vcp-tool-process-title) { font-weight: 500; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) > .vcp-tool-row-chevron { order: 1; opacity: 0; transition: opacity .2s, transform .2s; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle):is(:hover, [aria-expanded="true"]) > .vcp-tool-row-chevron { opacity: 1; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] [data-vcp-tool-call-state] .vcp-tool-row-state { text-decoration: underline dotted; text-underline-offset: 2px; cursor: help; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] { margin: 2px 0; border: 0; border-radius: 0; background: transparent; overflow: visible; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] .vcp-tool-process-stats { margin-left: 0; font-size: inherit; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-body { margin: 4px 0 4px 8px; padding-left: 14px; border-left: 1px solid var(--vcp-ui-border); }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-body > .vcp-tool-presented { margin: 2px 0; border-top: 0; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-artifact { border-top: 0; padding: 4px 0 4px 22px; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) { font-size: var(--vcp-ui-text-body, 14px); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle .vcp-tool-row-title, .vcp-tool-process-title) { font-weight: 500; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) > .vcp-tool-row-chevron { order: 1; opacity: 0; transition: opacity .2s, transform .2s; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle):is(:hover, [aria-expanded="true"]) > .vcp-tool-row-chevron { opacity: 1; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] [data-vcp-tool-call-state] .vcp-tool-row-state { text-decoration: underline dotted; text-underline-offset: 2px; cursor: help; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] { margin: 2px 0; border: 0; border-radius: 0; background: transparent; overflow: visible; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] .vcp-tool-process-stats { margin-left: 0; font-size: inherit; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-body { margin: 4px 0 4px 8px; padding-left: 14px; border-left: 1px solid var(--vcp-ui-border); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-body > .vcp-tool-presented { margin: 2px 0; border-top: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-artifact { border-top: 0; padding: 4px 0 4px 22px; }
 
 /* 整轮折叠：图标悬停换成箭头，标题与摘要之间用小圆点分隔，失败时摘要显示红色报错首行。 */
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle { gap: 0; font-size: var(--vcp-ui-text-caption, 13px); }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-leading { position: relative; display: inline-flex; flex: none; width: 16px; height: 16px; margin-right: 6px; align-items: center; justify-content: center; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-leading .vcp-tool-row-icon { width: 14px; height: 14px; transition: opacity .1s; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-leading .vcp-tool-row-chevron { position: absolute; inset: 0; margin: auto; opacity: 0; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle:is(:hover, [aria-expanded="true"]) .vcp-tool-row-leading .vcp-tool-row-icon { opacity: 0; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle:is(:hover, [aria-expanded="true"]) .vcp-tool-row-leading .vcp-tool-row-chevron { opacity: 1; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-dot { flex: none; width: 2px; height: 2px; margin: 0 8px; border-radius: 1px; background: currentColor; opacity: .7; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle :is(.vcp-tool-row-state, .vcp-tool-row-diff) { margin-left: 10px; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] [data-vcp-tool-call-state="failed"] .vcp-tool-row-toggle .vcp-tool-row-resource { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] { margin: 4px 0 10px; border: 0; border-radius: 0; background: transparent; overflow: visible; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-toggle {
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle { gap: 0; font-size: var(--vcp-ui-text-caption, 13px); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-leading { position: relative; display: inline-flex; flex: none; width: 16px; height: 16px; margin-right: 6px; align-items: center; justify-content: center; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-leading .vcp-tool-row-icon { width: 14px; height: 14px; transition: opacity .1s; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-leading .vcp-tool-row-chevron { position: absolute; inset: 0; margin: auto; opacity: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle:is(:hover, [aria-expanded="true"]) .vcp-tool-row-leading .vcp-tool-row-icon { opacity: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle:is(:hover, [aria-expanded="true"]) .vcp-tool-row-leading .vcp-tool-row-chevron { opacity: 1; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-dot { flex: none; width: 2px; height: 2px; margin: 0 8px; border-radius: 1px; background: currentColor; opacity: .7; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle :is(.vcp-tool-row-state, .vcp-tool-row-diff) { margin-left: 10px; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] [data-vcp-tool-call-state="failed"] .vcp-tool-row-toggle .vcp-tool-row-resource { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] { margin: 4px 0 10px; border: 0; border-radius: 0; background: transparent; overflow: visible; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-toggle {
     width: 100%;
     min-height: 33px;
     padding: 0 0 8px;
@@ -236,8 +236,8 @@ html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-proce
     border-bottom: .5px solid var(--vcp-ui-border);
     font-size: var(--vcp-ui-text-body, 14px);
 }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-toggle > .vcp-tool-row-chevron { order: 1; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] .vcp-tool-process-stats { margin-left: 0; color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-body { padding-top: 8px; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-body > .vcp-tool-presented { margin: 2px 0; border-top: 0; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-artifact { border-top: 0; padding: 6px 0; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-toggle > .vcp-tool-row-chevron { order: 1; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] .vcp-tool-process-stats { margin-left: 0; color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-body { padding-top: 8px; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-body > .vcp-tool-presented { margin: 2px 0; border-top: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-artifact { border-top: 0; padding: 6px 0; }

From 55a37fbb2b2151bd26a67dc44d093b14239c4b45 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 01:01:57 +0000
Subject: [PATCH 033/143] Command output tab: a printing command is re-read
 once a second with one read in flight

Each push from a command that keeps printing made the tab re-read its output about every
180ms, and every read made the main process re-clean up to 512KB of terminal output (30-45ms
measured). The tab now re-reads a running command at most once a second and keeps a single
read in flight, as ZCode's background output view does. The store reuses the cleaned
output while the raw output is unchanged.

Also regenerates the chat event graph for the moved source lines and the contracts entry
for the git handler's dynamic site.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DFRovoZHMzeheXKkLNWKG
---
 .../PowerShellExecutor/commandRunStore.js     |  15 +-
 docs/contracts/chat-contracts.json            |   2 +-
 .../contracts/generated/chat-event-graph.json | 228 ++++++++++--------
 .../side-pane/toolOutputSideProvider.js       |  24 +-
 tests/side-pane-tool-output.test.mjs          |  21 +-
 5 files changed, 179 insertions(+), 111 deletions(-)

diff --git a/VCPDistributedServer/Plugin/PowerShellExecutor/commandRunStore.js b/VCPDistributedServer/Plugin/PowerShellExecutor/commandRunStore.js
index 81e20618b..0d39833c3 100644
--- a/VCPDistributedServer/Plugin/PowerShellExecutor/commandRunStore.js
+++ b/VCPDistributedServer/Plugin/PowerShellExecutor/commandRunStore.js
@@ -78,13 +78,24 @@ function listCommandRuns() {
     return commandRuns.map(summarizeCommandRun).reverse();
 }
 
+// 清洗是逐字符的屏幕模拟，几百 KB 要几十毫秒，而且在主进程里同步跑：输出没变时直接用上次的结果
+const cleanedOutput = new WeakMap(); // run -> { raw, clean }
+
+function cleanRunOutput(run) {
+    const cached = cleanedOutput.get(run);
+    if (cached && cached.raw === run.raw) return cached.clean;
+    // 起始标记那一行留下的换行不算输出
+    const clean = sanitizeTerminalOutput(run.raw).replace(/\r\n/g, '\n').replace(/\r/g, '').replace(/^\n/, '');
+    cleanedOutput.set(run, { raw: run.raw, clean });
+    return clean;
+}
+
 /** 读取一条记录，输出为清洗后的纯文本，只保留末尾 maxChars 个字符。 */
 function getCommandRun(id, { maxChars = COMMAND_RUN_READ_LIMIT } = {}) {
     const run = commandRuns.find(item => item.id === id);
     if (!run) return null;
     const limit = Math.max(1, Math.min(COMMAND_RUN_READ_LIMIT, Math.floor(Number(maxChars)) || COMMAND_RUN_READ_LIMIT));
-    // 起始标记那一行留下的换行不算输出
-    const clean = sanitizeTerminalOutput(run.raw).replace(/\r\n/g, '\n').replace(/\r/g, '').replace(/^\n/, '');
+    const clean = cleanRunOutput(run);
     const truncated = run.rawTruncated || clean.length > limit;
     return {
         ...summarizeCommandRun(run),
diff --git a/docs/contracts/chat-contracts.json b/docs/contracts/chat-contracts.json
index fce2fa754..d8ee3e1f8 100644
--- a/docs/contracts/chat-contracts.json
+++ b/docs/contracts/chat-contracts.json
@@ -431,7 +431,7 @@
     "dynamicSites": [
       {
         "file": "modules/ipc/gitHandlers.js",
-        "line": 97,
+        "line": 96,
         "kind": "event-listener",
         "match": "ipcMain.handle(channel"
       }
diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 4b5489dbb..923abb305 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -664,7 +664,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 243,
+          "line": 270,
           "kind": "custom-event-listener"
         },
         {
@@ -729,7 +729,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 243,
+          "line": 270,
           "kind": "custom-event-listener",
           "match": "signal?.addEventListener('abort'"
         },
@@ -1695,7 +1695,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/context-menu.js",
-          "line": 98,
+          "line": 99,
           "kind": "custom-event-listener"
         },
         {
@@ -1796,7 +1796,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/context-menu.js",
-          "line": 98,
+          "line": 99,
           "kind": "custom-event-listener",
           "match": "win.addEventListener('blur'"
         },
@@ -2387,7 +2387,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 567,
+          "line": 577,
           "kind": "custom-event-listener"
         }
       ],
@@ -2562,7 +2562,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 567,
+          "line": 577,
           "kind": "custom-event-listener",
           "match": "el.addEventListener('change'"
         }
@@ -3693,12 +3693,12 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 551,
+          "line": 562,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 554,
+          "line": 565,
           "kind": "custom-event-listener"
         },
         {
@@ -4193,17 +4193,17 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/cards.js",
-          "line": 220,
+          "line": 229,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/git/context-menu.js",
-          "line": 90,
+          "line": 91,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/git/git-view.js",
-          "line": 217,
+          "line": 219,
           "kind": "custom-event-listener"
         },
         {
@@ -4258,82 +4258,82 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 334,
+          "line": 336,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 369,
+          "line": 371,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 406,
+          "line": 408,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 415,
+          "line": 417,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 528,
+          "line": 530,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 582,
+          "line": 592,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 586,
+          "line": 596,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 658,
+          "line": 668,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 685,
+          "line": 695,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 703,
+          "line": 713,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 723,
+          "line": 733,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 751,
+          "line": 762,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 765,
+          "line": 776,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1023,
+          "line": 1024,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1029,
+          "line": 1030,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1043,
+          "line": 1044,
           "kind": "custom-event-listener"
         },
         {
@@ -5148,13 +5148,13 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 551,
+          "line": 562,
           "kind": "custom-event-listener",
           "match": "stopBtn.addEventListener('click'"
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 554,
+          "line": 565,
           "kind": "custom-event-listener",
           "match": "persistenceBadge.addEventListener('click'"
         },
@@ -5748,19 +5748,19 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/cards.js",
-          "line": 220,
+          "line": 229,
           "kind": "custom-event-listener",
           "match": "row.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/git/context-menu.js",
-          "line": 90,
+          "line": 91,
           "kind": "custom-event-listener",
           "match": "btn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/git/git-view.js",
-          "line": 217,
+          "line": 219,
           "kind": "custom-event-listener",
           "match": "btn.addEventListener('click'"
         },
@@ -5826,97 +5826,97 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 334,
+          "line": 336,
           "kind": "custom-event-listener",
           "match": "btn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 369,
+          "line": 371,
           "kind": "custom-event-listener",
           "match": "crumbs.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 406,
+          "line": 408,
           "kind": "custom-event-listener",
           "match": "refreshBtn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 415,
+          "line": 417,
           "kind": "custom-event-listener",
           "match": "forgeBtn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 528,
+          "line": 530,
           "kind": "custom-event-listener",
           "match": "row.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 582,
+          "line": 592,
           "kind": "custom-event-listener",
           "match": "toggle.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 586,
+          "line": 596,
           "kind": "custom-event-listener",
           "match": "clear.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 658,
+          "line": 668,
           "kind": "custom-event-listener",
           "match": "headBtn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 685,
+          "line": 695,
           "kind": "custom-event-listener",
           "match": "pick.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 703,
+          "line": 713,
           "kind": "custom-event-listener",
           "match": "pick.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 723,
+          "line": 733,
           "kind": "custom-event-listener",
           "match": "link.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 751,
+          "line": 762,
           "kind": "custom-event-listener",
           "match": "retry.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 765,
+          "line": 776,
           "kind": "custom-event-listener",
           "match": "retry.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1023,
+          "line": 1024,
           "kind": "custom-event-listener",
           "match": "toggleNotificationsBtn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1029,
+          "line": 1030,
           "kind": "custom-event-listener",
           "match": "expandButton.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1043,
+          "line": 1044,
           "kind": "custom-event-listener",
           "match": "closeSidePaneBtn.addEventListener('click'"
         },
@@ -7093,6 +7093,11 @@
           "file": "modules/renderer/sideChatSurfaceOwner.js",
           "line": 344,
           "kind": "custom-event-listener"
+        },
+        {
+          "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
+          "line": 558,
+          "kind": "custom-event-listener"
         }
       ],
       "evidence": [
@@ -7101,6 +7106,12 @@
           "line": 344,
           "kind": "custom-event-listener",
           "match": "textarea.addEventListener('compositionend'"
+        },
+        {
+          "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
+          "line": 558,
+          "kind": "custom-event-listener",
+          "match": "el.addEventListener('compositionend'"
         }
       ]
     },
@@ -7112,6 +7123,11 @@
           "file": "modules/renderer/sideChatSurfaceOwner.js",
           "line": 343,
           "kind": "custom-event-listener"
+        },
+        {
+          "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
+          "line": 557,
+          "kind": "custom-event-listener"
         }
       ],
       "evidence": [
@@ -7120,6 +7136,12 @@
           "line": 343,
           "kind": "custom-event-listener",
           "match": "textarea.addEventListener('compositionstart'"
+        },
+        {
+          "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
+          "line": 557,
+          "kind": "custom-event-listener",
+          "match": "el.addEventListener('compositionstart'"
         }
       ]
     },
@@ -7273,7 +7295,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 558,
+          "line": 569,
           "kind": "custom-event-listener"
         },
         {
@@ -7298,7 +7320,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/cards.js",
-          "line": 238,
+          "line": 247,
           "kind": "custom-event-listener"
         },
         {
@@ -7405,7 +7427,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 558,
+          "line": 569,
           "kind": "custom-event-listener",
           "match": "persistenceBadge.addEventListener('contextmenu'"
         },
@@ -7435,7 +7457,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/cards.js",
-          "line": 238,
+          "line": 247,
           "kind": "custom-event-listener",
           "match": "row.addEventListener('contextmenu'"
         },
@@ -11785,7 +11807,7 @@
         },
         {
           "file": "modules/services/gitWatcher.js",
-          "line": 62,
+          "line": 67,
           "kind": "event-listener"
         },
         {
@@ -12111,7 +12133,7 @@
         },
         {
           "file": "modules/services/gitWatcher.js",
-          "line": 62,
+          "line": 67,
           "kind": "event-listener",
           "match": "watcher.on?.('error'"
         },
@@ -12682,14 +12704,14 @@
       "consumers": [
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 152,
+          "line": 179,
           "kind": "custom-event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 152,
+          "line": 179,
           "kind": "custom-event-listener",
           "match": "screen.addEventListener('focusin'"
         }
@@ -13835,14 +13857,14 @@
       "consumers": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 191,
+          "line": 188,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 191,
+          "line": 188,
           "kind": "event-listener",
           "match": "handle('git:change-summary'"
         },
@@ -13885,14 +13907,14 @@
       "consumers": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 154,
+          "line": 153,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 154,
+          "line": 153,
           "kind": "event-listener",
           "match": "handle('git:commit'"
         },
@@ -13916,14 +13938,14 @@
       "consumers": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 186,
+          "line": 183,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 186,
+          "line": 183,
           "kind": "event-listener",
           "match": "handle('git:commit-graph'"
         },
@@ -13947,14 +13969,14 @@
       "consumers": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 180,
+          "line": 177,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 180,
+          "line": 177,
           "kind": "event-listener",
           "match": "handle('git:create-branch'"
         },
@@ -13978,14 +14000,14 @@
       "consumers": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 135,
+          "line": 134,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 135,
+          "line": 134,
           "kind": "event-listener",
           "match": "handle('git:diff'"
         },
@@ -14009,14 +14031,14 @@
       "consumers": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 148,
+          "line": 147,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 148,
+          "line": 147,
           "kind": "event-listener",
           "match": "handle('git:discard'"
         },
@@ -14040,14 +14062,14 @@
       "consumers": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 173,
+          "line": 170,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 173,
+          "line": 170,
           "kind": "event-listener",
           "match": "handle('git:list-branches'"
         },
@@ -14071,14 +14093,14 @@
       "consumers": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 128,
+          "line": 127,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 128,
+          "line": 127,
           "kind": "event-listener",
           "match": "handle('git:list-workspaces'"
         },
@@ -14102,14 +14124,14 @@
       "consumers": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 159,
+          "line": 158,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 159,
+          "line": 158,
           "kind": "event-listener",
           "match": "handle('git:push'"
         },
@@ -14133,14 +14155,14 @@
       "consumers": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 165,
+          "line": 164,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 165,
+          "line": 164,
           "kind": "event-listener",
           "match": "handle('git:reveal-path'"
         },
@@ -14164,14 +14186,14 @@
       "consumers": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 144,
+          "line": 143,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 144,
+          "line": 143,
           "kind": "event-listener",
           "match": "handle('git:stage'"
         },
@@ -14195,14 +14217,14 @@
       "consumers": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 133,
+          "line": 132,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 133,
+          "line": 132,
           "kind": "event-listener",
           "match": "handle('git:status'"
         },
@@ -14226,14 +14248,14 @@
       "consumers": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 175,
+          "line": 172,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 175,
+          "line": 172,
           "kind": "event-listener",
           "match": "handle('git:switch-branch'"
         },
@@ -14257,14 +14279,14 @@
       "consumers": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 146,
+          "line": 145,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 146,
+          "line": 145,
           "kind": "event-listener",
           "match": "handle('git:unstage'"
         },
@@ -14861,7 +14883,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 542,
+          "line": 556,
           "kind": "custom-event-listener"
         },
         {
@@ -15053,7 +15075,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 542,
+          "line": 556,
           "kind": "custom-event-listener",
           "match": "el.addEventListener('input'"
         },
@@ -15512,7 +15534,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/context-menu.js",
-          "line": 97,
+          "line": 98,
           "kind": "custom-event-listener"
         },
         {
@@ -15875,7 +15897,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/context-menu.js",
-          "line": 97,
+          "line": 98,
           "kind": "custom-event-listener",
           "match": "doc.addEventListener('keydown'"
         },
@@ -21669,14 +21691,14 @@
       "consumers": [
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 157,
+          "line": 184,
           "kind": "preload-subscription"
         }
       ],
       "evidence": [
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 157,
+          "line": 184,
           "kind": "preload-subscription",
           "match": "api.onTerminalClear("
         }
@@ -21707,14 +21729,14 @@
       "consumers": [
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 154,
+          "line": 181,
           "kind": "preload-subscription"
         }
       ],
       "evidence": [
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 154,
+          "line": 181,
           "kind": "preload-subscription",
           "match": "api.onTerminalData("
         }
@@ -21726,14 +21748,14 @@
       "consumers": [
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 160,
+          "line": 187,
           "kind": "preload-subscription"
         }
       ],
       "evidence": [
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 160,
+          "line": 187,
           "kind": "preload-subscription",
           "match": "api.onTerminalExit("
         }
@@ -23003,7 +23025,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/context-menu.js",
-          "line": 96,
+          "line": 97,
           "kind": "custom-event-listener"
         },
         {
@@ -23057,7 +23079,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/context-menu.js",
-          "line": 96,
+          "line": 97,
           "kind": "custom-event-listener",
           "match": "doc.addEventListener('pointerdown'"
         },
@@ -24974,7 +24996,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1063,
+          "line": 1064,
           "kind": "custom-event-listener"
         },
         {
@@ -25068,7 +25090,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1063,
+          "line": 1064,
           "kind": "custom-event-listener",
           "match": "win?.addEventListener?.('resize'"
         },
@@ -28064,7 +28086,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 550,
+          "line": 561,
           "kind": "custom-event-listener"
         },
         {
@@ -28124,7 +28146,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 550,
+          "line": 561,
           "kind": "custom-event-listener",
           "match": "form.addEventListener('submit'"
         },
@@ -29214,7 +29236,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-visibility.js",
-          "line": 104,
+          "line": 122,
           "kind": "custom-event-listener"
         },
         {
@@ -29232,7 +29254,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-visibility.js",
-          "line": 104,
+          "line": 122,
           "kind": "custom-event-listener",
           "match": "root.addEventListener('transitionend'"
         },
@@ -32429,7 +32451,7 @@
     },
     {
       "file": "modules/ipc/gitHandlers.js",
-      "line": 97,
+      "line": 96,
       "reason": "dynamic event listener name: channel",
       "kind": "event-listener",
       "match": "ipcMain.handle(channel",
diff --git a/modules/ui-system/side-pane/toolOutputSideProvider.js b/modules/ui-system/side-pane/toolOutputSideProvider.js
index 8b4afe644..aa36601dd 100644
--- a/modules/ui-system/side-pane/toolOutputSideProvider.js
+++ b/modules/ui-system/side-pane/toolOutputSideProvider.js
@@ -13,6 +13,8 @@ import { formatRelativeTime } from './side-pane-tab-utils.js';
 import { getCommandRunsSource } from '../sources/terminal-command-runs.js';
 import { createSidePaneRootScope } from './side-pane-occurrence.js';
 
+// 运行中的命令持续出输出时，重读输出的最短间隔
+const RUNNING_RELOAD_MS = 1000;
 const TAB_ID = 'tool-output:main';
 const FOLLOW_THRESHOLD_PX = 24;
 const TICK_MS = 1000;
@@ -52,7 +54,8 @@ export function createToolOutputSideProvider({
     sidePaneController = null,
     uiHelper = null,
     // 和状态面板共用的命令运行记录源
-    commandRunsSource = getCommandRunsSource(api)
+    commandRunsSource = getCommandRunsSource(api),
+    runningReloadMs = RUNNING_RELOAD_MS
 } = {}) {
     const kind = 'tool-output';
     const win = doc.defaultView || window;
@@ -253,10 +256,22 @@ export function createToolOutputSideProvider({
                 if (!running && stopTicker) { stopTicker(); stopTicker = null; }
             };
 
+            // 同一时间只有一个读取在路上；读的时候又有新输出，读完再补一次（对照 ZCode useBackgroundBashOutput 的 inFlight）
+            let loadInFlight = false;
+            let loadAgain = false;
             const loadSelected = async () => {
                 if (!selectedId) { detail = null; renderAll(); return; }
+                if (loadInFlight) { loadAgain = true; return; }
+                loadInFlight = true;
+                loadAgain = false;
                 const seq = ++loadSeq;
-                const res = await api?.terminalGetCommandRun?.(selectedId);
+                let res;
+                try {
+                    res = await api?.terminalGetCommandRun?.(selectedId);
+                } finally {
+                    loadInFlight = false;
+                }
+                if (loadAgain && !disposed()) { loadAgain = false; void loadSelected(); }
                 if (disposed() || seq !== loadSeq) return;
                 if (res?.success) {
                     detail = res.data;
@@ -326,8 +341,11 @@ export function createToolOutputSideProvider({
                 renderPicker();
                 const before = previous.find(run => run.id === selectedId);
                 if (selectedSummary() !== before) {
+                    // 命令还在刷屏时最多一秒读一次：每次读都要主进程把整段输出清洗一遍
+                    const streaming = before && selectedSummary()?.status === 'running' && before.status === 'running';
+                    if (streaming && cancelReload) return;
                     cancelReload?.();
-                    cancelReload = own.timeout(() => { cancelReload = null; void loadSelected(); }, 60, 'reload-output');
+                    cancelReload = own.timeout(() => { cancelReload = null; void loadSelected(); }, streaming ? runningReloadMs : 60, 'reload-output');
                 } else {
                     renderStatus();
                 }
diff --git a/tests/side-pane-tool-output.test.mjs b/tests/side-pane-tool-output.test.mjs
index 4ee389b36..be0f34181 100644
--- a/tests/side-pane-tool-output.test.mjs
+++ b/tests/side-pane-tool-output.test.mjs
@@ -14,7 +14,7 @@ test('formatRunDuration and status labels', () => {
     assert.equal(commandRunStatusLabel('timed_out'), '已超时');
 });
 
-function makeEnv({ runs, details }) {
+function makeEnv({ runs, details, runningReloadMs = 60 }) {
     const dom = new JSDOM('<div id="view"></div>', { pretendToBeVisual: true });
     const doc = dom.window.document;
     const state = { runs, details, gets: [], opened: [], toasts: [], watch: 0, copied: [] };
@@ -36,7 +36,7 @@ function makeEnv({ runs, details }) {
         openTab: async (tab) => { state.opened.push(tab); return { focus() {} }; },
         setVisible() {}
     };
-    const provider = createToolOutputSideProvider({ document: doc, api, sidePaneController, uiHelper: { showToastNotification: (m) => state.toasts.push(m) } });
+    const provider = createToolOutputSideProvider({ document: doc, api, sidePaneController, runningReloadMs, uiHelper: { showToastNotification: (m) => state.toasts.push(m) } });
     return { dom, doc, provider, state, view: doc.getElementById('view'), fire: (s) => changed?.(s), wasUnsubscribed: () => unsubscribed };
 }
 
@@ -211,3 +211,20 @@ test('a hidden tab keeps only the latest update and catches up when shown again'
     assert.deepEqual(state.gets, ['r2', 'r3']);
     await handle.dispose();
 });
+
+test('a command that keeps printing is re-read at most once per interval, with one read in flight', async () => {
+    const { provider, state, view, fire } = makeEnv({ runs: RUNS, details: { r2: { ...RUNS[0], output: 'a\n', truncated: false } }, runningReloadMs: 800 });
+    const handle = await provider.mountTab({ id: 'tool-output:main' }, view);
+    await wait(20);
+    const before = state.gets.length;
+    for (let i = 0; i < 6; i += 1) {
+        state.details.r2 = { ...RUNS[0], output: `line ${i}\n`, truncated: false };
+        fire({ id: 'r2', command: 'npm test', status: 'running', startedAt: RUNS[0].startedAt, endedAt: null });
+        await wait(100);
+    }
+    assert.equal(state.gets.length, before, 'no re-read inside the interval');
+    await wait(400);
+    assert.equal(state.gets.length, before + 1, 'one re-read after the interval');
+    assert.equal(view.querySelector('.side-tool-output-text').textContent, 'line 5\n', 'and it shows the latest output');
+    await handle.dispose();
+});

From 31c042812fafb53a5dbd4ab46ae853d6934e0aaf Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 01:02:38 +0000
Subject: [PATCH 034/143] UI system gate: use the accent token for the pinned
 window control

Second half of 2200d128 from the integration PR: the pin rule arrived with the
upstream #234 merge, so it now applies here.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01SADzqzusVz3S3z7qBUSy8M
---
 styles/ui-system/components.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/styles/ui-system/components.css b/styles/ui-system/components.css
index 418b7df8b..ddff52098 100644
--- a/styles/ui-system/components.css
+++ b/styles/ui-system/components.css
@@ -541,8 +541,8 @@
     }
 
     :is(html, html.vcp-global-settings-host) .vcp-ui-scope .vcp-ui-window-control-pin.is-pinned {
-        color: var(--vcp-ui-primary, #6366f1);
-        background: var(--vcp-ui-primary-bg, rgba(99, 102, 241, 0.16));
+        color: var(--vcp-ui-accent);
+        background: color-mix(in srgb, var(--vcp-ui-accent) 16%, transparent);
     }
 
     :is(html, html.vcp-global-settings-host) .vcp-ui-scope .vcp-ui-window-control-pin.is-pinned .vcp-ui-icon,

From 5b943b8b4d3c52d68766dece4b933b5ddd4eb0fe Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 01:04:21 +0000
Subject: [PATCH 035/143] Contracts: regenerate the chat event graph after
 merging the latest #3, #4 and #5

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01UCGGgmHsCToooXTgSXpmq9
---
 .../contracts/generated/chat-event-graph.json | 134 +++++++++---------
 1 file changed, 67 insertions(+), 67 deletions(-)

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 58d41386e..041c1689c 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -1244,7 +1244,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 202,
+          "line": 204,
           "kind": "custom-event-listener"
         }
       ],
@@ -1263,7 +1263,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 202,
+          "line": 204,
           "kind": "custom-event-listener",
           "match": "tabItem.addEventListener('auxclick'"
         }
@@ -1695,7 +1695,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/context-menu.js",
-          "line": 132,
+          "line": 133,
           "kind": "custom-event-listener"
         },
         {
@@ -1801,7 +1801,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/context-menu.js",
-          "line": 132,
+          "line": 133,
           "kind": "custom-event-listener",
           "match": "win.addEventListener('blur'"
         },
@@ -4185,22 +4185,22 @@
         },
         {
           "file": "modules/ui-system/side-pane/code-viewer/editor.js",
-          "line": 54,
+          "line": 87,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/git/cards.js",
-          "line": 220,
+          "line": 229,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/git/context-menu.js",
-          "line": 114,
+          "line": 115,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/git/git-view.js",
-          "line": 217,
+          "line": 219,
           "kind": "custom-event-listener"
         },
         {
@@ -4395,12 +4395,12 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 179,
+          "line": 181,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 191,
+          "line": 193,
           "kind": "custom-event-listener"
         },
         {
@@ -5750,25 +5750,25 @@
         },
         {
           "file": "modules/ui-system/side-pane/code-viewer/editor.js",
-          "line": 54,
+          "line": 87,
           "kind": "custom-event-listener",
           "match": "read.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/git/cards.js",
-          "line": 220,
+          "line": 229,
           "kind": "custom-event-listener",
           "match": "row.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/git/context-menu.js",
-          "line": 114,
+          "line": 115,
           "kind": "custom-event-listener",
           "match": "btn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/git/git-view.js",
-          "line": 217,
+          "line": 219,
           "kind": "custom-event-listener",
           "match": "btn.addEventListener('click'"
         },
@@ -6002,13 +6002,13 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 179,
+          "line": 181,
           "kind": "custom-event-listener",
           "match": "btn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 191,
+          "line": 193,
           "kind": "custom-event-listener",
           "match": "closeBtn.addEventListener('click'"
         },
@@ -7315,12 +7315,12 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/cards.js",
-          "line": 238,
+          "line": 247,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 214,
+          "line": 216,
           "kind": "custom-event-listener"
         },
         {
@@ -7452,13 +7452,13 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/cards.js",
-          "line": 238,
+          "line": 247,
           "kind": "custom-event-listener",
           "match": "row.addEventListener('contextmenu'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 214,
+          "line": 216,
           "kind": "custom-event-listener",
           "match": "tabItem.addEventListener('contextmenu'"
         },
@@ -11780,7 +11780,7 @@
         },
         {
           "file": "modules/services/gitWatcher.js",
-          "line": 62,
+          "line": 67,
           "kind": "event-listener"
         },
         {
@@ -12106,7 +12106,7 @@
         },
         {
           "file": "modules/services/gitWatcher.js",
-          "line": 62,
+          "line": 67,
           "kind": "event-listener",
           "match": "watcher.on?.('error'"
         },
@@ -13830,14 +13830,14 @@
       "consumers": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 191,
+          "line": 188,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 191,
+          "line": 188,
           "kind": "event-listener",
           "match": "handle('git:change-summary'"
         },
@@ -13880,14 +13880,14 @@
       "consumers": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 154,
+          "line": 153,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 154,
+          "line": 153,
           "kind": "event-listener",
           "match": "handle('git:commit'"
         },
@@ -13911,14 +13911,14 @@
       "consumers": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 186,
+          "line": 183,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 186,
+          "line": 183,
           "kind": "event-listener",
           "match": "handle('git:commit-graph'"
         },
@@ -13942,14 +13942,14 @@
       "consumers": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 180,
+          "line": 177,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 180,
+          "line": 177,
           "kind": "event-listener",
           "match": "handle('git:create-branch'"
         },
@@ -13973,14 +13973,14 @@
       "consumers": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 135,
+          "line": 134,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 135,
+          "line": 134,
           "kind": "event-listener",
           "match": "handle('git:diff'"
         },
@@ -14004,14 +14004,14 @@
       "consumers": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 148,
+          "line": 147,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 148,
+          "line": 147,
           "kind": "event-listener",
           "match": "handle('git:discard'"
         },
@@ -14035,14 +14035,14 @@
       "consumers": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 173,
+          "line": 170,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 173,
+          "line": 170,
           "kind": "event-listener",
           "match": "handle('git:list-branches'"
         },
@@ -14066,14 +14066,14 @@
       "consumers": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 128,
+          "line": 127,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 128,
+          "line": 127,
           "kind": "event-listener",
           "match": "handle('git:list-workspaces'"
         },
@@ -14097,14 +14097,14 @@
       "consumers": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 159,
+          "line": 158,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 159,
+          "line": 158,
           "kind": "event-listener",
           "match": "handle('git:push'"
         },
@@ -14128,14 +14128,14 @@
       "consumers": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 165,
+          "line": 164,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 165,
+          "line": 164,
           "kind": "event-listener",
           "match": "handle('git:reveal-path'"
         },
@@ -14159,14 +14159,14 @@
       "consumers": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 144,
+          "line": 143,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 144,
+          "line": 143,
           "kind": "event-listener",
           "match": "handle('git:stage'"
         },
@@ -14190,14 +14190,14 @@
       "consumers": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 133,
+          "line": 132,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 133,
+          "line": 132,
           "kind": "event-listener",
           "match": "handle('git:status'"
         },
@@ -14221,14 +14221,14 @@
       "consumers": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 175,
+          "line": 172,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 175,
+          "line": 172,
           "kind": "event-listener",
           "match": "handle('git:switch-branch'"
         },
@@ -14252,14 +14252,14 @@
       "consumers": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 146,
+          "line": 145,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 146,
+          "line": 145,
           "kind": "event-listener",
           "match": "handle('git:unstage'"
         },
@@ -15507,7 +15507,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/context-menu.js",
-          "line": 131,
+          "line": 132,
           "kind": "custom-event-listener"
         },
         {
@@ -15577,7 +15577,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 303,
+          "line": 305,
           "kind": "custom-event-listener"
         },
         {
@@ -15870,7 +15870,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/context-menu.js",
-          "line": 131,
+          "line": 132,
           "kind": "custom-event-listener",
           "match": "doc.addEventListener('keydown'"
         },
@@ -15954,7 +15954,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 303,
+          "line": 305,
           "kind": "custom-event-listener",
           "match": "tabListElement.addEventListener('keydown'"
         },
@@ -18817,7 +18817,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 199,
+          "line": 201,
           "kind": "custom-event-listener"
         },
         {
@@ -18941,7 +18941,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 199,
+          "line": 201,
           "kind": "custom-event-listener",
           "match": "tabItem.addEventListener('mousedown'"
         },
@@ -19032,7 +19032,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 210,
+          "line": 212,
           "kind": "custom-event-listener"
         },
         {
@@ -19074,7 +19074,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 210,
+          "line": 212,
           "kind": "custom-event-listener",
           "match": "tabItem.addEventListener('mouseenter'"
         },
@@ -19147,7 +19147,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 211,
+          "line": 213,
           "kind": "custom-event-listener"
         },
         {
@@ -19230,7 +19230,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 211,
+          "line": 213,
           "kind": "custom-event-listener",
           "match": "tabItem.addEventListener('mouseleave'"
         },
@@ -22998,7 +22998,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/context-menu.js",
-          "line": 130,
+          "line": 131,
           "kind": "custom-event-listener"
         },
         {
@@ -23023,7 +23023,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 212,
+          "line": 214,
           "kind": "custom-event-listener"
         },
         {
@@ -23052,7 +23052,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/context-menu.js",
-          "line": 130,
+          "line": 131,
           "kind": "custom-event-listener",
           "match": "doc.addEventListener('pointerdown'"
         },
@@ -23082,7 +23082,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 212,
+          "line": 214,
           "kind": "custom-event-listener",
           "match": "tabItem.addEventListener('pointerdown'"
         },
@@ -26462,7 +26462,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 260,
+          "line": 262,
           "kind": "custom-event-listener"
         },
         {
@@ -26526,7 +26526,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 260,
+          "line": 262,
           "kind": "custom-event-listener",
           "match": "tabListElement.addEventListener('scroll'"
         },
@@ -32485,7 +32485,7 @@
     },
     {
       "file": "modules/ipc/gitHandlers.js",
-      "line": 97,
+      "line": 96,
       "reason": "dynamic event listener name: channel",
       "kind": "event-listener",
       "match": "ipcMain.handle(channel",

From 0aa02957f217856ddc4ef4e1d56f5715aaa5e77b Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 01:10:54 +0000
Subject: [PATCH 036/143] Tool card styles: pass the UI system gate the base
 branch fails

Every selector now sits under :where(.vcp-ui-scope) (zero specificity, so
cascade order is unchanged; chat messages and the side pane are already
inside a scope). The reduced-motion rule repeats the animated selector
instead of using !important, and the 11px labels derive from the sm token.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DFRovoZHMzeheXKkLNWKG
---
 styles/ui-system/tool-presentation.css | 196 ++++++++++++-------------
 1 file changed, 98 insertions(+), 98 deletions(-)

diff --git a/styles/ui-system/tool-presentation.css b/styles/ui-system/tool-presentation.css
index 436a2e39c..38f0ec98a 100644
--- a/styles/ui-system/tool-presentation.css
+++ b/styles/ui-system/tool-presentation.css
@@ -1,12 +1,12 @@
 /* Optional presentation; Legacy is untouched. Theme and typography stay owned
  * by the existing appearance profile, including role wallpapers. */
-html[data-ui-mode="next"] [data-vcp-tool-presentation="compact"],
-html[data-ui-mode="next"] [data-vcp-tool-presentation="grouped"] {
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="compact"],
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="grouped"] {
     --vcp-tool-row-height: 38px;
 }
-html[data-ui-mode="next"][data-vcp-density="compact"] [data-vcp-tool-presentation] { --vcp-tool-row-height: 32px; }
-html[data-ui-mode="next"][data-vcp-density="relaxed"] [data-vcp-tool-presentation] { --vcp-tool-row-height: 44px; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented {
+html[data-ui-mode="next"][data-vcp-density="compact"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] { --vcp-tool-row-height: 32px; }
+html[data-ui-mode="next"][data-vcp-density="relaxed"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] { --vcp-tool-row-height: 44px; }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] .vcp-tool-presented {
     --vcp-tool-presented-font-family: var(--vcp-tool-card-font-family, var(--vcp-chat-font-family));
     --vcp-tool-presented-font-size: var(--vcp-ui-text-caption, 13px);
     --vcp-tool-presented-white-space: normal;
@@ -32,11 +32,11 @@ html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented {
     color: var(--vcp-ui-text-primary);
     font-family: var(--vcp-tool-card-font-family, inherit);
 }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented::before,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented::after { display: none; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-summary,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-result-header,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-call-summary-header {
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] .vcp-tool-presented::before,
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] .vcp-tool-presented::after { display: none; }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-summary,
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-result-header,
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-call-summary-header {
     display: flex;
     gap: 5px;
     padding: 0;
@@ -47,7 +47,7 @@ html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vc
     min-width: 0;
     flex-wrap: nowrap;
 }
-html[data-ui-mode="next"] .vcp-tool-row-toggle, html[data-ui-mode="next"] .vcp-tool-process-toggle {
+html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-row-toggle, html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-process-toggle {
     display: flex;
     width: 100%;
     min-width: 0;
@@ -65,13 +65,13 @@ html[data-ui-mode="next"] .vcp-tool-row-toggle, html[data-ui-mode="next"] .vcp-t
     cursor: pointer;
     text-align: left;
 }
-html[data-ui-mode="next"] .vcp-tool-result-header > .vcp-tool-row-toggle {
+html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-result-header > .vcp-tool-row-toggle {
     width: auto;
     flex: 1;
 }
-html[data-ui-mode="next"] .vcp-tool-row-toggle:hover, html[data-ui-mode="next"] .vcp-tool-process-toggle:hover { background: var(--vcp-ui-bg-2); }
-html[data-ui-mode="next"] .vcp-tool-row-toggle:focus-visible, html[data-ui-mode="next"] .vcp-tool-process-toggle:focus-visible, html[data-ui-mode="next"] .vcp-tool-process-artifact:focus-visible { outline: 2px solid var(--vcp-ui-accent); outline-offset: -2px; }
-html[data-ui-mode="next"] .vcp-tool-row-chevron {
+html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-row-toggle:hover, html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-process-toggle:hover { background: var(--vcp-ui-bg-2); }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-row-toggle:focus-visible, html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-process-toggle:focus-visible, html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-process-artifact:focus-visible { outline: 2px solid var(--vcp-ui-accent); outline-offset: -2px; }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-row-chevron {
     width: 7px;
     height: 7px;
     flex: 0 0 7px;
@@ -79,44 +79,44 @@ html[data-ui-mode="next"] .vcp-tool-row-chevron {
     border-bottom: 1.5px solid currentColor;
     transform: rotate(-45deg);
 }
-html[data-ui-mode="next"] [aria-expanded="true"] > .vcp-tool-row-chevron { transform: rotate(45deg); }
-html[data-ui-mode="next"] .vcp-tool-row-title { overflow-wrap: anywhere; min-width: 0; color: var(--vcp-ui-text-primary); }
-html[data-ui-mode="next"] .vcp-tool-row-resource { overflow-wrap: anywhere; min-width: 0; font-size: var(--vcp-ui-text-sm, 12px); }
-html[data-ui-mode="next"] .vcp-tool-row-state { margin-left: auto; white-space: nowrap; font-size: var(--vcp-ui-text-sm, 12px); }
-html[data-ui-mode="next"] [data-vcp-tool-state="success"] .vcp-tool-row-state { color: var(--vcp-ui-success); }
-html[data-ui-mode="next"] [data-vcp-tool-state="failed"] .vcp-tool-row-state { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
-html[data-ui-mode="next"] [data-vcp-tool-state="waiting"] .vcp-tool-row-state,
-html[data-ui-mode="next"] [data-vcp-tool-state="stopped"] .vcp-tool-row-state { color: var(--vcp-ui-warning, var(--vcp-ui-palette-amber)); }
-html[data-ui-mode="next"] [data-vcp-tool-state="running"] .vcp-tool-row-state { color: var(--vcp-ui-accent); }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-delete-btn { flex: 0 0 24px; margin-right: 6px; opacity: 0; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-header:hover .vcp-tool-result-delete-btn,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-header:focus-within .vcp-tool-result-delete-btn { opacity: 1; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="compact"] .vcp-role-divider,
-html[data-ui-mode="next"] [data-vcp-tool-presentation="grouped"] .vcp-role-divider { margin: 4px 0; font-size: 11px; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-details { max-height: 360px; overflow: auto; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-details,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-result-collapsible-content,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-call-summary-content {
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [aria-expanded="true"] > .vcp-tool-row-chevron { transform: rotate(45deg); }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-row-title { overflow-wrap: anywhere; min-width: 0; color: var(--vcp-ui-text-primary); }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-row-resource { overflow-wrap: anywhere; min-width: 0; font-size: var(--vcp-ui-text-sm, 12px); }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-row-state { margin-left: auto; white-space: nowrap; font-size: var(--vcp-ui-text-sm, 12px); }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-state="success"] .vcp-tool-row-state { color: var(--vcp-ui-success); }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-state="failed"] .vcp-tool-row-state { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-state="waiting"] .vcp-tool-row-state,
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-state="stopped"] .vcp-tool-row-state { color: var(--vcp-ui-warning, var(--vcp-ui-palette-amber)); }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-state="running"] .vcp-tool-row-state { color: var(--vcp-ui-accent); }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-delete-btn { flex: 0 0 24px; margin-right: 6px; opacity: 0; }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-header:hover .vcp-tool-result-delete-btn,
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-header:focus-within .vcp-tool-result-delete-btn { opacity: 1; }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="compact"] .vcp-role-divider,
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="grouped"] .vcp-role-divider { margin: 4px 0; font-size: calc(var(--vcp-ui-text-sm, 12px) - 1px); }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-details { max-height: 360px; overflow: auto; }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-details,
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-result-collapsible-content,
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-call-summary-content {
     margin: 0;
     padding: 6px 12px 12px 28px;
     background: transparent;
     border: 0;
     min-width: 0;
 }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-details,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-result-collapsible-content,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-call-summary-content { display: none; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-details,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-result-collapsible-content,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-call-summary-content { display: block; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented pre {
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-details,
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-result-collapsible-content,
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-call-summary-content { display: none; }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-details,
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-result-collapsible-content,
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-call-summary-content { display: block; }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] .vcp-tool-presented pre {
     white-space: pre-wrap;
     overflow-wrap: anywhere;
     min-width: 0;
     max-height: 320px;
     overflow: auto;
 }
-html[data-ui-mode="next"] .vcp-tool-process {
+html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-process {
     border: 1px solid var(--vcp-ui-border);
     border-radius: var(--vcp-ui-radius-md, 8px);
     margin: 10px 0;
@@ -124,12 +124,12 @@ html[data-ui-mode="next"] .vcp-tool-process {
     overflow: hidden;
     background: var(--vcp-ui-bg-0);
 }
-html[data-ui-mode="next"] .vcp-tool-process-toggle { background: var(--vcp-ui-bg-1); border-radius: 0; }
-html[data-ui-mode="next"] .vcp-tool-process-title { min-width: 0; overflow-wrap: anywhere; }
-html[data-ui-mode="next"] .vcp-tool-process-stats { margin-left: auto; font-size: var(--vcp-ui-text-sm, 12px); overflow-wrap: anywhere; }
-html[data-ui-mode="next"] .vcp-tool-process-body[hidden] { display: none; }
-html[data-ui-mode="next"] .vcp-tool-process-body > .vcp-tool-presented { margin: 0; border-top: 1px solid var(--vcp-ui-border); }
-html[data-ui-mode="next"] .vcp-tool-process-artifact {
+html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-process-toggle { background: var(--vcp-ui-bg-1); border-radius: 0; }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-process-title { min-width: 0; overflow-wrap: anywhere; }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-process-stats { margin-left: auto; font-size: var(--vcp-ui-text-sm, 12px); overflow-wrap: anywhere; }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-process-body[hidden] { display: none; }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-process-body > .vcp-tool-presented { margin: 0; border-top: 1px solid var(--vcp-ui-border); }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-process-artifact {
     color: var(--vcp-ui-text-accent);
     background: transparent;
     border: 0;
@@ -142,20 +142,20 @@ html[data-ui-mode="next"] .vcp-tool-process-artifact {
     cursor: pointer;
 }
 @media (max-width: 640px) {
-    html[data-ui-mode="next"] .vcp-tool-row-toggle { flex-wrap: wrap; gap: 6px; }
-    html[data-ui-mode="next"] .vcp-tool-row-state { margin-left: auto; }
-    html[data-ui-mode="next"] .vcp-tool-process-toggle { flex-wrap: wrap; }
-    html[data-ui-mode="next"] .vcp-tool-process-stats { margin-left: 16px; }
+    html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-row-toggle { flex-wrap: wrap; gap: 6px; }
+    html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-row-state { margin-left: auto; }
+    html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-process-toggle { flex-wrap: wrap; }
+    html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-process-stats { margin-left: 16px; }
 }
 
 /* 单行合并 / 整轮折叠：无框单行，一次调用一行；紧跟的同名结果收进请求行，展开后才显示。 */
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) {
+html[data-ui-mode="next"] :where(.vcp-ui-scope) :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) {
     --vcp-tool-call-color: var(--vcp-ui-text-3, var(--vcp-ui-text-secondary));
     --vcp-tool-call-hover: var(--vcp-ui-text-2, var(--vcp-ui-text-secondary));
 }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-role-divider { margin: 4px 0; font-size: 11px; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-presented { margin: 2px 0; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) {
+html[data-ui-mode="next"] :where(.vcp-ui-scope) :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-role-divider { margin: 4px 0; font-size: calc(var(--vcp-ui-text-sm, 12px) - 1px); }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-presented { margin: 2px 0; }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) {
     width: auto;
     max-width: 100%;
     min-height: 24px;
@@ -168,10 +168,10 @@ html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-t
     color: var(--vcp-tool-call-color);
     transition: color .1s;
 }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle):hover { background: transparent; color: var(--vcp-tool-call-hover); }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle .vcp-tool-row-title, .vcp-tool-process-title) { flex: none; color: inherit; white-space: nowrap; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-process-stats { min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; overflow-wrap: normal; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-toggle .vcp-tool-row-resource {
+html[data-ui-mode="next"] :where(.vcp-ui-scope) :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle):hover { background: transparent; color: var(--vcp-tool-call-hover); }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle .vcp-tool-row-title, .vcp-tool-process-title) { flex: none; color: inherit; white-space: nowrap; }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-process-stats { min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; overflow-wrap: normal; }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-toggle .vcp-tool-row-resource {
     min-width: 0;
     overflow: hidden;
     text-overflow: ellipsis;
@@ -179,20 +179,20 @@ html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-t
     overflow-wrap: normal;
     font-size: inherit;
 }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-toggle .vcp-tool-row-state { flex: none; margin-left: 0; color: inherit; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-icon { display: inline-flex; flex: none; width: 16px; height: 16px; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-icon svg { width: 100%; height: 100%; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-diff { flex: none; font-family: var(--vcp-ui-font-mono, ui-monospace, Consolas, monospace); font-size: 11px; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle:hover, [aria-expanded="true"]) .vcp-tool-row-diff-add { color: var(--vcp-ui-success); }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle:hover, [aria-expanded="true"]) .vcp-tool-row-diff-del { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-toggle .vcp-tool-row-state { flex: none; margin-left: 0; color: inherit; }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-icon { display: inline-flex; flex: none; width: 16px; height: 16px; }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-icon svg { width: 100%; height: 100%; }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-diff { flex: none; font-family: var(--vcp-ui-font-mono, ui-monospace, Consolas, monospace); font-size: calc(var(--vcp-ui-text-sm, 12px) - 1px); }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle:hover, [aria-expanded="true"]) .vcp-tool-row-diff-add { color: var(--vcp-ui-success); }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle:hover, [aria-expanded="true"]) .vcp-tool-row-diff-del { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
 /* 并入请求行的结果：收起时不占位，展开后只留一个小标题“输出”。
- * 旧层给结果气泡写了 display:block !important，这里只能藏标题、去掉外边距，正文由上面的收起规则隐藏。 */
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"]:not(.expanded) { margin: 0; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"]:not(.expanded) > .vcp-tool-result-header { display: none; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"] .vcp-tool-row-toggle { min-height: 20px; padding-left: 24px; font-size: var(--vcp-ui-text-sm, 12px); }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-presented > :is(.vcp-tool-details, .vcp-tool-result-collapsible-content, .vcp-tool-call-summary-content) { padding: 8px 0 4px 24px; }
+ * 旧层给结果气泡写了 display:block 并加了强制优先级，这里只能藏标题、去掉外边距，正文由上面的收起规则隐藏。 */
+html[data-ui-mode="next"] :where(.vcp-ui-scope) :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"]:not(.expanded) { margin: 0; }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"]:not(.expanded) > .vcp-tool-result-header { display: none; }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"] .vcp-tool-row-toggle { min-height: 20px; padding-left: 24px; font-size: var(--vcp-ui-text-sm, 12px); }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-presented > :is(.vcp-tool-details, .vcp-tool-result-collapsible-content, .vcp-tool-call-summary-content) { padding: 8px 0 4px 24px; }
 /* 等待结果时动作词的微光，只在回复生成中出现。 */
-html[data-ui-mode="next"] .message-item.streaming :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-pending="true"] .vcp-tool-row-title {
+html[data-ui-mode="next"] :where(.vcp-ui-scope) .message-item.streaming :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-pending="true"] .vcp-tool-row-title {
     background: linear-gradient(90deg, var(--vcp-tool-call-color) 0%, var(--vcp-ui-text-primary) 50%, var(--vcp-tool-call-color) 100%);
     background-size: 200% 100%;
     -webkit-background-clip: text;
@@ -202,33 +202,33 @@ html[data-ui-mode="next"] .message-item.streaming :is([data-vcp-tool-presentatio
 }
 @keyframes vcp-tool-call-shimmer { from { background-position: 100% 0; } to { background-position: -100% 0; } }
 @media (prefers-reduced-motion: reduce) {
-    html[data-ui-mode="next"] [data-vcp-tool-pending="true"] .vcp-tool-row-title { animation: none !important; }
+    html[data-ui-mode="next"] :where(.vcp-ui-scope) .message-item.streaming :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-pending="true"] .vcp-tool-row-title { animation: none; }
 }
 
 /* 单行合并：动作词加粗，箭头在行尾、悬停或展开时出现；问题状态用虚线下划线，悬停看报错。 */
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) { font-size: var(--vcp-ui-text-body, 14px); }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle .vcp-tool-row-title, .vcp-tool-process-title) { font-weight: 500; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) > .vcp-tool-row-chevron { order: 1; opacity: 0; transition: opacity .2s, transform .2s; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle):is(:hover, [aria-expanded="true"]) > .vcp-tool-row-chevron { opacity: 1; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] [data-vcp-tool-call-state] .vcp-tool-row-state { text-decoration: underline dotted; text-underline-offset: 2px; cursor: help; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] { margin: 2px 0; border: 0; border-radius: 0; background: transparent; overflow: visible; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] .vcp-tool-process-stats { margin-left: 0; font-size: inherit; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-body { margin: 4px 0 4px 8px; padding-left: 14px; border-left: 1px solid var(--vcp-ui-border); }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-body > .vcp-tool-presented { margin: 2px 0; border-top: 0; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-artifact { border-top: 0; padding: 4px 0 4px 22px; }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) { font-size: var(--vcp-ui-text-body, 14px); }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle .vcp-tool-row-title, .vcp-tool-process-title) { font-weight: 500; }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) > .vcp-tool-row-chevron { order: 1; opacity: 0; transition: opacity .2s, transform .2s; }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle):is(:hover, [aria-expanded="true"]) > .vcp-tool-row-chevron { opacity: 1; }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="inline"] [data-vcp-tool-call-state] .vcp-tool-row-state { text-decoration: underline dotted; text-underline-offset: 2px; cursor: help; }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] { margin: 2px 0; border: 0; border-radius: 0; background: transparent; overflow: visible; }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] .vcp-tool-process-stats { margin-left: 0; font-size: inherit; }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-body { margin: 4px 0 4px 8px; padding-left: 14px; border-left: 1px solid var(--vcp-ui-border); }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-body > .vcp-tool-presented { margin: 2px 0; border-top: 0; }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-artifact { border-top: 0; padding: 4px 0 4px 22px; }
 
 /* 整轮折叠：图标悬停换成箭头，标题与摘要之间用小圆点分隔，失败时摘要显示红色报错首行。 */
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle { gap: 0; font-size: var(--vcp-ui-text-caption, 13px); }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-leading { position: relative; display: inline-flex; flex: none; width: 16px; height: 16px; margin-right: 6px; align-items: center; justify-content: center; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-leading .vcp-tool-row-icon { width: 14px; height: 14px; transition: opacity .1s; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-leading .vcp-tool-row-chevron { position: absolute; inset: 0; margin: auto; opacity: 0; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle:is(:hover, [aria-expanded="true"]) .vcp-tool-row-leading .vcp-tool-row-icon { opacity: 0; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle:is(:hover, [aria-expanded="true"]) .vcp-tool-row-leading .vcp-tool-row-chevron { opacity: 1; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-dot { flex: none; width: 2px; height: 2px; margin: 0 8px; border-radius: 1px; background: currentColor; opacity: .7; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle :is(.vcp-tool-row-state, .vcp-tool-row-diff) { margin-left: 10px; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] [data-vcp-tool-call-state="failed"] .vcp-tool-row-toggle .vcp-tool-row-resource { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] { margin: 4px 0 10px; border: 0; border-radius: 0; background: transparent; overflow: visible; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-toggle {
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle { gap: 0; font-size: var(--vcp-ui-text-caption, 13px); }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="process"] .vcp-tool-row-leading { position: relative; display: inline-flex; flex: none; width: 16px; height: 16px; margin-right: 6px; align-items: center; justify-content: center; }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="process"] .vcp-tool-row-leading .vcp-tool-row-icon { width: 14px; height: 14px; transition: opacity .1s; }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="process"] .vcp-tool-row-leading .vcp-tool-row-chevron { position: absolute; inset: 0; margin: auto; opacity: 0; }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle:is(:hover, [aria-expanded="true"]) .vcp-tool-row-leading .vcp-tool-row-icon { opacity: 0; }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle:is(:hover, [aria-expanded="true"]) .vcp-tool-row-leading .vcp-tool-row-chevron { opacity: 1; }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="process"] .vcp-tool-row-dot { flex: none; width: 2px; height: 2px; margin: 0 8px; border-radius: 1px; background: currentColor; opacity: .7; }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle :is(.vcp-tool-row-state, .vcp-tool-row-diff) { margin-left: 10px; }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="process"] [data-vcp-tool-call-state="failed"] .vcp-tool-row-toggle .vcp-tool-row-resource { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] { margin: 4px 0 10px; border: 0; border-radius: 0; background: transparent; overflow: visible; }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-toggle {
     width: 100%;
     min-height: 33px;
     padding: 0 0 8px;
@@ -236,8 +236,8 @@ html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-proce
     border-bottom: .5px solid var(--vcp-ui-border);
     font-size: var(--vcp-ui-text-body, 14px);
 }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-toggle > .vcp-tool-row-chevron { order: 1; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] .vcp-tool-process-stats { margin-left: 0; color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-body { padding-top: 8px; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-body > .vcp-tool-presented { margin: 2px 0; border-top: 0; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-artifact { border-top: 0; padding: 6px 0; }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-toggle > .vcp-tool-row-chevron { order: 1; }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] .vcp-tool-process-stats { margin-left: 0; color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-body { padding-top: 8px; }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-body > .vcp-tool-presented { margin: 2px 0; border-top: 0; }
+html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-artifact { border-top: 0; padding: 6px 0; }

From e20dbb456bffd93210156e6c7e68cd8276907d7a Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 01:12:06 +0000
Subject: [PATCH 037/143] UI system gate: use the accent token for the pinned
 window button

Finishes porting 2200d128 now that the base branch carries the pinned
button rule with its hard-coded indigo fallback.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_017bCbRB3E9yajQ3HbdMrjiJ
---
 styles/ui-system/components.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/styles/ui-system/components.css b/styles/ui-system/components.css
index 418b7df8b..ddff52098 100644
--- a/styles/ui-system/components.css
+++ b/styles/ui-system/components.css
@@ -541,8 +541,8 @@
     }
 
     :is(html, html.vcp-global-settings-host) .vcp-ui-scope .vcp-ui-window-control-pin.is-pinned {
-        color: var(--vcp-ui-primary, #6366f1);
-        background: var(--vcp-ui-primary-bg, rgba(99, 102, 241, 0.16));
+        color: var(--vcp-ui-accent);
+        background: color-mix(in srgb, var(--vcp-ui-accent) 16%, transparent);
     }
 
     :is(html, html.vcp-global-settings-host) .vcp-ui-scope .vcp-ui-window-control-pin.is-pinned .vcp-ui-icon,

From dcd3a737cee562e68efb2364b59d0c874677b211 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 01:12:06 +0000
Subject: [PATCH 038/143] Chat: open big assistants without waiting on side
 chat scans and height estimates

Selecting an assistant with 1000 topics took about 0.4s longer than on
main. Two causes:

- side-chat:list-metadata ran requireChild (two ancestor lstats, an lstat,
  two realpaths and a marker read) on every topic directory before checking
  for side chat metadata. Checking the metadata file first, in parallel,
  takes the scan from ~650ms to ~25ms.
- Every rendered message queued its own pretext idle callback. Forty of
  them ran ahead of the batched history insertion, each forcing a layout.
  One per-window idle queue now drains jobs within the idle deadline and
  re-queues behind waiting work.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_017bCbRB3E9yajQ3HbdMrjiJ
---
 modules/ipc/sideChatHandlers.js         | 13 ++++-
 modules/messageRenderer.js              | 72 ++++++++++++++++---------
 scripts/next-delta-shared-baseline.json |  4 +-
 3 files changed, 59 insertions(+), 30 deletions(-)

diff --git a/modules/ipc/sideChatHandlers.js b/modules/ipc/sideChatHandlers.js
index 9725d01b2..5dd1ede3a 100644
--- a/modules/ipc/sideChatHandlers.js
+++ b/modules/ipc/sideChatHandlers.js
@@ -240,8 +240,17 @@ function initialize(paths) {
             const entries = await fs.readdir(topicsDir, { withFileTypes: true });
             const items = [];
 
-            for (const entry of entries) {
-                if (!entry.isDirectory()) continue;
+            // 普通话题远多于侧聊；先用一次 stat 排除没有侧聊元数据的目录，
+            // 再做 requireChild 的多次 lstat/realpath/读标记校验。1000 个话题时
+            // 这次扫描从约 650ms 降到约 25ms。
+            const candidates = await Promise.all(entries.map(async entry => {
+                if (!entry.isDirectory()) return null;
+                const entryDir = path.join(topicsDir, entry.name);
+                return await fs.pathExists(path.join(entryDir, 'sidechat-metadata.json')) ? entry : null;
+            }));
+
+            for (const entry of candidates) {
+                if (!entry) continue;
                 const entryDir = path.join(topicsDir, entry.name);
                 if (!await requireChild(entryDir, safeAgentId, entry.name, parentTopicId)) continue;
                 const metadataPath = path.join(entryDir, 'sidechat-metadata.json');
diff --git a/modules/messageRenderer.js b/modules/messageRenderer.js
index 15c40c4f9..9182737ac 100644
--- a/modules/messageRenderer.js
+++ b/modules/messageRenderer.js
@@ -2650,16 +2650,7 @@ function cleanupMessageDomResources(messageItem, messageId = null) {
             clearTimeout(contentDiv._vcpDeferredHighlightTimer);
             delete contentDiv._vcpDeferredHighlightTimer;
         }
-        if (contentDiv._vcpPretextIdleHandle) {
-            const { kind, id } = contentDiv._vcpPretextIdleHandle;
-            const ownerWindow = contentDiv.ownerDocument?.defaultView;
-            if (kind === 'idle' && typeof ownerWindow?.cancelIdleCallback === 'function') {
-                ownerWindow.cancelIdleCallback(id);
-            } else if (kind === 'timer') {
-                clearTimeout(id);
-            }
-            delete contentDiv._vcpPretextIdleHandle;
-        }
+        cancelPretextEstimate(contentDiv);
         cleanupMermaidViewers(contentDiv);
         contentProcessor.cleanupPreviewsInContent(contentDiv);
         cleanupAnimationsInContent(contentDiv);
@@ -4273,24 +4264,53 @@ function scheduleMessagePretextEstimate(messageId, text, contentDiv) {
         }
     };
 
-    if (contentDiv?._vcpPretextIdleHandle) {
-        const previous = contentDiv._vcpPretextIdleHandle;
-        const ownerWindow = contentDiv.ownerDocument?.defaultView;
-        if (previous.kind === 'idle' && typeof ownerWindow?.cancelIdleCallback === 'function') ownerWindow.cancelIdleCallback(previous.id);
-        else if (previous.kind === 'timer') clearTimeout(previous.id);
-    }
-    const wrappedRun = () => {
-        if (contentDiv) delete contentDiv._vcpPretextIdleHandle;
-        run();
-    };
     const ownerWindow = contentDiv?.ownerDocument?.defaultView;
-    if (typeof ownerWindow?.requestIdleCallback === 'function') {
-        const id = ownerWindow.requestIdleCallback(wrappedRun, { timeout: 300 });
-        if (contentDiv) contentDiv._vcpPretextIdleHandle = { kind: 'idle', id };
-    } else {
-        const id = ownerWindow?.setTimeout?.(wrappedRun, 0) || setTimeout(wrappedRun, 0);
-        if (contentDiv) contentDiv._vcpPretextIdleHandle = { kind: 'timer', id };
+    enqueuePretextEstimate(ownerWindow, contentDiv || messageId, run);
+}
+
+/*
+ * 每条消息各占一个 requestIdleCallback 时，40 条历史就是 40 个排在前面的回调，
+ * 历史分批插入的 idle 回调只能等它们逐个跑完（每个还要读一次 clientWidth 触发布局），
+ * 大话题打开因此慢约 0.4s。这里每个窗口只挂一个 idle 回调，按 deadline 分片消费队列，
+ * 没做完就重新排队，让已经排着的分批插入先执行。同一节点重复渲染时覆盖旧任务。
+ */
+const pretextEstimateQueues = new WeakMap();
+
+function getPretextQueueOwner(ownerWindow) {
+    return typeof ownerWindow?.requestIdleCallback === 'function' ? ownerWindow : globalThis;
+}
+
+function enqueuePretextEstimate(ownerWindow, key, run) {
+    const queueOwner = getPretextQueueOwner(ownerWindow);
+    let state = pretextEstimateQueues.get(queueOwner);
+    if (!state) {
+        state = { jobs: new Map(), scheduled: false };
+        pretextEstimateQueues.set(queueOwner, state);
     }
+    state.jobs.delete(key);
+    state.jobs.set(key, run);
+    if (state.scheduled) return;
+
+    const schedule = () => {
+        state.scheduled = true;
+        if (queueOwner !== globalThis) queueOwner.requestIdleCallback(drain, { timeout: 300 });
+        else setTimeout(drain, 0);
+    };
+    const drain = (deadline) => {
+        state.scheduled = false;
+        for (const [jobKey, job] of state.jobs) {
+            state.jobs.delete(jobKey);
+            job();
+            if (!deadline || deadline.didTimeout || deadline.timeRemaining() <= 1) break;
+        }
+        if (state.jobs.size > 0) schedule();
+    };
+    schedule();
+}
+
+function cancelPretextEstimate(contentDiv) {
+    const queueOwner = getPretextQueueOwner(contentDiv?.ownerDocument?.defaultView);
+    pretextEstimateQueues.get(queueOwner)?.jobs.delete(contentDiv);
 }
 
 async function renderFullMessageProjection(messageId, fullContent, agentName, agentId, root = mainRendererReferences.chatMessagesDiv) {
diff --git a/scripts/next-delta-shared-baseline.json b/scripts/next-delta-shared-baseline.json
index 251a462fd..6c64855eb 100644
--- a/scripts/next-delta-shared-baseline.json
+++ b/scripts/next-delta-shared-baseline.json
@@ -4,8 +4,8 @@
     "reason": "Integrated chat behavior: selection subscriptions for topic side panes; clear old media before navigation; per-conversation side chat context/unread policy; explicit cancellation and non-streaming terminal settlement; one error notice per failed request. Reviewed auxiliary-side-chat reproduction: Stop during delayed history save or request preparation previously still sent generation; renderer-local AbortSignal checks now prevent that send. When upstream interrupt fails, await the existing local stream terminal before placeholder cleanup so accepted partial content is saved instead of deleted. Actual native side owner, internal renderer, manager, preload/IPC/disk and local HTTP before/after evidence; side preparation and partial-cancel regressions. Existing Surface routing and history authority remain in place. Main/group sending without the optional signal keeps its preparation path. Stop while awaiting the first HTTP headers: a locally aborted stream IPC return now awaits the already-owned cancellation terminal instead of showing a service-error notice; the regression keeps the submitted question and leaves the busy state."
   },
   "modules/messageRenderer.js": {
-    "sha256": "7ebdd1b28c5af25ec0c1907e17037f873ed3d80eb9ae87d369dcc291b6c116ac",
-    "reason": "Integrated renderer behavior: nested tool result data isolation; lazy tool payload DOM; safe approval diagnostics; upstream tool-result hide/restore toggle, still persisted through historyMutationAuthority; upstream scanned-PDF page labels on attachments; owned media cleanup; cross-agent avatar projection; message-local pretext estimates. This records the integrated source boundary, not a guarantee of all data-write scenarios. Tool presentation: the renderer owns presenter teardown, reads appearance from its owner realm, captures disclosure before HTML replacement, and applies presentation after a valid render without changing protocol or persistence."
+    "sha256": "f24426207cf95eb4fa3f42e2ee357ed906d0a56ac6b235dd9d996fc39966b6e5",
+    "reason": "Integrated renderer behavior: nested tool result data isolation; lazy tool payload DOM; safe approval diagnostics; upstream tool-result hide/restore toggle, still persisted through historyMutationAuthority; upstream scanned-PDF page labels on attachments; owned media cleanup; cross-agent avatar projection; message-local pretext estimates drained from one per-window idle queue so they never starve batched history insertion. This records the integrated source boundary, not a guarantee of all data-write scenarios. Tool presentation: the renderer owns presenter teardown, reads appearance from its owner realm, captures disclosure before HTML replacement, and applies presentation after a valid render without changing protocol or persistence."
   },
   "modules/renderer/streamManager.js": {
     "sha256": "f4cb0dfc44a7e870725fad479a718d010ec10238fadedd7808ce9bd958385b13",

From 295d9570174b2abccfb3f6abf4daa3edf899cdbd Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 01:16:17 +0000
Subject: [PATCH 039/143] Browser tab: a page playing video, even muted, is not
 put to sleep

isBusy only knew audible pages, so a muted video or camera preview was
evicted at the live view limit and reloaded from the start when shown.
media-started-playing / media-paused now count too (ZCode protects
media playback the same way); navigation or a crashed page clears it.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DFRovoZHMzeheXKkLNWKG
---
 docs/contracts/chat-contracts.json            |  2 +-
 .../side-pane/browserSideProvider.js          | 12 ++++++--
 tests/side-browser-address.test.mjs           | 30 +++++++++++++++++++
 3 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/docs/contracts/chat-contracts.json b/docs/contracts/chat-contracts.json
index d8ee3e1f8..5587488cb 100644
--- a/docs/contracts/chat-contracts.json
+++ b/docs/contracts/chat-contracts.json
@@ -1123,7 +1123,7 @@
     "dynamicSites": [
       {
         "file": "modules/ui-system/side-pane/browserSideProvider.js",
-        "line": 279,
+        "line": 281,
         "kind": "custom-event-listener",
         "match": "guest.addEventListener(name"
       }
diff --git a/modules/ui-system/side-pane/browserSideProvider.js b/modules/ui-system/side-pane/browserSideProvider.js
index 92102dc76..4e955c7ee 100644
--- a/modules/ui-system/side-pane/browserSideProvider.js
+++ b/modules/ui-system/side-pane/browserSideProvider.js
@@ -147,6 +147,8 @@ export function createBrowserSideProvider({
             let domReady = false;
             let currentUrl = '';
             let loading = false;
+            // 静音的视频、摄像头预览也算在播：isCurrentlyAudible 只认出声的
+            let mediaPlaying = false;
             let lastFailure = null;
             let pendingUrl = '';
 
@@ -302,7 +304,11 @@ export function createBrowserSideProvider({
                     }
                     syncControls();
                 });
+                on('media-started-playing', () => { mediaPlaying = true; });
+                on('media-paused', () => { mediaPlaying = false; });
                 on('did-navigate', (event) => {
+                    // 换了文档，旧页面的播放不会再发暂停
+                    mediaPlaying = false;
                     setAddress(event.url);
                     syncControls();
                 });
@@ -329,6 +335,7 @@ export function createBrowserSideProvider({
                 });
                 on('render-process-gone', (event) => {
                     loading = false;
+                    mediaPlaying = false;
                     lastFailure = { crashed: true };
                     showNotice({
                         title: '页面已停止响应',
@@ -351,6 +358,7 @@ export function createBrowserSideProvider({
                     webview = null;
                     domReady = false;
                     loading = false;
+                    mediaPlaying = false;
                     old.remove();
                 }
                 hideNotice();
@@ -492,9 +500,9 @@ export function createBrowserSideProvider({
                     if (result?.url) navigate(result.url);
                     return result;
                 },
-                // 还在加载或者在放声音的页面不休眠，休眠了再显示会从当前地址重新打开
+                // 还在加载、在放声音或在放视频的页面不休眠，休眠了再显示会从当前地址重新打开
                 isBusy() {
-                    if (loading) return true;
+                    if (loading || mediaPlaying) return true;
                     try {
                         return domReady && webview?.isCurrentlyAudible?.() === true;
                     } catch (_error) {
diff --git a/tests/side-browser-address.test.mjs b/tests/side-browser-address.test.mjs
index e0ea320d9..e774b8014 100644
--- a/tests/side-browser-address.test.mjs
+++ b/tests/side-browser-address.test.mjs
@@ -184,3 +184,33 @@ for (const readyBeforeFailure of [false, true]) {
         } finally { await h.cleanup(); }
     });
 }
+
+test('a page playing media stays busy even when muted, until it pauses or navigates away', async () => {
+    const { JSDOM } = await import('jsdom');
+    const { createBrowserSideProvider } = await import('../modules/ui-system/side-pane/browserSideProvider.js');
+    const dom = new JSDOM('<div id="view"></div>');
+    const provider = createBrowserSideProvider({
+        document: dom.window.document,
+        api: null,
+        sidePaneController: { updateTab() {} },
+        notify: () => {}
+    });
+    const view = dom.window.document.getElementById('view');
+    const handle = await provider.mountTab({ id: 'browser:1', kind: 'browser', payload: { url: 'https://example.com/' } }, view);
+    const guest = view.querySelector('webview');
+    assert.ok(guest);
+    guest.isCurrentlyAudible = () => false;
+    const fire = (name, extra = {}) => guest.dispatchEvent(Object.assign(new dom.window.Event(name), extra));
+
+    assert.equal(handle.isBusy(), false);
+    fire('media-started-playing');
+    assert.equal(handle.isBusy(), true);
+    fire('media-paused');
+    assert.equal(handle.isBusy(), false);
+    fire('media-started-playing');
+    fire('did-navigate', { url: 'https://example.com/next' });
+    assert.equal(handle.isBusy(), false);
+
+    handle.dispose();
+    dom.window.close();
+});

From 6014f754049c19314499344df0f0af049ecb9b9c Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 01:16:17 +0000
Subject: [PATCH 040/143] Side chats: restoring them on a topic switch no
 longer forces the pane open

restoreSessions used openTab for every child, which activated and expanded
the pane, marked the topic as expanded in the saved preference, and mounted
each chat. The controller now has restoreTabs: tabs go in without taking
focus or mounting. If the topic had no tabs when the user switched to it
(so the pane auto-collapsed), the switch is re-resolved as if they had been
there: last shown tab, saved collapse state. ZCode mounts restored panels in
the background without writing the preference.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DFRovoZHMzeheXKkLNWKG
---
 .../contracts/generated/chat-event-graph.json | 18 ++--
 modules/renderer/sideChatWiring.js            | 13 ++-
 .../side-pane/side-pane-controller.js         | 51 +++++++++++
 tests/side-pane-background-restore.test.mjs   | 87 +++++++++++++++++++
 tests/side-pane-wiring-modules.test.mjs       | 18 ++--
 5 files changed, 161 insertions(+), 26 deletions(-)
 create mode 100644 tests/side-pane-background-restore.test.mjs

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 923abb305..6565107f0 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -4323,17 +4323,17 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1024,
+          "line": 1075,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1030,
+          "line": 1081,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1044,
+          "line": 1095,
           "kind": "custom-event-listener"
         },
         {
@@ -5904,19 +5904,19 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1024,
+          "line": 1075,
           "kind": "custom-event-listener",
           "match": "toggleNotificationsBtn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1030,
+          "line": 1081,
           "kind": "custom-event-listener",
           "match": "expandButton.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1044,
+          "line": 1095,
           "kind": "custom-event-listener",
           "match": "closeSidePaneBtn.addEventListener('click'"
         },
@@ -24996,7 +24996,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1064,
+          "line": 1115,
           "kind": "custom-event-listener"
         },
         {
@@ -25090,7 +25090,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1064,
+          "line": 1115,
           "kind": "custom-event-listener",
           "match": "win?.addEventListener?.('resize'"
         },
@@ -32827,7 +32827,7 @@
     },
     {
       "file": "modules/ui-system/side-pane/browserSideProvider.js",
-      "line": 279,
+      "line": 281,
       "reason": "dynamic listener name: name",
       "kind": "custom-event-listener",
       "match": "guest.addEventListener(name",
diff --git a/modules/renderer/sideChatWiring.js b/modules/renderer/sideChatWiring.js
index c22c8e189..b1224e2e9 100644
--- a/modules/renderer/sideChatWiring.js
+++ b/modules/renderer/sideChatWiring.js
@@ -229,14 +229,15 @@ export function createSideChatWiring({
         if (!isSameParent(getController().getSnapshot().parent, agentId, parentTopicId)) return [];
         if (!listRes.ok || !Array.isArray(listRes.items)) return [];
 
-        // openTab 会激活恢复出来的侧聊，恢复完切回用户原来看的标签
-        const activeBefore = getController().getSnapshot().activeTabId;
+        // 收齐了一次性在后台补回：不抢用户正在看的标签，不强行展开，也不改这个话题记下的收起状态
+        const restored = [];
         for (const item of listRes.items) {
             try {
                 if (!isSameParent(getController().getSnapshot().parent, agentId, parentTopicId)) break;
                 if (item.open === false || item.status === 'closed') continue;
                 const childTopicId = item.child?.topicId;
                 if (getController().getSnapshot().tabs.some(t => t.descriptor?.child?.topicId === childTopicId)) continue;
+                if (restored.some(t => t.descriptor.child?.topicId === childTopicId)) continue;
 
                 // 从未发过消息、也没有草稿和引用的空侧聊不再恢复，直接清理
                 const childAgentId = item.child.itemId || agentId;
@@ -253,7 +254,7 @@ export function createSideChatWiring({
                     }
                 }
 
-                await getController().openTab({ kind: 'chat', descriptor: { ...createSideChatDescriptor({
+                restored.push({ kind: 'chat', descriptor: { ...createSideChatDescriptor({
                     parent: item.parent,
                     childTopicId,
                     title: item.title,
@@ -270,10 +271,8 @@ export function createSideChatWiring({
                 console.warn('[SideChat] Failed to restore side chat tab:', e);
             }
         }
-        const snapshot = getController().getSnapshot();
-        if (activeBefore && activeBefore !== snapshot.activeTabId && isSameParent(snapshot.parent, agentId, parentTopicId)
-            && snapshot.tabs.some(t => t.id === activeBefore)) {
-            getController().activateTab(activeBefore, { focus: false });
+        if (restored.length > 0 && isSameParent(getController().getSnapshot().parent, agentId, parentTopicId)) {
+            await getController().restoreTabs(restored);
         }
         return listRes.items;
     }
diff --git a/modules/ui-system/side-pane/side-pane-controller.js b/modules/ui-system/side-pane/side-pane-controller.js
index 6aec0369e..035fb52b0 100644
--- a/modules/ui-system/side-pane/side-pane-controller.js
+++ b/modules/ui-system/side-pane/side-pane-controller.js
@@ -809,6 +809,57 @@ export function createSidePaneController({
             return finishOpen(targetTabId, entry, origin);
         },
 
+        /**
+         * 在后台补回标签（比如切到话题后才读回来的辅助对话）：不抢激活、不挂载，也不改这个对话记下的收起状态。
+         * 切到这个对话时它还一个标签都没有，面板按「没有标签」自动收起了；补回之后照切换时本该有的样子重新定一次：
+         * 回到上次停的标签、按记下的收起状态展开或收起。期间用户自己动过面板就不再改。
+         * @param {Array<SidePaneTab | { kind: string }>} rawTabs
+         * @returns {Promise<string[]>} 补进来的标签 id；其中有标签因此显示出来时，等它挂好
+         */
+        async restoreTabs(rawTabs = []) {
+            if (isDisposed) return [];
+            const ownTabsBefore = state.parent
+                ? state.tabs.filter(tab => SidePaneState.matchesConversation(SidePaneState.getTabParent(tab), state.parent))
+                : [];
+            const untouchedFallback = state.parent && ownTabsBefore.length === 0 && !state.visible
+                && isNotificationsTab(state.activeTabId);
+            const added = [];
+            for (const rawTab of rawTabs) {
+                if (!rawTab) continue;
+                const definition = getTabType(rawTab.kind);
+                let resolved;
+                try {
+                    resolved = definition?.toTab ? definition.toTab(rawTab, state.tabs) : rawTab;
+                } catch (error) {
+                    console.error('[SidePaneController] Failed to restore tab:', error);
+                    continue;
+                }
+                const next = SidePaneState.restoreTabs(state, [definition ? {
+                    icon: definition.icon, typeLabel: definition.label, searchHint: definition.searchHint,
+                    ...resolved
+                } : resolved]);
+                if (next === state) continue;
+                state = next;
+                added.push(String(resolved.id));
+            }
+            if (added.length === 0) return added;
+            navigationRevision++;
+            if (untouchedFallback) {
+                const key = parentKeyOf();
+                state = SidePaneState.setParent(state, state.parent, {
+                    force: true,
+                    preferredTabId: activeTabByParent.get(key),
+                    collapsedPreference: collapsedByParent.get(key)
+                });
+            }
+            renderTabList();
+            syncViewPanels();
+            syncDomVisibility();
+            const mounting = pendingTabMounts.get(state.activeTabId);
+            if (mounting && added.includes(state.activeTabId)) await mounting.promise.catch(() => null);
+            return added;
+        },
+
         /** 改已打开标签的标题或 payload（关掉后重新打开时用新的 payload），不切换标签 */
         updateTab(tabId, patch = {}) {
             if (isDisposed || !tabId) return;
diff --git a/tests/side-pane-background-restore.test.mjs b/tests/side-pane-background-restore.test.mjs
new file mode 100644
index 000000000..41d34fd23
--- /dev/null
+++ b/tests/side-pane-background-restore.test.mjs
@@ -0,0 +1,87 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { JSDOM } from 'jsdom';
+import { createSidePaneController } from '../modules/ui-system/side-pane/side-pane-controller.js';
+import { defineChatTabType } from '../modules/ui-system/side-pane/tab-types/chat.js';
+
+// 切到话题后才读回来的辅助对话在后台补回：不抢激活、不强行展开、不改这个话题记下的收起状态
+const parentOf = topicId => ({ itemType: 'agent', itemId: 'agent', topicId });
+const sideChat = (id, topicId) => ({ kind: 'chat', descriptor: {
+    id, title: id, parent: parentOf(topicId), child: { itemType: 'agent', itemId: 'agent', topicId: `child-${id}` }
+} });
+
+function createController() {
+    const dom = new JSDOM('<main class="main-content"></main><aside id="pane"><div id="tabs"></div><div id="content"><section class="side-pane-view" id="sidePaneViewNotifications"></section></div></aside>');
+    const doc = dom.window.document;
+    const mounted = [];
+    const ctrl = createSidePaneController({
+        root: doc.getElementById('pane'),
+        tabListElement: doc.getElementById('tabs'),
+        contentContainer: doc.getElementById('content'),
+        tabTypes: [defineChatTabType({
+            provider: { mountTab: async descriptor => { mounted.push(descriptor.id); return { dispose: async () => {}, focus() {} }; } }
+        })]
+    });
+    return { ctrl, mounted, dispose: () => { ctrl.dispose?.(); dom.window.close(); } };
+}
+
+test('a topic the user collapsed stays collapsed when its side chats come back, and nothing mounts', async t => {
+    const { ctrl, mounted, dispose } = createController();
+    t.after(dispose);
+    ctrl.setParent(parentOf('a'));
+    ctrl.setVisible(true);
+    ctrl.setVisible(false);
+    ctrl.setParent(parentOf('b'));
+    ctrl.setParent(parentOf('a'));
+
+    const added = await ctrl.restoreTabs([sideChat('side-a', 'a')]);
+
+    assert.deepEqual(added, ['side-a']);
+    const snapshot = ctrl.getSnapshot();
+    assert.equal(snapshot.visible, false);
+    assert.ok(snapshot.tabs.some(tab => tab.id === 'side-a'));
+    assert.deepEqual(mounted, []);
+
+    ctrl.setParent(parentOf('b'));
+    ctrl.setParent(parentOf('a'));
+    assert.equal(ctrl.getSnapshot().visible, false, 'the collapsed preference was not rewritten');
+});
+
+test('a topic whose side chats arrive after the switch opens on the one it was last showing', async t => {
+    const { ctrl, mounted, dispose } = createController();
+    t.after(dispose);
+    ctrl.setParent(parentOf('a'));
+    await ctrl.openTab(sideChat('first', 'a'));
+    await ctrl.openTab(sideChat('second', 'a'));
+    ctrl.activateTab('first');
+    ctrl.setParent(parentOf('b'));
+    // 模拟重启后：话题 a 的辅助对话还没读回来
+    await ctrl.closeTab('first', { force: true });
+    await ctrl.closeTab('second', { force: true });
+    mounted.length = 0;
+    ctrl.setParent(parentOf('a'));
+    assert.equal(ctrl.getSnapshot().visible, false);
+
+    await ctrl.restoreTabs([sideChat('first', 'a'), sideChat('second', 'a')]);
+
+    const snapshot = ctrl.getSnapshot();
+    assert.equal(snapshot.visible, true);
+    assert.equal(snapshot.activeTabId, 'first');
+    assert.deepEqual(mounted, ['first']);
+});
+
+test('side chats restored while the user is on another tab of the topic stay in the background', async t => {
+    const { ctrl, mounted, dispose } = createController();
+    t.after(dispose);
+    ctrl.setParent(parentOf('a'));
+    await ctrl.openTab(sideChat('current', 'a'));
+    mounted.length = 0;
+
+    await ctrl.restoreTabs([sideChat('older', 'a')]);
+
+    const snapshot = ctrl.getSnapshot();
+    assert.equal(snapshot.activeTabId, 'current');
+    assert.equal(snapshot.visible, true);
+    assert.ok(snapshot.tabs.some(tab => tab.id === 'older'));
+    assert.deepEqual(mounted, []);
+});
diff --git a/tests/side-pane-wiring-modules.test.mjs b/tests/side-pane-wiring-modules.test.mjs
index a15b0db1a..f977d775b 100644
--- a/tests/side-pane-wiring-modules.test.mjs
+++ b/tests/side-pane-wiring-modules.test.mjs
@@ -18,17 +18,15 @@ test('restoring side chats in the background keeps the tab the user was looking
     const dom = new JSDOM('<!doctype html><body></body>');
     const parent = { itemType: 'agent', itemId: 'agent-1', topicId: 'topic-1' };
     let state = { parent, tabs: [{ id: 'browser:1', kind: 'browser' }], activeTabId: 'browser:1' };
-    const activations = [];
+    const restoredBatches = [];
     const controller = {
         getSnapshot: () => state,
-        async openTab(raw) {
-            const id = `chat:${raw.descriptor.child.topicId}`;
-            state = { ...state, tabs: [...state.tabs, { id, kind: 'chat', descriptor: raw.descriptor }], activeTabId: id };
-            return null;
-        },
-        activateTab(tabId, options) {
-            activations.push([tabId, options]);
-            state = { ...state, activeTabId: tabId };
+        async openTab() { throw new Error('restoring must not open (activate and expand) tabs'); },
+        async restoreTabs(raws) {
+            restoredBatches.push(raws.length);
+            const tabs = raws.map(raw => ({ id: `chat:${raw.descriptor.child.topicId}`, kind: 'chat', descriptor: raw.descriptor }));
+            state = { ...state, tabs: [...state.tabs, ...tabs] };
+            return tabs.map(tab => tab.id);
         }
     };
     const chatAPI = {
@@ -45,7 +43,7 @@ test('restoring side chats in the background keeps the tab the user was looking
         await wiring.restoreSessions('agent-1', 'topic-1');
         assert.ok(state.tabs.some(t => t.id === 'chat:child-1'));
         assert.equal(state.activeTabId, 'browser:1');
-        assert.deepEqual(activations, [['browser:1', { focus: false }]]);
+        assert.deepEqual(restoredBatches, [1]);
     } finally {
         wiring.dispose?.();
         dom.window.close();

From ea899c98ce8f4a92585b9d58ae8ba21b05bc438d Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 01:18:46 +0000
Subject: [PATCH 041/143] Contracts: follow the message renderer listener site
 the pretext queue moved

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_017bCbRB3E9yajQ3HbdMrjiJ
---
 docs/contracts/chat-contracts.json            |  2 +-
 .../contracts/generated/chat-event-graph.json | 58 +++++++++----------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/docs/contracts/chat-contracts.json b/docs/contracts/chat-contracts.json
index c6e520d4a..b6d3ea385 100644
--- a/docs/contracts/chat-contracts.json
+++ b/docs/contracts/chat-contracts.json
@@ -600,7 +600,7 @@
       },
       {
         "file": "modules/messageRenderer.js",
-        "line": 3328,
+        "line": 3319,
         "kind": "custom-event-listener",
         "match": "target.addEventListener(type"
       }
diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 69770eda3..d5f7fbbfd 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -1244,7 +1244,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 200,
+          "line": 202,
           "kind": "custom-event-listener"
         }
       ],
@@ -1263,7 +1263,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 200,
+          "line": 202,
           "kind": "custom-event-listener",
           "match": "tabItem.addEventListener('auxclick'"
         }
@@ -3534,17 +3534,17 @@
         },
         {
           "file": "modules/messageRenderer.js",
-          "line": 3438,
+          "line": 3429,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/messageRenderer.js",
-          "line": 3497,
+          "line": 3488,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/messageRenderer.js",
-          "line": 3535,
+          "line": 3526,
           "kind": "custom-event-listener"
         },
         {
@@ -4374,12 +4374,12 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 177,
+          "line": 179,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 189,
+          "line": 191,
           "kind": "custom-event-listener"
         },
         {
@@ -4961,19 +4961,19 @@
         },
         {
           "file": "modules/messageRenderer.js",
-          "line": 3438,
+          "line": 3429,
           "kind": "custom-event-listener",
           "match": "attachmentElement.addEventListener('click'"
         },
         {
           "file": "modules/messageRenderer.js",
-          "line": 3497,
+          "line": 3488,
           "kind": "custom-event-listener",
           "match": "attachmentElement.addEventListener('click'"
         },
         {
           "file": "modules/messageRenderer.js",
-          "line": 3535,
+          "line": 3526,
           "kind": "custom-event-listener",
           "match": "removeBtn.addEventListener('click'"
         },
@@ -5969,13 +5969,13 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 177,
+          "line": 179,
           "kind": "custom-event-listener",
           "match": "btn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 189,
+          "line": 191,
           "kind": "custom-event-listener",
           "match": "closeBtn.addEventListener('click'"
         },
@@ -7215,7 +7215,7 @@
         },
         {
           "file": "modules/messageRenderer.js",
-          "line": 3439,
+          "line": 3430,
           "kind": "custom-event-listener"
         },
         {
@@ -7265,7 +7265,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 212,
+          "line": 214,
           "kind": "custom-event-listener"
         },
         {
@@ -7343,7 +7343,7 @@
         },
         {
           "file": "modules/messageRenderer.js",
-          "line": 3439,
+          "line": 3430,
           "kind": "custom-event-listener",
           "match": "attachmentElement.addEventListener('contextmenu'"
         },
@@ -7403,7 +7403,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 212,
+          "line": 214,
           "kind": "custom-event-listener",
           "match": "tabItem.addEventListener('contextmenu'"
         },
@@ -15522,7 +15522,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 285,
+          "line": 287,
           "kind": "custom-event-listener"
         },
         {
@@ -15899,7 +15899,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 285,
+          "line": 287,
           "kind": "custom-event-listener",
           "match": "tabListElement.addEventListener('keydown'"
         },
@@ -18762,7 +18762,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 197,
+          "line": 199,
           "kind": "custom-event-listener"
         },
         {
@@ -18886,7 +18886,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 197,
+          "line": 199,
           "kind": "custom-event-listener",
           "match": "tabItem.addEventListener('mousedown'"
         },
@@ -18977,7 +18977,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 208,
+          "line": 210,
           "kind": "custom-event-listener"
         },
         {
@@ -19019,7 +19019,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 208,
+          "line": 210,
           "kind": "custom-event-listener",
           "match": "tabItem.addEventListener('mouseenter'"
         },
@@ -19092,7 +19092,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 209,
+          "line": 211,
           "kind": "custom-event-listener"
         },
         {
@@ -19175,7 +19175,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 209,
+          "line": 211,
           "kind": "custom-event-listener",
           "match": "tabItem.addEventListener('mouseleave'"
         },
@@ -22968,7 +22968,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 210,
+          "line": 212,
           "kind": "custom-event-listener"
         },
         {
@@ -23027,7 +23027,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 210,
+          "line": 212,
           "kind": "custom-event-listener",
           "match": "tabItem.addEventListener('pointerdown'"
         },
@@ -26407,7 +26407,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 254,
+          "line": 256,
           "kind": "custom-event-listener"
         },
         {
@@ -26471,7 +26471,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 254,
+          "line": 256,
           "kind": "custom-event-listener",
           "match": "tabListElement.addEventListener('scroll'"
         },
@@ -32542,7 +32542,7 @@
     },
     {
       "file": "modules/messageRenderer.js",
-      "line": 3328,
+      "line": 3319,
       "reason": "dynamic listener name: type",
       "kind": "custom-event-listener",
       "match": "target.addEventListener(type",

From b44c09263bd2b3040042249802ae8f2f3a7d61dc Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 01:19:06 +0000
Subject: [PATCH 042/143] Side pane: expand before mounting, and batch closes
 stop mounting doomed tabs

openTab switched the strip to the new tab but left the pane collapsed and
the old view showing until the provider finished mounting. The panel and
view now follow in the same frame and the new view fills in while the
provider mounts, the same order DSH uses.

Close all / close others retired tabs one by one, and each fallback
activation mounted a not-yet-shown tab that was closed straight after.
Mounting now waits until the batch ends and only the tab left showing
mounts (ZCode applies the batch as one transition).

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DFRovoZHMzeheXKkLNWKG
---
 .../contracts/generated/chat-event-graph.json | 16 ++---
 .../side-pane/side-pane-controller.js         | 24 ++++++--
 ...st.mjs => side-pane-mount-timing.test.mjs} | 59 ++++++++++++++++++-
 3 files changed, 86 insertions(+), 13 deletions(-)
 rename tests/{side-pane-background-restore.test.mjs => side-pane-mount-timing.test.mjs} (58%)

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 6565107f0..cc613b27b 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -4323,17 +4323,17 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1075,
+          "line": 1091,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1081,
+          "line": 1097,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1095,
+          "line": 1111,
           "kind": "custom-event-listener"
         },
         {
@@ -5904,19 +5904,19 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1075,
+          "line": 1091,
           "kind": "custom-event-listener",
           "match": "toggleNotificationsBtn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1081,
+          "line": 1097,
           "kind": "custom-event-listener",
           "match": "expandButton.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1095,
+          "line": 1111,
           "kind": "custom-event-listener",
           "match": "closeSidePaneBtn.addEventListener('click'"
         },
@@ -24996,7 +24996,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1115,
+          "line": 1131,
           "kind": "custom-event-listener"
         },
         {
@@ -25090,7 +25090,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1115,
+          "line": 1131,
           "kind": "custom-event-listener",
           "match": "win?.addEventListener?.('resize'"
         },
diff --git a/modules/ui-system/side-pane/side-pane-controller.js b/modules/ui-system/side-pane/side-pane-controller.js
index 035fb52b0..e20e99d91 100644
--- a/modules/ui-system/side-pane/side-pane-controller.js
+++ b/modules/ui-system/side-pane/side-pane-controller.js
@@ -540,8 +540,20 @@ export function createSidePaneController({
     }
 
     // 恢复出来的标签不在启动时挂载，第一次显示时才挂；焦点留在原处
+    // 批量关闭期间兜底激活的标签多半紧接着也要关，等整批关完再挂当时停着的那个
+    let batchClosing = 0;
+    async function closeBatch(tabs, options, onFocusMoved) {
+        batchClosing++;
+        try {
+            await tabCloseOwner.closeTabs(tabs, options, onFocusMoved);
+        } finally {
+            batchClosing--;
+            mountActiveIfNeeded();
+        }
+    }
+
     function mountActiveIfNeeded() {
-        if (isDisposed || !state.visible) return;
+        if (isDisposed || !state.visible || batchClosing > 0) return;
         const tabId = state.activeTabId;
         if (!tabId || mountedTabMap.has(tabId) || pendingTabMounts.has(tabId)) return;
         const tab = state.tabs.find(t => t.id === tabId);
@@ -762,7 +774,7 @@ export function createSidePaneController({
             const revision = ++navigationRevision;
             const keptLifetime = tabCloseOwner.getLifetime(tabId);
             let expectedFocus = doc.activeElement;
-            await tabCloseOwner.closeTabs(closing, { collapseWhenEmpty: false }, (before, after) => {
+            await closeBatch(closing, { collapseWhenEmpty: false }, (before, after) => {
                 // Follow our synchronous close handoffs, not an unrelated focus change.
                 if (before === expectedFocus) expectedFocus = after;
             });
@@ -775,7 +787,7 @@ export function createSidePaneController({
         async closeAllTabs() {
             if (isDisposed) return;
             navigationRevision++;
-            await tabCloseOwner.closeTabs(SidePaneState.getClosableVisibleTabs(state));
+            await closeBatch(SidePaneState.getClosableVisibleTabs(state));
         },
 
         /**
@@ -800,12 +812,16 @@ export function createSidePaneController({
             rememberOpened(SidePaneState.getTabParent(openedTab), targetTabId);
             renderTabList();
 
-            const entry = await ensureTabMounted(targetTabId, {
+            const mounting = ensureTabMounted(targetTabId, {
                 provider: providers[rawTab.kind],
                 payload: rawTab,
                 onClosed: definition?.onClosed,
                 ariaLabel: resolved.title || '副屏视图'
             });
+            // 标签条已经切过去了，面板和内容区同一刻跟上，不等挂载完（慢的挂载期间不会是新标签配旧内容、或标签亮着面板却收着）
+            syncViewPanels();
+            syncDomVisibility();
+            const entry = await mounting;
             return finishOpen(targetTabId, entry, origin);
         },
 
diff --git a/tests/side-pane-background-restore.test.mjs b/tests/side-pane-mount-timing.test.mjs
similarity index 58%
rename from tests/side-pane-background-restore.test.mjs
rename to tests/side-pane-mount-timing.test.mjs
index 41d34fd23..a93379da2 100644
--- a/tests/side-pane-background-restore.test.mjs
+++ b/tests/side-pane-mount-timing.test.mjs
@@ -4,7 +4,7 @@ import { JSDOM } from 'jsdom';
 import { createSidePaneController } from '../modules/ui-system/side-pane/side-pane-controller.js';
 import { defineChatTabType } from '../modules/ui-system/side-pane/tab-types/chat.js';
 
-// 切到话题后才读回来的辅助对话在后台补回：不抢激活、不强行展开、不改这个话题记下的收起状态
+// 什么时候挂载：后台补回的标签不抢激活也不挂；打开时面板先展开；批量关闭不挂马上要关的标签
 const parentOf = topicId => ({ itemType: 'agent', itemId: 'agent', topicId });
 const sideChat = (id, topicId) => ({ kind: 'chat', descriptor: {
     id, title: id, parent: parentOf(topicId), child: { itemType: 'agent', itemId: 'agent', topicId: `child-${id}` }
@@ -85,3 +85,60 @@ test('side chats restored while the user is on another tab of the topic stay in
     assert.ok(snapshot.tabs.some(tab => tab.id === 'older'));
     assert.deepEqual(mounted, []);
 });
+
+test('opening a tab expands the pane and shows its view while the provider is still mounting', async t => {
+    const dom = new JSDOM('<main class="main-content"></main><aside id="pane"><div id="tabs"></div><div id="content"><section class="side-pane-view" id="sidePaneViewNotifications"></section></div></aside>');
+    const doc = dom.window.document;
+    let finishMount;
+    const ctrl = createSidePaneController({
+        root: doc.getElementById('pane'),
+        tabListElement: doc.getElementById('tabs'),
+        contentContainer: doc.getElementById('content'),
+        tabTypes: [defineChatTabType({
+            provider: { mountTab: () => new Promise(resolve => { finishMount = () => resolve({ dispose: async () => {}, focus() {} }); }) }
+        })]
+    });
+    t.after(() => { ctrl.dispose?.(); dom.window.close(); });
+    ctrl.setParent(parentOf('a'));
+    assert.equal(ctrl.getSnapshot().visible, false);
+
+    const opening = ctrl.openTab(sideChat('slow', 'a'));
+    const view = doc.querySelector('#content [data-tab-id="slow"]');
+    assert.ok(view);
+    assert.equal(view.hidden, false);
+    assert.equal(doc.getElementById('sidePaneViewNotifications').hidden, true);
+    assert.equal(doc.getElementById('pane').getAttribute('aria-hidden'), 'false');
+
+    finishMount();
+    await opening;
+    assert.equal(view.hidden, false);
+});
+
+test('close all does not mount the not-yet-shown tabs it is about to close', async t => {
+    const { ctrl, mounted, dispose } = createController();
+    t.after(dispose);
+    ctrl.setParent(parentOf('a'));
+    await ctrl.openTab(sideChat('current', 'a'));
+    await ctrl.restoreTabs([sideChat('one', 'a'), sideChat('two', 'a'), sideChat('three', 'a')]);
+    mounted.length = 0;
+
+    await ctrl.closeAllTabs();
+
+    assert.deepEqual(mounted, []);
+    assert.deepEqual(ctrl.getSnapshot().tabs.map(tab => tab.id), ['notifications']);
+});
+
+test('close others mounts only the tab that stays', async t => {
+    const { ctrl, mounted, dispose } = createController();
+    t.after(dispose);
+    ctrl.setParent(parentOf('a'));
+    await ctrl.openTab(sideChat('current', 'a'));
+    await ctrl.restoreTabs([sideChat('one', 'a'), sideChat('two', 'a'), sideChat('keep', 'a')]);
+    mounted.length = 0;
+
+    await ctrl.closeOtherTabs('keep');
+    await new Promise(resolve => setTimeout(resolve, 0));
+
+    assert.deepEqual(mounted, ['keep']);
+    assert.equal(ctrl.getSnapshot().activeTabId, 'keep');
+});

From 0befa45c81d6424c39dfc46fd7391208e1cf6052 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 01:22:06 +0000
Subject: [PATCH 043/143] Side chat: View trajectory opens the child topic's
 calls and finds the reply

The menu item passed only the message id, and the trajectory tab always read
the main chat's current topic, so a side reply never matched and the user got
'no recorded call'. The side chat now passes its child conversation; the tab
reads that until the main chat switches conversation or the trajectory is
opened from the main chat. ZCode passes the task id explicitly the same way.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DFRovoZHMzeheXKkLNWKG
---
 .../contracts/generated/chat-event-graph.json | 36 +++++++++----------
 modules/renderer/side-chat/message-actions.js |  6 +++-
 modules/renderer/sidePaneCommands.js          |  2 +-
 .../side-pane/modelTrajectorySideProvider.js  | 26 ++++++++++----
 tests/side-chat-message-delete.test.mjs       | 17 +++++++++
 tests/side-pane-model-trajectory.test.mjs     | 25 +++++++++++++
 6 files changed, 86 insertions(+), 26 deletions(-)

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index cc613b27b..219b7ae84 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -3648,12 +3648,12 @@
         },
         {
           "file": "modules/renderer/side-chat/message-actions.js",
-          "line": 212,
+          "line": 216,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/renderer/side-chat/message-actions.js",
-          "line": 261,
+          "line": 265,
           "kind": "custom-event-listener"
         },
         {
@@ -4208,17 +4208,17 @@
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 339,
+          "line": 345,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 363,
+          "line": 369,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 751,
+          "line": 757,
           "kind": "custom-event-listener"
         },
         {
@@ -5094,13 +5094,13 @@
         },
         {
           "file": "modules/renderer/side-chat/message-actions.js",
-          "line": 212,
+          "line": 216,
           "kind": "custom-event-listener",
           "match": "el.addEventListener('click'"
         },
         {
           "file": "modules/renderer/side-chat/message-actions.js",
-          "line": 261,
+          "line": 265,
           "kind": "custom-event-listener",
           "match": "doc.addEventListener('click'"
         },
@@ -5766,19 +5766,19 @@
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 339,
+          "line": 345,
           "kind": "custom-event-listener",
           "match": "more.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 363,
+          "line": 369,
           "kind": "custom-event-listener",
           "match": "head.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 751,
+          "line": 757,
           "kind": "custom-event-listener",
           "match": "item.addEventListener('click'"
         },
@@ -7290,7 +7290,7 @@
         },
         {
           "file": "modules/renderer/side-chat/message-actions.js",
-          "line": 260,
+          "line": 264,
           "kind": "custom-event-listener"
         },
         {
@@ -7421,7 +7421,7 @@
         },
         {
           "file": "modules/renderer/side-chat/message-actions.js",
-          "line": 260,
+          "line": 264,
           "kind": "custom-event-listener",
           "match": "root?.addEventListener('contextmenu'"
         },
@@ -15394,7 +15394,7 @@
         },
         {
           "file": "modules/renderer/side-chat/message-actions.js",
-          "line": 262,
+          "line": 266,
           "kind": "custom-event-listener"
         },
         {
@@ -15539,7 +15539,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 364,
+          "line": 370,
           "kind": "custom-event-listener"
         },
         {
@@ -15729,7 +15729,7 @@
         },
         {
           "file": "modules/renderer/side-chat/message-actions.js",
-          "line": 262,
+          "line": 266,
           "kind": "custom-event-listener",
           "match": "doc.addEventListener('keydown'"
         },
@@ -15903,7 +15903,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 364,
+          "line": 370,
           "kind": "custom-event-listener",
           "match": "head.addEventListener('keydown'"
         },
@@ -21585,14 +21585,14 @@
       "consumers": [
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 872,
+          "line": 885,
           "kind": "preload-subscription"
         }
       ],
       "evidence": [
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 872,
+          "line": 885,
           "kind": "preload-subscription",
           "match": "api?.onModelTrajectoryChanged("
         }
diff --git a/modules/renderer/side-chat/message-actions.js b/modules/renderer/side-chat/message-actions.js
index 614184a64..b668a0b74 100644
--- a/modules/renderer/side-chat/message-actions.js
+++ b/modules/renderer/side-chat/message-actions.js
@@ -167,7 +167,11 @@ export function createSideChatMessageActions({
 
         const commands = win?.VCPContributions?.commands;
         if (isAssistant && message.id && commands?.get('sidepane.open-trajectory')) {
-            add('trajectory', 'fa-route', '查看调用轨迹', () => commands.execute('sidepane.open-trajectory', { requestId: message.id }));
+            // 这条回复记在子话题下，轨迹要看子话题，不是主聊天当前的话题
+            const conversation = descriptor?.child?.itemId && descriptor.child.topicId
+                ? { item: { id: descriptor.child.itemId, name: descriptor.title || '辅助对话' }, topicId: descriptor.child.topicId }
+                : null;
+            add('trajectory', 'fa-route', '查看调用轨迹', () => commands.execute('sidepane.open-trajectory', { requestId: message.id, conversation }));
         }
 
         if (message.id && typeof removeMessage === 'function' && typeof saveHistory === 'function' && !unfinished && !busy) {
diff --git a/modules/renderer/sidePaneCommands.js b/modules/renderer/sidePaneCommands.js
index e3cb53463..3378b76d0 100644
--- a/modules/renderer/sidePaneCommands.js
+++ b/modules/renderer/sidePaneCommands.js
@@ -1,7 +1,7 @@
 /*
  * 侧栏对外提供的动作，登记成命令：
  *   sidepane.open-tab          打开（或回到）一个标签，参数同 controller.openTab
- *   sidepane.open-trajectory   打开调用轨迹并定位到某次请求 { requestId }
+ *   sidepane.open-trajectory   打开调用轨迹并定位到某次请求 { requestId, conversation }（conversation 指定会话，辅助对话用）
  *   notifications.toggle       开 / 关通知页
  *   projectforge.open          打开 V工程，可带 { projectId } 直接定位到那个工程
  * 别的模块（消息右键、代码块按钮、主进程转来的快捷键）只认命令 id，不再碰侧栏控制器或 window 上的全局函数。
diff --git a/modules/ui-system/side-pane/modelTrajectorySideProvider.js b/modules/ui-system/side-pane/modelTrajectorySideProvider.js
index 7eb59cecb..8d8e53685 100644
--- a/modules/ui-system/side-pane/modelTrajectorySideProvider.js
+++ b/modules/ui-system/side-pane/modelTrajectorySideProvider.js
@@ -61,17 +61,23 @@ export function createModelTrajectorySideProvider({
     const kind = 'model-trajectory';
     const win = doc.defaultView || window;
     const toast = (message, type = 'info') => uiHelper?.showToastNotification?.(message, type);
-    /** @type {Set<{focusCall: (requestId: string) => void}>} */
+    /** @type {Set<{show: (requestId: string | null) => void}>} */
     const instances = new Set();
     let requestedRequestId = null;
+    // 从辅助对话打开时看的是它的子话题（同 ZCode 打开时显式带上会话）；主聊天切换会话或从主聊天再打开时回到跟随主聊天
+    let pinnedConversation = null;
 
     return {
         kind,
 
-        /** 打开（或聚焦）调用轨迹标签；带 requestId（消息 id）时滚动到对应的那次调用。 */
-        async openModelTrajectoryTab({ requestId = null } = {}) {
+        /**
+         * 打开（或聚焦）调用轨迹标签；带 requestId（消息 id）时滚动到对应的那次调用。
+         * conversation（{ item: { id, name }, topicId }）指定要看的会话，不传就跟随主聊天当前会话。
+         */
+        async openModelTrajectoryTab({ requestId = null, conversation = null } = {}) {
             if (!sidePaneController) return null;
             requestedRequestId = requestId;
+            pinnedConversation = trajectoryKeyFor(conversation) ? conversation : null;
             const handle = await sidePaneController.openTab({
                 id: TAB_ID,
                 kind,
@@ -82,7 +88,7 @@ export function createModelTrajectorySideProvider({
                 searchHint: '模型调用 请求 响应 token 轨迹'
             });
             sidePaneController.setVisible?.(true);
-            if (requestId) for (const instance of instances) instance.focusCall(requestId);
+            for (const instance of instances) instance.show(requestId);
             handle?.focus?.();
             return handle;
         },
@@ -777,7 +783,7 @@ export function createModelTrajectorySideProvider({
 
             // ---------------------------------------------------------------- 数据
             const currentKey = () => {
-                const conversation = getConversation?.() || null;
+                const conversation = pinnedConversation || getConversation?.() || null;
                 conversationLabel = conversation?.item?.name || '';
                 return trajectoryKeyFor(conversation);
             };
@@ -850,7 +856,14 @@ export function createModelTrajectorySideProvider({
                 if (change.sessionKey === sessionKey || change.sessionKey === currentKey()) reloadWhenShown(scheduleReload);
             };
 
-            const instance = { focusCall: requestId => { focusRequestId = requestId; if (!loading) renderAll(); } };
+            const instance = {
+                show: requestId => {
+                    if (requestId) focusRequestId = requestId;
+                    // 换了要看的会话（比如从辅助对话打开）先读那个会话，读完再定位
+                    if (currentKey() !== sessionKey) void load();
+                    else if (!loading) renderAll();
+                }
+            };
             instances.add(instance);
             own.own(() => instances.delete(instance), 'focus-request-target');
             own.own(() => {
@@ -876,6 +889,7 @@ export function createModelTrajectorySideProvider({
             // 切换智能体 / 话题（包括删掉当前助手）都由主聊天通知，接上了就不用轮询
             own.subscribe(() => {
                 const off = onConversationChange?.(() => {
+                    pinnedConversation = null;
                     if (!disposed() && currentKey() !== sessionKey) reloadWhenShown(() => void load());
                 });
                 followsConversation = typeof off === 'function';
diff --git a/tests/side-chat-message-delete.test.mjs b/tests/side-chat-message-delete.test.mjs
index e83e2ee4c..1865c8e58 100644
--- a/tests/side-chat-message-delete.test.mjs
+++ b/tests/side-chat-message-delete.test.mjs
@@ -183,3 +183,20 @@ test('closing a side chat that has messages asks first, and keeps it when declin
     assert.deepEqual(await f.handle.requestClose(), { closed: true });
     assert.equal(f.confirms.length, 2);
 });
+
+test('view trajectory from a side reply asks for the child topic, not the main chat', async t => {
+    const f = await fixture(t);
+    const executed = [];
+    f.doc.defaultView.VCPContributions = { commands: {
+        get: id => id === 'sidepane.open-trajectory',
+        execute: (id, options) => executed.push([id, options])
+    } };
+    f.menu('answer');
+    f.doc.querySelector('[data-side-chat-action="trajectory"]').click();
+    assert.equal(executed.length, 1);
+    const [id, options] = executed[0];
+    assert.equal(id, 'sidepane.open-trajectory');
+    assert.equal(options.requestId, 'answer');
+    assert.equal(options.conversation.item.id, 'agent');
+    assert.equal(options.conversation.topicId, 'child');
+});
diff --git a/tests/side-pane-model-trajectory.test.mjs b/tests/side-pane-model-trajectory.test.mjs
index 37c5a6eb0..b16fde4e1 100644
--- a/tests/side-pane-model-trajectory.test.mjs
+++ b/tests/side-pane-model-trajectory.test.mjs
@@ -377,3 +377,28 @@ test('closing the trajectory tab while the push registration is pending leaves n
     assert.equal(env.state.lists.length, 0);
     assert.equal(env.view.innerHTML, '');
 });
+
+test('opening from a side chat reads the child topic and finds its reply; a main chat switch goes back to following', async () => {
+    const env = makeEnv({ recs: manyRecords(2) });
+    const handle = await env.provider.mountTab({ id: 'x' }, env.view);
+    assert.equal(env.state.lists.at(-1)[0], 'agent1__t1');
+
+    const child = { item: { id: 'agent1', name: '辅助对话 1' }, topicId: 'sidechat_1' };
+    await env.provider.openModelTrajectoryTab({ requestId: 'm1', conversation: child });
+    await wait(50);
+    assert.equal(env.state.lists.at(-1)[0], 'agent1__sidechat_1');
+    assert.ok(env.view.querySelectorAll('.side-traj-call')[1].classList.contains('flash'));
+    assert.equal(env.state.toasts.filter(text => /没有对应的调用记录/.test(text)).length, 0);
+
+    env.state.conversation = { item: { id: 'agent2', name: '另一个' }, topicId: 't9' };
+    env.state.conversationListeners[0]();
+    await wait(50);
+    assert.equal(env.state.lists.at(-1)[0], 'agent2__t9');
+
+    await env.provider.openModelTrajectoryTab({ requestId: 'm0', conversation: child });
+    await wait(50);
+    await env.provider.openModelTrajectoryTab();
+    await wait(50);
+    assert.equal(env.state.lists.at(-1)[0], 'agent2__t9', 'opening from the main chat follows the main chat again');
+    await handle.dispose();
+});

From f67b7409b04ec20effee81fa69d84f92f77afcc3 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 01:24:27 +0000
Subject: [PATCH 044/143] UI system gate: take the integration branch's tool
 card and components.css fix

The base now carries upstream #234, whose components.css falls back to a
literal colour, so check:ui-system was red again on the merge. Both files
now match 2200d128 on the integration branch (#2), which fixes that and
scopes the tool card styles, so the two branches merge without a conflict.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DFRovoZHMzeheXKkLNWKG
---
 styles/ui-system/components.css        |   4 +-
 styles/ui-system/tool-presentation.css | 196 ++++++++++++-------------
 2 files changed, 100 insertions(+), 100 deletions(-)

diff --git a/styles/ui-system/components.css b/styles/ui-system/components.css
index 418b7df8b..ddff52098 100644
--- a/styles/ui-system/components.css
+++ b/styles/ui-system/components.css
@@ -541,8 +541,8 @@
     }
 
     :is(html, html.vcp-global-settings-host) .vcp-ui-scope .vcp-ui-window-control-pin.is-pinned {
-        color: var(--vcp-ui-primary, #6366f1);
-        background: var(--vcp-ui-primary-bg, rgba(99, 102, 241, 0.16));
+        color: var(--vcp-ui-accent);
+        background: color-mix(in srgb, var(--vcp-ui-accent) 16%, transparent);
     }
 
     :is(html, html.vcp-global-settings-host) .vcp-ui-scope .vcp-ui-window-control-pin.is-pinned .vcp-ui-icon,
diff --git a/styles/ui-system/tool-presentation.css b/styles/ui-system/tool-presentation.css
index 38f0ec98a..be8a90316 100644
--- a/styles/ui-system/tool-presentation.css
+++ b/styles/ui-system/tool-presentation.css
@@ -1,12 +1,12 @@
 /* Optional presentation; Legacy is untouched. Theme and typography stay owned
  * by the existing appearance profile, including role wallpapers. */
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="compact"],
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="grouped"] {
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="compact"],
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="grouped"] {
     --vcp-tool-row-height: 38px;
 }
-html[data-ui-mode="next"][data-vcp-density="compact"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] { --vcp-tool-row-height: 32px; }
-html[data-ui-mode="next"][data-vcp-density="relaxed"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] { --vcp-tool-row-height: 44px; }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] .vcp-tool-presented {
+html[data-ui-mode="next"][data-vcp-density="compact"] .vcp-ui-scope [data-vcp-tool-presentation] { --vcp-tool-row-height: 32px; }
+html[data-ui-mode="next"][data-vcp-density="relaxed"] .vcp-ui-scope [data-vcp-tool-presentation] { --vcp-tool-row-height: 44px; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented {
     --vcp-tool-presented-font-family: var(--vcp-tool-card-font-family, var(--vcp-chat-font-family));
     --vcp-tool-presented-font-size: var(--vcp-ui-text-caption, 13px);
     --vcp-tool-presented-white-space: normal;
@@ -32,11 +32,11 @@ html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] .vc
     color: var(--vcp-ui-text-primary);
     font-family: var(--vcp-tool-card-font-family, inherit);
 }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] .vcp-tool-presented::before,
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] .vcp-tool-presented::after { display: none; }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-summary,
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-result-header,
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-call-summary-header {
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented::before,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented::after { display: none; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-summary,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-result-header,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-call-summary-header {
     display: flex;
     gap: 5px;
     padding: 0;
@@ -47,7 +47,7 @@ html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] .vc
     min-width: 0;
     flex-wrap: nowrap;
 }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-row-toggle, html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-process-toggle {
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-toggle, html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-toggle {
     display: flex;
     width: 100%;
     min-width: 0;
@@ -65,13 +65,13 @@ html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-row-toggle, html[data-
     cursor: pointer;
     text-align: left;
 }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-result-header > .vcp-tool-row-toggle {
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-result-header > .vcp-tool-row-toggle {
     width: auto;
     flex: 1;
 }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-row-toggle:hover, html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-process-toggle:hover { background: var(--vcp-ui-bg-2); }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-row-toggle:focus-visible, html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-process-toggle:focus-visible, html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-process-artifact:focus-visible { outline: 2px solid var(--vcp-ui-accent); outline-offset: -2px; }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-row-chevron {
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-toggle:hover, html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-toggle:hover { background: var(--vcp-ui-bg-2); }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-toggle:focus-visible, html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-toggle:focus-visible, html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-artifact:focus-visible { outline: 2px solid var(--vcp-ui-accent); outline-offset: -2px; }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-chevron {
     width: 7px;
     height: 7px;
     flex: 0 0 7px;
@@ -79,44 +79,44 @@ html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-row-chevron {
     border-bottom: 1.5px solid currentColor;
     transform: rotate(-45deg);
 }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [aria-expanded="true"] > .vcp-tool-row-chevron { transform: rotate(45deg); }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-row-title { overflow-wrap: anywhere; min-width: 0; color: var(--vcp-ui-text-primary); }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-row-resource { overflow-wrap: anywhere; min-width: 0; font-size: var(--vcp-ui-text-sm, 12px); }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-row-state { margin-left: auto; white-space: nowrap; font-size: var(--vcp-ui-text-sm, 12px); }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-state="success"] .vcp-tool-row-state { color: var(--vcp-ui-success); }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-state="failed"] .vcp-tool-row-state { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-state="waiting"] .vcp-tool-row-state,
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-state="stopped"] .vcp-tool-row-state { color: var(--vcp-ui-warning, var(--vcp-ui-palette-amber)); }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-state="running"] .vcp-tool-row-state { color: var(--vcp-ui-accent); }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-delete-btn { flex: 0 0 24px; margin-right: 6px; opacity: 0; }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-header:hover .vcp-tool-result-delete-btn,
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-header:focus-within .vcp-tool-result-delete-btn { opacity: 1; }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="compact"] .vcp-role-divider,
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="grouped"] .vcp-role-divider { margin: 4px 0; font-size: calc(var(--vcp-ui-text-sm, 12px) - 1px); }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-details { max-height: 360px; overflow: auto; }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-details,
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-result-collapsible-content,
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-call-summary-content {
+html[data-ui-mode="next"] .vcp-ui-scope [aria-expanded="true"] > .vcp-tool-row-chevron { transform: rotate(45deg); }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-title { overflow-wrap: anywhere; min-width: 0; color: var(--vcp-ui-text-primary); }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-resource { overflow-wrap: anywhere; min-width: 0; font-size: var(--vcp-ui-text-sm, 12px); }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-state { margin-left: auto; white-space: nowrap; font-size: var(--vcp-ui-text-sm, 12px); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-state="success"] .vcp-tool-row-state { color: var(--vcp-ui-success); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-state="failed"] .vcp-tool-row-state { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-state="waiting"] .vcp-tool-row-state,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-state="stopped"] .vcp-tool-row-state { color: var(--vcp-ui-warning, var(--vcp-ui-palette-amber)); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-state="running"] .vcp-tool-row-state { color: var(--vcp-ui-accent); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-delete-btn { flex: 0 0 24px; margin-right: 6px; opacity: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-header:hover .vcp-tool-result-delete-btn,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-header:focus-within .vcp-tool-result-delete-btn { opacity: 1; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="compact"] .vcp-role-divider,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="grouped"] .vcp-role-divider { margin: 4px 0; font-size: var(--vcp-ui-text-xs, 11px); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-details { max-height: 360px; overflow: auto; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-details,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-result-collapsible-content,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-call-summary-content {
     margin: 0;
     padding: 6px 12px 12px 28px;
     background: transparent;
     border: 0;
     min-width: 0;
 }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-details,
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-result-collapsible-content,
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-call-summary-content { display: none; }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-details,
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-result-collapsible-content,
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-call-summary-content { display: block; }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation] .vcp-tool-presented pre {
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-details,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-result-collapsible-content,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-call-summary-content { display: none; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-details,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-result-collapsible-content,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-call-summary-content { display: block; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented pre {
     white-space: pre-wrap;
     overflow-wrap: anywhere;
     min-width: 0;
     max-height: 320px;
     overflow: auto;
 }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-process {
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process {
     border: 1px solid var(--vcp-ui-border);
     border-radius: var(--vcp-ui-radius-md, 8px);
     margin: 10px 0;
@@ -124,12 +124,12 @@ html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-process {
     overflow: hidden;
     background: var(--vcp-ui-bg-0);
 }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-process-toggle { background: var(--vcp-ui-bg-1); border-radius: 0; }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-process-title { min-width: 0; overflow-wrap: anywhere; }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-process-stats { margin-left: auto; font-size: var(--vcp-ui-text-sm, 12px); overflow-wrap: anywhere; }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-process-body[hidden] { display: none; }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-process-body > .vcp-tool-presented { margin: 0; border-top: 1px solid var(--vcp-ui-border); }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-process-artifact {
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-toggle { background: var(--vcp-ui-bg-1); border-radius: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-title { min-width: 0; overflow-wrap: anywhere; }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-stats { margin-left: auto; font-size: var(--vcp-ui-text-sm, 12px); overflow-wrap: anywhere; }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-body[hidden] { display: none; }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-body > .vcp-tool-presented { margin: 0; border-top: 1px solid var(--vcp-ui-border); }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-artifact {
     color: var(--vcp-ui-text-accent);
     background: transparent;
     border: 0;
@@ -142,20 +142,20 @@ html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-process-artifact {
     cursor: pointer;
 }
 @media (max-width: 640px) {
-    html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-row-toggle { flex-wrap: wrap; gap: 6px; }
-    html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-row-state { margin-left: auto; }
-    html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-process-toggle { flex-wrap: wrap; }
-    html[data-ui-mode="next"] :where(.vcp-ui-scope) .vcp-tool-process-stats { margin-left: 16px; }
+    html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-toggle { flex-wrap: wrap; gap: 6px; }
+    html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-state { margin-left: auto; }
+    html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-toggle { flex-wrap: wrap; }
+    html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-stats { margin-left: 16px; }
 }
 
 /* 单行合并 / 整轮折叠：无框单行，一次调用一行；紧跟的同名结果收进请求行，展开后才显示。 */
-html[data-ui-mode="next"] :where(.vcp-ui-scope) :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) {
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) {
     --vcp-tool-call-color: var(--vcp-ui-text-3, var(--vcp-ui-text-secondary));
     --vcp-tool-call-hover: var(--vcp-ui-text-2, var(--vcp-ui-text-secondary));
 }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-role-divider { margin: 4px 0; font-size: calc(var(--vcp-ui-text-sm, 12px) - 1px); }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-presented { margin: 2px 0; }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) {
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-role-divider { margin: 4px 0; font-size: var(--vcp-ui-text-xs, 11px); }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-presented { margin: 2px 0; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) {
     width: auto;
     max-width: 100%;
     min-height: 24px;
@@ -168,10 +168,10 @@ html[data-ui-mode="next"] :where(.vcp-ui-scope) :is([data-vcp-tool-presentation=
     color: var(--vcp-tool-call-color);
     transition: color .1s;
 }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle):hover { background: transparent; color: var(--vcp-tool-call-hover); }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle .vcp-tool-row-title, .vcp-tool-process-title) { flex: none; color: inherit; white-space: nowrap; }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-process-stats { min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; overflow-wrap: normal; }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-toggle .vcp-tool-row-resource {
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle):hover { background: transparent; color: var(--vcp-tool-call-hover); }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle .vcp-tool-row-title, .vcp-tool-process-title) { flex: none; color: inherit; white-space: nowrap; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-process-stats { min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; overflow-wrap: normal; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-toggle .vcp-tool-row-resource {
     min-width: 0;
     overflow: hidden;
     text-overflow: ellipsis;
@@ -179,20 +179,20 @@ html[data-ui-mode="next"] :where(.vcp-ui-scope) :is([data-vcp-tool-presentation=
     overflow-wrap: normal;
     font-size: inherit;
 }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-toggle .vcp-tool-row-state { flex: none; margin-left: 0; color: inherit; }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-icon { display: inline-flex; flex: none; width: 16px; height: 16px; }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-icon svg { width: 100%; height: 100%; }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-diff { flex: none; font-family: var(--vcp-ui-font-mono, ui-monospace, Consolas, monospace); font-size: calc(var(--vcp-ui-text-sm, 12px) - 1px); }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle:hover, [aria-expanded="true"]) .vcp-tool-row-diff-add { color: var(--vcp-ui-success); }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle:hover, [aria-expanded="true"]) .vcp-tool-row-diff-del { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-toggle .vcp-tool-row-state { flex: none; margin-left: 0; color: inherit; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-icon { display: inline-flex; flex: none; width: 16px; height: 16px; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-icon svg { width: 100%; height: 100%; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-diff { flex: none; font-family: var(--vcp-ui-font-mono, ui-monospace, Consolas, monospace); font-size: var(--vcp-ui-text-xs, 11px); }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle:hover, [aria-expanded="true"]) .vcp-tool-row-diff-add { color: var(--vcp-ui-success); }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle:hover, [aria-expanded="true"]) .vcp-tool-row-diff-del { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
 /* 并入请求行的结果：收起时不占位，展开后只留一个小标题“输出”。
- * 旧层给结果气泡写了 display:block 并加了强制优先级，这里只能藏标题、去掉外边距，正文由上面的收起规则隐藏。 */
-html[data-ui-mode="next"] :where(.vcp-ui-scope) :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"]:not(.expanded) { margin: 0; }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"]:not(.expanded) > .vcp-tool-result-header { display: none; }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"] .vcp-tool-row-toggle { min-height: 20px; padding-left: 24px; font-size: var(--vcp-ui-text-sm, 12px); }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-presented > :is(.vcp-tool-details, .vcp-tool-result-collapsible-content, .vcp-tool-call-summary-content) { padding: 8px 0 4px 24px; }
+ * 旧层给结果气泡写了强制的 display:block（important 级），这里只能藏标题、去掉外边距，正文由上面的收起规则隐藏。 */
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"]:not(.expanded) { margin: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"]:not(.expanded) > .vcp-tool-result-header { display: none; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"] .vcp-tool-row-toggle { min-height: 20px; padding-left: 24px; font-size: var(--vcp-ui-text-sm, 12px); }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-presented > :is(.vcp-tool-details, .vcp-tool-result-collapsible-content, .vcp-tool-call-summary-content) { padding: 8px 0 4px 24px; }
 /* 等待结果时动作词的微光，只在回复生成中出现。 */
-html[data-ui-mode="next"] :where(.vcp-ui-scope) .message-item.streaming :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-pending="true"] .vcp-tool-row-title {
+html[data-ui-mode="next"] .vcp-ui-scope .message-item.streaming :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-pending="true"] .vcp-tool-row-title {
     background: linear-gradient(90deg, var(--vcp-tool-call-color) 0%, var(--vcp-ui-text-primary) 50%, var(--vcp-tool-call-color) 100%);
     background-size: 200% 100%;
     -webkit-background-clip: text;
@@ -202,33 +202,33 @@ html[data-ui-mode="next"] :where(.vcp-ui-scope) .message-item.streaming :is([dat
 }
 @keyframes vcp-tool-call-shimmer { from { background-position: 100% 0; } to { background-position: -100% 0; } }
 @media (prefers-reduced-motion: reduce) {
-    html[data-ui-mode="next"] :where(.vcp-ui-scope) .message-item.streaming :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-pending="true"] .vcp-tool-row-title { animation: none; }
+    html[data-ui-mode="next"] .vcp-ui-scope .message-item.streaming :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-pending="true"] .vcp-tool-row-title { animation: none; }
 }
 
 /* 单行合并：动作词加粗，箭头在行尾、悬停或展开时出现；问题状态用虚线下划线，悬停看报错。 */
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) { font-size: var(--vcp-ui-text-body, 14px); }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle .vcp-tool-row-title, .vcp-tool-process-title) { font-weight: 500; }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) > .vcp-tool-row-chevron { order: 1; opacity: 0; transition: opacity .2s, transform .2s; }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle):is(:hover, [aria-expanded="true"]) > .vcp-tool-row-chevron { opacity: 1; }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="inline"] [data-vcp-tool-call-state] .vcp-tool-row-state { text-decoration: underline dotted; text-underline-offset: 2px; cursor: help; }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] { margin: 2px 0; border: 0; border-radius: 0; background: transparent; overflow: visible; }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] .vcp-tool-process-stats { margin-left: 0; font-size: inherit; }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-body { margin: 4px 0 4px 8px; padding-left: 14px; border-left: 1px solid var(--vcp-ui-border); }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-body > .vcp-tool-presented { margin: 2px 0; border-top: 0; }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-artifact { border-top: 0; padding: 4px 0 4px 22px; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) { font-size: var(--vcp-ui-text-body, 14px); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle .vcp-tool-row-title, .vcp-tool-process-title) { font-weight: 500; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) > .vcp-tool-row-chevron { order: 1; opacity: 0; transition: opacity .2s, transform .2s; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle):is(:hover, [aria-expanded="true"]) > .vcp-tool-row-chevron { opacity: 1; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] [data-vcp-tool-call-state] .vcp-tool-row-state { text-decoration: underline dotted; text-underline-offset: 2px; cursor: help; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] { margin: 2px 0; border: 0; border-radius: 0; background: transparent; overflow: visible; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] .vcp-tool-process-stats { margin-left: 0; font-size: inherit; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-body { margin: 4px 0 4px 8px; padding-left: 14px; border-left: 1px solid var(--vcp-ui-border); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-body > .vcp-tool-presented { margin: 2px 0; border-top: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-artifact { border-top: 0; padding: 4px 0 4px 22px; }
 
 /* 整轮折叠：图标悬停换成箭头，标题与摘要之间用小圆点分隔，失败时摘要显示红色报错首行。 */
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle { gap: 0; font-size: var(--vcp-ui-text-caption, 13px); }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="process"] .vcp-tool-row-leading { position: relative; display: inline-flex; flex: none; width: 16px; height: 16px; margin-right: 6px; align-items: center; justify-content: center; }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="process"] .vcp-tool-row-leading .vcp-tool-row-icon { width: 14px; height: 14px; transition: opacity .1s; }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="process"] .vcp-tool-row-leading .vcp-tool-row-chevron { position: absolute; inset: 0; margin: auto; opacity: 0; }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle:is(:hover, [aria-expanded="true"]) .vcp-tool-row-leading .vcp-tool-row-icon { opacity: 0; }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle:is(:hover, [aria-expanded="true"]) .vcp-tool-row-leading .vcp-tool-row-chevron { opacity: 1; }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="process"] .vcp-tool-row-dot { flex: none; width: 2px; height: 2px; margin: 0 8px; border-radius: 1px; background: currentColor; opacity: .7; }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle :is(.vcp-tool-row-state, .vcp-tool-row-diff) { margin-left: 10px; }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="process"] [data-vcp-tool-call-state="failed"] .vcp-tool-row-toggle .vcp-tool-row-resource { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] { margin: 4px 0 10px; border: 0; border-radius: 0; background: transparent; overflow: visible; }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-toggle {
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle { gap: 0; font-size: var(--vcp-ui-text-caption, 13px); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-leading { position: relative; display: inline-flex; flex: none; width: 16px; height: 16px; margin-right: 6px; align-items: center; justify-content: center; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-leading .vcp-tool-row-icon { width: 14px; height: 14px; transition: opacity .1s; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-leading .vcp-tool-row-chevron { position: absolute; inset: 0; margin: auto; opacity: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle:is(:hover, [aria-expanded="true"]) .vcp-tool-row-leading .vcp-tool-row-icon { opacity: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle:is(:hover, [aria-expanded="true"]) .vcp-tool-row-leading .vcp-tool-row-chevron { opacity: 1; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-dot { flex: none; width: 2px; height: 2px; margin: 0 8px; border-radius: 1px; background: currentColor; opacity: .7; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle :is(.vcp-tool-row-state, .vcp-tool-row-diff) { margin-left: 10px; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] [data-vcp-tool-call-state="failed"] .vcp-tool-row-toggle .vcp-tool-row-resource { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] { margin: 4px 0 10px; border: 0; border-radius: 0; background: transparent; overflow: visible; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-toggle {
     width: 100%;
     min-height: 33px;
     padding: 0 0 8px;
@@ -236,8 +236,8 @@ html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="pro
     border-bottom: .5px solid var(--vcp-ui-border);
     font-size: var(--vcp-ui-text-body, 14px);
 }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-toggle > .vcp-tool-row-chevron { order: 1; }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] .vcp-tool-process-stats { margin-left: 0; color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-body { padding-top: 8px; }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-body > .vcp-tool-presented { margin: 2px 0; border-top: 0; }
-html[data-ui-mode="next"] :where(.vcp-ui-scope) [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-artifact { border-top: 0; padding: 6px 0; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-toggle > .vcp-tool-row-chevron { order: 1; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] .vcp-tool-process-stats { margin-left: 0; color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-body { padding-top: 8px; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-body > .vcp-tool-presented { margin: 2px 0; border-top: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-artifact { border-top: 0; padding: 6px 0; }

From 2eb5587152a32fdcf8299fc3aeb4a0044ff43e77 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 01:25:55 +0000
Subject: [PATCH 045/143] Contracts: regenerate the chat event graph after
 merging the latest #4 and #5

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01UCGGgmHsCToooXTgSXpmq9
---
 .../contracts/generated/chat-event-graph.json | 72 +++++++++----------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 041c1689c..eedcfe423 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -3545,17 +3545,17 @@
         },
         {
           "file": "modules/messageRenderer.js",
-          "line": 3438,
+          "line": 3429,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/messageRenderer.js",
-          "line": 3497,
+          "line": 3488,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/messageRenderer.js",
-          "line": 3535,
+          "line": 3526,
           "kind": "custom-event-listener"
         },
         {
@@ -3640,12 +3640,12 @@
         },
         {
           "file": "modules/renderer/side-chat/message-actions.js",
-          "line": 212,
+          "line": 216,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/renderer/side-chat/message-actions.js",
-          "line": 261,
+          "line": 265,
           "kind": "custom-event-listener"
         },
         {
@@ -4205,17 +4205,17 @@
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 339,
+          "line": 345,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 363,
+          "line": 369,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 751,
+          "line": 757,
           "kind": "custom-event-listener"
         },
         {
@@ -4325,17 +4325,17 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1077,
+          "line": 1144,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1083,
+          "line": 1150,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1097,
+          "line": 1164,
           "kind": "custom-event-listener"
         },
         {
@@ -4982,19 +4982,19 @@
         },
         {
           "file": "modules/messageRenderer.js",
-          "line": 3438,
+          "line": 3429,
           "kind": "custom-event-listener",
           "match": "attachmentElement.addEventListener('click'"
         },
         {
           "file": "modules/messageRenderer.js",
-          "line": 3497,
+          "line": 3488,
           "kind": "custom-event-listener",
           "match": "attachmentElement.addEventListener('click'"
         },
         {
           "file": "modules/messageRenderer.js",
-          "line": 3535,
+          "line": 3526,
           "kind": "custom-event-listener",
           "match": "removeBtn.addEventListener('click'"
         },
@@ -5096,13 +5096,13 @@
         },
         {
           "file": "modules/renderer/side-chat/message-actions.js",
-          "line": 212,
+          "line": 216,
           "kind": "custom-event-listener",
           "match": "el.addEventListener('click'"
         },
         {
           "file": "modules/renderer/side-chat/message-actions.js",
-          "line": 261,
+          "line": 265,
           "kind": "custom-event-listener",
           "match": "doc.addEventListener('click'"
         },
@@ -5774,19 +5774,19 @@
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 339,
+          "line": 345,
           "kind": "custom-event-listener",
           "match": "more.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 363,
+          "line": 369,
           "kind": "custom-event-listener",
           "match": "head.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 751,
+          "line": 757,
           "kind": "custom-event-listener",
           "match": "item.addEventListener('click'"
         },
@@ -5918,19 +5918,19 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1077,
+          "line": 1144,
           "kind": "custom-event-listener",
           "match": "toggleNotificationsBtn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1083,
+          "line": 1150,
           "kind": "custom-event-listener",
           "match": "expandButton.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1097,
+          "line": 1164,
           "kind": "custom-event-listener",
           "match": "closeSidePaneBtn.addEventListener('click'"
         },
@@ -7270,7 +7270,7 @@
         },
         {
           "file": "modules/messageRenderer.js",
-          "line": 3439,
+          "line": 3430,
           "kind": "custom-event-listener"
         },
         {
@@ -7285,7 +7285,7 @@
         },
         {
           "file": "modules/renderer/side-chat/message-actions.js",
-          "line": 260,
+          "line": 264,
           "kind": "custom-event-listener"
         },
         {
@@ -7398,7 +7398,7 @@
         },
         {
           "file": "modules/messageRenderer.js",
-          "line": 3439,
+          "line": 3430,
           "kind": "custom-event-listener",
           "match": "attachmentElement.addEventListener('contextmenu'"
         },
@@ -7416,7 +7416,7 @@
         },
         {
           "file": "modules/renderer/side-chat/message-actions.js",
-          "line": 260,
+          "line": 264,
           "kind": "custom-event-listener",
           "match": "root?.addEventListener('contextmenu'"
         },
@@ -15367,7 +15367,7 @@
         },
         {
           "file": "modules/renderer/side-chat/message-actions.js",
-          "line": 262,
+          "line": 266,
           "kind": "custom-event-listener"
         },
         {
@@ -15512,7 +15512,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 364,
+          "line": 370,
           "kind": "custom-event-listener"
         },
         {
@@ -15702,7 +15702,7 @@
         },
         {
           "file": "modules/renderer/side-chat/message-actions.js",
-          "line": 262,
+          "line": 266,
           "kind": "custom-event-listener",
           "match": "doc.addEventListener('keydown'"
         },
@@ -15876,7 +15876,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 364,
+          "line": 370,
           "kind": "custom-event-listener",
           "match": "head.addEventListener('keydown'"
         },
@@ -21547,14 +21547,14 @@
       "consumers": [
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 872,
+          "line": 885,
           "kind": "preload-subscription"
         }
       ],
       "evidence": [
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 872,
+          "line": 885,
           "kind": "preload-subscription",
           "match": "api?.onModelTrajectoryChanged("
         }
@@ -24969,7 +24969,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1117,
+          "line": 1184,
           "kind": "custom-event-listener"
         },
         {
@@ -25063,7 +25063,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1117,
+          "line": 1184,
           "kind": "custom-event-listener",
           "match": "win?.addEventListener?.('resize'"
         },
@@ -32597,7 +32597,7 @@
     },
     {
       "file": "modules/messageRenderer.js",
-      "line": 3328,
+      "line": 3319,
       "reason": "dynamic listener name: type",
       "kind": "custom-event-listener",
       "match": "target.addEventListener(type",
@@ -32861,7 +32861,7 @@
     },
     {
       "file": "modules/ui-system/side-pane/browserSideProvider.js",
-      "line": 279,
+      "line": 281,
       "reason": "dynamic listener name: name",
       "kind": "custom-event-listener",
       "match": "guest.addEventListener(name",

From 06961e4b868fedf22a4638f8bd8f9d58c5d467d0 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 01:27:50 +0000
Subject: [PATCH 046/143] Leak test: count listeners, intervals and observers
 that bypass own.*

The cycle test only counted resources registered through the lifecycle
owner, so a stray doc.addEventListener in a provider passed all 452 tests.
The fixture now also counts live listeners on document and window, open
setInterval handles and observing MutationObservers. Swapping the trajectory
tab's own.listen(doc, 'click') for a bare addEventListener now fails both
cycle tests (4 -> 24 listeners). Browser and code viewer tabs join the
cycle, so every lazily mounted tab type except side chat is covered.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DFRovoZHMzeheXKkLNWKG
---
 tests/side-pane-leak.test.mjs | 59 +++++++++++++++++++++++++++++++++--
 1 file changed, 57 insertions(+), 2 deletions(-)

diff --git a/tests/side-pane-leak.test.mjs b/tests/side-pane-leak.test.mjs
index 05872b158..6f2d5d48b 100644
--- a/tests/side-pane-leak.test.mjs
+++ b/tests/side-pane-leak.test.mjs
@@ -8,6 +8,8 @@ import { createTerminalSideProvider } from '../modules/ui-system/side-pane/termi
 import { createPlanDetailSideProvider } from '../modules/ui-system/side-pane/planDetailSideProvider.js';
 import { createModelTrajectorySideProvider } from '../modules/ui-system/side-pane/modelTrajectorySideProvider.js';
 import { createToolOutputSideProvider } from '../modules/ui-system/side-pane/toolOutputSideProvider.js';
+import { createBrowserSideProvider } from '../modules/ui-system/side-pane/browserSideProvider.js';
+import { createCodeViewerSideProvider } from '../modules/ui-system/side-pane/codeViewerSideProvider.js';
 import { getProjectForgeChangesSource } from '../modules/ui-system/sources/projectforge-changes.js';
 import { getCommandRunsSource } from '../modules/ui-system/sources/terminal-command-runs.js';
 
@@ -17,6 +19,51 @@ const settle = async () => {
     await new Promise(resolve => setTimeout(resolve, 0));
 };
 
+/**
+ * 不经过 own.* 的资源也要数到：document / window 上的活监听、没清掉的 setInterval、没 disconnect 的 MutationObserver。
+ * 只数这些长寿目标：挂在已移除视图节点上的监听随节点一起丢弃，不算泄漏。
+ */
+function instrument(win) {
+    const live = new Set();
+    const keyOf = (target, type, listener, options) => {
+        const capture = typeof options === 'boolean' ? options : Boolean(options?.capture);
+        return `${target === win ? 'window' : 'document'}|${type}|${capture}|${listenerIds.get(listener) ?? listenerIds.set(listener, listenerIds.size).get(listener)}`;
+    };
+    const listenerIds = new Map();
+    const proto = win.EventTarget.prototype;
+    const add = proto.addEventListener;
+    const remove = proto.removeEventListener;
+    const watched = target => target === win || target === win.document;
+    proto.addEventListener = function (type, listener, options) {
+        if (listener && watched(this)) {
+            const key = keyOf(this, type, listener, options);
+            live.add(key);
+            options?.signal?.addEventListener?.('abort', () => live.delete(key), { once: true });
+        }
+        return add.call(this, type, listener, options);
+    };
+    proto.removeEventListener = function (type, listener, options) {
+        if (listener && watched(this)) live.delete(keyOf(this, type, listener, options));
+        return remove.call(this, type, listener, options);
+    };
+
+    const intervals = new Set();
+    for (const host of new Set([globalThis, win])) {
+        const setI = host.setInterval, clearI = host.clearInterval;
+        host.setInterval = (...args) => { const id = setI.apply(host, args); intervals.add(id); return id; };
+        host.clearInterval = id => { intervals.delete(id); return clearI.call(host, id); };
+    }
+
+    const observers = new Set();
+    const NativeObserver = win.MutationObserver;
+    win.MutationObserver = class extends NativeObserver {
+        observe(...args) { observers.add(this); return super.observe(...args); }
+        disconnect() { observers.delete(this); return super.disconnect(); }
+    };
+
+    return () => ({ globalListeners: live.size, intervals: intervals.size, mutationObservers: observers.size });
+}
+
 const PROJECT = {
     project: { id: 'p1', name: '工程', status: 'active', updated_at: '2026-09-30T01:00:00.000Z', root: 'C:\\w' },
     todos: [{ id: 1, title: '第一步', status: 'doing' }],
@@ -29,6 +76,7 @@ function fixture() {
             <div class="side-pane-tabs"></div>
             <div class="side-pane-content-container"></div>
         </aside></body>`, { pretendToBeVisual: true });
+    const unmanaged = instrument(dom.window);
     const doc = dom.window.document;
     const root = doc.getElementById('vcpSidePane');
     const listeners = new Map();
@@ -81,14 +129,19 @@ function fixture() {
         'plan-detail': createPlanDetailSideProvider({ document: doc, api, sidePaneController: controller, uiHelper: {} }),
         'model-trajectory': createModelTrajectorySideProvider({ document: doc, api, sidePaneController: controller, uiHelper: {},
             getConversation: () => ({ item: { id: 'agent1', name: 'A' }, topicId: 't1' }) }),
-        'tool-output': createToolOutputSideProvider({ document: doc, api, sidePaneController: controller, uiHelper: {} })
+        'tool-output': createToolOutputSideProvider({ document: doc, api, sidePaneController: controller, uiHelper: {} }),
+        browser: createBrowserSideProvider({ document: doc, api: null, sidePaneController: controller, notify: () => {} }),
+        'code-viewer': createCodeViewerSideProvider({ document: doc, api: null, uiHelper: null, sidePaneController: controller })
     };
     Object.entries(providers).forEach(([kind, provider]) => controller.registerProvider(kind, provider));
     const opens = {
         terminal: () => providers.terminal.openTerminalTab(),
         'plan-detail': () => providers['plan-detail'].openPlanDetailTab({ projectId: 'p1', projectName: '工程' }),
         'model-trajectory': () => providers['model-trajectory'].openModelTrajectoryTab(),
-        'tool-output': () => providers['tool-output'].openToolOutputTab()
+        'tool-output': () => providers['tool-output'].openToolOutputTab(),
+        browser: () => controller.openTab({ id: 'browser:leak', kind: 'browser', title: '浏览器', closable: true, scopeMode: 'global',
+            payload: { url: 'https://example.com/' } }),
+        'code-viewer': () => providers['code-viewer'].openViewer({ filePath: 'C:\\w\\a.js', code: 'const a = 1;\n' })
     };
 
     const { diagnostics } = globalThis.VCPLifecycle;
@@ -100,6 +153,7 @@ function fixture() {
         sourcesRunning: globalThis.VCPSharedSources.diagnostics().filter(s => s.running || s.polling).length,
         ipcListeners: [...listeners.values()].reduce((sum, n) => sum + n, 0),
         nodes: doc.body.querySelectorAll('*').length,
+        ...unmanaged(),
         views: controller.getViewResidency()
     });
     return { dom, controller, opens, calls, measure,
@@ -141,6 +195,7 @@ test(`views put to sleep and woken ${CYCLES} times leave nothing behind`, async
         for (const open of Object.values(h.opens)) await open();
         await settle();
         const ids = openTabIds(h.controller);
+        assert.equal(ids.length, Object.keys(h.opens).length, 'every tab type opened');
         // 只能有一个视图挂着：切到哪个标签，别的都休眠
         for (const id of ids) { h.controller.activateTab(id); await settle(); }
         const baseline = h.measure();

From b38aa8bbae5513c03d1ece1e1a5d23a6a9773635 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 01:28:12 +0000
Subject: [PATCH 047/143] Code viewer picker: keyboard navigation and focus
 after opening a file

Opening a file collapsed the picker under the focused row, so focus fell
to body. Focus now returns to the picker toggle (which reports
aria-expanded), like a Radix Popover returning to its trigger. The list
no longer claims role=listbox over plain buttons, the filter has a name,
the open file is aria-current, and arrow keys move between the filter
and rows the way ZCode's cmdk file picker does.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_016hW799u5Ji5k9khDAwu688
---
 .../ui-system/side-pane/code-viewer/picker.js | 48 +++++++++++++++++--
 tests/side-pane-code-viewer.test.mjs          | 43 +++++++++++++++++
 2 files changed, 86 insertions(+), 5 deletions(-)

diff --git a/modules/ui-system/side-pane/code-viewer/picker.js b/modules/ui-system/side-pane/code-viewer/picker.js
index 39bfe5b5a..b7bf878b4 100644
--- a/modules/ui-system/side-pane/code-viewer/picker.js
+++ b/modules/ui-system/side-pane/code-viewer/picker.js
@@ -22,6 +22,11 @@ export function createCodeViewerPicker({
     // 监听挂在查看器这次挂载的 scope 上，标签释放时一起拆
     const on = (node, event, listener) => scope.listen(node, event, listener, undefined, `picker:${event}`);
 
+    function setCollapsed(collapsed) {
+        picker.classList.toggle('is-collapsed', collapsed);
+        pickerToggleBtn?.setAttribute('aria-expanded', String(!collapsed));
+    }
+
     async function setupPicker() {
         const wsSelect = doc.createElement('select');
         wsSelect.className = 'side-code-picker-select';
@@ -30,9 +35,11 @@ export function createCodeViewerPicker({
         filterInput.type = 'search';
         filterInput.className = 'side-code-picker-filter';
         filterInput.placeholder = '搜索文件名...';
+        filterInput.setAttribute('aria-label', '搜索文件名');
+        // 行是普通按钮，不是 option，所以不标 listbox；方向键导航见下面的 onListKeydown
         const list = doc.createElement('div');
         list.className = 'side-code-picker-list';
-        list.setAttribute('role', 'listbox');
+        list.setAttribute('aria-label', '文件');
         const note = doc.createElement('div');
         note.className = 'side-code-picker-note';
         picker.append(wsSelect, filterInput, list, note);
@@ -52,7 +59,10 @@ export function createCodeViewerPicker({
                 item.type = 'button';
                 item.className = 'side-code-picker-item';
                 item.dataset.path = rel;
-                if (rel === activePath) item.classList.add('active');
+                if (rel === activePath) {
+                    item.classList.add('active');
+                    item.setAttribute('aria-current', 'true');
+                }
                 const slash = rel.lastIndexOf('/');
                 const name = doc.createElement('span');
                 name.className = 'side-code-picker-name';
@@ -103,6 +113,8 @@ export function createCodeViewerPicker({
             store.currentCode = '';
             list.querySelectorAll('.side-code-picker-item').forEach((el) => {
                 el.classList.toggle('active', el.dataset.path === rel);
+                if (el.dataset.path === rel) el.setAttribute('aria-current', 'true');
+                else el.removeAttribute('aria-current');
             });
             setBodyMessage('加载文件中...');
             try {
@@ -130,7 +142,10 @@ export function createCodeViewerPicker({
                 } else {
                     store.currentCode = file.text || '';
                     renderCodeView();
-                    picker.classList.add('is-collapsed');
+                    // 收起会把焦点所在的行藏掉，焦点交给能再打开选择器的按钮（Radix Popover 关闭时也回到触发器）
+                    const hadFocus = picker.contains(doc.activeElement);
+                    setCollapsed(true);
+                    if (hadFocus) pickerToggleBtn?.focus?.();
                 }
             } catch (err) {
                 if (!isCurrent()) return;
@@ -153,10 +168,32 @@ export function createCodeViewerPicker({
             loadFiles();
         });
         on(filterInput, 'input', renderList);
+        // 搜索框 ↓ 进列表，列表里 ↑↓/Home/End 移动，第一行再按 ↑ 回搜索框（同 ZCode/cmdk 的文件选择）
+        const rows = () => Array.from(list.querySelectorAll('.side-code-picker-item'));
+        on(filterInput, 'keydown', (event) => {
+            if (event.key !== 'ArrowDown') return;
+            const first = rows()[0];
+            if (!first) return;
+            event.preventDefault();
+            first.focus();
+        });
+        on(list, 'keydown', (event) => {
+            if (!['ArrowDown', 'ArrowUp', 'Home', 'End'].includes(event.key)) return;
+            const items = rows();
+            const index = items.indexOf(event.target);
+            if (index < 0) return;
+            event.preventDefault();
+            if (event.key === 'ArrowUp' && index === 0) { filterInput.focus(); return; }
+            const next = event.key === 'Home' ? 0
+                : event.key === 'End' ? items.length - 1
+                    : Math.min(items.length - 1, Math.max(0, index + (event.key === 'ArrowDown' ? 1 : -1)));
+            items[next].focus();
+        });
         on(pickerToggleBtn, 'click', () => {
-            picker.classList.toggle('is-collapsed');
+            setCollapsed(!picker.classList.contains('is-collapsed'));
             if (!picker.classList.contains('is-collapsed')) filterInput.focus();
         });
+        setCollapsed(picker.classList.contains('is-collapsed'));
 
         setBodyMessage('请选择要查看的文件');
         if (typeof api?.gitListWorkspaces !== 'function' || typeof api?.sourceListFiles !== 'function') {
@@ -181,7 +218,8 @@ export function createCodeViewerPicker({
                 wsSelect.appendChild(opt);
             }
             const valid = (id) => workspaces.some((w) => w.id === id);
-            const saved = getStorage()?.getItem(SOURCE_WORKSPACE_KEY);
+            let saved = null;
+            try { saved = getStorage()?.getItem(SOURCE_WORKSPACE_KEY); } catch (_error) { /* Storage is optional. */ }
             const preferred = valid(saved) ? saved : res.data.activeWorkspaceId;
             wsSelect.value = valid(preferred) ? preferred : workspaces[0].id;
             activeWorkspaceId = wsSelect.value;
diff --git a/tests/side-pane-code-viewer.test.mjs b/tests/side-pane-code-viewer.test.mjs
index 34baf3515..43572bac8 100644
--- a/tests/side-pane-code-viewer.test.mjs
+++ b/tests/side-pane-code-viewer.test.mjs
@@ -166,6 +166,49 @@ test('replaced picker rows no longer trigger reads after filtering', async () =>
     }
 });
 
+test('workspace picker is keyboard usable and returns focus to its toggle after opening a file', async () => {
+    const dom = new JSDOM('<section id="view"></section>', { url: 'https://vcpchat.local/' });
+    const doc = dom.window.document;
+    const provider = createCodeViewerSideProvider({ document: doc, uiHelper: null, api: {
+        async gitListWorkspaces() { return { success: true, data: { workspaces: [{ id: 'w', path: '/repo' }], activeWorkspaceId: 'w' } }; },
+        async sourceListFiles() { return { success: true, data: { files: ['a.js', 'b.js'] } }; },
+        async sourceReadFile(_workspace, path) { return { success: true, data: { text: path } }; }
+    } });
+    const view = doc.getElementById('view');
+    doc.body.appendChild(view);
+    const handle = await provider.mountTab({ title: '代码', payload: {} }, view);
+    try {
+        const filter = view.querySelector('.side-code-picker-filter');
+        const list = view.querySelector('.side-code-picker-list');
+        const toggle = view.querySelector('[aria-label="选择文件"]');
+        assert.equal(filter.getAttribute('aria-label'), '搜索文件名');
+        assert.notEqual(list.getAttribute('role'), 'listbox', 'rows are buttons, not options');
+        assert.equal(toggle.getAttribute('aria-expanded'), 'true');
+
+        const key = (target, k) => target.dispatchEvent(new dom.window.KeyboardEvent('keydown', { key: k, bubbles: true, cancelable: true }));
+        filter.focus();
+        key(filter, 'ArrowDown');
+        assert.equal(doc.activeElement?.dataset.path, 'a.js');
+        key(doc.activeElement, 'ArrowDown');
+        assert.equal(doc.activeElement?.dataset.path, 'b.js');
+        key(doc.activeElement, 'Home');
+        key(doc.activeElement, 'ArrowUp');
+        assert.equal(doc.activeElement, filter);
+
+        key(filter, 'ArrowDown');
+        doc.activeElement.click();
+        await new Promise(resolve => setImmediate(resolve));
+        assert.equal(handle.getCode(), 'a.js');
+        assert.equal(view.querySelector('.side-code-picker').classList.contains('is-collapsed'), true);
+        assert.equal(toggle.getAttribute('aria-expanded'), 'false');
+        assert.equal(doc.activeElement, toggle, 'focus does not fall to body when the picker collapses');
+        assert.equal(view.querySelector('[data-path="a.js"]').getAttribute('aria-current'), 'true');
+    } finally {
+        handle.dispose();
+        dom.window.close();
+    }
+});
+
 function fileTab(filePath) {
     return { id: `code-viewer:${filePath}`, title: filePath.split('/').pop(), payload: { filePath } };
 }

From d322faf5b6fbc587f57d26609a846cc8a5a0a7de Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 01:30:52 +0000
Subject: [PATCH 048/143] Tests: replace source-text assertions with behaviour,
 drop CSS text pins
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Side sends leave the main topic's unread mark and list badges alone: now
  driven through chatManager.handleSendMessage with a side conversation (the
  old regex only checked how the if statement was spelled; removing the guard
  now fails the test).
- Side chat numbering: the selection menu entry is driven through
  sideChatWiring with chats 1 and 3 open and must create 辅助对话 2; this
  also replaces the regex checks that the entry point exists.
- Removed the gpt-4o grep (the missing-model refusal test covers it) and the
  three tests that matched stylesheet text and the <link> order in main.html,
  which broke on formatting and would block loading tab styles lazily.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DFRovoZHMzeheXKkLNWKG
---
 tests/chat-manager-selection-race.test.js  | 38 ++++++++++++++++-
 tests/side-chat-entry-points.test.mjs      | 14 ++-----
 tests/side-chat-model-and-context.test.mjs | 47 ++++++++++++++--------
 tests/side-pane-advanced-parity.test.mjs   | 41 -------------------
 4 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/tests/chat-manager-selection-race.test.js b/tests/chat-manager-selection-race.test.js
index 2d14d0861..d5115b9ee 100644
--- a/tests/chat-manager-selection-race.test.js
+++ b/tests/chat-manager-selection-race.test.js
@@ -59,6 +59,8 @@ function createFixture(options = {}) {
     let nextVcpGate = null;
     let nextSettingsSaveGate = null;
     let historySaveCount = 0;
+    const unreadMarks = [];
+    let unreadRefreshes = 0;
     const savedSettings = [];
     const sentRequests = [];
     const topicRequests = new Map();
@@ -172,7 +174,7 @@ function createFixture(options = {}) {
             histories.set(`${itemId}:${requestedTopicId}`, JSON.parse(JSON.stringify(messages)));
             return { success: true };
         },
-        setTopicUnread: async () => ({ success: true }),
+        setTopicUnread: async (...args) => { unreadMarks.push(args); return { success: true }; },
         sendToVCP: async (...args) => {
             sentRequests.push(args);
             const gate = nextVcpGate;
@@ -241,7 +243,7 @@ function createFixture(options = {}) {
             streamManager: options.streamProjection || null,
             itemListManager: {
                 highlightActiveItem() {},
-                refreshUnreadCounts() {},
+                refreshUnreadCounts() { unreadRefreshes += 1; },
                 findItemById(itemId, itemType) {
                     const item = configs[itemId];
                     return item && itemType === 'agent' ? { ...item, type: 'agent' } : null;
@@ -318,6 +320,8 @@ function createFixture(options = {}) {
         },
         savedSettings,
         historySaveCount: () => historySaveCount,
+        unreadMarks,
+        unreadRefreshes: () => unreadRefreshes,
         canvas: {
             emitContent: value => canvasContentListener?.(value),
             emitClosed: () => canvasClosedListener?.(),
@@ -1025,3 +1029,33 @@ test('deleting the current assistant tells selection followers that nothing is s
     unsubscribe();
     fixture.dom.window.close();
 });
+
+test('a side conversation send leaves the main topic unread state and item list alone', async () => {
+    const fixture = createFixture();
+    const selectedA = fixture.chatManager.selectItem('agent-a', 'agent', 'Agent A', null, fixture.configs['agent-a']);
+    await new Promise(resolve => setImmediate(resolve));
+    fixture.topicRequests.get('agent-a').resolve(fixture.configs['agent-a'].topics);
+    await selectedA;
+
+    let sideHistory = [];
+    const sideInput = fixture.window.document.createElement('textarea');
+    await fixture.chatManager.handleSendMessage({
+        content: 'side question',
+        attachments: [],
+        input: sideInput,
+        conversation: {
+            selectedItemRef: { get: () => ({ ...fixture.configs['agent-a'], type: 'agent', config: fixture.configs['agent-a'] }) },
+            topicIdRef: { get: () => 'topic-side' },
+            historyRef: { get: () => sideHistory, set: value => { sideHistory = value; } },
+        },
+    });
+    assert.equal(fixture.sentRequests.length, 1, 'the side message was sent');
+    assert.deepEqual(fixture.unreadMarks, []);
+    assert.equal(fixture.unreadRefreshes(), 0);
+
+    fixture.window.document.getElementById('messageInput').value = 'main question';
+    await fixture.chatManager.handleSendMessage();
+    assert.equal(fixture.sentRequests.length, 2);
+    assert.deepEqual(fixture.unreadMarks, [['agent-a', 'topic-a', false]]);
+    assert.equal(fixture.unreadRefreshes(), 1);
+});
diff --git a/tests/side-chat-entry-points.test.mjs b/tests/side-chat-entry-points.test.mjs
index 221bd85ee..399083a1f 100644
--- a/tests/side-chat-entry-points.test.mjs
+++ b/tests/side-chat-entry-points.test.mjs
@@ -4,8 +4,6 @@ import fs from 'node:fs';
 import { JSDOM } from 'jsdom';
 
 const html = fs.readFileSync(new URL('../main.html', import.meta.url), 'utf8');
-const renderer = fs.readFileSync(new URL('../renderer.js', import.meta.url), 'utf8');
-const wiring = fs.readFileSync(new URL('../modules/renderer/sideChatWiring.js', import.meta.url), 'utf8');
 
 test('the selection "ask in side pane" button survives message-list re-renders', () => {
     const { document } = new JSDOM(html).window;
@@ -16,16 +14,10 @@ test('the selection "ask in side pane" button survives message-list re-renders',
     // lucide 适配器只替换 .vcp-ui-scope 里的图标
     assert.ok(button.classList.contains('vcp-ui-scope') || button.closest('.vcp-ui-scope'));
 
+    // 初始隐藏，选中消息文字后才出现；点它打开侧聊的行为见 side-chat-model-and-context.test.mjs
+    assert.equal(button.hidden, true);
+
     const list = document.getElementById('chatMessages');
     list.innerHTML = '';
     assert.ok(document.getElementById('floatingSelectionSideChatBtn'));
 });
-
-test('side chat is enabled and wired to the selection button and message context menu', () => {
-    assert.match(renderer, /initWorkspaceSidePane\(\{/);
-    assert.match(wiring, /win\.openSideChatWithSelection = async/);
-    assert.ok(html.includes('side-pane-side-chat-extras.css'));
-    // 按钮初始隐藏，选中消息文字后才出现
-    const { document } = new JSDOM(html).window;
-    assert.equal(document.getElementById('floatingSelectionSideChatBtn').hidden, true);
-});
diff --git a/tests/side-chat-model-and-context.test.mjs b/tests/side-chat-model-and-context.test.mjs
index 080e5efcd..a78d4f9f9 100644
--- a/tests/side-chat-model-and-context.test.mjs
+++ b/tests/side-chat-model-and-context.test.mjs
@@ -1,6 +1,5 @@
 import test from 'node:test';
 import assert from 'node:assert/strict';
-import fs from 'node:fs';
 import { JSDOM } from 'jsdom';
 
 import { mountSideChatSurface } from '../modules/renderer/sideChatSurfaceOwner.js';
@@ -134,24 +133,40 @@ test('references-only mode never sends parent history and never refreshes the sn
     await handle.dispose();
 });
 
-test('a side conversation send does not touch the main topic unread state or item list', () => {
-    const source = fs.readFileSync(new URL('../modules/chatManager.js', import.meta.url), 'utf8');
-    assert.match(source, /const isSideConversation = !!request\?\.conversation;\s+if \(!isSideConversation\) try \{\s+const readResult = await electronAPI\.setTopicUnread\(/);
-    assert.match(source, /if \(isSideConversation\) \{[^}]*\} else if \(itemListManager && typeof itemListManager\.refreshUnreadCounts/);
-});
-
-test('no hard-coded fallback model remains in the side chat stack', () => {
-    for (const file of ['../modules/renderer/sideChatSurfaceOwner.js', '../modules/chat/sideChatSessionService.js']) {
-        assert.ok(!/gpt-4o/.test(fs.readFileSync(new URL(file, import.meta.url), 'utf8')), `${file} must not hard-code gpt-4o`);
+// 侧聊发送不碰主话题未读：行为测试在 chat-manager-selection-race.test.js；没配置模型时拒绝发送见上面的测试
+
+test('new side chats are named by the lowest free ordinal under the same parent', async () => {
+    const { createSideChatWiring } = await import('../modules/renderer/sideChatWiring.js');
+    const dom = new JSDOM('<!doctype html><body></body>');
+    const parent = { itemType: 'agent', itemId: 'agent', topicId: 'parent' };
+    const tab = (title, topicId = 'parent') => ({ id: title, kind: 'chat', title, descriptor: { parent: { ...parent, topicId } } });
+    const opened = [];
+    const controller = {
+        getSnapshot: () => ({ parent, activeTabId: null,
+            tabs: [tab('辅助对话 1'), tab('辅助对话 3'), tab('辅助对话 2', 'other-topic')] }),
+        async openTab(raw) { opened.push(raw.descriptor.title); return null; },
+        setVisible() {}
+    };
+    let children = 0;
+    const chatAPI = {
+        createSideChatChild: async () => ({ success: true, topicId: `child-${++children}` }),
+        saveSideChatMetadata: async metadata => ({ success: true, metadata })
+    };
+    const wiring = createSideChatWiring({
+        doc: dom.window.document, win: dom.window, chatAPI, chatRepository: null, chatManager: null, uiHelper: null,
+        createRenderer: () => null,
+        selectedItemRef: { get: () => ({ id: 'agent', type: 'agent', name: 'Agent', config: { model: 'm' } }) },
+        topicIdRef: { get: () => 'parent' }, historyRef: { get: () => [] }, getController: () => controller
+    });
+    try {
+        await dom.window.openSideChatWithSelection({ selectedText: '一段引用' });
+        assert.deepEqual(opened, ['辅助对话 2'], 'the menu entry opens a side chat with the first free number of this topic');
+    } finally {
+        wiring.dispose?.();
+        dom.window.close();
     }
 });
 
-test('new side chats are named by the lowest free ordinal under the same parent', () => {
-    const source = fs.readFileSync(new URL('../modules/renderer/sideChatWiring.js', import.meta.url), 'utf8');
-    assert.ok(source.includes(String.raw`/^辅助对话 (\d+)$/`));
-    assert.ok(source.includes('`辅助对话 ${ordinal}`'));
-});
-
 test('composer autosaves go to browser storage; metadata only migrates once', async () => {
     const saved = [];
     const caps = capabilities({ saveSideChatMetadata: async (meta) => { saved.push(meta); return { success: true }; } });
diff --git a/tests/side-pane-advanced-parity.test.mjs b/tests/side-pane-advanced-parity.test.mjs
index e66a08a70..4b5877db2 100644
--- a/tests/side-pane-advanced-parity.test.mjs
+++ b/tests/side-pane-advanced-parity.test.mjs
@@ -1,6 +1,5 @@
 import test from 'node:test';
 import assert from 'node:assert/strict';
-import fs from 'node:fs';
 import { JSDOM } from 'jsdom';
 
 import * as SidePaneState from '../modules/ui-system/side-pane/side-pane-state.js';
@@ -611,9 +610,6 @@ test('Parity: tab context menu is scoped, keyboard friendly and closes on Escape
     // 外壳的 backdrop-filter 会把 fixed 菜单的定位和背后内容都带偏，所以菜单挂在 body 下
     assert.equal(contextMenu.parentNode, doc.body);
     assert.ok(contextMenu.classList.contains('vcp-ui-scope'));
-    // 出了侧栏就没有 #vcpSidePane [hidden] 兜底，菜单自己的 display: flex 会让它一直显示
-    const overlaysCss = fs.readFileSync(new URL('../styles/ui-system/side-pane-tab-overlays.css', import.meta.url), 'utf8');
-    assert.match(overlaysCss, /html \.side-pane-context-menu\[hidden\]:where\(\.vcp-ui-scope, \.vcp-ui-scope \*\) \{\s*display: none;/);
 
     ctrl.setParent({ itemType: 'agent', itemId: 'agent-1', topicId: 'parent' });
     await ctrl.openTab({ kind: 'chat', descriptor: createDesc('s1', 'c1') });
@@ -812,25 +808,6 @@ test('Parity: Side Chat Model Picker supports interactive switching', async () =
     dom.window.close();
 });
 
-test('Side pane divider and header hairlines', () => {
-    const html = fs.readFileSync(new URL('../main.html', import.meta.url), 'utf8');
-    const css = [...html.matchAll(/href="(styles\/ui-system\/side-pane-[^"]+\.css)"/g)]
-        .map(([, href]) => fs.readFileSync(new URL(`../${href}`, import.meta.url), 'utf8')).join('');
-
-    // The pane sits inside the workspace card, so its only edge is a hairline
-    // on the left, drawn with the same token as the card border.
-    assert.match(css, /html #vcpSidePane:where\(\.vcp-ui-scope, \.vcp-ui-scope \*\) \{[^}]*border-left:\s*1px solid var\(--next-panel-edge/);
-    // Main panel and main content are outside .vcp-ui-scope: scoped rules for
-    // them would never match, so the side pane stylesheet must not carry any.
-    assert.doesNotMatch(css, /#nextUiMainPanel:where\(\.vcp-ui-scope/);
-    assert.doesNotMatch(css, /\.main-content[^{]*:where\(\.vcp-ui-scope/);
-
-    assert.match(css, /html \.side-pane-tab-bar[\s\S]*?border-bottom:\s*1px solid var\(--zcode-header-divider/);
-    // VCPLog status lives on the 通知 tab, so the panel has no second header row.
-    assert.doesNotMatch(css, /\.notifications-header/);
-});
-
-
 test('tab type registration connects presentation, launcher availability and provider mounting', async () => {
     const dom = createParityTestDOM();
     const ctrl = createController(dom);
@@ -939,21 +916,3 @@ test('entry identity changes replace the whole declaration, while invalid replac
     }
 });
 
-test('Side pane overlays animate in and out and respect reduced motion', () => {
-    const html = fs.readFileSync(new URL('../main.html', import.meta.url), 'utf8');
-    assert.match(html, /side-pane-side-chat-extras\.css">\s*<link rel="stylesheet" href="styles\/ui-system\/side-pane-motion\.css">/);
-    const motion = fs.readFileSync(new URL('../styles/ui-system/side-pane-motion.css', import.meta.url), 'utf8');
-    for (const cls of ['side-pane-tab-overview-popover', 'side-pane-context-menu', 'side-chat-model-popover']) {
-        assert.ok(motion.includes(`.${cls}[hidden]`), `${cls} has a hidden state to fade out to`);
-    }
-    assert.match(motion, /display var\(--vcp-motion-duration-fast\) allow-discrete/);
-    assert.match(motion, /@starting-style/);
-    const reduced = motion.slice(motion.indexOf('@media (prefers-reduced-motion: reduce)'));
-    for (const sel of ['.side-pane-launcher-tabs', '.side-pane-launcher-tab-status[data-status]', '.side-pane-launcher-notice-dot', '.side-traj-call.flash', '.side-git-refresh-btn.spinning']) {
-        assert.ok(reduced.includes(sel), `reduced motion covers ${sel}`);
-    }
-    const launcher = fs.readFileSync(new URL('../styles/ui-system/side-pane-launcher.css', import.meta.url), 'utf8');
-    assert.match(launcher, /\.side-pane-launcher-tabs:where\(\.vcp-ui-scope, \.vcp-ui-scope \*\)::before \{[^}]*transform: translateX\(calc\(var\(--side-pane-segment-index\) \* 100%\)\)/);
-    const bubbles = fs.readFileSync(new URL('../styles/side-chat-bubbles.css', import.meta.url), 'utf8');
-    assert.match(bubbles, /#chatContextMenu\[data-side-chat-menu="true"\] \{[^}]*animation: side-chat-menu-in/);
-});

From 15af839499d829a71976274c43a3da9b1a1d80cd Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 01:32:01 +0000
Subject: [PATCH 049/143] CI: run the 28 workbench tests no gate ran, and
 trigger on the files the PR adds outside modules

The side pane PR adds 100 test files; 30 were not reached by any CI script.
test:workbench runs the 28 that run on Linux (186 tests: terminal command
runs, model trajectory, conversation status, notification center, tool
presentation, message file changes, source and state IPC, and so on).
terminal-handlers needs PowerShell and side-browser-retry-electron needs a
display, so they stay with the Windows check.

The Chat Kernel and UI gates also did not trigger on changes to main.js,
style.css, Groupmodules, ProjectForgemodules, the PowerShellExecutor and
ProjectForge plugins or vendor/xterm, all of which this PR changes.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01UCGGgmHsCToooXTgSXpmq9
---
 .github/workflows/chat_kernel_ui.yml | 10 ++++++++++
 package.json                         |  1 +
 2 files changed, 11 insertions(+)

diff --git a/.github/workflows/chat_kernel_ui.yml b/.github/workflows/chat_kernel_ui.yml
index ebf406d00..fb204971b 100644
--- a/.github/workflows/chat_kernel_ui.yml
+++ b/.github/workflows/chat_kernel_ui.yml
@@ -5,6 +5,13 @@ on:
   pull_request:
     paths:
       - 'renderer.js'
+      - 'main.js'
+      - 'style.css'
+      - 'Groupmodules/**'
+      - 'ProjectForgemodules/**'
+      - 'VCPDistributedServer/Plugin/PowerShellExecutor/**'
+      - 'VCPDistributedServer/Plugin/ProjectForge/**'
+      - 'vendor/xterm/**'
       - 'main.html'
       - 'modules/**'
       - 'preloads/**'
@@ -57,6 +64,9 @@ jobs:
       - name: Run side pane tests
         run: npm run test:side-pane
 
+      - name: Run side pane workbench surface tests
+        run: npm run test:workbench
+
       - name: Run Chat contract evidence gate
         env:
           VCPCHAT_PACKAGED_ARTIFACT_SMOKE_OUTPUT: ${{ runner.temp }}/packaged-artifact-smoke.json
diff --git a/package.json b/package.json
index 70498447d..aa8ef47ec 100644
--- a/package.json
+++ b/package.json
@@ -55,6 +55,7 @@
     "test:built-artifact-smoke": "node scripts/test-built-artifact-smoke.mjs",
     "test:chat-transcript-snapshot": "node scripts/test-chat-transcript-snapshot.mjs",
     "test:side-pane": "node --test tests/side-pane-*.test.mjs tests/side-chat-*.test.mjs tests/side-browser-address.test.mjs tests/side-plan-revert-confirmation.test.mjs tests/sidebar-resizer-lifecycle.test.mjs tests/conversation-status-panel.test.mjs tests/domain-activator.test.js tests/browser-handlers.test.js tests/git-service.test.js tests/git-watcher.test.js tests/git-file-diff.test.mjs tests/git-changes-source.test.mjs tests/git-workspace-source.test.mjs",
+    "test:workbench": "node --test tests/conversation-current-source.test.mjs tests/conversation-scope.test.mjs tests/conversation-status-races.test.mjs tests/design-system-boundary.test.mjs tests/group-chat-url.test.js tests/group-stream-watchdog.test.js tests/line-diff-budget.test.mjs tests/main-composer-commands.test.mjs tests/message-file-changes-projectforge.test.mjs tests/message-file-changes.test.mjs tests/messenger-presentation.test.mjs tests/model-trajectory-handlers.test.js tests/model-trajectory-model.test.mjs tests/model-trajectory-recorder.test.js tests/notification-center.test.js tests/popover-window-blur.test.mjs tests/projectforge-changes-source.test.mjs tests/selection-reference.test.mjs tests/shared-source.test.mjs tests/source-handlers-sender.test.js tests/state-subscriptions.test.js tests/terminal-command-run-watch.test.js tests/terminal-native-helper.test.js tests/terminal-package-closure.test.js tests/tool-approval-card-enhancement.test.mjs tests/tool-presentation-settings.test.cjs tests/tool-presentation.test.mjs tests/tool-request-malformed-marker.test.mjs",
     "check:chat-evidence": "node scripts/check-chat-evidence.mjs",
     "check:chat-release-evidence": "node scripts/check-chat-release-evidence.mjs",
     "write:chat-evidence-manifest": "node scripts/write-chat-evidence-manifest.mjs",

From 263b6c97bef6a35b7967a972fe8026f82259966b Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 01:32:25 +0000
Subject: [PATCH 050/143] Tab overview: expose the arrow-key selection to
 screen readers

Arrow keys only toggled a CSS class while focus stayed in the search box,
so assistive tech never heard which tab was selected. The search box is
now a combobox controlling a listbox of options with
aria-activedescendant, the pattern ZCode's cmdk command palette uses.
Closing a tab from the list no longer drops focus to body.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_016hW799u5Ji5k9khDAwu688
---
 .../contracts/generated/chat-event-graph.json | 36 +++++++++---------
 .../side-pane/side-pane-tab-overview.js       | 37 ++++++++++++++++++-
 tests/side-pane-tab-strip.test.mjs            | 23 ++++++++++++
 3 files changed, 77 insertions(+), 19 deletions(-)

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 26850224b..e8bc986a2 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -1720,7 +1720,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-overview.js",
-          "line": 219,
+          "line": 254,
           "kind": "custom-event-listener"
         },
         {
@@ -1831,7 +1831,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-overview.js",
-          "line": 219,
+          "line": 254,
           "kind": "custom-event-listener",
           "match": "win?.addEventListener('blur'"
         },
@@ -4375,22 +4375,22 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-overview.js",
-          "line": 120,
+          "line": 152,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-overview.js",
-          "line": 128,
+          "line": 162,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-overview.js",
-          "line": 143,
+          "line": 178,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-overview.js",
-          "line": 200,
+          "line": 235,
           "kind": "custom-event-listener"
         },
         {
@@ -5978,25 +5978,25 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-overview.js",
-          "line": 120,
+          "line": 152,
           "kind": "custom-event-listener",
           "match": "closeBtn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-overview.js",
-          "line": 128,
+          "line": 162,
           "kind": "custom-event-listener",
           "match": "item.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-overview.js",
-          "line": 143,
+          "line": 178,
           "kind": "custom-event-listener",
           "match": "item.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-overview.js",
-          "line": 200,
+          "line": 235,
           "kind": "custom-event-listener",
           "match": "button.addEventListener('click'"
         },
@@ -14839,7 +14839,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-overview.js",
-          "line": 154,
+          "line": 189,
           "kind": "custom-event-listener"
         }
       ],
@@ -15032,7 +15032,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-overview.js",
-          "line": 154,
+          "line": 189,
           "kind": "custom-event-listener",
           "match": "searchInput.addEventListener('input'"
         }
@@ -15545,12 +15545,12 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-overview.js",
-          "line": 180,
+          "line": 215,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-overview.js",
-          "line": 218,
+          "line": 253,
           "kind": "custom-event-listener"
         },
         {
@@ -15920,13 +15920,13 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-overview.js",
-          "line": 180,
+          "line": 215,
           "kind": "custom-event-listener",
           "match": "searchInput.addEventListener('keydown'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-overview.js",
-          "line": 218,
+          "line": 253,
           "kind": "custom-event-listener",
           "match": "doc.addEventListener('keydown'"
         },
@@ -22996,7 +22996,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-overview.js",
-          "line": 217,
+          "line": 252,
           "kind": "custom-event-listener"
         },
         {
@@ -23054,7 +23054,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-overview.js",
-          "line": 217,
+          "line": 252,
           "kind": "custom-event-listener",
           "match": "doc.addEventListener('pointerdown'"
         },
diff --git a/modules/ui-system/side-pane/side-pane-tab-overview.js b/modules/ui-system/side-pane/side-pane-tab-overview.js
index fe54207bd..9f64723fc 100644
--- a/modules/ui-system/side-pane/side-pane-tab-overview.js
+++ b/modules/ui-system/side-pane/side-pane-tab-overview.js
@@ -38,6 +38,35 @@ export function createSidePaneTabOverview({
     const listEl = popover.querySelector('#sidePaneOpenTabsList');
     const searchInput = popover.querySelector('.side-pane-overview-input');
 
+    // 搜索框 + 列表按 combobox/listbox 标注（ZCode 的 cmdk 命令面板同一套）：焦点留在搜索框，
+    // 方向键选中的项通过 aria-activedescendant 读出来
+    let optionSeq = 0;
+    if (listEl) {
+        listEl.setAttribute('role', 'listbox');
+        listEl.setAttribute('aria-label', '标签页');
+    }
+    if (searchInput && listEl?.id) {
+        searchInput.setAttribute('role', 'combobox');
+        searchInput.setAttribute('aria-autocomplete', 'list');
+        searchInput.setAttribute('aria-expanded', 'true');
+        searchInput.setAttribute('aria-controls', listEl.id);
+    }
+
+    function markOption(item, selected = false) {
+        item.id ||= `side-pane-overview-option-${++optionSeq}`;
+        item.setAttribute('role', 'option');
+        item.setAttribute('aria-selected', String(selected));
+    }
+
+    function setKeyboardActive(items, index) {
+        items.forEach((item, i) => {
+            item.classList.toggle('kbd-active', i === index);
+            item.setAttribute('aria-selected', String(i === index));
+        });
+        if (items[index]) searchInput?.setAttribute('aria-activedescendant', items[index].id);
+        else searchInput?.removeAttribute('aria-activedescendant');
+    }
+
     const isOpen = () => !popover.hidden;
     const currentQuery = () => searchInput?.value || '';
 
@@ -66,6 +95,7 @@ export function createSidePaneTabOverview({
     function createSectionTitle(text) {
         const title = doc.createElement('div');
         title.className = 'side-pane-overview-section-title';
+        title.setAttribute('role', 'presentation');
         title.textContent = text;
         return title;
     }
@@ -80,6 +110,7 @@ export function createSidePaneTabOverview({
     function render(filterQuery = '') {
         if (!listEl) return;
         listEl.innerHTML = '';
+        searchInput?.removeAttribute('aria-activedescendant');
         const queryParts = normalizeSearchQuery(filterQuery);
         const activeTabId = getActiveTabId();
         const now = Date.now();
@@ -107,6 +138,7 @@ export function createSidePaneTabOverview({
                 const item = doc.createElement('div');
                 item.className = `side-pane-overview-item${tab.id === activeTabId ? ' active' : ''}`;
                 item.setAttribute('data-tab-id', tab.id);
+                markOption(item);
                 item.appendChild(createItemTitle(getTabIconName(tab, getTabType), tab.title));
                 if (tab.openedAt) item.appendChild(createTime(formatRelativeTime(tab.openedAt, now)));
 
@@ -121,6 +153,8 @@ export function createSidePaneTabOverview({
                         e.stopPropagation();
                         await onClose(tab.id);
                         render(currentQuery());
+                        // 被点的关闭按钮跟着整行重建没了，焦点回搜索框而不是掉到 body
+                        if (isOpen()) searchInput?.focus?.();
                     });
                     item.appendChild(closeBtn);
                 }
@@ -139,6 +173,7 @@ export function createSidePaneTabOverview({
                 const item = doc.createElement('div');
                 item.className = 'side-pane-overview-item recently-closed';
                 item.setAttribute('data-closed-tab-id', closed.id);
+                markOption(item);
                 item.append(createItemTitle(getTabIconName(closed.tab, getTabType), closed.title), createTime(formatRelativeTime(closed.closedAt, now)));
                 item.addEventListener('click', async () => {
                     hide();
@@ -163,7 +198,7 @@ export function createSidePaneTabOverview({
                 event.preventDefault();
                 const step = event.key === 'ArrowDown' ? 1 : -1;
                 const next = current < 0 ? (step > 0 ? 0 : items.length - 1) : (current + step + items.length) % items.length;
-                items.forEach((item, index) => item.classList.toggle('kbd-active', index === next));
+                setKeyboardActive(items, next);
                 items[next].scrollIntoView?.({ block: 'nearest' });
             } else if (event.key === 'Enter') {
                 const target = items[current] || items[0];
diff --git a/tests/side-pane-tab-strip.test.mjs b/tests/side-pane-tab-strip.test.mjs
index 0993a161a..778a0ee0a 100644
--- a/tests/side-pane-tab-strip.test.mjs
+++ b/tests/side-pane-tab-strip.test.mjs
@@ -211,6 +211,29 @@ test('controller: the tab overview is keyboard driven (arrows, Enter, Escape)',
     button.click();
     press('Escape');
     assert.equal(popover.hidden, true);
+
+    // 屏幕阅读器要能读到方向键选中的是哪一项：combobox + listbox + aria-activedescendant
+    button.click();
+    const list = doc.getElementById('sidePaneOpenTabsList');
+    assert.equal(input.getAttribute('role'), 'combobox');
+    assert.equal(input.getAttribute('aria-controls'), list.id);
+    assert.equal(list.getAttribute('role'), 'listbox');
+    press('ArrowDown');
+    const selected = doc.querySelector('.side-pane-overview-item.kbd-active');
+    assert.equal(selected.getAttribute('role'), 'option');
+    assert.equal(selected.getAttribute('aria-selected'), 'true');
+    assert.equal(input.getAttribute('aria-activedescendant'), selected.id);
+    assert.equal(doc.getElementById(selected.id), selected);
+
+    // 关闭按钮跟着整行重建掉了，焦点回到搜索框
+    const closeBtn = doc.querySelector('.side-pane-overview-item[data-tab-id="n2"] .side-pane-tab-close');
+    closeBtn.focus();
+    closeBtn.click();
+    await new Promise(resolve => setImmediate(resolve));
+    await new Promise(resolve => setImmediate(resolve));
+    assert.equal(doc.querySelector('.side-pane-overview-item[data-tab-id="n2"]'), null);
+    assert.equal(doc.activeElement, input);
+    assert.equal(input.hasAttribute('aria-activedescendant'), false, 'no stale id after a redraw');
     controller.dispose();
 });
 

From c15e7076bbe75f27adfc7e2127b5422cdf62a7c2 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 01:33:20 +0000
Subject: [PATCH 051/143] Git graph: selecting a commit or loading more keeps
 the scroll position

Every repaint rebuilt the scroll container, so clicking commit 120 for its
details or pressing Load more threw the list back to the top. The scroll
offset and the focused row now survive a repaint; only a refresh starts at
the top. A refresh also discards a Load more page still in flight, and pages
that overlap after new commits are de-duplicated by hash.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DFRovoZHMzeheXKkLNWKG
---
 .../contracts/generated/chat-event-graph.json | 12 +++---
 .../conversation-status-panel/git-graph.js    | 35 +++++++++++++---
 tests/conversation-status-panel.test.mjs      | 41 +++++++++++++++++++
 3 files changed, 76 insertions(+), 12 deletions(-)

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 1794089df..d0744c4d3 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -4049,17 +4049,17 @@
         },
         {
           "file": "modules/ui-system/conversation-status-panel/git-graph.js",
-          "line": 71,
+          "line": 77,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/conversation-status-panel/git-graph.js",
-          "line": 126,
+          "line": 140,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/conversation-status-panel/git-graph.js",
-          "line": 135,
+          "line": 149,
           "kind": "custom-event-listener"
         },
         {
@@ -5579,19 +5579,19 @@
         },
         {
           "file": "modules/ui-system/conversation-status-panel/git-graph.js",
-          "line": 71,
+          "line": 77,
           "kind": "custom-event-listener",
           "match": "refreshBtn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/conversation-status-panel/git-graph.js",
-          "line": 126,
+          "line": 140,
           "kind": "custom-event-listener",
           "match": "line.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/conversation-status-panel/git-graph.js",
-          "line": 135,
+          "line": 149,
           "kind": "custom-event-listener",
           "match": "more.addEventListener('click'"
         },
diff --git a/modules/ui-system/conversation-status-panel/git-graph.js b/modules/ui-system/conversation-status-panel/git-graph.js
index 11f7d0991..a7cc31cef 100644
--- a/modules/ui-system/conversation-status-panel/git-graph.js
+++ b/modules/ui-system/conversation-status-panel/git-graph.js
@@ -52,6 +52,8 @@ export function createStatusPanelGitGraph({
         let expandedHash = null;
         let loadingMore = false;
         let refreshing = false;
+        // 刷新换掉整份列表；在那之前发出的「加载更多」回来时作废
+        let generation = 0;
         const closeBtn = button('zc-btn zc-btn-ghost zc-btn-icon-sm zc-graph-close', { label: '关闭', onClick: modal.close }, icon('x'));
 
         const fetchPage = async skip => {
@@ -60,7 +62,11 @@ export function createStatusPanelGitGraph({
             return res.data;
         };
 
-        const paint = () => {
+        // 重画时保住滚动位置和焦点所在的行：点一行看详情、加载更多都不该把人送回顶部
+        const paint = ({ keepScroll = true } = {}) => {
+            const previousScroll = keepScroll ? (modal.dialog.querySelector('.zc-graph-scroll')?.scrollTop || 0) : 0;
+            const focusedHash = modal.dialog.contains(doc.activeElement) ? doc.activeElement?.dataset?.hash || null : null;
+            const focusLoadMore = modal.dialog.contains(doc.activeElement) && doc.activeElement?.classList?.contains('zc-graph-load-more');
             modal.dialog.textContent = '';
             const layout = layoutGitGraph(commits);
             const graphWidth = Math.max(56, layout.width + 12);
@@ -71,17 +77,24 @@ export function createStatusPanelGitGraph({
             refreshBtn.addEventListener('click', async () => {
                 if (refreshing) return;
                 refreshing = true;
+                const current = ++generation;
+                loadingMore = false;
                 paint();
+                let refreshed = false;
                 try {
                     const page = await fetchPage(0);
+                    if (current !== generation || modal.closed) return;
                     commits = page.commits;
                     hasMore = page.hasMore;
                     selectedHash = commits[0]?.hash ?? null;
+                    expandedHash = null;
+                    refreshed = true;
                 } catch (e) {
+                    if (current !== generation || modal.closed) return;
                     toast(`刷新 Git 图谱失败：${e?.message || e}`, 'error');
                 }
                 refreshing = false;
-                paint();
+                paint({ keepScroll: !refreshed });
             });
             head.appendChild(refreshBtn);
             modal.dialog.append(closeBtn, head);
@@ -121,6 +134,7 @@ export function createStatusPanelGitGraph({
                     h('span', 'zc-graph-cell zc-graph-date', formatCommitTime(commit.time)),
                     h('span', 'zc-graph-cell zc-graph-author', commit.author),
                     h('span', 'zc-graph-cell zc-graph-hash', commit.hash.slice(0, 7)));
+                line.dataset.hash = commit.hash;
                 line.style.gridTemplateColumns = columns;
                 line.style.height = `${layout.rowHeight}px`;
                 line.addEventListener('click', () => {
@@ -131,16 +145,21 @@ export function createStatusPanelGitGraph({
                 rows.appendChild(line);
             }
             if (hasMore) {
-                const more = button('zc-graph-load-more', { disabled: loadingMore }, loadingMore ? '正在加载...' : '加载更多提交');
+                const more = button('zc-graph-load-more', { disabled: loadingMore || refreshing }, loadingMore ? '正在加载...' : '加载更多提交');
                 more.addEventListener('click', async () => {
-                    if (loadingMore) return;
+                    if (loadingMore || refreshing) return;
                     loadingMore = true;
+                    const current = generation;
                     paint();
                     try {
                         const page = await fetchPage(commits.length);
-                        commits = [...commits, ...page.commits];
+                        if (current !== generation || modal.closed) return;
+                        // 两页之间有新提交时分页会错开，已有的提交不再追加一遍
+                        const known = new Set(commits.map(commit => commit.hash));
+                        commits = [...commits, ...page.commits.filter(commit => !known.has(commit.hash))];
                         hasMore = page.hasMore;
                     } catch (e) {
+                        if (current !== generation || modal.closed) return;
                         toast(`Git 图谱加载失败：${e?.message || e}`, 'error');
                     }
                     loadingMore = false;
@@ -157,7 +176,11 @@ export function createStatusPanelGitGraph({
             const graphCol = h('div', 'zc-graph-lane-col', graphSvg);
             graphCol.style.height = `${svgHeight}px`;
             table.append(h('div', 'zc-graph-col zc-graph-col-first', '图'), headCells, graphCol, rows);
-            modal.dialog.appendChild(h('div', 'zc-graph-scroll', table));
+            const scroll = h('div', 'zc-graph-scroll', table);
+            modal.dialog.appendChild(scroll);
+            scroll.scrollTop = previousScroll;
+            const refocus = focusedHash ? rows.querySelector(`[data-hash="${focusedHash}"]`) : focusLoadMore ? rows.querySelector('.zc-graph-load-more') : null;
+            refocus?.focus({ preventScroll: true });
 
             const expanded = commits.find(commit => commit.hash === expandedHash);
             if (expanded) {
diff --git a/tests/conversation-status-panel.test.mjs b/tests/conversation-status-panel.test.mjs
index 58354fd26..38d498c85 100644
--- a/tests/conversation-status-panel.test.mjs
+++ b/tests/conversation-status-panel.test.mjs
@@ -380,6 +380,47 @@ test('git graph dialog draws commits and lanes', async () => {
     panel.dispose();
 });
 
+test('git graph keeps its scroll position on select and load more; a refresh drops a load more already in flight', async () => {
+    const page = (from, count) => Array.from({ length: count }, (_, i) => {
+        const n = from + i;
+        return { hash: `h${String(n).padStart(6, '0')}`, parents: [`h${String(n + 1).padStart(6, '0')}`], author: 'Roxy', time: 1790000000 - n, subject: `提交 ${n}`, refs: [] };
+    });
+    let gate = null;
+    const { doc, panel, dom } = setup({ api: {
+        gitCommitGraph: async (_id, { skip }) => {
+            if (gate) await gate.promise;
+            return { success: true, data: { commits: page(skip, 50), hasMore: true } };
+        }
+    } });
+    panel.mount();
+    await flush();
+    await panel.openGitGraphDialog();
+    const dialog = q(doc, '.zc-graph-dialog');
+    q(dialog, '.zc-graph-scroll').scrollTop = 900;
+
+    click(dom, dialog.querySelectorAll('.zc-graph-row')[30]);
+    assert.equal(q(dialog, '.zc-graph-scroll').scrollTop, 900, 'opening a commit detail keeps the list where it was');
+    assert.match(q(doc, '.zc-graph-detail').textContent, /h000030/);
+
+    click(dom, q(dialog, '.zc-graph-load-more'));
+    await flush();
+    assert.equal(dialog.querySelectorAll('.zc-graph-row').length, 100);
+    assert.equal(q(dialog, '.zc-graph-scroll').scrollTop, 900, 'loading more keeps the list where it was');
+
+    // 加载更多还没回来时刷新：旧的那页回来后不能追加到刷新后的列表上
+    let release;
+    gate = { promise: new Promise(resolve => { release = resolve; }) };
+    click(dom, q(dialog, '.zc-graph-load-more'));
+    click(dom, q(dialog, '.zc-graph-refresh'));
+    gate = null;
+    release();
+    await flush();
+    await flush();
+    assert.equal(dialog.querySelectorAll('.zc-graph-row').length, 50);
+    assert.equal(new Set([...dialog.querySelectorAll('.zc-graph-row')].map(row => row.dataset.hash)).size, 50);
+    panel.dispose();
+});
+
 test('panel lists recent AI commands from the built-in terminal and opens their output', async () => {
     let push = null;
     let watching = false;

From decc1b3f183fbdc5ea9c9e21866fa5f53bd0d088 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 01:34:17 +0000
Subject: [PATCH 052/143] Git view: keep focus on the same file across a pushed
 redraw

Every file change pushes a quiet refresh that rebuilds the whole list, so
a keyboard user's focused row vanished and focus fell to body each time
the agent edited a file. The redraw now refocuses the same file's row (or
the row at the same position if that file is gone), which is what keyed
React lists in ZCode and DSH do for free.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_016hW799u5Ji5k9khDAwu688
---
 modules/ui-system/side-pane/git/git-view.js | 10 +++++
 tests/side-pane-git-refresh-focus.test.mjs  | 46 +++++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 tests/side-pane-git-refresh-focus.test.mjs

diff --git a/modules/ui-system/side-pane/git/git-view.js b/modules/ui-system/side-pane/git/git-view.js
index 4fe3d20dd..9f15f06b9 100644
--- a/modules/ui-system/side-pane/git/git-view.js
+++ b/modules/ui-system/side-pane/git/git-view.js
@@ -266,9 +266,19 @@ export function mountGitView(host, {
             return;
         }
         empty.hidden = true;
+        // 推送触发的重绘会换掉整张列表：记下焦点所在的行，重建后还给同一个文件（React 按 key 复用节点时焦点本来就不丢，
+        // ZCode/DSH 的列表都是这样）；那个文件没了就给同一位置的行
+        const focusedCard = list.contains(doc.activeElement) ? doc.activeElement.closest('.side-git-card') : null;
+        const focusKey = focusedCard?.dataset.key ?? null;
+        const focusIndex = focusedCard ? Array.prototype.indexOf.call(list.children, focusedCard) : -1;
         list.innerHTML = '';
         items.forEach(item => list.appendChild(buildCard(item)));
         cardsOwner.prefetch(items);
+        if (focusKey !== null) {
+            const cards = Array.from(list.querySelectorAll('.side-git-card'));
+            const target = cards.find(card => card.dataset.key === focusKey) || cards[Math.min(focusIndex, cards.length - 1)];
+            target?.querySelector('.side-git-row')?.focus?.({ preventScroll: true });
+        }
     }
 
     // ── 数据 ────────────────────────────────────────────────
diff --git a/tests/side-pane-git-refresh-focus.test.mjs b/tests/side-pane-git-refresh-focus.test.mjs
new file mode 100644
index 000000000..8b6827473
--- /dev/null
+++ b/tests/side-pane-git-refresh-focus.test.mjs
@@ -0,0 +1,46 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { JSDOM } from 'jsdom';
+
+import { mountGitView } from '../modules/ui-system/side-pane/git/git-view.js';
+
+// 文件一改主进程就推送，Git 列表静默重绘；键盘用户正停在某一行时焦点不能掉到 body
+test('a quiet refresh that redraws the list keeps focus on the same file row', async () => {
+    const dom = new JSDOM('<div id="host"></div>', { pretendToBeVisual: true });
+    const doc = dom.window.document;
+    const host = doc.getElementById('host');
+    // JSDOM 不做布局，offsetParent 总是 null；这里当作挂在文档里就看得见
+    Object.defineProperty(dom.window.HTMLElement.prototype, 'offsetParent', { configurable: true, get() { return this.isConnected ? this.parentNode : null; } });
+    let changes = [{ path: 'a.js', status: 'M' }, { path: 'b.js', status: 'M' }];
+    const api = {
+        async gitListWorkspaces() { return { success: true, data: { workspaces: [{ id: 'w', alias: 'w', path: '/w' }], activeWorkspaceId: 'w' } }; },
+        async gitStatus() { return { success: true, data: { isRepo: true, branch: { head: 'main' }, remotes: [], staged: [], changes: [...changes], conflicts: [] } }; },
+        async gitDiff() { return { success: false, error: 'n/a' }; }
+    };
+    const handle = mountGitView(host, { api, uiHelper: null });
+    await handle.ready;
+    const row = path => host.querySelector(`.side-git-card[data-path="${path}"] .side-git-row`);
+    const settle = () => new Promise(resolve => setTimeout(resolve, 20));
+    try {
+        row('b.js').focus();
+        assert.equal(doc.activeElement, row('b.js'));
+
+        // 新增一个文件：整张列表重建，焦点仍在 b.js
+        changes = [{ path: 'new.js', status: 'U' }, ...changes];
+        dom.window.dispatchEvent(new dom.window.Event('focus'));
+        await settle();
+        assert.ok(host.querySelector('.side-git-card[data-path="new.js"]'), 'list was redrawn');
+        assert.equal(doc.activeElement, row('b.js'));
+
+        // 聚焦的文件被提交掉了：焦点给同一位置的行，不掉到 body
+        changes = changes.filter(item => item.path !== 'b.js');
+        dom.window.dispatchEvent(new dom.window.Event('focus'));
+        await settle();
+        assert.equal(row('b.js'), null);
+        assert.ok(host.contains(doc.activeElement) && doc.activeElement.isConnected, 'focus stays in the list');
+        assert.equal(doc.activeElement.classList.contains('side-git-row'), true);
+    } finally {
+        handle.dispose?.();
+        dom.window.close();
+    }
+});

From 281471c21ec5ff8642f87f7b1d40d59748047b08 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 01:35:47 +0000
Subject: [PATCH 053/143] Sidebar: show every unsaved settings edit; debounce
 and harden topic search
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Agent and group settings save only on the Save button, so the 未保存更改
dot is the only warning before a switch drops an edit.
- Regex rule add/edit/delete (modal is outside the form) and MiMo director
  prompt add/remove now mark the Agent draft unsaved.
- The group form gets the same indicator: input/change, speaker reorder,
  member tags and JEV styles mark it; a successful save clears it; loading a
  group resets it; a failed save keeps it.

Topic list:
- Typing in topic search waits 200ms before reloading (one config read and
  one content search instead of one per keystroke); Enter stays immediate.
  ZCode's IO-backed refreshes debounce in the same range (fileWatcherService
  150ms, useTabPersistence 300ms).
- A rejected config IPC shows an error row instead of a permanent spinner.
- Item names and IPC errors render as text, not innerHTML. Same for the item
  list load errors and embedded-app error messages.

Contract line pins and the next-delta digests are updated for the moved
lines. New tests run in check:ui-system.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012AP71nAxrCFEpH7st6asf9
---
 Groupmodules/grouprenderer.js                 |  66 ++++-
 docs/contracts/chat-contracts.json            |  10 +-
 .../contracts/generated/chat-event-graph.json | 174 ++++++-------
 modules/itemListManager.js                    |   2 +-
 modules/settings/schema/sidebar-surfaces.js   |   6 +-
 modules/settingsManager.js                    |  28 ++-
 modules/topicListManager.js                   |  59 ++++-
 .../next-shell/next-shell-controller.js       |  18 +-
 package.json                                  |   2 +-
 scripts/next-delta-shared-baseline.json       |  16 +-
 tests/settings-unsaved-indicator.test.mjs     | 238 ++++++++++++++++++
 tests/topic-list-load-robustness.test.js      | 111 ++++++++
 12 files changed, 604 insertions(+), 126 deletions(-)
 create mode 100644 tests/settings-unsaved-indicator.test.mjs
 create mode 100644 tests/topic-list-load-robustness.test.js

diff --git a/Groupmodules/grouprenderer.js b/Groupmodules/grouprenderer.js
index fa5532806..0b16b4118 100644
--- a/Groupmodules/grouprenderer.js
+++ b/Groupmodules/grouprenderer.js
@@ -40,6 +40,11 @@ window.GroupRenderer = (() => {
     const pendingGroupUserMessageIds = new Set();
     let groupSettingsGeneration = 0;
     let groupSettingsReady = false;
+    // Group settings save only on the Save button, like Agent settings. Track
+    // unsaved edits the same way so the form shows 未保存更改 before a switch
+    // throws them away.
+    let groupSettingsDirty = false;
+    let groupSettingsRevision = 0;
     let groupSlotsLoadPromise = null;
 
     function ensureGroupSlotsBridge() {
@@ -629,6 +634,11 @@ window.GroupRenderer = (() => {
         }
         groupSettingsForm.addEventListener('submit', handleSaveGroupSettings);
         groupSettingsForm._eventListenerAttached = true;
+        if (!groupSettingsForm._dirtyListenerAttached) {
+            groupSettingsForm.addEventListener('input', markGroupSettingsDirty);
+            groupSettingsForm.addEventListener('change', markGroupSettingsDirty);
+            groupSettingsForm._dirtyListenerAttached = true;
+        }
 
 
         if (deleteGroupBtn?._eventListenerAttached) {
@@ -646,6 +656,7 @@ window.GroupRenderer = (() => {
         groupAvatarInput._eventListenerAttached = true;
 
         groupSettingsReady = true;
+        resetGroupSettingsDirty();
         updateAllGroupSectionSummaries();
     }
 
@@ -722,7 +733,10 @@ window.GroupRenderer = (() => {
             list: sequentialSpeakerOrderList,
             agents: availableAgentsForGroup,
             groupConfig,
-            onChanged: () => updateGroupSectionSummary('mode')
+            onChanged: () => {
+                updateGroupSectionSummary('mode');
+                markGroupSettingsDirty();
+            }
         });
     }
 
@@ -732,7 +746,10 @@ window.GroupRenderer = (() => {
             membersContainer: groupMembersListDiv,
             agents: availableAgentsForGroup,
             groupConfig,
-            onChanged: () => updateGroupSectionSummary('mode')
+            onChanged: () => {
+                updateGroupSectionSummary('mode');
+                markGroupSettingsDirty();
+            }
         });
     }
 
@@ -743,7 +760,10 @@ window.GroupRenderer = (() => {
             membersContainer: groupMembersListDiv,
             agents: availableAgentsForGroup,
             groupConfig,
-            onChanged: () => updateGroupSectionSummary('mode')
+            onChanged: () => {
+                updateGroupSectionSummary('mode');
+                markGroupSettingsDirty();
+            }
         });
     }
 
@@ -757,7 +777,41 @@ window.GroupRenderer = (() => {
         updateGroupSectionSummary('mode');
     }
 
-    function reportSettingsSaveResult(success, error = '') {
+    function setGroupSaveState(state) {
+        const indicator = groupSettingsForm?.querySelector('.form-save-state-indicator');
+        if (!indicator) return;
+        indicator.dataset.state = state;
+        const label = indicator.querySelector('.form-state-dot-label');
+        if (label) label.textContent = state === 'warning' ? '未保存更改' : (state === 'ongoing' ? '保存中...' : '已保存');
+        const dotHost = indicator.querySelector('.form-state-dot-host');
+        if (!dotHost) return;
+        dotHost.replaceChildren();
+        try {
+            window.VCPUIUX?.mountStateDot?.(dotHost, { state, size: 7 }, {
+                own: () => {},
+                child: () => ({ own: () => {}, listen: () => {}, dispose: () => {} }),
+                listen: () => {},
+                dispose: () => {}
+            });
+        } catch (_) {}
+    }
+
+    function markGroupSettingsDirty() {
+        if (!groupSettingsReady) return;
+        groupSettingsDirty = true;
+        ++groupSettingsRevision;
+        setGroupSaveState('warning');
+    }
+
+    function resetGroupSettingsDirty() {
+        groupSettingsDirty = false;
+        groupSettingsRevision = 0;
+        setGroupSaveState('done');
+    }
+
+    function reportSettingsSaveResult(success, error = '', saveRevision = null) {
+        if (success && saveRevision === groupSettingsRevision) groupSettingsDirty = false;
+        setGroupSaveState(success && !groupSettingsDirty ? 'done' : 'warning');
         groupSettingsForm?.dispatchEvent(new CustomEvent('vcp-settings-save-result', {
             detail: { success: Boolean(success), error }
         }));
@@ -790,6 +844,8 @@ window.GroupRenderer = (() => {
         const selectedMemberIds = [...getSelectedMemberIds()];
         const targetGroupId = groupId;
         const saveGeneration = groupSettingsGeneration;
+        const saveRevision = groupSettingsRevision;
+        setGroupSaveState('ongoing');
         const saveSurface = window.VCPSettingsSidebar;
         const saveSnapshot = saveSurface?.getSnapshot?.();
         const isCurrentSave = () => {
@@ -959,7 +1015,7 @@ window.GroupRenderer = (() => {
             const saveButton = groupSettingsForm.querySelector('button[type="submit"]');
 
             if (result.success && result.agentGroup) {
-                reportSettingsSaveResult(true);
+                reportSettingsSaveResult(true, '', saveRevision);
                 if (saveButton) uiHelper.showSaveFeedback(saveButton, true, "已保存!", "保存群组设置");
                 await mainRendererFunctions.loadItems(); // Reload list to reflect name/avatar changes
                 if (!isCurrentSave()) return;
diff --git a/docs/contracts/chat-contracts.json b/docs/contracts/chat-contracts.json
index c6e520d4a..813dbd145 100644
--- a/docs/contracts/chat-contracts.json
+++ b/docs/contracts/chat-contracts.json
@@ -720,19 +720,19 @@
     "dynamicSites": [
       {
         "file": "modules/settingsManager.js",
-        "line": 711,
+        "line": 722,
         "kind": "custom-event-listener",
         "match": "target.addEventListener(type"
       },
       {
         "file": "modules/settingsManager.js",
-        "line": 2221,
+        "line": 2233,
         "kind": "custom-event-listener",
         "match": "element.addEventListener(eventName"
       },
       {
         "file": "modules/settingsManager.js",
-        "line": 2250,
+        "line": 2262,
         "kind": "custom-event-listener",
         "match": "systemPromptContainer.addEventListener(eventName"
       }
@@ -751,13 +751,13 @@
     "dynamicSites": [
       {
         "file": "modules/topicListManager.js",
-        "line": 34,
+        "line": 40,
         "kind": "custom-event-listener",
         "match": "target?.addEventListener?.(type"
       },
       {
         "file": "modules/topicListManager.js",
-        "line": 39,
+        "line": 45,
         "kind": "custom-event-listener",
         "match": "target?.addEventListener?.(type"
       }
diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 69770eda3..12a5ff813 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -1239,7 +1239,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1000,
+          "line": 1011,
           "kind": "custom-event-listener"
         },
         {
@@ -1257,7 +1257,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1000,
+          "line": 1011,
           "kind": "custom-event-listener",
           "match": "settingsContainer.addEventListener('auxclick'"
         },
@@ -1675,7 +1675,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1351,
+          "line": 1357,
           "kind": "custom-event-listener"
         },
         {
@@ -1772,7 +1772,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1351,
+          "line": 1357,
           "kind": "custom-event-listener",
           "match": "vcpServerUrlInput.addEventListener('blur'"
         },
@@ -2318,7 +2318,7 @@
         },
         {
           "file": "modules/settings/schema/sidebar-surfaces.js",
-          "line": 515,
+          "line": 519,
           "kind": "custom-event-listener"
         },
         {
@@ -2348,7 +2348,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1160,
+          "line": 1166,
           "kind": "custom-event-listener"
         },
         {
@@ -2483,7 +2483,7 @@
         },
         {
           "file": "modules/settings/schema/sidebar-surfaces.js",
-          "line": 515,
+          "line": 519,
           "kind": "custom-event-listener",
           "match": "form.addEventListener('change'"
         },
@@ -2519,7 +2519,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1160,
+          "line": 1166,
           "kind": "custom-event-listener",
           "match": "agentSettingsForm.addEventListener('change'"
         },
@@ -3774,77 +3774,77 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1064,
+          "line": 1075,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1079,
+          "line": 1090,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1080,
+          "line": 1091,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1082,
+          "line": 1093,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1092,
+          "line": 1103,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1099,
+          "line": 1110,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1163,
+          "line": 1169,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1238,
+          "line": 1244,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1244,
+          "line": 1250,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1271,
+          "line": 1277,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1300,
+          "line": 1306,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1627,
+          "line": 1637,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1640,
+          "line": 1650,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1814,
+          "line": 1824,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1822,
+          "line": 1832,
           "kind": "custom-event-listener"
         },
         {
@@ -3959,7 +3959,7 @@
         },
         {
           "file": "modules/topicListManager.js",
-          "line": 1276,
+          "line": 1318,
           "kind": "custom-event-listener"
         },
         {
@@ -5249,91 +5249,91 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1064,
+          "line": 1075,
           "kind": "custom-event-listener",
           "match": "refreshModelsBtn.addEventListener('click'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1079,
+          "line": 1090,
           "kind": "custom-event-listener",
           "match": "cancelRegexRuleBtn.addEventListener('click'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1080,
+          "line": 1091,
           "kind": "custom-event-listener",
           "match": "closeRegexRuleModalBtn.addEventListener('click'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1082,
+          "line": 1093,
           "kind": "custom-event-listener",
           "match": "regexRuleModal.addEventListener('click'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1092,
+          "line": 1103,
           "kind": "custom-event-listener",
           "match": "openTopicSummaryModelSelectBtn.addEventListener('click'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1099,
+          "line": 1110,
           "kind": "custom-event-listener",
           "match": "document.addEventListener('click'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1163,
+          "line": 1169,
           "kind": "custom-event-listener",
           "match": "deleteItemBtn.addEventListener('click'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1238,
+          "line": 1244,
           "kind": "custom-event-listener",
           "match": "openModelSelectBtn.addEventListener('click'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1244,
+          "line": 1250,
           "kind": "custom-event-listener",
           "match": "refreshModelsBtn.addEventListener('click'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1271,
+          "line": 1277,
           "kind": "custom-event-listener",
           "match": "refreshTtsModelsBtn.addEventListener('click'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1300,
+          "line": 1306,
           "kind": "custom-event-listener",
           "match": "resetAvatarColorsBtn.addEventListener('click'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1627,
+          "line": 1637,
           "kind": "custom-event-listener",
           "match": "starSpan.addEventListener('click'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1640,
+          "line": 1650,
           "kind": "custom-event-listener",
           "match": "li.addEventListener('click'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1814,
+          "line": 1824,
           "kind": "custom-event-listener",
           "match": "editBtn.addEventListener('click'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1822,
+          "line": 1832,
           "kind": "custom-event-listener",
           "match": "deleteBtn.addEventListener('click'"
         },
@@ -5471,7 +5471,7 @@
         },
         {
           "file": "modules/topicListManager.js",
-          "line": 1276,
+          "line": 1318,
           "kind": "custom-event-listener",
           "match": "document.addEventListener('click'"
         },
@@ -7245,7 +7245,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 975,
+          "line": 986,
           "kind": "custom-event-listener"
         },
         {
@@ -7379,7 +7379,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 975,
+          "line": 986,
           "kind": "custom-event-listener",
           "match": "settingsContainer.addEventListener('contextmenu'"
         },
@@ -14649,7 +14649,7 @@
       "producers": [
         {
           "file": "modules/settingsManager.js",
-          "line": 1961,
+          "line": 1973,
           "kind": "custom-event-create"
         }
       ],
@@ -14736,32 +14736,32 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1063,
+          "line": 1074,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1159,
+          "line": 1165,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1241,
+          "line": 1247,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1306,
+          "line": 1312,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1310,
+          "line": 1316,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1338,
+          "line": 1344,
           "kind": "custom-event-listener"
         },
         {
@@ -14909,43 +14909,43 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1063,
+          "line": 1074,
           "kind": "custom-event-listener",
           "match": "modelSearchInput.addEventListener('input'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1159,
+          "line": 1165,
           "kind": "custom-event-listener",
           "match": "agentSettingsForm.addEventListener('input'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1241,
+          "line": 1247,
           "kind": "custom-event-listener",
           "match": "modelSearchInput.addEventListener('input'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1306,
+          "line": 1312,
           "kind": "custom-event-listener",
           "match": "picker.addEventListener('input'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1310,
+          "line": 1316,
           "kind": "custom-event-listener",
           "match": "textInput.addEventListener('input'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1338,
+          "line": 1344,
           "kind": "custom-event-listener",
           "match": "agentCardCssInput.addEventListener('input'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1961,
+          "line": 1973,
           "kind": "custom-event-create",
           "match": "new CustomEvent('input'"
         },
@@ -15377,7 +15377,7 @@
         },
         {
           "file": "modules/topicListManager.js",
-          "line": 1077,
+          "line": 1119,
           "kind": "custom-event-listener"
         },
         {
@@ -15725,7 +15725,7 @@
         },
         {
           "file": "modules/topicListManager.js",
-          "line": 1077,
+          "line": 1119,
           "kind": "custom-event-listener",
           "match": "inputField.addEventListener('keydown'"
         },
@@ -18326,7 +18326,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1055,
+          "line": 1066,
           "kind": "custom-event-listener"
         },
         {
@@ -18356,7 +18356,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1055,
+          "line": 1066,
           "kind": "custom-event-listener",
           "match": "document.addEventListener('modal-ready'"
         },
@@ -18742,7 +18742,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1016,
+          "line": 1027,
           "kind": "custom-event-listener"
         },
         {
@@ -18862,7 +18862,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1016,
+          "line": 1027,
           "kind": "custom-event-listener",
           "match": "settingsContainer.addEventListener('mousedown'"
         },
@@ -21462,7 +21462,7 @@
       "consumers": [
         {
           "file": "modules/settingsManager.js",
-          "line": 1247,
+          "line": 1253,
           "kind": "preload-subscription"
         },
         {
@@ -21474,7 +21474,7 @@
       "evidence": [
         {
           "file": "modules/settingsManager.js",
-          "line": 1247,
+          "line": 1253,
           "kind": "preload-subscription",
           "match": "electronAPI.onModelsUpdated("
         },
@@ -22517,7 +22517,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1263,
+          "line": 1269,
           "kind": "custom-event-listener"
         },
         {
@@ -22535,7 +22535,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1263,
+          "line": 1269,
           "kind": "custom-event-listener",
           "match": "window.addEventListener('pagehide'"
         },
@@ -26387,12 +26387,12 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 2014,
+          "line": 2026,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/topicListManager.js",
-          "line": 535,
+          "line": 562,
           "kind": "custom-event-listener"
         },
         {
@@ -26447,13 +26447,13 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 2014,
+          "line": 2026,
           "kind": "custom-event-listener",
           "match": "settingsTab.addEventListener('scroll'"
         },
         {
           "file": "modules/topicListManager.js",
-          "line": 535,
+          "line": 562,
           "kind": "custom-event-listener",
           "match": "scrollContainer.addEventListener('scroll'"
         },
@@ -28009,12 +28009,12 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1078,
+          "line": 1089,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1132,
+          "line": 1143,
           "kind": "custom-event-listener"
         },
         {
@@ -28070,13 +28070,13 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1078,
+          "line": 1089,
           "kind": "custom-event-listener",
           "match": "regexRuleForm.addEventListener('submit'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1132,
+          "line": 1143,
           "kind": "custom-event-listener",
           "match": "agentSettingsForm.addEventListener('submit'"
         },
@@ -30176,7 +30176,7 @@
       "producers": [
         {
           "file": "modules/settingsManager.js",
-          "line": 172,
+          "line": 183,
           "kind": "custom-event-create"
         }
       ],
@@ -30184,7 +30184,7 @@
       "evidence": [
         {
           "file": "modules/settingsManager.js",
-          "line": 172,
+          "line": 183,
           "kind": "custom-event-create",
           "match": "new CustomEvent('vcp-settings-delete-result'"
         }
@@ -30229,7 +30229,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 166,
+          "line": 177,
           "kind": "custom-event-create"
         },
         {
@@ -30291,7 +30291,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 166,
+          "line": 177,
           "kind": "custom-event-create",
           "match": "new CustomEvent('vcp-settings-save-result'"
         },
@@ -30344,12 +30344,12 @@
       "producers": [
         {
           "file": "modules/settingsManager.js",
-          "line": 461,
+          "line": 472,
           "kind": "custom-event-create"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1344,
+          "line": 1350,
           "kind": "custom-event-create"
         }
       ],
@@ -30363,13 +30363,13 @@
       "evidence": [
         {
           "file": "modules/settingsManager.js",
-          "line": 461,
+          "line": 472,
           "kind": "custom-event-create",
           "match": "new CustomEvent('vcp-settings-surface-updated'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1344,
+          "line": 1350,
           "kind": "custom-event-create",
           "match": "new CustomEvent('vcp-settings-surface-updated'"
         },
@@ -32598,7 +32598,7 @@
     },
     {
       "file": "modules/settingsManager.js",
-      "line": 711,
+      "line": 722,
       "reason": "dynamic listener name: type",
       "kind": "custom-event-listener",
       "match": "target.addEventListener(type",
@@ -32606,7 +32606,7 @@
     },
     {
       "file": "modules/settingsManager.js",
-      "line": 2221,
+      "line": 2233,
       "reason": "dynamic listener name: eventName",
       "kind": "custom-event-listener",
       "match": "element.addEventListener(eventName",
@@ -32614,7 +32614,7 @@
     },
     {
       "file": "modules/settingsManager.js",
-      "line": 2250,
+      "line": 2262,
       "reason": "dynamic listener name: eventName",
       "kind": "custom-event-listener",
       "match": "systemPromptContainer.addEventListener(eventName",
@@ -32622,7 +32622,7 @@
     },
     {
       "file": "modules/topicListManager.js",
-      "line": 34,
+      "line": 40,
       "reason": "dynamic listener name: type",
       "kind": "custom-event-listener",
       "match": "target?.addEventListener?.(type",
@@ -32630,7 +32630,7 @@
     },
     {
       "file": "modules/topicListManager.js",
-      "line": 39,
+      "line": 45,
       "reason": "dynamic listener name: type",
       "kind": "custom-event-listener",
       "match": "target?.addEventListener?.(type",
diff --git a/modules/itemListManager.js b/modules/itemListManager.js
index 4c78dbfe3..9e95cef85 100644
--- a/modules/itemListManager.js
+++ b/modules/itemListManager.js
@@ -1089,7 +1089,7 @@ window.itemListManager = (() => {
         } else if (errors.length > 0) {
             console.warn('[ItemListManager] Failed to fully reload items, preserving previous list where possible:', errors.join(' | '));
             if (!hadPreviousItems) {
-                itemListUl.innerHTML = errors.map(error => `<li>${error}</li>`).join('');
+                itemListUl.innerHTML = errors.map(error => `<li>${escapeHtml(String(error))}</li>`).join('');
             }
         } else {
             loadedItemsCache = [];
diff --git a/modules/settings/schema/sidebar-surfaces.js b/modules/settings/schema/sidebar-surfaces.js
index 3ef4af49d..c525b8e88 100644
--- a/modules/settings/schema/sidebar-surfaces.js
+++ b/modules/settings/schema/sidebar-surfaces.js
@@ -511,7 +511,11 @@ export function renderGroupSettingsSurface(host, doc = host?.ownerDocument || do
     const form = el(doc, 'form', { id: 'groupSettingsForm' });
     form.append(el(doc, 'input', { type: 'hidden', id: 'editingGroupId' }));
     [['identity', '基础信息', 'groupIdentitySummary'], ['mode', '群聊模式', 'groupModeSummary'], ['model', '模型设置', 'groupModelSummary'], ['prompt', '系统提示词', 'groupPromptSummary']].forEach(([key, title, summaryId]) => form.append(renderSection(doc, { kind: 'group', key, title, summaryId, content: d => renderGroupSectionContent(d, key) })));
-    form.append(el(doc, 'div', { class: 'form-actions' }, el(doc, 'button', { type: 'submit' }, '保存群组设置'), el(doc, 'div', { class: 'delete-button-container' }, el(doc, 'button', { type: 'button', id: 'deleteGroupBtn', class: 'danger-button' }, '删除此群组'))));
+    form.append(el(doc, 'div', { class: 'form-actions' },
+        el(doc, 'div', { id: 'groupFormSaveStateIndicator', class: 'form-save-state-indicator', 'data-state': 'done' },
+            el(doc, 'span', { class: 'form-state-dot-host' }),
+            el(doc, 'span', { class: 'form-state-dot-label' }, '已保存')),
+        el(doc, 'button', { type: 'submit' }, '保存群组设置'), el(doc, 'div', { class: 'delete-button-container' }, el(doc, 'button', { type: 'button', id: 'deleteGroupBtn', class: 'danger-button' }, '删除此群组'))));
     form.addEventListener('change', () => {
         syncSchemaDependencies(form);
     });
diff --git a/modules/settingsManager.js b/modules/settingsManager.js
index c5de468b9..aa370901f 100644
--- a/modules/settingsManager.js
+++ b/modules/settingsManager.js
@@ -95,6 +95,17 @@ const settingsManager = (() => {
     let isAgentSettingsDirty = false;
     let agentSettingsRevision = 0;
     let agentSettingsAutosaveTimer = null;
+
+    // Edits that live outside the form's own input/change events (the regex
+    // modal, MiMo add/remove buttons) report here so the unsaved-changes dot
+    // shows them like any other field.
+    function markAgentSettingsDirty() {
+        isAgentSettingsDirty = true;
+        ++agentSettingsRevision;
+        if (typeof globalThis.vcpUpdateFormStateDot === 'function') {
+            globalThis.vcpUpdateFormStateDot('warning');
+        }
+    }
     const initializedCollapseStateAgents = new Set();
     const promptModeFallbackLabels = {
         original: '文本',
@@ -1151,13 +1162,8 @@ const settingsManager = (() => {
                         }
                     }
                 });
-                const markDirty = () => {
-                    isAgentSettingsDirty = true;
-                    ++agentSettingsRevision;
-                    updateStateDotIndicator('warning');
-                };
-                agentSettingsForm.addEventListener('input', markDirty);
-                agentSettingsForm.addEventListener('change', markDirty);
+                agentSettingsForm.addEventListener('input', markAgentSettingsDirty);
+                agentSettingsForm.addEventListener('change', markAgentSettingsDirty);
             }
             if (deleteItemBtn) {
                 deleteItemBtn.addEventListener('click', handleDeleteCurrentItem);
@@ -1377,9 +1383,13 @@ const settingsManager = (() => {
         // slot owns rows, shortcuts and editor geometry.
         getTtsDirectorPrompts: () => [...currentAgentTtsDirectorPrompts],
         setTtsDirectorPrompts: (prompts) => {
-            currentAgentTtsDirectorPrompts = Array.isArray(prompts)
+            const nextPrompts = Array.isArray(prompts)
                 ? prompts.map(prompt => String(prompt ?? '').trim()).filter(Boolean)
                 : [];
+            const changed = nextPrompts.length !== currentAgentTtsDirectorPrompts.length
+                || nextPrompts.some((prompt, index) => prompt !== currentAgentTtsDirectorPrompts[index]);
+            currentAgentTtsDirectorPrompts = nextPrompts;
+            if (changed) markAgentSettingsDirty();
             updateSectionSummary('tts');
         },
         getTtsDirectorTemplate: () => TTS_DIRECTOR_TEMPLATE,
@@ -1823,6 +1833,7 @@ function resolveRegexSlots() {
             if (await uiHelper.showConfirmDialog(`确定要删除规则 "${rule.title}" 吗？`, '删除确认', '删除', '取消', true)) {
                 currentAgentRegexes = currentAgentRegexes.filter(r => r.id !== rule.id);
                 renderRegexList();
+                markAgentSettingsDirty();
             }
         });
 
@@ -1930,6 +1941,7 @@ function resolveRegexSlots() {
         }
 
         renderRegexList();
+        markAgentSettingsDirty();
         closeRegexModal();
     }
 
diff --git a/modules/topicListManager.js b/modules/topicListManager.js
index 41b4a9339..075f8c746 100644
--- a/modules/topicListManager.js
+++ b/modules/topicListManager.js
@@ -28,6 +28,12 @@ window.topicListManager = (() => {
     const TOPIC_INITIAL_RENDER_COUNT = 40;
     const TOPIC_PROGRESSIVE_BATCH_SIZE = 30;
     const TOPIC_LOAD_MORE_THRESHOLD_PX = 320;
+    // Each search reload re-reads the item config and runs a content search
+    // over IPC. Typing waits for a short pause first, in the range ZCode uses
+    // for its IO-backed refreshes (fileWatcherService 150ms, useTabPersistence
+    // 300ms); Enter still searches at once.
+    const TOPIC_SEARCH_DEBOUNCE_MS = 200;
+    let topicSearchTimer = null;
 
     const addListener = (target, type, handler, options) => {
         if (listenerOwner) return listenerOwner.add(target, type, handler, options);
@@ -40,6 +46,27 @@ window.topicListManager = (() => {
         renderListenerDisposers.push(() => target?.removeEventListener?.(type, handler, options));
     }
 
+    function cancelPendingTopicSearch() {
+        if (topicSearchTimer) clearTimeout(topicSearchTimer);
+        topicSearchTimer = null;
+    }
+
+    // Names and IPC error strings are user or disk data, so status rows are
+    // built with textContent, never by interpolating into innerHTML.
+    function renderTopicListStatus(topicListUl, message, { loading = false } = {}) {
+        const li = document.createElement('li');
+        if (loading) {
+            const spinner = document.createElement('div');
+            spinner.className = 'loading-spinner-small';
+            li.append(spinner, document.createTextNode(message));
+        } else {
+            const p = document.createElement('p');
+            p.textContent = message;
+            li.appendChild(p);
+        }
+        topicListUl.replaceChildren(li);
+    }
+
     function disposeRenderListeners() {
         renderListenerDisposers.splice(0).reverse().forEach(dispose => dispose());
     }
@@ -545,6 +572,7 @@ window.topicListManager = (() => {
             return;
         }
 
+        cancelPendingTopicSearch();
         cleanupProgressiveTopicRendering();
         const loadGeneration = topicListRenderGeneration;
 
@@ -594,15 +622,21 @@ window.topicListManager = (() => {
         let itemConfigFull;
 
         if (!searchTerm) {
-            topicListUl.innerHTML = `<li><div class="loading-spinner-small"></div>正在加载 ${itemNameForLoading} 的话题...</li>`;
+            renderTopicListStatus(topicListUl, `正在加载 ${itemNameForLoading} 的话题...`, { loading: true });
         } else {
             topicListUl.innerHTML = '';
         }
 
-        if (currentSelectedItem.type === 'agent') {
-            itemConfigFull = await electronAPI.getAgentConfig(currentSelectedItem.id);
-        } else if (currentSelectedItem.type === 'group') {
-            itemConfigFull = await electronAPI.getAgentGroupConfig(currentSelectedItem.id);
+        try {
+            if (currentSelectedItem.type === 'agent') {
+                itemConfigFull = await electronAPI.getAgentConfig(currentSelectedItem.id);
+            } else if (currentSelectedItem.type === 'group') {
+                itemConfigFull = await electronAPI.getAgentGroupConfig(currentSelectedItem.id);
+            }
+        } catch (error) {
+            // A rejected IPC call used to leave the loading spinner up for good.
+            console.error('[TopicListManager] Failed to load item config:', error);
+            itemConfigFull = { error: error?.message || String(error) };
         }
 
         if (loadGeneration !== topicListRenderGeneration ||
@@ -621,7 +655,7 @@ window.topicListManager = (() => {
             currentItemConfig = null;
             selectedTopicIds.clear();
             syncManageUi();
-            topicListUl.innerHTML = `<li><p>无法加载 ${itemNameForLoading} 的配置信息: ${itemConfigFull?.error || '未知错误'}</p></li>`;
+            renderTopicListStatus(topicListUl, `无法加载 ${itemNameForLoading} 的配置信息: ${itemConfigFull?.error || '未知错误'}`);
         } else {
             let topicsToProcess = itemConfigFull.topics || [];
             if (currentSelectedItem.type === 'agent' && topicsToProcess.length === 0) {
@@ -682,7 +716,7 @@ window.topicListManager = (() => {
             syncManageUi();
 
             if (topicsToProcess.length === 0) {
-                topicListUl.innerHTML = `<li><p>${itemNameForLoading} 还没有任何话题${searchTerm ? '匹配当前搜索' : ''}。您可以点击上方的“新建${currentSelectedItem.type === 'group' ? '群聊话题' : '聊天话题'}”按钮创建一个。</p></li>`;
+                renderTopicListStatus(topicListUl, `${itemNameForLoading} 还没有任何话题${searchTerm ? '匹配当前搜索' : ''}。您可以点击上方的“新建${currentSelectedItem.type === 'group' ? '群聊话题' : '聊天话题'}”按钮创建一个。`);
             } else {
                 const currentTopicId = currentTopicIdRef.get();
                 renderTopicListProgressively(topicListUl, topicsToProcess, currentSelectedItem, currentTopicId, itemConfigFull, searchTerm);
@@ -701,7 +735,7 @@ window.topicListManager = (() => {
         if (inputElement.dataset.topicSearchBound === 'true') return;
         inputElement.dataset.topicSearchBound = 'true';
 
-        addListener(inputElement, 'input', filterTopicList);
+        addListener(inputElement, 'input', scheduleTopicSearch);
         addListener(inputElement, 'keydown', (event) => {
             if (event.key === 'Enter') {
                 event.preventDefault();
@@ -710,6 +744,14 @@ window.topicListManager = (() => {
         });
     }
 
+    function scheduleTopicSearch() {
+        cancelPendingTopicSearch();
+        topicSearchTimer = setTimeout(() => {
+            topicSearchTimer = null;
+            loadTopicList();
+        }, TOPIC_SEARCH_DEBOUNCE_MS);
+    }
+
     function filterTopicList() {
         loadTopicList();
     }
@@ -1539,6 +1581,7 @@ window.topicListManager = (() => {
     }
 
     function dispose() {
+        cancelPendingTopicSearch();
         cleanupProgressiveTopicRendering();
         closeTopicContextMenu();
         selectedTopicIds.clear();
diff --git a/modules/ui-system/next-shell/next-shell-controller.js b/modules/ui-system/next-shell/next-shell-controller.js
index 05b90a637..c0bc81260 100644
--- a/modules/ui-system/next-shell/next-shell-controller.js
+++ b/modules/ui-system/next-shell/next-shell-controller.js
@@ -401,10 +401,24 @@
         } catch (error) {
             console.error(`[NextUI] Failed to open embedded app ${app.id}:`, error);
             container.dataset.state = 'error';
-            container.innerHTML = `<div class="next-ui-embedded-app-status is-error"><span class="vcp-ui-icon" aria-hidden="true">error</span><span>${error.message || '应用加载失败'}</span></div>`;
+            container.replaceChildren(createEmbeddedAppError(error.message || '应用加载失败'));
         }
     }
 
+    // The error text comes from the app or its process, so it goes in as text.
+    function createEmbeddedAppError(message) {
+        const status = document.createElement('div');
+        status.className = 'next-ui-embedded-app-status is-error';
+        const icon = document.createElement('span');
+        icon.className = 'vcp-ui-icon';
+        icon.setAttribute('aria-hidden', 'true');
+        icon.textContent = 'error';
+        const text = document.createElement('span');
+        text.textContent = String(message);
+        status.append(icon, text);
+        return status;
+    }
+
     function openEmbeddedApp(app) {
         return trackTabPromise(`open:${app?.action || app?.id || 'unknown'}`, openEmbeddedAppInternal(app));
     }
@@ -592,7 +606,7 @@
             }
             if (payload?.state !== 'error') return;
             view.container.dataset.state = 'error';
-            view.container.innerHTML = `<div class="next-ui-embedded-app-status is-error"><span class="vcp-ui-icon" aria-hidden="true">error</span><span>${payload.error || '应用运行异常'}</span></div>`;
+            view.container.replaceChildren(createEmbeddedAppError(payload.error || '应用运行异常'));
         });
     }
 
diff --git a/package.json b/package.json
index 50c91de3a..f64155862 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,7 @@
     "test:launchpad-icons": "node --test tests/launchpad-icons.test.js tests/launchpad-controller.test.js",
     "test:next-ui-empty-state": "node scripts/test-next-ui-empty-state.mjs",
     "test:ui-motion-contract": "node scripts/test-ui-motion-contract.mjs",
-    "check:ui-system": "npm run guard:design-subtraction && npm run guard:classic-parity && npm run guard:classic-retirement && npm run guard:next-delta && npm run guard:ui-interaction && npm run guard:ui-async-state && npm run guard:ui-task-journeys && npm run guard:theme-provenance && npm run test:ui-motion-contract && node --check modules/ui-system/lifecycle-scope.js && node --check VCPDistributedServer/frontend-plugin-loader.js && node --check modules/ui-system/component-manifest.js && node --check modules/ui-system/vcp-ui.js && node --check modules/ui-system/webawesome-runtime-manifest.js && node --check modules/ui-system/webawesome-adapter.js && node --check modules/ui-system/appearance-engine.js && node --check modules/ui-system/appearance-studio.js && node --check modules/ui-system/next-ui-apps.js && node --check modules/ui-system/component-showcase.js && node --check modules/ui-system/webawesome-comparison.js && node --check modules/topTabManager.js && npm run lint:ui-system && npm run guard:ui-system && npm run check:ui-applications && npm run test:ui-system && npm run test:appearance-engine && npm run test:appearance-studio && node scripts/test-next-ui-tab-lifecycle.mjs && node scripts/test-webawesome-adapter.mjs && node --test tests/lifecycle-scope.test.js tests/next-ui-registries.test.mjs tests/topic-list-mode-lifecycle.test.js && npm run test:bootstrap",
+    "check:ui-system": "npm run guard:design-subtraction && npm run guard:classic-parity && npm run guard:classic-retirement && npm run guard:next-delta && npm run guard:ui-interaction && npm run guard:ui-async-state && npm run guard:ui-task-journeys && npm run guard:theme-provenance && npm run test:ui-motion-contract && node --check modules/ui-system/lifecycle-scope.js && node --check VCPDistributedServer/frontend-plugin-loader.js && node --check modules/ui-system/component-manifest.js && node --check modules/ui-system/vcp-ui.js && node --check modules/ui-system/webawesome-runtime-manifest.js && node --check modules/ui-system/webawesome-adapter.js && node --check modules/ui-system/appearance-engine.js && node --check modules/ui-system/appearance-studio.js && node --check modules/ui-system/next-ui-apps.js && node --check modules/ui-system/component-showcase.js && node --check modules/ui-system/webawesome-comparison.js && node --check modules/topTabManager.js && npm run lint:ui-system && npm run guard:ui-system && npm run check:ui-applications && npm run test:ui-system && npm run test:appearance-engine && npm run test:appearance-studio && node scripts/test-next-ui-tab-lifecycle.mjs && node scripts/test-webawesome-adapter.mjs && node --test tests/lifecycle-scope.test.js tests/next-ui-registries.test.mjs tests/topic-list-mode-lifecycle.test.js tests/topic-list-load-robustness.test.js tests/settings-unsaved-indicator.test.mjs && npm run test:bootstrap",
     "test:appearance-engine": "node scripts/test-appearance-engine.mjs",
     "test:appearance-studio": "node scripts/test-appearance-studio.mjs",
     "test:vcp-ui-select-proxy": "node scripts/test-vcp-ui-select-proxy.mjs",
diff --git a/scripts/next-delta-shared-baseline.json b/scripts/next-delta-shared-baseline.json
index 251a462fd..e246e27d2 100644
--- a/scripts/next-delta-shared-baseline.json
+++ b/scripts/next-delta-shared-baseline.json
@@ -12,20 +12,20 @@
     "reason": "Integrated projection behavior: media cleanup before subtree replacement; nested tool-result ranges shield protocol markers; incremental smooth-stream burst handling preserves text order; durable persistence remains outside this projection."
   },
   "modules/topicListManager.js": {
-    "sha256": "a06e63547574acb218ae131b1539ccc5fc6ac798d0cd0e2e0a0adb34677c8c16",
-    "reason": "Integrated topic behavior: configuration/unread loads validate the selected item; sort/title/menu operations capture their original topic target; completed deletion changes the active view only for the same item and topic. Repository, readiness and render listener ownership remain unchanged."
+    "sha256": "50b2475f546cde9b601fb37dcc77562513f57b27823287a64061e85858653b74",
+    "reason": "Integrated topic behavior: configuration/unread loads validate the selected item; sort/title/menu operations capture their original topic target; completed deletion changes the active view only for the same item and topic. Repository, readiness and render listener ownership remain unchanged. Topic search waits 200ms after typing before reloading (Enter is immediate); a rejected config IPC shows an error row instead of a permanent spinner; names and IPC errors render as text."
   },
   "modules/itemListManager.js": {
-    "sha256": "6fb3f38f57edda8c4a9632d04fba6e1239c85e11064fc5214b58700e035850ae",
-    "reason": "Integrated catalog behavior: operation-counted speaking indicators survive list refreshes; catalog publication validates the final settings read; unread publication is ordered across navigation and catalog refreshes. Persona WIP is excluded."
+    "sha256": "ae5eca22dd19312f56d5c9d60b6a221c3a5be8cf2d34c1049407b45100cc5393",
+    "reason": "Integrated catalog behavior: operation-counted speaking indicators survive list refreshes; catalog publication validates the final settings read; unread publication is ordered across navigation and catalog refreshes. Persona WIP is excluded. Load error rows are HTML-escaped."
   },
   "Groupmodules/grouprenderer.js": {
-    "sha256": "31f0d3defe8ba31ef1f9b6c41f9655b23fa02991671483b6ab658a3e3f8450eb",
-    "reason": "Integrated group behavior: JEV mode/context-window fields and invitations; explicit group queue interrupt; optimistic user message IDs survive file sync; settings read/save snapshots preserve the original group and mode data; chat header delegates to its presentation owner."
+    "sha256": "a88a5e4972d9b3739a8da8f300876f066dd2841bcfa8f41f6ffac664cc36cac8",
+    "reason": "Integrated group behavior: JEV mode/context-window fields and invitations; explicit group queue interrupt; optimistic user message IDs survive file sync; settings read/save snapshots preserve the original group and mode data; chat header delegates to its presentation owner. Group form tracks unsaved edits (including speaker reorder) and shows the same 未保存更改 indicator as Agent settings; a successful save clears it, loading a group resets it."
   },
   "modules/settingsManager.js": {
-    "sha256": "ab7f07e0a7ef558b3c5ac8a04ff7d715912414d6cd8f0799f38160ac7e46c550",
-    "reason": "Integrated manual-save policy: Agent/prompt edits remain drafts until Save; context changes and collapse no longer implicitly persist; submit captures draft and display identity; regex import merges into the draft; Lucide renders action icons. Replaces the obsolete autosave rationale. Settings display uses a local selection snapshot; a delayed config read cannot overwrite a newer settings view (frozen-selection and A-to-B display regression tests)."
+    "sha256": "1d1a99372dba5059837c4a00d48ed8eb3e983f01323cb664750828e1254585f4",
+    "reason": "Integrated manual-save policy: Agent/prompt edits remain drafts until Save; context changes and collapse no longer implicitly persist; submit captures draft and display identity; regex import merges into the draft; Lucide renders action icons. Replaces the obsolete autosave rationale. Settings display uses a local selection snapshot; a delayed config read cannot overwrite a newer settings view (frozen-selection and A-to-B display regression tests). Regex rule add/edit/delete and MiMo director prompt add/remove mark the draft unsaved like ordinary field edits."
   },
   "modules/filterManager.js": {
     "sha256": "2390116ff961f18cdf2d3defd02d5559de9381f891be7e5eb33ef99f98337225",
diff --git a/tests/settings-unsaved-indicator.test.mjs b/tests/settings-unsaved-indicator.test.mjs
new file mode 100644
index 000000000..fd42952e2
--- /dev/null
+++ b/tests/settings-unsaved-indicator.test.mjs
@@ -0,0 +1,238 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { JSDOM } from 'jsdom';
+import fs from 'node:fs';
+import path from 'node:path';
+import { pathToFileURL, fileURLToPath } from 'node:url';
+
+// Agent and group settings save only on the Save button. Every edit has to
+// show 未保存更改 before the user switches away, or the switch drops it
+// without a trace. These cover the edits that bypass the form's own
+// input/change events: the regex modal, MiMo add/remove, and group speaker
+// reordering, plus the group form, which had no indicator at all.
+
+const repoRoot = fileURLToPath(new URL('..', import.meta.url));
+const mainHtml = fs.readFileSync(path.join(repoRoot, 'main.html'), 'utf8');
+const schema = await import(pathToFileURL(path.join(repoRoot, 'modules/settings/schema/sidebar-surfaces.js')).href);
+const surfaceModule = await import(pathToFileURL(path.join(repoRoot, 'modules/ui-system/settings/settings-sidebar-surface.js')).href);
+const wait = ms => new Promise(resolve => setTimeout(resolve, ms));
+
+function withDom(run) {
+    return async () => {
+        const dom = new JSDOM('<!doctype html><html><body><main id="tabContentSettings" class="active" aria-hidden="false"><div id="agentSettingsContainer"></div><p id="selectAgentPromptForSettings">请选择</p></main></body></html>', { url: 'http://localhost' });
+        const saved = {
+            window: globalThis.window,
+            document: globalThis.document,
+            requestAnimationFrame: globalThis.requestAnimationFrame,
+            MutationObserver: globalThis.MutationObserver,
+            CustomEvent: globalThis.CustomEvent,
+            setInterval: globalThis.setInterval
+        };
+        const intervals = [];
+        globalThis.window = dom.window;
+        globalThis.document = dom.window.document;
+        globalThis.requestAnimationFrame = cb => setTimeout(cb, 0);
+        dom.window.requestAnimationFrame = cb => setTimeout(cb, 0);
+        globalThis.MutationObserver = dom.window.MutationObserver;
+        globalThis.CustomEvent = dom.window.CustomEvent;
+        globalThis.setInterval = (...args) => {
+            const id = saved.setInterval(...args);
+            id.unref?.();
+            intervals.push(id);
+            return id;
+        };
+        try {
+            await run(dom, dom.window.document);
+        } finally {
+            intervals.forEach(clearInterval);
+            Object.assign(globalThis, saved);
+            dom.window.close();
+        }
+    };
+}
+
+function mountRegexModal(document) {
+    const match = mainHtml.match(/<template id="regexRuleModalTemplate">([\s\S]*?)<\/template>/);
+    assert.ok(match, 'main.html must carry the regex modal template');
+    const holder = document.createElement('div');
+    holder.innerHTML = match[1];
+    document.body.append(...holder.childNodes);
+}
+
+async function mountAgentSettings(dom, document) {
+    const host = document.getElementById('agentSettingsContainer');
+    const form = schema.renderAgentSettingsSurface(host, document);
+    mountRegexModal(document);
+    dom.window.eval(fs.readFileSync(path.join(repoRoot, 'modules/settingsManager.js'), 'utf8'));
+    const sm = dom.window.settingsManager;
+    sm.init({
+        electronAPI: { saveAgentConfig: async () => ({ success: true }), getAgentConfig: async () => ({}) },
+        uiHelper: {
+            showToastNotification() {},
+            showSaveFeedback() {},
+            openModal() {},
+            closeModal() {},
+            showConfirmDialog: async () => true
+        },
+        refs: { currentSelectedItemRef: { get: () => ({ id: 'agent-a', type: 'agent' }), set() {} } },
+        mainRendererFunctions: { getCroppedFile: () => null, resetCroppedFile() {} },
+        elements: {
+            agentSettingsContainer: host,
+            groupSettingsContainer: null,
+            selectItemPromptForSettings: document.getElementById('selectAgentPromptForSettings'),
+            itemSettingsContainerTitle: null,
+            selectedItemNameForSettingsSpan: null,
+            deleteItemBtn: document.getElementById('deleteAgentBtn'),
+            agentSettingsForm: form,
+            editingAgentIdInput: document.getElementById('editingAgentId'),
+            agentNameInput: document.getElementById('agentNameInput'),
+            agentAvatarInput: document.getElementById('agentAvatarInput'),
+            agentAvatarPreview: document.getElementById('agentAvatarPreview'),
+            agentModelInput: document.getElementById('agentModel'),
+            agentTemperatureInput: document.getElementById('agentTemperature'),
+            agentContextTokenLimitInput: document.getElementById('agentContextTokenLimit'),
+            agentMaxOutputTokensInput: document.getElementById('agentMaxOutputTokens'),
+            openModelSelectBtn: document.getElementById('openModelSelectBtn'),
+            topicSummaryModelInput: null,
+            openTopicSummaryModelSelectBtn: null,
+            agentTtsSpeedSlider: document.getElementById('agentTtsSpeed')
+        }
+    });
+    document.dispatchEvent(new dom.window.CustomEvent('modal-ready', { detail: { modalId: 'regexRuleModal' } }));
+    document.getElementById('editingAgentId').value = 'agent-a';
+    const state = () => document.getElementById('formSaveStateIndicator').dataset.state;
+    const save = async () => {
+        form.dispatchEvent(new dom.window.Event('submit', { bubbles: true, cancelable: true }));
+        await wait(30);
+    };
+    return { sm, form, state, save };
+}
+
+test('adding or editing a regex rule in the modal marks the Agent form unsaved', withDom(async (dom, document) => {
+    const { sm, state, save } = await mountAgentSettings(dom, document);
+    await save();
+    assert.equal(state(), 'done');
+
+    sm.openRegexModal();
+    document.getElementById('regexRuleTitle').value = 'strip thinking';
+    document.getElementById('regexRuleFind').value = '<think>.*</think>';
+    document.getElementById('regexRuleForm').dispatchEvent(new dom.window.Event('submit', { bubbles: true, cancelable: true }));
+    assert.equal(document.querySelectorAll('.strip-regex-row').length, 1);
+    assert.equal(state(), 'warning', 'a new regex rule is an unsaved edit');
+}));
+
+test('deleting a regex rule marks the Agent form unsaved', withDom(async (dom, document) => {
+    const { sm, state, save } = await mountAgentSettings(dom, document);
+    sm.openRegexModal();
+    document.getElementById('regexRuleTitle').value = 'rule';
+    document.getElementById('regexRuleFind').value = 'x';
+    document.getElementById('regexRuleForm').dispatchEvent(new dom.window.Event('submit', { bubbles: true, cancelable: true }));
+    await save();
+    assert.equal(state(), 'done');
+
+    document.querySelector('.btn-delete-regex').click();
+    await wait(0);
+    assert.equal(document.querySelectorAll('.strip-regex-row').length, 0);
+    assert.equal(state(), 'warning', 'a deleted regex rule is an unsaved edit');
+}));
+
+test('adding or removing a MiMo director prompt marks the Agent form unsaved', withDom(async (dom, document) => {
+    const { sm, state, save } = await mountAgentSettings(dom, document);
+    await save();
+    assert.equal(state(), 'done');
+
+    sm.setTtsDirectorPrompts(['温柔一点']);
+    assert.equal(state(), 'warning', 'adding a prompt is an unsaved edit');
+
+    await save();
+    assert.equal(state(), 'done');
+    sm.setTtsDirectorPrompts(['温柔一点']);
+    assert.equal(state(), 'done', 'writing back the same prompts is not an edit');
+
+    sm.setTtsDirectorPrompts([]);
+    assert.equal(state(), 'warning', 'removing a prompt is an unsaved edit');
+}));
+
+async function mountGroupSettings(dom, document, { saveResult = { success: true } } = {}) {
+    const root = document.getElementById('tabContentSettings');
+    dom.window.VCPSettingsSidebar = surfaceModule.createSettingsSidebarSurface({ document, root });
+    dom.window.VCPSettingsSchema = schema;
+    dom.window.eval(fs.readFileSync(path.join(repoRoot, 'modules/ui-system/settings/group-slots.js'), 'utf8'));
+    dom.window.VCPGroupSettingsSlots.ensureSettingsSurface({ document, settingsTab: root });
+    dom.window.eval(fs.readFileSync(path.join(repoRoot, 'Groupmodules/grouprenderer.js'), 'utf8'));
+    const gr = dom.window.GroupRenderer;
+    const agents = [{ id: 'a1', name: 'Ann' }, { id: 'a2', name: 'Bob' }];
+    const configs = {
+        'group-1': { id: 'group-1', name: 'One', mode: 'sequential', members: ['a1', 'a2'] },
+        'group-2': { id: 'group-2', name: 'Two', mode: 'sequential', members: ['a1', 'a2'] }
+    };
+    let selected = { id: 'group-1', type: 'group' };
+    gr.init({
+        electronAPI: {
+            getAgentGroupConfig: async id => structuredClone(configs[id]),
+            getAgents: async () => agents,
+            saveAgentGroupConfig: async (id, config) => (saveResult.success
+                ? { success: true, agentGroup: { ...config, id } }
+                : { success: false, error: 'disk full' })
+        },
+        globalSettings: {},
+        currentSelectedItemRef: { get: () => selected, set: value => { selected = value; } },
+        currentTopicIdRef: { get: () => null, set() {} },
+        messageRenderer: { setCurrentItemAvatar() {}, setCurrentItemAvatarColor() {} },
+        uiHelper: { showToastNotification() {}, showSaveFeedback() {} },
+        mainRendererElements: {},
+        selectAgentPromptForSettingsElement: document.getElementById('selectAgentPromptForSettings'),
+        agentSettingsContainer: null,
+        selectedItemNameForSettingsElement: null,
+        mainRendererFunctions: { setCroppedFile() {}, getCroppedFile: () => null, loadItems: async () => {} }
+    });
+    const open = async id => {
+        selected = { id, type: 'group' };
+        await gr.displayGroupSettingsPage(id);
+    };
+    const state = () => document.querySelector('#groupSettingsForm .form-save-state-indicator')?.dataset.state;
+    return { gr, open, state };
+}
+
+test('group settings show unsaved edits, clear on save, and reset on switching group', withDom(async (dom, document) => {
+    const { open, state } = await mountGroupSettings(dom, document);
+    await open('group-1');
+    assert.equal(state(), 'done', 'a freshly loaded group has nothing unsaved');
+
+    const name = document.getElementById('groupNameInput');
+    name.value = 'One renamed';
+    name.dispatchEvent(new dom.window.Event('input', { bubbles: true }));
+    assert.equal(state(), 'warning', 'typing in the group form is an unsaved edit');
+
+    document.getElementById('groupSettingsForm')
+        .dispatchEvent(new dom.window.Event('submit', { bubbles: true, cancelable: true }));
+    await wait(30);
+    assert.equal(state(), 'done', 'a successful save clears the indicator');
+
+    name.value = 'again';
+    name.dispatchEvent(new dom.window.Event('input', { bubbles: true }));
+    await open('group-2');
+    assert.equal(state(), 'done', 'the next group starts clean');
+}));
+
+test('reordering the speaker order marks the group form unsaved', withDom(async (dom, document) => {
+    const { open, state } = await mountGroupSettings(dom, document);
+    await open('group-1');
+    assert.equal(state(), 'done');
+    const items = document.querySelectorAll('#sequentialSpeakerOrderList .sequential-speaker-order-item');
+    assert.equal(items.length, 2);
+    items[1].querySelector('button').click();
+    assert.equal(state(), 'warning', 'a speaker reorder fires no input event but is still an edit');
+}));
+
+test('a failed group save keeps the edit marked unsaved', withDom(async (dom, document) => {
+    const { open, state } = await mountGroupSettings(dom, document, { saveResult: { success: false } });
+    await open('group-1');
+    const name = document.getElementById('groupNameInput');
+    name.value = 'lost?';
+    name.dispatchEvent(new dom.window.Event('input', { bubbles: true }));
+    document.getElementById('groupSettingsForm')
+        .dispatchEvent(new dom.window.Event('submit', { bubbles: true, cancelable: true }));
+    await wait(30);
+    assert.equal(state(), 'warning');
+}));
diff --git a/tests/topic-list-load-robustness.test.js b/tests/topic-list-load-robustness.test.js
new file mode 100644
index 000000000..c664cc44d
--- /dev/null
+++ b/tests/topic-list-load-robustness.test.js
@@ -0,0 +1,111 @@
+const test = require('node:test');
+const assert = require('node:assert/strict');
+const fs = require('node:fs');
+const path = require('node:path');
+const { JSDOM } = require('jsdom');
+
+const root = path.resolve(__dirname, '..');
+const source = fs.readFileSync(path.join(root, 'modules/topicListManager.js'), 'utf8');
+const wait = ms => new Promise(resolve => setTimeout(resolve, ms));
+
+function mountTopicList({ item, electronAPI }) {
+    const dom = new JSDOM(`<!doctype html><html><body>
+        <section id="tabContentTopics">
+            <div class="topics-header"><input type="text" id="topicSearchInput"></div>
+            <ul id="topicList" class="topic-list"></ul>
+        </section>
+    </body></html>`, { url: 'https://vcpchat.local/main.html', runScripts: 'outside-only' });
+    const { window } = dom;
+    window.requestAnimationFrame = callback => setTimeout(callback, 0);
+    window.IntersectionObserver = class { observe() {} unobserve() {} disconnect() {} };
+    window.eval(source);
+    const configUpdates = [];
+    window.topicListManager.init({
+        elements: { topicListContainer: window.document.getElementById('tabContentTopics') },
+        electronAPI,
+        chatRepository: { getHistory: async () => [] },
+        refs: {
+            currentSelectedItemRef: { get: () => item },
+            currentTopicIdRef: { get: () => null }
+        },
+        uiHelper: {},
+        mainRendererFunctions: { updateCurrentItemConfig: config => configUpdates.push(config) },
+        topicSelectionReadiness: { isReady: () => true, defer() {} }
+    });
+    window.topicListManager.setupTopicSearch();
+    return { dom, window, list: window.document.getElementById('topicList'), configUpdates };
+}
+
+test('a rejected config IPC replaces the loading spinner with an error row', async () => {
+    const { dom, window, list } = mountTopicList({
+        item: { id: 'agent-a', type: 'agent', name: 'Alice' },
+        electronAPI: { getAgentConfig: async () => { throw new Error('config read failed'); } }
+    });
+    await window.topicListManager.loadTopicList();
+    assert.equal(list.querySelector('.loading-spinner-small'), null, 'spinner must not stay up after a rejection');
+    assert.match(list.textContent, /config read failed/);
+    window.topicListManager.dispose();
+    dom.window.close();
+});
+
+test('item names and IPC errors render as text, not markup', async () => {
+    const hostile = '<img src=x data-injected="name">';
+    const { dom, window, list } = mountTopicList({
+        item: { id: 'agent-a', type: 'agent', name: hostile },
+        electronAPI: { getAgentConfig: async () => ({ error: '<b data-injected="error">boom</b>' }) }
+    });
+    await window.topicListManager.loadTopicList();
+    assert.equal(list.querySelector('[data-injected]'), null, 'no element may be parsed out of a name or error');
+    assert.ok(list.textContent.includes(hostile));
+    assert.ok(list.textContent.includes('<b data-injected="error">boom</b>'));
+    window.topicListManager.dispose();
+    dom.window.close();
+});
+
+test('typing a search waits for a pause and reloads once', async () => {
+    let configCalls = 0;
+    let searchCalls = 0;
+    const { dom, window, list } = mountTopicList({
+        item: { id: 'agent-a', type: 'agent', name: 'Alice' },
+        electronAPI: {
+            getAgentConfig: async () => {
+                configCalls++;
+                return { topics: [{ id: 't1', name: 'alpha notes', createdAt: 1 }, { id: 't2', name: 'beta', createdAt: 2 }] };
+            },
+            searchTopicsByContent: async () => { searchCalls++; return { success: true, matchedTopicIds: [] }; }
+        }
+    });
+    const input = window.document.getElementById('topicSearchInput');
+    for (const value of ['a', 'al', 'alp', 'alph', 'alpha']) {
+        input.value = value;
+        input.dispatchEvent(new window.Event('input', { bubbles: true }));
+    }
+    assert.equal(configCalls, 0, 'no IPC per keystroke');
+    await wait(300);
+    assert.equal(configCalls, 1, 'one reload after typing stops');
+    assert.equal(searchCalls, 1, 'one content search for the final query');
+    assert.deepEqual([...list.querySelectorAll('.topic-item')].map(li => li.dataset.topicId), ['t1']);
+    window.topicListManager.dispose();
+    dom.window.close();
+});
+
+test('Enter searches at once and cancels the pending debounced reload', async () => {
+    let configCalls = 0;
+    const { dom, window } = mountTopicList({
+        item: { id: 'agent-a', type: 'agent', name: 'Alice' },
+        electronAPI: {
+            getAgentConfig: async () => { configCalls++; return { topics: [] }; },
+            searchTopicsByContent: async () => ({ success: true, matchedTopicIds: [] })
+        }
+    });
+    const input = window.document.getElementById('topicSearchInput');
+    input.value = 'x';
+    input.dispatchEvent(new window.Event('input', { bubbles: true }));
+    input.dispatchEvent(new window.KeyboardEvent('keydown', { key: 'Enter', bubbles: true }));
+    await wait(0);
+    assert.equal(configCalls, 1);
+    await wait(300);
+    assert.equal(configCalls, 1, 'the earlier keystroke must not reload again');
+    window.topicListManager.dispose();
+    dom.window.close();
+});

From eceb23edfdd864e15a3a50213de9f661dd14b8be Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 01:37:01 +0000
Subject: [PATCH 054/143] Terminal: tell xterm about ConPTY, and skip the
 PowerShell handshake under bash

On Windows the PTY backend reflows the visible screen itself on resize; without
windowsPty xterm reflowed it again, duplicating lines and leaving prompt ghosts
when the side pane and the tray terminal trade sizes. The main process now
reports the backend (ConPTY from build 18309, as node-pty picks) with the view
and the side terminal sets it, as ZCode does.

On macOS and Linux the shell is bash, which rejected the PowerShell
initialisation, so the ready marker never came: the pane stayed blank for 15s
and the timeout surfaced as an unhandled rejection. Bash now just prints the
marker (split across two quoted halves so the echoed command line does not
match it), and the readiness promise always has a handler. On Linux two of
the three real-PTY tests in terminal-handlers.test.js now pass; the third
runs an AI command in PowerShell syntax and stays Windows-only.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DFRovoZHMzeheXKkLNWKG
---
 .../PowerShellExecutor/PowerShellExecutor.js  | 3908 +++++++++--------
 docs/contracts/chat-contracts.json            |    2 +-
 .../contracts/generated/chat-event-graph.json |   66 +-
 modules/ipc/terminalHandlers.js               |   13 +-
 .../side-pane/terminalSideProvider.js         |    1 +
 tests/side-pane-terminal-lifecycle.test.mjs   |    9 +
 6 files changed, 2015 insertions(+), 1984 deletions(-)

diff --git a/VCPDistributedServer/Plugin/PowerShellExecutor/PowerShellExecutor.js b/VCPDistributedServer/Plugin/PowerShellExecutor/PowerShellExecutor.js
index 4d560a1ac..2184ef9eb 100644
--- a/VCPDistributedServer/Plugin/PowerShellExecutor/PowerShellExecutor.js
+++ b/VCPDistributedServer/Plugin/PowerShellExecutor/PowerShellExecutor.js
@@ -1,1950 +1,1960 @@
-// node-pty 是原生模块：只读命令记录、不开终端时不加载它，真正创建会话时才 require
-let ptyModule = null;
-function loadPty() {
-    return ptyModule || (ptyModule = require('node-pty'));
-}
-const os = require('os');
-const { spawn } = require('child_process');
-const path = require('path');
-const fs = require('fs');
-const crypto = require('crypto');
-const { BrowserWindow, ipcMain, clipboard } = require('electron');
-const tmp = require('tmp');
-const chokidar = require('chokidar');
-const { CommandOutputParser } = require('./command-output-parser');
-const { sanitizeTerminalOutput } = require('./terminalOutputSanitizer');
-// 命令运行记录放在无副作用的独立模块里：主进程只读记录时不必加载整个执行器
-const {
-    COMMAND_RUN_RAW_LIMIT,
-    beginCommandRun,
-    appendCommandRunOutput,
-    finishCommandRun,
-    listCommandRuns,
-    getCommandRun,
-    subscribeCommandRuns,
-} = require('./commandRunStore');
-const { resolveConfirmationScript } = require('./nativeHelperPath.js');
-
-// --- GUI Window Management ---
-let guiWindow = null;
-let guiReady = false;
-let guiReadyPromise = Promise.resolve();
-let resolveGuiReady = null;
-
-function createGuiReadyBarrier() {
-    guiReady = false;
-    guiReadyPromise = new Promise((resolve) => {
-        resolveGuiReady = resolve;
-    });
-}
-
-async function waitForGuiReady(timeoutMs = 15000) {
-    if (!guiWindow || guiWindow.isDestroyed()) {
-        throw new Error('PowerShell GUI window is not available.');
-    }
-
-    if (guiReady) {
-        return;
-    }
-
-    const targetWebContents = guiWindow.webContents;
-    let timeoutId = null;
-
-    try {
-        await Promise.race([
-            guiReadyPromise,
-            new Promise((_, reject) => {
-                timeoutId = setTimeout(() => {
-                    reject(new Error(`PowerShell GUI initialization timed out after ${timeoutMs}ms.`));
-                }, timeoutMs);
-            })
-        ]);
-    } finally {
-        if (timeoutId) {
-            clearTimeout(timeoutId);
-        }
-    }
-
-    if (!guiWindow || guiWindow.isDestroyed() || guiWindow.webContents !== targetWebContents || !guiReady) {
-        throw new Error('PowerShell GUI window changed or closed during initialization.');
-    }
-}
-
-function ensureGuiWindow() {
-    if (guiWindow && !guiWindow.isDestroyed()) {
-        guiWindow.focus();
-        return guiWindow;
-    }
-
-    createGuiReadyBarrier();
-    guiWindow = new BrowserWindow({
-        width: 800,
-        height: 600,
-        title: 'VCP PowerShell Executor',
-        frame: false, // 禁用窗口边框
-        ...(process.platform === 'darwin' ? {} : { titleBarStyle: 'hidden' }),
-        webPreferences: {
-            preload: path.join(__dirname, 'gui', 'preload.js'),
-            nodeIntegration: false, // 禁用 Node.js 集成以增强安全性
-            contextIsolation: true, // 启用上下文隔离
-            spellcheck: false,
-            // 将 node_modules 的路径作为参数传递给窗口，以便在 HTML 中使用
-            additionalArguments: [`--node-modules-path=${path.join(__dirname, '..', '..', '..', '..', 'node_modules')}`]
-        },
-        autoHideMenuBar: true,
-    });
-
-    guiWindow.loadFile(path.join(__dirname, 'gui', 'PowerShellViewer.html'));
-
-    guiWindow.on('closed', () => {
-        guiReady = false;
-        if (resolveGuiReady) {
-            resolveGuiReady();
-            resolveGuiReady = null;
-        }
-        guiWindow = null;
-        // 当GUI关闭时，也终止关联的 pty 进程
-        if (ptyProcess) {
-            try {
-                ptyProcess.kill();
-                console.log('[PowerShellExecutor] GUI closed, associated pty process terminated.');
-            } catch (e) {
-                console.error('[PowerShellExecutor] Error terminating pty process on GUI close:', e);
-            }
-            // ptyProcess 的 onExit 事件处理器会自动将其设置为 null 并从 childProcesses 集合中移除
-        }
-    });
-
-    return guiWindow;
-}
-
-// --- 主题管理与文件监视 ---
-const settingsPath = path.join(__dirname, '..', '..', '..', 'AppData', 'settings.json');
-let settingsWatcher = null;
-let lastSentTheme = null; // 用于存储上一次发送的主题名称
-
-/**
- * 读取、比较并发送主题更新。
- * 只有当主题名称实际发生变化时，才会向GUI发送事件。
- * @param {Electron.WebContents} targetWebContents - 目标窗口的 webContents。
- * @param {boolean} [forceSend=false] - 是否强制发送，即使用于初始化。
- */
-function sendThemeUpdate(targetWebContents, forceSend = false) {
-    if (!targetWebContents || targetWebContents.isDestroyed()) {
-        return;
-    }
-    try {
-        let currentTheme = 'dark'; // 默认主题
-        if (fs.existsSync(settingsPath)) {
-            const settings = JSON.parse(fs.readFileSync(settingsPath, 'utf-8'));
-            currentTheme = settings.currentThemeMode || 'dark';
-        }
-
-        // 只有当主题变化或强制发送时，才进行通信
-        if (currentTheme !== lastSentTheme || forceSend) {
-            targetWebContents.send('theme-init', { themeName: currentTheme });
-            lastSentTheme = currentTheme; // 更新已发送的主题记录
-            console.log(`[PowerShellExecutor] Theme updated to: ${currentTheme}`);
-        }
-    } catch (error) {
-        console.error('[PowerShellExecutor] Error reading or sending theme settings:', error);
-    }
-}
-
-// 初始化文件监视器
-function setupThemeWatcher() {
-    if (settingsWatcher) {
-        settingsWatcher.close();
-    }
-    settingsWatcher = chokidar.watch(settingsPath, {
-        persistent: true,
-        ignoreInitial: true
-    });
-
-    settingsWatcher.on('change', () => {
-        if (guiWindow && !guiWindow.isDestroyed()) {
-            sendThemeUpdate(guiWindow.webContents);
-        }
-    });
-}
-
-// 在插件加载时启动监视
-setupThemeWatcher();
-
-
-// 监听来自GUI的“就绪”信号。
-// 只有当前窗口在 xterm 挂载、IPC 监听注册和首次 fit 完成后发出的信号才能解除屏障；
-// 旧窗口的迟到消息不能误解锁新窗口。
-ipcMain.on('powershell-gui-ready', (event) => {
-    if (!guiWindow || guiWindow.isDestroyed() || event.sender !== guiWindow.webContents) {
-        return;
-    }
-
-    guiReady = true;
-    if (resolveGuiReady) {
-        resolveGuiReady();
-        resolveGuiReady = null;
-    }
-
-    sendThemeUpdate(event.sender, true);
-});
-
-// 监听来自GUI的用户命令
-ipcMain.on('powershell-command', (event, command) => {
-    if (ptyProcess && command) {
-        // 将用户输入的命令写入 pty 进程
-        ptyProcess.write(`${command}\r`);
-    }
-});
-
-// 监听来自GUI的复制请求
-ipcMain.on('copy-to-clipboard', (event, text) => {
-    if (text) {
-        clipboard.writeText(text);
-    }
-});
-
-// 监听来自GUI的粘贴请求
-ipcMain.handle('read-from-clipboard', () => {
-    return clipboard.readText();
-});
-
-// 监听来自GUI的尺寸调整请求
-function applyPtyResize(cols, rows) {
-    const normalizedCols = Number(cols);
-    const normalizedRows = Number(rows);
-
-    if (Number.isInteger(normalizedCols) && Number.isInteger(normalizedRows) && normalizedCols > 0 && normalizedRows > 0) {
-        lastKnownSize = { cols: normalizedCols, rows: normalizedRows };
-    }
-
-    if (ptyProcess) {
-        try {
-            ptyProcess.resize(lastKnownSize.cols, lastKnownSize.rows);
-        } catch (e) {
-            console.error('[PowerShellExecutor] Failed to resize pty:', e);
-        }
-    }
-}
-
-ipcMain.on('powershell-resize', (event, { cols, rows }) => {
-    applyPtyResize(cols, rows);
-});
-
-// 监听来自GUI的真实终端输入透传。
-// 安全声明：此通道等价于用户直接操作本机终端，不经过 intelligentSecurityCheck；
-// forbiddenCommands/authRequiredCommands 仅约束 AI 工具调用路径 processToolCall。
-ipcMain.on('powershell-input', (event, data) => {
-    if (ptyProcess && typeof data === 'string') {
-        ptyProcess.write(data);
-    }
-});
-
-// --- 查询终端可见文本与 xterm 粘贴响应 ---
-const visibleTextResolvers = new Map();
-const terminalPasteResolvers = new Map();
-
-ipcMain.on('visible-text-response', (event, payload, legacyText) => {
-    if (!isPowerShellGuiSender(event)) {
-        return;
-    }
-
-    // 兼容旧渲染端直接返回字符串的格式。
-    if (typeof payload === 'string') {
-        const firstEntry = visibleTextResolvers.entries().next().value;
-        if (firstEntry) {
-            const [requestId, resolve] = firstEntry;
-            visibleTextResolvers.delete(requestId);
-            resolve(payload);
-        }
-        return;
-    }
-
-    const requestId = payload && payload.requestId;
-    const resolver = requestId ? visibleTextResolvers.get(requestId) : null;
-    if (resolver) {
-        visibleTextResolvers.delete(requestId);
-        resolver(typeof payload.text === 'string' ? payload.text : (legacyText || ''));
-    }
-});
-
-ipcMain.on('terminal-paste-complete', (event, payload) => {
-    if (!isPowerShellGuiSender(event)) {
-        return;
-    }
-
-    const requestId = payload && payload.requestId;
-    const resolver = requestId ? terminalPasteResolvers.get(requestId) : null;
-    if (resolver) {
-        terminalPasteResolvers.delete(requestId);
-        resolver();
-    }
-});
-
-// --- PowerShell GUI 专属窗口控制 ---
-// 不复用应用级 minimize-window/maximize-window/close-window：ipcMain 是全局事件总线，
-// 使用通用通道会让日志中心等其它窗口的操作也落到此 guiWindow 上；而 PowerShell
-// 自身的消息还会与应用级处理器重复执行（最大化切换两次后等同于没有变化）。
-function isPowerShellGuiSender(event) {
-    return Boolean(
-        event
-        && guiWindow
-        && !guiWindow.isDestroyed()
-        && guiWindow.webContents
-        && !guiWindow.webContents.isDestroyed()
-        && event.sender === guiWindow.webContents
-    );
-}
-
-ipcMain.on('powershell-window:minimize', (event) => {
-    if (isPowerShellGuiSender(event)) {
-        guiWindow.minimize();
-    }
-});
-
-ipcMain.on('powershell-window:toggle-maximize', (event) => {
-    if (!isPowerShellGuiSender(event)) {
-        return;
-    }
-
-    if (guiWindow.isMaximized()) {
-        guiWindow.unmaximize();
-    } else {
-        guiWindow.maximize();
-    }
-});
-
-ipcMain.on('powershell-window:close', (event) => {
-    if (isPowerShellGuiSender(event)) {
-        guiWindow.close();
-    }
-});
-
-// --- ANSI / terminal control projection for AI text summaries ---
-// 清洗逻辑在 terminalOutputSanitizer.js（纯函数，命令运行记录也用它）
-
-// --- 模块级状态 ---
-// 用于保存持久化的伪终端（PowerShell）进程
-let ptyProcess = null;
-// 移除 fullTerminalHistory，后端不再维护终端内容的完整状态
-// 新增：用于跟踪所有子进程，确保它们在插件卸载或程序退出时被正确清理
-const childProcesses = new Set();
-let guiDataListener = null; // 新增：保存GUI监听器的引用
-let isExecutingCommand = false; // 仅表示 AI 短命令执行中；不要用于交互式 TUI 会话
-let interactiveMode = false; // 表示当前 PTY 被 snow/codex/claude 等交互式程序占用
-let activeCommandAbort = null; // 当前同步命令的本地等待中止器；供并发 interrupt 工具调用解除阻塞
-let lastKnownSize = { cols: 80, rows: 24 }; // GUI 最近一次 fit 出来的尺寸，用作 PTY 初始尺寸
-let ptyReadyPromise = Promise.resolve();
-
-// --- 配置加载 ---
-const defaultConfig = {
-    returnMode: 'delta', // 默认为增量模式
-    forbiddenCommands: [],
-    authRequiredCommands: []
-};
-
-try {
-    const configPath = path.join(__dirname, 'config.env');
-    if (fs.existsSync(configPath)) {
-        const configContent = fs.readFileSync(configPath, 'utf-8');
-
-        const returnModeMatch = configContent.match(/^POWERSHELL_RETURN_MODE\s*=\s*(delta|full)/m);
-        if (returnModeMatch) {
-            defaultConfig.returnMode = returnModeMatch[1];
-        }
-
-        const forbiddenMatch = configContent.match(/^FORBIDDEN_COMMANDS\s*=\s*(.*)/m);
-        if (forbiddenMatch && forbiddenMatch[1]) {
-            defaultConfig.forbiddenCommands = forbiddenMatch[1].split(',').map(c => c.trim().toLowerCase()).filter(c => c);
-        }
-
-        const authRequiredMatch = configContent.match(/^AUTH_REQUIRED_COMMANDS\s*=\s*(.*)/m);
-        if (authRequiredMatch && authRequiredMatch[1]) {
-            defaultConfig.authRequiredCommands = authRequiredMatch[1].split(',').map(c => c.trim().toLowerCase()).filter(c => c);
-        }
-    }
-} catch (error) {
-    console.error('[PowerShellExecutor] Error reading config.env:', error);
-}
-
-
-/**
- * 智能安全检查函数 - 区分命令关键字和路径内容
- * @param {string} command - 要检查的命令字符串
- * @param {string[]} forbiddenKeywords - 禁止的关键字列表
- * @param {string[]} authRequiredKeywords - 需要授权的关键字列表
- * @returns {object} - 检查结果 {isForbidden: boolean, needsAuth: boolean, matchedKeyword: string}
- */
-function intelligentSecurityCheck(command, forbiddenKeywords, authRequiredKeywords) {
-    const result = {
-        isForbidden: false,
-        needsAuth: false,
-        matchedKeyword: null,
-        reason: null
-    };
-
-    // 预处理命令：移除多余空格，转换为小写
-    const normalizedCommand = command.trim().toLowerCase();
-
-    // 如果命令为空，直接返回
-    if (!normalizedCommand) {
-        return result;
-    }
-
-    // 定义路径模式 - 常见的Windows和Unix路径格式
-    const pathPatterns = [
-        /[a-z]:\\[^\\/:*?"<>|]*(?:\\[^\\/:*?"<>|]*)*\\?/gi,  // Windows路径 C:\path\to\file
-        /\/[^\/\s]*(?:\/[^\/\s]*)*\/?/g,                      // Unix路径 /path/to/file
-        /\$env:[a-z_]+[^\\/:*?"<>|\s]*/gi,                   // PowerShell环境变量路径
-        /\${[^}]+}[^\\/:*?"<>|\s]*/gi,                       // 变量路径 ${VAR}/path
-        /~\/[^\/\s]*(?:\/[^\/\s]*)*\/?/g                     // 用户目录路径 ~/path
-    ];
-
-    // 提取所有可能的路径
-    const detectedPaths = [];
-    pathPatterns.forEach(pattern => {
-        const matches = normalizedCommand.match(pattern);
-        if (matches) {
-            detectedPaths.push(...matches);
-        }
-    });
-
-    // 创建不包含路径的命令版本用于安全检查
-    let commandWithoutPaths = normalizedCommand;
-    detectedPaths.forEach(path => {
-        // 将路径替换为占位符，避免路径中的关键字被误判
-        commandWithoutPaths = commandWithoutPaths.replace(path.toLowerCase(), ' __PATH_PLACEHOLDER__ ');
-    });
-
-    // 清理命令：移除多余空格
-    commandWithoutPaths = commandWithoutPaths.replace(/\s+/g, ' ').trim();
-
-    // 定义PowerShell命令结构模式
-    const commandStructurePatterns = [
-        // PowerShell cmdlet模式: Verb-Noun
-        /\b[a-z]+-[a-z]+\b/g,
-        // 常见命令
-        /\b(?:get|set|new|remove|copy|move|invoke|start|stop|restart|test|clear|add|export|import|select|where|foreach|sort|group|measure|compare|out|write|read)\b/g,
-        // 参数模式
-        /\s-[a-z]+\b/g
-    ];
-
-    // 检查禁止的关键字
-    for (const keyword of forbiddenKeywords) {
-        if (!keyword) continue;
-
-        const keywordLower = keyword.toLowerCase();
-
-        // 1. 首先检查是否在路径中
-        const isInPath = detectedPaths.some(path =>
-            path.toLowerCase().includes(keywordLower)
-        );
-
-        if (isInPath) {
-            // 如果关键字只在路径中出现，检查是否也在命令部分出现
-            if (!commandWithoutPaths.includes(keywordLower)) {
-                console.log(`[PowerShellExecutor] 安全检查：关键字 "${keyword}" 仅在路径中发现，允许执行`);
-                continue; // 跳过这个关键字，不视为违规
-            }
-        }
-
-        // 2. 检查命令部分是否包含关键字
-        if (commandWithoutPaths.includes(keywordLower)) {
-            // 3. 进一步验证：检查关键字是否作为独立的命令或参数出现
-            const wordBoundaryPattern = new RegExp(`\\b${keywordLower.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\b`);
-
-            if (wordBoundaryPattern.test(commandWithoutPaths)) {
-                result.isForbidden = true;
-                result.matchedKeyword = keyword;
-                result.reason = `命令包含被禁止的关键字: ${keyword}`;
-                console.log(`[PowerShellExecutor] 安全检查：发现禁止的命令关键字 "${keyword}"`);
-                return result;
-            }
-        }
-    }
-
-    // 检查需要授权的关键字（使用相同的逻辑）
-    for (const keyword of authRequiredKeywords) {
-        if (!keyword) continue;
-
-        const keywordLower = keyword.toLowerCase();
-
-        // 1. 首先检查是否在路径中
-        const isInPath = detectedPaths.some(path =>
-            path.toLowerCase().includes(keywordLower)
-        );
-
-        if (isInPath) {
-            // 如果关键字只在路径中出现，检查是否也在命令部分出现
-            if (!commandWithoutPaths.includes(keywordLower)) {
-                console.log(`[PowerShellExecutor] 安全检查：授权关键字 "${keyword}" 仅在路径中发现，不需要授权`);
-                continue; // 跳过这个关键字，不需要授权
-            }
-        }
-
-        // 2. 检查命令部分是否包含关键字
-        if (commandWithoutPaths.includes(keywordLower)) {
-            // 3. 进一步验证：检查关键字是否作为独立的命令或参数出现
-            const wordBoundaryPattern = new RegExp(`\\b${keywordLower.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\b`);
-
-            if (wordBoundaryPattern.test(commandWithoutPaths)) {
-                result.needsAuth = true;
-                result.matchedKeyword = keyword;
-                result.reason = `命令包含需要授权的关键字: ${keyword}`;
-                console.log(`[PowerShellExecutor] 安全检查：发现需要授权的命令关键字 "${keyword}"`);
-                // 注意：不要return，继续检查其他关键字
-            }
-        }
-    }
-
-    return result;
-}
-
-/**
- * 启动一个独立的 Python GUI 脚本来请求管理员权限并执行命令。
- * 这是一个"即发即忘"的操作，它会打开一个全新的、独立的管理员终端窗口。
- * @param {string} command - 需要以管理员权限执行的命令。
- * @returns {Promise<string>} - 一个解析为提示信息的消息。
- */
-function executeAdminCommand(command) {
-    return new Promise((resolve, reject) => {
-        // 1. 创建一个临时的输出文件
-        tmp.file({ postfix: '.txt' }, (err, tmpFilePath, fd, cleanupCallback) => {
-            if (err) {
-                return reject(new Error(`无法创建临时文件: ${err.message}`));
-            }
-
-            let pythonConfirmScript;
-            try { pythonConfirmScript = resolveConfirmationScript(__dirname); }
-            catch (error) { cleanupCallback(); reject(error); return; }
-            const commandAsBase64 = Buffer.from(command).toString('base64');
-
-            // 2. 准备传递给Python脚本的参数
-            const scriptPathForPS = pythonConfirmScript.replace(/'/g, "''");
-            const commandForPS = commandAsBase64.replace(/'/g, "''");
-            const tmpPathForPS = tmpFilePath.replace(/'/g, "''");
-            const argumentList = `"${scriptPathForPS}", "${commandForPS}", "${tmpPathForPS}"`;
-
-            // 3. 构造PowerShell命令以管理员权限运行Python脚本（捕获UAC异常并注入纯ASCII标记）
-            const psCommand = `$ErrorActionPreference = 'Stop'; try { Start-Process -FilePath "pythonw.exe" -ArgumentList ${argumentList} -Verb RunAs -Wait } catch { [Console]::Error.WriteLine('UAC_CANCELLED_OR_FAILED: ' + $_.Exception.Message) }`;
-            const child = spawn('powershell.exe', [
-                '-NoProfile',
-                '-ExecutionPolicy', 'Bypass',
-                '-Command', psCommand
-            ], {
-                windowsHide: true
-            });
-            childProcesses.add(child); // 跟踪进程
-
-            let stderrOutput = '';
-            let isSettled = false;
-
-            // 310 秒外部安全定时器守护，防止后台卡死挂起 (Todo #3)
-            const safetyTimeout = setTimeout(() => {
-                if (isSettled) return;
-                isSettled = true;
-                try {
-                    child.kill();
-                } catch { }
-                childProcesses.delete(child);
-                cleanupCallback();
-                resolve({
-                    isCancelled: true,
-                    content: [{
-                        type: 'text',
-                        text: '⚠️ [操作超时]：等待管理员确认超时（超过无操作安全时限），系统已自动拒绝执行。'
-                    }]
-                });
-            }, 310000);
-
-            child.stderr.on('data', (data) => {
-                stderrOutput += data.toString('utf-8');
-            });
-
-            child.on('error', (err) => {
-                if (isSettled) return;
-                isSettled = true;
-                clearTimeout(safetyTimeout);
-                childProcesses.delete(child); // 停止跟踪
-                cleanupCallback(); // 清理临时文件
-                reject(new Error(`无法启动PowerShell包装脚本: ${err.message}`));
-            });
-
-            child.on('close', (code) => {
-                if (isSettled) return;
-                isSettled = true;
-                clearTimeout(safetyTimeout);
-                childProcesses.delete(child); // 停止跟踪
-                // PowerShell脚本执行完毕，安全读取临时文件内容
-                fs.readFile(tmpFilePath, 'utf-8', (readErr, data) => {
-                    cleanupCallback(); // 确保清理临时文件
-
-                    // 检测 UAC 取消或拒绝错误（显式捕获标记、0x800704C7 或中文取消提示）
-                    const isUacCancelled = stderrOutput && (
-                        stderrOutput.includes('UAC_CANCELLED_OR_FAILED') ||
-                        stderrOutput.includes('0x800704C7') ||
-                        stderrOutput.includes('74C7') ||
-                        stderrOutput.includes('操作已被用户取消') ||
-                        stderrOutput.includes('The operation was canceled by the user')
-                    );
-
-                    if (isUacCancelled) {
-                        return resolve({
-                            isCancelled: true,
-                            content: [{
-                                type: 'text',
-                                text: '⚠️ [操作未执行/未授权]：用户在 Windows UAC 提权界面取消了授权，或未获取到管理员权限。敏感命令未执行。'
-                            }]
-                        });
-                    }
-                    if (readErr) {
-                        if (stderrOutput.trim()) {
-                            return reject(new Error(`管理员脚本执行失败: ${stderrOutput.trim()}`));
-                        }
-                        return reject(new Error(`无法读取管理员任务的输出文件: ${readErr.message}`));
-                    }
-
-                    const result = data.trim();
-                    if (result === "USER_CANCELLED") {
-                        resolve({
-                            isCancelled: true,
-                            content: [{
-                                type: 'text',
-                                text: '⚠️ [操作已取消]：用户已主动拒绝或取消了本次管理员权限申请。敏感命令未执行。'
-                            }]
-                        });
-                    } else if (result === "TIMEOUT_REJECTED") {
-                        resolve({
-                            isCancelled: true,
-                            content: [{
-                                type: 'text',
-                                text: '⚠️ [操作超时]：等待管理员确认超时（超过无操作安全时限），系统已自动拒绝执行。'
-                            }]
-                        });
-                    } else if (result.startsWith("ERROR:")) {
-                        reject(new Error(result.substring(6).trim()));
-                    } else if (result === "") {
-                        // 空输出防穿透：脚本根本未生成内容或提权未通过时，绝不能当作正常执行成功
-                        resolve({
-                            isCancelled: true,
-                            content: [{
-                                type: 'text',
-                                text: '⚠️ [操作未执行/未授权]：用户在 Windows UAC 提权界面取消了授权，或未获取到管理员权限。敏感命令未执行。'
-                            }]
-                        });
-                    } else {
-                        resolve(result);
-                    }
-                });
-            });
-        });
-    });
-}
-
-/**
- * 请求用户确认一个敏感命令，但不在确认脚本中执行命令。
- * 确认通过后，命令仍回到主 PTY/xterm 会话执行，以保持 GUI 连续输出。
- * @param {string} command - 需要展示给用户确认的命令。
- * @returns {Promise<boolean>} - 用户是否允许执行。
- */
-function requestInteractiveConfirmation(command) {
-    return new Promise((resolve, reject) => {
-        tmp.file({ postfix: '.txt' }, (err, tmpFilePath, fd, cleanupCallback) => {
-            if (err) {
-                return reject(new Error(`无法创建临时文件: ${err.message}`));
-            }
-
-            let pythonConfirmScript;
-            try { pythonConfirmScript = resolveConfirmationScript(__dirname); }
-            catch (error) { cleanupCallback(); reject(error); return; }
-            const commandAsBase64 = Buffer.from(command).toString('base64');
-
-            // 普通敏感命令只需要当前权限确认，不应绕过主 PTY/xterm 执行链路。
-            const child = spawn('pythonw.exe', [
-                pythonConfirmScript,
-                commandAsBase64,
-                tmpFilePath,
-                '--interactive-auth',
-                '--confirm-only'
-            ], {
-                windowsHide: true
-            });
-            childProcesses.add(child);
-
-            let stderrOutput = '';
-            child.stderr.on('data', (data) => {
-                stderrOutput += data.toString('utf-8');
-            });
-
-            child.on('error', (err) => {
-                childProcesses.delete(child);
-                cleanupCallback();
-                reject(new Error(`无法启动交互式确认脚本: ${err.message}`));
-            });
-
-            child.on('close', () => {
-                childProcesses.delete(child);
-                fs.readFile(tmpFilePath, 'utf-8', (readErr, data) => {
-                    cleanupCallback();
-
-                    if (readErr) {
-                        if (stderrOutput.trim()) {
-                            return reject(new Error(`交互式确认脚本失败: ${stderrOutput.trim()}`));
-                        }
-                        return reject(new Error(`无法读取交互式确认结果文件: ${readErr.message}`));
-                    }
-
-                    const result = data.trim();
-                    if (result === 'CONFIRMED') {
-                        resolve(true);
-                    } else if (result === 'USER_CANCELLED' || result === 'TIMEOUT_REJECTED') {
-                        resolve(false);
-                    } else if (result.startsWith('ERROR:')) {
-                        reject(new Error(result.substring(6).trim()));
-                    } else {
-                        reject(new Error(`未知的交互式确认结果: ${result || '<empty>'}`));
-                    }
-                });
-            });
-        });
-    });
-}
-
-/**
- * GUI 仅接收原始PTY投影；渲染窗口失效不得打断命令完成检测。
- */
-function dispatchPtyData(rawData) {
-    const dataStr = rawData.toString('utf-8');
-    if (!dataStr) {
-        return;
-    }
-
-    if (mirrorStartupPending) {
-        // 启动握手（编码设置与就绪标记）是内部细节，握手完成前不投影到侧栏
-        mirrorStartupHeld = (mirrorStartupHeld + dataStr).slice(-MIRROR_REPLAY_LIMIT);
-    } else {
-        emitMirrorData(dataStr);
-    }
-
-    try {
-        if (!guiWindow || guiWindow.isDestroyed()
-            || guiWindow.webContents.isDestroyed()) {
-            return;
-        }
-        guiWindow.webContents.send('powershell-data', dataStr);
-    } catch (error) {
-        console.warn('[PowerShellExecutor] GUI output delivery failed:', error.message);
-    }
-}
-
-// --- 侧栏镜像 ---
-// 主窗口侧栏的「终端」标签是同一个 PTY 会话的另一个视图：输出同时送往 GUI 窗口和镜像，
-// 输入与尺寸调整直接落到同一个 PTY，AI 工具执行的命令因此对两处都可见。
-const MIRROR_REPLAY_LIMIT = 256 * 1024;
-const mirrorSinks = new Set();
-let replayBuffer = '';
-let mirrorStartupPending = false;
-let mirrorStartupHeld = '';
-
-function emitMirrorData(dataStr) {
-    if (!dataStr) return;
-    // 侧栏终端可能在会话进行中才挂载，缓存最近输出用于回放。
-    replayBuffer += dataStr;
-    if (replayBuffer.length > MIRROR_REPLAY_LIMIT) {
-        replayBuffer = replayBuffer.slice(-MIRROR_REPLAY_LIMIT);
-    }
-    notifyMirrors('onData', dataStr);
-}
-
-/** 结束启动握手：成功时只放出就绪标记之后的内容（通常是提示符），失败时原样放出便于排查。 */
-function releaseMirrorStartup(afterReady = null) {
-    if (!mirrorStartupPending) return;
-    mirrorStartupPending = false;
-    const held = mirrorStartupHeld;
-    mirrorStartupHeld = '';
-    emitMirrorData(afterReady === null ? held : afterReady);
-}
-
-function notifyMirrors(method, ...args) {
-    for (const sink of mirrorSinks) {
-        try {
-            sink[method]?.(...args);
-        } catch (e) {
-            console.error('[PowerShellExecutor] Mirror sink failed:', e);
-        }
-    }
-}
-
-/**
- * 注册一个镜像视图并回放已有输出。
- * @param {{onData: Function, onClear?: Function, onExit?: Function}} sink
- * @returns {Function} 取消注册
- */
-function attachMirror(sink) {
-    mirrorSinks.add(sink);
-    if (replayBuffer) {
-        try {
-            sink.onData(replayBuffer);
-        } catch (e) {
-            console.error('[PowerShellExecutor] Mirror replay failed:', e);
-        }
-    }
-    return () => mirrorSinks.delete(sink);
-}
-
-/** 确保有一个 PTY 会话（不打开 GUI 窗口）。 */
-function ensureMirrorSession() {
-    if (!ptyProcess) {
-        createNewPtySession();
-    }
-    return getSessionState();
-}
-
-/** 重置为全新的 PTY 会话（与 GUI 窗口共用）。 */
-function restartSession() {
-    createNewPtySession();
-    return getSessionState();
-}
-
-function getSessionState() {
-    return {
-        running: Boolean(ptyProcess),
-        pid: ptyProcess ? ptyProcess.pid : null,
-        // AI 短命令或交互式 TUI 占用期间，不应向会话里塞入额外命令。
-        busy: Boolean(isExecutingCommand || interactiveMode),
-        cols: lastKnownSize.cols,
-        rows: lastKnownSize.rows,
-    };
-}
-
-function writeSessionInput(data) {
-    if (!ptyProcess || typeof data !== 'string') {
-        return false;
-    }
-    ptyProcess.write(data);
-    return true;
-}
-
-/**
- * 等待指定 PTY 完成 PowerShell 初始化探针。
- * Promise 与具体 PTY 实例绑定，旧会话的迟到结果不能被新会话复用。
- * @param {object} targetPtyProcess - 要等待的 node-pty 实例。
- * @param {number} timeoutMs - 最大等待时间。
- */
-async function waitForPtyReady(targetPtyProcess = ptyProcess, timeoutMs = 15000) {
-    if (!targetPtyProcess || targetPtyProcess !== ptyProcess) {
-        throw new Error('PowerShell PTY session is not available.');
-    }
-
-    let timeoutId = null;
-    try {
-        await Promise.race([
-            ptyReadyPromise,
-            new Promise((_, reject) => {
-                timeoutId = setTimeout(() => {
-                    reject(new Error(`PowerShell PTY initialization timed out after ${timeoutMs}ms.`));
-                }, timeoutMs);
-            })
-        ]);
-    } finally {
-        if (timeoutId) {
-            clearTimeout(timeoutId);
-        }
-    }
-
-    if (!ptyProcess || ptyProcess !== targetPtyProcess) {
-        throw new Error('PowerShell PTY session changed or exited during initialization.');
-    }
-}
-
-/**
- * 同时等待渲染端 xterm 和后端 PTY 就绪，确保指令不会在界面初始化前注入。
- */
-async function waitForTerminalReady() {
-    const targetPtyProcess = ptyProcess;
-    await Promise.all([
-        waitForGuiReady(),
-        waitForPtyReady(targetPtyProcess)
-    ]);
-}
-
-/**
- * 创建一个新的伪终端 (pty) 进程。
- */
-function createNewPtySession() {
-    // newSession 是交互模式的一期低成本复位入口。
-    interactiveMode = false;
-    isExecutingCommand = false;
-    activeCommandAbort = null;
-
-    // 如果已存在旧进程，先销毁它
-    if (ptyProcess) {
-        childProcesses.delete(ptyProcess);
-        ptyProcess.kill();
-        // 当重置会话时，通知前端清屏
-        if (guiWindow && !guiWindow.isDestroyed()) {
-            guiWindow.webContents.send('powershell-clear');
-        }
-    }
-    replayBuffer = '';
-    notifyMirrors('onClear');
-
-    let shell = 'bash';
-    let args = [];
-
-    if (os.platform() === 'win32') {
-        // 优先使用 PowerShell Core (pwsh.exe)，如果不存在则回退到 Windows PowerShell (powershell.exe)
-        // 检测顺序：Program Files 标准路径 → where.exe PATH 查找 → 回退 powershell.exe
-        const pwshPath = path.join(process.env.PROGRAMFILES, 'PowerShell', '7', 'pwsh.exe');
-        if (fs.existsSync(pwshPath)) {
-            shell = pwshPath;
-        } else {
-            // 二级回退：winget/MSIX 安装的 PS7 位于 WindowsApps（AppExecution Alias），
-            // fs.existsSync 对此类特殊文件不可靠，直接信任 where.exe 结果。
-            try {
-                const { execSync } = require('child_process');
-                const whereResult = execSync('where.exe pwsh', { windowsHide: true, encoding: 'utf8', timeout: 5000 }).trim();
-                const firstLine = whereResult.split(/\r?\n/)[0].trim();
-                if (firstLine) {
-                    shell = firstLine;
-                } else {
-                    shell = 'powershell.exe';
-                }
-            } catch (e) {
-                shell = 'powershell.exe';
-            }
-        }
-        args = ['-NoLogo'];
-    }
-
-    ptyProcess = loadPty().spawn(shell, args, {
-        name: 'xterm-color',
-        cols: lastKnownSize.cols,
-        rows: lastKnownSize.rows,
-        cwd: process.env.USERPROFILE || process.env.HOME,
-        env: {
-            ...process.env,
-            PAGER: 'cat',
-            GIT_PAGER: 'cat',
-            GIT_TERMINAL_PROMPT: '0',
-            GH_PAGER: '',
-            SYSTEMD_PAGER: 'cat',
-            AWS_PAGER: '',
-            MANPAGER: 'cat'
-        }
-    });
-    childProcesses.add(ptyProcess);
-    const currentPtyProcess = ptyProcess;
-
-    // 创建GUI数据监听器（带 AI 短命令执行状态检查）
-    guiDataListener = (data) => {
-        // AI 短命令期间由 executeSingleCommandInPty 的临时监听器负责 flushToGui，避免重复输出。
-        // 交互式 TUI 模式绝不能设置 isExecutingCommand，否则 GUI 会黑屏。
-        if (isExecutingCommand) {
-            return;
-        }
-
-        dispatchPtyData(data);
-    };
-
-    // 设置数据监听器，将所有 pty 输出直接代理到 GUI
-    currentPtyProcess.onData(guiDataListener);
-
-    // 不再用固定延时猜测 PowerShell 是否启动完成。随机边界不会以明文出现在
-    // PSReadLine 的输入回显中；只有 PowerShell 真正执行 Write-Host 后才会命中。
-    const readyBoundary = `__VCP_PTY_READY_${crypto.randomUUID()}__`;
-    const encodedReadyBoundary = Buffer.from(readyBoundary, 'utf8').toString('base64');
-    mirrorStartupPending = true;
-    mirrorStartupHeld = '';
-    ptyReadyPromise = new Promise((resolve, reject) => {
-        let startupOutput = '';
-        let settled = false;
-        let timeoutId = null;
-        let readyListener = null;
-
-        const cleanupReadyProbe = () => {
-            if (timeoutId) {
-                clearTimeout(timeoutId);
-                timeoutId = null;
-            }
-            if (readyListener && typeof readyListener.dispose === 'function') {
-                readyListener.dispose();
-                readyListener = null;
-            }
-        };
-
-        readyListener = currentPtyProcess.onData((data) => {
-            if (settled) {
-                return;
-            }
-
-            startupOutput += data.toString('utf8');
-            // 防止异常启动输出无限占用内存，同时保留足够长度处理跨 chunk 边界。
-            if (startupOutput.length > 65536) {
-                startupOutput = startupOutput.slice(-65536);
-            }
-
-            const boundaryIndex = startupOutput.indexOf(readyBoundary);
-            if (boundaryIndex !== -1) {
-                settled = true;
-                cleanupReadyProbe();
-                if (ptyProcess === currentPtyProcess) {
-                    releaseMirrorStartup(startupOutput.slice(boundaryIndex + readyBoundary.length).replace(/^\r?\n/, ''));
-                }
-                resolve();
-            }
-        });
-
-        timeoutId = setTimeout(() => {
-            if (settled) {
-                return;
-            }
-            settled = true;
-            cleanupReadyProbe();
-            if (ptyProcess === currentPtyProcess) releaseMirrorStartup();
-            reject(new Error('PowerShell did not complete its startup readiness probe within 15 seconds.'));
-        }, 15000);
-
-        const initializationCommand = [
-            '[Console]::OutputEncoding = [System.Text.Encoding]::UTF8',
-            '$env:PAGER = "cat"',
-            '$env:GIT_PAGER = "cat"',
-            '$env:GIT_TERMINAL_PROMPT = "0"',
-            '$env:GH_PAGER = ""',
-            '$env:SYSTEMD_PAGER = "cat"',
-            '$env:AWS_PAGER = ""',
-            '$env:MANPAGER = "cat"',
-            'function global:more { param([string[]]$paths) if ($paths) { foreach ($file in $paths) { Get-Content $file } } else { $input } }',
-            'function global:help { Get-Help @args }',
-            `$__vcpReady = [System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String('${encodedReadyBoundary}'))`,
-            'Write-Host $__vcpReady',
-            // 清掉握手留下的几行：侧栏只从就绪标记之后开始显示，ConPTY 的光标也得回到左上角，
-            // 否则 PSReadLine 按绝对坐标重绘时会和侧栏错开几行
-            'Clear-Host'
-        ].join('; ');
-        currentPtyProcess.write(`${initializationCommand}\r`);
-    });
-
-    // 当 pty 进程意外退出时，清理资源。
-    // 注意：newSession 会先 kill 旧 PTY 再创建新 PTY，旧 PTY 的异步 onExit 不能误清理新会话。
-    currentPtyProcess.onExit((exitInfo) => {
-        childProcesses.delete(currentPtyProcess);
-        // 自行结束的 shell 仍占着 ConPTY 的管道句柄，显式 kill 才会释放
-        try {
-            currentPtyProcess.kill();
-        } catch (e) {
-            // 进程已经退出
-        }
-
-        if (ptyProcess !== currentPtyProcess) {
-            return;
-        }
-
-        ptyProcess = null;
-        guiDataListener = null;
-        isExecutingCommand = false;
-        interactiveMode = false;
-        activeCommandAbort = null;
-        notifyMirrors('onExit', exitInfo && exitInfo.exitCode);
-    });
-}
-
-function buildHumanLaunchAnimationCommand() {
-    const script = [
-        '$esc = [char]27',
-        '# 尝试擦掉用于触发动画的短命令输入行，避免启动动画前出现杂乱命令文本。',
-        'Write-Host -NoNewline "$esc[1A$esc[2K`r"',
-        '',
-        '# 霓虹渐变色定义',
-        '$c1 = "$esc[38;2;245;194;231m" # Pink',
-        '$c2 = "$esc[38;2;203;166;247m" # Mauve',
-        '$c3 = "$esc[38;2;137;180;250m" # Blue',
-        '$c4 = "$esc[38;2;116;199;236m" # Sapphire',
-        '$c5 = "$esc[38;2;137;220;235m" # Sky',
-        '$c6 = "$esc[38;2;148;226;213m" # Teal',
-        '$reset = "$esc[0m"',
-        '$gray = "$esc[38;2;147;153;178m"',
-        '$darkGray = "$esc[38;2;88;91;112m"',
-        '$green = "$esc[38;2;166;227;161m"',
-        '$yellow = "$esc[38;2;249;226;175m"',
-        '',
-        '# 逐行打印华丽的 VCP CLI ASCII Art',
-        'Write-Host ""',
-        'Write-Host "  ${c1}██╗   ██╗  ██████╗  ██████╗      ██████╗  ██╗      ██╗${reset}"',
-        'Start-Sleep -Milliseconds 40',
-        'Write-Host "  ${c2}██║   ██║ ██╔════╝  ██╔══██╗    ██╔════╝  ██║      ██║${reset}"',
-        'Start-Sleep -Milliseconds 40',
-        'Write-Host "  ${c3}██║   ██║ ██║       ██████╔╝    ██║       ██║      ██║${reset}"',
-        'Start-Sleep -Milliseconds 40',
-        'Write-Host "  ${c4}╚██╗ ██╔╝ ██║       ██╔═══╝     ██║       ██║      ██║${reset}"',
-        'Start-Sleep -Milliseconds 40',
-        'Write-Host "  ${c5} ╚████╔╝  ╚██████╗  ██║         ╚██████╗  ███████╗ ██║${reset}"',
-        'Start-Sleep -Milliseconds 40',
-        'Write-Host "  ${c6}  ╚═══╝    ╚═════╝  ╚═╝          ╚═════╝  ╚══════╝ ╚═╝${reset}"',
-        'Start-Sleep -Milliseconds 50',
-        '',
-        '# 打印副标题和分割线',
-        'Write-Host "  ${darkGray}──────────────────────────────────────────────────────────${reset}"',
-        'Write-Host "  ${gray}Distributed PowerShell Bridge & Interactive Terminal GUI${reset}"',
-        'Write-Host "  ${darkGray}──────────────────────────────────────────────────────────${reset}"',
-        'Write-Host ""',
-        '',
-        '# 华丽的渐变色进度条加载动画',
-        '$barWidth = 30',
-        'for ($i = 0; $i -le $barWidth; $i++) {',
-        '    $percent = [math]::Round(($i / $barWidth) * 100)',
-        '    $filledCount = $i',
-        '    $emptyCount = $barWidth - $i',
-        '    ',
-        '    # 动态计算渐变色 (从 Mauve 203,166,247 渐变到 Teal 148,226,213)',
-        '    $r = [int](203 - (203 - 148) * ($i / $barWidth))',
-        '    $g = [int](166 + (226 - 166) * ($i / $barWidth))',
-        '    $b = [int](247 - (247 - 213) * ($i / $barWidth))',
-        '    $color = "$esc[38;2;${r};${g};${b}m"',
-        '    ',
-        '    $filled = "▰" * $filledCount',
-        '    $empty = "▱" * $emptyCount',
-        '    ',
-        '    Write-Host -NoNewline "$esc[2K`r  ${gray}Loading Bridge:${reset} [${color}${filled}${darkGray}${empty}${reset}] ${color}${percent}%${reset}"',
-        '    Start-Sleep -Milliseconds 35',
-        '}',
-        'Write-Host ""',
-        'Write-Host ""',
-        '',
-        '# 打印系统就绪状态和极客风系统信息',
-        'Write-Host "  ${gray}Status:${reset}    ${green}ONLINE${reset}"',
-        'Write-Host "  ${gray}Session:${reset}   ${c3}Active PowerShell Bridge${reset}"',
-        'Write-Host "  ${gray}Terminal:${reset}  ${yellow}Interactive Console Ready${reset}"',
-        'Write-Host ""',
-        'Write-Host "  ${gray}Type commands below. Press ${c3}Ctrl+C${gray} to interrupt.${reset}"',
-        'Write-Host ""',
-        'Remove-Item -LiteralPath $PSCommandPath -Force -ErrorAction SilentlyContinue',
-    ].join('\n');
-
-    const tempScriptName = `vcp-cli-launch-${crypto.randomUUID()}.ps1`;
-    const tempScriptPath = path.join(os.tmpdir(), tempScriptName);
-    fs.writeFileSync(tempScriptPath, `\ufeff${script}`, 'utf8');
-
-    const escapedTempScriptPath = tempScriptPath.replace(/'/g, "''");
-    return `& '${escapedTempScriptPath}'\r`;
-}
-
-/**
- * 打开或聚焦 PowerShellExecutor 的交互式终端 GUI。
- * 该入口供主程序托盘 / 桌面应用启动器直接调用，不需要先通过 AI 工具执行命令。
- * @returns {BrowserWindow} PowerShell 终端窗口实例。
- */
-function openGuiTerminal() {
-    ensureGuiWindow();
-
-    const shouldPlayHumanLaunchAnimation = !ptyProcess;
-    if (!ptyProcess) {
-        createNewPtySession();
-    }
-
-    if (shouldPlayHumanLaunchAnimation && ptyProcess) {
-        const targetPtyProcess = ptyProcess;
-        waitForTerminalReady()
-            .then(() => {
-                if (ptyProcess === targetPtyProcess) {
-                    targetPtyProcess.write(buildHumanLaunchAnimationCommand());
-                }
-            })
-            .catch((error) => {
-                console.error('[PowerShellExecutor] Failed to initialize terminal launch animation:', error);
-            });
-    }
-
-    return guiWindow;
-}
-
-/**
- * 插件的主入口点，由 PluginManager 直接调用。
- * @param {object} args - 从 AI 工具调用中解析出的参数。
- * @returns {Promise<string>} - 命令执行的结果。
- */
-/**
- * 在给定的 pty 会话中执行单条命令并返回其增量输出。
- * @param {object} ptyProcess - node-pty 实例。
- * @param {string} singleCommand - 要执行的单条命令。
- * @returns {Promise<string>} - 该命令的增量输出。
- */
-function executeSingleCommandInPty(ptyProcess, singleCommand) {
-    return new Promise((resolve, reject) => {
-        if (!ptyProcess) {
-            return reject(new Error("PTY process is not available."));
-        }
-
-        let rawOutput = '';
-        let rawOutputTruncated = false;
-        let settled = false;
-        let tempScriptPath = null;
-        let wrapperScriptPath = null;
-        let listenerDisposable = null;
-        let timeoutId = null;
-
-        const run = beginCommandRun(singleCommand);
-        const startBoundary = `__VCP_COMMAND_START_${crypto.randomUUID()}__`;
-        const endBoundary = `__VCP_COMMAND_END_${crypto.randomUUID()}__`;
-        const outputParser = new CommandOutputParser(startBoundary, endBoundary);
-
-        const abortThisCommand = () => {
-            if (settled) {
-                return false;
-            }
-
-            settled = true;
-            finishCommandRun(run, 'cancelled');
-            // ETX 等价于用户在真实终端按下 Ctrl+C，用于中断当前前台命令。
-            ptyProcess.write('\x03');
-            cleanupListener(listenerDisposable, timeoutId);
-            reject(new Error('命令已被 interrupt 动作中止。'));
-            return true;
-        };
-
-        const cleanupListener = (disposable, commandTimeoutId) => {
-            if (commandTimeoutId) {
-                clearTimeout(commandTimeoutId);
-            }
-            if (disposable && typeof disposable.dispose === 'function') {
-                disposable.dispose();
-            }
-            if (activeCommandAbort === abortThisCommand) {
-                activeCommandAbort = null;
-            }
-            for (const scriptPath of [tempScriptPath, wrapperScriptPath]) {
-                if (!scriptPath) continue;
-                try {
-                    fs.unlinkSync(scriptPath);
-                } catch (e) {
-                    console.warn('[PowerShellExecutor] Failed to remove temporary script:', e.message);
-                }
-            }
-            tempScriptPath = null;
-            wrapperScriptPath = null;
-        };
-
-        const flushToGui = (text) => {
-            if (text) {
-                dispatchPtyData(text);
-            }
-        };
-
-        listenerDisposable = ptyProcess.onData((data) => {
-            if (settled) {
-                return;
-            }
-
-            const result = outputParser.push(data.toString('utf-8'));
-            rawOutputTruncated ||= rawOutput.length + result.output.length > COMMAND_RUN_RAW_LIMIT;
-            rawOutput = (rawOutput + result.output).slice(-COMMAND_RUN_RAW_LIMIT);
-            appendCommandRunOutput(run, result.output);
-
-            if (result.done) {
-                settled = true;
-                finishCommandRun(run, 'completed');
-                cleanupListener(listenerDisposable, timeoutId);
-                resolve((rawOutputTruncated ? '[输出超过容量限制，仅保留末尾内容]\n' : '') + sanitizeTerminalOutput(rawOutput).trim());
-            }
-
-            // GUI 是投影，不是完成裁决者；保留同块中的结束后提示符。
-            flushToGui(result.output + result.trailing);
-        });
-
-        timeoutId = setTimeout(() => {
-            if (settled) {
-                return;
-            }
-            settled = true;
-            finishCommandRun(run, 'timed_out');
-            cleanupListener(listenerDisposable, timeoutId);
-            reject(new Error(`Command "${singleCommand}" timed out after 60 seconds.`));
-        }, 60000);
-
-        activeCommandAbort = abortThisCommand;
-
-        try {
-            const tempScriptName = `vcp-powershell-${crypto.randomUUID()}.ps1`;
-            tempScriptPath = path.join(os.tmpdir(), tempScriptName);
-            // Windows PowerShell 5.1 对无 BOM UTF-8 的中文兼容性较差，写入 BOM 保证脚本内容稳定解析。
-            fs.writeFileSync(tempScriptPath, `\ufeff${singleCommand}`, 'utf8');
-
-            const escapedTempScriptPath = tempScriptPath.replace(/'/g, "''");
-
-            // 边界标记只写进包装脚本，不出现在交互式命令行里：
-            // PowerShell/PSReadLine 会先回显整行输入，若标记出现在回显里，就会被误判为真实输出。
-            // 终端里也只留下一行短的脚本调用，而不是整段包装代码。
-            const wrapperScript = [
-                // 关掉分页器和 Git 交互提示，否则 git log/help 等会停在分页界面，命令一直等不到结束标记。
-                `$env:PAGER = 'cat'`,
-                `$env:GIT_PAGER = 'cat'`,
-                `$env:GIT_TERMINAL_PROMPT = '0'`,
-                `Write-Host '${startBoundary}'`,
-                // 即使临时脚本发生 ParserError / RuntimeException，也必须输出 end boundary，
-                // 否则 AI 调用会一直等待直到超时。终止性错误要在结束标记之前打印，
-                // 否则 PowerShell 会在命令行结束后才显示它，AI 拿到的输出就是空的。
-                `try { & '${escapedTempScriptPath}' } catch { $_ | Out-Host } finally { Write-Host '${endBoundary}' }`
-            ].join('\r\n');
-            wrapperScriptPath = path.join(os.tmpdir(), `vcp-run-${crypto.randomUUID()}.ps1`);
-            fs.writeFileSync(wrapperScriptPath, `\ufeff${wrapperScript}`, 'utf8');
-            const wrappedCommand = `& '${wrapperScriptPath.replace(/'/g, "''")}'`;
-
-            ptyProcess.write(`${wrappedCommand}\r`);
-        } catch (error) {
-            settled = true;
-            finishCommandRun(run, 'spawn_error');
-            cleanupListener(listenerDisposable, timeoutId);
-            reject(new Error(`无法创建或执行临时 PowerShell 脚本: ${error.message}`));
-        }
-    });
-}
-
-
-const INTERACTIVE_SEQUENCE_LIMITS = Object.freeze({
-    maxSteps: 100,
-    maxWaitMs: 60000,
-    maxTotalWaitMs: 300000,
-    maxTextLength: 100000,
-    maxQueryLines: 2000,
-    responseTimeoutMs: 5000
-});
-
-const TERMINAL_KEY_SEQUENCES = Object.freeze({
-    enter: '\r',
-    return: '\r',
-    up: '\x1b[A',
-    arrowup: '\x1b[A',
-    down: '\x1b[B',
-    arrowdown: '\x1b[B',
-    right: '\x1b[C',
-    arrowright: '\x1b[C',
-    left: '\x1b[D',
-    arrowleft: '\x1b[D',
-    esc: '\x1b',
-    escape: '\x1b',
-    tab: '\t',
-    backtab: '\x1b[Z',
-    'shift+tab': '\x1b[Z',
-    backspace: '\x7f',
-    delete: '\x1b[3~',
-    home: '\x1b[H',
-    end: '\x1b[F',
-    pageup: '\x1b[5~',
-    pagedown: '\x1b[6~',
-    space: ' ',
-    'ctrl+c': '\x03',
-    'ctrl+d': '\x04',
-    'ctrl+z': '\x1a',
-    'ctrl+l': '\x0c',
-    'ctrl+a': '\x01',
-    'ctrl+e': '\x05',
-    'ctrl+u': '\x15',
-    'ctrl+k': '\x0b',
-    'ctrl+w': '\x17'
-});
-
-function delay(ms) {
-    return new Promise(resolve => setTimeout(resolve, ms));
-}
-
-function parseWaitDuration(value) {
-    if (typeof value === 'number' && Number.isFinite(value)) {
-        return Math.round(value);
-    }
-
-    const match = String(value).trim().toLowerCase().match(/^(\d+(?:\.\d+)?)\s*(ms|s)?$/);
-    if (!match) {
-        throw new Error(`无效 wait 时长 "${value}"；请使用 50ms、1s 或毫秒数字。`);
-    }
-
-    const milliseconds = Number(match[1]) * (match[2] === 's' ? 1000 : 1);
-    return Math.round(milliseconds);
-}
-
-function parseTerminalKey(value) {
-    const raw = String(value).trim().toLowerCase();
-    const match = raw.match(/^(.+?)(?:\s*\*\s*(\d+))?$/);
-    const keyName = match ? match[1].trim() : raw;
-    const repeat = match && match[2] ? Number.parseInt(match[2], 10) : 1;
-    const sequence = TERMINAL_KEY_SEQUENCES[keyName];
-
-    if (!sequence) {
-        throw new Error(`不支持的终端按键 "${value}"。`);
-    }
-    if (!Number.isInteger(repeat) || repeat < 1 || repeat > 10) {
-        throw new Error(`按键重复次数必须在 1 到 10 之间："${value}"。`);
-    }
-
-    return { keyName, repeat, data: sequence.repeat(repeat) };
-}
-
-function parseInteractiveSequence(args) {
-    const steps = [];
-
-    for (const [key, value] of Object.entries(args)) {
-        const match = key.match(/^(command|wait|key|paste|queryVisible)(\d+)$/i);
-        if (!match) {
-            continue;
-        }
-
-        const typeLookup = {
-            command: 'command',
-            wait: 'wait',
-            key: 'key',
-            paste: 'paste',
-            queryvisible: 'queryVisible'
-        };
-        steps.push({
-            key,
-            type: typeLookup[match[1].toLowerCase()],
-            index: Number.parseInt(match[2], 10),
-            value
-        });
-    }
-
-    if (steps.length === 0) {
-        throw new Error('RunInteractiveSequence 至少需要一个带全局序号的步骤，例如 command1、wait2、key3、paste4、queryVisible5。');
-    }
-    if (steps.length > INTERACTIVE_SEQUENCE_LIMITS.maxSteps) {
-        throw new Error(`交互序列最多允许 ${INTERACTIVE_SEQUENCE_LIMITS.maxSteps} 个步骤。`);
-    }
-
-    steps.sort((a, b) => a.index - b.index);
-    const usedIndexes = new Set();
-    let totalWaitMs = 0;
-
-    for (const step of steps) {
-        if (!Number.isInteger(step.index) || step.index < 1) {
-            throw new Error(`步骤编号必须是从 1 开始的正整数：${step.key}。`);
-        }
-        if (usedIndexes.has(step.index)) {
-            throw new Error(`步骤编号 ${step.index} 重复；不同类型步骤必须共用唯一的全局序号。`);
-        }
-        usedIndexes.add(step.index);
-
-        if (step.type === 'wait') {
-            step.durationMs = parseWaitDuration(step.value);
-            if (step.durationMs < 0 || step.durationMs > INTERACTIVE_SEQUENCE_LIMITS.maxWaitMs) {
-                throw new Error(`单个 wait 步骤必须在 0 到 ${INTERACTIVE_SEQUENCE_LIMITS.maxWaitMs}ms 之间。`);
-            }
-            totalWaitMs += step.durationMs;
-        } else if (step.type === 'key') {
-            step.keySpec = parseTerminalKey(step.value);
-        } else if (step.type === 'queryVisible') {
-            const parsedLines = Number.parseInt(step.value, 10);
-            step.maxLines = Number.isInteger(parsedLines) && parsedLines > 0
-                ? Math.min(parsedLines, INTERACTIVE_SEQUENCE_LIMITS.maxQueryLines)
-                : null;
-        } else {
-            if (typeof step.value !== 'string' || !step.value.length) {
-                throw new Error(`${step.key} 必须是非空字符串。`);
-            }
-            if (step.value.length > INTERACTIVE_SEQUENCE_LIMITS.maxTextLength) {
-                throw new Error(`${step.key} 超过 ${INTERACTIVE_SEQUENCE_LIMITS.maxTextLength} 字符限制。`);
-            }
-        }
-    }
-
-    if (totalWaitMs > INTERACTIVE_SEQUENCE_LIMITS.maxTotalWaitMs) {
-        throw new Error(`序列累计等待不能超过 ${INTERACTIVE_SEQUENCE_LIMITS.maxTotalWaitMs}ms。`);
-    }
-    if (steps.every(step => step.type === 'wait')) {
-        throw new Error('交互序列不能只包含 wait；请至少加入 command、key、paste 或 queryVisible 步骤。');
-    }
-
-    return steps;
-}
-
-function requestVisibleText(maxLines = null) {
-    return new Promise((resolve, reject) => {
-        if (!guiWindow || guiWindow.isDestroyed() || !guiReady) {
-            reject(new Error('PowerShell GUI 尚未就绪，无法查询可见文本。'));
-            return;
-        }
-
-        const requestId = crypto.randomUUID();
-        const timeout = setTimeout(() => {
-            visibleTextResolvers.delete(requestId);
-            reject(new Error('查询终端文本超时'));
-        }, INTERACTIVE_SEQUENCE_LIMITS.responseTimeoutMs);
-
-        visibleTextResolvers.set(requestId, (text) => {
-            clearTimeout(timeout);
-            resolve(text);
-        });
-        guiWindow.webContents.send('query-visible-text', { requestId, maxLines });
-    });
-}
-
-function requestTerminalPaste(text) {
-    return new Promise((resolve, reject) => {
-        if (!guiWindow || guiWindow.isDestroyed() || !guiReady) {
-            reject(new Error('PowerShell GUI 尚未就绪，无法执行 xterm 粘贴。'));
-            return;
-        }
-
-        const requestId = crypto.randomUUID();
-        const timeout = setTimeout(() => {
-            terminalPasteResolvers.delete(requestId);
-            reject(new Error('xterm 粘贴请求超时'));
-        }, INTERACTIVE_SEQUENCE_LIMITS.responseTimeoutMs);
-
-        terminalPasteResolvers.set(requestId, () => {
-            clearTimeout(timeout);
-            resolve();
-        });
-        guiWindow.webContents.send('terminal-paste-request', { requestId, text });
-    });
-}
-
-async function ensureInteractiveTerminal(newSession = false) {
-    ensureGuiWindow();
-    if (newSession === true || !ptyProcess) {
-        createNewPtySession();
-    }
-    await waitForTerminalReady();
-    interactiveMode = true;
-    return ptyProcess;
-}
-
-async function sendSingleInteractiveKey(args) {
-    if (typeof args.key !== 'string' || !args.key.trim()) {
-        throw new Error('SendInteractiveKey 需要 key 参数，例如 enter、up、esc 或 ctrl+c*2。');
-    }
-
-    const keySpec = parseTerminalKey(args.key);
-    const targetPtyProcess = await ensureInteractiveTerminal(args.newSession === true);
-    targetPtyProcess.write(keySpec.data);
-
-    return {
-        content: [{
-            type: 'text',
-            text: `Interactive key sent: ${keySpec.keyName}${keySpec.repeat > 1 ? ` x${keySpec.repeat}` : ''}.`
-        }]
-    };
-}
-
-async function pasteSingleInteractiveText(args) {
-    if (typeof args.text !== 'string' || !args.text.length) {
-        throw new Error('PasteInteractiveText 需要非空 text 参数。');
-    }
-    if (args.text.length > INTERACTIVE_SEQUENCE_LIMITS.maxTextLength) {
-        throw new Error(`text 超过 ${INTERACTIVE_SEQUENCE_LIMITS.maxTextLength} 字符限制。`);
-    }
-
-    await ensureInteractiveTerminal(args.newSession === true);
-    await requestTerminalPaste(args.text);
-
-    if (args.submit === true) {
-        if (!ptyProcess) {
-            throw new Error('粘贴完成后 PTY 会话已退出，无法发送 Enter。');
-        }
-        ptyProcess.write('\r');
-    }
-
-    return {
-        content: [{
-            type: 'text',
-            text: `Interactive text pasted (${args.text.length} characters)${args.submit === true ? ' and Enter was sent' : ''}.`
-        }]
-    };
-}
-
-async function runInteractiveSequence(args) {
-    const steps = parseInteractiveSequence(args);
-
-    for (const step of steps.filter(item => item.type === 'command')) {
-        const securityResult = intelligentSecurityCheck(
-            step.value,
-            defaultConfig.forbiddenCommands,
-            defaultConfig.authRequiredCommands
-        );
-        if (securityResult.isForbidden) {
-            throw new Error(`步骤 ${step.index} 执行被阻止：${securityResult.reason}`);
-        }
-        if (securityResult.needsAuth) {
-            throw new Error(`步骤 ${step.index} 需要授权，RunInteractiveSequence 不支持在 TUI 序列中弹出授权确认：${securityResult.reason}`);
-        }
-    }
-
-    const targetPtyProcess = await ensureInteractiveTerminal(args.newSession === true);
-    const queryResults = [];
-
-    for (const step of steps) {
-        if (!ptyProcess || ptyProcess !== targetPtyProcess) {
-            throw new Error(`执行到步骤 ${step.index} 时 PTY 会话已退出或被替换。`);
-        }
-
-        switch (step.type) {
-            case 'command':
-                targetPtyProcess.write(`${step.value}\r`);
-                break;
-            case 'wait':
-                await delay(step.durationMs);
-                break;
-            case 'key':
-                targetPtyProcess.write(step.keySpec.data);
-                break;
-            case 'paste':
-                await requestTerminalPaste(step.value);
-                break;
-            case 'queryVisible': {
-                const text = await requestVisibleText(step.maxLines);
-                queryResults.push({ index: step.index, maxLines: step.maxLines, text });
-                break;
-            }
-            default:
-                throw new Error(`未知交互步骤类型：${step.type}`);
-        }
-    }
-
-    if (queryResults.length === 0) {
-        return {
-            content: [{
-                type: 'text',
-                text: `Interactive sequence completed (${steps.length} steps). No queryVisible step was requested.`
-            }]
-        };
-    }
-
-    const output = queryResults.map(result => {
-        const lineLabel = result.maxLines ? `, max ${result.maxLines} lines` : '';
-        return `---[queryVisible step ${result.index}${lineLabel}]---\n${result.text}`;
-    }).join('\n\n');
-
-    return { content: [{ type: 'text', text: `\`\`\`\n${output}\n\`\`\`` }] };
-}
-
-async function processToolCall(args) {
-    const declaredCommands = new Set([
-        'ExecutePowerShell',
-        'StartInteractive',
-        'SendInteractiveKey',
-        'PasteInteractiveText',
-        'RunInteractiveSequence',
-        'QueryVisible',
-        'InterruptPowerShell',
-        'EndInteractive'
-    ]);
-    const declaredCommand = typeof args.command === 'string' && declaredCommands.has(args.command.trim())
-        ? args.command.trim()
-        : null;
-
-    // 新清单格式使用 command 选择能力、powershell 传递脚本文本。
-    // 同时保留旧 action + command 调用格式，避免已有提示词和调用方立即失效。
-    const actionByDeclaredCommand = {
-        ExecutePowerShell: 'execute',
-        StartInteractive: 'startInteractive',
-        SendInteractiveKey: 'interactiveKey',
-        PasteInteractiveText: 'interactivePaste',
-        RunInteractiveSequence: 'interactiveSequence',
-        QueryVisible: 'queryVisible',
-        InterruptPowerShell: 'interrupt',
-        EndInteractive: 'endInteractive'
-    };
-    const action = declaredCommand
-        ? actionByDeclaredCommand[declaredCommand]
-        : (typeof args.action === 'string' ? args.action.trim() : 'execute');
-
-    if (action === 'interactiveKey') {
-        return sendSingleInteractiveKey(args);
-    }
-
-    if (action === 'interactivePaste') {
-        return pasteSingleInteractiveText(args);
-    }
-
-    if (action === 'interactiveSequence') {
-        return runInteractiveSequence(args);
-    }
-
-    if (action.startsWith('queryVisible')) {
-        ensureGuiWindow();
-        await waitForGuiReady();
-
-        const legacyMatch = action.match(/^queryVisible(\d+)?$/);
-        const requestedMaxLines = declaredCommand === 'QueryVisible' ? args.maxLines : (legacyMatch && legacyMatch[1]);
-        const parsedMaxLines = requestedMaxLines === undefined || requestedMaxLines === null || requestedMaxLines === ''
-            ? null
-            : Number.parseInt(requestedMaxLines, 10);
-        const maxLines = Number.isInteger(parsedMaxLines) && parsedMaxLines > 0
-            ? Math.min(parsedMaxLines, INTERACTIVE_SEQUENCE_LIMITS.maxQueryLines)
-            : null;
-        const text = await requestVisibleText(maxLines);
-        return { content: [{ type: 'text', text: `\`\`\`\n${text}\n\`\`\`` }] };
-    }
-
-    if (action === 'endInteractive') {
-        interactiveMode = false;
-        return { content: [{ type: 'text', text: 'Interactive mode flag cleared. The existing PTY session was not terminated.' }] };
-    }
-
-    if (action === 'interrupt') {
-        if (!ptyProcess) {
-            return { content: [{ type: 'text', text: 'No active PowerShell session to interrupt.' }] };
-        }
-
-        if (activeCommandAbort) {
-            const interrupted = activeCommandAbort();
-            return { content: [{ type: 'text', text: interrupted
-                ? 'Interrupt signal sent. The active synchronous command wait was cancelled.'
-                : 'The synchronous command had already completed before it could be interrupted.' }] };
-        }
-
-        if (interactiveMode) {
-            ptyProcess.write('\x03');
-            return { content: [{ type: 'text', text: 'Ctrl+C was sent to the interactive foreground program. The interactive mode flag remains set.' }] };
-        }
-
-        return { content: [{ type: 'text', text: 'The PowerShell session is active, but no AI-started foreground command is currently running.' }] };
-    }
-
-    // --- 1. 解析和排序 PowerShell 脚本 ---
-    // 新格式：powershell, powershell1, powershell2...
-    // 旧格式：command, command1, command2...
-    const scriptParameterPrefix = declaredCommand ? 'powershell' : 'command';
-    const commandEntries = Object.entries(args)
-        .filter(([key]) => key.startsWith(scriptParameterPrefix))
-        .map(([key, value]) => {
-            const match = key.match(new RegExp(`^${scriptParameterPrefix}(\\d*)$`));
-            const index = match ? (match[1] === '' ? 0 : parseInt(match[1], 10)) : -1;
-            return { key, value, index };
-        })
-        .filter(item => item.index !== -1 && typeof item.value === 'string' && item.value.trim())
-        .sort((a, b) => a.index - b.index);
-
-    // 新格式中的 args.command 是能力选择器，绝不能作为待执行脚本。
-    if (declaredCommand) {
-        commandEntries.forEach(entry => {
-            entry.value = entry.value.trim();
-        });
-    }
-
-    if (commandEntries.length === 0) {
-        throw new Error(declaredCommand
-            ? '未提供任何有效的 powershell 参数 (例如 powershell, powershell1, powershell2)。'
-            : '未提供任何有效的 command 参数 (例如 command, command1, command2)。');
-    }
-
-    if (action !== 'execute' && action !== 'startInteractive') {
-        throw new Error(`不支持的 action: ${action}`);
-    }
-
-    // --- 2. 智能安全预检查 ---
-    let needsInteractiveAuth = false;
-    for (const entry of commandEntries) {
-        const securityResult = intelligentSecurityCheck(
-            entry.value,
-            defaultConfig.forbiddenCommands,
-            defaultConfig.authRequiredCommands
-        );
-
-        if (securityResult.isForbidden) {
-            throw new Error(`执行被阻止：${securityResult.reason}`);
-        }
-
-        if (securityResult.needsAuth) {
-            needsInteractiveAuth = true;
-            console.log(`[PowerShellExecutor] 命令 "${entry.value}" 需要交互式授权：${securityResult.reason}`);
-        }
-    }
-
-    // --- 3. 初始化会话和参数 ---
-    const lastCommandIndex = commandEntries[commandEntries.length - 1].index;
-    const getArg = (key, defaultVal) => {
-        const indexedKey = `${key}${lastCommandIndex || ''}`;
-        return args[indexedKey] !== undefined ? args[indexedKey] : (args[key] !== undefined ? args[key] : defaultVal);
-    };
-
-    const requireAdmin = getArg('requireAdmin', false);
-    const newSession = getArg('newSession', false);
-    const finalReturnMode = getArg('returnMode', defaultConfig.returnMode);
-
-    // --- 4. 根据模式选择执行路径 ---
-
-    // 路径 A: 管理员模式 (最高优先级)
-    if (requireAdmin) {
-        if (commandEntries.length > 1) {
-            throw new Error("管理员模式 (requireAdmin: true) 不支持执行多个命令链。");
-        }
-        if (ptyProcess) {
-            ptyProcess.kill();
-            ptyProcess = null;
-        }
-        const command = commandEntries[0].value;
-        const fullCommand = `[Console]::OutputEncoding = [System.Text.Encoding]::UTF8; $env:PAGER = 'cat'; $env:GIT_PAGER = 'cat'; $env:GIT_TERMINAL_PROMPT = '0'; function global:more { param([string[]]$paths) if ($paths) { foreach ($file in $paths) { Get-Content $file } } else { $input } }; function global:help { Get-Help @args }; ${command}`;
-        const output = await executeAdminCommand(fullCommand);
-        if (output && typeof output === 'object' && Array.isArray(output.content)) {
-            return output;
-        }
-        const cleanOutput = (typeof output === 'string' ? output : String(output || '')).replace(/\r\n/g, '\n').replace(/\r/g, '');
-        return { content: [{ type: 'text', text: `\`\`\`powershell\n${cleanOutput}\n\`\`\`` }] };
-    }
-
-    // 路径 B: 普通敏感命令确认模式
-    // 这里只做确认；确认通过后继续走路径 C，在主 PTY/xterm 会话中执行并连续显示输出。
-    if (needsInteractiveAuth) {
-        const combinedCommand = commandEntries.map(e => e.value).join('; ');
-        const confirmed = await requestInteractiveConfirmation(combinedCommand);
-        if (!confirmed) {
-            return { content: [{ type: 'text', text: '用户取消了操作。' }] };
-        }
-    }
-
-    // 路径 C: 标准非管理员会话执行
-    if (isExecutingCommand) {
-        throw new Error('当前已有同步命令执行中，请等待完成或使用 interrupt。');
-    }
-    ensureGuiWindow();
-
-    if (newSession || !ptyProcess) {
-        createNewPtySession();
-    }
-
-    // 必须等渲染端完成 xterm 挂载/监听/首次 fit，且 PowerShell 执行完启动探针，
-    // 才允许向 PTY 注入用户或 AI 指令。替代容易产生竞态的固定 500ms 延时。
-    await waitForTerminalReady();
-
-    if (action === 'startInteractive') {
-        if (commandEntries.length > 1) {
-            throw new Error('startInteractive 只支持单条 command。');
-        }
-
-        const command = commandEntries[0].value;
-        interactiveMode = true;
-        // 不设置 isExecutingCommand；交互式 TUI 输出必须走常驻 guiDataListener，否则会黑屏。
-        ptyProcess.write(`${command}\r`);
-        return { content: [{ type: 'text', text: `Interactive session started: ${command}` }] };
-    }
-
-    if (interactiveMode) {
-        throw new Error('当前终端正被交互式程序 (snow/codex/claude) 占用，请先退出并调用 action:"endInteractive"，或使用 newSession:true 重置会话。');
-    }
-
-    // 就绪等待期间其它调用可能先取得PTY，await后必须再次检查。
-    if (isExecutingCommand) {
-        throw new Error('当前已有同步命令执行中，请等待完成或使用 interrupt。');
-    }
-    const deltaOutputs = [];
-    isExecutingCommand = true;
-    try {
-        for (const entry of commandEntries) {
-            const command = entry.value;
-            const currentReturnModeKey = `returnMode${entry.index || ''}`;
-            const currentReturnMode = args[currentReturnModeKey] || finalReturnMode;
-
-            try {
-                const output = await executeSingleCommandInPty(ptyProcess, command);
-                deltaOutputs.push({ command, output, returnMode: currentReturnMode });
-            } catch (error) {
-                throw new Error(`在执行命令 "${command}" 时出错: ${error.message}`);
-            }
-        }
-    } finally {
-        isExecutingCommand = false;
-    }
-
-    // --- 5. 格式化并返回结果 ---
-    let finalOutput = '';
-    if (finalReturnMode === 'full') {
-        finalOutput = deltaOutputs.length > 0 ? deltaOutputs[deltaOutputs.length - 1].output : '';
-    } else { // delta 模式
-        if (deltaOutputs.length === 1) {
-            finalOutput = deltaOutputs[0].output;
-        } else {
-            finalOutput = deltaOutputs.map(res =>
-                `---[Output for: ${res.command}]---\n${res.output}`
-            ).join('\n\n');
-        }
-    }
-
-    const cleanOutput = finalOutput.replace(/\r\n/g, '\n').replace(/\r/g, '');
-    return { content: [{ type: 'text', text: `\`\`\`powershell\n${cleanOutput}\n\`\`\`` }] };
-}
-
-/**
- * 清理插件资源，在主程序退出或插件重载时调用。
- */
-function cleanup() {
-    console.log('[PowerShellExecutor] 正在清理资源...');
-
-    // 1. 关闭并销毁 GUI 窗口
-    if (guiWindow && !guiWindow.isDestroyed()) {
-        try {
-            // 移除 'closed' 监听器，以避免在程序化关闭时触发额外的 ptyProcess.kill()
-            guiWindow.removeAllListeners('closed');
-            guiWindow.close();
-            console.log('[PowerShellExecutor] GUI 窗口已关闭。');
-        } catch (e) {
-            console.error('[PowerShellExecutor] 关闭 GUI 窗口时出错:', e);
-        }
-        guiWindow = null;
-    }
-    guiReady = false;
-    if (resolveGuiReady) {
-        resolveGuiReady();
-        resolveGuiReady = null;
-    }
-    guiReadyPromise = Promise.resolve();
-    visibleTextResolvers.clear();
-    terminalPasteResolvers.clear();
-
-    // 2. 终止所有跟踪的子进程
-    if (childProcesses.size > 0) {
-        console.log(`[PowerShellExecutor] 正在终止 ${childProcesses.size} 个子进程...`);
-        for (const processToKill of childProcesses) {
-            try {
-                // ptyProcess 和 child_process 对象都有一个 .kill() 方法
-                processToKill.kill();
-                console.log(`[PowerShellExecutor] 进程 (PID: ${processToKill.pid}) 已终止。`);
-            } catch (e) {
-                console.error(`[PowerShellExecutor] 终止进程 (PID: ${processToKill.pid}) 时出错:`, e);
-            }
-        }
-        childProcesses.clear();
-    }
-
-    // 3. 停止文件监视器
-    if (settingsWatcher) {
-        try {
-            settingsWatcher.close();
-            settingsWatcher = null;
-            console.log('[PowerShellExecutor] Settings file watcher stopped.');
-        } catch (e) {
-            console.error('[PowerShellExecutor] Error stopping settings watcher:', e);
-        }
-    }
-
-    // 4. 确保 ptyProcess 状态被重置
-    mirrorSinks.clear();
-    replayBuffer = '';
-    mirrorStartupPending = false;
-    mirrorStartupHeld = '';
-    ptyProcess = null;
-    ptyReadyPromise = Promise.resolve();
-    guiDataListener = null;
-    isExecutingCommand = false;
-    interactiveMode = false;
-    activeCommandAbort = null;
-}
-
-// 导出主入口、GUI/清理函数，以及无 Electron 副作用的序列解析器供单元测试使用。
-module.exports = {
-    processToolCall,
-    openGuiTerminal,
-    attachMirror,
-    listCommandRuns,
-    getCommandRun,
-    subscribeCommandRuns,
-    // 仅供测试：跳过 GUI 窗口，直接在共享 PTY 会话里跑一条短命令
-    _runCommandForTest: (command) => executeSingleCommandInPty(ptyProcess, command),
-    ensureMirrorSession,
-    restartSession,
-    getSessionState,
-    writeSessionInput,
-    resizeSession: applyPtyResize,
-    cleanup,
-    parseInteractiveSequence,
-    parseWaitDuration,
-    parseTerminalKey
+// node-pty 是原生模块：只读命令记录、不开终端时不加载它，真正创建会话时才 require
+let ptyModule = null;
+function loadPty() {
+    return ptyModule || (ptyModule = require('node-pty'));
+}
+const os = require('os');
+const { spawn } = require('child_process');
+const path = require('path');
+const fs = require('fs');
+const crypto = require('crypto');
+const { BrowserWindow, ipcMain, clipboard } = require('electron');
+const tmp = require('tmp');
+const chokidar = require('chokidar');
+const { CommandOutputParser } = require('./command-output-parser');
+const { sanitizeTerminalOutput } = require('./terminalOutputSanitizer');
+// 命令运行记录放在无副作用的独立模块里：主进程只读记录时不必加载整个执行器
+const {
+    COMMAND_RUN_RAW_LIMIT,
+    beginCommandRun,
+    appendCommandRunOutput,
+    finishCommandRun,
+    listCommandRuns,
+    getCommandRun,
+    subscribeCommandRuns,
+} = require('./commandRunStore');
+const { resolveConfirmationScript } = require('./nativeHelperPath.js');
+
+// --- GUI Window Management ---
+let guiWindow = null;
+let guiReady = false;
+let guiReadyPromise = Promise.resolve();
+let resolveGuiReady = null;
+
+function createGuiReadyBarrier() {
+    guiReady = false;
+    guiReadyPromise = new Promise((resolve) => {
+        resolveGuiReady = resolve;
+    });
+}
+
+async function waitForGuiReady(timeoutMs = 15000) {
+    if (!guiWindow || guiWindow.isDestroyed()) {
+        throw new Error('PowerShell GUI window is not available.');
+    }
+
+    if (guiReady) {
+        return;
+    }
+
+    const targetWebContents = guiWindow.webContents;
+    let timeoutId = null;
+
+    try {
+        await Promise.race([
+            guiReadyPromise,
+            new Promise((_, reject) => {
+                timeoutId = setTimeout(() => {
+                    reject(new Error(`PowerShell GUI initialization timed out after ${timeoutMs}ms.`));
+                }, timeoutMs);
+            })
+        ]);
+    } finally {
+        if (timeoutId) {
+            clearTimeout(timeoutId);
+        }
+    }
+
+    if (!guiWindow || guiWindow.isDestroyed() || guiWindow.webContents !== targetWebContents || !guiReady) {
+        throw new Error('PowerShell GUI window changed or closed during initialization.');
+    }
+}
+
+function ensureGuiWindow() {
+    if (guiWindow && !guiWindow.isDestroyed()) {
+        guiWindow.focus();
+        return guiWindow;
+    }
+
+    createGuiReadyBarrier();
+    guiWindow = new BrowserWindow({
+        width: 800,
+        height: 600,
+        title: 'VCP PowerShell Executor',
+        frame: false, // 禁用窗口边框
+        ...(process.platform === 'darwin' ? {} : { titleBarStyle: 'hidden' }),
+        webPreferences: {
+            preload: path.join(__dirname, 'gui', 'preload.js'),
+            nodeIntegration: false, // 禁用 Node.js 集成以增强安全性
+            contextIsolation: true, // 启用上下文隔离
+            spellcheck: false,
+            // 将 node_modules 的路径作为参数传递给窗口，以便在 HTML 中使用
+            additionalArguments: [`--node-modules-path=${path.join(__dirname, '..', '..', '..', '..', 'node_modules')}`]
+        },
+        autoHideMenuBar: true,
+    });
+
+    guiWindow.loadFile(path.join(__dirname, 'gui', 'PowerShellViewer.html'));
+
+    guiWindow.on('closed', () => {
+        guiReady = false;
+        if (resolveGuiReady) {
+            resolveGuiReady();
+            resolveGuiReady = null;
+        }
+        guiWindow = null;
+        // 当GUI关闭时，也终止关联的 pty 进程
+        if (ptyProcess) {
+            try {
+                ptyProcess.kill();
+                console.log('[PowerShellExecutor] GUI closed, associated pty process terminated.');
+            } catch (e) {
+                console.error('[PowerShellExecutor] Error terminating pty process on GUI close:', e);
+            }
+            // ptyProcess 的 onExit 事件处理器会自动将其设置为 null 并从 childProcesses 集合中移除
+        }
+    });
+
+    return guiWindow;
+}
+
+// --- 主题管理与文件监视 ---
+const settingsPath = path.join(__dirname, '..', '..', '..', 'AppData', 'settings.json');
+let settingsWatcher = null;
+let lastSentTheme = null; // 用于存储上一次发送的主题名称
+
+/**
+ * 读取、比较并发送主题更新。
+ * 只有当主题名称实际发生变化时，才会向GUI发送事件。
+ * @param {Electron.WebContents} targetWebContents - 目标窗口的 webContents。
+ * @param {boolean} [forceSend=false] - 是否强制发送，即使用于初始化。
+ */
+function sendThemeUpdate(targetWebContents, forceSend = false) {
+    if (!targetWebContents || targetWebContents.isDestroyed()) {
+        return;
+    }
+    try {
+        let currentTheme = 'dark'; // 默认主题
+        if (fs.existsSync(settingsPath)) {
+            const settings = JSON.parse(fs.readFileSync(settingsPath, 'utf-8'));
+            currentTheme = settings.currentThemeMode || 'dark';
+        }
+
+        // 只有当主题变化或强制发送时，才进行通信
+        if (currentTheme !== lastSentTheme || forceSend) {
+            targetWebContents.send('theme-init', { themeName: currentTheme });
+            lastSentTheme = currentTheme; // 更新已发送的主题记录
+            console.log(`[PowerShellExecutor] Theme updated to: ${currentTheme}`);
+        }
+    } catch (error) {
+        console.error('[PowerShellExecutor] Error reading or sending theme settings:', error);
+    }
+}
+
+// 初始化文件监视器
+function setupThemeWatcher() {
+    if (settingsWatcher) {
+        settingsWatcher.close();
+    }
+    settingsWatcher = chokidar.watch(settingsPath, {
+        persistent: true,
+        ignoreInitial: true
+    });
+
+    settingsWatcher.on('change', () => {
+        if (guiWindow && !guiWindow.isDestroyed()) {
+            sendThemeUpdate(guiWindow.webContents);
+        }
+    });
+}
+
+// 在插件加载时启动监视
+setupThemeWatcher();
+
+
+// 监听来自GUI的“就绪”信号。
+// 只有当前窗口在 xterm 挂载、IPC 监听注册和首次 fit 完成后发出的信号才能解除屏障；
+// 旧窗口的迟到消息不能误解锁新窗口。
+ipcMain.on('powershell-gui-ready', (event) => {
+    if (!guiWindow || guiWindow.isDestroyed() || event.sender !== guiWindow.webContents) {
+        return;
+    }
+
+    guiReady = true;
+    if (resolveGuiReady) {
+        resolveGuiReady();
+        resolveGuiReady = null;
+    }
+
+    sendThemeUpdate(event.sender, true);
+});
+
+// 监听来自GUI的用户命令
+ipcMain.on('powershell-command', (event, command) => {
+    if (ptyProcess && command) {
+        // 将用户输入的命令写入 pty 进程
+        ptyProcess.write(`${command}\r`);
+    }
+});
+
+// 监听来自GUI的复制请求
+ipcMain.on('copy-to-clipboard', (event, text) => {
+    if (text) {
+        clipboard.writeText(text);
+    }
+});
+
+// 监听来自GUI的粘贴请求
+ipcMain.handle('read-from-clipboard', () => {
+    return clipboard.readText();
+});
+
+// 监听来自GUI的尺寸调整请求
+function applyPtyResize(cols, rows) {
+    const normalizedCols = Number(cols);
+    const normalizedRows = Number(rows);
+
+    if (Number.isInteger(normalizedCols) && Number.isInteger(normalizedRows) && normalizedCols > 0 && normalizedRows > 0) {
+        lastKnownSize = { cols: normalizedCols, rows: normalizedRows };
+    }
+
+    if (ptyProcess) {
+        try {
+            ptyProcess.resize(lastKnownSize.cols, lastKnownSize.rows);
+        } catch (e) {
+            console.error('[PowerShellExecutor] Failed to resize pty:', e);
+        }
+    }
+}
+
+ipcMain.on('powershell-resize', (event, { cols, rows }) => {
+    applyPtyResize(cols, rows);
+});
+
+// 监听来自GUI的真实终端输入透传。
+// 安全声明：此通道等价于用户直接操作本机终端，不经过 intelligentSecurityCheck；
+// forbiddenCommands/authRequiredCommands 仅约束 AI 工具调用路径 processToolCall。
+ipcMain.on('powershell-input', (event, data) => {
+    if (ptyProcess && typeof data === 'string') {
+        ptyProcess.write(data);
+    }
+});
+
+// --- 查询终端可见文本与 xterm 粘贴响应 ---
+const visibleTextResolvers = new Map();
+const terminalPasteResolvers = new Map();
+
+ipcMain.on('visible-text-response', (event, payload, legacyText) => {
+    if (!isPowerShellGuiSender(event)) {
+        return;
+    }
+
+    // 兼容旧渲染端直接返回字符串的格式。
+    if (typeof payload === 'string') {
+        const firstEntry = visibleTextResolvers.entries().next().value;
+        if (firstEntry) {
+            const [requestId, resolve] = firstEntry;
+            visibleTextResolvers.delete(requestId);
+            resolve(payload);
+        }
+        return;
+    }
+
+    const requestId = payload && payload.requestId;
+    const resolver = requestId ? visibleTextResolvers.get(requestId) : null;
+    if (resolver) {
+        visibleTextResolvers.delete(requestId);
+        resolver(typeof payload.text === 'string' ? payload.text : (legacyText || ''));
+    }
+});
+
+ipcMain.on('terminal-paste-complete', (event, payload) => {
+    if (!isPowerShellGuiSender(event)) {
+        return;
+    }
+
+    const requestId = payload && payload.requestId;
+    const resolver = requestId ? terminalPasteResolvers.get(requestId) : null;
+    if (resolver) {
+        terminalPasteResolvers.delete(requestId);
+        resolver();
+    }
+});
+
+// --- PowerShell GUI 专属窗口控制 ---
+// 不复用应用级 minimize-window/maximize-window/close-window：ipcMain 是全局事件总线，
+// 使用通用通道会让日志中心等其它窗口的操作也落到此 guiWindow 上；而 PowerShell
+// 自身的消息还会与应用级处理器重复执行（最大化切换两次后等同于没有变化）。
+function isPowerShellGuiSender(event) {
+    return Boolean(
+        event
+        && guiWindow
+        && !guiWindow.isDestroyed()
+        && guiWindow.webContents
+        && !guiWindow.webContents.isDestroyed()
+        && event.sender === guiWindow.webContents
+    );
+}
+
+ipcMain.on('powershell-window:minimize', (event) => {
+    if (isPowerShellGuiSender(event)) {
+        guiWindow.minimize();
+    }
+});
+
+ipcMain.on('powershell-window:toggle-maximize', (event) => {
+    if (!isPowerShellGuiSender(event)) {
+        return;
+    }
+
+    if (guiWindow.isMaximized()) {
+        guiWindow.unmaximize();
+    } else {
+        guiWindow.maximize();
+    }
+});
+
+ipcMain.on('powershell-window:close', (event) => {
+    if (isPowerShellGuiSender(event)) {
+        guiWindow.close();
+    }
+});
+
+// --- ANSI / terminal control projection for AI text summaries ---
+// 清洗逻辑在 terminalOutputSanitizer.js（纯函数，命令运行记录也用它）
+
+// --- 模块级状态 ---
+// 用于保存持久化的伪终端（PowerShell）进程
+let ptyProcess = null;
+// 移除 fullTerminalHistory，后端不再维护终端内容的完整状态
+// 新增：用于跟踪所有子进程，确保它们在插件卸载或程序退出时被正确清理
+const childProcesses = new Set();
+let guiDataListener = null; // 新增：保存GUI监听器的引用
+let isExecutingCommand = false; // 仅表示 AI 短命令执行中；不要用于交互式 TUI 会话
+let interactiveMode = false; // 表示当前 PTY 被 snow/codex/claude 等交互式程序占用
+let activeCommandAbort = null; // 当前同步命令的本地等待中止器；供并发 interrupt 工具调用解除阻塞
+let lastKnownSize = { cols: 80, rows: 24 }; // GUI 最近一次 fit 出来的尺寸，用作 PTY 初始尺寸
+let ptyReadyPromise = Promise.resolve();
+
+// --- 配置加载 ---
+const defaultConfig = {
+    returnMode: 'delta', // 默认为增量模式
+    forbiddenCommands: [],
+    authRequiredCommands: []
+};
+
+try {
+    const configPath = path.join(__dirname, 'config.env');
+    if (fs.existsSync(configPath)) {
+        const configContent = fs.readFileSync(configPath, 'utf-8');
+
+        const returnModeMatch = configContent.match(/^POWERSHELL_RETURN_MODE\s*=\s*(delta|full)/m);
+        if (returnModeMatch) {
+            defaultConfig.returnMode = returnModeMatch[1];
+        }
+
+        const forbiddenMatch = configContent.match(/^FORBIDDEN_COMMANDS\s*=\s*(.*)/m);
+        if (forbiddenMatch && forbiddenMatch[1]) {
+            defaultConfig.forbiddenCommands = forbiddenMatch[1].split(',').map(c => c.trim().toLowerCase()).filter(c => c);
+        }
+
+        const authRequiredMatch = configContent.match(/^AUTH_REQUIRED_COMMANDS\s*=\s*(.*)/m);
+        if (authRequiredMatch && authRequiredMatch[1]) {
+            defaultConfig.authRequiredCommands = authRequiredMatch[1].split(',').map(c => c.trim().toLowerCase()).filter(c => c);
+        }
+    }
+} catch (error) {
+    console.error('[PowerShellExecutor] Error reading config.env:', error);
+}
+
+
+/**
+ * 智能安全检查函数 - 区分命令关键字和路径内容
+ * @param {string} command - 要检查的命令字符串
+ * @param {string[]} forbiddenKeywords - 禁止的关键字列表
+ * @param {string[]} authRequiredKeywords - 需要授权的关键字列表
+ * @returns {object} - 检查结果 {isForbidden: boolean, needsAuth: boolean, matchedKeyword: string}
+ */
+function intelligentSecurityCheck(command, forbiddenKeywords, authRequiredKeywords) {
+    const result = {
+        isForbidden: false,
+        needsAuth: false,
+        matchedKeyword: null,
+        reason: null
+    };
+
+    // 预处理命令：移除多余空格，转换为小写
+    const normalizedCommand = command.trim().toLowerCase();
+
+    // 如果命令为空，直接返回
+    if (!normalizedCommand) {
+        return result;
+    }
+
+    // 定义路径模式 - 常见的Windows和Unix路径格式
+    const pathPatterns = [
+        /[a-z]:\\[^\\/:*?"<>|]*(?:\\[^\\/:*?"<>|]*)*\\?/gi,  // Windows路径 C:\path\to\file
+        /\/[^\/\s]*(?:\/[^\/\s]*)*\/?/g,                      // Unix路径 /path/to/file
+        /\$env:[a-z_]+[^\\/:*?"<>|\s]*/gi,                   // PowerShell环境变量路径
+        /\${[^}]+}[^\\/:*?"<>|\s]*/gi,                       // 变量路径 ${VAR}/path
+        /~\/[^\/\s]*(?:\/[^\/\s]*)*\/?/g                     // 用户目录路径 ~/path
+    ];
+
+    // 提取所有可能的路径
+    const detectedPaths = [];
+    pathPatterns.forEach(pattern => {
+        const matches = normalizedCommand.match(pattern);
+        if (matches) {
+            detectedPaths.push(...matches);
+        }
+    });
+
+    // 创建不包含路径的命令版本用于安全检查
+    let commandWithoutPaths = normalizedCommand;
+    detectedPaths.forEach(path => {
+        // 将路径替换为占位符，避免路径中的关键字被误判
+        commandWithoutPaths = commandWithoutPaths.replace(path.toLowerCase(), ' __PATH_PLACEHOLDER__ ');
+    });
+
+    // 清理命令：移除多余空格
+    commandWithoutPaths = commandWithoutPaths.replace(/\s+/g, ' ').trim();
+
+    // 定义PowerShell命令结构模式
+    const commandStructurePatterns = [
+        // PowerShell cmdlet模式: Verb-Noun
+        /\b[a-z]+-[a-z]+\b/g,
+        // 常见命令
+        /\b(?:get|set|new|remove|copy|move|invoke|start|stop|restart|test|clear|add|export|import|select|where|foreach|sort|group|measure|compare|out|write|read)\b/g,
+        // 参数模式
+        /\s-[a-z]+\b/g
+    ];
+
+    // 检查禁止的关键字
+    for (const keyword of forbiddenKeywords) {
+        if (!keyword) continue;
+
+        const keywordLower = keyword.toLowerCase();
+
+        // 1. 首先检查是否在路径中
+        const isInPath = detectedPaths.some(path =>
+            path.toLowerCase().includes(keywordLower)
+        );
+
+        if (isInPath) {
+            // 如果关键字只在路径中出现，检查是否也在命令部分出现
+            if (!commandWithoutPaths.includes(keywordLower)) {
+                console.log(`[PowerShellExecutor] 安全检查：关键字 "${keyword}" 仅在路径中发现，允许执行`);
+                continue; // 跳过这个关键字，不视为违规
+            }
+        }
+
+        // 2. 检查命令部分是否包含关键字
+        if (commandWithoutPaths.includes(keywordLower)) {
+            // 3. 进一步验证：检查关键字是否作为独立的命令或参数出现
+            const wordBoundaryPattern = new RegExp(`\\b${keywordLower.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\b`);
+
+            if (wordBoundaryPattern.test(commandWithoutPaths)) {
+                result.isForbidden = true;
+                result.matchedKeyword = keyword;
+                result.reason = `命令包含被禁止的关键字: ${keyword}`;
+                console.log(`[PowerShellExecutor] 安全检查：发现禁止的命令关键字 "${keyword}"`);
+                return result;
+            }
+        }
+    }
+
+    // 检查需要授权的关键字（使用相同的逻辑）
+    for (const keyword of authRequiredKeywords) {
+        if (!keyword) continue;
+
+        const keywordLower = keyword.toLowerCase();
+
+        // 1. 首先检查是否在路径中
+        const isInPath = detectedPaths.some(path =>
+            path.toLowerCase().includes(keywordLower)
+        );
+
+        if (isInPath) {
+            // 如果关键字只在路径中出现，检查是否也在命令部分出现
+            if (!commandWithoutPaths.includes(keywordLower)) {
+                console.log(`[PowerShellExecutor] 安全检查：授权关键字 "${keyword}" 仅在路径中发现，不需要授权`);
+                continue; // 跳过这个关键字，不需要授权
+            }
+        }
+
+        // 2. 检查命令部分是否包含关键字
+        if (commandWithoutPaths.includes(keywordLower)) {
+            // 3. 进一步验证：检查关键字是否作为独立的命令或参数出现
+            const wordBoundaryPattern = new RegExp(`\\b${keywordLower.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\b`);
+
+            if (wordBoundaryPattern.test(commandWithoutPaths)) {
+                result.needsAuth = true;
+                result.matchedKeyword = keyword;
+                result.reason = `命令包含需要授权的关键字: ${keyword}`;
+                console.log(`[PowerShellExecutor] 安全检查：发现需要授权的命令关键字 "${keyword}"`);
+                // 注意：不要return，继续检查其他关键字
+            }
+        }
+    }
+
+    return result;
+}
+
+/**
+ * 启动一个独立的 Python GUI 脚本来请求管理员权限并执行命令。
+ * 这是一个"即发即忘"的操作，它会打开一个全新的、独立的管理员终端窗口。
+ * @param {string} command - 需要以管理员权限执行的命令。
+ * @returns {Promise<string>} - 一个解析为提示信息的消息。
+ */
+function executeAdminCommand(command) {
+    return new Promise((resolve, reject) => {
+        // 1. 创建一个临时的输出文件
+        tmp.file({ postfix: '.txt' }, (err, tmpFilePath, fd, cleanupCallback) => {
+            if (err) {
+                return reject(new Error(`无法创建临时文件: ${err.message}`));
+            }
+
+            let pythonConfirmScript;
+            try { pythonConfirmScript = resolveConfirmationScript(__dirname); }
+            catch (error) { cleanupCallback(); reject(error); return; }
+            const commandAsBase64 = Buffer.from(command).toString('base64');
+
+            // 2. 准备传递给Python脚本的参数
+            const scriptPathForPS = pythonConfirmScript.replace(/'/g, "''");
+            const commandForPS = commandAsBase64.replace(/'/g, "''");
+            const tmpPathForPS = tmpFilePath.replace(/'/g, "''");
+            const argumentList = `"${scriptPathForPS}", "${commandForPS}", "${tmpPathForPS}"`;
+
+            // 3. 构造PowerShell命令以管理员权限运行Python脚本（捕获UAC异常并注入纯ASCII标记）
+            const psCommand = `$ErrorActionPreference = 'Stop'; try { Start-Process -FilePath "pythonw.exe" -ArgumentList ${argumentList} -Verb RunAs -Wait } catch { [Console]::Error.WriteLine('UAC_CANCELLED_OR_FAILED: ' + $_.Exception.Message) }`;
+            const child = spawn('powershell.exe', [
+                '-NoProfile',
+                '-ExecutionPolicy', 'Bypass',
+                '-Command', psCommand
+            ], {
+                windowsHide: true
+            });
+            childProcesses.add(child); // 跟踪进程
+
+            let stderrOutput = '';
+            let isSettled = false;
+
+            // 310 秒外部安全定时器守护，防止后台卡死挂起 (Todo #3)
+            const safetyTimeout = setTimeout(() => {
+                if (isSettled) return;
+                isSettled = true;
+                try {
+                    child.kill();
+                } catch { }
+                childProcesses.delete(child);
+                cleanupCallback();
+                resolve({
+                    isCancelled: true,
+                    content: [{
+                        type: 'text',
+                        text: '⚠️ [操作超时]：等待管理员确认超时（超过无操作安全时限），系统已自动拒绝执行。'
+                    }]
+                });
+            }, 310000);
+
+            child.stderr.on('data', (data) => {
+                stderrOutput += data.toString('utf-8');
+            });
+
+            child.on('error', (err) => {
+                if (isSettled) return;
+                isSettled = true;
+                clearTimeout(safetyTimeout);
+                childProcesses.delete(child); // 停止跟踪
+                cleanupCallback(); // 清理临时文件
+                reject(new Error(`无法启动PowerShell包装脚本: ${err.message}`));
+            });
+
+            child.on('close', (code) => {
+                if (isSettled) return;
+                isSettled = true;
+                clearTimeout(safetyTimeout);
+                childProcesses.delete(child); // 停止跟踪
+                // PowerShell脚本执行完毕，安全读取临时文件内容
+                fs.readFile(tmpFilePath, 'utf-8', (readErr, data) => {
+                    cleanupCallback(); // 确保清理临时文件
+
+                    // 检测 UAC 取消或拒绝错误（显式捕获标记、0x800704C7 或中文取消提示）
+                    const isUacCancelled = stderrOutput && (
+                        stderrOutput.includes('UAC_CANCELLED_OR_FAILED') ||
+                        stderrOutput.includes('0x800704C7') ||
+                        stderrOutput.includes('74C7') ||
+                        stderrOutput.includes('操作已被用户取消') ||
+                        stderrOutput.includes('The operation was canceled by the user')
+                    );
+
+                    if (isUacCancelled) {
+                        return resolve({
+                            isCancelled: true,
+                            content: [{
+                                type: 'text',
+                                text: '⚠️ [操作未执行/未授权]：用户在 Windows UAC 提权界面取消了授权，或未获取到管理员权限。敏感命令未执行。'
+                            }]
+                        });
+                    }
+                    if (readErr) {
+                        if (stderrOutput.trim()) {
+                            return reject(new Error(`管理员脚本执行失败: ${stderrOutput.trim()}`));
+                        }
+                        return reject(new Error(`无法读取管理员任务的输出文件: ${readErr.message}`));
+                    }
+
+                    const result = data.trim();
+                    if (result === "USER_CANCELLED") {
+                        resolve({
+                            isCancelled: true,
+                            content: [{
+                                type: 'text',
+                                text: '⚠️ [操作已取消]：用户已主动拒绝或取消了本次管理员权限申请。敏感命令未执行。'
+                            }]
+                        });
+                    } else if (result === "TIMEOUT_REJECTED") {
+                        resolve({
+                            isCancelled: true,
+                            content: [{
+                                type: 'text',
+                                text: '⚠️ [操作超时]：等待管理员确认超时（超过无操作安全时限），系统已自动拒绝执行。'
+                            }]
+                        });
+                    } else if (result.startsWith("ERROR:")) {
+                        reject(new Error(result.substring(6).trim()));
+                    } else if (result === "") {
+                        // 空输出防穿透：脚本根本未生成内容或提权未通过时，绝不能当作正常执行成功
+                        resolve({
+                            isCancelled: true,
+                            content: [{
+                                type: 'text',
+                                text: '⚠️ [操作未执行/未授权]：用户在 Windows UAC 提权界面取消了授权，或未获取到管理员权限。敏感命令未执行。'
+                            }]
+                        });
+                    } else {
+                        resolve(result);
+                    }
+                });
+            });
+        });
+    });
+}
+
+/**
+ * 请求用户确认一个敏感命令，但不在确认脚本中执行命令。
+ * 确认通过后，命令仍回到主 PTY/xterm 会话执行，以保持 GUI 连续输出。
+ * @param {string} command - 需要展示给用户确认的命令。
+ * @returns {Promise<boolean>} - 用户是否允许执行。
+ */
+function requestInteractiveConfirmation(command) {
+    return new Promise((resolve, reject) => {
+        tmp.file({ postfix: '.txt' }, (err, tmpFilePath, fd, cleanupCallback) => {
+            if (err) {
+                return reject(new Error(`无法创建临时文件: ${err.message}`));
+            }
+
+            let pythonConfirmScript;
+            try { pythonConfirmScript = resolveConfirmationScript(__dirname); }
+            catch (error) { cleanupCallback(); reject(error); return; }
+            const commandAsBase64 = Buffer.from(command).toString('base64');
+
+            // 普通敏感命令只需要当前权限确认，不应绕过主 PTY/xterm 执行链路。
+            const child = spawn('pythonw.exe', [
+                pythonConfirmScript,
+                commandAsBase64,
+                tmpFilePath,
+                '--interactive-auth',
+                '--confirm-only'
+            ], {
+                windowsHide: true
+            });
+            childProcesses.add(child);
+
+            let stderrOutput = '';
+            child.stderr.on('data', (data) => {
+                stderrOutput += data.toString('utf-8');
+            });
+
+            child.on('error', (err) => {
+                childProcesses.delete(child);
+                cleanupCallback();
+                reject(new Error(`无法启动交互式确认脚本: ${err.message}`));
+            });
+
+            child.on('close', () => {
+                childProcesses.delete(child);
+                fs.readFile(tmpFilePath, 'utf-8', (readErr, data) => {
+                    cleanupCallback();
+
+                    if (readErr) {
+                        if (stderrOutput.trim()) {
+                            return reject(new Error(`交互式确认脚本失败: ${stderrOutput.trim()}`));
+                        }
+                        return reject(new Error(`无法读取交互式确认结果文件: ${readErr.message}`));
+                    }
+
+                    const result = data.trim();
+                    if (result === 'CONFIRMED') {
+                        resolve(true);
+                    } else if (result === 'USER_CANCELLED' || result === 'TIMEOUT_REJECTED') {
+                        resolve(false);
+                    } else if (result.startsWith('ERROR:')) {
+                        reject(new Error(result.substring(6).trim()));
+                    } else {
+                        reject(new Error(`未知的交互式确认结果: ${result || '<empty>'}`));
+                    }
+                });
+            });
+        });
+    });
+}
+
+/**
+ * GUI 仅接收原始PTY投影；渲染窗口失效不得打断命令完成检测。
+ */
+function dispatchPtyData(rawData) {
+    const dataStr = rawData.toString('utf-8');
+    if (!dataStr) {
+        return;
+    }
+
+    if (mirrorStartupPending) {
+        // 启动握手（编码设置与就绪标记）是内部细节，握手完成前不投影到侧栏
+        mirrorStartupHeld = (mirrorStartupHeld + dataStr).slice(-MIRROR_REPLAY_LIMIT);
+    } else {
+        emitMirrorData(dataStr);
+    }
+
+    try {
+        if (!guiWindow || guiWindow.isDestroyed()
+            || guiWindow.webContents.isDestroyed()) {
+            return;
+        }
+        guiWindow.webContents.send('powershell-data', dataStr);
+    } catch (error) {
+        console.warn('[PowerShellExecutor] GUI output delivery failed:', error.message);
+    }
+}
+
+// --- 侧栏镜像 ---
+// 主窗口侧栏的「终端」标签是同一个 PTY 会话的另一个视图：输出同时送往 GUI 窗口和镜像，
+// 输入与尺寸调整直接落到同一个 PTY，AI 工具执行的命令因此对两处都可见。
+const MIRROR_REPLAY_LIMIT = 256 * 1024;
+const mirrorSinks = new Set();
+let replayBuffer = '';
+let mirrorStartupPending = false;
+let mirrorStartupHeld = '';
+
+function emitMirrorData(dataStr) {
+    if (!dataStr) return;
+    // 侧栏终端可能在会话进行中才挂载，缓存最近输出用于回放。
+    replayBuffer += dataStr;
+    if (replayBuffer.length > MIRROR_REPLAY_LIMIT) {
+        replayBuffer = replayBuffer.slice(-MIRROR_REPLAY_LIMIT);
+    }
+    notifyMirrors('onData', dataStr);
+}
+
+/** 结束启动握手：成功时只放出就绪标记之后的内容（通常是提示符），失败时原样放出便于排查。 */
+function releaseMirrorStartup(afterReady = null) {
+    if (!mirrorStartupPending) return;
+    mirrorStartupPending = false;
+    const held = mirrorStartupHeld;
+    mirrorStartupHeld = '';
+    emitMirrorData(afterReady === null ? held : afterReady);
+}
+
+function notifyMirrors(method, ...args) {
+    for (const sink of mirrorSinks) {
+        try {
+            sink[method]?.(...args);
+        } catch (e) {
+            console.error('[PowerShellExecutor] Mirror sink failed:', e);
+        }
+    }
+}
+
+/**
+ * 注册一个镜像视图并回放已有输出。
+ * @param {{onData: Function, onClear?: Function, onExit?: Function}} sink
+ * @returns {Function} 取消注册
+ */
+function attachMirror(sink) {
+    mirrorSinks.add(sink);
+    if (replayBuffer) {
+        try {
+            sink.onData(replayBuffer);
+        } catch (e) {
+            console.error('[PowerShellExecutor] Mirror replay failed:', e);
+        }
+    }
+    return () => mirrorSinks.delete(sink);
+}
+
+/** 确保有一个 PTY 会话（不打开 GUI 窗口）。 */
+function ensureMirrorSession() {
+    if (!ptyProcess) {
+        createNewPtySession();
+    }
+    return getSessionState();
+}
+
+/** 重置为全新的 PTY 会话（与 GUI 窗口共用）。 */
+function restartSession() {
+    createNewPtySession();
+    return getSessionState();
+}
+
+function getSessionState() {
+    return {
+        running: Boolean(ptyProcess),
+        pid: ptyProcess ? ptyProcess.pid : null,
+        // AI 短命令或交互式 TUI 占用期间，不应向会话里塞入额外命令。
+        busy: Boolean(isExecutingCommand || interactiveMode),
+        cols: lastKnownSize.cols,
+        rows: lastKnownSize.rows,
+    };
+}
+
+function writeSessionInput(data) {
+    if (!ptyProcess || typeof data !== 'string') {
+        return false;
+    }
+    ptyProcess.write(data);
+    return true;
+}
+
+/**
+ * 等待指定 PTY 完成 PowerShell 初始化探针。
+ * Promise 与具体 PTY 实例绑定，旧会话的迟到结果不能被新会话复用。
+ * @param {object} targetPtyProcess - 要等待的 node-pty 实例。
+ * @param {number} timeoutMs - 最大等待时间。
+ */
+async function waitForPtyReady(targetPtyProcess = ptyProcess, timeoutMs = 15000) {
+    if (!targetPtyProcess || targetPtyProcess !== ptyProcess) {
+        throw new Error('PowerShell PTY session is not available.');
+    }
+
+    let timeoutId = null;
+    try {
+        await Promise.race([
+            ptyReadyPromise,
+            new Promise((_, reject) => {
+                timeoutId = setTimeout(() => {
+                    reject(new Error(`PowerShell PTY initialization timed out after ${timeoutMs}ms.`));
+                }, timeoutMs);
+            })
+        ]);
+    } finally {
+        if (timeoutId) {
+            clearTimeout(timeoutId);
+        }
+    }
+
+    if (!ptyProcess || ptyProcess !== targetPtyProcess) {
+        throw new Error('PowerShell PTY session changed or exited during initialization.');
+    }
+}
+
+/**
+ * 同时等待渲染端 xterm 和后端 PTY 就绪，确保指令不会在界面初始化前注入。
+ */
+async function waitForTerminalReady() {
+    const targetPtyProcess = ptyProcess;
+    await Promise.all([
+        waitForGuiReady(),
+        waitForPtyReady(targetPtyProcess)
+    ]);
+}
+
+/**
+ * 创建一个新的伪终端 (pty) 进程。
+ */
+function createNewPtySession() {
+    // newSession 是交互模式的一期低成本复位入口。
+    interactiveMode = false;
+    isExecutingCommand = false;
+    activeCommandAbort = null;
+
+    // 如果已存在旧进程，先销毁它
+    if (ptyProcess) {
+        childProcesses.delete(ptyProcess);
+        ptyProcess.kill();
+        // 当重置会话时，通知前端清屏
+        if (guiWindow && !guiWindow.isDestroyed()) {
+            guiWindow.webContents.send('powershell-clear');
+        }
+    }
+    replayBuffer = '';
+    notifyMirrors('onClear');
+
+    let shell = 'bash';
+    let args = [];
+
+    if (os.platform() === 'win32') {
+        // 优先使用 PowerShell Core (pwsh.exe)，如果不存在则回退到 Windows PowerShell (powershell.exe)
+        // 检测顺序：Program Files 标准路径 → where.exe PATH 查找 → 回退 powershell.exe
+        const pwshPath = path.join(process.env.PROGRAMFILES, 'PowerShell', '7', 'pwsh.exe');
+        if (fs.existsSync(pwshPath)) {
+            shell = pwshPath;
+        } else {
+            // 二级回退：winget/MSIX 安装的 PS7 位于 WindowsApps（AppExecution Alias），
+            // fs.existsSync 对此类特殊文件不可靠，直接信任 where.exe 结果。
+            try {
+                const { execSync } = require('child_process');
+                const whereResult = execSync('where.exe pwsh', { windowsHide: true, encoding: 'utf8', timeout: 5000 }).trim();
+                const firstLine = whereResult.split(/\r?\n/)[0].trim();
+                if (firstLine) {
+                    shell = firstLine;
+                } else {
+                    shell = 'powershell.exe';
+                }
+            } catch (e) {
+                shell = 'powershell.exe';
+            }
+        }
+        args = ['-NoLogo'];
+    }
+
+    ptyProcess = loadPty().spawn(shell, args, {
+        name: 'xterm-color',
+        cols: lastKnownSize.cols,
+        rows: lastKnownSize.rows,
+        cwd: process.env.USERPROFILE || process.env.HOME,
+        env: {
+            ...process.env,
+            PAGER: 'cat',
+            GIT_PAGER: 'cat',
+            GIT_TERMINAL_PROMPT: '0',
+            GH_PAGER: '',
+            SYSTEMD_PAGER: 'cat',
+            AWS_PAGER: '',
+            MANPAGER: 'cat'
+        }
+    });
+    childProcesses.add(ptyProcess);
+    const currentPtyProcess = ptyProcess;
+
+    // 创建GUI数据监听器（带 AI 短命令执行状态检查）
+    guiDataListener = (data) => {
+        // AI 短命令期间由 executeSingleCommandInPty 的临时监听器负责 flushToGui，避免重复输出。
+        // 交互式 TUI 模式绝不能设置 isExecutingCommand，否则 GUI 会黑屏。
+        if (isExecutingCommand) {
+            return;
+        }
+
+        dispatchPtyData(data);
+    };
+
+    // 设置数据监听器，将所有 pty 输出直接代理到 GUI
+    currentPtyProcess.onData(guiDataListener);
+
+    // 不再用固定延时猜测 PowerShell 是否启动完成。随机边界不会以明文出现在
+    // PSReadLine 的输入回显中；只有 PowerShell 真正执行 Write-Host 后才会命中。
+    const readyBoundary = `__VCP_PTY_READY_${crypto.randomUUID()}__`;
+    const encodedReadyBoundary = Buffer.from(readyBoundary, 'utf8').toString('base64');
+    mirrorStartupPending = true;
+    mirrorStartupHeld = '';
+    ptyReadyPromise = new Promise((resolve, reject) => {
+        let startupOutput = '';
+        let settled = false;
+        let timeoutId = null;
+        let readyListener = null;
+
+        const cleanupReadyProbe = () => {
+            if (timeoutId) {
+                clearTimeout(timeoutId);
+                timeoutId = null;
+            }
+            if (readyListener && typeof readyListener.dispose === 'function') {
+                readyListener.dispose();
+                readyListener = null;
+            }
+        };
+
+        readyListener = currentPtyProcess.onData((data) => {
+            if (settled) {
+                return;
+            }
+
+            startupOutput += data.toString('utf8');
+            // 防止异常启动输出无限占用内存，同时保留足够长度处理跨 chunk 边界。
+            if (startupOutput.length > 65536) {
+                startupOutput = startupOutput.slice(-65536);
+            }
+
+            const boundaryIndex = startupOutput.indexOf(readyBoundary);
+            if (boundaryIndex !== -1) {
+                settled = true;
+                cleanupReadyProbe();
+                if (ptyProcess === currentPtyProcess) {
+                    releaseMirrorStartup(startupOutput.slice(boundaryIndex + readyBoundary.length).replace(/^\r?\n/, ''));
+                }
+                resolve();
+            }
+        });
+
+        timeoutId = setTimeout(() => {
+            if (settled) {
+                return;
+            }
+            settled = true;
+            cleanupReadyProbe();
+            if (ptyProcess === currentPtyProcess) releaseMirrorStartup();
+            reject(new Error('PowerShell did not complete its startup readiness probe within 15 seconds.'));
+        }, 15000);
+
+        // macOS / Linux 起的是 bash：PowerShell 的初始化写进去只会报语法错误，边界永远等不到，
+        // 前 15 秒侧栏一片空白。环境变量 spawn 时已经给了，这里只打印边界：两段引号拼起来，
+        // 回显的命令行里是 '…''…'，不会提前命中
+        if (os.platform() !== 'win32') {
+            const split = Math.floor(readyBoundary.length / 2);
+            currentPtyProcess.write(`printf '%s\\n' '${readyBoundary.slice(0, split)}''${readyBoundary.slice(split)}'; clear\r`);
+            return;
+        }
+        const initializationCommand = [
+            '[Console]::OutputEncoding = [System.Text.Encoding]::UTF8',
+            '$env:PAGER = "cat"',
+            '$env:GIT_PAGER = "cat"',
+            '$env:GIT_TERMINAL_PROMPT = "0"',
+            '$env:GH_PAGER = ""',
+            '$env:SYSTEMD_PAGER = "cat"',
+            '$env:AWS_PAGER = ""',
+            '$env:MANPAGER = "cat"',
+            'function global:more { param([string[]]$paths) if ($paths) { foreach ($file in $paths) { Get-Content $file } } else { $input } }',
+            'function global:help { Get-Help @args }',
+            `$__vcpReady = [System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String('${encodedReadyBoundary}'))`,
+            'Write-Host $__vcpReady',
+            // 清掉握手留下的几行：侧栏只从就绪标记之后开始显示，ConPTY 的光标也得回到左上角，
+            // 否则 PSReadLine 按绝对坐标重绘时会和侧栏错开几行
+            'Clear-Host'
+        ].join('; ');
+        currentPtyProcess.write(`${initializationCommand}\r`);
+    });
+    // 只有 AI 命令会等它；没人等的时候超时也不能变成未处理的 rejection
+    ptyReadyPromise.catch(() => {});
+
+    // 当 pty 进程意外退出时，清理资源。
+    // 注意：newSession 会先 kill 旧 PTY 再创建新 PTY，旧 PTY 的异步 onExit 不能误清理新会话。
+    currentPtyProcess.onExit((exitInfo) => {
+        childProcesses.delete(currentPtyProcess);
+        // 自行结束的 shell 仍占着 ConPTY 的管道句柄，显式 kill 才会释放
+        try {
+            currentPtyProcess.kill();
+        } catch (e) {
+            // 进程已经退出
+        }
+
+        if (ptyProcess !== currentPtyProcess) {
+            return;
+        }
+
+        ptyProcess = null;
+        guiDataListener = null;
+        isExecutingCommand = false;
+        interactiveMode = false;
+        activeCommandAbort = null;
+        notifyMirrors('onExit', exitInfo && exitInfo.exitCode);
+    });
+}
+
+function buildHumanLaunchAnimationCommand() {
+    const script = [
+        '$esc = [char]27',
+        '# 尝试擦掉用于触发动画的短命令输入行，避免启动动画前出现杂乱命令文本。',
+        'Write-Host -NoNewline "$esc[1A$esc[2K`r"',
+        '',
+        '# 霓虹渐变色定义',
+        '$c1 = "$esc[38;2;245;194;231m" # Pink',
+        '$c2 = "$esc[38;2;203;166;247m" # Mauve',
+        '$c3 = "$esc[38;2;137;180;250m" # Blue',
+        '$c4 = "$esc[38;2;116;199;236m" # Sapphire',
+        '$c5 = "$esc[38;2;137;220;235m" # Sky',
+        '$c6 = "$esc[38;2;148;226;213m" # Teal',
+        '$reset = "$esc[0m"',
+        '$gray = "$esc[38;2;147;153;178m"',
+        '$darkGray = "$esc[38;2;88;91;112m"',
+        '$green = "$esc[38;2;166;227;161m"',
+        '$yellow = "$esc[38;2;249;226;175m"',
+        '',
+        '# 逐行打印华丽的 VCP CLI ASCII Art',
+        'Write-Host ""',
+        'Write-Host "  ${c1}██╗   ██╗  ██████╗  ██████╗      ██████╗  ██╗      ██╗${reset}"',
+        'Start-Sleep -Milliseconds 40',
+        'Write-Host "  ${c2}██║   ██║ ██╔════╝  ██╔══██╗    ██╔════╝  ██║      ██║${reset}"',
+        'Start-Sleep -Milliseconds 40',
+        'Write-Host "  ${c3}██║   ██║ ██║       ██████╔╝    ██║       ██║      ██║${reset}"',
+        'Start-Sleep -Milliseconds 40',
+        'Write-Host "  ${c4}╚██╗ ██╔╝ ██║       ██╔═══╝     ██║       ██║      ██║${reset}"',
+        'Start-Sleep -Milliseconds 40',
+        'Write-Host "  ${c5} ╚████╔╝  ╚██████╗  ██║         ╚██████╗  ███████╗ ██║${reset}"',
+        'Start-Sleep -Milliseconds 40',
+        'Write-Host "  ${c6}  ╚═══╝    ╚═════╝  ╚═╝          ╚═════╝  ╚══════╝ ╚═╝${reset}"',
+        'Start-Sleep -Milliseconds 50',
+        '',
+        '# 打印副标题和分割线',
+        'Write-Host "  ${darkGray}──────────────────────────────────────────────────────────${reset}"',
+        'Write-Host "  ${gray}Distributed PowerShell Bridge & Interactive Terminal GUI${reset}"',
+        'Write-Host "  ${darkGray}──────────────────────────────────────────────────────────${reset}"',
+        'Write-Host ""',
+        '',
+        '# 华丽的渐变色进度条加载动画',
+        '$barWidth = 30',
+        'for ($i = 0; $i -le $barWidth; $i++) {',
+        '    $percent = [math]::Round(($i / $barWidth) * 100)',
+        '    $filledCount = $i',
+        '    $emptyCount = $barWidth - $i',
+        '    ',
+        '    # 动态计算渐变色 (从 Mauve 203,166,247 渐变到 Teal 148,226,213)',
+        '    $r = [int](203 - (203 - 148) * ($i / $barWidth))',
+        '    $g = [int](166 + (226 - 166) * ($i / $barWidth))',
+        '    $b = [int](247 - (247 - 213) * ($i / $barWidth))',
+        '    $color = "$esc[38;2;${r};${g};${b}m"',
+        '    ',
+        '    $filled = "▰" * $filledCount',
+        '    $empty = "▱" * $emptyCount',
+        '    ',
+        '    Write-Host -NoNewline "$esc[2K`r  ${gray}Loading Bridge:${reset} [${color}${filled}${darkGray}${empty}${reset}] ${color}${percent}%${reset}"',
+        '    Start-Sleep -Milliseconds 35',
+        '}',
+        'Write-Host ""',
+        'Write-Host ""',
+        '',
+        '# 打印系统就绪状态和极客风系统信息',
+        'Write-Host "  ${gray}Status:${reset}    ${green}ONLINE${reset}"',
+        'Write-Host "  ${gray}Session:${reset}   ${c3}Active PowerShell Bridge${reset}"',
+        'Write-Host "  ${gray}Terminal:${reset}  ${yellow}Interactive Console Ready${reset}"',
+        'Write-Host ""',
+        'Write-Host "  ${gray}Type commands below. Press ${c3}Ctrl+C${gray} to interrupt.${reset}"',
+        'Write-Host ""',
+        'Remove-Item -LiteralPath $PSCommandPath -Force -ErrorAction SilentlyContinue',
+    ].join('\n');
+
+    const tempScriptName = `vcp-cli-launch-${crypto.randomUUID()}.ps1`;
+    const tempScriptPath = path.join(os.tmpdir(), tempScriptName);
+    fs.writeFileSync(tempScriptPath, `\ufeff${script}`, 'utf8');
+
+    const escapedTempScriptPath = tempScriptPath.replace(/'/g, "''");
+    return `& '${escapedTempScriptPath}'\r`;
+}
+
+/**
+ * 打开或聚焦 PowerShellExecutor 的交互式终端 GUI。
+ * 该入口供主程序托盘 / 桌面应用启动器直接调用，不需要先通过 AI 工具执行命令。
+ * @returns {BrowserWindow} PowerShell 终端窗口实例。
+ */
+function openGuiTerminal() {
+    ensureGuiWindow();
+
+    const shouldPlayHumanLaunchAnimation = !ptyProcess;
+    if (!ptyProcess) {
+        createNewPtySession();
+    }
+
+    if (shouldPlayHumanLaunchAnimation && ptyProcess) {
+        const targetPtyProcess = ptyProcess;
+        waitForTerminalReady()
+            .then(() => {
+                if (ptyProcess === targetPtyProcess) {
+                    targetPtyProcess.write(buildHumanLaunchAnimationCommand());
+                }
+            })
+            .catch((error) => {
+                console.error('[PowerShellExecutor] Failed to initialize terminal launch animation:', error);
+            });
+    }
+
+    return guiWindow;
+}
+
+/**
+ * 插件的主入口点，由 PluginManager 直接调用。
+ * @param {object} args - 从 AI 工具调用中解析出的参数。
+ * @returns {Promise<string>} - 命令执行的结果。
+ */
+/**
+ * 在给定的 pty 会话中执行单条命令并返回其增量输出。
+ * @param {object} ptyProcess - node-pty 实例。
+ * @param {string} singleCommand - 要执行的单条命令。
+ * @returns {Promise<string>} - 该命令的增量输出。
+ */
+function executeSingleCommandInPty(ptyProcess, singleCommand) {
+    return new Promise((resolve, reject) => {
+        if (!ptyProcess) {
+            return reject(new Error("PTY process is not available."));
+        }
+
+        let rawOutput = '';
+        let rawOutputTruncated = false;
+        let settled = false;
+        let tempScriptPath = null;
+        let wrapperScriptPath = null;
+        let listenerDisposable = null;
+        let timeoutId = null;
+
+        const run = beginCommandRun(singleCommand);
+        const startBoundary = `__VCP_COMMAND_START_${crypto.randomUUID()}__`;
+        const endBoundary = `__VCP_COMMAND_END_${crypto.randomUUID()}__`;
+        const outputParser = new CommandOutputParser(startBoundary, endBoundary);
+
+        const abortThisCommand = () => {
+            if (settled) {
+                return false;
+            }
+
+            settled = true;
+            finishCommandRun(run, 'cancelled');
+            // ETX 等价于用户在真实终端按下 Ctrl+C，用于中断当前前台命令。
+            ptyProcess.write('\x03');
+            cleanupListener(listenerDisposable, timeoutId);
+            reject(new Error('命令已被 interrupt 动作中止。'));
+            return true;
+        };
+
+        const cleanupListener = (disposable, commandTimeoutId) => {
+            if (commandTimeoutId) {
+                clearTimeout(commandTimeoutId);
+            }
+            if (disposable && typeof disposable.dispose === 'function') {
+                disposable.dispose();
+            }
+            if (activeCommandAbort === abortThisCommand) {
+                activeCommandAbort = null;
+            }
+            for (const scriptPath of [tempScriptPath, wrapperScriptPath]) {
+                if (!scriptPath) continue;
+                try {
+                    fs.unlinkSync(scriptPath);
+                } catch (e) {
+                    console.warn('[PowerShellExecutor] Failed to remove temporary script:', e.message);
+                }
+            }
+            tempScriptPath = null;
+            wrapperScriptPath = null;
+        };
+
+        const flushToGui = (text) => {
+            if (text) {
+                dispatchPtyData(text);
+            }
+        };
+
+        listenerDisposable = ptyProcess.onData((data) => {
+            if (settled) {
+                return;
+            }
+
+            const result = outputParser.push(data.toString('utf-8'));
+            rawOutputTruncated ||= rawOutput.length + result.output.length > COMMAND_RUN_RAW_LIMIT;
+            rawOutput = (rawOutput + result.output).slice(-COMMAND_RUN_RAW_LIMIT);
+            appendCommandRunOutput(run, result.output);
+
+            if (result.done) {
+                settled = true;
+                finishCommandRun(run, 'completed');
+                cleanupListener(listenerDisposable, timeoutId);
+                resolve((rawOutputTruncated ? '[输出超过容量限制，仅保留末尾内容]\n' : '') + sanitizeTerminalOutput(rawOutput).trim());
+            }
+
+            // GUI 是投影，不是完成裁决者；保留同块中的结束后提示符。
+            flushToGui(result.output + result.trailing);
+        });
+
+        timeoutId = setTimeout(() => {
+            if (settled) {
+                return;
+            }
+            settled = true;
+            finishCommandRun(run, 'timed_out');
+            cleanupListener(listenerDisposable, timeoutId);
+            reject(new Error(`Command "${singleCommand}" timed out after 60 seconds.`));
+        }, 60000);
+
+        activeCommandAbort = abortThisCommand;
+
+        try {
+            const tempScriptName = `vcp-powershell-${crypto.randomUUID()}.ps1`;
+            tempScriptPath = path.join(os.tmpdir(), tempScriptName);
+            // Windows PowerShell 5.1 对无 BOM UTF-8 的中文兼容性较差，写入 BOM 保证脚本内容稳定解析。
+            fs.writeFileSync(tempScriptPath, `\ufeff${singleCommand}`, 'utf8');
+
+            const escapedTempScriptPath = tempScriptPath.replace(/'/g, "''");
+
+            // 边界标记只写进包装脚本，不出现在交互式命令行里：
+            // PowerShell/PSReadLine 会先回显整行输入，若标记出现在回显里，就会被误判为真实输出。
+            // 终端里也只留下一行短的脚本调用，而不是整段包装代码。
+            const wrapperScript = [
+                // 关掉分页器和 Git 交互提示，否则 git log/help 等会停在分页界面，命令一直等不到结束标记。
+                `$env:PAGER = 'cat'`,
+                `$env:GIT_PAGER = 'cat'`,
+                `$env:GIT_TERMINAL_PROMPT = '0'`,
+                `Write-Host '${startBoundary}'`,
+                // 即使临时脚本发生 ParserError / RuntimeException，也必须输出 end boundary，
+                // 否则 AI 调用会一直等待直到超时。终止性错误要在结束标记之前打印，
+                // 否则 PowerShell 会在命令行结束后才显示它，AI 拿到的输出就是空的。
+                `try { & '${escapedTempScriptPath}' } catch { $_ | Out-Host } finally { Write-Host '${endBoundary}' }`
+            ].join('\r\n');
+            wrapperScriptPath = path.join(os.tmpdir(), `vcp-run-${crypto.randomUUID()}.ps1`);
+            fs.writeFileSync(wrapperScriptPath, `\ufeff${wrapperScript}`, 'utf8');
+            const wrappedCommand = `& '${wrapperScriptPath.replace(/'/g, "''")}'`;
+
+            ptyProcess.write(`${wrappedCommand}\r`);
+        } catch (error) {
+            settled = true;
+            finishCommandRun(run, 'spawn_error');
+            cleanupListener(listenerDisposable, timeoutId);
+            reject(new Error(`无法创建或执行临时 PowerShell 脚本: ${error.message}`));
+        }
+    });
+}
+
+
+const INTERACTIVE_SEQUENCE_LIMITS = Object.freeze({
+    maxSteps: 100,
+    maxWaitMs: 60000,
+    maxTotalWaitMs: 300000,
+    maxTextLength: 100000,
+    maxQueryLines: 2000,
+    responseTimeoutMs: 5000
+});
+
+const TERMINAL_KEY_SEQUENCES = Object.freeze({
+    enter: '\r',
+    return: '\r',
+    up: '\x1b[A',
+    arrowup: '\x1b[A',
+    down: '\x1b[B',
+    arrowdown: '\x1b[B',
+    right: '\x1b[C',
+    arrowright: '\x1b[C',
+    left: '\x1b[D',
+    arrowleft: '\x1b[D',
+    esc: '\x1b',
+    escape: '\x1b',
+    tab: '\t',
+    backtab: '\x1b[Z',
+    'shift+tab': '\x1b[Z',
+    backspace: '\x7f',
+    delete: '\x1b[3~',
+    home: '\x1b[H',
+    end: '\x1b[F',
+    pageup: '\x1b[5~',
+    pagedown: '\x1b[6~',
+    space: ' ',
+    'ctrl+c': '\x03',
+    'ctrl+d': '\x04',
+    'ctrl+z': '\x1a',
+    'ctrl+l': '\x0c',
+    'ctrl+a': '\x01',
+    'ctrl+e': '\x05',
+    'ctrl+u': '\x15',
+    'ctrl+k': '\x0b',
+    'ctrl+w': '\x17'
+});
+
+function delay(ms) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+}
+
+function parseWaitDuration(value) {
+    if (typeof value === 'number' && Number.isFinite(value)) {
+        return Math.round(value);
+    }
+
+    const match = String(value).trim().toLowerCase().match(/^(\d+(?:\.\d+)?)\s*(ms|s)?$/);
+    if (!match) {
+        throw new Error(`无效 wait 时长 "${value}"；请使用 50ms、1s 或毫秒数字。`);
+    }
+
+    const milliseconds = Number(match[1]) * (match[2] === 's' ? 1000 : 1);
+    return Math.round(milliseconds);
+}
+
+function parseTerminalKey(value) {
+    const raw = String(value).trim().toLowerCase();
+    const match = raw.match(/^(.+?)(?:\s*\*\s*(\d+))?$/);
+    const keyName = match ? match[1].trim() : raw;
+    const repeat = match && match[2] ? Number.parseInt(match[2], 10) : 1;
+    const sequence = TERMINAL_KEY_SEQUENCES[keyName];
+
+    if (!sequence) {
+        throw new Error(`不支持的终端按键 "${value}"。`);
+    }
+    if (!Number.isInteger(repeat) || repeat < 1 || repeat > 10) {
+        throw new Error(`按键重复次数必须在 1 到 10 之间："${value}"。`);
+    }
+
+    return { keyName, repeat, data: sequence.repeat(repeat) };
+}
+
+function parseInteractiveSequence(args) {
+    const steps = [];
+
+    for (const [key, value] of Object.entries(args)) {
+        const match = key.match(/^(command|wait|key|paste|queryVisible)(\d+)$/i);
+        if (!match) {
+            continue;
+        }
+
+        const typeLookup = {
+            command: 'command',
+            wait: 'wait',
+            key: 'key',
+            paste: 'paste',
+            queryvisible: 'queryVisible'
+        };
+        steps.push({
+            key,
+            type: typeLookup[match[1].toLowerCase()],
+            index: Number.parseInt(match[2], 10),
+            value
+        });
+    }
+
+    if (steps.length === 0) {
+        throw new Error('RunInteractiveSequence 至少需要一个带全局序号的步骤，例如 command1、wait2、key3、paste4、queryVisible5。');
+    }
+    if (steps.length > INTERACTIVE_SEQUENCE_LIMITS.maxSteps) {
+        throw new Error(`交互序列最多允许 ${INTERACTIVE_SEQUENCE_LIMITS.maxSteps} 个步骤。`);
+    }
+
+    steps.sort((a, b) => a.index - b.index);
+    const usedIndexes = new Set();
+    let totalWaitMs = 0;
+
+    for (const step of steps) {
+        if (!Number.isInteger(step.index) || step.index < 1) {
+            throw new Error(`步骤编号必须是从 1 开始的正整数：${step.key}。`);
+        }
+        if (usedIndexes.has(step.index)) {
+            throw new Error(`步骤编号 ${step.index} 重复；不同类型步骤必须共用唯一的全局序号。`);
+        }
+        usedIndexes.add(step.index);
+
+        if (step.type === 'wait') {
+            step.durationMs = parseWaitDuration(step.value);
+            if (step.durationMs < 0 || step.durationMs > INTERACTIVE_SEQUENCE_LIMITS.maxWaitMs) {
+                throw new Error(`单个 wait 步骤必须在 0 到 ${INTERACTIVE_SEQUENCE_LIMITS.maxWaitMs}ms 之间。`);
+            }
+            totalWaitMs += step.durationMs;
+        } else if (step.type === 'key') {
+            step.keySpec = parseTerminalKey(step.value);
+        } else if (step.type === 'queryVisible') {
+            const parsedLines = Number.parseInt(step.value, 10);
+            step.maxLines = Number.isInteger(parsedLines) && parsedLines > 0
+                ? Math.min(parsedLines, INTERACTIVE_SEQUENCE_LIMITS.maxQueryLines)
+                : null;
+        } else {
+            if (typeof step.value !== 'string' || !step.value.length) {
+                throw new Error(`${step.key} 必须是非空字符串。`);
+            }
+            if (step.value.length > INTERACTIVE_SEQUENCE_LIMITS.maxTextLength) {
+                throw new Error(`${step.key} 超过 ${INTERACTIVE_SEQUENCE_LIMITS.maxTextLength} 字符限制。`);
+            }
+        }
+    }
+
+    if (totalWaitMs > INTERACTIVE_SEQUENCE_LIMITS.maxTotalWaitMs) {
+        throw new Error(`序列累计等待不能超过 ${INTERACTIVE_SEQUENCE_LIMITS.maxTotalWaitMs}ms。`);
+    }
+    if (steps.every(step => step.type === 'wait')) {
+        throw new Error('交互序列不能只包含 wait；请至少加入 command、key、paste 或 queryVisible 步骤。');
+    }
+
+    return steps;
+}
+
+function requestVisibleText(maxLines = null) {
+    return new Promise((resolve, reject) => {
+        if (!guiWindow || guiWindow.isDestroyed() || !guiReady) {
+            reject(new Error('PowerShell GUI 尚未就绪，无法查询可见文本。'));
+            return;
+        }
+
+        const requestId = crypto.randomUUID();
+        const timeout = setTimeout(() => {
+            visibleTextResolvers.delete(requestId);
+            reject(new Error('查询终端文本超时'));
+        }, INTERACTIVE_SEQUENCE_LIMITS.responseTimeoutMs);
+
+        visibleTextResolvers.set(requestId, (text) => {
+            clearTimeout(timeout);
+            resolve(text);
+        });
+        guiWindow.webContents.send('query-visible-text', { requestId, maxLines });
+    });
+}
+
+function requestTerminalPaste(text) {
+    return new Promise((resolve, reject) => {
+        if (!guiWindow || guiWindow.isDestroyed() || !guiReady) {
+            reject(new Error('PowerShell GUI 尚未就绪，无法执行 xterm 粘贴。'));
+            return;
+        }
+
+        const requestId = crypto.randomUUID();
+        const timeout = setTimeout(() => {
+            terminalPasteResolvers.delete(requestId);
+            reject(new Error('xterm 粘贴请求超时'));
+        }, INTERACTIVE_SEQUENCE_LIMITS.responseTimeoutMs);
+
+        terminalPasteResolvers.set(requestId, () => {
+            clearTimeout(timeout);
+            resolve();
+        });
+        guiWindow.webContents.send('terminal-paste-request', { requestId, text });
+    });
+}
+
+async function ensureInteractiveTerminal(newSession = false) {
+    ensureGuiWindow();
+    if (newSession === true || !ptyProcess) {
+        createNewPtySession();
+    }
+    await waitForTerminalReady();
+    interactiveMode = true;
+    return ptyProcess;
+}
+
+async function sendSingleInteractiveKey(args) {
+    if (typeof args.key !== 'string' || !args.key.trim()) {
+        throw new Error('SendInteractiveKey 需要 key 参数，例如 enter、up、esc 或 ctrl+c*2。');
+    }
+
+    const keySpec = parseTerminalKey(args.key);
+    const targetPtyProcess = await ensureInteractiveTerminal(args.newSession === true);
+    targetPtyProcess.write(keySpec.data);
+
+    return {
+        content: [{
+            type: 'text',
+            text: `Interactive key sent: ${keySpec.keyName}${keySpec.repeat > 1 ? ` x${keySpec.repeat}` : ''}.`
+        }]
+    };
+}
+
+async function pasteSingleInteractiveText(args) {
+    if (typeof args.text !== 'string' || !args.text.length) {
+        throw new Error('PasteInteractiveText 需要非空 text 参数。');
+    }
+    if (args.text.length > INTERACTIVE_SEQUENCE_LIMITS.maxTextLength) {
+        throw new Error(`text 超过 ${INTERACTIVE_SEQUENCE_LIMITS.maxTextLength} 字符限制。`);
+    }
+
+    await ensureInteractiveTerminal(args.newSession === true);
+    await requestTerminalPaste(args.text);
+
+    if (args.submit === true) {
+        if (!ptyProcess) {
+            throw new Error('粘贴完成后 PTY 会话已退出，无法发送 Enter。');
+        }
+        ptyProcess.write('\r');
+    }
+
+    return {
+        content: [{
+            type: 'text',
+            text: `Interactive text pasted (${args.text.length} characters)${args.submit === true ? ' and Enter was sent' : ''}.`
+        }]
+    };
+}
+
+async function runInteractiveSequence(args) {
+    const steps = parseInteractiveSequence(args);
+
+    for (const step of steps.filter(item => item.type === 'command')) {
+        const securityResult = intelligentSecurityCheck(
+            step.value,
+            defaultConfig.forbiddenCommands,
+            defaultConfig.authRequiredCommands
+        );
+        if (securityResult.isForbidden) {
+            throw new Error(`步骤 ${step.index} 执行被阻止：${securityResult.reason}`);
+        }
+        if (securityResult.needsAuth) {
+            throw new Error(`步骤 ${step.index} 需要授权，RunInteractiveSequence 不支持在 TUI 序列中弹出授权确认：${securityResult.reason}`);
+        }
+    }
+
+    const targetPtyProcess = await ensureInteractiveTerminal(args.newSession === true);
+    const queryResults = [];
+
+    for (const step of steps) {
+        if (!ptyProcess || ptyProcess !== targetPtyProcess) {
+            throw new Error(`执行到步骤 ${step.index} 时 PTY 会话已退出或被替换。`);
+        }
+
+        switch (step.type) {
+            case 'command':
+                targetPtyProcess.write(`${step.value}\r`);
+                break;
+            case 'wait':
+                await delay(step.durationMs);
+                break;
+            case 'key':
+                targetPtyProcess.write(step.keySpec.data);
+                break;
+            case 'paste':
+                await requestTerminalPaste(step.value);
+                break;
+            case 'queryVisible': {
+                const text = await requestVisibleText(step.maxLines);
+                queryResults.push({ index: step.index, maxLines: step.maxLines, text });
+                break;
+            }
+            default:
+                throw new Error(`未知交互步骤类型：${step.type}`);
+        }
+    }
+
+    if (queryResults.length === 0) {
+        return {
+            content: [{
+                type: 'text',
+                text: `Interactive sequence completed (${steps.length} steps). No queryVisible step was requested.`
+            }]
+        };
+    }
+
+    const output = queryResults.map(result => {
+        const lineLabel = result.maxLines ? `, max ${result.maxLines} lines` : '';
+        return `---[queryVisible step ${result.index}${lineLabel}]---\n${result.text}`;
+    }).join('\n\n');
+
+    return { content: [{ type: 'text', text: `\`\`\`\n${output}\n\`\`\`` }] };
+}
+
+async function processToolCall(args) {
+    const declaredCommands = new Set([
+        'ExecutePowerShell',
+        'StartInteractive',
+        'SendInteractiveKey',
+        'PasteInteractiveText',
+        'RunInteractiveSequence',
+        'QueryVisible',
+        'InterruptPowerShell',
+        'EndInteractive'
+    ]);
+    const declaredCommand = typeof args.command === 'string' && declaredCommands.has(args.command.trim())
+        ? args.command.trim()
+        : null;
+
+    // 新清单格式使用 command 选择能力、powershell 传递脚本文本。
+    // 同时保留旧 action + command 调用格式，避免已有提示词和调用方立即失效。
+    const actionByDeclaredCommand = {
+        ExecutePowerShell: 'execute',
+        StartInteractive: 'startInteractive',
+        SendInteractiveKey: 'interactiveKey',
+        PasteInteractiveText: 'interactivePaste',
+        RunInteractiveSequence: 'interactiveSequence',
+        QueryVisible: 'queryVisible',
+        InterruptPowerShell: 'interrupt',
+        EndInteractive: 'endInteractive'
+    };
+    const action = declaredCommand
+        ? actionByDeclaredCommand[declaredCommand]
+        : (typeof args.action === 'string' ? args.action.trim() : 'execute');
+
+    if (action === 'interactiveKey') {
+        return sendSingleInteractiveKey(args);
+    }
+
+    if (action === 'interactivePaste') {
+        return pasteSingleInteractiveText(args);
+    }
+
+    if (action === 'interactiveSequence') {
+        return runInteractiveSequence(args);
+    }
+
+    if (action.startsWith('queryVisible')) {
+        ensureGuiWindow();
+        await waitForGuiReady();
+
+        const legacyMatch = action.match(/^queryVisible(\d+)?$/);
+        const requestedMaxLines = declaredCommand === 'QueryVisible' ? args.maxLines : (legacyMatch && legacyMatch[1]);
+        const parsedMaxLines = requestedMaxLines === undefined || requestedMaxLines === null || requestedMaxLines === ''
+            ? null
+            : Number.parseInt(requestedMaxLines, 10);
+        const maxLines = Number.isInteger(parsedMaxLines) && parsedMaxLines > 0
+            ? Math.min(parsedMaxLines, INTERACTIVE_SEQUENCE_LIMITS.maxQueryLines)
+            : null;
+        const text = await requestVisibleText(maxLines);
+        return { content: [{ type: 'text', text: `\`\`\`\n${text}\n\`\`\`` }] };
+    }
+
+    if (action === 'endInteractive') {
+        interactiveMode = false;
+        return { content: [{ type: 'text', text: 'Interactive mode flag cleared. The existing PTY session was not terminated.' }] };
+    }
+
+    if (action === 'interrupt') {
+        if (!ptyProcess) {
+            return { content: [{ type: 'text', text: 'No active PowerShell session to interrupt.' }] };
+        }
+
+        if (activeCommandAbort) {
+            const interrupted = activeCommandAbort();
+            return { content: [{ type: 'text', text: interrupted
+                ? 'Interrupt signal sent. The active synchronous command wait was cancelled.'
+                : 'The synchronous command had already completed before it could be interrupted.' }] };
+        }
+
+        if (interactiveMode) {
+            ptyProcess.write('\x03');
+            return { content: [{ type: 'text', text: 'Ctrl+C was sent to the interactive foreground program. The interactive mode flag remains set.' }] };
+        }
+
+        return { content: [{ type: 'text', text: 'The PowerShell session is active, but no AI-started foreground command is currently running.' }] };
+    }
+
+    // --- 1. 解析和排序 PowerShell 脚本 ---
+    // 新格式：powershell, powershell1, powershell2...
+    // 旧格式：command, command1, command2...
+    const scriptParameterPrefix = declaredCommand ? 'powershell' : 'command';
+    const commandEntries = Object.entries(args)
+        .filter(([key]) => key.startsWith(scriptParameterPrefix))
+        .map(([key, value]) => {
+            const match = key.match(new RegExp(`^${scriptParameterPrefix}(\\d*)$`));
+            const index = match ? (match[1] === '' ? 0 : parseInt(match[1], 10)) : -1;
+            return { key, value, index };
+        })
+        .filter(item => item.index !== -1 && typeof item.value === 'string' && item.value.trim())
+        .sort((a, b) => a.index - b.index);
+
+    // 新格式中的 args.command 是能力选择器，绝不能作为待执行脚本。
+    if (declaredCommand) {
+        commandEntries.forEach(entry => {
+            entry.value = entry.value.trim();
+        });
+    }
+
+    if (commandEntries.length === 0) {
+        throw new Error(declaredCommand
+            ? '未提供任何有效的 powershell 参数 (例如 powershell, powershell1, powershell2)。'
+            : '未提供任何有效的 command 参数 (例如 command, command1, command2)。');
+    }
+
+    if (action !== 'execute' && action !== 'startInteractive') {
+        throw new Error(`不支持的 action: ${action}`);
+    }
+
+    // --- 2. 智能安全预检查 ---
+    let needsInteractiveAuth = false;
+    for (const entry of commandEntries) {
+        const securityResult = intelligentSecurityCheck(
+            entry.value,
+            defaultConfig.forbiddenCommands,
+            defaultConfig.authRequiredCommands
+        );
+
+        if (securityResult.isForbidden) {
+            throw new Error(`执行被阻止：${securityResult.reason}`);
+        }
+
+        if (securityResult.needsAuth) {
+            needsInteractiveAuth = true;
+            console.log(`[PowerShellExecutor] 命令 "${entry.value}" 需要交互式授权：${securityResult.reason}`);
+        }
+    }
+
+    // --- 3. 初始化会话和参数 ---
+    const lastCommandIndex = commandEntries[commandEntries.length - 1].index;
+    const getArg = (key, defaultVal) => {
+        const indexedKey = `${key}${lastCommandIndex || ''}`;
+        return args[indexedKey] !== undefined ? args[indexedKey] : (args[key] !== undefined ? args[key] : defaultVal);
+    };
+
+    const requireAdmin = getArg('requireAdmin', false);
+    const newSession = getArg('newSession', false);
+    const finalReturnMode = getArg('returnMode', defaultConfig.returnMode);
+
+    // --- 4. 根据模式选择执行路径 ---
+
+    // 路径 A: 管理员模式 (最高优先级)
+    if (requireAdmin) {
+        if (commandEntries.length > 1) {
+            throw new Error("管理员模式 (requireAdmin: true) 不支持执行多个命令链。");
+        }
+        if (ptyProcess) {
+            ptyProcess.kill();
+            ptyProcess = null;
+        }
+        const command = commandEntries[0].value;
+        const fullCommand = `[Console]::OutputEncoding = [System.Text.Encoding]::UTF8; $env:PAGER = 'cat'; $env:GIT_PAGER = 'cat'; $env:GIT_TERMINAL_PROMPT = '0'; function global:more { param([string[]]$paths) if ($paths) { foreach ($file in $paths) { Get-Content $file } } else { $input } }; function global:help { Get-Help @args }; ${command}`;
+        const output = await executeAdminCommand(fullCommand);
+        if (output && typeof output === 'object' && Array.isArray(output.content)) {
+            return output;
+        }
+        const cleanOutput = (typeof output === 'string' ? output : String(output || '')).replace(/\r\n/g, '\n').replace(/\r/g, '');
+        return { content: [{ type: 'text', text: `\`\`\`powershell\n${cleanOutput}\n\`\`\`` }] };
+    }
+
+    // 路径 B: 普通敏感命令确认模式
+    // 这里只做确认；确认通过后继续走路径 C，在主 PTY/xterm 会话中执行并连续显示输出。
+    if (needsInteractiveAuth) {
+        const combinedCommand = commandEntries.map(e => e.value).join('; ');
+        const confirmed = await requestInteractiveConfirmation(combinedCommand);
+        if (!confirmed) {
+            return { content: [{ type: 'text', text: '用户取消了操作。' }] };
+        }
+    }
+
+    // 路径 C: 标准非管理员会话执行
+    if (isExecutingCommand) {
+        throw new Error('当前已有同步命令执行中，请等待完成或使用 interrupt。');
+    }
+    ensureGuiWindow();
+
+    if (newSession || !ptyProcess) {
+        createNewPtySession();
+    }
+
+    // 必须等渲染端完成 xterm 挂载/监听/首次 fit，且 PowerShell 执行完启动探针，
+    // 才允许向 PTY 注入用户或 AI 指令。替代容易产生竞态的固定 500ms 延时。
+    await waitForTerminalReady();
+
+    if (action === 'startInteractive') {
+        if (commandEntries.length > 1) {
+            throw new Error('startInteractive 只支持单条 command。');
+        }
+
+        const command = commandEntries[0].value;
+        interactiveMode = true;
+        // 不设置 isExecutingCommand；交互式 TUI 输出必须走常驻 guiDataListener，否则会黑屏。
+        ptyProcess.write(`${command}\r`);
+        return { content: [{ type: 'text', text: `Interactive session started: ${command}` }] };
+    }
+
+    if (interactiveMode) {
+        throw new Error('当前终端正被交互式程序 (snow/codex/claude) 占用，请先退出并调用 action:"endInteractive"，或使用 newSession:true 重置会话。');
+    }
+
+    // 就绪等待期间其它调用可能先取得PTY，await后必须再次检查。
+    if (isExecutingCommand) {
+        throw new Error('当前已有同步命令执行中，请等待完成或使用 interrupt。');
+    }
+    const deltaOutputs = [];
+    isExecutingCommand = true;
+    try {
+        for (const entry of commandEntries) {
+            const command = entry.value;
+            const currentReturnModeKey = `returnMode${entry.index || ''}`;
+            const currentReturnMode = args[currentReturnModeKey] || finalReturnMode;
+
+            try {
+                const output = await executeSingleCommandInPty(ptyProcess, command);
+                deltaOutputs.push({ command, output, returnMode: currentReturnMode });
+            } catch (error) {
+                throw new Error(`在执行命令 "${command}" 时出错: ${error.message}`);
+            }
+        }
+    } finally {
+        isExecutingCommand = false;
+    }
+
+    // --- 5. 格式化并返回结果 ---
+    let finalOutput = '';
+    if (finalReturnMode === 'full') {
+        finalOutput = deltaOutputs.length > 0 ? deltaOutputs[deltaOutputs.length - 1].output : '';
+    } else { // delta 模式
+        if (deltaOutputs.length === 1) {
+            finalOutput = deltaOutputs[0].output;
+        } else {
+            finalOutput = deltaOutputs.map(res =>
+                `---[Output for: ${res.command}]---\n${res.output}`
+            ).join('\n\n');
+        }
+    }
+
+    const cleanOutput = finalOutput.replace(/\r\n/g, '\n').replace(/\r/g, '');
+    return { content: [{ type: 'text', text: `\`\`\`powershell\n${cleanOutput}\n\`\`\`` }] };
+}
+
+/**
+ * 清理插件资源，在主程序退出或插件重载时调用。
+ */
+function cleanup() {
+    console.log('[PowerShellExecutor] 正在清理资源...');
+
+    // 1. 关闭并销毁 GUI 窗口
+    if (guiWindow && !guiWindow.isDestroyed()) {
+        try {
+            // 移除 'closed' 监听器，以避免在程序化关闭时触发额外的 ptyProcess.kill()
+            guiWindow.removeAllListeners('closed');
+            guiWindow.close();
+            console.log('[PowerShellExecutor] GUI 窗口已关闭。');
+        } catch (e) {
+            console.error('[PowerShellExecutor] 关闭 GUI 窗口时出错:', e);
+        }
+        guiWindow = null;
+    }
+    guiReady = false;
+    if (resolveGuiReady) {
+        resolveGuiReady();
+        resolveGuiReady = null;
+    }
+    guiReadyPromise = Promise.resolve();
+    visibleTextResolvers.clear();
+    terminalPasteResolvers.clear();
+
+    // 2. 终止所有跟踪的子进程
+    if (childProcesses.size > 0) {
+        console.log(`[PowerShellExecutor] 正在终止 ${childProcesses.size} 个子进程...`);
+        for (const processToKill of childProcesses) {
+            try {
+                // ptyProcess 和 child_process 对象都有一个 .kill() 方法
+                processToKill.kill();
+                console.log(`[PowerShellExecutor] 进程 (PID: ${processToKill.pid}) 已终止。`);
+            } catch (e) {
+                console.error(`[PowerShellExecutor] 终止进程 (PID: ${processToKill.pid}) 时出错:`, e);
+            }
+        }
+        childProcesses.clear();
+    }
+
+    // 3. 停止文件监视器
+    if (settingsWatcher) {
+        try {
+            settingsWatcher.close();
+            settingsWatcher = null;
+            console.log('[PowerShellExecutor] Settings file watcher stopped.');
+        } catch (e) {
+            console.error('[PowerShellExecutor] Error stopping settings watcher:', e);
+        }
+    }
+
+    // 4. 确保 ptyProcess 状态被重置
+    mirrorSinks.clear();
+    replayBuffer = '';
+    mirrorStartupPending = false;
+    mirrorStartupHeld = '';
+    ptyProcess = null;
+    ptyReadyPromise = Promise.resolve();
+    guiDataListener = null;
+    isExecutingCommand = false;
+    interactiveMode = false;
+    activeCommandAbort = null;
+}
+
+// 导出主入口、GUI/清理函数，以及无 Electron 副作用的序列解析器供单元测试使用。
+module.exports = {
+    processToolCall,
+    openGuiTerminal,
+    attachMirror,
+    listCommandRuns,
+    getCommandRun,
+    subscribeCommandRuns,
+    // 仅供测试：跳过 GUI 窗口，直接在共享 PTY 会话里跑一条短命令
+    _runCommandForTest: (command) => executeSingleCommandInPty(ptyProcess, command),
+    ensureMirrorSession,
+    restartSession,
+    getSessionState,
+    writeSessionInput,
+    resizeSession: applyPtyResize,
+    cleanup,
+    parseInteractiveSequence,
+    parseWaitDuration,
+    parseTerminalKey
 };
\ No newline at end of file
diff --git a/docs/contracts/chat-contracts.json b/docs/contracts/chat-contracts.json
index eb817c46a..086fd703e 100644
--- a/docs/contracts/chat-contracts.json
+++ b/docs/contracts/chat-contracts.json
@@ -526,7 +526,7 @@
     "dynamicSites": [
       {
         "file": "modules/ipc/terminalHandlers.js",
-        "line": 64,
+        "line": 65,
         "kind": "event-send",
         "match": "sender.send(channel"
       }
diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index d0744c4d3..03a7ac23e 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -664,7 +664,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 270,
+          "line": 271,
           "kind": "custom-event-listener"
         },
         {
@@ -729,7 +729,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 270,
+          "line": 271,
           "kind": "custom-event-listener",
           "match": "signal?.addEventListener('abort'"
         },
@@ -23712,7 +23712,7 @@
       "producers": [
         {
           "file": "VCPDistributedServer/Plugin/PowerShellExecutor/PowerShellExecutor.js",
-          "line": 1475,
+          "line": 1485,
           "kind": "event-send"
         }
       ],
@@ -23726,7 +23726,7 @@
       "evidence": [
         {
           "file": "VCPDistributedServer/Plugin/PowerShellExecutor/PowerShellExecutor.js",
-          "line": 1475,
+          "line": 1485,
           "kind": "event-send",
           "match": "guiWindow.webContents.send('query-visible-text'"
         },
@@ -28324,7 +28324,7 @@
       "producers": [
         {
           "file": "VCPDistributedServer/Plugin/PowerShellExecutor/PowerShellExecutor.js",
-          "line": 1496,
+          "line": 1506,
           "kind": "event-send"
         }
       ],
@@ -28338,7 +28338,7 @@
       "evidence": [
         {
           "file": "VCPDistributedServer/Plugin/PowerShellExecutor/PowerShellExecutor.js",
-          "line": 1496,
+          "line": 1506,
           "kind": "event-send",
           "match": "guiWindow.webContents.send('terminal-paste-request'"
         },
@@ -28362,14 +28362,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 297,
+          "line": 308,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 297,
+          "line": 308,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:cd'"
         },
@@ -28386,7 +28386,7 @@
       "producers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 183,
+          "line": 184,
           "kind": "event-send"
         }
       ],
@@ -28400,7 +28400,7 @@
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 183,
+          "line": 184,
           "kind": "event-send",
           "match": "emit('terminal:clear'"
         },
@@ -28424,14 +28424,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 269,
+          "line": 280,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 269,
+          "line": 280,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:command-run'"
         },
@@ -28474,14 +28474,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 260,
+          "line": 271,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 260,
+          "line": 271,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:command-runs'"
         },
@@ -28505,14 +28505,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 208,
+          "line": 219,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 208,
+          "line": 219,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:create'"
         },
@@ -28529,7 +28529,7 @@
       "producers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 182,
+          "line": 183,
           "kind": "event-send"
         }
       ],
@@ -28543,7 +28543,7 @@
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 182,
+          "line": 183,
           "kind": "event-send",
           "match": "emit('terminal:data'"
         },
@@ -28560,7 +28560,7 @@
       "producers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 184,
+          "line": 185,
           "kind": "event-send"
         }
       ],
@@ -28574,7 +28574,7 @@
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 184,
+          "line": 185,
           "kind": "event-send",
           "match": "emit('terminal:exit'"
         },
@@ -28598,14 +28598,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 242,
+          "line": 253,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 242,
+          "line": 253,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:kill'"
         },
@@ -28629,14 +28629,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 230,
+          "line": 241,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 230,
+          "line": 241,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:resize'"
         },
@@ -28660,14 +28660,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 248,
+          "line": 259,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 248,
+          "line": 259,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:restart'"
         },
@@ -28691,14 +28691,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 291,
+          "line": 302,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 291,
+          "line": 302,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:unwatch-command-runs'"
         },
@@ -28722,14 +28722,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 280,
+          "line": 291,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 280,
+          "line": 291,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:watch-command-runs'"
         },
@@ -28753,14 +28753,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 217,
+          "line": 228,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 217,
+          "line": 228,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:write'"
         },
@@ -32484,7 +32484,7 @@
     },
     {
       "file": "modules/ipc/terminalHandlers.js",
-      "line": 64,
+      "line": 65,
       "reason": "dynamic event name: channel",
       "kind": "event-send",
       "match": "sender.send(channel",
diff --git a/modules/ipc/terminalHandlers.js b/modules/ipc/terminalHandlers.js
index eed56c1c5..f4505819b 100644
--- a/modules/ipc/terminalHandlers.js
+++ b/modules/ipc/terminalHandlers.js
@@ -8,6 +8,7 @@
 'use strict';
 
 const fs = require('fs');
+const os = require('os');
 const path = require('path');
 const { ipcMain: defaultIpcMain } = require('electron');
 const { createApplicationSenderGuard, resolveWindowWebContents } = require('./applicationSender');
@@ -190,7 +191,17 @@ function createView(event, options = {}) {
     views.set(id, { id, sender, detach });
     trackSender(sender);
 
-    return { id, pid: state.pid, shared: true };
+    return { id, pid: state.pid, shared: true, windowsPty: windowsPtyInfo() };
+}
+
+/**
+ * Windows 上 PTY 后端自己会按新宽度重排可见区，xterm 得知道这点，不然 resize 时两边各排一次，
+ * 行会重复、提示符错位（对照 ZCode TerminalSession 的 windowsPty）。node-pty 在 build 18309 起用 ConPTY。
+ */
+function windowsPtyInfo() {
+    if (process.platform !== 'win32') return null;
+    const buildNumber = Number(os.release().split('.')[2]) || undefined;
+    return { backend: buildNumber && buildNumber < 18309 ? 'winpty' : 'conpty', ...(buildNumber ? { buildNumber } : {}) };
 }
 
 function initialize({ workspaceService = null, executorLoader = null, commandRunStoreLoader = null, mainWindow = null, getMainWindow: getWindow = null, ipcMain: injectedIpcMain = null } = {}) {
diff --git a/modules/ui-system/side-pane/terminalSideProvider.js b/modules/ui-system/side-pane/terminalSideProvider.js
index 492954f80..01396cd11 100644
--- a/modules/ui-system/side-pane/terminalSideProvider.js
+++ b/modules/ui-system/side-pane/terminalSideProvider.js
@@ -224,6 +224,7 @@ export function createTerminalSideProvider({
             }
             session.sessionId = res.data.id;
             session.exited = false;
+            if (res.data.windowsPty && typeof res.data.windowsPty === 'object') term.options.windowsPty = res.data.windowsPty;
             setStatus('已连接终端', 'connected',
                 `已连接终端 · 与终端窗口 / AI 命令共用同一个会话${res.data.pid ? ` · PID ${res.data.pid}` : ''}`);
             if (screen.offsetWidth) session.claimSize(); // opened on screen: take over the size
diff --git a/tests/side-pane-terminal-lifecycle.test.mjs b/tests/side-pane-terminal-lifecycle.test.mjs
index 5fc0eaf88..02784a83c 100644
--- a/tests/side-pane-terminal-lifecycle.test.mjs
+++ b/tests/side-pane-terminal-lifecycle.test.mjs
@@ -253,6 +253,15 @@ test('OSC 8 hyperlinks open http(s) in the side browser and nothing else', async
     } finally { await h.cleanup(); }
 });
 
+test('a Windows PTY backend reported by the main process is handed to xterm so resizes do not reflow twice', async () => {
+    const h = fixture({ create: async () => ({ success: true, data: { id: 'view:win', windowsPty: { backend: 'conpty', buildNumber: 22631 } } }) });
+    try {
+        const handle = await h.provider.openTerminalTab();
+        await until(() => handle.getSessionId() === 'view:win');
+        assert.deepEqual(h.terminals[0].options.windowsPty, { backend: 'conpty', buildNumber: 22631 });
+    } finally { await h.cleanup(); }
+});
+
 test('Ctrl+C with a selection copies instead of interrupting the shared shell; pane shortcuts stay out of the shell', async () => {
     const h = fixture();
     const copied = [];

From 4b5862a432e2aa6732cd45c31f403bcb853c4c26 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 01:39:26 +0000
Subject: [PATCH 055/143] Git: drop an inherited GIT_DIR, and read parsed
 errors in English

Launched from a git hook or a shell inside another repository, VCPChat
inherited GIT_DIR / GIT_WORK_TREE and every git command ran against that
repository instead of the workspace. Those repository-local variables are
now removed from the child environment, as ZCode's git config does.

Commands whose error text is matched (rev-parse for 'not a git repository',
switch for 'would be overwritten') now run with LC_ALL=C. With a localised
Git (Chinese Git for Windows prints its own message) the commit-and-switch
flow never opened and non-repositories in other languages showed an error.
Other commands keep the user's language for the messages people read.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DFRovoZHMzeheXKkLNWKG
---
 modules/services/gitService.js | 29 +++++++++++++++++++---------
 tests/git-service.test.js      | 35 ++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 9 deletions(-)

diff --git a/modules/services/gitService.js b/modules/services/gitService.js
index 6c13550ec..19d0b71d9 100644
--- a/modules/services/gitService.js
+++ b/modules/services/gitService.js
@@ -59,7 +59,22 @@ function comparePath(a, b) {
     return a.path < b.path ? -1 : 1;
 }
 
-function runGit(cwd, args, { timeout = DEFAULT_TIMEOUT, input = null } = {}) {
+// 从 git hook 或某个仓库的 shell 里启动时会带着这些变量，所有命令都会跑到那个仓库上（同 ZCode git/config.ts）
+const REPO_LOCAL_ENV = ['GIT_DIR', 'GIT_WORK_TREE', 'GIT_INDEX_FILE', 'GIT_OBJECT_DIRECTORY', 'GIT_ALTERNATE_OBJECT_DIRECTORIES',
+    'GIT_COMMON_DIR', 'GIT_PREFIX', 'GIT_NAMESPACE', 'GIT_CEILING_DIRECTORIES', 'GIT_DISCOVERY_ACROSS_FILESYSTEM'];
+
+function gitEnv(englishMessages) {
+    const env = { ...process.env };
+    for (const name of REPO_LOCAL_ENV) delete env[name];
+    env.GIT_TERMINAL_PROMPT = '0'; // 没有终端可交互，缺凭据时直接失败而不是挂起
+    env.GIT_OPTIONAL_LOCKS = '0'; // status 刷新不抢 index.lock
+    // 要按报错文字判断结果的命令用英文输出：中文、日文等本地化的 Git 报错认不出来
+    if (englishMessages) Object.assign(env, { LC_ALL: 'C', LANG: 'C', LANGUAGE: 'C' });
+    return env;
+}
+
+/** englishMessages：报错要拿来匹配（不是仓库、切分支被本地改动挡住）时传 true，其余保留用户语言的报错给人看 */
+function runGit(cwd, args, { timeout = DEFAULT_TIMEOUT, input = null, englishMessages = false } = {}) {
     return new Promise((resolve, reject) => {
         const child = execFile('git', [
             '-c', 'core.quotepath=false',
@@ -72,11 +87,7 @@ function runGit(cwd, args, { timeout = DEFAULT_TIMEOUT, input = null } = {}) {
             maxBuffer: MAX_BUFFER,
             windowsHide: true,
             encoding: 'buffer',
-            env: {
-                ...process.env,
-                GIT_TERMINAL_PROMPT: '0', // 没有终端可交互，缺凭据时直接失败而不是挂起
-                GIT_OPTIONAL_LOCKS: '0', // status 刷新不抢 index.lock
-            },
+            env: gitEnv(englishMessages),
         }, (error, stdout, stderr) => {
             if (error) {
                 const detail = Buffer.isBuffer(stderr) ? stderr.toString('utf8').trim() : '';
@@ -206,7 +217,7 @@ async function openRepository(workspaceRoot) {
     const root = realpathSafe(path.resolve(workspaceRoot));
     let top;
     try {
-        const { stdout } = await runGit(root, ['rev-parse', '--show-toplevel']);
+        const { stdout } = await runGit(root, ['rev-parse', '--show-toplevel'], { englishMessages: true });
         top = stdout.toString('utf8').trim();
     } catch (error) {
         if (/not a git repository|不是\s*git\s*仓库/i.test(error.message)) return null;
@@ -226,7 +237,7 @@ async function getWatchTargets(workspaceRoot) {
     const root = realpathSafe(path.resolve(workspaceRoot));
     let stdout;
     try {
-        ({ stdout } = await runGit(root, ['rev-parse', '--absolute-git-dir', '--git-common-dir']));
+        ({ stdout } = await runGit(root, ['rev-parse', '--absolute-git-dir', '--git-common-dir'], { englishMessages: true }));
     } catch (error) {
         if (/not a git repository|不是\s*git\s*仓库/i.test(error.message)) return null;
         throw error;
@@ -684,7 +695,7 @@ async function switchLike(workspaceRoot, action, name, buildArgs) {
         if (status.conflicts?.length) return fail(BRANCH_ISSUES.conflicts);
         if (await hasOperationInProgress(repo)) return fail(BRANCH_ISSUES.operation);
         try {
-            await runGit(repo.toplevel, buildArgs(branchName), { timeout: COMMIT_TIMEOUT });
+            await runGit(repo.toplevel, buildArgs(branchName), { timeout: COMMIT_TIMEOUT, englishMessages: true });
         } catch (error) {
             return fail({ code: 'git-error', message: error.message });
         }
diff --git a/tests/git-service.test.js b/tests/git-service.test.js
index 388ca2e10..9a0ab7d85 100644
--- a/tests/git-service.test.js
+++ b/tests/git-service.test.js
@@ -415,3 +415,38 @@ test('reveal targets resolve against the repository root when the workspace is a
     assert.equal(fs.realpathSync(target), fs.realpathSync(path.join(root, 'pkg', 'sub', 'keep.txt')));
     await assert.rejects(gitService.resolveRevealTarget(workspace, 'README.md'), /不在工作区内/);
 });
+
+test('a GIT_DIR inherited from the launching shell does not redirect commands to another repository', { skip: SKIP_GIT }, async t => {
+    const root = createRepo(t);
+    const other = createRepo(t);
+    write(other, 'only-in-other.txt', 'x\n');
+    write(root, 'src/app.js', 'const a = 2;\n');
+    const saved = { GIT_DIR: process.env.GIT_DIR, GIT_WORK_TREE: process.env.GIT_WORK_TREE, LC_ALL: process.env.LC_ALL, LANGUAGE: process.env.LANGUAGE };
+    Object.assign(process.env, { GIT_DIR: path.join(other, '.git'), GIT_WORK_TREE: other, LC_ALL: 'zh_CN.UTF-8', LANGUAGE: 'zh_CN' });
+    t.after(() => { for (const [key, value] of Object.entries(saved)) { if (value === undefined) delete process.env[key]; else process.env[key] = value; } });
+
+    const status = await gitService.getStatus(root);
+    assert.equal(status.isRepo, true);
+    assert.deepEqual(status.changes.map(item => item.path), ['src/app.js'], 'the workspace\'s own change, nothing from the other repository');
+
+    const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'vcp-nogit-'));
+    t.after(() => fs.rmSync(dir, { recursive: true, force: true }));
+    assert.equal((await gitService.getStatus(dir)).isRepo, false);
+});
+
+test('a switch blocked by local changes reports the files in a form the commit-and-switch flow recognises', { skip: SKIP_GIT }, async t => {
+    const root = createRepo(t);
+    git(root, ['switch', '-q', '-c', 'other']);
+    write(root, 'README.md', '# other\n');
+    git(root, ['commit', '-q', '-am', 'other change']);
+    git(root, ['switch', '-q', 'main']);
+    write(root, 'README.md', '# local edit\n');
+    const saved = { LC_ALL: process.env.LC_ALL, LANGUAGE: process.env.LANGUAGE };
+    Object.assign(process.env, { LC_ALL: 'zh_CN.UTF-8', LANGUAGE: 'zh_CN' });
+    t.after(() => { for (const [key, value] of Object.entries(saved)) { if (value === undefined) delete process.env[key]; else process.env[key] = value; } });
+
+    const blocked = await gitService.switchBranch(root, 'other');
+    assert.equal(blocked.ok, false);
+    const { parseSwitchBlockedFiles } = await import('../modules/ui-system/conversation-status-panel/helpers.js');
+    assert.deepEqual(parseSwitchBlockedFiles(blocked.issues[0].message), { files: ['README.md'], untracked: false });
+});

From 8dc795a4fe08cac0fd58618e4d222637f9b60999 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 00:22:28 +0000
Subject: [PATCH 056/143] UI system gate: scope the tool presentation styles
 and drop the stray literal colour

check:ui-system was red on the side pane branch. tool-presentation.css had
101 selectors outside .vcp-ui-scope, an !important on the reduced-motion
rule and two fixed 11px sizes; components.css (from upstream #234) fell back
to a hard-coded indigo because --vcp-ui-primary is not a token.

Every tool presentation selector now sits under .vcp-ui-scope (the chat
messages container already carries it, and the file is alone in its layer,
so the uniform specificity bump changes no cascade). The reduced-motion rule
reuses the shimmer selector instead of !important, the 11px sizes use
--vcp-ui-text-xs, and the pinned window button uses the accent token.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01UCGGgmHsCToooXTgSXpmq9
(cherry picked from commit 2200d12803ea515c9badd8727602ab052cfadaca)
---
 styles/ui-system/components.css        |   4 +-
 styles/ui-system/tool-presentation.css | 196 ++++++++++++-------------
 2 files changed, 100 insertions(+), 100 deletions(-)

diff --git a/styles/ui-system/components.css b/styles/ui-system/components.css
index 418b7df8b..ddff52098 100644
--- a/styles/ui-system/components.css
+++ b/styles/ui-system/components.css
@@ -541,8 +541,8 @@
     }
 
     :is(html, html.vcp-global-settings-host) .vcp-ui-scope .vcp-ui-window-control-pin.is-pinned {
-        color: var(--vcp-ui-primary, #6366f1);
-        background: var(--vcp-ui-primary-bg, rgba(99, 102, 241, 0.16));
+        color: var(--vcp-ui-accent);
+        background: color-mix(in srgb, var(--vcp-ui-accent) 16%, transparent);
     }
 
     :is(html, html.vcp-global-settings-host) .vcp-ui-scope .vcp-ui-window-control-pin.is-pinned .vcp-ui-icon,
diff --git a/styles/ui-system/tool-presentation.css b/styles/ui-system/tool-presentation.css
index 436a2e39c..be8a90316 100644
--- a/styles/ui-system/tool-presentation.css
+++ b/styles/ui-system/tool-presentation.css
@@ -1,12 +1,12 @@
 /* Optional presentation; Legacy is untouched. Theme and typography stay owned
  * by the existing appearance profile, including role wallpapers. */
-html[data-ui-mode="next"] [data-vcp-tool-presentation="compact"],
-html[data-ui-mode="next"] [data-vcp-tool-presentation="grouped"] {
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="compact"],
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="grouped"] {
     --vcp-tool-row-height: 38px;
 }
-html[data-ui-mode="next"][data-vcp-density="compact"] [data-vcp-tool-presentation] { --vcp-tool-row-height: 32px; }
-html[data-ui-mode="next"][data-vcp-density="relaxed"] [data-vcp-tool-presentation] { --vcp-tool-row-height: 44px; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented {
+html[data-ui-mode="next"][data-vcp-density="compact"] .vcp-ui-scope [data-vcp-tool-presentation] { --vcp-tool-row-height: 32px; }
+html[data-ui-mode="next"][data-vcp-density="relaxed"] .vcp-ui-scope [data-vcp-tool-presentation] { --vcp-tool-row-height: 44px; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented {
     --vcp-tool-presented-font-family: var(--vcp-tool-card-font-family, var(--vcp-chat-font-family));
     --vcp-tool-presented-font-size: var(--vcp-ui-text-caption, 13px);
     --vcp-tool-presented-white-space: normal;
@@ -32,11 +32,11 @@ html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented {
     color: var(--vcp-ui-text-primary);
     font-family: var(--vcp-tool-card-font-family, inherit);
 }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented::before,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented::after { display: none; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-summary,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-result-header,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-call-summary-header {
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented::before,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented::after { display: none; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-summary,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-result-header,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-call-summary-header {
     display: flex;
     gap: 5px;
     padding: 0;
@@ -47,7 +47,7 @@ html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vc
     min-width: 0;
     flex-wrap: nowrap;
 }
-html[data-ui-mode="next"] .vcp-tool-row-toggle, html[data-ui-mode="next"] .vcp-tool-process-toggle {
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-toggle, html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-toggle {
     display: flex;
     width: 100%;
     min-width: 0;
@@ -65,13 +65,13 @@ html[data-ui-mode="next"] .vcp-tool-row-toggle, html[data-ui-mode="next"] .vcp-t
     cursor: pointer;
     text-align: left;
 }
-html[data-ui-mode="next"] .vcp-tool-result-header > .vcp-tool-row-toggle {
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-result-header > .vcp-tool-row-toggle {
     width: auto;
     flex: 1;
 }
-html[data-ui-mode="next"] .vcp-tool-row-toggle:hover, html[data-ui-mode="next"] .vcp-tool-process-toggle:hover { background: var(--vcp-ui-bg-2); }
-html[data-ui-mode="next"] .vcp-tool-row-toggle:focus-visible, html[data-ui-mode="next"] .vcp-tool-process-toggle:focus-visible, html[data-ui-mode="next"] .vcp-tool-process-artifact:focus-visible { outline: 2px solid var(--vcp-ui-accent); outline-offset: -2px; }
-html[data-ui-mode="next"] .vcp-tool-row-chevron {
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-toggle:hover, html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-toggle:hover { background: var(--vcp-ui-bg-2); }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-toggle:focus-visible, html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-toggle:focus-visible, html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-artifact:focus-visible { outline: 2px solid var(--vcp-ui-accent); outline-offset: -2px; }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-chevron {
     width: 7px;
     height: 7px;
     flex: 0 0 7px;
@@ -79,44 +79,44 @@ html[data-ui-mode="next"] .vcp-tool-row-chevron {
     border-bottom: 1.5px solid currentColor;
     transform: rotate(-45deg);
 }
-html[data-ui-mode="next"] [aria-expanded="true"] > .vcp-tool-row-chevron { transform: rotate(45deg); }
-html[data-ui-mode="next"] .vcp-tool-row-title { overflow-wrap: anywhere; min-width: 0; color: var(--vcp-ui-text-primary); }
-html[data-ui-mode="next"] .vcp-tool-row-resource { overflow-wrap: anywhere; min-width: 0; font-size: var(--vcp-ui-text-sm, 12px); }
-html[data-ui-mode="next"] .vcp-tool-row-state { margin-left: auto; white-space: nowrap; font-size: var(--vcp-ui-text-sm, 12px); }
-html[data-ui-mode="next"] [data-vcp-tool-state="success"] .vcp-tool-row-state { color: var(--vcp-ui-success); }
-html[data-ui-mode="next"] [data-vcp-tool-state="failed"] .vcp-tool-row-state { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
-html[data-ui-mode="next"] [data-vcp-tool-state="waiting"] .vcp-tool-row-state,
-html[data-ui-mode="next"] [data-vcp-tool-state="stopped"] .vcp-tool-row-state { color: var(--vcp-ui-warning, var(--vcp-ui-palette-amber)); }
-html[data-ui-mode="next"] [data-vcp-tool-state="running"] .vcp-tool-row-state { color: var(--vcp-ui-accent); }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-delete-btn { flex: 0 0 24px; margin-right: 6px; opacity: 0; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-header:hover .vcp-tool-result-delete-btn,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-header:focus-within .vcp-tool-result-delete-btn { opacity: 1; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="compact"] .vcp-role-divider,
-html[data-ui-mode="next"] [data-vcp-tool-presentation="grouped"] .vcp-role-divider { margin: 4px 0; font-size: 11px; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-details { max-height: 360px; overflow: auto; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-details,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-result-collapsible-content,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-call-summary-content {
+html[data-ui-mode="next"] .vcp-ui-scope [aria-expanded="true"] > .vcp-tool-row-chevron { transform: rotate(45deg); }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-title { overflow-wrap: anywhere; min-width: 0; color: var(--vcp-ui-text-primary); }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-resource { overflow-wrap: anywhere; min-width: 0; font-size: var(--vcp-ui-text-sm, 12px); }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-state { margin-left: auto; white-space: nowrap; font-size: var(--vcp-ui-text-sm, 12px); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-state="success"] .vcp-tool-row-state { color: var(--vcp-ui-success); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-state="failed"] .vcp-tool-row-state { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-state="waiting"] .vcp-tool-row-state,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-state="stopped"] .vcp-tool-row-state { color: var(--vcp-ui-warning, var(--vcp-ui-palette-amber)); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-state="running"] .vcp-tool-row-state { color: var(--vcp-ui-accent); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-delete-btn { flex: 0 0 24px; margin-right: 6px; opacity: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-header:hover .vcp-tool-result-delete-btn,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-header:focus-within .vcp-tool-result-delete-btn { opacity: 1; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="compact"] .vcp-role-divider,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="grouped"] .vcp-role-divider { margin: 4px 0; font-size: var(--vcp-ui-text-xs, 11px); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-details { max-height: 360px; overflow: auto; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-details,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-result-collapsible-content,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-call-summary-content {
     margin: 0;
     padding: 6px 12px 12px 28px;
     background: transparent;
     border: 0;
     min-width: 0;
 }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-details,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-result-collapsible-content,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-call-summary-content { display: none; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-details,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-result-collapsible-content,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-call-summary-content { display: block; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented pre {
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-details,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-result-collapsible-content,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-call-summary-content { display: none; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-details,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-result-collapsible-content,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-call-summary-content { display: block; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented pre {
     white-space: pre-wrap;
     overflow-wrap: anywhere;
     min-width: 0;
     max-height: 320px;
     overflow: auto;
 }
-html[data-ui-mode="next"] .vcp-tool-process {
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process {
     border: 1px solid var(--vcp-ui-border);
     border-radius: var(--vcp-ui-radius-md, 8px);
     margin: 10px 0;
@@ -124,12 +124,12 @@ html[data-ui-mode="next"] .vcp-tool-process {
     overflow: hidden;
     background: var(--vcp-ui-bg-0);
 }
-html[data-ui-mode="next"] .vcp-tool-process-toggle { background: var(--vcp-ui-bg-1); border-radius: 0; }
-html[data-ui-mode="next"] .vcp-tool-process-title { min-width: 0; overflow-wrap: anywhere; }
-html[data-ui-mode="next"] .vcp-tool-process-stats { margin-left: auto; font-size: var(--vcp-ui-text-sm, 12px); overflow-wrap: anywhere; }
-html[data-ui-mode="next"] .vcp-tool-process-body[hidden] { display: none; }
-html[data-ui-mode="next"] .vcp-tool-process-body > .vcp-tool-presented { margin: 0; border-top: 1px solid var(--vcp-ui-border); }
-html[data-ui-mode="next"] .vcp-tool-process-artifact {
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-toggle { background: var(--vcp-ui-bg-1); border-radius: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-title { min-width: 0; overflow-wrap: anywhere; }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-stats { margin-left: auto; font-size: var(--vcp-ui-text-sm, 12px); overflow-wrap: anywhere; }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-body[hidden] { display: none; }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-body > .vcp-tool-presented { margin: 0; border-top: 1px solid var(--vcp-ui-border); }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-artifact {
     color: var(--vcp-ui-text-accent);
     background: transparent;
     border: 0;
@@ -142,20 +142,20 @@ html[data-ui-mode="next"] .vcp-tool-process-artifact {
     cursor: pointer;
 }
 @media (max-width: 640px) {
-    html[data-ui-mode="next"] .vcp-tool-row-toggle { flex-wrap: wrap; gap: 6px; }
-    html[data-ui-mode="next"] .vcp-tool-row-state { margin-left: auto; }
-    html[data-ui-mode="next"] .vcp-tool-process-toggle { flex-wrap: wrap; }
-    html[data-ui-mode="next"] .vcp-tool-process-stats { margin-left: 16px; }
+    html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-toggle { flex-wrap: wrap; gap: 6px; }
+    html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-state { margin-left: auto; }
+    html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-toggle { flex-wrap: wrap; }
+    html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-stats { margin-left: 16px; }
 }
 
 /* 单行合并 / 整轮折叠：无框单行，一次调用一行；紧跟的同名结果收进请求行，展开后才显示。 */
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) {
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) {
     --vcp-tool-call-color: var(--vcp-ui-text-3, var(--vcp-ui-text-secondary));
     --vcp-tool-call-hover: var(--vcp-ui-text-2, var(--vcp-ui-text-secondary));
 }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-role-divider { margin: 4px 0; font-size: 11px; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-presented { margin: 2px 0; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) {
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-role-divider { margin: 4px 0; font-size: var(--vcp-ui-text-xs, 11px); }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-presented { margin: 2px 0; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) {
     width: auto;
     max-width: 100%;
     min-height: 24px;
@@ -168,10 +168,10 @@ html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-t
     color: var(--vcp-tool-call-color);
     transition: color .1s;
 }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle):hover { background: transparent; color: var(--vcp-tool-call-hover); }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle .vcp-tool-row-title, .vcp-tool-process-title) { flex: none; color: inherit; white-space: nowrap; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-process-stats { min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; overflow-wrap: normal; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-toggle .vcp-tool-row-resource {
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle):hover { background: transparent; color: var(--vcp-tool-call-hover); }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle .vcp-tool-row-title, .vcp-tool-process-title) { flex: none; color: inherit; white-space: nowrap; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-process-stats { min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; overflow-wrap: normal; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-toggle .vcp-tool-row-resource {
     min-width: 0;
     overflow: hidden;
     text-overflow: ellipsis;
@@ -179,20 +179,20 @@ html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-t
     overflow-wrap: normal;
     font-size: inherit;
 }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-toggle .vcp-tool-row-state { flex: none; margin-left: 0; color: inherit; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-icon { display: inline-flex; flex: none; width: 16px; height: 16px; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-icon svg { width: 100%; height: 100%; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-diff { flex: none; font-family: var(--vcp-ui-font-mono, ui-monospace, Consolas, monospace); font-size: 11px; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle:hover, [aria-expanded="true"]) .vcp-tool-row-diff-add { color: var(--vcp-ui-success); }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle:hover, [aria-expanded="true"]) .vcp-tool-row-diff-del { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-toggle .vcp-tool-row-state { flex: none; margin-left: 0; color: inherit; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-icon { display: inline-flex; flex: none; width: 16px; height: 16px; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-icon svg { width: 100%; height: 100%; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-diff { flex: none; font-family: var(--vcp-ui-font-mono, ui-monospace, Consolas, monospace); font-size: var(--vcp-ui-text-xs, 11px); }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle:hover, [aria-expanded="true"]) .vcp-tool-row-diff-add { color: var(--vcp-ui-success); }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle:hover, [aria-expanded="true"]) .vcp-tool-row-diff-del { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
 /* 并入请求行的结果：收起时不占位，展开后只留一个小标题“输出”。
- * 旧层给结果气泡写了 display:block !important，这里只能藏标题、去掉外边距，正文由上面的收起规则隐藏。 */
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"]:not(.expanded) { margin: 0; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"]:not(.expanded) > .vcp-tool-result-header { display: none; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"] .vcp-tool-row-toggle { min-height: 20px; padding-left: 24px; font-size: var(--vcp-ui-text-sm, 12px); }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-presented > :is(.vcp-tool-details, .vcp-tool-result-collapsible-content, .vcp-tool-call-summary-content) { padding: 8px 0 4px 24px; }
+ * 旧层给结果气泡写了强制的 display:block（important 级），这里只能藏标题、去掉外边距，正文由上面的收起规则隐藏。 */
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"]:not(.expanded) { margin: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"]:not(.expanded) > .vcp-tool-result-header { display: none; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"] .vcp-tool-row-toggle { min-height: 20px; padding-left: 24px; font-size: var(--vcp-ui-text-sm, 12px); }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-presented > :is(.vcp-tool-details, .vcp-tool-result-collapsible-content, .vcp-tool-call-summary-content) { padding: 8px 0 4px 24px; }
 /* 等待结果时动作词的微光，只在回复生成中出现。 */
-html[data-ui-mode="next"] .message-item.streaming :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-pending="true"] .vcp-tool-row-title {
+html[data-ui-mode="next"] .vcp-ui-scope .message-item.streaming :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-pending="true"] .vcp-tool-row-title {
     background: linear-gradient(90deg, var(--vcp-tool-call-color) 0%, var(--vcp-ui-text-primary) 50%, var(--vcp-tool-call-color) 100%);
     background-size: 200% 100%;
     -webkit-background-clip: text;
@@ -202,33 +202,33 @@ html[data-ui-mode="next"] .message-item.streaming :is([data-vcp-tool-presentatio
 }
 @keyframes vcp-tool-call-shimmer { from { background-position: 100% 0; } to { background-position: -100% 0; } }
 @media (prefers-reduced-motion: reduce) {
-    html[data-ui-mode="next"] [data-vcp-tool-pending="true"] .vcp-tool-row-title { animation: none !important; }
+    html[data-ui-mode="next"] .vcp-ui-scope .message-item.streaming :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-pending="true"] .vcp-tool-row-title { animation: none; }
 }
 
 /* 单行合并：动作词加粗，箭头在行尾、悬停或展开时出现；问题状态用虚线下划线，悬停看报错。 */
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) { font-size: var(--vcp-ui-text-body, 14px); }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle .vcp-tool-row-title, .vcp-tool-process-title) { font-weight: 500; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) > .vcp-tool-row-chevron { order: 1; opacity: 0; transition: opacity .2s, transform .2s; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle):is(:hover, [aria-expanded="true"]) > .vcp-tool-row-chevron { opacity: 1; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] [data-vcp-tool-call-state] .vcp-tool-row-state { text-decoration: underline dotted; text-underline-offset: 2px; cursor: help; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] { margin: 2px 0; border: 0; border-radius: 0; background: transparent; overflow: visible; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] .vcp-tool-process-stats { margin-left: 0; font-size: inherit; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-body { margin: 4px 0 4px 8px; padding-left: 14px; border-left: 1px solid var(--vcp-ui-border); }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-body > .vcp-tool-presented { margin: 2px 0; border-top: 0; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-artifact { border-top: 0; padding: 4px 0 4px 22px; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) { font-size: var(--vcp-ui-text-body, 14px); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle .vcp-tool-row-title, .vcp-tool-process-title) { font-weight: 500; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) > .vcp-tool-row-chevron { order: 1; opacity: 0; transition: opacity .2s, transform .2s; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle):is(:hover, [aria-expanded="true"]) > .vcp-tool-row-chevron { opacity: 1; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] [data-vcp-tool-call-state] .vcp-tool-row-state { text-decoration: underline dotted; text-underline-offset: 2px; cursor: help; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] { margin: 2px 0; border: 0; border-radius: 0; background: transparent; overflow: visible; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] .vcp-tool-process-stats { margin-left: 0; font-size: inherit; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-body { margin: 4px 0 4px 8px; padding-left: 14px; border-left: 1px solid var(--vcp-ui-border); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-body > .vcp-tool-presented { margin: 2px 0; border-top: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-artifact { border-top: 0; padding: 4px 0 4px 22px; }
 
 /* 整轮折叠：图标悬停换成箭头，标题与摘要之间用小圆点分隔，失败时摘要显示红色报错首行。 */
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle { gap: 0; font-size: var(--vcp-ui-text-caption, 13px); }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-leading { position: relative; display: inline-flex; flex: none; width: 16px; height: 16px; margin-right: 6px; align-items: center; justify-content: center; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-leading .vcp-tool-row-icon { width: 14px; height: 14px; transition: opacity .1s; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-leading .vcp-tool-row-chevron { position: absolute; inset: 0; margin: auto; opacity: 0; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle:is(:hover, [aria-expanded="true"]) .vcp-tool-row-leading .vcp-tool-row-icon { opacity: 0; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle:is(:hover, [aria-expanded="true"]) .vcp-tool-row-leading .vcp-tool-row-chevron { opacity: 1; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-dot { flex: none; width: 2px; height: 2px; margin: 0 8px; border-radius: 1px; background: currentColor; opacity: .7; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle :is(.vcp-tool-row-state, .vcp-tool-row-diff) { margin-left: 10px; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] [data-vcp-tool-call-state="failed"] .vcp-tool-row-toggle .vcp-tool-row-resource { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] { margin: 4px 0 10px; border: 0; border-radius: 0; background: transparent; overflow: visible; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-toggle {
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle { gap: 0; font-size: var(--vcp-ui-text-caption, 13px); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-leading { position: relative; display: inline-flex; flex: none; width: 16px; height: 16px; margin-right: 6px; align-items: center; justify-content: center; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-leading .vcp-tool-row-icon { width: 14px; height: 14px; transition: opacity .1s; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-leading .vcp-tool-row-chevron { position: absolute; inset: 0; margin: auto; opacity: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle:is(:hover, [aria-expanded="true"]) .vcp-tool-row-leading .vcp-tool-row-icon { opacity: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle:is(:hover, [aria-expanded="true"]) .vcp-tool-row-leading .vcp-tool-row-chevron { opacity: 1; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-dot { flex: none; width: 2px; height: 2px; margin: 0 8px; border-radius: 1px; background: currentColor; opacity: .7; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle :is(.vcp-tool-row-state, .vcp-tool-row-diff) { margin-left: 10px; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] [data-vcp-tool-call-state="failed"] .vcp-tool-row-toggle .vcp-tool-row-resource { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] { margin: 4px 0 10px; border: 0; border-radius: 0; background: transparent; overflow: visible; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-toggle {
     width: 100%;
     min-height: 33px;
     padding: 0 0 8px;
@@ -236,8 +236,8 @@ html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-proce
     border-bottom: .5px solid var(--vcp-ui-border);
     font-size: var(--vcp-ui-text-body, 14px);
 }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-toggle > .vcp-tool-row-chevron { order: 1; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] .vcp-tool-process-stats { margin-left: 0; color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-body { padding-top: 8px; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-body > .vcp-tool-presented { margin: 2px 0; border-top: 0; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-artifact { border-top: 0; padding: 6px 0; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-toggle > .vcp-tool-row-chevron { order: 1; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] .vcp-tool-process-stats { margin-left: 0; color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-body { padding-top: 8px; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-body > .vcp-tool-presented { margin: 2px 0; border-top: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-artifact { border-top: 0; padding: 6px 0; }

From fbb69114577bed74a676ada9ce4eea931e23c02c Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 01:41:13 +0000
Subject: [PATCH 057/143] Side pane: return to a topic's side chat, and keep
 side chat replies pinned to the bottom

Switching from a topic where the side chat was open to a topic with no
side-pane tabs falls back to a global tool such as the browser. Coming
back then left the browser in front, because a global active tab won over
the tab remembered for the topic. The remembered tab now wins first, the
same order as ZCode's resolveActiveTabForOwner (workspaceSidePane.ts).
Global tools still keep the pane open state; topic tabs follow the
topic's own collapsed preference.

Side chat only re-pinned to the bottom when the scroll container itself
resized. A reply that grows after the last pin (the final re-render after
streaming, code highlighting, images) stopped about 22px short of the
bottom. The scroller now also observes each message's size, like ZCode's
use-stick-to-bottom; readers who scrolled up are left alone.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019L2bZomLn4NVoxS4Rv5Bkv
---
 modules/renderer/side-chat/scrolling.js       | 17 +++++-
 .../ui-system/side-pane/side-pane-state.js    | 12 ++++
 tests/side-chat-scrolling.test.mjs            | 61 +++++++++++++++++++
 tests/side-pane-scope-restore.test.mjs        | 61 +++++++++++++++++++
 4 files changed, 150 insertions(+), 1 deletion(-)
 create mode 100644 tests/side-chat-scrolling.test.mjs
 create mode 100644 tests/side-pane-scope-restore.test.mjs

diff --git a/modules/renderer/side-chat/scrolling.js b/modules/renderer/side-chat/scrolling.js
index 7993837bc..e165d7971 100644
--- a/modules/renderer/side-chat/scrolling.js
+++ b/modules/renderer/side-chat/scrolling.js
@@ -34,7 +34,22 @@ export function createSideChatScrolling({
         if (ResizeObserverClass) {
             const rootResizeObserver = new ResizeObserverClass(pinToBottomIfSticky);
             rootResizeObserver.observe(root);
-            disposeCleanups.push(() => rootResizeObserver.disconnect());
+            // 也盯着每条消息的高度：流式结束后的整段重排、代码高亮、图片加载都会在最后一次贴底之后
+            // 再长高，只看容器尺寸会停在离底部几十像素的地方（ZCode 的 use-stick-to-bottom 同样观察内容尺寸）
+            const observeChild = node => { if (node.nodeType === 1) rootResizeObserver.observe(node); };
+            root.childNodes.forEach(observeChild);
+            const MutationObserverClass = doc.defaultView?.MutationObserver || globalThis.MutationObserver;
+            const childObserver = MutationObserverClass ? new MutationObserverClass(records => {
+                for (const record of records) {
+                    record.addedNodes.forEach(observeChild);
+                    record.removedNodes.forEach(node => { if (node.nodeType === 1) rootResizeObserver.unobserve(node); });
+                }
+            }) : null;
+            childObserver?.observe(root, { childList: true });
+            disposeCleanups.push(() => {
+                childObserver?.disconnect();
+                rootResizeObserver.disconnect();
+            });
         }
     }
 
diff --git a/modules/ui-system/side-pane/side-pane-state.js b/modules/ui-system/side-pane/side-pane-state.js
index 0824e86e5..6d6a5d77d 100644
--- a/modules/ui-system/side-pane/side-pane-state.js
+++ b/modules/ui-system/side-pane/side-pane-state.js
@@ -86,6 +86,18 @@ export function resolveSidePaneScopeState(state, parentRef, options = {}) {
         ? state.tabs.filter(t => matchesConversation(getTabParent(t), parentRef))
         : [];
 
+    // 回到一个对话时先还原它上次停留的标签（ZCode workspaceSidePane.ts resolveActiveTabForOwner 也是 preferred 优先）。
+    // 否则在 A 话题看辅助对话、切到没有标签的 B 话题落到浏览器，再切回 A 时仍停在浏览器，辅助对话被晾在后面
+    const preferred = options.preferredTabId
+        ? state.tabs.find(tab => tab.id === options.preferredTabId)
+        : null;
+    if (preferred && preferred.id !== NOTIFICATIONS_TAB_ID
+        && (preferred.scopeMode === 'global' || parentChatTabs.includes(preferred))) {
+        // 全局工具沿用当前的展开状态，话题自己的标签按这个话题的展开偏好
+        if (preferred.scopeMode === 'global') return { activeTabId: preferred.id, visible: state.visible };
+        return { activeTabId: preferred.id, visible: !options.collapsedPreference };
+    }
+
     // Workspace/global tools survive topic changes, including their collapsed state.
     const active = state.tabs.find(tab => tab.id === state.activeTabId);
     if (active?.scopeMode === 'global' && active.id !== NOTIFICATIONS_TAB_ID) {
diff --git a/tests/side-chat-scrolling.test.mjs b/tests/side-chat-scrolling.test.mjs
new file mode 100644
index 000000000..09b5c6427
--- /dev/null
+++ b/tests/side-chat-scrolling.test.mjs
@@ -0,0 +1,61 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { JSDOM } from 'jsdom';
+
+import { createSideChatScrolling } from '../modules/renderer/side-chat/scrolling.js';
+
+// jsdom 没有布局：用假的 ResizeObserver 手动触发「某个元素长高了」
+function setup() {
+    const dom = new JSDOM('<div id="root"><div class="message-item">old</div></div>');
+    const win = dom.window;
+    const observers = [];
+    win.ResizeObserver = class {
+        constructor(cb) { this.cb = cb; this.targets = new Set(); observers.push(this); }
+        observe(el) { this.targets.add(el); }
+        unobserve(el) { this.targets.delete(el); }
+        disconnect() { this.targets.clear(); }
+        fire(el) { if (this.targets.has(el)) this.cb([{ target: el }]); }
+    };
+    const root = win.document.getElementById('root');
+    let scrollHeight = 1000;
+    Object.defineProperty(root, 'clientHeight', { get: () => 500 });
+    Object.defineProperty(root, 'scrollHeight', { get: () => scrollHeight });
+    const scrolling = createSideChatScrolling({ store: { isDisposed: false }, doc: win.document, root });
+    return { win, root, ro: observers[0], scrolling, grow: (px) => { scrollHeight += px; } };
+}
+
+test('a reply that grows after the last pin is still followed to the bottom', async () => {
+    const { win, root, ro, scrolling, grow } = setup();
+    root.scrollTop = 500;
+    const reply = win.document.createElement('div');
+    root.appendChild(reply);
+    await new Promise(r => setTimeout(r, 0)); // MutationObserver 回调
+    grow(22); // 流式结束后整段重排多出来的高度
+    ro.fire(reply);
+    assert.equal(root.scrollTop, root.scrollHeight);
+    scrolling.dispose();
+    assert.equal(ro.targets.size, 0);
+});
+
+test('existing messages are observed and removed ones are released', async () => {
+    const { win, root, ro, scrolling } = setup();
+    const first = root.firstElementChild;
+    assert.ok(ro.targets.has(first));
+    first.remove();
+    await new Promise(r => setTimeout(r, 0));
+    assert.ok(!ro.targets.has(first));
+    scrolling.dispose();
+});
+
+test('content growth does not pull a reader who scrolled up back down', async () => {
+    const { win, root, ro, scrolling, grow } = setup();
+    root.scrollTop = 500;
+    root.dispatchEvent(new win.Event('scroll'));
+    root.scrollTop = 100;
+    root.dispatchEvent(new win.Event('scroll'));
+    assert.equal(scrolling.isSticky(), false);
+    grow(300);
+    ro.fire(root.firstElementChild);
+    assert.equal(root.scrollTop, 100);
+    scrolling.dispose();
+});
diff --git a/tests/side-pane-scope-restore.test.mjs b/tests/side-pane-scope-restore.test.mjs
new file mode 100644
index 000000000..4512ee6d7
--- /dev/null
+++ b/tests/side-pane-scope-restore.test.mjs
@@ -0,0 +1,61 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+
+import * as SidePaneState from '../modules/ui-system/side-pane/side-pane-state.js';
+import { sideChatTab } from '../modules/ui-system/side-pane/tab-types/chat.js';
+
+const topicA = { itemType: 'agent', itemId: 'agent-1', topicId: 'topic-a' };
+const topicB = { itemType: 'agent', itemId: 'agent-1', topicId: 'topic-b' };
+const browser = { id: 'browser:1', kind: 'browser', title: '浏览器', closable: true, scopeMode: 'global' };
+const chatOf = (parent) => ({
+    id: `chat-${parent.topicId}`,
+    title: '辅助对话',
+    parent: { ...parent, name: 'Agent' },
+    child: { itemType: 'agent', itemId: 'agent-1', topicId: `child-${parent.topicId}` },
+    contextMode: 'references-only'
+});
+
+function setup() {
+    let s = SidePaneState.setParent(SidePaneState.createInitialSidePaneState({ visible: true }), topicA);
+    s = SidePaneState.openTab(s, browser);
+    const chat = sideChatTab(chatOf(topicA), s.tabs);
+    s = SidePaneState.openTab(s, chat);
+    return { state: SidePaneState.activateTab(s, chat.id), chatId: chat.id };
+}
+
+test('returning to a topic restores its side chat even while a global tool filled in elsewhere', () => {
+    const { state, chatId } = setup();
+    // B 没有自己的标签，落到浏览器
+    const onB = SidePaneState.setParent(state, topicB);
+    assert.equal(onB.activeTabId, browser.id);
+    assert.equal(onB.visible, true);
+    // 回到 A：还原 A 上次停留的辅助对话，而不是继续停在浏览器
+    const backOnA = SidePaneState.setParent(onB, topicA, { preferredTabId: chatId, collapsedPreference: false });
+    assert.equal(backOnA.activeTabId, chatId);
+    assert.equal(backOnA.visible, true);
+});
+
+test('a topic remembered as collapsed stays collapsed when its side chat is restored', () => {
+    const { state, chatId } = setup();
+    const onB = SidePaneState.setParent(state, topicB);
+    const backOnA = SidePaneState.setParent(onB, topicA, { preferredTabId: chatId, collapsedPreference: true });
+    assert.equal(backOnA.activeTabId, chatId);
+    assert.equal(backOnA.visible, false);
+});
+
+test('a global tool keeps the pane state when no topic tab is remembered', () => {
+    const { state } = setup();
+    const onBrowser = SidePaneState.activateTab(state, browser.id);
+    const onB = SidePaneState.setParent(onBrowser, topicB);
+    assert.equal(onB.activeTabId, browser.id);
+    const backOnA = SidePaneState.setParent(onB, topicA, { preferredTabId: browser.id, collapsedPreference: true });
+    assert.equal(backOnA.activeTabId, browser.id);
+    // 全局工具不跟着话题的收起偏好走
+    assert.equal(backOnA.visible, true);
+});
+
+test('another topic\'s side chat is never restored as the preferred tab', () => {
+    const { state, chatId } = setup();
+    const onB = SidePaneState.setParent(state, topicB, { preferredTabId: chatId });
+    assert.equal(onB.activeTabId, browser.id);
+});

From 1ba83fb3fdfc8637265d613a8e624c17d002a892 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 01:41:13 +0000
Subject: [PATCH 058/143] UI system gate: take the integration branch's tool
 presentation and component styles

pr/side-pane-workbench is red on check:ui-system (tool-presentation.css
!important and unscoped selectors, components.css literal colour). These
are the same file contents as the integration branch (RoxyAsahi/VCPChat#2),
so merging this branch there is a no-op for them.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019L2bZomLn4NVoxS4Rv5Bkv
---
 styles/ui-system/components.css        |   4 +-
 styles/ui-system/tool-presentation.css | 196 ++++++++++++-------------
 2 files changed, 100 insertions(+), 100 deletions(-)

diff --git a/styles/ui-system/components.css b/styles/ui-system/components.css
index 418b7df8b..ddff52098 100644
--- a/styles/ui-system/components.css
+++ b/styles/ui-system/components.css
@@ -541,8 +541,8 @@
     }
 
     :is(html, html.vcp-global-settings-host) .vcp-ui-scope .vcp-ui-window-control-pin.is-pinned {
-        color: var(--vcp-ui-primary, #6366f1);
-        background: var(--vcp-ui-primary-bg, rgba(99, 102, 241, 0.16));
+        color: var(--vcp-ui-accent);
+        background: color-mix(in srgb, var(--vcp-ui-accent) 16%, transparent);
     }
 
     :is(html, html.vcp-global-settings-host) .vcp-ui-scope .vcp-ui-window-control-pin.is-pinned .vcp-ui-icon,
diff --git a/styles/ui-system/tool-presentation.css b/styles/ui-system/tool-presentation.css
index 436a2e39c..be8a90316 100644
--- a/styles/ui-system/tool-presentation.css
+++ b/styles/ui-system/tool-presentation.css
@@ -1,12 +1,12 @@
 /* Optional presentation; Legacy is untouched. Theme and typography stay owned
  * by the existing appearance profile, including role wallpapers. */
-html[data-ui-mode="next"] [data-vcp-tool-presentation="compact"],
-html[data-ui-mode="next"] [data-vcp-tool-presentation="grouped"] {
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="compact"],
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="grouped"] {
     --vcp-tool-row-height: 38px;
 }
-html[data-ui-mode="next"][data-vcp-density="compact"] [data-vcp-tool-presentation] { --vcp-tool-row-height: 32px; }
-html[data-ui-mode="next"][data-vcp-density="relaxed"] [data-vcp-tool-presentation] { --vcp-tool-row-height: 44px; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented {
+html[data-ui-mode="next"][data-vcp-density="compact"] .vcp-ui-scope [data-vcp-tool-presentation] { --vcp-tool-row-height: 32px; }
+html[data-ui-mode="next"][data-vcp-density="relaxed"] .vcp-ui-scope [data-vcp-tool-presentation] { --vcp-tool-row-height: 44px; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented {
     --vcp-tool-presented-font-family: var(--vcp-tool-card-font-family, var(--vcp-chat-font-family));
     --vcp-tool-presented-font-size: var(--vcp-ui-text-caption, 13px);
     --vcp-tool-presented-white-space: normal;
@@ -32,11 +32,11 @@ html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented {
     color: var(--vcp-ui-text-primary);
     font-family: var(--vcp-tool-card-font-family, inherit);
 }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented::before,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented::after { display: none; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-summary,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-result-header,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-call-summary-header {
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented::before,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented::after { display: none; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-summary,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-result-header,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-call-summary-header {
     display: flex;
     gap: 5px;
     padding: 0;
@@ -47,7 +47,7 @@ html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vc
     min-width: 0;
     flex-wrap: nowrap;
 }
-html[data-ui-mode="next"] .vcp-tool-row-toggle, html[data-ui-mode="next"] .vcp-tool-process-toggle {
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-toggle, html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-toggle {
     display: flex;
     width: 100%;
     min-width: 0;
@@ -65,13 +65,13 @@ html[data-ui-mode="next"] .vcp-tool-row-toggle, html[data-ui-mode="next"] .vcp-t
     cursor: pointer;
     text-align: left;
 }
-html[data-ui-mode="next"] .vcp-tool-result-header > .vcp-tool-row-toggle {
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-result-header > .vcp-tool-row-toggle {
     width: auto;
     flex: 1;
 }
-html[data-ui-mode="next"] .vcp-tool-row-toggle:hover, html[data-ui-mode="next"] .vcp-tool-process-toggle:hover { background: var(--vcp-ui-bg-2); }
-html[data-ui-mode="next"] .vcp-tool-row-toggle:focus-visible, html[data-ui-mode="next"] .vcp-tool-process-toggle:focus-visible, html[data-ui-mode="next"] .vcp-tool-process-artifact:focus-visible { outline: 2px solid var(--vcp-ui-accent); outline-offset: -2px; }
-html[data-ui-mode="next"] .vcp-tool-row-chevron {
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-toggle:hover, html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-toggle:hover { background: var(--vcp-ui-bg-2); }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-toggle:focus-visible, html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-toggle:focus-visible, html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-artifact:focus-visible { outline: 2px solid var(--vcp-ui-accent); outline-offset: -2px; }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-chevron {
     width: 7px;
     height: 7px;
     flex: 0 0 7px;
@@ -79,44 +79,44 @@ html[data-ui-mode="next"] .vcp-tool-row-chevron {
     border-bottom: 1.5px solid currentColor;
     transform: rotate(-45deg);
 }
-html[data-ui-mode="next"] [aria-expanded="true"] > .vcp-tool-row-chevron { transform: rotate(45deg); }
-html[data-ui-mode="next"] .vcp-tool-row-title { overflow-wrap: anywhere; min-width: 0; color: var(--vcp-ui-text-primary); }
-html[data-ui-mode="next"] .vcp-tool-row-resource { overflow-wrap: anywhere; min-width: 0; font-size: var(--vcp-ui-text-sm, 12px); }
-html[data-ui-mode="next"] .vcp-tool-row-state { margin-left: auto; white-space: nowrap; font-size: var(--vcp-ui-text-sm, 12px); }
-html[data-ui-mode="next"] [data-vcp-tool-state="success"] .vcp-tool-row-state { color: var(--vcp-ui-success); }
-html[data-ui-mode="next"] [data-vcp-tool-state="failed"] .vcp-tool-row-state { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
-html[data-ui-mode="next"] [data-vcp-tool-state="waiting"] .vcp-tool-row-state,
-html[data-ui-mode="next"] [data-vcp-tool-state="stopped"] .vcp-tool-row-state { color: var(--vcp-ui-warning, var(--vcp-ui-palette-amber)); }
-html[data-ui-mode="next"] [data-vcp-tool-state="running"] .vcp-tool-row-state { color: var(--vcp-ui-accent); }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-delete-btn { flex: 0 0 24px; margin-right: 6px; opacity: 0; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-header:hover .vcp-tool-result-delete-btn,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-header:focus-within .vcp-tool-result-delete-btn { opacity: 1; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="compact"] .vcp-role-divider,
-html[data-ui-mode="next"] [data-vcp-tool-presentation="grouped"] .vcp-role-divider { margin: 4px 0; font-size: 11px; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-details { max-height: 360px; overflow: auto; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-details,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-result-collapsible-content,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-call-summary-content {
+html[data-ui-mode="next"] .vcp-ui-scope [aria-expanded="true"] > .vcp-tool-row-chevron { transform: rotate(45deg); }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-title { overflow-wrap: anywhere; min-width: 0; color: var(--vcp-ui-text-primary); }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-resource { overflow-wrap: anywhere; min-width: 0; font-size: var(--vcp-ui-text-sm, 12px); }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-state { margin-left: auto; white-space: nowrap; font-size: var(--vcp-ui-text-sm, 12px); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-state="success"] .vcp-tool-row-state { color: var(--vcp-ui-success); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-state="failed"] .vcp-tool-row-state { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-state="waiting"] .vcp-tool-row-state,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-state="stopped"] .vcp-tool-row-state { color: var(--vcp-ui-warning, var(--vcp-ui-palette-amber)); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-state="running"] .vcp-tool-row-state { color: var(--vcp-ui-accent); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-delete-btn { flex: 0 0 24px; margin-right: 6px; opacity: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-header:hover .vcp-tool-result-delete-btn,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-header:focus-within .vcp-tool-result-delete-btn { opacity: 1; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="compact"] .vcp-role-divider,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="grouped"] .vcp-role-divider { margin: 4px 0; font-size: var(--vcp-ui-text-xs, 11px); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-details { max-height: 360px; overflow: auto; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-details,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-result-collapsible-content,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-call-summary-content {
     margin: 0;
     padding: 6px 12px 12px 28px;
     background: transparent;
     border: 0;
     min-width: 0;
 }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-details,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-result-collapsible-content,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-call-summary-content { display: none; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-details,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-result-collapsible-content,
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-call-summary-content { display: block; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented pre {
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-details,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-result-collapsible-content,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-call-summary-content { display: none; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-details,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-result-collapsible-content,
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-call-summary-content { display: block; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented pre {
     white-space: pre-wrap;
     overflow-wrap: anywhere;
     min-width: 0;
     max-height: 320px;
     overflow: auto;
 }
-html[data-ui-mode="next"] .vcp-tool-process {
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process {
     border: 1px solid var(--vcp-ui-border);
     border-radius: var(--vcp-ui-radius-md, 8px);
     margin: 10px 0;
@@ -124,12 +124,12 @@ html[data-ui-mode="next"] .vcp-tool-process {
     overflow: hidden;
     background: var(--vcp-ui-bg-0);
 }
-html[data-ui-mode="next"] .vcp-tool-process-toggle { background: var(--vcp-ui-bg-1); border-radius: 0; }
-html[data-ui-mode="next"] .vcp-tool-process-title { min-width: 0; overflow-wrap: anywhere; }
-html[data-ui-mode="next"] .vcp-tool-process-stats { margin-left: auto; font-size: var(--vcp-ui-text-sm, 12px); overflow-wrap: anywhere; }
-html[data-ui-mode="next"] .vcp-tool-process-body[hidden] { display: none; }
-html[data-ui-mode="next"] .vcp-tool-process-body > .vcp-tool-presented { margin: 0; border-top: 1px solid var(--vcp-ui-border); }
-html[data-ui-mode="next"] .vcp-tool-process-artifact {
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-toggle { background: var(--vcp-ui-bg-1); border-radius: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-title { min-width: 0; overflow-wrap: anywhere; }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-stats { margin-left: auto; font-size: var(--vcp-ui-text-sm, 12px); overflow-wrap: anywhere; }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-body[hidden] { display: none; }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-body > .vcp-tool-presented { margin: 0; border-top: 1px solid var(--vcp-ui-border); }
+html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-artifact {
     color: var(--vcp-ui-text-accent);
     background: transparent;
     border: 0;
@@ -142,20 +142,20 @@ html[data-ui-mode="next"] .vcp-tool-process-artifact {
     cursor: pointer;
 }
 @media (max-width: 640px) {
-    html[data-ui-mode="next"] .vcp-tool-row-toggle { flex-wrap: wrap; gap: 6px; }
-    html[data-ui-mode="next"] .vcp-tool-row-state { margin-left: auto; }
-    html[data-ui-mode="next"] .vcp-tool-process-toggle { flex-wrap: wrap; }
-    html[data-ui-mode="next"] .vcp-tool-process-stats { margin-left: 16px; }
+    html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-toggle { flex-wrap: wrap; gap: 6px; }
+    html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-state { margin-left: auto; }
+    html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-toggle { flex-wrap: wrap; }
+    html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-stats { margin-left: 16px; }
 }
 
 /* 单行合并 / 整轮折叠：无框单行，一次调用一行；紧跟的同名结果收进请求行，展开后才显示。 */
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) {
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) {
     --vcp-tool-call-color: var(--vcp-ui-text-3, var(--vcp-ui-text-secondary));
     --vcp-tool-call-hover: var(--vcp-ui-text-2, var(--vcp-ui-text-secondary));
 }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-role-divider { margin: 4px 0; font-size: 11px; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-presented { margin: 2px 0; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) {
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-role-divider { margin: 4px 0; font-size: var(--vcp-ui-text-xs, 11px); }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-presented { margin: 2px 0; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) {
     width: auto;
     max-width: 100%;
     min-height: 24px;
@@ -168,10 +168,10 @@ html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-t
     color: var(--vcp-tool-call-color);
     transition: color .1s;
 }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle):hover { background: transparent; color: var(--vcp-tool-call-hover); }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle .vcp-tool-row-title, .vcp-tool-process-title) { flex: none; color: inherit; white-space: nowrap; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-process-stats { min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; overflow-wrap: normal; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-toggle .vcp-tool-row-resource {
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle):hover { background: transparent; color: var(--vcp-tool-call-hover); }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle .vcp-tool-row-title, .vcp-tool-process-title) { flex: none; color: inherit; white-space: nowrap; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-process-stats { min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; overflow-wrap: normal; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-toggle .vcp-tool-row-resource {
     min-width: 0;
     overflow: hidden;
     text-overflow: ellipsis;
@@ -179,20 +179,20 @@ html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-t
     overflow-wrap: normal;
     font-size: inherit;
 }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-toggle .vcp-tool-row-state { flex: none; margin-left: 0; color: inherit; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-icon { display: inline-flex; flex: none; width: 16px; height: 16px; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-icon svg { width: 100%; height: 100%; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-diff { flex: none; font-family: var(--vcp-ui-font-mono, ui-monospace, Consolas, monospace); font-size: 11px; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle:hover, [aria-expanded="true"]) .vcp-tool-row-diff-add { color: var(--vcp-ui-success); }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle:hover, [aria-expanded="true"]) .vcp-tool-row-diff-del { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-toggle .vcp-tool-row-state { flex: none; margin-left: 0; color: inherit; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-icon { display: inline-flex; flex: none; width: 16px; height: 16px; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-icon svg { width: 100%; height: 100%; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-diff { flex: none; font-family: var(--vcp-ui-font-mono, ui-monospace, Consolas, monospace); font-size: var(--vcp-ui-text-xs, 11px); }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle:hover, [aria-expanded="true"]) .vcp-tool-row-diff-add { color: var(--vcp-ui-success); }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle:hover, [aria-expanded="true"]) .vcp-tool-row-diff-del { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
 /* 并入请求行的结果：收起时不占位，展开后只留一个小标题“输出”。
- * 旧层给结果气泡写了 display:block !important，这里只能藏标题、去掉外边距，正文由上面的收起规则隐藏。 */
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"]:not(.expanded) { margin: 0; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"]:not(.expanded) > .vcp-tool-result-header { display: none; }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"] .vcp-tool-row-toggle { min-height: 20px; padding-left: 24px; font-size: var(--vcp-ui-text-sm, 12px); }
-html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-presented > :is(.vcp-tool-details, .vcp-tool-result-collapsible-content, .vcp-tool-call-summary-content) { padding: 8px 0 4px 24px; }
+ * 旧层给结果气泡写了强制的 display:block（important 级），这里只能藏标题、去掉外边距，正文由上面的收起规则隐藏。 */
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"]:not(.expanded) { margin: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"]:not(.expanded) > .vcp-tool-result-header { display: none; }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"] .vcp-tool-row-toggle { min-height: 20px; padding-left: 24px; font-size: var(--vcp-ui-text-sm, 12px); }
+html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-presented > :is(.vcp-tool-details, .vcp-tool-result-collapsible-content, .vcp-tool-call-summary-content) { padding: 8px 0 4px 24px; }
 /* 等待结果时动作词的微光，只在回复生成中出现。 */
-html[data-ui-mode="next"] .message-item.streaming :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-pending="true"] .vcp-tool-row-title {
+html[data-ui-mode="next"] .vcp-ui-scope .message-item.streaming :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-pending="true"] .vcp-tool-row-title {
     background: linear-gradient(90deg, var(--vcp-tool-call-color) 0%, var(--vcp-ui-text-primary) 50%, var(--vcp-tool-call-color) 100%);
     background-size: 200% 100%;
     -webkit-background-clip: text;
@@ -202,33 +202,33 @@ html[data-ui-mode="next"] .message-item.streaming :is([data-vcp-tool-presentatio
 }
 @keyframes vcp-tool-call-shimmer { from { background-position: 100% 0; } to { background-position: -100% 0; } }
 @media (prefers-reduced-motion: reduce) {
-    html[data-ui-mode="next"] [data-vcp-tool-pending="true"] .vcp-tool-row-title { animation: none !important; }
+    html[data-ui-mode="next"] .vcp-ui-scope .message-item.streaming :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-pending="true"] .vcp-tool-row-title { animation: none; }
 }
 
 /* 单行合并：动作词加粗，箭头在行尾、悬停或展开时出现；问题状态用虚线下划线，悬停看报错。 */
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) { font-size: var(--vcp-ui-text-body, 14px); }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle .vcp-tool-row-title, .vcp-tool-process-title) { font-weight: 500; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) > .vcp-tool-row-chevron { order: 1; opacity: 0; transition: opacity .2s, transform .2s; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle):is(:hover, [aria-expanded="true"]) > .vcp-tool-row-chevron { opacity: 1; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] [data-vcp-tool-call-state] .vcp-tool-row-state { text-decoration: underline dotted; text-underline-offset: 2px; cursor: help; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] { margin: 2px 0; border: 0; border-radius: 0; background: transparent; overflow: visible; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] .vcp-tool-process-stats { margin-left: 0; font-size: inherit; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-body { margin: 4px 0 4px 8px; padding-left: 14px; border-left: 1px solid var(--vcp-ui-border); }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-body > .vcp-tool-presented { margin: 2px 0; border-top: 0; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-artifact { border-top: 0; padding: 4px 0 4px 22px; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) { font-size: var(--vcp-ui-text-body, 14px); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle .vcp-tool-row-title, .vcp-tool-process-title) { font-weight: 500; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) > .vcp-tool-row-chevron { order: 1; opacity: 0; transition: opacity .2s, transform .2s; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle):is(:hover, [aria-expanded="true"]) > .vcp-tool-row-chevron { opacity: 1; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] [data-vcp-tool-call-state] .vcp-tool-row-state { text-decoration: underline dotted; text-underline-offset: 2px; cursor: help; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] { margin: 2px 0; border: 0; border-radius: 0; background: transparent; overflow: visible; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] .vcp-tool-process-stats { margin-left: 0; font-size: inherit; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-body { margin: 4px 0 4px 8px; padding-left: 14px; border-left: 1px solid var(--vcp-ui-border); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-body > .vcp-tool-presented { margin: 2px 0; border-top: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-artifact { border-top: 0; padding: 4px 0 4px 22px; }
 
 /* 整轮折叠：图标悬停换成箭头，标题与摘要之间用小圆点分隔，失败时摘要显示红色报错首行。 */
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle { gap: 0; font-size: var(--vcp-ui-text-caption, 13px); }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-leading { position: relative; display: inline-flex; flex: none; width: 16px; height: 16px; margin-right: 6px; align-items: center; justify-content: center; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-leading .vcp-tool-row-icon { width: 14px; height: 14px; transition: opacity .1s; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-leading .vcp-tool-row-chevron { position: absolute; inset: 0; margin: auto; opacity: 0; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle:is(:hover, [aria-expanded="true"]) .vcp-tool-row-leading .vcp-tool-row-icon { opacity: 0; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle:is(:hover, [aria-expanded="true"]) .vcp-tool-row-leading .vcp-tool-row-chevron { opacity: 1; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-dot { flex: none; width: 2px; height: 2px; margin: 0 8px; border-radius: 1px; background: currentColor; opacity: .7; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle :is(.vcp-tool-row-state, .vcp-tool-row-diff) { margin-left: 10px; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] [data-vcp-tool-call-state="failed"] .vcp-tool-row-toggle .vcp-tool-row-resource { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] { margin: 4px 0 10px; border: 0; border-radius: 0; background: transparent; overflow: visible; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-toggle {
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle { gap: 0; font-size: var(--vcp-ui-text-caption, 13px); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-leading { position: relative; display: inline-flex; flex: none; width: 16px; height: 16px; margin-right: 6px; align-items: center; justify-content: center; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-leading .vcp-tool-row-icon { width: 14px; height: 14px; transition: opacity .1s; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-leading .vcp-tool-row-chevron { position: absolute; inset: 0; margin: auto; opacity: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle:is(:hover, [aria-expanded="true"]) .vcp-tool-row-leading .vcp-tool-row-icon { opacity: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle:is(:hover, [aria-expanded="true"]) .vcp-tool-row-leading .vcp-tool-row-chevron { opacity: 1; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-dot { flex: none; width: 2px; height: 2px; margin: 0 8px; border-radius: 1px; background: currentColor; opacity: .7; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle :is(.vcp-tool-row-state, .vcp-tool-row-diff) { margin-left: 10px; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] [data-vcp-tool-call-state="failed"] .vcp-tool-row-toggle .vcp-tool-row-resource { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] { margin: 4px 0 10px; border: 0; border-radius: 0; background: transparent; overflow: visible; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-toggle {
     width: 100%;
     min-height: 33px;
     padding: 0 0 8px;
@@ -236,8 +236,8 @@ html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-proce
     border-bottom: .5px solid var(--vcp-ui-border);
     font-size: var(--vcp-ui-text-body, 14px);
 }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-toggle > .vcp-tool-row-chevron { order: 1; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] .vcp-tool-process-stats { margin-left: 0; color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-body { padding-top: 8px; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-body > .vcp-tool-presented { margin: 2px 0; border-top: 0; }
-html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-artifact { border-top: 0; padding: 6px 0; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-toggle > .vcp-tool-row-chevron { order: 1; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] .vcp-tool-process-stats { margin-left: 0; color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-body { padding-top: 8px; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-body > .vcp-tool-presented { margin: 2px 0; border-top: 0; }
+html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-artifact { border-top: 0; padding: 6px 0; }

From 66315896923ff205cff9f03b224973b709f012ef Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 01:41:48 +0000
Subject: [PATCH 059/143] Status panel: data refreshes no longer close the
 branch popover under the user

While an agent worked, every file push repainted the panel and closed any
open popover, so the branch switcher shut while the user typed a filter.
A click on the branch button that coincided with a refresh did nothing,
because the branch list borrowed the panel's refresh sequence.

A repaint now waits while a popover anchored in the panel is open and runs
once it closes (ZCode keeps popover open state apart from data). Popovers
anchored elsewhere, such as in the commit dialog, are no longer closed by a
panel repaint. The branch list has its own request sequence.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DFRovoZHMzeheXKkLNWKG
---
 .../ui-system/conversation-status-panel.js    | 21 ++++++++-
 .../conversation-status-panel/git-actions.js  |  8 ++--
 tests/conversation-status-panel.test.mjs      | 43 +++++++++++++++++++
 3 files changed, 67 insertions(+), 5 deletions(-)

diff --git a/modules/ui-system/conversation-status-panel.js b/modules/ui-system/conversation-status-panel.js
index 47199cd08..2ea92dea2 100644
--- a/modules/ui-system/conversation-status-panel.js
+++ b/modules/ui-system/conversation-status-panel.js
@@ -398,10 +398,27 @@ export function createConversationStatusPanel({
             plan: plan && { p: plan.project?.id, i: plan.items }
        });
         if (!force && key === renderKey) return;
+        // 面板上开着的浮层（分支切换、提交菜单……）锚在这次要换掉的节点上：agent 干活时数据一直在变，
+        // 每次都重画就会把用户正在用的浮层关掉。先记下要重画，等浮层关了再画（同 ZCode Popover 的开合独立于数据）
+        const anchoredHere = popovers.filter(entry => aside.contains(entry.anchor));
+        if (!force && anchoredHere.length) {
+            for (const entry of anchoredHere) {
+                if (entry.renderWhenClosed) continue;
+                entry.renderWhenClosed = true;
+                entry.ownOnClose = entry.onClose;
+                entry.onClose = () => { entry.ownOnClose?.(); if (!disposed) renderPanel(); };
+            }
+            return;
+        }
         renderKey = key;
+        // 这次就是重画：之前挂上的「关了再画」去掉，免得关的时候又画一遍
+        const closePanelPopovers = () => anchoredHere.forEach(entry => {
+            if (entry.renderWhenClosed) entry.onClose = entry.ownOnClose;
+            closePopover(entry);
+        });
 
         if (!hasGit && !hasPlan && !hasRuns) {
-            closeAllPopovers();
+            closePanelPopovers();
             aside.textContent = '';
             // 跟随会话时，这个会话没有 V工程 / 命令就没有可显示的状态：整块隐藏，不拿别的会话的内容占位
             if (!onOpenGitTab || scoped) { setAvailable(false); return; }
@@ -415,7 +432,7 @@ export function createConversationStatusPanel({
             aside.appendChild(btn);
             return;
         }
-        closeAllPopovers();
+        closePanelPopovers();
         setAvailable(true);
         aside.textContent = '';
         aside.dataset.displayMode = variant;
diff --git a/modules/ui-system/conversation-status-panel/git-actions.js b/modules/ui-system/conversation-status-panel/git-actions.js
index cb037ed3d..f01776d39 100644
--- a/modules/ui-system/conversation-status-panel/git-actions.js
+++ b/modules/ui-system/conversation-status-panel/git-actions.js
@@ -26,17 +26,19 @@ export function createStatusPanelGitActions({
     uniquePaths
 }) {
 
+    // 只防分支列表请求之间互相覆盖；借用面板刷新的序号的话，agent 改文件触发一次刷新，点分支按钮就没反应
+    let branchSeq = 0;
     async function loadBranches() {
         const targetWorkspace = store.workspace;
-        const seq = store.refreshSeq;
+        const seq = ++branchSeq;
         if (!targetWorkspace || !api?.gitListBranches) return false;
         try {
             const res = await api.gitListBranches(targetWorkspace.id);
-            if (store.disposed || seq !== store.refreshSeq || store.workspace?.id !== targetWorkspace.id) return false;
+            if (store.disposed || seq !== branchSeq || store.workspace?.id !== targetWorkspace.id) return false;
             store.branchList = res?.success ? res.data : null;
             return true;
         } catch (_e) {
-            if (!store.disposed && seq === store.refreshSeq) store.branchList = null;
+            if (!store.disposed && seq === branchSeq) store.branchList = null;
             return false;
         }
     }
diff --git a/tests/conversation-status-panel.test.mjs b/tests/conversation-status-panel.test.mjs
index 38d498c85..8dc12ef11 100644
--- a/tests/conversation-status-panel.test.mjs
+++ b/tests/conversation-status-panel.test.mjs
@@ -280,6 +280,49 @@ test('branch popover filters, switches and offers create / graph in the footer',
     panel.dispose();
 });
 
+test('an agent changing files while the branch popover is open neither closes it nor makes the next click do nothing', async () => {
+    let added = 5;
+    let branchListGate = null;
+    const { doc, panel, dom } = setup({ api: {
+        gitChangeSummary: async () => ({ success: true, data: { files: 2, added: added++, removed: 1, branch: { head: 'main', ahead: 0, behind: 0, upstream: 'origin/main' }, remotes: ['origin'] } }),
+        gitListBranches: async () => {
+            if (branchListGate) await branchListGate.promise;
+            return { success: true, data: { current: 'main', branches: [{ name: 'main', current: true }, { name: 'dev', current: false }] } };
+        }
+    } });
+    panel.mount();
+    await flush();
+
+    click(dom, q(doc, '.zc-row-branch'));
+    await flush();
+    const pop = q(doc, '.zc-branch-popover');
+    const input = q(pop, '.zc-command-input');
+    input.value = 'de';
+    input.dispatchEvent(new dom.window.Event('input', { bubbles: true }));
+
+    await panel.refresh();
+    await flush();
+    assert.equal(q(doc, '.zc-branch-popover'), pop, 'the popover the user is typing in stays open');
+    assert.equal(q(pop, '.zc-command-input').value, 'de');
+    assert.match(q(doc, '.zc-status-panel, aside').textContent, /\+5/, 'the panel waits to repaint until the popover closes');
+
+    doc.body.dispatchEvent(new dom.window.MouseEvent('mousedown', { bubbles: true }));
+    await flush();
+    assert.equal(q(doc, '.zc-branch-popover'), null);
+    assert.match(q(doc, '.zc-status-panel, aside').textContent, /\+6/, 'the deferred repaint ran once it closed');
+
+    // 点分支按钮时正好来了一次刷新：浮层照样打开
+    let release;
+    branchListGate = { promise: new Promise(resolve => { release = resolve; }) };
+    click(dom, q(doc, '.zc-row-branch'));
+    const refreshing = panel.refresh();
+    release();
+    await refreshing;
+    await flush();
+    assert.ok(q(doc, '.zc-branch-popover'));
+    panel.dispose();
+});
+
 test('create-branch dialog creates and switches', async () => {
     const { doc, panel, calls, dom } = setup();
     panel.mount();

From 49c11838d5fcc7ac8135db12a40a4bb5f1031624 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 01:43:37 +0000
Subject: [PATCH 060/143] Trajectory tab: stay at the top while reading, and
 stop piling up copy listeners

A reader scrolled to the first call (the system prompt) was thrown to the
bottom on every reload while the agent ran, because a scrollTop of 0 was
read as 'nothing rendered yet'. Only the first render with content now
sticks to the bottom; after that it follows only a reader already there.

Each rebuilt row registered its copy button on the view scope, keeping the
detached button and the whole message text until the view was released
(17 -> 167 records over 50 reloads). Row buttons now use a plain listener
that goes away with the element.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DFRovoZHMzeheXKkLNWKG
---
 .../contracts/generated/chat-event-graph.json | 31 ++++++++++-----
 .../side-pane/modelTrajectorySideProvider.js  | 13 +++++--
 tests/side-pane-model-trajectory.test.mjs     | 39 +++++++++++++++++++
 3 files changed, 69 insertions(+), 14 deletions(-)

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 03a7ac23e..642bbd565 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -4189,17 +4189,22 @@
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 345,
+          "line": 124,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 369,
+          "line": 348,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 757,
+          "line": 372,
+          "kind": "custom-event-listener"
+        },
+        {
+          "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
+          "line": 762,
           "kind": "custom-event-listener"
         },
         {
@@ -5747,19 +5752,25 @@
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 345,
+          "line": 124,
+          "kind": "custom-event-listener",
+          "match": "btn.addEventListener('click'"
+        },
+        {
+          "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
+          "line": 348,
           "kind": "custom-event-listener",
           "match": "more.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 369,
+          "line": 372,
           "kind": "custom-event-listener",
           "match": "head.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 757,
+          "line": 762,
           "kind": "custom-event-listener",
           "match": "item.addEventListener('click'"
         },
@@ -15479,7 +15490,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 370,
+          "line": 373,
           "kind": "custom-event-listener"
         },
         {
@@ -15843,7 +15854,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 370,
+          "line": 373,
           "kind": "custom-event-listener",
           "match": "head.addEventListener('keydown'"
         },
@@ -21514,14 +21525,14 @@
       "consumers": [
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 885,
+          "line": 890,
           "kind": "preload-subscription"
         }
       ],
       "evidence": [
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 885,
+          "line": 890,
           "kind": "preload-subscription",
           "match": "api?.onModelTrajectoryChanged("
         }
diff --git a/modules/ui-system/side-pane/modelTrajectorySideProvider.js b/modules/ui-system/side-pane/modelTrajectorySideProvider.js
index 8d8e53685..5e9f49653 100644
--- a/modules/ui-system/side-pane/modelTrajectorySideProvider.js
+++ b/modules/ui-system/side-pane/modelTrajectorySideProvider.js
@@ -113,13 +113,16 @@ export function createModelTrajectorySideProvider({
                 node.setAttribute('aria-hidden', 'true');
                 return node;
             };
-            const iconButton = (name, label, onClick, className = '') => {
+            // 常驻按钮的监听归 own；卡片里的按钮每次重建卡片都会换新，监听跟着元素一起丢弃（inline），
+            // 不然每次刷新都往 own 上多记一条，连同闭包里整段消息文本一直留到视图释放
+            const iconButton = (name, label, onClick, className = '', { inline = false } = {}) => {
                 const btn = h('button', `side-traj-icon-btn ${className}`.trim());
                 btn.type = 'button';
                 btn.title = label;
                 btn.setAttribute('aria-label', label);
                 btn.appendChild(icon(name));
-                if (onClick) own.listen(btn, 'click', onClick);
+                if (onClick && inline) btn.addEventListener('click', onClick);
+                else if (onClick) own.listen(btn, 'click', onClick);
                 return btn;
             };
 
@@ -276,7 +279,7 @@ export function createModelTrajectorySideProvider({
                     } catch (_error) {
                         toast('复制失败', 'error');
                     }
-                }, 'side-traj-row-copy');
+                }, 'side-traj-row-copy', { inline: true });
                 copyBtn.disabled = !copyText;
                 head.append(chevron, label, body, meta, copyBtn);
 
@@ -557,6 +560,8 @@ export function createModelTrajectorySideProvider({
             function renderTimeline() {
                 const wasAtBottom = scroller.scrollHeight - scroller.scrollTop - scroller.clientHeight <= FOLLOW_THRESHOLD_PX;
                 const previousTop = scroller.scrollTop;
+                // 第一次画出内容时贴到底；之后只看读者原来在不在底部，停在顶部读第一条调用的人不会被拉走
+                const firstContent = timeline.childElementCount === 0;
                 const nextCache = new Map();
                 const fragment = doc.createDocumentFragment();
                 buildObserver?.disconnect();
@@ -582,7 +587,7 @@ export function createModelTrajectorySideProvider({
                 });
                 updateAllRows();
                 if (!doc.hidden) {
-                    stickToBottom = wasAtBottom || previousTop === 0;
+                    stickToBottom = wasAtBottom || firstContent;
                     if (stickToBottom) scroller.scrollTop = scroller.scrollHeight;
                     else scroller.scrollTop = previousTop;
                 }
diff --git a/tests/side-pane-model-trajectory.test.mjs b/tests/side-pane-model-trajectory.test.mjs
index b16fde4e1..befbc546f 100644
--- a/tests/side-pane-model-trajectory.test.mjs
+++ b/tests/side-pane-model-trajectory.test.mjs
@@ -402,3 +402,42 @@ test('opening from a side chat reads the child topic and finds its reply; a main
     assert.equal(env.state.lists.at(-1)[0], 'agent2__t9', 'opening from the main chat follows the main chat again');
     await handle.dispose();
 });
+
+test('rebuilding cards on every change does not pile up listener records on the view scope', async () => {
+    const env = makeEnv({ recs: manyRecords(3) });
+    const view = createSidePaneRootScope(null, 'test-view');
+    const handle = await env.provider.mountTab({ id: 'x' }, env.view, { scope: view });
+    const { diagnostics } = globalThis.VCPLifecycle;
+    const owned = () => diagnostics.snapshot().find(scope => scope.parentId === view.id).resources.length;
+    const before = owned();
+    for (let i = 0; i < 10; i++) {
+        env.state.recs = env.state.recs.map(record => ({ ...record, endedAt: record.endedAt + 1 }));
+        env.fire({ sessionKey: 'agent1__t1' });
+        await wait(150);
+    }
+    assert.ok(env.state.lists.length > 10, 'the cards were rebuilt on each change');
+    assert.equal(owned(), before);
+    // 行内的复制按钮仍然能用
+    env.view.querySelector('.side-traj-row-copy:not([disabled])').click();
+    await wait();
+    assert.equal(env.state.copied.length, 1);
+    await handle.dispose();
+    await view.dispose('test');
+});
+
+test('a reader parked at the top of the trajectory stays there while new calls arrive', async () => {
+    const env = makeEnv({ recs: manyRecords(4) });
+    const handle = await env.provider.mountTab({ id: 'x' }, env.view);
+    const scroller = env.view.querySelector('.side-traj-scroll');
+    // jsdom 没有布局：给出一个比视口高的内容
+    Object.defineProperty(scroller, 'scrollHeight', { configurable: true, get: () => 5000 });
+    Object.defineProperty(scroller, 'clientHeight', { configurable: true, get: () => 400 });
+    scroller.scrollTop = 0;
+    scroller.dispatchEvent(new env.dom.window.Event('scroll'));
+    env.state.recs = [...env.state.recs, ...manyRecords(6).slice(4)];
+    env.fire({ sessionKey: 'agent1__t1' });
+    await wait(150);
+    assert.equal(env.view.querySelectorAll('.side-traj-call').length, 6);
+    assert.equal(scroller.scrollTop, 0);
+    await handle.dispose();
+});

From 30f09c53dfda76a8018c85f4aa7bb77a943668a9 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 01:44:40 +0000
Subject: [PATCH 061/143] Side terminal: type the workspace jump without
 pressing Enter
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The jump wrote `cd '…'\r` into the shared PTY whenever no AI command was
running, so with vim, python, ssh or a password prompt in the foreground
the keystrokes and Enter went to that program. The command is now typed
for the user to submit. PowerShell also treats ‘ ’ ‚ ‛ as single quotes,
so those are doubled too (DSH quoteForPwsh escapes per PowerShell's own
quoting rules rather than ASCII only). A tab that showed the shell as
exited now returns to connected when the shared shell is restarted by an
AI command or the tray terminal.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_016hW799u5Ji5k9khDAwu688
---
 .../contracts/generated/chat-event-graph.json | 64 +++++++++----------
 modules/ipc/terminalHandlers.js               | 13 ++--
 .../side-pane/terminalSideProvider.js         |  8 ++-
 tests/side-pane-terminal-lifecycle.test.mjs   | 15 +++++
 tests/terminal-cd-command.test.js             | 29 +++++++++
 5 files changed, 91 insertions(+), 38 deletions(-)
 create mode 100644 tests/terminal-cd-command.test.js

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index e8bc986a2..4632b5cc2 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -664,7 +664,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 243,
+          "line": 249,
           "kind": "custom-event-listener"
         },
         {
@@ -729,7 +729,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 243,
+          "line": 249,
           "kind": "custom-event-listener",
           "match": "signal?.addEventListener('abort'"
         },
@@ -21631,14 +21631,14 @@
       "consumers": [
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 157,
+          "line": 158,
           "kind": "preload-subscription"
         }
       ],
       "evidence": [
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 157,
+          "line": 158,
           "kind": "preload-subscription",
           "match": "api.onTerminalClear("
         }
@@ -21688,14 +21688,14 @@
       "consumers": [
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 160,
+          "line": 166,
           "kind": "preload-subscription"
         }
       ],
       "evidence": [
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 160,
+          "line": 166,
           "kind": "preload-subscription",
           "match": "api.onTerminalExit("
         }
@@ -28373,14 +28373,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 297,
+          "line": 300,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 297,
+          "line": 300,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:cd'"
         },
@@ -28397,7 +28397,7 @@
       "producers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 183,
+          "line": 186,
           "kind": "event-send"
         }
       ],
@@ -28411,7 +28411,7 @@
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 183,
+          "line": 186,
           "kind": "event-send",
           "match": "emit('terminal:clear'"
         },
@@ -28435,14 +28435,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 269,
+          "line": 272,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 269,
+          "line": 272,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:command-run'"
         },
@@ -28485,14 +28485,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 260,
+          "line": 263,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 260,
+          "line": 263,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:command-runs'"
         },
@@ -28516,14 +28516,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 208,
+          "line": 211,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 208,
+          "line": 211,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:create'"
         },
@@ -28540,7 +28540,7 @@
       "producers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 182,
+          "line": 185,
           "kind": "event-send"
         }
       ],
@@ -28554,7 +28554,7 @@
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 182,
+          "line": 185,
           "kind": "event-send",
           "match": "emit('terminal:data'"
         },
@@ -28571,7 +28571,7 @@
       "producers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 184,
+          "line": 187,
           "kind": "event-send"
         }
       ],
@@ -28585,7 +28585,7 @@
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 184,
+          "line": 187,
           "kind": "event-send",
           "match": "emit('terminal:exit'"
         },
@@ -28609,14 +28609,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 242,
+          "line": 245,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 242,
+          "line": 245,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:kill'"
         },
@@ -28640,14 +28640,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 230,
+          "line": 233,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 230,
+          "line": 233,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:resize'"
         },
@@ -28671,14 +28671,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 248,
+          "line": 251,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 248,
+          "line": 251,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:restart'"
         },
@@ -28702,14 +28702,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 291,
+          "line": 294,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 291,
+          "line": 294,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:unwatch-command-runs'"
         },
@@ -28733,14 +28733,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 280,
+          "line": 283,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 280,
+          "line": 283,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:watch-command-runs'"
         },
@@ -28764,14 +28764,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 217,
+          "line": 220,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 217,
+          "line": 220,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:write'"
         },
diff --git a/modules/ipc/terminalHandlers.js b/modules/ipc/terminalHandlers.js
index eed56c1c5..0e1eac781 100644
--- a/modules/ipc/terminalHandlers.js
+++ b/modules/ipc/terminalHandlers.js
@@ -150,10 +150,13 @@ function resolveWorkspacePath(workspaceId) {
     return ws.path;
 }
 
-// 终端窗口用的是 PowerShell（Windows）/ bash（其它平台）
-function buildChangeDirectoryCommand(dir) {
-    if (process.platform === 'win32') return `Set-Location -LiteralPath '${dir.replace(/'/g, "''")}'\r`;
-    return `cd '${dir.replace(/'/g, "'\\''")}'\r`;
+// 终端窗口用的是 PowerShell（Windows）/ bash（其它平台）。
+// 只把命令打到输入行、不替用户按回车：前台可能是 vim、python、ssh 或密码提示（busy 只认 AI 跑的命令），
+// 回车会把这串字当成那个程序的输入；提示符后有半截命令时也会拼成别的命令。用户看一眼再回车。
+// PowerShell 把 ‘ ’ ‚ ‛ 也当单引号，只转义 ASCII ' 的话，带弯引号的目录名会提前结束字符串。
+function buildChangeDirectoryCommand(dir, platform = process.platform) {
+    if (platform === 'win32') return `Set-Location -LiteralPath '${dir.replace(/['\u2018\u2019\u201A\u201B]/g, '$&$&')}'`;
+    return `cd '${dir.replace(/'/g, "'\\''")}'`;
 }
 
 function createView(event, options = {}) {
@@ -316,4 +319,4 @@ function disposeAll() {
     for (const sender of [...runWatchers.keys()]) stopRunWatcher(sender);
 }
 
-module.exports = { CHANNELS, initialize, disposeAll };
+module.exports = { CHANNELS, initialize, disposeAll, buildChangeDirectoryCommand };
diff --git a/modules/ui-system/side-pane/terminalSideProvider.js b/modules/ui-system/side-pane/terminalSideProvider.js
index 466adc795..9f9053a36 100644
--- a/modules/ui-system/side-pane/terminalSideProvider.js
+++ b/modules/ui-system/side-pane/terminalSideProvider.js
@@ -154,8 +154,14 @@ export function createTerminalSideProvider({
         const unsubscribeData = api.onTerminalData?.((payload) => {
             if (payload?.id === session.sessionId && typeof payload.data === 'string') term.write(payload.data);
         });
+        // 主进程只在起了新 PTY 时清屏（AI 跑命令或托盘终端重启了共享会话）：这时已经活过来了，别再显示已退出
         const unsubscribeClear = api.onTerminalClear?.((payload) => {
-            if (payload?.id === session.sessionId) term.reset();
+            if (payload?.id !== session.sessionId) return;
+            term.reset();
+            if (session.exited) {
+                session.exited = false;
+                setStatus('已连接终端', 'connected');
+            }
         });
         const unsubscribeExit = api.onTerminalExit?.((payload) => {
             if (payload?.id !== session.sessionId) return;
diff --git a/tests/side-pane-terminal-lifecycle.test.mjs b/tests/side-pane-terminal-lifecycle.test.mjs
index e3b82b72a..f38b311e2 100644
--- a/tests/side-pane-terminal-lifecycle.test.mjs
+++ b/tests/side-pane-terminal-lifecycle.test.mjs
@@ -230,3 +230,18 @@ test('a live terminal view holds its buttons and size observer through the view
         assert.deepEqual(h.killed, [], 'the shell itself keeps running');
     } finally { await h.cleanup(); }
 });
+
+test('a shared shell restarted elsewhere brings the exited tab back to connected', async () => {
+    const h = fixture();
+    try {
+        await h.provider.openTerminalTab();
+        await until(() => h.status().dataset.state === 'connected');
+        h.listeners.get('exit')({ id: 'view:1', exitCode: 0 });
+        assert.equal(h.status().dataset.state, 'exited');
+        // AI 跑命令或托盘终端重启：主进程起了新 PTY，只推一次清屏
+        h.listeners.get('clear')({ id: 'view:1' });
+        assert.equal(h.status().dataset.state, 'connected');
+        h.listeners.get('clear')({ id: 'view:other' });
+        assert.equal(h.status().dataset.state, 'connected');
+    } finally { await h.cleanup(); }
+});
diff --git a/tests/terminal-cd-command.test.js b/tests/terminal-cd-command.test.js
new file mode 100644
index 000000000..5f527c3b9
--- /dev/null
+++ b/tests/terminal-cd-command.test.js
@@ -0,0 +1,29 @@
+'use strict';
+
+// 侧栏终端「跳转到工作区」打到共享终端里的命令
+const test = require('node:test');
+const assert = require('node:assert/strict');
+const Module = require('node:module');
+
+const originalLoad = Module._load;
+Module._load = function loadWithElectronMock(request, parent, isMain) {
+    if (request === 'electron') return { ipcMain: { handle() {}, removeHandler() {}, on() {} }, BrowserWindow: class {}, clipboard: {}, shell: {} };
+    return originalLoad.call(this, request, parent, isMain);
+};
+const { buildChangeDirectoryCommand } = require('../modules/ipc/terminalHandlers');
+Module._load = originalLoad;
+
+test('the jump command is typed but not submitted', () => {
+    // 前台可能是 vim / python / 密码提示：不替用户按回车
+    for (const platform of ['win32', 'linux', 'darwin']) {
+        assert.doesNotMatch(buildChangeDirectoryCommand('/w', platform), /[\r\n]$/);
+    }
+});
+
+test('PowerShell quoting doubles typographic single quotes too', () => {
+    // PowerShell 把 ‘ ’ ‚ ‛ 当单引号；不转义的话目录名能提前结束字符串，后面的部分会被当成命令执行
+    const dir = 'D:\\a\u2019; calc; \u2018b';
+    assert.equal(buildChangeDirectoryCommand(dir, 'win32'), "Set-Location -LiteralPath 'D:\\a\u2019\u2019; calc; \u2018\u2018b'");
+    assert.equal(buildChangeDirectoryCommand("D:\\Tom's \u201Aapp\u201B", 'win32'), "Set-Location -LiteralPath 'D:\\Tom''s \u201A\u201Aapp\u201B\u201B'");
+    assert.equal(buildChangeDirectoryCommand("/home/tom's", 'linux'), "cd '/home/tom'\\''s'");
+});

From a286784655ee0f434b9eeebbcd2ba54300865020 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 01:44:52 +0000
Subject: [PATCH 062/143] Side chat: a failed send gives the draft back even if
 the words were sent before
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Whether to refill the composer was decided by looking for any user message
with the same text. After sending '继续' once, a later '继续' with
attachments that failed in transport was treated as still in history, and
the draft, attachments and references were lost. Only user messages added
since this send started count now, as the main chat does by message id.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DFRovoZHMzeheXKkLNWKG
---
 .../contracts/generated/chat-event-graph.json | 16 +++----
 modules/renderer/sideChatSurfaceOwner.js      |  7 ++-
 tests/side-chat-interactive-submit.test.mjs   | 45 +++++++++++++++++++
 3 files changed, 58 insertions(+), 10 deletions(-)

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 642bbd565..d32b758bc 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -3674,12 +3674,12 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 562,
+          "line": 565,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 565,
+          "line": 568,
           "kind": "custom-event-listener"
         },
         {
@@ -5134,13 +5134,13 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 562,
+          "line": 565,
           "kind": "custom-event-listener",
           "match": "stopBtn.addEventListener('click'"
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 565,
+          "line": 568,
           "kind": "custom-event-listener",
           "match": "persistenceBadge.addEventListener('click'"
         },
@@ -7268,7 +7268,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 569,
+          "line": 572,
           "kind": "custom-event-listener"
         },
         {
@@ -7400,7 +7400,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 569,
+          "line": 572,
           "kind": "custom-event-listener",
           "match": "persistenceBadge.addEventListener('contextmenu'"
         },
@@ -28037,7 +28037,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 561,
+          "line": 564,
           "kind": "custom-event-listener"
         },
         {
@@ -28097,7 +28097,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 561,
+          "line": 564,
           "kind": "custom-event-listener",
           "match": "form.addEventListener('submit'"
         },
diff --git a/modules/renderer/sideChatSurfaceOwner.js b/modules/renderer/sideChatSurfaceOwner.js
index aa2a63c33..9073af3c6 100644
--- a/modules/renderer/sideChatSurfaceOwner.js
+++ b/modules/renderer/sideChatSurfaceOwner.js
@@ -421,10 +421,13 @@ export async function mountSideChatSurface(container, {
         scrollingOwner.resume();
         pinToBottomIfSticky();
 
-        // 已经进入历史的一轮（例如中途停止）不再回填，避免重复发送
+        // 已经进入历史的一轮（例如中途停止）不再回填，避免重复发送。只看这次新增的用户消息：
+        // 以前发过同样的文字（比如「继续」）不代表这一轮还在，否则这次的草稿、附件和引用会一起丢掉
+        const userMessagesBefore = new Set((enhancedConversation?.historyRef?.get?.() || [])
+            .filter(msg => msg?.role === 'user').map(msg => msg.id ?? msg));
         const restoreDraftIfRetracted = () => {
             const history = enhancedConversation?.historyRef?.get?.() || [];
-            if (history.some(msg => msg?.role === 'user' && msg.content === payload)) return;
+            if (history.some(msg => msg?.role === 'user' && !userMessagesBefore.has(msg.id ?? msg))) return;
             restoreDraft();
         };
 
diff --git a/tests/side-chat-interactive-submit.test.mjs b/tests/side-chat-interactive-submit.test.mjs
index 2992f0d47..85b2cbdde 100644
--- a/tests/side-chat-interactive-submit.test.mjs
+++ b/tests/side-chat-interactive-submit.test.mjs
@@ -88,3 +88,48 @@ test('a message button does not overwrite or send a typed draft', async () => {
         assert.equal(f.sends.length, 1);
     } finally { await f.cleanup(); }
 });
+
+test('a failed send puts the draft back even when the same words were sent successfully before', async () => {
+    const dom = new JSDOM('<div id="mount"></div>');
+    const doc = dom.window.document;
+    let history = [
+        { id: 'u-old', role: 'user', content: '继续' },
+        { id: 'a-old', role: 'assistant', content: '好的' }
+    ];
+    const handle = await mountSideChatSurface(doc.getElementById('mount'), {
+        descriptor: {
+            id: 'side', title: '侧聊', model: 'model', contextMode: 'references-only',
+            parent: { itemId: 'agent', topicId: 'parent' }, child: { itemId: 'agent', topicId: 'child' }
+        },
+        chatCapabilities: {
+            repository: { getHistory: async () => history, saveHistory: async () => ({ success: true }) },
+            uiHelper: { showToastNotification() {} },
+            // 传输失败：这一轮的用户消息已经按 id 撤回，历史里只剩以前那条同样的「继续」
+            manager: { async sendMessage() { return { terminal: { event: { type: 'failed', outcome: { transport: { error: 'network down' } } } } }; } },
+            createRenderer({ conversation }) {
+                return {
+                    renderer: { renderHistory: async () => {} },
+                    conversation: {
+                        selectedItemRef: { get: () => conversation.selectedItem },
+                        topicIdRef: { get: () => conversation.topicId },
+                        historyRef: { get: () => history, set: next => { history = next; } },
+                        replaceHistory: next => { history = next; }
+                    },
+                    dispose: async () => {}
+                };
+            }
+        }
+    });
+    try {
+        await settle();
+        const textarea = doc.querySelector('.side-chat-textarea');
+        textarea.value = '继续';
+        doc.querySelector('form').requestSubmit();
+        await settle();
+        await settle();
+        assert.equal(textarea.value, '继续', 'the draft that failed to send is back in the composer');
+    } finally {
+        await handle.dispose();
+        dom.window.close();
+    }
+});

From 8c5fd7effe402d334f6f2124ab8c6ccd5059b1de Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 01:46:01 +0000
Subject: [PATCH 063/143] Side browser: make the more menu reachable by
 keyboard

The menu sits after the webview in the DOM and focus stayed on the more
button, so Tab went into the page, the window blurred and the menu
closed: open externally, DevTools and clear data were unreachable by
keyboard. Opening now focuses the first enabled item, arrows move, and
Escape or Tab close it back onto the button, which reports aria-haspopup
and aria-expanded (Radix DropdownMenu behaviour, as ZCode uses).

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_016hW799u5Ji5k9khDAwu688
---
 .../side-pane/browserSideProvider.js          | 39 +++++++++++++++++--
 tests/side-browser-address.test.mjs           | 39 +++++++++++++++++++
 2 files changed, 74 insertions(+), 4 deletions(-)

diff --git a/modules/ui-system/side-pane/browserSideProvider.js b/modules/ui-system/side-pane/browserSideProvider.js
index b159da1e5..74e7a2bb2 100644
--- a/modules/ui-system/side-pane/browserSideProvider.js
+++ b/modules/ui-system/side-pane/browserSideProvider.js
@@ -404,7 +404,38 @@ export function createBrowserSideProvider({
                 webview?.focus?.();
             };
 
-            const closeMenu = () => { menu.hidden = true; };
+            // 键盘打开后焦点进菜单：菜单在 DOM 里排在 webview 后面，焦点留在按钮上时 Tab 会先进网页、窗口失焦、菜单收起，
+            // 菜单项就永远够不着。方向键 / Esc / Tab 的处理同标签右键菜单（Radix Menu 的行为）
+            moreBtn.setAttribute('aria-haspopup', 'menu');
+            moreBtn.setAttribute('aria-expanded', 'false');
+            const closeMenu = ({ restoreFocus = false } = {}) => {
+                menu.hidden = true;
+                moreBtn.setAttribute('aria-expanded', 'false');
+                if (restoreFocus) moreBtn.focus();
+            };
+            const openMenu = () => {
+                syncControls();
+                menu.hidden = false;
+                moreBtn.setAttribute('aria-expanded', 'true');
+                menu.querySelector('[role="menuitem"]:not([disabled])')?.focus();
+            };
+            own.listen(menu, 'keydown', (event) => {
+                if (event.key === 'Escape' || event.key === 'Tab') {
+                    event.preventDefault();
+                    closeMenu({ restoreFocus: true });
+                    return;
+                }
+                if (!['ArrowDown', 'ArrowUp', 'Home', 'End'].includes(event.key)) return;
+                const items = Array.from(menu.querySelectorAll('[role="menuitem"]:not([disabled])'));
+                if (!items.length) return;
+                event.preventDefault();
+                const current = items.indexOf(doc.activeElement);
+                const next = event.key === 'Home' ? 0
+                    : event.key === 'End' ? items.length - 1
+                        : event.key === 'ArrowDown' ? (current + 1) % items.length
+                            : (current - 1 + items.length) % items.length;
+                items[next].focus();
+            });
             const onDocumentPointerDown = (event) => {
                 if (!menu.hidden && !menu.contains(event.target) && !moreBtn.contains(event.target)) closeMenu();
             };
@@ -430,13 +461,13 @@ export function createBrowserSideProvider({
                 else reload();
             });
             own.listen(moreBtn, 'click', () => {
-                syncControls();
-                menu.hidden = !menu.hidden;
+                if (menu.hidden) openMenu();
+                else closeMenu();
             });
             own.listen(menu, 'click', async (event) => {
                 const item = event.target.closest('[data-action]');
                 if (!item || item.disabled) return;
-                closeMenu();
+                closeMenu({ restoreFocus: menu.contains(doc.activeElement) });
                 const action = item.getAttribute('data-action');
                 if (action === 'open-external') {
                     const res = await api?.browserOpenExternal?.(currentUrl);
diff --git a/tests/side-browser-address.test.mjs b/tests/side-browser-address.test.mjs
index e0ea320d9..b0ed426cc 100644
--- a/tests/side-browser-address.test.mjs
+++ b/tests/side-browser-address.test.mjs
@@ -184,3 +184,42 @@ for (const readyBeforeFailure of [false, true]) {
         } finally { await h.cleanup(); }
     });
 }
+
+test('the more menu is keyboard reachable: focus moves in, arrows move, Escape and Tab return to the button', async () => {
+    const { JSDOM } = await import('jsdom');
+    const { createBrowserSideProvider } = await import('../modules/ui-system/side-pane/browserSideProvider.js');
+    const dom = new JSDOM('<div id="view"></div>');
+    const doc = dom.window.document;
+    const provider = createBrowserSideProvider({ document: doc, api: null, sidePaneController: { updateTab() {} }, notify: () => {} });
+    const handle = await provider.mountTab({ id: 'browser:1', kind: 'browser', payload: {} }, doc.getElementById('view'));
+    try {
+        handle.navigate('https://example.com/');
+        const more = doc.querySelector('[aria-label="更多浏览器操作"]');
+        const menu = doc.querySelector('.side-browser-menu');
+        const key = k => doc.activeElement.dispatchEvent(new dom.window.KeyboardEvent('keydown', { key: k, bubbles: true, cancelable: true }));
+        assert.equal(more.getAttribute('aria-haspopup'), 'menu');
+        assert.equal(more.getAttribute('aria-expanded'), 'false');
+
+        more.focus();
+        more.click();
+        assert.equal(menu.hidden, false);
+        assert.equal(more.getAttribute('aria-expanded'), 'true');
+        assert.equal(doc.activeElement.getAttribute('data-action'), 'open-external', 'focus moves into the menu');
+        key('ArrowDown');
+        assert.equal(doc.activeElement.getAttribute('data-action'), 'clear-data', 'disabled devtools item is skipped');
+        key('ArrowDown');
+        assert.equal(doc.activeElement.getAttribute('data-action'), 'open-external');
+        key('Escape');
+        assert.equal(menu.hidden, true);
+        assert.equal(doc.activeElement, more);
+
+        more.click();
+        key('Tab');
+        assert.equal(menu.hidden, true);
+        assert.equal(doc.activeElement, more);
+        assert.equal(more.getAttribute('aria-expanded'), 'false');
+    } finally {
+        handle.dispose();
+        dom.window.close();
+    }
+});

From 3059799f0a1e14218f85780db1d4684c0c9fa56a Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 01:46:40 +0000
Subject: [PATCH 064/143] Revert "UI system gate: take the integration branch's
 tool presentation and component styles"

This reverts commit 1ba83fb3fdfc8637265d613a8e624c17d002a892.
---
 styles/ui-system/components.css        |   4 +-
 styles/ui-system/tool-presentation.css | 196 ++++++++++++-------------
 2 files changed, 100 insertions(+), 100 deletions(-)

diff --git a/styles/ui-system/components.css b/styles/ui-system/components.css
index ddff52098..418b7df8b 100644
--- a/styles/ui-system/components.css
+++ b/styles/ui-system/components.css
@@ -541,8 +541,8 @@
     }
 
     :is(html, html.vcp-global-settings-host) .vcp-ui-scope .vcp-ui-window-control-pin.is-pinned {
-        color: var(--vcp-ui-accent);
-        background: color-mix(in srgb, var(--vcp-ui-accent) 16%, transparent);
+        color: var(--vcp-ui-primary, #6366f1);
+        background: var(--vcp-ui-primary-bg, rgba(99, 102, 241, 0.16));
     }
 
     :is(html, html.vcp-global-settings-host) .vcp-ui-scope .vcp-ui-window-control-pin.is-pinned .vcp-ui-icon,
diff --git a/styles/ui-system/tool-presentation.css b/styles/ui-system/tool-presentation.css
index be8a90316..436a2e39c 100644
--- a/styles/ui-system/tool-presentation.css
+++ b/styles/ui-system/tool-presentation.css
@@ -1,12 +1,12 @@
 /* Optional presentation; Legacy is untouched. Theme and typography stay owned
  * by the existing appearance profile, including role wallpapers. */
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="compact"],
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="grouped"] {
+html[data-ui-mode="next"] [data-vcp-tool-presentation="compact"],
+html[data-ui-mode="next"] [data-vcp-tool-presentation="grouped"] {
     --vcp-tool-row-height: 38px;
 }
-html[data-ui-mode="next"][data-vcp-density="compact"] .vcp-ui-scope [data-vcp-tool-presentation] { --vcp-tool-row-height: 32px; }
-html[data-ui-mode="next"][data-vcp-density="relaxed"] .vcp-ui-scope [data-vcp-tool-presentation] { --vcp-tool-row-height: 44px; }
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented {
+html[data-ui-mode="next"][data-vcp-density="compact"] [data-vcp-tool-presentation] { --vcp-tool-row-height: 32px; }
+html[data-ui-mode="next"][data-vcp-density="relaxed"] [data-vcp-tool-presentation] { --vcp-tool-row-height: 44px; }
+html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented {
     --vcp-tool-presented-font-family: var(--vcp-tool-card-font-family, var(--vcp-chat-font-family));
     --vcp-tool-presented-font-size: var(--vcp-ui-text-caption, 13px);
     --vcp-tool-presented-white-space: normal;
@@ -32,11 +32,11 @@ html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-p
     color: var(--vcp-ui-text-primary);
     font-family: var(--vcp-tool-card-font-family, inherit);
 }
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented::before,
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented::after { display: none; }
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-summary,
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-result-header,
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-call-summary-header {
+html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented::before,
+html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented::after { display: none; }
+html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-summary,
+html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-result-header,
+html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-call-summary-header {
     display: flex;
     gap: 5px;
     padding: 0;
@@ -47,7 +47,7 @@ html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-p
     min-width: 0;
     flex-wrap: nowrap;
 }
-html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-toggle, html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-toggle {
+html[data-ui-mode="next"] .vcp-tool-row-toggle, html[data-ui-mode="next"] .vcp-tool-process-toggle {
     display: flex;
     width: 100%;
     min-width: 0;
@@ -65,13 +65,13 @@ html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-toggle, html[data-ui-mode=
     cursor: pointer;
     text-align: left;
 }
-html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-result-header > .vcp-tool-row-toggle {
+html[data-ui-mode="next"] .vcp-tool-result-header > .vcp-tool-row-toggle {
     width: auto;
     flex: 1;
 }
-html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-toggle:hover, html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-toggle:hover { background: var(--vcp-ui-bg-2); }
-html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-toggle:focus-visible, html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-toggle:focus-visible, html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-artifact:focus-visible { outline: 2px solid var(--vcp-ui-accent); outline-offset: -2px; }
-html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-chevron {
+html[data-ui-mode="next"] .vcp-tool-row-toggle:hover, html[data-ui-mode="next"] .vcp-tool-process-toggle:hover { background: var(--vcp-ui-bg-2); }
+html[data-ui-mode="next"] .vcp-tool-row-toggle:focus-visible, html[data-ui-mode="next"] .vcp-tool-process-toggle:focus-visible, html[data-ui-mode="next"] .vcp-tool-process-artifact:focus-visible { outline: 2px solid var(--vcp-ui-accent); outline-offset: -2px; }
+html[data-ui-mode="next"] .vcp-tool-row-chevron {
     width: 7px;
     height: 7px;
     flex: 0 0 7px;
@@ -79,44 +79,44 @@ html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-chevron {
     border-bottom: 1.5px solid currentColor;
     transform: rotate(-45deg);
 }
-html[data-ui-mode="next"] .vcp-ui-scope [aria-expanded="true"] > .vcp-tool-row-chevron { transform: rotate(45deg); }
-html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-title { overflow-wrap: anywhere; min-width: 0; color: var(--vcp-ui-text-primary); }
-html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-resource { overflow-wrap: anywhere; min-width: 0; font-size: var(--vcp-ui-text-sm, 12px); }
-html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-state { margin-left: auto; white-space: nowrap; font-size: var(--vcp-ui-text-sm, 12px); }
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-state="success"] .vcp-tool-row-state { color: var(--vcp-ui-success); }
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-state="failed"] .vcp-tool-row-state { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-state="waiting"] .vcp-tool-row-state,
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-state="stopped"] .vcp-tool-row-state { color: var(--vcp-ui-warning, var(--vcp-ui-palette-amber)); }
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-state="running"] .vcp-tool-row-state { color: var(--vcp-ui-accent); }
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-delete-btn { flex: 0 0 24px; margin-right: 6px; opacity: 0; }
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-header:hover .vcp-tool-result-delete-btn,
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-header:focus-within .vcp-tool-result-delete-btn { opacity: 1; }
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="compact"] .vcp-role-divider,
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="grouped"] .vcp-role-divider { margin: 4px 0; font-size: var(--vcp-ui-text-xs, 11px); }
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-details { max-height: 360px; overflow: auto; }
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-details,
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-result-collapsible-content,
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-call-summary-content {
+html[data-ui-mode="next"] [aria-expanded="true"] > .vcp-tool-row-chevron { transform: rotate(45deg); }
+html[data-ui-mode="next"] .vcp-tool-row-title { overflow-wrap: anywhere; min-width: 0; color: var(--vcp-ui-text-primary); }
+html[data-ui-mode="next"] .vcp-tool-row-resource { overflow-wrap: anywhere; min-width: 0; font-size: var(--vcp-ui-text-sm, 12px); }
+html[data-ui-mode="next"] .vcp-tool-row-state { margin-left: auto; white-space: nowrap; font-size: var(--vcp-ui-text-sm, 12px); }
+html[data-ui-mode="next"] [data-vcp-tool-state="success"] .vcp-tool-row-state { color: var(--vcp-ui-success); }
+html[data-ui-mode="next"] [data-vcp-tool-state="failed"] .vcp-tool-row-state { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
+html[data-ui-mode="next"] [data-vcp-tool-state="waiting"] .vcp-tool-row-state,
+html[data-ui-mode="next"] [data-vcp-tool-state="stopped"] .vcp-tool-row-state { color: var(--vcp-ui-warning, var(--vcp-ui-palette-amber)); }
+html[data-ui-mode="next"] [data-vcp-tool-state="running"] .vcp-tool-row-state { color: var(--vcp-ui-accent); }
+html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-delete-btn { flex: 0 0 24px; margin-right: 6px; opacity: 0; }
+html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-header:hover .vcp-tool-result-delete-btn,
+html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-header:focus-within .vcp-tool-result-delete-btn { opacity: 1; }
+html[data-ui-mode="next"] [data-vcp-tool-presentation="compact"] .vcp-role-divider,
+html[data-ui-mode="next"] [data-vcp-tool-presentation="grouped"] .vcp-role-divider { margin: 4px 0; font-size: 11px; }
+html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented .vcp-tool-result-details { max-height: 360px; overflow: auto; }
+html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-details,
+html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-result-collapsible-content,
+html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented > .vcp-tool-call-summary-content {
     margin: 0;
     padding: 6px 12px 12px 28px;
     background: transparent;
     border: 0;
     min-width: 0;
 }
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-details,
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-result-collapsible-content,
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-call-summary-content { display: none; }
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-details,
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-result-collapsible-content,
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-call-summary-content { display: block; }
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation] .vcp-tool-presented pre {
+html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-details,
+html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-result-collapsible-content,
+html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented:not(.expanded) > .vcp-tool-call-summary-content { display: none; }
+html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-details,
+html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-result-collapsible-content,
+html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented.expanded > .vcp-tool-call-summary-content { display: block; }
+html[data-ui-mode="next"] [data-vcp-tool-presentation] .vcp-tool-presented pre {
     white-space: pre-wrap;
     overflow-wrap: anywhere;
     min-width: 0;
     max-height: 320px;
     overflow: auto;
 }
-html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process {
+html[data-ui-mode="next"] .vcp-tool-process {
     border: 1px solid var(--vcp-ui-border);
     border-radius: var(--vcp-ui-radius-md, 8px);
     margin: 10px 0;
@@ -124,12 +124,12 @@ html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process {
     overflow: hidden;
     background: var(--vcp-ui-bg-0);
 }
-html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-toggle { background: var(--vcp-ui-bg-1); border-radius: 0; }
-html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-title { min-width: 0; overflow-wrap: anywhere; }
-html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-stats { margin-left: auto; font-size: var(--vcp-ui-text-sm, 12px); overflow-wrap: anywhere; }
-html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-body[hidden] { display: none; }
-html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-body > .vcp-tool-presented { margin: 0; border-top: 1px solid var(--vcp-ui-border); }
-html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-artifact {
+html[data-ui-mode="next"] .vcp-tool-process-toggle { background: var(--vcp-ui-bg-1); border-radius: 0; }
+html[data-ui-mode="next"] .vcp-tool-process-title { min-width: 0; overflow-wrap: anywhere; }
+html[data-ui-mode="next"] .vcp-tool-process-stats { margin-left: auto; font-size: var(--vcp-ui-text-sm, 12px); overflow-wrap: anywhere; }
+html[data-ui-mode="next"] .vcp-tool-process-body[hidden] { display: none; }
+html[data-ui-mode="next"] .vcp-tool-process-body > .vcp-tool-presented { margin: 0; border-top: 1px solid var(--vcp-ui-border); }
+html[data-ui-mode="next"] .vcp-tool-process-artifact {
     color: var(--vcp-ui-text-accent);
     background: transparent;
     border: 0;
@@ -142,20 +142,20 @@ html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-artifact {
     cursor: pointer;
 }
 @media (max-width: 640px) {
-    html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-toggle { flex-wrap: wrap; gap: 6px; }
-    html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-row-state { margin-left: auto; }
-    html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-toggle { flex-wrap: wrap; }
-    html[data-ui-mode="next"] .vcp-ui-scope .vcp-tool-process-stats { margin-left: 16px; }
+    html[data-ui-mode="next"] .vcp-tool-row-toggle { flex-wrap: wrap; gap: 6px; }
+    html[data-ui-mode="next"] .vcp-tool-row-state { margin-left: auto; }
+    html[data-ui-mode="next"] .vcp-tool-process-toggle { flex-wrap: wrap; }
+    html[data-ui-mode="next"] .vcp-tool-process-stats { margin-left: 16px; }
 }
 
 /* 单行合并 / 整轮折叠：无框单行，一次调用一行；紧跟的同名结果收进请求行，展开后才显示。 */
-html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) {
+html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) {
     --vcp-tool-call-color: var(--vcp-ui-text-3, var(--vcp-ui-text-secondary));
     --vcp-tool-call-hover: var(--vcp-ui-text-2, var(--vcp-ui-text-secondary));
 }
-html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-role-divider { margin: 4px 0; font-size: var(--vcp-ui-text-xs, 11px); }
-html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-presented { margin: 2px 0; }
-html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) {
+html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-role-divider { margin: 4px 0; font-size: 11px; }
+html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-presented { margin: 2px 0; }
+html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) {
     width: auto;
     max-width: 100%;
     min-height: 24px;
@@ -168,10 +168,10 @@ html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"
     color: var(--vcp-tool-call-color);
     transition: color .1s;
 }
-html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle):hover { background: transparent; color: var(--vcp-tool-call-hover); }
-html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle .vcp-tool-row-title, .vcp-tool-process-title) { flex: none; color: inherit; white-space: nowrap; }
-html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-process-stats { min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; overflow-wrap: normal; }
-html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-toggle .vcp-tool-row-resource {
+html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle):hover { background: transparent; color: var(--vcp-tool-call-hover); }
+html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle .vcp-tool-row-title, .vcp-tool-process-title) { flex: none; color: inherit; white-space: nowrap; }
+html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-process-stats { min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; overflow-wrap: normal; }
+html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-toggle .vcp-tool-row-resource {
     min-width: 0;
     overflow: hidden;
     text-overflow: ellipsis;
@@ -179,20 +179,20 @@ html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"
     overflow-wrap: normal;
     font-size: inherit;
 }
-html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-toggle .vcp-tool-row-state { flex: none; margin-left: 0; color: inherit; }
-html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-icon { display: inline-flex; flex: none; width: 16px; height: 16px; }
-html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-icon svg { width: 100%; height: 100%; }
-html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-diff { flex: none; font-family: var(--vcp-ui-font-mono, ui-monospace, Consolas, monospace); font-size: var(--vcp-ui-text-xs, 11px); }
-html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle:hover, [aria-expanded="true"]) .vcp-tool-row-diff-add { color: var(--vcp-ui-success); }
-html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle:hover, [aria-expanded="true"]) .vcp-tool-row-diff-del { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
+html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-toggle .vcp-tool-row-state { flex: none; margin-left: 0; color: inherit; }
+html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-icon { display: inline-flex; flex: none; width: 16px; height: 16px; }
+html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-icon svg { width: 100%; height: 100%; }
+html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-row-diff { flex: none; font-family: var(--vcp-ui-font-mono, ui-monospace, Consolas, monospace); font-size: 11px; }
+html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle:hover, [aria-expanded="true"]) .vcp-tool-row-diff-add { color: var(--vcp-ui-success); }
+html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) :is(.vcp-tool-row-toggle:hover, [aria-expanded="true"]) .vcp-tool-row-diff-del { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
 /* 并入请求行的结果：收起时不占位，展开后只留一个小标题“输出”。
- * 旧层给结果气泡写了强制的 display:block（important 级），这里只能藏标题、去掉外边距，正文由上面的收起规则隐藏。 */
-html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"]:not(.expanded) { margin: 0; }
-html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"]:not(.expanded) > .vcp-tool-result-header { display: none; }
-html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"] .vcp-tool-row-toggle { min-height: 20px; padding-left: 24px; font-size: var(--vcp-ui-text-sm, 12px); }
-html[data-ui-mode="next"] .vcp-ui-scope :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-presented > :is(.vcp-tool-details, .vcp-tool-result-collapsible-content, .vcp-tool-call-summary-content) { padding: 8px 0 4px 24px; }
+ * 旧层给结果气泡写了 display:block !important，这里只能藏标题、去掉外边距，正文由上面的收起规则隐藏。 */
+html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"]:not(.expanded) { margin: 0; }
+html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"]:not(.expanded) > .vcp-tool-result-header { display: none; }
+html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-merged="true"] .vcp-tool-row-toggle { min-height: 20px; padding-left: 24px; font-size: var(--vcp-ui-text-sm, 12px); }
+html[data-ui-mode="next"] :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) .vcp-tool-presented > :is(.vcp-tool-details, .vcp-tool-result-collapsible-content, .vcp-tool-call-summary-content) { padding: 8px 0 4px 24px; }
 /* 等待结果时动作词的微光，只在回复生成中出现。 */
-html[data-ui-mode="next"] .vcp-ui-scope .message-item.streaming :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-pending="true"] .vcp-tool-row-title {
+html[data-ui-mode="next"] .message-item.streaming :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-pending="true"] .vcp-tool-row-title {
     background: linear-gradient(90deg, var(--vcp-tool-call-color) 0%, var(--vcp-ui-text-primary) 50%, var(--vcp-tool-call-color) 100%);
     background-size: 200% 100%;
     -webkit-background-clip: text;
@@ -202,33 +202,33 @@ html[data-ui-mode="next"] .vcp-ui-scope .message-item.streaming :is([data-vcp-to
 }
 @keyframes vcp-tool-call-shimmer { from { background-position: 100% 0; } to { background-position: -100% 0; } }
 @media (prefers-reduced-motion: reduce) {
-    html[data-ui-mode="next"] .vcp-ui-scope .message-item.streaming :is([data-vcp-tool-presentation="inline"], [data-vcp-tool-presentation="process"]) [data-vcp-tool-pending="true"] .vcp-tool-row-title { animation: none; }
+    html[data-ui-mode="next"] [data-vcp-tool-pending="true"] .vcp-tool-row-title { animation: none !important; }
 }
 
 /* 单行合并：动作词加粗，箭头在行尾、悬停或展开时出现；问题状态用虚线下划线，悬停看报错。 */
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) { font-size: var(--vcp-ui-text-body, 14px); }
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle .vcp-tool-row-title, .vcp-tool-process-title) { font-weight: 500; }
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) > .vcp-tool-row-chevron { order: 1; opacity: 0; transition: opacity .2s, transform .2s; }
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle):is(:hover, [aria-expanded="true"]) > .vcp-tool-row-chevron { opacity: 1; }
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] [data-vcp-tool-call-state] .vcp-tool-row-state { text-decoration: underline dotted; text-underline-offset: 2px; cursor: help; }
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] { margin: 2px 0; border: 0; border-radius: 0; background: transparent; overflow: visible; }
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] .vcp-tool-process-stats { margin-left: 0; font-size: inherit; }
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-body { margin: 4px 0 4px 8px; padding-left: 14px; border-left: 1px solid var(--vcp-ui-border); }
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-body > .vcp-tool-presented { margin: 2px 0; border-top: 0; }
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-artifact { border-top: 0; padding: 4px 0 4px 22px; }
+html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) { font-size: var(--vcp-ui-text-body, 14px); }
+html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle .vcp-tool-row-title, .vcp-tool-process-title) { font-weight: 500; }
+html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle) > .vcp-tool-row-chevron { order: 1; opacity: 0; transition: opacity .2s, transform .2s; }
+html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] :is(.vcp-tool-row-toggle, .vcp-tool-process-toggle):is(:hover, [aria-expanded="true"]) > .vcp-tool-row-chevron { opacity: 1; }
+html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] [data-vcp-tool-call-state] .vcp-tool-row-state { text-decoration: underline dotted; text-underline-offset: 2px; cursor: help; }
+html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] { margin: 2px 0; border: 0; border-radius: 0; background: transparent; overflow: visible; }
+html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] .vcp-tool-process-stats { margin-left: 0; font-size: inherit; }
+html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-body { margin: 4px 0 4px 8px; padding-left: 14px; border-left: 1px solid var(--vcp-ui-border); }
+html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-body > .vcp-tool-presented { margin: 2px 0; border-top: 0; }
+html[data-ui-mode="next"] [data-vcp-tool-presentation="inline"] .vcp-tool-process[data-variant="inline"] > .vcp-tool-process-artifact { border-top: 0; padding: 4px 0 4px 22px; }
 
 /* 整轮折叠：图标悬停换成箭头，标题与摘要之间用小圆点分隔，失败时摘要显示红色报错首行。 */
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle { gap: 0; font-size: var(--vcp-ui-text-caption, 13px); }
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-leading { position: relative; display: inline-flex; flex: none; width: 16px; height: 16px; margin-right: 6px; align-items: center; justify-content: center; }
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-leading .vcp-tool-row-icon { width: 14px; height: 14px; transition: opacity .1s; }
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-leading .vcp-tool-row-chevron { position: absolute; inset: 0; margin: auto; opacity: 0; }
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle:is(:hover, [aria-expanded="true"]) .vcp-tool-row-leading .vcp-tool-row-icon { opacity: 0; }
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle:is(:hover, [aria-expanded="true"]) .vcp-tool-row-leading .vcp-tool-row-chevron { opacity: 1; }
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-dot { flex: none; width: 2px; height: 2px; margin: 0 8px; border-radius: 1px; background: currentColor; opacity: .7; }
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle :is(.vcp-tool-row-state, .vcp-tool-row-diff) { margin-left: 10px; }
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] [data-vcp-tool-call-state="failed"] .vcp-tool-row-toggle .vcp-tool-row-resource { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] { margin: 4px 0 10px; border: 0; border-radius: 0; background: transparent; overflow: visible; }
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-toggle {
+html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle { gap: 0; font-size: var(--vcp-ui-text-caption, 13px); }
+html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-leading { position: relative; display: inline-flex; flex: none; width: 16px; height: 16px; margin-right: 6px; align-items: center; justify-content: center; }
+html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-leading .vcp-tool-row-icon { width: 14px; height: 14px; transition: opacity .1s; }
+html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-leading .vcp-tool-row-chevron { position: absolute; inset: 0; margin: auto; opacity: 0; }
+html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle:is(:hover, [aria-expanded="true"]) .vcp-tool-row-leading .vcp-tool-row-icon { opacity: 0; }
+html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle:is(:hover, [aria-expanded="true"]) .vcp-tool-row-leading .vcp-tool-row-chevron { opacity: 1; }
+html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-dot { flex: none; width: 2px; height: 2px; margin: 0 8px; border-radius: 1px; background: currentColor; opacity: .7; }
+html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-row-toggle :is(.vcp-tool-row-state, .vcp-tool-row-diff) { margin-left: 10px; }
+html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] [data-vcp-tool-call-state="failed"] .vcp-tool-row-toggle .vcp-tool-row-resource { color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
+html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] { margin: 4px 0 10px; border: 0; border-radius: 0; background: transparent; overflow: visible; }
+html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-toggle {
     width: 100%;
     min-height: 33px;
     padding: 0 0 8px;
@@ -236,8 +236,8 @@ html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .
     border-bottom: .5px solid var(--vcp-ui-border);
     font-size: var(--vcp-ui-text-body, 14px);
 }
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-toggle > .vcp-tool-row-chevron { order: 1; }
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] .vcp-tool-process-stats { margin-left: 0; color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-body { padding-top: 8px; }
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-body > .vcp-tool-presented { margin: 2px 0; border-top: 0; }
-html[data-ui-mode="next"] .vcp-ui-scope [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-artifact { border-top: 0; padding: 6px 0; }
+html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-toggle > .vcp-tool-row-chevron { order: 1; }
+html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] .vcp-tool-process-stats { margin-left: 0; color: var(--vcp-ui-danger, var(--vcp-ui-palette-red)); }
+html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-body { padding-top: 8px; }
+html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-body > .vcp-tool-presented { margin: 2px 0; border-top: 0; }
+html[data-ui-mode="next"] [data-vcp-tool-presentation="process"] .vcp-tool-process[data-variant="turn"] > .vcp-tool-process-artifact { border-top: 0; padding: 6px 0; }

From 342714fb77063eac621b6f939edafdb31254dcf5 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 01:47:39 +0000
Subject: [PATCH 065/143] Terminal: canvas colours come from the mounted frame;
 PSReadLine redraws lose grey blocks

The xterm theme was read from a screen node not yet in the document (and
from the stash while dormant), so CSS never applied and the canvas used the
hard-coded fallback, leaving a visible band against the frame under custom
themes. The theme is now computed after the screen is placed in the pane,
deferred while it sits in the stash, and only reassigned when the colours
actually change (body class flips during a divider drag forced a full xterm
repaint each time).

PSReadLine pads the rest of the edited line with ANSI black (40m), which is
not the pane background, so a grey bar trailed the prompt. Ported ZCode's
normalizePowerShellReadlineRedraw for PowerShell sessions.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DFRovoZHMzeheXKkLNWKG
---
 .../contracts/generated/chat-event-graph.json | 21 +++++----
 .../side-pane/terminalDataTransform.js        | 43 +++++++++++++++++
 .../side-pane/terminalSideProvider.js         | 22 ++++++++-
 tests/side-pane-terminal-theme.test.mjs       | 47 +++++++++++++++++++
 4 files changed, 121 insertions(+), 12 deletions(-)
 create mode 100644 modules/ui-system/side-pane/terminalDataTransform.js

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index d32b758bc..7bdb62ec3 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -485,6 +485,7 @@
     "modules/ui-system/side-pane/tab-types/plan-detail.js",
     "modules/ui-system/side-pane/tab-types/terminal.js",
     "modules/ui-system/side-pane/tab-types/tool-output.js",
+    "modules/ui-system/side-pane/terminalDataTransform.js",
     "modules/ui-system/side-pane/terminalLinks.js",
     "modules/ui-system/side-pane/terminalSideProvider.js",
     "modules/ui-system/side-pane/terminalTheme.js",
@@ -664,7 +665,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 271,
+          "line": 288,
           "kind": "custom-event-listener"
         },
         {
@@ -729,7 +730,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 271,
+          "line": 288,
           "kind": "custom-event-listener",
           "match": "signal?.addEventListener('abort'"
         },
@@ -12655,14 +12656,14 @@
       "consumers": [
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 179,
+          "line": 192,
           "kind": "custom-event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 179,
+          "line": 192,
           "kind": "custom-event-listener",
           "match": "screen.addEventListener('focusin'"
         }
@@ -21631,14 +21632,14 @@
       "consumers": [
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 184,
+          "line": 199,
           "kind": "preload-subscription"
         }
       ],
       "evidence": [
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 184,
+          "line": 199,
           "kind": "preload-subscription",
           "match": "api.onTerminalClear("
         }
@@ -21669,14 +21670,14 @@
       "consumers": [
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 181,
+          "line": 194,
           "kind": "preload-subscription"
         }
       ],
       "evidence": [
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 181,
+          "line": 194,
           "kind": "preload-subscription",
           "match": "api.onTerminalData("
         }
@@ -21688,14 +21689,14 @@
       "consumers": [
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 187,
+          "line": 202,
           "kind": "preload-subscription"
         }
       ],
       "evidence": [
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 187,
+          "line": 202,
           "kind": "preload-subscription",
           "match": "api.onTerminalExit("
         }
diff --git a/modules/ui-system/side-pane/terminalDataTransform.js b/modules/ui-system/side-pane/terminalDataTransform.js
new file mode 100644
index 000000000..25818a756
--- /dev/null
+++ b/modules/ui-system/side-pane/terminalDataTransform.js
@@ -0,0 +1,43 @@
+/**
+ * modules/ui-system/side-pane/terminalDataTransform.js
+ * PSReadLine 行编辑重绘的背景修正：Windows PowerShell / PSReadLine 重绘当前输入行时，用 ANSI 40m（黑底）
+ * 给行尾空白补背景；侧栏终端的背景不是 ANSI black，xterm 会把这些空白画成一条灰块，这里把 40 换回默认背景 49。
+ *
+ * 移植自 ZCode `packages/ui/src/terminal/terminalDataTransform.ts`（zai-org/ZCode，Apache-2.0），
+ * 由 TypeScript 改写为原生 JS；逻辑不变，只是是否为 PowerShell 由调用方告知。
+ */
+
+'use strict';
+
+const ESC = String.fromCharCode(0x1b);
+const SGR_SEQUENCE_PATTERN = new RegExp(`${ESC}\\[([0-9;]*)m`, 'g');
+const PSREADLINE_REDRAW_CURSOR_PATTERN = new RegExp(`${ESC}\\[\\d+;\\d+H`);
+const PSREADLINE_DEFAULT_ON_BLACK_PATTERN = new RegExp(
+    `${ESC}\\[(?:[0-9;]*;)?37(?:;[0-9;]*)?m[\\s\\S]*${ESC}\\[(?:[0-9;]*;)?40(?:;[0-9;]*)?m`
+);
+
+function replaceAnsiBlackBackgroundWithDefault(data) {
+    return data.replace(SGR_SEQUENCE_PATTERN, (sequence, rawParams) => {
+        const params = rawParams.length > 0 ? rawParams.split(';') : ['0'];
+        let changed = false;
+        const nextParams = params.map(param => {
+            if (param !== '40') return param;
+            changed = true;
+            return '49';
+        });
+        return changed ? `${ESC}[${nextParams.join(';')}m` : sequence;
+    });
+}
+
+/**
+ * @param {string} data PTY 输出的一块
+ * @param {boolean} powershell 会话是不是 PowerShell（共享终端在 Windows 上总是 pwsh / powershell）
+ */
+export function normalizePowerShellReadlineRedraw(data, powershell) {
+    if (!powershell || typeof data !== 'string') return data;
+    // 只认带光标定位、不换行、37…40m 的单行重绘，命令自己输出的黑底不动
+    if (!data.includes(ESC) || data.includes('\n')) return data;
+    if (!PSREADLINE_REDRAW_CURSOR_PATTERN.test(data)) return data;
+    if (!PSREADLINE_DEFAULT_ON_BLACK_PATTERN.test(data)) return data;
+    return replaceAnsiBlackBackgroundWithDefault(data);
+}
diff --git a/modules/ui-system/side-pane/terminalSideProvider.js b/modules/ui-system/side-pane/terminalSideProvider.js
index 01396cd11..bf92b7d91 100644
--- a/modules/ui-system/side-pane/terminalSideProvider.js
+++ b/modules/ui-system/side-pane/terminalSideProvider.js
@@ -11,6 +11,7 @@
 
 import { getHttpLinksForTerminalBufferLine } from './terminalLinks.js';
 import { buildTerminalTheme } from './terminalTheme.js';
+import { normalizePowerShellReadlineRedraw } from './terminalDataTransform.js';
 import { createSidePaneRootScope } from './side-pane-occurrence.js';
 
 const GO_OPTION_VALUE = '';
@@ -137,10 +138,22 @@ export function createTerminalSideProvider({
             return true;
         });
         // 外框底色由 CSS 给出，xterm 从外框读取同一颜色，明暗主题切换时跟着换调色板。
+        // 只有画面挂在侧栏里时 CSS 才算得出来（新建的节点和暂存区都读到回退色），所以挂上之后再算；
+        // 收着的时候只记一笔，下次挂上时重算。颜色没变就不赋值：每次赋值 xterm 都整屏重绘
+        // （拖动分隔条时 body 的 class 也会变）
+        let appliedTheme = JSON.stringify(initialTheme);
+        let themeStale = false;
         const applyTheme = () => {
+            if (!term?.options) return;
+            if (!screen.isConnected || screen.closest?.('[data-side-terminal-stash]')) { themeStale = true; return; }
+            themeStale = false;
             const theme = buildTerminalTheme(doc, screen);
-            if (term?.options) term.options.theme = theme;
+            const serialized = JSON.stringify(theme);
+            if (serialized === appliedTheme) return;
+            appliedTheme = serialized;
+            term.options.theme = theme;
         };
+        session.applyTheme = applyTheme;
         const ThemeObserver = doc.defaultView?.MutationObserver;
         const themeObserver = ThemeObserver && doc.body ? new ThemeObserver(applyTheme) : null;
         themeObserver?.observe(doc.body, { attributes: true, attributeFilter: ['class', 'data-vcp-theme'] });
@@ -179,7 +192,9 @@ export function createTerminalSideProvider({
         screen.addEventListener('focusin', session.claimSize);
 
         const unsubscribeData = api.onTerminalData?.((payload) => {
-            if (payload?.id === session.sessionId && typeof payload.data === 'string') term.write(payload.data);
+            if (payload?.id === session.sessionId && typeof payload.data === 'string') {
+                term.write(normalizePowerShellReadlineRedraw(payload.data, session.powershell));
+            }
         });
         const unsubscribeClear = api.onTerminalClear?.((payload) => {
             if (payload?.id === session.sessionId) term.reset();
@@ -225,6 +240,8 @@ export function createTerminalSideProvider({
             session.sessionId = res.data.id;
             session.exited = false;
             if (res.data.windowsPty && typeof res.data.windowsPty === 'object') term.options.windowsPty = res.data.windowsPty;
+            // 共享终端在 Windows 上起的是 pwsh / powershell，其余平台是 bash
+            session.powershell = Boolean(res.data.windowsPty);
             setStatus('已连接终端', 'connected',
                 `已连接终端 · 与终端窗口 / AI 命令共用同一个会话${res.data.pid ? ` · PID ${res.data.pid}` : ''}`);
             if (screen.offsetWidth) session.claimSize(); // opened on screen: take over the size
@@ -401,6 +418,7 @@ export function createTerminalSideProvider({
             }
             const { term, screen } = session;
             placeScreen(screen, container);
+            session.applyTheme();
 
             let viewReleased = false;
             // 这一次挂载的按钮监听、尺寸观察和防抖定时器都挂在视图 scope 下，休眠或关标签时一起拆；
diff --git a/tests/side-pane-terminal-theme.test.mjs b/tests/side-pane-terminal-theme.test.mjs
index 8e1be3a26..9051948e7 100644
--- a/tests/side-pane-terminal-theme.test.mjs
+++ b/tests/side-pane-terminal-theme.test.mjs
@@ -72,3 +72,50 @@ test('mounted terminal: xterm theme follows the frame and switches with the ligh
         dom.window.close();
     }
 });
+
+test('the canvas takes the frame colour once the screen is in the pane, and unrelated body changes do not repaint it', async () => {
+    const { createTerminalSideProvider } = await import('../modules/ui-system/side-pane/terminalSideProvider.js');
+    const dom = new JSDOM('<body><div id="view"></div></body>', { pretendToBeVisual: true });
+    const doc = dom.window.document;
+    const sheet = doc.createElement('style');
+    sheet.textContent = '#view .side-terminal-screen { background-color: rgb(30, 40, 50); color: rgb(200, 210, 220); }';
+    doc.head.appendChild(sheet);
+    const terminals = [];
+    class FakeTerminal {
+        constructor(options) {
+            this.themeWrites = 0;
+            let theme = options.theme;
+            this.options = { ...options };
+            Object.defineProperty(this.options, 'theme', { get: () => theme, set: value => { theme = value; this.themeWrites++; } });
+            this.cols = 80; this.buffer = { active: {} }; terminals.push(this);
+        }
+        loadAddon() {} open() {} onData() { return { dispose() {} }; } onResize() { return { dispose() {} }; }
+        focus() {} write() {} dispose() {} reset() {} clear() {} registerLinkProvider() {}
+    }
+    const api = { terminalCreate: async () => ({ success: true, data: { id: 's1' } }), terminalKill() {} };
+    const provider = createTerminalSideProvider({ document: doc, api, sidePaneController: null,
+        xtermLoader: async () => ({ Terminal: FakeTerminal, FitAddon: null }) });
+    let handle;
+    try {
+        handle = await provider.mountTab({ id: 'terminal:main' }, doc.getElementById('view'));
+        assert.equal(terminals[0].options.theme.background, 'rgb(30, 40, 50)', 'not the hard-coded fallback');
+        assert.equal(terminals[0].options.theme.foreground, 'rgb(200, 210, 220)');
+        const writes = terminals[0].themeWrites;
+        doc.body.classList.add('side-pane-resizing');
+        await new Promise(resolve => dom.window.queueMicrotask(resolve));
+        assert.equal(terminals[0].themeWrites, writes, 'same colours: no reassignment, no full repaint');
+    } finally {
+        await handle?.dispose?.();
+        dom.window.close();
+    }
+});
+
+test('PSReadLine line redraws lose their black trailing background; command output keeps its colours', async () => {
+    const { normalizePowerShellReadlineRedraw } = await import('../modules/ui-system/side-pane/terminalDataTransform.js');
+    const ESC = '\x1b';
+    const redraw = `${ESC}[3;1H${ESC}[37mPS C:\\> ${ESC}[93mgit${ESC}[37;40m        ${ESC}[0m`;
+    assert.equal(normalizePowerShellReadlineRedraw(redraw, true), `${ESC}[3;1H${ESC}[37mPS C:\\> ${ESC}[93mgit${ESC}[37;49m        ${ESC}[0m`);
+    assert.equal(normalizePowerShellReadlineRedraw(redraw, false), redraw, 'bash sessions are left alone');
+    const output = `${ESC}[37;40mblack box from a program${ESC}[0m\r\n`;
+    assert.equal(normalizePowerShellReadlineRedraw(output, true), output, 'output with a newline is not a line redraw');
+});

From 30672352e210f06b60d5d4f1513efba0820a3dd2 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 01:48:14 +0000
Subject: [PATCH 066/143] Delete a conversation's model trajectory file when
 the conversation is deleted

Every side chat that sent a message left ModelTrajectory/<agent>__<child>.jsonl
behind after it was closed (32 orphaned files after one leak run, each capped at
16 MB). Deleting a side chat, the side chats of a deleted parent, an agent topic
or a group topic now also clears that conversation's trajectory.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01SADzqzusVz3S3z7qBUSy8M
---
 .../contracts/generated/chat-event-graph.json | 144 +++++++++---------
 modules/ipc/chatHandlers.js                   |   3 +-
 modules/ipc/groupChatHandlers.js              |   5 +-
 modules/ipc/sideChatHandlers.js               |   3 +
 modules/modelTrajectory.js                    |   8 +
 tests/side-chat-trajectory-cleanup.test.mjs   |  60 ++++++++
 6 files changed, 149 insertions(+), 74 deletions(-)
 create mode 100644 tests/side-chat-trajectory-cleanup.test.mjs

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 69770eda3..2103cafac 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -7427,14 +7427,14 @@
       "consumers": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 212,
+          "line": 215,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 212,
+          "line": 215,
           "kind": "event-listener",
           "match": "ipcMain.handle('continue-jev-group-chat'"
         },
@@ -7593,14 +7593,14 @@
       "consumers": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 75,
+          "line": 76,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 75,
+          "line": 76,
           "kind": "event-listener",
           "match": "ipcMain.handle('create-agent-group'"
         },
@@ -7686,14 +7686,14 @@
       "consumers": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 116,
+          "line": 117,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 116,
+          "line": 117,
           "kind": "event-listener",
           "match": "ipcMain.handle('create-new-topic-for-group'"
         },
@@ -8387,14 +8387,14 @@
       "consumers": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 91,
+          "line": 92,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 91,
+          "line": 92,
           "kind": "event-listener",
           "match": "ipcMain.handle('delete-agent-group'"
         },
@@ -8449,14 +8449,14 @@
       "consumers": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 120,
+          "line": 121,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 120,
+          "line": 121,
           "kind": "event-listener",
           "match": "ipcMain.handle('delete-group-topic'"
         },
@@ -11455,14 +11455,14 @@
       "consumers": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 225,
+          "line": 228,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 225,
+          "line": 228,
           "kind": "event-listener",
           "match": "ipcMain.handle('enqueue-jev-group-agent'"
         },
@@ -12728,14 +12728,14 @@
       "consumers": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 83,
+          "line": 84,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 83,
+          "line": 84,
           "kind": "event-listener",
           "match": "ipcMain.handle('get-agent-group-config'"
         },
@@ -12759,14 +12759,14 @@
       "consumers": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 79,
+          "line": 80,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 79,
+          "line": 80,
           "kind": "event-listener",
           "match": "ipcMain.handle('get-agent-groups'"
         },
@@ -13299,14 +13299,14 @@
       "consumers": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 132,
+          "line": 135,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 132,
+          "line": 135,
           "kind": "event-listener",
           "match": "ipcMain.handle('get-group-chat-history'"
         },
@@ -13330,14 +13330,14 @@
       "consumers": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 112,
+          "line": 113,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 112,
+          "line": 113,
           "kind": "event-listener",
           "match": "ipcMain.handle('get-group-topics'"
         },
@@ -13392,14 +13392,14 @@
       "consumers": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 239,
+          "line": 242,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 239,
+          "line": 242,
           "kind": "event-listener",
           "match": "ipcMain.handle('get-jev-group-chat-state'"
         },
@@ -13516,14 +13516,14 @@
       "consumers": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 1007,
+          "line": 1008,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 1007,
+          "line": 1008,
           "kind": "event-listener",
           "match": "ipcMain.handle('get-original-message-content'"
         },
@@ -13713,14 +13713,14 @@
       "consumers": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 1629,
+          "line": 1630,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 1629,
+          "line": 1630,
           "kind": "event-listener",
           "match": "ipcMain.handle('get-unread-topic-counts'"
         },
@@ -14358,14 +14358,14 @@
       "consumers": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 907,
+          "line": 908,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 907,
+          "line": 908,
           "kind": "event-listener",
           "match": "ipcMain.handle('handle-file-drop'"
         },
@@ -14389,14 +14389,14 @@
       "consumers": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 779,
+          "line": 780,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 779,
+          "line": 780,
           "kind": "event-listener",
           "match": "ipcMain.handle('handle-file-paste'"
         },
@@ -14420,14 +14420,14 @@
       "consumers": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 891,
+          "line": 892,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 891,
+          "line": 892,
           "kind": "event-listener",
           "match": "ipcMain.handle('handle-text-paste-as-file'"
         },
@@ -15036,14 +15036,14 @@
       "consumers": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 243,
+          "line": 246,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 243,
+          "line": 246,
           "kind": "event-listener",
           "match": "ipcMain.handle('interrupt-group-chat-queue'"
         },
@@ -15098,14 +15098,14 @@
       "consumers": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 1521,
+          "line": 1522,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 1521,
+          "line": 1522,
           "kind": "event-listener",
           "match": "ipcMain.handle('interrupt-vcp-request'"
         },
@@ -15129,14 +15129,14 @@
       "consumers": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 177,
+          "line": 180,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 177,
+          "line": 180,
           "kind": "event-listener",
           "match": "ipcMain.handle('inviteAgentToSpeak'"
         },
@@ -24540,14 +24540,14 @@
       "consumers": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 253,
+          "line": 256,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 253,
+          "line": 256,
           "kind": "event-listener",
           "match": "ipcMain.handle('redo-group-chat-message'"
         },
@@ -24652,14 +24652,14 @@
       "consumers": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 128,
+          "line": 131,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 128,
+          "line": 131,
           "kind": "event-listener",
           "match": "ipcMain.handle('regenerate-group-topic-title'"
         },
@@ -25243,14 +25243,14 @@
       "consumers": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 95,
+          "line": 96,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 95,
+          "line": 96,
           "kind": "event-listener",
           "match": "ipcMain.handle('save-agent-group-avatar'"
         },
@@ -25274,14 +25274,14 @@
       "consumers": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 87,
+          "line": 88,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 87,
+          "line": 88,
           "kind": "event-listener",
           "match": "ipcMain.handle('save-agent-group-config'"
         },
@@ -25615,14 +25615,14 @@
       "consumers": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 136,
+          "line": 139,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 136,
+          "line": 139,
           "kind": "event-listener",
           "match": "ipcMain.handle('save-group-chat-history'"
         },
@@ -25677,14 +25677,14 @@
       "consumers": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 124,
+          "line": 127,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 124,
+          "line": 127,
           "kind": "event-listener",
           "match": "ipcMain.handle('save-group-topic-title'"
         },
@@ -25801,14 +25801,14 @@
       "consumers": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 987,
+          "line": 988,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 987,
+          "line": 988,
           "kind": "event-listener",
           "match": "ipcMain.handle('save-pasted-image-to-file'"
         },
@@ -26669,14 +26669,14 @@
       "consumers": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 817,
+          "line": 818,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 817,
+          "line": 818,
           "kind": "event-listener",
           "match": "ipcMain.handle('select-files-to-send'"
         },
@@ -26750,14 +26750,14 @@
       "consumers": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 155,
+          "line": 158,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 155,
+          "line": 158,
           "kind": "event-listener",
           "match": "ipcMain.handle('send-group-chat-message'"
         },
@@ -26781,14 +26781,14 @@
       "consumers": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 1039,
+          "line": 1040,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 1039,
+          "line": 1040,
           "kind": "event-listener",
           "match": "ipcMain.handle('send-to-vcp'"
         },
@@ -26905,14 +26905,14 @@
       "consumers": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 1724,
+          "line": 1725,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 1724,
+          "line": 1725,
           "kind": "event-listener",
           "match": "ipcMain.handle('set-topic-unread'"
         },
@@ -27792,14 +27792,14 @@
       "consumers": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 199,
+          "line": 202,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 199,
+          "line": 202,
           "kind": "event-listener",
           "match": "ipcMain.handle('start-jev-group-chat'"
         },
@@ -29090,14 +29090,14 @@
       "consumers": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 1680,
+          "line": 1681,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 1680,
+          "line": 1681,
           "kind": "event-listener",
           "match": "ipcMain.handle('toggle-topic-lock'"
         },
@@ -30424,22 +30424,22 @@
       "producers": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 1055,
+          "line": 1056,
           "kind": "event-send"
         },
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 70,
+          "line": 71,
           "kind": "event-send"
         },
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 163,
+          "line": 166,
           "kind": "event-send"
         },
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 258,
+          "line": 261,
           "kind": "event-send"
         }
       ],
@@ -30453,25 +30453,25 @@
       "evidence": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 1055,
+          "line": 1056,
           "kind": "event-send",
           "match": "event.sender.send(streamChannel"
         },
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 70,
+          "line": 71,
           "kind": "event-send",
           "match": "mainWindow.webContents.send('vcp-stream-event'"
         },
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 163,
+          "line": 166,
           "kind": "event-send",
           "match": "mainWindow.webContents.send('vcp-stream-event'"
         },
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 258,
+          "line": 261,
           "kind": "event-send",
           "match": "mainWindow.webContents.send('vcp-stream-event'"
         },
diff --git a/modules/ipc/chatHandlers.js b/modules/ipc/chatHandlers.js
index a5adc8b34..ba4743e90 100644
--- a/modules/ipc/chatHandlers.js
+++ b/modules/ipc/chatHandlers.js
@@ -10,7 +10,7 @@ const {
     rememberAttachmentDirectory
 } = require('../services/attachmentDialogState');
 const topicTitleManager = require('../../Groupmodules/topicTitleManager');
-const { beginTrajectoryCall, sessionKeyFromContext, sourceFromContext, withStreamUsage } = require('../modelTrajectory');
+const { beginTrajectoryCall, clearTrajectoryOf, sessionKeyFromContext, sourceFromContext, withStreamUsage } = require('../modelTrajectory');
 const { HistoryMutationQueue } = require('../services/historyMutationQueue');
 const workspaceHandlers = require('./workspaceHandlers');
 const { removeSideChatChildrenOfParent } = require('./sideChatHandlers');
@@ -762,6 +762,7 @@ function initialize(mainWindow, context) {
 
                 const topicDataDir = path.join(USER_DATA_DIR, agentId, 'topics', topicIdToDelete);
                 if (await fs.pathExists(topicDataDir)) await fs.remove(topicDataDir);
+                await clearTrajectoryOf({ agentId, topicId: topicIdToDelete });
                 await removeSideChatChildrenOfParent({ USER_DATA_DIR, agentId, parentTopicId: topicIdToDelete })
                     .catch(err => console.warn('[delete-topic] Failed to remove side chats:', err));
 
diff --git a/modules/ipc/groupChatHandlers.js b/modules/ipc/groupChatHandlers.js
index 21c39d8e8..b82bd2705 100644
--- a/modules/ipc/groupChatHandlers.js
+++ b/modules/ipc/groupChatHandlers.js
@@ -5,6 +5,7 @@ const fs = require('fs-extra');
 const { pathToFileURL } = require('url');
 const groupChat = require('../../Groupmodules/groupchat');
 const { HistoryMutationQueue } = require('../services/historyMutationQueue');
+const { clearTrajectoryOf } = require('../modelTrajectory');
 
 /**
  * Initializes group chat related IPC handlers.
@@ -118,7 +119,9 @@ function initialize(mainWindow, context) {
     });
 
     ipcMain.handle('delete-group-topic', async (event, groupId, topicId) => {
-        return await groupChat.deleteGroupTopic(groupId, topicId);
+        const result = await groupChat.deleteGroupTopic(groupId, topicId);
+        if (result?.success) await clearTrajectoryOf({ groupId, topicId });
+        return result;
     });
 
     ipcMain.handle('save-group-topic-title', async (event, groupId, topicId, newTitle) => {
diff --git a/modules/ipc/sideChatHandlers.js b/modules/ipc/sideChatHandlers.js
index 9725d01b2..a789f05c3 100644
--- a/modules/ipc/sideChatHandlers.js
+++ b/modules/ipc/sideChatHandlers.js
@@ -12,6 +12,7 @@ const fs = require('fs-extra');
 const path = require('path');
 const crypto = require('crypto');
 const { createApplicationSenderGuard, resolveWindowWebContents } = require('./applicationSender');
+const { clearTrajectoryOf } = require('../modelTrajectory');
 
 function filterStableHistory(history = []) {
     if (!Array.isArray(history)) return [];
@@ -337,6 +338,7 @@ function initialize(paths) {
                 return { success: false, error: 'NOT_A_SIDE_CHAT_CHILD' };
             }
             await removeChildDir(topicDir);
+            await clearTrajectoryOf({ agentId, topicId: childTopicId });
             return { success: true, removed: true };
         } catch (error) {
             console.error('[SideChatHandlers] delete-child error:', error);
@@ -434,6 +436,7 @@ async function removeSideChatChildrenOfParent({ USER_DATA_DIR, agentId, parentTo
                 marker.agentId !== safeAgentId || marker.topicId !== entry.name ||
                 marker.parentTopicId !== safeParentId) continue;
             await removeChildDir(entryDir);
+            await clearTrajectoryOf({ agentId: safeAgentId, topicId: entry.name });
             removed += 1;
         } catch {}
     }
diff --git a/modules/modelTrajectory.js b/modules/modelTrajectory.js
index 2c376f3ba..a438d2588 100644
--- a/modules/modelTrajectory.js
+++ b/modules/modelTrajectory.js
@@ -585,6 +585,13 @@ function getSharedRecorder() {
     return sharedRecorder;
 }
 
+/** 话题（含辅助对话子话题）删掉时一并删掉它的轨迹文件，否则每个删过的话题都在磁盘上留一份；没配置或键不完整时什么也不做。 */
+function clearTrajectoryOf(context) {
+    const sessionKey = sessionKeyFromContext(context);
+    if (!sharedRecorder || sessionKey === 'unscoped') return Promise.resolve();
+    return sharedRecorder.clear(sessionKey).catch(() => {});
+}
+
 function beginTrajectoryCall(args) {
     try {
         return sharedRecorder && args ? sharedRecorder.begin(args) : NOOP_CALL;
@@ -598,6 +605,7 @@ module.exports = {
     configureSharedRecorder,
     getSharedRecorder,
     beginTrajectoryCall,
+    clearTrajectoryOf,
     sessionKeyFromContext,
     sourceFromContext,
     normalizeMessage,
diff --git a/tests/side-chat-trajectory-cleanup.test.mjs b/tests/side-chat-trajectory-cleanup.test.mjs
new file mode 100644
index 000000000..518f35f13
--- /dev/null
+++ b/tests/side-chat-trajectory-cleanup.test.mjs
@@ -0,0 +1,60 @@
+// 删除辅助对话（单独关掉，或随父话题一起删）时，它的调用轨迹文件也要删掉，不能在磁盘上越积越多
+import trustedSenderFixture from './helpers/trusted-main-sender.cjs';
+import modelTrajectory from '../modules/modelTrajectory.js';
+import sideChatHandlers from '../modules/ipc/sideChatHandlers.js';
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import fs from 'node:fs/promises';
+import path from 'node:path';
+import os from 'node:os';
+
+const exists = file => fs.access(file).then(() => true, () => false);
+
+async function setup(t) {
+    const userData = await fs.mkdtemp(path.join(os.tmpdir(), 'vcp-sidechat-traj-'));
+    const trajectories = path.join(userData, 'ModelTrajectory');
+    t.after(() => fs.rm(userData, { recursive: true, force: true }));
+    const recorder = modelTrajectory.configureSharedRecorder({ rootDir: trajectories });
+    const writeTrajectory = async (sessionKey) => {
+        const call = recorder.begin({ sessionKey, requestId: 'r1', source: { kind: 'side-chat' }, model: 'm', params: {}, messages: [{ role: 'user', content: 'hi' }] });
+        call.finish({ status: 'success', body: { choices: [{ message: { role: 'assistant', content: 'ok' } }] } });
+        await recorder.list(sessionKey);
+        return recorder.fileOf(sessionKey);
+    };
+    const makeChild = async (agentId, topicId, parentTopicId) => {
+        const dir = path.join(userData, agentId, 'topics', topicId);
+        await fs.mkdir(dir, { recursive: true });
+        await fs.writeFile(path.join(dir, 'history.json'), '[]');
+        await fs.writeFile(path.join(dir, 'sidechat-child.json'), JSON.stringify({ schemaVersion: 1, ephemeral: true, agentId, topicId, parentTopicId }));
+    };
+    const handlers = new Map();
+    const trusted = trustedSenderFixture.createTrustedMainSender();
+    sideChatHandlers.initialize({ USER_DATA_DIR: userData, mainWindow: trusted.mainWindow, ipcMain: { handle: (channel, fn) => handlers.set(channel, fn), removeHandler() {} } });
+    return { userData, writeTrajectory, makeChild, invoke: (channel, ...args) => handlers.get(channel)(trusted.event, ...args) };
+}
+
+test('deleting a side chat also deletes its model trajectory file', async (t) => {
+    const { writeTrajectory, makeChild, invoke } = await setup(t);
+    await makeChild('agent_a', 'sidechat_1', 'topic_p');
+    const childFile = await writeTrajectory('agent_a__sidechat_1');
+    const parentFile = await writeTrajectory('agent_a__topic_p');
+    assert.equal(await exists(childFile), true);
+
+    const result = await invoke('side-chat:delete-child', 'agent_a', 'sidechat_1');
+    assert.equal(result.success, true);
+    assert.equal(await exists(childFile), false);
+    assert.equal(await exists(parentFile), true, 'other conversations keep their trajectories');
+});
+
+test('side chats removed with their parent topic take their trajectory files with them', async (t) => {
+    const { userData, writeTrajectory, makeChild } = await setup(t);
+    await makeChild('agent_a', 'sidechat_1', 'topic_p');
+    await makeChild('agent_a', 'sidechat_2', 'topic_other');
+    const removedFile = await writeTrajectory('agent_a__sidechat_1');
+    const keptFile = await writeTrajectory('agent_a__sidechat_2');
+
+    const removed = await sideChatHandlers.removeSideChatChildrenOfParent({ USER_DATA_DIR: userData, agentId: 'agent_a', parentTopicId: 'topic_p' });
+    assert.equal(removed, 1);
+    assert.equal(await exists(removedFile), false);
+    assert.equal(await exists(keptFile), true);
+});

From 465cee1035fa6b9b84c5e217d43d68666345f6ae Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 01:55:01 +0000
Subject: [PATCH 067/143] Side pane P2 batch J: floating ask button, side chat
 scroll intent, guarded git dialogs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Floating 在侧栏提问 hides on any scroll or resize and only appears for
  selections inside the main chat, never inside side chat messages.
- Side chat stick-to-bottom detaches on wheel-up, PageUp/ArrowUp/Home and
  touch pull before a ResizeObserver pin can fight the user; small scrolls
  up inside the 48px threshold now detach too.
- Git dialogs ignore Esc, overlay and close-button dismissal while a step
  is in flight, trap Tab focus and restore focus on close; createBranch
  throws when another git op is running instead of closing as success.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DFRovoZHMzeheXKkLNWKG
---
 .../contracts/generated/chat-event-graph.json | 137 ++++++++++++++----
 modules/renderer/floatingSelectionButton.js   |  11 +-
 modules/renderer/side-chat/scrolling.js       |  38 ++++-
 .../ui-system/conversation-status-panel.js    |   2 +-
 .../branch-dialogs.js                         |   8 +-
 .../commit-dialog.js                          |   4 +-
 .../conversation-status-panel/floating.js     |  25 +++-
 .../conversation-status-panel/git-actions.js  |   5 +-
 .../conversation-status-panel/push-dialog.js  |   2 +
 tests/conversation-status-panel.test.mjs      |  91 ++++++++++++
 tests/side-chat-floating-selection.test.mjs   |  53 +++++++
 tests/side-chat-scrolling.test.mjs            |  41 ++++++
 12 files changed, 378 insertions(+), 39 deletions(-)
 create mode 100644 tests/side-chat-floating-selection.test.mjs

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 884bd9735..bc07bf172 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -3611,7 +3611,7 @@
         },
         {
           "file": "modules/renderer/floatingSelectionButton.js",
-          "line": 50,
+          "line": 57,
           "kind": "custom-event-listener"
         },
         {
@@ -4046,12 +4046,12 @@
         },
         {
           "file": "modules/ui-system/conversation-status-panel/commit-dialog.js",
-          "line": 169,
+          "line": 171,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/conversation-status-panel/commit-dialog.js",
-          "line": 174,
+          "line": 176,
           "kind": "custom-event-listener"
         },
         {
@@ -5066,7 +5066,7 @@
         },
         {
           "file": "modules/renderer/floatingSelectionButton.js",
-          "line": 50,
+          "line": 57,
           "kind": "custom-event-listener",
           "match": "floatingBtn.addEventListener('click'"
         },
@@ -5588,13 +5588,13 @@
         },
         {
           "file": "modules/ui-system/conversation-status-panel/commit-dialog.js",
-          "line": 169,
+          "line": 171,
           "kind": "custom-event-listener",
           "match": "generate.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/conversation-status-panel/commit-dialog.js",
-          "line": 174,
+          "line": 176,
           "kind": "custom-event-listener",
           "match": "checkbox.addEventListener('click'"
         },
@@ -14843,12 +14843,12 @@
         },
         {
           "file": "modules/ui-system/conversation-status-panel/branch-dialogs.js",
-          "line": 248,
+          "line": 250,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/conversation-status-panel/commit-dialog.js",
-          "line": 168,
+          "line": 170,
           "kind": "custom-event-listener"
         },
         {
@@ -15030,13 +15030,13 @@
         },
         {
           "file": "modules/ui-system/conversation-status-panel/branch-dialogs.js",
-          "line": 248,
+          "line": 250,
           "kind": "custom-event-listener",
           "match": "textarea.addEventListener('input'"
         },
         {
           "file": "modules/ui-system/conversation-status-panel/commit-dialog.js",
-          "line": 168,
+          "line": 170,
           "kind": "custom-event-listener",
           "match": "textarea.addEventListener('input'"
         },
@@ -15397,6 +15397,11 @@
           "line": 255,
           "kind": "custom-event-listener"
         },
+        {
+          "file": "modules/renderer/side-chat/scrolling.js",
+          "line": 53,
+          "kind": "custom-event-listener"
+        },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
           "line": 352,
@@ -15469,12 +15474,17 @@
         },
         {
           "file": "modules/ui-system/conversation-status-panel/commit-dialog.js",
-          "line": 175,
+          "line": 177,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/conversation-status-panel/commit-dialog.js",
-          "line": 183,
+          "line": 185,
+          "kind": "custom-event-listener"
+        },
+        {
+          "file": "modules/ui-system/conversation-status-panel/floating.js",
+          "line": 112,
           "kind": "custom-event-listener"
         },
         {
@@ -15736,6 +15746,12 @@
           "kind": "custom-event-listener",
           "match": "statusText.addEventListener('keydown'"
         },
+        {
+          "file": "modules/renderer/side-chat/scrolling.js",
+          "line": 53,
+          "kind": "custom-event-listener",
+          "match": "root.addEventListener('keydown'"
+        },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
           "line": 352,
@@ -15822,16 +15838,22 @@
         },
         {
           "file": "modules/ui-system/conversation-status-panel/commit-dialog.js",
-          "line": 175,
+          "line": 177,
           "kind": "custom-event-listener",
           "match": "actionsBox.addEventListener('keydown'"
         },
         {
           "file": "modules/ui-system/conversation-status-panel/commit-dialog.js",
-          "line": 183,
+          "line": 185,
           "kind": "custom-event-listener",
           "match": "form.addEventListener('keydown'"
         },
+        {
+          "file": "modules/ui-system/conversation-status-panel/floating.js",
+          "line": 112,
+          "kind": "custom-event-listener",
+          "match": "overlay.addEventListener('keydown'"
+        },
         {
           "file": "modules/ui-system/conversation-status-panel/sections.js",
           "line": 156,
@@ -18804,7 +18826,7 @@
         },
         {
           "file": "modules/renderer/floatingSelectionButton.js",
-          "line": 49,
+          "line": 56,
           "kind": "custom-event-listener"
         },
         {
@@ -18824,7 +18846,7 @@
         },
         {
           "file": "modules/ui-system/conversation-status-panel/floating.js",
-          "line": 103,
+          "line": 111,
           "kind": "custom-event-listener"
         },
         {
@@ -18923,7 +18945,7 @@
         },
         {
           "file": "modules/renderer/floatingSelectionButton.js",
-          "line": 49,
+          "line": 56,
           "kind": "custom-event-listener",
           "match": "floatingBtn.addEventListener('mousedown'"
         },
@@ -18947,7 +18969,7 @@
         },
         {
           "file": "modules/ui-system/conversation-status-panel/floating.js",
-          "line": 103,
+          "line": 111,
           "kind": "custom-event-listener",
           "match": "overlay.addEventListener('mousedown'"
         },
@@ -24959,6 +24981,11 @@
           "line": 349,
           "kind": "custom-event-listener"
         },
+        {
+          "file": "modules/renderer/floatingSelectionButton.js",
+          "line": 55,
+          "kind": "custom-event-listener"
+        },
         {
           "file": "modules/services/embeddedAppSessionManager.js",
           "line": 390,
@@ -25049,6 +25076,12 @@
           "kind": "custom-event-listener",
           "match": "window.addEventListener('resize'"
         },
+        {
+          "file": "modules/renderer/floatingSelectionButton.js",
+          "line": 55,
+          "kind": "custom-event-listener",
+          "match": "win.addEventListener('resize'"
+        },
         {
           "file": "modules/services/embeddedAppSessionManager.js",
           "line": 390,
@@ -26442,6 +26475,11 @@
           "line": 56,
           "kind": "custom-event-listener"
         },
+        {
+          "file": "modules/renderer/floatingSelectionButton.js",
+          "line": 54,
+          "kind": "custom-event-listener"
+        },
         {
           "file": "modules/renderer/messenger-presentation.js",
           "line": 235,
@@ -26449,7 +26487,7 @@
         },
         {
           "file": "modules/renderer/side-chat/scrolling.js",
-          "line": 31,
+          "line": 51,
           "kind": "custom-event-listener"
         },
         {
@@ -26500,6 +26538,12 @@
           "kind": "custom-event-listener",
           "match": "container.addEventListener('scroll'"
         },
+        {
+          "file": "modules/renderer/floatingSelectionButton.js",
+          "line": 54,
+          "kind": "custom-event-listener",
+          "match": "doc.addEventListener('scroll'"
+        },
         {
           "file": "modules/renderer/messenger-presentation.js",
           "line": 235,
@@ -26508,7 +26552,7 @@
         },
         {
           "file": "modules/renderer/side-chat/scrolling.js",
-          "line": 31,
+          "line": 51,
           "kind": "custom-event-listener",
           "match": "root.addEventListener('scroll'"
         },
@@ -26792,14 +26836,14 @@
       "consumers": [
         {
           "file": "modules/renderer/floatingSelectionButton.js",
-          "line": 48,
+          "line": 53,
           "kind": "custom-event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/renderer/floatingSelectionButton.js",
-          "line": 48,
+          "line": 53,
           "kind": "custom-event-listener",
           "match": "doc.addEventListener('selectionchange'"
         }
@@ -28091,12 +28135,12 @@
         },
         {
           "file": "modules/ui-system/conversation-status-panel/branch-dialogs.js",
-          "line": 249,
+          "line": 251,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/conversation-status-panel/commit-dialog.js",
-          "line": 182,
+          "line": 184,
           "kind": "custom-event-listener"
         },
         {
@@ -28155,13 +28199,13 @@
         },
         {
           "file": "modules/ui-system/conversation-status-panel/branch-dialogs.js",
-          "line": 249,
+          "line": 251,
           "kind": "custom-event-listener",
           "match": "form.addEventListener('submit'"
         },
         {
           "file": "modules/ui-system/conversation-status-panel/commit-dialog.js",
-          "line": 182,
+          "line": 184,
           "kind": "custom-event-listener",
           "match": "form.addEventListener('submit'"
         },
@@ -29233,10 +29277,34 @@
         }
       ]
     },
+    {
+      "name": "touchmove",
+      "producers": [],
+      "consumers": [
+        {
+          "file": "modules/renderer/side-chat/scrolling.js",
+          "line": 55,
+          "kind": "custom-event-listener"
+        }
+      ],
+      "evidence": [
+        {
+          "file": "modules/renderer/side-chat/scrolling.js",
+          "line": 55,
+          "kind": "custom-event-listener",
+          "match": "root.addEventListener('touchmove'"
+        }
+      ]
+    },
     {
       "name": "touchstart",
       "producers": [],
       "consumers": [
+        {
+          "file": "modules/renderer/side-chat/scrolling.js",
+          "line": 54,
+          "kind": "custom-event-listener"
+        },
         {
           "file": "modules/ui-helpers.js",
           "line": 344,
@@ -29244,6 +29312,12 @@
         }
       ],
       "evidence": [
+        {
+          "file": "modules/renderer/side-chat/scrolling.js",
+          "line": 54,
+          "kind": "custom-event-listener",
+          "match": "root.addEventListener('touchstart'"
+        },
         {
           "file": "modules/ui-helpers.js",
           "line": 344,
@@ -31657,6 +31731,11 @@
           "line": 489,
           "kind": "custom-event-listener"
         },
+        {
+          "file": "modules/renderer/side-chat/scrolling.js",
+          "line": 52,
+          "kind": "custom-event-listener"
+        },
         {
           "file": "modules/ui-helpers.js",
           "line": 332,
@@ -31681,6 +31760,12 @@
           "kind": "custom-event-listener",
           "match": "zoomTarget.addEventListener('wheel'"
         },
+        {
+          "file": "modules/renderer/side-chat/scrolling.js",
+          "line": 52,
+          "kind": "custom-event-listener",
+          "match": "root.addEventListener('wheel'"
+        },
         {
           "file": "modules/ui-helpers.js",
           "line": 332,
diff --git a/modules/renderer/floatingSelectionButton.js b/modules/renderer/floatingSelectionButton.js
index 759bba62e..e3e912ef0 100644
--- a/modules/renderer/floatingSelectionButton.js
+++ b/modules/renderer/floatingSelectionButton.js
@@ -6,10 +6,15 @@ export function createFloatingSelectionButton({ doc, win, notify }) {
 
     const getSelectionMessageItem = (range) => {
         const node = range?.commonAncestorContainer;
-        return (node?.nodeType === 1 ? node : node?.parentElement)?.closest?.('.message-item') || null;
+        const element = node?.nodeType === 1 ? node : node?.parentElement;
+        // 只认主聊天区的消息；侧栏对话里的选区若再"在侧栏提问"会把回复喂回同一个侧聊
+        if (!element?.closest?.('#chatMessages') || element.closest('.side-chat-surface')) return null;
+        return element.closest('.message-item') || null;
     };
 
     const hide = () => { floatingBtn.hidden = true; };
+    // 按钮是 fixed 定位在选区视口坐标上；任何滚动或尺寸变化都会让坐标失效（ZCode MarkdownSelectionTooltip 同样在滚动时收起）
+    const onViewportChange = () => { if (!floatingBtn.hidden) hide(); };
 
     const onSelectionChange = () => {
         const sel = win.getSelection();
@@ -46,11 +51,15 @@ export function createFloatingSelectionButton({ doc, win, notify }) {
     };
 
     doc.addEventListener('selectionchange', onSelectionChange);
+    doc.addEventListener('scroll', onViewportChange, true);
+    win.addEventListener('resize', onViewportChange);
     floatingBtn.addEventListener('mousedown', onMouseDown);
     floatingBtn.addEventListener('click', onClick);
     return Object.freeze({
         dispose: () => {
             doc.removeEventListener('selectionchange', onSelectionChange);
+            doc.removeEventListener('scroll', onViewportChange, true);
+            win.removeEventListener('resize', onViewportChange);
             floatingBtn.removeEventListener('mousedown', onMouseDown);
             floatingBtn.removeEventListener('click', onClick);
         }
diff --git a/modules/renderer/side-chat/scrolling.js b/modules/renderer/side-chat/scrolling.js
index e165d7971..bd7706d39 100644
--- a/modules/renderer/side-chat/scrolling.js
+++ b/modules/renderer/side-chat/scrolling.js
@@ -23,13 +23,43 @@ export function createSideChatScrolling({
     if (root) {
         const onRootScroll = () => {
             if (root.clientHeight === 0) return;
-            // 只有往上滚才算离开底部；内容增长、布局变化引起的滚动事件不改变贴底状态
-            if (root.scrollHeight - root.scrollTop - root.clientHeight < 48) stickToBottom = true;
-            else if (root.scrollTop < lastScrollTop - 1) stickToBottom = false;
+            const distance = root.scrollHeight - root.scrollTop - root.clientHeight;
+            const movedUp = root.scrollTop < lastScrollTop - 1;
+            // 真正到底（含内容变短被夹回底部）才无条件贴底；往上滚哪怕只滚了一格也算离开，
+            // 往下滚回接近底部才恢复。内容增长引起的滚动事件不改变贴底状态
+            if (distance < 2) stickToBottom = true;
+            else if (movedUp) stickToBottom = false;
+            else if (distance < 48 && root.scrollTop > lastScrollTop + 1) stickToBottom = true;
             lastScrollTop = root.scrollTop;
         };
+        // 用户意图先于 scroll 事件生效：流式期间 ResizeObserver 可能在滚轮产生的 scroll 事件之前
+        // 把视图拽回底部，只靠 scroll 判断就会和滚轮打架（ZCode use-stick-to-bottom 同样监听 wheel 立即脱离）
+        const escape = () => {
+            if (root.scrollHeight > root.clientHeight) stickToBottom = false;
+        };
+        const onWheel = (event) => { if (event.deltaY < 0) escape(); };
+        const onKeyDown = (event) => {
+            if (['ArrowUp', 'PageUp', 'Home'].includes(event.key) && !event.target?.closest?.('textarea, input, [contenteditable="true"]')) escape();
+        };
+        let touchY = null;
+        const onTouchStart = (event) => { touchY = event.touches?.[0]?.clientY ?? null; };
+        const onTouchMove = (event) => {
+            const y = event.touches?.[0]?.clientY;
+            if (touchY !== null && y > touchY + 2) escape(); // 手指下拉 = 内容往上翻
+            touchY = y ?? touchY;
+        };
         root.addEventListener('scroll', onRootScroll, { passive: true });
-        disposeCleanups.push(() => root.removeEventListener('scroll', onRootScroll));
+        root.addEventListener('wheel', onWheel, { passive: true });
+        root.addEventListener('keydown', onKeyDown);
+        root.addEventListener('touchstart', onTouchStart, { passive: true });
+        root.addEventListener('touchmove', onTouchMove, { passive: true });
+        disposeCleanups.push(() => {
+            root.removeEventListener('scroll', onRootScroll);
+            root.removeEventListener('wheel', onWheel);
+            root.removeEventListener('keydown', onKeyDown);
+            root.removeEventListener('touchstart', onTouchStart);
+            root.removeEventListener('touchmove', onTouchMove);
+        });
         const ResizeObserverClass = doc.defaultView?.ResizeObserver || globalThis.ResizeObserver;
         if (ResizeObserverClass) {
             const rootResizeObserver = new ResizeObserverClass(pinToBottomIfSticky);
diff --git a/modules/ui-system/conversation-status-panel.js b/modules/ui-system/conversation-status-panel.js
index 2ea92dea2..5e0d21b02 100644
--- a/modules/ui-system/conversation-status-panel.js
+++ b/modules/ui-system/conversation-status-panel.js
@@ -486,7 +486,7 @@ export function createConversationStatusPanel({
         on(doc, 'keydown', event => {
             if (event.key !== 'Escape') return;
             if (popovers.length) { closePopover(popovers[popovers.length - 1]); return; }
-            if (modals.length) modals[modals.length - 1].close();
+            if (modals.length) modals[modals.length - 1].dismiss();
        });
         on(win, 'resize', () => { measureHost(); closeAllPopovers(); });
         on(doc, 'visibilitychange', () => { if (!doc.hidden && gitStale) refresh(); });
diff --git a/modules/ui-system/conversation-status-panel/branch-dialogs.js b/modules/ui-system/conversation-status-panel/branch-dialogs.js
index 1ba0311b1..7be90e57b 100644
--- a/modules/ui-system/conversation-status-panel/branch-dialogs.js
+++ b/modules/ui-system/conversation-status-panel/branch-dialogs.js
@@ -181,6 +181,7 @@ export function createStatusPanelBranchDialogs({
             event.preventDefault();
             if (pending || !name.trim()) return;
             pending = true;
+            modal.busy = true;
             submit.disabled = true;
             cancel.disabled = true;
             submit.prepend(spinner());
@@ -190,6 +191,7 @@ export function createStatusPanelBranchDialogs({
                 modal.close();
             } catch (e) {
                 pending = false;
+                modal.busy = false;
                 cancel.disabled = false;
                 submit.disabled = !name.trim();
                 submit.querySelector('.zc-spin')?.remove();
@@ -250,16 +252,17 @@ export function createStatusPanelBranchDialogs({
             event.preventDefault();
             if (pending) return;
             pending = true;
+            modal.busy = true;
             submit.disabled = true;
             cancel.disabled = true;
             submit.prepend(spinner());
             error.hidden = true;
             try {
                 await stageAll(status, targetWorkspace);
-                if (modal.closed || store.workspace?.id !== targetWorkspace.id) return;
+                if (store.disposed || store.workspace?.id !== targetWorkspace.id) { modal.close(); return; }
                 const commitRes = await api.gitCommit(targetWorkspace.id, { message: message.trim() || buildCommitMessage(paths) });
                 if (!commitRes?.success) throw new Error(describeIssue(commitRes));
-                if (modal.closed || store.workspace?.id !== targetWorkspace.id) return;
+                if (store.disposed || store.workspace?.id !== targetWorkspace.id) { modal.close(); refreshAfterMutation(); return; }
                 const res = await api.gitSwitchBranch(targetWorkspace.id, target);
                 if (!res?.success || res?.data?.ok === false) throw new Error(res?.data?.issues?.[0]?.message || res?.error || '切换分支失败');
                 adoptBranch(res.data, targetWorkspace);
@@ -268,6 +271,7 @@ export function createStatusPanelBranchDialogs({
                 refreshAfterMutation();
             } catch (e) {
                 pending = false;
+                modal.busy = false;
                 cancel.disabled = false;
                 submit.disabled = false;
                 submit.querySelector('.zc-spin')?.remove();
diff --git a/modules/ui-system/conversation-status-panel/commit-dialog.js b/modules/ui-system/conversation-status-panel/commit-dialog.js
index f1a46193a..1d8d192be 100644
--- a/modules/ui-system/conversation-status-panel/commit-dialog.js
+++ b/modules/ui-system/conversation-status-panel/commit-dialog.js
@@ -143,12 +143,13 @@ export function createStatusPanelCommitDialog({
             const paths = selectedPaths();
             if (!paths.length) { state.error = '当前没有可提交的更改。'; sync(); return; }
             state.pending = true;
+            modal.busy = true;
             state.error = '';
             sync();
             let committed = false;
             try {
                 if (state.includeUnstaged) await stageAll(status, targetWorkspace);
-                if (modal.closed || store.workspace?.id !== targetWorkspace.id) return;
+                if (store.disposed || store.workspace?.id !== targetWorkspace.id) { modal.close(); return; }
                 const message = state.message.trim() || buildCommitMessage(paths);
                 const res = await api.gitCommit(targetWorkspace.id, { message });
                 if (!res?.success) throw new Error(describeIssue(res));
@@ -159,6 +160,7 @@ export function createStatusPanelCommitDialog({
                 refreshAfterMutation();
             } catch (e) {
                 state.pending = false;
+                modal.busy = false;
                 state.error = committed ? `已提交，但推送失败：${e?.message || e}` : `提交失败：${e?.message || e}`;
                 sync();
                 if (committed) refreshAfterMutation();
diff --git a/modules/ui-system/conversation-status-panel/floating.js b/modules/ui-system/conversation-status-panel/floating.js
index 419240a51..8a1993f78 100644
--- a/modules/ui-system/conversation-status-panel/floating.js
+++ b/modules/ui-system/conversation-status-panel/floating.js
@@ -88,19 +88,38 @@ export function createStatusPanelFloating({
         dialog.setAttribute('aria-modal', 'true');
         dialog.tabIndex = -1;
         overlay.appendChild(dialog);
-        const entry = { overlay, dialog, closed: false };
+        const previouslyFocused = doc.activeElement;
+        // busy 期间（提交、推送、建分支进行中）Esc、遮罩和右上角关闭都不生效，流程走完由它自己 close；
+        // 对齐 ZCode 的 Radix Dialog：流程归父级持有，焦点困在对话框里，关闭后还给打开前的元素
+        const entry = { overlay, dialog, closed: false, busy: false };
         entry.close = () => {
             if (entry.closed) return;
             entry.closed = true;
             const index = modals.indexOf(entry);
             if (index >= 0) modals.splice(index, 1);
+            const hadFocus = overlay.contains(doc.activeElement);
             overlay.remove();
             onClose?.();
+            if ((hadFocus || doc.activeElement === doc.body) && previouslyFocused?.isConnected) {
+                previouslyFocused.focus?.({ preventScroll: true });
+            }
         };
+        entry.dismiss = () => { if (!entry.busy) entry.close(); };
         if (showClose) {
-            dialog.appendChild(button('zc-btn zc-btn-ghost zc-btn-icon-sm zc-dialog-close', { label: '关闭', onClick: entry.close }, icon('x')));
+            dialog.appendChild(button('zc-btn zc-btn-ghost zc-btn-icon-sm zc-dialog-close', { label: '关闭', onClick: entry.dismiss }, icon('x')));
         }
-        overlay.addEventListener('mousedown', event => { if (event.target === overlay) entry.close(); });
+        overlay.addEventListener('mousedown', event => { if (event.target === overlay) entry.dismiss(); });
+        overlay.addEventListener('keydown', event => {
+            if (event.key !== 'Tab') return;
+            const focusable = [...dialog.querySelectorAll('button, [href], input, select, textarea, [tabindex]:not([tabindex="-1"])')]
+                .filter(el => !el.disabled && !el.hidden);
+            if (!focusable.length) { event.preventDefault(); dialog.focus({ preventScroll: true }); return; }
+            const first = focusable[0];
+            const last = focusable[focusable.length - 1];
+            const active = doc.activeElement;
+            if (event.shiftKey && (active === first || active === dialog)) { event.preventDefault(); last.focus(); }
+            else if (!event.shiftKey && active === last) { event.preventDefault(); first.focus(); }
+        });
         portal.appendChild(overlay);
         modals.push(entry);
         dialog.focus({ preventScroll: true });
diff --git a/modules/ui-system/conversation-status-panel/git-actions.js b/modules/ui-system/conversation-status-panel/git-actions.js
index f01776d39..c21ac7fbd 100644
--- a/modules/ui-system/conversation-status-panel/git-actions.js
+++ b/modules/ui-system/conversation-status-panel/git-actions.js
@@ -84,7 +84,7 @@ export function createStatusPanelGitActions({
 
     async function createBranch(name) {
         const targetWorkspace = store.workspace;
-        return runBusy(async () => {
+        const created = await runBusy(async () => {
             const res = await api.gitCreateBranch(targetWorkspace.id, name, '');
             const data = res?.data;
             if (!res?.success || data?.ok === false) {
@@ -95,6 +95,9 @@ export function createStatusPanelGitActions({
             toast(`已创建并切换到分支 ${name}`, 'success');
             return true;
         });
+        // runBusy 在另一个 Git 操作进行中时直接返回 false；不抛错的话对话框会当成功关掉
+        if (created !== true) throw new Error('另一个 Git 操作正在进行，请稍后再试');
+        return true;
     }
 
     async function pushCurrent(targetWorkspace = store.workspace) {
diff --git a/modules/ui-system/conversation-status-panel/push-dialog.js b/modules/ui-system/conversation-status-panel/push-dialog.js
index 76bbd70a8..9fcdde248 100644
--- a/modules/ui-system/conversation-status-panel/push-dialog.js
+++ b/modules/ui-system/conversation-status-panel/push-dialog.js
@@ -85,6 +85,7 @@ export function createStatusPanelPushDialog({
                 const submit = button('zc-btn zc-btn-primary zc-btn-xl', { disabled: pending || !pushEnabled }, pending ? spinner() : null, '推送');
                 submit.addEventListener('click', async () => {
                     pending = true;
+                    modal.busy = true;
                     paint();
                     try {
                         if (!modal.dialog.isConnected || store.workspace?.id !== targetWorkspace.id) return;
@@ -94,6 +95,7 @@ export function createStatusPanelPushDialog({
                         refreshAfterMutation();
                     } catch (e) {
                         pending = false;
+                        modal.busy = false;
                         errorText = e?.message || String(e);
                         paint();
                     }
diff --git a/tests/conversation-status-panel.test.mjs b/tests/conversation-status-panel.test.mjs
index 8dc12ef11..5affb14a7 100644
--- a/tests/conversation-status-panel.test.mjs
+++ b/tests/conversation-status-panel.test.mjs
@@ -877,3 +877,94 @@ test('a panel that does not follow the conversation shows the workspace picked i
     assert.equal(reads.length, 3);
     panel.dispose();
 });
+
+test('a dialog with a git step in flight ignores Esc and overlay clicks, then finishes the step', async () => {
+    let release;
+    const gate = new Promise(resolve => { release = resolve; });
+    const { doc, panel, calls, dom } = setup({ api: {
+        gitStage: async (id, paths) => { calls.push(['stage', id, paths]); await gate; return { success: true, data: {} }; }
+    } });
+    try {
+        panel.mount();
+        await flush();
+        await panel.openCommitDialog();
+        click(dom, q(doc, '[data-action="commit"]'));
+        await flush();
+        doc.dispatchEvent(new dom.window.KeyboardEvent('keydown', { key: 'Escape', bubbles: true }));
+        const overlay = q(doc, '.zc-overlay');
+        overlay.dispatchEvent(new dom.window.MouseEvent('mousedown', { bubbles: true }));
+        assert.ok(q(doc, '.zc-commit-dialog'), 'dialog stays open while staging');
+        release();
+        await flush();
+        assert.ok(calls.some(c => c[0] === 'commit'), 'commit still runs after the ignored Esc');
+        assert.equal(q(doc, '.zc-commit-dialog'), null);
+    } finally {
+        release();
+        panel.dispose();
+    }
+});
+
+test('an idle dialog closes on Esc and returns focus to the element that opened it', async () => {
+    const { doc, panel, dom } = setup();
+    panel.mount();
+    await flush();
+    const opener = doc.createElement('button');
+    doc.body.appendChild(opener);
+    opener.focus();
+    panel.openCreateBranchDialog();
+    assert.notEqual(doc.activeElement, opener);
+    doc.dispatchEvent(new dom.window.KeyboardEvent('keydown', { key: 'Escape', bubbles: true }));
+    assert.equal(q(doc, '.zc-dialog'), null);
+    assert.equal(doc.activeElement, opener);
+    panel.dispose();
+});
+
+test('Tab inside a dialog wraps around instead of reaching the chat behind it', async () => {
+    const { doc, panel, dom } = setup();
+    panel.mount();
+    await flush();
+    panel.openCreateBranchDialog();
+    const dialog = q(doc, '.zc-dialog');
+    const input = q(dialog, 'input');
+    input.value = 'feat';
+    input.dispatchEvent(new dom.window.Event('input', { bubbles: true }));
+    const buttons = [...dialog.querySelectorAll('button')].filter(b => !b.disabled);
+    const last = buttons[buttons.length - 1];
+    last.focus();
+    const tab = new dom.window.KeyboardEvent('keydown', { key: 'Tab', bubbles: true, cancelable: true });
+    last.dispatchEvent(tab);
+    assert.equal(tab.defaultPrevented, true);
+    assert.equal(doc.activeElement, input);
+    panel.dispose();
+});
+
+test('creating a branch while another git operation runs keeps the dialog open with an error', async () => {
+    let release;
+    const gate = new Promise(resolve => { release = resolve; });
+    const { doc, panel, calls, dom } = setup({ api: {
+        gitSwitchBranch: async (id, name) => { calls.push(['switch', id, name]); await gate; return { success: true, data: { ok: true, status: { branch: { head: name } } } }; }
+    } });
+    try {
+        panel.mount();
+        await flush();
+        click(dom, q(doc, '.zc-row-branch'));
+        await flush();
+        click(dom, q(doc, '.zc-branch-item[data-branch="dev"]'));
+        await flush();
+        assert.ok(calls.some(c => c[0] === 'switch'));
+        panel.openCreateBranchDialog();
+        const dialog = q(doc, '.zc-dialog');
+        const input = q(dialog, 'input');
+        input.value = 'feat';
+        input.dispatchEvent(new dom.window.Event('input', { bubbles: true }));
+        q(dialog, 'form').dispatchEvent(new dom.window.Event('submit', { bubbles: true, cancelable: true }));
+        await flush();
+        assert.ok(q(doc, '.zc-dialog'), 'dialog stays open');
+        assert.match(q(dialog, '.zc-field-error').textContent, /正在进行/);
+        assert.equal(calls.some(c => c[0] === 'create'), false);
+    } finally {
+        release();
+        await flush();
+        panel.dispose();
+    }
+});
diff --git a/tests/side-chat-floating-selection.test.mjs b/tests/side-chat-floating-selection.test.mjs
new file mode 100644
index 000000000..c4169618e
--- /dev/null
+++ b/tests/side-chat-floating-selection.test.mjs
@@ -0,0 +1,53 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { JSDOM } from 'jsdom';
+import { createFloatingSelectionButton } from '../modules/renderer/floatingSelectionButton.js';
+
+function setup() {
+    const dom = new JSDOM(`<body>
+        <div id="chatMessages"><div class="message-item" data-message-id="m1"><p id="main">hello world text</p></div></div>
+        <aside><div class="side-chat-surface"><div class="message-item" data-message-id="s1"><p id="side">side reply text</p></div></div></aside>
+        <button id="floatingSelectionSideChatBtn" hidden></button>
+    </body>`, { pretendToBeVisual: true });
+    const { window } = dom;
+    window.Range.prototype.getBoundingClientRect = () => ({ left: 100, top: 200, width: 50, height: 10 });
+    const opened = [];
+    window.openSideChatWithSelection = async (payload) => { opened.push(payload); };
+    const handle = createFloatingSelectionButton({ doc: window.document, win: window, notify() {} });
+    const btn = window.document.getElementById('floatingSelectionSideChatBtn');
+    const select = (id) => {
+        const range = window.document.createRange();
+        range.selectNodeContents(window.document.getElementById(id));
+        const sel = window.getSelection();
+        sel.removeAllRanges();
+        sel.addRange(range);
+        window.document.dispatchEvent(new window.Event('selectionchange'));
+    };
+    return { window, handle, btn, select, opened };
+}
+
+test('floating ask button shows only for main chat selections, not side chat messages', async () => {
+    const { btn, select, opened } = setup();
+    select('main');
+    assert.equal(btn.hidden, false);
+    btn.click();
+    await Promise.resolve();
+    assert.deepEqual(opened.map((p) => p.message.id), ['m1']);
+    select('side');
+    assert.equal(btn.hidden, true);
+});
+
+test('floating ask button hides when any container scrolls or the window resizes', () => {
+    const { window, btn, select, handle } = setup();
+    select('main');
+    assert.equal(btn.hidden, false);
+    window.document.getElementById('chatMessages').dispatchEvent(new window.Event('scroll'));
+    assert.equal(btn.hidden, true);
+    select('main');
+    window.dispatchEvent(new window.Event('resize'));
+    assert.equal(btn.hidden, true);
+    handle.dispose();
+    btn.hidden = false;
+    window.dispatchEvent(new window.Event('resize'));
+    assert.equal(btn.hidden, false);
+});
diff --git a/tests/side-chat-scrolling.test.mjs b/tests/side-chat-scrolling.test.mjs
index 09b5c6427..3466ac3a6 100644
--- a/tests/side-chat-scrolling.test.mjs
+++ b/tests/side-chat-scrolling.test.mjs
@@ -59,3 +59,44 @@ test('content growth does not pull a reader who scrolled up back down', async ()
     assert.equal(root.scrollTop, 100);
     scrolling.dispose();
 });
+
+test('a wheel tick up during streaming detaches before the next growth pins back down', () => {
+    const { win, root, ro, scrolling, grow } = setup();
+    root.scrollTop = 500;
+    root.dispatchEvent(new win.Event('scroll'));
+    root.dispatchEvent(new win.WheelEvent('wheel', { deltaY: -40 }));
+    grow(30); // 新 token 先于滚轮的 scroll 事件到达
+    ro.fire(root.firstElementChild);
+    assert.equal(root.scrollTop, 500);
+    assert.equal(scrolling.isSticky(), false);
+    scrolling.dispose();
+});
+
+test('a small scroll up within the bottom threshold still detaches; scrolling back down re-attaches', () => {
+    const { win, root, scrolling } = setup();
+    root.scrollTop = 500;
+    root.dispatchEvent(new win.Event('scroll'));
+    root.scrollTop = 470;
+    root.dispatchEvent(new win.Event('scroll'));
+    assert.equal(scrolling.isSticky(), false);
+    root.scrollTop = 490;
+    root.dispatchEvent(new win.Event('scroll'));
+    assert.equal(scrolling.isSticky(), true);
+    scrolling.dispose();
+});
+
+test('keyboard and touch scroll-up intents detach, but arrow keys inside the composer do not', () => {
+    const { win, root, scrolling } = setup();
+    const input = win.document.createElement('textarea');
+    root.appendChild(input);
+    input.dispatchEvent(new win.KeyboardEvent('keydown', { key: 'ArrowUp', bubbles: true }));
+    assert.equal(scrolling.isSticky(), true);
+    root.dispatchEvent(new win.KeyboardEvent('keydown', { key: 'PageUp', bubbles: true }));
+    assert.equal(scrolling.isSticky(), false);
+    scrolling.resume();
+    const touch = (type, y) => { const e = new win.Event(type); e.touches = [{ clientY: y }]; root.dispatchEvent(e); };
+    touch('touchstart', 100);
+    touch('touchmove', 140);
+    assert.equal(scrolling.isSticky(), false);
+    scrolling.dispose();
+});

From f2da276b140cabd4a4f4298d63d570b73cc1e2dc Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 02:00:47 +0000
Subject: [PATCH 068/143] Side pane: drop tabs owned by a deleted topic

Deleting a topic removed its side chat children on disk but left their
tabs (dormancy keep) mounted until restart, with renderers, observers and
document listeners resident. Topic deletion now reports the deleted ids;
the controller discards tabs whose parent is gone without asking,
without recording them as recently closed and without re-running the
child delete (ZCode useAppPanels closes selection side chats with the
parent task). Reviewed baseline hash for topicListManager.js updated.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DFRovoZHMzeheXKkLNWKG
---
 .../contracts/generated/chat-event-graph.json |   56 +-
 modules/topicListManager.js                   | 3213 +++++++++--------
 .../side-pane/side-pane-controller.js         |   16 +-
 .../side-pane/side-pane-tab-close-owner.js    |    5 +-
 renderer.js                                   |    8 +-
 scripts/next-delta-shared-baseline.json       |    4 +-
 tests/side-pane-deleted-topic.test.mjs        |   46 +
 7 files changed, 1709 insertions(+), 1639 deletions(-)
 create mode 100644 tests/side-pane-deleted-topic.test.mjs

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index bc07bf172..6a4243c9f 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -3971,7 +3971,7 @@
         },
         {
           "file": "modules/topicListManager.js",
-          "line": 1318,
+          "line": 1321,
           "kind": "custom-event-listener"
         },
         {
@@ -4331,17 +4331,17 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1144,
+          "line": 1158,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1150,
+          "line": 1164,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1164,
+          "line": 1178,
           "kind": "custom-event-listener"
         },
         {
@@ -5498,7 +5498,7 @@
         },
         {
           "file": "modules/topicListManager.js",
-          "line": 1318,
+          "line": 1321,
           "kind": "custom-event-listener",
           "match": "document.addEventListener('click'"
         },
@@ -5930,19 +5930,19 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1144,
+          "line": 1158,
           "kind": "custom-event-listener",
           "match": "toggleNotificationsBtn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1150,
+          "line": 1164,
           "kind": "custom-event-listener",
           "match": "expandButton.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1164,
+          "line": 1178,
           "kind": "custom-event-listener",
           "match": "closeSidePaneBtn.addEventListener('click'"
         },
@@ -14340,7 +14340,7 @@
         },
         {
           "file": "renderer.js",
-          "line": 678,
+          "line": 679,
           "kind": "custom-event-listener"
         }
       ],
@@ -14407,7 +14407,7 @@
         },
         {
           "file": "renderer.js",
-          "line": 678,
+          "line": 679,
           "kind": "custom-event-listener",
           "match": "window.addEventListener('global-settings-updated'"
         }
@@ -15449,7 +15449,7 @@
         },
         {
           "file": "modules/topicListManager.js",
-          "line": 1119,
+          "line": 1121,
           "kind": "custom-event-listener"
         },
         {
@@ -15808,7 +15808,7 @@
         },
         {
           "file": "modules/topicListManager.js",
-          "line": 1119,
+          "line": 1121,
           "kind": "custom-event-listener",
           "match": "inputField.addEventListener('keydown'"
         },
@@ -21600,14 +21600,14 @@
       "consumers": [
         {
           "file": "renderer.js",
-          "line": 190,
+          "line": 191,
           "kind": "preload-subscription"
         }
       ],
       "evidence": [
         {
           "file": "renderer.js",
-          "line": 190,
+          "line": 191,
           "kind": "preload-subscription",
           "match": "chatAPI.onPlayTtsAudio("
         }
@@ -21668,14 +21668,14 @@
       "consumers": [
         {
           "file": "renderer.js",
-          "line": 191,
+          "line": 192,
           "kind": "preload-subscription"
         }
       ],
       "evidence": [
         {
           "file": "renderer.js",
-          "line": 191,
+          "line": 192,
           "kind": "preload-subscription",
           "match": "chatAPI.onStopTtsAudio("
         }
@@ -25008,7 +25008,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1184,
+          "line": 1198,
           "kind": "custom-event-listener"
         },
         {
@@ -25108,7 +25108,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1184,
+          "line": 1198,
           "kind": "custom-event-listener",
           "match": "win?.addEventListener?.('resize'"
         },
@@ -29792,7 +29792,7 @@
       "producers": [
         {
           "file": "renderer.js",
-          "line": 275,
+          "line": 276,
           "kind": "custom-event-create"
         }
       ],
@@ -29812,7 +29812,7 @@
         },
         {
           "file": "renderer.js",
-          "line": 275,
+          "line": 276,
           "kind": "custom-event-create",
           "match": "new CustomEvent('vcp-appearance-studio-configure'"
         }
@@ -29823,7 +29823,7 @@
       "producers": [
         {
           "file": "renderer.js",
-          "line": 265,
+          "line": 266,
           "kind": "custom-event-create"
         }
       ],
@@ -29843,7 +29843,7 @@
         },
         {
           "file": "renderer.js",
-          "line": 265,
+          "line": 266,
           "kind": "custom-event-create",
           "match": "new CustomEvent('vcp-appearance-studio-dispose'"
         }
@@ -29873,7 +29873,7 @@
       "producers": [
         {
           "file": "renderer.js",
-          "line": 591,
+          "line": 592,
           "kind": "custom-event-create"
         }
       ],
@@ -29881,7 +29881,7 @@
       "evidence": [
         {
           "file": "renderer.js",
-          "line": 591,
+          "line": 592,
           "kind": "custom-event-create",
           "match": "new CustomEvent('vcp-chat-stream-terminal'"
         }
@@ -30267,7 +30267,7 @@
       "producers": [
         {
           "file": "renderer.js",
-          "line": 860,
+          "line": 866,
           "kind": "custom-event-create"
         }
       ],
@@ -30287,7 +30287,7 @@
         },
         {
           "file": "renderer.js",
-          "line": 860,
+          "line": 866,
           "kind": "custom-event-create",
           "match": "new CustomEvent('vcp-main-chat-commands-configure'"
         }
@@ -30298,7 +30298,7 @@
       "producers": [
         {
           "file": "renderer.js",
-          "line": 1078,
+          "line": 1084,
           "kind": "custom-event-create"
         }
       ],
@@ -30306,7 +30306,7 @@
       "evidence": [
         {
           "file": "renderer.js",
-          "line": 1078,
+          "line": 1084,
           "kind": "custom-event-create",
           "match": "new CustomEvent('vcp-renderer-ready'"
         }
diff --git a/modules/topicListManager.js b/modules/topicListManager.js
index 075f8c746..33c19ed72 100644
--- a/modules/topicListManager.js
+++ b/modules/topicListManager.js
@@ -1,1605 +1,1608 @@
-// modules/topicListManager.js
-
-window.topicListManager = (() => {
-    // --- Private Variables ---
-    let topicListContainer;
-    let electronAPI;
-    let chatRepository;
-    let currentSelectedItemRef;
-    let currentTopicIdRef;
-    let topicSelectionReadiness;
-    let uiHelper;
-    let mainRendererFunctions;
-    let listenerOwner;
-    let uiManager;
-    let itemListManager;
-    let renderListenerDisposers = [];
-    let wasSelectionListenerActive = false; // To store the state of the selection listener before dragging
-    let topicListRenderGeneration = 0;
-    let topicListScrollCleanup = null;
-    let topicCountObserver = null;
-    let isManageMode = false;
-    let selectedTopicIds = new Set();
-    let displayedTopics = [];
-    let availableTopics = [];
-    let currentItemConfig = null;
-    let managedItemKey = '';
-
-    const TOPIC_INITIAL_RENDER_COUNT = 40;
-    const TOPIC_PROGRESSIVE_BATCH_SIZE = 30;
-    const TOPIC_LOAD_MORE_THRESHOLD_PX = 320;
-    // Each search reload re-reads the item config and runs a content search
-    // over IPC. Typing waits for a short pause first, in the range ZCode uses
-    // for its IO-backed refreshes (fileWatcherService 150ms, useTabPersistence
-    // 300ms); Enter still searches at once.
-    const TOPIC_SEARCH_DEBOUNCE_MS = 200;
-    let topicSearchTimer = null;
-
-    const addListener = (target, type, handler, options) => {
-        if (listenerOwner) return listenerOwner.add(target, type, handler, options);
-        target?.addEventListener?.(type, handler, options);
-        return true;
-    };
-
-    function addRenderListener(target, type, handler, options) {
-        target?.addEventListener?.(type, handler, options);
-        renderListenerDisposers.push(() => target?.removeEventListener?.(type, handler, options));
-    }
-
-    function cancelPendingTopicSearch() {
-        if (topicSearchTimer) clearTimeout(topicSearchTimer);
-        topicSearchTimer = null;
-    }
-
-    // Names and IPC error strings are user or disk data, so status rows are
-    // built with textContent, never by interpolating into innerHTML.
-    function renderTopicListStatus(topicListUl, message, { loading = false } = {}) {
-        const li = document.createElement('li');
-        if (loading) {
-            const spinner = document.createElement('div');
-            spinner.className = 'loading-spinner-small';
-            li.append(spinner, document.createTextNode(message));
-        } else {
-            const p = document.createElement('p');
-            p.textContent = message;
-            li.appendChild(p);
-        }
-        topicListUl.replaceChildren(li);
-    }
-
-    function disposeRenderListeners() {
-        renderListenerDisposers.splice(0).reverse().forEach(dispose => dispose());
-    }
-
-    /**
-     * Initializes the TopicListManager module.
-     * @param {object} config - The configuration object.
-     */
-    function init(config) {
-        if (!config.elements || !config.elements.topicListContainer) {
-            console.error('[TopicListManager] Missing required DOM element: topicListContainer.');
-            return;
-        }
-        if (!config.electronAPI || !config.refs || !config.uiHelper || !config.mainRendererFunctions || !config.topicSelectionReadiness) {
-            console.error('[TopicListManager] Missing required configuration parameters.');
-            return;
-        }
-
-        topicListContainer = config.elements.topicListContainer;
-        electronAPI = config.electronAPI;
-        chatRepository = config.chatRepository || null;
-        if (!chatRepository) throw new Error('TopicListManager requires ChatRepository');
-        currentSelectedItemRef = config.refs.currentSelectedItemRef;
-        currentTopicIdRef = config.refs.currentTopicIdRef;
-        topicSelectionReadiness = config.topicSelectionReadiness;
-        uiHelper = config.uiHelper;
-        mainRendererFunctions = config.mainRendererFunctions;
-        listenerOwner = config.listenerOwner || null;
-        uiManager = config.uiManager || null;
-        itemListManager = config.itemListManager || null;
-
-        // 设置鼠标快捷键
-        setupMouseShortcuts();
-        setupNextUiTopicTools();
-
-        console.log('[TopicListManager] Initialized successfully.');
-    }
-
-    function getHistory(itemId, itemType, topicId) {
-        return chatRepository.getHistory(itemId, itemType, topicId);
-    }
-
-    function hasUserParticipation(history) {
-        return Array.isArray(history) && history.some(message =>
-            message &&
-            message.role === 'user' &&
-            message.isThinking !== true
-        );
-    }
-
-    function hasValidPersistentUnreadMarker(topic, history) {
-        if (topic?.unread !== true) return false;
-        if (topic.unreadSource === 'manual') return true;
-
-        // Agent/TopicSponsor 产生的旧未读标记在用户参与后即失效。
-        return !hasUserParticipation(history);
-    }
-
-    async function clearStalePersistentUnreadMarker(topic, itemId, history) {
-        if (
-            topic?.unread !== true ||
-            topic.unreadSource === 'manual' ||
-            !hasUserParticipation(history)
-        ) {
-            return;
-        }
-
-        topic.unread = false;
-        delete topic.unreadSource;
-
-        try {
-            const result = await electronAPI.setTopicUnread(itemId, topic.id, false);
-            if (!result?.success) {
-                console.warn(`[TopicListManager] 清理话题 ${topic.id} 的残留未读标记失败:`, result?.error);
-            }
-        } catch (error) {
-            console.warn(`[TopicListManager] 清理话题 ${topic.id} 的残留未读标记失败:`, error);
-        }
-    }
-
-    /**
-     * 统计完全由 Agent 主动发起、尚无用户参与的话题消息数。
-     * 系统消息和思考占位不参与判断；历史中只要出现过用户消息就返回 0。
-     * @param {Array} history - 消息历史
-     * @returns {number}
-     */
-    function countUnreadMessages(history) {
-        if (!Array.isArray(history) || history.length === 0) return 0;
-
-        const effectiveMessages = history.filter(message =>
-            message &&
-            message.role !== 'system' &&
-            message.isThinking !== true
-        );
-
-        if (effectiveMessages.some(message => message.role === 'user')) {
-            return 0;
-        }
-
-        return effectiveMessages.filter(message => message.role === 'assistant').length;
-    }
-
-    function normalizeTopicTitle(topicTitle) {
-        if (typeof topicTitle !== 'string') return topicTitle;
-
-        const trimmedTitle = topicTitle.trim();
-        if (!trimmedTitle) return trimmedTitle;
-        if (trimmedTitle.includes('新话题')) return trimmedTitle;
-
-        const timeMatch = trimmedTitle.match(/(\d{1,2}:\d{2}:\d{2})/);
-        if (trimmedTitle.includes('新话') && timeMatch) {
-            return `新话题 ${timeMatch[1]}`;
-        }
-
-        return trimmedTitle;
-    }
-
-    /**
-     * 解析话题搜索约定词。
-     * 仅当完整输入为“未读话题”或“unread topic”时启用未读置顶。
-     * @param {string} rawValue - 搜索框原始值
-     * @returns {{ rawTerm: string, queryTerm: string, prioritizeUnread: boolean }}
-     */
-    function parseTopicSearchQuery(rawValue) {
-        const rawTerm = String(rawValue || '').trim().toLowerCase();
-        const prioritizeUnread = rawTerm === '未读话题' || rawTerm === 'unread topic';
-
-        return {
-            rawTerm,
-            queryTerm: prioritizeUnread ? '' : rawTerm,
-            prioritizeUnread
-        };
-    }
-
-    /**
-     * 读取各话题历史，并将未读话题稳定地移到顶部。
-     * 未读组与已读组内部均保留用户自定义顺序。
-     */
-    async function prioritizeUnreadTopics(topics, currentSelectedItem) {
-        const topicsWithUnreadState = await Promise.all(topics.map(async topic => {
-            let history = [];
-            try {
-                history = await getHistory(currentSelectedItem.id, currentSelectedItem.type, topic.id);
-            } catch (error) {
-                console.warn(`[TopicListManager] 读取话题 ${topic.id} 的未读状态失败:`, error);
-            }
-
-            const calculatedUnreadCount = Array.isArray(history)
-                ? countUnreadMessages(history)
-                : 0;
-            const hasPersistentUnread = hasValidPersistentUnreadMarker(topic, history);
-
-            await clearStalePersistentUnreadMarker(topic, currentSelectedItem.id, history);
-
-            return {
-                topic,
-                isUnread: calculatedUnreadCount > 0 || hasPersistentUnread,
-                calculatedUnreadCount
-            };
-        }));
-
-        const unreadTopics = [];
-        const readTopics = [];
-        topicsWithUnreadState.forEach(({ topic, isUnread, calculatedUnreadCount }) => {
-            topic.__calculatedUnreadCount = calculatedUnreadCount;
-            (isUnread ? unreadTopics : readTopics).push(topic);
-        });
-
-        return unreadTopics.concat(readTopics);
-    }
-
-    function ensureTopicUnreadIndicator(li, unreadCount = -1) {
-        if (!li) return;
-
-        let indicator = li.querySelector('.topic-unread-indicator');
-        if (!indicator) {
-            indicator = document.createElement('span');
-            indicator.className = 'topic-unread-indicator';
-            const messageCountSpan = li.querySelector('.message-count');
-            li.insertBefore(indicator, messageCountSpan || null);
-        }
-
-        indicator.textContent = unreadCount > 0 ? `未读 ${unreadCount}` : '未读';
-        indicator.title = unreadCount > 0 ? `${unreadCount} 条未读消息` : '未读话题';
-        li.classList.add('has-unread-topic');
-    }
-
-    function removeTopicUnreadIndicator(li) {
-        if (!li) return;
-        li.querySelector('.topic-unread-indicator')?.remove();
-        li.classList.remove('has-unread-topic');
-    }
-
-    /**
-     * Part C: 计算单个话题的未读消息数
-     * @param {Object} topic - 话题对象
-     * @param {Array} history - 话题历史消息
-     * @returns {number} - 未读消息数，-1 表示仅显示小点
-     */
-    function calculateTopicUnreadCount(topic, history) {
-        const count = countUnreadMessages(history);
-        if (count > 0) return count;
-
-        // 没有自动计数时，仅保留仍有效的持久化未读标记。
-        if (hasValidPersistentUnreadMarker(topic, history)) {
-            return -1; // 仅显示小点，不显示数字
-        }
-
-        return 0; // 不显示
-    }
-
-    function cleanupProgressiveTopicRendering() {
-        topicListRenderGeneration++;
-        disposeRenderListeners();
-        if (typeof topicListScrollCleanup === 'function') {
-            topicListScrollCleanup();
-            topicListScrollCleanup = null;
-        }
-        if (topicCountObserver) {
-            topicCountObserver.disconnect();
-            topicCountObserver = null;
-        }
-        const topicListUl = document.getElementById('topicList');
-        if (topicListUl?.sortableInstance) {
-            topicListUl.sortableInstance.destroy();
-            topicListUl.sortableInstance = null;
-        }
-    }
-
-    function getTopicScrollContainer(topicListUl) {
-        return topicListUl?.closest('.sidebar-list-scroll') || topicListContainer;
-    }
-
-    function ensureTopicCountObserver() {
-        if (topicCountObserver) return topicCountObserver;
-
-        topicCountObserver = new IntersectionObserver((entries) => {
-            entries.forEach((entry) => {
-                if (!entry.isIntersecting) return;
-
-                const li = entry.target;
-                topicCountObserver.unobserve(li);
-                loadTopicMessageCount(li);
-            });
-        }, {
-            root: getTopicScrollContainer(document.getElementById('topicList')),
-            rootMargin: '240px 0px',
-            threshold: 0.01
-        });
-
-        return topicCountObserver;
-    }
-
-    function loadTopicMessageCount(li) {
-        if (!li?.isConnected || li.dataset.countLoaded === 'true' || li.dataset.countLoading === 'true') return;
-
-        const itemId = li.dataset.itemId;
-        const itemType = li.dataset.itemType;
-        const topicId = li.dataset.topicId;
-        const topic = li.__topicData;
-        const messageCountSpan = li.querySelector('.message-count');
-
-        if (!itemId || !itemType || !topicId || !topic || !messageCountSpan) return;
-
-        li.dataset.countLoading = 'true';
-
-        let historyPromise;
-        historyPromise = getHistory(itemId, itemType, topicId);
-
-        if (!historyPromise) {
-            messageCountSpan.textContent = 'N/A';
-            li.dataset.countLoaded = 'true';
-            li.dataset.countLoading = 'false';
-            return;
-        }
-
-        historyPromise.then(async historyResult => {
-            if (!li.isConnected) return;
-
-            messageCountSpan.classList.remove('has-unread', 'unread-marker-only');
-
-            if (historyResult && !historyResult.error && Array.isArray(historyResult)) {
-                await clearStalePersistentUnreadMarker(topic, itemId, historyResult);
-                const unreadCount = calculateTopicUnreadCount(topic, historyResult);
-                if (unreadCount > 0) {
-                    messageCountSpan.textContent = `${historyResult.length}`;
-                    messageCountSpan.classList.add('has-unread');
-                    ensureTopicUnreadIndicator(li, unreadCount);
-                } else if (unreadCount === -1) {
-                    messageCountSpan.textContent = `${historyResult.length}`;
-                    messageCountSpan.classList.add('unread-marker-only');
-                    ensureTopicUnreadIndicator(li);
-                } else {
-                    messageCountSpan.textContent = `${historyResult.length}`;
-                    removeTopicUnreadIndicator(li);
-                }
-            } else {
-                messageCountSpan.textContent = 'N/A';
-            }
-            li.dataset.countLoaded = 'true';
-        }).catch(() => {
-            if (li.isConnected) {
-                messageCountSpan.textContent = 'ERR';
-            }
-        }).finally(() => {
-            if (li.isConnected) {
-                li.dataset.countLoading = 'false';
-            }
-        });
-    }
-
-    function createTopicListItem(topic, currentSelectedItem, currentTopicId, itemConfigFull) {
-        const li = document.createElement('li');
-        li.classList.add('topic-item');
-        li.dataset.itemId = currentSelectedItem.id;
-        li.dataset.itemType = currentSelectedItem.type;
-        li.dataset.topicId = topic.id;
-        li.__topicData = topic;
-
-        const isCurrentActiveTopic = topic.id === currentTopicId;
-        const isPersistentlyUnread = topic.unread === true || topic.__calculatedUnreadCount > 0;
-        li.classList.toggle('active', isCurrentActiveTopic);
-        li.classList.toggle('active-topic-glowing', isCurrentActiveTopic);
-        li.classList.toggle('has-unread-topic', isPersistentlyUnread);
-
-        const avatarImg = document.createElement('img');
-        avatarImg.classList.add('avatar');
-        avatarImg.loading = 'lazy';
-        avatarImg.decoding = 'async';
-        avatarImg.src = currentSelectedItem.avatarUrl ? currentSelectedItem.avatarUrl : (currentSelectedItem.type === 'group' ? 'assets/default_group_avatar.png' : 'assets/default_avatar.png');
-
-        const displayTopicTitle = normalizeTopicTitle(topic.name || `话题 ${topic.id}`);
-        avatarImg.alt = `${currentSelectedItem.name} - ${displayTopicTitle}`;
-        avatarImg.onerror = () => { avatarImg.src = (currentSelectedItem.type === 'group' ? 'assets/default_group_avatar.png' : 'assets/default_avatar.png'); };
-
-        const topicTitleDisplay = document.createElement('span');
-        topicTitleDisplay.classList.add('topic-title-display');
-        topicTitleDisplay.textContent = displayTopicTitle;
-
-        const messageCountSpan = document.createElement('span');
-        messageCountSpan.classList.add('message-count');
-        messageCountSpan.textContent = '...';
-
-        const selectionIcon = document.createElement('span');
-        selectionIcon.classList.add('next-ui-topic-select-icon', 'vcp-ui-icon');
-        selectionIcon.setAttribute('aria-hidden', 'true');
-        selectionIcon.textContent = selectedTopicIds.has(topic.id) ? 'check_box' : 'check_box_outline_blank';
-        li.appendChild(selectionIcon);
-        li.appendChild(avatarImg);
-
-        if (topic.locked === false) {
-            const unlockedIndicator = document.createElement('span');
-            unlockedIndicator.classList.add('unlocked-indicator');
-            unlockedIndicator.textContent = 'unlocked';
-            unlockedIndicator.title = 'AI可以查看和回复此话题';
-            li.appendChild(unlockedIndicator);
-        }
-
-        li.appendChild(topicTitleDisplay);
-        if (isPersistentlyUnread) {
-            ensureTopicUnreadIndicator(li, topic.__calculatedUnreadCount);
-        }
-        li.appendChild(messageCountSpan);
-
-        const observer = ensureTopicCountObserver();
-        observer.observe(li);
-
-        addRenderListener(li, 'click', async () => {
-            if (isManageMode) {
-                toggleTopicSelection(topic.id);
-                return;
-            }
-
-            if (currentTopicIdRef.get() === topic.id) {
-                return;
-            }
-
-            if (!topicSelectionReadiness.isReady()) {
-                topicSelectionReadiness.defer({
-                    itemId: currentSelectedItem.id,
-                    itemType: currentSelectedItem.type,
-                    topicId: topic.id,
-                });
-                if (uiHelper && uiHelper.showToastNotification) {
-                    uiHelper.showToastNotification('正在初始化界面，稍后自动打开该话题', 'info');
-                }
-                return;
-            }
-
-            try {
-                await Promise.resolve(mainRendererFunctions.selectTopic(topic.id));
-            } catch (error) {
-                console.error('[TopicListManager] Failed to select topic:', error);
-                if (uiHelper && uiHelper.showToastNotification) {
-                    uiHelper.showToastNotification(`打开话题失败: ${error.message}`, 'error');
-                }
-            }
-        });
-
-        addRenderListener(li, 'contextmenu', (e) => {
-            e.preventDefault();
-            if (isManageMode) return;
-            showTopicContextMenu(e, li, itemConfigFull, topic, currentSelectedItem.type);
-        });
-
-        return li;
-    }
-
-    function renderTopicListProgressively(topicListUl, topicsToProcess, currentSelectedItem, currentTopicId, itemConfigFull, searchTerm) {
-        const renderGeneration = topicListRenderGeneration;
-        const scrollContainer = getTopicScrollContainer(topicListUl);
-        const totalCount = topicsToProcess.length;
-        const initialCount = searchTerm
-            ? Math.min(Math.max(TOPIC_INITIAL_RENDER_COUNT, TOPIC_PROGRESSIVE_BATCH_SIZE), totalCount)
-            : Math.min(TOPIC_INITIAL_RENDER_COUNT, totalCount);
-
-        let currentIndex = 0;
-        let isRendering = false;
-        let allRendered = false;
-
-        const statusLi = document.createElement('li');
-        statusLi.className = 'topic-list-progressive-status';
-        statusLi.textContent = '';
-        statusLi.style.justifyContent = 'center';
-        statusLi.style.opacity = '0.75';
-
-        const finalizeIfDone = () => {
-            if (!allRendered || renderGeneration !== topicListRenderGeneration) return;
-
-            statusLi.remove();
-            if (typeof topicListScrollCleanup === 'function') {
-                topicListScrollCleanup();
-                topicListScrollCleanup = null;
-            }
-
-            if (currentSelectedItem.id && topicsToProcess.length > 0 && typeof Sortable !== 'undefined' && !searchTerm) {
-                initializeTopicSortable(currentSelectedItem.id, currentSelectedItem.type);
-            }
-        };
-
-        const renderNextBatch = (batchSize = TOPIC_PROGRESSIVE_BATCH_SIZE) => {
-            if (isRendering || allRendered || renderGeneration !== topicListRenderGeneration) return;
-            isRendering = true;
-
-            requestAnimationFrame(() => {
-                if (renderGeneration !== topicListRenderGeneration) {
-                    isRendering = false;
-                    return;
-                }
-
-                const fragment = document.createDocumentFragment();
-                const end = Math.min(currentIndex + batchSize, totalCount);
-
-                for (; currentIndex < end; currentIndex++) {
-                    fragment.appendChild(createTopicListItem(
-                        topicsToProcess[currentIndex],
-                        currentSelectedItem,
-                        currentTopicId,
-                        itemConfigFull
-                    ));
-                }
-
-                if (statusLi.parentNode === topicListUl) {
-                    topicListUl.insertBefore(fragment, statusLi);
-                } else {
-                    topicListUl.appendChild(fragment);
-                }
-
-                allRendered = currentIndex >= totalCount;
-                isRendering = false;
-
-                if (!allRendered) {
-                    statusLi.textContent = `继续向下滚动加载更多话题（${currentIndex}/${totalCount}）`;
-                    if (!statusLi.parentNode) topicListUl.appendChild(statusLi);
-                    if (scrollContainer.scrollHeight <= scrollContainer.clientHeight + TOPIC_LOAD_MORE_THRESHOLD_PX) {
-                        renderNextBatch();
-                    }
-                } else {
-                    finalizeIfDone();
-                }
-            });
-        };
-
-        const onScroll = () => {
-            if (allRendered || isRendering || renderGeneration !== topicListRenderGeneration) return;
-
-            const distanceToBottom = scrollContainer.scrollHeight - scrollContainer.scrollTop - scrollContainer.clientHeight;
-            if (distanceToBottom <= TOPIC_LOAD_MORE_THRESHOLD_PX) {
-                renderNextBatch();
-            }
-        };
-
-        scrollContainer.addEventListener('scroll', onScroll, { passive: true });
-        topicListScrollCleanup = () => scrollContainer.removeEventListener('scroll', onScroll);
-
-        topicListUl.innerHTML = '';
-        renderNextBatch(initialCount);
-    }
-
-    async function loadTopicList() {
-        if (!topicListContainer) {
-            console.error("Topic list container (tabContentTopics) not found.");
-            return;
-        }
-
-        cancelPendingTopicSearch();
-        cleanupProgressiveTopicRendering();
-        const loadGeneration = topicListRenderGeneration;
-
-        let topicListUl = topicListContainer.querySelector('.topic-list');
-        if (topicListUl) {
-            topicListUl.innerHTML = '';
-        } else {
-            const topicsHeader = topicListContainer.querySelector('.topics-header') || document.createElement('div');
-            if (!topicsHeader.classList.contains('topics-header')) {
-                topicsHeader.className = 'topics-header';
-                topicsHeader.innerHTML = `<h2>话题列表</h2><div class="topic-search-container"><input type="text" id="topicSearchInput" placeholder="搜索话题；输入“未读话题”置顶" title="输入“未读话题”或“unread topic”将未读话题置顶" aria-label="搜索话题；输入未读话题将未读话题置顶" class="topic-search-input"></div>`;
-                topicListContainer.prepend(topicsHeader);
-                const newTopicSearchInput = topicsHeader.querySelector('#topicSearchInput');
-                if (newTopicSearchInput) setupTopicSearchListener(newTopicSearchInput);
-            }
-
-            topicListUl = document.createElement('ul');
-            topicListUl.className = 'topic-list';
-            topicListUl.id = 'topicList';
-            topicListContainer.appendChild(topicListUl);
-        }
-
-        const currentSelectedItem = currentSelectedItemRef.get();
-        if (!currentSelectedItem.id) {
-            availableTopics = [];
-            displayedTopics = [];
-            currentItemConfig = null;
-            managedItemKey = '';
-            selectedTopicIds.clear();
-            syncManageUi();
-            topicListUl.innerHTML = '<li><p>请先在“助手与群组”列表选择一个项目以查看其相关话题。</p></li>';
-            return;
-        }
-
-        const nextItemKey = `${currentSelectedItem.type}:${currentSelectedItem.id}`;
-        if (managedItemKey && managedItemKey !== nextItemKey) {
-            selectedTopicIds.clear();
-        }
-        managedItemKey = nextItemKey;
-
-        const itemNameForLoading = currentSelectedItem.name || '当前项目';
-        const searchInput = document.getElementById('topicSearchInput');
-        const searchQuery = parseTopicSearchQuery(searchInput ? searchInput.value : '');
-        const searchTerm = searchQuery.rawTerm;
-        const contentQueryTerm = searchQuery.queryTerm;
-
-        let itemConfigFull;
-
-        if (!searchTerm) {
-            renderTopicListStatus(topicListUl, `正在加载 ${itemNameForLoading} 的话题...`, { loading: true });
-        } else {
-            topicListUl.innerHTML = '';
-        }
-
-        try {
-            if (currentSelectedItem.type === 'agent') {
-                itemConfigFull = await electronAPI.getAgentConfig(currentSelectedItem.id);
-            } else if (currentSelectedItem.type === 'group') {
-                itemConfigFull = await electronAPI.getAgentGroupConfig(currentSelectedItem.id);
-            }
-        } catch (error) {
-            // A rejected IPC call used to leave the loading spinner up for good.
-            console.error('[TopicListManager] Failed to load item config:', error);
-            itemConfigFull = { error: error?.message || String(error) };
-        }
-
-        if (loadGeneration !== topicListRenderGeneration ||
-            currentSelectedItemRef.get()?.id !== currentSelectedItem.id ||
-            currentSelectedItemRef.get()?.type !== currentSelectedItem.type) {
-            return;
-        }
-
-        if (itemConfigFull && !itemConfigFull.error) {
-            mainRendererFunctions.updateCurrentItemConfig(itemConfigFull);
-        }
-
-        if (!itemConfigFull || itemConfigFull.error) {
-            availableTopics = [];
-            displayedTopics = [];
-            currentItemConfig = null;
-            selectedTopicIds.clear();
-            syncManageUi();
-            renderTopicListStatus(topicListUl, `无法加载 ${itemNameForLoading} 的配置信息: ${itemConfigFull?.error || '未知错误'}`);
-        } else {
-            let topicsToProcess = itemConfigFull.topics || [];
-            if (currentSelectedItem.type === 'agent' && topicsToProcess.length === 0) {
-                const defaultAgentTopic = { id: "default", name: "主要对话", createdAt: Date.now() };
-                topicsToProcess.push(defaultAgentTopic);
-            }
-
-            availableTopics = [...topicsToProcess];
-            currentItemConfig = itemConfigFull;
-            const availableTopicIds = new Set(availableTopics.map(topic => topic.id));
-            selectedTopicIds = new Set([...selectedTopicIds].filter(topicId => availableTopicIds.has(topicId)));
-
-            // topicsToProcess.sort((a, b) => (b.createdAt || 0) - (a.createdAt || 0));
-
-            if (contentQueryTerm) {
-                let frontendFilteredTopics = topicsToProcess.filter(topic => {
-                    const normalizedTopicTitle = normalizeTopicTitle(topic.name || '');
-                    const nameMatch = normalizedTopicTitle.toLowerCase().includes(contentQueryTerm);
-                    let dateMatch = false;
-                    if (topic.createdAt) {
-                        const date = new Date(topic.createdAt);
-                        const fullDateStr = `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')} ${String(date.getHours()).padStart(2, '0')}:${String(date.getMinutes()).padStart(2, '0')}`;
-                        const shortDateStr = `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')}`;
-                        dateMatch = fullDateStr.toLowerCase().includes(contentQueryTerm) || shortDateStr.toLowerCase().includes(contentQueryTerm);
-                    }
-                    return nameMatch || dateMatch;
-                });
-
-                let contentMatchedTopicIds = [];
-                try {
-                    const contentSearchResult = await electronAPI.searchTopicsByContent(currentSelectedItem.id, currentSelectedItem.type, contentQueryTerm);
-                    if (contentSearchResult && contentSearchResult.success && Array.isArray(contentSearchResult.matchedTopicIds)) {
-                        contentMatchedTopicIds = contentSearchResult.matchedTopicIds;
-                    } else if (contentSearchResult && !contentSearchResult.success) {
-                        console.warn("Topic content search failed:", contentSearchResult.error);
-                    }
-                } catch (e) {
-                    console.error("Error calling searchTopicsByContent:", e);
-                }
-
-                const finalFilteredTopicIds = new Set(frontendFilteredTopics.map(t => t.id));
-                contentMatchedTopicIds.forEach(id => finalFilteredTopicIds.add(id));
-
-                topicsToProcess = topicsToProcess.filter(topic => finalFilteredTopicIds.has(topic.id));
-            }
-
-            if (searchQuery.prioritizeUnread) {
-                topicsToProcess = await prioritizeUnreadTopics(topicsToProcess, currentSelectedItem);
-            }
-
-            if (loadGeneration !== topicListRenderGeneration ||
-                currentSelectedItemRef.get()?.id !== currentSelectedItem.id ||
-                currentSelectedItemRef.get()?.type !== currentSelectedItem.type) {
-                return;
-            }
-
-            displayedTopics = [...topicsToProcess];
-            syncManageUi();
-
-            if (topicsToProcess.length === 0) {
-                renderTopicListStatus(topicListUl, `${itemNameForLoading} 还没有任何话题${searchTerm ? '匹配当前搜索' : ''}。您可以点击上方的“新建${currentSelectedItem.type === 'group' ? '群聊话题' : '聊天话题'}”按钮创建一个。`);
-            } else {
-                const currentTopicId = currentTopicIdRef.get();
-                renderTopicListProgressively(topicListUl, topicsToProcess, currentSelectedItem, currentTopicId, itemConfigFull, searchTerm);
-            }
-        }
-    }
-
-    function setupTopicSearch() {
-        let searchInput = document.getElementById('topicSearchInput');
-        if (searchInput) {
-            setupTopicSearchListener(searchInput);
-        }
-    }
-
-    function setupTopicSearchListener(inputElement) {
-        if (inputElement.dataset.topicSearchBound === 'true') return;
-        inputElement.dataset.topicSearchBound = 'true';
-
-        addListener(inputElement, 'input', scheduleTopicSearch);
-        addListener(inputElement, 'keydown', (event) => {
-            if (event.key === 'Enter') {
-                event.preventDefault();
-                filterTopicList();
-            }
-        });
-    }
-
-    function scheduleTopicSearch() {
-        cancelPendingTopicSearch();
-        topicSearchTimer = setTimeout(() => {
-            topicSearchTimer = null;
-            loadTopicList();
-        }, TOPIC_SEARCH_DEBOUNCE_MS);
-    }
-
-    function filterTopicList() {
-        loadTopicList();
-    }
-
-    function setupNextUiTopicTools() {
-        const topicsHeader = document.querySelector('#tabContentTopics .topics-header-container');
-        const createButton = document.getElementById('nextUiCreateTopicBtn');
-        const manageButton = document.getElementById('nextUiManageTopicsBtn');
-        const searchButton = document.getElementById('nextUiTopicSearchTrigger');
-        const searchCloseButton = document.getElementById('nextUiTopicSearchClose');
-        const searchInput = document.getElementById('topicSearchInput');
-        const selectAllButton = document.getElementById('nextUiSelectAllTopicsBtn');
-        const deleteButton = document.getElementById('nextUiDeleteTopicsBtn');
-        const exitButton = document.getElementById('nextUiExitTopicManageBtn');
-
-        if (!topicsHeader || !createButton || !manageButton || !searchButton || !searchCloseButton || !searchInput) return;
-        if (topicsHeader.dataset.nextUiToolsBound === 'true') return;
-        topicsHeader.dataset.nextUiToolsBound = 'true';
-
-        const setSearchMode = (active, clear = !active) => {
-            topicsHeader.classList.toggle('is-searching', active);
-            searchButton.setAttribute('aria-expanded', String(active));
-            if (clear) {
-                searchInput.value = '';
-                loadTopicList();
-            }
-            if (active) requestAnimationFrame(() => searchInput.focus());
-            else if (document.activeElement === searchInput) searchButton.focus();
-        };
-
-        addListener(createButton, 'click', () => {
-            document.getElementById('currentAgentSettingsBtn')?.dispatchEvent(new MouseEvent('click', { bubbles: true }));
-        });
-        addListener(createButton, 'contextmenu', (event) => {
-            event.preventDefault();
-            document.getElementById('currentAgentSettingsBtn')?.dispatchEvent(new MouseEvent('contextmenu', {
-                bubbles: true,
-                clientX: event.clientX,
-                clientY: event.clientY
-            }));
-        });
-        addListener(manageButton, 'click', () => setManageMode(!isManageMode));
-        addListener(searchButton, 'click', () => setSearchMode(true, false));
-        addListener(searchCloseButton, 'click', () => setSearchMode(false, true));
-        addListener(searchInput, 'keydown', (event) => {
-            if (event.key === 'Escape') {
-                event.preventDefault();
-                setSearchMode(false, true);
-            }
-        });
-        if (selectAllButton) addListener(selectAllButton, 'click', toggleSelectAllDisplayedTopics);
-        if (deleteButton) addListener(deleteButton, 'click', deleteSelectedTopics);
-        if (exitButton) addListener(exitButton, 'click', () => setManageMode(false));
-
-        syncManageUi();
-    }
-
-    function setManageMode(active) {
-        isManageMode = active;
-        if (!active) selectedTopicIds.clear();
-
-        const topicListUl = document.getElementById('topicList');
-        if (active && topicListUl?.sortableInstance) {
-            topicListUl.sortableInstance.destroy();
-            topicListUl.sortableInstance = null;
-        } else if (!active) {
-            loadTopicList();
-        }
-
-        syncManageUi();
-    }
-
-    function toggleTopicSelection(topicId) {
-        if (selectedTopicIds.has(topicId)) selectedTopicIds.delete(topicId);
-        else selectedTopicIds.add(topicId);
-        syncManageUi();
-    }
-
-    function toggleSelectAllDisplayedTopics() {
-        const displayedIds = displayedTopics.map(topic => topic.id);
-        const allDisplayedSelected = displayedIds.length > 0 && displayedIds.every(topicId => selectedTopicIds.has(topicId));
-
-        if (allDisplayedSelected) displayedIds.forEach(topicId => selectedTopicIds.delete(topicId));
-        else displayedIds.forEach(topicId => selectedTopicIds.add(topicId));
-        syncManageUi();
-    }
-
-    function syncManageUi() {
-        const container = document.getElementById('tabContentTopics');
-        const manageButton = document.getElementById('nextUiManageTopicsBtn');
-        const managePanel = container?.querySelector('.next-ui-topic-manage-panel');
-        const count = document.getElementById('nextUiTopicSelectionCount');
-        const selectAllButton = document.getElementById('nextUiSelectAllTopicsBtn');
-        const deleteButton = document.getElementById('nextUiDeleteTopicsBtn');
-        const allDisplayedSelected = displayedTopics.length > 0
-            && displayedTopics.every(topic => selectedTopicIds.has(topic.id));
-
-        container?.classList.toggle('is-managing', isManageMode);
-        manageButton?.classList.toggle('active', isManageMode);
-        manageButton?.setAttribute('aria-pressed', String(isManageMode));
-        managePanel?.setAttribute('aria-hidden', String(!isManageMode));
-        if (count) count.textContent = `已选择 ${selectedTopicIds.size} 项`;
-        if (deleteButton) deleteButton.disabled = selectedTopicIds.size === 0;
-        const selectAllIcon = selectAllButton?.querySelector('.vcp-ui-icon');
-        if (selectAllIcon) selectAllIcon.textContent = allDisplayedSelected ? 'check_box' : 'check_box_outline_blank';
-        if (selectAllButton) selectAllButton.title = allDisplayedSelected ? '取消全选' : '全选话题';
-
-        document.querySelectorAll('#topicList .topic-item').forEach(item => {
-            const selected = selectedTopicIds.has(item.dataset.topicId);
-            item.classList.toggle('selected', selected);
-            item.setAttribute('aria-selected', String(selected));
-            const icon = item.querySelector('.next-ui-topic-select-icon');
-            if (icon) icon.textContent = selected ? 'check_box' : 'check_box_outline_blank';
-        });
-    }
-
-    async function deleteSelectedTopics() {
-        if (!isManageMode || selectedTopicIds.size === 0 || !currentItemConfig) return;
-
-        const currentSelectedItem = currentSelectedItemRef.get();
-        const topicsToDelete = availableTopics.filter(topic => selectedTopicIds.has(topic.id));
-        if (topicsToDelete.length === 0) return;
-        if (topicsToDelete.length >= availableTopics.length) {
-            uiHelper.showToastNotification('至少需要保留一个话题。', 'warning');
-            return;
-        }
-
-        const flowlockedTopic = currentSelectedItem.type === 'agent'
-            ? topicsToDelete.find(topic => window.flowlockManager?.isTopicLocked?.(currentSelectedItem.id, topic.id))
-            : null;
-        if (flowlockedTopic) {
-            uiHelper.showToastNotification(`话题“${flowlockedTopic.name}”正在心流锁中运行，请先停止对应心流锁。`, 'warning');
-            return;
-        }
-
-        const confirmed = await uiHelper.showConfirmDialog(
-            `确定要永久删除选中的 ${topicsToDelete.length} 个话题吗？此操作不可撤销。`,
-            '批量删除话题',
-            '删除',
-            '取消',
-            true
-        );
-        if (!confirmed) return;
-
-        let deletedCount = 0;
-        let remainingTopics = availableTopics;
-        let firstError = '';
-        const activeTopicId = currentTopicIdRef.get();
-        let activeTopicDeleted = false;
-
-        for (const topic of topicsToDelete) {
-            try {
-                const result = currentSelectedItem.type === 'agent'
-                    ? await electronAPI.deleteTopic(currentSelectedItem.id, topic.id)
-                    : await electronAPI.deleteGroupTopic(currentSelectedItem.id, topic.id);
-                if (result?.success) {
-                    deletedCount++;
-                    if (topic.id === activeTopicId) activeTopicDeleted = true;
-                    remainingTopics = result.remainingTopics || remainingTopics.filter(item => item.id !== topic.id);
-                } else if (!firstError) {
-                    firstError = result?.error || '未知错误';
-                }
-            } catch (error) {
-                if (!firstError) firstError = error.message;
-            }
-        }
-
-        if (activeTopicDeleted) {
-            mainRendererFunctions.handleTopicDeletion(remainingTopics, {
-                id: currentSelectedItem.id,
-                type: currentSelectedItem.type,
-                deletedTopicIds: topicsToDelete.map(topic => topic.id),
-                fallbackTopicId: topicsToDelete.some(topic => topic.id === activeTopicId) ? null : activeTopicId,
-            });
-        }
-
-        setManageMode(false);
-        if (deletedCount > 0) uiHelper.showToastNotification(`已删除 ${deletedCount} 个话题。`, 'success');
-        if (firstError) uiHelper.showToastNotification(`部分话题删除失败：${firstError}`, 'error');
-    }
-
-    function initializeTopicSortable(itemId, itemType) {
-        const topicListUl = document.getElementById('topicList');
-        if (!topicListUl) {
-            console.warn("[TopicListManager] topicListUl element not found. Skipping Sortable initialization.");
-            return;
-        }
-
-        if (topicListUl.sortableInstance) {
-            topicListUl.sortableInstance.destroy();
-        }
-
-        const targetItemId = itemId;
-        const targetItemType = itemType;
-        topicListUl.sortableInstance = new Sortable(topicListUl, {
-            animation: 150,
-            ghostClass: 'sortable-ghost-topic',
-            chosenClass: 'sortable-chosen-topic',
-            dragClass: 'sortable-drag-topic',
-            onStart: async function (evt) {
-                // Check original state, store it, and then disable if it was active.
-                if (electronAPI?.getSelectionListenerStatus) {
-                    wasSelectionListenerActive = await electronAPI.getSelectionListenerStatus();
-                    if (wasSelectionListenerActive) {
-                        electronAPI.toggleSelectionListener(false);
-                    }
-                }
-            },
-            onEnd: async function (evt) {
-                // Re-enable selection hook only if it was active before the drag.
-                if (electronAPI?.toggleSelectionListener) {
-                    if (wasSelectionListenerActive) {
-                        electronAPI.toggleSelectionListener(true);
-                    }
-                    wasSelectionListenerActive = false; // Reset state
-                }
-
-                const topicItems = Array.from(evt.to.children);
-                const orderedTopicIds = topicItems.map(item => item.dataset.topicId);
-                try {
-                    let result;
-                    if (targetItemType === 'agent') {
-                        result = await electronAPI.saveTopicOrder(targetItemId, orderedTopicIds);
-                    } else if (targetItemType === 'group') {
-                        result = await electronAPI.saveGroupTopicOrder(targetItemId, orderedTopicIds);
-                    }
-
-                    if (result && result.success) {
-                        // UI reflects sort.
-                    } else {
-                        console.error(`Failed to save topic order for ${targetItemType} ${targetItemId}:`, result?.error);
-                        uiHelper.showToastNotification(`保存话题顺序失败: ${result?.error || '未知错误'}`, 'error');
-                        loadTopicList();
-                    }
-                } catch (error) {
-                    console.error(`Error calling saveTopicOrder for ${targetItemType} ${targetItemId}:`, error);
-                    uiHelper.showToastNotification(`调用保存话题顺序API时出错: ${error.message}`, 'error');
-                    loadTopicList();
-                }
-            }
-        });
-    }
-
-    function showTopicContextMenu(event, topicItemElement, itemFullConfig, topic, itemType) {
-        // closeContextMenu(); // This function is not available in this module
-        closeTopicContextMenu();
-
-        const menu = document.createElement('div');
-        menu.id = 'topicContextMenu';
-        menu.classList.add('context-menu');
-
-        // 冻结话题域目标；标题生成允许即时保存，但绝不能跨项目串写。
-        const targetItemId = itemFullConfig.id;
-        const targetItemType = itemType;
-        const targetTopicId = topic.id;
-        // "生成话题名" 菜单项：Agent 和 Group 话题均支持
-        const regenerateTitleOption = document.createElement('div');
-        regenerateTitleOption.classList.add('context-menu-item');
-        regenerateTitleOption.innerHTML = `<i class="fas fa-magic"></i> 生成话题名`;
-        regenerateTitleOption.onclick = async () => {
-            closeTopicContextMenu();
-            if (regenerateTitleOption.dataset.loading === 'true') return;
-
-            regenerateTitleOption.dataset.loading = 'true';
-            regenerateTitleOption.classList.add('disabled');
-            try {
-                // 根据话题类型调用对应的 IPC
-                const result = targetItemType === 'agent'
-                    ? await electronAPI.regenerateAgentTopicTitle(targetItemId, targetTopicId)
-                    : await electronAPI.regenerateGroupTopicTitle(targetItemId, targetTopicId);
-
-                if (result?.success && result.newTitle) {
-                    // 原话题已保存；离开原项目后不再投影到当前界面，也不误报失败。
-                    if (currentSelectedItemRef.get()?.id !== targetItemId ||
-                        currentSelectedItemRef.get()?.type !== targetItemType) return;
-                    topic.name = result.newTitle;
-                    const topicInFullConfig = itemFullConfig.topics?.find(candidate => candidate.id === topic.id);
-                    if (topicInFullConfig) topicInFullConfig.name = result.newTitle;
-
-                    const titleDisplayElement = topicItemElement.querySelector('.topic-title-display, .topic-name');
-                    if (titleDisplayElement) titleDisplayElement.textContent = result.newTitle;
-                    uiHelper.showToastNotification(`话题名已更新为"${result.newTitle}"`, 'success');
-                } else {
-                    // 失败时不修改 topic、itemFullConfig 或 DOM，保留旧标题。
-                    uiHelper.showToastNotification(`生成话题名失败: ${result?.error || 'AI 未返回有效标题'}`, 'error');
-                }
-            } catch (error) {
-                // 请求异常时同样不触碰旧标题。
-                console.error('[TopicListManager] 生成话题名失败:', error);
-                uiHelper.showToastNotification(`生成话题名失败: ${error.message}`, 'error');
-            } finally {
-                regenerateTitleOption.dataset.loading = 'false';
-                regenerateTitleOption.classList.remove('disabled');
-            }
-        };
-
-        const editTitleOption = document.createElement('div');
-        editTitleOption.classList.add('context-menu-item');
-        editTitleOption.innerHTML = `<i class="fas fa-edit"></i> 编辑话题标题`;
-        editTitleOption.onclick = () => {
-            closeTopicContextMenu();
-            const titleDisplayElement = topicItemElement.querySelector('.topic-title-display');
-            if (!titleDisplayElement) return;
-
-            const originalTitle = topic.name;
-            titleDisplayElement.style.display = 'none';
-
-            const inputWrapper = document.createElement('div');
-            inputWrapper.style.display = 'flex';
-            inputWrapper.style.alignItems = 'center';
-
-            const inputField = document.createElement('input');
-            inputField.type = 'text';
-            inputField.value = originalTitle;
-            inputField.classList.add('topic-title-edit-input');
-            inputField.style.flexGrow = '1';
-            inputField.onclick = (e) => e.stopPropagation();
-
-            const confirmButton = document.createElement('button');
-            confirmButton.type = 'button';
-            confirmButton.innerHTML = '✓';
-            confirmButton.classList.add('topic-title-edit-confirm');
-            confirmButton.onclick = async (e) => {
-                e.stopPropagation();
-                const newTitle = inputField.value.trim();
-                if (newTitle && newTitle !== originalTitle) {
-                    let saveResult;
-                    if (targetItemType === 'agent') {
-                        saveResult = await electronAPI.saveAgentTopicTitle(targetItemId, targetTopicId, newTitle);
-                    } else if (targetItemType === 'group') {
-                        saveResult = await electronAPI.saveGroupTopicTitle(targetItemId, targetTopicId, newTitle);
-                    }
-                    if (saveResult && saveResult.success) {
-                        topic.name = newTitle;
-                        titleDisplayElement.textContent = newTitle;
-                        if (itemFullConfig.topics) {
-                            const topicInFullConfig = itemFullConfig.topics.find(t => t.id === topic.id);
-                            if (topicInFullConfig) topicInFullConfig.name = newTitle;
-                        }
-                    } else {
-                        uiHelper.showToastNotification(`更新话题标题失败: ${saveResult?.error || '未知错误'}`, 'error');
-                    }
-                }
-                titleDisplayElement.style.display = '';
-                inputWrapper.replaceWith(titleDisplayElement);
-            };
-
-            const cancelButton = document.createElement('button');
-            cancelButton.type = 'button';
-            cancelButton.innerHTML = '✗';
-            cancelButton.classList.add('topic-title-edit-cancel');
-            cancelButton.onclick = (e) => {
-                e.stopPropagation();
-                titleDisplayElement.style.display = '';
-                inputWrapper.replaceWith(titleDisplayElement);
-            };
-
-            inputWrapper.appendChild(inputField);
-            inputWrapper.appendChild(confirmButton);
-            inputWrapper.appendChild(cancelButton);
-            topicItemElement.insertBefore(inputWrapper, titleDisplayElement.nextSibling);
-            inputField.focus();
-            inputField.select();
-
-            inputField.addEventListener('keydown', (e) => {
-                if (e.key === 'Enter') {
-                    confirmButton.click();
-                } else if (e.key === 'Escape') {
-                    cancelButton.click();
-                }
-            });
-        };
-        menu.appendChild(editTitleOption);
-        menu.appendChild(regenerateTitleOption);
-
-        const copyTopicIdOption = document.createElement('div');
-        copyTopicIdOption.classList.add('context-menu-item');
-        copyTopicIdOption.innerHTML = `<i class="fas fa-copy"></i> 复制话题ID`;
-        copyTopicIdOption.onclick = async () => {
-            closeTopicContextMenu();
-            const topicId = String(topic.id ?? '');
-            try {
-                if (navigator.clipboard?.writeText) {
-                    await navigator.clipboard.writeText(topicId);
-                } else {
-                    const textarea = document.createElement('textarea');
-                    textarea.value = topicId;
-                    textarea.style.position = 'fixed';
-                    textarea.style.opacity = '0';
-                    document.body.appendChild(textarea);
-                    textarea.focus();
-                    textarea.select();
-                    document.execCommand('copy');
-                    textarea.remove();
-                }
-                uiHelper.showToastNotification('已复制话题ID', 'success');
-            } catch (error) {
-                console.error('[TopicListManager] Failed to copy topic ID:', error);
-                uiHelper.showToastNotification(`复制话题ID失败: ${error.message}`, 'error');
-            }
-        };
-        menu.appendChild(copyTopicIdOption);
-
-        // Part C: 锁定/解锁话题选项
-        const toggleLockOption = document.createElement('div');
-        toggleLockOption.classList.add('context-menu-item');
-        const isLocked = topic.locked !== false; // 默认为锁定
-        toggleLockOption.innerHTML = isLocked
-            ? `<i class="fas fa-unlock"></i> 解锁话题`
-            : `<i class="fas fa-lock"></i> 锁定话题`;
-        toggleLockOption.onclick = async () => {
-            closeTopicContextMenu();
-            try {
-                const result = await electronAPI.toggleTopicLock(targetItemId, targetTopicId);
-                if (result.success) {
-                    topic.locked = result.locked;
-                    uiHelper.showToastNotification(result.message, 'success');
-                    loadTopicList(); // 刷新列表以显示新状态
-                } else {
-                    uiHelper.showToastNotification(`切换锁定状态失败: ${result.error}`, 'error');
-                }
-            } catch (error) {
-                uiHelper.showToastNotification(`操作失败: ${error.message}`, 'error');
-            }
-        };
-        menu.appendChild(toggleLockOption);
-
-        // Part C: 标记为未读/已读选项
-        const toggleUnreadOption = document.createElement('div');
-        toggleUnreadOption.classList.add('context-menu-item');
-        const isUnread = topic.unread === true;
-        toggleUnreadOption.innerHTML = isUnread
-            ? `<i class="fas fa-check"></i> 标记为已读`
-            : `<i class="fas fa-envelope"></i> 标记为未读`;
-        toggleUnreadOption.onclick = async () => {
-            closeTopicContextMenu();
-            try {
-                const result = await electronAPI.setTopicUnread(targetItemId, targetTopicId, !isUnread);
-                if (result.success) {
-                    topic.unread = result.unread;
-                    if (result.unreadSource) {
-                        topic.unreadSource = result.unreadSource;
-                    } else {
-                        delete topic.unreadSource;
-                    }
-                    uiHelper.showToastNotification(
-                        topic.unread ? '已标记为未读' : '已标记为已读',
-                        'success'
-                    );
-                    loadTopicList(); // 刷新列表
-                    // 同时刷新助手列表以更新计数
-                    if (itemListManager) {
-                        itemListManager.loadItems();
-                    }
-                } else {
-                    uiHelper.showToastNotification(`操作失败: ${result.error}`, 'error');
-                }
-            } catch (error) {
-                uiHelper.showToastNotification(`操作失败: ${error.message}`, 'error');
-            }
-        };
-        menu.appendChild(toggleUnreadOption);
-
-        const deleteTopicPermanentlyOption = document.createElement('div');
-        deleteTopicPermanentlyOption.classList.add('context-menu-item', 'danger-item');
-        deleteTopicPermanentlyOption.innerHTML = `<i class="fas fa-trash-alt"></i> 删除此话题`;
-        deleteTopicPermanentlyOption.onclick = async () => {
-            closeTopicContextMenu();
-
-            // 活动 Flowlock Session 仍依赖该话题的历史目录，运行期间禁止删除。
-            if (targetItemType === 'agent' && window.flowlockManager?.isTopicLocked?.(targetItemId, targetTopicId)) {
-                uiHelper.showToastNotification('该话题正在心流锁中运行，请先停止对应 Agent 的心流锁。', 'warning');
-                return;
-            }
-
-            // 使用自定义确认对话框替代原生 confirm()，避免 Electron 焦点问题
-            const confirmed = await uiHelper.showConfirmDialog(
-                `确定要永久删除话题 "${topic.name}" 吗？此操作不可撤销。`,
-                '删除话题',
-                '删除',
-                '取消',
-                true // isDanger
-            );
-            if (confirmed) {
-                let result;
-                if (targetItemType === 'agent') {
-                    result = await electronAPI.deleteTopic(targetItemId, targetTopicId);
-                } else if (targetItemType === 'group') {
-                    result = await electronAPI.deleteGroupTopic(targetItemId, targetTopicId);
-                }
-
-                if (result && result.success) {
-                    if (currentSelectedItemRef.get()?.id === targetItemId &&
-                        currentSelectedItemRef.get()?.type === targetItemType &&
-                        currentTopicIdRef.get() === targetTopicId) {
-                        mainRendererFunctions.handleTopicDeletion(result.remainingTopics, {
-                            id: targetItemId,
-                            type: targetItemType,
-                            topicId: targetTopicId,
-                            fallbackTopicId: itemFullConfig.topics?.find(candidate => candidate.id !== topic.id)?.id || null,
-                        });
-                    }
-                    loadTopicList();
-                } else {
-                    uiHelper.showToastNotification(`删除话题 "${topic.name}" 失败: ${result ? result.error : '未知错误'}`, 'error');
-                }
-            }
-        };
-        menu.appendChild(deleteTopicPermanentlyOption);
-
-        const exportTopicOption = document.createElement('div');
-        exportTopicOption.classList.add('context-menu-item');
-        exportTopicOption.innerHTML = `<i class="fas fa-file-export"></i> 导出此话题`;
-        exportTopicOption.onclick = () => {
-            closeTopicContextMenu();
-            handleExportTopic(itemFullConfig.id, itemType, topic.id, topic.name);
-        };
-        menu.appendChild(exportTopicOption);
-
-        const exportFullTopicOption = document.createElement('div');
-        exportFullTopicOption.classList.add('context-menu-item');
-        exportFullTopicOption.innerHTML = `<i class="fas fa-file-code"></i> 导出此话题(完整)`;
-        exportFullTopicOption.onclick = () => {
-            closeTopicContextMenu();
-            handleExportFullTopic(itemFullConfig, itemType, topic.id, topic.name);
-        };
-        menu.appendChild(exportFullTopicOption);
-
-        // 智能定位逻辑：先隐藏菜单以测量尺寸
-        menu.style.visibility = 'hidden';
-        menu.style.position = 'absolute';
-        document.body.appendChild(menu);
-
-        // 获取菜单和窗口尺寸
-        const menuWidth = menu.offsetWidth;
-        const menuHeight = menu.offsetHeight;
-        const windowWidth = window.innerWidth;
-        const windowHeight = window.innerHeight;
-
-        let top = event.clientY;
-        let left = event.clientX;
-
-        // 检查菜单是否会超出窗口底部
-        if (top + menuHeight > windowHeight) {
-            // 将菜单显示在鼠标上方
-            top = event.clientY - menuHeight;
-            // 如果上方空间也不够，则贴近顶部
-            if (top < 0) top = 5;
-        }
-
-        // 检查菜单是否会超出窗口右侧
-        if (left + menuWidth > windowWidth) {
-            // 将菜单显示在鼠标左侧
-            left = event.clientX - menuWidth;
-            // 如果左侧空间也不够，则贴近左边
-            if (left < 0) left = 5;
-        }
-
-        // 应用最终位置并显示菜单
-        menu.style.top = `${top}px`;
-        menu.style.left = `${left}px`;
-        menu.style.visibility = 'visible';
-
-        document.addEventListener('click', closeTopicContextMenuOnClickOutside, true);
-    }
-
-    function closeTopicContextMenu() {
-        const existingMenu = document.getElementById('topicContextMenu');
-        if (existingMenu) {
-            existingMenu.remove();
-            document.removeEventListener('click', closeTopicContextMenuOnClickOutside, true);
-        }
-    }
-
-    function closeTopicContextMenuOnClickOutside(event) {
-        const menu = document.getElementById('topicContextMenu');
-        if (menu && !menu.contains(event.target)) {
-            closeTopicContextMenu();
-        }
-    }
-
-    async function handleExportTopic(itemId, itemType, topicId, topicName) {
-        const currentTopicId = currentTopicIdRef.get();
-        if (topicId !== currentTopicId) {
-            uiHelper.showToastNotification('请先点击并加载此话题，然后再导出。', 'info');
-            return;
-        }
-
-        console.log(`[TopicListManager] Exporting currently visible topic: ${topicName} (ID: ${topicId})`);
-
-        try {
-            const chatMessagesDiv = document.getElementById('chatMessages');
-            if (!chatMessagesDiv) {
-                console.error('[Export Debug] chatMessagesDiv not found!');
-                uiHelper.showToastNotification('错误：找不到聊天内容容器。', 'error');
-                return;
-            }
-
-            const messageItems = chatMessagesDiv.querySelectorAll('.message-item');
-            console.log(`[Export Debug] Found ${messageItems.length} message items.`);
-            if (messageItems.length === 0) {
-                uiHelper.showToastNotification('此话题没有可见的聊天内容可导出。', 'info');
-                return;
-            }
-
-            let markdownContent = `# 话题: ${topicName}\n\n`;
-            let extractedCount = 0;
-
-            messageItems.forEach((item, index) => {
-                if (item.classList.contains('system') || item.classList.contains('thinking')) {
-                    console.log(`[Export Debug] Skipping system/thinking message at index ${index}.`);
-                    return;
-                }
-
-                const senderElement = item.querySelector('.sender-name');
-                const contentElement = item.querySelector('.md-content');
-
-                if (senderElement && contentElement) {
-                    const sender = senderElement.textContent.trim().replace(':', '');
-                    // 克隆节点，移除思维链气泡（<think> 已被渲染为 DOM 节点，innerText 会包含其文本）
-                    const contentClone = contentElement.cloneNode(true);
-                    contentClone.querySelectorAll('.vcp-thought-chain-bubble').forEach(el => el.remove());
-                    let content = contentClone.innerText || contentClone.textContent || "";
-                    // 兜底：仅清理起止标签分别独占一行的明文思维链。
-                    content = content.replace(/^[ \t]*\[--- VCP元思考链(?::\s*"[^"]*")?\s*---\][ \t]*\r?\n[\s\S]*?^[ \t]*\[--- 元思考链结束 ---\][ \t]*(?:\r?\n|$)/gm, '');
-                    content = content.replace(/^[ \t]*<think(?:ing)?>[ \t]*\r?\n[\s\S]*?^[ \t]*<\/think(?:ing)?>[ \t]*(?:\r?\n|$)/gim, '');
-                    content = content.trim();
-
-                    if (sender && content) {
-                        markdownContent += `**${sender}**: ${content}\n\n---\n\n`;
-                        extractedCount++;
-                    } else {
-                        console.log(`[Export Debug] Skipping message at index ${index} due to empty sender or content. Sender: "${sender}", Content: "${content}"`);
-                    }
-                } else {
-                    console.log(`[Export Debug] Skipping message at index ${index} because sender or content element was not found.`);
-                }
-            });
-
-            console.log(`[Export Debug] Extracted ${extractedCount} messages. Final markdown length: ${markdownContent.length}`);
-
-            if (extractedCount === 0) {
-                uiHelper.showToastNotification('未能从当前话题中提取任何有效对话内容。', 'warning');
-                return;
-            }
-
-            const result = await electronAPI.exportTopicAsMarkdown({
-                topicName: topicName,
-                markdownContent: markdownContent
-            });
-
-            if (result.success) {
-                uiHelper.showToastNotification(`话题 "${topicName}" 已成功导出到: ${result.path}`);
-            } else {
-                uiHelper.showToastNotification(`导出话题失败: ${result.error}`, 'error');
-            }
-        } catch (error) {
-            console.error(`[TopicListManager] 导出话题时发生错误:`, error);
-            uiHelper.showToastNotification(`导出话题时发生前端错误: ${error.message}`, 'error');
-        }
-    }
-
-    function getRawMessageContent(message) {
-        if (typeof message?.content === 'string') return message.content;
-        if (typeof message?.content?.text === 'string') return message.content.text;
-        if (Array.isArray(message?.content)) {
-            return message.content
-                .filter(part => part && part.type === 'text' && typeof part.text === 'string')
-                .map(part => part.text)
-                .join('\n');
-        }
-        if (message?.content === null || message?.content === undefined) return '';
-        try {
-            return JSON.stringify(message.content, null, 2);
-        } catch {
-            return String(message.content);
-        }
-    }
-
-    function resolveFullExportAgentInfo(message, itemFullConfig, itemType) {
-        if (message.role === 'user') {
-            return {
-                name: message.name || '用户',
-                model: 'N/A'
-            };
-        }
-
-        if (itemType === 'group') {
-            const agentId = message.agentId || message.agentID;
-            const member = (itemFullConfig.agents || []).find(agent =>
-                agent.id === agentId || agent.agentId === agentId
-            );
-            const usesUnifiedModel = itemFullConfig.useUnifiedModel === true;
-            return {
-                name: message.name || member?.name || agentId || 'Assistant',
-                model: message.model || message.modelName ||
-                    (usesUnifiedModel ? itemFullConfig.unifiedModel : member?.model) ||
-                    '未知模型'
-            };
-        }
-
-        return {
-            name: message.name || itemFullConfig.name || itemFullConfig.id || 'Assistant',
-            model: message.model || message.modelName || itemFullConfig.model || '未知模型'
-        };
-    }
-
-    async function handleExportFullTopic(itemFullConfig, itemType, topicId, topicName) {
-        console.log(`[TopicListManager] Exporting full raw topic: ${topicName} (ID: ${topicId})`);
-
-        try {
-            const history = await getHistory(itemFullConfig.id, itemType, topicId);
-
-            if (!Array.isArray(history)) {
-                throw new Error(history?.error || '无法读取话题历史');
-            }
-
-            const messages = history.filter(message =>
-                message &&
-                message.role !== 'system' &&
-                message.isThinking !== true
-            );
-
-            if (messages.length === 0) {
-                uiHelper.showToastNotification('此话题没有可导出的对话内容。', 'info');
-                return;
-            }
-
-            let exportContent = `# 话题: ${topicName}\n\n`;
-            exportContent += `> 导出模式: 完整（保留原始消息内容）\n\n`;
-
-            messages.forEach((message, index) => {
-                const { name, model } = resolveFullExportAgentInfo(message, itemFullConfig, itemType);
-                const rawContent = getRawMessageContent(message);
-
-                exportContent += `===== 消息 ${index + 1} =====\n`;
-                exportContent += `Role: ${message.role || 'unknown'}\n`;
-                exportContent += `Agent: ${name}\n`;
-                exportContent += `Model: ${model}\n`;
-                if (message.timestamp) {
-                    exportContent += `Timestamp: ${new Date(message.timestamp).toISOString()}\n`;
-                }
-                exportContent += `\n${rawContent}\n\n`;
-            });
-
-            const result = await electronAPI.exportTopicAsMarkdown({
-                topicName: `${topicName}-完整`,
-                markdownContent: exportContent
-            });
-
-            if (result.success) {
-                uiHelper.showToastNotification(`话题 "${topicName}" 已完整导出到: ${result.path}`);
-            } else if (result.error !== '用户取消了导出操作。') {
-                uiHelper.showToastNotification(`完整导出话题失败: ${result.error}`, 'error');
-            }
-        } catch (error) {
-            console.error('[TopicListManager] 完整导出话题时发生错误:', error);
-            uiHelper.showToastNotification(`完整导出话题失败: ${error.message}`, 'error');
-        }
-    }
-
-    /**
-     * 设置鼠标快捷键事件监听器
-     */
-    function setupMouseShortcuts() {
-        const topicsContainer = document.getElementById('tabContentTopics');
-        if (!topicsContainer) {
-            console.warn('[TopicListManager] 话题容器未找到，跳过鼠标快捷键设置');
-            return;
-        }
-
-        let lastLeftClickTime = 0;
-
-        // 双击左键：进入设置页面
-        addListener(topicsContainer, 'click', (e) => {
-            if (isManageMode) return;
-            if (e.target.closest('button, input, .topics-header-container, .next-ui-topic-manage-panel')) return;
-            if (e.button === 0) { // 左键
-                const currentTime = Date.now();
-                const timeDiff = currentTime - lastLeftClickTime;
-
-                if (timeDiff < 300) { // 双击检测（300ms内）
-                    console.log('[TopicListManager] 检测到双击左键，进入设置页面');
-                    e.preventDefault();
-                    e.stopPropagation();
-
-                    // 切换到设置页面
-                    if (uiManager && typeof uiManager.switchToTab === 'function') {
-                        uiManager.switchToTab('settings');
-                    } else {
-                        console.warn('[TopicListManager] uiManager不可用，无法切换到设置页面');
-                    }
-                }
-
-                lastLeftClickTime = currentTime;
-            }
-        });
-
-        // 中键点击：返回助手页面
-        addListener(topicsContainer, 'auxclick', (e) => {
-            if (e.button === 1) { // 中键
-                console.log('[TopicListManager] 检测到中键点击，返回助手页面');
-                e.preventDefault();
-                e.stopPropagation();
-
-                // 切换到助手页面
-                if (uiManager && typeof uiManager.switchToTab === 'function') {
-                    uiManager.switchToTab('agents');
-                    // 重置助手页面的鼠标事件状态，确保双击功能正常工作
-                    if (itemListManager && typeof itemListManager.resetMouseEventStates === 'function') {
-                        itemListManager.resetMouseEventStates();
-                    }
-                } else {
-                    console.warn('[TopicListManager] uiManager不可用，无法切换到助手页面');
-                }
-            }
-        });
-
-        // 防止中键点击的默认行为
-        addListener(topicsContainer, 'mousedown', (e) => {
-            if (e.button === 1) { // 中键
-                e.preventDefault();
-            }
-        });
-
-        console.log('[TopicListManager] 鼠标快捷键设置完成');
-    }
-
-    function dispose() {
-        cancelPendingTopicSearch();
-        cleanupProgressiveTopicRendering();
-        closeTopicContextMenu();
-        selectedTopicIds.clear();
-        displayedTopics = [];
-        availableTopics = [];
-        currentItemConfig = null;
-        managedItemKey = '';
-        topicListContainer = null;
-        listenerOwner = null;
-    }
-
-    // --- Public API ---
-    return {
-        init,
-        loadTopicList,
-        setupTopicSearch,
-        showTopicContextMenu,
-        setupMouseShortcuts,
-        dispose
-    };
-})();
+// modules/topicListManager.js
+
+window.topicListManager = (() => {
+    // --- Private Variables ---
+    let topicListContainer;
+    let electronAPI;
+    let chatRepository;
+    let currentSelectedItemRef;
+    let currentTopicIdRef;
+    let topicSelectionReadiness;
+    let uiHelper;
+    let mainRendererFunctions;
+    let listenerOwner;
+    let uiManager;
+    let itemListManager;
+    let renderListenerDisposers = [];
+    let wasSelectionListenerActive = false; // To store the state of the selection listener before dragging
+    let topicListRenderGeneration = 0;
+    let topicListScrollCleanup = null;
+    let topicCountObserver = null;
+    let isManageMode = false;
+    let selectedTopicIds = new Set();
+    let displayedTopics = [];
+    let availableTopics = [];
+    let currentItemConfig = null;
+    let managedItemKey = '';
+
+    const TOPIC_INITIAL_RENDER_COUNT = 40;
+    const TOPIC_PROGRESSIVE_BATCH_SIZE = 30;
+    const TOPIC_LOAD_MORE_THRESHOLD_PX = 320;
+    // Each search reload re-reads the item config and runs a content search
+    // over IPC. Typing waits for a short pause first, in the range ZCode uses
+    // for its IO-backed refreshes (fileWatcherService 150ms, useTabPersistence
+    // 300ms); Enter still searches at once.
+    const TOPIC_SEARCH_DEBOUNCE_MS = 200;
+    let topicSearchTimer = null;
+
+    const addListener = (target, type, handler, options) => {
+        if (listenerOwner) return listenerOwner.add(target, type, handler, options);
+        target?.addEventListener?.(type, handler, options);
+        return true;
+    };
+
+    function addRenderListener(target, type, handler, options) {
+        target?.addEventListener?.(type, handler, options);
+        renderListenerDisposers.push(() => target?.removeEventListener?.(type, handler, options));
+    }
+
+    function cancelPendingTopicSearch() {
+        if (topicSearchTimer) clearTimeout(topicSearchTimer);
+        topicSearchTimer = null;
+    }
+
+    // Names and IPC error strings are user or disk data, so status rows are
+    // built with textContent, never by interpolating into innerHTML.
+    function renderTopicListStatus(topicListUl, message, { loading = false } = {}) {
+        const li = document.createElement('li');
+        if (loading) {
+            const spinner = document.createElement('div');
+            spinner.className = 'loading-spinner-small';
+            li.append(spinner, document.createTextNode(message));
+        } else {
+            const p = document.createElement('p');
+            p.textContent = message;
+            li.appendChild(p);
+        }
+        topicListUl.replaceChildren(li);
+    }
+
+    function disposeRenderListeners() {
+        renderListenerDisposers.splice(0).reverse().forEach(dispose => dispose());
+    }
+
+    /**
+     * Initializes the TopicListManager module.
+     * @param {object} config - The configuration object.
+     */
+    function init(config) {
+        if (!config.elements || !config.elements.topicListContainer) {
+            console.error('[TopicListManager] Missing required DOM element: topicListContainer.');
+            return;
+        }
+        if (!config.electronAPI || !config.refs || !config.uiHelper || !config.mainRendererFunctions || !config.topicSelectionReadiness) {
+            console.error('[TopicListManager] Missing required configuration parameters.');
+            return;
+        }
+
+        topicListContainer = config.elements.topicListContainer;
+        electronAPI = config.electronAPI;
+        chatRepository = config.chatRepository || null;
+        if (!chatRepository) throw new Error('TopicListManager requires ChatRepository');
+        currentSelectedItemRef = config.refs.currentSelectedItemRef;
+        currentTopicIdRef = config.refs.currentTopicIdRef;
+        topicSelectionReadiness = config.topicSelectionReadiness;
+        uiHelper = config.uiHelper;
+        mainRendererFunctions = config.mainRendererFunctions;
+        listenerOwner = config.listenerOwner || null;
+        uiManager = config.uiManager || null;
+        itemListManager = config.itemListManager || null;
+
+        // 设置鼠标快捷键
+        setupMouseShortcuts();
+        setupNextUiTopicTools();
+
+        console.log('[TopicListManager] Initialized successfully.');
+    }
+
+    function getHistory(itemId, itemType, topicId) {
+        return chatRepository.getHistory(itemId, itemType, topicId);
+    }
+
+    function hasUserParticipation(history) {
+        return Array.isArray(history) && history.some(message =>
+            message &&
+            message.role === 'user' &&
+            message.isThinking !== true
+        );
+    }
+
+    function hasValidPersistentUnreadMarker(topic, history) {
+        if (topic?.unread !== true) return false;
+        if (topic.unreadSource === 'manual') return true;
+
+        // Agent/TopicSponsor 产生的旧未读标记在用户参与后即失效。
+        return !hasUserParticipation(history);
+    }
+
+    async function clearStalePersistentUnreadMarker(topic, itemId, history) {
+        if (
+            topic?.unread !== true ||
+            topic.unreadSource === 'manual' ||
+            !hasUserParticipation(history)
+        ) {
+            return;
+        }
+
+        topic.unread = false;
+        delete topic.unreadSource;
+
+        try {
+            const result = await electronAPI.setTopicUnread(itemId, topic.id, false);
+            if (!result?.success) {
+                console.warn(`[TopicListManager] 清理话题 ${topic.id} 的残留未读标记失败:`, result?.error);
+            }
+        } catch (error) {
+            console.warn(`[TopicListManager] 清理话题 ${topic.id} 的残留未读标记失败:`, error);
+        }
+    }
+
+    /**
+     * 统计完全由 Agent 主动发起、尚无用户参与的话题消息数。
+     * 系统消息和思考占位不参与判断；历史中只要出现过用户消息就返回 0。
+     * @param {Array} history - 消息历史
+     * @returns {number}
+     */
+    function countUnreadMessages(history) {
+        if (!Array.isArray(history) || history.length === 0) return 0;
+
+        const effectiveMessages = history.filter(message =>
+            message &&
+            message.role !== 'system' &&
+            message.isThinking !== true
+        );
+
+        if (effectiveMessages.some(message => message.role === 'user')) {
+            return 0;
+        }
+
+        return effectiveMessages.filter(message => message.role === 'assistant').length;
+    }
+
+    function normalizeTopicTitle(topicTitle) {
+        if (typeof topicTitle !== 'string') return topicTitle;
+
+        const trimmedTitle = topicTitle.trim();
+        if (!trimmedTitle) return trimmedTitle;
+        if (trimmedTitle.includes('新话题')) return trimmedTitle;
+
+        const timeMatch = trimmedTitle.match(/(\d{1,2}:\d{2}:\d{2})/);
+        if (trimmedTitle.includes('新话') && timeMatch) {
+            return `新话题 ${timeMatch[1]}`;
+        }
+
+        return trimmedTitle;
+    }
+
+    /**
+     * 解析话题搜索约定词。
+     * 仅当完整输入为“未读话题”或“unread topic”时启用未读置顶。
+     * @param {string} rawValue - 搜索框原始值
+     * @returns {{ rawTerm: string, queryTerm: string, prioritizeUnread: boolean }}
+     */
+    function parseTopicSearchQuery(rawValue) {
+        const rawTerm = String(rawValue || '').trim().toLowerCase();
+        const prioritizeUnread = rawTerm === '未读话题' || rawTerm === 'unread topic';
+
+        return {
+            rawTerm,
+            queryTerm: prioritizeUnread ? '' : rawTerm,
+            prioritizeUnread
+        };
+    }
+
+    /**
+     * 读取各话题历史，并将未读话题稳定地移到顶部。
+     * 未读组与已读组内部均保留用户自定义顺序。
+     */
+    async function prioritizeUnreadTopics(topics, currentSelectedItem) {
+        const topicsWithUnreadState = await Promise.all(topics.map(async topic => {
+            let history = [];
+            try {
+                history = await getHistory(currentSelectedItem.id, currentSelectedItem.type, topic.id);
+            } catch (error) {
+                console.warn(`[TopicListManager] 读取话题 ${topic.id} 的未读状态失败:`, error);
+            }
+
+            const calculatedUnreadCount = Array.isArray(history)
+                ? countUnreadMessages(history)
+                : 0;
+            const hasPersistentUnread = hasValidPersistentUnreadMarker(topic, history);
+
+            await clearStalePersistentUnreadMarker(topic, currentSelectedItem.id, history);
+
+            return {
+                topic,
+                isUnread: calculatedUnreadCount > 0 || hasPersistentUnread,
+                calculatedUnreadCount
+            };
+        }));
+
+        const unreadTopics = [];
+        const readTopics = [];
+        topicsWithUnreadState.forEach(({ topic, isUnread, calculatedUnreadCount }) => {
+            topic.__calculatedUnreadCount = calculatedUnreadCount;
+            (isUnread ? unreadTopics : readTopics).push(topic);
+        });
+
+        return unreadTopics.concat(readTopics);
+    }
+
+    function ensureTopicUnreadIndicator(li, unreadCount = -1) {
+        if (!li) return;
+
+        let indicator = li.querySelector('.topic-unread-indicator');
+        if (!indicator) {
+            indicator = document.createElement('span');
+            indicator.className = 'topic-unread-indicator';
+            const messageCountSpan = li.querySelector('.message-count');
+            li.insertBefore(indicator, messageCountSpan || null);
+        }
+
+        indicator.textContent = unreadCount > 0 ? `未读 ${unreadCount}` : '未读';
+        indicator.title = unreadCount > 0 ? `${unreadCount} 条未读消息` : '未读话题';
+        li.classList.add('has-unread-topic');
+    }
+
+    function removeTopicUnreadIndicator(li) {
+        if (!li) return;
+        li.querySelector('.topic-unread-indicator')?.remove();
+        li.classList.remove('has-unread-topic');
+    }
+
+    /**
+     * Part C: 计算单个话题的未读消息数
+     * @param {Object} topic - 话题对象
+     * @param {Array} history - 话题历史消息
+     * @returns {number} - 未读消息数，-1 表示仅显示小点
+     */
+    function calculateTopicUnreadCount(topic, history) {
+        const count = countUnreadMessages(history);
+        if (count > 0) return count;
+
+        // 没有自动计数时，仅保留仍有效的持久化未读标记。
+        if (hasValidPersistentUnreadMarker(topic, history)) {
+            return -1; // 仅显示小点，不显示数字
+        }
+
+        return 0; // 不显示
+    }
+
+    function cleanupProgressiveTopicRendering() {
+        topicListRenderGeneration++;
+        disposeRenderListeners();
+        if (typeof topicListScrollCleanup === 'function') {
+            topicListScrollCleanup();
+            topicListScrollCleanup = null;
+        }
+        if (topicCountObserver) {
+            topicCountObserver.disconnect();
+            topicCountObserver = null;
+        }
+        const topicListUl = document.getElementById('topicList');
+        if (topicListUl?.sortableInstance) {
+            topicListUl.sortableInstance.destroy();
+            topicListUl.sortableInstance = null;
+        }
+    }
+
+    function getTopicScrollContainer(topicListUl) {
+        return topicListUl?.closest('.sidebar-list-scroll') || topicListContainer;
+    }
+
+    function ensureTopicCountObserver() {
+        if (topicCountObserver) return topicCountObserver;
+
+        topicCountObserver = new IntersectionObserver((entries) => {
+            entries.forEach((entry) => {
+                if (!entry.isIntersecting) return;
+
+                const li = entry.target;
+                topicCountObserver.unobserve(li);
+                loadTopicMessageCount(li);
+            });
+        }, {
+            root: getTopicScrollContainer(document.getElementById('topicList')),
+            rootMargin: '240px 0px',
+            threshold: 0.01
+        });
+
+        return topicCountObserver;
+    }
+
+    function loadTopicMessageCount(li) {
+        if (!li?.isConnected || li.dataset.countLoaded === 'true' || li.dataset.countLoading === 'true') return;
+
+        const itemId = li.dataset.itemId;
+        const itemType = li.dataset.itemType;
+        const topicId = li.dataset.topicId;
+        const topic = li.__topicData;
+        const messageCountSpan = li.querySelector('.message-count');
+
+        if (!itemId || !itemType || !topicId || !topic || !messageCountSpan) return;
+
+        li.dataset.countLoading = 'true';
+
+        let historyPromise;
+        historyPromise = getHistory(itemId, itemType, topicId);
+
+        if (!historyPromise) {
+            messageCountSpan.textContent = 'N/A';
+            li.dataset.countLoaded = 'true';
+            li.dataset.countLoading = 'false';
+            return;
+        }
+
+        historyPromise.then(async historyResult => {
+            if (!li.isConnected) return;
+
+            messageCountSpan.classList.remove('has-unread', 'unread-marker-only');
+
+            if (historyResult && !historyResult.error && Array.isArray(historyResult)) {
+                await clearStalePersistentUnreadMarker(topic, itemId, historyResult);
+                const unreadCount = calculateTopicUnreadCount(topic, historyResult);
+                if (unreadCount > 0) {
+                    messageCountSpan.textContent = `${historyResult.length}`;
+                    messageCountSpan.classList.add('has-unread');
+                    ensureTopicUnreadIndicator(li, unreadCount);
+                } else if (unreadCount === -1) {
+                    messageCountSpan.textContent = `${historyResult.length}`;
+                    messageCountSpan.classList.add('unread-marker-only');
+                    ensureTopicUnreadIndicator(li);
+                } else {
+                    messageCountSpan.textContent = `${historyResult.length}`;
+                    removeTopicUnreadIndicator(li);
+                }
+            } else {
+                messageCountSpan.textContent = 'N/A';
+            }
+            li.dataset.countLoaded = 'true';
+        }).catch(() => {
+            if (li.isConnected) {
+                messageCountSpan.textContent = 'ERR';
+            }
+        }).finally(() => {
+            if (li.isConnected) {
+                li.dataset.countLoading = 'false';
+            }
+        });
+    }
+
+    function createTopicListItem(topic, currentSelectedItem, currentTopicId, itemConfigFull) {
+        const li = document.createElement('li');
+        li.classList.add('topic-item');
+        li.dataset.itemId = currentSelectedItem.id;
+        li.dataset.itemType = currentSelectedItem.type;
+        li.dataset.topicId = topic.id;
+        li.__topicData = topic;
+
+        const isCurrentActiveTopic = topic.id === currentTopicId;
+        const isPersistentlyUnread = topic.unread === true || topic.__calculatedUnreadCount > 0;
+        li.classList.toggle('active', isCurrentActiveTopic);
+        li.classList.toggle('active-topic-glowing', isCurrentActiveTopic);
+        li.classList.toggle('has-unread-topic', isPersistentlyUnread);
+
+        const avatarImg = document.createElement('img');
+        avatarImg.classList.add('avatar');
+        avatarImg.loading = 'lazy';
+        avatarImg.decoding = 'async';
+        avatarImg.src = currentSelectedItem.avatarUrl ? currentSelectedItem.avatarUrl : (currentSelectedItem.type === 'group' ? 'assets/default_group_avatar.png' : 'assets/default_avatar.png');
+
+        const displayTopicTitle = normalizeTopicTitle(topic.name || `话题 ${topic.id}`);
+        avatarImg.alt = `${currentSelectedItem.name} - ${displayTopicTitle}`;
+        avatarImg.onerror = () => { avatarImg.src = (currentSelectedItem.type === 'group' ? 'assets/default_group_avatar.png' : 'assets/default_avatar.png'); };
+
+        const topicTitleDisplay = document.createElement('span');
+        topicTitleDisplay.classList.add('topic-title-display');
+        topicTitleDisplay.textContent = displayTopicTitle;
+
+        const messageCountSpan = document.createElement('span');
+        messageCountSpan.classList.add('message-count');
+        messageCountSpan.textContent = '...';
+
+        const selectionIcon = document.createElement('span');
+        selectionIcon.classList.add('next-ui-topic-select-icon', 'vcp-ui-icon');
+        selectionIcon.setAttribute('aria-hidden', 'true');
+        selectionIcon.textContent = selectedTopicIds.has(topic.id) ? 'check_box' : 'check_box_outline_blank';
+        li.appendChild(selectionIcon);
+        li.appendChild(avatarImg);
+
+        if (topic.locked === false) {
+            const unlockedIndicator = document.createElement('span');
+            unlockedIndicator.classList.add('unlocked-indicator');
+            unlockedIndicator.textContent = 'unlocked';
+            unlockedIndicator.title = 'AI可以查看和回复此话题';
+            li.appendChild(unlockedIndicator);
+        }
+
+        li.appendChild(topicTitleDisplay);
+        if (isPersistentlyUnread) {
+            ensureTopicUnreadIndicator(li, topic.__calculatedUnreadCount);
+        }
+        li.appendChild(messageCountSpan);
+
+        const observer = ensureTopicCountObserver();
+        observer.observe(li);
+
+        addRenderListener(li, 'click', async () => {
+            if (isManageMode) {
+                toggleTopicSelection(topic.id);
+                return;
+            }
+
+            if (currentTopicIdRef.get() === topic.id) {
+                return;
+            }
+
+            if (!topicSelectionReadiness.isReady()) {
+                topicSelectionReadiness.defer({
+                    itemId: currentSelectedItem.id,
+                    itemType: currentSelectedItem.type,
+                    topicId: topic.id,
+                });
+                if (uiHelper && uiHelper.showToastNotification) {
+                    uiHelper.showToastNotification('正在初始化界面，稍后自动打开该话题', 'info');
+                }
+                return;
+            }
+
+            try {
+                await Promise.resolve(mainRendererFunctions.selectTopic(topic.id));
+            } catch (error) {
+                console.error('[TopicListManager] Failed to select topic:', error);
+                if (uiHelper && uiHelper.showToastNotification) {
+                    uiHelper.showToastNotification(`打开话题失败: ${error.message}`, 'error');
+                }
+            }
+        });
+
+        addRenderListener(li, 'contextmenu', (e) => {
+            e.preventDefault();
+            if (isManageMode) return;
+            showTopicContextMenu(e, li, itemConfigFull, topic, currentSelectedItem.type);
+        });
+
+        return li;
+    }
+
+    function renderTopicListProgressively(topicListUl, topicsToProcess, currentSelectedItem, currentTopicId, itemConfigFull, searchTerm) {
+        const renderGeneration = topicListRenderGeneration;
+        const scrollContainer = getTopicScrollContainer(topicListUl);
+        const totalCount = topicsToProcess.length;
+        const initialCount = searchTerm
+            ? Math.min(Math.max(TOPIC_INITIAL_RENDER_COUNT, TOPIC_PROGRESSIVE_BATCH_SIZE), totalCount)
+            : Math.min(TOPIC_INITIAL_RENDER_COUNT, totalCount);
+
+        let currentIndex = 0;
+        let isRendering = false;
+        let allRendered = false;
+
+        const statusLi = document.createElement('li');
+        statusLi.className = 'topic-list-progressive-status';
+        statusLi.textContent = '';
+        statusLi.style.justifyContent = 'center';
+        statusLi.style.opacity = '0.75';
+
+        const finalizeIfDone = () => {
+            if (!allRendered || renderGeneration !== topicListRenderGeneration) return;
+
+            statusLi.remove();
+            if (typeof topicListScrollCleanup === 'function') {
+                topicListScrollCleanup();
+                topicListScrollCleanup = null;
+            }
+
+            if (currentSelectedItem.id && topicsToProcess.length > 0 && typeof Sortable !== 'undefined' && !searchTerm) {
+                initializeTopicSortable(currentSelectedItem.id, currentSelectedItem.type);
+            }
+        };
+
+        const renderNextBatch = (batchSize = TOPIC_PROGRESSIVE_BATCH_SIZE) => {
+            if (isRendering || allRendered || renderGeneration !== topicListRenderGeneration) return;
+            isRendering = true;
+
+            requestAnimationFrame(() => {
+                if (renderGeneration !== topicListRenderGeneration) {
+                    isRendering = false;
+                    return;
+                }
+
+                const fragment = document.createDocumentFragment();
+                const end = Math.min(currentIndex + batchSize, totalCount);
+
+                for (; currentIndex < end; currentIndex++) {
+                    fragment.appendChild(createTopicListItem(
+                        topicsToProcess[currentIndex],
+                        currentSelectedItem,
+                        currentTopicId,
+                        itemConfigFull
+                    ));
+                }
+
+                if (statusLi.parentNode === topicListUl) {
+                    topicListUl.insertBefore(fragment, statusLi);
+                } else {
+                    topicListUl.appendChild(fragment);
+                }
+
+                allRendered = currentIndex >= totalCount;
+                isRendering = false;
+
+                if (!allRendered) {
+                    statusLi.textContent = `继续向下滚动加载更多话题（${currentIndex}/${totalCount}）`;
+                    if (!statusLi.parentNode) topicListUl.appendChild(statusLi);
+                    if (scrollContainer.scrollHeight <= scrollContainer.clientHeight + TOPIC_LOAD_MORE_THRESHOLD_PX) {
+                        renderNextBatch();
+                    }
+                } else {
+                    finalizeIfDone();
+                }
+            });
+        };
+
+        const onScroll = () => {
+            if (allRendered || isRendering || renderGeneration !== topicListRenderGeneration) return;
+
+            const distanceToBottom = scrollContainer.scrollHeight - scrollContainer.scrollTop - scrollContainer.clientHeight;
+            if (distanceToBottom <= TOPIC_LOAD_MORE_THRESHOLD_PX) {
+                renderNextBatch();
+            }
+        };
+
+        scrollContainer.addEventListener('scroll', onScroll, { passive: true });
+        topicListScrollCleanup = () => scrollContainer.removeEventListener('scroll', onScroll);
+
+        topicListUl.innerHTML = '';
+        renderNextBatch(initialCount);
+    }
+
+    async function loadTopicList() {
+        if (!topicListContainer) {
+            console.error("Topic list container (tabContentTopics) not found.");
+            return;
+        }
+
+        cancelPendingTopicSearch();
+        cleanupProgressiveTopicRendering();
+        const loadGeneration = topicListRenderGeneration;
+
+        let topicListUl = topicListContainer.querySelector('.topic-list');
+        if (topicListUl) {
+            topicListUl.innerHTML = '';
+        } else {
+            const topicsHeader = topicListContainer.querySelector('.topics-header') || document.createElement('div');
+            if (!topicsHeader.classList.contains('topics-header')) {
+                topicsHeader.className = 'topics-header';
+                topicsHeader.innerHTML = `<h2>话题列表</h2><div class="topic-search-container"><input type="text" id="topicSearchInput" placeholder="搜索话题；输入“未读话题”置顶" title="输入“未读话题”或“unread topic”将未读话题置顶" aria-label="搜索话题；输入未读话题将未读话题置顶" class="topic-search-input"></div>`;
+                topicListContainer.prepend(topicsHeader);
+                const newTopicSearchInput = topicsHeader.querySelector('#topicSearchInput');
+                if (newTopicSearchInput) setupTopicSearchListener(newTopicSearchInput);
+            }
+
+            topicListUl = document.createElement('ul');
+            topicListUl.className = 'topic-list';
+            topicListUl.id = 'topicList';
+            topicListContainer.appendChild(topicListUl);
+        }
+
+        const currentSelectedItem = currentSelectedItemRef.get();
+        if (!currentSelectedItem.id) {
+            availableTopics = [];
+            displayedTopics = [];
+            currentItemConfig = null;
+            managedItemKey = '';
+            selectedTopicIds.clear();
+            syncManageUi();
+            topicListUl.innerHTML = '<li><p>请先在“助手与群组”列表选择一个项目以查看其相关话题。</p></li>';
+            return;
+        }
+
+        const nextItemKey = `${currentSelectedItem.type}:${currentSelectedItem.id}`;
+        if (managedItemKey && managedItemKey !== nextItemKey) {
+            selectedTopicIds.clear();
+        }
+        managedItemKey = nextItemKey;
+
+        const itemNameForLoading = currentSelectedItem.name || '当前项目';
+        const searchInput = document.getElementById('topicSearchInput');
+        const searchQuery = parseTopicSearchQuery(searchInput ? searchInput.value : '');
+        const searchTerm = searchQuery.rawTerm;
+        const contentQueryTerm = searchQuery.queryTerm;
+
+        let itemConfigFull;
+
+        if (!searchTerm) {
+            renderTopicListStatus(topicListUl, `正在加载 ${itemNameForLoading} 的话题...`, { loading: true });
+        } else {
+            topicListUl.innerHTML = '';
+        }
+
+        try {
+            if (currentSelectedItem.type === 'agent') {
+                itemConfigFull = await electronAPI.getAgentConfig(currentSelectedItem.id);
+            } else if (currentSelectedItem.type === 'group') {
+                itemConfigFull = await electronAPI.getAgentGroupConfig(currentSelectedItem.id);
+            }
+        } catch (error) {
+            // A rejected IPC call used to leave the loading spinner up for good.
+            console.error('[TopicListManager] Failed to load item config:', error);
+            itemConfigFull = { error: error?.message || String(error) };
+        }
+
+        if (loadGeneration !== topicListRenderGeneration ||
+            currentSelectedItemRef.get()?.id !== currentSelectedItem.id ||
+            currentSelectedItemRef.get()?.type !== currentSelectedItem.type) {
+            return;
+        }
+
+        if (itemConfigFull && !itemConfigFull.error) {
+            mainRendererFunctions.updateCurrentItemConfig(itemConfigFull);
+        }
+
+        if (!itemConfigFull || itemConfigFull.error) {
+            availableTopics = [];
+            displayedTopics = [];
+            currentItemConfig = null;
+            selectedTopicIds.clear();
+            syncManageUi();
+            renderTopicListStatus(topicListUl, `无法加载 ${itemNameForLoading} 的配置信息: ${itemConfigFull?.error || '未知错误'}`);
+        } else {
+            let topicsToProcess = itemConfigFull.topics || [];
+            if (currentSelectedItem.type === 'agent' && topicsToProcess.length === 0) {
+                const defaultAgentTopic = { id: "default", name: "主要对话", createdAt: Date.now() };
+                topicsToProcess.push(defaultAgentTopic);
+            }
+
+            availableTopics = [...topicsToProcess];
+            currentItemConfig = itemConfigFull;
+            const availableTopicIds = new Set(availableTopics.map(topic => topic.id));
+            selectedTopicIds = new Set([...selectedTopicIds].filter(topicId => availableTopicIds.has(topicId)));
+
+            // topicsToProcess.sort((a, b) => (b.createdAt || 0) - (a.createdAt || 0));
+
+            if (contentQueryTerm) {
+                let frontendFilteredTopics = topicsToProcess.filter(topic => {
+                    const normalizedTopicTitle = normalizeTopicTitle(topic.name || '');
+                    const nameMatch = normalizedTopicTitle.toLowerCase().includes(contentQueryTerm);
+                    let dateMatch = false;
+                    if (topic.createdAt) {
+                        const date = new Date(topic.createdAt);
+                        const fullDateStr = `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')} ${String(date.getHours()).padStart(2, '0')}:${String(date.getMinutes()).padStart(2, '0')}`;
+                        const shortDateStr = `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')}`;
+                        dateMatch = fullDateStr.toLowerCase().includes(contentQueryTerm) || shortDateStr.toLowerCase().includes(contentQueryTerm);
+                    }
+                    return nameMatch || dateMatch;
+                });
+
+                let contentMatchedTopicIds = [];
+                try {
+                    const contentSearchResult = await electronAPI.searchTopicsByContent(currentSelectedItem.id, currentSelectedItem.type, contentQueryTerm);
+                    if (contentSearchResult && contentSearchResult.success && Array.isArray(contentSearchResult.matchedTopicIds)) {
+                        contentMatchedTopicIds = contentSearchResult.matchedTopicIds;
+                    } else if (contentSearchResult && !contentSearchResult.success) {
+                        console.warn("Topic content search failed:", contentSearchResult.error);
+                    }
+                } catch (e) {
+                    console.error("Error calling searchTopicsByContent:", e);
+                }
+
+                const finalFilteredTopicIds = new Set(frontendFilteredTopics.map(t => t.id));
+                contentMatchedTopicIds.forEach(id => finalFilteredTopicIds.add(id));
+
+                topicsToProcess = topicsToProcess.filter(topic => finalFilteredTopicIds.has(topic.id));
+            }
+
+            if (searchQuery.prioritizeUnread) {
+                topicsToProcess = await prioritizeUnreadTopics(topicsToProcess, currentSelectedItem);
+            }
+
+            if (loadGeneration !== topicListRenderGeneration ||
+                currentSelectedItemRef.get()?.id !== currentSelectedItem.id ||
+                currentSelectedItemRef.get()?.type !== currentSelectedItem.type) {
+                return;
+            }
+
+            displayedTopics = [...topicsToProcess];
+            syncManageUi();
+
+            if (topicsToProcess.length === 0) {
+                renderTopicListStatus(topicListUl, `${itemNameForLoading} 还没有任何话题${searchTerm ? '匹配当前搜索' : ''}。您可以点击上方的“新建${currentSelectedItem.type === 'group' ? '群聊话题' : '聊天话题'}”按钮创建一个。`);
+            } else {
+                const currentTopicId = currentTopicIdRef.get();
+                renderTopicListProgressively(topicListUl, topicsToProcess, currentSelectedItem, currentTopicId, itemConfigFull, searchTerm);
+            }
+        }
+    }
+
+    function setupTopicSearch() {
+        let searchInput = document.getElementById('topicSearchInput');
+        if (searchInput) {
+            setupTopicSearchListener(searchInput);
+        }
+    }
+
+    function setupTopicSearchListener(inputElement) {
+        if (inputElement.dataset.topicSearchBound === 'true') return;
+        inputElement.dataset.topicSearchBound = 'true';
+
+        addListener(inputElement, 'input', scheduleTopicSearch);
+        addListener(inputElement, 'keydown', (event) => {
+            if (event.key === 'Enter') {
+                event.preventDefault();
+                filterTopicList();
+            }
+        });
+    }
+
+    function scheduleTopicSearch() {
+        cancelPendingTopicSearch();
+        topicSearchTimer = setTimeout(() => {
+            topicSearchTimer = null;
+            loadTopicList();
+        }, TOPIC_SEARCH_DEBOUNCE_MS);
+    }
+
+    function filterTopicList() {
+        loadTopicList();
+    }
+
+    function setupNextUiTopicTools() {
+        const topicsHeader = document.querySelector('#tabContentTopics .topics-header-container');
+        const createButton = document.getElementById('nextUiCreateTopicBtn');
+        const manageButton = document.getElementById('nextUiManageTopicsBtn');
+        const searchButton = document.getElementById('nextUiTopicSearchTrigger');
+        const searchCloseButton = document.getElementById('nextUiTopicSearchClose');
+        const searchInput = document.getElementById('topicSearchInput');
+        const selectAllButton = document.getElementById('nextUiSelectAllTopicsBtn');
+        const deleteButton = document.getElementById('nextUiDeleteTopicsBtn');
+        const exitButton = document.getElementById('nextUiExitTopicManageBtn');
+
+        if (!topicsHeader || !createButton || !manageButton || !searchButton || !searchCloseButton || !searchInput) return;
+        if (topicsHeader.dataset.nextUiToolsBound === 'true') return;
+        topicsHeader.dataset.nextUiToolsBound = 'true';
+
+        const setSearchMode = (active, clear = !active) => {
+            topicsHeader.classList.toggle('is-searching', active);
+            searchButton.setAttribute('aria-expanded', String(active));
+            if (clear) {
+                searchInput.value = '';
+                loadTopicList();
+            }
+            if (active) requestAnimationFrame(() => searchInput.focus());
+            else if (document.activeElement === searchInput) searchButton.focus();
+        };
+
+        addListener(createButton, 'click', () => {
+            document.getElementById('currentAgentSettingsBtn')?.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+        });
+        addListener(createButton, 'contextmenu', (event) => {
+            event.preventDefault();
+            document.getElementById('currentAgentSettingsBtn')?.dispatchEvent(new MouseEvent('contextmenu', {
+                bubbles: true,
+                clientX: event.clientX,
+                clientY: event.clientY
+            }));
+        });
+        addListener(manageButton, 'click', () => setManageMode(!isManageMode));
+        addListener(searchButton, 'click', () => setSearchMode(true, false));
+        addListener(searchCloseButton, 'click', () => setSearchMode(false, true));
+        addListener(searchInput, 'keydown', (event) => {
+            if (event.key === 'Escape') {
+                event.preventDefault();
+                setSearchMode(false, true);
+            }
+        });
+        if (selectAllButton) addListener(selectAllButton, 'click', toggleSelectAllDisplayedTopics);
+        if (deleteButton) addListener(deleteButton, 'click', deleteSelectedTopics);
+        if (exitButton) addListener(exitButton, 'click', () => setManageMode(false));
+
+        syncManageUi();
+    }
+
+    function setManageMode(active) {
+        isManageMode = active;
+        if (!active) selectedTopicIds.clear();
+
+        const topicListUl = document.getElementById('topicList');
+        if (active && topicListUl?.sortableInstance) {
+            topicListUl.sortableInstance.destroy();
+            topicListUl.sortableInstance = null;
+        } else if (!active) {
+            loadTopicList();
+        }
+
+        syncManageUi();
+    }
+
+    function toggleTopicSelection(topicId) {
+        if (selectedTopicIds.has(topicId)) selectedTopicIds.delete(topicId);
+        else selectedTopicIds.add(topicId);
+        syncManageUi();
+    }
+
+    function toggleSelectAllDisplayedTopics() {
+        const displayedIds = displayedTopics.map(topic => topic.id);
+        const allDisplayedSelected = displayedIds.length > 0 && displayedIds.every(topicId => selectedTopicIds.has(topicId));
+
+        if (allDisplayedSelected) displayedIds.forEach(topicId => selectedTopicIds.delete(topicId));
+        else displayedIds.forEach(topicId => selectedTopicIds.add(topicId));
+        syncManageUi();
+    }
+
+    function syncManageUi() {
+        const container = document.getElementById('tabContentTopics');
+        const manageButton = document.getElementById('nextUiManageTopicsBtn');
+        const managePanel = container?.querySelector('.next-ui-topic-manage-panel');
+        const count = document.getElementById('nextUiTopicSelectionCount');
+        const selectAllButton = document.getElementById('nextUiSelectAllTopicsBtn');
+        const deleteButton = document.getElementById('nextUiDeleteTopicsBtn');
+        const allDisplayedSelected = displayedTopics.length > 0
+            && displayedTopics.every(topic => selectedTopicIds.has(topic.id));
+
+        container?.classList.toggle('is-managing', isManageMode);
+        manageButton?.classList.toggle('active', isManageMode);
+        manageButton?.setAttribute('aria-pressed', String(isManageMode));
+        managePanel?.setAttribute('aria-hidden', String(!isManageMode));
+        if (count) count.textContent = `已选择 ${selectedTopicIds.size} 项`;
+        if (deleteButton) deleteButton.disabled = selectedTopicIds.size === 0;
+        const selectAllIcon = selectAllButton?.querySelector('.vcp-ui-icon');
+        if (selectAllIcon) selectAllIcon.textContent = allDisplayedSelected ? 'check_box' : 'check_box_outline_blank';
+        if (selectAllButton) selectAllButton.title = allDisplayedSelected ? '取消全选' : '全选话题';
+
+        document.querySelectorAll('#topicList .topic-item').forEach(item => {
+            const selected = selectedTopicIds.has(item.dataset.topicId);
+            item.classList.toggle('selected', selected);
+            item.setAttribute('aria-selected', String(selected));
+            const icon = item.querySelector('.next-ui-topic-select-icon');
+            if (icon) icon.textContent = selected ? 'check_box' : 'check_box_outline_blank';
+        });
+    }
+
+    async function deleteSelectedTopics() {
+        if (!isManageMode || selectedTopicIds.size === 0 || !currentItemConfig) return;
+
+        const currentSelectedItem = currentSelectedItemRef.get();
+        const topicsToDelete = availableTopics.filter(topic => selectedTopicIds.has(topic.id));
+        if (topicsToDelete.length === 0) return;
+        if (topicsToDelete.length >= availableTopics.length) {
+            uiHelper.showToastNotification('至少需要保留一个话题。', 'warning');
+            return;
+        }
+
+        const flowlockedTopic = currentSelectedItem.type === 'agent'
+            ? topicsToDelete.find(topic => window.flowlockManager?.isTopicLocked?.(currentSelectedItem.id, topic.id))
+            : null;
+        if (flowlockedTopic) {
+            uiHelper.showToastNotification(`话题“${flowlockedTopic.name}”正在心流锁中运行，请先停止对应心流锁。`, 'warning');
+            return;
+        }
+
+        const confirmed = await uiHelper.showConfirmDialog(
+            `确定要永久删除选中的 ${topicsToDelete.length} 个话题吗？此操作不可撤销。`,
+            '批量删除话题',
+            '删除',
+            '取消',
+            true
+        );
+        if (!confirmed) return;
+
+        let deletedCount = 0;
+        let remainingTopics = availableTopics;
+        let firstError = '';
+        const activeTopicId = currentTopicIdRef.get();
+        let activeTopicDeleted = false;
+
+        for (const topic of topicsToDelete) {
+            try {
+                const result = currentSelectedItem.type === 'agent'
+                    ? await electronAPI.deleteTopic(currentSelectedItem.id, topic.id)
+                    : await electronAPI.deleteGroupTopic(currentSelectedItem.id, topic.id);
+                if (result?.success) {
+                    deletedCount++;
+                    if (topic.id === activeTopicId) activeTopicDeleted = true;
+                    remainingTopics = result.remainingTopics || remainingTopics.filter(item => item.id !== topic.id);
+                } else if (!firstError) {
+                    firstError = result?.error || '未知错误';
+                }
+            } catch (error) {
+                if (!firstError) firstError = error.message;
+            }
+        }
+
+        const deletedTopicIds = topicsToDelete.map(topic => topic.id).filter(id => !remainingTopics.some(item => item.id === id));
+        if (deletedTopicIds.length) mainRendererFunctions.onTopicsDeleted?.({ itemId: currentSelectedItem.id, itemType: currentSelectedItem.type, topicIds: deletedTopicIds });
+        if (activeTopicDeleted) {
+            mainRendererFunctions.handleTopicDeletion(remainingTopics, {
+                id: currentSelectedItem.id,
+                type: currentSelectedItem.type,
+                deletedTopicIds: topicsToDelete.map(topic => topic.id),
+                fallbackTopicId: topicsToDelete.some(topic => topic.id === activeTopicId) ? null : activeTopicId,
+            });
+        }
+
+        setManageMode(false);
+        if (deletedCount > 0) uiHelper.showToastNotification(`已删除 ${deletedCount} 个话题。`, 'success');
+        if (firstError) uiHelper.showToastNotification(`部分话题删除失败：${firstError}`, 'error');
+    }
+
+    function initializeTopicSortable(itemId, itemType) {
+        const topicListUl = document.getElementById('topicList');
+        if (!topicListUl) {
+            console.warn("[TopicListManager] topicListUl element not found. Skipping Sortable initialization.");
+            return;
+        }
+
+        if (topicListUl.sortableInstance) {
+            topicListUl.sortableInstance.destroy();
+        }
+
+        const targetItemId = itemId;
+        const targetItemType = itemType;
+        topicListUl.sortableInstance = new Sortable(topicListUl, {
+            animation: 150,
+            ghostClass: 'sortable-ghost-topic',
+            chosenClass: 'sortable-chosen-topic',
+            dragClass: 'sortable-drag-topic',
+            onStart: async function (evt) {
+                // Check original state, store it, and then disable if it was active.
+                if (electronAPI?.getSelectionListenerStatus) {
+                    wasSelectionListenerActive = await electronAPI.getSelectionListenerStatus();
+                    if (wasSelectionListenerActive) {
+                        electronAPI.toggleSelectionListener(false);
+                    }
+                }
+            },
+            onEnd: async function (evt) {
+                // Re-enable selection hook only if it was active before the drag.
+                if (electronAPI?.toggleSelectionListener) {
+                    if (wasSelectionListenerActive) {
+                        electronAPI.toggleSelectionListener(true);
+                    }
+                    wasSelectionListenerActive = false; // Reset state
+                }
+
+                const topicItems = Array.from(evt.to.children);
+                const orderedTopicIds = topicItems.map(item => item.dataset.topicId);
+                try {
+                    let result;
+                    if (targetItemType === 'agent') {
+                        result = await electronAPI.saveTopicOrder(targetItemId, orderedTopicIds);
+                    } else if (targetItemType === 'group') {
+                        result = await electronAPI.saveGroupTopicOrder(targetItemId, orderedTopicIds);
+                    }
+
+                    if (result && result.success) {
+                        // UI reflects sort.
+                    } else {
+                        console.error(`Failed to save topic order for ${targetItemType} ${targetItemId}:`, result?.error);
+                        uiHelper.showToastNotification(`保存话题顺序失败: ${result?.error || '未知错误'}`, 'error');
+                        loadTopicList();
+                    }
+                } catch (error) {
+                    console.error(`Error calling saveTopicOrder for ${targetItemType} ${targetItemId}:`, error);
+                    uiHelper.showToastNotification(`调用保存话题顺序API时出错: ${error.message}`, 'error');
+                    loadTopicList();
+                }
+            }
+        });
+    }
+
+    function showTopicContextMenu(event, topicItemElement, itemFullConfig, topic, itemType) {
+        // closeContextMenu(); // This function is not available in this module
+        closeTopicContextMenu();
+
+        const menu = document.createElement('div');
+        menu.id = 'topicContextMenu';
+        menu.classList.add('context-menu');
+
+        // 冻结话题域目标；标题生成允许即时保存，但绝不能跨项目串写。
+        const targetItemId = itemFullConfig.id;
+        const targetItemType = itemType;
+        const targetTopicId = topic.id;
+        // "生成话题名" 菜单项：Agent 和 Group 话题均支持
+        const regenerateTitleOption = document.createElement('div');
+        regenerateTitleOption.classList.add('context-menu-item');
+        regenerateTitleOption.innerHTML = `<i class="fas fa-magic"></i> 生成话题名`;
+        regenerateTitleOption.onclick = async () => {
+            closeTopicContextMenu();
+            if (regenerateTitleOption.dataset.loading === 'true') return;
+
+            regenerateTitleOption.dataset.loading = 'true';
+            regenerateTitleOption.classList.add('disabled');
+            try {
+                // 根据话题类型调用对应的 IPC
+                const result = targetItemType === 'agent'
+                    ? await electronAPI.regenerateAgentTopicTitle(targetItemId, targetTopicId)
+                    : await electronAPI.regenerateGroupTopicTitle(targetItemId, targetTopicId);
+
+                if (result?.success && result.newTitle) {
+                    // 原话题已保存；离开原项目后不再投影到当前界面，也不误报失败。
+                    if (currentSelectedItemRef.get()?.id !== targetItemId ||
+                        currentSelectedItemRef.get()?.type !== targetItemType) return;
+                    topic.name = result.newTitle;
+                    const topicInFullConfig = itemFullConfig.topics?.find(candidate => candidate.id === topic.id);
+                    if (topicInFullConfig) topicInFullConfig.name = result.newTitle;
+
+                    const titleDisplayElement = topicItemElement.querySelector('.topic-title-display, .topic-name');
+                    if (titleDisplayElement) titleDisplayElement.textContent = result.newTitle;
+                    uiHelper.showToastNotification(`话题名已更新为"${result.newTitle}"`, 'success');
+                } else {
+                    // 失败时不修改 topic、itemFullConfig 或 DOM，保留旧标题。
+                    uiHelper.showToastNotification(`生成话题名失败: ${result?.error || 'AI 未返回有效标题'}`, 'error');
+                }
+            } catch (error) {
+                // 请求异常时同样不触碰旧标题。
+                console.error('[TopicListManager] 生成话题名失败:', error);
+                uiHelper.showToastNotification(`生成话题名失败: ${error.message}`, 'error');
+            } finally {
+                regenerateTitleOption.dataset.loading = 'false';
+                regenerateTitleOption.classList.remove('disabled');
+            }
+        };
+
+        const editTitleOption = document.createElement('div');
+        editTitleOption.classList.add('context-menu-item');
+        editTitleOption.innerHTML = `<i class="fas fa-edit"></i> 编辑话题标题`;
+        editTitleOption.onclick = () => {
+            closeTopicContextMenu();
+            const titleDisplayElement = topicItemElement.querySelector('.topic-title-display');
+            if (!titleDisplayElement) return;
+
+            const originalTitle = topic.name;
+            titleDisplayElement.style.display = 'none';
+
+            const inputWrapper = document.createElement('div');
+            inputWrapper.style.display = 'flex';
+            inputWrapper.style.alignItems = 'center';
+
+            const inputField = document.createElement('input');
+            inputField.type = 'text';
+            inputField.value = originalTitle;
+            inputField.classList.add('topic-title-edit-input');
+            inputField.style.flexGrow = '1';
+            inputField.onclick = (e) => e.stopPropagation();
+
+            const confirmButton = document.createElement('button');
+            confirmButton.type = 'button';
+            confirmButton.innerHTML = '✓';
+            confirmButton.classList.add('topic-title-edit-confirm');
+            confirmButton.onclick = async (e) => {
+                e.stopPropagation();
+                const newTitle = inputField.value.trim();
+                if (newTitle && newTitle !== originalTitle) {
+                    let saveResult;
+                    if (targetItemType === 'agent') {
+                        saveResult = await electronAPI.saveAgentTopicTitle(targetItemId, targetTopicId, newTitle);
+                    } else if (targetItemType === 'group') {
+                        saveResult = await electronAPI.saveGroupTopicTitle(targetItemId, targetTopicId, newTitle);
+                    }
+                    if (saveResult && saveResult.success) {
+                        topic.name = newTitle;
+                        titleDisplayElement.textContent = newTitle;
+                        if (itemFullConfig.topics) {
+                            const topicInFullConfig = itemFullConfig.topics.find(t => t.id === topic.id);
+                            if (topicInFullConfig) topicInFullConfig.name = newTitle;
+                        }
+                    } else {
+                        uiHelper.showToastNotification(`更新话题标题失败: ${saveResult?.error || '未知错误'}`, 'error');
+                    }
+                }
+                titleDisplayElement.style.display = '';
+                inputWrapper.replaceWith(titleDisplayElement);
+            };
+
+            const cancelButton = document.createElement('button');
+            cancelButton.type = 'button';
+            cancelButton.innerHTML = '✗';
+            cancelButton.classList.add('topic-title-edit-cancel');
+            cancelButton.onclick = (e) => {
+                e.stopPropagation();
+                titleDisplayElement.style.display = '';
+                inputWrapper.replaceWith(titleDisplayElement);
+            };
+
+            inputWrapper.appendChild(inputField);
+            inputWrapper.appendChild(confirmButton);
+            inputWrapper.appendChild(cancelButton);
+            topicItemElement.insertBefore(inputWrapper, titleDisplayElement.nextSibling);
+            inputField.focus();
+            inputField.select();
+
+            inputField.addEventListener('keydown', (e) => {
+                if (e.key === 'Enter') {
+                    confirmButton.click();
+                } else if (e.key === 'Escape') {
+                    cancelButton.click();
+                }
+            });
+        };
+        menu.appendChild(editTitleOption);
+        menu.appendChild(regenerateTitleOption);
+
+        const copyTopicIdOption = document.createElement('div');
+        copyTopicIdOption.classList.add('context-menu-item');
+        copyTopicIdOption.innerHTML = `<i class="fas fa-copy"></i> 复制话题ID`;
+        copyTopicIdOption.onclick = async () => {
+            closeTopicContextMenu();
+            const topicId = String(topic.id ?? '');
+            try {
+                if (navigator.clipboard?.writeText) {
+                    await navigator.clipboard.writeText(topicId);
+                } else {
+                    const textarea = document.createElement('textarea');
+                    textarea.value = topicId;
+                    textarea.style.position = 'fixed';
+                    textarea.style.opacity = '0';
+                    document.body.appendChild(textarea);
+                    textarea.focus();
+                    textarea.select();
+                    document.execCommand('copy');
+                    textarea.remove();
+                }
+                uiHelper.showToastNotification('已复制话题ID', 'success');
+            } catch (error) {
+                console.error('[TopicListManager] Failed to copy topic ID:', error);
+                uiHelper.showToastNotification(`复制话题ID失败: ${error.message}`, 'error');
+            }
+        };
+        menu.appendChild(copyTopicIdOption);
+
+        // Part C: 锁定/解锁话题选项
+        const toggleLockOption = document.createElement('div');
+        toggleLockOption.classList.add('context-menu-item');
+        const isLocked = topic.locked !== false; // 默认为锁定
+        toggleLockOption.innerHTML = isLocked
+            ? `<i class="fas fa-unlock"></i> 解锁话题`
+            : `<i class="fas fa-lock"></i> 锁定话题`;
+        toggleLockOption.onclick = async () => {
+            closeTopicContextMenu();
+            try {
+                const result = await electronAPI.toggleTopicLock(targetItemId, targetTopicId);
+                if (result.success) {
+                    topic.locked = result.locked;
+                    uiHelper.showToastNotification(result.message, 'success');
+                    loadTopicList(); // 刷新列表以显示新状态
+                } else {
+                    uiHelper.showToastNotification(`切换锁定状态失败: ${result.error}`, 'error');
+                }
+            } catch (error) {
+                uiHelper.showToastNotification(`操作失败: ${error.message}`, 'error');
+            }
+        };
+        menu.appendChild(toggleLockOption);
+
+        // Part C: 标记为未读/已读选项
+        const toggleUnreadOption = document.createElement('div');
+        toggleUnreadOption.classList.add('context-menu-item');
+        const isUnread = topic.unread === true;
+        toggleUnreadOption.innerHTML = isUnread
+            ? `<i class="fas fa-check"></i> 标记为已读`
+            : `<i class="fas fa-envelope"></i> 标记为未读`;
+        toggleUnreadOption.onclick = async () => {
+            closeTopicContextMenu();
+            try {
+                const result = await electronAPI.setTopicUnread(targetItemId, targetTopicId, !isUnread);
+                if (result.success) {
+                    topic.unread = result.unread;
+                    if (result.unreadSource) {
+                        topic.unreadSource = result.unreadSource;
+                    } else {
+                        delete topic.unreadSource;
+                    }
+                    uiHelper.showToastNotification(
+                        topic.unread ? '已标记为未读' : '已标记为已读',
+                        'success'
+                    );
+                    loadTopicList(); // 刷新列表
+                    // 同时刷新助手列表以更新计数
+                    if (itemListManager) {
+                        itemListManager.loadItems();
+                    }
+                } else {
+                    uiHelper.showToastNotification(`操作失败: ${result.error}`, 'error');
+                }
+            } catch (error) {
+                uiHelper.showToastNotification(`操作失败: ${error.message}`, 'error');
+            }
+        };
+        menu.appendChild(toggleUnreadOption);
+
+        const deleteTopicPermanentlyOption = document.createElement('div');
+        deleteTopicPermanentlyOption.classList.add('context-menu-item', 'danger-item');
+        deleteTopicPermanentlyOption.innerHTML = `<i class="fas fa-trash-alt"></i> 删除此话题`;
+        deleteTopicPermanentlyOption.onclick = async () => {
+            closeTopicContextMenu();
+
+            // 活动 Flowlock Session 仍依赖该话题的历史目录，运行期间禁止删除。
+            if (targetItemType === 'agent' && window.flowlockManager?.isTopicLocked?.(targetItemId, targetTopicId)) {
+                uiHelper.showToastNotification('该话题正在心流锁中运行，请先停止对应 Agent 的心流锁。', 'warning');
+                return;
+            }
+
+            // 使用自定义确认对话框替代原生 confirm()，避免 Electron 焦点问题
+            const confirmed = await uiHelper.showConfirmDialog(
+                `确定要永久删除话题 "${topic.name}" 吗？此操作不可撤销。`,
+                '删除话题',
+                '删除',
+                '取消',
+                true // isDanger
+            );
+            if (confirmed) {
+                let result;
+                if (targetItemType === 'agent') {
+                    result = await electronAPI.deleteTopic(targetItemId, targetTopicId);
+                } else if (targetItemType === 'group') {
+                    result = await electronAPI.deleteGroupTopic(targetItemId, targetTopicId);
+                }
+
+                if (result && result.success) {
+                    mainRendererFunctions.onTopicsDeleted?.({ itemId: targetItemId, itemType: targetItemType, topicIds: [targetTopicId] });
+                    if (currentSelectedItemRef.get()?.id === targetItemId &&
+                        currentSelectedItemRef.get()?.type === targetItemType &&
+                        currentTopicIdRef.get() === targetTopicId) {
+                        mainRendererFunctions.handleTopicDeletion(result.remainingTopics, {
+                            id: targetItemId,
+                            type: targetItemType,
+                            topicId: targetTopicId,
+                            fallbackTopicId: itemFullConfig.topics?.find(candidate => candidate.id !== topic.id)?.id || null,
+                        });
+                    }
+                    loadTopicList();
+                } else {
+                    uiHelper.showToastNotification(`删除话题 "${topic.name}" 失败: ${result ? result.error : '未知错误'}`, 'error');
+                }
+            }
+        };
+        menu.appendChild(deleteTopicPermanentlyOption);
+
+        const exportTopicOption = document.createElement('div');
+        exportTopicOption.classList.add('context-menu-item');
+        exportTopicOption.innerHTML = `<i class="fas fa-file-export"></i> 导出此话题`;
+        exportTopicOption.onclick = () => {
+            closeTopicContextMenu();
+            handleExportTopic(itemFullConfig.id, itemType, topic.id, topic.name);
+        };
+        menu.appendChild(exportTopicOption);
+
+        const exportFullTopicOption = document.createElement('div');
+        exportFullTopicOption.classList.add('context-menu-item');
+        exportFullTopicOption.innerHTML = `<i class="fas fa-file-code"></i> 导出此话题(完整)`;
+        exportFullTopicOption.onclick = () => {
+            closeTopicContextMenu();
+            handleExportFullTopic(itemFullConfig, itemType, topic.id, topic.name);
+        };
+        menu.appendChild(exportFullTopicOption);
+
+        // 智能定位逻辑：先隐藏菜单以测量尺寸
+        menu.style.visibility = 'hidden';
+        menu.style.position = 'absolute';
+        document.body.appendChild(menu);
+
+        // 获取菜单和窗口尺寸
+        const menuWidth = menu.offsetWidth;
+        const menuHeight = menu.offsetHeight;
+        const windowWidth = window.innerWidth;
+        const windowHeight = window.innerHeight;
+
+        let top = event.clientY;
+        let left = event.clientX;
+
+        // 检查菜单是否会超出窗口底部
+        if (top + menuHeight > windowHeight) {
+            // 将菜单显示在鼠标上方
+            top = event.clientY - menuHeight;
+            // 如果上方空间也不够，则贴近顶部
+            if (top < 0) top = 5;
+        }
+
+        // 检查菜单是否会超出窗口右侧
+        if (left + menuWidth > windowWidth) {
+            // 将菜单显示在鼠标左侧
+            left = event.clientX - menuWidth;
+            // 如果左侧空间也不够，则贴近左边
+            if (left < 0) left = 5;
+        }
+
+        // 应用最终位置并显示菜单
+        menu.style.top = `${top}px`;
+        menu.style.left = `${left}px`;
+        menu.style.visibility = 'visible';
+
+        document.addEventListener('click', closeTopicContextMenuOnClickOutside, true);
+    }
+
+    function closeTopicContextMenu() {
+        const existingMenu = document.getElementById('topicContextMenu');
+        if (existingMenu) {
+            existingMenu.remove();
+            document.removeEventListener('click', closeTopicContextMenuOnClickOutside, true);
+        }
+    }
+
+    function closeTopicContextMenuOnClickOutside(event) {
+        const menu = document.getElementById('topicContextMenu');
+        if (menu && !menu.contains(event.target)) {
+            closeTopicContextMenu();
+        }
+    }
+
+    async function handleExportTopic(itemId, itemType, topicId, topicName) {
+        const currentTopicId = currentTopicIdRef.get();
+        if (topicId !== currentTopicId) {
+            uiHelper.showToastNotification('请先点击并加载此话题，然后再导出。', 'info');
+            return;
+        }
+
+        console.log(`[TopicListManager] Exporting currently visible topic: ${topicName} (ID: ${topicId})`);
+
+        try {
+            const chatMessagesDiv = document.getElementById('chatMessages');
+            if (!chatMessagesDiv) {
+                console.error('[Export Debug] chatMessagesDiv not found!');
+                uiHelper.showToastNotification('错误：找不到聊天内容容器。', 'error');
+                return;
+            }
+
+            const messageItems = chatMessagesDiv.querySelectorAll('.message-item');
+            console.log(`[Export Debug] Found ${messageItems.length} message items.`);
+            if (messageItems.length === 0) {
+                uiHelper.showToastNotification('此话题没有可见的聊天内容可导出。', 'info');
+                return;
+            }
+
+            let markdownContent = `# 话题: ${topicName}\n\n`;
+            let extractedCount = 0;
+
+            messageItems.forEach((item, index) => {
+                if (item.classList.contains('system') || item.classList.contains('thinking')) {
+                    console.log(`[Export Debug] Skipping system/thinking message at index ${index}.`);
+                    return;
+                }
+
+                const senderElement = item.querySelector('.sender-name');
+                const contentElement = item.querySelector('.md-content');
+
+                if (senderElement && contentElement) {
+                    const sender = senderElement.textContent.trim().replace(':', '');
+                    // 克隆节点，移除思维链气泡（<think> 已被渲染为 DOM 节点，innerText 会包含其文本）
+                    const contentClone = contentElement.cloneNode(true);
+                    contentClone.querySelectorAll('.vcp-thought-chain-bubble').forEach(el => el.remove());
+                    let content = contentClone.innerText || contentClone.textContent || "";
+                    // 兜底：仅清理起止标签分别独占一行的明文思维链。
+                    content = content.replace(/^[ \t]*\[--- VCP元思考链(?::\s*"[^"]*")?\s*---\][ \t]*\r?\n[\s\S]*?^[ \t]*\[--- 元思考链结束 ---\][ \t]*(?:\r?\n|$)/gm, '');
+                    content = content.replace(/^[ \t]*<think(?:ing)?>[ \t]*\r?\n[\s\S]*?^[ \t]*<\/think(?:ing)?>[ \t]*(?:\r?\n|$)/gim, '');
+                    content = content.trim();
+
+                    if (sender && content) {
+                        markdownContent += `**${sender}**: ${content}\n\n---\n\n`;
+                        extractedCount++;
+                    } else {
+                        console.log(`[Export Debug] Skipping message at index ${index} due to empty sender or content. Sender: "${sender}", Content: "${content}"`);
+                    }
+                } else {
+                    console.log(`[Export Debug] Skipping message at index ${index} because sender or content element was not found.`);
+                }
+            });
+
+            console.log(`[Export Debug] Extracted ${extractedCount} messages. Final markdown length: ${markdownContent.length}`);
+
+            if (extractedCount === 0) {
+                uiHelper.showToastNotification('未能从当前话题中提取任何有效对话内容。', 'warning');
+                return;
+            }
+
+            const result = await electronAPI.exportTopicAsMarkdown({
+                topicName: topicName,
+                markdownContent: markdownContent
+            });
+
+            if (result.success) {
+                uiHelper.showToastNotification(`话题 "${topicName}" 已成功导出到: ${result.path}`);
+            } else {
+                uiHelper.showToastNotification(`导出话题失败: ${result.error}`, 'error');
+            }
+        } catch (error) {
+            console.error(`[TopicListManager] 导出话题时发生错误:`, error);
+            uiHelper.showToastNotification(`导出话题时发生前端错误: ${error.message}`, 'error');
+        }
+    }
+
+    function getRawMessageContent(message) {
+        if (typeof message?.content === 'string') return message.content;
+        if (typeof message?.content?.text === 'string') return message.content.text;
+        if (Array.isArray(message?.content)) {
+            return message.content
+                .filter(part => part && part.type === 'text' && typeof part.text === 'string')
+                .map(part => part.text)
+                .join('\n');
+        }
+        if (message?.content === null || message?.content === undefined) return '';
+        try {
+            return JSON.stringify(message.content, null, 2);
+        } catch {
+            return String(message.content);
+        }
+    }
+
+    function resolveFullExportAgentInfo(message, itemFullConfig, itemType) {
+        if (message.role === 'user') {
+            return {
+                name: message.name || '用户',
+                model: 'N/A'
+            };
+        }
+
+        if (itemType === 'group') {
+            const agentId = message.agentId || message.agentID;
+            const member = (itemFullConfig.agents || []).find(agent =>
+                agent.id === agentId || agent.agentId === agentId
+            );
+            const usesUnifiedModel = itemFullConfig.useUnifiedModel === true;
+            return {
+                name: message.name || member?.name || agentId || 'Assistant',
+                model: message.model || message.modelName ||
+                    (usesUnifiedModel ? itemFullConfig.unifiedModel : member?.model) ||
+                    '未知模型'
+            };
+        }
+
+        return {
+            name: message.name || itemFullConfig.name || itemFullConfig.id || 'Assistant',
+            model: message.model || message.modelName || itemFullConfig.model || '未知模型'
+        };
+    }
+
+    async function handleExportFullTopic(itemFullConfig, itemType, topicId, topicName) {
+        console.log(`[TopicListManager] Exporting full raw topic: ${topicName} (ID: ${topicId})`);
+
+        try {
+            const history = await getHistory(itemFullConfig.id, itemType, topicId);
+
+            if (!Array.isArray(history)) {
+                throw new Error(history?.error || '无法读取话题历史');
+            }
+
+            const messages = history.filter(message =>
+                message &&
+                message.role !== 'system' &&
+                message.isThinking !== true
+            );
+
+            if (messages.length === 0) {
+                uiHelper.showToastNotification('此话题没有可导出的对话内容。', 'info');
+                return;
+            }
+
+            let exportContent = `# 话题: ${topicName}\n\n`;
+            exportContent += `> 导出模式: 完整（保留原始消息内容）\n\n`;
+
+            messages.forEach((message, index) => {
+                const { name, model } = resolveFullExportAgentInfo(message, itemFullConfig, itemType);
+                const rawContent = getRawMessageContent(message);
+
+                exportContent += `===== 消息 ${index + 1} =====\n`;
+                exportContent += `Role: ${message.role || 'unknown'}\n`;
+                exportContent += `Agent: ${name}\n`;
+                exportContent += `Model: ${model}\n`;
+                if (message.timestamp) {
+                    exportContent += `Timestamp: ${new Date(message.timestamp).toISOString()}\n`;
+                }
+                exportContent += `\n${rawContent}\n\n`;
+            });
+
+            const result = await electronAPI.exportTopicAsMarkdown({
+                topicName: `${topicName}-完整`,
+                markdownContent: exportContent
+            });
+
+            if (result.success) {
+                uiHelper.showToastNotification(`话题 "${topicName}" 已完整导出到: ${result.path}`);
+            } else if (result.error !== '用户取消了导出操作。') {
+                uiHelper.showToastNotification(`完整导出话题失败: ${result.error}`, 'error');
+            }
+        } catch (error) {
+            console.error('[TopicListManager] 完整导出话题时发生错误:', error);
+            uiHelper.showToastNotification(`完整导出话题失败: ${error.message}`, 'error');
+        }
+    }
+
+    /**
+     * 设置鼠标快捷键事件监听器
+     */
+    function setupMouseShortcuts() {
+        const topicsContainer = document.getElementById('tabContentTopics');
+        if (!topicsContainer) {
+            console.warn('[TopicListManager] 话题容器未找到，跳过鼠标快捷键设置');
+            return;
+        }
+
+        let lastLeftClickTime = 0;
+
+        // 双击左键：进入设置页面
+        addListener(topicsContainer, 'click', (e) => {
+            if (isManageMode) return;
+            if (e.target.closest('button, input, .topics-header-container, .next-ui-topic-manage-panel')) return;
+            if (e.button === 0) { // 左键
+                const currentTime = Date.now();
+                const timeDiff = currentTime - lastLeftClickTime;
+
+                if (timeDiff < 300) { // 双击检测（300ms内）
+                    console.log('[TopicListManager] 检测到双击左键，进入设置页面');
+                    e.preventDefault();
+                    e.stopPropagation();
+
+                    // 切换到设置页面
+                    if (uiManager && typeof uiManager.switchToTab === 'function') {
+                        uiManager.switchToTab('settings');
+                    } else {
+                        console.warn('[TopicListManager] uiManager不可用，无法切换到设置页面');
+                    }
+                }
+
+                lastLeftClickTime = currentTime;
+            }
+        });
+
+        // 中键点击：返回助手页面
+        addListener(topicsContainer, 'auxclick', (e) => {
+            if (e.button === 1) { // 中键
+                console.log('[TopicListManager] 检测到中键点击，返回助手页面');
+                e.preventDefault();
+                e.stopPropagation();
+
+                // 切换到助手页面
+                if (uiManager && typeof uiManager.switchToTab === 'function') {
+                    uiManager.switchToTab('agents');
+                    // 重置助手页面的鼠标事件状态，确保双击功能正常工作
+                    if (itemListManager && typeof itemListManager.resetMouseEventStates === 'function') {
+                        itemListManager.resetMouseEventStates();
+                    }
+                } else {
+                    console.warn('[TopicListManager] uiManager不可用，无法切换到助手页面');
+                }
+            }
+        });
+
+        // 防止中键点击的默认行为
+        addListener(topicsContainer, 'mousedown', (e) => {
+            if (e.button === 1) { // 中键
+                e.preventDefault();
+            }
+        });
+
+        console.log('[TopicListManager] 鼠标快捷键设置完成');
+    }
+
+    function dispose() {
+        cancelPendingTopicSearch();
+        cleanupProgressiveTopicRendering();
+        closeTopicContextMenu();
+        selectedTopicIds.clear();
+        displayedTopics = [];
+        availableTopics = [];
+        currentItemConfig = null;
+        managedItemKey = '';
+        topicListContainer = null;
+        listenerOwner = null;
+    }
+
+    // --- Public API ---
+    return {
+        init,
+        loadTopicList,
+        setupTopicSearch,
+        showTopicContextMenu,
+        setupMouseShortcuts,
+        dispose
+    };
+})();
diff --git a/modules/ui-system/side-pane/side-pane-controller.js b/modules/ui-system/side-pane/side-pane-controller.js
index aab6591ba..280352145 100644
--- a/modules/ui-system/side-pane/side-pane-controller.js
+++ b/modules/ui-system/side-pane/side-pane-controller.js
@@ -672,7 +672,7 @@ export function createSidePaneController({
             const tabOccurrence = entry?.occurrence || occurrences.get(tab.id);
             if (entry) occurrences.delete(tab.id);
             else void releaseOccurrence(tabOccurrence, 'tab-closed');
-            rememberClosed(tab);
+            if (!options.discard) rememberClosed(tab);
             const wasVisible = state.visible;
             state = SidePaneState.closeTab(state, tab.id, options);
             tabCloseOwner.forgetLifetime(tab.id);
@@ -842,6 +842,20 @@ export function createSidePaneController({
             await closeBatch(SidePaneState.getClosableVisibleTabs(state));
         },
 
+        /**
+         * 话题删掉后，属于它的标签（辅助对话、话题级代码查看等）直接丢弃：不询问、不进最近关闭、不调 onClosed
+         * （子话题目录已随父话题一起删了）。不丢的话辅助对话是 keep，会一直挂着渲染器和监听直到重启。
+         * 对齐 ZCode useAppPanels.ts 订阅父任务生命周期统一关掉框选副屏标签。
+         */
+        async discardTabsOfDeletedTopics({ itemId, topicIds } = {}) {
+            if (isDisposed || !itemId || !topicIds?.length) return;
+            const deleted = new Set(topicIds);
+            const orphaned = state.tabs.filter(tab => tab.parent?.itemId === itemId && deleted.has(tab.parent?.topicId));
+            if (!orphaned.length) return;
+            navigationRevision++;
+            await closeBatch(orphaned, { discard: true });
+        },
+
         /**
          * 打开（或激活已打开的）标签。登记了 toTab 的类型可以只传 payload，比如
          * openTab({ kind: 'chat', descriptor })，由类型自己映射成标签并决定落到哪个已有标签上。
diff --git a/modules/ui-system/side-pane/side-pane-tab-close-owner.js b/modules/ui-system/side-pane/side-pane-tab-close-owner.js
index c5760b2a6..fd4e4e285 100644
--- a/modules/ui-system/side-pane/side-pane-tab-close-owner.js
+++ b/modules/ui-system/side-pane/side-pane-tab-close-owner.js
@@ -49,7 +49,8 @@ export function createSidePaneTabCloseOwner({
         closing.set(tabId, operation);
         const onClosed = getOnClosed(tab);
         const run = async () => {
-            if (entry) {
+            // discard：标签的归属已经不在了（父话题被删），不再询问、不再回调 onClosed
+            if (entry && !options.discard) {
                 const result = await entry.handle?.requestClose?.();
                 if (result?.closed === false) return;
                 if (isDisposed() || getEntry(tabId) !== entry) return;
@@ -64,7 +65,7 @@ export function createSidePaneTabCloseOwner({
             });
             const cleanup = (async () => {
                 await disposeEntry(tabId, entry);
-                try { await onClosed?.(current); }
+                try { if (!options.discard) await onClosed?.(current); }
                 catch (error) { console.error(`[SidePaneController] onClosed failed for tab "${tabId}":`, error); }
             })();
             retiring.add(cleanup);
diff --git a/renderer.js b/renderer.js
index b2d4b6790..4917d4e74 100755
--- a/renderer.js
+++ b/renderer.js
@@ -165,6 +165,7 @@ let modelSelectModal = null;
 let modelList = null;
 let modelSearchInput = null;
 let refreshModelsBtn = null;
+let workspaceSidePaneController = null; // 话题删除时丢弃它的侧栏标签
 
 // UI Helper functions to be passed to modules
 // The main uiHelperFunctions object is now defined in modules/ui-helpers.js
@@ -802,6 +803,11 @@ mainChatSettingsPresentationOwner.configureStartup({
                         console.error('[TopicListManager] chatManager not available for handleTopicDeletion');
                     }
                 },
+                // 侧栏晚于话题列表初始化，删话题时再取
+                onTopicsDeleted: (deletion) => {
+                    void workspaceSidePaneController?.discardTabsOfDeletedTopics(deletion)
+                        .catch(error => console.error('[RENDERER] Failed to drop side pane tabs of deleted topics:', error));
+                },
                 selectTopic: (topicId) => {
                     if (chatManager) {
                         return chatManager.selectTopic(topicId);
@@ -983,7 +989,7 @@ mainChatSettingsPresentationOwner.configureStartup({
         // 右侧工作区侧栏：通知 + 辅助对话
         // 侧栏起不来只影响侧栏：后面的过滤器、事件绑定（发送按钮等）照常初始化
         try {
-            initWorkspaceSidePane({
+            workspaceSidePaneController = initWorkspaceSidePane({
                 document,
                 window,
                 elements: {
diff --git a/scripts/next-delta-shared-baseline.json b/scripts/next-delta-shared-baseline.json
index 26c8ed337..6e0d77e23 100644
--- a/scripts/next-delta-shared-baseline.json
+++ b/scripts/next-delta-shared-baseline.json
@@ -12,8 +12,8 @@
     "reason": "Integrated projection behavior: media cleanup before subtree replacement; nested tool-result ranges shield protocol markers; incremental smooth-stream burst handling preserves text order; durable persistence remains outside this projection."
   },
   "modules/topicListManager.js": {
-    "sha256": "50b2475f546cde9b601fb37dcc77562513f57b27823287a64061e85858653b74",
-    "reason": "Integrated topic behavior: configuration/unread loads validate the selected item; sort/title/menu operations capture their original topic target; completed deletion changes the active view only for the same item and topic. Repository, readiness and render listener ownership remain unchanged. Topic search waits 200ms after typing before reloading (Enter is immediate); a rejected config IPC shows an error row instead of a permanent spinner; names and IPC errors render as text."
+    "sha256": "6300f8f255f1df88c26d5608b48f21d29848ca0395e34695c1aa31d4146f3646",
+    "reason": "Integrated topic behavior: configuration/unread loads validate the selected item; sort/title/menu operations capture their original topic target; completed deletion changes the active view only for the same item and topic. Repository, readiness and render listener ownership remain unchanged. Topic search waits 200ms after typing before reloading (Enter is immediate); a rejected config IPC shows an error row instead of a permanent spinner; names and IPC errors render as text. Successful single and batch deletions report the deleted topic ids through mainRendererFunctions.onTopicsDeleted so the side pane drops tabs owned by those topics."
   },
   "modules/itemListManager.js": {
     "sha256": "ae5eca22dd19312f56d5c9d60b6a221c3a5be8cf2d34c1049407b45100cc5393",
diff --git a/tests/side-pane-deleted-topic.test.mjs b/tests/side-pane-deleted-topic.test.mjs
new file mode 100644
index 000000000..3dc926a19
--- /dev/null
+++ b/tests/side-pane-deleted-topic.test.mjs
@@ -0,0 +1,46 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { JSDOM } from 'jsdom';
+import { createSidePaneController } from '../modules/ui-system/side-pane/side-pane-controller.js';
+import { defineChatTabType } from '../modules/ui-system/side-pane/tab-types/chat.js';
+
+// 删掉话题后，它的辅助对话标签要被释放，而不是一直挂着（keep 永不休眠）
+const parentOf = topicId => ({ itemType: 'agent', itemId: 'agent', topicId });
+const sideChat = (id, topicId) => ({ kind: 'chat', descriptor: {
+    id, title: id, parent: parentOf(topicId), child: { itemType: 'agent', itemId: 'agent', topicId: `child-${id}` }
+} });
+
+test('deleting a topic disposes its side chat tabs without asking or deleting the child again', async t => {
+    const dom = new JSDOM('<main class="main-content"></main><aside id="pane"><div id="tabs"></div><div id="content"><section class="side-pane-view" id="sidePaneViewNotifications"></section></div></aside>');
+    const doc = dom.window.document;
+    const disposed = [];
+    const asked = [];
+    const closed = [];
+    const ctrl = createSidePaneController({
+        root: doc.getElementById('pane'),
+        tabListElement: doc.getElementById('tabs'),
+        contentContainer: doc.getElementById('content'),
+        tabTypes: [defineChatTabType({
+            provider: { mountTab: async descriptor => ({
+                dispose: async () => { disposed.push(descriptor.id); },
+                requestClose: async () => { asked.push(descriptor.id); return { closed: false }; },
+                focus() {}
+            }) },
+            onClosed: descriptor => { closed.push(descriptor.id); }
+        })]
+    });
+    t.after(() => { ctrl.dispose?.(); dom.window.close(); });
+
+    ctrl.setParent(parentOf('gone'));
+    await ctrl.openTab(sideChat('orphan', 'gone'));
+    ctrl.setParent(parentOf('kept'));
+    await ctrl.openTab(sideChat('survivor', 'kept'));
+
+    await ctrl.discardTabsOfDeletedTopics({ itemId: 'agent', topicIds: ['gone'] });
+
+    assert.deepEqual(ctrl.getSnapshot().tabs.map(tab => tab.id).filter(id => id !== 'notifications'), ['survivor']);
+    assert.deepEqual(disposed, ['orphan']);
+    assert.deepEqual(asked, [], 'no confirmation for a conversation that no longer exists');
+    assert.deepEqual(closed, [], 'the child directory was already removed with its parent');
+    assert.ok(doc.querySelector('[data-tab-id="survivor"]'));
+});

From 1357c31adbdb5d53613bd3ac253246853984f8a7 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 02:01:16 +0000
Subject: [PATCH 069/143] Git page: mount long change lists in batches

Opening the plan tab's Git page mounted a card for every changed file at
once. With 1000 changes the click took ~0.75s; with 3000 it took ~1.9s
with a 0.74s long task, and every scroll frame relaid out the whole list.

Following ZCode's GitPane, which virtualizes its change rows for the same
reason, cards now mount 120 at a time: a sentinel after the list mounts
the next batch as it nears the viewport. The expanded, focused and
located files are always mounted. Cards skip off-screen layout and paint
with content-visibility. 1000 changes now open in ~0.24s and 3000 in
~0.41s, with no task over 100ms.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_017bCbRB3E9yajQ3HbdMrjiJ
---
 .../contracts/generated/chat-event-graph.json |  4 +-
 modules/ui-system/side-pane/git/cards.js      |  3 +-
 modules/ui-system/side-pane/git/git-view.js   | 51 ++++++++++++++++++-
 styles/ui-system/side-pane-git-extras.css     |  3 +-
 tests/side-pane-git.test.mjs                  | 43 ++++++++++++++++
 5 files changed, 98 insertions(+), 6 deletions(-)

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index bc07bf172..e861f553f 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -4201,7 +4201,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/git-view.js",
-          "line": 219,
+          "line": 260,
           "kind": "custom-event-listener"
         },
         {
@@ -5774,7 +5774,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/git-view.js",
-          "line": 219,
+          "line": 260,
           "kind": "custom-event-listener",
           "match": "btn.addEventListener('click'"
         },
diff --git a/modules/ui-system/side-pane/git/cards.js b/modules/ui-system/side-pane/git/cards.js
index 2027ff42a..aa4c85e07 100644
--- a/modules/ui-system/side-pane/git/cards.js
+++ b/modules/ui-system/side-pane/git/cards.js
@@ -261,6 +261,7 @@ export function createGitCards({
     function reset() { clearDiff(); countQueue = []; }
     function expand(item) { expanded.clear(); expanded.add(keyOf(item)); }
     function hasExpanded() { return expanded.size > 0; }
+    function isExpanded(item) { return expanded.has(keyOf(item)); }
 
-    return Object.freeze({ buildCard, cardFor, prefetch, reset, clearDiff, invalidate, clearExpanded, expand, hasExpanded, dispose() { disposed = true; countQueue = []; expanded.clear(); diffCache.clear(); } });
+    return Object.freeze({ buildCard, cardFor, prefetch, reset, clearDiff, invalidate, clearExpanded, expand, hasExpanded, isExpanded, dispose() { disposed = true; countQueue = []; expanded.clear(); diffCache.clear(); } });
 }
diff --git a/modules/ui-system/side-pane/git/git-view.js b/modules/ui-system/side-pane/git/git-view.js
index 887c58a97..54a93d604 100644
--- a/modules/ui-system/side-pane/git/git-view.js
+++ b/modules/ui-system/side-pane/git/git-view.js
@@ -31,6 +31,7 @@ export { filterAiTouched, latestAiBatch, buildHunkRows } from './diff-model.js';
 
 // 工作区选择和 V工程 Git 页（ProjectForgemodules/projectforge-git.js）共用，见 sources/git-workspace.js。
 const STORAGE_KEY_SOURCE = 'vcp-side-pane-git-source';
+const GIT_LIST_BATCH = 120;
 const AI_SOURCE = 'ai-last';
 const SELECTION_ORIGIN = 'git-view';
 
@@ -141,10 +142,14 @@ export function mountGitView(host, {
     body.className = 'side-git-body';
     const list = doc.createElement('div');
     list.className = 'side-git-list';
+    // 列表尾部的哨兵：进入可视区附近时挂下一批卡片（见 render）
+    const listMore = doc.createElement('div');
+    listMore.className = 'side-git-list-more';
+    listMore.setAttribute('aria-hidden', 'true');
     const empty = doc.createElement('div');
     empty.className = 'side-git-empty';
     empty.hidden = true;
-    body.append(list, empty);
+    body.append(list, listMore, empty);
 
     root.append(header, body);
     host.appendChild(root);
@@ -184,6 +189,40 @@ export function mountGitView(host, {
     });
     const { cardFor, buildCard } = cardsOwner;
 
+    // ── 长列表分批挂载 ───────────────────────────────────────
+    // ZCode `GitPane` 用 @tanstack/react-virtual 只挂可视行，注释里记着数百个未跟踪文件同步挂载时
+    // click 出现 600ms+ 长任务。这里沿用话题列表的分批做法：先挂一批，哨兵接近可视区再挂下一批；
+    // 卡片本身用 content-visibility 跳过屏外的布局和绘制（样式表 side-pane-git-extras.css）。
+    // 1000 个改动时打开 Git 页从约 0.75s 降到 0.24s；3000 个时从 1.9s（最长任务 0.74s）降到 0.41s。
+    let listItems = [];
+    let listMounted = 0;
+    const moreObserver = typeof win.IntersectionObserver === 'function'
+        ? new win.IntersectionObserver((entries) => {
+            if (entries.some(entry => entry.isIntersecting)) mountMoreCards(listMounted + GIT_LIST_BATCH);
+        }, { rootMargin: '600px 0px' })
+        : null;
+    if (moreObserver) own.observe(moreObserver, listMore, undefined, 'git-list-more');
+
+    function mountMoreCards(upTo) {
+        if (disposed()) return;
+        const end = moreObserver ? Math.min(listItems.length, upTo) : listItems.length;
+        if (end <= listMounted) return;
+        const fragment = doc.createDocumentFragment();
+        for (; listMounted < end; listMounted++) fragment.appendChild(buildCard(listItems[listMounted]));
+        list.appendChild(fragment);
+        // 哨兵仍在可视区附近时不会再报相交；重新观察一次，让它按当前位置再判一次
+        if (moreObserver && listMounted < listItems.length) {
+            moreObserver.unobserve(listMore);
+            moreObserver.observe(listMore);
+        }
+    }
+
+    /** 让这一项的卡片已经挂上（定位、恢复焦点前调用） */
+    function mountThrough(item) {
+        const index = listItems.findIndex(entry => keyOf(entry) === keyOf(item));
+        if (index >= listMounted) mountMoreCards(index + 1);
+    }
+
     function visibleItems() {
         if (!currentStatus?.isRepo) return [];
         const staged = (currentStatus.staged || []).map(i => ({ ...i, staged: true }));
@@ -198,6 +237,8 @@ export function mountGitView(host, {
 
     function showEmpty({ icon = 'description', title, description, action = null }) {
         list.innerHTML = '';
+        listItems = [];
+        listMounted = 0;
         empty.hidden = false;
         empty.innerHTML = '';
         const iconEl = doc.createElement('span');
@@ -274,7 +315,12 @@ export function mountGitView(host, {
         const focusKey = focusedCard?.dataset.key ?? null;
         const focusIndex = focusedCard ? Array.prototype.indexOf.call(list.children, focusedCard) : -1;
         list.innerHTML = '';
-        items.forEach(item => list.appendChild(buildCard(item)));
+        listItems = items;
+        listMounted = 0;
+        // 展开着的文件和有焦点的文件所在批次一起挂上
+        const expandedIndex = items.findIndex(item => cardsOwner.isExpanded(item));
+        const focusItemIndex = focusKey !== null ? items.findIndex(item => keyOf(item) === focusKey) : -1;
+        mountMoreCards(Math.max(GIT_LIST_BATCH, expandedIndex + 1, focusItemIndex + 1, focusIndex + 1));
         cardsOwner.prefetch(items);
         if (focusKey !== null) {
             const cards = Array.from(list.querySelectorAll('.side-git-card'));
@@ -428,6 +474,7 @@ export function mountGitView(host, {
         storage?.setItem(STORAGE_KEY_SOURCE, currentSource);
         cardsOwner.expand(found);
         render();
+        mountThrough(found);
         cardFor(found)?.scrollIntoView?.({ block: 'nearest' });
     }
 
diff --git a/styles/ui-system/side-pane-git-extras.css b/styles/ui-system/side-pane-git-extras.css
index d37aeb83d..a5e39893c 100644
--- a/styles/ui-system/side-pane-git-extras.css
+++ b/styles/ui-system/side-pane-git-extras.css
@@ -127,7 +127,8 @@ html body .side-plan-git .side-git-body:where(.vcp-ui-scope, .vcp-ui-scope *) {
 html body .side-plan-git .side-git-empty:where(.vcp-ui-scope, .vcp-ui-scope *) { height: auto; padding: 40px 24px; }
 
 /* ── 变更卡片 ─────────────────────────────────────────── */
-html .side-git-card:where(.vcp-ui-scope, .vcp-ui-scope *) { width: 100%; min-width: 0; }
+html .side-git-card:where(.vcp-ui-scope, .vcp-ui-scope *) { width: 100%; min-width: 0; content-visibility: auto; contain-intrinsic-block-size: auto 34px; }
+html .side-git-list-more:where(.vcp-ui-scope, .vcp-ui-scope *) { height: 1px; }
 
 html .side-git-row:where(.vcp-ui-scope, .vcp-ui-scope *) {
     position: sticky;
diff --git a/tests/side-pane-git.test.mjs b/tests/side-pane-git.test.mjs
index 025ebc86f..940a9aba6 100644
--- a/tests/side-pane-git.test.mjs
+++ b/tests/side-pane-git.test.mjs
@@ -136,3 +136,46 @@ test('the Git view has source select, flat change cards, expandable diff, contex
 });
 
 
+
+test('a long change list mounts in batches and still mounts the file being focused', async () => {
+    const dom = new JSDOM('<div id="sideGitHost"></div>', { pretendToBeVisual: true });
+    const win = dom.window;
+    const observers = [];
+    win.IntersectionObserver = class {
+        constructor(callback) { this.callback = callback; this.targets = new Set(); observers.push(this); }
+        observe(target) { this.targets.add(target); }
+        unobserve(target) { this.targets.delete(target); }
+        disconnect() { this.targets.clear(); }
+        fire() { this.callback([...this.targets].map(target => ({ target, isIntersecting: true }))); }
+    };
+    const changes = Array.from({ length: 300 }, (_, i) => ({ path: `src/file_${i}.js`, status: 'M' }));
+    const api = {
+        async gitListWorkspaces() { return { success: true, data: { workspaces: [{ id: 'ws', alias: 'ws', path: '/code/ws' }], activeWorkspaceId: 'ws' } }; },
+        async gitStatus() { return { success: true, data: { isRepo: true, staged: [], changes, conflicts: [] } }; },
+        async gitDiff(wsId, relPath) {
+            return { success: true, data: { path: relPath, before: { exists: true, binary: false, text: 'a\n' }, after: { exists: true, binary: false, text: 'b\n' } } };
+        }
+    };
+    const host = win.document.getElementById('sideGitHost');
+    const handle = mountGitView(host, { api });
+    await handle.ready;
+    const paths = () => [...host.querySelectorAll('.side-git-card')].map(card => card.dataset.path);
+
+    assert.equal(paths().length, 120, 'only the first batch is mounted');
+    assert.deepEqual(paths().slice(0, 2), ['src/file_0.js', 'src/file_1.js']);
+
+    const more = observers.find(observer => observer.targets.size);
+    more.fire();
+    assert.equal(paths().length, 240);
+    assert.equal(paths()[239], 'src/file_239.js', 'batches keep the status order');
+
+    await handle.focusPath('src/file_290.js');
+    const card = [...host.querySelectorAll('.side-git-card')].find(el => el.dataset.path === 'src/file_290.js');
+    assert.ok(card, 'the focused file is mounted even past the loaded batches');
+    assert.equal(card.querySelector('.side-git-row').getAttribute('aria-expanded'), 'true');
+    assert.equal(new Set(paths()).size, paths().length, 'no card is mounted twice');
+
+    more.fire();
+    assert.equal(paths().length, 300);
+    handle.dispose();
+});

From d947bb0d653548ff138d2a0ffe1206dd6743d277 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 02:03:17 +0000
Subject: [PATCH 070/143] topicListManager.js: restore CRLF line endings

#4's batch K rewrote the whole file with LF, a 3,213-line diff for a 3-line
change. The next-delta digest normalises line endings, so its baseline hash
still matches.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01UCGGgmHsCToooXTgSXpmq9
---
 modules/topicListManager.js | 3216 +++++++++++++++++------------------
 1 file changed, 1608 insertions(+), 1608 deletions(-)

diff --git a/modules/topicListManager.js b/modules/topicListManager.js
index 33c19ed72..4495e2976 100644
--- a/modules/topicListManager.js
+++ b/modules/topicListManager.js
@@ -1,1608 +1,1608 @@
-// modules/topicListManager.js
-
-window.topicListManager = (() => {
-    // --- Private Variables ---
-    let topicListContainer;
-    let electronAPI;
-    let chatRepository;
-    let currentSelectedItemRef;
-    let currentTopicIdRef;
-    let topicSelectionReadiness;
-    let uiHelper;
-    let mainRendererFunctions;
-    let listenerOwner;
-    let uiManager;
-    let itemListManager;
-    let renderListenerDisposers = [];
-    let wasSelectionListenerActive = false; // To store the state of the selection listener before dragging
-    let topicListRenderGeneration = 0;
-    let topicListScrollCleanup = null;
-    let topicCountObserver = null;
-    let isManageMode = false;
-    let selectedTopicIds = new Set();
-    let displayedTopics = [];
-    let availableTopics = [];
-    let currentItemConfig = null;
-    let managedItemKey = '';
-
-    const TOPIC_INITIAL_RENDER_COUNT = 40;
-    const TOPIC_PROGRESSIVE_BATCH_SIZE = 30;
-    const TOPIC_LOAD_MORE_THRESHOLD_PX = 320;
-    // Each search reload re-reads the item config and runs a content search
-    // over IPC. Typing waits for a short pause first, in the range ZCode uses
-    // for its IO-backed refreshes (fileWatcherService 150ms, useTabPersistence
-    // 300ms); Enter still searches at once.
-    const TOPIC_SEARCH_DEBOUNCE_MS = 200;
-    let topicSearchTimer = null;
-
-    const addListener = (target, type, handler, options) => {
-        if (listenerOwner) return listenerOwner.add(target, type, handler, options);
-        target?.addEventListener?.(type, handler, options);
-        return true;
-    };
-
-    function addRenderListener(target, type, handler, options) {
-        target?.addEventListener?.(type, handler, options);
-        renderListenerDisposers.push(() => target?.removeEventListener?.(type, handler, options));
-    }
-
-    function cancelPendingTopicSearch() {
-        if (topicSearchTimer) clearTimeout(topicSearchTimer);
-        topicSearchTimer = null;
-    }
-
-    // Names and IPC error strings are user or disk data, so status rows are
-    // built with textContent, never by interpolating into innerHTML.
-    function renderTopicListStatus(topicListUl, message, { loading = false } = {}) {
-        const li = document.createElement('li');
-        if (loading) {
-            const spinner = document.createElement('div');
-            spinner.className = 'loading-spinner-small';
-            li.append(spinner, document.createTextNode(message));
-        } else {
-            const p = document.createElement('p');
-            p.textContent = message;
-            li.appendChild(p);
-        }
-        topicListUl.replaceChildren(li);
-    }
-
-    function disposeRenderListeners() {
-        renderListenerDisposers.splice(0).reverse().forEach(dispose => dispose());
-    }
-
-    /**
-     * Initializes the TopicListManager module.
-     * @param {object} config - The configuration object.
-     */
-    function init(config) {
-        if (!config.elements || !config.elements.topicListContainer) {
-            console.error('[TopicListManager] Missing required DOM element: topicListContainer.');
-            return;
-        }
-        if (!config.electronAPI || !config.refs || !config.uiHelper || !config.mainRendererFunctions || !config.topicSelectionReadiness) {
-            console.error('[TopicListManager] Missing required configuration parameters.');
-            return;
-        }
-
-        topicListContainer = config.elements.topicListContainer;
-        electronAPI = config.electronAPI;
-        chatRepository = config.chatRepository || null;
-        if (!chatRepository) throw new Error('TopicListManager requires ChatRepository');
-        currentSelectedItemRef = config.refs.currentSelectedItemRef;
-        currentTopicIdRef = config.refs.currentTopicIdRef;
-        topicSelectionReadiness = config.topicSelectionReadiness;
-        uiHelper = config.uiHelper;
-        mainRendererFunctions = config.mainRendererFunctions;
-        listenerOwner = config.listenerOwner || null;
-        uiManager = config.uiManager || null;
-        itemListManager = config.itemListManager || null;
-
-        // 设置鼠标快捷键
-        setupMouseShortcuts();
-        setupNextUiTopicTools();
-
-        console.log('[TopicListManager] Initialized successfully.');
-    }
-
-    function getHistory(itemId, itemType, topicId) {
-        return chatRepository.getHistory(itemId, itemType, topicId);
-    }
-
-    function hasUserParticipation(history) {
-        return Array.isArray(history) && history.some(message =>
-            message &&
-            message.role === 'user' &&
-            message.isThinking !== true
-        );
-    }
-
-    function hasValidPersistentUnreadMarker(topic, history) {
-        if (topic?.unread !== true) return false;
-        if (topic.unreadSource === 'manual') return true;
-
-        // Agent/TopicSponsor 产生的旧未读标记在用户参与后即失效。
-        return !hasUserParticipation(history);
-    }
-
-    async function clearStalePersistentUnreadMarker(topic, itemId, history) {
-        if (
-            topic?.unread !== true ||
-            topic.unreadSource === 'manual' ||
-            !hasUserParticipation(history)
-        ) {
-            return;
-        }
-
-        topic.unread = false;
-        delete topic.unreadSource;
-
-        try {
-            const result = await electronAPI.setTopicUnread(itemId, topic.id, false);
-            if (!result?.success) {
-                console.warn(`[TopicListManager] 清理话题 ${topic.id} 的残留未读标记失败:`, result?.error);
-            }
-        } catch (error) {
-            console.warn(`[TopicListManager] 清理话题 ${topic.id} 的残留未读标记失败:`, error);
-        }
-    }
-
-    /**
-     * 统计完全由 Agent 主动发起、尚无用户参与的话题消息数。
-     * 系统消息和思考占位不参与判断；历史中只要出现过用户消息就返回 0。
-     * @param {Array} history - 消息历史
-     * @returns {number}
-     */
-    function countUnreadMessages(history) {
-        if (!Array.isArray(history) || history.length === 0) return 0;
-
-        const effectiveMessages = history.filter(message =>
-            message &&
-            message.role !== 'system' &&
-            message.isThinking !== true
-        );
-
-        if (effectiveMessages.some(message => message.role === 'user')) {
-            return 0;
-        }
-
-        return effectiveMessages.filter(message => message.role === 'assistant').length;
-    }
-
-    function normalizeTopicTitle(topicTitle) {
-        if (typeof topicTitle !== 'string') return topicTitle;
-
-        const trimmedTitle = topicTitle.trim();
-        if (!trimmedTitle) return trimmedTitle;
-        if (trimmedTitle.includes('新话题')) return trimmedTitle;
-
-        const timeMatch = trimmedTitle.match(/(\d{1,2}:\d{2}:\d{2})/);
-        if (trimmedTitle.includes('新话') && timeMatch) {
-            return `新话题 ${timeMatch[1]}`;
-        }
-
-        return trimmedTitle;
-    }
-
-    /**
-     * 解析话题搜索约定词。
-     * 仅当完整输入为“未读话题”或“unread topic”时启用未读置顶。
-     * @param {string} rawValue - 搜索框原始值
-     * @returns {{ rawTerm: string, queryTerm: string, prioritizeUnread: boolean }}
-     */
-    function parseTopicSearchQuery(rawValue) {
-        const rawTerm = String(rawValue || '').trim().toLowerCase();
-        const prioritizeUnread = rawTerm === '未读话题' || rawTerm === 'unread topic';
-
-        return {
-            rawTerm,
-            queryTerm: prioritizeUnread ? '' : rawTerm,
-            prioritizeUnread
-        };
-    }
-
-    /**
-     * 读取各话题历史，并将未读话题稳定地移到顶部。
-     * 未读组与已读组内部均保留用户自定义顺序。
-     */
-    async function prioritizeUnreadTopics(topics, currentSelectedItem) {
-        const topicsWithUnreadState = await Promise.all(topics.map(async topic => {
-            let history = [];
-            try {
-                history = await getHistory(currentSelectedItem.id, currentSelectedItem.type, topic.id);
-            } catch (error) {
-                console.warn(`[TopicListManager] 读取话题 ${topic.id} 的未读状态失败:`, error);
-            }
-
-            const calculatedUnreadCount = Array.isArray(history)
-                ? countUnreadMessages(history)
-                : 0;
-            const hasPersistentUnread = hasValidPersistentUnreadMarker(topic, history);
-
-            await clearStalePersistentUnreadMarker(topic, currentSelectedItem.id, history);
-
-            return {
-                topic,
-                isUnread: calculatedUnreadCount > 0 || hasPersistentUnread,
-                calculatedUnreadCount
-            };
-        }));
-
-        const unreadTopics = [];
-        const readTopics = [];
-        topicsWithUnreadState.forEach(({ topic, isUnread, calculatedUnreadCount }) => {
-            topic.__calculatedUnreadCount = calculatedUnreadCount;
-            (isUnread ? unreadTopics : readTopics).push(topic);
-        });
-
-        return unreadTopics.concat(readTopics);
-    }
-
-    function ensureTopicUnreadIndicator(li, unreadCount = -1) {
-        if (!li) return;
-
-        let indicator = li.querySelector('.topic-unread-indicator');
-        if (!indicator) {
-            indicator = document.createElement('span');
-            indicator.className = 'topic-unread-indicator';
-            const messageCountSpan = li.querySelector('.message-count');
-            li.insertBefore(indicator, messageCountSpan || null);
-        }
-
-        indicator.textContent = unreadCount > 0 ? `未读 ${unreadCount}` : '未读';
-        indicator.title = unreadCount > 0 ? `${unreadCount} 条未读消息` : '未读话题';
-        li.classList.add('has-unread-topic');
-    }
-
-    function removeTopicUnreadIndicator(li) {
-        if (!li) return;
-        li.querySelector('.topic-unread-indicator')?.remove();
-        li.classList.remove('has-unread-topic');
-    }
-
-    /**
-     * Part C: 计算单个话题的未读消息数
-     * @param {Object} topic - 话题对象
-     * @param {Array} history - 话题历史消息
-     * @returns {number} - 未读消息数，-1 表示仅显示小点
-     */
-    function calculateTopicUnreadCount(topic, history) {
-        const count = countUnreadMessages(history);
-        if (count > 0) return count;
-
-        // 没有自动计数时，仅保留仍有效的持久化未读标记。
-        if (hasValidPersistentUnreadMarker(topic, history)) {
-            return -1; // 仅显示小点，不显示数字
-        }
-
-        return 0; // 不显示
-    }
-
-    function cleanupProgressiveTopicRendering() {
-        topicListRenderGeneration++;
-        disposeRenderListeners();
-        if (typeof topicListScrollCleanup === 'function') {
-            topicListScrollCleanup();
-            topicListScrollCleanup = null;
-        }
-        if (topicCountObserver) {
-            topicCountObserver.disconnect();
-            topicCountObserver = null;
-        }
-        const topicListUl = document.getElementById('topicList');
-        if (topicListUl?.sortableInstance) {
-            topicListUl.sortableInstance.destroy();
-            topicListUl.sortableInstance = null;
-        }
-    }
-
-    function getTopicScrollContainer(topicListUl) {
-        return topicListUl?.closest('.sidebar-list-scroll') || topicListContainer;
-    }
-
-    function ensureTopicCountObserver() {
-        if (topicCountObserver) return topicCountObserver;
-
-        topicCountObserver = new IntersectionObserver((entries) => {
-            entries.forEach((entry) => {
-                if (!entry.isIntersecting) return;
-
-                const li = entry.target;
-                topicCountObserver.unobserve(li);
-                loadTopicMessageCount(li);
-            });
-        }, {
-            root: getTopicScrollContainer(document.getElementById('topicList')),
-            rootMargin: '240px 0px',
-            threshold: 0.01
-        });
-
-        return topicCountObserver;
-    }
-
-    function loadTopicMessageCount(li) {
-        if (!li?.isConnected || li.dataset.countLoaded === 'true' || li.dataset.countLoading === 'true') return;
-
-        const itemId = li.dataset.itemId;
-        const itemType = li.dataset.itemType;
-        const topicId = li.dataset.topicId;
-        const topic = li.__topicData;
-        const messageCountSpan = li.querySelector('.message-count');
-
-        if (!itemId || !itemType || !topicId || !topic || !messageCountSpan) return;
-
-        li.dataset.countLoading = 'true';
-
-        let historyPromise;
-        historyPromise = getHistory(itemId, itemType, topicId);
-
-        if (!historyPromise) {
-            messageCountSpan.textContent = 'N/A';
-            li.dataset.countLoaded = 'true';
-            li.dataset.countLoading = 'false';
-            return;
-        }
-
-        historyPromise.then(async historyResult => {
-            if (!li.isConnected) return;
-
-            messageCountSpan.classList.remove('has-unread', 'unread-marker-only');
-
-            if (historyResult && !historyResult.error && Array.isArray(historyResult)) {
-                await clearStalePersistentUnreadMarker(topic, itemId, historyResult);
-                const unreadCount = calculateTopicUnreadCount(topic, historyResult);
-                if (unreadCount > 0) {
-                    messageCountSpan.textContent = `${historyResult.length}`;
-                    messageCountSpan.classList.add('has-unread');
-                    ensureTopicUnreadIndicator(li, unreadCount);
-                } else if (unreadCount === -1) {
-                    messageCountSpan.textContent = `${historyResult.length}`;
-                    messageCountSpan.classList.add('unread-marker-only');
-                    ensureTopicUnreadIndicator(li);
-                } else {
-                    messageCountSpan.textContent = `${historyResult.length}`;
-                    removeTopicUnreadIndicator(li);
-                }
-            } else {
-                messageCountSpan.textContent = 'N/A';
-            }
-            li.dataset.countLoaded = 'true';
-        }).catch(() => {
-            if (li.isConnected) {
-                messageCountSpan.textContent = 'ERR';
-            }
-        }).finally(() => {
-            if (li.isConnected) {
-                li.dataset.countLoading = 'false';
-            }
-        });
-    }
-
-    function createTopicListItem(topic, currentSelectedItem, currentTopicId, itemConfigFull) {
-        const li = document.createElement('li');
-        li.classList.add('topic-item');
-        li.dataset.itemId = currentSelectedItem.id;
-        li.dataset.itemType = currentSelectedItem.type;
-        li.dataset.topicId = topic.id;
-        li.__topicData = topic;
-
-        const isCurrentActiveTopic = topic.id === currentTopicId;
-        const isPersistentlyUnread = topic.unread === true || topic.__calculatedUnreadCount > 0;
-        li.classList.toggle('active', isCurrentActiveTopic);
-        li.classList.toggle('active-topic-glowing', isCurrentActiveTopic);
-        li.classList.toggle('has-unread-topic', isPersistentlyUnread);
-
-        const avatarImg = document.createElement('img');
-        avatarImg.classList.add('avatar');
-        avatarImg.loading = 'lazy';
-        avatarImg.decoding = 'async';
-        avatarImg.src = currentSelectedItem.avatarUrl ? currentSelectedItem.avatarUrl : (currentSelectedItem.type === 'group' ? 'assets/default_group_avatar.png' : 'assets/default_avatar.png');
-
-        const displayTopicTitle = normalizeTopicTitle(topic.name || `话题 ${topic.id}`);
-        avatarImg.alt = `${currentSelectedItem.name} - ${displayTopicTitle}`;
-        avatarImg.onerror = () => { avatarImg.src = (currentSelectedItem.type === 'group' ? 'assets/default_group_avatar.png' : 'assets/default_avatar.png'); };
-
-        const topicTitleDisplay = document.createElement('span');
-        topicTitleDisplay.classList.add('topic-title-display');
-        topicTitleDisplay.textContent = displayTopicTitle;
-
-        const messageCountSpan = document.createElement('span');
-        messageCountSpan.classList.add('message-count');
-        messageCountSpan.textContent = '...';
-
-        const selectionIcon = document.createElement('span');
-        selectionIcon.classList.add('next-ui-topic-select-icon', 'vcp-ui-icon');
-        selectionIcon.setAttribute('aria-hidden', 'true');
-        selectionIcon.textContent = selectedTopicIds.has(topic.id) ? 'check_box' : 'check_box_outline_blank';
-        li.appendChild(selectionIcon);
-        li.appendChild(avatarImg);
-
-        if (topic.locked === false) {
-            const unlockedIndicator = document.createElement('span');
-            unlockedIndicator.classList.add('unlocked-indicator');
-            unlockedIndicator.textContent = 'unlocked';
-            unlockedIndicator.title = 'AI可以查看和回复此话题';
-            li.appendChild(unlockedIndicator);
-        }
-
-        li.appendChild(topicTitleDisplay);
-        if (isPersistentlyUnread) {
-            ensureTopicUnreadIndicator(li, topic.__calculatedUnreadCount);
-        }
-        li.appendChild(messageCountSpan);
-
-        const observer = ensureTopicCountObserver();
-        observer.observe(li);
-
-        addRenderListener(li, 'click', async () => {
-            if (isManageMode) {
-                toggleTopicSelection(topic.id);
-                return;
-            }
-
-            if (currentTopicIdRef.get() === topic.id) {
-                return;
-            }
-
-            if (!topicSelectionReadiness.isReady()) {
-                topicSelectionReadiness.defer({
-                    itemId: currentSelectedItem.id,
-                    itemType: currentSelectedItem.type,
-                    topicId: topic.id,
-                });
-                if (uiHelper && uiHelper.showToastNotification) {
-                    uiHelper.showToastNotification('正在初始化界面，稍后自动打开该话题', 'info');
-                }
-                return;
-            }
-
-            try {
-                await Promise.resolve(mainRendererFunctions.selectTopic(topic.id));
-            } catch (error) {
-                console.error('[TopicListManager] Failed to select topic:', error);
-                if (uiHelper && uiHelper.showToastNotification) {
-                    uiHelper.showToastNotification(`打开话题失败: ${error.message}`, 'error');
-                }
-            }
-        });
-
-        addRenderListener(li, 'contextmenu', (e) => {
-            e.preventDefault();
-            if (isManageMode) return;
-            showTopicContextMenu(e, li, itemConfigFull, topic, currentSelectedItem.type);
-        });
-
-        return li;
-    }
-
-    function renderTopicListProgressively(topicListUl, topicsToProcess, currentSelectedItem, currentTopicId, itemConfigFull, searchTerm) {
-        const renderGeneration = topicListRenderGeneration;
-        const scrollContainer = getTopicScrollContainer(topicListUl);
-        const totalCount = topicsToProcess.length;
-        const initialCount = searchTerm
-            ? Math.min(Math.max(TOPIC_INITIAL_RENDER_COUNT, TOPIC_PROGRESSIVE_BATCH_SIZE), totalCount)
-            : Math.min(TOPIC_INITIAL_RENDER_COUNT, totalCount);
-
-        let currentIndex = 0;
-        let isRendering = false;
-        let allRendered = false;
-
-        const statusLi = document.createElement('li');
-        statusLi.className = 'topic-list-progressive-status';
-        statusLi.textContent = '';
-        statusLi.style.justifyContent = 'center';
-        statusLi.style.opacity = '0.75';
-
-        const finalizeIfDone = () => {
-            if (!allRendered || renderGeneration !== topicListRenderGeneration) return;
-
-            statusLi.remove();
-            if (typeof topicListScrollCleanup === 'function') {
-                topicListScrollCleanup();
-                topicListScrollCleanup = null;
-            }
-
-            if (currentSelectedItem.id && topicsToProcess.length > 0 && typeof Sortable !== 'undefined' && !searchTerm) {
-                initializeTopicSortable(currentSelectedItem.id, currentSelectedItem.type);
-            }
-        };
-
-        const renderNextBatch = (batchSize = TOPIC_PROGRESSIVE_BATCH_SIZE) => {
-            if (isRendering || allRendered || renderGeneration !== topicListRenderGeneration) return;
-            isRendering = true;
-
-            requestAnimationFrame(() => {
-                if (renderGeneration !== topicListRenderGeneration) {
-                    isRendering = false;
-                    return;
-                }
-
-                const fragment = document.createDocumentFragment();
-                const end = Math.min(currentIndex + batchSize, totalCount);
-
-                for (; currentIndex < end; currentIndex++) {
-                    fragment.appendChild(createTopicListItem(
-                        topicsToProcess[currentIndex],
-                        currentSelectedItem,
-                        currentTopicId,
-                        itemConfigFull
-                    ));
-                }
-
-                if (statusLi.parentNode === topicListUl) {
-                    topicListUl.insertBefore(fragment, statusLi);
-                } else {
-                    topicListUl.appendChild(fragment);
-                }
-
-                allRendered = currentIndex >= totalCount;
-                isRendering = false;
-
-                if (!allRendered) {
-                    statusLi.textContent = `继续向下滚动加载更多话题（${currentIndex}/${totalCount}）`;
-                    if (!statusLi.parentNode) topicListUl.appendChild(statusLi);
-                    if (scrollContainer.scrollHeight <= scrollContainer.clientHeight + TOPIC_LOAD_MORE_THRESHOLD_PX) {
-                        renderNextBatch();
-                    }
-                } else {
-                    finalizeIfDone();
-                }
-            });
-        };
-
-        const onScroll = () => {
-            if (allRendered || isRendering || renderGeneration !== topicListRenderGeneration) return;
-
-            const distanceToBottom = scrollContainer.scrollHeight - scrollContainer.scrollTop - scrollContainer.clientHeight;
-            if (distanceToBottom <= TOPIC_LOAD_MORE_THRESHOLD_PX) {
-                renderNextBatch();
-            }
-        };
-
-        scrollContainer.addEventListener('scroll', onScroll, { passive: true });
-        topicListScrollCleanup = () => scrollContainer.removeEventListener('scroll', onScroll);
-
-        topicListUl.innerHTML = '';
-        renderNextBatch(initialCount);
-    }
-
-    async function loadTopicList() {
-        if (!topicListContainer) {
-            console.error("Topic list container (tabContentTopics) not found.");
-            return;
-        }
-
-        cancelPendingTopicSearch();
-        cleanupProgressiveTopicRendering();
-        const loadGeneration = topicListRenderGeneration;
-
-        let topicListUl = topicListContainer.querySelector('.topic-list');
-        if (topicListUl) {
-            topicListUl.innerHTML = '';
-        } else {
-            const topicsHeader = topicListContainer.querySelector('.topics-header') || document.createElement('div');
-            if (!topicsHeader.classList.contains('topics-header')) {
-                topicsHeader.className = 'topics-header';
-                topicsHeader.innerHTML = `<h2>话题列表</h2><div class="topic-search-container"><input type="text" id="topicSearchInput" placeholder="搜索话题；输入“未读话题”置顶" title="输入“未读话题”或“unread topic”将未读话题置顶" aria-label="搜索话题；输入未读话题将未读话题置顶" class="topic-search-input"></div>`;
-                topicListContainer.prepend(topicsHeader);
-                const newTopicSearchInput = topicsHeader.querySelector('#topicSearchInput');
-                if (newTopicSearchInput) setupTopicSearchListener(newTopicSearchInput);
-            }
-
-            topicListUl = document.createElement('ul');
-            topicListUl.className = 'topic-list';
-            topicListUl.id = 'topicList';
-            topicListContainer.appendChild(topicListUl);
-        }
-
-        const currentSelectedItem = currentSelectedItemRef.get();
-        if (!currentSelectedItem.id) {
-            availableTopics = [];
-            displayedTopics = [];
-            currentItemConfig = null;
-            managedItemKey = '';
-            selectedTopicIds.clear();
-            syncManageUi();
-            topicListUl.innerHTML = '<li><p>请先在“助手与群组”列表选择一个项目以查看其相关话题。</p></li>';
-            return;
-        }
-
-        const nextItemKey = `${currentSelectedItem.type}:${currentSelectedItem.id}`;
-        if (managedItemKey && managedItemKey !== nextItemKey) {
-            selectedTopicIds.clear();
-        }
-        managedItemKey = nextItemKey;
-
-        const itemNameForLoading = currentSelectedItem.name || '当前项目';
-        const searchInput = document.getElementById('topicSearchInput');
-        const searchQuery = parseTopicSearchQuery(searchInput ? searchInput.value : '');
-        const searchTerm = searchQuery.rawTerm;
-        const contentQueryTerm = searchQuery.queryTerm;
-
-        let itemConfigFull;
-
-        if (!searchTerm) {
-            renderTopicListStatus(topicListUl, `正在加载 ${itemNameForLoading} 的话题...`, { loading: true });
-        } else {
-            topicListUl.innerHTML = '';
-        }
-
-        try {
-            if (currentSelectedItem.type === 'agent') {
-                itemConfigFull = await electronAPI.getAgentConfig(currentSelectedItem.id);
-            } else if (currentSelectedItem.type === 'group') {
-                itemConfigFull = await electronAPI.getAgentGroupConfig(currentSelectedItem.id);
-            }
-        } catch (error) {
-            // A rejected IPC call used to leave the loading spinner up for good.
-            console.error('[TopicListManager] Failed to load item config:', error);
-            itemConfigFull = { error: error?.message || String(error) };
-        }
-
-        if (loadGeneration !== topicListRenderGeneration ||
-            currentSelectedItemRef.get()?.id !== currentSelectedItem.id ||
-            currentSelectedItemRef.get()?.type !== currentSelectedItem.type) {
-            return;
-        }
-
-        if (itemConfigFull && !itemConfigFull.error) {
-            mainRendererFunctions.updateCurrentItemConfig(itemConfigFull);
-        }
-
-        if (!itemConfigFull || itemConfigFull.error) {
-            availableTopics = [];
-            displayedTopics = [];
-            currentItemConfig = null;
-            selectedTopicIds.clear();
-            syncManageUi();
-            renderTopicListStatus(topicListUl, `无法加载 ${itemNameForLoading} 的配置信息: ${itemConfigFull?.error || '未知错误'}`);
-        } else {
-            let topicsToProcess = itemConfigFull.topics || [];
-            if (currentSelectedItem.type === 'agent' && topicsToProcess.length === 0) {
-                const defaultAgentTopic = { id: "default", name: "主要对话", createdAt: Date.now() };
-                topicsToProcess.push(defaultAgentTopic);
-            }
-
-            availableTopics = [...topicsToProcess];
-            currentItemConfig = itemConfigFull;
-            const availableTopicIds = new Set(availableTopics.map(topic => topic.id));
-            selectedTopicIds = new Set([...selectedTopicIds].filter(topicId => availableTopicIds.has(topicId)));
-
-            // topicsToProcess.sort((a, b) => (b.createdAt || 0) - (a.createdAt || 0));
-
-            if (contentQueryTerm) {
-                let frontendFilteredTopics = topicsToProcess.filter(topic => {
-                    const normalizedTopicTitle = normalizeTopicTitle(topic.name || '');
-                    const nameMatch = normalizedTopicTitle.toLowerCase().includes(contentQueryTerm);
-                    let dateMatch = false;
-                    if (topic.createdAt) {
-                        const date = new Date(topic.createdAt);
-                        const fullDateStr = `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')} ${String(date.getHours()).padStart(2, '0')}:${String(date.getMinutes()).padStart(2, '0')}`;
-                        const shortDateStr = `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')}`;
-                        dateMatch = fullDateStr.toLowerCase().includes(contentQueryTerm) || shortDateStr.toLowerCase().includes(contentQueryTerm);
-                    }
-                    return nameMatch || dateMatch;
-                });
-
-                let contentMatchedTopicIds = [];
-                try {
-                    const contentSearchResult = await electronAPI.searchTopicsByContent(currentSelectedItem.id, currentSelectedItem.type, contentQueryTerm);
-                    if (contentSearchResult && contentSearchResult.success && Array.isArray(contentSearchResult.matchedTopicIds)) {
-                        contentMatchedTopicIds = contentSearchResult.matchedTopicIds;
-                    } else if (contentSearchResult && !contentSearchResult.success) {
-                        console.warn("Topic content search failed:", contentSearchResult.error);
-                    }
-                } catch (e) {
-                    console.error("Error calling searchTopicsByContent:", e);
-                }
-
-                const finalFilteredTopicIds = new Set(frontendFilteredTopics.map(t => t.id));
-                contentMatchedTopicIds.forEach(id => finalFilteredTopicIds.add(id));
-
-                topicsToProcess = topicsToProcess.filter(topic => finalFilteredTopicIds.has(topic.id));
-            }
-
-            if (searchQuery.prioritizeUnread) {
-                topicsToProcess = await prioritizeUnreadTopics(topicsToProcess, currentSelectedItem);
-            }
-
-            if (loadGeneration !== topicListRenderGeneration ||
-                currentSelectedItemRef.get()?.id !== currentSelectedItem.id ||
-                currentSelectedItemRef.get()?.type !== currentSelectedItem.type) {
-                return;
-            }
-
-            displayedTopics = [...topicsToProcess];
-            syncManageUi();
-
-            if (topicsToProcess.length === 0) {
-                renderTopicListStatus(topicListUl, `${itemNameForLoading} 还没有任何话题${searchTerm ? '匹配当前搜索' : ''}。您可以点击上方的“新建${currentSelectedItem.type === 'group' ? '群聊话题' : '聊天话题'}”按钮创建一个。`);
-            } else {
-                const currentTopicId = currentTopicIdRef.get();
-                renderTopicListProgressively(topicListUl, topicsToProcess, currentSelectedItem, currentTopicId, itemConfigFull, searchTerm);
-            }
-        }
-    }
-
-    function setupTopicSearch() {
-        let searchInput = document.getElementById('topicSearchInput');
-        if (searchInput) {
-            setupTopicSearchListener(searchInput);
-        }
-    }
-
-    function setupTopicSearchListener(inputElement) {
-        if (inputElement.dataset.topicSearchBound === 'true') return;
-        inputElement.dataset.topicSearchBound = 'true';
-
-        addListener(inputElement, 'input', scheduleTopicSearch);
-        addListener(inputElement, 'keydown', (event) => {
-            if (event.key === 'Enter') {
-                event.preventDefault();
-                filterTopicList();
-            }
-        });
-    }
-
-    function scheduleTopicSearch() {
-        cancelPendingTopicSearch();
-        topicSearchTimer = setTimeout(() => {
-            topicSearchTimer = null;
-            loadTopicList();
-        }, TOPIC_SEARCH_DEBOUNCE_MS);
-    }
-
-    function filterTopicList() {
-        loadTopicList();
-    }
-
-    function setupNextUiTopicTools() {
-        const topicsHeader = document.querySelector('#tabContentTopics .topics-header-container');
-        const createButton = document.getElementById('nextUiCreateTopicBtn');
-        const manageButton = document.getElementById('nextUiManageTopicsBtn');
-        const searchButton = document.getElementById('nextUiTopicSearchTrigger');
-        const searchCloseButton = document.getElementById('nextUiTopicSearchClose');
-        const searchInput = document.getElementById('topicSearchInput');
-        const selectAllButton = document.getElementById('nextUiSelectAllTopicsBtn');
-        const deleteButton = document.getElementById('nextUiDeleteTopicsBtn');
-        const exitButton = document.getElementById('nextUiExitTopicManageBtn');
-
-        if (!topicsHeader || !createButton || !manageButton || !searchButton || !searchCloseButton || !searchInput) return;
-        if (topicsHeader.dataset.nextUiToolsBound === 'true') return;
-        topicsHeader.dataset.nextUiToolsBound = 'true';
-
-        const setSearchMode = (active, clear = !active) => {
-            topicsHeader.classList.toggle('is-searching', active);
-            searchButton.setAttribute('aria-expanded', String(active));
-            if (clear) {
-                searchInput.value = '';
-                loadTopicList();
-            }
-            if (active) requestAnimationFrame(() => searchInput.focus());
-            else if (document.activeElement === searchInput) searchButton.focus();
-        };
-
-        addListener(createButton, 'click', () => {
-            document.getElementById('currentAgentSettingsBtn')?.dispatchEvent(new MouseEvent('click', { bubbles: true }));
-        });
-        addListener(createButton, 'contextmenu', (event) => {
-            event.preventDefault();
-            document.getElementById('currentAgentSettingsBtn')?.dispatchEvent(new MouseEvent('contextmenu', {
-                bubbles: true,
-                clientX: event.clientX,
-                clientY: event.clientY
-            }));
-        });
-        addListener(manageButton, 'click', () => setManageMode(!isManageMode));
-        addListener(searchButton, 'click', () => setSearchMode(true, false));
-        addListener(searchCloseButton, 'click', () => setSearchMode(false, true));
-        addListener(searchInput, 'keydown', (event) => {
-            if (event.key === 'Escape') {
-                event.preventDefault();
-                setSearchMode(false, true);
-            }
-        });
-        if (selectAllButton) addListener(selectAllButton, 'click', toggleSelectAllDisplayedTopics);
-        if (deleteButton) addListener(deleteButton, 'click', deleteSelectedTopics);
-        if (exitButton) addListener(exitButton, 'click', () => setManageMode(false));
-
-        syncManageUi();
-    }
-
-    function setManageMode(active) {
-        isManageMode = active;
-        if (!active) selectedTopicIds.clear();
-
-        const topicListUl = document.getElementById('topicList');
-        if (active && topicListUl?.sortableInstance) {
-            topicListUl.sortableInstance.destroy();
-            topicListUl.sortableInstance = null;
-        } else if (!active) {
-            loadTopicList();
-        }
-
-        syncManageUi();
-    }
-
-    function toggleTopicSelection(topicId) {
-        if (selectedTopicIds.has(topicId)) selectedTopicIds.delete(topicId);
-        else selectedTopicIds.add(topicId);
-        syncManageUi();
-    }
-
-    function toggleSelectAllDisplayedTopics() {
-        const displayedIds = displayedTopics.map(topic => topic.id);
-        const allDisplayedSelected = displayedIds.length > 0 && displayedIds.every(topicId => selectedTopicIds.has(topicId));
-
-        if (allDisplayedSelected) displayedIds.forEach(topicId => selectedTopicIds.delete(topicId));
-        else displayedIds.forEach(topicId => selectedTopicIds.add(topicId));
-        syncManageUi();
-    }
-
-    function syncManageUi() {
-        const container = document.getElementById('tabContentTopics');
-        const manageButton = document.getElementById('nextUiManageTopicsBtn');
-        const managePanel = container?.querySelector('.next-ui-topic-manage-panel');
-        const count = document.getElementById('nextUiTopicSelectionCount');
-        const selectAllButton = document.getElementById('nextUiSelectAllTopicsBtn');
-        const deleteButton = document.getElementById('nextUiDeleteTopicsBtn');
-        const allDisplayedSelected = displayedTopics.length > 0
-            && displayedTopics.every(topic => selectedTopicIds.has(topic.id));
-
-        container?.classList.toggle('is-managing', isManageMode);
-        manageButton?.classList.toggle('active', isManageMode);
-        manageButton?.setAttribute('aria-pressed', String(isManageMode));
-        managePanel?.setAttribute('aria-hidden', String(!isManageMode));
-        if (count) count.textContent = `已选择 ${selectedTopicIds.size} 项`;
-        if (deleteButton) deleteButton.disabled = selectedTopicIds.size === 0;
-        const selectAllIcon = selectAllButton?.querySelector('.vcp-ui-icon');
-        if (selectAllIcon) selectAllIcon.textContent = allDisplayedSelected ? 'check_box' : 'check_box_outline_blank';
-        if (selectAllButton) selectAllButton.title = allDisplayedSelected ? '取消全选' : '全选话题';
-
-        document.querySelectorAll('#topicList .topic-item').forEach(item => {
-            const selected = selectedTopicIds.has(item.dataset.topicId);
-            item.classList.toggle('selected', selected);
-            item.setAttribute('aria-selected', String(selected));
-            const icon = item.querySelector('.next-ui-topic-select-icon');
-            if (icon) icon.textContent = selected ? 'check_box' : 'check_box_outline_blank';
-        });
-    }
-
-    async function deleteSelectedTopics() {
-        if (!isManageMode || selectedTopicIds.size === 0 || !currentItemConfig) return;
-
-        const currentSelectedItem = currentSelectedItemRef.get();
-        const topicsToDelete = availableTopics.filter(topic => selectedTopicIds.has(topic.id));
-        if (topicsToDelete.length === 0) return;
-        if (topicsToDelete.length >= availableTopics.length) {
-            uiHelper.showToastNotification('至少需要保留一个话题。', 'warning');
-            return;
-        }
-
-        const flowlockedTopic = currentSelectedItem.type === 'agent'
-            ? topicsToDelete.find(topic => window.flowlockManager?.isTopicLocked?.(currentSelectedItem.id, topic.id))
-            : null;
-        if (flowlockedTopic) {
-            uiHelper.showToastNotification(`话题“${flowlockedTopic.name}”正在心流锁中运行，请先停止对应心流锁。`, 'warning');
-            return;
-        }
-
-        const confirmed = await uiHelper.showConfirmDialog(
-            `确定要永久删除选中的 ${topicsToDelete.length} 个话题吗？此操作不可撤销。`,
-            '批量删除话题',
-            '删除',
-            '取消',
-            true
-        );
-        if (!confirmed) return;
-
-        let deletedCount = 0;
-        let remainingTopics = availableTopics;
-        let firstError = '';
-        const activeTopicId = currentTopicIdRef.get();
-        let activeTopicDeleted = false;
-
-        for (const topic of topicsToDelete) {
-            try {
-                const result = currentSelectedItem.type === 'agent'
-                    ? await electronAPI.deleteTopic(currentSelectedItem.id, topic.id)
-                    : await electronAPI.deleteGroupTopic(currentSelectedItem.id, topic.id);
-                if (result?.success) {
-                    deletedCount++;
-                    if (topic.id === activeTopicId) activeTopicDeleted = true;
-                    remainingTopics = result.remainingTopics || remainingTopics.filter(item => item.id !== topic.id);
-                } else if (!firstError) {
-                    firstError = result?.error || '未知错误';
-                }
-            } catch (error) {
-                if (!firstError) firstError = error.message;
-            }
-        }
-
-        const deletedTopicIds = topicsToDelete.map(topic => topic.id).filter(id => !remainingTopics.some(item => item.id === id));
-        if (deletedTopicIds.length) mainRendererFunctions.onTopicsDeleted?.({ itemId: currentSelectedItem.id, itemType: currentSelectedItem.type, topicIds: deletedTopicIds });
-        if (activeTopicDeleted) {
-            mainRendererFunctions.handleTopicDeletion(remainingTopics, {
-                id: currentSelectedItem.id,
-                type: currentSelectedItem.type,
-                deletedTopicIds: topicsToDelete.map(topic => topic.id),
-                fallbackTopicId: topicsToDelete.some(topic => topic.id === activeTopicId) ? null : activeTopicId,
-            });
-        }
-
-        setManageMode(false);
-        if (deletedCount > 0) uiHelper.showToastNotification(`已删除 ${deletedCount} 个话题。`, 'success');
-        if (firstError) uiHelper.showToastNotification(`部分话题删除失败：${firstError}`, 'error');
-    }
-
-    function initializeTopicSortable(itemId, itemType) {
-        const topicListUl = document.getElementById('topicList');
-        if (!topicListUl) {
-            console.warn("[TopicListManager] topicListUl element not found. Skipping Sortable initialization.");
-            return;
-        }
-
-        if (topicListUl.sortableInstance) {
-            topicListUl.sortableInstance.destroy();
-        }
-
-        const targetItemId = itemId;
-        const targetItemType = itemType;
-        topicListUl.sortableInstance = new Sortable(topicListUl, {
-            animation: 150,
-            ghostClass: 'sortable-ghost-topic',
-            chosenClass: 'sortable-chosen-topic',
-            dragClass: 'sortable-drag-topic',
-            onStart: async function (evt) {
-                // Check original state, store it, and then disable if it was active.
-                if (electronAPI?.getSelectionListenerStatus) {
-                    wasSelectionListenerActive = await electronAPI.getSelectionListenerStatus();
-                    if (wasSelectionListenerActive) {
-                        electronAPI.toggleSelectionListener(false);
-                    }
-                }
-            },
-            onEnd: async function (evt) {
-                // Re-enable selection hook only if it was active before the drag.
-                if (electronAPI?.toggleSelectionListener) {
-                    if (wasSelectionListenerActive) {
-                        electronAPI.toggleSelectionListener(true);
-                    }
-                    wasSelectionListenerActive = false; // Reset state
-                }
-
-                const topicItems = Array.from(evt.to.children);
-                const orderedTopicIds = topicItems.map(item => item.dataset.topicId);
-                try {
-                    let result;
-                    if (targetItemType === 'agent') {
-                        result = await electronAPI.saveTopicOrder(targetItemId, orderedTopicIds);
-                    } else if (targetItemType === 'group') {
-                        result = await electronAPI.saveGroupTopicOrder(targetItemId, orderedTopicIds);
-                    }
-
-                    if (result && result.success) {
-                        // UI reflects sort.
-                    } else {
-                        console.error(`Failed to save topic order for ${targetItemType} ${targetItemId}:`, result?.error);
-                        uiHelper.showToastNotification(`保存话题顺序失败: ${result?.error || '未知错误'}`, 'error');
-                        loadTopicList();
-                    }
-                } catch (error) {
-                    console.error(`Error calling saveTopicOrder for ${targetItemType} ${targetItemId}:`, error);
-                    uiHelper.showToastNotification(`调用保存话题顺序API时出错: ${error.message}`, 'error');
-                    loadTopicList();
-                }
-            }
-        });
-    }
-
-    function showTopicContextMenu(event, topicItemElement, itemFullConfig, topic, itemType) {
-        // closeContextMenu(); // This function is not available in this module
-        closeTopicContextMenu();
-
-        const menu = document.createElement('div');
-        menu.id = 'topicContextMenu';
-        menu.classList.add('context-menu');
-
-        // 冻结话题域目标；标题生成允许即时保存，但绝不能跨项目串写。
-        const targetItemId = itemFullConfig.id;
-        const targetItemType = itemType;
-        const targetTopicId = topic.id;
-        // "生成话题名" 菜单项：Agent 和 Group 话题均支持
-        const regenerateTitleOption = document.createElement('div');
-        regenerateTitleOption.classList.add('context-menu-item');
-        regenerateTitleOption.innerHTML = `<i class="fas fa-magic"></i> 生成话题名`;
-        regenerateTitleOption.onclick = async () => {
-            closeTopicContextMenu();
-            if (regenerateTitleOption.dataset.loading === 'true') return;
-
-            regenerateTitleOption.dataset.loading = 'true';
-            regenerateTitleOption.classList.add('disabled');
-            try {
-                // 根据话题类型调用对应的 IPC
-                const result = targetItemType === 'agent'
-                    ? await electronAPI.regenerateAgentTopicTitle(targetItemId, targetTopicId)
-                    : await electronAPI.regenerateGroupTopicTitle(targetItemId, targetTopicId);
-
-                if (result?.success && result.newTitle) {
-                    // 原话题已保存；离开原项目后不再投影到当前界面，也不误报失败。
-                    if (currentSelectedItemRef.get()?.id !== targetItemId ||
-                        currentSelectedItemRef.get()?.type !== targetItemType) return;
-                    topic.name = result.newTitle;
-                    const topicInFullConfig = itemFullConfig.topics?.find(candidate => candidate.id === topic.id);
-                    if (topicInFullConfig) topicInFullConfig.name = result.newTitle;
-
-                    const titleDisplayElement = topicItemElement.querySelector('.topic-title-display, .topic-name');
-                    if (titleDisplayElement) titleDisplayElement.textContent = result.newTitle;
-                    uiHelper.showToastNotification(`话题名已更新为"${result.newTitle}"`, 'success');
-                } else {
-                    // 失败时不修改 topic、itemFullConfig 或 DOM，保留旧标题。
-                    uiHelper.showToastNotification(`生成话题名失败: ${result?.error || 'AI 未返回有效标题'}`, 'error');
-                }
-            } catch (error) {
-                // 请求异常时同样不触碰旧标题。
-                console.error('[TopicListManager] 生成话题名失败:', error);
-                uiHelper.showToastNotification(`生成话题名失败: ${error.message}`, 'error');
-            } finally {
-                regenerateTitleOption.dataset.loading = 'false';
-                regenerateTitleOption.classList.remove('disabled');
-            }
-        };
-
-        const editTitleOption = document.createElement('div');
-        editTitleOption.classList.add('context-menu-item');
-        editTitleOption.innerHTML = `<i class="fas fa-edit"></i> 编辑话题标题`;
-        editTitleOption.onclick = () => {
-            closeTopicContextMenu();
-            const titleDisplayElement = topicItemElement.querySelector('.topic-title-display');
-            if (!titleDisplayElement) return;
-
-            const originalTitle = topic.name;
-            titleDisplayElement.style.display = 'none';
-
-            const inputWrapper = document.createElement('div');
-            inputWrapper.style.display = 'flex';
-            inputWrapper.style.alignItems = 'center';
-
-            const inputField = document.createElement('input');
-            inputField.type = 'text';
-            inputField.value = originalTitle;
-            inputField.classList.add('topic-title-edit-input');
-            inputField.style.flexGrow = '1';
-            inputField.onclick = (e) => e.stopPropagation();
-
-            const confirmButton = document.createElement('button');
-            confirmButton.type = 'button';
-            confirmButton.innerHTML = '✓';
-            confirmButton.classList.add('topic-title-edit-confirm');
-            confirmButton.onclick = async (e) => {
-                e.stopPropagation();
-                const newTitle = inputField.value.trim();
-                if (newTitle && newTitle !== originalTitle) {
-                    let saveResult;
-                    if (targetItemType === 'agent') {
-                        saveResult = await electronAPI.saveAgentTopicTitle(targetItemId, targetTopicId, newTitle);
-                    } else if (targetItemType === 'group') {
-                        saveResult = await electronAPI.saveGroupTopicTitle(targetItemId, targetTopicId, newTitle);
-                    }
-                    if (saveResult && saveResult.success) {
-                        topic.name = newTitle;
-                        titleDisplayElement.textContent = newTitle;
-                        if (itemFullConfig.topics) {
-                            const topicInFullConfig = itemFullConfig.topics.find(t => t.id === topic.id);
-                            if (topicInFullConfig) topicInFullConfig.name = newTitle;
-                        }
-                    } else {
-                        uiHelper.showToastNotification(`更新话题标题失败: ${saveResult?.error || '未知错误'}`, 'error');
-                    }
-                }
-                titleDisplayElement.style.display = '';
-                inputWrapper.replaceWith(titleDisplayElement);
-            };
-
-            const cancelButton = document.createElement('button');
-            cancelButton.type = 'button';
-            cancelButton.innerHTML = '✗';
-            cancelButton.classList.add('topic-title-edit-cancel');
-            cancelButton.onclick = (e) => {
-                e.stopPropagation();
-                titleDisplayElement.style.display = '';
-                inputWrapper.replaceWith(titleDisplayElement);
-            };
-
-            inputWrapper.appendChild(inputField);
-            inputWrapper.appendChild(confirmButton);
-            inputWrapper.appendChild(cancelButton);
-            topicItemElement.insertBefore(inputWrapper, titleDisplayElement.nextSibling);
-            inputField.focus();
-            inputField.select();
-
-            inputField.addEventListener('keydown', (e) => {
-                if (e.key === 'Enter') {
-                    confirmButton.click();
-                } else if (e.key === 'Escape') {
-                    cancelButton.click();
-                }
-            });
-        };
-        menu.appendChild(editTitleOption);
-        menu.appendChild(regenerateTitleOption);
-
-        const copyTopicIdOption = document.createElement('div');
-        copyTopicIdOption.classList.add('context-menu-item');
-        copyTopicIdOption.innerHTML = `<i class="fas fa-copy"></i> 复制话题ID`;
-        copyTopicIdOption.onclick = async () => {
-            closeTopicContextMenu();
-            const topicId = String(topic.id ?? '');
-            try {
-                if (navigator.clipboard?.writeText) {
-                    await navigator.clipboard.writeText(topicId);
-                } else {
-                    const textarea = document.createElement('textarea');
-                    textarea.value = topicId;
-                    textarea.style.position = 'fixed';
-                    textarea.style.opacity = '0';
-                    document.body.appendChild(textarea);
-                    textarea.focus();
-                    textarea.select();
-                    document.execCommand('copy');
-                    textarea.remove();
-                }
-                uiHelper.showToastNotification('已复制话题ID', 'success');
-            } catch (error) {
-                console.error('[TopicListManager] Failed to copy topic ID:', error);
-                uiHelper.showToastNotification(`复制话题ID失败: ${error.message}`, 'error');
-            }
-        };
-        menu.appendChild(copyTopicIdOption);
-
-        // Part C: 锁定/解锁话题选项
-        const toggleLockOption = document.createElement('div');
-        toggleLockOption.classList.add('context-menu-item');
-        const isLocked = topic.locked !== false; // 默认为锁定
-        toggleLockOption.innerHTML = isLocked
-            ? `<i class="fas fa-unlock"></i> 解锁话题`
-            : `<i class="fas fa-lock"></i> 锁定话题`;
-        toggleLockOption.onclick = async () => {
-            closeTopicContextMenu();
-            try {
-                const result = await electronAPI.toggleTopicLock(targetItemId, targetTopicId);
-                if (result.success) {
-                    topic.locked = result.locked;
-                    uiHelper.showToastNotification(result.message, 'success');
-                    loadTopicList(); // 刷新列表以显示新状态
-                } else {
-                    uiHelper.showToastNotification(`切换锁定状态失败: ${result.error}`, 'error');
-                }
-            } catch (error) {
-                uiHelper.showToastNotification(`操作失败: ${error.message}`, 'error');
-            }
-        };
-        menu.appendChild(toggleLockOption);
-
-        // Part C: 标记为未读/已读选项
-        const toggleUnreadOption = document.createElement('div');
-        toggleUnreadOption.classList.add('context-menu-item');
-        const isUnread = topic.unread === true;
-        toggleUnreadOption.innerHTML = isUnread
-            ? `<i class="fas fa-check"></i> 标记为已读`
-            : `<i class="fas fa-envelope"></i> 标记为未读`;
-        toggleUnreadOption.onclick = async () => {
-            closeTopicContextMenu();
-            try {
-                const result = await electronAPI.setTopicUnread(targetItemId, targetTopicId, !isUnread);
-                if (result.success) {
-                    topic.unread = result.unread;
-                    if (result.unreadSource) {
-                        topic.unreadSource = result.unreadSource;
-                    } else {
-                        delete topic.unreadSource;
-                    }
-                    uiHelper.showToastNotification(
-                        topic.unread ? '已标记为未读' : '已标记为已读',
-                        'success'
-                    );
-                    loadTopicList(); // 刷新列表
-                    // 同时刷新助手列表以更新计数
-                    if (itemListManager) {
-                        itemListManager.loadItems();
-                    }
-                } else {
-                    uiHelper.showToastNotification(`操作失败: ${result.error}`, 'error');
-                }
-            } catch (error) {
-                uiHelper.showToastNotification(`操作失败: ${error.message}`, 'error');
-            }
-        };
-        menu.appendChild(toggleUnreadOption);
-
-        const deleteTopicPermanentlyOption = document.createElement('div');
-        deleteTopicPermanentlyOption.classList.add('context-menu-item', 'danger-item');
-        deleteTopicPermanentlyOption.innerHTML = `<i class="fas fa-trash-alt"></i> 删除此话题`;
-        deleteTopicPermanentlyOption.onclick = async () => {
-            closeTopicContextMenu();
-
-            // 活动 Flowlock Session 仍依赖该话题的历史目录，运行期间禁止删除。
-            if (targetItemType === 'agent' && window.flowlockManager?.isTopicLocked?.(targetItemId, targetTopicId)) {
-                uiHelper.showToastNotification('该话题正在心流锁中运行，请先停止对应 Agent 的心流锁。', 'warning');
-                return;
-            }
-
-            // 使用自定义确认对话框替代原生 confirm()，避免 Electron 焦点问题
-            const confirmed = await uiHelper.showConfirmDialog(
-                `确定要永久删除话题 "${topic.name}" 吗？此操作不可撤销。`,
-                '删除话题',
-                '删除',
-                '取消',
-                true // isDanger
-            );
-            if (confirmed) {
-                let result;
-                if (targetItemType === 'agent') {
-                    result = await electronAPI.deleteTopic(targetItemId, targetTopicId);
-                } else if (targetItemType === 'group') {
-                    result = await electronAPI.deleteGroupTopic(targetItemId, targetTopicId);
-                }
-
-                if (result && result.success) {
-                    mainRendererFunctions.onTopicsDeleted?.({ itemId: targetItemId, itemType: targetItemType, topicIds: [targetTopicId] });
-                    if (currentSelectedItemRef.get()?.id === targetItemId &&
-                        currentSelectedItemRef.get()?.type === targetItemType &&
-                        currentTopicIdRef.get() === targetTopicId) {
-                        mainRendererFunctions.handleTopicDeletion(result.remainingTopics, {
-                            id: targetItemId,
-                            type: targetItemType,
-                            topicId: targetTopicId,
-                            fallbackTopicId: itemFullConfig.topics?.find(candidate => candidate.id !== topic.id)?.id || null,
-                        });
-                    }
-                    loadTopicList();
-                } else {
-                    uiHelper.showToastNotification(`删除话题 "${topic.name}" 失败: ${result ? result.error : '未知错误'}`, 'error');
-                }
-            }
-        };
-        menu.appendChild(deleteTopicPermanentlyOption);
-
-        const exportTopicOption = document.createElement('div');
-        exportTopicOption.classList.add('context-menu-item');
-        exportTopicOption.innerHTML = `<i class="fas fa-file-export"></i> 导出此话题`;
-        exportTopicOption.onclick = () => {
-            closeTopicContextMenu();
-            handleExportTopic(itemFullConfig.id, itemType, topic.id, topic.name);
-        };
-        menu.appendChild(exportTopicOption);
-
-        const exportFullTopicOption = document.createElement('div');
-        exportFullTopicOption.classList.add('context-menu-item');
-        exportFullTopicOption.innerHTML = `<i class="fas fa-file-code"></i> 导出此话题(完整)`;
-        exportFullTopicOption.onclick = () => {
-            closeTopicContextMenu();
-            handleExportFullTopic(itemFullConfig, itemType, topic.id, topic.name);
-        };
-        menu.appendChild(exportFullTopicOption);
-
-        // 智能定位逻辑：先隐藏菜单以测量尺寸
-        menu.style.visibility = 'hidden';
-        menu.style.position = 'absolute';
-        document.body.appendChild(menu);
-
-        // 获取菜单和窗口尺寸
-        const menuWidth = menu.offsetWidth;
-        const menuHeight = menu.offsetHeight;
-        const windowWidth = window.innerWidth;
-        const windowHeight = window.innerHeight;
-
-        let top = event.clientY;
-        let left = event.clientX;
-
-        // 检查菜单是否会超出窗口底部
-        if (top + menuHeight > windowHeight) {
-            // 将菜单显示在鼠标上方
-            top = event.clientY - menuHeight;
-            // 如果上方空间也不够，则贴近顶部
-            if (top < 0) top = 5;
-        }
-
-        // 检查菜单是否会超出窗口右侧
-        if (left + menuWidth > windowWidth) {
-            // 将菜单显示在鼠标左侧
-            left = event.clientX - menuWidth;
-            // 如果左侧空间也不够，则贴近左边
-            if (left < 0) left = 5;
-        }
-
-        // 应用最终位置并显示菜单
-        menu.style.top = `${top}px`;
-        menu.style.left = `${left}px`;
-        menu.style.visibility = 'visible';
-
-        document.addEventListener('click', closeTopicContextMenuOnClickOutside, true);
-    }
-
-    function closeTopicContextMenu() {
-        const existingMenu = document.getElementById('topicContextMenu');
-        if (existingMenu) {
-            existingMenu.remove();
-            document.removeEventListener('click', closeTopicContextMenuOnClickOutside, true);
-        }
-    }
-
-    function closeTopicContextMenuOnClickOutside(event) {
-        const menu = document.getElementById('topicContextMenu');
-        if (menu && !menu.contains(event.target)) {
-            closeTopicContextMenu();
-        }
-    }
-
-    async function handleExportTopic(itemId, itemType, topicId, topicName) {
-        const currentTopicId = currentTopicIdRef.get();
-        if (topicId !== currentTopicId) {
-            uiHelper.showToastNotification('请先点击并加载此话题，然后再导出。', 'info');
-            return;
-        }
-
-        console.log(`[TopicListManager] Exporting currently visible topic: ${topicName} (ID: ${topicId})`);
-
-        try {
-            const chatMessagesDiv = document.getElementById('chatMessages');
-            if (!chatMessagesDiv) {
-                console.error('[Export Debug] chatMessagesDiv not found!');
-                uiHelper.showToastNotification('错误：找不到聊天内容容器。', 'error');
-                return;
-            }
-
-            const messageItems = chatMessagesDiv.querySelectorAll('.message-item');
-            console.log(`[Export Debug] Found ${messageItems.length} message items.`);
-            if (messageItems.length === 0) {
-                uiHelper.showToastNotification('此话题没有可见的聊天内容可导出。', 'info');
-                return;
-            }
-
-            let markdownContent = `# 话题: ${topicName}\n\n`;
-            let extractedCount = 0;
-
-            messageItems.forEach((item, index) => {
-                if (item.classList.contains('system') || item.classList.contains('thinking')) {
-                    console.log(`[Export Debug] Skipping system/thinking message at index ${index}.`);
-                    return;
-                }
-
-                const senderElement = item.querySelector('.sender-name');
-                const contentElement = item.querySelector('.md-content');
-
-                if (senderElement && contentElement) {
-                    const sender = senderElement.textContent.trim().replace(':', '');
-                    // 克隆节点，移除思维链气泡（<think> 已被渲染为 DOM 节点，innerText 会包含其文本）
-                    const contentClone = contentElement.cloneNode(true);
-                    contentClone.querySelectorAll('.vcp-thought-chain-bubble').forEach(el => el.remove());
-                    let content = contentClone.innerText || contentClone.textContent || "";
-                    // 兜底：仅清理起止标签分别独占一行的明文思维链。
-                    content = content.replace(/^[ \t]*\[--- VCP元思考链(?::\s*"[^"]*")?\s*---\][ \t]*\r?\n[\s\S]*?^[ \t]*\[--- 元思考链结束 ---\][ \t]*(?:\r?\n|$)/gm, '');
-                    content = content.replace(/^[ \t]*<think(?:ing)?>[ \t]*\r?\n[\s\S]*?^[ \t]*<\/think(?:ing)?>[ \t]*(?:\r?\n|$)/gim, '');
-                    content = content.trim();
-
-                    if (sender && content) {
-                        markdownContent += `**${sender}**: ${content}\n\n---\n\n`;
-                        extractedCount++;
-                    } else {
-                        console.log(`[Export Debug] Skipping message at index ${index} due to empty sender or content. Sender: "${sender}", Content: "${content}"`);
-                    }
-                } else {
-                    console.log(`[Export Debug] Skipping message at index ${index} because sender or content element was not found.`);
-                }
-            });
-
-            console.log(`[Export Debug] Extracted ${extractedCount} messages. Final markdown length: ${markdownContent.length}`);
-
-            if (extractedCount === 0) {
-                uiHelper.showToastNotification('未能从当前话题中提取任何有效对话内容。', 'warning');
-                return;
-            }
-
-            const result = await electronAPI.exportTopicAsMarkdown({
-                topicName: topicName,
-                markdownContent: markdownContent
-            });
-
-            if (result.success) {
-                uiHelper.showToastNotification(`话题 "${topicName}" 已成功导出到: ${result.path}`);
-            } else {
-                uiHelper.showToastNotification(`导出话题失败: ${result.error}`, 'error');
-            }
-        } catch (error) {
-            console.error(`[TopicListManager] 导出话题时发生错误:`, error);
-            uiHelper.showToastNotification(`导出话题时发生前端错误: ${error.message}`, 'error');
-        }
-    }
-
-    function getRawMessageContent(message) {
-        if (typeof message?.content === 'string') return message.content;
-        if (typeof message?.content?.text === 'string') return message.content.text;
-        if (Array.isArray(message?.content)) {
-            return message.content
-                .filter(part => part && part.type === 'text' && typeof part.text === 'string')
-                .map(part => part.text)
-                .join('\n');
-        }
-        if (message?.content === null || message?.content === undefined) return '';
-        try {
-            return JSON.stringify(message.content, null, 2);
-        } catch {
-            return String(message.content);
-        }
-    }
-
-    function resolveFullExportAgentInfo(message, itemFullConfig, itemType) {
-        if (message.role === 'user') {
-            return {
-                name: message.name || '用户',
-                model: 'N/A'
-            };
-        }
-
-        if (itemType === 'group') {
-            const agentId = message.agentId || message.agentID;
-            const member = (itemFullConfig.agents || []).find(agent =>
-                agent.id === agentId || agent.agentId === agentId
-            );
-            const usesUnifiedModel = itemFullConfig.useUnifiedModel === true;
-            return {
-                name: message.name || member?.name || agentId || 'Assistant',
-                model: message.model || message.modelName ||
-                    (usesUnifiedModel ? itemFullConfig.unifiedModel : member?.model) ||
-                    '未知模型'
-            };
-        }
-
-        return {
-            name: message.name || itemFullConfig.name || itemFullConfig.id || 'Assistant',
-            model: message.model || message.modelName || itemFullConfig.model || '未知模型'
-        };
-    }
-
-    async function handleExportFullTopic(itemFullConfig, itemType, topicId, topicName) {
-        console.log(`[TopicListManager] Exporting full raw topic: ${topicName} (ID: ${topicId})`);
-
-        try {
-            const history = await getHistory(itemFullConfig.id, itemType, topicId);
-
-            if (!Array.isArray(history)) {
-                throw new Error(history?.error || '无法读取话题历史');
-            }
-
-            const messages = history.filter(message =>
-                message &&
-                message.role !== 'system' &&
-                message.isThinking !== true
-            );
-
-            if (messages.length === 0) {
-                uiHelper.showToastNotification('此话题没有可导出的对话内容。', 'info');
-                return;
-            }
-
-            let exportContent = `# 话题: ${topicName}\n\n`;
-            exportContent += `> 导出模式: 完整（保留原始消息内容）\n\n`;
-
-            messages.forEach((message, index) => {
-                const { name, model } = resolveFullExportAgentInfo(message, itemFullConfig, itemType);
-                const rawContent = getRawMessageContent(message);
-
-                exportContent += `===== 消息 ${index + 1} =====\n`;
-                exportContent += `Role: ${message.role || 'unknown'}\n`;
-                exportContent += `Agent: ${name}\n`;
-                exportContent += `Model: ${model}\n`;
-                if (message.timestamp) {
-                    exportContent += `Timestamp: ${new Date(message.timestamp).toISOString()}\n`;
-                }
-                exportContent += `\n${rawContent}\n\n`;
-            });
-
-            const result = await electronAPI.exportTopicAsMarkdown({
-                topicName: `${topicName}-完整`,
-                markdownContent: exportContent
-            });
-
-            if (result.success) {
-                uiHelper.showToastNotification(`话题 "${topicName}" 已完整导出到: ${result.path}`);
-            } else if (result.error !== '用户取消了导出操作。') {
-                uiHelper.showToastNotification(`完整导出话题失败: ${result.error}`, 'error');
-            }
-        } catch (error) {
-            console.error('[TopicListManager] 完整导出话题时发生错误:', error);
-            uiHelper.showToastNotification(`完整导出话题失败: ${error.message}`, 'error');
-        }
-    }
-
-    /**
-     * 设置鼠标快捷键事件监听器
-     */
-    function setupMouseShortcuts() {
-        const topicsContainer = document.getElementById('tabContentTopics');
-        if (!topicsContainer) {
-            console.warn('[TopicListManager] 话题容器未找到，跳过鼠标快捷键设置');
-            return;
-        }
-
-        let lastLeftClickTime = 0;
-
-        // 双击左键：进入设置页面
-        addListener(topicsContainer, 'click', (e) => {
-            if (isManageMode) return;
-            if (e.target.closest('button, input, .topics-header-container, .next-ui-topic-manage-panel')) return;
-            if (e.button === 0) { // 左键
-                const currentTime = Date.now();
-                const timeDiff = currentTime - lastLeftClickTime;
-
-                if (timeDiff < 300) { // 双击检测（300ms内）
-                    console.log('[TopicListManager] 检测到双击左键，进入设置页面');
-                    e.preventDefault();
-                    e.stopPropagation();
-
-                    // 切换到设置页面
-                    if (uiManager && typeof uiManager.switchToTab === 'function') {
-                        uiManager.switchToTab('settings');
-                    } else {
-                        console.warn('[TopicListManager] uiManager不可用，无法切换到设置页面');
-                    }
-                }
-
-                lastLeftClickTime = currentTime;
-            }
-        });
-
-        // 中键点击：返回助手页面
-        addListener(topicsContainer, 'auxclick', (e) => {
-            if (e.button === 1) { // 中键
-                console.log('[TopicListManager] 检测到中键点击，返回助手页面');
-                e.preventDefault();
-                e.stopPropagation();
-
-                // 切换到助手页面
-                if (uiManager && typeof uiManager.switchToTab === 'function') {
-                    uiManager.switchToTab('agents');
-                    // 重置助手页面的鼠标事件状态，确保双击功能正常工作
-                    if (itemListManager && typeof itemListManager.resetMouseEventStates === 'function') {
-                        itemListManager.resetMouseEventStates();
-                    }
-                } else {
-                    console.warn('[TopicListManager] uiManager不可用，无法切换到助手页面');
-                }
-            }
-        });
-
-        // 防止中键点击的默认行为
-        addListener(topicsContainer, 'mousedown', (e) => {
-            if (e.button === 1) { // 中键
-                e.preventDefault();
-            }
-        });
-
-        console.log('[TopicListManager] 鼠标快捷键设置完成');
-    }
-
-    function dispose() {
-        cancelPendingTopicSearch();
-        cleanupProgressiveTopicRendering();
-        closeTopicContextMenu();
-        selectedTopicIds.clear();
-        displayedTopics = [];
-        availableTopics = [];
-        currentItemConfig = null;
-        managedItemKey = '';
-        topicListContainer = null;
-        listenerOwner = null;
-    }
-
-    // --- Public API ---
-    return {
-        init,
-        loadTopicList,
-        setupTopicSearch,
-        showTopicContextMenu,
-        setupMouseShortcuts,
-        dispose
-    };
-})();
+// modules/topicListManager.js
+
+window.topicListManager = (() => {
+    // --- Private Variables ---
+    let topicListContainer;
+    let electronAPI;
+    let chatRepository;
+    let currentSelectedItemRef;
+    let currentTopicIdRef;
+    let topicSelectionReadiness;
+    let uiHelper;
+    let mainRendererFunctions;
+    let listenerOwner;
+    let uiManager;
+    let itemListManager;
+    let renderListenerDisposers = [];
+    let wasSelectionListenerActive = false; // To store the state of the selection listener before dragging
+    let topicListRenderGeneration = 0;
+    let topicListScrollCleanup = null;
+    let topicCountObserver = null;
+    let isManageMode = false;
+    let selectedTopicIds = new Set();
+    let displayedTopics = [];
+    let availableTopics = [];
+    let currentItemConfig = null;
+    let managedItemKey = '';
+
+    const TOPIC_INITIAL_RENDER_COUNT = 40;
+    const TOPIC_PROGRESSIVE_BATCH_SIZE = 30;
+    const TOPIC_LOAD_MORE_THRESHOLD_PX = 320;
+    // Each search reload re-reads the item config and runs a content search
+    // over IPC. Typing waits for a short pause first, in the range ZCode uses
+    // for its IO-backed refreshes (fileWatcherService 150ms, useTabPersistence
+    // 300ms); Enter still searches at once.
+    const TOPIC_SEARCH_DEBOUNCE_MS = 200;
+    let topicSearchTimer = null;
+
+    const addListener = (target, type, handler, options) => {
+        if (listenerOwner) return listenerOwner.add(target, type, handler, options);
+        target?.addEventListener?.(type, handler, options);
+        return true;
+    };
+
+    function addRenderListener(target, type, handler, options) {
+        target?.addEventListener?.(type, handler, options);
+        renderListenerDisposers.push(() => target?.removeEventListener?.(type, handler, options));
+    }
+
+    function cancelPendingTopicSearch() {
+        if (topicSearchTimer) clearTimeout(topicSearchTimer);
+        topicSearchTimer = null;
+    }
+
+    // Names and IPC error strings are user or disk data, so status rows are
+    // built with textContent, never by interpolating into innerHTML.
+    function renderTopicListStatus(topicListUl, message, { loading = false } = {}) {
+        const li = document.createElement('li');
+        if (loading) {
+            const spinner = document.createElement('div');
+            spinner.className = 'loading-spinner-small';
+            li.append(spinner, document.createTextNode(message));
+        } else {
+            const p = document.createElement('p');
+            p.textContent = message;
+            li.appendChild(p);
+        }
+        topicListUl.replaceChildren(li);
+    }
+
+    function disposeRenderListeners() {
+        renderListenerDisposers.splice(0).reverse().forEach(dispose => dispose());
+    }
+
+    /**
+     * Initializes the TopicListManager module.
+     * @param {object} config - The configuration object.
+     */
+    function init(config) {
+        if (!config.elements || !config.elements.topicListContainer) {
+            console.error('[TopicListManager] Missing required DOM element: topicListContainer.');
+            return;
+        }
+        if (!config.electronAPI || !config.refs || !config.uiHelper || !config.mainRendererFunctions || !config.topicSelectionReadiness) {
+            console.error('[TopicListManager] Missing required configuration parameters.');
+            return;
+        }
+
+        topicListContainer = config.elements.topicListContainer;
+        electronAPI = config.electronAPI;
+        chatRepository = config.chatRepository || null;
+        if (!chatRepository) throw new Error('TopicListManager requires ChatRepository');
+        currentSelectedItemRef = config.refs.currentSelectedItemRef;
+        currentTopicIdRef = config.refs.currentTopicIdRef;
+        topicSelectionReadiness = config.topicSelectionReadiness;
+        uiHelper = config.uiHelper;
+        mainRendererFunctions = config.mainRendererFunctions;
+        listenerOwner = config.listenerOwner || null;
+        uiManager = config.uiManager || null;
+        itemListManager = config.itemListManager || null;
+
+        // 设置鼠标快捷键
+        setupMouseShortcuts();
+        setupNextUiTopicTools();
+
+        console.log('[TopicListManager] Initialized successfully.');
+    }
+
+    function getHistory(itemId, itemType, topicId) {
+        return chatRepository.getHistory(itemId, itemType, topicId);
+    }
+
+    function hasUserParticipation(history) {
+        return Array.isArray(history) && history.some(message =>
+            message &&
+            message.role === 'user' &&
+            message.isThinking !== true
+        );
+    }
+
+    function hasValidPersistentUnreadMarker(topic, history) {
+        if (topic?.unread !== true) return false;
+        if (topic.unreadSource === 'manual') return true;
+
+        // Agent/TopicSponsor 产生的旧未读标记在用户参与后即失效。
+        return !hasUserParticipation(history);
+    }
+
+    async function clearStalePersistentUnreadMarker(topic, itemId, history) {
+        if (
+            topic?.unread !== true ||
+            topic.unreadSource === 'manual' ||
+            !hasUserParticipation(history)
+        ) {
+            return;
+        }
+
+        topic.unread = false;
+        delete topic.unreadSource;
+
+        try {
+            const result = await electronAPI.setTopicUnread(itemId, topic.id, false);
+            if (!result?.success) {
+                console.warn(`[TopicListManager] 清理话题 ${topic.id} 的残留未读标记失败:`, result?.error);
+            }
+        } catch (error) {
+            console.warn(`[TopicListManager] 清理话题 ${topic.id} 的残留未读标记失败:`, error);
+        }
+    }
+
+    /**
+     * 统计完全由 Agent 主动发起、尚无用户参与的话题消息数。
+     * 系统消息和思考占位不参与判断；历史中只要出现过用户消息就返回 0。
+     * @param {Array} history - 消息历史
+     * @returns {number}
+     */
+    function countUnreadMessages(history) {
+        if (!Array.isArray(history) || history.length === 0) return 0;
+
+        const effectiveMessages = history.filter(message =>
+            message &&
+            message.role !== 'system' &&
+            message.isThinking !== true
+        );
+
+        if (effectiveMessages.some(message => message.role === 'user')) {
+            return 0;
+        }
+
+        return effectiveMessages.filter(message => message.role === 'assistant').length;
+    }
+
+    function normalizeTopicTitle(topicTitle) {
+        if (typeof topicTitle !== 'string') return topicTitle;
+
+        const trimmedTitle = topicTitle.trim();
+        if (!trimmedTitle) return trimmedTitle;
+        if (trimmedTitle.includes('新话题')) return trimmedTitle;
+
+        const timeMatch = trimmedTitle.match(/(\d{1,2}:\d{2}:\d{2})/);
+        if (trimmedTitle.includes('新话') && timeMatch) {
+            return `新话题 ${timeMatch[1]}`;
+        }
+
+        return trimmedTitle;
+    }
+
+    /**
+     * 解析话题搜索约定词。
+     * 仅当完整输入为“未读话题”或“unread topic”时启用未读置顶。
+     * @param {string} rawValue - 搜索框原始值
+     * @returns {{ rawTerm: string, queryTerm: string, prioritizeUnread: boolean }}
+     */
+    function parseTopicSearchQuery(rawValue) {
+        const rawTerm = String(rawValue || '').trim().toLowerCase();
+        const prioritizeUnread = rawTerm === '未读话题' || rawTerm === 'unread topic';
+
+        return {
+            rawTerm,
+            queryTerm: prioritizeUnread ? '' : rawTerm,
+            prioritizeUnread
+        };
+    }
+
+    /**
+     * 读取各话题历史，并将未读话题稳定地移到顶部。
+     * 未读组与已读组内部均保留用户自定义顺序。
+     */
+    async function prioritizeUnreadTopics(topics, currentSelectedItem) {
+        const topicsWithUnreadState = await Promise.all(topics.map(async topic => {
+            let history = [];
+            try {
+                history = await getHistory(currentSelectedItem.id, currentSelectedItem.type, topic.id);
+            } catch (error) {
+                console.warn(`[TopicListManager] 读取话题 ${topic.id} 的未读状态失败:`, error);
+            }
+
+            const calculatedUnreadCount = Array.isArray(history)
+                ? countUnreadMessages(history)
+                : 0;
+            const hasPersistentUnread = hasValidPersistentUnreadMarker(topic, history);
+
+            await clearStalePersistentUnreadMarker(topic, currentSelectedItem.id, history);
+
+            return {
+                topic,
+                isUnread: calculatedUnreadCount > 0 || hasPersistentUnread,
+                calculatedUnreadCount
+            };
+        }));
+
+        const unreadTopics = [];
+        const readTopics = [];
+        topicsWithUnreadState.forEach(({ topic, isUnread, calculatedUnreadCount }) => {
+            topic.__calculatedUnreadCount = calculatedUnreadCount;
+            (isUnread ? unreadTopics : readTopics).push(topic);
+        });
+
+        return unreadTopics.concat(readTopics);
+    }
+
+    function ensureTopicUnreadIndicator(li, unreadCount = -1) {
+        if (!li) return;
+
+        let indicator = li.querySelector('.topic-unread-indicator');
+        if (!indicator) {
+            indicator = document.createElement('span');
+            indicator.className = 'topic-unread-indicator';
+            const messageCountSpan = li.querySelector('.message-count');
+            li.insertBefore(indicator, messageCountSpan || null);
+        }
+
+        indicator.textContent = unreadCount > 0 ? `未读 ${unreadCount}` : '未读';
+        indicator.title = unreadCount > 0 ? `${unreadCount} 条未读消息` : '未读话题';
+        li.classList.add('has-unread-topic');
+    }
+
+    function removeTopicUnreadIndicator(li) {
+        if (!li) return;
+        li.querySelector('.topic-unread-indicator')?.remove();
+        li.classList.remove('has-unread-topic');
+    }
+
+    /**
+     * Part C: 计算单个话题的未读消息数
+     * @param {Object} topic - 话题对象
+     * @param {Array} history - 话题历史消息
+     * @returns {number} - 未读消息数，-1 表示仅显示小点
+     */
+    function calculateTopicUnreadCount(topic, history) {
+        const count = countUnreadMessages(history);
+        if (count > 0) return count;
+
+        // 没有自动计数时，仅保留仍有效的持久化未读标记。
+        if (hasValidPersistentUnreadMarker(topic, history)) {
+            return -1; // 仅显示小点，不显示数字
+        }
+
+        return 0; // 不显示
+    }
+
+    function cleanupProgressiveTopicRendering() {
+        topicListRenderGeneration++;
+        disposeRenderListeners();
+        if (typeof topicListScrollCleanup === 'function') {
+            topicListScrollCleanup();
+            topicListScrollCleanup = null;
+        }
+        if (topicCountObserver) {
+            topicCountObserver.disconnect();
+            topicCountObserver = null;
+        }
+        const topicListUl = document.getElementById('topicList');
+        if (topicListUl?.sortableInstance) {
+            topicListUl.sortableInstance.destroy();
+            topicListUl.sortableInstance = null;
+        }
+    }
+
+    function getTopicScrollContainer(topicListUl) {
+        return topicListUl?.closest('.sidebar-list-scroll') || topicListContainer;
+    }
+
+    function ensureTopicCountObserver() {
+        if (topicCountObserver) return topicCountObserver;
+
+        topicCountObserver = new IntersectionObserver((entries) => {
+            entries.forEach((entry) => {
+                if (!entry.isIntersecting) return;
+
+                const li = entry.target;
+                topicCountObserver.unobserve(li);
+                loadTopicMessageCount(li);
+            });
+        }, {
+            root: getTopicScrollContainer(document.getElementById('topicList')),
+            rootMargin: '240px 0px',
+            threshold: 0.01
+        });
+
+        return topicCountObserver;
+    }
+
+    function loadTopicMessageCount(li) {
+        if (!li?.isConnected || li.dataset.countLoaded === 'true' || li.dataset.countLoading === 'true') return;
+
+        const itemId = li.dataset.itemId;
+        const itemType = li.dataset.itemType;
+        const topicId = li.dataset.topicId;
+        const topic = li.__topicData;
+        const messageCountSpan = li.querySelector('.message-count');
+
+        if (!itemId || !itemType || !topicId || !topic || !messageCountSpan) return;
+
+        li.dataset.countLoading = 'true';
+
+        let historyPromise;
+        historyPromise = getHistory(itemId, itemType, topicId);
+
+        if (!historyPromise) {
+            messageCountSpan.textContent = 'N/A';
+            li.dataset.countLoaded = 'true';
+            li.dataset.countLoading = 'false';
+            return;
+        }
+
+        historyPromise.then(async historyResult => {
+            if (!li.isConnected) return;
+
+            messageCountSpan.classList.remove('has-unread', 'unread-marker-only');
+
+            if (historyResult && !historyResult.error && Array.isArray(historyResult)) {
+                await clearStalePersistentUnreadMarker(topic, itemId, historyResult);
+                const unreadCount = calculateTopicUnreadCount(topic, historyResult);
+                if (unreadCount > 0) {
+                    messageCountSpan.textContent = `${historyResult.length}`;
+                    messageCountSpan.classList.add('has-unread');
+                    ensureTopicUnreadIndicator(li, unreadCount);
+                } else if (unreadCount === -1) {
+                    messageCountSpan.textContent = `${historyResult.length}`;
+                    messageCountSpan.classList.add('unread-marker-only');
+                    ensureTopicUnreadIndicator(li);
+                } else {
+                    messageCountSpan.textContent = `${historyResult.length}`;
+                    removeTopicUnreadIndicator(li);
+                }
+            } else {
+                messageCountSpan.textContent = 'N/A';
+            }
+            li.dataset.countLoaded = 'true';
+        }).catch(() => {
+            if (li.isConnected) {
+                messageCountSpan.textContent = 'ERR';
+            }
+        }).finally(() => {
+            if (li.isConnected) {
+                li.dataset.countLoading = 'false';
+            }
+        });
+    }
+
+    function createTopicListItem(topic, currentSelectedItem, currentTopicId, itemConfigFull) {
+        const li = document.createElement('li');
+        li.classList.add('topic-item');
+        li.dataset.itemId = currentSelectedItem.id;
+        li.dataset.itemType = currentSelectedItem.type;
+        li.dataset.topicId = topic.id;
+        li.__topicData = topic;
+
+        const isCurrentActiveTopic = topic.id === currentTopicId;
+        const isPersistentlyUnread = topic.unread === true || topic.__calculatedUnreadCount > 0;
+        li.classList.toggle('active', isCurrentActiveTopic);
+        li.classList.toggle('active-topic-glowing', isCurrentActiveTopic);
+        li.classList.toggle('has-unread-topic', isPersistentlyUnread);
+
+        const avatarImg = document.createElement('img');
+        avatarImg.classList.add('avatar');
+        avatarImg.loading = 'lazy';
+        avatarImg.decoding = 'async';
+        avatarImg.src = currentSelectedItem.avatarUrl ? currentSelectedItem.avatarUrl : (currentSelectedItem.type === 'group' ? 'assets/default_group_avatar.png' : 'assets/default_avatar.png');
+
+        const displayTopicTitle = normalizeTopicTitle(topic.name || `话题 ${topic.id}`);
+        avatarImg.alt = `${currentSelectedItem.name} - ${displayTopicTitle}`;
+        avatarImg.onerror = () => { avatarImg.src = (currentSelectedItem.type === 'group' ? 'assets/default_group_avatar.png' : 'assets/default_avatar.png'); };
+
+        const topicTitleDisplay = document.createElement('span');
+        topicTitleDisplay.classList.add('topic-title-display');
+        topicTitleDisplay.textContent = displayTopicTitle;
+
+        const messageCountSpan = document.createElement('span');
+        messageCountSpan.classList.add('message-count');
+        messageCountSpan.textContent = '...';
+
+        const selectionIcon = document.createElement('span');
+        selectionIcon.classList.add('next-ui-topic-select-icon', 'vcp-ui-icon');
+        selectionIcon.setAttribute('aria-hidden', 'true');
+        selectionIcon.textContent = selectedTopicIds.has(topic.id) ? 'check_box' : 'check_box_outline_blank';
+        li.appendChild(selectionIcon);
+        li.appendChild(avatarImg);
+
+        if (topic.locked === false) {
+            const unlockedIndicator = document.createElement('span');
+            unlockedIndicator.classList.add('unlocked-indicator');
+            unlockedIndicator.textContent = 'unlocked';
+            unlockedIndicator.title = 'AI可以查看和回复此话题';
+            li.appendChild(unlockedIndicator);
+        }
+
+        li.appendChild(topicTitleDisplay);
+        if (isPersistentlyUnread) {
+            ensureTopicUnreadIndicator(li, topic.__calculatedUnreadCount);
+        }
+        li.appendChild(messageCountSpan);
+
+        const observer = ensureTopicCountObserver();
+        observer.observe(li);
+
+        addRenderListener(li, 'click', async () => {
+            if (isManageMode) {
+                toggleTopicSelection(topic.id);
+                return;
+            }
+
+            if (currentTopicIdRef.get() === topic.id) {
+                return;
+            }
+
+            if (!topicSelectionReadiness.isReady()) {
+                topicSelectionReadiness.defer({
+                    itemId: currentSelectedItem.id,
+                    itemType: currentSelectedItem.type,
+                    topicId: topic.id,
+                });
+                if (uiHelper && uiHelper.showToastNotification) {
+                    uiHelper.showToastNotification('正在初始化界面，稍后自动打开该话题', 'info');
+                }
+                return;
+            }
+
+            try {
+                await Promise.resolve(mainRendererFunctions.selectTopic(topic.id));
+            } catch (error) {
+                console.error('[TopicListManager] Failed to select topic:', error);
+                if (uiHelper && uiHelper.showToastNotification) {
+                    uiHelper.showToastNotification(`打开话题失败: ${error.message}`, 'error');
+                }
+            }
+        });
+
+        addRenderListener(li, 'contextmenu', (e) => {
+            e.preventDefault();
+            if (isManageMode) return;
+            showTopicContextMenu(e, li, itemConfigFull, topic, currentSelectedItem.type);
+        });
+
+        return li;
+    }
+
+    function renderTopicListProgressively(topicListUl, topicsToProcess, currentSelectedItem, currentTopicId, itemConfigFull, searchTerm) {
+        const renderGeneration = topicListRenderGeneration;
+        const scrollContainer = getTopicScrollContainer(topicListUl);
+        const totalCount = topicsToProcess.length;
+        const initialCount = searchTerm
+            ? Math.min(Math.max(TOPIC_INITIAL_RENDER_COUNT, TOPIC_PROGRESSIVE_BATCH_SIZE), totalCount)
+            : Math.min(TOPIC_INITIAL_RENDER_COUNT, totalCount);
+
+        let currentIndex = 0;
+        let isRendering = false;
+        let allRendered = false;
+
+        const statusLi = document.createElement('li');
+        statusLi.className = 'topic-list-progressive-status';
+        statusLi.textContent = '';
+        statusLi.style.justifyContent = 'center';
+        statusLi.style.opacity = '0.75';
+
+        const finalizeIfDone = () => {
+            if (!allRendered || renderGeneration !== topicListRenderGeneration) return;
+
+            statusLi.remove();
+            if (typeof topicListScrollCleanup === 'function') {
+                topicListScrollCleanup();
+                topicListScrollCleanup = null;
+            }
+
+            if (currentSelectedItem.id && topicsToProcess.length > 0 && typeof Sortable !== 'undefined' && !searchTerm) {
+                initializeTopicSortable(currentSelectedItem.id, currentSelectedItem.type);
+            }
+        };
+
+        const renderNextBatch = (batchSize = TOPIC_PROGRESSIVE_BATCH_SIZE) => {
+            if (isRendering || allRendered || renderGeneration !== topicListRenderGeneration) return;
+            isRendering = true;
+
+            requestAnimationFrame(() => {
+                if (renderGeneration !== topicListRenderGeneration) {
+                    isRendering = false;
+                    return;
+                }
+
+                const fragment = document.createDocumentFragment();
+                const end = Math.min(currentIndex + batchSize, totalCount);
+
+                for (; currentIndex < end; currentIndex++) {
+                    fragment.appendChild(createTopicListItem(
+                        topicsToProcess[currentIndex],
+                        currentSelectedItem,
+                        currentTopicId,
+                        itemConfigFull
+                    ));
+                }
+
+                if (statusLi.parentNode === topicListUl) {
+                    topicListUl.insertBefore(fragment, statusLi);
+                } else {
+                    topicListUl.appendChild(fragment);
+                }
+
+                allRendered = currentIndex >= totalCount;
+                isRendering = false;
+
+                if (!allRendered) {
+                    statusLi.textContent = `继续向下滚动加载更多话题（${currentIndex}/${totalCount}）`;
+                    if (!statusLi.parentNode) topicListUl.appendChild(statusLi);
+                    if (scrollContainer.scrollHeight <= scrollContainer.clientHeight + TOPIC_LOAD_MORE_THRESHOLD_PX) {
+                        renderNextBatch();
+                    }
+                } else {
+                    finalizeIfDone();
+                }
+            });
+        };
+
+        const onScroll = () => {
+            if (allRendered || isRendering || renderGeneration !== topicListRenderGeneration) return;
+
+            const distanceToBottom = scrollContainer.scrollHeight - scrollContainer.scrollTop - scrollContainer.clientHeight;
+            if (distanceToBottom <= TOPIC_LOAD_MORE_THRESHOLD_PX) {
+                renderNextBatch();
+            }
+        };
+
+        scrollContainer.addEventListener('scroll', onScroll, { passive: true });
+        topicListScrollCleanup = () => scrollContainer.removeEventListener('scroll', onScroll);
+
+        topicListUl.innerHTML = '';
+        renderNextBatch(initialCount);
+    }
+
+    async function loadTopicList() {
+        if (!topicListContainer) {
+            console.error("Topic list container (tabContentTopics) not found.");
+            return;
+        }
+
+        cancelPendingTopicSearch();
+        cleanupProgressiveTopicRendering();
+        const loadGeneration = topicListRenderGeneration;
+
+        let topicListUl = topicListContainer.querySelector('.topic-list');
+        if (topicListUl) {
+            topicListUl.innerHTML = '';
+        } else {
+            const topicsHeader = topicListContainer.querySelector('.topics-header') || document.createElement('div');
+            if (!topicsHeader.classList.contains('topics-header')) {
+                topicsHeader.className = 'topics-header';
+                topicsHeader.innerHTML = `<h2>话题列表</h2><div class="topic-search-container"><input type="text" id="topicSearchInput" placeholder="搜索话题；输入“未读话题”置顶" title="输入“未读话题”或“unread topic”将未读话题置顶" aria-label="搜索话题；输入未读话题将未读话题置顶" class="topic-search-input"></div>`;
+                topicListContainer.prepend(topicsHeader);
+                const newTopicSearchInput = topicsHeader.querySelector('#topicSearchInput');
+                if (newTopicSearchInput) setupTopicSearchListener(newTopicSearchInput);
+            }
+
+            topicListUl = document.createElement('ul');
+            topicListUl.className = 'topic-list';
+            topicListUl.id = 'topicList';
+            topicListContainer.appendChild(topicListUl);
+        }
+
+        const currentSelectedItem = currentSelectedItemRef.get();
+        if (!currentSelectedItem.id) {
+            availableTopics = [];
+            displayedTopics = [];
+            currentItemConfig = null;
+            managedItemKey = '';
+            selectedTopicIds.clear();
+            syncManageUi();
+            topicListUl.innerHTML = '<li><p>请先在“助手与群组”列表选择一个项目以查看其相关话题。</p></li>';
+            return;
+        }
+
+        const nextItemKey = `${currentSelectedItem.type}:${currentSelectedItem.id}`;
+        if (managedItemKey && managedItemKey !== nextItemKey) {
+            selectedTopicIds.clear();
+        }
+        managedItemKey = nextItemKey;
+
+        const itemNameForLoading = currentSelectedItem.name || '当前项目';
+        const searchInput = document.getElementById('topicSearchInput');
+        const searchQuery = parseTopicSearchQuery(searchInput ? searchInput.value : '');
+        const searchTerm = searchQuery.rawTerm;
+        const contentQueryTerm = searchQuery.queryTerm;
+
+        let itemConfigFull;
+
+        if (!searchTerm) {
+            renderTopicListStatus(topicListUl, `正在加载 ${itemNameForLoading} 的话题...`, { loading: true });
+        } else {
+            topicListUl.innerHTML = '';
+        }
+
+        try {
+            if (currentSelectedItem.type === 'agent') {
+                itemConfigFull = await electronAPI.getAgentConfig(currentSelectedItem.id);
+            } else if (currentSelectedItem.type === 'group') {
+                itemConfigFull = await electronAPI.getAgentGroupConfig(currentSelectedItem.id);
+            }
+        } catch (error) {
+            // A rejected IPC call used to leave the loading spinner up for good.
+            console.error('[TopicListManager] Failed to load item config:', error);
+            itemConfigFull = { error: error?.message || String(error) };
+        }
+
+        if (loadGeneration !== topicListRenderGeneration ||
+            currentSelectedItemRef.get()?.id !== currentSelectedItem.id ||
+            currentSelectedItemRef.get()?.type !== currentSelectedItem.type) {
+            return;
+        }
+
+        if (itemConfigFull && !itemConfigFull.error) {
+            mainRendererFunctions.updateCurrentItemConfig(itemConfigFull);
+        }
+
+        if (!itemConfigFull || itemConfigFull.error) {
+            availableTopics = [];
+            displayedTopics = [];
+            currentItemConfig = null;
+            selectedTopicIds.clear();
+            syncManageUi();
+            renderTopicListStatus(topicListUl, `无法加载 ${itemNameForLoading} 的配置信息: ${itemConfigFull?.error || '未知错误'}`);
+        } else {
+            let topicsToProcess = itemConfigFull.topics || [];
+            if (currentSelectedItem.type === 'agent' && topicsToProcess.length === 0) {
+                const defaultAgentTopic = { id: "default", name: "主要对话", createdAt: Date.now() };
+                topicsToProcess.push(defaultAgentTopic);
+            }
+
+            availableTopics = [...topicsToProcess];
+            currentItemConfig = itemConfigFull;
+            const availableTopicIds = new Set(availableTopics.map(topic => topic.id));
+            selectedTopicIds = new Set([...selectedTopicIds].filter(topicId => availableTopicIds.has(topicId)));
+
+            // topicsToProcess.sort((a, b) => (b.createdAt || 0) - (a.createdAt || 0));
+
+            if (contentQueryTerm) {
+                let frontendFilteredTopics = topicsToProcess.filter(topic => {
+                    const normalizedTopicTitle = normalizeTopicTitle(topic.name || '');
+                    const nameMatch = normalizedTopicTitle.toLowerCase().includes(contentQueryTerm);
+                    let dateMatch = false;
+                    if (topic.createdAt) {
+                        const date = new Date(topic.createdAt);
+                        const fullDateStr = `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')} ${String(date.getHours()).padStart(2, '0')}:${String(date.getMinutes()).padStart(2, '0')}`;
+                        const shortDateStr = `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')}`;
+                        dateMatch = fullDateStr.toLowerCase().includes(contentQueryTerm) || shortDateStr.toLowerCase().includes(contentQueryTerm);
+                    }
+                    return nameMatch || dateMatch;
+                });
+
+                let contentMatchedTopicIds = [];
+                try {
+                    const contentSearchResult = await electronAPI.searchTopicsByContent(currentSelectedItem.id, currentSelectedItem.type, contentQueryTerm);
+                    if (contentSearchResult && contentSearchResult.success && Array.isArray(contentSearchResult.matchedTopicIds)) {
+                        contentMatchedTopicIds = contentSearchResult.matchedTopicIds;
+                    } else if (contentSearchResult && !contentSearchResult.success) {
+                        console.warn("Topic content search failed:", contentSearchResult.error);
+                    }
+                } catch (e) {
+                    console.error("Error calling searchTopicsByContent:", e);
+                }
+
+                const finalFilteredTopicIds = new Set(frontendFilteredTopics.map(t => t.id));
+                contentMatchedTopicIds.forEach(id => finalFilteredTopicIds.add(id));
+
+                topicsToProcess = topicsToProcess.filter(topic => finalFilteredTopicIds.has(topic.id));
+            }
+
+            if (searchQuery.prioritizeUnread) {
+                topicsToProcess = await prioritizeUnreadTopics(topicsToProcess, currentSelectedItem);
+            }
+
+            if (loadGeneration !== topicListRenderGeneration ||
+                currentSelectedItemRef.get()?.id !== currentSelectedItem.id ||
+                currentSelectedItemRef.get()?.type !== currentSelectedItem.type) {
+                return;
+            }
+
+            displayedTopics = [...topicsToProcess];
+            syncManageUi();
+
+            if (topicsToProcess.length === 0) {
+                renderTopicListStatus(topicListUl, `${itemNameForLoading} 还没有任何话题${searchTerm ? '匹配当前搜索' : ''}。您可以点击上方的“新建${currentSelectedItem.type === 'group' ? '群聊话题' : '聊天话题'}”按钮创建一个。`);
+            } else {
+                const currentTopicId = currentTopicIdRef.get();
+                renderTopicListProgressively(topicListUl, topicsToProcess, currentSelectedItem, currentTopicId, itemConfigFull, searchTerm);
+            }
+        }
+    }
+
+    function setupTopicSearch() {
+        let searchInput = document.getElementById('topicSearchInput');
+        if (searchInput) {
+            setupTopicSearchListener(searchInput);
+        }
+    }
+
+    function setupTopicSearchListener(inputElement) {
+        if (inputElement.dataset.topicSearchBound === 'true') return;
+        inputElement.dataset.topicSearchBound = 'true';
+
+        addListener(inputElement, 'input', scheduleTopicSearch);
+        addListener(inputElement, 'keydown', (event) => {
+            if (event.key === 'Enter') {
+                event.preventDefault();
+                filterTopicList();
+            }
+        });
+    }
+
+    function scheduleTopicSearch() {
+        cancelPendingTopicSearch();
+        topicSearchTimer = setTimeout(() => {
+            topicSearchTimer = null;
+            loadTopicList();
+        }, TOPIC_SEARCH_DEBOUNCE_MS);
+    }
+
+    function filterTopicList() {
+        loadTopicList();
+    }
+
+    function setupNextUiTopicTools() {
+        const topicsHeader = document.querySelector('#tabContentTopics .topics-header-container');
+        const createButton = document.getElementById('nextUiCreateTopicBtn');
+        const manageButton = document.getElementById('nextUiManageTopicsBtn');
+        const searchButton = document.getElementById('nextUiTopicSearchTrigger');
+        const searchCloseButton = document.getElementById('nextUiTopicSearchClose');
+        const searchInput = document.getElementById('topicSearchInput');
+        const selectAllButton = document.getElementById('nextUiSelectAllTopicsBtn');
+        const deleteButton = document.getElementById('nextUiDeleteTopicsBtn');
+        const exitButton = document.getElementById('nextUiExitTopicManageBtn');
+
+        if (!topicsHeader || !createButton || !manageButton || !searchButton || !searchCloseButton || !searchInput) return;
+        if (topicsHeader.dataset.nextUiToolsBound === 'true') return;
+        topicsHeader.dataset.nextUiToolsBound = 'true';
+
+        const setSearchMode = (active, clear = !active) => {
+            topicsHeader.classList.toggle('is-searching', active);
+            searchButton.setAttribute('aria-expanded', String(active));
+            if (clear) {
+                searchInput.value = '';
+                loadTopicList();
+            }
+            if (active) requestAnimationFrame(() => searchInput.focus());
+            else if (document.activeElement === searchInput) searchButton.focus();
+        };
+
+        addListener(createButton, 'click', () => {
+            document.getElementById('currentAgentSettingsBtn')?.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+        });
+        addListener(createButton, 'contextmenu', (event) => {
+            event.preventDefault();
+            document.getElementById('currentAgentSettingsBtn')?.dispatchEvent(new MouseEvent('contextmenu', {
+                bubbles: true,
+                clientX: event.clientX,
+                clientY: event.clientY
+            }));
+        });
+        addListener(manageButton, 'click', () => setManageMode(!isManageMode));
+        addListener(searchButton, 'click', () => setSearchMode(true, false));
+        addListener(searchCloseButton, 'click', () => setSearchMode(false, true));
+        addListener(searchInput, 'keydown', (event) => {
+            if (event.key === 'Escape') {
+                event.preventDefault();
+                setSearchMode(false, true);
+            }
+        });
+        if (selectAllButton) addListener(selectAllButton, 'click', toggleSelectAllDisplayedTopics);
+        if (deleteButton) addListener(deleteButton, 'click', deleteSelectedTopics);
+        if (exitButton) addListener(exitButton, 'click', () => setManageMode(false));
+
+        syncManageUi();
+    }
+
+    function setManageMode(active) {
+        isManageMode = active;
+        if (!active) selectedTopicIds.clear();
+
+        const topicListUl = document.getElementById('topicList');
+        if (active && topicListUl?.sortableInstance) {
+            topicListUl.sortableInstance.destroy();
+            topicListUl.sortableInstance = null;
+        } else if (!active) {
+            loadTopicList();
+        }
+
+        syncManageUi();
+    }
+
+    function toggleTopicSelection(topicId) {
+        if (selectedTopicIds.has(topicId)) selectedTopicIds.delete(topicId);
+        else selectedTopicIds.add(topicId);
+        syncManageUi();
+    }
+
+    function toggleSelectAllDisplayedTopics() {
+        const displayedIds = displayedTopics.map(topic => topic.id);
+        const allDisplayedSelected = displayedIds.length > 0 && displayedIds.every(topicId => selectedTopicIds.has(topicId));
+
+        if (allDisplayedSelected) displayedIds.forEach(topicId => selectedTopicIds.delete(topicId));
+        else displayedIds.forEach(topicId => selectedTopicIds.add(topicId));
+        syncManageUi();
+    }
+
+    function syncManageUi() {
+        const container = document.getElementById('tabContentTopics');
+        const manageButton = document.getElementById('nextUiManageTopicsBtn');
+        const managePanel = container?.querySelector('.next-ui-topic-manage-panel');
+        const count = document.getElementById('nextUiTopicSelectionCount');
+        const selectAllButton = document.getElementById('nextUiSelectAllTopicsBtn');
+        const deleteButton = document.getElementById('nextUiDeleteTopicsBtn');
+        const allDisplayedSelected = displayedTopics.length > 0
+            && displayedTopics.every(topic => selectedTopicIds.has(topic.id));
+
+        container?.classList.toggle('is-managing', isManageMode);
+        manageButton?.classList.toggle('active', isManageMode);
+        manageButton?.setAttribute('aria-pressed', String(isManageMode));
+        managePanel?.setAttribute('aria-hidden', String(!isManageMode));
+        if (count) count.textContent = `已选择 ${selectedTopicIds.size} 项`;
+        if (deleteButton) deleteButton.disabled = selectedTopicIds.size === 0;
+        const selectAllIcon = selectAllButton?.querySelector('.vcp-ui-icon');
+        if (selectAllIcon) selectAllIcon.textContent = allDisplayedSelected ? 'check_box' : 'check_box_outline_blank';
+        if (selectAllButton) selectAllButton.title = allDisplayedSelected ? '取消全选' : '全选话题';
+
+        document.querySelectorAll('#topicList .topic-item').forEach(item => {
+            const selected = selectedTopicIds.has(item.dataset.topicId);
+            item.classList.toggle('selected', selected);
+            item.setAttribute('aria-selected', String(selected));
+            const icon = item.querySelector('.next-ui-topic-select-icon');
+            if (icon) icon.textContent = selected ? 'check_box' : 'check_box_outline_blank';
+        });
+    }
+
+    async function deleteSelectedTopics() {
+        if (!isManageMode || selectedTopicIds.size === 0 || !currentItemConfig) return;
+
+        const currentSelectedItem = currentSelectedItemRef.get();
+        const topicsToDelete = availableTopics.filter(topic => selectedTopicIds.has(topic.id));
+        if (topicsToDelete.length === 0) return;
+        if (topicsToDelete.length >= availableTopics.length) {
+            uiHelper.showToastNotification('至少需要保留一个话题。', 'warning');
+            return;
+        }
+
+        const flowlockedTopic = currentSelectedItem.type === 'agent'
+            ? topicsToDelete.find(topic => window.flowlockManager?.isTopicLocked?.(currentSelectedItem.id, topic.id))
+            : null;
+        if (flowlockedTopic) {
+            uiHelper.showToastNotification(`话题“${flowlockedTopic.name}”正在心流锁中运行，请先停止对应心流锁。`, 'warning');
+            return;
+        }
+
+        const confirmed = await uiHelper.showConfirmDialog(
+            `确定要永久删除选中的 ${topicsToDelete.length} 个话题吗？此操作不可撤销。`,
+            '批量删除话题',
+            '删除',
+            '取消',
+            true
+        );
+        if (!confirmed) return;
+
+        let deletedCount = 0;
+        let remainingTopics = availableTopics;
+        let firstError = '';
+        const activeTopicId = currentTopicIdRef.get();
+        let activeTopicDeleted = false;
+
+        for (const topic of topicsToDelete) {
+            try {
+                const result = currentSelectedItem.type === 'agent'
+                    ? await electronAPI.deleteTopic(currentSelectedItem.id, topic.id)
+                    : await electronAPI.deleteGroupTopic(currentSelectedItem.id, topic.id);
+                if (result?.success) {
+                    deletedCount++;
+                    if (topic.id === activeTopicId) activeTopicDeleted = true;
+                    remainingTopics = result.remainingTopics || remainingTopics.filter(item => item.id !== topic.id);
+                } else if (!firstError) {
+                    firstError = result?.error || '未知错误';
+                }
+            } catch (error) {
+                if (!firstError) firstError = error.message;
+            }
+        }
+
+        const deletedTopicIds = topicsToDelete.map(topic => topic.id).filter(id => !remainingTopics.some(item => item.id === id));
+        if (deletedTopicIds.length) mainRendererFunctions.onTopicsDeleted?.({ itemId: currentSelectedItem.id, itemType: currentSelectedItem.type, topicIds: deletedTopicIds });
+        if (activeTopicDeleted) {
+            mainRendererFunctions.handleTopicDeletion(remainingTopics, {
+                id: currentSelectedItem.id,
+                type: currentSelectedItem.type,
+                deletedTopicIds: topicsToDelete.map(topic => topic.id),
+                fallbackTopicId: topicsToDelete.some(topic => topic.id === activeTopicId) ? null : activeTopicId,
+            });
+        }
+
+        setManageMode(false);
+        if (deletedCount > 0) uiHelper.showToastNotification(`已删除 ${deletedCount} 个话题。`, 'success');
+        if (firstError) uiHelper.showToastNotification(`部分话题删除失败：${firstError}`, 'error');
+    }
+
+    function initializeTopicSortable(itemId, itemType) {
+        const topicListUl = document.getElementById('topicList');
+        if (!topicListUl) {
+            console.warn("[TopicListManager] topicListUl element not found. Skipping Sortable initialization.");
+            return;
+        }
+
+        if (topicListUl.sortableInstance) {
+            topicListUl.sortableInstance.destroy();
+        }
+
+        const targetItemId = itemId;
+        const targetItemType = itemType;
+        topicListUl.sortableInstance = new Sortable(topicListUl, {
+            animation: 150,
+            ghostClass: 'sortable-ghost-topic',
+            chosenClass: 'sortable-chosen-topic',
+            dragClass: 'sortable-drag-topic',
+            onStart: async function (evt) {
+                // Check original state, store it, and then disable if it was active.
+                if (electronAPI?.getSelectionListenerStatus) {
+                    wasSelectionListenerActive = await electronAPI.getSelectionListenerStatus();
+                    if (wasSelectionListenerActive) {
+                        electronAPI.toggleSelectionListener(false);
+                    }
+                }
+            },
+            onEnd: async function (evt) {
+                // Re-enable selection hook only if it was active before the drag.
+                if (electronAPI?.toggleSelectionListener) {
+                    if (wasSelectionListenerActive) {
+                        electronAPI.toggleSelectionListener(true);
+                    }
+                    wasSelectionListenerActive = false; // Reset state
+                }
+
+                const topicItems = Array.from(evt.to.children);
+                const orderedTopicIds = topicItems.map(item => item.dataset.topicId);
+                try {
+                    let result;
+                    if (targetItemType === 'agent') {
+                        result = await electronAPI.saveTopicOrder(targetItemId, orderedTopicIds);
+                    } else if (targetItemType === 'group') {
+                        result = await electronAPI.saveGroupTopicOrder(targetItemId, orderedTopicIds);
+                    }
+
+                    if (result && result.success) {
+                        // UI reflects sort.
+                    } else {
+                        console.error(`Failed to save topic order for ${targetItemType} ${targetItemId}:`, result?.error);
+                        uiHelper.showToastNotification(`保存话题顺序失败: ${result?.error || '未知错误'}`, 'error');
+                        loadTopicList();
+                    }
+                } catch (error) {
+                    console.error(`Error calling saveTopicOrder for ${targetItemType} ${targetItemId}:`, error);
+                    uiHelper.showToastNotification(`调用保存话题顺序API时出错: ${error.message}`, 'error');
+                    loadTopicList();
+                }
+            }
+        });
+    }
+
+    function showTopicContextMenu(event, topicItemElement, itemFullConfig, topic, itemType) {
+        // closeContextMenu(); // This function is not available in this module
+        closeTopicContextMenu();
+
+        const menu = document.createElement('div');
+        menu.id = 'topicContextMenu';
+        menu.classList.add('context-menu');
+
+        // 冻结话题域目标；标题生成允许即时保存，但绝不能跨项目串写。
+        const targetItemId = itemFullConfig.id;
+        const targetItemType = itemType;
+        const targetTopicId = topic.id;
+        // "生成话题名" 菜单项：Agent 和 Group 话题均支持
+        const regenerateTitleOption = document.createElement('div');
+        regenerateTitleOption.classList.add('context-menu-item');
+        regenerateTitleOption.innerHTML = `<i class="fas fa-magic"></i> 生成话题名`;
+        regenerateTitleOption.onclick = async () => {
+            closeTopicContextMenu();
+            if (regenerateTitleOption.dataset.loading === 'true') return;
+
+            regenerateTitleOption.dataset.loading = 'true';
+            regenerateTitleOption.classList.add('disabled');
+            try {
+                // 根据话题类型调用对应的 IPC
+                const result = targetItemType === 'agent'
+                    ? await electronAPI.regenerateAgentTopicTitle(targetItemId, targetTopicId)
+                    : await electronAPI.regenerateGroupTopicTitle(targetItemId, targetTopicId);
+
+                if (result?.success && result.newTitle) {
+                    // 原话题已保存；离开原项目后不再投影到当前界面，也不误报失败。
+                    if (currentSelectedItemRef.get()?.id !== targetItemId ||
+                        currentSelectedItemRef.get()?.type !== targetItemType) return;
+                    topic.name = result.newTitle;
+                    const topicInFullConfig = itemFullConfig.topics?.find(candidate => candidate.id === topic.id);
+                    if (topicInFullConfig) topicInFullConfig.name = result.newTitle;
+
+                    const titleDisplayElement = topicItemElement.querySelector('.topic-title-display, .topic-name');
+                    if (titleDisplayElement) titleDisplayElement.textContent = result.newTitle;
+                    uiHelper.showToastNotification(`话题名已更新为"${result.newTitle}"`, 'success');
+                } else {
+                    // 失败时不修改 topic、itemFullConfig 或 DOM，保留旧标题。
+                    uiHelper.showToastNotification(`生成话题名失败: ${result?.error || 'AI 未返回有效标题'}`, 'error');
+                }
+            } catch (error) {
+                // 请求异常时同样不触碰旧标题。
+                console.error('[TopicListManager] 生成话题名失败:', error);
+                uiHelper.showToastNotification(`生成话题名失败: ${error.message}`, 'error');
+            } finally {
+                regenerateTitleOption.dataset.loading = 'false';
+                regenerateTitleOption.classList.remove('disabled');
+            }
+        };
+
+        const editTitleOption = document.createElement('div');
+        editTitleOption.classList.add('context-menu-item');
+        editTitleOption.innerHTML = `<i class="fas fa-edit"></i> 编辑话题标题`;
+        editTitleOption.onclick = () => {
+            closeTopicContextMenu();
+            const titleDisplayElement = topicItemElement.querySelector('.topic-title-display');
+            if (!titleDisplayElement) return;
+
+            const originalTitle = topic.name;
+            titleDisplayElement.style.display = 'none';
+
+            const inputWrapper = document.createElement('div');
+            inputWrapper.style.display = 'flex';
+            inputWrapper.style.alignItems = 'center';
+
+            const inputField = document.createElement('input');
+            inputField.type = 'text';
+            inputField.value = originalTitle;
+            inputField.classList.add('topic-title-edit-input');
+            inputField.style.flexGrow = '1';
+            inputField.onclick = (e) => e.stopPropagation();
+
+            const confirmButton = document.createElement('button');
+            confirmButton.type = 'button';
+            confirmButton.innerHTML = '✓';
+            confirmButton.classList.add('topic-title-edit-confirm');
+            confirmButton.onclick = async (e) => {
+                e.stopPropagation();
+                const newTitle = inputField.value.trim();
+                if (newTitle && newTitle !== originalTitle) {
+                    let saveResult;
+                    if (targetItemType === 'agent') {
+                        saveResult = await electronAPI.saveAgentTopicTitle(targetItemId, targetTopicId, newTitle);
+                    } else if (targetItemType === 'group') {
+                        saveResult = await electronAPI.saveGroupTopicTitle(targetItemId, targetTopicId, newTitle);
+                    }
+                    if (saveResult && saveResult.success) {
+                        topic.name = newTitle;
+                        titleDisplayElement.textContent = newTitle;
+                        if (itemFullConfig.topics) {
+                            const topicInFullConfig = itemFullConfig.topics.find(t => t.id === topic.id);
+                            if (topicInFullConfig) topicInFullConfig.name = newTitle;
+                        }
+                    } else {
+                        uiHelper.showToastNotification(`更新话题标题失败: ${saveResult?.error || '未知错误'}`, 'error');
+                    }
+                }
+                titleDisplayElement.style.display = '';
+                inputWrapper.replaceWith(titleDisplayElement);
+            };
+
+            const cancelButton = document.createElement('button');
+            cancelButton.type = 'button';
+            cancelButton.innerHTML = '✗';
+            cancelButton.classList.add('topic-title-edit-cancel');
+            cancelButton.onclick = (e) => {
+                e.stopPropagation();
+                titleDisplayElement.style.display = '';
+                inputWrapper.replaceWith(titleDisplayElement);
+            };
+
+            inputWrapper.appendChild(inputField);
+            inputWrapper.appendChild(confirmButton);
+            inputWrapper.appendChild(cancelButton);
+            topicItemElement.insertBefore(inputWrapper, titleDisplayElement.nextSibling);
+            inputField.focus();
+            inputField.select();
+
+            inputField.addEventListener('keydown', (e) => {
+                if (e.key === 'Enter') {
+                    confirmButton.click();
+                } else if (e.key === 'Escape') {
+                    cancelButton.click();
+                }
+            });
+        };
+        menu.appendChild(editTitleOption);
+        menu.appendChild(regenerateTitleOption);
+
+        const copyTopicIdOption = document.createElement('div');
+        copyTopicIdOption.classList.add('context-menu-item');
+        copyTopicIdOption.innerHTML = `<i class="fas fa-copy"></i> 复制话题ID`;
+        copyTopicIdOption.onclick = async () => {
+            closeTopicContextMenu();
+            const topicId = String(topic.id ?? '');
+            try {
+                if (navigator.clipboard?.writeText) {
+                    await navigator.clipboard.writeText(topicId);
+                } else {
+                    const textarea = document.createElement('textarea');
+                    textarea.value = topicId;
+                    textarea.style.position = 'fixed';
+                    textarea.style.opacity = '0';
+                    document.body.appendChild(textarea);
+                    textarea.focus();
+                    textarea.select();
+                    document.execCommand('copy');
+                    textarea.remove();
+                }
+                uiHelper.showToastNotification('已复制话题ID', 'success');
+            } catch (error) {
+                console.error('[TopicListManager] Failed to copy topic ID:', error);
+                uiHelper.showToastNotification(`复制话题ID失败: ${error.message}`, 'error');
+            }
+        };
+        menu.appendChild(copyTopicIdOption);
+
+        // Part C: 锁定/解锁话题选项
+        const toggleLockOption = document.createElement('div');
+        toggleLockOption.classList.add('context-menu-item');
+        const isLocked = topic.locked !== false; // 默认为锁定
+        toggleLockOption.innerHTML = isLocked
+            ? `<i class="fas fa-unlock"></i> 解锁话题`
+            : `<i class="fas fa-lock"></i> 锁定话题`;
+        toggleLockOption.onclick = async () => {
+            closeTopicContextMenu();
+            try {
+                const result = await electronAPI.toggleTopicLock(targetItemId, targetTopicId);
+                if (result.success) {
+                    topic.locked = result.locked;
+                    uiHelper.showToastNotification(result.message, 'success');
+                    loadTopicList(); // 刷新列表以显示新状态
+                } else {
+                    uiHelper.showToastNotification(`切换锁定状态失败: ${result.error}`, 'error');
+                }
+            } catch (error) {
+                uiHelper.showToastNotification(`操作失败: ${error.message}`, 'error');
+            }
+        };
+        menu.appendChild(toggleLockOption);
+
+        // Part C: 标记为未读/已读选项
+        const toggleUnreadOption = document.createElement('div');
+        toggleUnreadOption.classList.add('context-menu-item');
+        const isUnread = topic.unread === true;
+        toggleUnreadOption.innerHTML = isUnread
+            ? `<i class="fas fa-check"></i> 标记为已读`
+            : `<i class="fas fa-envelope"></i> 标记为未读`;
+        toggleUnreadOption.onclick = async () => {
+            closeTopicContextMenu();
+            try {
+                const result = await electronAPI.setTopicUnread(targetItemId, targetTopicId, !isUnread);
+                if (result.success) {
+                    topic.unread = result.unread;
+                    if (result.unreadSource) {
+                        topic.unreadSource = result.unreadSource;
+                    } else {
+                        delete topic.unreadSource;
+                    }
+                    uiHelper.showToastNotification(
+                        topic.unread ? '已标记为未读' : '已标记为已读',
+                        'success'
+                    );
+                    loadTopicList(); // 刷新列表
+                    // 同时刷新助手列表以更新计数
+                    if (itemListManager) {
+                        itemListManager.loadItems();
+                    }
+                } else {
+                    uiHelper.showToastNotification(`操作失败: ${result.error}`, 'error');
+                }
+            } catch (error) {
+                uiHelper.showToastNotification(`操作失败: ${error.message}`, 'error');
+            }
+        };
+        menu.appendChild(toggleUnreadOption);
+
+        const deleteTopicPermanentlyOption = document.createElement('div');
+        deleteTopicPermanentlyOption.classList.add('context-menu-item', 'danger-item');
+        deleteTopicPermanentlyOption.innerHTML = `<i class="fas fa-trash-alt"></i> 删除此话题`;
+        deleteTopicPermanentlyOption.onclick = async () => {
+            closeTopicContextMenu();
+
+            // 活动 Flowlock Session 仍依赖该话题的历史目录，运行期间禁止删除。
+            if (targetItemType === 'agent' && window.flowlockManager?.isTopicLocked?.(targetItemId, targetTopicId)) {
+                uiHelper.showToastNotification('该话题正在心流锁中运行，请先停止对应 Agent 的心流锁。', 'warning');
+                return;
+            }
+
+            // 使用自定义确认对话框替代原生 confirm()，避免 Electron 焦点问题
+            const confirmed = await uiHelper.showConfirmDialog(
+                `确定要永久删除话题 "${topic.name}" 吗？此操作不可撤销。`,
+                '删除话题',
+                '删除',
+                '取消',
+                true // isDanger
+            );
+            if (confirmed) {
+                let result;
+                if (targetItemType === 'agent') {
+                    result = await electronAPI.deleteTopic(targetItemId, targetTopicId);
+                } else if (targetItemType === 'group') {
+                    result = await electronAPI.deleteGroupTopic(targetItemId, targetTopicId);
+                }
+
+                if (result && result.success) {
+                    mainRendererFunctions.onTopicsDeleted?.({ itemId: targetItemId, itemType: targetItemType, topicIds: [targetTopicId] });
+                    if (currentSelectedItemRef.get()?.id === targetItemId &&
+                        currentSelectedItemRef.get()?.type === targetItemType &&
+                        currentTopicIdRef.get() === targetTopicId) {
+                        mainRendererFunctions.handleTopicDeletion(result.remainingTopics, {
+                            id: targetItemId,
+                            type: targetItemType,
+                            topicId: targetTopicId,
+                            fallbackTopicId: itemFullConfig.topics?.find(candidate => candidate.id !== topic.id)?.id || null,
+                        });
+                    }
+                    loadTopicList();
+                } else {
+                    uiHelper.showToastNotification(`删除话题 "${topic.name}" 失败: ${result ? result.error : '未知错误'}`, 'error');
+                }
+            }
+        };
+        menu.appendChild(deleteTopicPermanentlyOption);
+
+        const exportTopicOption = document.createElement('div');
+        exportTopicOption.classList.add('context-menu-item');
+        exportTopicOption.innerHTML = `<i class="fas fa-file-export"></i> 导出此话题`;
+        exportTopicOption.onclick = () => {
+            closeTopicContextMenu();
+            handleExportTopic(itemFullConfig.id, itemType, topic.id, topic.name);
+        };
+        menu.appendChild(exportTopicOption);
+
+        const exportFullTopicOption = document.createElement('div');
+        exportFullTopicOption.classList.add('context-menu-item');
+        exportFullTopicOption.innerHTML = `<i class="fas fa-file-code"></i> 导出此话题(完整)`;
+        exportFullTopicOption.onclick = () => {
+            closeTopicContextMenu();
+            handleExportFullTopic(itemFullConfig, itemType, topic.id, topic.name);
+        };
+        menu.appendChild(exportFullTopicOption);
+
+        // 智能定位逻辑：先隐藏菜单以测量尺寸
+        menu.style.visibility = 'hidden';
+        menu.style.position = 'absolute';
+        document.body.appendChild(menu);
+
+        // 获取菜单和窗口尺寸
+        const menuWidth = menu.offsetWidth;
+        const menuHeight = menu.offsetHeight;
+        const windowWidth = window.innerWidth;
+        const windowHeight = window.innerHeight;
+
+        let top = event.clientY;
+        let left = event.clientX;
+
+        // 检查菜单是否会超出窗口底部
+        if (top + menuHeight > windowHeight) {
+            // 将菜单显示在鼠标上方
+            top = event.clientY - menuHeight;
+            // 如果上方空间也不够，则贴近顶部
+            if (top < 0) top = 5;
+        }
+
+        // 检查菜单是否会超出窗口右侧
+        if (left + menuWidth > windowWidth) {
+            // 将菜单显示在鼠标左侧
+            left = event.clientX - menuWidth;
+            // 如果左侧空间也不够，则贴近左边
+            if (left < 0) left = 5;
+        }
+
+        // 应用最终位置并显示菜单
+        menu.style.top = `${top}px`;
+        menu.style.left = `${left}px`;
+        menu.style.visibility = 'visible';
+
+        document.addEventListener('click', closeTopicContextMenuOnClickOutside, true);
+    }
+
+    function closeTopicContextMenu() {
+        const existingMenu = document.getElementById('topicContextMenu');
+        if (existingMenu) {
+            existingMenu.remove();
+            document.removeEventListener('click', closeTopicContextMenuOnClickOutside, true);
+        }
+    }
+
+    function closeTopicContextMenuOnClickOutside(event) {
+        const menu = document.getElementById('topicContextMenu');
+        if (menu && !menu.contains(event.target)) {
+            closeTopicContextMenu();
+        }
+    }
+
+    async function handleExportTopic(itemId, itemType, topicId, topicName) {
+        const currentTopicId = currentTopicIdRef.get();
+        if (topicId !== currentTopicId) {
+            uiHelper.showToastNotification('请先点击并加载此话题，然后再导出。', 'info');
+            return;
+        }
+
+        console.log(`[TopicListManager] Exporting currently visible topic: ${topicName} (ID: ${topicId})`);
+
+        try {
+            const chatMessagesDiv = document.getElementById('chatMessages');
+            if (!chatMessagesDiv) {
+                console.error('[Export Debug] chatMessagesDiv not found!');
+                uiHelper.showToastNotification('错误：找不到聊天内容容器。', 'error');
+                return;
+            }
+
+            const messageItems = chatMessagesDiv.querySelectorAll('.message-item');
+            console.log(`[Export Debug] Found ${messageItems.length} message items.`);
+            if (messageItems.length === 0) {
+                uiHelper.showToastNotification('此话题没有可见的聊天内容可导出。', 'info');
+                return;
+            }
+
+            let markdownContent = `# 话题: ${topicName}\n\n`;
+            let extractedCount = 0;
+
+            messageItems.forEach((item, index) => {
+                if (item.classList.contains('system') || item.classList.contains('thinking')) {
+                    console.log(`[Export Debug] Skipping system/thinking message at index ${index}.`);
+                    return;
+                }
+
+                const senderElement = item.querySelector('.sender-name');
+                const contentElement = item.querySelector('.md-content');
+
+                if (senderElement && contentElement) {
+                    const sender = senderElement.textContent.trim().replace(':', '');
+                    // 克隆节点，移除思维链气泡（<think> 已被渲染为 DOM 节点，innerText 会包含其文本）
+                    const contentClone = contentElement.cloneNode(true);
+                    contentClone.querySelectorAll('.vcp-thought-chain-bubble').forEach(el => el.remove());
+                    let content = contentClone.innerText || contentClone.textContent || "";
+                    // 兜底：仅清理起止标签分别独占一行的明文思维链。
+                    content = content.replace(/^[ \t]*\[--- VCP元思考链(?::\s*"[^"]*")?\s*---\][ \t]*\r?\n[\s\S]*?^[ \t]*\[--- 元思考链结束 ---\][ \t]*(?:\r?\n|$)/gm, '');
+                    content = content.replace(/^[ \t]*<think(?:ing)?>[ \t]*\r?\n[\s\S]*?^[ \t]*<\/think(?:ing)?>[ \t]*(?:\r?\n|$)/gim, '');
+                    content = content.trim();
+
+                    if (sender && content) {
+                        markdownContent += `**${sender}**: ${content}\n\n---\n\n`;
+                        extractedCount++;
+                    } else {
+                        console.log(`[Export Debug] Skipping message at index ${index} due to empty sender or content. Sender: "${sender}", Content: "${content}"`);
+                    }
+                } else {
+                    console.log(`[Export Debug] Skipping message at index ${index} because sender or content element was not found.`);
+                }
+            });
+
+            console.log(`[Export Debug] Extracted ${extractedCount} messages. Final markdown length: ${markdownContent.length}`);
+
+            if (extractedCount === 0) {
+                uiHelper.showToastNotification('未能从当前话题中提取任何有效对话内容。', 'warning');
+                return;
+            }
+
+            const result = await electronAPI.exportTopicAsMarkdown({
+                topicName: topicName,
+                markdownContent: markdownContent
+            });
+
+            if (result.success) {
+                uiHelper.showToastNotification(`话题 "${topicName}" 已成功导出到: ${result.path}`);
+            } else {
+                uiHelper.showToastNotification(`导出话题失败: ${result.error}`, 'error');
+            }
+        } catch (error) {
+            console.error(`[TopicListManager] 导出话题时发生错误:`, error);
+            uiHelper.showToastNotification(`导出话题时发生前端错误: ${error.message}`, 'error');
+        }
+    }
+
+    function getRawMessageContent(message) {
+        if (typeof message?.content === 'string') return message.content;
+        if (typeof message?.content?.text === 'string') return message.content.text;
+        if (Array.isArray(message?.content)) {
+            return message.content
+                .filter(part => part && part.type === 'text' && typeof part.text === 'string')
+                .map(part => part.text)
+                .join('\n');
+        }
+        if (message?.content === null || message?.content === undefined) return '';
+        try {
+            return JSON.stringify(message.content, null, 2);
+        } catch {
+            return String(message.content);
+        }
+    }
+
+    function resolveFullExportAgentInfo(message, itemFullConfig, itemType) {
+        if (message.role === 'user') {
+            return {
+                name: message.name || '用户',
+                model: 'N/A'
+            };
+        }
+
+        if (itemType === 'group') {
+            const agentId = message.agentId || message.agentID;
+            const member = (itemFullConfig.agents || []).find(agent =>
+                agent.id === agentId || agent.agentId === agentId
+            );
+            const usesUnifiedModel = itemFullConfig.useUnifiedModel === true;
+            return {
+                name: message.name || member?.name || agentId || 'Assistant',
+                model: message.model || message.modelName ||
+                    (usesUnifiedModel ? itemFullConfig.unifiedModel : member?.model) ||
+                    '未知模型'
+            };
+        }
+
+        return {
+            name: message.name || itemFullConfig.name || itemFullConfig.id || 'Assistant',
+            model: message.model || message.modelName || itemFullConfig.model || '未知模型'
+        };
+    }
+
+    async function handleExportFullTopic(itemFullConfig, itemType, topicId, topicName) {
+        console.log(`[TopicListManager] Exporting full raw topic: ${topicName} (ID: ${topicId})`);
+
+        try {
+            const history = await getHistory(itemFullConfig.id, itemType, topicId);
+
+            if (!Array.isArray(history)) {
+                throw new Error(history?.error || '无法读取话题历史');
+            }
+
+            const messages = history.filter(message =>
+                message &&
+                message.role !== 'system' &&
+                message.isThinking !== true
+            );
+
+            if (messages.length === 0) {
+                uiHelper.showToastNotification('此话题没有可导出的对话内容。', 'info');
+                return;
+            }
+
+            let exportContent = `# 话题: ${topicName}\n\n`;
+            exportContent += `> 导出模式: 完整（保留原始消息内容）\n\n`;
+
+            messages.forEach((message, index) => {
+                const { name, model } = resolveFullExportAgentInfo(message, itemFullConfig, itemType);
+                const rawContent = getRawMessageContent(message);
+
+                exportContent += `===== 消息 ${index + 1} =====\n`;
+                exportContent += `Role: ${message.role || 'unknown'}\n`;
+                exportContent += `Agent: ${name}\n`;
+                exportContent += `Model: ${model}\n`;
+                if (message.timestamp) {
+                    exportContent += `Timestamp: ${new Date(message.timestamp).toISOString()}\n`;
+                }
+                exportContent += `\n${rawContent}\n\n`;
+            });
+
+            const result = await electronAPI.exportTopicAsMarkdown({
+                topicName: `${topicName}-完整`,
+                markdownContent: exportContent
+            });
+
+            if (result.success) {
+                uiHelper.showToastNotification(`话题 "${topicName}" 已完整导出到: ${result.path}`);
+            } else if (result.error !== '用户取消了导出操作。') {
+                uiHelper.showToastNotification(`完整导出话题失败: ${result.error}`, 'error');
+            }
+        } catch (error) {
+            console.error('[TopicListManager] 完整导出话题时发生错误:', error);
+            uiHelper.showToastNotification(`完整导出话题失败: ${error.message}`, 'error');
+        }
+    }
+
+    /**
+     * 设置鼠标快捷键事件监听器
+     */
+    function setupMouseShortcuts() {
+        const topicsContainer = document.getElementById('tabContentTopics');
+        if (!topicsContainer) {
+            console.warn('[TopicListManager] 话题容器未找到，跳过鼠标快捷键设置');
+            return;
+        }
+
+        let lastLeftClickTime = 0;
+
+        // 双击左键：进入设置页面
+        addListener(topicsContainer, 'click', (e) => {
+            if (isManageMode) return;
+            if (e.target.closest('button, input, .topics-header-container, .next-ui-topic-manage-panel')) return;
+            if (e.button === 0) { // 左键
+                const currentTime = Date.now();
+                const timeDiff = currentTime - lastLeftClickTime;
+
+                if (timeDiff < 300) { // 双击检测（300ms内）
+                    console.log('[TopicListManager] 检测到双击左键，进入设置页面');
+                    e.preventDefault();
+                    e.stopPropagation();
+
+                    // 切换到设置页面
+                    if (uiManager && typeof uiManager.switchToTab === 'function') {
+                        uiManager.switchToTab('settings');
+                    } else {
+                        console.warn('[TopicListManager] uiManager不可用，无法切换到设置页面');
+                    }
+                }
+
+                lastLeftClickTime = currentTime;
+            }
+        });
+
+        // 中键点击：返回助手页面
+        addListener(topicsContainer, 'auxclick', (e) => {
+            if (e.button === 1) { // 中键
+                console.log('[TopicListManager] 检测到中键点击，返回助手页面');
+                e.preventDefault();
+                e.stopPropagation();
+
+                // 切换到助手页面
+                if (uiManager && typeof uiManager.switchToTab === 'function') {
+                    uiManager.switchToTab('agents');
+                    // 重置助手页面的鼠标事件状态，确保双击功能正常工作
+                    if (itemListManager && typeof itemListManager.resetMouseEventStates === 'function') {
+                        itemListManager.resetMouseEventStates();
+                    }
+                } else {
+                    console.warn('[TopicListManager] uiManager不可用，无法切换到助手页面');
+                }
+            }
+        });
+
+        // 防止中键点击的默认行为
+        addListener(topicsContainer, 'mousedown', (e) => {
+            if (e.button === 1) { // 中键
+                e.preventDefault();
+            }
+        });
+
+        console.log('[TopicListManager] 鼠标快捷键设置完成');
+    }
+
+    function dispose() {
+        cancelPendingTopicSearch();
+        cleanupProgressiveTopicRendering();
+        closeTopicContextMenu();
+        selectedTopicIds.clear();
+        displayedTopics = [];
+        availableTopics = [];
+        currentItemConfig = null;
+        managedItemKey = '';
+        topicListContainer = null;
+        listenerOwner = null;
+    }
+
+    // --- Public API ---
+    return {
+        init,
+        loadTopicList,
+        setupTopicSearch,
+        showTopicContextMenu,
+        setupMouseShortcuts,
+        dispose
+    };
+})();

From 1b0da7b83889ad80d67cad1bec693e9d1d261009 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 02:04:00 +0000
Subject: [PATCH 071/143] PowerShellExecutor.js: restore CRLF line endings

eceb23ed (#4) rewrote the file with LF for a 10-line change.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01UCGGgmHsCToooXTgSXpmq9
---
 .../PowerShellExecutor/PowerShellExecutor.js  | 3918 ++++++++---------
 1 file changed, 1959 insertions(+), 1959 deletions(-)

diff --git a/VCPDistributedServer/Plugin/PowerShellExecutor/PowerShellExecutor.js b/VCPDistributedServer/Plugin/PowerShellExecutor/PowerShellExecutor.js
index 2184ef9eb..96a0ae662 100644
--- a/VCPDistributedServer/Plugin/PowerShellExecutor/PowerShellExecutor.js
+++ b/VCPDistributedServer/Plugin/PowerShellExecutor/PowerShellExecutor.js
@@ -1,1960 +1,1960 @@
-// node-pty 是原生模块：只读命令记录、不开终端时不加载它，真正创建会话时才 require
-let ptyModule = null;
-function loadPty() {
-    return ptyModule || (ptyModule = require('node-pty'));
-}
-const os = require('os');
-const { spawn } = require('child_process');
-const path = require('path');
-const fs = require('fs');
-const crypto = require('crypto');
-const { BrowserWindow, ipcMain, clipboard } = require('electron');
-const tmp = require('tmp');
-const chokidar = require('chokidar');
-const { CommandOutputParser } = require('./command-output-parser');
-const { sanitizeTerminalOutput } = require('./terminalOutputSanitizer');
-// 命令运行记录放在无副作用的独立模块里：主进程只读记录时不必加载整个执行器
-const {
-    COMMAND_RUN_RAW_LIMIT,
-    beginCommandRun,
-    appendCommandRunOutput,
-    finishCommandRun,
-    listCommandRuns,
-    getCommandRun,
-    subscribeCommandRuns,
-} = require('./commandRunStore');
-const { resolveConfirmationScript } = require('./nativeHelperPath.js');
-
-// --- GUI Window Management ---
-let guiWindow = null;
-let guiReady = false;
-let guiReadyPromise = Promise.resolve();
-let resolveGuiReady = null;
-
-function createGuiReadyBarrier() {
-    guiReady = false;
-    guiReadyPromise = new Promise((resolve) => {
-        resolveGuiReady = resolve;
-    });
-}
-
-async function waitForGuiReady(timeoutMs = 15000) {
-    if (!guiWindow || guiWindow.isDestroyed()) {
-        throw new Error('PowerShell GUI window is not available.');
-    }
-
-    if (guiReady) {
-        return;
-    }
-
-    const targetWebContents = guiWindow.webContents;
-    let timeoutId = null;
-
-    try {
-        await Promise.race([
-            guiReadyPromise,
-            new Promise((_, reject) => {
-                timeoutId = setTimeout(() => {
-                    reject(new Error(`PowerShell GUI initialization timed out after ${timeoutMs}ms.`));
-                }, timeoutMs);
-            })
-        ]);
-    } finally {
-        if (timeoutId) {
-            clearTimeout(timeoutId);
-        }
-    }
-
-    if (!guiWindow || guiWindow.isDestroyed() || guiWindow.webContents !== targetWebContents || !guiReady) {
-        throw new Error('PowerShell GUI window changed or closed during initialization.');
-    }
-}
-
-function ensureGuiWindow() {
-    if (guiWindow && !guiWindow.isDestroyed()) {
-        guiWindow.focus();
-        return guiWindow;
-    }
-
-    createGuiReadyBarrier();
-    guiWindow = new BrowserWindow({
-        width: 800,
-        height: 600,
-        title: 'VCP PowerShell Executor',
-        frame: false, // 禁用窗口边框
-        ...(process.platform === 'darwin' ? {} : { titleBarStyle: 'hidden' }),
-        webPreferences: {
-            preload: path.join(__dirname, 'gui', 'preload.js'),
-            nodeIntegration: false, // 禁用 Node.js 集成以增强安全性
-            contextIsolation: true, // 启用上下文隔离
-            spellcheck: false,
-            // 将 node_modules 的路径作为参数传递给窗口，以便在 HTML 中使用
-            additionalArguments: [`--node-modules-path=${path.join(__dirname, '..', '..', '..', '..', 'node_modules')}`]
-        },
-        autoHideMenuBar: true,
-    });
-
-    guiWindow.loadFile(path.join(__dirname, 'gui', 'PowerShellViewer.html'));
-
-    guiWindow.on('closed', () => {
-        guiReady = false;
-        if (resolveGuiReady) {
-            resolveGuiReady();
-            resolveGuiReady = null;
-        }
-        guiWindow = null;
-        // 当GUI关闭时，也终止关联的 pty 进程
-        if (ptyProcess) {
-            try {
-                ptyProcess.kill();
-                console.log('[PowerShellExecutor] GUI closed, associated pty process terminated.');
-            } catch (e) {
-                console.error('[PowerShellExecutor] Error terminating pty process on GUI close:', e);
-            }
-            // ptyProcess 的 onExit 事件处理器会自动将其设置为 null 并从 childProcesses 集合中移除
-        }
-    });
-
-    return guiWindow;
-}
-
-// --- 主题管理与文件监视 ---
-const settingsPath = path.join(__dirname, '..', '..', '..', 'AppData', 'settings.json');
-let settingsWatcher = null;
-let lastSentTheme = null; // 用于存储上一次发送的主题名称
-
-/**
- * 读取、比较并发送主题更新。
- * 只有当主题名称实际发生变化时，才会向GUI发送事件。
- * @param {Electron.WebContents} targetWebContents - 目标窗口的 webContents。
- * @param {boolean} [forceSend=false] - 是否强制发送，即使用于初始化。
- */
-function sendThemeUpdate(targetWebContents, forceSend = false) {
-    if (!targetWebContents || targetWebContents.isDestroyed()) {
-        return;
-    }
-    try {
-        let currentTheme = 'dark'; // 默认主题
-        if (fs.existsSync(settingsPath)) {
-            const settings = JSON.parse(fs.readFileSync(settingsPath, 'utf-8'));
-            currentTheme = settings.currentThemeMode || 'dark';
-        }
-
-        // 只有当主题变化或强制发送时，才进行通信
-        if (currentTheme !== lastSentTheme || forceSend) {
-            targetWebContents.send('theme-init', { themeName: currentTheme });
-            lastSentTheme = currentTheme; // 更新已发送的主题记录
-            console.log(`[PowerShellExecutor] Theme updated to: ${currentTheme}`);
-        }
-    } catch (error) {
-        console.error('[PowerShellExecutor] Error reading or sending theme settings:', error);
-    }
-}
-
-// 初始化文件监视器
-function setupThemeWatcher() {
-    if (settingsWatcher) {
-        settingsWatcher.close();
-    }
-    settingsWatcher = chokidar.watch(settingsPath, {
-        persistent: true,
-        ignoreInitial: true
-    });
-
-    settingsWatcher.on('change', () => {
-        if (guiWindow && !guiWindow.isDestroyed()) {
-            sendThemeUpdate(guiWindow.webContents);
-        }
-    });
-}
-
-// 在插件加载时启动监视
-setupThemeWatcher();
-
-
-// 监听来自GUI的“就绪”信号。
-// 只有当前窗口在 xterm 挂载、IPC 监听注册和首次 fit 完成后发出的信号才能解除屏障；
-// 旧窗口的迟到消息不能误解锁新窗口。
-ipcMain.on('powershell-gui-ready', (event) => {
-    if (!guiWindow || guiWindow.isDestroyed() || event.sender !== guiWindow.webContents) {
-        return;
-    }
-
-    guiReady = true;
-    if (resolveGuiReady) {
-        resolveGuiReady();
-        resolveGuiReady = null;
-    }
-
-    sendThemeUpdate(event.sender, true);
-});
-
-// 监听来自GUI的用户命令
-ipcMain.on('powershell-command', (event, command) => {
-    if (ptyProcess && command) {
-        // 将用户输入的命令写入 pty 进程
-        ptyProcess.write(`${command}\r`);
-    }
-});
-
-// 监听来自GUI的复制请求
-ipcMain.on('copy-to-clipboard', (event, text) => {
-    if (text) {
-        clipboard.writeText(text);
-    }
-});
-
-// 监听来自GUI的粘贴请求
-ipcMain.handle('read-from-clipboard', () => {
-    return clipboard.readText();
-});
-
-// 监听来自GUI的尺寸调整请求
-function applyPtyResize(cols, rows) {
-    const normalizedCols = Number(cols);
-    const normalizedRows = Number(rows);
-
-    if (Number.isInteger(normalizedCols) && Number.isInteger(normalizedRows) && normalizedCols > 0 && normalizedRows > 0) {
-        lastKnownSize = { cols: normalizedCols, rows: normalizedRows };
-    }
-
-    if (ptyProcess) {
-        try {
-            ptyProcess.resize(lastKnownSize.cols, lastKnownSize.rows);
-        } catch (e) {
-            console.error('[PowerShellExecutor] Failed to resize pty:', e);
-        }
-    }
-}
-
-ipcMain.on('powershell-resize', (event, { cols, rows }) => {
-    applyPtyResize(cols, rows);
-});
-
-// 监听来自GUI的真实终端输入透传。
-// 安全声明：此通道等价于用户直接操作本机终端，不经过 intelligentSecurityCheck；
-// forbiddenCommands/authRequiredCommands 仅约束 AI 工具调用路径 processToolCall。
-ipcMain.on('powershell-input', (event, data) => {
-    if (ptyProcess && typeof data === 'string') {
-        ptyProcess.write(data);
-    }
-});
-
-// --- 查询终端可见文本与 xterm 粘贴响应 ---
-const visibleTextResolvers = new Map();
-const terminalPasteResolvers = new Map();
-
-ipcMain.on('visible-text-response', (event, payload, legacyText) => {
-    if (!isPowerShellGuiSender(event)) {
-        return;
-    }
-
-    // 兼容旧渲染端直接返回字符串的格式。
-    if (typeof payload === 'string') {
-        const firstEntry = visibleTextResolvers.entries().next().value;
-        if (firstEntry) {
-            const [requestId, resolve] = firstEntry;
-            visibleTextResolvers.delete(requestId);
-            resolve(payload);
-        }
-        return;
-    }
-
-    const requestId = payload && payload.requestId;
-    const resolver = requestId ? visibleTextResolvers.get(requestId) : null;
-    if (resolver) {
-        visibleTextResolvers.delete(requestId);
-        resolver(typeof payload.text === 'string' ? payload.text : (legacyText || ''));
-    }
-});
-
-ipcMain.on('terminal-paste-complete', (event, payload) => {
-    if (!isPowerShellGuiSender(event)) {
-        return;
-    }
-
-    const requestId = payload && payload.requestId;
-    const resolver = requestId ? terminalPasteResolvers.get(requestId) : null;
-    if (resolver) {
-        terminalPasteResolvers.delete(requestId);
-        resolver();
-    }
-});
-
-// --- PowerShell GUI 专属窗口控制 ---
-// 不复用应用级 minimize-window/maximize-window/close-window：ipcMain 是全局事件总线，
-// 使用通用通道会让日志中心等其它窗口的操作也落到此 guiWindow 上；而 PowerShell
-// 自身的消息还会与应用级处理器重复执行（最大化切换两次后等同于没有变化）。
-function isPowerShellGuiSender(event) {
-    return Boolean(
-        event
-        && guiWindow
-        && !guiWindow.isDestroyed()
-        && guiWindow.webContents
-        && !guiWindow.webContents.isDestroyed()
-        && event.sender === guiWindow.webContents
-    );
-}
-
-ipcMain.on('powershell-window:minimize', (event) => {
-    if (isPowerShellGuiSender(event)) {
-        guiWindow.minimize();
-    }
-});
-
-ipcMain.on('powershell-window:toggle-maximize', (event) => {
-    if (!isPowerShellGuiSender(event)) {
-        return;
-    }
-
-    if (guiWindow.isMaximized()) {
-        guiWindow.unmaximize();
-    } else {
-        guiWindow.maximize();
-    }
-});
-
-ipcMain.on('powershell-window:close', (event) => {
-    if (isPowerShellGuiSender(event)) {
-        guiWindow.close();
-    }
-});
-
-// --- ANSI / terminal control projection for AI text summaries ---
-// 清洗逻辑在 terminalOutputSanitizer.js（纯函数，命令运行记录也用它）
-
-// --- 模块级状态 ---
-// 用于保存持久化的伪终端（PowerShell）进程
-let ptyProcess = null;
-// 移除 fullTerminalHistory，后端不再维护终端内容的完整状态
-// 新增：用于跟踪所有子进程，确保它们在插件卸载或程序退出时被正确清理
-const childProcesses = new Set();
-let guiDataListener = null; // 新增：保存GUI监听器的引用
-let isExecutingCommand = false; // 仅表示 AI 短命令执行中；不要用于交互式 TUI 会话
-let interactiveMode = false; // 表示当前 PTY 被 snow/codex/claude 等交互式程序占用
-let activeCommandAbort = null; // 当前同步命令的本地等待中止器；供并发 interrupt 工具调用解除阻塞
-let lastKnownSize = { cols: 80, rows: 24 }; // GUI 最近一次 fit 出来的尺寸，用作 PTY 初始尺寸
-let ptyReadyPromise = Promise.resolve();
-
-// --- 配置加载 ---
-const defaultConfig = {
-    returnMode: 'delta', // 默认为增量模式
-    forbiddenCommands: [],
-    authRequiredCommands: []
-};
-
-try {
-    const configPath = path.join(__dirname, 'config.env');
-    if (fs.existsSync(configPath)) {
-        const configContent = fs.readFileSync(configPath, 'utf-8');
-
-        const returnModeMatch = configContent.match(/^POWERSHELL_RETURN_MODE\s*=\s*(delta|full)/m);
-        if (returnModeMatch) {
-            defaultConfig.returnMode = returnModeMatch[1];
-        }
-
-        const forbiddenMatch = configContent.match(/^FORBIDDEN_COMMANDS\s*=\s*(.*)/m);
-        if (forbiddenMatch && forbiddenMatch[1]) {
-            defaultConfig.forbiddenCommands = forbiddenMatch[1].split(',').map(c => c.trim().toLowerCase()).filter(c => c);
-        }
-
-        const authRequiredMatch = configContent.match(/^AUTH_REQUIRED_COMMANDS\s*=\s*(.*)/m);
-        if (authRequiredMatch && authRequiredMatch[1]) {
-            defaultConfig.authRequiredCommands = authRequiredMatch[1].split(',').map(c => c.trim().toLowerCase()).filter(c => c);
-        }
-    }
-} catch (error) {
-    console.error('[PowerShellExecutor] Error reading config.env:', error);
-}
-
-
-/**
- * 智能安全检查函数 - 区分命令关键字和路径内容
- * @param {string} command - 要检查的命令字符串
- * @param {string[]} forbiddenKeywords - 禁止的关键字列表
- * @param {string[]} authRequiredKeywords - 需要授权的关键字列表
- * @returns {object} - 检查结果 {isForbidden: boolean, needsAuth: boolean, matchedKeyword: string}
- */
-function intelligentSecurityCheck(command, forbiddenKeywords, authRequiredKeywords) {
-    const result = {
-        isForbidden: false,
-        needsAuth: false,
-        matchedKeyword: null,
-        reason: null
-    };
-
-    // 预处理命令：移除多余空格，转换为小写
-    const normalizedCommand = command.trim().toLowerCase();
-
-    // 如果命令为空，直接返回
-    if (!normalizedCommand) {
-        return result;
-    }
-
-    // 定义路径模式 - 常见的Windows和Unix路径格式
-    const pathPatterns = [
-        /[a-z]:\\[^\\/:*?"<>|]*(?:\\[^\\/:*?"<>|]*)*\\?/gi,  // Windows路径 C:\path\to\file
-        /\/[^\/\s]*(?:\/[^\/\s]*)*\/?/g,                      // Unix路径 /path/to/file
-        /\$env:[a-z_]+[^\\/:*?"<>|\s]*/gi,                   // PowerShell环境变量路径
-        /\${[^}]+}[^\\/:*?"<>|\s]*/gi,                       // 变量路径 ${VAR}/path
-        /~\/[^\/\s]*(?:\/[^\/\s]*)*\/?/g                     // 用户目录路径 ~/path
-    ];
-
-    // 提取所有可能的路径
-    const detectedPaths = [];
-    pathPatterns.forEach(pattern => {
-        const matches = normalizedCommand.match(pattern);
-        if (matches) {
-            detectedPaths.push(...matches);
-        }
-    });
-
-    // 创建不包含路径的命令版本用于安全检查
-    let commandWithoutPaths = normalizedCommand;
-    detectedPaths.forEach(path => {
-        // 将路径替换为占位符，避免路径中的关键字被误判
-        commandWithoutPaths = commandWithoutPaths.replace(path.toLowerCase(), ' __PATH_PLACEHOLDER__ ');
-    });
-
-    // 清理命令：移除多余空格
-    commandWithoutPaths = commandWithoutPaths.replace(/\s+/g, ' ').trim();
-
-    // 定义PowerShell命令结构模式
-    const commandStructurePatterns = [
-        // PowerShell cmdlet模式: Verb-Noun
-        /\b[a-z]+-[a-z]+\b/g,
-        // 常见命令
-        /\b(?:get|set|new|remove|copy|move|invoke|start|stop|restart|test|clear|add|export|import|select|where|foreach|sort|group|measure|compare|out|write|read)\b/g,
-        // 参数模式
-        /\s-[a-z]+\b/g
-    ];
-
-    // 检查禁止的关键字
-    for (const keyword of forbiddenKeywords) {
-        if (!keyword) continue;
-
-        const keywordLower = keyword.toLowerCase();
-
-        // 1. 首先检查是否在路径中
-        const isInPath = detectedPaths.some(path =>
-            path.toLowerCase().includes(keywordLower)
-        );
-
-        if (isInPath) {
-            // 如果关键字只在路径中出现，检查是否也在命令部分出现
-            if (!commandWithoutPaths.includes(keywordLower)) {
-                console.log(`[PowerShellExecutor] 安全检查：关键字 "${keyword}" 仅在路径中发现，允许执行`);
-                continue; // 跳过这个关键字，不视为违规
-            }
-        }
-
-        // 2. 检查命令部分是否包含关键字
-        if (commandWithoutPaths.includes(keywordLower)) {
-            // 3. 进一步验证：检查关键字是否作为独立的命令或参数出现
-            const wordBoundaryPattern = new RegExp(`\\b${keywordLower.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\b`);
-
-            if (wordBoundaryPattern.test(commandWithoutPaths)) {
-                result.isForbidden = true;
-                result.matchedKeyword = keyword;
-                result.reason = `命令包含被禁止的关键字: ${keyword}`;
-                console.log(`[PowerShellExecutor] 安全检查：发现禁止的命令关键字 "${keyword}"`);
-                return result;
-            }
-        }
-    }
-
-    // 检查需要授权的关键字（使用相同的逻辑）
-    for (const keyword of authRequiredKeywords) {
-        if (!keyword) continue;
-
-        const keywordLower = keyword.toLowerCase();
-
-        // 1. 首先检查是否在路径中
-        const isInPath = detectedPaths.some(path =>
-            path.toLowerCase().includes(keywordLower)
-        );
-
-        if (isInPath) {
-            // 如果关键字只在路径中出现，检查是否也在命令部分出现
-            if (!commandWithoutPaths.includes(keywordLower)) {
-                console.log(`[PowerShellExecutor] 安全检查：授权关键字 "${keyword}" 仅在路径中发现，不需要授权`);
-                continue; // 跳过这个关键字，不需要授权
-            }
-        }
-
-        // 2. 检查命令部分是否包含关键字
-        if (commandWithoutPaths.includes(keywordLower)) {
-            // 3. 进一步验证：检查关键字是否作为独立的命令或参数出现
-            const wordBoundaryPattern = new RegExp(`\\b${keywordLower.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\b`);
-
-            if (wordBoundaryPattern.test(commandWithoutPaths)) {
-                result.needsAuth = true;
-                result.matchedKeyword = keyword;
-                result.reason = `命令包含需要授权的关键字: ${keyword}`;
-                console.log(`[PowerShellExecutor] 安全检查：发现需要授权的命令关键字 "${keyword}"`);
-                // 注意：不要return，继续检查其他关键字
-            }
-        }
-    }
-
-    return result;
-}
-
-/**
- * 启动一个独立的 Python GUI 脚本来请求管理员权限并执行命令。
- * 这是一个"即发即忘"的操作，它会打开一个全新的、独立的管理员终端窗口。
- * @param {string} command - 需要以管理员权限执行的命令。
- * @returns {Promise<string>} - 一个解析为提示信息的消息。
- */
-function executeAdminCommand(command) {
-    return new Promise((resolve, reject) => {
-        // 1. 创建一个临时的输出文件
-        tmp.file({ postfix: '.txt' }, (err, tmpFilePath, fd, cleanupCallback) => {
-            if (err) {
-                return reject(new Error(`无法创建临时文件: ${err.message}`));
-            }
-
-            let pythonConfirmScript;
-            try { pythonConfirmScript = resolveConfirmationScript(__dirname); }
-            catch (error) { cleanupCallback(); reject(error); return; }
-            const commandAsBase64 = Buffer.from(command).toString('base64');
-
-            // 2. 准备传递给Python脚本的参数
-            const scriptPathForPS = pythonConfirmScript.replace(/'/g, "''");
-            const commandForPS = commandAsBase64.replace(/'/g, "''");
-            const tmpPathForPS = tmpFilePath.replace(/'/g, "''");
-            const argumentList = `"${scriptPathForPS}", "${commandForPS}", "${tmpPathForPS}"`;
-
-            // 3. 构造PowerShell命令以管理员权限运行Python脚本（捕获UAC异常并注入纯ASCII标记）
-            const psCommand = `$ErrorActionPreference = 'Stop'; try { Start-Process -FilePath "pythonw.exe" -ArgumentList ${argumentList} -Verb RunAs -Wait } catch { [Console]::Error.WriteLine('UAC_CANCELLED_OR_FAILED: ' + $_.Exception.Message) }`;
-            const child = spawn('powershell.exe', [
-                '-NoProfile',
-                '-ExecutionPolicy', 'Bypass',
-                '-Command', psCommand
-            ], {
-                windowsHide: true
-            });
-            childProcesses.add(child); // 跟踪进程
-
-            let stderrOutput = '';
-            let isSettled = false;
-
-            // 310 秒外部安全定时器守护，防止后台卡死挂起 (Todo #3)
-            const safetyTimeout = setTimeout(() => {
-                if (isSettled) return;
-                isSettled = true;
-                try {
-                    child.kill();
-                } catch { }
-                childProcesses.delete(child);
-                cleanupCallback();
-                resolve({
-                    isCancelled: true,
-                    content: [{
-                        type: 'text',
-                        text: '⚠️ [操作超时]：等待管理员确认超时（超过无操作安全时限），系统已自动拒绝执行。'
-                    }]
-                });
-            }, 310000);
-
-            child.stderr.on('data', (data) => {
-                stderrOutput += data.toString('utf-8');
-            });
-
-            child.on('error', (err) => {
-                if (isSettled) return;
-                isSettled = true;
-                clearTimeout(safetyTimeout);
-                childProcesses.delete(child); // 停止跟踪
-                cleanupCallback(); // 清理临时文件
-                reject(new Error(`无法启动PowerShell包装脚本: ${err.message}`));
-            });
-
-            child.on('close', (code) => {
-                if (isSettled) return;
-                isSettled = true;
-                clearTimeout(safetyTimeout);
-                childProcesses.delete(child); // 停止跟踪
-                // PowerShell脚本执行完毕，安全读取临时文件内容
-                fs.readFile(tmpFilePath, 'utf-8', (readErr, data) => {
-                    cleanupCallback(); // 确保清理临时文件
-
-                    // 检测 UAC 取消或拒绝错误（显式捕获标记、0x800704C7 或中文取消提示）
-                    const isUacCancelled = stderrOutput && (
-                        stderrOutput.includes('UAC_CANCELLED_OR_FAILED') ||
-                        stderrOutput.includes('0x800704C7') ||
-                        stderrOutput.includes('74C7') ||
-                        stderrOutput.includes('操作已被用户取消') ||
-                        stderrOutput.includes('The operation was canceled by the user')
-                    );
-
-                    if (isUacCancelled) {
-                        return resolve({
-                            isCancelled: true,
-                            content: [{
-                                type: 'text',
-                                text: '⚠️ [操作未执行/未授权]：用户在 Windows UAC 提权界面取消了授权，或未获取到管理员权限。敏感命令未执行。'
-                            }]
-                        });
-                    }
-                    if (readErr) {
-                        if (stderrOutput.trim()) {
-                            return reject(new Error(`管理员脚本执行失败: ${stderrOutput.trim()}`));
-                        }
-                        return reject(new Error(`无法读取管理员任务的输出文件: ${readErr.message}`));
-                    }
-
-                    const result = data.trim();
-                    if (result === "USER_CANCELLED") {
-                        resolve({
-                            isCancelled: true,
-                            content: [{
-                                type: 'text',
-                                text: '⚠️ [操作已取消]：用户已主动拒绝或取消了本次管理员权限申请。敏感命令未执行。'
-                            }]
-                        });
-                    } else if (result === "TIMEOUT_REJECTED") {
-                        resolve({
-                            isCancelled: true,
-                            content: [{
-                                type: 'text',
-                                text: '⚠️ [操作超时]：等待管理员确认超时（超过无操作安全时限），系统已自动拒绝执行。'
-                            }]
-                        });
-                    } else if (result.startsWith("ERROR:")) {
-                        reject(new Error(result.substring(6).trim()));
-                    } else if (result === "") {
-                        // 空输出防穿透：脚本根本未生成内容或提权未通过时，绝不能当作正常执行成功
-                        resolve({
-                            isCancelled: true,
-                            content: [{
-                                type: 'text',
-                                text: '⚠️ [操作未执行/未授权]：用户在 Windows UAC 提权界面取消了授权，或未获取到管理员权限。敏感命令未执行。'
-                            }]
-                        });
-                    } else {
-                        resolve(result);
-                    }
-                });
-            });
-        });
-    });
-}
-
-/**
- * 请求用户确认一个敏感命令，但不在确认脚本中执行命令。
- * 确认通过后，命令仍回到主 PTY/xterm 会话执行，以保持 GUI 连续输出。
- * @param {string} command - 需要展示给用户确认的命令。
- * @returns {Promise<boolean>} - 用户是否允许执行。
- */
-function requestInteractiveConfirmation(command) {
-    return new Promise((resolve, reject) => {
-        tmp.file({ postfix: '.txt' }, (err, tmpFilePath, fd, cleanupCallback) => {
-            if (err) {
-                return reject(new Error(`无法创建临时文件: ${err.message}`));
-            }
-
-            let pythonConfirmScript;
-            try { pythonConfirmScript = resolveConfirmationScript(__dirname); }
-            catch (error) { cleanupCallback(); reject(error); return; }
-            const commandAsBase64 = Buffer.from(command).toString('base64');
-
-            // 普通敏感命令只需要当前权限确认，不应绕过主 PTY/xterm 执行链路。
-            const child = spawn('pythonw.exe', [
-                pythonConfirmScript,
-                commandAsBase64,
-                tmpFilePath,
-                '--interactive-auth',
-                '--confirm-only'
-            ], {
-                windowsHide: true
-            });
-            childProcesses.add(child);
-
-            let stderrOutput = '';
-            child.stderr.on('data', (data) => {
-                stderrOutput += data.toString('utf-8');
-            });
-
-            child.on('error', (err) => {
-                childProcesses.delete(child);
-                cleanupCallback();
-                reject(new Error(`无法启动交互式确认脚本: ${err.message}`));
-            });
-
-            child.on('close', () => {
-                childProcesses.delete(child);
-                fs.readFile(tmpFilePath, 'utf-8', (readErr, data) => {
-                    cleanupCallback();
-
-                    if (readErr) {
-                        if (stderrOutput.trim()) {
-                            return reject(new Error(`交互式确认脚本失败: ${stderrOutput.trim()}`));
-                        }
-                        return reject(new Error(`无法读取交互式确认结果文件: ${readErr.message}`));
-                    }
-
-                    const result = data.trim();
-                    if (result === 'CONFIRMED') {
-                        resolve(true);
-                    } else if (result === 'USER_CANCELLED' || result === 'TIMEOUT_REJECTED') {
-                        resolve(false);
-                    } else if (result.startsWith('ERROR:')) {
-                        reject(new Error(result.substring(6).trim()));
-                    } else {
-                        reject(new Error(`未知的交互式确认结果: ${result || '<empty>'}`));
-                    }
-                });
-            });
-        });
-    });
-}
-
-/**
- * GUI 仅接收原始PTY投影；渲染窗口失效不得打断命令完成检测。
- */
-function dispatchPtyData(rawData) {
-    const dataStr = rawData.toString('utf-8');
-    if (!dataStr) {
-        return;
-    }
-
-    if (mirrorStartupPending) {
-        // 启动握手（编码设置与就绪标记）是内部细节，握手完成前不投影到侧栏
-        mirrorStartupHeld = (mirrorStartupHeld + dataStr).slice(-MIRROR_REPLAY_LIMIT);
-    } else {
-        emitMirrorData(dataStr);
-    }
-
-    try {
-        if (!guiWindow || guiWindow.isDestroyed()
-            || guiWindow.webContents.isDestroyed()) {
-            return;
-        }
-        guiWindow.webContents.send('powershell-data', dataStr);
-    } catch (error) {
-        console.warn('[PowerShellExecutor] GUI output delivery failed:', error.message);
-    }
-}
-
-// --- 侧栏镜像 ---
-// 主窗口侧栏的「终端」标签是同一个 PTY 会话的另一个视图：输出同时送往 GUI 窗口和镜像，
-// 输入与尺寸调整直接落到同一个 PTY，AI 工具执行的命令因此对两处都可见。
-const MIRROR_REPLAY_LIMIT = 256 * 1024;
-const mirrorSinks = new Set();
-let replayBuffer = '';
-let mirrorStartupPending = false;
-let mirrorStartupHeld = '';
-
-function emitMirrorData(dataStr) {
-    if (!dataStr) return;
-    // 侧栏终端可能在会话进行中才挂载，缓存最近输出用于回放。
-    replayBuffer += dataStr;
-    if (replayBuffer.length > MIRROR_REPLAY_LIMIT) {
-        replayBuffer = replayBuffer.slice(-MIRROR_REPLAY_LIMIT);
-    }
-    notifyMirrors('onData', dataStr);
-}
-
-/** 结束启动握手：成功时只放出就绪标记之后的内容（通常是提示符），失败时原样放出便于排查。 */
-function releaseMirrorStartup(afterReady = null) {
-    if (!mirrorStartupPending) return;
-    mirrorStartupPending = false;
-    const held = mirrorStartupHeld;
-    mirrorStartupHeld = '';
-    emitMirrorData(afterReady === null ? held : afterReady);
-}
-
-function notifyMirrors(method, ...args) {
-    for (const sink of mirrorSinks) {
-        try {
-            sink[method]?.(...args);
-        } catch (e) {
-            console.error('[PowerShellExecutor] Mirror sink failed:', e);
-        }
-    }
-}
-
-/**
- * 注册一个镜像视图并回放已有输出。
- * @param {{onData: Function, onClear?: Function, onExit?: Function}} sink
- * @returns {Function} 取消注册
- */
-function attachMirror(sink) {
-    mirrorSinks.add(sink);
-    if (replayBuffer) {
-        try {
-            sink.onData(replayBuffer);
-        } catch (e) {
-            console.error('[PowerShellExecutor] Mirror replay failed:', e);
-        }
-    }
-    return () => mirrorSinks.delete(sink);
-}
-
-/** 确保有一个 PTY 会话（不打开 GUI 窗口）。 */
-function ensureMirrorSession() {
-    if (!ptyProcess) {
-        createNewPtySession();
-    }
-    return getSessionState();
-}
-
-/** 重置为全新的 PTY 会话（与 GUI 窗口共用）。 */
-function restartSession() {
-    createNewPtySession();
-    return getSessionState();
-}
-
-function getSessionState() {
-    return {
-        running: Boolean(ptyProcess),
-        pid: ptyProcess ? ptyProcess.pid : null,
-        // AI 短命令或交互式 TUI 占用期间，不应向会话里塞入额外命令。
-        busy: Boolean(isExecutingCommand || interactiveMode),
-        cols: lastKnownSize.cols,
-        rows: lastKnownSize.rows,
-    };
-}
-
-function writeSessionInput(data) {
-    if (!ptyProcess || typeof data !== 'string') {
-        return false;
-    }
-    ptyProcess.write(data);
-    return true;
-}
-
-/**
- * 等待指定 PTY 完成 PowerShell 初始化探针。
- * Promise 与具体 PTY 实例绑定，旧会话的迟到结果不能被新会话复用。
- * @param {object} targetPtyProcess - 要等待的 node-pty 实例。
- * @param {number} timeoutMs - 最大等待时间。
- */
-async function waitForPtyReady(targetPtyProcess = ptyProcess, timeoutMs = 15000) {
-    if (!targetPtyProcess || targetPtyProcess !== ptyProcess) {
-        throw new Error('PowerShell PTY session is not available.');
-    }
-
-    let timeoutId = null;
-    try {
-        await Promise.race([
-            ptyReadyPromise,
-            new Promise((_, reject) => {
-                timeoutId = setTimeout(() => {
-                    reject(new Error(`PowerShell PTY initialization timed out after ${timeoutMs}ms.`));
-                }, timeoutMs);
-            })
-        ]);
-    } finally {
-        if (timeoutId) {
-            clearTimeout(timeoutId);
-        }
-    }
-
-    if (!ptyProcess || ptyProcess !== targetPtyProcess) {
-        throw new Error('PowerShell PTY session changed or exited during initialization.');
-    }
-}
-
-/**
- * 同时等待渲染端 xterm 和后端 PTY 就绪，确保指令不会在界面初始化前注入。
- */
-async function waitForTerminalReady() {
-    const targetPtyProcess = ptyProcess;
-    await Promise.all([
-        waitForGuiReady(),
-        waitForPtyReady(targetPtyProcess)
-    ]);
-}
-
-/**
- * 创建一个新的伪终端 (pty) 进程。
- */
-function createNewPtySession() {
-    // newSession 是交互模式的一期低成本复位入口。
-    interactiveMode = false;
-    isExecutingCommand = false;
-    activeCommandAbort = null;
-
-    // 如果已存在旧进程，先销毁它
-    if (ptyProcess) {
-        childProcesses.delete(ptyProcess);
-        ptyProcess.kill();
-        // 当重置会话时，通知前端清屏
-        if (guiWindow && !guiWindow.isDestroyed()) {
-            guiWindow.webContents.send('powershell-clear');
-        }
-    }
-    replayBuffer = '';
-    notifyMirrors('onClear');
-
-    let shell = 'bash';
-    let args = [];
-
-    if (os.platform() === 'win32') {
-        // 优先使用 PowerShell Core (pwsh.exe)，如果不存在则回退到 Windows PowerShell (powershell.exe)
-        // 检测顺序：Program Files 标准路径 → where.exe PATH 查找 → 回退 powershell.exe
-        const pwshPath = path.join(process.env.PROGRAMFILES, 'PowerShell', '7', 'pwsh.exe');
-        if (fs.existsSync(pwshPath)) {
-            shell = pwshPath;
-        } else {
-            // 二级回退：winget/MSIX 安装的 PS7 位于 WindowsApps（AppExecution Alias），
-            // fs.existsSync 对此类特殊文件不可靠，直接信任 where.exe 结果。
-            try {
-                const { execSync } = require('child_process');
-                const whereResult = execSync('where.exe pwsh', { windowsHide: true, encoding: 'utf8', timeout: 5000 }).trim();
-                const firstLine = whereResult.split(/\r?\n/)[0].trim();
-                if (firstLine) {
-                    shell = firstLine;
-                } else {
-                    shell = 'powershell.exe';
-                }
-            } catch (e) {
-                shell = 'powershell.exe';
-            }
-        }
-        args = ['-NoLogo'];
-    }
-
-    ptyProcess = loadPty().spawn(shell, args, {
-        name: 'xterm-color',
-        cols: lastKnownSize.cols,
-        rows: lastKnownSize.rows,
-        cwd: process.env.USERPROFILE || process.env.HOME,
-        env: {
-            ...process.env,
-            PAGER: 'cat',
-            GIT_PAGER: 'cat',
-            GIT_TERMINAL_PROMPT: '0',
-            GH_PAGER: '',
-            SYSTEMD_PAGER: 'cat',
-            AWS_PAGER: '',
-            MANPAGER: 'cat'
-        }
-    });
-    childProcesses.add(ptyProcess);
-    const currentPtyProcess = ptyProcess;
-
-    // 创建GUI数据监听器（带 AI 短命令执行状态检查）
-    guiDataListener = (data) => {
-        // AI 短命令期间由 executeSingleCommandInPty 的临时监听器负责 flushToGui，避免重复输出。
-        // 交互式 TUI 模式绝不能设置 isExecutingCommand，否则 GUI 会黑屏。
-        if (isExecutingCommand) {
-            return;
-        }
-
-        dispatchPtyData(data);
-    };
-
-    // 设置数据监听器，将所有 pty 输出直接代理到 GUI
-    currentPtyProcess.onData(guiDataListener);
-
-    // 不再用固定延时猜测 PowerShell 是否启动完成。随机边界不会以明文出现在
-    // PSReadLine 的输入回显中；只有 PowerShell 真正执行 Write-Host 后才会命中。
-    const readyBoundary = `__VCP_PTY_READY_${crypto.randomUUID()}__`;
-    const encodedReadyBoundary = Buffer.from(readyBoundary, 'utf8').toString('base64');
-    mirrorStartupPending = true;
-    mirrorStartupHeld = '';
-    ptyReadyPromise = new Promise((resolve, reject) => {
-        let startupOutput = '';
-        let settled = false;
-        let timeoutId = null;
-        let readyListener = null;
-
-        const cleanupReadyProbe = () => {
-            if (timeoutId) {
-                clearTimeout(timeoutId);
-                timeoutId = null;
-            }
-            if (readyListener && typeof readyListener.dispose === 'function') {
-                readyListener.dispose();
-                readyListener = null;
-            }
-        };
-
-        readyListener = currentPtyProcess.onData((data) => {
-            if (settled) {
-                return;
-            }
-
-            startupOutput += data.toString('utf8');
-            // 防止异常启动输出无限占用内存，同时保留足够长度处理跨 chunk 边界。
-            if (startupOutput.length > 65536) {
-                startupOutput = startupOutput.slice(-65536);
-            }
-
-            const boundaryIndex = startupOutput.indexOf(readyBoundary);
-            if (boundaryIndex !== -1) {
-                settled = true;
-                cleanupReadyProbe();
-                if (ptyProcess === currentPtyProcess) {
-                    releaseMirrorStartup(startupOutput.slice(boundaryIndex + readyBoundary.length).replace(/^\r?\n/, ''));
-                }
-                resolve();
-            }
-        });
-
-        timeoutId = setTimeout(() => {
-            if (settled) {
-                return;
-            }
-            settled = true;
-            cleanupReadyProbe();
-            if (ptyProcess === currentPtyProcess) releaseMirrorStartup();
-            reject(new Error('PowerShell did not complete its startup readiness probe within 15 seconds.'));
-        }, 15000);
-
-        // macOS / Linux 起的是 bash：PowerShell 的初始化写进去只会报语法错误，边界永远等不到，
-        // 前 15 秒侧栏一片空白。环境变量 spawn 时已经给了，这里只打印边界：两段引号拼起来，
-        // 回显的命令行里是 '…''…'，不会提前命中
-        if (os.platform() !== 'win32') {
-            const split = Math.floor(readyBoundary.length / 2);
-            currentPtyProcess.write(`printf '%s\\n' '${readyBoundary.slice(0, split)}''${readyBoundary.slice(split)}'; clear\r`);
-            return;
-        }
-        const initializationCommand = [
-            '[Console]::OutputEncoding = [System.Text.Encoding]::UTF8',
-            '$env:PAGER = "cat"',
-            '$env:GIT_PAGER = "cat"',
-            '$env:GIT_TERMINAL_PROMPT = "0"',
-            '$env:GH_PAGER = ""',
-            '$env:SYSTEMD_PAGER = "cat"',
-            '$env:AWS_PAGER = ""',
-            '$env:MANPAGER = "cat"',
-            'function global:more { param([string[]]$paths) if ($paths) { foreach ($file in $paths) { Get-Content $file } } else { $input } }',
-            'function global:help { Get-Help @args }',
-            `$__vcpReady = [System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String('${encodedReadyBoundary}'))`,
-            'Write-Host $__vcpReady',
-            // 清掉握手留下的几行：侧栏只从就绪标记之后开始显示，ConPTY 的光标也得回到左上角，
-            // 否则 PSReadLine 按绝对坐标重绘时会和侧栏错开几行
-            'Clear-Host'
-        ].join('; ');
-        currentPtyProcess.write(`${initializationCommand}\r`);
-    });
-    // 只有 AI 命令会等它；没人等的时候超时也不能变成未处理的 rejection
-    ptyReadyPromise.catch(() => {});
-
-    // 当 pty 进程意外退出时，清理资源。
-    // 注意：newSession 会先 kill 旧 PTY 再创建新 PTY，旧 PTY 的异步 onExit 不能误清理新会话。
-    currentPtyProcess.onExit((exitInfo) => {
-        childProcesses.delete(currentPtyProcess);
-        // 自行结束的 shell 仍占着 ConPTY 的管道句柄，显式 kill 才会释放
-        try {
-            currentPtyProcess.kill();
-        } catch (e) {
-            // 进程已经退出
-        }
-
-        if (ptyProcess !== currentPtyProcess) {
-            return;
-        }
-
-        ptyProcess = null;
-        guiDataListener = null;
-        isExecutingCommand = false;
-        interactiveMode = false;
-        activeCommandAbort = null;
-        notifyMirrors('onExit', exitInfo && exitInfo.exitCode);
-    });
-}
-
-function buildHumanLaunchAnimationCommand() {
-    const script = [
-        '$esc = [char]27',
-        '# 尝试擦掉用于触发动画的短命令输入行，避免启动动画前出现杂乱命令文本。',
-        'Write-Host -NoNewline "$esc[1A$esc[2K`r"',
-        '',
-        '# 霓虹渐变色定义',
-        '$c1 = "$esc[38;2;245;194;231m" # Pink',
-        '$c2 = "$esc[38;2;203;166;247m" # Mauve',
-        '$c3 = "$esc[38;2;137;180;250m" # Blue',
-        '$c4 = "$esc[38;2;116;199;236m" # Sapphire',
-        '$c5 = "$esc[38;2;137;220;235m" # Sky',
-        '$c6 = "$esc[38;2;148;226;213m" # Teal',
-        '$reset = "$esc[0m"',
-        '$gray = "$esc[38;2;147;153;178m"',
-        '$darkGray = "$esc[38;2;88;91;112m"',
-        '$green = "$esc[38;2;166;227;161m"',
-        '$yellow = "$esc[38;2;249;226;175m"',
-        '',
-        '# 逐行打印华丽的 VCP CLI ASCII Art',
-        'Write-Host ""',
-        'Write-Host "  ${c1}██╗   ██╗  ██████╗  ██████╗      ██████╗  ██╗      ██╗${reset}"',
-        'Start-Sleep -Milliseconds 40',
-        'Write-Host "  ${c2}██║   ██║ ██╔════╝  ██╔══██╗    ██╔════╝  ██║      ██║${reset}"',
-        'Start-Sleep -Milliseconds 40',
-        'Write-Host "  ${c3}██║   ██║ ██║       ██████╔╝    ██║       ██║      ██║${reset}"',
-        'Start-Sleep -Milliseconds 40',
-        'Write-Host "  ${c4}╚██╗ ██╔╝ ██║       ██╔═══╝     ██║       ██║      ██║${reset}"',
-        'Start-Sleep -Milliseconds 40',
-        'Write-Host "  ${c5} ╚████╔╝  ╚██████╗  ██║         ╚██████╗  ███████╗ ██║${reset}"',
-        'Start-Sleep -Milliseconds 40',
-        'Write-Host "  ${c6}  ╚═══╝    ╚═════╝  ╚═╝          ╚═════╝  ╚══════╝ ╚═╝${reset}"',
-        'Start-Sleep -Milliseconds 50',
-        '',
-        '# 打印副标题和分割线',
-        'Write-Host "  ${darkGray}──────────────────────────────────────────────────────────${reset}"',
-        'Write-Host "  ${gray}Distributed PowerShell Bridge & Interactive Terminal GUI${reset}"',
-        'Write-Host "  ${darkGray}──────────────────────────────────────────────────────────${reset}"',
-        'Write-Host ""',
-        '',
-        '# 华丽的渐变色进度条加载动画',
-        '$barWidth = 30',
-        'for ($i = 0; $i -le $barWidth; $i++) {',
-        '    $percent = [math]::Round(($i / $barWidth) * 100)',
-        '    $filledCount = $i',
-        '    $emptyCount = $barWidth - $i',
-        '    ',
-        '    # 动态计算渐变色 (从 Mauve 203,166,247 渐变到 Teal 148,226,213)',
-        '    $r = [int](203 - (203 - 148) * ($i / $barWidth))',
-        '    $g = [int](166 + (226 - 166) * ($i / $barWidth))',
-        '    $b = [int](247 - (247 - 213) * ($i / $barWidth))',
-        '    $color = "$esc[38;2;${r};${g};${b}m"',
-        '    ',
-        '    $filled = "▰" * $filledCount',
-        '    $empty = "▱" * $emptyCount',
-        '    ',
-        '    Write-Host -NoNewline "$esc[2K`r  ${gray}Loading Bridge:${reset} [${color}${filled}${darkGray}${empty}${reset}] ${color}${percent}%${reset}"',
-        '    Start-Sleep -Milliseconds 35',
-        '}',
-        'Write-Host ""',
-        'Write-Host ""',
-        '',
-        '# 打印系统就绪状态和极客风系统信息',
-        'Write-Host "  ${gray}Status:${reset}    ${green}ONLINE${reset}"',
-        'Write-Host "  ${gray}Session:${reset}   ${c3}Active PowerShell Bridge${reset}"',
-        'Write-Host "  ${gray}Terminal:${reset}  ${yellow}Interactive Console Ready${reset}"',
-        'Write-Host ""',
-        'Write-Host "  ${gray}Type commands below. Press ${c3}Ctrl+C${gray} to interrupt.${reset}"',
-        'Write-Host ""',
-        'Remove-Item -LiteralPath $PSCommandPath -Force -ErrorAction SilentlyContinue',
-    ].join('\n');
-
-    const tempScriptName = `vcp-cli-launch-${crypto.randomUUID()}.ps1`;
-    const tempScriptPath = path.join(os.tmpdir(), tempScriptName);
-    fs.writeFileSync(tempScriptPath, `\ufeff${script}`, 'utf8');
-
-    const escapedTempScriptPath = tempScriptPath.replace(/'/g, "''");
-    return `& '${escapedTempScriptPath}'\r`;
-}
-
-/**
- * 打开或聚焦 PowerShellExecutor 的交互式终端 GUI。
- * 该入口供主程序托盘 / 桌面应用启动器直接调用，不需要先通过 AI 工具执行命令。
- * @returns {BrowserWindow} PowerShell 终端窗口实例。
- */
-function openGuiTerminal() {
-    ensureGuiWindow();
-
-    const shouldPlayHumanLaunchAnimation = !ptyProcess;
-    if (!ptyProcess) {
-        createNewPtySession();
-    }
-
-    if (shouldPlayHumanLaunchAnimation && ptyProcess) {
-        const targetPtyProcess = ptyProcess;
-        waitForTerminalReady()
-            .then(() => {
-                if (ptyProcess === targetPtyProcess) {
-                    targetPtyProcess.write(buildHumanLaunchAnimationCommand());
-                }
-            })
-            .catch((error) => {
-                console.error('[PowerShellExecutor] Failed to initialize terminal launch animation:', error);
-            });
-    }
-
-    return guiWindow;
-}
-
-/**
- * 插件的主入口点，由 PluginManager 直接调用。
- * @param {object} args - 从 AI 工具调用中解析出的参数。
- * @returns {Promise<string>} - 命令执行的结果。
- */
-/**
- * 在给定的 pty 会话中执行单条命令并返回其增量输出。
- * @param {object} ptyProcess - node-pty 实例。
- * @param {string} singleCommand - 要执行的单条命令。
- * @returns {Promise<string>} - 该命令的增量输出。
- */
-function executeSingleCommandInPty(ptyProcess, singleCommand) {
-    return new Promise((resolve, reject) => {
-        if (!ptyProcess) {
-            return reject(new Error("PTY process is not available."));
-        }
-
-        let rawOutput = '';
-        let rawOutputTruncated = false;
-        let settled = false;
-        let tempScriptPath = null;
-        let wrapperScriptPath = null;
-        let listenerDisposable = null;
-        let timeoutId = null;
-
-        const run = beginCommandRun(singleCommand);
-        const startBoundary = `__VCP_COMMAND_START_${crypto.randomUUID()}__`;
-        const endBoundary = `__VCP_COMMAND_END_${crypto.randomUUID()}__`;
-        const outputParser = new CommandOutputParser(startBoundary, endBoundary);
-
-        const abortThisCommand = () => {
-            if (settled) {
-                return false;
-            }
-
-            settled = true;
-            finishCommandRun(run, 'cancelled');
-            // ETX 等价于用户在真实终端按下 Ctrl+C，用于中断当前前台命令。
-            ptyProcess.write('\x03');
-            cleanupListener(listenerDisposable, timeoutId);
-            reject(new Error('命令已被 interrupt 动作中止。'));
-            return true;
-        };
-
-        const cleanupListener = (disposable, commandTimeoutId) => {
-            if (commandTimeoutId) {
-                clearTimeout(commandTimeoutId);
-            }
-            if (disposable && typeof disposable.dispose === 'function') {
-                disposable.dispose();
-            }
-            if (activeCommandAbort === abortThisCommand) {
-                activeCommandAbort = null;
-            }
-            for (const scriptPath of [tempScriptPath, wrapperScriptPath]) {
-                if (!scriptPath) continue;
-                try {
-                    fs.unlinkSync(scriptPath);
-                } catch (e) {
-                    console.warn('[PowerShellExecutor] Failed to remove temporary script:', e.message);
-                }
-            }
-            tempScriptPath = null;
-            wrapperScriptPath = null;
-        };
-
-        const flushToGui = (text) => {
-            if (text) {
-                dispatchPtyData(text);
-            }
-        };
-
-        listenerDisposable = ptyProcess.onData((data) => {
-            if (settled) {
-                return;
-            }
-
-            const result = outputParser.push(data.toString('utf-8'));
-            rawOutputTruncated ||= rawOutput.length + result.output.length > COMMAND_RUN_RAW_LIMIT;
-            rawOutput = (rawOutput + result.output).slice(-COMMAND_RUN_RAW_LIMIT);
-            appendCommandRunOutput(run, result.output);
-
-            if (result.done) {
-                settled = true;
-                finishCommandRun(run, 'completed');
-                cleanupListener(listenerDisposable, timeoutId);
-                resolve((rawOutputTruncated ? '[输出超过容量限制，仅保留末尾内容]\n' : '') + sanitizeTerminalOutput(rawOutput).trim());
-            }
-
-            // GUI 是投影，不是完成裁决者；保留同块中的结束后提示符。
-            flushToGui(result.output + result.trailing);
-        });
-
-        timeoutId = setTimeout(() => {
-            if (settled) {
-                return;
-            }
-            settled = true;
-            finishCommandRun(run, 'timed_out');
-            cleanupListener(listenerDisposable, timeoutId);
-            reject(new Error(`Command "${singleCommand}" timed out after 60 seconds.`));
-        }, 60000);
-
-        activeCommandAbort = abortThisCommand;
-
-        try {
-            const tempScriptName = `vcp-powershell-${crypto.randomUUID()}.ps1`;
-            tempScriptPath = path.join(os.tmpdir(), tempScriptName);
-            // Windows PowerShell 5.1 对无 BOM UTF-8 的中文兼容性较差，写入 BOM 保证脚本内容稳定解析。
-            fs.writeFileSync(tempScriptPath, `\ufeff${singleCommand}`, 'utf8');
-
-            const escapedTempScriptPath = tempScriptPath.replace(/'/g, "''");
-
-            // 边界标记只写进包装脚本，不出现在交互式命令行里：
-            // PowerShell/PSReadLine 会先回显整行输入，若标记出现在回显里，就会被误判为真实输出。
-            // 终端里也只留下一行短的脚本调用，而不是整段包装代码。
-            const wrapperScript = [
-                // 关掉分页器和 Git 交互提示，否则 git log/help 等会停在分页界面，命令一直等不到结束标记。
-                `$env:PAGER = 'cat'`,
-                `$env:GIT_PAGER = 'cat'`,
-                `$env:GIT_TERMINAL_PROMPT = '0'`,
-                `Write-Host '${startBoundary}'`,
-                // 即使临时脚本发生 ParserError / RuntimeException，也必须输出 end boundary，
-                // 否则 AI 调用会一直等待直到超时。终止性错误要在结束标记之前打印，
-                // 否则 PowerShell 会在命令行结束后才显示它，AI 拿到的输出就是空的。
-                `try { & '${escapedTempScriptPath}' } catch { $_ | Out-Host } finally { Write-Host '${endBoundary}' }`
-            ].join('\r\n');
-            wrapperScriptPath = path.join(os.tmpdir(), `vcp-run-${crypto.randomUUID()}.ps1`);
-            fs.writeFileSync(wrapperScriptPath, `\ufeff${wrapperScript}`, 'utf8');
-            const wrappedCommand = `& '${wrapperScriptPath.replace(/'/g, "''")}'`;
-
-            ptyProcess.write(`${wrappedCommand}\r`);
-        } catch (error) {
-            settled = true;
-            finishCommandRun(run, 'spawn_error');
-            cleanupListener(listenerDisposable, timeoutId);
-            reject(new Error(`无法创建或执行临时 PowerShell 脚本: ${error.message}`));
-        }
-    });
-}
-
-
-const INTERACTIVE_SEQUENCE_LIMITS = Object.freeze({
-    maxSteps: 100,
-    maxWaitMs: 60000,
-    maxTotalWaitMs: 300000,
-    maxTextLength: 100000,
-    maxQueryLines: 2000,
-    responseTimeoutMs: 5000
-});
-
-const TERMINAL_KEY_SEQUENCES = Object.freeze({
-    enter: '\r',
-    return: '\r',
-    up: '\x1b[A',
-    arrowup: '\x1b[A',
-    down: '\x1b[B',
-    arrowdown: '\x1b[B',
-    right: '\x1b[C',
-    arrowright: '\x1b[C',
-    left: '\x1b[D',
-    arrowleft: '\x1b[D',
-    esc: '\x1b',
-    escape: '\x1b',
-    tab: '\t',
-    backtab: '\x1b[Z',
-    'shift+tab': '\x1b[Z',
-    backspace: '\x7f',
-    delete: '\x1b[3~',
-    home: '\x1b[H',
-    end: '\x1b[F',
-    pageup: '\x1b[5~',
-    pagedown: '\x1b[6~',
-    space: ' ',
-    'ctrl+c': '\x03',
-    'ctrl+d': '\x04',
-    'ctrl+z': '\x1a',
-    'ctrl+l': '\x0c',
-    'ctrl+a': '\x01',
-    'ctrl+e': '\x05',
-    'ctrl+u': '\x15',
-    'ctrl+k': '\x0b',
-    'ctrl+w': '\x17'
-});
-
-function delay(ms) {
-    return new Promise(resolve => setTimeout(resolve, ms));
-}
-
-function parseWaitDuration(value) {
-    if (typeof value === 'number' && Number.isFinite(value)) {
-        return Math.round(value);
-    }
-
-    const match = String(value).trim().toLowerCase().match(/^(\d+(?:\.\d+)?)\s*(ms|s)?$/);
-    if (!match) {
-        throw new Error(`无效 wait 时长 "${value}"；请使用 50ms、1s 或毫秒数字。`);
-    }
-
-    const milliseconds = Number(match[1]) * (match[2] === 's' ? 1000 : 1);
-    return Math.round(milliseconds);
-}
-
-function parseTerminalKey(value) {
-    const raw = String(value).trim().toLowerCase();
-    const match = raw.match(/^(.+?)(?:\s*\*\s*(\d+))?$/);
-    const keyName = match ? match[1].trim() : raw;
-    const repeat = match && match[2] ? Number.parseInt(match[2], 10) : 1;
-    const sequence = TERMINAL_KEY_SEQUENCES[keyName];
-
-    if (!sequence) {
-        throw new Error(`不支持的终端按键 "${value}"。`);
-    }
-    if (!Number.isInteger(repeat) || repeat < 1 || repeat > 10) {
-        throw new Error(`按键重复次数必须在 1 到 10 之间："${value}"。`);
-    }
-
-    return { keyName, repeat, data: sequence.repeat(repeat) };
-}
-
-function parseInteractiveSequence(args) {
-    const steps = [];
-
-    for (const [key, value] of Object.entries(args)) {
-        const match = key.match(/^(command|wait|key|paste|queryVisible)(\d+)$/i);
-        if (!match) {
-            continue;
-        }
-
-        const typeLookup = {
-            command: 'command',
-            wait: 'wait',
-            key: 'key',
-            paste: 'paste',
-            queryvisible: 'queryVisible'
-        };
-        steps.push({
-            key,
-            type: typeLookup[match[1].toLowerCase()],
-            index: Number.parseInt(match[2], 10),
-            value
-        });
-    }
-
-    if (steps.length === 0) {
-        throw new Error('RunInteractiveSequence 至少需要一个带全局序号的步骤，例如 command1、wait2、key3、paste4、queryVisible5。');
-    }
-    if (steps.length > INTERACTIVE_SEQUENCE_LIMITS.maxSteps) {
-        throw new Error(`交互序列最多允许 ${INTERACTIVE_SEQUENCE_LIMITS.maxSteps} 个步骤。`);
-    }
-
-    steps.sort((a, b) => a.index - b.index);
-    const usedIndexes = new Set();
-    let totalWaitMs = 0;
-
-    for (const step of steps) {
-        if (!Number.isInteger(step.index) || step.index < 1) {
-            throw new Error(`步骤编号必须是从 1 开始的正整数：${step.key}。`);
-        }
-        if (usedIndexes.has(step.index)) {
-            throw new Error(`步骤编号 ${step.index} 重复；不同类型步骤必须共用唯一的全局序号。`);
-        }
-        usedIndexes.add(step.index);
-
-        if (step.type === 'wait') {
-            step.durationMs = parseWaitDuration(step.value);
-            if (step.durationMs < 0 || step.durationMs > INTERACTIVE_SEQUENCE_LIMITS.maxWaitMs) {
-                throw new Error(`单个 wait 步骤必须在 0 到 ${INTERACTIVE_SEQUENCE_LIMITS.maxWaitMs}ms 之间。`);
-            }
-            totalWaitMs += step.durationMs;
-        } else if (step.type === 'key') {
-            step.keySpec = parseTerminalKey(step.value);
-        } else if (step.type === 'queryVisible') {
-            const parsedLines = Number.parseInt(step.value, 10);
-            step.maxLines = Number.isInteger(parsedLines) && parsedLines > 0
-                ? Math.min(parsedLines, INTERACTIVE_SEQUENCE_LIMITS.maxQueryLines)
-                : null;
-        } else {
-            if (typeof step.value !== 'string' || !step.value.length) {
-                throw new Error(`${step.key} 必须是非空字符串。`);
-            }
-            if (step.value.length > INTERACTIVE_SEQUENCE_LIMITS.maxTextLength) {
-                throw new Error(`${step.key} 超过 ${INTERACTIVE_SEQUENCE_LIMITS.maxTextLength} 字符限制。`);
-            }
-        }
-    }
-
-    if (totalWaitMs > INTERACTIVE_SEQUENCE_LIMITS.maxTotalWaitMs) {
-        throw new Error(`序列累计等待不能超过 ${INTERACTIVE_SEQUENCE_LIMITS.maxTotalWaitMs}ms。`);
-    }
-    if (steps.every(step => step.type === 'wait')) {
-        throw new Error('交互序列不能只包含 wait；请至少加入 command、key、paste 或 queryVisible 步骤。');
-    }
-
-    return steps;
-}
-
-function requestVisibleText(maxLines = null) {
-    return new Promise((resolve, reject) => {
-        if (!guiWindow || guiWindow.isDestroyed() || !guiReady) {
-            reject(new Error('PowerShell GUI 尚未就绪，无法查询可见文本。'));
-            return;
-        }
-
-        const requestId = crypto.randomUUID();
-        const timeout = setTimeout(() => {
-            visibleTextResolvers.delete(requestId);
-            reject(new Error('查询终端文本超时'));
-        }, INTERACTIVE_SEQUENCE_LIMITS.responseTimeoutMs);
-
-        visibleTextResolvers.set(requestId, (text) => {
-            clearTimeout(timeout);
-            resolve(text);
-        });
-        guiWindow.webContents.send('query-visible-text', { requestId, maxLines });
-    });
-}
-
-function requestTerminalPaste(text) {
-    return new Promise((resolve, reject) => {
-        if (!guiWindow || guiWindow.isDestroyed() || !guiReady) {
-            reject(new Error('PowerShell GUI 尚未就绪，无法执行 xterm 粘贴。'));
-            return;
-        }
-
-        const requestId = crypto.randomUUID();
-        const timeout = setTimeout(() => {
-            terminalPasteResolvers.delete(requestId);
-            reject(new Error('xterm 粘贴请求超时'));
-        }, INTERACTIVE_SEQUENCE_LIMITS.responseTimeoutMs);
-
-        terminalPasteResolvers.set(requestId, () => {
-            clearTimeout(timeout);
-            resolve();
-        });
-        guiWindow.webContents.send('terminal-paste-request', { requestId, text });
-    });
-}
-
-async function ensureInteractiveTerminal(newSession = false) {
-    ensureGuiWindow();
-    if (newSession === true || !ptyProcess) {
-        createNewPtySession();
-    }
-    await waitForTerminalReady();
-    interactiveMode = true;
-    return ptyProcess;
-}
-
-async function sendSingleInteractiveKey(args) {
-    if (typeof args.key !== 'string' || !args.key.trim()) {
-        throw new Error('SendInteractiveKey 需要 key 参数，例如 enter、up、esc 或 ctrl+c*2。');
-    }
-
-    const keySpec = parseTerminalKey(args.key);
-    const targetPtyProcess = await ensureInteractiveTerminal(args.newSession === true);
-    targetPtyProcess.write(keySpec.data);
-
-    return {
-        content: [{
-            type: 'text',
-            text: `Interactive key sent: ${keySpec.keyName}${keySpec.repeat > 1 ? ` x${keySpec.repeat}` : ''}.`
-        }]
-    };
-}
-
-async function pasteSingleInteractiveText(args) {
-    if (typeof args.text !== 'string' || !args.text.length) {
-        throw new Error('PasteInteractiveText 需要非空 text 参数。');
-    }
-    if (args.text.length > INTERACTIVE_SEQUENCE_LIMITS.maxTextLength) {
-        throw new Error(`text 超过 ${INTERACTIVE_SEQUENCE_LIMITS.maxTextLength} 字符限制。`);
-    }
-
-    await ensureInteractiveTerminal(args.newSession === true);
-    await requestTerminalPaste(args.text);
-
-    if (args.submit === true) {
-        if (!ptyProcess) {
-            throw new Error('粘贴完成后 PTY 会话已退出，无法发送 Enter。');
-        }
-        ptyProcess.write('\r');
-    }
-
-    return {
-        content: [{
-            type: 'text',
-            text: `Interactive text pasted (${args.text.length} characters)${args.submit === true ? ' and Enter was sent' : ''}.`
-        }]
-    };
-}
-
-async function runInteractiveSequence(args) {
-    const steps = parseInteractiveSequence(args);
-
-    for (const step of steps.filter(item => item.type === 'command')) {
-        const securityResult = intelligentSecurityCheck(
-            step.value,
-            defaultConfig.forbiddenCommands,
-            defaultConfig.authRequiredCommands
-        );
-        if (securityResult.isForbidden) {
-            throw new Error(`步骤 ${step.index} 执行被阻止：${securityResult.reason}`);
-        }
-        if (securityResult.needsAuth) {
-            throw new Error(`步骤 ${step.index} 需要授权，RunInteractiveSequence 不支持在 TUI 序列中弹出授权确认：${securityResult.reason}`);
-        }
-    }
-
-    const targetPtyProcess = await ensureInteractiveTerminal(args.newSession === true);
-    const queryResults = [];
-
-    for (const step of steps) {
-        if (!ptyProcess || ptyProcess !== targetPtyProcess) {
-            throw new Error(`执行到步骤 ${step.index} 时 PTY 会话已退出或被替换。`);
-        }
-
-        switch (step.type) {
-            case 'command':
-                targetPtyProcess.write(`${step.value}\r`);
-                break;
-            case 'wait':
-                await delay(step.durationMs);
-                break;
-            case 'key':
-                targetPtyProcess.write(step.keySpec.data);
-                break;
-            case 'paste':
-                await requestTerminalPaste(step.value);
-                break;
-            case 'queryVisible': {
-                const text = await requestVisibleText(step.maxLines);
-                queryResults.push({ index: step.index, maxLines: step.maxLines, text });
-                break;
-            }
-            default:
-                throw new Error(`未知交互步骤类型：${step.type}`);
-        }
-    }
-
-    if (queryResults.length === 0) {
-        return {
-            content: [{
-                type: 'text',
-                text: `Interactive sequence completed (${steps.length} steps). No queryVisible step was requested.`
-            }]
-        };
-    }
-
-    const output = queryResults.map(result => {
-        const lineLabel = result.maxLines ? `, max ${result.maxLines} lines` : '';
-        return `---[queryVisible step ${result.index}${lineLabel}]---\n${result.text}`;
-    }).join('\n\n');
-
-    return { content: [{ type: 'text', text: `\`\`\`\n${output}\n\`\`\`` }] };
-}
-
-async function processToolCall(args) {
-    const declaredCommands = new Set([
-        'ExecutePowerShell',
-        'StartInteractive',
-        'SendInteractiveKey',
-        'PasteInteractiveText',
-        'RunInteractiveSequence',
-        'QueryVisible',
-        'InterruptPowerShell',
-        'EndInteractive'
-    ]);
-    const declaredCommand = typeof args.command === 'string' && declaredCommands.has(args.command.trim())
-        ? args.command.trim()
-        : null;
-
-    // 新清单格式使用 command 选择能力、powershell 传递脚本文本。
-    // 同时保留旧 action + command 调用格式，避免已有提示词和调用方立即失效。
-    const actionByDeclaredCommand = {
-        ExecutePowerShell: 'execute',
-        StartInteractive: 'startInteractive',
-        SendInteractiveKey: 'interactiveKey',
-        PasteInteractiveText: 'interactivePaste',
-        RunInteractiveSequence: 'interactiveSequence',
-        QueryVisible: 'queryVisible',
-        InterruptPowerShell: 'interrupt',
-        EndInteractive: 'endInteractive'
-    };
-    const action = declaredCommand
-        ? actionByDeclaredCommand[declaredCommand]
-        : (typeof args.action === 'string' ? args.action.trim() : 'execute');
-
-    if (action === 'interactiveKey') {
-        return sendSingleInteractiveKey(args);
-    }
-
-    if (action === 'interactivePaste') {
-        return pasteSingleInteractiveText(args);
-    }
-
-    if (action === 'interactiveSequence') {
-        return runInteractiveSequence(args);
-    }
-
-    if (action.startsWith('queryVisible')) {
-        ensureGuiWindow();
-        await waitForGuiReady();
-
-        const legacyMatch = action.match(/^queryVisible(\d+)?$/);
-        const requestedMaxLines = declaredCommand === 'QueryVisible' ? args.maxLines : (legacyMatch && legacyMatch[1]);
-        const parsedMaxLines = requestedMaxLines === undefined || requestedMaxLines === null || requestedMaxLines === ''
-            ? null
-            : Number.parseInt(requestedMaxLines, 10);
-        const maxLines = Number.isInteger(parsedMaxLines) && parsedMaxLines > 0
-            ? Math.min(parsedMaxLines, INTERACTIVE_SEQUENCE_LIMITS.maxQueryLines)
-            : null;
-        const text = await requestVisibleText(maxLines);
-        return { content: [{ type: 'text', text: `\`\`\`\n${text}\n\`\`\`` }] };
-    }
-
-    if (action === 'endInteractive') {
-        interactiveMode = false;
-        return { content: [{ type: 'text', text: 'Interactive mode flag cleared. The existing PTY session was not terminated.' }] };
-    }
-
-    if (action === 'interrupt') {
-        if (!ptyProcess) {
-            return { content: [{ type: 'text', text: 'No active PowerShell session to interrupt.' }] };
-        }
-
-        if (activeCommandAbort) {
-            const interrupted = activeCommandAbort();
-            return { content: [{ type: 'text', text: interrupted
-                ? 'Interrupt signal sent. The active synchronous command wait was cancelled.'
-                : 'The synchronous command had already completed before it could be interrupted.' }] };
-        }
-
-        if (interactiveMode) {
-            ptyProcess.write('\x03');
-            return { content: [{ type: 'text', text: 'Ctrl+C was sent to the interactive foreground program. The interactive mode flag remains set.' }] };
-        }
-
-        return { content: [{ type: 'text', text: 'The PowerShell session is active, but no AI-started foreground command is currently running.' }] };
-    }
-
-    // --- 1. 解析和排序 PowerShell 脚本 ---
-    // 新格式：powershell, powershell1, powershell2...
-    // 旧格式：command, command1, command2...
-    const scriptParameterPrefix = declaredCommand ? 'powershell' : 'command';
-    const commandEntries = Object.entries(args)
-        .filter(([key]) => key.startsWith(scriptParameterPrefix))
-        .map(([key, value]) => {
-            const match = key.match(new RegExp(`^${scriptParameterPrefix}(\\d*)$`));
-            const index = match ? (match[1] === '' ? 0 : parseInt(match[1], 10)) : -1;
-            return { key, value, index };
-        })
-        .filter(item => item.index !== -1 && typeof item.value === 'string' && item.value.trim())
-        .sort((a, b) => a.index - b.index);
-
-    // 新格式中的 args.command 是能力选择器，绝不能作为待执行脚本。
-    if (declaredCommand) {
-        commandEntries.forEach(entry => {
-            entry.value = entry.value.trim();
-        });
-    }
-
-    if (commandEntries.length === 0) {
-        throw new Error(declaredCommand
-            ? '未提供任何有效的 powershell 参数 (例如 powershell, powershell1, powershell2)。'
-            : '未提供任何有效的 command 参数 (例如 command, command1, command2)。');
-    }
-
-    if (action !== 'execute' && action !== 'startInteractive') {
-        throw new Error(`不支持的 action: ${action}`);
-    }
-
-    // --- 2. 智能安全预检查 ---
-    let needsInteractiveAuth = false;
-    for (const entry of commandEntries) {
-        const securityResult = intelligentSecurityCheck(
-            entry.value,
-            defaultConfig.forbiddenCommands,
-            defaultConfig.authRequiredCommands
-        );
-
-        if (securityResult.isForbidden) {
-            throw new Error(`执行被阻止：${securityResult.reason}`);
-        }
-
-        if (securityResult.needsAuth) {
-            needsInteractiveAuth = true;
-            console.log(`[PowerShellExecutor] 命令 "${entry.value}" 需要交互式授权：${securityResult.reason}`);
-        }
-    }
-
-    // --- 3. 初始化会话和参数 ---
-    const lastCommandIndex = commandEntries[commandEntries.length - 1].index;
-    const getArg = (key, defaultVal) => {
-        const indexedKey = `${key}${lastCommandIndex || ''}`;
-        return args[indexedKey] !== undefined ? args[indexedKey] : (args[key] !== undefined ? args[key] : defaultVal);
-    };
-
-    const requireAdmin = getArg('requireAdmin', false);
-    const newSession = getArg('newSession', false);
-    const finalReturnMode = getArg('returnMode', defaultConfig.returnMode);
-
-    // --- 4. 根据模式选择执行路径 ---
-
-    // 路径 A: 管理员模式 (最高优先级)
-    if (requireAdmin) {
-        if (commandEntries.length > 1) {
-            throw new Error("管理员模式 (requireAdmin: true) 不支持执行多个命令链。");
-        }
-        if (ptyProcess) {
-            ptyProcess.kill();
-            ptyProcess = null;
-        }
-        const command = commandEntries[0].value;
-        const fullCommand = `[Console]::OutputEncoding = [System.Text.Encoding]::UTF8; $env:PAGER = 'cat'; $env:GIT_PAGER = 'cat'; $env:GIT_TERMINAL_PROMPT = '0'; function global:more { param([string[]]$paths) if ($paths) { foreach ($file in $paths) { Get-Content $file } } else { $input } }; function global:help { Get-Help @args }; ${command}`;
-        const output = await executeAdminCommand(fullCommand);
-        if (output && typeof output === 'object' && Array.isArray(output.content)) {
-            return output;
-        }
-        const cleanOutput = (typeof output === 'string' ? output : String(output || '')).replace(/\r\n/g, '\n').replace(/\r/g, '');
-        return { content: [{ type: 'text', text: `\`\`\`powershell\n${cleanOutput}\n\`\`\`` }] };
-    }
-
-    // 路径 B: 普通敏感命令确认模式
-    // 这里只做确认；确认通过后继续走路径 C，在主 PTY/xterm 会话中执行并连续显示输出。
-    if (needsInteractiveAuth) {
-        const combinedCommand = commandEntries.map(e => e.value).join('; ');
-        const confirmed = await requestInteractiveConfirmation(combinedCommand);
-        if (!confirmed) {
-            return { content: [{ type: 'text', text: '用户取消了操作。' }] };
-        }
-    }
-
-    // 路径 C: 标准非管理员会话执行
-    if (isExecutingCommand) {
-        throw new Error('当前已有同步命令执行中，请等待完成或使用 interrupt。');
-    }
-    ensureGuiWindow();
-
-    if (newSession || !ptyProcess) {
-        createNewPtySession();
-    }
-
-    // 必须等渲染端完成 xterm 挂载/监听/首次 fit，且 PowerShell 执行完启动探针，
-    // 才允许向 PTY 注入用户或 AI 指令。替代容易产生竞态的固定 500ms 延时。
-    await waitForTerminalReady();
-
-    if (action === 'startInteractive') {
-        if (commandEntries.length > 1) {
-            throw new Error('startInteractive 只支持单条 command。');
-        }
-
-        const command = commandEntries[0].value;
-        interactiveMode = true;
-        // 不设置 isExecutingCommand；交互式 TUI 输出必须走常驻 guiDataListener，否则会黑屏。
-        ptyProcess.write(`${command}\r`);
-        return { content: [{ type: 'text', text: `Interactive session started: ${command}` }] };
-    }
-
-    if (interactiveMode) {
-        throw new Error('当前终端正被交互式程序 (snow/codex/claude) 占用，请先退出并调用 action:"endInteractive"，或使用 newSession:true 重置会话。');
-    }
-
-    // 就绪等待期间其它调用可能先取得PTY，await后必须再次检查。
-    if (isExecutingCommand) {
-        throw new Error('当前已有同步命令执行中，请等待完成或使用 interrupt。');
-    }
-    const deltaOutputs = [];
-    isExecutingCommand = true;
-    try {
-        for (const entry of commandEntries) {
-            const command = entry.value;
-            const currentReturnModeKey = `returnMode${entry.index || ''}`;
-            const currentReturnMode = args[currentReturnModeKey] || finalReturnMode;
-
-            try {
-                const output = await executeSingleCommandInPty(ptyProcess, command);
-                deltaOutputs.push({ command, output, returnMode: currentReturnMode });
-            } catch (error) {
-                throw new Error(`在执行命令 "${command}" 时出错: ${error.message}`);
-            }
-        }
-    } finally {
-        isExecutingCommand = false;
-    }
-
-    // --- 5. 格式化并返回结果 ---
-    let finalOutput = '';
-    if (finalReturnMode === 'full') {
-        finalOutput = deltaOutputs.length > 0 ? deltaOutputs[deltaOutputs.length - 1].output : '';
-    } else { // delta 模式
-        if (deltaOutputs.length === 1) {
-            finalOutput = deltaOutputs[0].output;
-        } else {
-            finalOutput = deltaOutputs.map(res =>
-                `---[Output for: ${res.command}]---\n${res.output}`
-            ).join('\n\n');
-        }
-    }
-
-    const cleanOutput = finalOutput.replace(/\r\n/g, '\n').replace(/\r/g, '');
-    return { content: [{ type: 'text', text: `\`\`\`powershell\n${cleanOutput}\n\`\`\`` }] };
-}
-
-/**
- * 清理插件资源，在主程序退出或插件重载时调用。
- */
-function cleanup() {
-    console.log('[PowerShellExecutor] 正在清理资源...');
-
-    // 1. 关闭并销毁 GUI 窗口
-    if (guiWindow && !guiWindow.isDestroyed()) {
-        try {
-            // 移除 'closed' 监听器，以避免在程序化关闭时触发额外的 ptyProcess.kill()
-            guiWindow.removeAllListeners('closed');
-            guiWindow.close();
-            console.log('[PowerShellExecutor] GUI 窗口已关闭。');
-        } catch (e) {
-            console.error('[PowerShellExecutor] 关闭 GUI 窗口时出错:', e);
-        }
-        guiWindow = null;
-    }
-    guiReady = false;
-    if (resolveGuiReady) {
-        resolveGuiReady();
-        resolveGuiReady = null;
-    }
-    guiReadyPromise = Promise.resolve();
-    visibleTextResolvers.clear();
-    terminalPasteResolvers.clear();
-
-    // 2. 终止所有跟踪的子进程
-    if (childProcesses.size > 0) {
-        console.log(`[PowerShellExecutor] 正在终止 ${childProcesses.size} 个子进程...`);
-        for (const processToKill of childProcesses) {
-            try {
-                // ptyProcess 和 child_process 对象都有一个 .kill() 方法
-                processToKill.kill();
-                console.log(`[PowerShellExecutor] 进程 (PID: ${processToKill.pid}) 已终止。`);
-            } catch (e) {
-                console.error(`[PowerShellExecutor] 终止进程 (PID: ${processToKill.pid}) 时出错:`, e);
-            }
-        }
-        childProcesses.clear();
-    }
-
-    // 3. 停止文件监视器
-    if (settingsWatcher) {
-        try {
-            settingsWatcher.close();
-            settingsWatcher = null;
-            console.log('[PowerShellExecutor] Settings file watcher stopped.');
-        } catch (e) {
-            console.error('[PowerShellExecutor] Error stopping settings watcher:', e);
-        }
-    }
-
-    // 4. 确保 ptyProcess 状态被重置
-    mirrorSinks.clear();
-    replayBuffer = '';
-    mirrorStartupPending = false;
-    mirrorStartupHeld = '';
-    ptyProcess = null;
-    ptyReadyPromise = Promise.resolve();
-    guiDataListener = null;
-    isExecutingCommand = false;
-    interactiveMode = false;
-    activeCommandAbort = null;
-}
-
-// 导出主入口、GUI/清理函数，以及无 Electron 副作用的序列解析器供单元测试使用。
-module.exports = {
-    processToolCall,
-    openGuiTerminal,
-    attachMirror,
-    listCommandRuns,
-    getCommandRun,
-    subscribeCommandRuns,
-    // 仅供测试：跳过 GUI 窗口，直接在共享 PTY 会话里跑一条短命令
-    _runCommandForTest: (command) => executeSingleCommandInPty(ptyProcess, command),
-    ensureMirrorSession,
-    restartSession,
-    getSessionState,
-    writeSessionInput,
-    resizeSession: applyPtyResize,
-    cleanup,
-    parseInteractiveSequence,
-    parseWaitDuration,
-    parseTerminalKey
+// node-pty 是原生模块：只读命令记录、不开终端时不加载它，真正创建会话时才 require
+let ptyModule = null;
+function loadPty() {
+    return ptyModule || (ptyModule = require('node-pty'));
+}
+const os = require('os');
+const { spawn } = require('child_process');
+const path = require('path');
+const fs = require('fs');
+const crypto = require('crypto');
+const { BrowserWindow, ipcMain, clipboard } = require('electron');
+const tmp = require('tmp');
+const chokidar = require('chokidar');
+const { CommandOutputParser } = require('./command-output-parser');
+const { sanitizeTerminalOutput } = require('./terminalOutputSanitizer');
+// 命令运行记录放在无副作用的独立模块里：主进程只读记录时不必加载整个执行器
+const {
+    COMMAND_RUN_RAW_LIMIT,
+    beginCommandRun,
+    appendCommandRunOutput,
+    finishCommandRun,
+    listCommandRuns,
+    getCommandRun,
+    subscribeCommandRuns,
+} = require('./commandRunStore');
+const { resolveConfirmationScript } = require('./nativeHelperPath.js');
+
+// --- GUI Window Management ---
+let guiWindow = null;
+let guiReady = false;
+let guiReadyPromise = Promise.resolve();
+let resolveGuiReady = null;
+
+function createGuiReadyBarrier() {
+    guiReady = false;
+    guiReadyPromise = new Promise((resolve) => {
+        resolveGuiReady = resolve;
+    });
+}
+
+async function waitForGuiReady(timeoutMs = 15000) {
+    if (!guiWindow || guiWindow.isDestroyed()) {
+        throw new Error('PowerShell GUI window is not available.');
+    }
+
+    if (guiReady) {
+        return;
+    }
+
+    const targetWebContents = guiWindow.webContents;
+    let timeoutId = null;
+
+    try {
+        await Promise.race([
+            guiReadyPromise,
+            new Promise((_, reject) => {
+                timeoutId = setTimeout(() => {
+                    reject(new Error(`PowerShell GUI initialization timed out after ${timeoutMs}ms.`));
+                }, timeoutMs);
+            })
+        ]);
+    } finally {
+        if (timeoutId) {
+            clearTimeout(timeoutId);
+        }
+    }
+
+    if (!guiWindow || guiWindow.isDestroyed() || guiWindow.webContents !== targetWebContents || !guiReady) {
+        throw new Error('PowerShell GUI window changed or closed during initialization.');
+    }
+}
+
+function ensureGuiWindow() {
+    if (guiWindow && !guiWindow.isDestroyed()) {
+        guiWindow.focus();
+        return guiWindow;
+    }
+
+    createGuiReadyBarrier();
+    guiWindow = new BrowserWindow({
+        width: 800,
+        height: 600,
+        title: 'VCP PowerShell Executor',
+        frame: false, // 禁用窗口边框
+        ...(process.platform === 'darwin' ? {} : { titleBarStyle: 'hidden' }),
+        webPreferences: {
+            preload: path.join(__dirname, 'gui', 'preload.js'),
+            nodeIntegration: false, // 禁用 Node.js 集成以增强安全性
+            contextIsolation: true, // 启用上下文隔离
+            spellcheck: false,
+            // 将 node_modules 的路径作为参数传递给窗口，以便在 HTML 中使用
+            additionalArguments: [`--node-modules-path=${path.join(__dirname, '..', '..', '..', '..', 'node_modules')}`]
+        },
+        autoHideMenuBar: true,
+    });
+
+    guiWindow.loadFile(path.join(__dirname, 'gui', 'PowerShellViewer.html'));
+
+    guiWindow.on('closed', () => {
+        guiReady = false;
+        if (resolveGuiReady) {
+            resolveGuiReady();
+            resolveGuiReady = null;
+        }
+        guiWindow = null;
+        // 当GUI关闭时，也终止关联的 pty 进程
+        if (ptyProcess) {
+            try {
+                ptyProcess.kill();
+                console.log('[PowerShellExecutor] GUI closed, associated pty process terminated.');
+            } catch (e) {
+                console.error('[PowerShellExecutor] Error terminating pty process on GUI close:', e);
+            }
+            // ptyProcess 的 onExit 事件处理器会自动将其设置为 null 并从 childProcesses 集合中移除
+        }
+    });
+
+    return guiWindow;
+}
+
+// --- 主题管理与文件监视 ---
+const settingsPath = path.join(__dirname, '..', '..', '..', 'AppData', 'settings.json');
+let settingsWatcher = null;
+let lastSentTheme = null; // 用于存储上一次发送的主题名称
+
+/**
+ * 读取、比较并发送主题更新。
+ * 只有当主题名称实际发生变化时，才会向GUI发送事件。
+ * @param {Electron.WebContents} targetWebContents - 目标窗口的 webContents。
+ * @param {boolean} [forceSend=false] - 是否强制发送，即使用于初始化。
+ */
+function sendThemeUpdate(targetWebContents, forceSend = false) {
+    if (!targetWebContents || targetWebContents.isDestroyed()) {
+        return;
+    }
+    try {
+        let currentTheme = 'dark'; // 默认主题
+        if (fs.existsSync(settingsPath)) {
+            const settings = JSON.parse(fs.readFileSync(settingsPath, 'utf-8'));
+            currentTheme = settings.currentThemeMode || 'dark';
+        }
+
+        // 只有当主题变化或强制发送时，才进行通信
+        if (currentTheme !== lastSentTheme || forceSend) {
+            targetWebContents.send('theme-init', { themeName: currentTheme });
+            lastSentTheme = currentTheme; // 更新已发送的主题记录
+            console.log(`[PowerShellExecutor] Theme updated to: ${currentTheme}`);
+        }
+    } catch (error) {
+        console.error('[PowerShellExecutor] Error reading or sending theme settings:', error);
+    }
+}
+
+// 初始化文件监视器
+function setupThemeWatcher() {
+    if (settingsWatcher) {
+        settingsWatcher.close();
+    }
+    settingsWatcher = chokidar.watch(settingsPath, {
+        persistent: true,
+        ignoreInitial: true
+    });
+
+    settingsWatcher.on('change', () => {
+        if (guiWindow && !guiWindow.isDestroyed()) {
+            sendThemeUpdate(guiWindow.webContents);
+        }
+    });
+}
+
+// 在插件加载时启动监视
+setupThemeWatcher();
+
+
+// 监听来自GUI的“就绪”信号。
+// 只有当前窗口在 xterm 挂载、IPC 监听注册和首次 fit 完成后发出的信号才能解除屏障；
+// 旧窗口的迟到消息不能误解锁新窗口。
+ipcMain.on('powershell-gui-ready', (event) => {
+    if (!guiWindow || guiWindow.isDestroyed() || event.sender !== guiWindow.webContents) {
+        return;
+    }
+
+    guiReady = true;
+    if (resolveGuiReady) {
+        resolveGuiReady();
+        resolveGuiReady = null;
+    }
+
+    sendThemeUpdate(event.sender, true);
+});
+
+// 监听来自GUI的用户命令
+ipcMain.on('powershell-command', (event, command) => {
+    if (ptyProcess && command) {
+        // 将用户输入的命令写入 pty 进程
+        ptyProcess.write(`${command}\r`);
+    }
+});
+
+// 监听来自GUI的复制请求
+ipcMain.on('copy-to-clipboard', (event, text) => {
+    if (text) {
+        clipboard.writeText(text);
+    }
+});
+
+// 监听来自GUI的粘贴请求
+ipcMain.handle('read-from-clipboard', () => {
+    return clipboard.readText();
+});
+
+// 监听来自GUI的尺寸调整请求
+function applyPtyResize(cols, rows) {
+    const normalizedCols = Number(cols);
+    const normalizedRows = Number(rows);
+
+    if (Number.isInteger(normalizedCols) && Number.isInteger(normalizedRows) && normalizedCols > 0 && normalizedRows > 0) {
+        lastKnownSize = { cols: normalizedCols, rows: normalizedRows };
+    }
+
+    if (ptyProcess) {
+        try {
+            ptyProcess.resize(lastKnownSize.cols, lastKnownSize.rows);
+        } catch (e) {
+            console.error('[PowerShellExecutor] Failed to resize pty:', e);
+        }
+    }
+}
+
+ipcMain.on('powershell-resize', (event, { cols, rows }) => {
+    applyPtyResize(cols, rows);
+});
+
+// 监听来自GUI的真实终端输入透传。
+// 安全声明：此通道等价于用户直接操作本机终端，不经过 intelligentSecurityCheck；
+// forbiddenCommands/authRequiredCommands 仅约束 AI 工具调用路径 processToolCall。
+ipcMain.on('powershell-input', (event, data) => {
+    if (ptyProcess && typeof data === 'string') {
+        ptyProcess.write(data);
+    }
+});
+
+// --- 查询终端可见文本与 xterm 粘贴响应 ---
+const visibleTextResolvers = new Map();
+const terminalPasteResolvers = new Map();
+
+ipcMain.on('visible-text-response', (event, payload, legacyText) => {
+    if (!isPowerShellGuiSender(event)) {
+        return;
+    }
+
+    // 兼容旧渲染端直接返回字符串的格式。
+    if (typeof payload === 'string') {
+        const firstEntry = visibleTextResolvers.entries().next().value;
+        if (firstEntry) {
+            const [requestId, resolve] = firstEntry;
+            visibleTextResolvers.delete(requestId);
+            resolve(payload);
+        }
+        return;
+    }
+
+    const requestId = payload && payload.requestId;
+    const resolver = requestId ? visibleTextResolvers.get(requestId) : null;
+    if (resolver) {
+        visibleTextResolvers.delete(requestId);
+        resolver(typeof payload.text === 'string' ? payload.text : (legacyText || ''));
+    }
+});
+
+ipcMain.on('terminal-paste-complete', (event, payload) => {
+    if (!isPowerShellGuiSender(event)) {
+        return;
+    }
+
+    const requestId = payload && payload.requestId;
+    const resolver = requestId ? terminalPasteResolvers.get(requestId) : null;
+    if (resolver) {
+        terminalPasteResolvers.delete(requestId);
+        resolver();
+    }
+});
+
+// --- PowerShell GUI 专属窗口控制 ---
+// 不复用应用级 minimize-window/maximize-window/close-window：ipcMain 是全局事件总线，
+// 使用通用通道会让日志中心等其它窗口的操作也落到此 guiWindow 上；而 PowerShell
+// 自身的消息还会与应用级处理器重复执行（最大化切换两次后等同于没有变化）。
+function isPowerShellGuiSender(event) {
+    return Boolean(
+        event
+        && guiWindow
+        && !guiWindow.isDestroyed()
+        && guiWindow.webContents
+        && !guiWindow.webContents.isDestroyed()
+        && event.sender === guiWindow.webContents
+    );
+}
+
+ipcMain.on('powershell-window:minimize', (event) => {
+    if (isPowerShellGuiSender(event)) {
+        guiWindow.minimize();
+    }
+});
+
+ipcMain.on('powershell-window:toggle-maximize', (event) => {
+    if (!isPowerShellGuiSender(event)) {
+        return;
+    }
+
+    if (guiWindow.isMaximized()) {
+        guiWindow.unmaximize();
+    } else {
+        guiWindow.maximize();
+    }
+});
+
+ipcMain.on('powershell-window:close', (event) => {
+    if (isPowerShellGuiSender(event)) {
+        guiWindow.close();
+    }
+});
+
+// --- ANSI / terminal control projection for AI text summaries ---
+// 清洗逻辑在 terminalOutputSanitizer.js（纯函数，命令运行记录也用它）
+
+// --- 模块级状态 ---
+// 用于保存持久化的伪终端（PowerShell）进程
+let ptyProcess = null;
+// 移除 fullTerminalHistory，后端不再维护终端内容的完整状态
+// 新增：用于跟踪所有子进程，确保它们在插件卸载或程序退出时被正确清理
+const childProcesses = new Set();
+let guiDataListener = null; // 新增：保存GUI监听器的引用
+let isExecutingCommand = false; // 仅表示 AI 短命令执行中；不要用于交互式 TUI 会话
+let interactiveMode = false; // 表示当前 PTY 被 snow/codex/claude 等交互式程序占用
+let activeCommandAbort = null; // 当前同步命令的本地等待中止器；供并发 interrupt 工具调用解除阻塞
+let lastKnownSize = { cols: 80, rows: 24 }; // GUI 最近一次 fit 出来的尺寸，用作 PTY 初始尺寸
+let ptyReadyPromise = Promise.resolve();
+
+// --- 配置加载 ---
+const defaultConfig = {
+    returnMode: 'delta', // 默认为增量模式
+    forbiddenCommands: [],
+    authRequiredCommands: []
+};
+
+try {
+    const configPath = path.join(__dirname, 'config.env');
+    if (fs.existsSync(configPath)) {
+        const configContent = fs.readFileSync(configPath, 'utf-8');
+
+        const returnModeMatch = configContent.match(/^POWERSHELL_RETURN_MODE\s*=\s*(delta|full)/m);
+        if (returnModeMatch) {
+            defaultConfig.returnMode = returnModeMatch[1];
+        }
+
+        const forbiddenMatch = configContent.match(/^FORBIDDEN_COMMANDS\s*=\s*(.*)/m);
+        if (forbiddenMatch && forbiddenMatch[1]) {
+            defaultConfig.forbiddenCommands = forbiddenMatch[1].split(',').map(c => c.trim().toLowerCase()).filter(c => c);
+        }
+
+        const authRequiredMatch = configContent.match(/^AUTH_REQUIRED_COMMANDS\s*=\s*(.*)/m);
+        if (authRequiredMatch && authRequiredMatch[1]) {
+            defaultConfig.authRequiredCommands = authRequiredMatch[1].split(',').map(c => c.trim().toLowerCase()).filter(c => c);
+        }
+    }
+} catch (error) {
+    console.error('[PowerShellExecutor] Error reading config.env:', error);
+}
+
+
+/**
+ * 智能安全检查函数 - 区分命令关键字和路径内容
+ * @param {string} command - 要检查的命令字符串
+ * @param {string[]} forbiddenKeywords - 禁止的关键字列表
+ * @param {string[]} authRequiredKeywords - 需要授权的关键字列表
+ * @returns {object} - 检查结果 {isForbidden: boolean, needsAuth: boolean, matchedKeyword: string}
+ */
+function intelligentSecurityCheck(command, forbiddenKeywords, authRequiredKeywords) {
+    const result = {
+        isForbidden: false,
+        needsAuth: false,
+        matchedKeyword: null,
+        reason: null
+    };
+
+    // 预处理命令：移除多余空格，转换为小写
+    const normalizedCommand = command.trim().toLowerCase();
+
+    // 如果命令为空，直接返回
+    if (!normalizedCommand) {
+        return result;
+    }
+
+    // 定义路径模式 - 常见的Windows和Unix路径格式
+    const pathPatterns = [
+        /[a-z]:\\[^\\/:*?"<>|]*(?:\\[^\\/:*?"<>|]*)*\\?/gi,  // Windows路径 C:\path\to\file
+        /\/[^\/\s]*(?:\/[^\/\s]*)*\/?/g,                      // Unix路径 /path/to/file
+        /\$env:[a-z_]+[^\\/:*?"<>|\s]*/gi,                   // PowerShell环境变量路径
+        /\${[^}]+}[^\\/:*?"<>|\s]*/gi,                       // 变量路径 ${VAR}/path
+        /~\/[^\/\s]*(?:\/[^\/\s]*)*\/?/g                     // 用户目录路径 ~/path
+    ];
+
+    // 提取所有可能的路径
+    const detectedPaths = [];
+    pathPatterns.forEach(pattern => {
+        const matches = normalizedCommand.match(pattern);
+        if (matches) {
+            detectedPaths.push(...matches);
+        }
+    });
+
+    // 创建不包含路径的命令版本用于安全检查
+    let commandWithoutPaths = normalizedCommand;
+    detectedPaths.forEach(path => {
+        // 将路径替换为占位符，避免路径中的关键字被误判
+        commandWithoutPaths = commandWithoutPaths.replace(path.toLowerCase(), ' __PATH_PLACEHOLDER__ ');
+    });
+
+    // 清理命令：移除多余空格
+    commandWithoutPaths = commandWithoutPaths.replace(/\s+/g, ' ').trim();
+
+    // 定义PowerShell命令结构模式
+    const commandStructurePatterns = [
+        // PowerShell cmdlet模式: Verb-Noun
+        /\b[a-z]+-[a-z]+\b/g,
+        // 常见命令
+        /\b(?:get|set|new|remove|copy|move|invoke|start|stop|restart|test|clear|add|export|import|select|where|foreach|sort|group|measure|compare|out|write|read)\b/g,
+        // 参数模式
+        /\s-[a-z]+\b/g
+    ];
+
+    // 检查禁止的关键字
+    for (const keyword of forbiddenKeywords) {
+        if (!keyword) continue;
+
+        const keywordLower = keyword.toLowerCase();
+
+        // 1. 首先检查是否在路径中
+        const isInPath = detectedPaths.some(path =>
+            path.toLowerCase().includes(keywordLower)
+        );
+
+        if (isInPath) {
+            // 如果关键字只在路径中出现，检查是否也在命令部分出现
+            if (!commandWithoutPaths.includes(keywordLower)) {
+                console.log(`[PowerShellExecutor] 安全检查：关键字 "${keyword}" 仅在路径中发现，允许执行`);
+                continue; // 跳过这个关键字，不视为违规
+            }
+        }
+
+        // 2. 检查命令部分是否包含关键字
+        if (commandWithoutPaths.includes(keywordLower)) {
+            // 3. 进一步验证：检查关键字是否作为独立的命令或参数出现
+            const wordBoundaryPattern = new RegExp(`\\b${keywordLower.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\b`);
+
+            if (wordBoundaryPattern.test(commandWithoutPaths)) {
+                result.isForbidden = true;
+                result.matchedKeyword = keyword;
+                result.reason = `命令包含被禁止的关键字: ${keyword}`;
+                console.log(`[PowerShellExecutor] 安全检查：发现禁止的命令关键字 "${keyword}"`);
+                return result;
+            }
+        }
+    }
+
+    // 检查需要授权的关键字（使用相同的逻辑）
+    for (const keyword of authRequiredKeywords) {
+        if (!keyword) continue;
+
+        const keywordLower = keyword.toLowerCase();
+
+        // 1. 首先检查是否在路径中
+        const isInPath = detectedPaths.some(path =>
+            path.toLowerCase().includes(keywordLower)
+        );
+
+        if (isInPath) {
+            // 如果关键字只在路径中出现，检查是否也在命令部分出现
+            if (!commandWithoutPaths.includes(keywordLower)) {
+                console.log(`[PowerShellExecutor] 安全检查：授权关键字 "${keyword}" 仅在路径中发现，不需要授权`);
+                continue; // 跳过这个关键字，不需要授权
+            }
+        }
+
+        // 2. 检查命令部分是否包含关键字
+        if (commandWithoutPaths.includes(keywordLower)) {
+            // 3. 进一步验证：检查关键字是否作为独立的命令或参数出现
+            const wordBoundaryPattern = new RegExp(`\\b${keywordLower.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\b`);
+
+            if (wordBoundaryPattern.test(commandWithoutPaths)) {
+                result.needsAuth = true;
+                result.matchedKeyword = keyword;
+                result.reason = `命令包含需要授权的关键字: ${keyword}`;
+                console.log(`[PowerShellExecutor] 安全检查：发现需要授权的命令关键字 "${keyword}"`);
+                // 注意：不要return，继续检查其他关键字
+            }
+        }
+    }
+
+    return result;
+}
+
+/**
+ * 启动一个独立的 Python GUI 脚本来请求管理员权限并执行命令。
+ * 这是一个"即发即忘"的操作，它会打开一个全新的、独立的管理员终端窗口。
+ * @param {string} command - 需要以管理员权限执行的命令。
+ * @returns {Promise<string>} - 一个解析为提示信息的消息。
+ */
+function executeAdminCommand(command) {
+    return new Promise((resolve, reject) => {
+        // 1. 创建一个临时的输出文件
+        tmp.file({ postfix: '.txt' }, (err, tmpFilePath, fd, cleanupCallback) => {
+            if (err) {
+                return reject(new Error(`无法创建临时文件: ${err.message}`));
+            }
+
+            let pythonConfirmScript;
+            try { pythonConfirmScript = resolveConfirmationScript(__dirname); }
+            catch (error) { cleanupCallback(); reject(error); return; }
+            const commandAsBase64 = Buffer.from(command).toString('base64');
+
+            // 2. 准备传递给Python脚本的参数
+            const scriptPathForPS = pythonConfirmScript.replace(/'/g, "''");
+            const commandForPS = commandAsBase64.replace(/'/g, "''");
+            const tmpPathForPS = tmpFilePath.replace(/'/g, "''");
+            const argumentList = `"${scriptPathForPS}", "${commandForPS}", "${tmpPathForPS}"`;
+
+            // 3. 构造PowerShell命令以管理员权限运行Python脚本（捕获UAC异常并注入纯ASCII标记）
+            const psCommand = `$ErrorActionPreference = 'Stop'; try { Start-Process -FilePath "pythonw.exe" -ArgumentList ${argumentList} -Verb RunAs -Wait } catch { [Console]::Error.WriteLine('UAC_CANCELLED_OR_FAILED: ' + $_.Exception.Message) }`;
+            const child = spawn('powershell.exe', [
+                '-NoProfile',
+                '-ExecutionPolicy', 'Bypass',
+                '-Command', psCommand
+            ], {
+                windowsHide: true
+            });
+            childProcesses.add(child); // 跟踪进程
+
+            let stderrOutput = '';
+            let isSettled = false;
+
+            // 310 秒外部安全定时器守护，防止后台卡死挂起 (Todo #3)
+            const safetyTimeout = setTimeout(() => {
+                if (isSettled) return;
+                isSettled = true;
+                try {
+                    child.kill();
+                } catch { }
+                childProcesses.delete(child);
+                cleanupCallback();
+                resolve({
+                    isCancelled: true,
+                    content: [{
+                        type: 'text',
+                        text: '⚠️ [操作超时]：等待管理员确认超时（超过无操作安全时限），系统已自动拒绝执行。'
+                    }]
+                });
+            }, 310000);
+
+            child.stderr.on('data', (data) => {
+                stderrOutput += data.toString('utf-8');
+            });
+
+            child.on('error', (err) => {
+                if (isSettled) return;
+                isSettled = true;
+                clearTimeout(safetyTimeout);
+                childProcesses.delete(child); // 停止跟踪
+                cleanupCallback(); // 清理临时文件
+                reject(new Error(`无法启动PowerShell包装脚本: ${err.message}`));
+            });
+
+            child.on('close', (code) => {
+                if (isSettled) return;
+                isSettled = true;
+                clearTimeout(safetyTimeout);
+                childProcesses.delete(child); // 停止跟踪
+                // PowerShell脚本执行完毕，安全读取临时文件内容
+                fs.readFile(tmpFilePath, 'utf-8', (readErr, data) => {
+                    cleanupCallback(); // 确保清理临时文件
+
+                    // 检测 UAC 取消或拒绝错误（显式捕获标记、0x800704C7 或中文取消提示）
+                    const isUacCancelled = stderrOutput && (
+                        stderrOutput.includes('UAC_CANCELLED_OR_FAILED') ||
+                        stderrOutput.includes('0x800704C7') ||
+                        stderrOutput.includes('74C7') ||
+                        stderrOutput.includes('操作已被用户取消') ||
+                        stderrOutput.includes('The operation was canceled by the user')
+                    );
+
+                    if (isUacCancelled) {
+                        return resolve({
+                            isCancelled: true,
+                            content: [{
+                                type: 'text',
+                                text: '⚠️ [操作未执行/未授权]：用户在 Windows UAC 提权界面取消了授权，或未获取到管理员权限。敏感命令未执行。'
+                            }]
+                        });
+                    }
+                    if (readErr) {
+                        if (stderrOutput.trim()) {
+                            return reject(new Error(`管理员脚本执行失败: ${stderrOutput.trim()}`));
+                        }
+                        return reject(new Error(`无法读取管理员任务的输出文件: ${readErr.message}`));
+                    }
+
+                    const result = data.trim();
+                    if (result === "USER_CANCELLED") {
+                        resolve({
+                            isCancelled: true,
+                            content: [{
+                                type: 'text',
+                                text: '⚠️ [操作已取消]：用户已主动拒绝或取消了本次管理员权限申请。敏感命令未执行。'
+                            }]
+                        });
+                    } else if (result === "TIMEOUT_REJECTED") {
+                        resolve({
+                            isCancelled: true,
+                            content: [{
+                                type: 'text',
+                                text: '⚠️ [操作超时]：等待管理员确认超时（超过无操作安全时限），系统已自动拒绝执行。'
+                            }]
+                        });
+                    } else if (result.startsWith("ERROR:")) {
+                        reject(new Error(result.substring(6).trim()));
+                    } else if (result === "") {
+                        // 空输出防穿透：脚本根本未生成内容或提权未通过时，绝不能当作正常执行成功
+                        resolve({
+                            isCancelled: true,
+                            content: [{
+                                type: 'text',
+                                text: '⚠️ [操作未执行/未授权]：用户在 Windows UAC 提权界面取消了授权，或未获取到管理员权限。敏感命令未执行。'
+                            }]
+                        });
+                    } else {
+                        resolve(result);
+                    }
+                });
+            });
+        });
+    });
+}
+
+/**
+ * 请求用户确认一个敏感命令，但不在确认脚本中执行命令。
+ * 确认通过后，命令仍回到主 PTY/xterm 会话执行，以保持 GUI 连续输出。
+ * @param {string} command - 需要展示给用户确认的命令。
+ * @returns {Promise<boolean>} - 用户是否允许执行。
+ */
+function requestInteractiveConfirmation(command) {
+    return new Promise((resolve, reject) => {
+        tmp.file({ postfix: '.txt' }, (err, tmpFilePath, fd, cleanupCallback) => {
+            if (err) {
+                return reject(new Error(`无法创建临时文件: ${err.message}`));
+            }
+
+            let pythonConfirmScript;
+            try { pythonConfirmScript = resolveConfirmationScript(__dirname); }
+            catch (error) { cleanupCallback(); reject(error); return; }
+            const commandAsBase64 = Buffer.from(command).toString('base64');
+
+            // 普通敏感命令只需要当前权限确认，不应绕过主 PTY/xterm 执行链路。
+            const child = spawn('pythonw.exe', [
+                pythonConfirmScript,
+                commandAsBase64,
+                tmpFilePath,
+                '--interactive-auth',
+                '--confirm-only'
+            ], {
+                windowsHide: true
+            });
+            childProcesses.add(child);
+
+            let stderrOutput = '';
+            child.stderr.on('data', (data) => {
+                stderrOutput += data.toString('utf-8');
+            });
+
+            child.on('error', (err) => {
+                childProcesses.delete(child);
+                cleanupCallback();
+                reject(new Error(`无法启动交互式确认脚本: ${err.message}`));
+            });
+
+            child.on('close', () => {
+                childProcesses.delete(child);
+                fs.readFile(tmpFilePath, 'utf-8', (readErr, data) => {
+                    cleanupCallback();
+
+                    if (readErr) {
+                        if (stderrOutput.trim()) {
+                            return reject(new Error(`交互式确认脚本失败: ${stderrOutput.trim()}`));
+                        }
+                        return reject(new Error(`无法读取交互式确认结果文件: ${readErr.message}`));
+                    }
+
+                    const result = data.trim();
+                    if (result === 'CONFIRMED') {
+                        resolve(true);
+                    } else if (result === 'USER_CANCELLED' || result === 'TIMEOUT_REJECTED') {
+                        resolve(false);
+                    } else if (result.startsWith('ERROR:')) {
+                        reject(new Error(result.substring(6).trim()));
+                    } else {
+                        reject(new Error(`未知的交互式确认结果: ${result || '<empty>'}`));
+                    }
+                });
+            });
+        });
+    });
+}
+
+/**
+ * GUI 仅接收原始PTY投影；渲染窗口失效不得打断命令完成检测。
+ */
+function dispatchPtyData(rawData) {
+    const dataStr = rawData.toString('utf-8');
+    if (!dataStr) {
+        return;
+    }
+
+    if (mirrorStartupPending) {
+        // 启动握手（编码设置与就绪标记）是内部细节，握手完成前不投影到侧栏
+        mirrorStartupHeld = (mirrorStartupHeld + dataStr).slice(-MIRROR_REPLAY_LIMIT);
+    } else {
+        emitMirrorData(dataStr);
+    }
+
+    try {
+        if (!guiWindow || guiWindow.isDestroyed()
+            || guiWindow.webContents.isDestroyed()) {
+            return;
+        }
+        guiWindow.webContents.send('powershell-data', dataStr);
+    } catch (error) {
+        console.warn('[PowerShellExecutor] GUI output delivery failed:', error.message);
+    }
+}
+
+// --- 侧栏镜像 ---
+// 主窗口侧栏的「终端」标签是同一个 PTY 会话的另一个视图：输出同时送往 GUI 窗口和镜像，
+// 输入与尺寸调整直接落到同一个 PTY，AI 工具执行的命令因此对两处都可见。
+const MIRROR_REPLAY_LIMIT = 256 * 1024;
+const mirrorSinks = new Set();
+let replayBuffer = '';
+let mirrorStartupPending = false;
+let mirrorStartupHeld = '';
+
+function emitMirrorData(dataStr) {
+    if (!dataStr) return;
+    // 侧栏终端可能在会话进行中才挂载，缓存最近输出用于回放。
+    replayBuffer += dataStr;
+    if (replayBuffer.length > MIRROR_REPLAY_LIMIT) {
+        replayBuffer = replayBuffer.slice(-MIRROR_REPLAY_LIMIT);
+    }
+    notifyMirrors('onData', dataStr);
+}
+
+/** 结束启动握手：成功时只放出就绪标记之后的内容（通常是提示符），失败时原样放出便于排查。 */
+function releaseMirrorStartup(afterReady = null) {
+    if (!mirrorStartupPending) return;
+    mirrorStartupPending = false;
+    const held = mirrorStartupHeld;
+    mirrorStartupHeld = '';
+    emitMirrorData(afterReady === null ? held : afterReady);
+}
+
+function notifyMirrors(method, ...args) {
+    for (const sink of mirrorSinks) {
+        try {
+            sink[method]?.(...args);
+        } catch (e) {
+            console.error('[PowerShellExecutor] Mirror sink failed:', e);
+        }
+    }
+}
+
+/**
+ * 注册一个镜像视图并回放已有输出。
+ * @param {{onData: Function, onClear?: Function, onExit?: Function}} sink
+ * @returns {Function} 取消注册
+ */
+function attachMirror(sink) {
+    mirrorSinks.add(sink);
+    if (replayBuffer) {
+        try {
+            sink.onData(replayBuffer);
+        } catch (e) {
+            console.error('[PowerShellExecutor] Mirror replay failed:', e);
+        }
+    }
+    return () => mirrorSinks.delete(sink);
+}
+
+/** 确保有一个 PTY 会话（不打开 GUI 窗口）。 */
+function ensureMirrorSession() {
+    if (!ptyProcess) {
+        createNewPtySession();
+    }
+    return getSessionState();
+}
+
+/** 重置为全新的 PTY 会话（与 GUI 窗口共用）。 */
+function restartSession() {
+    createNewPtySession();
+    return getSessionState();
+}
+
+function getSessionState() {
+    return {
+        running: Boolean(ptyProcess),
+        pid: ptyProcess ? ptyProcess.pid : null,
+        // AI 短命令或交互式 TUI 占用期间，不应向会话里塞入额外命令。
+        busy: Boolean(isExecutingCommand || interactiveMode),
+        cols: lastKnownSize.cols,
+        rows: lastKnownSize.rows,
+    };
+}
+
+function writeSessionInput(data) {
+    if (!ptyProcess || typeof data !== 'string') {
+        return false;
+    }
+    ptyProcess.write(data);
+    return true;
+}
+
+/**
+ * 等待指定 PTY 完成 PowerShell 初始化探针。
+ * Promise 与具体 PTY 实例绑定，旧会话的迟到结果不能被新会话复用。
+ * @param {object} targetPtyProcess - 要等待的 node-pty 实例。
+ * @param {number} timeoutMs - 最大等待时间。
+ */
+async function waitForPtyReady(targetPtyProcess = ptyProcess, timeoutMs = 15000) {
+    if (!targetPtyProcess || targetPtyProcess !== ptyProcess) {
+        throw new Error('PowerShell PTY session is not available.');
+    }
+
+    let timeoutId = null;
+    try {
+        await Promise.race([
+            ptyReadyPromise,
+            new Promise((_, reject) => {
+                timeoutId = setTimeout(() => {
+                    reject(new Error(`PowerShell PTY initialization timed out after ${timeoutMs}ms.`));
+                }, timeoutMs);
+            })
+        ]);
+    } finally {
+        if (timeoutId) {
+            clearTimeout(timeoutId);
+        }
+    }
+
+    if (!ptyProcess || ptyProcess !== targetPtyProcess) {
+        throw new Error('PowerShell PTY session changed or exited during initialization.');
+    }
+}
+
+/**
+ * 同时等待渲染端 xterm 和后端 PTY 就绪，确保指令不会在界面初始化前注入。
+ */
+async function waitForTerminalReady() {
+    const targetPtyProcess = ptyProcess;
+    await Promise.all([
+        waitForGuiReady(),
+        waitForPtyReady(targetPtyProcess)
+    ]);
+}
+
+/**
+ * 创建一个新的伪终端 (pty) 进程。
+ */
+function createNewPtySession() {
+    // newSession 是交互模式的一期低成本复位入口。
+    interactiveMode = false;
+    isExecutingCommand = false;
+    activeCommandAbort = null;
+
+    // 如果已存在旧进程，先销毁它
+    if (ptyProcess) {
+        childProcesses.delete(ptyProcess);
+        ptyProcess.kill();
+        // 当重置会话时，通知前端清屏
+        if (guiWindow && !guiWindow.isDestroyed()) {
+            guiWindow.webContents.send('powershell-clear');
+        }
+    }
+    replayBuffer = '';
+    notifyMirrors('onClear');
+
+    let shell = 'bash';
+    let args = [];
+
+    if (os.platform() === 'win32') {
+        // 优先使用 PowerShell Core (pwsh.exe)，如果不存在则回退到 Windows PowerShell (powershell.exe)
+        // 检测顺序：Program Files 标准路径 → where.exe PATH 查找 → 回退 powershell.exe
+        const pwshPath = path.join(process.env.PROGRAMFILES, 'PowerShell', '7', 'pwsh.exe');
+        if (fs.existsSync(pwshPath)) {
+            shell = pwshPath;
+        } else {
+            // 二级回退：winget/MSIX 安装的 PS7 位于 WindowsApps（AppExecution Alias），
+            // fs.existsSync 对此类特殊文件不可靠，直接信任 where.exe 结果。
+            try {
+                const { execSync } = require('child_process');
+                const whereResult = execSync('where.exe pwsh', { windowsHide: true, encoding: 'utf8', timeout: 5000 }).trim();
+                const firstLine = whereResult.split(/\r?\n/)[0].trim();
+                if (firstLine) {
+                    shell = firstLine;
+                } else {
+                    shell = 'powershell.exe';
+                }
+            } catch (e) {
+                shell = 'powershell.exe';
+            }
+        }
+        args = ['-NoLogo'];
+    }
+
+    ptyProcess = loadPty().spawn(shell, args, {
+        name: 'xterm-color',
+        cols: lastKnownSize.cols,
+        rows: lastKnownSize.rows,
+        cwd: process.env.USERPROFILE || process.env.HOME,
+        env: {
+            ...process.env,
+            PAGER: 'cat',
+            GIT_PAGER: 'cat',
+            GIT_TERMINAL_PROMPT: '0',
+            GH_PAGER: '',
+            SYSTEMD_PAGER: 'cat',
+            AWS_PAGER: '',
+            MANPAGER: 'cat'
+        }
+    });
+    childProcesses.add(ptyProcess);
+    const currentPtyProcess = ptyProcess;
+
+    // 创建GUI数据监听器（带 AI 短命令执行状态检查）
+    guiDataListener = (data) => {
+        // AI 短命令期间由 executeSingleCommandInPty 的临时监听器负责 flushToGui，避免重复输出。
+        // 交互式 TUI 模式绝不能设置 isExecutingCommand，否则 GUI 会黑屏。
+        if (isExecutingCommand) {
+            return;
+        }
+
+        dispatchPtyData(data);
+    };
+
+    // 设置数据监听器，将所有 pty 输出直接代理到 GUI
+    currentPtyProcess.onData(guiDataListener);
+
+    // 不再用固定延时猜测 PowerShell 是否启动完成。随机边界不会以明文出现在
+    // PSReadLine 的输入回显中；只有 PowerShell 真正执行 Write-Host 后才会命中。
+    const readyBoundary = `__VCP_PTY_READY_${crypto.randomUUID()}__`;
+    const encodedReadyBoundary = Buffer.from(readyBoundary, 'utf8').toString('base64');
+    mirrorStartupPending = true;
+    mirrorStartupHeld = '';
+    ptyReadyPromise = new Promise((resolve, reject) => {
+        let startupOutput = '';
+        let settled = false;
+        let timeoutId = null;
+        let readyListener = null;
+
+        const cleanupReadyProbe = () => {
+            if (timeoutId) {
+                clearTimeout(timeoutId);
+                timeoutId = null;
+            }
+            if (readyListener && typeof readyListener.dispose === 'function') {
+                readyListener.dispose();
+                readyListener = null;
+            }
+        };
+
+        readyListener = currentPtyProcess.onData((data) => {
+            if (settled) {
+                return;
+            }
+
+            startupOutput += data.toString('utf8');
+            // 防止异常启动输出无限占用内存，同时保留足够长度处理跨 chunk 边界。
+            if (startupOutput.length > 65536) {
+                startupOutput = startupOutput.slice(-65536);
+            }
+
+            const boundaryIndex = startupOutput.indexOf(readyBoundary);
+            if (boundaryIndex !== -1) {
+                settled = true;
+                cleanupReadyProbe();
+                if (ptyProcess === currentPtyProcess) {
+                    releaseMirrorStartup(startupOutput.slice(boundaryIndex + readyBoundary.length).replace(/^\r?\n/, ''));
+                }
+                resolve();
+            }
+        });
+
+        timeoutId = setTimeout(() => {
+            if (settled) {
+                return;
+            }
+            settled = true;
+            cleanupReadyProbe();
+            if (ptyProcess === currentPtyProcess) releaseMirrorStartup();
+            reject(new Error('PowerShell did not complete its startup readiness probe within 15 seconds.'));
+        }, 15000);
+
+        // macOS / Linux 起的是 bash：PowerShell 的初始化写进去只会报语法错误，边界永远等不到，
+        // 前 15 秒侧栏一片空白。环境变量 spawn 时已经给了，这里只打印边界：两段引号拼起来，
+        // 回显的命令行里是 '…''…'，不会提前命中
+        if (os.platform() !== 'win32') {
+            const split = Math.floor(readyBoundary.length / 2);
+            currentPtyProcess.write(`printf '%s\\n' '${readyBoundary.slice(0, split)}''${readyBoundary.slice(split)}'; clear\r`);
+            return;
+        }
+        const initializationCommand = [
+            '[Console]::OutputEncoding = [System.Text.Encoding]::UTF8',
+            '$env:PAGER = "cat"',
+            '$env:GIT_PAGER = "cat"',
+            '$env:GIT_TERMINAL_PROMPT = "0"',
+            '$env:GH_PAGER = ""',
+            '$env:SYSTEMD_PAGER = "cat"',
+            '$env:AWS_PAGER = ""',
+            '$env:MANPAGER = "cat"',
+            'function global:more { param([string[]]$paths) if ($paths) { foreach ($file in $paths) { Get-Content $file } } else { $input } }',
+            'function global:help { Get-Help @args }',
+            `$__vcpReady = [System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String('${encodedReadyBoundary}'))`,
+            'Write-Host $__vcpReady',
+            // 清掉握手留下的几行：侧栏只从就绪标记之后开始显示，ConPTY 的光标也得回到左上角，
+            // 否则 PSReadLine 按绝对坐标重绘时会和侧栏错开几行
+            'Clear-Host'
+        ].join('; ');
+        currentPtyProcess.write(`${initializationCommand}\r`);
+    });
+    // 只有 AI 命令会等它；没人等的时候超时也不能变成未处理的 rejection
+    ptyReadyPromise.catch(() => {});
+
+    // 当 pty 进程意外退出时，清理资源。
+    // 注意：newSession 会先 kill 旧 PTY 再创建新 PTY，旧 PTY 的异步 onExit 不能误清理新会话。
+    currentPtyProcess.onExit((exitInfo) => {
+        childProcesses.delete(currentPtyProcess);
+        // 自行结束的 shell 仍占着 ConPTY 的管道句柄，显式 kill 才会释放
+        try {
+            currentPtyProcess.kill();
+        } catch (e) {
+            // 进程已经退出
+        }
+
+        if (ptyProcess !== currentPtyProcess) {
+            return;
+        }
+
+        ptyProcess = null;
+        guiDataListener = null;
+        isExecutingCommand = false;
+        interactiveMode = false;
+        activeCommandAbort = null;
+        notifyMirrors('onExit', exitInfo && exitInfo.exitCode);
+    });
+}
+
+function buildHumanLaunchAnimationCommand() {
+    const script = [
+        '$esc = [char]27',
+        '# 尝试擦掉用于触发动画的短命令输入行，避免启动动画前出现杂乱命令文本。',
+        'Write-Host -NoNewline "$esc[1A$esc[2K`r"',
+        '',
+        '# 霓虹渐变色定义',
+        '$c1 = "$esc[38;2;245;194;231m" # Pink',
+        '$c2 = "$esc[38;2;203;166;247m" # Mauve',
+        '$c3 = "$esc[38;2;137;180;250m" # Blue',
+        '$c4 = "$esc[38;2;116;199;236m" # Sapphire',
+        '$c5 = "$esc[38;2;137;220;235m" # Sky',
+        '$c6 = "$esc[38;2;148;226;213m" # Teal',
+        '$reset = "$esc[0m"',
+        '$gray = "$esc[38;2;147;153;178m"',
+        '$darkGray = "$esc[38;2;88;91;112m"',
+        '$green = "$esc[38;2;166;227;161m"',
+        '$yellow = "$esc[38;2;249;226;175m"',
+        '',
+        '# 逐行打印华丽的 VCP CLI ASCII Art',
+        'Write-Host ""',
+        'Write-Host "  ${c1}██╗   ██╗  ██████╗  ██████╗      ██████╗  ██╗      ██╗${reset}"',
+        'Start-Sleep -Milliseconds 40',
+        'Write-Host "  ${c2}██║   ██║ ██╔════╝  ██╔══██╗    ██╔════╝  ██║      ██║${reset}"',
+        'Start-Sleep -Milliseconds 40',
+        'Write-Host "  ${c3}██║   ██║ ██║       ██████╔╝    ██║       ██║      ██║${reset}"',
+        'Start-Sleep -Milliseconds 40',
+        'Write-Host "  ${c4}╚██╗ ██╔╝ ██║       ██╔═══╝     ██║       ██║      ██║${reset}"',
+        'Start-Sleep -Milliseconds 40',
+        'Write-Host "  ${c5} ╚████╔╝  ╚██████╗  ██║         ╚██████╗  ███████╗ ██║${reset}"',
+        'Start-Sleep -Milliseconds 40',
+        'Write-Host "  ${c6}  ╚═══╝    ╚═════╝  ╚═╝          ╚═════╝  ╚══════╝ ╚═╝${reset}"',
+        'Start-Sleep -Milliseconds 50',
+        '',
+        '# 打印副标题和分割线',
+        'Write-Host "  ${darkGray}──────────────────────────────────────────────────────────${reset}"',
+        'Write-Host "  ${gray}Distributed PowerShell Bridge & Interactive Terminal GUI${reset}"',
+        'Write-Host "  ${darkGray}──────────────────────────────────────────────────────────${reset}"',
+        'Write-Host ""',
+        '',
+        '# 华丽的渐变色进度条加载动画',
+        '$barWidth = 30',
+        'for ($i = 0; $i -le $barWidth; $i++) {',
+        '    $percent = [math]::Round(($i / $barWidth) * 100)',
+        '    $filledCount = $i',
+        '    $emptyCount = $barWidth - $i',
+        '    ',
+        '    # 动态计算渐变色 (从 Mauve 203,166,247 渐变到 Teal 148,226,213)',
+        '    $r = [int](203 - (203 - 148) * ($i / $barWidth))',
+        '    $g = [int](166 + (226 - 166) * ($i / $barWidth))',
+        '    $b = [int](247 - (247 - 213) * ($i / $barWidth))',
+        '    $color = "$esc[38;2;${r};${g};${b}m"',
+        '    ',
+        '    $filled = "▰" * $filledCount',
+        '    $empty = "▱" * $emptyCount',
+        '    ',
+        '    Write-Host -NoNewline "$esc[2K`r  ${gray}Loading Bridge:${reset} [${color}${filled}${darkGray}${empty}${reset}] ${color}${percent}%${reset}"',
+        '    Start-Sleep -Milliseconds 35',
+        '}',
+        'Write-Host ""',
+        'Write-Host ""',
+        '',
+        '# 打印系统就绪状态和极客风系统信息',
+        'Write-Host "  ${gray}Status:${reset}    ${green}ONLINE${reset}"',
+        'Write-Host "  ${gray}Session:${reset}   ${c3}Active PowerShell Bridge${reset}"',
+        'Write-Host "  ${gray}Terminal:${reset}  ${yellow}Interactive Console Ready${reset}"',
+        'Write-Host ""',
+        'Write-Host "  ${gray}Type commands below. Press ${c3}Ctrl+C${gray} to interrupt.${reset}"',
+        'Write-Host ""',
+        'Remove-Item -LiteralPath $PSCommandPath -Force -ErrorAction SilentlyContinue',
+    ].join('\n');
+
+    const tempScriptName = `vcp-cli-launch-${crypto.randomUUID()}.ps1`;
+    const tempScriptPath = path.join(os.tmpdir(), tempScriptName);
+    fs.writeFileSync(tempScriptPath, `\ufeff${script}`, 'utf8');
+
+    const escapedTempScriptPath = tempScriptPath.replace(/'/g, "''");
+    return `& '${escapedTempScriptPath}'\r`;
+}
+
+/**
+ * 打开或聚焦 PowerShellExecutor 的交互式终端 GUI。
+ * 该入口供主程序托盘 / 桌面应用启动器直接调用，不需要先通过 AI 工具执行命令。
+ * @returns {BrowserWindow} PowerShell 终端窗口实例。
+ */
+function openGuiTerminal() {
+    ensureGuiWindow();
+
+    const shouldPlayHumanLaunchAnimation = !ptyProcess;
+    if (!ptyProcess) {
+        createNewPtySession();
+    }
+
+    if (shouldPlayHumanLaunchAnimation && ptyProcess) {
+        const targetPtyProcess = ptyProcess;
+        waitForTerminalReady()
+            .then(() => {
+                if (ptyProcess === targetPtyProcess) {
+                    targetPtyProcess.write(buildHumanLaunchAnimationCommand());
+                }
+            })
+            .catch((error) => {
+                console.error('[PowerShellExecutor] Failed to initialize terminal launch animation:', error);
+            });
+    }
+
+    return guiWindow;
+}
+
+/**
+ * 插件的主入口点，由 PluginManager 直接调用。
+ * @param {object} args - 从 AI 工具调用中解析出的参数。
+ * @returns {Promise<string>} - 命令执行的结果。
+ */
+/**
+ * 在给定的 pty 会话中执行单条命令并返回其增量输出。
+ * @param {object} ptyProcess - node-pty 实例。
+ * @param {string} singleCommand - 要执行的单条命令。
+ * @returns {Promise<string>} - 该命令的增量输出。
+ */
+function executeSingleCommandInPty(ptyProcess, singleCommand) {
+    return new Promise((resolve, reject) => {
+        if (!ptyProcess) {
+            return reject(new Error("PTY process is not available."));
+        }
+
+        let rawOutput = '';
+        let rawOutputTruncated = false;
+        let settled = false;
+        let tempScriptPath = null;
+        let wrapperScriptPath = null;
+        let listenerDisposable = null;
+        let timeoutId = null;
+
+        const run = beginCommandRun(singleCommand);
+        const startBoundary = `__VCP_COMMAND_START_${crypto.randomUUID()}__`;
+        const endBoundary = `__VCP_COMMAND_END_${crypto.randomUUID()}__`;
+        const outputParser = new CommandOutputParser(startBoundary, endBoundary);
+
+        const abortThisCommand = () => {
+            if (settled) {
+                return false;
+            }
+
+            settled = true;
+            finishCommandRun(run, 'cancelled');
+            // ETX 等价于用户在真实终端按下 Ctrl+C，用于中断当前前台命令。
+            ptyProcess.write('\x03');
+            cleanupListener(listenerDisposable, timeoutId);
+            reject(new Error('命令已被 interrupt 动作中止。'));
+            return true;
+        };
+
+        const cleanupListener = (disposable, commandTimeoutId) => {
+            if (commandTimeoutId) {
+                clearTimeout(commandTimeoutId);
+            }
+            if (disposable && typeof disposable.dispose === 'function') {
+                disposable.dispose();
+            }
+            if (activeCommandAbort === abortThisCommand) {
+                activeCommandAbort = null;
+            }
+            for (const scriptPath of [tempScriptPath, wrapperScriptPath]) {
+                if (!scriptPath) continue;
+                try {
+                    fs.unlinkSync(scriptPath);
+                } catch (e) {
+                    console.warn('[PowerShellExecutor] Failed to remove temporary script:', e.message);
+                }
+            }
+            tempScriptPath = null;
+            wrapperScriptPath = null;
+        };
+
+        const flushToGui = (text) => {
+            if (text) {
+                dispatchPtyData(text);
+            }
+        };
+
+        listenerDisposable = ptyProcess.onData((data) => {
+            if (settled) {
+                return;
+            }
+
+            const result = outputParser.push(data.toString('utf-8'));
+            rawOutputTruncated ||= rawOutput.length + result.output.length > COMMAND_RUN_RAW_LIMIT;
+            rawOutput = (rawOutput + result.output).slice(-COMMAND_RUN_RAW_LIMIT);
+            appendCommandRunOutput(run, result.output);
+
+            if (result.done) {
+                settled = true;
+                finishCommandRun(run, 'completed');
+                cleanupListener(listenerDisposable, timeoutId);
+                resolve((rawOutputTruncated ? '[输出超过容量限制，仅保留末尾内容]\n' : '') + sanitizeTerminalOutput(rawOutput).trim());
+            }
+
+            // GUI 是投影，不是完成裁决者；保留同块中的结束后提示符。
+            flushToGui(result.output + result.trailing);
+        });
+
+        timeoutId = setTimeout(() => {
+            if (settled) {
+                return;
+            }
+            settled = true;
+            finishCommandRun(run, 'timed_out');
+            cleanupListener(listenerDisposable, timeoutId);
+            reject(new Error(`Command "${singleCommand}" timed out after 60 seconds.`));
+        }, 60000);
+
+        activeCommandAbort = abortThisCommand;
+
+        try {
+            const tempScriptName = `vcp-powershell-${crypto.randomUUID()}.ps1`;
+            tempScriptPath = path.join(os.tmpdir(), tempScriptName);
+            // Windows PowerShell 5.1 对无 BOM UTF-8 的中文兼容性较差，写入 BOM 保证脚本内容稳定解析。
+            fs.writeFileSync(tempScriptPath, `\ufeff${singleCommand}`, 'utf8');
+
+            const escapedTempScriptPath = tempScriptPath.replace(/'/g, "''");
+
+            // 边界标记只写进包装脚本，不出现在交互式命令行里：
+            // PowerShell/PSReadLine 会先回显整行输入，若标记出现在回显里，就会被误判为真实输出。
+            // 终端里也只留下一行短的脚本调用，而不是整段包装代码。
+            const wrapperScript = [
+                // 关掉分页器和 Git 交互提示，否则 git log/help 等会停在分页界面，命令一直等不到结束标记。
+                `$env:PAGER = 'cat'`,
+                `$env:GIT_PAGER = 'cat'`,
+                `$env:GIT_TERMINAL_PROMPT = '0'`,
+                `Write-Host '${startBoundary}'`,
+                // 即使临时脚本发生 ParserError / RuntimeException，也必须输出 end boundary，
+                // 否则 AI 调用会一直等待直到超时。终止性错误要在结束标记之前打印，
+                // 否则 PowerShell 会在命令行结束后才显示它，AI 拿到的输出就是空的。
+                `try { & '${escapedTempScriptPath}' } catch { $_ | Out-Host } finally { Write-Host '${endBoundary}' }`
+            ].join('\r\n');
+            wrapperScriptPath = path.join(os.tmpdir(), `vcp-run-${crypto.randomUUID()}.ps1`);
+            fs.writeFileSync(wrapperScriptPath, `\ufeff${wrapperScript}`, 'utf8');
+            const wrappedCommand = `& '${wrapperScriptPath.replace(/'/g, "''")}'`;
+
+            ptyProcess.write(`${wrappedCommand}\r`);
+        } catch (error) {
+            settled = true;
+            finishCommandRun(run, 'spawn_error');
+            cleanupListener(listenerDisposable, timeoutId);
+            reject(new Error(`无法创建或执行临时 PowerShell 脚本: ${error.message}`));
+        }
+    });
+}
+
+
+const INTERACTIVE_SEQUENCE_LIMITS = Object.freeze({
+    maxSteps: 100,
+    maxWaitMs: 60000,
+    maxTotalWaitMs: 300000,
+    maxTextLength: 100000,
+    maxQueryLines: 2000,
+    responseTimeoutMs: 5000
+});
+
+const TERMINAL_KEY_SEQUENCES = Object.freeze({
+    enter: '\r',
+    return: '\r',
+    up: '\x1b[A',
+    arrowup: '\x1b[A',
+    down: '\x1b[B',
+    arrowdown: '\x1b[B',
+    right: '\x1b[C',
+    arrowright: '\x1b[C',
+    left: '\x1b[D',
+    arrowleft: '\x1b[D',
+    esc: '\x1b',
+    escape: '\x1b',
+    tab: '\t',
+    backtab: '\x1b[Z',
+    'shift+tab': '\x1b[Z',
+    backspace: '\x7f',
+    delete: '\x1b[3~',
+    home: '\x1b[H',
+    end: '\x1b[F',
+    pageup: '\x1b[5~',
+    pagedown: '\x1b[6~',
+    space: ' ',
+    'ctrl+c': '\x03',
+    'ctrl+d': '\x04',
+    'ctrl+z': '\x1a',
+    'ctrl+l': '\x0c',
+    'ctrl+a': '\x01',
+    'ctrl+e': '\x05',
+    'ctrl+u': '\x15',
+    'ctrl+k': '\x0b',
+    'ctrl+w': '\x17'
+});
+
+function delay(ms) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+}
+
+function parseWaitDuration(value) {
+    if (typeof value === 'number' && Number.isFinite(value)) {
+        return Math.round(value);
+    }
+
+    const match = String(value).trim().toLowerCase().match(/^(\d+(?:\.\d+)?)\s*(ms|s)?$/);
+    if (!match) {
+        throw new Error(`无效 wait 时长 "${value}"；请使用 50ms、1s 或毫秒数字。`);
+    }
+
+    const milliseconds = Number(match[1]) * (match[2] === 's' ? 1000 : 1);
+    return Math.round(milliseconds);
+}
+
+function parseTerminalKey(value) {
+    const raw = String(value).trim().toLowerCase();
+    const match = raw.match(/^(.+?)(?:\s*\*\s*(\d+))?$/);
+    const keyName = match ? match[1].trim() : raw;
+    const repeat = match && match[2] ? Number.parseInt(match[2], 10) : 1;
+    const sequence = TERMINAL_KEY_SEQUENCES[keyName];
+
+    if (!sequence) {
+        throw new Error(`不支持的终端按键 "${value}"。`);
+    }
+    if (!Number.isInteger(repeat) || repeat < 1 || repeat > 10) {
+        throw new Error(`按键重复次数必须在 1 到 10 之间："${value}"。`);
+    }
+
+    return { keyName, repeat, data: sequence.repeat(repeat) };
+}
+
+function parseInteractiveSequence(args) {
+    const steps = [];
+
+    for (const [key, value] of Object.entries(args)) {
+        const match = key.match(/^(command|wait|key|paste|queryVisible)(\d+)$/i);
+        if (!match) {
+            continue;
+        }
+
+        const typeLookup = {
+            command: 'command',
+            wait: 'wait',
+            key: 'key',
+            paste: 'paste',
+            queryvisible: 'queryVisible'
+        };
+        steps.push({
+            key,
+            type: typeLookup[match[1].toLowerCase()],
+            index: Number.parseInt(match[2], 10),
+            value
+        });
+    }
+
+    if (steps.length === 0) {
+        throw new Error('RunInteractiveSequence 至少需要一个带全局序号的步骤，例如 command1、wait2、key3、paste4、queryVisible5。');
+    }
+    if (steps.length > INTERACTIVE_SEQUENCE_LIMITS.maxSteps) {
+        throw new Error(`交互序列最多允许 ${INTERACTIVE_SEQUENCE_LIMITS.maxSteps} 个步骤。`);
+    }
+
+    steps.sort((a, b) => a.index - b.index);
+    const usedIndexes = new Set();
+    let totalWaitMs = 0;
+
+    for (const step of steps) {
+        if (!Number.isInteger(step.index) || step.index < 1) {
+            throw new Error(`步骤编号必须是从 1 开始的正整数：${step.key}。`);
+        }
+        if (usedIndexes.has(step.index)) {
+            throw new Error(`步骤编号 ${step.index} 重复；不同类型步骤必须共用唯一的全局序号。`);
+        }
+        usedIndexes.add(step.index);
+
+        if (step.type === 'wait') {
+            step.durationMs = parseWaitDuration(step.value);
+            if (step.durationMs < 0 || step.durationMs > INTERACTIVE_SEQUENCE_LIMITS.maxWaitMs) {
+                throw new Error(`单个 wait 步骤必须在 0 到 ${INTERACTIVE_SEQUENCE_LIMITS.maxWaitMs}ms 之间。`);
+            }
+            totalWaitMs += step.durationMs;
+        } else if (step.type === 'key') {
+            step.keySpec = parseTerminalKey(step.value);
+        } else if (step.type === 'queryVisible') {
+            const parsedLines = Number.parseInt(step.value, 10);
+            step.maxLines = Number.isInteger(parsedLines) && parsedLines > 0
+                ? Math.min(parsedLines, INTERACTIVE_SEQUENCE_LIMITS.maxQueryLines)
+                : null;
+        } else {
+            if (typeof step.value !== 'string' || !step.value.length) {
+                throw new Error(`${step.key} 必须是非空字符串。`);
+            }
+            if (step.value.length > INTERACTIVE_SEQUENCE_LIMITS.maxTextLength) {
+                throw new Error(`${step.key} 超过 ${INTERACTIVE_SEQUENCE_LIMITS.maxTextLength} 字符限制。`);
+            }
+        }
+    }
+
+    if (totalWaitMs > INTERACTIVE_SEQUENCE_LIMITS.maxTotalWaitMs) {
+        throw new Error(`序列累计等待不能超过 ${INTERACTIVE_SEQUENCE_LIMITS.maxTotalWaitMs}ms。`);
+    }
+    if (steps.every(step => step.type === 'wait')) {
+        throw new Error('交互序列不能只包含 wait；请至少加入 command、key、paste 或 queryVisible 步骤。');
+    }
+
+    return steps;
+}
+
+function requestVisibleText(maxLines = null) {
+    return new Promise((resolve, reject) => {
+        if (!guiWindow || guiWindow.isDestroyed() || !guiReady) {
+            reject(new Error('PowerShell GUI 尚未就绪，无法查询可见文本。'));
+            return;
+        }
+
+        const requestId = crypto.randomUUID();
+        const timeout = setTimeout(() => {
+            visibleTextResolvers.delete(requestId);
+            reject(new Error('查询终端文本超时'));
+        }, INTERACTIVE_SEQUENCE_LIMITS.responseTimeoutMs);
+
+        visibleTextResolvers.set(requestId, (text) => {
+            clearTimeout(timeout);
+            resolve(text);
+        });
+        guiWindow.webContents.send('query-visible-text', { requestId, maxLines });
+    });
+}
+
+function requestTerminalPaste(text) {
+    return new Promise((resolve, reject) => {
+        if (!guiWindow || guiWindow.isDestroyed() || !guiReady) {
+            reject(new Error('PowerShell GUI 尚未就绪，无法执行 xterm 粘贴。'));
+            return;
+        }
+
+        const requestId = crypto.randomUUID();
+        const timeout = setTimeout(() => {
+            terminalPasteResolvers.delete(requestId);
+            reject(new Error('xterm 粘贴请求超时'));
+        }, INTERACTIVE_SEQUENCE_LIMITS.responseTimeoutMs);
+
+        terminalPasteResolvers.set(requestId, () => {
+            clearTimeout(timeout);
+            resolve();
+        });
+        guiWindow.webContents.send('terminal-paste-request', { requestId, text });
+    });
+}
+
+async function ensureInteractiveTerminal(newSession = false) {
+    ensureGuiWindow();
+    if (newSession === true || !ptyProcess) {
+        createNewPtySession();
+    }
+    await waitForTerminalReady();
+    interactiveMode = true;
+    return ptyProcess;
+}
+
+async function sendSingleInteractiveKey(args) {
+    if (typeof args.key !== 'string' || !args.key.trim()) {
+        throw new Error('SendInteractiveKey 需要 key 参数，例如 enter、up、esc 或 ctrl+c*2。');
+    }
+
+    const keySpec = parseTerminalKey(args.key);
+    const targetPtyProcess = await ensureInteractiveTerminal(args.newSession === true);
+    targetPtyProcess.write(keySpec.data);
+
+    return {
+        content: [{
+            type: 'text',
+            text: `Interactive key sent: ${keySpec.keyName}${keySpec.repeat > 1 ? ` x${keySpec.repeat}` : ''}.`
+        }]
+    };
+}
+
+async function pasteSingleInteractiveText(args) {
+    if (typeof args.text !== 'string' || !args.text.length) {
+        throw new Error('PasteInteractiveText 需要非空 text 参数。');
+    }
+    if (args.text.length > INTERACTIVE_SEQUENCE_LIMITS.maxTextLength) {
+        throw new Error(`text 超过 ${INTERACTIVE_SEQUENCE_LIMITS.maxTextLength} 字符限制。`);
+    }
+
+    await ensureInteractiveTerminal(args.newSession === true);
+    await requestTerminalPaste(args.text);
+
+    if (args.submit === true) {
+        if (!ptyProcess) {
+            throw new Error('粘贴完成后 PTY 会话已退出，无法发送 Enter。');
+        }
+        ptyProcess.write('\r');
+    }
+
+    return {
+        content: [{
+            type: 'text',
+            text: `Interactive text pasted (${args.text.length} characters)${args.submit === true ? ' and Enter was sent' : ''}.`
+        }]
+    };
+}
+
+async function runInteractiveSequence(args) {
+    const steps = parseInteractiveSequence(args);
+
+    for (const step of steps.filter(item => item.type === 'command')) {
+        const securityResult = intelligentSecurityCheck(
+            step.value,
+            defaultConfig.forbiddenCommands,
+            defaultConfig.authRequiredCommands
+        );
+        if (securityResult.isForbidden) {
+            throw new Error(`步骤 ${step.index} 执行被阻止：${securityResult.reason}`);
+        }
+        if (securityResult.needsAuth) {
+            throw new Error(`步骤 ${step.index} 需要授权，RunInteractiveSequence 不支持在 TUI 序列中弹出授权确认：${securityResult.reason}`);
+        }
+    }
+
+    const targetPtyProcess = await ensureInteractiveTerminal(args.newSession === true);
+    const queryResults = [];
+
+    for (const step of steps) {
+        if (!ptyProcess || ptyProcess !== targetPtyProcess) {
+            throw new Error(`执行到步骤 ${step.index} 时 PTY 会话已退出或被替换。`);
+        }
+
+        switch (step.type) {
+            case 'command':
+                targetPtyProcess.write(`${step.value}\r`);
+                break;
+            case 'wait':
+                await delay(step.durationMs);
+                break;
+            case 'key':
+                targetPtyProcess.write(step.keySpec.data);
+                break;
+            case 'paste':
+                await requestTerminalPaste(step.value);
+                break;
+            case 'queryVisible': {
+                const text = await requestVisibleText(step.maxLines);
+                queryResults.push({ index: step.index, maxLines: step.maxLines, text });
+                break;
+            }
+            default:
+                throw new Error(`未知交互步骤类型：${step.type}`);
+        }
+    }
+
+    if (queryResults.length === 0) {
+        return {
+            content: [{
+                type: 'text',
+                text: `Interactive sequence completed (${steps.length} steps). No queryVisible step was requested.`
+            }]
+        };
+    }
+
+    const output = queryResults.map(result => {
+        const lineLabel = result.maxLines ? `, max ${result.maxLines} lines` : '';
+        return `---[queryVisible step ${result.index}${lineLabel}]---\n${result.text}`;
+    }).join('\n\n');
+
+    return { content: [{ type: 'text', text: `\`\`\`\n${output}\n\`\`\`` }] };
+}
+
+async function processToolCall(args) {
+    const declaredCommands = new Set([
+        'ExecutePowerShell',
+        'StartInteractive',
+        'SendInteractiveKey',
+        'PasteInteractiveText',
+        'RunInteractiveSequence',
+        'QueryVisible',
+        'InterruptPowerShell',
+        'EndInteractive'
+    ]);
+    const declaredCommand = typeof args.command === 'string' && declaredCommands.has(args.command.trim())
+        ? args.command.trim()
+        : null;
+
+    // 新清单格式使用 command 选择能力、powershell 传递脚本文本。
+    // 同时保留旧 action + command 调用格式，避免已有提示词和调用方立即失效。
+    const actionByDeclaredCommand = {
+        ExecutePowerShell: 'execute',
+        StartInteractive: 'startInteractive',
+        SendInteractiveKey: 'interactiveKey',
+        PasteInteractiveText: 'interactivePaste',
+        RunInteractiveSequence: 'interactiveSequence',
+        QueryVisible: 'queryVisible',
+        InterruptPowerShell: 'interrupt',
+        EndInteractive: 'endInteractive'
+    };
+    const action = declaredCommand
+        ? actionByDeclaredCommand[declaredCommand]
+        : (typeof args.action === 'string' ? args.action.trim() : 'execute');
+
+    if (action === 'interactiveKey') {
+        return sendSingleInteractiveKey(args);
+    }
+
+    if (action === 'interactivePaste') {
+        return pasteSingleInteractiveText(args);
+    }
+
+    if (action === 'interactiveSequence') {
+        return runInteractiveSequence(args);
+    }
+
+    if (action.startsWith('queryVisible')) {
+        ensureGuiWindow();
+        await waitForGuiReady();
+
+        const legacyMatch = action.match(/^queryVisible(\d+)?$/);
+        const requestedMaxLines = declaredCommand === 'QueryVisible' ? args.maxLines : (legacyMatch && legacyMatch[1]);
+        const parsedMaxLines = requestedMaxLines === undefined || requestedMaxLines === null || requestedMaxLines === ''
+            ? null
+            : Number.parseInt(requestedMaxLines, 10);
+        const maxLines = Number.isInteger(parsedMaxLines) && parsedMaxLines > 0
+            ? Math.min(parsedMaxLines, INTERACTIVE_SEQUENCE_LIMITS.maxQueryLines)
+            : null;
+        const text = await requestVisibleText(maxLines);
+        return { content: [{ type: 'text', text: `\`\`\`\n${text}\n\`\`\`` }] };
+    }
+
+    if (action === 'endInteractive') {
+        interactiveMode = false;
+        return { content: [{ type: 'text', text: 'Interactive mode flag cleared. The existing PTY session was not terminated.' }] };
+    }
+
+    if (action === 'interrupt') {
+        if (!ptyProcess) {
+            return { content: [{ type: 'text', text: 'No active PowerShell session to interrupt.' }] };
+        }
+
+        if (activeCommandAbort) {
+            const interrupted = activeCommandAbort();
+            return { content: [{ type: 'text', text: interrupted
+                ? 'Interrupt signal sent. The active synchronous command wait was cancelled.'
+                : 'The synchronous command had already completed before it could be interrupted.' }] };
+        }
+
+        if (interactiveMode) {
+            ptyProcess.write('\x03');
+            return { content: [{ type: 'text', text: 'Ctrl+C was sent to the interactive foreground program. The interactive mode flag remains set.' }] };
+        }
+
+        return { content: [{ type: 'text', text: 'The PowerShell session is active, but no AI-started foreground command is currently running.' }] };
+    }
+
+    // --- 1. 解析和排序 PowerShell 脚本 ---
+    // 新格式：powershell, powershell1, powershell2...
+    // 旧格式：command, command1, command2...
+    const scriptParameterPrefix = declaredCommand ? 'powershell' : 'command';
+    const commandEntries = Object.entries(args)
+        .filter(([key]) => key.startsWith(scriptParameterPrefix))
+        .map(([key, value]) => {
+            const match = key.match(new RegExp(`^${scriptParameterPrefix}(\\d*)$`));
+            const index = match ? (match[1] === '' ? 0 : parseInt(match[1], 10)) : -1;
+            return { key, value, index };
+        })
+        .filter(item => item.index !== -1 && typeof item.value === 'string' && item.value.trim())
+        .sort((a, b) => a.index - b.index);
+
+    // 新格式中的 args.command 是能力选择器，绝不能作为待执行脚本。
+    if (declaredCommand) {
+        commandEntries.forEach(entry => {
+            entry.value = entry.value.trim();
+        });
+    }
+
+    if (commandEntries.length === 0) {
+        throw new Error(declaredCommand
+            ? '未提供任何有效的 powershell 参数 (例如 powershell, powershell1, powershell2)。'
+            : '未提供任何有效的 command 参数 (例如 command, command1, command2)。');
+    }
+
+    if (action !== 'execute' && action !== 'startInteractive') {
+        throw new Error(`不支持的 action: ${action}`);
+    }
+
+    // --- 2. 智能安全预检查 ---
+    let needsInteractiveAuth = false;
+    for (const entry of commandEntries) {
+        const securityResult = intelligentSecurityCheck(
+            entry.value,
+            defaultConfig.forbiddenCommands,
+            defaultConfig.authRequiredCommands
+        );
+
+        if (securityResult.isForbidden) {
+            throw new Error(`执行被阻止：${securityResult.reason}`);
+        }
+
+        if (securityResult.needsAuth) {
+            needsInteractiveAuth = true;
+            console.log(`[PowerShellExecutor] 命令 "${entry.value}" 需要交互式授权：${securityResult.reason}`);
+        }
+    }
+
+    // --- 3. 初始化会话和参数 ---
+    const lastCommandIndex = commandEntries[commandEntries.length - 1].index;
+    const getArg = (key, defaultVal) => {
+        const indexedKey = `${key}${lastCommandIndex || ''}`;
+        return args[indexedKey] !== undefined ? args[indexedKey] : (args[key] !== undefined ? args[key] : defaultVal);
+    };
+
+    const requireAdmin = getArg('requireAdmin', false);
+    const newSession = getArg('newSession', false);
+    const finalReturnMode = getArg('returnMode', defaultConfig.returnMode);
+
+    // --- 4. 根据模式选择执行路径 ---
+
+    // 路径 A: 管理员模式 (最高优先级)
+    if (requireAdmin) {
+        if (commandEntries.length > 1) {
+            throw new Error("管理员模式 (requireAdmin: true) 不支持执行多个命令链。");
+        }
+        if (ptyProcess) {
+            ptyProcess.kill();
+            ptyProcess = null;
+        }
+        const command = commandEntries[0].value;
+        const fullCommand = `[Console]::OutputEncoding = [System.Text.Encoding]::UTF8; $env:PAGER = 'cat'; $env:GIT_PAGER = 'cat'; $env:GIT_TERMINAL_PROMPT = '0'; function global:more { param([string[]]$paths) if ($paths) { foreach ($file in $paths) { Get-Content $file } } else { $input } }; function global:help { Get-Help @args }; ${command}`;
+        const output = await executeAdminCommand(fullCommand);
+        if (output && typeof output === 'object' && Array.isArray(output.content)) {
+            return output;
+        }
+        const cleanOutput = (typeof output === 'string' ? output : String(output || '')).replace(/\r\n/g, '\n').replace(/\r/g, '');
+        return { content: [{ type: 'text', text: `\`\`\`powershell\n${cleanOutput}\n\`\`\`` }] };
+    }
+
+    // 路径 B: 普通敏感命令确认模式
+    // 这里只做确认；确认通过后继续走路径 C，在主 PTY/xterm 会话中执行并连续显示输出。
+    if (needsInteractiveAuth) {
+        const combinedCommand = commandEntries.map(e => e.value).join('; ');
+        const confirmed = await requestInteractiveConfirmation(combinedCommand);
+        if (!confirmed) {
+            return { content: [{ type: 'text', text: '用户取消了操作。' }] };
+        }
+    }
+
+    // 路径 C: 标准非管理员会话执行
+    if (isExecutingCommand) {
+        throw new Error('当前已有同步命令执行中，请等待完成或使用 interrupt。');
+    }
+    ensureGuiWindow();
+
+    if (newSession || !ptyProcess) {
+        createNewPtySession();
+    }
+
+    // 必须等渲染端完成 xterm 挂载/监听/首次 fit，且 PowerShell 执行完启动探针，
+    // 才允许向 PTY 注入用户或 AI 指令。替代容易产生竞态的固定 500ms 延时。
+    await waitForTerminalReady();
+
+    if (action === 'startInteractive') {
+        if (commandEntries.length > 1) {
+            throw new Error('startInteractive 只支持单条 command。');
+        }
+
+        const command = commandEntries[0].value;
+        interactiveMode = true;
+        // 不设置 isExecutingCommand；交互式 TUI 输出必须走常驻 guiDataListener，否则会黑屏。
+        ptyProcess.write(`${command}\r`);
+        return { content: [{ type: 'text', text: `Interactive session started: ${command}` }] };
+    }
+
+    if (interactiveMode) {
+        throw new Error('当前终端正被交互式程序 (snow/codex/claude) 占用，请先退出并调用 action:"endInteractive"，或使用 newSession:true 重置会话。');
+    }
+
+    // 就绪等待期间其它调用可能先取得PTY，await后必须再次检查。
+    if (isExecutingCommand) {
+        throw new Error('当前已有同步命令执行中，请等待完成或使用 interrupt。');
+    }
+    const deltaOutputs = [];
+    isExecutingCommand = true;
+    try {
+        for (const entry of commandEntries) {
+            const command = entry.value;
+            const currentReturnModeKey = `returnMode${entry.index || ''}`;
+            const currentReturnMode = args[currentReturnModeKey] || finalReturnMode;
+
+            try {
+                const output = await executeSingleCommandInPty(ptyProcess, command);
+                deltaOutputs.push({ command, output, returnMode: currentReturnMode });
+            } catch (error) {
+                throw new Error(`在执行命令 "${command}" 时出错: ${error.message}`);
+            }
+        }
+    } finally {
+        isExecutingCommand = false;
+    }
+
+    // --- 5. 格式化并返回结果 ---
+    let finalOutput = '';
+    if (finalReturnMode === 'full') {
+        finalOutput = deltaOutputs.length > 0 ? deltaOutputs[deltaOutputs.length - 1].output : '';
+    } else { // delta 模式
+        if (deltaOutputs.length === 1) {
+            finalOutput = deltaOutputs[0].output;
+        } else {
+            finalOutput = deltaOutputs.map(res =>
+                `---[Output for: ${res.command}]---\n${res.output}`
+            ).join('\n\n');
+        }
+    }
+
+    const cleanOutput = finalOutput.replace(/\r\n/g, '\n').replace(/\r/g, '');
+    return { content: [{ type: 'text', text: `\`\`\`powershell\n${cleanOutput}\n\`\`\`` }] };
+}
+
+/**
+ * 清理插件资源，在主程序退出或插件重载时调用。
+ */
+function cleanup() {
+    console.log('[PowerShellExecutor] 正在清理资源...');
+
+    // 1. 关闭并销毁 GUI 窗口
+    if (guiWindow && !guiWindow.isDestroyed()) {
+        try {
+            // 移除 'closed' 监听器，以避免在程序化关闭时触发额外的 ptyProcess.kill()
+            guiWindow.removeAllListeners('closed');
+            guiWindow.close();
+            console.log('[PowerShellExecutor] GUI 窗口已关闭。');
+        } catch (e) {
+            console.error('[PowerShellExecutor] 关闭 GUI 窗口时出错:', e);
+        }
+        guiWindow = null;
+    }
+    guiReady = false;
+    if (resolveGuiReady) {
+        resolveGuiReady();
+        resolveGuiReady = null;
+    }
+    guiReadyPromise = Promise.resolve();
+    visibleTextResolvers.clear();
+    terminalPasteResolvers.clear();
+
+    // 2. 终止所有跟踪的子进程
+    if (childProcesses.size > 0) {
+        console.log(`[PowerShellExecutor] 正在终止 ${childProcesses.size} 个子进程...`);
+        for (const processToKill of childProcesses) {
+            try {
+                // ptyProcess 和 child_process 对象都有一个 .kill() 方法
+                processToKill.kill();
+                console.log(`[PowerShellExecutor] 进程 (PID: ${processToKill.pid}) 已终止。`);
+            } catch (e) {
+                console.error(`[PowerShellExecutor] 终止进程 (PID: ${processToKill.pid}) 时出错:`, e);
+            }
+        }
+        childProcesses.clear();
+    }
+
+    // 3. 停止文件监视器
+    if (settingsWatcher) {
+        try {
+            settingsWatcher.close();
+            settingsWatcher = null;
+            console.log('[PowerShellExecutor] Settings file watcher stopped.');
+        } catch (e) {
+            console.error('[PowerShellExecutor] Error stopping settings watcher:', e);
+        }
+    }
+
+    // 4. 确保 ptyProcess 状态被重置
+    mirrorSinks.clear();
+    replayBuffer = '';
+    mirrorStartupPending = false;
+    mirrorStartupHeld = '';
+    ptyProcess = null;
+    ptyReadyPromise = Promise.resolve();
+    guiDataListener = null;
+    isExecutingCommand = false;
+    interactiveMode = false;
+    activeCommandAbort = null;
+}
+
+// 导出主入口、GUI/清理函数，以及无 Electron 副作用的序列解析器供单元测试使用。
+module.exports = {
+    processToolCall,
+    openGuiTerminal,
+    attachMirror,
+    listCommandRuns,
+    getCommandRun,
+    subscribeCommandRuns,
+    // 仅供测试：跳过 GUI 窗口，直接在共享 PTY 会话里跑一条短命令
+    _runCommandForTest: (command) => executeSingleCommandInPty(ptyProcess, command),
+    ensureMirrorSession,
+    restartSession,
+    getSessionState,
+    writeSessionInput,
+    resizeSession: applyPtyResize,
+    cleanup,
+    parseInteractiveSequence,
+    parseWaitDuration,
+    parseTerminalKey
 };
\ No newline at end of file

From 7d962eb8c5bd284e248d67c954bc8a8a6b074497 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 02:05:57 +0000
Subject: [PATCH 072/143] Side pane batch L: quiet startup restore, ordered Git
 reads, no page dialogs

- Restore the saved layout after the host has synced the current
  conversation, without animation: a pane saved open on another topic no
  longer flashes open and closed at startup.
- Number Git page status reads and only apply the newest one; an older
  read landing late no longer paints a deleted file back, and only the
  newest read stops the spinner (ZCode useGitRepository requestVersionRef).
- Guest webviews get disableDialogs (DSH browser-guests): pages cannot
  raise native alert/confirm/prompt titled as the app and block it.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DFRovoZHMzeheXKkLNWKG
---
 .../contracts/generated/chat-event-graph.json | 48 +++++++++----------
 modules/ipc/browserHandlers.js                |  2 +
 modules/renderer/sidePaneWiring.js            |  5 +-
 modules/ui-system/side-pane/git/git-view.js   | 18 +++++--
 .../side-pane/side-pane-controller.js         |  3 +-
 tests/browser-handlers.test.js                |  1 +
 tests/side-pane-git-push-visibility.test.mjs  | 42 ++++++++++++++++
 tests/side-pane-persistence.test.mjs          | 33 +++++++++++++
 tests/side-pane-wiring-modules.test.mjs       | 38 +++++++++++++++
 9 files changed, 159 insertions(+), 31 deletions(-)

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 6a4243c9f..f36ce3733 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -1276,14 +1276,14 @@
       "consumers": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 158,
+          "line": 160,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 158,
+          "line": 160,
           "kind": "event-listener",
           "match": "guest.on('before-input-event'"
         }
@@ -1874,14 +1874,14 @@
       "consumers": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 184,
+          "line": 186,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 184,
+          "line": 186,
           "kind": "event-listener",
           "match": "ipcMain.handle('browser:clear-data'"
         },
@@ -1905,14 +1905,14 @@
       "consumers": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 173,
+          "line": 175,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 173,
+          "line": 175,
           "kind": "event-listener",
           "match": "ipcMain.handle('browser:open-external'"
         },
@@ -4331,17 +4331,17 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1158,
+          "line": 1159,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1164,
+          "line": 1165,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1178,
+          "line": 1179,
           "kind": "custom-event-listener"
         },
         {
@@ -5930,19 +5930,19 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1158,
+          "line": 1159,
           "kind": "custom-event-listener",
           "match": "toggleNotificationsBtn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1164,
+          "line": 1165,
           "kind": "custom-event-listener",
           "match": "expandButton.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1178,
+          "line": 1179,
           "kind": "custom-event-listener",
           "match": "closeSidePaneBtn.addEventListener('click'"
         },
@@ -10032,14 +10032,14 @@
       "consumers": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 142,
+          "line": 144,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 142,
+          "line": 144,
           "kind": "event-listener",
           "match": "host.on('did-attach-webview'"
         }
@@ -15078,14 +15078,14 @@
       "consumers": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 144,
+          "line": 146,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 144,
+          "line": 146,
           "kind": "event-listener",
           "match": "guest.on('input-event'"
         }
@@ -21342,14 +21342,14 @@
       "consumers": [
         {
           "file": "modules/renderer/sidePaneWiring.js",
-          "line": 80,
+          "line": 78,
           "kind": "preload-subscription"
         }
       ],
       "evidence": [
         {
           "file": "modules/renderer/sidePaneWiring.js",
-          "line": 80,
+          "line": 78,
           "kind": "preload-subscription",
           "match": "chatAPI?.onBrowserSidePaneShortcut("
         }
@@ -25008,7 +25008,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1198,
+          "line": 1199,
           "kind": "custom-event-listener"
         },
         {
@@ -25108,7 +25108,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1198,
+          "line": 1199,
           "kind": "custom-event-listener",
           "match": "win?.addEventListener?.('resize'"
         },
@@ -31829,7 +31829,7 @@
         },
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 156,
+          "line": 158,
           "kind": "event-listener"
         },
         {
@@ -31847,7 +31847,7 @@
         },
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 156,
+          "line": 158,
           "kind": "event-listener",
           "match": "guest.on('will-navigate'"
         },
@@ -31895,14 +31895,14 @@
       "consumers": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 157,
+          "line": 159,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 157,
+          "line": 159,
           "kind": "event-listener",
           "match": "guest.on('will-redirect'"
         }
diff --git a/modules/ipc/browserHandlers.js b/modules/ipc/browserHandlers.js
index a3240afce..29d0e6d3f 100644
--- a/modules/ipc/browserHandlers.js
+++ b/modules/ipc/browserHandlers.js
@@ -136,6 +136,8 @@ function attachToWindow(mainWindow) {
             sandbox: true,
             webSecurity: true,
             allowRunningInsecureContent: false,
+            // 网页的 alert/confirm/prompt 会以应用窗口名义弹原生模态框（可仿冒应用提示）并卡住主窗口；同 DSH browser-guests 直接禁用
+            disableDialogs: true,
         });
     });
 
diff --git a/modules/renderer/sidePaneWiring.js b/modules/renderer/sidePaneWiring.js
index e205181ff..9374b31e2 100644
--- a/modules/renderer/sidePaneWiring.js
+++ b/modules/renderer/sidePaneWiring.js
@@ -74,8 +74,6 @@ export function initWorkspaceSidePane({
     for (const definition of [defineNotificationsTabType(), defineChatTabType({ provider: sideChat.provider, openSideChat: sideChat.openSideChat, onClosed: sideChat.onTabClosed }), codeViewer, browser, terminal, toolOutput, planDetail, modelTrajectory]) {
         controller.registerTabType(definition);
     }
-    // 标签类型都登记完才能认出存档里的标签
-    controller.restoreLayout();
     // 焦点在侧栏网页里时按键到不了这个窗口，主进程截下副屏快捷键转过来
     const unsubscribeBrowserShortcut = chatAPI?.onBrowserSidePaneShortcut?.((shortcut) => {
         if (shortcut?.action === 'toggle') controller.toggleFromUser();
@@ -85,6 +83,9 @@ export function initWorkspaceSidePane({
     subscriptions.add(createSidePaneWorkspaceServices({ doc, win, chatAPI, chatManager, uiHelper, historyRef, controller, codeViewerProvider: codeViewer.provider, toolOutputProvider: toolOutput.provider, planDetailProvider: planDetail.provider }));
     subscriptions.add(createSidePaneLauncherWiring({ doc, win, chatAPI, chatManager, uiHelper, selectedItemRef, controller }));
     subscriptions.add(createSidePaneHostBindings({ win, chatAPI, uiHelper, chatManager, selectedItemRef, topicIdRef, toggleChatBtn, controller, restoreSessions: sideChat.restoreSessions }));
+    // 标签类型都登记完才能认出存档里的标签；放在宿主同步 setParent 之后，存档直接按当前对话投影，
+    // 不会先展开、挂上上次话题的激活标签，再被 setParent 收起
+    controller.restoreLayout();
     subscriptions.add(createFloatingSelectionButton({ doc, win, notify: (message, type) => uiHelper?.showToastNotification?.(message, type) }));
     return controller;
 }
diff --git a/modules/ui-system/side-pane/git/git-view.js b/modules/ui-system/side-pane/git/git-view.js
index 887c58a97..d923abfc2 100644
--- a/modules/ui-system/side-pane/git/git-view.js
+++ b/modules/ui-system/side-pane/git/git-view.js
@@ -308,24 +308,29 @@ export function mountGitView(host, {
         aiBatchLoaded = true;
     }
 
+    // 每次读都编号，只认最新那次：推送和窗口 focus 同时触发、大仓库 status 上秒级时，
+    // 先发的请求可能后到，把已经删掉的文件又画回来（同 ZCode useGitRepository 的 requestVersionRef）
+    let statusSeq = 0;
     async function refreshStatus({ quiet = false } = {}) {
         // 已经拆掉就不再跟：否则迟到的刷新会把刚退掉的推送重新订上
         if (disposed()) return;
         // 每次读都对准当前工作区的变更推送（换了工作区就换订阅）
         changes.follow(currentWorkspaceId);
         if (!api?.gitStatus || !currentWorkspaceId || disposed()) return;
+        const seq = ++statusSeq;
+        const superseded = () => disposed() || seq !== statusSeq;
         stale = false;
         if (!quiet) { loading = true; render(); }
         let skipRender = false;
         try {
             const requestedId = currentWorkspaceId;
             const res = await api.gitStatus(requestedId);
-            if (disposed() || requestedId !== currentWorkspaceId) return;
+            if (superseded() || requestedId !== currentWorkspaceId) return;
             if (!res?.success) throw new Error(res?.error || '获取 Git 状态失败');
             loadError = null;
             currentStatus = res.data;
             if (currentSource === AI_SOURCE && !aiBatchLoaded) await loadAiBatch();
-            if (disposed() || requestedId !== currentWorkspaceId) return;
+            if (superseded() || requestedId !== currentWorkspaceId) return;
             // 推送触发的静默刷新：状态没变就不重绘（避免闪烁、丢 hover），有展开的 diff 时照常重绘。
             // 状态里带着每个文件的增删行数，内容变了 key 也会变；变了就让缓存的 diff 作废（展开的那个保持展开，重新取）
             const statusKey = JSON.stringify(res.data);
@@ -333,10 +338,15 @@ export function mountGitView(host, {
             if (statusKey !== lastStatusKey) { cardsOwner.invalidate(); }
             lastStatusKey = statusKey;
         } catch (err) {
-            if (quiet) return;
+            if (quiet || superseded()) return;
             loadError = err.message;
         } finally {
-            if (!disposed()) { loading = false; if (!skipRender || !quiet) render(); }
+            // 旋转图标只由最新的请求停下；被它盖过的旧请求什么都不动
+            if (!superseded()) {
+                const wasLoading = loading;
+                loading = false;
+                if (!skipRender || !quiet || wasLoading) render();
+            }
         }
     }
 
diff --git a/modules/ui-system/side-pane/side-pane-controller.js b/modules/ui-system/side-pane/side-pane-controller.js
index 280352145..6afdbc64c 100644
--- a/modules/ui-system/side-pane/side-pane-controller.js
+++ b/modules/ui-system/side-pane/side-pane-controller.js
@@ -1073,7 +1073,8 @@ export function createSidePaneController({
             }
             renderTabList();
             syncViewPanels();
-            syncDomVisibility();
+            // 启动时直接落到存档的开合状态，不播动画
+            syncDomVisibility({ animate: false });
             return true;
         },
 
diff --git a/tests/browser-handlers.test.js b/tests/browser-handlers.test.js
index 56d97e604..dccca01ac 100644
--- a/tests/browser-handlers.test.js
+++ b/tests/browser-handlers.test.js
@@ -78,6 +78,7 @@ test('attachToWindow locks the partition and strips privileged web preferences',
     assert.equal('preloadURL' in prefs, false);
     assert.equal(prefs.nodeIntegration, false);
     assert.equal(prefs.sandbox, true);
+    assert.equal(prefs.disableDialogs, true, 'pages cannot raise native dialogs titled as the app');
     assert.equal(prefs.contextIsolation, true);
 
     const guest = new EventEmitter();
diff --git a/tests/side-pane-git-push-visibility.test.mjs b/tests/side-pane-git-push-visibility.test.mjs
index f0cc2d554..6667bb63d 100644
--- a/tests/side-pane-git-push-visibility.test.mjs
+++ b/tests/side-pane-git-push-visibility.test.mjs
@@ -118,3 +118,45 @@ test('the Git page catches up when it gets a size again after the whole chat was
     await handle.dispose();
     assert.equal(observers[0].targets.size, 0, 'closing disconnects the observer');
 });
+
+test('a slow earlier Git read that lands after a newer one does not paint back a deleted file', async t => {
+    const dom = new JSDOM('<aside class="vcp-side-pane" aria-hidden="false"><section id="view"></section></aside>', { pretendToBeVisual: true });
+    t.after(() => dom.window.close());
+    const doc = dom.window.document;
+    const host = doc.getElementById('view');
+    const pending = [];
+    const listeners = new Set();
+    const status = changes => ({ success: true, data: { isRepo: true, staged: [], changes, conflicts: [] } });
+    const api = {
+        async gitListWorkspaces() { return { success: true, data: { workspaces: [{ id: 'race', path: '/race' }] } }; },
+        gitStatus() {
+            if (!pending.length && !listeners.size) return Promise.resolve(status([]));
+            return new Promise(resolve => pending.push(resolve));
+        },
+        onGitChanged(cb) { listeners.add(cb); return () => listeners.delete(cb); },
+        async subscribeMainState() { return { success: true }; },
+        async unsubscribeMainState() { return { success: true }; },
+    };
+    getGitChangesSource(api, 'race', { graceMs: 0 });
+    const handle = mountGitView(host, { api });
+    t.after(() => handle.dispose());
+    Object.defineProperty(handle.element, 'offsetParent', { get: () => doc.body });
+    const settle = () => new Promise(resolve => setImmediate(resolve));
+    while (pending.length === 0) await settle();
+    pending.shift()(status([]));
+    await handle.ready;
+    await settle();
+
+    listeners.forEach(cb => cb({ workspaceId: 'race', reason: 'files' })); // agent 建了 ghost.js
+    await settle();
+    listeners.forEach(cb => cb({ workspaceId: 'race', reason: 'files' })); // 又删掉了
+    await settle();
+    assert.equal(pending.length, 2);
+    const [older, newer] = pending.splice(0);
+    newer(status([]));
+    await settle();
+    older(status([{ path: 'ghost.js', status: 'A', added: 1, removed: 0 }]));
+    await settle();
+    await settle();
+    assert.doesNotMatch(handle.element.textContent, /ghost\.js/);
+});
diff --git a/tests/side-pane-persistence.test.mjs b/tests/side-pane-persistence.test.mjs
index 9db4741e7..8594fe6ab 100644
--- a/tests/side-pane-persistence.test.mjs
+++ b/tests/side-pane-persistence.test.mjs
@@ -148,3 +148,36 @@ test('nothing is written before restoreLayout runs, so an early render cannot wi
     pane.dom.window.close();
     assert.deepEqual(JSON.parse(storage.data.get('vcp.sidePane.layout.v1')).tabs.map(t => t.id), ['notes']);
 });
+
+test('restoring after the host picked the conversation mounts nothing from another topic and does not animate', async () => {
+    const storage = createStorage();
+    const topicA = { itemType: 'agent', itemId: 'agent-1', topicId: 'topic-a' };
+    const topicB = { itemType: 'agent', itemId: 'agent-1', topicId: 'topic-b' };
+
+    const first = createPane(storage, []);
+    first.controller.restoreLayout();
+    first.controller.setParent(topicA);
+    await first.controller.openTab({ id: 'notes:a', kind: 'notes', title: '笔记', closable: true, scopeMode: 'topic', parent: topicA });
+    first.controller.setParent(topicB);
+    first.controller.setVisible(false);
+    first.controller.setParent(topicA);
+    await first.controller.dispose();
+    first.dom.window.close();
+
+    const mounts = [];
+    const second = createPane(storage, mounts);
+    // 宿主先同步当前对话（话题 B），再恢复存档
+    second.controller.setParent(topicB);
+    assert.equal(second.controller.restoreLayout(), true);
+    await new Promise(resolve => setTimeout(resolve, 0));
+    const root = second.dom.window.document.getElementById('vcpSidePane');
+    assert.deepEqual(mounts, [], 'the topic A tab is not mounted while topic B is shown');
+    assert.equal(root.classList.contains('is-animating'), false);
+    assert.equal(second.controller.getSnapshot().visible, false, 'topic B was left collapsed');
+
+    second.controller.setParent(topicA);
+    await new Promise(resolve => setTimeout(resolve, 0));
+    assert.deepEqual(mounts.map(m => m.id), ['notes:a']);
+    await second.controller.dispose();
+    second.dom.window.close();
+});
diff --git a/tests/side-pane-wiring-modules.test.mjs b/tests/side-pane-wiring-modules.test.mjs
index f977d775b..b9396967b 100644
--- a/tests/side-pane-wiring-modules.test.mjs
+++ b/tests/side-pane-wiring-modules.test.mjs
@@ -49,3 +49,41 @@ test('restoring side chats in the background keeps the tab the user was looking
         dom.window.close();
     }
 });
+
+test('startup restores the saved layout against the current conversation: a pane saved open on another topic never flashes open', async () => {
+    const { JSDOM } = await import('jsdom');
+    const { initWorkspaceSidePane } = await import('../modules/renderer/sidePaneWiring.js');
+    const dom = new JSDOM('<main class="main-content"></main><aside id="pane"><div id="tabs"></div><div id="content"><section class="side-pane-view" id="sidePaneViewNotifications"></section></div></aside>', { url: 'http://localhost/' });
+    const win = dom.window;
+    const doc = win.document;
+    const topicA = { itemType: 'agent', itemId: 'agent-1', topicId: 'topic-a' };
+    win.localStorage.setItem('vcp.sidePane.layout.v1', JSON.stringify({
+        version: 1,
+        tabs: [{ id: 'plan:a', kind: 'plan-detail', title: '计划', closable: true, scopeMode: 'topic', parent: topicA, payload: { projectId: 'p1' } }],
+        activeTabId: 'plan:a', visible: true, activeByParent: [], collapsedByParent: []
+    }));
+    const root = doc.getElementById('pane');
+    const classHistory = [];
+    new win.MutationObserver(records => records.forEach(record => classHistory.push(record.oldValue || '')))
+        .observe(root, { attributes: true, attributeFilter: ['class'], attributeOldValue: true });
+    const chatAPI = new Proxy({}, { get: (_target, key) => (key === 'then' ? undefined : async () => ({ success: false })) });
+    const subscriptions = [];
+    const controller = initWorkspaceSidePane({
+        document: doc, window: win,
+        elements: { root, tabList: doc.getElementById('tabs'), contentContainer: doc.getElementById('content') },
+        chatAPI, chatRepository: null, chatManager: { onSelectionChange: () => () => {} }, uiHelper: null,
+        createRenderer: () => null, settingsRef: { get: () => ({}) },
+        selectedItemRef: { get: () => ({ id: 'agent-1', type: 'agent' }) }, topicIdRef: { get: () => 'topic-b' },
+        historyRef: { get: () => [] }, subscriptions: { add: owner => subscriptions.push(owner) }
+    });
+    await new Promise(resolve => setTimeout(resolve, 0));
+    classHistory.push(root.className);
+    try {
+        assert.ok(controller.getSnapshot().tabs.some(tab => tab.id === 'plan:a'), 'the saved tab was restored');
+        assert.equal(controller.getSnapshot().visible, false);
+        assert.equal(classHistory.some(className => /\bactive\b/.test(className)), false, `pane never opened: ${classHistory.join(' | ')}`);
+    } finally {
+        for (const owner of subscriptions.reverse()) await owner.dispose?.();
+        win.close();
+    }
+});

From 17c29affad510371341a52c47689233c9f8410a3 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 02:08:35 +0000
Subject: [PATCH 073/143] Message file changes: one history index per mutation
 batch

Loading a long topic ran a linear history find and a fresh extraction per
assistant message (and a full project-root scan when a ProjectForge path
was present), O(N^2) on history load. Each mutation batch now builds one
id map and one root map lazily, and messages without file changes are
remembered by id and content length so later class flips skip them.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DFRovoZHMzeheXKkLNWKG
---
 .../contracts/generated/chat-event-graph.json | 12 +++----
 modules/ui-system/message-file-changes.js     | 36 +++++++++++++------
 tests/message-file-changes.test.mjs           | 28 +++++++++++++++
 3 files changed, 60 insertions(+), 16 deletions(-)

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index f36ce3733..4f48d2ff4 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -4106,12 +4106,12 @@
         },
         {
           "file": "modules/ui-system/message-file-changes.js",
-          "line": 366,
+          "line": 380,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/message-file-changes.js",
-          "line": 403,
+          "line": 417,
           "kind": "custom-event-listener"
         },
         {
@@ -5660,13 +5660,13 @@
         },
         {
           "file": "modules/ui-system/message-file-changes.js",
-          "line": 366,
+          "line": 380,
           "kind": "custom-event-listener",
           "match": "label.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/message-file-changes.js",
-          "line": 403,
+          "line": 417,
           "kind": "custom-event-listener",
           "match": "button.addEventListener('click'"
         },
@@ -29052,14 +29052,14 @@
       "consumers": [
         {
           "file": "modules/ui-system/message-file-changes.js",
-          "line": 389,
+          "line": 403,
           "kind": "custom-event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ui-system/message-file-changes.js",
-          "line": 389,
+          "line": 403,
           "kind": "custom-event-listener",
           "match": "details.addEventListener('toggle'"
         }
diff --git a/modules/ui-system/message-file-changes.js b/modules/ui-system/message-file-changes.js
index 1dd683ff9..d70d16a7f 100644
--- a/modules/ui-system/message-file-changes.js
+++ b/modules/ui-system/message-file-changes.js
@@ -325,21 +325,35 @@ export function createMessageFileChanges({
     const win = doc.defaultView;
     let observer = null;
     let disposed = false;
+    // 没有文件改动的消息记下 id 和内容长度：class 再变（hover、展开等）不用重新提取
+    const noChanges = new Map();
+
+    // 一批 mutation 共用一份历史索引和工程根：长历史加载时不再每条消息线性 find、再扫一遍全历史
+    function createBatch() {
+        let history = null;
+        let byId = null;
+        let roots = null;
+        const getAll = () => (history ??= getHistory() || []);
+        return {
+            find: id => (byId ??= new Map(getAll().map(message => [message?.id, message]))).get(id),
+            roots: () => (roots ??= findProjectRoots(getAll().map(message => message?.content)))
+        };
+    }
 
-    function render(item) {
+    function render(item, batch = createBatch()) {
         if (!item.classList?.contains('message-item') || !item.classList.contains('assistant') || item.classList.contains('streaming')) return;
         const wrapper = item.querySelector(':scope > .details-and-bubble-wrapper');
         if (!wrapper || wrapper.querySelector(':scope > .vcp-file-changes')) return;
         const id = item.dataset.messageId;
         if (!id) return;
-        const record = (getHistory() || []).find(message => message?.id === id);
+        const record = batch.find(id);
         const raw = typeof record?.content === 'string' ? record.content : '';
+        if (noChanges.get(id) === raw.length) return;
         const changes = extractFileChanges(raw);
-        if (changes.length === 0) return;
+        if (changes.length === 0) { noChanges.set(id, raw.length); return; }
+        noChanges.delete(id);
         // ProjectForge 的路径相对工程根；根目录写在建工程（CreateProject / GetProject）的结果里，可能在更早的消息中
-        const roots = changes.some(change => change.projectId)
-            ? findProjectRoots((getHistory() || []).map(message => message?.content))
-            : new Map();
+        const roots = changes.some(change => change.projectId) ? batch.roots() : new Map();
 
         const details = doc.createElement('details');
         details.className = 'vcp-file-changes';
@@ -430,15 +444,16 @@ export function createMessageFileChanges({
     }
 
     function onMutations(records) {
+        const batch = createBatch();
         for (const record of records) {
             if (record.type === 'attributes') {
-                render(record.target);
+                render(record.target, batch);
                 continue;
             }
             for (const node of record.addedNodes) {
                 if (node.nodeType !== 1) continue;
-                if (node.classList.contains('message-item')) render(node);
-                else node.querySelectorAll?.('.message-item').forEach(render);
+                if (node.classList.contains('message-item')) render(node, batch);
+                else node.querySelectorAll?.('.message-item').forEach(item => render(item, batch));
             }
         }
     }
@@ -448,7 +463,8 @@ export function createMessageFileChanges({
         if (!messagesRoot || observer || disposed || typeof win?.MutationObserver !== 'function') return null;
         observer = new win.MutationObserver(onMutations);
         observer.observe(messagesRoot, { childList: true, subtree: true, attributes: true, attributeFilter: ['class'] });
-        messagesRoot.querySelectorAll('.message-item').forEach(render);
+        const batch = createBatch();
+        messagesRoot.querySelectorAll('.message-item').forEach(item => render(item, batch));
         return observer;
     }
 
diff --git a/tests/message-file-changes.test.mjs b/tests/message-file-changes.test.mjs
index 8b51983f9..9cfa6e0c2 100644
--- a/tests/message-file-changes.test.mjs
+++ b/tests/message-file-changes.test.mjs
@@ -156,3 +156,31 @@ test('results preceding a request do not confirm it; later sequential requests r
     const text=[write('C:/ambiguous1.js'),write('C:/ambiguous2.js'),RES('SUCCESS'),RES('ERROR'),write('C:/known.js'),RES('SUCCESS')].join('\n');
     assert.deepEqual(extractFileChanges(text),[{path:'C:/known.js',op:'write'}]);
 });
+
+test('loading a long history reads the history once per batch, not once per message', async () => {
+    const dom = new JSDOM('<div id="chatMessages"></div>', { pretendToBeVisual: true });
+    const doc = dom.window.document;
+    const root = doc.getElementById('chatMessages');
+    const history = Array.from({ length: 200 }, (_, i) => ({ id: `m${i}`, role: 'assistant', content: i === 199 ? confirmed(write('C:/proj/a.js')) : `回复 ${i}` }));
+    let reads = 0;
+    const controller = createMessageFileChanges({ document: doc, messagesRoot: root, getHistory: () => { reads++; return history; } });
+    controller.mount();
+    const fragment = doc.createDocumentFragment();
+    for (const message of history) {
+        const item = doc.createElement('div');
+        item.className = 'message-item assistant';
+        item.dataset.messageId = message.id;
+        item.innerHTML = '<div class="details-and-bubble-wrapper"><div class="md-content">x</div></div>';
+        fragment.appendChild(item);
+    }
+    root.appendChild(fragment);
+    await new Promise(resolve => setTimeout(resolve, 20));
+    assert.equal(reads, 1);
+    assert.equal(root.querySelectorAll('.vcp-file-changes').length, 1);
+    // 之后的 class 变化（hover、选中）不再为没有改动的消息重新提取
+    reads = 0;
+    root.querySelectorAll('.message-item').forEach(item => item.classList.add('is-hovered'));
+    await new Promise(resolve => setTimeout(resolve, 20));
+    assert.ok(reads <= 1);
+    controller.dispose();
+});

From 9f9a44938213fcc639cfe32946bd6f948c38ec24 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 02:11:39 +0000
Subject: [PATCH 074/143] gitService: coalesce concurrent status reads per
 repository

While an agent works, one files push makes the status panel, the Git page
and the ProjectForge page each read status (three git spawns per read,
slow on Windows). Callers that arrive while a read is in flight now share
the single read that starts right after it, so every caller still gets a
snapshot taken after its call and N concurrent callers cost at most two
reads (ZCode gitCliRepo reuseInFlightRequest, with a trailing read for
freshness).

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DFRovoZHMzeheXKkLNWKG
---
 modules/services/gitService.js | 37 +++++++++++++++++++++++++++++++++-
 tests/git-service.test.js      | 17 ++++++++++++++++
 2 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/modules/services/gitService.js b/modules/services/gitService.js
index 37a837a3c..7a2f00971 100644
--- a/modules/services/gitService.js
+++ b/modules/services/gitService.js
@@ -390,7 +390,42 @@ function withCounts(list, counts) {
     });
 }
 
-async function readStatus(repo) {
+// 同一仓库的 status 读取合并：agent 施工时一次 files 推送会让状态面板、Git 页、V工程页各自来读（每次 3 个 git 子进程，
+// Windows 上 spawn 很慢）。在飞时到达的请求不搭这次的车（它可能早于刚发生的改动），而是共享紧随其后的下一次读取，
+// 所以每个调用拿到的都是调用之后才开始的快照，N 个并发调用最多跑两轮（对照 ZCode gitCliRepo reuseInFlightRequest）。
+const statusReads = new Map(); // key -> { current, next }
+
+function readStatus(repo) {
+    const key = `${repo.toplevel}\0${repo.prefix || ''}`;
+    let slot = statusReads.get(key);
+    if (!slot) {
+        slot = { current: null, next: null };
+        statusReads.set(key, slot);
+    }
+    if (!slot.current) {
+        slot.current = readStatusNow(repo).finally(() => settleStatusRead(key, slot));
+        return slot.current;
+    }
+    if (!slot.next) {
+        const queued = Promise.withResolvers();
+        slot.next = { repo, ...queued };
+    }
+    return slot.next.promise;
+}
+
+function settleStatusRead(key, slot) {
+    const queued = slot.next;
+    slot.next = null;
+    if (!queued) {
+        slot.current = null;
+        statusReads.delete(key);
+        return;
+    }
+    slot.current = readStatusNow(queued.repo).finally(() => settleStatusRead(key, slot));
+    slot.current.then(queued.resolve, queued.reject);
+}
+
+async function readStatusNow(repo) {
     const args = ['status', '--porcelain=v2', '-z', '--branch', '--untracked-files=all'];
     if (repo.prefix) args.push('--', repo.prefix);
     const [{ stdout }, remotes, counts] = await Promise.all([runGit(repo.toplevel, args), listRemotes(repo), readDiffCounts(repo)]);
diff --git a/tests/git-service.test.js b/tests/git-service.test.js
index 9a0ab7d85..fd10acc64 100644
--- a/tests/git-service.test.js
+++ b/tests/git-service.test.js
@@ -450,3 +450,20 @@ test('a switch blocked by local changes reports the files in a form the commit-a
     const { parseSwitchBlockedFiles } = await import('../modules/ui-system/conversation-status-panel/helpers.js');
     assert.deepEqual(parseSwitchBlockedFiles(blocked.issues[0].message), { files: ['README.md'], untracked: false });
 });
+
+test('concurrent status reads share one follow-up read that still sees changes made after the first began', { skip: SKIP_GIT }, async t => {
+    const root = createRepo(t);
+    const first = gitService.getStatus(root);
+    // 读取已经在路上时文件变了；之后来的调用不能拿到那次旧读取
+    await new Promise(resolve => setImmediate(resolve));
+    write(root, 'late.js', 'late\n');
+    const followers = await Promise.all(Array.from({ length: 5 }, () => gitService.getStatus(root)));
+    await first;
+    for (const status of followers) {
+        assert.ok(status.changes.some(item => item.path === 'late.js'), 'every later caller sees the late file');
+    }
+    // 每个调用先各自 rev-parse 定位仓库，到达时间有先后；但 6 个调用最多跑 3 轮 status
+    assert.ok(new Set([await first, ...followers]).size <= 3, 'callers that arrive together share reads');
+    const after = await gitService.getStatus(root);
+    assert.notEqual(after, followers[0], 'a call after the reads settle starts a fresh read');
+});

From 7a0a15c4558ea7df19beba48faf5ccf2f35fdea0 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 02:13:29 +0000
Subject: [PATCH 075/143] Restore CRLF line endings on topicListManager.js and
 PowerShellExecutor.js

Earlier edits rewrote both files with LF, turning a few-line change into a
whole-file diff. Content is unchanged; the reviewed baseline digest
normalizes line endings so it still matches.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DFRovoZHMzeheXKkLNWKG
---
 .../PowerShellExecutor/PowerShellExecutor.js  | 3918 ++++++++---------
 modules/topicListManager.js                   | 3216 +++++++-------
 2 files changed, 3567 insertions(+), 3567 deletions(-)

diff --git a/VCPDistributedServer/Plugin/PowerShellExecutor/PowerShellExecutor.js b/VCPDistributedServer/Plugin/PowerShellExecutor/PowerShellExecutor.js
index 2184ef9eb..96a0ae662 100644
--- a/VCPDistributedServer/Plugin/PowerShellExecutor/PowerShellExecutor.js
+++ b/VCPDistributedServer/Plugin/PowerShellExecutor/PowerShellExecutor.js
@@ -1,1960 +1,1960 @@
-// node-pty 是原生模块：只读命令记录、不开终端时不加载它，真正创建会话时才 require
-let ptyModule = null;
-function loadPty() {
-    return ptyModule || (ptyModule = require('node-pty'));
-}
-const os = require('os');
-const { spawn } = require('child_process');
-const path = require('path');
-const fs = require('fs');
-const crypto = require('crypto');
-const { BrowserWindow, ipcMain, clipboard } = require('electron');
-const tmp = require('tmp');
-const chokidar = require('chokidar');
-const { CommandOutputParser } = require('./command-output-parser');
-const { sanitizeTerminalOutput } = require('./terminalOutputSanitizer');
-// 命令运行记录放在无副作用的独立模块里：主进程只读记录时不必加载整个执行器
-const {
-    COMMAND_RUN_RAW_LIMIT,
-    beginCommandRun,
-    appendCommandRunOutput,
-    finishCommandRun,
-    listCommandRuns,
-    getCommandRun,
-    subscribeCommandRuns,
-} = require('./commandRunStore');
-const { resolveConfirmationScript } = require('./nativeHelperPath.js');
-
-// --- GUI Window Management ---
-let guiWindow = null;
-let guiReady = false;
-let guiReadyPromise = Promise.resolve();
-let resolveGuiReady = null;
-
-function createGuiReadyBarrier() {
-    guiReady = false;
-    guiReadyPromise = new Promise((resolve) => {
-        resolveGuiReady = resolve;
-    });
-}
-
-async function waitForGuiReady(timeoutMs = 15000) {
-    if (!guiWindow || guiWindow.isDestroyed()) {
-        throw new Error('PowerShell GUI window is not available.');
-    }
-
-    if (guiReady) {
-        return;
-    }
-
-    const targetWebContents = guiWindow.webContents;
-    let timeoutId = null;
-
-    try {
-        await Promise.race([
-            guiReadyPromise,
-            new Promise((_, reject) => {
-                timeoutId = setTimeout(() => {
-                    reject(new Error(`PowerShell GUI initialization timed out after ${timeoutMs}ms.`));
-                }, timeoutMs);
-            })
-        ]);
-    } finally {
-        if (timeoutId) {
-            clearTimeout(timeoutId);
-        }
-    }
-
-    if (!guiWindow || guiWindow.isDestroyed() || guiWindow.webContents !== targetWebContents || !guiReady) {
-        throw new Error('PowerShell GUI window changed or closed during initialization.');
-    }
-}
-
-function ensureGuiWindow() {
-    if (guiWindow && !guiWindow.isDestroyed()) {
-        guiWindow.focus();
-        return guiWindow;
-    }
-
-    createGuiReadyBarrier();
-    guiWindow = new BrowserWindow({
-        width: 800,
-        height: 600,
-        title: 'VCP PowerShell Executor',
-        frame: false, // 禁用窗口边框
-        ...(process.platform === 'darwin' ? {} : { titleBarStyle: 'hidden' }),
-        webPreferences: {
-            preload: path.join(__dirname, 'gui', 'preload.js'),
-            nodeIntegration: false, // 禁用 Node.js 集成以增强安全性
-            contextIsolation: true, // 启用上下文隔离
-            spellcheck: false,
-            // 将 node_modules 的路径作为参数传递给窗口，以便在 HTML 中使用
-            additionalArguments: [`--node-modules-path=${path.join(__dirname, '..', '..', '..', '..', 'node_modules')}`]
-        },
-        autoHideMenuBar: true,
-    });
-
-    guiWindow.loadFile(path.join(__dirname, 'gui', 'PowerShellViewer.html'));
-
-    guiWindow.on('closed', () => {
-        guiReady = false;
-        if (resolveGuiReady) {
-            resolveGuiReady();
-            resolveGuiReady = null;
-        }
-        guiWindow = null;
-        // 当GUI关闭时，也终止关联的 pty 进程
-        if (ptyProcess) {
-            try {
-                ptyProcess.kill();
-                console.log('[PowerShellExecutor] GUI closed, associated pty process terminated.');
-            } catch (e) {
-                console.error('[PowerShellExecutor] Error terminating pty process on GUI close:', e);
-            }
-            // ptyProcess 的 onExit 事件处理器会自动将其设置为 null 并从 childProcesses 集合中移除
-        }
-    });
-
-    return guiWindow;
-}
-
-// --- 主题管理与文件监视 ---
-const settingsPath = path.join(__dirname, '..', '..', '..', 'AppData', 'settings.json');
-let settingsWatcher = null;
-let lastSentTheme = null; // 用于存储上一次发送的主题名称
-
-/**
- * 读取、比较并发送主题更新。
- * 只有当主题名称实际发生变化时，才会向GUI发送事件。
- * @param {Electron.WebContents} targetWebContents - 目标窗口的 webContents。
- * @param {boolean} [forceSend=false] - 是否强制发送，即使用于初始化。
- */
-function sendThemeUpdate(targetWebContents, forceSend = false) {
-    if (!targetWebContents || targetWebContents.isDestroyed()) {
-        return;
-    }
-    try {
-        let currentTheme = 'dark'; // 默认主题
-        if (fs.existsSync(settingsPath)) {
-            const settings = JSON.parse(fs.readFileSync(settingsPath, 'utf-8'));
-            currentTheme = settings.currentThemeMode || 'dark';
-        }
-
-        // 只有当主题变化或强制发送时，才进行通信
-        if (currentTheme !== lastSentTheme || forceSend) {
-            targetWebContents.send('theme-init', { themeName: currentTheme });
-            lastSentTheme = currentTheme; // 更新已发送的主题记录
-            console.log(`[PowerShellExecutor] Theme updated to: ${currentTheme}`);
-        }
-    } catch (error) {
-        console.error('[PowerShellExecutor] Error reading or sending theme settings:', error);
-    }
-}
-
-// 初始化文件监视器
-function setupThemeWatcher() {
-    if (settingsWatcher) {
-        settingsWatcher.close();
-    }
-    settingsWatcher = chokidar.watch(settingsPath, {
-        persistent: true,
-        ignoreInitial: true
-    });
-
-    settingsWatcher.on('change', () => {
-        if (guiWindow && !guiWindow.isDestroyed()) {
-            sendThemeUpdate(guiWindow.webContents);
-        }
-    });
-}
-
-// 在插件加载时启动监视
-setupThemeWatcher();
-
-
-// 监听来自GUI的“就绪”信号。
-// 只有当前窗口在 xterm 挂载、IPC 监听注册和首次 fit 完成后发出的信号才能解除屏障；
-// 旧窗口的迟到消息不能误解锁新窗口。
-ipcMain.on('powershell-gui-ready', (event) => {
-    if (!guiWindow || guiWindow.isDestroyed() || event.sender !== guiWindow.webContents) {
-        return;
-    }
-
-    guiReady = true;
-    if (resolveGuiReady) {
-        resolveGuiReady();
-        resolveGuiReady = null;
-    }
-
-    sendThemeUpdate(event.sender, true);
-});
-
-// 监听来自GUI的用户命令
-ipcMain.on('powershell-command', (event, command) => {
-    if (ptyProcess && command) {
-        // 将用户输入的命令写入 pty 进程
-        ptyProcess.write(`${command}\r`);
-    }
-});
-
-// 监听来自GUI的复制请求
-ipcMain.on('copy-to-clipboard', (event, text) => {
-    if (text) {
-        clipboard.writeText(text);
-    }
-});
-
-// 监听来自GUI的粘贴请求
-ipcMain.handle('read-from-clipboard', () => {
-    return clipboard.readText();
-});
-
-// 监听来自GUI的尺寸调整请求
-function applyPtyResize(cols, rows) {
-    const normalizedCols = Number(cols);
-    const normalizedRows = Number(rows);
-
-    if (Number.isInteger(normalizedCols) && Number.isInteger(normalizedRows) && normalizedCols > 0 && normalizedRows > 0) {
-        lastKnownSize = { cols: normalizedCols, rows: normalizedRows };
-    }
-
-    if (ptyProcess) {
-        try {
-            ptyProcess.resize(lastKnownSize.cols, lastKnownSize.rows);
-        } catch (e) {
-            console.error('[PowerShellExecutor] Failed to resize pty:', e);
-        }
-    }
-}
-
-ipcMain.on('powershell-resize', (event, { cols, rows }) => {
-    applyPtyResize(cols, rows);
-});
-
-// 监听来自GUI的真实终端输入透传。
-// 安全声明：此通道等价于用户直接操作本机终端，不经过 intelligentSecurityCheck；
-// forbiddenCommands/authRequiredCommands 仅约束 AI 工具调用路径 processToolCall。
-ipcMain.on('powershell-input', (event, data) => {
-    if (ptyProcess && typeof data === 'string') {
-        ptyProcess.write(data);
-    }
-});
-
-// --- 查询终端可见文本与 xterm 粘贴响应 ---
-const visibleTextResolvers = new Map();
-const terminalPasteResolvers = new Map();
-
-ipcMain.on('visible-text-response', (event, payload, legacyText) => {
-    if (!isPowerShellGuiSender(event)) {
-        return;
-    }
-
-    // 兼容旧渲染端直接返回字符串的格式。
-    if (typeof payload === 'string') {
-        const firstEntry = visibleTextResolvers.entries().next().value;
-        if (firstEntry) {
-            const [requestId, resolve] = firstEntry;
-            visibleTextResolvers.delete(requestId);
-            resolve(payload);
-        }
-        return;
-    }
-
-    const requestId = payload && payload.requestId;
-    const resolver = requestId ? visibleTextResolvers.get(requestId) : null;
-    if (resolver) {
-        visibleTextResolvers.delete(requestId);
-        resolver(typeof payload.text === 'string' ? payload.text : (legacyText || ''));
-    }
-});
-
-ipcMain.on('terminal-paste-complete', (event, payload) => {
-    if (!isPowerShellGuiSender(event)) {
-        return;
-    }
-
-    const requestId = payload && payload.requestId;
-    const resolver = requestId ? terminalPasteResolvers.get(requestId) : null;
-    if (resolver) {
-        terminalPasteResolvers.delete(requestId);
-        resolver();
-    }
-});
-
-// --- PowerShell GUI 专属窗口控制 ---
-// 不复用应用级 minimize-window/maximize-window/close-window：ipcMain 是全局事件总线，
-// 使用通用通道会让日志中心等其它窗口的操作也落到此 guiWindow 上；而 PowerShell
-// 自身的消息还会与应用级处理器重复执行（最大化切换两次后等同于没有变化）。
-function isPowerShellGuiSender(event) {
-    return Boolean(
-        event
-        && guiWindow
-        && !guiWindow.isDestroyed()
-        && guiWindow.webContents
-        && !guiWindow.webContents.isDestroyed()
-        && event.sender === guiWindow.webContents
-    );
-}
-
-ipcMain.on('powershell-window:minimize', (event) => {
-    if (isPowerShellGuiSender(event)) {
-        guiWindow.minimize();
-    }
-});
-
-ipcMain.on('powershell-window:toggle-maximize', (event) => {
-    if (!isPowerShellGuiSender(event)) {
-        return;
-    }
-
-    if (guiWindow.isMaximized()) {
-        guiWindow.unmaximize();
-    } else {
-        guiWindow.maximize();
-    }
-});
-
-ipcMain.on('powershell-window:close', (event) => {
-    if (isPowerShellGuiSender(event)) {
-        guiWindow.close();
-    }
-});
-
-// --- ANSI / terminal control projection for AI text summaries ---
-// 清洗逻辑在 terminalOutputSanitizer.js（纯函数，命令运行记录也用它）
-
-// --- 模块级状态 ---
-// 用于保存持久化的伪终端（PowerShell）进程
-let ptyProcess = null;
-// 移除 fullTerminalHistory，后端不再维护终端内容的完整状态
-// 新增：用于跟踪所有子进程，确保它们在插件卸载或程序退出时被正确清理
-const childProcesses = new Set();
-let guiDataListener = null; // 新增：保存GUI监听器的引用
-let isExecutingCommand = false; // 仅表示 AI 短命令执行中；不要用于交互式 TUI 会话
-let interactiveMode = false; // 表示当前 PTY 被 snow/codex/claude 等交互式程序占用
-let activeCommandAbort = null; // 当前同步命令的本地等待中止器；供并发 interrupt 工具调用解除阻塞
-let lastKnownSize = { cols: 80, rows: 24 }; // GUI 最近一次 fit 出来的尺寸，用作 PTY 初始尺寸
-let ptyReadyPromise = Promise.resolve();
-
-// --- 配置加载 ---
-const defaultConfig = {
-    returnMode: 'delta', // 默认为增量模式
-    forbiddenCommands: [],
-    authRequiredCommands: []
-};
-
-try {
-    const configPath = path.join(__dirname, 'config.env');
-    if (fs.existsSync(configPath)) {
-        const configContent = fs.readFileSync(configPath, 'utf-8');
-
-        const returnModeMatch = configContent.match(/^POWERSHELL_RETURN_MODE\s*=\s*(delta|full)/m);
-        if (returnModeMatch) {
-            defaultConfig.returnMode = returnModeMatch[1];
-        }
-
-        const forbiddenMatch = configContent.match(/^FORBIDDEN_COMMANDS\s*=\s*(.*)/m);
-        if (forbiddenMatch && forbiddenMatch[1]) {
-            defaultConfig.forbiddenCommands = forbiddenMatch[1].split(',').map(c => c.trim().toLowerCase()).filter(c => c);
-        }
-
-        const authRequiredMatch = configContent.match(/^AUTH_REQUIRED_COMMANDS\s*=\s*(.*)/m);
-        if (authRequiredMatch && authRequiredMatch[1]) {
-            defaultConfig.authRequiredCommands = authRequiredMatch[1].split(',').map(c => c.trim().toLowerCase()).filter(c => c);
-        }
-    }
-} catch (error) {
-    console.error('[PowerShellExecutor] Error reading config.env:', error);
-}
-
-
-/**
- * 智能安全检查函数 - 区分命令关键字和路径内容
- * @param {string} command - 要检查的命令字符串
- * @param {string[]} forbiddenKeywords - 禁止的关键字列表
- * @param {string[]} authRequiredKeywords - 需要授权的关键字列表
- * @returns {object} - 检查结果 {isForbidden: boolean, needsAuth: boolean, matchedKeyword: string}
- */
-function intelligentSecurityCheck(command, forbiddenKeywords, authRequiredKeywords) {
-    const result = {
-        isForbidden: false,
-        needsAuth: false,
-        matchedKeyword: null,
-        reason: null
-    };
-
-    // 预处理命令：移除多余空格，转换为小写
-    const normalizedCommand = command.trim().toLowerCase();
-
-    // 如果命令为空，直接返回
-    if (!normalizedCommand) {
-        return result;
-    }
-
-    // 定义路径模式 - 常见的Windows和Unix路径格式
-    const pathPatterns = [
-        /[a-z]:\\[^\\/:*?"<>|]*(?:\\[^\\/:*?"<>|]*)*\\?/gi,  // Windows路径 C:\path\to\file
-        /\/[^\/\s]*(?:\/[^\/\s]*)*\/?/g,                      // Unix路径 /path/to/file
-        /\$env:[a-z_]+[^\\/:*?"<>|\s]*/gi,                   // PowerShell环境变量路径
-        /\${[^}]+}[^\\/:*?"<>|\s]*/gi,                       // 变量路径 ${VAR}/path
-        /~\/[^\/\s]*(?:\/[^\/\s]*)*\/?/g                     // 用户目录路径 ~/path
-    ];
-
-    // 提取所有可能的路径
-    const detectedPaths = [];
-    pathPatterns.forEach(pattern => {
-        const matches = normalizedCommand.match(pattern);
-        if (matches) {
-            detectedPaths.push(...matches);
-        }
-    });
-
-    // 创建不包含路径的命令版本用于安全检查
-    let commandWithoutPaths = normalizedCommand;
-    detectedPaths.forEach(path => {
-        // 将路径替换为占位符，避免路径中的关键字被误判
-        commandWithoutPaths = commandWithoutPaths.replace(path.toLowerCase(), ' __PATH_PLACEHOLDER__ ');
-    });
-
-    // 清理命令：移除多余空格
-    commandWithoutPaths = commandWithoutPaths.replace(/\s+/g, ' ').trim();
-
-    // 定义PowerShell命令结构模式
-    const commandStructurePatterns = [
-        // PowerShell cmdlet模式: Verb-Noun
-        /\b[a-z]+-[a-z]+\b/g,
-        // 常见命令
-        /\b(?:get|set|new|remove|copy|move|invoke|start|stop|restart|test|clear|add|export|import|select|where|foreach|sort|group|measure|compare|out|write|read)\b/g,
-        // 参数模式
-        /\s-[a-z]+\b/g
-    ];
-
-    // 检查禁止的关键字
-    for (const keyword of forbiddenKeywords) {
-        if (!keyword) continue;
-
-        const keywordLower = keyword.toLowerCase();
-
-        // 1. 首先检查是否在路径中
-        const isInPath = detectedPaths.some(path =>
-            path.toLowerCase().includes(keywordLower)
-        );
-
-        if (isInPath) {
-            // 如果关键字只在路径中出现，检查是否也在命令部分出现
-            if (!commandWithoutPaths.includes(keywordLower)) {
-                console.log(`[PowerShellExecutor] 安全检查：关键字 "${keyword}" 仅在路径中发现，允许执行`);
-                continue; // 跳过这个关键字，不视为违规
-            }
-        }
-
-        // 2. 检查命令部分是否包含关键字
-        if (commandWithoutPaths.includes(keywordLower)) {
-            // 3. 进一步验证：检查关键字是否作为独立的命令或参数出现
-            const wordBoundaryPattern = new RegExp(`\\b${keywordLower.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\b`);
-
-            if (wordBoundaryPattern.test(commandWithoutPaths)) {
-                result.isForbidden = true;
-                result.matchedKeyword = keyword;
-                result.reason = `命令包含被禁止的关键字: ${keyword}`;
-                console.log(`[PowerShellExecutor] 安全检查：发现禁止的命令关键字 "${keyword}"`);
-                return result;
-            }
-        }
-    }
-
-    // 检查需要授权的关键字（使用相同的逻辑）
-    for (const keyword of authRequiredKeywords) {
-        if (!keyword) continue;
-
-        const keywordLower = keyword.toLowerCase();
-
-        // 1. 首先检查是否在路径中
-        const isInPath = detectedPaths.some(path =>
-            path.toLowerCase().includes(keywordLower)
-        );
-
-        if (isInPath) {
-            // 如果关键字只在路径中出现，检查是否也在命令部分出现
-            if (!commandWithoutPaths.includes(keywordLower)) {
-                console.log(`[PowerShellExecutor] 安全检查：授权关键字 "${keyword}" 仅在路径中发现，不需要授权`);
-                continue; // 跳过这个关键字，不需要授权
-            }
-        }
-
-        // 2. 检查命令部分是否包含关键字
-        if (commandWithoutPaths.includes(keywordLower)) {
-            // 3. 进一步验证：检查关键字是否作为独立的命令或参数出现
-            const wordBoundaryPattern = new RegExp(`\\b${keywordLower.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\b`);
-
-            if (wordBoundaryPattern.test(commandWithoutPaths)) {
-                result.needsAuth = true;
-                result.matchedKeyword = keyword;
-                result.reason = `命令包含需要授权的关键字: ${keyword}`;
-                console.log(`[PowerShellExecutor] 安全检查：发现需要授权的命令关键字 "${keyword}"`);
-                // 注意：不要return，继续检查其他关键字
-            }
-        }
-    }
-
-    return result;
-}
-
-/**
- * 启动一个独立的 Python GUI 脚本来请求管理员权限并执行命令。
- * 这是一个"即发即忘"的操作，它会打开一个全新的、独立的管理员终端窗口。
- * @param {string} command - 需要以管理员权限执行的命令。
- * @returns {Promise<string>} - 一个解析为提示信息的消息。
- */
-function executeAdminCommand(command) {
-    return new Promise((resolve, reject) => {
-        // 1. 创建一个临时的输出文件
-        tmp.file({ postfix: '.txt' }, (err, tmpFilePath, fd, cleanupCallback) => {
-            if (err) {
-                return reject(new Error(`无法创建临时文件: ${err.message}`));
-            }
-
-            let pythonConfirmScript;
-            try { pythonConfirmScript = resolveConfirmationScript(__dirname); }
-            catch (error) { cleanupCallback(); reject(error); return; }
-            const commandAsBase64 = Buffer.from(command).toString('base64');
-
-            // 2. 准备传递给Python脚本的参数
-            const scriptPathForPS = pythonConfirmScript.replace(/'/g, "''");
-            const commandForPS = commandAsBase64.replace(/'/g, "''");
-            const tmpPathForPS = tmpFilePath.replace(/'/g, "''");
-            const argumentList = `"${scriptPathForPS}", "${commandForPS}", "${tmpPathForPS}"`;
-
-            // 3. 构造PowerShell命令以管理员权限运行Python脚本（捕获UAC异常并注入纯ASCII标记）
-            const psCommand = `$ErrorActionPreference = 'Stop'; try { Start-Process -FilePath "pythonw.exe" -ArgumentList ${argumentList} -Verb RunAs -Wait } catch { [Console]::Error.WriteLine('UAC_CANCELLED_OR_FAILED: ' + $_.Exception.Message) }`;
-            const child = spawn('powershell.exe', [
-                '-NoProfile',
-                '-ExecutionPolicy', 'Bypass',
-                '-Command', psCommand
-            ], {
-                windowsHide: true
-            });
-            childProcesses.add(child); // 跟踪进程
-
-            let stderrOutput = '';
-            let isSettled = false;
-
-            // 310 秒外部安全定时器守护，防止后台卡死挂起 (Todo #3)
-            const safetyTimeout = setTimeout(() => {
-                if (isSettled) return;
-                isSettled = true;
-                try {
-                    child.kill();
-                } catch { }
-                childProcesses.delete(child);
-                cleanupCallback();
-                resolve({
-                    isCancelled: true,
-                    content: [{
-                        type: 'text',
-                        text: '⚠️ [操作超时]：等待管理员确认超时（超过无操作安全时限），系统已自动拒绝执行。'
-                    }]
-                });
-            }, 310000);
-
-            child.stderr.on('data', (data) => {
-                stderrOutput += data.toString('utf-8');
-            });
-
-            child.on('error', (err) => {
-                if (isSettled) return;
-                isSettled = true;
-                clearTimeout(safetyTimeout);
-                childProcesses.delete(child); // 停止跟踪
-                cleanupCallback(); // 清理临时文件
-                reject(new Error(`无法启动PowerShell包装脚本: ${err.message}`));
-            });
-
-            child.on('close', (code) => {
-                if (isSettled) return;
-                isSettled = true;
-                clearTimeout(safetyTimeout);
-                childProcesses.delete(child); // 停止跟踪
-                // PowerShell脚本执行完毕，安全读取临时文件内容
-                fs.readFile(tmpFilePath, 'utf-8', (readErr, data) => {
-                    cleanupCallback(); // 确保清理临时文件
-
-                    // 检测 UAC 取消或拒绝错误（显式捕获标记、0x800704C7 或中文取消提示）
-                    const isUacCancelled = stderrOutput && (
-                        stderrOutput.includes('UAC_CANCELLED_OR_FAILED') ||
-                        stderrOutput.includes('0x800704C7') ||
-                        stderrOutput.includes('74C7') ||
-                        stderrOutput.includes('操作已被用户取消') ||
-                        stderrOutput.includes('The operation was canceled by the user')
-                    );
-
-                    if (isUacCancelled) {
-                        return resolve({
-                            isCancelled: true,
-                            content: [{
-                                type: 'text',
-                                text: '⚠️ [操作未执行/未授权]：用户在 Windows UAC 提权界面取消了授权，或未获取到管理员权限。敏感命令未执行。'
-                            }]
-                        });
-                    }
-                    if (readErr) {
-                        if (stderrOutput.trim()) {
-                            return reject(new Error(`管理员脚本执行失败: ${stderrOutput.trim()}`));
-                        }
-                        return reject(new Error(`无法读取管理员任务的输出文件: ${readErr.message}`));
-                    }
-
-                    const result = data.trim();
-                    if (result === "USER_CANCELLED") {
-                        resolve({
-                            isCancelled: true,
-                            content: [{
-                                type: 'text',
-                                text: '⚠️ [操作已取消]：用户已主动拒绝或取消了本次管理员权限申请。敏感命令未执行。'
-                            }]
-                        });
-                    } else if (result === "TIMEOUT_REJECTED") {
-                        resolve({
-                            isCancelled: true,
-                            content: [{
-                                type: 'text',
-                                text: '⚠️ [操作超时]：等待管理员确认超时（超过无操作安全时限），系统已自动拒绝执行。'
-                            }]
-                        });
-                    } else if (result.startsWith("ERROR:")) {
-                        reject(new Error(result.substring(6).trim()));
-                    } else if (result === "") {
-                        // 空输出防穿透：脚本根本未生成内容或提权未通过时，绝不能当作正常执行成功
-                        resolve({
-                            isCancelled: true,
-                            content: [{
-                                type: 'text',
-                                text: '⚠️ [操作未执行/未授权]：用户在 Windows UAC 提权界面取消了授权，或未获取到管理员权限。敏感命令未执行。'
-                            }]
-                        });
-                    } else {
-                        resolve(result);
-                    }
-                });
-            });
-        });
-    });
-}
-
-/**
- * 请求用户确认一个敏感命令，但不在确认脚本中执行命令。
- * 确认通过后，命令仍回到主 PTY/xterm 会话执行，以保持 GUI 连续输出。
- * @param {string} command - 需要展示给用户确认的命令。
- * @returns {Promise<boolean>} - 用户是否允许执行。
- */
-function requestInteractiveConfirmation(command) {
-    return new Promise((resolve, reject) => {
-        tmp.file({ postfix: '.txt' }, (err, tmpFilePath, fd, cleanupCallback) => {
-            if (err) {
-                return reject(new Error(`无法创建临时文件: ${err.message}`));
-            }
-
-            let pythonConfirmScript;
-            try { pythonConfirmScript = resolveConfirmationScript(__dirname); }
-            catch (error) { cleanupCallback(); reject(error); return; }
-            const commandAsBase64 = Buffer.from(command).toString('base64');
-
-            // 普通敏感命令只需要当前权限确认，不应绕过主 PTY/xterm 执行链路。
-            const child = spawn('pythonw.exe', [
-                pythonConfirmScript,
-                commandAsBase64,
-                tmpFilePath,
-                '--interactive-auth',
-                '--confirm-only'
-            ], {
-                windowsHide: true
-            });
-            childProcesses.add(child);
-
-            let stderrOutput = '';
-            child.stderr.on('data', (data) => {
-                stderrOutput += data.toString('utf-8');
-            });
-
-            child.on('error', (err) => {
-                childProcesses.delete(child);
-                cleanupCallback();
-                reject(new Error(`无法启动交互式确认脚本: ${err.message}`));
-            });
-
-            child.on('close', () => {
-                childProcesses.delete(child);
-                fs.readFile(tmpFilePath, 'utf-8', (readErr, data) => {
-                    cleanupCallback();
-
-                    if (readErr) {
-                        if (stderrOutput.trim()) {
-                            return reject(new Error(`交互式确认脚本失败: ${stderrOutput.trim()}`));
-                        }
-                        return reject(new Error(`无法读取交互式确认结果文件: ${readErr.message}`));
-                    }
-
-                    const result = data.trim();
-                    if (result === 'CONFIRMED') {
-                        resolve(true);
-                    } else if (result === 'USER_CANCELLED' || result === 'TIMEOUT_REJECTED') {
-                        resolve(false);
-                    } else if (result.startsWith('ERROR:')) {
-                        reject(new Error(result.substring(6).trim()));
-                    } else {
-                        reject(new Error(`未知的交互式确认结果: ${result || '<empty>'}`));
-                    }
-                });
-            });
-        });
-    });
-}
-
-/**
- * GUI 仅接收原始PTY投影；渲染窗口失效不得打断命令完成检测。
- */
-function dispatchPtyData(rawData) {
-    const dataStr = rawData.toString('utf-8');
-    if (!dataStr) {
-        return;
-    }
-
-    if (mirrorStartupPending) {
-        // 启动握手（编码设置与就绪标记）是内部细节，握手完成前不投影到侧栏
-        mirrorStartupHeld = (mirrorStartupHeld + dataStr).slice(-MIRROR_REPLAY_LIMIT);
-    } else {
-        emitMirrorData(dataStr);
-    }
-
-    try {
-        if (!guiWindow || guiWindow.isDestroyed()
-            || guiWindow.webContents.isDestroyed()) {
-            return;
-        }
-        guiWindow.webContents.send('powershell-data', dataStr);
-    } catch (error) {
-        console.warn('[PowerShellExecutor] GUI output delivery failed:', error.message);
-    }
-}
-
-// --- 侧栏镜像 ---
-// 主窗口侧栏的「终端」标签是同一个 PTY 会话的另一个视图：输出同时送往 GUI 窗口和镜像，
-// 输入与尺寸调整直接落到同一个 PTY，AI 工具执行的命令因此对两处都可见。
-const MIRROR_REPLAY_LIMIT = 256 * 1024;
-const mirrorSinks = new Set();
-let replayBuffer = '';
-let mirrorStartupPending = false;
-let mirrorStartupHeld = '';
-
-function emitMirrorData(dataStr) {
-    if (!dataStr) return;
-    // 侧栏终端可能在会话进行中才挂载，缓存最近输出用于回放。
-    replayBuffer += dataStr;
-    if (replayBuffer.length > MIRROR_REPLAY_LIMIT) {
-        replayBuffer = replayBuffer.slice(-MIRROR_REPLAY_LIMIT);
-    }
-    notifyMirrors('onData', dataStr);
-}
-
-/** 结束启动握手：成功时只放出就绪标记之后的内容（通常是提示符），失败时原样放出便于排查。 */
-function releaseMirrorStartup(afterReady = null) {
-    if (!mirrorStartupPending) return;
-    mirrorStartupPending = false;
-    const held = mirrorStartupHeld;
-    mirrorStartupHeld = '';
-    emitMirrorData(afterReady === null ? held : afterReady);
-}
-
-function notifyMirrors(method, ...args) {
-    for (const sink of mirrorSinks) {
-        try {
-            sink[method]?.(...args);
-        } catch (e) {
-            console.error('[PowerShellExecutor] Mirror sink failed:', e);
-        }
-    }
-}
-
-/**
- * 注册一个镜像视图并回放已有输出。
- * @param {{onData: Function, onClear?: Function, onExit?: Function}} sink
- * @returns {Function} 取消注册
- */
-function attachMirror(sink) {
-    mirrorSinks.add(sink);
-    if (replayBuffer) {
-        try {
-            sink.onData(replayBuffer);
-        } catch (e) {
-            console.error('[PowerShellExecutor] Mirror replay failed:', e);
-        }
-    }
-    return () => mirrorSinks.delete(sink);
-}
-
-/** 确保有一个 PTY 会话（不打开 GUI 窗口）。 */
-function ensureMirrorSession() {
-    if (!ptyProcess) {
-        createNewPtySession();
-    }
-    return getSessionState();
-}
-
-/** 重置为全新的 PTY 会话（与 GUI 窗口共用）。 */
-function restartSession() {
-    createNewPtySession();
-    return getSessionState();
-}
-
-function getSessionState() {
-    return {
-        running: Boolean(ptyProcess),
-        pid: ptyProcess ? ptyProcess.pid : null,
-        // AI 短命令或交互式 TUI 占用期间，不应向会话里塞入额外命令。
-        busy: Boolean(isExecutingCommand || interactiveMode),
-        cols: lastKnownSize.cols,
-        rows: lastKnownSize.rows,
-    };
-}
-
-function writeSessionInput(data) {
-    if (!ptyProcess || typeof data !== 'string') {
-        return false;
-    }
-    ptyProcess.write(data);
-    return true;
-}
-
-/**
- * 等待指定 PTY 完成 PowerShell 初始化探针。
- * Promise 与具体 PTY 实例绑定，旧会话的迟到结果不能被新会话复用。
- * @param {object} targetPtyProcess - 要等待的 node-pty 实例。
- * @param {number} timeoutMs - 最大等待时间。
- */
-async function waitForPtyReady(targetPtyProcess = ptyProcess, timeoutMs = 15000) {
-    if (!targetPtyProcess || targetPtyProcess !== ptyProcess) {
-        throw new Error('PowerShell PTY session is not available.');
-    }
-
-    let timeoutId = null;
-    try {
-        await Promise.race([
-            ptyReadyPromise,
-            new Promise((_, reject) => {
-                timeoutId = setTimeout(() => {
-                    reject(new Error(`PowerShell PTY initialization timed out after ${timeoutMs}ms.`));
-                }, timeoutMs);
-            })
-        ]);
-    } finally {
-        if (timeoutId) {
-            clearTimeout(timeoutId);
-        }
-    }
-
-    if (!ptyProcess || ptyProcess !== targetPtyProcess) {
-        throw new Error('PowerShell PTY session changed or exited during initialization.');
-    }
-}
-
-/**
- * 同时等待渲染端 xterm 和后端 PTY 就绪，确保指令不会在界面初始化前注入。
- */
-async function waitForTerminalReady() {
-    const targetPtyProcess = ptyProcess;
-    await Promise.all([
-        waitForGuiReady(),
-        waitForPtyReady(targetPtyProcess)
-    ]);
-}
-
-/**
- * 创建一个新的伪终端 (pty) 进程。
- */
-function createNewPtySession() {
-    // newSession 是交互模式的一期低成本复位入口。
-    interactiveMode = false;
-    isExecutingCommand = false;
-    activeCommandAbort = null;
-
-    // 如果已存在旧进程，先销毁它
-    if (ptyProcess) {
-        childProcesses.delete(ptyProcess);
-        ptyProcess.kill();
-        // 当重置会话时，通知前端清屏
-        if (guiWindow && !guiWindow.isDestroyed()) {
-            guiWindow.webContents.send('powershell-clear');
-        }
-    }
-    replayBuffer = '';
-    notifyMirrors('onClear');
-
-    let shell = 'bash';
-    let args = [];
-
-    if (os.platform() === 'win32') {
-        // 优先使用 PowerShell Core (pwsh.exe)，如果不存在则回退到 Windows PowerShell (powershell.exe)
-        // 检测顺序：Program Files 标准路径 → where.exe PATH 查找 → 回退 powershell.exe
-        const pwshPath = path.join(process.env.PROGRAMFILES, 'PowerShell', '7', 'pwsh.exe');
-        if (fs.existsSync(pwshPath)) {
-            shell = pwshPath;
-        } else {
-            // 二级回退：winget/MSIX 安装的 PS7 位于 WindowsApps（AppExecution Alias），
-            // fs.existsSync 对此类特殊文件不可靠，直接信任 where.exe 结果。
-            try {
-                const { execSync } = require('child_process');
-                const whereResult = execSync('where.exe pwsh', { windowsHide: true, encoding: 'utf8', timeout: 5000 }).trim();
-                const firstLine = whereResult.split(/\r?\n/)[0].trim();
-                if (firstLine) {
-                    shell = firstLine;
-                } else {
-                    shell = 'powershell.exe';
-                }
-            } catch (e) {
-                shell = 'powershell.exe';
-            }
-        }
-        args = ['-NoLogo'];
-    }
-
-    ptyProcess = loadPty().spawn(shell, args, {
-        name: 'xterm-color',
-        cols: lastKnownSize.cols,
-        rows: lastKnownSize.rows,
-        cwd: process.env.USERPROFILE || process.env.HOME,
-        env: {
-            ...process.env,
-            PAGER: 'cat',
-            GIT_PAGER: 'cat',
-            GIT_TERMINAL_PROMPT: '0',
-            GH_PAGER: '',
-            SYSTEMD_PAGER: 'cat',
-            AWS_PAGER: '',
-            MANPAGER: 'cat'
-        }
-    });
-    childProcesses.add(ptyProcess);
-    const currentPtyProcess = ptyProcess;
-
-    // 创建GUI数据监听器（带 AI 短命令执行状态检查）
-    guiDataListener = (data) => {
-        // AI 短命令期间由 executeSingleCommandInPty 的临时监听器负责 flushToGui，避免重复输出。
-        // 交互式 TUI 模式绝不能设置 isExecutingCommand，否则 GUI 会黑屏。
-        if (isExecutingCommand) {
-            return;
-        }
-
-        dispatchPtyData(data);
-    };
-
-    // 设置数据监听器，将所有 pty 输出直接代理到 GUI
-    currentPtyProcess.onData(guiDataListener);
-
-    // 不再用固定延时猜测 PowerShell 是否启动完成。随机边界不会以明文出现在
-    // PSReadLine 的输入回显中；只有 PowerShell 真正执行 Write-Host 后才会命中。
-    const readyBoundary = `__VCP_PTY_READY_${crypto.randomUUID()}__`;
-    const encodedReadyBoundary = Buffer.from(readyBoundary, 'utf8').toString('base64');
-    mirrorStartupPending = true;
-    mirrorStartupHeld = '';
-    ptyReadyPromise = new Promise((resolve, reject) => {
-        let startupOutput = '';
-        let settled = false;
-        let timeoutId = null;
-        let readyListener = null;
-
-        const cleanupReadyProbe = () => {
-            if (timeoutId) {
-                clearTimeout(timeoutId);
-                timeoutId = null;
-            }
-            if (readyListener && typeof readyListener.dispose === 'function') {
-                readyListener.dispose();
-                readyListener = null;
-            }
-        };
-
-        readyListener = currentPtyProcess.onData((data) => {
-            if (settled) {
-                return;
-            }
-
-            startupOutput += data.toString('utf8');
-            // 防止异常启动输出无限占用内存，同时保留足够长度处理跨 chunk 边界。
-            if (startupOutput.length > 65536) {
-                startupOutput = startupOutput.slice(-65536);
-            }
-
-            const boundaryIndex = startupOutput.indexOf(readyBoundary);
-            if (boundaryIndex !== -1) {
-                settled = true;
-                cleanupReadyProbe();
-                if (ptyProcess === currentPtyProcess) {
-                    releaseMirrorStartup(startupOutput.slice(boundaryIndex + readyBoundary.length).replace(/^\r?\n/, ''));
-                }
-                resolve();
-            }
-        });
-
-        timeoutId = setTimeout(() => {
-            if (settled) {
-                return;
-            }
-            settled = true;
-            cleanupReadyProbe();
-            if (ptyProcess === currentPtyProcess) releaseMirrorStartup();
-            reject(new Error('PowerShell did not complete its startup readiness probe within 15 seconds.'));
-        }, 15000);
-
-        // macOS / Linux 起的是 bash：PowerShell 的初始化写进去只会报语法错误，边界永远等不到，
-        // 前 15 秒侧栏一片空白。环境变量 spawn 时已经给了，这里只打印边界：两段引号拼起来，
-        // 回显的命令行里是 '…''…'，不会提前命中
-        if (os.platform() !== 'win32') {
-            const split = Math.floor(readyBoundary.length / 2);
-            currentPtyProcess.write(`printf '%s\\n' '${readyBoundary.slice(0, split)}''${readyBoundary.slice(split)}'; clear\r`);
-            return;
-        }
-        const initializationCommand = [
-            '[Console]::OutputEncoding = [System.Text.Encoding]::UTF8',
-            '$env:PAGER = "cat"',
-            '$env:GIT_PAGER = "cat"',
-            '$env:GIT_TERMINAL_PROMPT = "0"',
-            '$env:GH_PAGER = ""',
-            '$env:SYSTEMD_PAGER = "cat"',
-            '$env:AWS_PAGER = ""',
-            '$env:MANPAGER = "cat"',
-            'function global:more { param([string[]]$paths) if ($paths) { foreach ($file in $paths) { Get-Content $file } } else { $input } }',
-            'function global:help { Get-Help @args }',
-            `$__vcpReady = [System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String('${encodedReadyBoundary}'))`,
-            'Write-Host $__vcpReady',
-            // 清掉握手留下的几行：侧栏只从就绪标记之后开始显示，ConPTY 的光标也得回到左上角，
-            // 否则 PSReadLine 按绝对坐标重绘时会和侧栏错开几行
-            'Clear-Host'
-        ].join('; ');
-        currentPtyProcess.write(`${initializationCommand}\r`);
-    });
-    // 只有 AI 命令会等它；没人等的时候超时也不能变成未处理的 rejection
-    ptyReadyPromise.catch(() => {});
-
-    // 当 pty 进程意外退出时，清理资源。
-    // 注意：newSession 会先 kill 旧 PTY 再创建新 PTY，旧 PTY 的异步 onExit 不能误清理新会话。
-    currentPtyProcess.onExit((exitInfo) => {
-        childProcesses.delete(currentPtyProcess);
-        // 自行结束的 shell 仍占着 ConPTY 的管道句柄，显式 kill 才会释放
-        try {
-            currentPtyProcess.kill();
-        } catch (e) {
-            // 进程已经退出
-        }
-
-        if (ptyProcess !== currentPtyProcess) {
-            return;
-        }
-
-        ptyProcess = null;
-        guiDataListener = null;
-        isExecutingCommand = false;
-        interactiveMode = false;
-        activeCommandAbort = null;
-        notifyMirrors('onExit', exitInfo && exitInfo.exitCode);
-    });
-}
-
-function buildHumanLaunchAnimationCommand() {
-    const script = [
-        '$esc = [char]27',
-        '# 尝试擦掉用于触发动画的短命令输入行，避免启动动画前出现杂乱命令文本。',
-        'Write-Host -NoNewline "$esc[1A$esc[2K`r"',
-        '',
-        '# 霓虹渐变色定义',
-        '$c1 = "$esc[38;2;245;194;231m" # Pink',
-        '$c2 = "$esc[38;2;203;166;247m" # Mauve',
-        '$c3 = "$esc[38;2;137;180;250m" # Blue',
-        '$c4 = "$esc[38;2;116;199;236m" # Sapphire',
-        '$c5 = "$esc[38;2;137;220;235m" # Sky',
-        '$c6 = "$esc[38;2;148;226;213m" # Teal',
-        '$reset = "$esc[0m"',
-        '$gray = "$esc[38;2;147;153;178m"',
-        '$darkGray = "$esc[38;2;88;91;112m"',
-        '$green = "$esc[38;2;166;227;161m"',
-        '$yellow = "$esc[38;2;249;226;175m"',
-        '',
-        '# 逐行打印华丽的 VCP CLI ASCII Art',
-        'Write-Host ""',
-        'Write-Host "  ${c1}██╗   ██╗  ██████╗  ██████╗      ██████╗  ██╗      ██╗${reset}"',
-        'Start-Sleep -Milliseconds 40',
-        'Write-Host "  ${c2}██║   ██║ ██╔════╝  ██╔══██╗    ██╔════╝  ██║      ██║${reset}"',
-        'Start-Sleep -Milliseconds 40',
-        'Write-Host "  ${c3}██║   ██║ ██║       ██████╔╝    ██║       ██║      ██║${reset}"',
-        'Start-Sleep -Milliseconds 40',
-        'Write-Host "  ${c4}╚██╗ ██╔╝ ██║       ██╔═══╝     ██║       ██║      ██║${reset}"',
-        'Start-Sleep -Milliseconds 40',
-        'Write-Host "  ${c5} ╚████╔╝  ╚██████╗  ██║         ╚██████╗  ███████╗ ██║${reset}"',
-        'Start-Sleep -Milliseconds 40',
-        'Write-Host "  ${c6}  ╚═══╝    ╚═════╝  ╚═╝          ╚═════╝  ╚══════╝ ╚═╝${reset}"',
-        'Start-Sleep -Milliseconds 50',
-        '',
-        '# 打印副标题和分割线',
-        'Write-Host "  ${darkGray}──────────────────────────────────────────────────────────${reset}"',
-        'Write-Host "  ${gray}Distributed PowerShell Bridge & Interactive Terminal GUI${reset}"',
-        'Write-Host "  ${darkGray}──────────────────────────────────────────────────────────${reset}"',
-        'Write-Host ""',
-        '',
-        '# 华丽的渐变色进度条加载动画',
-        '$barWidth = 30',
-        'for ($i = 0; $i -le $barWidth; $i++) {',
-        '    $percent = [math]::Round(($i / $barWidth) * 100)',
-        '    $filledCount = $i',
-        '    $emptyCount = $barWidth - $i',
-        '    ',
-        '    # 动态计算渐变色 (从 Mauve 203,166,247 渐变到 Teal 148,226,213)',
-        '    $r = [int](203 - (203 - 148) * ($i / $barWidth))',
-        '    $g = [int](166 + (226 - 166) * ($i / $barWidth))',
-        '    $b = [int](247 - (247 - 213) * ($i / $barWidth))',
-        '    $color = "$esc[38;2;${r};${g};${b}m"',
-        '    ',
-        '    $filled = "▰" * $filledCount',
-        '    $empty = "▱" * $emptyCount',
-        '    ',
-        '    Write-Host -NoNewline "$esc[2K`r  ${gray}Loading Bridge:${reset} [${color}${filled}${darkGray}${empty}${reset}] ${color}${percent}%${reset}"',
-        '    Start-Sleep -Milliseconds 35',
-        '}',
-        'Write-Host ""',
-        'Write-Host ""',
-        '',
-        '# 打印系统就绪状态和极客风系统信息',
-        'Write-Host "  ${gray}Status:${reset}    ${green}ONLINE${reset}"',
-        'Write-Host "  ${gray}Session:${reset}   ${c3}Active PowerShell Bridge${reset}"',
-        'Write-Host "  ${gray}Terminal:${reset}  ${yellow}Interactive Console Ready${reset}"',
-        'Write-Host ""',
-        'Write-Host "  ${gray}Type commands below. Press ${c3}Ctrl+C${gray} to interrupt.${reset}"',
-        'Write-Host ""',
-        'Remove-Item -LiteralPath $PSCommandPath -Force -ErrorAction SilentlyContinue',
-    ].join('\n');
-
-    const tempScriptName = `vcp-cli-launch-${crypto.randomUUID()}.ps1`;
-    const tempScriptPath = path.join(os.tmpdir(), tempScriptName);
-    fs.writeFileSync(tempScriptPath, `\ufeff${script}`, 'utf8');
-
-    const escapedTempScriptPath = tempScriptPath.replace(/'/g, "''");
-    return `& '${escapedTempScriptPath}'\r`;
-}
-
-/**
- * 打开或聚焦 PowerShellExecutor 的交互式终端 GUI。
- * 该入口供主程序托盘 / 桌面应用启动器直接调用，不需要先通过 AI 工具执行命令。
- * @returns {BrowserWindow} PowerShell 终端窗口实例。
- */
-function openGuiTerminal() {
-    ensureGuiWindow();
-
-    const shouldPlayHumanLaunchAnimation = !ptyProcess;
-    if (!ptyProcess) {
-        createNewPtySession();
-    }
-
-    if (shouldPlayHumanLaunchAnimation && ptyProcess) {
-        const targetPtyProcess = ptyProcess;
-        waitForTerminalReady()
-            .then(() => {
-                if (ptyProcess === targetPtyProcess) {
-                    targetPtyProcess.write(buildHumanLaunchAnimationCommand());
-                }
-            })
-            .catch((error) => {
-                console.error('[PowerShellExecutor] Failed to initialize terminal launch animation:', error);
-            });
-    }
-
-    return guiWindow;
-}
-
-/**
- * 插件的主入口点，由 PluginManager 直接调用。
- * @param {object} args - 从 AI 工具调用中解析出的参数。
- * @returns {Promise<string>} - 命令执行的结果。
- */
-/**
- * 在给定的 pty 会话中执行单条命令并返回其增量输出。
- * @param {object} ptyProcess - node-pty 实例。
- * @param {string} singleCommand - 要执行的单条命令。
- * @returns {Promise<string>} - 该命令的增量输出。
- */
-function executeSingleCommandInPty(ptyProcess, singleCommand) {
-    return new Promise((resolve, reject) => {
-        if (!ptyProcess) {
-            return reject(new Error("PTY process is not available."));
-        }
-
-        let rawOutput = '';
-        let rawOutputTruncated = false;
-        let settled = false;
-        let tempScriptPath = null;
-        let wrapperScriptPath = null;
-        let listenerDisposable = null;
-        let timeoutId = null;
-
-        const run = beginCommandRun(singleCommand);
-        const startBoundary = `__VCP_COMMAND_START_${crypto.randomUUID()}__`;
-        const endBoundary = `__VCP_COMMAND_END_${crypto.randomUUID()}__`;
-        const outputParser = new CommandOutputParser(startBoundary, endBoundary);
-
-        const abortThisCommand = () => {
-            if (settled) {
-                return false;
-            }
-
-            settled = true;
-            finishCommandRun(run, 'cancelled');
-            // ETX 等价于用户在真实终端按下 Ctrl+C，用于中断当前前台命令。
-            ptyProcess.write('\x03');
-            cleanupListener(listenerDisposable, timeoutId);
-            reject(new Error('命令已被 interrupt 动作中止。'));
-            return true;
-        };
-
-        const cleanupListener = (disposable, commandTimeoutId) => {
-            if (commandTimeoutId) {
-                clearTimeout(commandTimeoutId);
-            }
-            if (disposable && typeof disposable.dispose === 'function') {
-                disposable.dispose();
-            }
-            if (activeCommandAbort === abortThisCommand) {
-                activeCommandAbort = null;
-            }
-            for (const scriptPath of [tempScriptPath, wrapperScriptPath]) {
-                if (!scriptPath) continue;
-                try {
-                    fs.unlinkSync(scriptPath);
-                } catch (e) {
-                    console.warn('[PowerShellExecutor] Failed to remove temporary script:', e.message);
-                }
-            }
-            tempScriptPath = null;
-            wrapperScriptPath = null;
-        };
-
-        const flushToGui = (text) => {
-            if (text) {
-                dispatchPtyData(text);
-            }
-        };
-
-        listenerDisposable = ptyProcess.onData((data) => {
-            if (settled) {
-                return;
-            }
-
-            const result = outputParser.push(data.toString('utf-8'));
-            rawOutputTruncated ||= rawOutput.length + result.output.length > COMMAND_RUN_RAW_LIMIT;
-            rawOutput = (rawOutput + result.output).slice(-COMMAND_RUN_RAW_LIMIT);
-            appendCommandRunOutput(run, result.output);
-
-            if (result.done) {
-                settled = true;
-                finishCommandRun(run, 'completed');
-                cleanupListener(listenerDisposable, timeoutId);
-                resolve((rawOutputTruncated ? '[输出超过容量限制，仅保留末尾内容]\n' : '') + sanitizeTerminalOutput(rawOutput).trim());
-            }
-
-            // GUI 是投影，不是完成裁决者；保留同块中的结束后提示符。
-            flushToGui(result.output + result.trailing);
-        });
-
-        timeoutId = setTimeout(() => {
-            if (settled) {
-                return;
-            }
-            settled = true;
-            finishCommandRun(run, 'timed_out');
-            cleanupListener(listenerDisposable, timeoutId);
-            reject(new Error(`Command "${singleCommand}" timed out after 60 seconds.`));
-        }, 60000);
-
-        activeCommandAbort = abortThisCommand;
-
-        try {
-            const tempScriptName = `vcp-powershell-${crypto.randomUUID()}.ps1`;
-            tempScriptPath = path.join(os.tmpdir(), tempScriptName);
-            // Windows PowerShell 5.1 对无 BOM UTF-8 的中文兼容性较差，写入 BOM 保证脚本内容稳定解析。
-            fs.writeFileSync(tempScriptPath, `\ufeff${singleCommand}`, 'utf8');
-
-            const escapedTempScriptPath = tempScriptPath.replace(/'/g, "''");
-
-            // 边界标记只写进包装脚本，不出现在交互式命令行里：
-            // PowerShell/PSReadLine 会先回显整行输入，若标记出现在回显里，就会被误判为真实输出。
-            // 终端里也只留下一行短的脚本调用，而不是整段包装代码。
-            const wrapperScript = [
-                // 关掉分页器和 Git 交互提示，否则 git log/help 等会停在分页界面，命令一直等不到结束标记。
-                `$env:PAGER = 'cat'`,
-                `$env:GIT_PAGER = 'cat'`,
-                `$env:GIT_TERMINAL_PROMPT = '0'`,
-                `Write-Host '${startBoundary}'`,
-                // 即使临时脚本发生 ParserError / RuntimeException，也必须输出 end boundary，
-                // 否则 AI 调用会一直等待直到超时。终止性错误要在结束标记之前打印，
-                // 否则 PowerShell 会在命令行结束后才显示它，AI 拿到的输出就是空的。
-                `try { & '${escapedTempScriptPath}' } catch { $_ | Out-Host } finally { Write-Host '${endBoundary}' }`
-            ].join('\r\n');
-            wrapperScriptPath = path.join(os.tmpdir(), `vcp-run-${crypto.randomUUID()}.ps1`);
-            fs.writeFileSync(wrapperScriptPath, `\ufeff${wrapperScript}`, 'utf8');
-            const wrappedCommand = `& '${wrapperScriptPath.replace(/'/g, "''")}'`;
-
-            ptyProcess.write(`${wrappedCommand}\r`);
-        } catch (error) {
-            settled = true;
-            finishCommandRun(run, 'spawn_error');
-            cleanupListener(listenerDisposable, timeoutId);
-            reject(new Error(`无法创建或执行临时 PowerShell 脚本: ${error.message}`));
-        }
-    });
-}
-
-
-const INTERACTIVE_SEQUENCE_LIMITS = Object.freeze({
-    maxSteps: 100,
-    maxWaitMs: 60000,
-    maxTotalWaitMs: 300000,
-    maxTextLength: 100000,
-    maxQueryLines: 2000,
-    responseTimeoutMs: 5000
-});
-
-const TERMINAL_KEY_SEQUENCES = Object.freeze({
-    enter: '\r',
-    return: '\r',
-    up: '\x1b[A',
-    arrowup: '\x1b[A',
-    down: '\x1b[B',
-    arrowdown: '\x1b[B',
-    right: '\x1b[C',
-    arrowright: '\x1b[C',
-    left: '\x1b[D',
-    arrowleft: '\x1b[D',
-    esc: '\x1b',
-    escape: '\x1b',
-    tab: '\t',
-    backtab: '\x1b[Z',
-    'shift+tab': '\x1b[Z',
-    backspace: '\x7f',
-    delete: '\x1b[3~',
-    home: '\x1b[H',
-    end: '\x1b[F',
-    pageup: '\x1b[5~',
-    pagedown: '\x1b[6~',
-    space: ' ',
-    'ctrl+c': '\x03',
-    'ctrl+d': '\x04',
-    'ctrl+z': '\x1a',
-    'ctrl+l': '\x0c',
-    'ctrl+a': '\x01',
-    'ctrl+e': '\x05',
-    'ctrl+u': '\x15',
-    'ctrl+k': '\x0b',
-    'ctrl+w': '\x17'
-});
-
-function delay(ms) {
-    return new Promise(resolve => setTimeout(resolve, ms));
-}
-
-function parseWaitDuration(value) {
-    if (typeof value === 'number' && Number.isFinite(value)) {
-        return Math.round(value);
-    }
-
-    const match = String(value).trim().toLowerCase().match(/^(\d+(?:\.\d+)?)\s*(ms|s)?$/);
-    if (!match) {
-        throw new Error(`无效 wait 时长 "${value}"；请使用 50ms、1s 或毫秒数字。`);
-    }
-
-    const milliseconds = Number(match[1]) * (match[2] === 's' ? 1000 : 1);
-    return Math.round(milliseconds);
-}
-
-function parseTerminalKey(value) {
-    const raw = String(value).trim().toLowerCase();
-    const match = raw.match(/^(.+?)(?:\s*\*\s*(\d+))?$/);
-    const keyName = match ? match[1].trim() : raw;
-    const repeat = match && match[2] ? Number.parseInt(match[2], 10) : 1;
-    const sequence = TERMINAL_KEY_SEQUENCES[keyName];
-
-    if (!sequence) {
-        throw new Error(`不支持的终端按键 "${value}"。`);
-    }
-    if (!Number.isInteger(repeat) || repeat < 1 || repeat > 10) {
-        throw new Error(`按键重复次数必须在 1 到 10 之间："${value}"。`);
-    }
-
-    return { keyName, repeat, data: sequence.repeat(repeat) };
-}
-
-function parseInteractiveSequence(args) {
-    const steps = [];
-
-    for (const [key, value] of Object.entries(args)) {
-        const match = key.match(/^(command|wait|key|paste|queryVisible)(\d+)$/i);
-        if (!match) {
-            continue;
-        }
-
-        const typeLookup = {
-            command: 'command',
-            wait: 'wait',
-            key: 'key',
-            paste: 'paste',
-            queryvisible: 'queryVisible'
-        };
-        steps.push({
-            key,
-            type: typeLookup[match[1].toLowerCase()],
-            index: Number.parseInt(match[2], 10),
-            value
-        });
-    }
-
-    if (steps.length === 0) {
-        throw new Error('RunInteractiveSequence 至少需要一个带全局序号的步骤，例如 command1、wait2、key3、paste4、queryVisible5。');
-    }
-    if (steps.length > INTERACTIVE_SEQUENCE_LIMITS.maxSteps) {
-        throw new Error(`交互序列最多允许 ${INTERACTIVE_SEQUENCE_LIMITS.maxSteps} 个步骤。`);
-    }
-
-    steps.sort((a, b) => a.index - b.index);
-    const usedIndexes = new Set();
-    let totalWaitMs = 0;
-
-    for (const step of steps) {
-        if (!Number.isInteger(step.index) || step.index < 1) {
-            throw new Error(`步骤编号必须是从 1 开始的正整数：${step.key}。`);
-        }
-        if (usedIndexes.has(step.index)) {
-            throw new Error(`步骤编号 ${step.index} 重复；不同类型步骤必须共用唯一的全局序号。`);
-        }
-        usedIndexes.add(step.index);
-
-        if (step.type === 'wait') {
-            step.durationMs = parseWaitDuration(step.value);
-            if (step.durationMs < 0 || step.durationMs > INTERACTIVE_SEQUENCE_LIMITS.maxWaitMs) {
-                throw new Error(`单个 wait 步骤必须在 0 到 ${INTERACTIVE_SEQUENCE_LIMITS.maxWaitMs}ms 之间。`);
-            }
-            totalWaitMs += step.durationMs;
-        } else if (step.type === 'key') {
-            step.keySpec = parseTerminalKey(step.value);
-        } else if (step.type === 'queryVisible') {
-            const parsedLines = Number.parseInt(step.value, 10);
-            step.maxLines = Number.isInteger(parsedLines) && parsedLines > 0
-                ? Math.min(parsedLines, INTERACTIVE_SEQUENCE_LIMITS.maxQueryLines)
-                : null;
-        } else {
-            if (typeof step.value !== 'string' || !step.value.length) {
-                throw new Error(`${step.key} 必须是非空字符串。`);
-            }
-            if (step.value.length > INTERACTIVE_SEQUENCE_LIMITS.maxTextLength) {
-                throw new Error(`${step.key} 超过 ${INTERACTIVE_SEQUENCE_LIMITS.maxTextLength} 字符限制。`);
-            }
-        }
-    }
-
-    if (totalWaitMs > INTERACTIVE_SEQUENCE_LIMITS.maxTotalWaitMs) {
-        throw new Error(`序列累计等待不能超过 ${INTERACTIVE_SEQUENCE_LIMITS.maxTotalWaitMs}ms。`);
-    }
-    if (steps.every(step => step.type === 'wait')) {
-        throw new Error('交互序列不能只包含 wait；请至少加入 command、key、paste 或 queryVisible 步骤。');
-    }
-
-    return steps;
-}
-
-function requestVisibleText(maxLines = null) {
-    return new Promise((resolve, reject) => {
-        if (!guiWindow || guiWindow.isDestroyed() || !guiReady) {
-            reject(new Error('PowerShell GUI 尚未就绪，无法查询可见文本。'));
-            return;
-        }
-
-        const requestId = crypto.randomUUID();
-        const timeout = setTimeout(() => {
-            visibleTextResolvers.delete(requestId);
-            reject(new Error('查询终端文本超时'));
-        }, INTERACTIVE_SEQUENCE_LIMITS.responseTimeoutMs);
-
-        visibleTextResolvers.set(requestId, (text) => {
-            clearTimeout(timeout);
-            resolve(text);
-        });
-        guiWindow.webContents.send('query-visible-text', { requestId, maxLines });
-    });
-}
-
-function requestTerminalPaste(text) {
-    return new Promise((resolve, reject) => {
-        if (!guiWindow || guiWindow.isDestroyed() || !guiReady) {
-            reject(new Error('PowerShell GUI 尚未就绪，无法执行 xterm 粘贴。'));
-            return;
-        }
-
-        const requestId = crypto.randomUUID();
-        const timeout = setTimeout(() => {
-            terminalPasteResolvers.delete(requestId);
-            reject(new Error('xterm 粘贴请求超时'));
-        }, INTERACTIVE_SEQUENCE_LIMITS.responseTimeoutMs);
-
-        terminalPasteResolvers.set(requestId, () => {
-            clearTimeout(timeout);
-            resolve();
-        });
-        guiWindow.webContents.send('terminal-paste-request', { requestId, text });
-    });
-}
-
-async function ensureInteractiveTerminal(newSession = false) {
-    ensureGuiWindow();
-    if (newSession === true || !ptyProcess) {
-        createNewPtySession();
-    }
-    await waitForTerminalReady();
-    interactiveMode = true;
-    return ptyProcess;
-}
-
-async function sendSingleInteractiveKey(args) {
-    if (typeof args.key !== 'string' || !args.key.trim()) {
-        throw new Error('SendInteractiveKey 需要 key 参数，例如 enter、up、esc 或 ctrl+c*2。');
-    }
-
-    const keySpec = parseTerminalKey(args.key);
-    const targetPtyProcess = await ensureInteractiveTerminal(args.newSession === true);
-    targetPtyProcess.write(keySpec.data);
-
-    return {
-        content: [{
-            type: 'text',
-            text: `Interactive key sent: ${keySpec.keyName}${keySpec.repeat > 1 ? ` x${keySpec.repeat}` : ''}.`
-        }]
-    };
-}
-
-async function pasteSingleInteractiveText(args) {
-    if (typeof args.text !== 'string' || !args.text.length) {
-        throw new Error('PasteInteractiveText 需要非空 text 参数。');
-    }
-    if (args.text.length > INTERACTIVE_SEQUENCE_LIMITS.maxTextLength) {
-        throw new Error(`text 超过 ${INTERACTIVE_SEQUENCE_LIMITS.maxTextLength} 字符限制。`);
-    }
-
-    await ensureInteractiveTerminal(args.newSession === true);
-    await requestTerminalPaste(args.text);
-
-    if (args.submit === true) {
-        if (!ptyProcess) {
-            throw new Error('粘贴完成后 PTY 会话已退出，无法发送 Enter。');
-        }
-        ptyProcess.write('\r');
-    }
-
-    return {
-        content: [{
-            type: 'text',
-            text: `Interactive text pasted (${args.text.length} characters)${args.submit === true ? ' and Enter was sent' : ''}.`
-        }]
-    };
-}
-
-async function runInteractiveSequence(args) {
-    const steps = parseInteractiveSequence(args);
-
-    for (const step of steps.filter(item => item.type === 'command')) {
-        const securityResult = intelligentSecurityCheck(
-            step.value,
-            defaultConfig.forbiddenCommands,
-            defaultConfig.authRequiredCommands
-        );
-        if (securityResult.isForbidden) {
-            throw new Error(`步骤 ${step.index} 执行被阻止：${securityResult.reason}`);
-        }
-        if (securityResult.needsAuth) {
-            throw new Error(`步骤 ${step.index} 需要授权，RunInteractiveSequence 不支持在 TUI 序列中弹出授权确认：${securityResult.reason}`);
-        }
-    }
-
-    const targetPtyProcess = await ensureInteractiveTerminal(args.newSession === true);
-    const queryResults = [];
-
-    for (const step of steps) {
-        if (!ptyProcess || ptyProcess !== targetPtyProcess) {
-            throw new Error(`执行到步骤 ${step.index} 时 PTY 会话已退出或被替换。`);
-        }
-
-        switch (step.type) {
-            case 'command':
-                targetPtyProcess.write(`${step.value}\r`);
-                break;
-            case 'wait':
-                await delay(step.durationMs);
-                break;
-            case 'key':
-                targetPtyProcess.write(step.keySpec.data);
-                break;
-            case 'paste':
-                await requestTerminalPaste(step.value);
-                break;
-            case 'queryVisible': {
-                const text = await requestVisibleText(step.maxLines);
-                queryResults.push({ index: step.index, maxLines: step.maxLines, text });
-                break;
-            }
-            default:
-                throw new Error(`未知交互步骤类型：${step.type}`);
-        }
-    }
-
-    if (queryResults.length === 0) {
-        return {
-            content: [{
-                type: 'text',
-                text: `Interactive sequence completed (${steps.length} steps). No queryVisible step was requested.`
-            }]
-        };
-    }
-
-    const output = queryResults.map(result => {
-        const lineLabel = result.maxLines ? `, max ${result.maxLines} lines` : '';
-        return `---[queryVisible step ${result.index}${lineLabel}]---\n${result.text}`;
-    }).join('\n\n');
-
-    return { content: [{ type: 'text', text: `\`\`\`\n${output}\n\`\`\`` }] };
-}
-
-async function processToolCall(args) {
-    const declaredCommands = new Set([
-        'ExecutePowerShell',
-        'StartInteractive',
-        'SendInteractiveKey',
-        'PasteInteractiveText',
-        'RunInteractiveSequence',
-        'QueryVisible',
-        'InterruptPowerShell',
-        'EndInteractive'
-    ]);
-    const declaredCommand = typeof args.command === 'string' && declaredCommands.has(args.command.trim())
-        ? args.command.trim()
-        : null;
-
-    // 新清单格式使用 command 选择能力、powershell 传递脚本文本。
-    // 同时保留旧 action + command 调用格式，避免已有提示词和调用方立即失效。
-    const actionByDeclaredCommand = {
-        ExecutePowerShell: 'execute',
-        StartInteractive: 'startInteractive',
-        SendInteractiveKey: 'interactiveKey',
-        PasteInteractiveText: 'interactivePaste',
-        RunInteractiveSequence: 'interactiveSequence',
-        QueryVisible: 'queryVisible',
-        InterruptPowerShell: 'interrupt',
-        EndInteractive: 'endInteractive'
-    };
-    const action = declaredCommand
-        ? actionByDeclaredCommand[declaredCommand]
-        : (typeof args.action === 'string' ? args.action.trim() : 'execute');
-
-    if (action === 'interactiveKey') {
-        return sendSingleInteractiveKey(args);
-    }
-
-    if (action === 'interactivePaste') {
-        return pasteSingleInteractiveText(args);
-    }
-
-    if (action === 'interactiveSequence') {
-        return runInteractiveSequence(args);
-    }
-
-    if (action.startsWith('queryVisible')) {
-        ensureGuiWindow();
-        await waitForGuiReady();
-
-        const legacyMatch = action.match(/^queryVisible(\d+)?$/);
-        const requestedMaxLines = declaredCommand === 'QueryVisible' ? args.maxLines : (legacyMatch && legacyMatch[1]);
-        const parsedMaxLines = requestedMaxLines === undefined || requestedMaxLines === null || requestedMaxLines === ''
-            ? null
-            : Number.parseInt(requestedMaxLines, 10);
-        const maxLines = Number.isInteger(parsedMaxLines) && parsedMaxLines > 0
-            ? Math.min(parsedMaxLines, INTERACTIVE_SEQUENCE_LIMITS.maxQueryLines)
-            : null;
-        const text = await requestVisibleText(maxLines);
-        return { content: [{ type: 'text', text: `\`\`\`\n${text}\n\`\`\`` }] };
-    }
-
-    if (action === 'endInteractive') {
-        interactiveMode = false;
-        return { content: [{ type: 'text', text: 'Interactive mode flag cleared. The existing PTY session was not terminated.' }] };
-    }
-
-    if (action === 'interrupt') {
-        if (!ptyProcess) {
-            return { content: [{ type: 'text', text: 'No active PowerShell session to interrupt.' }] };
-        }
-
-        if (activeCommandAbort) {
-            const interrupted = activeCommandAbort();
-            return { content: [{ type: 'text', text: interrupted
-                ? 'Interrupt signal sent. The active synchronous command wait was cancelled.'
-                : 'The synchronous command had already completed before it could be interrupted.' }] };
-        }
-
-        if (interactiveMode) {
-            ptyProcess.write('\x03');
-            return { content: [{ type: 'text', text: 'Ctrl+C was sent to the interactive foreground program. The interactive mode flag remains set.' }] };
-        }
-
-        return { content: [{ type: 'text', text: 'The PowerShell session is active, but no AI-started foreground command is currently running.' }] };
-    }
-
-    // --- 1. 解析和排序 PowerShell 脚本 ---
-    // 新格式：powershell, powershell1, powershell2...
-    // 旧格式：command, command1, command2...
-    const scriptParameterPrefix = declaredCommand ? 'powershell' : 'command';
-    const commandEntries = Object.entries(args)
-        .filter(([key]) => key.startsWith(scriptParameterPrefix))
-        .map(([key, value]) => {
-            const match = key.match(new RegExp(`^${scriptParameterPrefix}(\\d*)$`));
-            const index = match ? (match[1] === '' ? 0 : parseInt(match[1], 10)) : -1;
-            return { key, value, index };
-        })
-        .filter(item => item.index !== -1 && typeof item.value === 'string' && item.value.trim())
-        .sort((a, b) => a.index - b.index);
-
-    // 新格式中的 args.command 是能力选择器，绝不能作为待执行脚本。
-    if (declaredCommand) {
-        commandEntries.forEach(entry => {
-            entry.value = entry.value.trim();
-        });
-    }
-
-    if (commandEntries.length === 0) {
-        throw new Error(declaredCommand
-            ? '未提供任何有效的 powershell 参数 (例如 powershell, powershell1, powershell2)。'
-            : '未提供任何有效的 command 参数 (例如 command, command1, command2)。');
-    }
-
-    if (action !== 'execute' && action !== 'startInteractive') {
-        throw new Error(`不支持的 action: ${action}`);
-    }
-
-    // --- 2. 智能安全预检查 ---
-    let needsInteractiveAuth = false;
-    for (const entry of commandEntries) {
-        const securityResult = intelligentSecurityCheck(
-            entry.value,
-            defaultConfig.forbiddenCommands,
-            defaultConfig.authRequiredCommands
-        );
-
-        if (securityResult.isForbidden) {
-            throw new Error(`执行被阻止：${securityResult.reason}`);
-        }
-
-        if (securityResult.needsAuth) {
-            needsInteractiveAuth = true;
-            console.log(`[PowerShellExecutor] 命令 "${entry.value}" 需要交互式授权：${securityResult.reason}`);
-        }
-    }
-
-    // --- 3. 初始化会话和参数 ---
-    const lastCommandIndex = commandEntries[commandEntries.length - 1].index;
-    const getArg = (key, defaultVal) => {
-        const indexedKey = `${key}${lastCommandIndex || ''}`;
-        return args[indexedKey] !== undefined ? args[indexedKey] : (args[key] !== undefined ? args[key] : defaultVal);
-    };
-
-    const requireAdmin = getArg('requireAdmin', false);
-    const newSession = getArg('newSession', false);
-    const finalReturnMode = getArg('returnMode', defaultConfig.returnMode);
-
-    // --- 4. 根据模式选择执行路径 ---
-
-    // 路径 A: 管理员模式 (最高优先级)
-    if (requireAdmin) {
-        if (commandEntries.length > 1) {
-            throw new Error("管理员模式 (requireAdmin: true) 不支持执行多个命令链。");
-        }
-        if (ptyProcess) {
-            ptyProcess.kill();
-            ptyProcess = null;
-        }
-        const command = commandEntries[0].value;
-        const fullCommand = `[Console]::OutputEncoding = [System.Text.Encoding]::UTF8; $env:PAGER = 'cat'; $env:GIT_PAGER = 'cat'; $env:GIT_TERMINAL_PROMPT = '0'; function global:more { param([string[]]$paths) if ($paths) { foreach ($file in $paths) { Get-Content $file } } else { $input } }; function global:help { Get-Help @args }; ${command}`;
-        const output = await executeAdminCommand(fullCommand);
-        if (output && typeof output === 'object' && Array.isArray(output.content)) {
-            return output;
-        }
-        const cleanOutput = (typeof output === 'string' ? output : String(output || '')).replace(/\r\n/g, '\n').replace(/\r/g, '');
-        return { content: [{ type: 'text', text: `\`\`\`powershell\n${cleanOutput}\n\`\`\`` }] };
-    }
-
-    // 路径 B: 普通敏感命令确认模式
-    // 这里只做确认；确认通过后继续走路径 C，在主 PTY/xterm 会话中执行并连续显示输出。
-    if (needsInteractiveAuth) {
-        const combinedCommand = commandEntries.map(e => e.value).join('; ');
-        const confirmed = await requestInteractiveConfirmation(combinedCommand);
-        if (!confirmed) {
-            return { content: [{ type: 'text', text: '用户取消了操作。' }] };
-        }
-    }
-
-    // 路径 C: 标准非管理员会话执行
-    if (isExecutingCommand) {
-        throw new Error('当前已有同步命令执行中，请等待完成或使用 interrupt。');
-    }
-    ensureGuiWindow();
-
-    if (newSession || !ptyProcess) {
-        createNewPtySession();
-    }
-
-    // 必须等渲染端完成 xterm 挂载/监听/首次 fit，且 PowerShell 执行完启动探针，
-    // 才允许向 PTY 注入用户或 AI 指令。替代容易产生竞态的固定 500ms 延时。
-    await waitForTerminalReady();
-
-    if (action === 'startInteractive') {
-        if (commandEntries.length > 1) {
-            throw new Error('startInteractive 只支持单条 command。');
-        }
-
-        const command = commandEntries[0].value;
-        interactiveMode = true;
-        // 不设置 isExecutingCommand；交互式 TUI 输出必须走常驻 guiDataListener，否则会黑屏。
-        ptyProcess.write(`${command}\r`);
-        return { content: [{ type: 'text', text: `Interactive session started: ${command}` }] };
-    }
-
-    if (interactiveMode) {
-        throw new Error('当前终端正被交互式程序 (snow/codex/claude) 占用，请先退出并调用 action:"endInteractive"，或使用 newSession:true 重置会话。');
-    }
-
-    // 就绪等待期间其它调用可能先取得PTY，await后必须再次检查。
-    if (isExecutingCommand) {
-        throw new Error('当前已有同步命令执行中，请等待完成或使用 interrupt。');
-    }
-    const deltaOutputs = [];
-    isExecutingCommand = true;
-    try {
-        for (const entry of commandEntries) {
-            const command = entry.value;
-            const currentReturnModeKey = `returnMode${entry.index || ''}`;
-            const currentReturnMode = args[currentReturnModeKey] || finalReturnMode;
-
-            try {
-                const output = await executeSingleCommandInPty(ptyProcess, command);
-                deltaOutputs.push({ command, output, returnMode: currentReturnMode });
-            } catch (error) {
-                throw new Error(`在执行命令 "${command}" 时出错: ${error.message}`);
-            }
-        }
-    } finally {
-        isExecutingCommand = false;
-    }
-
-    // --- 5. 格式化并返回结果 ---
-    let finalOutput = '';
-    if (finalReturnMode === 'full') {
-        finalOutput = deltaOutputs.length > 0 ? deltaOutputs[deltaOutputs.length - 1].output : '';
-    } else { // delta 模式
-        if (deltaOutputs.length === 1) {
-            finalOutput = deltaOutputs[0].output;
-        } else {
-            finalOutput = deltaOutputs.map(res =>
-                `---[Output for: ${res.command}]---\n${res.output}`
-            ).join('\n\n');
-        }
-    }
-
-    const cleanOutput = finalOutput.replace(/\r\n/g, '\n').replace(/\r/g, '');
-    return { content: [{ type: 'text', text: `\`\`\`powershell\n${cleanOutput}\n\`\`\`` }] };
-}
-
-/**
- * 清理插件资源，在主程序退出或插件重载时调用。
- */
-function cleanup() {
-    console.log('[PowerShellExecutor] 正在清理资源...');
-
-    // 1. 关闭并销毁 GUI 窗口
-    if (guiWindow && !guiWindow.isDestroyed()) {
-        try {
-            // 移除 'closed' 监听器，以避免在程序化关闭时触发额外的 ptyProcess.kill()
-            guiWindow.removeAllListeners('closed');
-            guiWindow.close();
-            console.log('[PowerShellExecutor] GUI 窗口已关闭。');
-        } catch (e) {
-            console.error('[PowerShellExecutor] 关闭 GUI 窗口时出错:', e);
-        }
-        guiWindow = null;
-    }
-    guiReady = false;
-    if (resolveGuiReady) {
-        resolveGuiReady();
-        resolveGuiReady = null;
-    }
-    guiReadyPromise = Promise.resolve();
-    visibleTextResolvers.clear();
-    terminalPasteResolvers.clear();
-
-    // 2. 终止所有跟踪的子进程
-    if (childProcesses.size > 0) {
-        console.log(`[PowerShellExecutor] 正在终止 ${childProcesses.size} 个子进程...`);
-        for (const processToKill of childProcesses) {
-            try {
-                // ptyProcess 和 child_process 对象都有一个 .kill() 方法
-                processToKill.kill();
-                console.log(`[PowerShellExecutor] 进程 (PID: ${processToKill.pid}) 已终止。`);
-            } catch (e) {
-                console.error(`[PowerShellExecutor] 终止进程 (PID: ${processToKill.pid}) 时出错:`, e);
-            }
-        }
-        childProcesses.clear();
-    }
-
-    // 3. 停止文件监视器
-    if (settingsWatcher) {
-        try {
-            settingsWatcher.close();
-            settingsWatcher = null;
-            console.log('[PowerShellExecutor] Settings file watcher stopped.');
-        } catch (e) {
-            console.error('[PowerShellExecutor] Error stopping settings watcher:', e);
-        }
-    }
-
-    // 4. 确保 ptyProcess 状态被重置
-    mirrorSinks.clear();
-    replayBuffer = '';
-    mirrorStartupPending = false;
-    mirrorStartupHeld = '';
-    ptyProcess = null;
-    ptyReadyPromise = Promise.resolve();
-    guiDataListener = null;
-    isExecutingCommand = false;
-    interactiveMode = false;
-    activeCommandAbort = null;
-}
-
-// 导出主入口、GUI/清理函数，以及无 Electron 副作用的序列解析器供单元测试使用。
-module.exports = {
-    processToolCall,
-    openGuiTerminal,
-    attachMirror,
-    listCommandRuns,
-    getCommandRun,
-    subscribeCommandRuns,
-    // 仅供测试：跳过 GUI 窗口，直接在共享 PTY 会话里跑一条短命令
-    _runCommandForTest: (command) => executeSingleCommandInPty(ptyProcess, command),
-    ensureMirrorSession,
-    restartSession,
-    getSessionState,
-    writeSessionInput,
-    resizeSession: applyPtyResize,
-    cleanup,
-    parseInteractiveSequence,
-    parseWaitDuration,
-    parseTerminalKey
+// node-pty 是原生模块：只读命令记录、不开终端时不加载它，真正创建会话时才 require
+let ptyModule = null;
+function loadPty() {
+    return ptyModule || (ptyModule = require('node-pty'));
+}
+const os = require('os');
+const { spawn } = require('child_process');
+const path = require('path');
+const fs = require('fs');
+const crypto = require('crypto');
+const { BrowserWindow, ipcMain, clipboard } = require('electron');
+const tmp = require('tmp');
+const chokidar = require('chokidar');
+const { CommandOutputParser } = require('./command-output-parser');
+const { sanitizeTerminalOutput } = require('./terminalOutputSanitizer');
+// 命令运行记录放在无副作用的独立模块里：主进程只读记录时不必加载整个执行器
+const {
+    COMMAND_RUN_RAW_LIMIT,
+    beginCommandRun,
+    appendCommandRunOutput,
+    finishCommandRun,
+    listCommandRuns,
+    getCommandRun,
+    subscribeCommandRuns,
+} = require('./commandRunStore');
+const { resolveConfirmationScript } = require('./nativeHelperPath.js');
+
+// --- GUI Window Management ---
+let guiWindow = null;
+let guiReady = false;
+let guiReadyPromise = Promise.resolve();
+let resolveGuiReady = null;
+
+function createGuiReadyBarrier() {
+    guiReady = false;
+    guiReadyPromise = new Promise((resolve) => {
+        resolveGuiReady = resolve;
+    });
+}
+
+async function waitForGuiReady(timeoutMs = 15000) {
+    if (!guiWindow || guiWindow.isDestroyed()) {
+        throw new Error('PowerShell GUI window is not available.');
+    }
+
+    if (guiReady) {
+        return;
+    }
+
+    const targetWebContents = guiWindow.webContents;
+    let timeoutId = null;
+
+    try {
+        await Promise.race([
+            guiReadyPromise,
+            new Promise((_, reject) => {
+                timeoutId = setTimeout(() => {
+                    reject(new Error(`PowerShell GUI initialization timed out after ${timeoutMs}ms.`));
+                }, timeoutMs);
+            })
+        ]);
+    } finally {
+        if (timeoutId) {
+            clearTimeout(timeoutId);
+        }
+    }
+
+    if (!guiWindow || guiWindow.isDestroyed() || guiWindow.webContents !== targetWebContents || !guiReady) {
+        throw new Error('PowerShell GUI window changed or closed during initialization.');
+    }
+}
+
+function ensureGuiWindow() {
+    if (guiWindow && !guiWindow.isDestroyed()) {
+        guiWindow.focus();
+        return guiWindow;
+    }
+
+    createGuiReadyBarrier();
+    guiWindow = new BrowserWindow({
+        width: 800,
+        height: 600,
+        title: 'VCP PowerShell Executor',
+        frame: false, // 禁用窗口边框
+        ...(process.platform === 'darwin' ? {} : { titleBarStyle: 'hidden' }),
+        webPreferences: {
+            preload: path.join(__dirname, 'gui', 'preload.js'),
+            nodeIntegration: false, // 禁用 Node.js 集成以增强安全性
+            contextIsolation: true, // 启用上下文隔离
+            spellcheck: false,
+            // 将 node_modules 的路径作为参数传递给窗口，以便在 HTML 中使用
+            additionalArguments: [`--node-modules-path=${path.join(__dirname, '..', '..', '..', '..', 'node_modules')}`]
+        },
+        autoHideMenuBar: true,
+    });
+
+    guiWindow.loadFile(path.join(__dirname, 'gui', 'PowerShellViewer.html'));
+
+    guiWindow.on('closed', () => {
+        guiReady = false;
+        if (resolveGuiReady) {
+            resolveGuiReady();
+            resolveGuiReady = null;
+        }
+        guiWindow = null;
+        // 当GUI关闭时，也终止关联的 pty 进程
+        if (ptyProcess) {
+            try {
+                ptyProcess.kill();
+                console.log('[PowerShellExecutor] GUI closed, associated pty process terminated.');
+            } catch (e) {
+                console.error('[PowerShellExecutor] Error terminating pty process on GUI close:', e);
+            }
+            // ptyProcess 的 onExit 事件处理器会自动将其设置为 null 并从 childProcesses 集合中移除
+        }
+    });
+
+    return guiWindow;
+}
+
+// --- 主题管理与文件监视 ---
+const settingsPath = path.join(__dirname, '..', '..', '..', 'AppData', 'settings.json');
+let settingsWatcher = null;
+let lastSentTheme = null; // 用于存储上一次发送的主题名称
+
+/**
+ * 读取、比较并发送主题更新。
+ * 只有当主题名称实际发生变化时，才会向GUI发送事件。
+ * @param {Electron.WebContents} targetWebContents - 目标窗口的 webContents。
+ * @param {boolean} [forceSend=false] - 是否强制发送，即使用于初始化。
+ */
+function sendThemeUpdate(targetWebContents, forceSend = false) {
+    if (!targetWebContents || targetWebContents.isDestroyed()) {
+        return;
+    }
+    try {
+        let currentTheme = 'dark'; // 默认主题
+        if (fs.existsSync(settingsPath)) {
+            const settings = JSON.parse(fs.readFileSync(settingsPath, 'utf-8'));
+            currentTheme = settings.currentThemeMode || 'dark';
+        }
+
+        // 只有当主题变化或强制发送时，才进行通信
+        if (currentTheme !== lastSentTheme || forceSend) {
+            targetWebContents.send('theme-init', { themeName: currentTheme });
+            lastSentTheme = currentTheme; // 更新已发送的主题记录
+            console.log(`[PowerShellExecutor] Theme updated to: ${currentTheme}`);
+        }
+    } catch (error) {
+        console.error('[PowerShellExecutor] Error reading or sending theme settings:', error);
+    }
+}
+
+// 初始化文件监视器
+function setupThemeWatcher() {
+    if (settingsWatcher) {
+        settingsWatcher.close();
+    }
+    settingsWatcher = chokidar.watch(settingsPath, {
+        persistent: true,
+        ignoreInitial: true
+    });
+
+    settingsWatcher.on('change', () => {
+        if (guiWindow && !guiWindow.isDestroyed()) {
+            sendThemeUpdate(guiWindow.webContents);
+        }
+    });
+}
+
+// 在插件加载时启动监视
+setupThemeWatcher();
+
+
+// 监听来自GUI的“就绪”信号。
+// 只有当前窗口在 xterm 挂载、IPC 监听注册和首次 fit 完成后发出的信号才能解除屏障；
+// 旧窗口的迟到消息不能误解锁新窗口。
+ipcMain.on('powershell-gui-ready', (event) => {
+    if (!guiWindow || guiWindow.isDestroyed() || event.sender !== guiWindow.webContents) {
+        return;
+    }
+
+    guiReady = true;
+    if (resolveGuiReady) {
+        resolveGuiReady();
+        resolveGuiReady = null;
+    }
+
+    sendThemeUpdate(event.sender, true);
+});
+
+// 监听来自GUI的用户命令
+ipcMain.on('powershell-command', (event, command) => {
+    if (ptyProcess && command) {
+        // 将用户输入的命令写入 pty 进程
+        ptyProcess.write(`${command}\r`);
+    }
+});
+
+// 监听来自GUI的复制请求
+ipcMain.on('copy-to-clipboard', (event, text) => {
+    if (text) {
+        clipboard.writeText(text);
+    }
+});
+
+// 监听来自GUI的粘贴请求
+ipcMain.handle('read-from-clipboard', () => {
+    return clipboard.readText();
+});
+
+// 监听来自GUI的尺寸调整请求
+function applyPtyResize(cols, rows) {
+    const normalizedCols = Number(cols);
+    const normalizedRows = Number(rows);
+
+    if (Number.isInteger(normalizedCols) && Number.isInteger(normalizedRows) && normalizedCols > 0 && normalizedRows > 0) {
+        lastKnownSize = { cols: normalizedCols, rows: normalizedRows };
+    }
+
+    if (ptyProcess) {
+        try {
+            ptyProcess.resize(lastKnownSize.cols, lastKnownSize.rows);
+        } catch (e) {
+            console.error('[PowerShellExecutor] Failed to resize pty:', e);
+        }
+    }
+}
+
+ipcMain.on('powershell-resize', (event, { cols, rows }) => {
+    applyPtyResize(cols, rows);
+});
+
+// 监听来自GUI的真实终端输入透传。
+// 安全声明：此通道等价于用户直接操作本机终端，不经过 intelligentSecurityCheck；
+// forbiddenCommands/authRequiredCommands 仅约束 AI 工具调用路径 processToolCall。
+ipcMain.on('powershell-input', (event, data) => {
+    if (ptyProcess && typeof data === 'string') {
+        ptyProcess.write(data);
+    }
+});
+
+// --- 查询终端可见文本与 xterm 粘贴响应 ---
+const visibleTextResolvers = new Map();
+const terminalPasteResolvers = new Map();
+
+ipcMain.on('visible-text-response', (event, payload, legacyText) => {
+    if (!isPowerShellGuiSender(event)) {
+        return;
+    }
+
+    // 兼容旧渲染端直接返回字符串的格式。
+    if (typeof payload === 'string') {
+        const firstEntry = visibleTextResolvers.entries().next().value;
+        if (firstEntry) {
+            const [requestId, resolve] = firstEntry;
+            visibleTextResolvers.delete(requestId);
+            resolve(payload);
+        }
+        return;
+    }
+
+    const requestId = payload && payload.requestId;
+    const resolver = requestId ? visibleTextResolvers.get(requestId) : null;
+    if (resolver) {
+        visibleTextResolvers.delete(requestId);
+        resolver(typeof payload.text === 'string' ? payload.text : (legacyText || ''));
+    }
+});
+
+ipcMain.on('terminal-paste-complete', (event, payload) => {
+    if (!isPowerShellGuiSender(event)) {
+        return;
+    }
+
+    const requestId = payload && payload.requestId;
+    const resolver = requestId ? terminalPasteResolvers.get(requestId) : null;
+    if (resolver) {
+        terminalPasteResolvers.delete(requestId);
+        resolver();
+    }
+});
+
+// --- PowerShell GUI 专属窗口控制 ---
+// 不复用应用级 minimize-window/maximize-window/close-window：ipcMain 是全局事件总线，
+// 使用通用通道会让日志中心等其它窗口的操作也落到此 guiWindow 上；而 PowerShell
+// 自身的消息还会与应用级处理器重复执行（最大化切换两次后等同于没有变化）。
+function isPowerShellGuiSender(event) {
+    return Boolean(
+        event
+        && guiWindow
+        && !guiWindow.isDestroyed()
+        && guiWindow.webContents
+        && !guiWindow.webContents.isDestroyed()
+        && event.sender === guiWindow.webContents
+    );
+}
+
+ipcMain.on('powershell-window:minimize', (event) => {
+    if (isPowerShellGuiSender(event)) {
+        guiWindow.minimize();
+    }
+});
+
+ipcMain.on('powershell-window:toggle-maximize', (event) => {
+    if (!isPowerShellGuiSender(event)) {
+        return;
+    }
+
+    if (guiWindow.isMaximized()) {
+        guiWindow.unmaximize();
+    } else {
+        guiWindow.maximize();
+    }
+});
+
+ipcMain.on('powershell-window:close', (event) => {
+    if (isPowerShellGuiSender(event)) {
+        guiWindow.close();
+    }
+});
+
+// --- ANSI / terminal control projection for AI text summaries ---
+// 清洗逻辑在 terminalOutputSanitizer.js（纯函数，命令运行记录也用它）
+
+// --- 模块级状态 ---
+// 用于保存持久化的伪终端（PowerShell）进程
+let ptyProcess = null;
+// 移除 fullTerminalHistory，后端不再维护终端内容的完整状态
+// 新增：用于跟踪所有子进程，确保它们在插件卸载或程序退出时被正确清理
+const childProcesses = new Set();
+let guiDataListener = null; // 新增：保存GUI监听器的引用
+let isExecutingCommand = false; // 仅表示 AI 短命令执行中；不要用于交互式 TUI 会话
+let interactiveMode = false; // 表示当前 PTY 被 snow/codex/claude 等交互式程序占用
+let activeCommandAbort = null; // 当前同步命令的本地等待中止器；供并发 interrupt 工具调用解除阻塞
+let lastKnownSize = { cols: 80, rows: 24 }; // GUI 最近一次 fit 出来的尺寸，用作 PTY 初始尺寸
+let ptyReadyPromise = Promise.resolve();
+
+// --- 配置加载 ---
+const defaultConfig = {
+    returnMode: 'delta', // 默认为增量模式
+    forbiddenCommands: [],
+    authRequiredCommands: []
+};
+
+try {
+    const configPath = path.join(__dirname, 'config.env');
+    if (fs.existsSync(configPath)) {
+        const configContent = fs.readFileSync(configPath, 'utf-8');
+
+        const returnModeMatch = configContent.match(/^POWERSHELL_RETURN_MODE\s*=\s*(delta|full)/m);
+        if (returnModeMatch) {
+            defaultConfig.returnMode = returnModeMatch[1];
+        }
+
+        const forbiddenMatch = configContent.match(/^FORBIDDEN_COMMANDS\s*=\s*(.*)/m);
+        if (forbiddenMatch && forbiddenMatch[1]) {
+            defaultConfig.forbiddenCommands = forbiddenMatch[1].split(',').map(c => c.trim().toLowerCase()).filter(c => c);
+        }
+
+        const authRequiredMatch = configContent.match(/^AUTH_REQUIRED_COMMANDS\s*=\s*(.*)/m);
+        if (authRequiredMatch && authRequiredMatch[1]) {
+            defaultConfig.authRequiredCommands = authRequiredMatch[1].split(',').map(c => c.trim().toLowerCase()).filter(c => c);
+        }
+    }
+} catch (error) {
+    console.error('[PowerShellExecutor] Error reading config.env:', error);
+}
+
+
+/**
+ * 智能安全检查函数 - 区分命令关键字和路径内容
+ * @param {string} command - 要检查的命令字符串
+ * @param {string[]} forbiddenKeywords - 禁止的关键字列表
+ * @param {string[]} authRequiredKeywords - 需要授权的关键字列表
+ * @returns {object} - 检查结果 {isForbidden: boolean, needsAuth: boolean, matchedKeyword: string}
+ */
+function intelligentSecurityCheck(command, forbiddenKeywords, authRequiredKeywords) {
+    const result = {
+        isForbidden: false,
+        needsAuth: false,
+        matchedKeyword: null,
+        reason: null
+    };
+
+    // 预处理命令：移除多余空格，转换为小写
+    const normalizedCommand = command.trim().toLowerCase();
+
+    // 如果命令为空，直接返回
+    if (!normalizedCommand) {
+        return result;
+    }
+
+    // 定义路径模式 - 常见的Windows和Unix路径格式
+    const pathPatterns = [
+        /[a-z]:\\[^\\/:*?"<>|]*(?:\\[^\\/:*?"<>|]*)*\\?/gi,  // Windows路径 C:\path\to\file
+        /\/[^\/\s]*(?:\/[^\/\s]*)*\/?/g,                      // Unix路径 /path/to/file
+        /\$env:[a-z_]+[^\\/:*?"<>|\s]*/gi,                   // PowerShell环境变量路径
+        /\${[^}]+}[^\\/:*?"<>|\s]*/gi,                       // 变量路径 ${VAR}/path
+        /~\/[^\/\s]*(?:\/[^\/\s]*)*\/?/g                     // 用户目录路径 ~/path
+    ];
+
+    // 提取所有可能的路径
+    const detectedPaths = [];
+    pathPatterns.forEach(pattern => {
+        const matches = normalizedCommand.match(pattern);
+        if (matches) {
+            detectedPaths.push(...matches);
+        }
+    });
+
+    // 创建不包含路径的命令版本用于安全检查
+    let commandWithoutPaths = normalizedCommand;
+    detectedPaths.forEach(path => {
+        // 将路径替换为占位符，避免路径中的关键字被误判
+        commandWithoutPaths = commandWithoutPaths.replace(path.toLowerCase(), ' __PATH_PLACEHOLDER__ ');
+    });
+
+    // 清理命令：移除多余空格
+    commandWithoutPaths = commandWithoutPaths.replace(/\s+/g, ' ').trim();
+
+    // 定义PowerShell命令结构模式
+    const commandStructurePatterns = [
+        // PowerShell cmdlet模式: Verb-Noun
+        /\b[a-z]+-[a-z]+\b/g,
+        // 常见命令
+        /\b(?:get|set|new|remove|copy|move|invoke|start|stop|restart|test|clear|add|export|import|select|where|foreach|sort|group|measure|compare|out|write|read)\b/g,
+        // 参数模式
+        /\s-[a-z]+\b/g
+    ];
+
+    // 检查禁止的关键字
+    for (const keyword of forbiddenKeywords) {
+        if (!keyword) continue;
+
+        const keywordLower = keyword.toLowerCase();
+
+        // 1. 首先检查是否在路径中
+        const isInPath = detectedPaths.some(path =>
+            path.toLowerCase().includes(keywordLower)
+        );
+
+        if (isInPath) {
+            // 如果关键字只在路径中出现，检查是否也在命令部分出现
+            if (!commandWithoutPaths.includes(keywordLower)) {
+                console.log(`[PowerShellExecutor] 安全检查：关键字 "${keyword}" 仅在路径中发现，允许执行`);
+                continue; // 跳过这个关键字，不视为违规
+            }
+        }
+
+        // 2. 检查命令部分是否包含关键字
+        if (commandWithoutPaths.includes(keywordLower)) {
+            // 3. 进一步验证：检查关键字是否作为独立的命令或参数出现
+            const wordBoundaryPattern = new RegExp(`\\b${keywordLower.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\b`);
+
+            if (wordBoundaryPattern.test(commandWithoutPaths)) {
+                result.isForbidden = true;
+                result.matchedKeyword = keyword;
+                result.reason = `命令包含被禁止的关键字: ${keyword}`;
+                console.log(`[PowerShellExecutor] 安全检查：发现禁止的命令关键字 "${keyword}"`);
+                return result;
+            }
+        }
+    }
+
+    // 检查需要授权的关键字（使用相同的逻辑）
+    for (const keyword of authRequiredKeywords) {
+        if (!keyword) continue;
+
+        const keywordLower = keyword.toLowerCase();
+
+        // 1. 首先检查是否在路径中
+        const isInPath = detectedPaths.some(path =>
+            path.toLowerCase().includes(keywordLower)
+        );
+
+        if (isInPath) {
+            // 如果关键字只在路径中出现，检查是否也在命令部分出现
+            if (!commandWithoutPaths.includes(keywordLower)) {
+                console.log(`[PowerShellExecutor] 安全检查：授权关键字 "${keyword}" 仅在路径中发现，不需要授权`);
+                continue; // 跳过这个关键字，不需要授权
+            }
+        }
+
+        // 2. 检查命令部分是否包含关键字
+        if (commandWithoutPaths.includes(keywordLower)) {
+            // 3. 进一步验证：检查关键字是否作为独立的命令或参数出现
+            const wordBoundaryPattern = new RegExp(`\\b${keywordLower.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\b`);
+
+            if (wordBoundaryPattern.test(commandWithoutPaths)) {
+                result.needsAuth = true;
+                result.matchedKeyword = keyword;
+                result.reason = `命令包含需要授权的关键字: ${keyword}`;
+                console.log(`[PowerShellExecutor] 安全检查：发现需要授权的命令关键字 "${keyword}"`);
+                // 注意：不要return，继续检查其他关键字
+            }
+        }
+    }
+
+    return result;
+}
+
+/**
+ * 启动一个独立的 Python GUI 脚本来请求管理员权限并执行命令。
+ * 这是一个"即发即忘"的操作，它会打开一个全新的、独立的管理员终端窗口。
+ * @param {string} command - 需要以管理员权限执行的命令。
+ * @returns {Promise<string>} - 一个解析为提示信息的消息。
+ */
+function executeAdminCommand(command) {
+    return new Promise((resolve, reject) => {
+        // 1. 创建一个临时的输出文件
+        tmp.file({ postfix: '.txt' }, (err, tmpFilePath, fd, cleanupCallback) => {
+            if (err) {
+                return reject(new Error(`无法创建临时文件: ${err.message}`));
+            }
+
+            let pythonConfirmScript;
+            try { pythonConfirmScript = resolveConfirmationScript(__dirname); }
+            catch (error) { cleanupCallback(); reject(error); return; }
+            const commandAsBase64 = Buffer.from(command).toString('base64');
+
+            // 2. 准备传递给Python脚本的参数
+            const scriptPathForPS = pythonConfirmScript.replace(/'/g, "''");
+            const commandForPS = commandAsBase64.replace(/'/g, "''");
+            const tmpPathForPS = tmpFilePath.replace(/'/g, "''");
+            const argumentList = `"${scriptPathForPS}", "${commandForPS}", "${tmpPathForPS}"`;
+
+            // 3. 构造PowerShell命令以管理员权限运行Python脚本（捕获UAC异常并注入纯ASCII标记）
+            const psCommand = `$ErrorActionPreference = 'Stop'; try { Start-Process -FilePath "pythonw.exe" -ArgumentList ${argumentList} -Verb RunAs -Wait } catch { [Console]::Error.WriteLine('UAC_CANCELLED_OR_FAILED: ' + $_.Exception.Message) }`;
+            const child = spawn('powershell.exe', [
+                '-NoProfile',
+                '-ExecutionPolicy', 'Bypass',
+                '-Command', psCommand
+            ], {
+                windowsHide: true
+            });
+            childProcesses.add(child); // 跟踪进程
+
+            let stderrOutput = '';
+            let isSettled = false;
+
+            // 310 秒外部安全定时器守护，防止后台卡死挂起 (Todo #3)
+            const safetyTimeout = setTimeout(() => {
+                if (isSettled) return;
+                isSettled = true;
+                try {
+                    child.kill();
+                } catch { }
+                childProcesses.delete(child);
+                cleanupCallback();
+                resolve({
+                    isCancelled: true,
+                    content: [{
+                        type: 'text',
+                        text: '⚠️ [操作超时]：等待管理员确认超时（超过无操作安全时限），系统已自动拒绝执行。'
+                    }]
+                });
+            }, 310000);
+
+            child.stderr.on('data', (data) => {
+                stderrOutput += data.toString('utf-8');
+            });
+
+            child.on('error', (err) => {
+                if (isSettled) return;
+                isSettled = true;
+                clearTimeout(safetyTimeout);
+                childProcesses.delete(child); // 停止跟踪
+                cleanupCallback(); // 清理临时文件
+                reject(new Error(`无法启动PowerShell包装脚本: ${err.message}`));
+            });
+
+            child.on('close', (code) => {
+                if (isSettled) return;
+                isSettled = true;
+                clearTimeout(safetyTimeout);
+                childProcesses.delete(child); // 停止跟踪
+                // PowerShell脚本执行完毕，安全读取临时文件内容
+                fs.readFile(tmpFilePath, 'utf-8', (readErr, data) => {
+                    cleanupCallback(); // 确保清理临时文件
+
+                    // 检测 UAC 取消或拒绝错误（显式捕获标记、0x800704C7 或中文取消提示）
+                    const isUacCancelled = stderrOutput && (
+                        stderrOutput.includes('UAC_CANCELLED_OR_FAILED') ||
+                        stderrOutput.includes('0x800704C7') ||
+                        stderrOutput.includes('74C7') ||
+                        stderrOutput.includes('操作已被用户取消') ||
+                        stderrOutput.includes('The operation was canceled by the user')
+                    );
+
+                    if (isUacCancelled) {
+                        return resolve({
+                            isCancelled: true,
+                            content: [{
+                                type: 'text',
+                                text: '⚠️ [操作未执行/未授权]：用户在 Windows UAC 提权界面取消了授权，或未获取到管理员权限。敏感命令未执行。'
+                            }]
+                        });
+                    }
+                    if (readErr) {
+                        if (stderrOutput.trim()) {
+                            return reject(new Error(`管理员脚本执行失败: ${stderrOutput.trim()}`));
+                        }
+                        return reject(new Error(`无法读取管理员任务的输出文件: ${readErr.message}`));
+                    }
+
+                    const result = data.trim();
+                    if (result === "USER_CANCELLED") {
+                        resolve({
+                            isCancelled: true,
+                            content: [{
+                                type: 'text',
+                                text: '⚠️ [操作已取消]：用户已主动拒绝或取消了本次管理员权限申请。敏感命令未执行。'
+                            }]
+                        });
+                    } else if (result === "TIMEOUT_REJECTED") {
+                        resolve({
+                            isCancelled: true,
+                            content: [{
+                                type: 'text',
+                                text: '⚠️ [操作超时]：等待管理员确认超时（超过无操作安全时限），系统已自动拒绝执行。'
+                            }]
+                        });
+                    } else if (result.startsWith("ERROR:")) {
+                        reject(new Error(result.substring(6).trim()));
+                    } else if (result === "") {
+                        // 空输出防穿透：脚本根本未生成内容或提权未通过时，绝不能当作正常执行成功
+                        resolve({
+                            isCancelled: true,
+                            content: [{
+                                type: 'text',
+                                text: '⚠️ [操作未执行/未授权]：用户在 Windows UAC 提权界面取消了授权，或未获取到管理员权限。敏感命令未执行。'
+                            }]
+                        });
+                    } else {
+                        resolve(result);
+                    }
+                });
+            });
+        });
+    });
+}
+
+/**
+ * 请求用户确认一个敏感命令，但不在确认脚本中执行命令。
+ * 确认通过后，命令仍回到主 PTY/xterm 会话执行，以保持 GUI 连续输出。
+ * @param {string} command - 需要展示给用户确认的命令。
+ * @returns {Promise<boolean>} - 用户是否允许执行。
+ */
+function requestInteractiveConfirmation(command) {
+    return new Promise((resolve, reject) => {
+        tmp.file({ postfix: '.txt' }, (err, tmpFilePath, fd, cleanupCallback) => {
+            if (err) {
+                return reject(new Error(`无法创建临时文件: ${err.message}`));
+            }
+
+            let pythonConfirmScript;
+            try { pythonConfirmScript = resolveConfirmationScript(__dirname); }
+            catch (error) { cleanupCallback(); reject(error); return; }
+            const commandAsBase64 = Buffer.from(command).toString('base64');
+
+            // 普通敏感命令只需要当前权限确认，不应绕过主 PTY/xterm 执行链路。
+            const child = spawn('pythonw.exe', [
+                pythonConfirmScript,
+                commandAsBase64,
+                tmpFilePath,
+                '--interactive-auth',
+                '--confirm-only'
+            ], {
+                windowsHide: true
+            });
+            childProcesses.add(child);
+
+            let stderrOutput = '';
+            child.stderr.on('data', (data) => {
+                stderrOutput += data.toString('utf-8');
+            });
+
+            child.on('error', (err) => {
+                childProcesses.delete(child);
+                cleanupCallback();
+                reject(new Error(`无法启动交互式确认脚本: ${err.message}`));
+            });
+
+            child.on('close', () => {
+                childProcesses.delete(child);
+                fs.readFile(tmpFilePath, 'utf-8', (readErr, data) => {
+                    cleanupCallback();
+
+                    if (readErr) {
+                        if (stderrOutput.trim()) {
+                            return reject(new Error(`交互式确认脚本失败: ${stderrOutput.trim()}`));
+                        }
+                        return reject(new Error(`无法读取交互式确认结果文件: ${readErr.message}`));
+                    }
+
+                    const result = data.trim();
+                    if (result === 'CONFIRMED') {
+                        resolve(true);
+                    } else if (result === 'USER_CANCELLED' || result === 'TIMEOUT_REJECTED') {
+                        resolve(false);
+                    } else if (result.startsWith('ERROR:')) {
+                        reject(new Error(result.substring(6).trim()));
+                    } else {
+                        reject(new Error(`未知的交互式确认结果: ${result || '<empty>'}`));
+                    }
+                });
+            });
+        });
+    });
+}
+
+/**
+ * GUI 仅接收原始PTY投影；渲染窗口失效不得打断命令完成检测。
+ */
+function dispatchPtyData(rawData) {
+    const dataStr = rawData.toString('utf-8');
+    if (!dataStr) {
+        return;
+    }
+
+    if (mirrorStartupPending) {
+        // 启动握手（编码设置与就绪标记）是内部细节，握手完成前不投影到侧栏
+        mirrorStartupHeld = (mirrorStartupHeld + dataStr).slice(-MIRROR_REPLAY_LIMIT);
+    } else {
+        emitMirrorData(dataStr);
+    }
+
+    try {
+        if (!guiWindow || guiWindow.isDestroyed()
+            || guiWindow.webContents.isDestroyed()) {
+            return;
+        }
+        guiWindow.webContents.send('powershell-data', dataStr);
+    } catch (error) {
+        console.warn('[PowerShellExecutor] GUI output delivery failed:', error.message);
+    }
+}
+
+// --- 侧栏镜像 ---
+// 主窗口侧栏的「终端」标签是同一个 PTY 会话的另一个视图：输出同时送往 GUI 窗口和镜像，
+// 输入与尺寸调整直接落到同一个 PTY，AI 工具执行的命令因此对两处都可见。
+const MIRROR_REPLAY_LIMIT = 256 * 1024;
+const mirrorSinks = new Set();
+let replayBuffer = '';
+let mirrorStartupPending = false;
+let mirrorStartupHeld = '';
+
+function emitMirrorData(dataStr) {
+    if (!dataStr) return;
+    // 侧栏终端可能在会话进行中才挂载，缓存最近输出用于回放。
+    replayBuffer += dataStr;
+    if (replayBuffer.length > MIRROR_REPLAY_LIMIT) {
+        replayBuffer = replayBuffer.slice(-MIRROR_REPLAY_LIMIT);
+    }
+    notifyMirrors('onData', dataStr);
+}
+
+/** 结束启动握手：成功时只放出就绪标记之后的内容（通常是提示符），失败时原样放出便于排查。 */
+function releaseMirrorStartup(afterReady = null) {
+    if (!mirrorStartupPending) return;
+    mirrorStartupPending = false;
+    const held = mirrorStartupHeld;
+    mirrorStartupHeld = '';
+    emitMirrorData(afterReady === null ? held : afterReady);
+}
+
+function notifyMirrors(method, ...args) {
+    for (const sink of mirrorSinks) {
+        try {
+            sink[method]?.(...args);
+        } catch (e) {
+            console.error('[PowerShellExecutor] Mirror sink failed:', e);
+        }
+    }
+}
+
+/**
+ * 注册一个镜像视图并回放已有输出。
+ * @param {{onData: Function, onClear?: Function, onExit?: Function}} sink
+ * @returns {Function} 取消注册
+ */
+function attachMirror(sink) {
+    mirrorSinks.add(sink);
+    if (replayBuffer) {
+        try {
+            sink.onData(replayBuffer);
+        } catch (e) {
+            console.error('[PowerShellExecutor] Mirror replay failed:', e);
+        }
+    }
+    return () => mirrorSinks.delete(sink);
+}
+
+/** 确保有一个 PTY 会话（不打开 GUI 窗口）。 */
+function ensureMirrorSession() {
+    if (!ptyProcess) {
+        createNewPtySession();
+    }
+    return getSessionState();
+}
+
+/** 重置为全新的 PTY 会话（与 GUI 窗口共用）。 */
+function restartSession() {
+    createNewPtySession();
+    return getSessionState();
+}
+
+function getSessionState() {
+    return {
+        running: Boolean(ptyProcess),
+        pid: ptyProcess ? ptyProcess.pid : null,
+        // AI 短命令或交互式 TUI 占用期间，不应向会话里塞入额外命令。
+        busy: Boolean(isExecutingCommand || interactiveMode),
+        cols: lastKnownSize.cols,
+        rows: lastKnownSize.rows,
+    };
+}
+
+function writeSessionInput(data) {
+    if (!ptyProcess || typeof data !== 'string') {
+        return false;
+    }
+    ptyProcess.write(data);
+    return true;
+}
+
+/**
+ * 等待指定 PTY 完成 PowerShell 初始化探针。
+ * Promise 与具体 PTY 实例绑定，旧会话的迟到结果不能被新会话复用。
+ * @param {object} targetPtyProcess - 要等待的 node-pty 实例。
+ * @param {number} timeoutMs - 最大等待时间。
+ */
+async function waitForPtyReady(targetPtyProcess = ptyProcess, timeoutMs = 15000) {
+    if (!targetPtyProcess || targetPtyProcess !== ptyProcess) {
+        throw new Error('PowerShell PTY session is not available.');
+    }
+
+    let timeoutId = null;
+    try {
+        await Promise.race([
+            ptyReadyPromise,
+            new Promise((_, reject) => {
+                timeoutId = setTimeout(() => {
+                    reject(new Error(`PowerShell PTY initialization timed out after ${timeoutMs}ms.`));
+                }, timeoutMs);
+            })
+        ]);
+    } finally {
+        if (timeoutId) {
+            clearTimeout(timeoutId);
+        }
+    }
+
+    if (!ptyProcess || ptyProcess !== targetPtyProcess) {
+        throw new Error('PowerShell PTY session changed or exited during initialization.');
+    }
+}
+
+/**
+ * 同时等待渲染端 xterm 和后端 PTY 就绪，确保指令不会在界面初始化前注入。
+ */
+async function waitForTerminalReady() {
+    const targetPtyProcess = ptyProcess;
+    await Promise.all([
+        waitForGuiReady(),
+        waitForPtyReady(targetPtyProcess)
+    ]);
+}
+
+/**
+ * 创建一个新的伪终端 (pty) 进程。
+ */
+function createNewPtySession() {
+    // newSession 是交互模式的一期低成本复位入口。
+    interactiveMode = false;
+    isExecutingCommand = false;
+    activeCommandAbort = null;
+
+    // 如果已存在旧进程，先销毁它
+    if (ptyProcess) {
+        childProcesses.delete(ptyProcess);
+        ptyProcess.kill();
+        // 当重置会话时，通知前端清屏
+        if (guiWindow && !guiWindow.isDestroyed()) {
+            guiWindow.webContents.send('powershell-clear');
+        }
+    }
+    replayBuffer = '';
+    notifyMirrors('onClear');
+
+    let shell = 'bash';
+    let args = [];
+
+    if (os.platform() === 'win32') {
+        // 优先使用 PowerShell Core (pwsh.exe)，如果不存在则回退到 Windows PowerShell (powershell.exe)
+        // 检测顺序：Program Files 标准路径 → where.exe PATH 查找 → 回退 powershell.exe
+        const pwshPath = path.join(process.env.PROGRAMFILES, 'PowerShell', '7', 'pwsh.exe');
+        if (fs.existsSync(pwshPath)) {
+            shell = pwshPath;
+        } else {
+            // 二级回退：winget/MSIX 安装的 PS7 位于 WindowsApps（AppExecution Alias），
+            // fs.existsSync 对此类特殊文件不可靠，直接信任 where.exe 结果。
+            try {
+                const { execSync } = require('child_process');
+                const whereResult = execSync('where.exe pwsh', { windowsHide: true, encoding: 'utf8', timeout: 5000 }).trim();
+                const firstLine = whereResult.split(/\r?\n/)[0].trim();
+                if (firstLine) {
+                    shell = firstLine;
+                } else {
+                    shell = 'powershell.exe';
+                }
+            } catch (e) {
+                shell = 'powershell.exe';
+            }
+        }
+        args = ['-NoLogo'];
+    }
+
+    ptyProcess = loadPty().spawn(shell, args, {
+        name: 'xterm-color',
+        cols: lastKnownSize.cols,
+        rows: lastKnownSize.rows,
+        cwd: process.env.USERPROFILE || process.env.HOME,
+        env: {
+            ...process.env,
+            PAGER: 'cat',
+            GIT_PAGER: 'cat',
+            GIT_TERMINAL_PROMPT: '0',
+            GH_PAGER: '',
+            SYSTEMD_PAGER: 'cat',
+            AWS_PAGER: '',
+            MANPAGER: 'cat'
+        }
+    });
+    childProcesses.add(ptyProcess);
+    const currentPtyProcess = ptyProcess;
+
+    // 创建GUI数据监听器（带 AI 短命令执行状态检查）
+    guiDataListener = (data) => {
+        // AI 短命令期间由 executeSingleCommandInPty 的临时监听器负责 flushToGui，避免重复输出。
+        // 交互式 TUI 模式绝不能设置 isExecutingCommand，否则 GUI 会黑屏。
+        if (isExecutingCommand) {
+            return;
+        }
+
+        dispatchPtyData(data);
+    };
+
+    // 设置数据监听器，将所有 pty 输出直接代理到 GUI
+    currentPtyProcess.onData(guiDataListener);
+
+    // 不再用固定延时猜测 PowerShell 是否启动完成。随机边界不会以明文出现在
+    // PSReadLine 的输入回显中；只有 PowerShell 真正执行 Write-Host 后才会命中。
+    const readyBoundary = `__VCP_PTY_READY_${crypto.randomUUID()}__`;
+    const encodedReadyBoundary = Buffer.from(readyBoundary, 'utf8').toString('base64');
+    mirrorStartupPending = true;
+    mirrorStartupHeld = '';
+    ptyReadyPromise = new Promise((resolve, reject) => {
+        let startupOutput = '';
+        let settled = false;
+        let timeoutId = null;
+        let readyListener = null;
+
+        const cleanupReadyProbe = () => {
+            if (timeoutId) {
+                clearTimeout(timeoutId);
+                timeoutId = null;
+            }
+            if (readyListener && typeof readyListener.dispose === 'function') {
+                readyListener.dispose();
+                readyListener = null;
+            }
+        };
+
+        readyListener = currentPtyProcess.onData((data) => {
+            if (settled) {
+                return;
+            }
+
+            startupOutput += data.toString('utf8');
+            // 防止异常启动输出无限占用内存，同时保留足够长度处理跨 chunk 边界。
+            if (startupOutput.length > 65536) {
+                startupOutput = startupOutput.slice(-65536);
+            }
+
+            const boundaryIndex = startupOutput.indexOf(readyBoundary);
+            if (boundaryIndex !== -1) {
+                settled = true;
+                cleanupReadyProbe();
+                if (ptyProcess === currentPtyProcess) {
+                    releaseMirrorStartup(startupOutput.slice(boundaryIndex + readyBoundary.length).replace(/^\r?\n/, ''));
+                }
+                resolve();
+            }
+        });
+
+        timeoutId = setTimeout(() => {
+            if (settled) {
+                return;
+            }
+            settled = true;
+            cleanupReadyProbe();
+            if (ptyProcess === currentPtyProcess) releaseMirrorStartup();
+            reject(new Error('PowerShell did not complete its startup readiness probe within 15 seconds.'));
+        }, 15000);
+
+        // macOS / Linux 起的是 bash：PowerShell 的初始化写进去只会报语法错误，边界永远等不到，
+        // 前 15 秒侧栏一片空白。环境变量 spawn 时已经给了，这里只打印边界：两段引号拼起来，
+        // 回显的命令行里是 '…''…'，不会提前命中
+        if (os.platform() !== 'win32') {
+            const split = Math.floor(readyBoundary.length / 2);
+            currentPtyProcess.write(`printf '%s\\n' '${readyBoundary.slice(0, split)}''${readyBoundary.slice(split)}'; clear\r`);
+            return;
+        }
+        const initializationCommand = [
+            '[Console]::OutputEncoding = [System.Text.Encoding]::UTF8',
+            '$env:PAGER = "cat"',
+            '$env:GIT_PAGER = "cat"',
+            '$env:GIT_TERMINAL_PROMPT = "0"',
+            '$env:GH_PAGER = ""',
+            '$env:SYSTEMD_PAGER = "cat"',
+            '$env:AWS_PAGER = ""',
+            '$env:MANPAGER = "cat"',
+            'function global:more { param([string[]]$paths) if ($paths) { foreach ($file in $paths) { Get-Content $file } } else { $input } }',
+            'function global:help { Get-Help @args }',
+            `$__vcpReady = [System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String('${encodedReadyBoundary}'))`,
+            'Write-Host $__vcpReady',
+            // 清掉握手留下的几行：侧栏只从就绪标记之后开始显示，ConPTY 的光标也得回到左上角，
+            // 否则 PSReadLine 按绝对坐标重绘时会和侧栏错开几行
+            'Clear-Host'
+        ].join('; ');
+        currentPtyProcess.write(`${initializationCommand}\r`);
+    });
+    // 只有 AI 命令会等它；没人等的时候超时也不能变成未处理的 rejection
+    ptyReadyPromise.catch(() => {});
+
+    // 当 pty 进程意外退出时，清理资源。
+    // 注意：newSession 会先 kill 旧 PTY 再创建新 PTY，旧 PTY 的异步 onExit 不能误清理新会话。
+    currentPtyProcess.onExit((exitInfo) => {
+        childProcesses.delete(currentPtyProcess);
+        // 自行结束的 shell 仍占着 ConPTY 的管道句柄，显式 kill 才会释放
+        try {
+            currentPtyProcess.kill();
+        } catch (e) {
+            // 进程已经退出
+        }
+
+        if (ptyProcess !== currentPtyProcess) {
+            return;
+        }
+
+        ptyProcess = null;
+        guiDataListener = null;
+        isExecutingCommand = false;
+        interactiveMode = false;
+        activeCommandAbort = null;
+        notifyMirrors('onExit', exitInfo && exitInfo.exitCode);
+    });
+}
+
+function buildHumanLaunchAnimationCommand() {
+    const script = [
+        '$esc = [char]27',
+        '# 尝试擦掉用于触发动画的短命令输入行，避免启动动画前出现杂乱命令文本。',
+        'Write-Host -NoNewline "$esc[1A$esc[2K`r"',
+        '',
+        '# 霓虹渐变色定义',
+        '$c1 = "$esc[38;2;245;194;231m" # Pink',
+        '$c2 = "$esc[38;2;203;166;247m" # Mauve',
+        '$c3 = "$esc[38;2;137;180;250m" # Blue',
+        '$c4 = "$esc[38;2;116;199;236m" # Sapphire',
+        '$c5 = "$esc[38;2;137;220;235m" # Sky',
+        '$c6 = "$esc[38;2;148;226;213m" # Teal',
+        '$reset = "$esc[0m"',
+        '$gray = "$esc[38;2;147;153;178m"',
+        '$darkGray = "$esc[38;2;88;91;112m"',
+        '$green = "$esc[38;2;166;227;161m"',
+        '$yellow = "$esc[38;2;249;226;175m"',
+        '',
+        '# 逐行打印华丽的 VCP CLI ASCII Art',
+        'Write-Host ""',
+        'Write-Host "  ${c1}██╗   ██╗  ██████╗  ██████╗      ██████╗  ██╗      ██╗${reset}"',
+        'Start-Sleep -Milliseconds 40',
+        'Write-Host "  ${c2}██║   ██║ ██╔════╝  ██╔══██╗    ██╔════╝  ██║      ██║${reset}"',
+        'Start-Sleep -Milliseconds 40',
+        'Write-Host "  ${c3}██║   ██║ ██║       ██████╔╝    ██║       ██║      ██║${reset}"',
+        'Start-Sleep -Milliseconds 40',
+        'Write-Host "  ${c4}╚██╗ ██╔╝ ██║       ██╔═══╝     ██║       ██║      ██║${reset}"',
+        'Start-Sleep -Milliseconds 40',
+        'Write-Host "  ${c5} ╚████╔╝  ╚██████╗  ██║         ╚██████╗  ███████╗ ██║${reset}"',
+        'Start-Sleep -Milliseconds 40',
+        'Write-Host "  ${c6}  ╚═══╝    ╚═════╝  ╚═╝          ╚═════╝  ╚══════╝ ╚═╝${reset}"',
+        'Start-Sleep -Milliseconds 50',
+        '',
+        '# 打印副标题和分割线',
+        'Write-Host "  ${darkGray}──────────────────────────────────────────────────────────${reset}"',
+        'Write-Host "  ${gray}Distributed PowerShell Bridge & Interactive Terminal GUI${reset}"',
+        'Write-Host "  ${darkGray}──────────────────────────────────────────────────────────${reset}"',
+        'Write-Host ""',
+        '',
+        '# 华丽的渐变色进度条加载动画',
+        '$barWidth = 30',
+        'for ($i = 0; $i -le $barWidth; $i++) {',
+        '    $percent = [math]::Round(($i / $barWidth) * 100)',
+        '    $filledCount = $i',
+        '    $emptyCount = $barWidth - $i',
+        '    ',
+        '    # 动态计算渐变色 (从 Mauve 203,166,247 渐变到 Teal 148,226,213)',
+        '    $r = [int](203 - (203 - 148) * ($i / $barWidth))',
+        '    $g = [int](166 + (226 - 166) * ($i / $barWidth))',
+        '    $b = [int](247 - (247 - 213) * ($i / $barWidth))',
+        '    $color = "$esc[38;2;${r};${g};${b}m"',
+        '    ',
+        '    $filled = "▰" * $filledCount',
+        '    $empty = "▱" * $emptyCount',
+        '    ',
+        '    Write-Host -NoNewline "$esc[2K`r  ${gray}Loading Bridge:${reset} [${color}${filled}${darkGray}${empty}${reset}] ${color}${percent}%${reset}"',
+        '    Start-Sleep -Milliseconds 35',
+        '}',
+        'Write-Host ""',
+        'Write-Host ""',
+        '',
+        '# 打印系统就绪状态和极客风系统信息',
+        'Write-Host "  ${gray}Status:${reset}    ${green}ONLINE${reset}"',
+        'Write-Host "  ${gray}Session:${reset}   ${c3}Active PowerShell Bridge${reset}"',
+        'Write-Host "  ${gray}Terminal:${reset}  ${yellow}Interactive Console Ready${reset}"',
+        'Write-Host ""',
+        'Write-Host "  ${gray}Type commands below. Press ${c3}Ctrl+C${gray} to interrupt.${reset}"',
+        'Write-Host ""',
+        'Remove-Item -LiteralPath $PSCommandPath -Force -ErrorAction SilentlyContinue',
+    ].join('\n');
+
+    const tempScriptName = `vcp-cli-launch-${crypto.randomUUID()}.ps1`;
+    const tempScriptPath = path.join(os.tmpdir(), tempScriptName);
+    fs.writeFileSync(tempScriptPath, `\ufeff${script}`, 'utf8');
+
+    const escapedTempScriptPath = tempScriptPath.replace(/'/g, "''");
+    return `& '${escapedTempScriptPath}'\r`;
+}
+
+/**
+ * 打开或聚焦 PowerShellExecutor 的交互式终端 GUI。
+ * 该入口供主程序托盘 / 桌面应用启动器直接调用，不需要先通过 AI 工具执行命令。
+ * @returns {BrowserWindow} PowerShell 终端窗口实例。
+ */
+function openGuiTerminal() {
+    ensureGuiWindow();
+
+    const shouldPlayHumanLaunchAnimation = !ptyProcess;
+    if (!ptyProcess) {
+        createNewPtySession();
+    }
+
+    if (shouldPlayHumanLaunchAnimation && ptyProcess) {
+        const targetPtyProcess = ptyProcess;
+        waitForTerminalReady()
+            .then(() => {
+                if (ptyProcess === targetPtyProcess) {
+                    targetPtyProcess.write(buildHumanLaunchAnimationCommand());
+                }
+            })
+            .catch((error) => {
+                console.error('[PowerShellExecutor] Failed to initialize terminal launch animation:', error);
+            });
+    }
+
+    return guiWindow;
+}
+
+/**
+ * 插件的主入口点，由 PluginManager 直接调用。
+ * @param {object} args - 从 AI 工具调用中解析出的参数。
+ * @returns {Promise<string>} - 命令执行的结果。
+ */
+/**
+ * 在给定的 pty 会话中执行单条命令并返回其增量输出。
+ * @param {object} ptyProcess - node-pty 实例。
+ * @param {string} singleCommand - 要执行的单条命令。
+ * @returns {Promise<string>} - 该命令的增量输出。
+ */
+function executeSingleCommandInPty(ptyProcess, singleCommand) {
+    return new Promise((resolve, reject) => {
+        if (!ptyProcess) {
+            return reject(new Error("PTY process is not available."));
+        }
+
+        let rawOutput = '';
+        let rawOutputTruncated = false;
+        let settled = false;
+        let tempScriptPath = null;
+        let wrapperScriptPath = null;
+        let listenerDisposable = null;
+        let timeoutId = null;
+
+        const run = beginCommandRun(singleCommand);
+        const startBoundary = `__VCP_COMMAND_START_${crypto.randomUUID()}__`;
+        const endBoundary = `__VCP_COMMAND_END_${crypto.randomUUID()}__`;
+        const outputParser = new CommandOutputParser(startBoundary, endBoundary);
+
+        const abortThisCommand = () => {
+            if (settled) {
+                return false;
+            }
+
+            settled = true;
+            finishCommandRun(run, 'cancelled');
+            // ETX 等价于用户在真实终端按下 Ctrl+C，用于中断当前前台命令。
+            ptyProcess.write('\x03');
+            cleanupListener(listenerDisposable, timeoutId);
+            reject(new Error('命令已被 interrupt 动作中止。'));
+            return true;
+        };
+
+        const cleanupListener = (disposable, commandTimeoutId) => {
+            if (commandTimeoutId) {
+                clearTimeout(commandTimeoutId);
+            }
+            if (disposable && typeof disposable.dispose === 'function') {
+                disposable.dispose();
+            }
+            if (activeCommandAbort === abortThisCommand) {
+                activeCommandAbort = null;
+            }
+            for (const scriptPath of [tempScriptPath, wrapperScriptPath]) {
+                if (!scriptPath) continue;
+                try {
+                    fs.unlinkSync(scriptPath);
+                } catch (e) {
+                    console.warn('[PowerShellExecutor] Failed to remove temporary script:', e.message);
+                }
+            }
+            tempScriptPath = null;
+            wrapperScriptPath = null;
+        };
+
+        const flushToGui = (text) => {
+            if (text) {
+                dispatchPtyData(text);
+            }
+        };
+
+        listenerDisposable = ptyProcess.onData((data) => {
+            if (settled) {
+                return;
+            }
+
+            const result = outputParser.push(data.toString('utf-8'));
+            rawOutputTruncated ||= rawOutput.length + result.output.length > COMMAND_RUN_RAW_LIMIT;
+            rawOutput = (rawOutput + result.output).slice(-COMMAND_RUN_RAW_LIMIT);
+            appendCommandRunOutput(run, result.output);
+
+            if (result.done) {
+                settled = true;
+                finishCommandRun(run, 'completed');
+                cleanupListener(listenerDisposable, timeoutId);
+                resolve((rawOutputTruncated ? '[输出超过容量限制，仅保留末尾内容]\n' : '') + sanitizeTerminalOutput(rawOutput).trim());
+            }
+
+            // GUI 是投影，不是完成裁决者；保留同块中的结束后提示符。
+            flushToGui(result.output + result.trailing);
+        });
+
+        timeoutId = setTimeout(() => {
+            if (settled) {
+                return;
+            }
+            settled = true;
+            finishCommandRun(run, 'timed_out');
+            cleanupListener(listenerDisposable, timeoutId);
+            reject(new Error(`Command "${singleCommand}" timed out after 60 seconds.`));
+        }, 60000);
+
+        activeCommandAbort = abortThisCommand;
+
+        try {
+            const tempScriptName = `vcp-powershell-${crypto.randomUUID()}.ps1`;
+            tempScriptPath = path.join(os.tmpdir(), tempScriptName);
+            // Windows PowerShell 5.1 对无 BOM UTF-8 的中文兼容性较差，写入 BOM 保证脚本内容稳定解析。
+            fs.writeFileSync(tempScriptPath, `\ufeff${singleCommand}`, 'utf8');
+
+            const escapedTempScriptPath = tempScriptPath.replace(/'/g, "''");
+
+            // 边界标记只写进包装脚本，不出现在交互式命令行里：
+            // PowerShell/PSReadLine 会先回显整行输入，若标记出现在回显里，就会被误判为真实输出。
+            // 终端里也只留下一行短的脚本调用，而不是整段包装代码。
+            const wrapperScript = [
+                // 关掉分页器和 Git 交互提示，否则 git log/help 等会停在分页界面，命令一直等不到结束标记。
+                `$env:PAGER = 'cat'`,
+                `$env:GIT_PAGER = 'cat'`,
+                `$env:GIT_TERMINAL_PROMPT = '0'`,
+                `Write-Host '${startBoundary}'`,
+                // 即使临时脚本发生 ParserError / RuntimeException，也必须输出 end boundary，
+                // 否则 AI 调用会一直等待直到超时。终止性错误要在结束标记之前打印，
+                // 否则 PowerShell 会在命令行结束后才显示它，AI 拿到的输出就是空的。
+                `try { & '${escapedTempScriptPath}' } catch { $_ | Out-Host } finally { Write-Host '${endBoundary}' }`
+            ].join('\r\n');
+            wrapperScriptPath = path.join(os.tmpdir(), `vcp-run-${crypto.randomUUID()}.ps1`);
+            fs.writeFileSync(wrapperScriptPath, `\ufeff${wrapperScript}`, 'utf8');
+            const wrappedCommand = `& '${wrapperScriptPath.replace(/'/g, "''")}'`;
+
+            ptyProcess.write(`${wrappedCommand}\r`);
+        } catch (error) {
+            settled = true;
+            finishCommandRun(run, 'spawn_error');
+            cleanupListener(listenerDisposable, timeoutId);
+            reject(new Error(`无法创建或执行临时 PowerShell 脚本: ${error.message}`));
+        }
+    });
+}
+
+
+const INTERACTIVE_SEQUENCE_LIMITS = Object.freeze({
+    maxSteps: 100,
+    maxWaitMs: 60000,
+    maxTotalWaitMs: 300000,
+    maxTextLength: 100000,
+    maxQueryLines: 2000,
+    responseTimeoutMs: 5000
+});
+
+const TERMINAL_KEY_SEQUENCES = Object.freeze({
+    enter: '\r',
+    return: '\r',
+    up: '\x1b[A',
+    arrowup: '\x1b[A',
+    down: '\x1b[B',
+    arrowdown: '\x1b[B',
+    right: '\x1b[C',
+    arrowright: '\x1b[C',
+    left: '\x1b[D',
+    arrowleft: '\x1b[D',
+    esc: '\x1b',
+    escape: '\x1b',
+    tab: '\t',
+    backtab: '\x1b[Z',
+    'shift+tab': '\x1b[Z',
+    backspace: '\x7f',
+    delete: '\x1b[3~',
+    home: '\x1b[H',
+    end: '\x1b[F',
+    pageup: '\x1b[5~',
+    pagedown: '\x1b[6~',
+    space: ' ',
+    'ctrl+c': '\x03',
+    'ctrl+d': '\x04',
+    'ctrl+z': '\x1a',
+    'ctrl+l': '\x0c',
+    'ctrl+a': '\x01',
+    'ctrl+e': '\x05',
+    'ctrl+u': '\x15',
+    'ctrl+k': '\x0b',
+    'ctrl+w': '\x17'
+});
+
+function delay(ms) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+}
+
+function parseWaitDuration(value) {
+    if (typeof value === 'number' && Number.isFinite(value)) {
+        return Math.round(value);
+    }
+
+    const match = String(value).trim().toLowerCase().match(/^(\d+(?:\.\d+)?)\s*(ms|s)?$/);
+    if (!match) {
+        throw new Error(`无效 wait 时长 "${value}"；请使用 50ms、1s 或毫秒数字。`);
+    }
+
+    const milliseconds = Number(match[1]) * (match[2] === 's' ? 1000 : 1);
+    return Math.round(milliseconds);
+}
+
+function parseTerminalKey(value) {
+    const raw = String(value).trim().toLowerCase();
+    const match = raw.match(/^(.+?)(?:\s*\*\s*(\d+))?$/);
+    const keyName = match ? match[1].trim() : raw;
+    const repeat = match && match[2] ? Number.parseInt(match[2], 10) : 1;
+    const sequence = TERMINAL_KEY_SEQUENCES[keyName];
+
+    if (!sequence) {
+        throw new Error(`不支持的终端按键 "${value}"。`);
+    }
+    if (!Number.isInteger(repeat) || repeat < 1 || repeat > 10) {
+        throw new Error(`按键重复次数必须在 1 到 10 之间："${value}"。`);
+    }
+
+    return { keyName, repeat, data: sequence.repeat(repeat) };
+}
+
+function parseInteractiveSequence(args) {
+    const steps = [];
+
+    for (const [key, value] of Object.entries(args)) {
+        const match = key.match(/^(command|wait|key|paste|queryVisible)(\d+)$/i);
+        if (!match) {
+            continue;
+        }
+
+        const typeLookup = {
+            command: 'command',
+            wait: 'wait',
+            key: 'key',
+            paste: 'paste',
+            queryvisible: 'queryVisible'
+        };
+        steps.push({
+            key,
+            type: typeLookup[match[1].toLowerCase()],
+            index: Number.parseInt(match[2], 10),
+            value
+        });
+    }
+
+    if (steps.length === 0) {
+        throw new Error('RunInteractiveSequence 至少需要一个带全局序号的步骤，例如 command1、wait2、key3、paste4、queryVisible5。');
+    }
+    if (steps.length > INTERACTIVE_SEQUENCE_LIMITS.maxSteps) {
+        throw new Error(`交互序列最多允许 ${INTERACTIVE_SEQUENCE_LIMITS.maxSteps} 个步骤。`);
+    }
+
+    steps.sort((a, b) => a.index - b.index);
+    const usedIndexes = new Set();
+    let totalWaitMs = 0;
+
+    for (const step of steps) {
+        if (!Number.isInteger(step.index) || step.index < 1) {
+            throw new Error(`步骤编号必须是从 1 开始的正整数：${step.key}。`);
+        }
+        if (usedIndexes.has(step.index)) {
+            throw new Error(`步骤编号 ${step.index} 重复；不同类型步骤必须共用唯一的全局序号。`);
+        }
+        usedIndexes.add(step.index);
+
+        if (step.type === 'wait') {
+            step.durationMs = parseWaitDuration(step.value);
+            if (step.durationMs < 0 || step.durationMs > INTERACTIVE_SEQUENCE_LIMITS.maxWaitMs) {
+                throw new Error(`单个 wait 步骤必须在 0 到 ${INTERACTIVE_SEQUENCE_LIMITS.maxWaitMs}ms 之间。`);
+            }
+            totalWaitMs += step.durationMs;
+        } else if (step.type === 'key') {
+            step.keySpec = parseTerminalKey(step.value);
+        } else if (step.type === 'queryVisible') {
+            const parsedLines = Number.parseInt(step.value, 10);
+            step.maxLines = Number.isInteger(parsedLines) && parsedLines > 0
+                ? Math.min(parsedLines, INTERACTIVE_SEQUENCE_LIMITS.maxQueryLines)
+                : null;
+        } else {
+            if (typeof step.value !== 'string' || !step.value.length) {
+                throw new Error(`${step.key} 必须是非空字符串。`);
+            }
+            if (step.value.length > INTERACTIVE_SEQUENCE_LIMITS.maxTextLength) {
+                throw new Error(`${step.key} 超过 ${INTERACTIVE_SEQUENCE_LIMITS.maxTextLength} 字符限制。`);
+            }
+        }
+    }
+
+    if (totalWaitMs > INTERACTIVE_SEQUENCE_LIMITS.maxTotalWaitMs) {
+        throw new Error(`序列累计等待不能超过 ${INTERACTIVE_SEQUENCE_LIMITS.maxTotalWaitMs}ms。`);
+    }
+    if (steps.every(step => step.type === 'wait')) {
+        throw new Error('交互序列不能只包含 wait；请至少加入 command、key、paste 或 queryVisible 步骤。');
+    }
+
+    return steps;
+}
+
+function requestVisibleText(maxLines = null) {
+    return new Promise((resolve, reject) => {
+        if (!guiWindow || guiWindow.isDestroyed() || !guiReady) {
+            reject(new Error('PowerShell GUI 尚未就绪，无法查询可见文本。'));
+            return;
+        }
+
+        const requestId = crypto.randomUUID();
+        const timeout = setTimeout(() => {
+            visibleTextResolvers.delete(requestId);
+            reject(new Error('查询终端文本超时'));
+        }, INTERACTIVE_SEQUENCE_LIMITS.responseTimeoutMs);
+
+        visibleTextResolvers.set(requestId, (text) => {
+            clearTimeout(timeout);
+            resolve(text);
+        });
+        guiWindow.webContents.send('query-visible-text', { requestId, maxLines });
+    });
+}
+
+function requestTerminalPaste(text) {
+    return new Promise((resolve, reject) => {
+        if (!guiWindow || guiWindow.isDestroyed() || !guiReady) {
+            reject(new Error('PowerShell GUI 尚未就绪，无法执行 xterm 粘贴。'));
+            return;
+        }
+
+        const requestId = crypto.randomUUID();
+        const timeout = setTimeout(() => {
+            terminalPasteResolvers.delete(requestId);
+            reject(new Error('xterm 粘贴请求超时'));
+        }, INTERACTIVE_SEQUENCE_LIMITS.responseTimeoutMs);
+
+        terminalPasteResolvers.set(requestId, () => {
+            clearTimeout(timeout);
+            resolve();
+        });
+        guiWindow.webContents.send('terminal-paste-request', { requestId, text });
+    });
+}
+
+async function ensureInteractiveTerminal(newSession = false) {
+    ensureGuiWindow();
+    if (newSession === true || !ptyProcess) {
+        createNewPtySession();
+    }
+    await waitForTerminalReady();
+    interactiveMode = true;
+    return ptyProcess;
+}
+
+async function sendSingleInteractiveKey(args) {
+    if (typeof args.key !== 'string' || !args.key.trim()) {
+        throw new Error('SendInteractiveKey 需要 key 参数，例如 enter、up、esc 或 ctrl+c*2。');
+    }
+
+    const keySpec = parseTerminalKey(args.key);
+    const targetPtyProcess = await ensureInteractiveTerminal(args.newSession === true);
+    targetPtyProcess.write(keySpec.data);
+
+    return {
+        content: [{
+            type: 'text',
+            text: `Interactive key sent: ${keySpec.keyName}${keySpec.repeat > 1 ? ` x${keySpec.repeat}` : ''}.`
+        }]
+    };
+}
+
+async function pasteSingleInteractiveText(args) {
+    if (typeof args.text !== 'string' || !args.text.length) {
+        throw new Error('PasteInteractiveText 需要非空 text 参数。');
+    }
+    if (args.text.length > INTERACTIVE_SEQUENCE_LIMITS.maxTextLength) {
+        throw new Error(`text 超过 ${INTERACTIVE_SEQUENCE_LIMITS.maxTextLength} 字符限制。`);
+    }
+
+    await ensureInteractiveTerminal(args.newSession === true);
+    await requestTerminalPaste(args.text);
+
+    if (args.submit === true) {
+        if (!ptyProcess) {
+            throw new Error('粘贴完成后 PTY 会话已退出，无法发送 Enter。');
+        }
+        ptyProcess.write('\r');
+    }
+
+    return {
+        content: [{
+            type: 'text',
+            text: `Interactive text pasted (${args.text.length} characters)${args.submit === true ? ' and Enter was sent' : ''}.`
+        }]
+    };
+}
+
+async function runInteractiveSequence(args) {
+    const steps = parseInteractiveSequence(args);
+
+    for (const step of steps.filter(item => item.type === 'command')) {
+        const securityResult = intelligentSecurityCheck(
+            step.value,
+            defaultConfig.forbiddenCommands,
+            defaultConfig.authRequiredCommands
+        );
+        if (securityResult.isForbidden) {
+            throw new Error(`步骤 ${step.index} 执行被阻止：${securityResult.reason}`);
+        }
+        if (securityResult.needsAuth) {
+            throw new Error(`步骤 ${step.index} 需要授权，RunInteractiveSequence 不支持在 TUI 序列中弹出授权确认：${securityResult.reason}`);
+        }
+    }
+
+    const targetPtyProcess = await ensureInteractiveTerminal(args.newSession === true);
+    const queryResults = [];
+
+    for (const step of steps) {
+        if (!ptyProcess || ptyProcess !== targetPtyProcess) {
+            throw new Error(`执行到步骤 ${step.index} 时 PTY 会话已退出或被替换。`);
+        }
+
+        switch (step.type) {
+            case 'command':
+                targetPtyProcess.write(`${step.value}\r`);
+                break;
+            case 'wait':
+                await delay(step.durationMs);
+                break;
+            case 'key':
+                targetPtyProcess.write(step.keySpec.data);
+                break;
+            case 'paste':
+                await requestTerminalPaste(step.value);
+                break;
+            case 'queryVisible': {
+                const text = await requestVisibleText(step.maxLines);
+                queryResults.push({ index: step.index, maxLines: step.maxLines, text });
+                break;
+            }
+            default:
+                throw new Error(`未知交互步骤类型：${step.type}`);
+        }
+    }
+
+    if (queryResults.length === 0) {
+        return {
+            content: [{
+                type: 'text',
+                text: `Interactive sequence completed (${steps.length} steps). No queryVisible step was requested.`
+            }]
+        };
+    }
+
+    const output = queryResults.map(result => {
+        const lineLabel = result.maxLines ? `, max ${result.maxLines} lines` : '';
+        return `---[queryVisible step ${result.index}${lineLabel}]---\n${result.text}`;
+    }).join('\n\n');
+
+    return { content: [{ type: 'text', text: `\`\`\`\n${output}\n\`\`\`` }] };
+}
+
+async function processToolCall(args) {
+    const declaredCommands = new Set([
+        'ExecutePowerShell',
+        'StartInteractive',
+        'SendInteractiveKey',
+        'PasteInteractiveText',
+        'RunInteractiveSequence',
+        'QueryVisible',
+        'InterruptPowerShell',
+        'EndInteractive'
+    ]);
+    const declaredCommand = typeof args.command === 'string' && declaredCommands.has(args.command.trim())
+        ? args.command.trim()
+        : null;
+
+    // 新清单格式使用 command 选择能力、powershell 传递脚本文本。
+    // 同时保留旧 action + command 调用格式，避免已有提示词和调用方立即失效。
+    const actionByDeclaredCommand = {
+        ExecutePowerShell: 'execute',
+        StartInteractive: 'startInteractive',
+        SendInteractiveKey: 'interactiveKey',
+        PasteInteractiveText: 'interactivePaste',
+        RunInteractiveSequence: 'interactiveSequence',
+        QueryVisible: 'queryVisible',
+        InterruptPowerShell: 'interrupt',
+        EndInteractive: 'endInteractive'
+    };
+    const action = declaredCommand
+        ? actionByDeclaredCommand[declaredCommand]
+        : (typeof args.action === 'string' ? args.action.trim() : 'execute');
+
+    if (action === 'interactiveKey') {
+        return sendSingleInteractiveKey(args);
+    }
+
+    if (action === 'interactivePaste') {
+        return pasteSingleInteractiveText(args);
+    }
+
+    if (action === 'interactiveSequence') {
+        return runInteractiveSequence(args);
+    }
+
+    if (action.startsWith('queryVisible')) {
+        ensureGuiWindow();
+        await waitForGuiReady();
+
+        const legacyMatch = action.match(/^queryVisible(\d+)?$/);
+        const requestedMaxLines = declaredCommand === 'QueryVisible' ? args.maxLines : (legacyMatch && legacyMatch[1]);
+        const parsedMaxLines = requestedMaxLines === undefined || requestedMaxLines === null || requestedMaxLines === ''
+            ? null
+            : Number.parseInt(requestedMaxLines, 10);
+        const maxLines = Number.isInteger(parsedMaxLines) && parsedMaxLines > 0
+            ? Math.min(parsedMaxLines, INTERACTIVE_SEQUENCE_LIMITS.maxQueryLines)
+            : null;
+        const text = await requestVisibleText(maxLines);
+        return { content: [{ type: 'text', text: `\`\`\`\n${text}\n\`\`\`` }] };
+    }
+
+    if (action === 'endInteractive') {
+        interactiveMode = false;
+        return { content: [{ type: 'text', text: 'Interactive mode flag cleared. The existing PTY session was not terminated.' }] };
+    }
+
+    if (action === 'interrupt') {
+        if (!ptyProcess) {
+            return { content: [{ type: 'text', text: 'No active PowerShell session to interrupt.' }] };
+        }
+
+        if (activeCommandAbort) {
+            const interrupted = activeCommandAbort();
+            return { content: [{ type: 'text', text: interrupted
+                ? 'Interrupt signal sent. The active synchronous command wait was cancelled.'
+                : 'The synchronous command had already completed before it could be interrupted.' }] };
+        }
+
+        if (interactiveMode) {
+            ptyProcess.write('\x03');
+            return { content: [{ type: 'text', text: 'Ctrl+C was sent to the interactive foreground program. The interactive mode flag remains set.' }] };
+        }
+
+        return { content: [{ type: 'text', text: 'The PowerShell session is active, but no AI-started foreground command is currently running.' }] };
+    }
+
+    // --- 1. 解析和排序 PowerShell 脚本 ---
+    // 新格式：powershell, powershell1, powershell2...
+    // 旧格式：command, command1, command2...
+    const scriptParameterPrefix = declaredCommand ? 'powershell' : 'command';
+    const commandEntries = Object.entries(args)
+        .filter(([key]) => key.startsWith(scriptParameterPrefix))
+        .map(([key, value]) => {
+            const match = key.match(new RegExp(`^${scriptParameterPrefix}(\\d*)$`));
+            const index = match ? (match[1] === '' ? 0 : parseInt(match[1], 10)) : -1;
+            return { key, value, index };
+        })
+        .filter(item => item.index !== -1 && typeof item.value === 'string' && item.value.trim())
+        .sort((a, b) => a.index - b.index);
+
+    // 新格式中的 args.command 是能力选择器，绝不能作为待执行脚本。
+    if (declaredCommand) {
+        commandEntries.forEach(entry => {
+            entry.value = entry.value.trim();
+        });
+    }
+
+    if (commandEntries.length === 0) {
+        throw new Error(declaredCommand
+            ? '未提供任何有效的 powershell 参数 (例如 powershell, powershell1, powershell2)。'
+            : '未提供任何有效的 command 参数 (例如 command, command1, command2)。');
+    }
+
+    if (action !== 'execute' && action !== 'startInteractive') {
+        throw new Error(`不支持的 action: ${action}`);
+    }
+
+    // --- 2. 智能安全预检查 ---
+    let needsInteractiveAuth = false;
+    for (const entry of commandEntries) {
+        const securityResult = intelligentSecurityCheck(
+            entry.value,
+            defaultConfig.forbiddenCommands,
+            defaultConfig.authRequiredCommands
+        );
+
+        if (securityResult.isForbidden) {
+            throw new Error(`执行被阻止：${securityResult.reason}`);
+        }
+
+        if (securityResult.needsAuth) {
+            needsInteractiveAuth = true;
+            console.log(`[PowerShellExecutor] 命令 "${entry.value}" 需要交互式授权：${securityResult.reason}`);
+        }
+    }
+
+    // --- 3. 初始化会话和参数 ---
+    const lastCommandIndex = commandEntries[commandEntries.length - 1].index;
+    const getArg = (key, defaultVal) => {
+        const indexedKey = `${key}${lastCommandIndex || ''}`;
+        return args[indexedKey] !== undefined ? args[indexedKey] : (args[key] !== undefined ? args[key] : defaultVal);
+    };
+
+    const requireAdmin = getArg('requireAdmin', false);
+    const newSession = getArg('newSession', false);
+    const finalReturnMode = getArg('returnMode', defaultConfig.returnMode);
+
+    // --- 4. 根据模式选择执行路径 ---
+
+    // 路径 A: 管理员模式 (最高优先级)
+    if (requireAdmin) {
+        if (commandEntries.length > 1) {
+            throw new Error("管理员模式 (requireAdmin: true) 不支持执行多个命令链。");
+        }
+        if (ptyProcess) {
+            ptyProcess.kill();
+            ptyProcess = null;
+        }
+        const command = commandEntries[0].value;
+        const fullCommand = `[Console]::OutputEncoding = [System.Text.Encoding]::UTF8; $env:PAGER = 'cat'; $env:GIT_PAGER = 'cat'; $env:GIT_TERMINAL_PROMPT = '0'; function global:more { param([string[]]$paths) if ($paths) { foreach ($file in $paths) { Get-Content $file } } else { $input } }; function global:help { Get-Help @args }; ${command}`;
+        const output = await executeAdminCommand(fullCommand);
+        if (output && typeof output === 'object' && Array.isArray(output.content)) {
+            return output;
+        }
+        const cleanOutput = (typeof output === 'string' ? output : String(output || '')).replace(/\r\n/g, '\n').replace(/\r/g, '');
+        return { content: [{ type: 'text', text: `\`\`\`powershell\n${cleanOutput}\n\`\`\`` }] };
+    }
+
+    // 路径 B: 普通敏感命令确认模式
+    // 这里只做确认；确认通过后继续走路径 C，在主 PTY/xterm 会话中执行并连续显示输出。
+    if (needsInteractiveAuth) {
+        const combinedCommand = commandEntries.map(e => e.value).join('; ');
+        const confirmed = await requestInteractiveConfirmation(combinedCommand);
+        if (!confirmed) {
+            return { content: [{ type: 'text', text: '用户取消了操作。' }] };
+        }
+    }
+
+    // 路径 C: 标准非管理员会话执行
+    if (isExecutingCommand) {
+        throw new Error('当前已有同步命令执行中，请等待完成或使用 interrupt。');
+    }
+    ensureGuiWindow();
+
+    if (newSession || !ptyProcess) {
+        createNewPtySession();
+    }
+
+    // 必须等渲染端完成 xterm 挂载/监听/首次 fit，且 PowerShell 执行完启动探针，
+    // 才允许向 PTY 注入用户或 AI 指令。替代容易产生竞态的固定 500ms 延时。
+    await waitForTerminalReady();
+
+    if (action === 'startInteractive') {
+        if (commandEntries.length > 1) {
+            throw new Error('startInteractive 只支持单条 command。');
+        }
+
+        const command = commandEntries[0].value;
+        interactiveMode = true;
+        // 不设置 isExecutingCommand；交互式 TUI 输出必须走常驻 guiDataListener，否则会黑屏。
+        ptyProcess.write(`${command}\r`);
+        return { content: [{ type: 'text', text: `Interactive session started: ${command}` }] };
+    }
+
+    if (interactiveMode) {
+        throw new Error('当前终端正被交互式程序 (snow/codex/claude) 占用，请先退出并调用 action:"endInteractive"，或使用 newSession:true 重置会话。');
+    }
+
+    // 就绪等待期间其它调用可能先取得PTY，await后必须再次检查。
+    if (isExecutingCommand) {
+        throw new Error('当前已有同步命令执行中，请等待完成或使用 interrupt。');
+    }
+    const deltaOutputs = [];
+    isExecutingCommand = true;
+    try {
+        for (const entry of commandEntries) {
+            const command = entry.value;
+            const currentReturnModeKey = `returnMode${entry.index || ''}`;
+            const currentReturnMode = args[currentReturnModeKey] || finalReturnMode;
+
+            try {
+                const output = await executeSingleCommandInPty(ptyProcess, command);
+                deltaOutputs.push({ command, output, returnMode: currentReturnMode });
+            } catch (error) {
+                throw new Error(`在执行命令 "${command}" 时出错: ${error.message}`);
+            }
+        }
+    } finally {
+        isExecutingCommand = false;
+    }
+
+    // --- 5. 格式化并返回结果 ---
+    let finalOutput = '';
+    if (finalReturnMode === 'full') {
+        finalOutput = deltaOutputs.length > 0 ? deltaOutputs[deltaOutputs.length - 1].output : '';
+    } else { // delta 模式
+        if (deltaOutputs.length === 1) {
+            finalOutput = deltaOutputs[0].output;
+        } else {
+            finalOutput = deltaOutputs.map(res =>
+                `---[Output for: ${res.command}]---\n${res.output}`
+            ).join('\n\n');
+        }
+    }
+
+    const cleanOutput = finalOutput.replace(/\r\n/g, '\n').replace(/\r/g, '');
+    return { content: [{ type: 'text', text: `\`\`\`powershell\n${cleanOutput}\n\`\`\`` }] };
+}
+
+/**
+ * 清理插件资源，在主程序退出或插件重载时调用。
+ */
+function cleanup() {
+    console.log('[PowerShellExecutor] 正在清理资源...');
+
+    // 1. 关闭并销毁 GUI 窗口
+    if (guiWindow && !guiWindow.isDestroyed()) {
+        try {
+            // 移除 'closed' 监听器，以避免在程序化关闭时触发额外的 ptyProcess.kill()
+            guiWindow.removeAllListeners('closed');
+            guiWindow.close();
+            console.log('[PowerShellExecutor] GUI 窗口已关闭。');
+        } catch (e) {
+            console.error('[PowerShellExecutor] 关闭 GUI 窗口时出错:', e);
+        }
+        guiWindow = null;
+    }
+    guiReady = false;
+    if (resolveGuiReady) {
+        resolveGuiReady();
+        resolveGuiReady = null;
+    }
+    guiReadyPromise = Promise.resolve();
+    visibleTextResolvers.clear();
+    terminalPasteResolvers.clear();
+
+    // 2. 终止所有跟踪的子进程
+    if (childProcesses.size > 0) {
+        console.log(`[PowerShellExecutor] 正在终止 ${childProcesses.size} 个子进程...`);
+        for (const processToKill of childProcesses) {
+            try {
+                // ptyProcess 和 child_process 对象都有一个 .kill() 方法
+                processToKill.kill();
+                console.log(`[PowerShellExecutor] 进程 (PID: ${processToKill.pid}) 已终止。`);
+            } catch (e) {
+                console.error(`[PowerShellExecutor] 终止进程 (PID: ${processToKill.pid}) 时出错:`, e);
+            }
+        }
+        childProcesses.clear();
+    }
+
+    // 3. 停止文件监视器
+    if (settingsWatcher) {
+        try {
+            settingsWatcher.close();
+            settingsWatcher = null;
+            console.log('[PowerShellExecutor] Settings file watcher stopped.');
+        } catch (e) {
+            console.error('[PowerShellExecutor] Error stopping settings watcher:', e);
+        }
+    }
+
+    // 4. 确保 ptyProcess 状态被重置
+    mirrorSinks.clear();
+    replayBuffer = '';
+    mirrorStartupPending = false;
+    mirrorStartupHeld = '';
+    ptyProcess = null;
+    ptyReadyPromise = Promise.resolve();
+    guiDataListener = null;
+    isExecutingCommand = false;
+    interactiveMode = false;
+    activeCommandAbort = null;
+}
+
+// 导出主入口、GUI/清理函数，以及无 Electron 副作用的序列解析器供单元测试使用。
+module.exports = {
+    processToolCall,
+    openGuiTerminal,
+    attachMirror,
+    listCommandRuns,
+    getCommandRun,
+    subscribeCommandRuns,
+    // 仅供测试：跳过 GUI 窗口，直接在共享 PTY 会话里跑一条短命令
+    _runCommandForTest: (command) => executeSingleCommandInPty(ptyProcess, command),
+    ensureMirrorSession,
+    restartSession,
+    getSessionState,
+    writeSessionInput,
+    resizeSession: applyPtyResize,
+    cleanup,
+    parseInteractiveSequence,
+    parseWaitDuration,
+    parseTerminalKey
 };
\ No newline at end of file
diff --git a/modules/topicListManager.js b/modules/topicListManager.js
index 33c19ed72..4495e2976 100644
--- a/modules/topicListManager.js
+++ b/modules/topicListManager.js
@@ -1,1608 +1,1608 @@
-// modules/topicListManager.js
-
-window.topicListManager = (() => {
-    // --- Private Variables ---
-    let topicListContainer;
-    let electronAPI;
-    let chatRepository;
-    let currentSelectedItemRef;
-    let currentTopicIdRef;
-    let topicSelectionReadiness;
-    let uiHelper;
-    let mainRendererFunctions;
-    let listenerOwner;
-    let uiManager;
-    let itemListManager;
-    let renderListenerDisposers = [];
-    let wasSelectionListenerActive = false; // To store the state of the selection listener before dragging
-    let topicListRenderGeneration = 0;
-    let topicListScrollCleanup = null;
-    let topicCountObserver = null;
-    let isManageMode = false;
-    let selectedTopicIds = new Set();
-    let displayedTopics = [];
-    let availableTopics = [];
-    let currentItemConfig = null;
-    let managedItemKey = '';
-
-    const TOPIC_INITIAL_RENDER_COUNT = 40;
-    const TOPIC_PROGRESSIVE_BATCH_SIZE = 30;
-    const TOPIC_LOAD_MORE_THRESHOLD_PX = 320;
-    // Each search reload re-reads the item config and runs a content search
-    // over IPC. Typing waits for a short pause first, in the range ZCode uses
-    // for its IO-backed refreshes (fileWatcherService 150ms, useTabPersistence
-    // 300ms); Enter still searches at once.
-    const TOPIC_SEARCH_DEBOUNCE_MS = 200;
-    let topicSearchTimer = null;
-
-    const addListener = (target, type, handler, options) => {
-        if (listenerOwner) return listenerOwner.add(target, type, handler, options);
-        target?.addEventListener?.(type, handler, options);
-        return true;
-    };
-
-    function addRenderListener(target, type, handler, options) {
-        target?.addEventListener?.(type, handler, options);
-        renderListenerDisposers.push(() => target?.removeEventListener?.(type, handler, options));
-    }
-
-    function cancelPendingTopicSearch() {
-        if (topicSearchTimer) clearTimeout(topicSearchTimer);
-        topicSearchTimer = null;
-    }
-
-    // Names and IPC error strings are user or disk data, so status rows are
-    // built with textContent, never by interpolating into innerHTML.
-    function renderTopicListStatus(topicListUl, message, { loading = false } = {}) {
-        const li = document.createElement('li');
-        if (loading) {
-            const spinner = document.createElement('div');
-            spinner.className = 'loading-spinner-small';
-            li.append(spinner, document.createTextNode(message));
-        } else {
-            const p = document.createElement('p');
-            p.textContent = message;
-            li.appendChild(p);
-        }
-        topicListUl.replaceChildren(li);
-    }
-
-    function disposeRenderListeners() {
-        renderListenerDisposers.splice(0).reverse().forEach(dispose => dispose());
-    }
-
-    /**
-     * Initializes the TopicListManager module.
-     * @param {object} config - The configuration object.
-     */
-    function init(config) {
-        if (!config.elements || !config.elements.topicListContainer) {
-            console.error('[TopicListManager] Missing required DOM element: topicListContainer.');
-            return;
-        }
-        if (!config.electronAPI || !config.refs || !config.uiHelper || !config.mainRendererFunctions || !config.topicSelectionReadiness) {
-            console.error('[TopicListManager] Missing required configuration parameters.');
-            return;
-        }
-
-        topicListContainer = config.elements.topicListContainer;
-        electronAPI = config.electronAPI;
-        chatRepository = config.chatRepository || null;
-        if (!chatRepository) throw new Error('TopicListManager requires ChatRepository');
-        currentSelectedItemRef = config.refs.currentSelectedItemRef;
-        currentTopicIdRef = config.refs.currentTopicIdRef;
-        topicSelectionReadiness = config.topicSelectionReadiness;
-        uiHelper = config.uiHelper;
-        mainRendererFunctions = config.mainRendererFunctions;
-        listenerOwner = config.listenerOwner || null;
-        uiManager = config.uiManager || null;
-        itemListManager = config.itemListManager || null;
-
-        // 设置鼠标快捷键
-        setupMouseShortcuts();
-        setupNextUiTopicTools();
-
-        console.log('[TopicListManager] Initialized successfully.');
-    }
-
-    function getHistory(itemId, itemType, topicId) {
-        return chatRepository.getHistory(itemId, itemType, topicId);
-    }
-
-    function hasUserParticipation(history) {
-        return Array.isArray(history) && history.some(message =>
-            message &&
-            message.role === 'user' &&
-            message.isThinking !== true
-        );
-    }
-
-    function hasValidPersistentUnreadMarker(topic, history) {
-        if (topic?.unread !== true) return false;
-        if (topic.unreadSource === 'manual') return true;
-
-        // Agent/TopicSponsor 产生的旧未读标记在用户参与后即失效。
-        return !hasUserParticipation(history);
-    }
-
-    async function clearStalePersistentUnreadMarker(topic, itemId, history) {
-        if (
-            topic?.unread !== true ||
-            topic.unreadSource === 'manual' ||
-            !hasUserParticipation(history)
-        ) {
-            return;
-        }
-
-        topic.unread = false;
-        delete topic.unreadSource;
-
-        try {
-            const result = await electronAPI.setTopicUnread(itemId, topic.id, false);
-            if (!result?.success) {
-                console.warn(`[TopicListManager] 清理话题 ${topic.id} 的残留未读标记失败:`, result?.error);
-            }
-        } catch (error) {
-            console.warn(`[TopicListManager] 清理话题 ${topic.id} 的残留未读标记失败:`, error);
-        }
-    }
-
-    /**
-     * 统计完全由 Agent 主动发起、尚无用户参与的话题消息数。
-     * 系统消息和思考占位不参与判断；历史中只要出现过用户消息就返回 0。
-     * @param {Array} history - 消息历史
-     * @returns {number}
-     */
-    function countUnreadMessages(history) {
-        if (!Array.isArray(history) || history.length === 0) return 0;
-
-        const effectiveMessages = history.filter(message =>
-            message &&
-            message.role !== 'system' &&
-            message.isThinking !== true
-        );
-
-        if (effectiveMessages.some(message => message.role === 'user')) {
-            return 0;
-        }
-
-        return effectiveMessages.filter(message => message.role === 'assistant').length;
-    }
-
-    function normalizeTopicTitle(topicTitle) {
-        if (typeof topicTitle !== 'string') return topicTitle;
-
-        const trimmedTitle = topicTitle.trim();
-        if (!trimmedTitle) return trimmedTitle;
-        if (trimmedTitle.includes('新话题')) return trimmedTitle;
-
-        const timeMatch = trimmedTitle.match(/(\d{1,2}:\d{2}:\d{2})/);
-        if (trimmedTitle.includes('新话') && timeMatch) {
-            return `新话题 ${timeMatch[1]}`;
-        }
-
-        return trimmedTitle;
-    }
-
-    /**
-     * 解析话题搜索约定词。
-     * 仅当完整输入为“未读话题”或“unread topic”时启用未读置顶。
-     * @param {string} rawValue - 搜索框原始值
-     * @returns {{ rawTerm: string, queryTerm: string, prioritizeUnread: boolean }}
-     */
-    function parseTopicSearchQuery(rawValue) {
-        const rawTerm = String(rawValue || '').trim().toLowerCase();
-        const prioritizeUnread = rawTerm === '未读话题' || rawTerm === 'unread topic';
-
-        return {
-            rawTerm,
-            queryTerm: prioritizeUnread ? '' : rawTerm,
-            prioritizeUnread
-        };
-    }
-
-    /**
-     * 读取各话题历史，并将未读话题稳定地移到顶部。
-     * 未读组与已读组内部均保留用户自定义顺序。
-     */
-    async function prioritizeUnreadTopics(topics, currentSelectedItem) {
-        const topicsWithUnreadState = await Promise.all(topics.map(async topic => {
-            let history = [];
-            try {
-                history = await getHistory(currentSelectedItem.id, currentSelectedItem.type, topic.id);
-            } catch (error) {
-                console.warn(`[TopicListManager] 读取话题 ${topic.id} 的未读状态失败:`, error);
-            }
-
-            const calculatedUnreadCount = Array.isArray(history)
-                ? countUnreadMessages(history)
-                : 0;
-            const hasPersistentUnread = hasValidPersistentUnreadMarker(topic, history);
-
-            await clearStalePersistentUnreadMarker(topic, currentSelectedItem.id, history);
-
-            return {
-                topic,
-                isUnread: calculatedUnreadCount > 0 || hasPersistentUnread,
-                calculatedUnreadCount
-            };
-        }));
-
-        const unreadTopics = [];
-        const readTopics = [];
-        topicsWithUnreadState.forEach(({ topic, isUnread, calculatedUnreadCount }) => {
-            topic.__calculatedUnreadCount = calculatedUnreadCount;
-            (isUnread ? unreadTopics : readTopics).push(topic);
-        });
-
-        return unreadTopics.concat(readTopics);
-    }
-
-    function ensureTopicUnreadIndicator(li, unreadCount = -1) {
-        if (!li) return;
-
-        let indicator = li.querySelector('.topic-unread-indicator');
-        if (!indicator) {
-            indicator = document.createElement('span');
-            indicator.className = 'topic-unread-indicator';
-            const messageCountSpan = li.querySelector('.message-count');
-            li.insertBefore(indicator, messageCountSpan || null);
-        }
-
-        indicator.textContent = unreadCount > 0 ? `未读 ${unreadCount}` : '未读';
-        indicator.title = unreadCount > 0 ? `${unreadCount} 条未读消息` : '未读话题';
-        li.classList.add('has-unread-topic');
-    }
-
-    function removeTopicUnreadIndicator(li) {
-        if (!li) return;
-        li.querySelector('.topic-unread-indicator')?.remove();
-        li.classList.remove('has-unread-topic');
-    }
-
-    /**
-     * Part C: 计算单个话题的未读消息数
-     * @param {Object} topic - 话题对象
-     * @param {Array} history - 话题历史消息
-     * @returns {number} - 未读消息数，-1 表示仅显示小点
-     */
-    function calculateTopicUnreadCount(topic, history) {
-        const count = countUnreadMessages(history);
-        if (count > 0) return count;
-
-        // 没有自动计数时，仅保留仍有效的持久化未读标记。
-        if (hasValidPersistentUnreadMarker(topic, history)) {
-            return -1; // 仅显示小点，不显示数字
-        }
-
-        return 0; // 不显示
-    }
-
-    function cleanupProgressiveTopicRendering() {
-        topicListRenderGeneration++;
-        disposeRenderListeners();
-        if (typeof topicListScrollCleanup === 'function') {
-            topicListScrollCleanup();
-            topicListScrollCleanup = null;
-        }
-        if (topicCountObserver) {
-            topicCountObserver.disconnect();
-            topicCountObserver = null;
-        }
-        const topicListUl = document.getElementById('topicList');
-        if (topicListUl?.sortableInstance) {
-            topicListUl.sortableInstance.destroy();
-            topicListUl.sortableInstance = null;
-        }
-    }
-
-    function getTopicScrollContainer(topicListUl) {
-        return topicListUl?.closest('.sidebar-list-scroll') || topicListContainer;
-    }
-
-    function ensureTopicCountObserver() {
-        if (topicCountObserver) return topicCountObserver;
-
-        topicCountObserver = new IntersectionObserver((entries) => {
-            entries.forEach((entry) => {
-                if (!entry.isIntersecting) return;
-
-                const li = entry.target;
-                topicCountObserver.unobserve(li);
-                loadTopicMessageCount(li);
-            });
-        }, {
-            root: getTopicScrollContainer(document.getElementById('topicList')),
-            rootMargin: '240px 0px',
-            threshold: 0.01
-        });
-
-        return topicCountObserver;
-    }
-
-    function loadTopicMessageCount(li) {
-        if (!li?.isConnected || li.dataset.countLoaded === 'true' || li.dataset.countLoading === 'true') return;
-
-        const itemId = li.dataset.itemId;
-        const itemType = li.dataset.itemType;
-        const topicId = li.dataset.topicId;
-        const topic = li.__topicData;
-        const messageCountSpan = li.querySelector('.message-count');
-
-        if (!itemId || !itemType || !topicId || !topic || !messageCountSpan) return;
-
-        li.dataset.countLoading = 'true';
-
-        let historyPromise;
-        historyPromise = getHistory(itemId, itemType, topicId);
-
-        if (!historyPromise) {
-            messageCountSpan.textContent = 'N/A';
-            li.dataset.countLoaded = 'true';
-            li.dataset.countLoading = 'false';
-            return;
-        }
-
-        historyPromise.then(async historyResult => {
-            if (!li.isConnected) return;
-
-            messageCountSpan.classList.remove('has-unread', 'unread-marker-only');
-
-            if (historyResult && !historyResult.error && Array.isArray(historyResult)) {
-                await clearStalePersistentUnreadMarker(topic, itemId, historyResult);
-                const unreadCount = calculateTopicUnreadCount(topic, historyResult);
-                if (unreadCount > 0) {
-                    messageCountSpan.textContent = `${historyResult.length}`;
-                    messageCountSpan.classList.add('has-unread');
-                    ensureTopicUnreadIndicator(li, unreadCount);
-                } else if (unreadCount === -1) {
-                    messageCountSpan.textContent = `${historyResult.length}`;
-                    messageCountSpan.classList.add('unread-marker-only');
-                    ensureTopicUnreadIndicator(li);
-                } else {
-                    messageCountSpan.textContent = `${historyResult.length}`;
-                    removeTopicUnreadIndicator(li);
-                }
-            } else {
-                messageCountSpan.textContent = 'N/A';
-            }
-            li.dataset.countLoaded = 'true';
-        }).catch(() => {
-            if (li.isConnected) {
-                messageCountSpan.textContent = 'ERR';
-            }
-        }).finally(() => {
-            if (li.isConnected) {
-                li.dataset.countLoading = 'false';
-            }
-        });
-    }
-
-    function createTopicListItem(topic, currentSelectedItem, currentTopicId, itemConfigFull) {
-        const li = document.createElement('li');
-        li.classList.add('topic-item');
-        li.dataset.itemId = currentSelectedItem.id;
-        li.dataset.itemType = currentSelectedItem.type;
-        li.dataset.topicId = topic.id;
-        li.__topicData = topic;
-
-        const isCurrentActiveTopic = topic.id === currentTopicId;
-        const isPersistentlyUnread = topic.unread === true || topic.__calculatedUnreadCount > 0;
-        li.classList.toggle('active', isCurrentActiveTopic);
-        li.classList.toggle('active-topic-glowing', isCurrentActiveTopic);
-        li.classList.toggle('has-unread-topic', isPersistentlyUnread);
-
-        const avatarImg = document.createElement('img');
-        avatarImg.classList.add('avatar');
-        avatarImg.loading = 'lazy';
-        avatarImg.decoding = 'async';
-        avatarImg.src = currentSelectedItem.avatarUrl ? currentSelectedItem.avatarUrl : (currentSelectedItem.type === 'group' ? 'assets/default_group_avatar.png' : 'assets/default_avatar.png');
-
-        const displayTopicTitle = normalizeTopicTitle(topic.name || `话题 ${topic.id}`);
-        avatarImg.alt = `${currentSelectedItem.name} - ${displayTopicTitle}`;
-        avatarImg.onerror = () => { avatarImg.src = (currentSelectedItem.type === 'group' ? 'assets/default_group_avatar.png' : 'assets/default_avatar.png'); };
-
-        const topicTitleDisplay = document.createElement('span');
-        topicTitleDisplay.classList.add('topic-title-display');
-        topicTitleDisplay.textContent = displayTopicTitle;
-
-        const messageCountSpan = document.createElement('span');
-        messageCountSpan.classList.add('message-count');
-        messageCountSpan.textContent = '...';
-
-        const selectionIcon = document.createElement('span');
-        selectionIcon.classList.add('next-ui-topic-select-icon', 'vcp-ui-icon');
-        selectionIcon.setAttribute('aria-hidden', 'true');
-        selectionIcon.textContent = selectedTopicIds.has(topic.id) ? 'check_box' : 'check_box_outline_blank';
-        li.appendChild(selectionIcon);
-        li.appendChild(avatarImg);
-
-        if (topic.locked === false) {
-            const unlockedIndicator = document.createElement('span');
-            unlockedIndicator.classList.add('unlocked-indicator');
-            unlockedIndicator.textContent = 'unlocked';
-            unlockedIndicator.title = 'AI可以查看和回复此话题';
-            li.appendChild(unlockedIndicator);
-        }
-
-        li.appendChild(topicTitleDisplay);
-        if (isPersistentlyUnread) {
-            ensureTopicUnreadIndicator(li, topic.__calculatedUnreadCount);
-        }
-        li.appendChild(messageCountSpan);
-
-        const observer = ensureTopicCountObserver();
-        observer.observe(li);
-
-        addRenderListener(li, 'click', async () => {
-            if (isManageMode) {
-                toggleTopicSelection(topic.id);
-                return;
-            }
-
-            if (currentTopicIdRef.get() === topic.id) {
-                return;
-            }
-
-            if (!topicSelectionReadiness.isReady()) {
-                topicSelectionReadiness.defer({
-                    itemId: currentSelectedItem.id,
-                    itemType: currentSelectedItem.type,
-                    topicId: topic.id,
-                });
-                if (uiHelper && uiHelper.showToastNotification) {
-                    uiHelper.showToastNotification('正在初始化界面，稍后自动打开该话题', 'info');
-                }
-                return;
-            }
-
-            try {
-                await Promise.resolve(mainRendererFunctions.selectTopic(topic.id));
-            } catch (error) {
-                console.error('[TopicListManager] Failed to select topic:', error);
-                if (uiHelper && uiHelper.showToastNotification) {
-                    uiHelper.showToastNotification(`打开话题失败: ${error.message}`, 'error');
-                }
-            }
-        });
-
-        addRenderListener(li, 'contextmenu', (e) => {
-            e.preventDefault();
-            if (isManageMode) return;
-            showTopicContextMenu(e, li, itemConfigFull, topic, currentSelectedItem.type);
-        });
-
-        return li;
-    }
-
-    function renderTopicListProgressively(topicListUl, topicsToProcess, currentSelectedItem, currentTopicId, itemConfigFull, searchTerm) {
-        const renderGeneration = topicListRenderGeneration;
-        const scrollContainer = getTopicScrollContainer(topicListUl);
-        const totalCount = topicsToProcess.length;
-        const initialCount = searchTerm
-            ? Math.min(Math.max(TOPIC_INITIAL_RENDER_COUNT, TOPIC_PROGRESSIVE_BATCH_SIZE), totalCount)
-            : Math.min(TOPIC_INITIAL_RENDER_COUNT, totalCount);
-
-        let currentIndex = 0;
-        let isRendering = false;
-        let allRendered = false;
-
-        const statusLi = document.createElement('li');
-        statusLi.className = 'topic-list-progressive-status';
-        statusLi.textContent = '';
-        statusLi.style.justifyContent = 'center';
-        statusLi.style.opacity = '0.75';
-
-        const finalizeIfDone = () => {
-            if (!allRendered || renderGeneration !== topicListRenderGeneration) return;
-
-            statusLi.remove();
-            if (typeof topicListScrollCleanup === 'function') {
-                topicListScrollCleanup();
-                topicListScrollCleanup = null;
-            }
-
-            if (currentSelectedItem.id && topicsToProcess.length > 0 && typeof Sortable !== 'undefined' && !searchTerm) {
-                initializeTopicSortable(currentSelectedItem.id, currentSelectedItem.type);
-            }
-        };
-
-        const renderNextBatch = (batchSize = TOPIC_PROGRESSIVE_BATCH_SIZE) => {
-            if (isRendering || allRendered || renderGeneration !== topicListRenderGeneration) return;
-            isRendering = true;
-
-            requestAnimationFrame(() => {
-                if (renderGeneration !== topicListRenderGeneration) {
-                    isRendering = false;
-                    return;
-                }
-
-                const fragment = document.createDocumentFragment();
-                const end = Math.min(currentIndex + batchSize, totalCount);
-
-                for (; currentIndex < end; currentIndex++) {
-                    fragment.appendChild(createTopicListItem(
-                        topicsToProcess[currentIndex],
-                        currentSelectedItem,
-                        currentTopicId,
-                        itemConfigFull
-                    ));
-                }
-
-                if (statusLi.parentNode === topicListUl) {
-                    topicListUl.insertBefore(fragment, statusLi);
-                } else {
-                    topicListUl.appendChild(fragment);
-                }
-
-                allRendered = currentIndex >= totalCount;
-                isRendering = false;
-
-                if (!allRendered) {
-                    statusLi.textContent = `继续向下滚动加载更多话题（${currentIndex}/${totalCount}）`;
-                    if (!statusLi.parentNode) topicListUl.appendChild(statusLi);
-                    if (scrollContainer.scrollHeight <= scrollContainer.clientHeight + TOPIC_LOAD_MORE_THRESHOLD_PX) {
-                        renderNextBatch();
-                    }
-                } else {
-                    finalizeIfDone();
-                }
-            });
-        };
-
-        const onScroll = () => {
-            if (allRendered || isRendering || renderGeneration !== topicListRenderGeneration) return;
-
-            const distanceToBottom = scrollContainer.scrollHeight - scrollContainer.scrollTop - scrollContainer.clientHeight;
-            if (distanceToBottom <= TOPIC_LOAD_MORE_THRESHOLD_PX) {
-                renderNextBatch();
-            }
-        };
-
-        scrollContainer.addEventListener('scroll', onScroll, { passive: true });
-        topicListScrollCleanup = () => scrollContainer.removeEventListener('scroll', onScroll);
-
-        topicListUl.innerHTML = '';
-        renderNextBatch(initialCount);
-    }
-
-    async function loadTopicList() {
-        if (!topicListContainer) {
-            console.error("Topic list container (tabContentTopics) not found.");
-            return;
-        }
-
-        cancelPendingTopicSearch();
-        cleanupProgressiveTopicRendering();
-        const loadGeneration = topicListRenderGeneration;
-
-        let topicListUl = topicListContainer.querySelector('.topic-list');
-        if (topicListUl) {
-            topicListUl.innerHTML = '';
-        } else {
-            const topicsHeader = topicListContainer.querySelector('.topics-header') || document.createElement('div');
-            if (!topicsHeader.classList.contains('topics-header')) {
-                topicsHeader.className = 'topics-header';
-                topicsHeader.innerHTML = `<h2>话题列表</h2><div class="topic-search-container"><input type="text" id="topicSearchInput" placeholder="搜索话题；输入“未读话题”置顶" title="输入“未读话题”或“unread topic”将未读话题置顶" aria-label="搜索话题；输入未读话题将未读话题置顶" class="topic-search-input"></div>`;
-                topicListContainer.prepend(topicsHeader);
-                const newTopicSearchInput = topicsHeader.querySelector('#topicSearchInput');
-                if (newTopicSearchInput) setupTopicSearchListener(newTopicSearchInput);
-            }
-
-            topicListUl = document.createElement('ul');
-            topicListUl.className = 'topic-list';
-            topicListUl.id = 'topicList';
-            topicListContainer.appendChild(topicListUl);
-        }
-
-        const currentSelectedItem = currentSelectedItemRef.get();
-        if (!currentSelectedItem.id) {
-            availableTopics = [];
-            displayedTopics = [];
-            currentItemConfig = null;
-            managedItemKey = '';
-            selectedTopicIds.clear();
-            syncManageUi();
-            topicListUl.innerHTML = '<li><p>请先在“助手与群组”列表选择一个项目以查看其相关话题。</p></li>';
-            return;
-        }
-
-        const nextItemKey = `${currentSelectedItem.type}:${currentSelectedItem.id}`;
-        if (managedItemKey && managedItemKey !== nextItemKey) {
-            selectedTopicIds.clear();
-        }
-        managedItemKey = nextItemKey;
-
-        const itemNameForLoading = currentSelectedItem.name || '当前项目';
-        const searchInput = document.getElementById('topicSearchInput');
-        const searchQuery = parseTopicSearchQuery(searchInput ? searchInput.value : '');
-        const searchTerm = searchQuery.rawTerm;
-        const contentQueryTerm = searchQuery.queryTerm;
-
-        let itemConfigFull;
-
-        if (!searchTerm) {
-            renderTopicListStatus(topicListUl, `正在加载 ${itemNameForLoading} 的话题...`, { loading: true });
-        } else {
-            topicListUl.innerHTML = '';
-        }
-
-        try {
-            if (currentSelectedItem.type === 'agent') {
-                itemConfigFull = await electronAPI.getAgentConfig(currentSelectedItem.id);
-            } else if (currentSelectedItem.type === 'group') {
-                itemConfigFull = await electronAPI.getAgentGroupConfig(currentSelectedItem.id);
-            }
-        } catch (error) {
-            // A rejected IPC call used to leave the loading spinner up for good.
-            console.error('[TopicListManager] Failed to load item config:', error);
-            itemConfigFull = { error: error?.message || String(error) };
-        }
-
-        if (loadGeneration !== topicListRenderGeneration ||
-            currentSelectedItemRef.get()?.id !== currentSelectedItem.id ||
-            currentSelectedItemRef.get()?.type !== currentSelectedItem.type) {
-            return;
-        }
-
-        if (itemConfigFull && !itemConfigFull.error) {
-            mainRendererFunctions.updateCurrentItemConfig(itemConfigFull);
-        }
-
-        if (!itemConfigFull || itemConfigFull.error) {
-            availableTopics = [];
-            displayedTopics = [];
-            currentItemConfig = null;
-            selectedTopicIds.clear();
-            syncManageUi();
-            renderTopicListStatus(topicListUl, `无法加载 ${itemNameForLoading} 的配置信息: ${itemConfigFull?.error || '未知错误'}`);
-        } else {
-            let topicsToProcess = itemConfigFull.topics || [];
-            if (currentSelectedItem.type === 'agent' && topicsToProcess.length === 0) {
-                const defaultAgentTopic = { id: "default", name: "主要对话", createdAt: Date.now() };
-                topicsToProcess.push(defaultAgentTopic);
-            }
-
-            availableTopics = [...topicsToProcess];
-            currentItemConfig = itemConfigFull;
-            const availableTopicIds = new Set(availableTopics.map(topic => topic.id));
-            selectedTopicIds = new Set([...selectedTopicIds].filter(topicId => availableTopicIds.has(topicId)));
-
-            // topicsToProcess.sort((a, b) => (b.createdAt || 0) - (a.createdAt || 0));
-
-            if (contentQueryTerm) {
-                let frontendFilteredTopics = topicsToProcess.filter(topic => {
-                    const normalizedTopicTitle = normalizeTopicTitle(topic.name || '');
-                    const nameMatch = normalizedTopicTitle.toLowerCase().includes(contentQueryTerm);
-                    let dateMatch = false;
-                    if (topic.createdAt) {
-                        const date = new Date(topic.createdAt);
-                        const fullDateStr = `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')} ${String(date.getHours()).padStart(2, '0')}:${String(date.getMinutes()).padStart(2, '0')}`;
-                        const shortDateStr = `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')}`;
-                        dateMatch = fullDateStr.toLowerCase().includes(contentQueryTerm) || shortDateStr.toLowerCase().includes(contentQueryTerm);
-                    }
-                    return nameMatch || dateMatch;
-                });
-
-                let contentMatchedTopicIds = [];
-                try {
-                    const contentSearchResult = await electronAPI.searchTopicsByContent(currentSelectedItem.id, currentSelectedItem.type, contentQueryTerm);
-                    if (contentSearchResult && contentSearchResult.success && Array.isArray(contentSearchResult.matchedTopicIds)) {
-                        contentMatchedTopicIds = contentSearchResult.matchedTopicIds;
-                    } else if (contentSearchResult && !contentSearchResult.success) {
-                        console.warn("Topic content search failed:", contentSearchResult.error);
-                    }
-                } catch (e) {
-                    console.error("Error calling searchTopicsByContent:", e);
-                }
-
-                const finalFilteredTopicIds = new Set(frontendFilteredTopics.map(t => t.id));
-                contentMatchedTopicIds.forEach(id => finalFilteredTopicIds.add(id));
-
-                topicsToProcess = topicsToProcess.filter(topic => finalFilteredTopicIds.has(topic.id));
-            }
-
-            if (searchQuery.prioritizeUnread) {
-                topicsToProcess = await prioritizeUnreadTopics(topicsToProcess, currentSelectedItem);
-            }
-
-            if (loadGeneration !== topicListRenderGeneration ||
-                currentSelectedItemRef.get()?.id !== currentSelectedItem.id ||
-                currentSelectedItemRef.get()?.type !== currentSelectedItem.type) {
-                return;
-            }
-
-            displayedTopics = [...topicsToProcess];
-            syncManageUi();
-
-            if (topicsToProcess.length === 0) {
-                renderTopicListStatus(topicListUl, `${itemNameForLoading} 还没有任何话题${searchTerm ? '匹配当前搜索' : ''}。您可以点击上方的“新建${currentSelectedItem.type === 'group' ? '群聊话题' : '聊天话题'}”按钮创建一个。`);
-            } else {
-                const currentTopicId = currentTopicIdRef.get();
-                renderTopicListProgressively(topicListUl, topicsToProcess, currentSelectedItem, currentTopicId, itemConfigFull, searchTerm);
-            }
-        }
-    }
-
-    function setupTopicSearch() {
-        let searchInput = document.getElementById('topicSearchInput');
-        if (searchInput) {
-            setupTopicSearchListener(searchInput);
-        }
-    }
-
-    function setupTopicSearchListener(inputElement) {
-        if (inputElement.dataset.topicSearchBound === 'true') return;
-        inputElement.dataset.topicSearchBound = 'true';
-
-        addListener(inputElement, 'input', scheduleTopicSearch);
-        addListener(inputElement, 'keydown', (event) => {
-            if (event.key === 'Enter') {
-                event.preventDefault();
-                filterTopicList();
-            }
-        });
-    }
-
-    function scheduleTopicSearch() {
-        cancelPendingTopicSearch();
-        topicSearchTimer = setTimeout(() => {
-            topicSearchTimer = null;
-            loadTopicList();
-        }, TOPIC_SEARCH_DEBOUNCE_MS);
-    }
-
-    function filterTopicList() {
-        loadTopicList();
-    }
-
-    function setupNextUiTopicTools() {
-        const topicsHeader = document.querySelector('#tabContentTopics .topics-header-container');
-        const createButton = document.getElementById('nextUiCreateTopicBtn');
-        const manageButton = document.getElementById('nextUiManageTopicsBtn');
-        const searchButton = document.getElementById('nextUiTopicSearchTrigger');
-        const searchCloseButton = document.getElementById('nextUiTopicSearchClose');
-        const searchInput = document.getElementById('topicSearchInput');
-        const selectAllButton = document.getElementById('nextUiSelectAllTopicsBtn');
-        const deleteButton = document.getElementById('nextUiDeleteTopicsBtn');
-        const exitButton = document.getElementById('nextUiExitTopicManageBtn');
-
-        if (!topicsHeader || !createButton || !manageButton || !searchButton || !searchCloseButton || !searchInput) return;
-        if (topicsHeader.dataset.nextUiToolsBound === 'true') return;
-        topicsHeader.dataset.nextUiToolsBound = 'true';
-
-        const setSearchMode = (active, clear = !active) => {
-            topicsHeader.classList.toggle('is-searching', active);
-            searchButton.setAttribute('aria-expanded', String(active));
-            if (clear) {
-                searchInput.value = '';
-                loadTopicList();
-            }
-            if (active) requestAnimationFrame(() => searchInput.focus());
-            else if (document.activeElement === searchInput) searchButton.focus();
-        };
-
-        addListener(createButton, 'click', () => {
-            document.getElementById('currentAgentSettingsBtn')?.dispatchEvent(new MouseEvent('click', { bubbles: true }));
-        });
-        addListener(createButton, 'contextmenu', (event) => {
-            event.preventDefault();
-            document.getElementById('currentAgentSettingsBtn')?.dispatchEvent(new MouseEvent('contextmenu', {
-                bubbles: true,
-                clientX: event.clientX,
-                clientY: event.clientY
-            }));
-        });
-        addListener(manageButton, 'click', () => setManageMode(!isManageMode));
-        addListener(searchButton, 'click', () => setSearchMode(true, false));
-        addListener(searchCloseButton, 'click', () => setSearchMode(false, true));
-        addListener(searchInput, 'keydown', (event) => {
-            if (event.key === 'Escape') {
-                event.preventDefault();
-                setSearchMode(false, true);
-            }
-        });
-        if (selectAllButton) addListener(selectAllButton, 'click', toggleSelectAllDisplayedTopics);
-        if (deleteButton) addListener(deleteButton, 'click', deleteSelectedTopics);
-        if (exitButton) addListener(exitButton, 'click', () => setManageMode(false));
-
-        syncManageUi();
-    }
-
-    function setManageMode(active) {
-        isManageMode = active;
-        if (!active) selectedTopicIds.clear();
-
-        const topicListUl = document.getElementById('topicList');
-        if (active && topicListUl?.sortableInstance) {
-            topicListUl.sortableInstance.destroy();
-            topicListUl.sortableInstance = null;
-        } else if (!active) {
-            loadTopicList();
-        }
-
-        syncManageUi();
-    }
-
-    function toggleTopicSelection(topicId) {
-        if (selectedTopicIds.has(topicId)) selectedTopicIds.delete(topicId);
-        else selectedTopicIds.add(topicId);
-        syncManageUi();
-    }
-
-    function toggleSelectAllDisplayedTopics() {
-        const displayedIds = displayedTopics.map(topic => topic.id);
-        const allDisplayedSelected = displayedIds.length > 0 && displayedIds.every(topicId => selectedTopicIds.has(topicId));
-
-        if (allDisplayedSelected) displayedIds.forEach(topicId => selectedTopicIds.delete(topicId));
-        else displayedIds.forEach(topicId => selectedTopicIds.add(topicId));
-        syncManageUi();
-    }
-
-    function syncManageUi() {
-        const container = document.getElementById('tabContentTopics');
-        const manageButton = document.getElementById('nextUiManageTopicsBtn');
-        const managePanel = container?.querySelector('.next-ui-topic-manage-panel');
-        const count = document.getElementById('nextUiTopicSelectionCount');
-        const selectAllButton = document.getElementById('nextUiSelectAllTopicsBtn');
-        const deleteButton = document.getElementById('nextUiDeleteTopicsBtn');
-        const allDisplayedSelected = displayedTopics.length > 0
-            && displayedTopics.every(topic => selectedTopicIds.has(topic.id));
-
-        container?.classList.toggle('is-managing', isManageMode);
-        manageButton?.classList.toggle('active', isManageMode);
-        manageButton?.setAttribute('aria-pressed', String(isManageMode));
-        managePanel?.setAttribute('aria-hidden', String(!isManageMode));
-        if (count) count.textContent = `已选择 ${selectedTopicIds.size} 项`;
-        if (deleteButton) deleteButton.disabled = selectedTopicIds.size === 0;
-        const selectAllIcon = selectAllButton?.querySelector('.vcp-ui-icon');
-        if (selectAllIcon) selectAllIcon.textContent = allDisplayedSelected ? 'check_box' : 'check_box_outline_blank';
-        if (selectAllButton) selectAllButton.title = allDisplayedSelected ? '取消全选' : '全选话题';
-
-        document.querySelectorAll('#topicList .topic-item').forEach(item => {
-            const selected = selectedTopicIds.has(item.dataset.topicId);
-            item.classList.toggle('selected', selected);
-            item.setAttribute('aria-selected', String(selected));
-            const icon = item.querySelector('.next-ui-topic-select-icon');
-            if (icon) icon.textContent = selected ? 'check_box' : 'check_box_outline_blank';
-        });
-    }
-
-    async function deleteSelectedTopics() {
-        if (!isManageMode || selectedTopicIds.size === 0 || !currentItemConfig) return;
-
-        const currentSelectedItem = currentSelectedItemRef.get();
-        const topicsToDelete = availableTopics.filter(topic => selectedTopicIds.has(topic.id));
-        if (topicsToDelete.length === 0) return;
-        if (topicsToDelete.length >= availableTopics.length) {
-            uiHelper.showToastNotification('至少需要保留一个话题。', 'warning');
-            return;
-        }
-
-        const flowlockedTopic = currentSelectedItem.type === 'agent'
-            ? topicsToDelete.find(topic => window.flowlockManager?.isTopicLocked?.(currentSelectedItem.id, topic.id))
-            : null;
-        if (flowlockedTopic) {
-            uiHelper.showToastNotification(`话题“${flowlockedTopic.name}”正在心流锁中运行，请先停止对应心流锁。`, 'warning');
-            return;
-        }
-
-        const confirmed = await uiHelper.showConfirmDialog(
-            `确定要永久删除选中的 ${topicsToDelete.length} 个话题吗？此操作不可撤销。`,
-            '批量删除话题',
-            '删除',
-            '取消',
-            true
-        );
-        if (!confirmed) return;
-
-        let deletedCount = 0;
-        let remainingTopics = availableTopics;
-        let firstError = '';
-        const activeTopicId = currentTopicIdRef.get();
-        let activeTopicDeleted = false;
-
-        for (const topic of topicsToDelete) {
-            try {
-                const result = currentSelectedItem.type === 'agent'
-                    ? await electronAPI.deleteTopic(currentSelectedItem.id, topic.id)
-                    : await electronAPI.deleteGroupTopic(currentSelectedItem.id, topic.id);
-                if (result?.success) {
-                    deletedCount++;
-                    if (topic.id === activeTopicId) activeTopicDeleted = true;
-                    remainingTopics = result.remainingTopics || remainingTopics.filter(item => item.id !== topic.id);
-                } else if (!firstError) {
-                    firstError = result?.error || '未知错误';
-                }
-            } catch (error) {
-                if (!firstError) firstError = error.message;
-            }
-        }
-
-        const deletedTopicIds = topicsToDelete.map(topic => topic.id).filter(id => !remainingTopics.some(item => item.id === id));
-        if (deletedTopicIds.length) mainRendererFunctions.onTopicsDeleted?.({ itemId: currentSelectedItem.id, itemType: currentSelectedItem.type, topicIds: deletedTopicIds });
-        if (activeTopicDeleted) {
-            mainRendererFunctions.handleTopicDeletion(remainingTopics, {
-                id: currentSelectedItem.id,
-                type: currentSelectedItem.type,
-                deletedTopicIds: topicsToDelete.map(topic => topic.id),
-                fallbackTopicId: topicsToDelete.some(topic => topic.id === activeTopicId) ? null : activeTopicId,
-            });
-        }
-
-        setManageMode(false);
-        if (deletedCount > 0) uiHelper.showToastNotification(`已删除 ${deletedCount} 个话题。`, 'success');
-        if (firstError) uiHelper.showToastNotification(`部分话题删除失败：${firstError}`, 'error');
-    }
-
-    function initializeTopicSortable(itemId, itemType) {
-        const topicListUl = document.getElementById('topicList');
-        if (!topicListUl) {
-            console.warn("[TopicListManager] topicListUl element not found. Skipping Sortable initialization.");
-            return;
-        }
-
-        if (topicListUl.sortableInstance) {
-            topicListUl.sortableInstance.destroy();
-        }
-
-        const targetItemId = itemId;
-        const targetItemType = itemType;
-        topicListUl.sortableInstance = new Sortable(topicListUl, {
-            animation: 150,
-            ghostClass: 'sortable-ghost-topic',
-            chosenClass: 'sortable-chosen-topic',
-            dragClass: 'sortable-drag-topic',
-            onStart: async function (evt) {
-                // Check original state, store it, and then disable if it was active.
-                if (electronAPI?.getSelectionListenerStatus) {
-                    wasSelectionListenerActive = await electronAPI.getSelectionListenerStatus();
-                    if (wasSelectionListenerActive) {
-                        electronAPI.toggleSelectionListener(false);
-                    }
-                }
-            },
-            onEnd: async function (evt) {
-                // Re-enable selection hook only if it was active before the drag.
-                if (electronAPI?.toggleSelectionListener) {
-                    if (wasSelectionListenerActive) {
-                        electronAPI.toggleSelectionListener(true);
-                    }
-                    wasSelectionListenerActive = false; // Reset state
-                }
-
-                const topicItems = Array.from(evt.to.children);
-                const orderedTopicIds = topicItems.map(item => item.dataset.topicId);
-                try {
-                    let result;
-                    if (targetItemType === 'agent') {
-                        result = await electronAPI.saveTopicOrder(targetItemId, orderedTopicIds);
-                    } else if (targetItemType === 'group') {
-                        result = await electronAPI.saveGroupTopicOrder(targetItemId, orderedTopicIds);
-                    }
-
-                    if (result && result.success) {
-                        // UI reflects sort.
-                    } else {
-                        console.error(`Failed to save topic order for ${targetItemType} ${targetItemId}:`, result?.error);
-                        uiHelper.showToastNotification(`保存话题顺序失败: ${result?.error || '未知错误'}`, 'error');
-                        loadTopicList();
-                    }
-                } catch (error) {
-                    console.error(`Error calling saveTopicOrder for ${targetItemType} ${targetItemId}:`, error);
-                    uiHelper.showToastNotification(`调用保存话题顺序API时出错: ${error.message}`, 'error');
-                    loadTopicList();
-                }
-            }
-        });
-    }
-
-    function showTopicContextMenu(event, topicItemElement, itemFullConfig, topic, itemType) {
-        // closeContextMenu(); // This function is not available in this module
-        closeTopicContextMenu();
-
-        const menu = document.createElement('div');
-        menu.id = 'topicContextMenu';
-        menu.classList.add('context-menu');
-
-        // 冻结话题域目标；标题生成允许即时保存，但绝不能跨项目串写。
-        const targetItemId = itemFullConfig.id;
-        const targetItemType = itemType;
-        const targetTopicId = topic.id;
-        // "生成话题名" 菜单项：Agent 和 Group 话题均支持
-        const regenerateTitleOption = document.createElement('div');
-        regenerateTitleOption.classList.add('context-menu-item');
-        regenerateTitleOption.innerHTML = `<i class="fas fa-magic"></i> 生成话题名`;
-        regenerateTitleOption.onclick = async () => {
-            closeTopicContextMenu();
-            if (regenerateTitleOption.dataset.loading === 'true') return;
-
-            regenerateTitleOption.dataset.loading = 'true';
-            regenerateTitleOption.classList.add('disabled');
-            try {
-                // 根据话题类型调用对应的 IPC
-                const result = targetItemType === 'agent'
-                    ? await electronAPI.regenerateAgentTopicTitle(targetItemId, targetTopicId)
-                    : await electronAPI.regenerateGroupTopicTitle(targetItemId, targetTopicId);
-
-                if (result?.success && result.newTitle) {
-                    // 原话题已保存；离开原项目后不再投影到当前界面，也不误报失败。
-                    if (currentSelectedItemRef.get()?.id !== targetItemId ||
-                        currentSelectedItemRef.get()?.type !== targetItemType) return;
-                    topic.name = result.newTitle;
-                    const topicInFullConfig = itemFullConfig.topics?.find(candidate => candidate.id === topic.id);
-                    if (topicInFullConfig) topicInFullConfig.name = result.newTitle;
-
-                    const titleDisplayElement = topicItemElement.querySelector('.topic-title-display, .topic-name');
-                    if (titleDisplayElement) titleDisplayElement.textContent = result.newTitle;
-                    uiHelper.showToastNotification(`话题名已更新为"${result.newTitle}"`, 'success');
-                } else {
-                    // 失败时不修改 topic、itemFullConfig 或 DOM，保留旧标题。
-                    uiHelper.showToastNotification(`生成话题名失败: ${result?.error || 'AI 未返回有效标题'}`, 'error');
-                }
-            } catch (error) {
-                // 请求异常时同样不触碰旧标题。
-                console.error('[TopicListManager] 生成话题名失败:', error);
-                uiHelper.showToastNotification(`生成话题名失败: ${error.message}`, 'error');
-            } finally {
-                regenerateTitleOption.dataset.loading = 'false';
-                regenerateTitleOption.classList.remove('disabled');
-            }
-        };
-
-        const editTitleOption = document.createElement('div');
-        editTitleOption.classList.add('context-menu-item');
-        editTitleOption.innerHTML = `<i class="fas fa-edit"></i> 编辑话题标题`;
-        editTitleOption.onclick = () => {
-            closeTopicContextMenu();
-            const titleDisplayElement = topicItemElement.querySelector('.topic-title-display');
-            if (!titleDisplayElement) return;
-
-            const originalTitle = topic.name;
-            titleDisplayElement.style.display = 'none';
-
-            const inputWrapper = document.createElement('div');
-            inputWrapper.style.display = 'flex';
-            inputWrapper.style.alignItems = 'center';
-
-            const inputField = document.createElement('input');
-            inputField.type = 'text';
-            inputField.value = originalTitle;
-            inputField.classList.add('topic-title-edit-input');
-            inputField.style.flexGrow = '1';
-            inputField.onclick = (e) => e.stopPropagation();
-
-            const confirmButton = document.createElement('button');
-            confirmButton.type = 'button';
-            confirmButton.innerHTML = '✓';
-            confirmButton.classList.add('topic-title-edit-confirm');
-            confirmButton.onclick = async (e) => {
-                e.stopPropagation();
-                const newTitle = inputField.value.trim();
-                if (newTitle && newTitle !== originalTitle) {
-                    let saveResult;
-                    if (targetItemType === 'agent') {
-                        saveResult = await electronAPI.saveAgentTopicTitle(targetItemId, targetTopicId, newTitle);
-                    } else if (targetItemType === 'group') {
-                        saveResult = await electronAPI.saveGroupTopicTitle(targetItemId, targetTopicId, newTitle);
-                    }
-                    if (saveResult && saveResult.success) {
-                        topic.name = newTitle;
-                        titleDisplayElement.textContent = newTitle;
-                        if (itemFullConfig.topics) {
-                            const topicInFullConfig = itemFullConfig.topics.find(t => t.id === topic.id);
-                            if (topicInFullConfig) topicInFullConfig.name = newTitle;
-                        }
-                    } else {
-                        uiHelper.showToastNotification(`更新话题标题失败: ${saveResult?.error || '未知错误'}`, 'error');
-                    }
-                }
-                titleDisplayElement.style.display = '';
-                inputWrapper.replaceWith(titleDisplayElement);
-            };
-
-            const cancelButton = document.createElement('button');
-            cancelButton.type = 'button';
-            cancelButton.innerHTML = '✗';
-            cancelButton.classList.add('topic-title-edit-cancel');
-            cancelButton.onclick = (e) => {
-                e.stopPropagation();
-                titleDisplayElement.style.display = '';
-                inputWrapper.replaceWith(titleDisplayElement);
-            };
-
-            inputWrapper.appendChild(inputField);
-            inputWrapper.appendChild(confirmButton);
-            inputWrapper.appendChild(cancelButton);
-            topicItemElement.insertBefore(inputWrapper, titleDisplayElement.nextSibling);
-            inputField.focus();
-            inputField.select();
-
-            inputField.addEventListener('keydown', (e) => {
-                if (e.key === 'Enter') {
-                    confirmButton.click();
-                } else if (e.key === 'Escape') {
-                    cancelButton.click();
-                }
-            });
-        };
-        menu.appendChild(editTitleOption);
-        menu.appendChild(regenerateTitleOption);
-
-        const copyTopicIdOption = document.createElement('div');
-        copyTopicIdOption.classList.add('context-menu-item');
-        copyTopicIdOption.innerHTML = `<i class="fas fa-copy"></i> 复制话题ID`;
-        copyTopicIdOption.onclick = async () => {
-            closeTopicContextMenu();
-            const topicId = String(topic.id ?? '');
-            try {
-                if (navigator.clipboard?.writeText) {
-                    await navigator.clipboard.writeText(topicId);
-                } else {
-                    const textarea = document.createElement('textarea');
-                    textarea.value = topicId;
-                    textarea.style.position = 'fixed';
-                    textarea.style.opacity = '0';
-                    document.body.appendChild(textarea);
-                    textarea.focus();
-                    textarea.select();
-                    document.execCommand('copy');
-                    textarea.remove();
-                }
-                uiHelper.showToastNotification('已复制话题ID', 'success');
-            } catch (error) {
-                console.error('[TopicListManager] Failed to copy topic ID:', error);
-                uiHelper.showToastNotification(`复制话题ID失败: ${error.message}`, 'error');
-            }
-        };
-        menu.appendChild(copyTopicIdOption);
-
-        // Part C: 锁定/解锁话题选项
-        const toggleLockOption = document.createElement('div');
-        toggleLockOption.classList.add('context-menu-item');
-        const isLocked = topic.locked !== false; // 默认为锁定
-        toggleLockOption.innerHTML = isLocked
-            ? `<i class="fas fa-unlock"></i> 解锁话题`
-            : `<i class="fas fa-lock"></i> 锁定话题`;
-        toggleLockOption.onclick = async () => {
-            closeTopicContextMenu();
-            try {
-                const result = await electronAPI.toggleTopicLock(targetItemId, targetTopicId);
-                if (result.success) {
-                    topic.locked = result.locked;
-                    uiHelper.showToastNotification(result.message, 'success');
-                    loadTopicList(); // 刷新列表以显示新状态
-                } else {
-                    uiHelper.showToastNotification(`切换锁定状态失败: ${result.error}`, 'error');
-                }
-            } catch (error) {
-                uiHelper.showToastNotification(`操作失败: ${error.message}`, 'error');
-            }
-        };
-        menu.appendChild(toggleLockOption);
-
-        // Part C: 标记为未读/已读选项
-        const toggleUnreadOption = document.createElement('div');
-        toggleUnreadOption.classList.add('context-menu-item');
-        const isUnread = topic.unread === true;
-        toggleUnreadOption.innerHTML = isUnread
-            ? `<i class="fas fa-check"></i> 标记为已读`
-            : `<i class="fas fa-envelope"></i> 标记为未读`;
-        toggleUnreadOption.onclick = async () => {
-            closeTopicContextMenu();
-            try {
-                const result = await electronAPI.setTopicUnread(targetItemId, targetTopicId, !isUnread);
-                if (result.success) {
-                    topic.unread = result.unread;
-                    if (result.unreadSource) {
-                        topic.unreadSource = result.unreadSource;
-                    } else {
-                        delete topic.unreadSource;
-                    }
-                    uiHelper.showToastNotification(
-                        topic.unread ? '已标记为未读' : '已标记为已读',
-                        'success'
-                    );
-                    loadTopicList(); // 刷新列表
-                    // 同时刷新助手列表以更新计数
-                    if (itemListManager) {
-                        itemListManager.loadItems();
-                    }
-                } else {
-                    uiHelper.showToastNotification(`操作失败: ${result.error}`, 'error');
-                }
-            } catch (error) {
-                uiHelper.showToastNotification(`操作失败: ${error.message}`, 'error');
-            }
-        };
-        menu.appendChild(toggleUnreadOption);
-
-        const deleteTopicPermanentlyOption = document.createElement('div');
-        deleteTopicPermanentlyOption.classList.add('context-menu-item', 'danger-item');
-        deleteTopicPermanentlyOption.innerHTML = `<i class="fas fa-trash-alt"></i> 删除此话题`;
-        deleteTopicPermanentlyOption.onclick = async () => {
-            closeTopicContextMenu();
-
-            // 活动 Flowlock Session 仍依赖该话题的历史目录，运行期间禁止删除。
-            if (targetItemType === 'agent' && window.flowlockManager?.isTopicLocked?.(targetItemId, targetTopicId)) {
-                uiHelper.showToastNotification('该话题正在心流锁中运行，请先停止对应 Agent 的心流锁。', 'warning');
-                return;
-            }
-
-            // 使用自定义确认对话框替代原生 confirm()，避免 Electron 焦点问题
-            const confirmed = await uiHelper.showConfirmDialog(
-                `确定要永久删除话题 "${topic.name}" 吗？此操作不可撤销。`,
-                '删除话题',
-                '删除',
-                '取消',
-                true // isDanger
-            );
-            if (confirmed) {
-                let result;
-                if (targetItemType === 'agent') {
-                    result = await electronAPI.deleteTopic(targetItemId, targetTopicId);
-                } else if (targetItemType === 'group') {
-                    result = await electronAPI.deleteGroupTopic(targetItemId, targetTopicId);
-                }
-
-                if (result && result.success) {
-                    mainRendererFunctions.onTopicsDeleted?.({ itemId: targetItemId, itemType: targetItemType, topicIds: [targetTopicId] });
-                    if (currentSelectedItemRef.get()?.id === targetItemId &&
-                        currentSelectedItemRef.get()?.type === targetItemType &&
-                        currentTopicIdRef.get() === targetTopicId) {
-                        mainRendererFunctions.handleTopicDeletion(result.remainingTopics, {
-                            id: targetItemId,
-                            type: targetItemType,
-                            topicId: targetTopicId,
-                            fallbackTopicId: itemFullConfig.topics?.find(candidate => candidate.id !== topic.id)?.id || null,
-                        });
-                    }
-                    loadTopicList();
-                } else {
-                    uiHelper.showToastNotification(`删除话题 "${topic.name}" 失败: ${result ? result.error : '未知错误'}`, 'error');
-                }
-            }
-        };
-        menu.appendChild(deleteTopicPermanentlyOption);
-
-        const exportTopicOption = document.createElement('div');
-        exportTopicOption.classList.add('context-menu-item');
-        exportTopicOption.innerHTML = `<i class="fas fa-file-export"></i> 导出此话题`;
-        exportTopicOption.onclick = () => {
-            closeTopicContextMenu();
-            handleExportTopic(itemFullConfig.id, itemType, topic.id, topic.name);
-        };
-        menu.appendChild(exportTopicOption);
-
-        const exportFullTopicOption = document.createElement('div');
-        exportFullTopicOption.classList.add('context-menu-item');
-        exportFullTopicOption.innerHTML = `<i class="fas fa-file-code"></i> 导出此话题(完整)`;
-        exportFullTopicOption.onclick = () => {
-            closeTopicContextMenu();
-            handleExportFullTopic(itemFullConfig, itemType, topic.id, topic.name);
-        };
-        menu.appendChild(exportFullTopicOption);
-
-        // 智能定位逻辑：先隐藏菜单以测量尺寸
-        menu.style.visibility = 'hidden';
-        menu.style.position = 'absolute';
-        document.body.appendChild(menu);
-
-        // 获取菜单和窗口尺寸
-        const menuWidth = menu.offsetWidth;
-        const menuHeight = menu.offsetHeight;
-        const windowWidth = window.innerWidth;
-        const windowHeight = window.innerHeight;
-
-        let top = event.clientY;
-        let left = event.clientX;
-
-        // 检查菜单是否会超出窗口底部
-        if (top + menuHeight > windowHeight) {
-            // 将菜单显示在鼠标上方
-            top = event.clientY - menuHeight;
-            // 如果上方空间也不够，则贴近顶部
-            if (top < 0) top = 5;
-        }
-
-        // 检查菜单是否会超出窗口右侧
-        if (left + menuWidth > windowWidth) {
-            // 将菜单显示在鼠标左侧
-            left = event.clientX - menuWidth;
-            // 如果左侧空间也不够，则贴近左边
-            if (left < 0) left = 5;
-        }
-
-        // 应用最终位置并显示菜单
-        menu.style.top = `${top}px`;
-        menu.style.left = `${left}px`;
-        menu.style.visibility = 'visible';
-
-        document.addEventListener('click', closeTopicContextMenuOnClickOutside, true);
-    }
-
-    function closeTopicContextMenu() {
-        const existingMenu = document.getElementById('topicContextMenu');
-        if (existingMenu) {
-            existingMenu.remove();
-            document.removeEventListener('click', closeTopicContextMenuOnClickOutside, true);
-        }
-    }
-
-    function closeTopicContextMenuOnClickOutside(event) {
-        const menu = document.getElementById('topicContextMenu');
-        if (menu && !menu.contains(event.target)) {
-            closeTopicContextMenu();
-        }
-    }
-
-    async function handleExportTopic(itemId, itemType, topicId, topicName) {
-        const currentTopicId = currentTopicIdRef.get();
-        if (topicId !== currentTopicId) {
-            uiHelper.showToastNotification('请先点击并加载此话题，然后再导出。', 'info');
-            return;
-        }
-
-        console.log(`[TopicListManager] Exporting currently visible topic: ${topicName} (ID: ${topicId})`);
-
-        try {
-            const chatMessagesDiv = document.getElementById('chatMessages');
-            if (!chatMessagesDiv) {
-                console.error('[Export Debug] chatMessagesDiv not found!');
-                uiHelper.showToastNotification('错误：找不到聊天内容容器。', 'error');
-                return;
-            }
-
-            const messageItems = chatMessagesDiv.querySelectorAll('.message-item');
-            console.log(`[Export Debug] Found ${messageItems.length} message items.`);
-            if (messageItems.length === 0) {
-                uiHelper.showToastNotification('此话题没有可见的聊天内容可导出。', 'info');
-                return;
-            }
-
-            let markdownContent = `# 话题: ${topicName}\n\n`;
-            let extractedCount = 0;
-
-            messageItems.forEach((item, index) => {
-                if (item.classList.contains('system') || item.classList.contains('thinking')) {
-                    console.log(`[Export Debug] Skipping system/thinking message at index ${index}.`);
-                    return;
-                }
-
-                const senderElement = item.querySelector('.sender-name');
-                const contentElement = item.querySelector('.md-content');
-
-                if (senderElement && contentElement) {
-                    const sender = senderElement.textContent.trim().replace(':', '');
-                    // 克隆节点，移除思维链气泡（<think> 已被渲染为 DOM 节点，innerText 会包含其文本）
-                    const contentClone = contentElement.cloneNode(true);
-                    contentClone.querySelectorAll('.vcp-thought-chain-bubble').forEach(el => el.remove());
-                    let content = contentClone.innerText || contentClone.textContent || "";
-                    // 兜底：仅清理起止标签分别独占一行的明文思维链。
-                    content = content.replace(/^[ \t]*\[--- VCP元思考链(?::\s*"[^"]*")?\s*---\][ \t]*\r?\n[\s\S]*?^[ \t]*\[--- 元思考链结束 ---\][ \t]*(?:\r?\n|$)/gm, '');
-                    content = content.replace(/^[ \t]*<think(?:ing)?>[ \t]*\r?\n[\s\S]*?^[ \t]*<\/think(?:ing)?>[ \t]*(?:\r?\n|$)/gim, '');
-                    content = content.trim();
-
-                    if (sender && content) {
-                        markdownContent += `**${sender}**: ${content}\n\n---\n\n`;
-                        extractedCount++;
-                    } else {
-                        console.log(`[Export Debug] Skipping message at index ${index} due to empty sender or content. Sender: "${sender}", Content: "${content}"`);
-                    }
-                } else {
-                    console.log(`[Export Debug] Skipping message at index ${index} because sender or content element was not found.`);
-                }
-            });
-
-            console.log(`[Export Debug] Extracted ${extractedCount} messages. Final markdown length: ${markdownContent.length}`);
-
-            if (extractedCount === 0) {
-                uiHelper.showToastNotification('未能从当前话题中提取任何有效对话内容。', 'warning');
-                return;
-            }
-
-            const result = await electronAPI.exportTopicAsMarkdown({
-                topicName: topicName,
-                markdownContent: markdownContent
-            });
-
-            if (result.success) {
-                uiHelper.showToastNotification(`话题 "${topicName}" 已成功导出到: ${result.path}`);
-            } else {
-                uiHelper.showToastNotification(`导出话题失败: ${result.error}`, 'error');
-            }
-        } catch (error) {
-            console.error(`[TopicListManager] 导出话题时发生错误:`, error);
-            uiHelper.showToastNotification(`导出话题时发生前端错误: ${error.message}`, 'error');
-        }
-    }
-
-    function getRawMessageContent(message) {
-        if (typeof message?.content === 'string') return message.content;
-        if (typeof message?.content?.text === 'string') return message.content.text;
-        if (Array.isArray(message?.content)) {
-            return message.content
-                .filter(part => part && part.type === 'text' && typeof part.text === 'string')
-                .map(part => part.text)
-                .join('\n');
-        }
-        if (message?.content === null || message?.content === undefined) return '';
-        try {
-            return JSON.stringify(message.content, null, 2);
-        } catch {
-            return String(message.content);
-        }
-    }
-
-    function resolveFullExportAgentInfo(message, itemFullConfig, itemType) {
-        if (message.role === 'user') {
-            return {
-                name: message.name || '用户',
-                model: 'N/A'
-            };
-        }
-
-        if (itemType === 'group') {
-            const agentId = message.agentId || message.agentID;
-            const member = (itemFullConfig.agents || []).find(agent =>
-                agent.id === agentId || agent.agentId === agentId
-            );
-            const usesUnifiedModel = itemFullConfig.useUnifiedModel === true;
-            return {
-                name: message.name || member?.name || agentId || 'Assistant',
-                model: message.model || message.modelName ||
-                    (usesUnifiedModel ? itemFullConfig.unifiedModel : member?.model) ||
-                    '未知模型'
-            };
-        }
-
-        return {
-            name: message.name || itemFullConfig.name || itemFullConfig.id || 'Assistant',
-            model: message.model || message.modelName || itemFullConfig.model || '未知模型'
-        };
-    }
-
-    async function handleExportFullTopic(itemFullConfig, itemType, topicId, topicName) {
-        console.log(`[TopicListManager] Exporting full raw topic: ${topicName} (ID: ${topicId})`);
-
-        try {
-            const history = await getHistory(itemFullConfig.id, itemType, topicId);
-
-            if (!Array.isArray(history)) {
-                throw new Error(history?.error || '无法读取话题历史');
-            }
-
-            const messages = history.filter(message =>
-                message &&
-                message.role !== 'system' &&
-                message.isThinking !== true
-            );
-
-            if (messages.length === 0) {
-                uiHelper.showToastNotification('此话题没有可导出的对话内容。', 'info');
-                return;
-            }
-
-            let exportContent = `# 话题: ${topicName}\n\n`;
-            exportContent += `> 导出模式: 完整（保留原始消息内容）\n\n`;
-
-            messages.forEach((message, index) => {
-                const { name, model } = resolveFullExportAgentInfo(message, itemFullConfig, itemType);
-                const rawContent = getRawMessageContent(message);
-
-                exportContent += `===== 消息 ${index + 1} =====\n`;
-                exportContent += `Role: ${message.role || 'unknown'}\n`;
-                exportContent += `Agent: ${name}\n`;
-                exportContent += `Model: ${model}\n`;
-                if (message.timestamp) {
-                    exportContent += `Timestamp: ${new Date(message.timestamp).toISOString()}\n`;
-                }
-                exportContent += `\n${rawContent}\n\n`;
-            });
-
-            const result = await electronAPI.exportTopicAsMarkdown({
-                topicName: `${topicName}-完整`,
-                markdownContent: exportContent
-            });
-
-            if (result.success) {
-                uiHelper.showToastNotification(`话题 "${topicName}" 已完整导出到: ${result.path}`);
-            } else if (result.error !== '用户取消了导出操作。') {
-                uiHelper.showToastNotification(`完整导出话题失败: ${result.error}`, 'error');
-            }
-        } catch (error) {
-            console.error('[TopicListManager] 完整导出话题时发生错误:', error);
-            uiHelper.showToastNotification(`完整导出话题失败: ${error.message}`, 'error');
-        }
-    }
-
-    /**
-     * 设置鼠标快捷键事件监听器
-     */
-    function setupMouseShortcuts() {
-        const topicsContainer = document.getElementById('tabContentTopics');
-        if (!topicsContainer) {
-            console.warn('[TopicListManager] 话题容器未找到，跳过鼠标快捷键设置');
-            return;
-        }
-
-        let lastLeftClickTime = 0;
-
-        // 双击左键：进入设置页面
-        addListener(topicsContainer, 'click', (e) => {
-            if (isManageMode) return;
-            if (e.target.closest('button, input, .topics-header-container, .next-ui-topic-manage-panel')) return;
-            if (e.button === 0) { // 左键
-                const currentTime = Date.now();
-                const timeDiff = currentTime - lastLeftClickTime;
-
-                if (timeDiff < 300) { // 双击检测（300ms内）
-                    console.log('[TopicListManager] 检测到双击左键，进入设置页面');
-                    e.preventDefault();
-                    e.stopPropagation();
-
-                    // 切换到设置页面
-                    if (uiManager && typeof uiManager.switchToTab === 'function') {
-                        uiManager.switchToTab('settings');
-                    } else {
-                        console.warn('[TopicListManager] uiManager不可用，无法切换到设置页面');
-                    }
-                }
-
-                lastLeftClickTime = currentTime;
-            }
-        });
-
-        // 中键点击：返回助手页面
-        addListener(topicsContainer, 'auxclick', (e) => {
-            if (e.button === 1) { // 中键
-                console.log('[TopicListManager] 检测到中键点击，返回助手页面');
-                e.preventDefault();
-                e.stopPropagation();
-
-                // 切换到助手页面
-                if (uiManager && typeof uiManager.switchToTab === 'function') {
-                    uiManager.switchToTab('agents');
-                    // 重置助手页面的鼠标事件状态，确保双击功能正常工作
-                    if (itemListManager && typeof itemListManager.resetMouseEventStates === 'function') {
-                        itemListManager.resetMouseEventStates();
-                    }
-                } else {
-                    console.warn('[TopicListManager] uiManager不可用，无法切换到助手页面');
-                }
-            }
-        });
-
-        // 防止中键点击的默认行为
-        addListener(topicsContainer, 'mousedown', (e) => {
-            if (e.button === 1) { // 中键
-                e.preventDefault();
-            }
-        });
-
-        console.log('[TopicListManager] 鼠标快捷键设置完成');
-    }
-
-    function dispose() {
-        cancelPendingTopicSearch();
-        cleanupProgressiveTopicRendering();
-        closeTopicContextMenu();
-        selectedTopicIds.clear();
-        displayedTopics = [];
-        availableTopics = [];
-        currentItemConfig = null;
-        managedItemKey = '';
-        topicListContainer = null;
-        listenerOwner = null;
-    }
-
-    // --- Public API ---
-    return {
-        init,
-        loadTopicList,
-        setupTopicSearch,
-        showTopicContextMenu,
-        setupMouseShortcuts,
-        dispose
-    };
-})();
+// modules/topicListManager.js
+
+window.topicListManager = (() => {
+    // --- Private Variables ---
+    let topicListContainer;
+    let electronAPI;
+    let chatRepository;
+    let currentSelectedItemRef;
+    let currentTopicIdRef;
+    let topicSelectionReadiness;
+    let uiHelper;
+    let mainRendererFunctions;
+    let listenerOwner;
+    let uiManager;
+    let itemListManager;
+    let renderListenerDisposers = [];
+    let wasSelectionListenerActive = false; // To store the state of the selection listener before dragging
+    let topicListRenderGeneration = 0;
+    let topicListScrollCleanup = null;
+    let topicCountObserver = null;
+    let isManageMode = false;
+    let selectedTopicIds = new Set();
+    let displayedTopics = [];
+    let availableTopics = [];
+    let currentItemConfig = null;
+    let managedItemKey = '';
+
+    const TOPIC_INITIAL_RENDER_COUNT = 40;
+    const TOPIC_PROGRESSIVE_BATCH_SIZE = 30;
+    const TOPIC_LOAD_MORE_THRESHOLD_PX = 320;
+    // Each search reload re-reads the item config and runs a content search
+    // over IPC. Typing waits for a short pause first, in the range ZCode uses
+    // for its IO-backed refreshes (fileWatcherService 150ms, useTabPersistence
+    // 300ms); Enter still searches at once.
+    const TOPIC_SEARCH_DEBOUNCE_MS = 200;
+    let topicSearchTimer = null;
+
+    const addListener = (target, type, handler, options) => {
+        if (listenerOwner) return listenerOwner.add(target, type, handler, options);
+        target?.addEventListener?.(type, handler, options);
+        return true;
+    };
+
+    function addRenderListener(target, type, handler, options) {
+        target?.addEventListener?.(type, handler, options);
+        renderListenerDisposers.push(() => target?.removeEventListener?.(type, handler, options));
+    }
+
+    function cancelPendingTopicSearch() {
+        if (topicSearchTimer) clearTimeout(topicSearchTimer);
+        topicSearchTimer = null;
+    }
+
+    // Names and IPC error strings are user or disk data, so status rows are
+    // built with textContent, never by interpolating into innerHTML.
+    function renderTopicListStatus(topicListUl, message, { loading = false } = {}) {
+        const li = document.createElement('li');
+        if (loading) {
+            const spinner = document.createElement('div');
+            spinner.className = 'loading-spinner-small';
+            li.append(spinner, document.createTextNode(message));
+        } else {
+            const p = document.createElement('p');
+            p.textContent = message;
+            li.appendChild(p);
+        }
+        topicListUl.replaceChildren(li);
+    }
+
+    function disposeRenderListeners() {
+        renderListenerDisposers.splice(0).reverse().forEach(dispose => dispose());
+    }
+
+    /**
+     * Initializes the TopicListManager module.
+     * @param {object} config - The configuration object.
+     */
+    function init(config) {
+        if (!config.elements || !config.elements.topicListContainer) {
+            console.error('[TopicListManager] Missing required DOM element: topicListContainer.');
+            return;
+        }
+        if (!config.electronAPI || !config.refs || !config.uiHelper || !config.mainRendererFunctions || !config.topicSelectionReadiness) {
+            console.error('[TopicListManager] Missing required configuration parameters.');
+            return;
+        }
+
+        topicListContainer = config.elements.topicListContainer;
+        electronAPI = config.electronAPI;
+        chatRepository = config.chatRepository || null;
+        if (!chatRepository) throw new Error('TopicListManager requires ChatRepository');
+        currentSelectedItemRef = config.refs.currentSelectedItemRef;
+        currentTopicIdRef = config.refs.currentTopicIdRef;
+        topicSelectionReadiness = config.topicSelectionReadiness;
+        uiHelper = config.uiHelper;
+        mainRendererFunctions = config.mainRendererFunctions;
+        listenerOwner = config.listenerOwner || null;
+        uiManager = config.uiManager || null;
+        itemListManager = config.itemListManager || null;
+
+        // 设置鼠标快捷键
+        setupMouseShortcuts();
+        setupNextUiTopicTools();
+
+        console.log('[TopicListManager] Initialized successfully.');
+    }
+
+    function getHistory(itemId, itemType, topicId) {
+        return chatRepository.getHistory(itemId, itemType, topicId);
+    }
+
+    function hasUserParticipation(history) {
+        return Array.isArray(history) && history.some(message =>
+            message &&
+            message.role === 'user' &&
+            message.isThinking !== true
+        );
+    }
+
+    function hasValidPersistentUnreadMarker(topic, history) {
+        if (topic?.unread !== true) return false;
+        if (topic.unreadSource === 'manual') return true;
+
+        // Agent/TopicSponsor 产生的旧未读标记在用户参与后即失效。
+        return !hasUserParticipation(history);
+    }
+
+    async function clearStalePersistentUnreadMarker(topic, itemId, history) {
+        if (
+            topic?.unread !== true ||
+            topic.unreadSource === 'manual' ||
+            !hasUserParticipation(history)
+        ) {
+            return;
+        }
+
+        topic.unread = false;
+        delete topic.unreadSource;
+
+        try {
+            const result = await electronAPI.setTopicUnread(itemId, topic.id, false);
+            if (!result?.success) {
+                console.warn(`[TopicListManager] 清理话题 ${topic.id} 的残留未读标记失败:`, result?.error);
+            }
+        } catch (error) {
+            console.warn(`[TopicListManager] 清理话题 ${topic.id} 的残留未读标记失败:`, error);
+        }
+    }
+
+    /**
+     * 统计完全由 Agent 主动发起、尚无用户参与的话题消息数。
+     * 系统消息和思考占位不参与判断；历史中只要出现过用户消息就返回 0。
+     * @param {Array} history - 消息历史
+     * @returns {number}
+     */
+    function countUnreadMessages(history) {
+        if (!Array.isArray(history) || history.length === 0) return 0;
+
+        const effectiveMessages = history.filter(message =>
+            message &&
+            message.role !== 'system' &&
+            message.isThinking !== true
+        );
+
+        if (effectiveMessages.some(message => message.role === 'user')) {
+            return 0;
+        }
+
+        return effectiveMessages.filter(message => message.role === 'assistant').length;
+    }
+
+    function normalizeTopicTitle(topicTitle) {
+        if (typeof topicTitle !== 'string') return topicTitle;
+
+        const trimmedTitle = topicTitle.trim();
+        if (!trimmedTitle) return trimmedTitle;
+        if (trimmedTitle.includes('新话题')) return trimmedTitle;
+
+        const timeMatch = trimmedTitle.match(/(\d{1,2}:\d{2}:\d{2})/);
+        if (trimmedTitle.includes('新话') && timeMatch) {
+            return `新话题 ${timeMatch[1]}`;
+        }
+
+        return trimmedTitle;
+    }
+
+    /**
+     * 解析话题搜索约定词。
+     * 仅当完整输入为“未读话题”或“unread topic”时启用未读置顶。
+     * @param {string} rawValue - 搜索框原始值
+     * @returns {{ rawTerm: string, queryTerm: string, prioritizeUnread: boolean }}
+     */
+    function parseTopicSearchQuery(rawValue) {
+        const rawTerm = String(rawValue || '').trim().toLowerCase();
+        const prioritizeUnread = rawTerm === '未读话题' || rawTerm === 'unread topic';
+
+        return {
+            rawTerm,
+            queryTerm: prioritizeUnread ? '' : rawTerm,
+            prioritizeUnread
+        };
+    }
+
+    /**
+     * 读取各话题历史，并将未读话题稳定地移到顶部。
+     * 未读组与已读组内部均保留用户自定义顺序。
+     */
+    async function prioritizeUnreadTopics(topics, currentSelectedItem) {
+        const topicsWithUnreadState = await Promise.all(topics.map(async topic => {
+            let history = [];
+            try {
+                history = await getHistory(currentSelectedItem.id, currentSelectedItem.type, topic.id);
+            } catch (error) {
+                console.warn(`[TopicListManager] 读取话题 ${topic.id} 的未读状态失败:`, error);
+            }
+
+            const calculatedUnreadCount = Array.isArray(history)
+                ? countUnreadMessages(history)
+                : 0;
+            const hasPersistentUnread = hasValidPersistentUnreadMarker(topic, history);
+
+            await clearStalePersistentUnreadMarker(topic, currentSelectedItem.id, history);
+
+            return {
+                topic,
+                isUnread: calculatedUnreadCount > 0 || hasPersistentUnread,
+                calculatedUnreadCount
+            };
+        }));
+
+        const unreadTopics = [];
+        const readTopics = [];
+        topicsWithUnreadState.forEach(({ topic, isUnread, calculatedUnreadCount }) => {
+            topic.__calculatedUnreadCount = calculatedUnreadCount;
+            (isUnread ? unreadTopics : readTopics).push(topic);
+        });
+
+        return unreadTopics.concat(readTopics);
+    }
+
+    function ensureTopicUnreadIndicator(li, unreadCount = -1) {
+        if (!li) return;
+
+        let indicator = li.querySelector('.topic-unread-indicator');
+        if (!indicator) {
+            indicator = document.createElement('span');
+            indicator.className = 'topic-unread-indicator';
+            const messageCountSpan = li.querySelector('.message-count');
+            li.insertBefore(indicator, messageCountSpan || null);
+        }
+
+        indicator.textContent = unreadCount > 0 ? `未读 ${unreadCount}` : '未读';
+        indicator.title = unreadCount > 0 ? `${unreadCount} 条未读消息` : '未读话题';
+        li.classList.add('has-unread-topic');
+    }
+
+    function removeTopicUnreadIndicator(li) {
+        if (!li) return;
+        li.querySelector('.topic-unread-indicator')?.remove();
+        li.classList.remove('has-unread-topic');
+    }
+
+    /**
+     * Part C: 计算单个话题的未读消息数
+     * @param {Object} topic - 话题对象
+     * @param {Array} history - 话题历史消息
+     * @returns {number} - 未读消息数，-1 表示仅显示小点
+     */
+    function calculateTopicUnreadCount(topic, history) {
+        const count = countUnreadMessages(history);
+        if (count > 0) return count;
+
+        // 没有自动计数时，仅保留仍有效的持久化未读标记。
+        if (hasValidPersistentUnreadMarker(topic, history)) {
+            return -1; // 仅显示小点，不显示数字
+        }
+
+        return 0; // 不显示
+    }
+
+    function cleanupProgressiveTopicRendering() {
+        topicListRenderGeneration++;
+        disposeRenderListeners();
+        if (typeof topicListScrollCleanup === 'function') {
+            topicListScrollCleanup();
+            topicListScrollCleanup = null;
+        }
+        if (topicCountObserver) {
+            topicCountObserver.disconnect();
+            topicCountObserver = null;
+        }
+        const topicListUl = document.getElementById('topicList');
+        if (topicListUl?.sortableInstance) {
+            topicListUl.sortableInstance.destroy();
+            topicListUl.sortableInstance = null;
+        }
+    }
+
+    function getTopicScrollContainer(topicListUl) {
+        return topicListUl?.closest('.sidebar-list-scroll') || topicListContainer;
+    }
+
+    function ensureTopicCountObserver() {
+        if (topicCountObserver) return topicCountObserver;
+
+        topicCountObserver = new IntersectionObserver((entries) => {
+            entries.forEach((entry) => {
+                if (!entry.isIntersecting) return;
+
+                const li = entry.target;
+                topicCountObserver.unobserve(li);
+                loadTopicMessageCount(li);
+            });
+        }, {
+            root: getTopicScrollContainer(document.getElementById('topicList')),
+            rootMargin: '240px 0px',
+            threshold: 0.01
+        });
+
+        return topicCountObserver;
+    }
+
+    function loadTopicMessageCount(li) {
+        if (!li?.isConnected || li.dataset.countLoaded === 'true' || li.dataset.countLoading === 'true') return;
+
+        const itemId = li.dataset.itemId;
+        const itemType = li.dataset.itemType;
+        const topicId = li.dataset.topicId;
+        const topic = li.__topicData;
+        const messageCountSpan = li.querySelector('.message-count');
+
+        if (!itemId || !itemType || !topicId || !topic || !messageCountSpan) return;
+
+        li.dataset.countLoading = 'true';
+
+        let historyPromise;
+        historyPromise = getHistory(itemId, itemType, topicId);
+
+        if (!historyPromise) {
+            messageCountSpan.textContent = 'N/A';
+            li.dataset.countLoaded = 'true';
+            li.dataset.countLoading = 'false';
+            return;
+        }
+
+        historyPromise.then(async historyResult => {
+            if (!li.isConnected) return;
+
+            messageCountSpan.classList.remove('has-unread', 'unread-marker-only');
+
+            if (historyResult && !historyResult.error && Array.isArray(historyResult)) {
+                await clearStalePersistentUnreadMarker(topic, itemId, historyResult);
+                const unreadCount = calculateTopicUnreadCount(topic, historyResult);
+                if (unreadCount > 0) {
+                    messageCountSpan.textContent = `${historyResult.length}`;
+                    messageCountSpan.classList.add('has-unread');
+                    ensureTopicUnreadIndicator(li, unreadCount);
+                } else if (unreadCount === -1) {
+                    messageCountSpan.textContent = `${historyResult.length}`;
+                    messageCountSpan.classList.add('unread-marker-only');
+                    ensureTopicUnreadIndicator(li);
+                } else {
+                    messageCountSpan.textContent = `${historyResult.length}`;
+                    removeTopicUnreadIndicator(li);
+                }
+            } else {
+                messageCountSpan.textContent = 'N/A';
+            }
+            li.dataset.countLoaded = 'true';
+        }).catch(() => {
+            if (li.isConnected) {
+                messageCountSpan.textContent = 'ERR';
+            }
+        }).finally(() => {
+            if (li.isConnected) {
+                li.dataset.countLoading = 'false';
+            }
+        });
+    }
+
+    function createTopicListItem(topic, currentSelectedItem, currentTopicId, itemConfigFull) {
+        const li = document.createElement('li');
+        li.classList.add('topic-item');
+        li.dataset.itemId = currentSelectedItem.id;
+        li.dataset.itemType = currentSelectedItem.type;
+        li.dataset.topicId = topic.id;
+        li.__topicData = topic;
+
+        const isCurrentActiveTopic = topic.id === currentTopicId;
+        const isPersistentlyUnread = topic.unread === true || topic.__calculatedUnreadCount > 0;
+        li.classList.toggle('active', isCurrentActiveTopic);
+        li.classList.toggle('active-topic-glowing', isCurrentActiveTopic);
+        li.classList.toggle('has-unread-topic', isPersistentlyUnread);
+
+        const avatarImg = document.createElement('img');
+        avatarImg.classList.add('avatar');
+        avatarImg.loading = 'lazy';
+        avatarImg.decoding = 'async';
+        avatarImg.src = currentSelectedItem.avatarUrl ? currentSelectedItem.avatarUrl : (currentSelectedItem.type === 'group' ? 'assets/default_group_avatar.png' : 'assets/default_avatar.png');
+
+        const displayTopicTitle = normalizeTopicTitle(topic.name || `话题 ${topic.id}`);
+        avatarImg.alt = `${currentSelectedItem.name} - ${displayTopicTitle}`;
+        avatarImg.onerror = () => { avatarImg.src = (currentSelectedItem.type === 'group' ? 'assets/default_group_avatar.png' : 'assets/default_avatar.png'); };
+
+        const topicTitleDisplay = document.createElement('span');
+        topicTitleDisplay.classList.add('topic-title-display');
+        topicTitleDisplay.textContent = displayTopicTitle;
+
+        const messageCountSpan = document.createElement('span');
+        messageCountSpan.classList.add('message-count');
+        messageCountSpan.textContent = '...';
+
+        const selectionIcon = document.createElement('span');
+        selectionIcon.classList.add('next-ui-topic-select-icon', 'vcp-ui-icon');
+        selectionIcon.setAttribute('aria-hidden', 'true');
+        selectionIcon.textContent = selectedTopicIds.has(topic.id) ? 'check_box' : 'check_box_outline_blank';
+        li.appendChild(selectionIcon);
+        li.appendChild(avatarImg);
+
+        if (topic.locked === false) {
+            const unlockedIndicator = document.createElement('span');
+            unlockedIndicator.classList.add('unlocked-indicator');
+            unlockedIndicator.textContent = 'unlocked';
+            unlockedIndicator.title = 'AI可以查看和回复此话题';
+            li.appendChild(unlockedIndicator);
+        }
+
+        li.appendChild(topicTitleDisplay);
+        if (isPersistentlyUnread) {
+            ensureTopicUnreadIndicator(li, topic.__calculatedUnreadCount);
+        }
+        li.appendChild(messageCountSpan);
+
+        const observer = ensureTopicCountObserver();
+        observer.observe(li);
+
+        addRenderListener(li, 'click', async () => {
+            if (isManageMode) {
+                toggleTopicSelection(topic.id);
+                return;
+            }
+
+            if (currentTopicIdRef.get() === topic.id) {
+                return;
+            }
+
+            if (!topicSelectionReadiness.isReady()) {
+                topicSelectionReadiness.defer({
+                    itemId: currentSelectedItem.id,
+                    itemType: currentSelectedItem.type,
+                    topicId: topic.id,
+                });
+                if (uiHelper && uiHelper.showToastNotification) {
+                    uiHelper.showToastNotification('正在初始化界面，稍后自动打开该话题', 'info');
+                }
+                return;
+            }
+
+            try {
+                await Promise.resolve(mainRendererFunctions.selectTopic(topic.id));
+            } catch (error) {
+                console.error('[TopicListManager] Failed to select topic:', error);
+                if (uiHelper && uiHelper.showToastNotification) {
+                    uiHelper.showToastNotification(`打开话题失败: ${error.message}`, 'error');
+                }
+            }
+        });
+
+        addRenderListener(li, 'contextmenu', (e) => {
+            e.preventDefault();
+            if (isManageMode) return;
+            showTopicContextMenu(e, li, itemConfigFull, topic, currentSelectedItem.type);
+        });
+
+        return li;
+    }
+
+    function renderTopicListProgressively(topicListUl, topicsToProcess, currentSelectedItem, currentTopicId, itemConfigFull, searchTerm) {
+        const renderGeneration = topicListRenderGeneration;
+        const scrollContainer = getTopicScrollContainer(topicListUl);
+        const totalCount = topicsToProcess.length;
+        const initialCount = searchTerm
+            ? Math.min(Math.max(TOPIC_INITIAL_RENDER_COUNT, TOPIC_PROGRESSIVE_BATCH_SIZE), totalCount)
+            : Math.min(TOPIC_INITIAL_RENDER_COUNT, totalCount);
+
+        let currentIndex = 0;
+        let isRendering = false;
+        let allRendered = false;
+
+        const statusLi = document.createElement('li');
+        statusLi.className = 'topic-list-progressive-status';
+        statusLi.textContent = '';
+        statusLi.style.justifyContent = 'center';
+        statusLi.style.opacity = '0.75';
+
+        const finalizeIfDone = () => {
+            if (!allRendered || renderGeneration !== topicListRenderGeneration) return;
+
+            statusLi.remove();
+            if (typeof topicListScrollCleanup === 'function') {
+                topicListScrollCleanup();
+                topicListScrollCleanup = null;
+            }
+
+            if (currentSelectedItem.id && topicsToProcess.length > 0 && typeof Sortable !== 'undefined' && !searchTerm) {
+                initializeTopicSortable(currentSelectedItem.id, currentSelectedItem.type);
+            }
+        };
+
+        const renderNextBatch = (batchSize = TOPIC_PROGRESSIVE_BATCH_SIZE) => {
+            if (isRendering || allRendered || renderGeneration !== topicListRenderGeneration) return;
+            isRendering = true;
+
+            requestAnimationFrame(() => {
+                if (renderGeneration !== topicListRenderGeneration) {
+                    isRendering = false;
+                    return;
+                }
+
+                const fragment = document.createDocumentFragment();
+                const end = Math.min(currentIndex + batchSize, totalCount);
+
+                for (; currentIndex < end; currentIndex++) {
+                    fragment.appendChild(createTopicListItem(
+                        topicsToProcess[currentIndex],
+                        currentSelectedItem,
+                        currentTopicId,
+                        itemConfigFull
+                    ));
+                }
+
+                if (statusLi.parentNode === topicListUl) {
+                    topicListUl.insertBefore(fragment, statusLi);
+                } else {
+                    topicListUl.appendChild(fragment);
+                }
+
+                allRendered = currentIndex >= totalCount;
+                isRendering = false;
+
+                if (!allRendered) {
+                    statusLi.textContent = `继续向下滚动加载更多话题（${currentIndex}/${totalCount}）`;
+                    if (!statusLi.parentNode) topicListUl.appendChild(statusLi);
+                    if (scrollContainer.scrollHeight <= scrollContainer.clientHeight + TOPIC_LOAD_MORE_THRESHOLD_PX) {
+                        renderNextBatch();
+                    }
+                } else {
+                    finalizeIfDone();
+                }
+            });
+        };
+
+        const onScroll = () => {
+            if (allRendered || isRendering || renderGeneration !== topicListRenderGeneration) return;
+
+            const distanceToBottom = scrollContainer.scrollHeight - scrollContainer.scrollTop - scrollContainer.clientHeight;
+            if (distanceToBottom <= TOPIC_LOAD_MORE_THRESHOLD_PX) {
+                renderNextBatch();
+            }
+        };
+
+        scrollContainer.addEventListener('scroll', onScroll, { passive: true });
+        topicListScrollCleanup = () => scrollContainer.removeEventListener('scroll', onScroll);
+
+        topicListUl.innerHTML = '';
+        renderNextBatch(initialCount);
+    }
+
+    async function loadTopicList() {
+        if (!topicListContainer) {
+            console.error("Topic list container (tabContentTopics) not found.");
+            return;
+        }
+
+        cancelPendingTopicSearch();
+        cleanupProgressiveTopicRendering();
+        const loadGeneration = topicListRenderGeneration;
+
+        let topicListUl = topicListContainer.querySelector('.topic-list');
+        if (topicListUl) {
+            topicListUl.innerHTML = '';
+        } else {
+            const topicsHeader = topicListContainer.querySelector('.topics-header') || document.createElement('div');
+            if (!topicsHeader.classList.contains('topics-header')) {
+                topicsHeader.className = 'topics-header';
+                topicsHeader.innerHTML = `<h2>话题列表</h2><div class="topic-search-container"><input type="text" id="topicSearchInput" placeholder="搜索话题；输入“未读话题”置顶" title="输入“未读话题”或“unread topic”将未读话题置顶" aria-label="搜索话题；输入未读话题将未读话题置顶" class="topic-search-input"></div>`;
+                topicListContainer.prepend(topicsHeader);
+                const newTopicSearchInput = topicsHeader.querySelector('#topicSearchInput');
+                if (newTopicSearchInput) setupTopicSearchListener(newTopicSearchInput);
+            }
+
+            topicListUl = document.createElement('ul');
+            topicListUl.className = 'topic-list';
+            topicListUl.id = 'topicList';
+            topicListContainer.appendChild(topicListUl);
+        }
+
+        const currentSelectedItem = currentSelectedItemRef.get();
+        if (!currentSelectedItem.id) {
+            availableTopics = [];
+            displayedTopics = [];
+            currentItemConfig = null;
+            managedItemKey = '';
+            selectedTopicIds.clear();
+            syncManageUi();
+            topicListUl.innerHTML = '<li><p>请先在“助手与群组”列表选择一个项目以查看其相关话题。</p></li>';
+            return;
+        }
+
+        const nextItemKey = `${currentSelectedItem.type}:${currentSelectedItem.id}`;
+        if (managedItemKey && managedItemKey !== nextItemKey) {
+            selectedTopicIds.clear();
+        }
+        managedItemKey = nextItemKey;
+
+        const itemNameForLoading = currentSelectedItem.name || '当前项目';
+        const searchInput = document.getElementById('topicSearchInput');
+        const searchQuery = parseTopicSearchQuery(searchInput ? searchInput.value : '');
+        const searchTerm = searchQuery.rawTerm;
+        const contentQueryTerm = searchQuery.queryTerm;
+
+        let itemConfigFull;
+
+        if (!searchTerm) {
+            renderTopicListStatus(topicListUl, `正在加载 ${itemNameForLoading} 的话题...`, { loading: true });
+        } else {
+            topicListUl.innerHTML = '';
+        }
+
+        try {
+            if (currentSelectedItem.type === 'agent') {
+                itemConfigFull = await electronAPI.getAgentConfig(currentSelectedItem.id);
+            } else if (currentSelectedItem.type === 'group') {
+                itemConfigFull = await electronAPI.getAgentGroupConfig(currentSelectedItem.id);
+            }
+        } catch (error) {
+            // A rejected IPC call used to leave the loading spinner up for good.
+            console.error('[TopicListManager] Failed to load item config:', error);
+            itemConfigFull = { error: error?.message || String(error) };
+        }
+
+        if (loadGeneration !== topicListRenderGeneration ||
+            currentSelectedItemRef.get()?.id !== currentSelectedItem.id ||
+            currentSelectedItemRef.get()?.type !== currentSelectedItem.type) {
+            return;
+        }
+
+        if (itemConfigFull && !itemConfigFull.error) {
+            mainRendererFunctions.updateCurrentItemConfig(itemConfigFull);
+        }
+
+        if (!itemConfigFull || itemConfigFull.error) {
+            availableTopics = [];
+            displayedTopics = [];
+            currentItemConfig = null;
+            selectedTopicIds.clear();
+            syncManageUi();
+            renderTopicListStatus(topicListUl, `无法加载 ${itemNameForLoading} 的配置信息: ${itemConfigFull?.error || '未知错误'}`);
+        } else {
+            let topicsToProcess = itemConfigFull.topics || [];
+            if (currentSelectedItem.type === 'agent' && topicsToProcess.length === 0) {
+                const defaultAgentTopic = { id: "default", name: "主要对话", createdAt: Date.now() };
+                topicsToProcess.push(defaultAgentTopic);
+            }
+
+            availableTopics = [...topicsToProcess];
+            currentItemConfig = itemConfigFull;
+            const availableTopicIds = new Set(availableTopics.map(topic => topic.id));
+            selectedTopicIds = new Set([...selectedTopicIds].filter(topicId => availableTopicIds.has(topicId)));
+
+            // topicsToProcess.sort((a, b) => (b.createdAt || 0) - (a.createdAt || 0));
+
+            if (contentQueryTerm) {
+                let frontendFilteredTopics = topicsToProcess.filter(topic => {
+                    const normalizedTopicTitle = normalizeTopicTitle(topic.name || '');
+                    const nameMatch = normalizedTopicTitle.toLowerCase().includes(contentQueryTerm);
+                    let dateMatch = false;
+                    if (topic.createdAt) {
+                        const date = new Date(topic.createdAt);
+                        const fullDateStr = `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')} ${String(date.getHours()).padStart(2, '0')}:${String(date.getMinutes()).padStart(2, '0')}`;
+                        const shortDateStr = `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')}`;
+                        dateMatch = fullDateStr.toLowerCase().includes(contentQueryTerm) || shortDateStr.toLowerCase().includes(contentQueryTerm);
+                    }
+                    return nameMatch || dateMatch;
+                });
+
+                let contentMatchedTopicIds = [];
+                try {
+                    const contentSearchResult = await electronAPI.searchTopicsByContent(currentSelectedItem.id, currentSelectedItem.type, contentQueryTerm);
+                    if (contentSearchResult && contentSearchResult.success && Array.isArray(contentSearchResult.matchedTopicIds)) {
+                        contentMatchedTopicIds = contentSearchResult.matchedTopicIds;
+                    } else if (contentSearchResult && !contentSearchResult.success) {
+                        console.warn("Topic content search failed:", contentSearchResult.error);
+                    }
+                } catch (e) {
+                    console.error("Error calling searchTopicsByContent:", e);
+                }
+
+                const finalFilteredTopicIds = new Set(frontendFilteredTopics.map(t => t.id));
+                contentMatchedTopicIds.forEach(id => finalFilteredTopicIds.add(id));
+
+                topicsToProcess = topicsToProcess.filter(topic => finalFilteredTopicIds.has(topic.id));
+            }
+
+            if (searchQuery.prioritizeUnread) {
+                topicsToProcess = await prioritizeUnreadTopics(topicsToProcess, currentSelectedItem);
+            }
+
+            if (loadGeneration !== topicListRenderGeneration ||
+                currentSelectedItemRef.get()?.id !== currentSelectedItem.id ||
+                currentSelectedItemRef.get()?.type !== currentSelectedItem.type) {
+                return;
+            }
+
+            displayedTopics = [...topicsToProcess];
+            syncManageUi();
+
+            if (topicsToProcess.length === 0) {
+                renderTopicListStatus(topicListUl, `${itemNameForLoading} 还没有任何话题${searchTerm ? '匹配当前搜索' : ''}。您可以点击上方的“新建${currentSelectedItem.type === 'group' ? '群聊话题' : '聊天话题'}”按钮创建一个。`);
+            } else {
+                const currentTopicId = currentTopicIdRef.get();
+                renderTopicListProgressively(topicListUl, topicsToProcess, currentSelectedItem, currentTopicId, itemConfigFull, searchTerm);
+            }
+        }
+    }
+
+    function setupTopicSearch() {
+        let searchInput = document.getElementById('topicSearchInput');
+        if (searchInput) {
+            setupTopicSearchListener(searchInput);
+        }
+    }
+
+    function setupTopicSearchListener(inputElement) {
+        if (inputElement.dataset.topicSearchBound === 'true') return;
+        inputElement.dataset.topicSearchBound = 'true';
+
+        addListener(inputElement, 'input', scheduleTopicSearch);
+        addListener(inputElement, 'keydown', (event) => {
+            if (event.key === 'Enter') {
+                event.preventDefault();
+                filterTopicList();
+            }
+        });
+    }
+
+    function scheduleTopicSearch() {
+        cancelPendingTopicSearch();
+        topicSearchTimer = setTimeout(() => {
+            topicSearchTimer = null;
+            loadTopicList();
+        }, TOPIC_SEARCH_DEBOUNCE_MS);
+    }
+
+    function filterTopicList() {
+        loadTopicList();
+    }
+
+    function setupNextUiTopicTools() {
+        const topicsHeader = document.querySelector('#tabContentTopics .topics-header-container');
+        const createButton = document.getElementById('nextUiCreateTopicBtn');
+        const manageButton = document.getElementById('nextUiManageTopicsBtn');
+        const searchButton = document.getElementById('nextUiTopicSearchTrigger');
+        const searchCloseButton = document.getElementById('nextUiTopicSearchClose');
+        const searchInput = document.getElementById('topicSearchInput');
+        const selectAllButton = document.getElementById('nextUiSelectAllTopicsBtn');
+        const deleteButton = document.getElementById('nextUiDeleteTopicsBtn');
+        const exitButton = document.getElementById('nextUiExitTopicManageBtn');
+
+        if (!topicsHeader || !createButton || !manageButton || !searchButton || !searchCloseButton || !searchInput) return;
+        if (topicsHeader.dataset.nextUiToolsBound === 'true') return;
+        topicsHeader.dataset.nextUiToolsBound = 'true';
+
+        const setSearchMode = (active, clear = !active) => {
+            topicsHeader.classList.toggle('is-searching', active);
+            searchButton.setAttribute('aria-expanded', String(active));
+            if (clear) {
+                searchInput.value = '';
+                loadTopicList();
+            }
+            if (active) requestAnimationFrame(() => searchInput.focus());
+            else if (document.activeElement === searchInput) searchButton.focus();
+        };
+
+        addListener(createButton, 'click', () => {
+            document.getElementById('currentAgentSettingsBtn')?.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+        });
+        addListener(createButton, 'contextmenu', (event) => {
+            event.preventDefault();
+            document.getElementById('currentAgentSettingsBtn')?.dispatchEvent(new MouseEvent('contextmenu', {
+                bubbles: true,
+                clientX: event.clientX,
+                clientY: event.clientY
+            }));
+        });
+        addListener(manageButton, 'click', () => setManageMode(!isManageMode));
+        addListener(searchButton, 'click', () => setSearchMode(true, false));
+        addListener(searchCloseButton, 'click', () => setSearchMode(false, true));
+        addListener(searchInput, 'keydown', (event) => {
+            if (event.key === 'Escape') {
+                event.preventDefault();
+                setSearchMode(false, true);
+            }
+        });
+        if (selectAllButton) addListener(selectAllButton, 'click', toggleSelectAllDisplayedTopics);
+        if (deleteButton) addListener(deleteButton, 'click', deleteSelectedTopics);
+        if (exitButton) addListener(exitButton, 'click', () => setManageMode(false));
+
+        syncManageUi();
+    }
+
+    function setManageMode(active) {
+        isManageMode = active;
+        if (!active) selectedTopicIds.clear();
+
+        const topicListUl = document.getElementById('topicList');
+        if (active && topicListUl?.sortableInstance) {
+            topicListUl.sortableInstance.destroy();
+            topicListUl.sortableInstance = null;
+        } else if (!active) {
+            loadTopicList();
+        }
+
+        syncManageUi();
+    }
+
+    function toggleTopicSelection(topicId) {
+        if (selectedTopicIds.has(topicId)) selectedTopicIds.delete(topicId);
+        else selectedTopicIds.add(topicId);
+        syncManageUi();
+    }
+
+    function toggleSelectAllDisplayedTopics() {
+        const displayedIds = displayedTopics.map(topic => topic.id);
+        const allDisplayedSelected = displayedIds.length > 0 && displayedIds.every(topicId => selectedTopicIds.has(topicId));
+
+        if (allDisplayedSelected) displayedIds.forEach(topicId => selectedTopicIds.delete(topicId));
+        else displayedIds.forEach(topicId => selectedTopicIds.add(topicId));
+        syncManageUi();
+    }
+
+    function syncManageUi() {
+        const container = document.getElementById('tabContentTopics');
+        const manageButton = document.getElementById('nextUiManageTopicsBtn');
+        const managePanel = container?.querySelector('.next-ui-topic-manage-panel');
+        const count = document.getElementById('nextUiTopicSelectionCount');
+        const selectAllButton = document.getElementById('nextUiSelectAllTopicsBtn');
+        const deleteButton = document.getElementById('nextUiDeleteTopicsBtn');
+        const allDisplayedSelected = displayedTopics.length > 0
+            && displayedTopics.every(topic => selectedTopicIds.has(topic.id));
+
+        container?.classList.toggle('is-managing', isManageMode);
+        manageButton?.classList.toggle('active', isManageMode);
+        manageButton?.setAttribute('aria-pressed', String(isManageMode));
+        managePanel?.setAttribute('aria-hidden', String(!isManageMode));
+        if (count) count.textContent = `已选择 ${selectedTopicIds.size} 项`;
+        if (deleteButton) deleteButton.disabled = selectedTopicIds.size === 0;
+        const selectAllIcon = selectAllButton?.querySelector('.vcp-ui-icon');
+        if (selectAllIcon) selectAllIcon.textContent = allDisplayedSelected ? 'check_box' : 'check_box_outline_blank';
+        if (selectAllButton) selectAllButton.title = allDisplayedSelected ? '取消全选' : '全选话题';
+
+        document.querySelectorAll('#topicList .topic-item').forEach(item => {
+            const selected = selectedTopicIds.has(item.dataset.topicId);
+            item.classList.toggle('selected', selected);
+            item.setAttribute('aria-selected', String(selected));
+            const icon = item.querySelector('.next-ui-topic-select-icon');
+            if (icon) icon.textContent = selected ? 'check_box' : 'check_box_outline_blank';
+        });
+    }
+
+    async function deleteSelectedTopics() {
+        if (!isManageMode || selectedTopicIds.size === 0 || !currentItemConfig) return;
+
+        const currentSelectedItem = currentSelectedItemRef.get();
+        const topicsToDelete = availableTopics.filter(topic => selectedTopicIds.has(topic.id));
+        if (topicsToDelete.length === 0) return;
+        if (topicsToDelete.length >= availableTopics.length) {
+            uiHelper.showToastNotification('至少需要保留一个话题。', 'warning');
+            return;
+        }
+
+        const flowlockedTopic = currentSelectedItem.type === 'agent'
+            ? topicsToDelete.find(topic => window.flowlockManager?.isTopicLocked?.(currentSelectedItem.id, topic.id))
+            : null;
+        if (flowlockedTopic) {
+            uiHelper.showToastNotification(`话题“${flowlockedTopic.name}”正在心流锁中运行，请先停止对应心流锁。`, 'warning');
+            return;
+        }
+
+        const confirmed = await uiHelper.showConfirmDialog(
+            `确定要永久删除选中的 ${topicsToDelete.length} 个话题吗？此操作不可撤销。`,
+            '批量删除话题',
+            '删除',
+            '取消',
+            true
+        );
+        if (!confirmed) return;
+
+        let deletedCount = 0;
+        let remainingTopics = availableTopics;
+        let firstError = '';
+        const activeTopicId = currentTopicIdRef.get();
+        let activeTopicDeleted = false;
+
+        for (const topic of topicsToDelete) {
+            try {
+                const result = currentSelectedItem.type === 'agent'
+                    ? await electronAPI.deleteTopic(currentSelectedItem.id, topic.id)
+                    : await electronAPI.deleteGroupTopic(currentSelectedItem.id, topic.id);
+                if (result?.success) {
+                    deletedCount++;
+                    if (topic.id === activeTopicId) activeTopicDeleted = true;
+                    remainingTopics = result.remainingTopics || remainingTopics.filter(item => item.id !== topic.id);
+                } else if (!firstError) {
+                    firstError = result?.error || '未知错误';
+                }
+            } catch (error) {
+                if (!firstError) firstError = error.message;
+            }
+        }
+
+        const deletedTopicIds = topicsToDelete.map(topic => topic.id).filter(id => !remainingTopics.some(item => item.id === id));
+        if (deletedTopicIds.length) mainRendererFunctions.onTopicsDeleted?.({ itemId: currentSelectedItem.id, itemType: currentSelectedItem.type, topicIds: deletedTopicIds });
+        if (activeTopicDeleted) {
+            mainRendererFunctions.handleTopicDeletion(remainingTopics, {
+                id: currentSelectedItem.id,
+                type: currentSelectedItem.type,
+                deletedTopicIds: topicsToDelete.map(topic => topic.id),
+                fallbackTopicId: topicsToDelete.some(topic => topic.id === activeTopicId) ? null : activeTopicId,
+            });
+        }
+
+        setManageMode(false);
+        if (deletedCount > 0) uiHelper.showToastNotification(`已删除 ${deletedCount} 个话题。`, 'success');
+        if (firstError) uiHelper.showToastNotification(`部分话题删除失败：${firstError}`, 'error');
+    }
+
+    function initializeTopicSortable(itemId, itemType) {
+        const topicListUl = document.getElementById('topicList');
+        if (!topicListUl) {
+            console.warn("[TopicListManager] topicListUl element not found. Skipping Sortable initialization.");
+            return;
+        }
+
+        if (topicListUl.sortableInstance) {
+            topicListUl.sortableInstance.destroy();
+        }
+
+        const targetItemId = itemId;
+        const targetItemType = itemType;
+        topicListUl.sortableInstance = new Sortable(topicListUl, {
+            animation: 150,
+            ghostClass: 'sortable-ghost-topic',
+            chosenClass: 'sortable-chosen-topic',
+            dragClass: 'sortable-drag-topic',
+            onStart: async function (evt) {
+                // Check original state, store it, and then disable if it was active.
+                if (electronAPI?.getSelectionListenerStatus) {
+                    wasSelectionListenerActive = await electronAPI.getSelectionListenerStatus();
+                    if (wasSelectionListenerActive) {
+                        electronAPI.toggleSelectionListener(false);
+                    }
+                }
+            },
+            onEnd: async function (evt) {
+                // Re-enable selection hook only if it was active before the drag.
+                if (electronAPI?.toggleSelectionListener) {
+                    if (wasSelectionListenerActive) {
+                        electronAPI.toggleSelectionListener(true);
+                    }
+                    wasSelectionListenerActive = false; // Reset state
+                }
+
+                const topicItems = Array.from(evt.to.children);
+                const orderedTopicIds = topicItems.map(item => item.dataset.topicId);
+                try {
+                    let result;
+                    if (targetItemType === 'agent') {
+                        result = await electronAPI.saveTopicOrder(targetItemId, orderedTopicIds);
+                    } else if (targetItemType === 'group') {
+                        result = await electronAPI.saveGroupTopicOrder(targetItemId, orderedTopicIds);
+                    }
+
+                    if (result && result.success) {
+                        // UI reflects sort.
+                    } else {
+                        console.error(`Failed to save topic order for ${targetItemType} ${targetItemId}:`, result?.error);
+                        uiHelper.showToastNotification(`保存话题顺序失败: ${result?.error || '未知错误'}`, 'error');
+                        loadTopicList();
+                    }
+                } catch (error) {
+                    console.error(`Error calling saveTopicOrder for ${targetItemType} ${targetItemId}:`, error);
+                    uiHelper.showToastNotification(`调用保存话题顺序API时出错: ${error.message}`, 'error');
+                    loadTopicList();
+                }
+            }
+        });
+    }
+
+    function showTopicContextMenu(event, topicItemElement, itemFullConfig, topic, itemType) {
+        // closeContextMenu(); // This function is not available in this module
+        closeTopicContextMenu();
+
+        const menu = document.createElement('div');
+        menu.id = 'topicContextMenu';
+        menu.classList.add('context-menu');
+
+        // 冻结话题域目标；标题生成允许即时保存，但绝不能跨项目串写。
+        const targetItemId = itemFullConfig.id;
+        const targetItemType = itemType;
+        const targetTopicId = topic.id;
+        // "生成话题名" 菜单项：Agent 和 Group 话题均支持
+        const regenerateTitleOption = document.createElement('div');
+        regenerateTitleOption.classList.add('context-menu-item');
+        regenerateTitleOption.innerHTML = `<i class="fas fa-magic"></i> 生成话题名`;
+        regenerateTitleOption.onclick = async () => {
+            closeTopicContextMenu();
+            if (regenerateTitleOption.dataset.loading === 'true') return;
+
+            regenerateTitleOption.dataset.loading = 'true';
+            regenerateTitleOption.classList.add('disabled');
+            try {
+                // 根据话题类型调用对应的 IPC
+                const result = targetItemType === 'agent'
+                    ? await electronAPI.regenerateAgentTopicTitle(targetItemId, targetTopicId)
+                    : await electronAPI.regenerateGroupTopicTitle(targetItemId, targetTopicId);
+
+                if (result?.success && result.newTitle) {
+                    // 原话题已保存；离开原项目后不再投影到当前界面，也不误报失败。
+                    if (currentSelectedItemRef.get()?.id !== targetItemId ||
+                        currentSelectedItemRef.get()?.type !== targetItemType) return;
+                    topic.name = result.newTitle;
+                    const topicInFullConfig = itemFullConfig.topics?.find(candidate => candidate.id === topic.id);
+                    if (topicInFullConfig) topicInFullConfig.name = result.newTitle;
+
+                    const titleDisplayElement = topicItemElement.querySelector('.topic-title-display, .topic-name');
+                    if (titleDisplayElement) titleDisplayElement.textContent = result.newTitle;
+                    uiHelper.showToastNotification(`话题名已更新为"${result.newTitle}"`, 'success');
+                } else {
+                    // 失败时不修改 topic、itemFullConfig 或 DOM，保留旧标题。
+                    uiHelper.showToastNotification(`生成话题名失败: ${result?.error || 'AI 未返回有效标题'}`, 'error');
+                }
+            } catch (error) {
+                // 请求异常时同样不触碰旧标题。
+                console.error('[TopicListManager] 生成话题名失败:', error);
+                uiHelper.showToastNotification(`生成话题名失败: ${error.message}`, 'error');
+            } finally {
+                regenerateTitleOption.dataset.loading = 'false';
+                regenerateTitleOption.classList.remove('disabled');
+            }
+        };
+
+        const editTitleOption = document.createElement('div');
+        editTitleOption.classList.add('context-menu-item');
+        editTitleOption.innerHTML = `<i class="fas fa-edit"></i> 编辑话题标题`;
+        editTitleOption.onclick = () => {
+            closeTopicContextMenu();
+            const titleDisplayElement = topicItemElement.querySelector('.topic-title-display');
+            if (!titleDisplayElement) return;
+
+            const originalTitle = topic.name;
+            titleDisplayElement.style.display = 'none';
+
+            const inputWrapper = document.createElement('div');
+            inputWrapper.style.display = 'flex';
+            inputWrapper.style.alignItems = 'center';
+
+            const inputField = document.createElement('input');
+            inputField.type = 'text';
+            inputField.value = originalTitle;
+            inputField.classList.add('topic-title-edit-input');
+            inputField.style.flexGrow = '1';
+            inputField.onclick = (e) => e.stopPropagation();
+
+            const confirmButton = document.createElement('button');
+            confirmButton.type = 'button';
+            confirmButton.innerHTML = '✓';
+            confirmButton.classList.add('topic-title-edit-confirm');
+            confirmButton.onclick = async (e) => {
+                e.stopPropagation();
+                const newTitle = inputField.value.trim();
+                if (newTitle && newTitle !== originalTitle) {
+                    let saveResult;
+                    if (targetItemType === 'agent') {
+                        saveResult = await electronAPI.saveAgentTopicTitle(targetItemId, targetTopicId, newTitle);
+                    } else if (targetItemType === 'group') {
+                        saveResult = await electronAPI.saveGroupTopicTitle(targetItemId, targetTopicId, newTitle);
+                    }
+                    if (saveResult && saveResult.success) {
+                        topic.name = newTitle;
+                        titleDisplayElement.textContent = newTitle;
+                        if (itemFullConfig.topics) {
+                            const topicInFullConfig = itemFullConfig.topics.find(t => t.id === topic.id);
+                            if (topicInFullConfig) topicInFullConfig.name = newTitle;
+                        }
+                    } else {
+                        uiHelper.showToastNotification(`更新话题标题失败: ${saveResult?.error || '未知错误'}`, 'error');
+                    }
+                }
+                titleDisplayElement.style.display = '';
+                inputWrapper.replaceWith(titleDisplayElement);
+            };
+
+            const cancelButton = document.createElement('button');
+            cancelButton.type = 'button';
+            cancelButton.innerHTML = '✗';
+            cancelButton.classList.add('topic-title-edit-cancel');
+            cancelButton.onclick = (e) => {
+                e.stopPropagation();
+                titleDisplayElement.style.display = '';
+                inputWrapper.replaceWith(titleDisplayElement);
+            };
+
+            inputWrapper.appendChild(inputField);
+            inputWrapper.appendChild(confirmButton);
+            inputWrapper.appendChild(cancelButton);
+            topicItemElement.insertBefore(inputWrapper, titleDisplayElement.nextSibling);
+            inputField.focus();
+            inputField.select();
+
+            inputField.addEventListener('keydown', (e) => {
+                if (e.key === 'Enter') {
+                    confirmButton.click();
+                } else if (e.key === 'Escape') {
+                    cancelButton.click();
+                }
+            });
+        };
+        menu.appendChild(editTitleOption);
+        menu.appendChild(regenerateTitleOption);
+
+        const copyTopicIdOption = document.createElement('div');
+        copyTopicIdOption.classList.add('context-menu-item');
+        copyTopicIdOption.innerHTML = `<i class="fas fa-copy"></i> 复制话题ID`;
+        copyTopicIdOption.onclick = async () => {
+            closeTopicContextMenu();
+            const topicId = String(topic.id ?? '');
+            try {
+                if (navigator.clipboard?.writeText) {
+                    await navigator.clipboard.writeText(topicId);
+                } else {
+                    const textarea = document.createElement('textarea');
+                    textarea.value = topicId;
+                    textarea.style.position = 'fixed';
+                    textarea.style.opacity = '0';
+                    document.body.appendChild(textarea);
+                    textarea.focus();
+                    textarea.select();
+                    document.execCommand('copy');
+                    textarea.remove();
+                }
+                uiHelper.showToastNotification('已复制话题ID', 'success');
+            } catch (error) {
+                console.error('[TopicListManager] Failed to copy topic ID:', error);
+                uiHelper.showToastNotification(`复制话题ID失败: ${error.message}`, 'error');
+            }
+        };
+        menu.appendChild(copyTopicIdOption);
+
+        // Part C: 锁定/解锁话题选项
+        const toggleLockOption = document.createElement('div');
+        toggleLockOption.classList.add('context-menu-item');
+        const isLocked = topic.locked !== false; // 默认为锁定
+        toggleLockOption.innerHTML = isLocked
+            ? `<i class="fas fa-unlock"></i> 解锁话题`
+            : `<i class="fas fa-lock"></i> 锁定话题`;
+        toggleLockOption.onclick = async () => {
+            closeTopicContextMenu();
+            try {
+                const result = await electronAPI.toggleTopicLock(targetItemId, targetTopicId);
+                if (result.success) {
+                    topic.locked = result.locked;
+                    uiHelper.showToastNotification(result.message, 'success');
+                    loadTopicList(); // 刷新列表以显示新状态
+                } else {
+                    uiHelper.showToastNotification(`切换锁定状态失败: ${result.error}`, 'error');
+                }
+            } catch (error) {
+                uiHelper.showToastNotification(`操作失败: ${error.message}`, 'error');
+            }
+        };
+        menu.appendChild(toggleLockOption);
+
+        // Part C: 标记为未读/已读选项
+        const toggleUnreadOption = document.createElement('div');
+        toggleUnreadOption.classList.add('context-menu-item');
+        const isUnread = topic.unread === true;
+        toggleUnreadOption.innerHTML = isUnread
+            ? `<i class="fas fa-check"></i> 标记为已读`
+            : `<i class="fas fa-envelope"></i> 标记为未读`;
+        toggleUnreadOption.onclick = async () => {
+            closeTopicContextMenu();
+            try {
+                const result = await electronAPI.setTopicUnread(targetItemId, targetTopicId, !isUnread);
+                if (result.success) {
+                    topic.unread = result.unread;
+                    if (result.unreadSource) {
+                        topic.unreadSource = result.unreadSource;
+                    } else {
+                        delete topic.unreadSource;
+                    }
+                    uiHelper.showToastNotification(
+                        topic.unread ? '已标记为未读' : '已标记为已读',
+                        'success'
+                    );
+                    loadTopicList(); // 刷新列表
+                    // 同时刷新助手列表以更新计数
+                    if (itemListManager) {
+                        itemListManager.loadItems();
+                    }
+                } else {
+                    uiHelper.showToastNotification(`操作失败: ${result.error}`, 'error');
+                }
+            } catch (error) {
+                uiHelper.showToastNotification(`操作失败: ${error.message}`, 'error');
+            }
+        };
+        menu.appendChild(toggleUnreadOption);
+
+        const deleteTopicPermanentlyOption = document.createElement('div');
+        deleteTopicPermanentlyOption.classList.add('context-menu-item', 'danger-item');
+        deleteTopicPermanentlyOption.innerHTML = `<i class="fas fa-trash-alt"></i> 删除此话题`;
+        deleteTopicPermanentlyOption.onclick = async () => {
+            closeTopicContextMenu();
+
+            // 活动 Flowlock Session 仍依赖该话题的历史目录，运行期间禁止删除。
+            if (targetItemType === 'agent' && window.flowlockManager?.isTopicLocked?.(targetItemId, targetTopicId)) {
+                uiHelper.showToastNotification('该话题正在心流锁中运行，请先停止对应 Agent 的心流锁。', 'warning');
+                return;
+            }
+
+            // 使用自定义确认对话框替代原生 confirm()，避免 Electron 焦点问题
+            const confirmed = await uiHelper.showConfirmDialog(
+                `确定要永久删除话题 "${topic.name}" 吗？此操作不可撤销。`,
+                '删除话题',
+                '删除',
+                '取消',
+                true // isDanger
+            );
+            if (confirmed) {
+                let result;
+                if (targetItemType === 'agent') {
+                    result = await electronAPI.deleteTopic(targetItemId, targetTopicId);
+                } else if (targetItemType === 'group') {
+                    result = await electronAPI.deleteGroupTopic(targetItemId, targetTopicId);
+                }
+
+                if (result && result.success) {
+                    mainRendererFunctions.onTopicsDeleted?.({ itemId: targetItemId, itemType: targetItemType, topicIds: [targetTopicId] });
+                    if (currentSelectedItemRef.get()?.id === targetItemId &&
+                        currentSelectedItemRef.get()?.type === targetItemType &&
+                        currentTopicIdRef.get() === targetTopicId) {
+                        mainRendererFunctions.handleTopicDeletion(result.remainingTopics, {
+                            id: targetItemId,
+                            type: targetItemType,
+                            topicId: targetTopicId,
+                            fallbackTopicId: itemFullConfig.topics?.find(candidate => candidate.id !== topic.id)?.id || null,
+                        });
+                    }
+                    loadTopicList();
+                } else {
+                    uiHelper.showToastNotification(`删除话题 "${topic.name}" 失败: ${result ? result.error : '未知错误'}`, 'error');
+                }
+            }
+        };
+        menu.appendChild(deleteTopicPermanentlyOption);
+
+        const exportTopicOption = document.createElement('div');
+        exportTopicOption.classList.add('context-menu-item');
+        exportTopicOption.innerHTML = `<i class="fas fa-file-export"></i> 导出此话题`;
+        exportTopicOption.onclick = () => {
+            closeTopicContextMenu();
+            handleExportTopic(itemFullConfig.id, itemType, topic.id, topic.name);
+        };
+        menu.appendChild(exportTopicOption);
+
+        const exportFullTopicOption = document.createElement('div');
+        exportFullTopicOption.classList.add('context-menu-item');
+        exportFullTopicOption.innerHTML = `<i class="fas fa-file-code"></i> 导出此话题(完整)`;
+        exportFullTopicOption.onclick = () => {
+            closeTopicContextMenu();
+            handleExportFullTopic(itemFullConfig, itemType, topic.id, topic.name);
+        };
+        menu.appendChild(exportFullTopicOption);
+
+        // 智能定位逻辑：先隐藏菜单以测量尺寸
+        menu.style.visibility = 'hidden';
+        menu.style.position = 'absolute';
+        document.body.appendChild(menu);
+
+        // 获取菜单和窗口尺寸
+        const menuWidth = menu.offsetWidth;
+        const menuHeight = menu.offsetHeight;
+        const windowWidth = window.innerWidth;
+        const windowHeight = window.innerHeight;
+
+        let top = event.clientY;
+        let left = event.clientX;
+
+        // 检查菜单是否会超出窗口底部
+        if (top + menuHeight > windowHeight) {
+            // 将菜单显示在鼠标上方
+            top = event.clientY - menuHeight;
+            // 如果上方空间也不够，则贴近顶部
+            if (top < 0) top = 5;
+        }
+
+        // 检查菜单是否会超出窗口右侧
+        if (left + menuWidth > windowWidth) {
+            // 将菜单显示在鼠标左侧
+            left = event.clientX - menuWidth;
+            // 如果左侧空间也不够，则贴近左边
+            if (left < 0) left = 5;
+        }
+
+        // 应用最终位置并显示菜单
+        menu.style.top = `${top}px`;
+        menu.style.left = `${left}px`;
+        menu.style.visibility = 'visible';
+
+        document.addEventListener('click', closeTopicContextMenuOnClickOutside, true);
+    }
+
+    function closeTopicContextMenu() {
+        const existingMenu = document.getElementById('topicContextMenu');
+        if (existingMenu) {
+            existingMenu.remove();
+            document.removeEventListener('click', closeTopicContextMenuOnClickOutside, true);
+        }
+    }
+
+    function closeTopicContextMenuOnClickOutside(event) {
+        const menu = document.getElementById('topicContextMenu');
+        if (menu && !menu.contains(event.target)) {
+            closeTopicContextMenu();
+        }
+    }
+
+    async function handleExportTopic(itemId, itemType, topicId, topicName) {
+        const currentTopicId = currentTopicIdRef.get();
+        if (topicId !== currentTopicId) {
+            uiHelper.showToastNotification('请先点击并加载此话题，然后再导出。', 'info');
+            return;
+        }
+
+        console.log(`[TopicListManager] Exporting currently visible topic: ${topicName} (ID: ${topicId})`);
+
+        try {
+            const chatMessagesDiv = document.getElementById('chatMessages');
+            if (!chatMessagesDiv) {
+                console.error('[Export Debug] chatMessagesDiv not found!');
+                uiHelper.showToastNotification('错误：找不到聊天内容容器。', 'error');
+                return;
+            }
+
+            const messageItems = chatMessagesDiv.querySelectorAll('.message-item');
+            console.log(`[Export Debug] Found ${messageItems.length} message items.`);
+            if (messageItems.length === 0) {
+                uiHelper.showToastNotification('此话题没有可见的聊天内容可导出。', 'info');
+                return;
+            }
+
+            let markdownContent = `# 话题: ${topicName}\n\n`;
+            let extractedCount = 0;
+
+            messageItems.forEach((item, index) => {
+                if (item.classList.contains('system') || item.classList.contains('thinking')) {
+                    console.log(`[Export Debug] Skipping system/thinking message at index ${index}.`);
+                    return;
+                }
+
+                const senderElement = item.querySelector('.sender-name');
+                const contentElement = item.querySelector('.md-content');
+
+                if (senderElement && contentElement) {
+                    const sender = senderElement.textContent.trim().replace(':', '');
+                    // 克隆节点，移除思维链气泡（<think> 已被渲染为 DOM 节点，innerText 会包含其文本）
+                    const contentClone = contentElement.cloneNode(true);
+                    contentClone.querySelectorAll('.vcp-thought-chain-bubble').forEach(el => el.remove());
+                    let content = contentClone.innerText || contentClone.textContent || "";
+                    // 兜底：仅清理起止标签分别独占一行的明文思维链。
+                    content = content.replace(/^[ \t]*\[--- VCP元思考链(?::\s*"[^"]*")?\s*---\][ \t]*\r?\n[\s\S]*?^[ \t]*\[--- 元思考链结束 ---\][ \t]*(?:\r?\n|$)/gm, '');
+                    content = content.replace(/^[ \t]*<think(?:ing)?>[ \t]*\r?\n[\s\S]*?^[ \t]*<\/think(?:ing)?>[ \t]*(?:\r?\n|$)/gim, '');
+                    content = content.trim();
+
+                    if (sender && content) {
+                        markdownContent += `**${sender}**: ${content}\n\n---\n\n`;
+                        extractedCount++;
+                    } else {
+                        console.log(`[Export Debug] Skipping message at index ${index} due to empty sender or content. Sender: "${sender}", Content: "${content}"`);
+                    }
+                } else {
+                    console.log(`[Export Debug] Skipping message at index ${index} because sender or content element was not found.`);
+                }
+            });
+
+            console.log(`[Export Debug] Extracted ${extractedCount} messages. Final markdown length: ${markdownContent.length}`);
+
+            if (extractedCount === 0) {
+                uiHelper.showToastNotification('未能从当前话题中提取任何有效对话内容。', 'warning');
+                return;
+            }
+
+            const result = await electronAPI.exportTopicAsMarkdown({
+                topicName: topicName,
+                markdownContent: markdownContent
+            });
+
+            if (result.success) {
+                uiHelper.showToastNotification(`话题 "${topicName}" 已成功导出到: ${result.path}`);
+            } else {
+                uiHelper.showToastNotification(`导出话题失败: ${result.error}`, 'error');
+            }
+        } catch (error) {
+            console.error(`[TopicListManager] 导出话题时发生错误:`, error);
+            uiHelper.showToastNotification(`导出话题时发生前端错误: ${error.message}`, 'error');
+        }
+    }
+
+    function getRawMessageContent(message) {
+        if (typeof message?.content === 'string') return message.content;
+        if (typeof message?.content?.text === 'string') return message.content.text;
+        if (Array.isArray(message?.content)) {
+            return message.content
+                .filter(part => part && part.type === 'text' && typeof part.text === 'string')
+                .map(part => part.text)
+                .join('\n');
+        }
+        if (message?.content === null || message?.content === undefined) return '';
+        try {
+            return JSON.stringify(message.content, null, 2);
+        } catch {
+            return String(message.content);
+        }
+    }
+
+    function resolveFullExportAgentInfo(message, itemFullConfig, itemType) {
+        if (message.role === 'user') {
+            return {
+                name: message.name || '用户',
+                model: 'N/A'
+            };
+        }
+
+        if (itemType === 'group') {
+            const agentId = message.agentId || message.agentID;
+            const member = (itemFullConfig.agents || []).find(agent =>
+                agent.id === agentId || agent.agentId === agentId
+            );
+            const usesUnifiedModel = itemFullConfig.useUnifiedModel === true;
+            return {
+                name: message.name || member?.name || agentId || 'Assistant',
+                model: message.model || message.modelName ||
+                    (usesUnifiedModel ? itemFullConfig.unifiedModel : member?.model) ||
+                    '未知模型'
+            };
+        }
+
+        return {
+            name: message.name || itemFullConfig.name || itemFullConfig.id || 'Assistant',
+            model: message.model || message.modelName || itemFullConfig.model || '未知模型'
+        };
+    }
+
+    async function handleExportFullTopic(itemFullConfig, itemType, topicId, topicName) {
+        console.log(`[TopicListManager] Exporting full raw topic: ${topicName} (ID: ${topicId})`);
+
+        try {
+            const history = await getHistory(itemFullConfig.id, itemType, topicId);
+
+            if (!Array.isArray(history)) {
+                throw new Error(history?.error || '无法读取话题历史');
+            }
+
+            const messages = history.filter(message =>
+                message &&
+                message.role !== 'system' &&
+                message.isThinking !== true
+            );
+
+            if (messages.length === 0) {
+                uiHelper.showToastNotification('此话题没有可导出的对话内容。', 'info');
+                return;
+            }
+
+            let exportContent = `# 话题: ${topicName}\n\n`;
+            exportContent += `> 导出模式: 完整（保留原始消息内容）\n\n`;
+
+            messages.forEach((message, index) => {
+                const { name, model } = resolveFullExportAgentInfo(message, itemFullConfig, itemType);
+                const rawContent = getRawMessageContent(message);
+
+                exportContent += `===== 消息 ${index + 1} =====\n`;
+                exportContent += `Role: ${message.role || 'unknown'}\n`;
+                exportContent += `Agent: ${name}\n`;
+                exportContent += `Model: ${model}\n`;
+                if (message.timestamp) {
+                    exportContent += `Timestamp: ${new Date(message.timestamp).toISOString()}\n`;
+                }
+                exportContent += `\n${rawContent}\n\n`;
+            });
+
+            const result = await electronAPI.exportTopicAsMarkdown({
+                topicName: `${topicName}-完整`,
+                markdownContent: exportContent
+            });
+
+            if (result.success) {
+                uiHelper.showToastNotification(`话题 "${topicName}" 已完整导出到: ${result.path}`);
+            } else if (result.error !== '用户取消了导出操作。') {
+                uiHelper.showToastNotification(`完整导出话题失败: ${result.error}`, 'error');
+            }
+        } catch (error) {
+            console.error('[TopicListManager] 完整导出话题时发生错误:', error);
+            uiHelper.showToastNotification(`完整导出话题失败: ${error.message}`, 'error');
+        }
+    }
+
+    /**
+     * 设置鼠标快捷键事件监听器
+     */
+    function setupMouseShortcuts() {
+        const topicsContainer = document.getElementById('tabContentTopics');
+        if (!topicsContainer) {
+            console.warn('[TopicListManager] 话题容器未找到，跳过鼠标快捷键设置');
+            return;
+        }
+
+        let lastLeftClickTime = 0;
+
+        // 双击左键：进入设置页面
+        addListener(topicsContainer, 'click', (e) => {
+            if (isManageMode) return;
+            if (e.target.closest('button, input, .topics-header-container, .next-ui-topic-manage-panel')) return;
+            if (e.button === 0) { // 左键
+                const currentTime = Date.now();
+                const timeDiff = currentTime - lastLeftClickTime;
+
+                if (timeDiff < 300) { // 双击检测（300ms内）
+                    console.log('[TopicListManager] 检测到双击左键，进入设置页面');
+                    e.preventDefault();
+                    e.stopPropagation();
+
+                    // 切换到设置页面
+                    if (uiManager && typeof uiManager.switchToTab === 'function') {
+                        uiManager.switchToTab('settings');
+                    } else {
+                        console.warn('[TopicListManager] uiManager不可用，无法切换到设置页面');
+                    }
+                }
+
+                lastLeftClickTime = currentTime;
+            }
+        });
+
+        // 中键点击：返回助手页面
+        addListener(topicsContainer, 'auxclick', (e) => {
+            if (e.button === 1) { // 中键
+                console.log('[TopicListManager] 检测到中键点击，返回助手页面');
+                e.preventDefault();
+                e.stopPropagation();
+
+                // 切换到助手页面
+                if (uiManager && typeof uiManager.switchToTab === 'function') {
+                    uiManager.switchToTab('agents');
+                    // 重置助手页面的鼠标事件状态，确保双击功能正常工作
+                    if (itemListManager && typeof itemListManager.resetMouseEventStates === 'function') {
+                        itemListManager.resetMouseEventStates();
+                    }
+                } else {
+                    console.warn('[TopicListManager] uiManager不可用，无法切换到助手页面');
+                }
+            }
+        });
+
+        // 防止中键点击的默认行为
+        addListener(topicsContainer, 'mousedown', (e) => {
+            if (e.button === 1) { // 中键
+                e.preventDefault();
+            }
+        });
+
+        console.log('[TopicListManager] 鼠标快捷键设置完成');
+    }
+
+    function dispose() {
+        cancelPendingTopicSearch();
+        cleanupProgressiveTopicRendering();
+        closeTopicContextMenu();
+        selectedTopicIds.clear();
+        displayedTopics = [];
+        availableTopics = [];
+        currentItemConfig = null;
+        managedItemKey = '';
+        topicListContainer = null;
+        listenerOwner = null;
+    }
+
+    // --- Public API ---
+    return {
+        init,
+        loadTopicList,
+        setupTopicSearch,
+        showTopicContextMenu,
+        setupMouseShortcuts,
+        dispose
+    };
+})();

From c6e4ac98ef23dbbced9274666bb2d0e8368f8cbd Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 02:17:11 +0000
Subject: [PATCH 076/143] Side pane batch N: recently closed per conversation,
 command output list, cd quoting

- The tab overview lists only recently closed tabs that would show in the
  current conversation; reopening another topic's tab used to look like
  nothing happened.
- Command output keeps at most the 30 runs the main process keeps, so
  evicted runs no longer linger in the picker; a run requested for an
  already-mounted tab no longer sticks to it after it sleeps and remounts.
- Jump-to-workspace doubles curly apostrophes for PowerShell (it treats
  U+2018-U+201B as quotes) and refuses paths with line breaks.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DFRovoZHMzeheXKkLNWKG
---
 .../contracts/generated/chat-event-graph.json | 76 +++++++++----------
 modules/ipc/terminalHandlers.js               |  9 ++-
 .../side-pane/side-pane-controller.js         |  3 +-
 .../ui-system/side-pane/side-pane-state.js    |  3 +-
 .../side-pane/toolOutputSideProvider.js       |  2 +
 .../sources/terminal-command-runs.js          |  5 +-
 tests/shared-source.test.mjs                  |  9 +++
 tests/side-pane-tab-strip.test.mjs            | 24 ++++++
 tests/side-pane-tool-output.test.mjs          | 11 +++
 tests/terminal-command-run-watch.test.js      |  8 ++
 10 files changed, 106 insertions(+), 44 deletions(-)

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 4f48d2ff4..a6d1dedeb 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -4326,22 +4326,22 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 498,
+          "line": 499,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1159,
+          "line": 1160,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1165,
+          "line": 1166,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1179,
+          "line": 1180,
           "kind": "custom-event-listener"
         },
         {
@@ -5924,25 +5924,25 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 498,
+          "line": 499,
           "kind": "custom-event-listener",
           "match": "retry.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1159,
+          "line": 1160,
           "kind": "custom-event-listener",
           "match": "toggleNotificationsBtn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1165,
+          "line": 1166,
           "kind": "custom-event-listener",
           "match": "expandButton.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1179,
+          "line": 1180,
           "kind": "custom-event-listener",
           "match": "closeSidePaneBtn.addEventListener('click'"
         },
@@ -21706,14 +21706,14 @@
       "consumers": [
         {
           "file": "modules/ui-system/sources/terminal-command-runs.js",
-          "line": 34,
+          "line": 37,
           "kind": "preload-subscription"
         }
       ],
       "evidence": [
         {
           "file": "modules/ui-system/sources/terminal-command-runs.js",
-          "line": 34,
+          "line": 37,
           "kind": "preload-subscription",
           "match": "api.onTerminalCommandRunChanged("
         }
@@ -25008,7 +25008,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1199,
+          "line": 1200,
           "kind": "custom-event-listener"
         },
         {
@@ -25108,7 +25108,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1199,
+          "line": 1200,
           "kind": "custom-event-listener",
           "match": "win?.addEventListener?.('resize'"
         },
@@ -28451,14 +28451,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 308,
+          "line": 311,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 308,
+          "line": 311,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:cd'"
         },
@@ -28475,7 +28475,7 @@
       "producers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 184,
+          "line": 187,
           "kind": "event-send"
         }
       ],
@@ -28489,7 +28489,7 @@
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 184,
+          "line": 187,
           "kind": "event-send",
           "match": "emit('terminal:clear'"
         },
@@ -28513,14 +28513,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 280,
+          "line": 283,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 280,
+          "line": 283,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:command-run'"
         },
@@ -28563,14 +28563,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 271,
+          "line": 274,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 271,
+          "line": 274,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:command-runs'"
         },
@@ -28594,14 +28594,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 219,
+          "line": 222,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 219,
+          "line": 222,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:create'"
         },
@@ -28618,7 +28618,7 @@
       "producers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 183,
+          "line": 186,
           "kind": "event-send"
         }
       ],
@@ -28632,7 +28632,7 @@
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 183,
+          "line": 186,
           "kind": "event-send",
           "match": "emit('terminal:data'"
         },
@@ -28649,7 +28649,7 @@
       "producers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 185,
+          "line": 188,
           "kind": "event-send"
         }
       ],
@@ -28663,7 +28663,7 @@
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 185,
+          "line": 188,
           "kind": "event-send",
           "match": "emit('terminal:exit'"
         },
@@ -28687,14 +28687,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 253,
+          "line": 256,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 253,
+          "line": 256,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:kill'"
         },
@@ -28718,14 +28718,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 241,
+          "line": 244,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 241,
+          "line": 244,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:resize'"
         },
@@ -28749,14 +28749,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 259,
+          "line": 262,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 259,
+          "line": 262,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:restart'"
         },
@@ -28780,14 +28780,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 302,
+          "line": 305,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 302,
+          "line": 305,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:unwatch-command-runs'"
         },
@@ -28811,14 +28811,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 291,
+          "line": 294,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 291,
+          "line": 294,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:watch-command-runs'"
         },
@@ -28842,14 +28842,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 228,
+          "line": 231,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 228,
+          "line": 231,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:write'"
         },
diff --git a/modules/ipc/terminalHandlers.js b/modules/ipc/terminalHandlers.js
index f4505819b..7c722fa4f 100644
--- a/modules/ipc/terminalHandlers.js
+++ b/modules/ipc/terminalHandlers.js
@@ -152,8 +152,11 @@ function resolveWorkspacePath(workspaceId) {
 }
 
 // 终端窗口用的是 PowerShell（Windows）/ bash（其它平台）
-function buildChangeDirectoryCommand(dir) {
-    if (process.platform === 'win32') return `Set-Location -LiteralPath '${dir.replace(/'/g, "''")}'\r`;
+// PowerShell 把弯引号 ‘ ’ ‚ ‛（U+2018–U+201B）也当单引号：只双写 ' 的话 `Bob’s repo` 会提前闭合字符串。
+// 换行会直接提交半条命令，这种路径不往终端里写
+function buildChangeDirectoryCommand(dir, platform = process.platform) {
+    if (/[\r\n]/.test(dir)) throw new Error('工作区路径包含换行，无法在终端里切换。');
+    if (platform === 'win32') return `Set-Location -LiteralPath '${dir.replace(/['\u2018-\u201B]/g, quote => quote + quote)}'\r`;
     return `cd '${dir.replace(/'/g, "'\\''")}'\r`;
 }
 
@@ -327,4 +330,4 @@ function disposeAll() {
     for (const sender of [...runWatchers.keys()]) stopRunWatcher(sender);
 }
 
-module.exports = { CHANNELS, initialize, disposeAll };
+module.exports = { CHANNELS, initialize, disposeAll, buildChangeDirectoryCommand };
diff --git a/modules/ui-system/side-pane/side-pane-controller.js b/modules/ui-system/side-pane/side-pane-controller.js
index 6afdbc64c..eeeb88510 100644
--- a/modules/ui-system/side-pane/side-pane-controller.js
+++ b/modules/ui-system/side-pane/side-pane-controller.js
@@ -262,7 +262,8 @@ export function createSidePaneController({
             getTabs: getStripTabs,
             getTabType,
             getActiveTabId: () => state.activeTabId,
-            getRecentlyClosed: () => recentlyClosedTabs,
+            // 只列当前对话能看到的：别的话题的标签重开后登记在那个话题下，这里看起来像点了没反应
+            getRecentlyClosed: () => recentlyClosedTabs.filter(entry => SidePaneState.isTabVisibleForParent(entry.tab, state.parent)),
             isClosable: isClosableTab,
             onActivate: (tabId) => {
                 controller.activateTab(tabId);
diff --git a/modules/ui-system/side-pane/side-pane-state.js b/modules/ui-system/side-pane/side-pane-state.js
index e8e8146c0..38c6282e7 100644
--- a/modules/ui-system/side-pane/side-pane-state.js
+++ b/modules/ui-system/side-pane/side-pane-state.js
@@ -333,7 +333,7 @@ export function reorderTabs(state, activeId, overId) {
 
 // 话题级标签只在所属对话里可见；没有当前对话（群组、启动早期）时一律不可见，
 // 否则「关闭所有」会关掉、进而删除别的对话的辅助对话（对照 ZCode workspaceSidePane.ts isSidePaneTabVisibleForParent）
-function isTabVisibleForParent(tab, parentRef) {
+export function isTabVisibleForParent(tab, parentRef) {
     if (tab.id === NOTIFICATIONS_TAB_ID || tab.scopeMode === 'global') return true;
     const tabParent = getTabParent(tab);
     if (!tabParent) return true;
@@ -368,6 +368,7 @@ const api = Object.freeze({
     closeTab,
     reorderTabs,
     getVisibleTabs,
+    isTabVisibleForParent,
     getClosableVisibleTabs,
     getTabParent
 });
diff --git a/modules/ui-system/side-pane/toolOutputSideProvider.js b/modules/ui-system/side-pane/toolOutputSideProvider.js
index aa36601dd..97ffe0bc9 100644
--- a/modules/ui-system/side-pane/toolOutputSideProvider.js
+++ b/modules/ui-system/side-pane/toolOutputSideProvider.js
@@ -82,6 +82,8 @@ export function createToolOutputSideProvider({
             });
             sidePaneController.setVisible?.(true);
             if (runId) for (const instance of instances) instance.select(runId);
+            // 已经挂着的实例直接定位了；不清掉的话，标签休眠后重新挂载会被这条旧命令"粘住"、不再跟随新命令
+            if (instances.size) requestedRunId = null;
             handle?.focus?.();
             return handle;
         },
diff --git a/modules/ui-system/sources/terminal-command-runs.js b/modules/ui-system/sources/terminal-command-runs.js
index a246fb5da..7ce7e3f52 100644
--- a/modules/ui-system/sources/terminal-command-runs.js
+++ b/modules/ui-system/sources/terminal-command-runs.js
@@ -6,13 +6,16 @@
 import { createSharedSource } from '../shared-source.js';
 
 const sources = new WeakMap();
+// 与主进程 commandRunStore 的 COMMAND_RUN_LIMIT 一致：主进程淘汰旧记录时不发通知，这边按同样的条数截掉，
+// 否则选择器里会一直列着已经读不到的命令
+export const COMMAND_RUN_LIMIT = 30;
 
 /** 推送来的是单条摘要：已有的就合并，新的放最前面。只替换变了的那一条，其余对象保持原样。 */
 export function mergeCommandRun(runs, summary) {
     const list = Array.isArray(runs) ? runs : [];
     if (!summary?.id) return list;
     const index = list.findIndex(run => run.id === summary.id);
-    if (index < 0) return [summary, ...list];
+    if (index < 0) return [summary, ...list].slice(0, COMMAND_RUN_LIMIT);
     const next = list.slice();
     next[index] = { ...list[index], ...summary };
     return next;
diff --git a/tests/shared-source.test.mjs b/tests/shared-source.test.mjs
index 1af3ddc30..4c824dac7 100644
--- a/tests/shared-source.test.mjs
+++ b/tests/shared-source.test.mjs
@@ -244,3 +244,12 @@ test('mergeCommandRun keeps untouched entries as the same objects', () => {
     assert.equal(merged[1], b);
     assert.deepEqual(mergeCommandRun([a], null), [a]);
 });
+
+test('mergeCommandRun keeps the same number of runs as the main process', async () => {
+    const { COMMAND_RUN_LIMIT } = await import('../modules/ui-system/sources/terminal-command-runs.js');
+    let runs = [];
+    for (let i = 0; i < COMMAND_RUN_LIMIT + 5; i++) runs = mergeCommandRun(runs, { id: `r${i}`, status: 'running' });
+    assert.equal(runs.length, COMMAND_RUN_LIMIT);
+    assert.equal(runs[0].id, `r${COMMAND_RUN_LIMIT + 4}`);
+    assert.equal(runs.some(run => run.id === 'r0'), false, 'runs the main process evicted are dropped');
+});
diff --git a/tests/side-pane-tab-strip.test.mjs b/tests/side-pane-tab-strip.test.mjs
index d68c0c431..a030e6faf 100644
--- a/tests/side-pane-tab-strip.test.mjs
+++ b/tests/side-pane-tab-strip.test.mjs
@@ -304,3 +304,27 @@ test('tab strip: a collapsed pane (only padding left) keeps the add button home
         dom.window.close();
     }
 });
+
+test('controller: the overview only offers recently closed tabs that would show in the current conversation', async () => {
+    const { controller, doc } = setup({ notes: notesProvider });
+    const topicA = { itemType: 'agent', itemId: 'agent', topicId: 'a' };
+    const topicB = { itemType: 'agent', itemId: 'agent', topicId: 'b' };
+    controller.setParent(topicA);
+    await controller.openTab({ id: 'plan-a', kind: 'notes', title: 'Plan A', scopeMode: 'topic', parent: topicA });
+    await controller.openTab({ id: 'tool', kind: 'notes', title: 'Tool', scopeMode: 'global' });
+    await controller.closeTab('plan-a');
+    await controller.closeTab('tool');
+    controller.setParent(topicB);
+
+    const input = doc.querySelector('.side-pane-overview-input');
+    input.value = '';
+    input.dispatchEvent(new doc.defaultView.Event('input'));
+    const titles = [...doc.querySelectorAll('.side-pane-overview-item.recently-closed')].map(item => item.textContent);
+    assert.equal(titles.length, 1, titles.join(' | '));
+    assert.match(titles[0], /Tool/);
+
+    controller.setParent(topicA);
+    input.dispatchEvent(new doc.defaultView.Event('input'));
+    assert.equal(doc.querySelectorAll('.side-pane-overview-item.recently-closed').length, 2, 'back in topic A both come back');
+    controller.dispose();
+});
diff --git a/tests/side-pane-tool-output.test.mjs b/tests/side-pane-tool-output.test.mjs
index be0f34181..5f77f8ea7 100644
--- a/tests/side-pane-tool-output.test.mjs
+++ b/tests/side-pane-tool-output.test.mjs
@@ -109,6 +109,17 @@ test('openToolOutputTab with a runId selects that run in an already-mounted tab'
     await handle.dispose();
 });
 
+test('a run picked in a mounted tab does not stick to the tab after it sleeps and remounts', async () => {
+    const { provider, view } = makeEnv({ runs: RUNS, details: DETAILS });
+    const first = await provider.mountTab({ id: 'tool-output:main' }, view);
+    await provider.openToolOutputTab({ runId: 'r1' });
+    await wait();
+    await first.dispose(); // 休眠
+    const again = await provider.mountTab({ id: 'tool-output:main' }, view);
+    assert.equal(view.querySelector('.side-tool-output-command').textContent, 'npm test', 'follows the latest run again');
+    await again.dispose();
+});
+
 test('a run requested before the tab mounts is honoured', async () => {
     const { provider, view } = makeEnv({ runs: RUNS, details: DETAILS });
     await provider.openToolOutputTab({ runId: 'r1' });
diff --git a/tests/terminal-command-run-watch.test.js b/tests/terminal-command-run-watch.test.js
index 507b5f160..182f41c6c 100644
--- a/tests/terminal-command-run-watch.test.js
+++ b/tests/terminal-command-run-watch.test.js
@@ -124,3 +124,11 @@ test('registering the IPC loads nothing; watch and unwatch are counted per page'
         terminalHandlers.disposeAll();
     }
 });
+
+test('jump-to-workspace quotes curly apostrophes for PowerShell and refuses paths with line breaks', () => {
+    const { buildChangeDirectoryCommand } = terminalHandlers;
+    assert.equal(buildChangeDirectoryCommand('C:\\Bob’s repo', 'win32'), "Set-Location -LiteralPath 'C:\\Bob’’s repo'\r");
+    assert.equal(buildChangeDirectoryCommand("C:\\it's", 'win32'), "Set-Location -LiteralPath 'C:\\it''s'\r");
+    assert.equal(buildChangeDirectoryCommand("/home/it's", 'linux'), "cd '/home/it'\\''s'\r");
+    assert.throws(() => buildChangeDirectoryCommand('C:\\a\nRemove-Item x', 'win32'), /换行/);
+});

From d6e6af2151d77fc46b92c21baa13270f7babb8e0 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 02:20:28 +0000
Subject: [PATCH 077/143] Side pane batch O: layout save budget, no domain
 reactivation at quit

- The persisted side pane layout has a 512KB total budget: older large
  tabs are dropped first and the active tab is always kept. A quota error
  retries without large tabs instead of silently stopping all layout and
  per-conversation memory saves.
- domainActivator.disposeAll({ final: true }) at will-quit: late renderer
  calls while the window is hidden get shutting-down instead of
  re-initializing a just-released domain that nobody disposes again.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DFRovoZHMzeheXKkLNWKG
---
 docs/contracts/chat-contracts.json            |  2 +-
 .../contracts/generated/chat-event-graph.json | 10 ++---
 main.js                                       |  2 +-
 modules/ipc/domainActivator.js                | 13 +++++-
 .../side-pane/side-pane-persistence.js        | 45 +++++++++++++++++--
 tests/domain-activator.test.js                | 21 +++++++++
 tests/side-pane-persistence.test.mjs          | 35 +++++++++++++++
 7 files changed, 116 insertions(+), 12 deletions(-)

diff --git a/docs/contracts/chat-contracts.json b/docs/contracts/chat-contracts.json
index 5e1444591..1dad635b9 100644
--- a/docs/contracts/chat-contracts.json
+++ b/docs/contracts/chat-contracts.json
@@ -507,7 +507,7 @@
     "dynamicSites": [
       {
         "file": "modules/ipc/domainActivator.js",
-        "line": 131,
+        "line": 136,
         "kind": "event-listener",
         "match": "ipcMain.handle(channel"
       }
diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index a6d1dedeb..a2d9550a4 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -1364,7 +1364,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-persistence.js",
-          "line": 134,
+          "line": 173,
           "kind": "custom-event-listener"
         }
       ],
@@ -1431,7 +1431,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-persistence.js",
-          "line": 134,
+          "line": 173,
           "kind": "custom-event-listener",
           "match": "win?.addEventListener?.('beforeunload'"
         }
@@ -22611,7 +22611,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-persistence.js",
-          "line": 133,
+          "line": 172,
           "kind": "custom-event-listener"
         }
       ],
@@ -22630,7 +22630,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-persistence.js",
-          "line": 133,
+          "line": 172,
           "kind": "custom-event-listener",
           "match": "win?.addEventListener?.('pagehide'"
         }
@@ -32574,7 +32574,7 @@
     },
     {
       "file": "modules/ipc/domainActivator.js",
-      "line": 131,
+      "line": 136,
       "reason": "dynamic event listener name: channel",
       "kind": "event-listener",
       "match": "ipcMain.handle(channel",
diff --git a/main.js b/main.js
index 1cec66796..b1c6d4c66 100644
--- a/main.js
+++ b/main.js
@@ -1961,7 +1961,7 @@ if (!gotTheLock) {
         }
 
         // 只释放用过的侧栏领域，没激活过的不会为了退出而加载
-        domainActivator.disposeAll();
+        domainActivator.disposeAll({ final: true });
         stateSubscriptions.dispose();
 
         // 1. 停止所有底层监听器
diff --git a/modules/ipc/domainActivator.js b/modules/ipc/domainActivator.js
index d0832bb64..08714288f 100644
--- a/modules/ipc/domainActivator.js
+++ b/modules/ipc/domainActivator.js
@@ -33,6 +33,9 @@ function createDomainActivator({ ipcMain, logger = console } = {}) {
     if (!ipcMain || typeof ipcMain.handle !== 'function') throw new TypeError('[DomainActivator] ipcMain is required.');
     const domains = new Map();
     const owners = new Map(); // channel → domain
+    // 退出时 disposeAll({ final: true }) 之后置位：will-quit 时窗口只是隐藏，渲染端的轮询和订阅还会调进来，
+    // 不拦住的话会把刚释放的领域重新 initialize（起 watcher、子进程），而之后再也没人 dispose
+    let shutDown = false;
 
     function unavailable(domain, error) {
         return { success: false, error: `${domain.name} 功能加载失败：${error?.message || String(error)}` };
@@ -41,6 +44,7 @@ function createDomainActivator({ ipcMain, logger = console } = {}) {
     function activate(name) {
         const domain = domains.get(name);
         if (!domain) throw new Error(`[DomainActivator] 未登记的领域：${name}`);
+        if (shutDown) throw new Error(`${name} 正在退出，不再激活`);
         if (domain.state === 'active') return domain.module;
         if (domain.state === 'loading') throw new Error(`${name} 正在初始化，不能在初始化过程中调用自己的通道`);
         domain.state = 'loading';
@@ -66,6 +70,7 @@ function createDomainActivator({ ipcMain, logger = console } = {}) {
     }
 
     function dispatch(domain, channel, event, args) {
+        if (shutDown) return { success: false, error: 'shutting-down' };
         if (domain.state !== 'active') {
             try {
                 activate(domain.name);
@@ -151,8 +156,12 @@ function createDomainActivator({ ipcMain, logger = console } = {}) {
         }));
     }
 
-    /** 释放已激活领域的资源，退回 declared；通道仍然登记着，之后再被调用会重新初始化 */
-    function disposeAll() {
+    /**
+     * 释放已激活领域的资源，退回 declared；通道仍然登记着，之后再被调用会重新初始化。
+     * final：应用退出，之后的调用一律返回 shutting-down，不再激活任何领域
+     */
+    function disposeAll({ final = false } = {}) {
+        if (final) shutDown = true;
         for (const domain of domains.values()) {
             if (domain.state !== 'active') continue;
             try {
diff --git a/modules/ui-system/side-pane/side-pane-persistence.js b/modules/ui-system/side-pane/side-pane-persistence.js
index dba19f541..f3dd179c1 100644
--- a/modules/ui-system/side-pane/side-pane-persistence.js
+++ b/modules/ui-system/side-pane/side-pane-persistence.js
@@ -10,6 +10,11 @@ export const PARENT_MEMORY_LIMIT = 50;
 export const MAX_PERSISTED_TABS = 30;
 // 单个标签序列化后超过这个大小就不存（比如很大的 diff），重启后不恢复它
 export const MAX_PERSISTED_TAB_CHARS = 64 * 1024;
+// 整份布局的总预算：30 个带 diff 的代码查看标签能到 ~2MB，同步 setItem 会卡、超配额还会让整份布局停存。
+// 超出时从最早打开的标签丢起（当前标签保留），对照 DSH persistence.ts 按 Session 分 key、坏了就清
+export const MAX_PERSISTED_LAYOUT_CHARS = 512 * 1024;
+// 写入失败（配额满）时的退路：只留小标签再写一次，至少保住标签列表和对话记忆
+const FALLBACK_TAB_CHARS = 4 * 1024;
 
 const TAB_FIELDS = ['id', 'kind', 'title', 'icon', 'closable', 'scopeMode', 'searchHint', 'openedAt'];
 
@@ -78,7 +83,9 @@ function sanitizeEntries(entries, isValidValue) {
 export function serializeLayout({
     tabs = [], activeTabId = null, visible = false, activeByParent = new Map(), collapsedByParent = new Map()
 }, canPersist) {
-    const persistedTabs = tabs.map(tab => sanitizeTab(tab, canPersist)).filter(Boolean).slice(-MAX_PERSISTED_TABS);
+    const persistedTabs = fitBudget(
+        tabs.map(tab => sanitizeTab(tab, canPersist)).filter(Boolean).slice(-MAX_PERSISTED_TABS),
+        activeTabId, MAX_PERSISTED_LAYOUT_CHARS);
     return {
         version: SIDE_PANE_LAYOUT_VERSION,
         tabs: persistedTabs,
@@ -90,6 +97,30 @@ export function serializeLayout({
     };
 }
 
+/** 从最新的标签往回累加体积，超出预算的较早标签不存；当前标签无论如何都留着 */
+function fitBudget(tabs, activeTabId, budget) {
+    const sizes = tabs.map(tab => JSON.stringify(tab).length);
+    let used = sizes[tabs.findIndex(tab => tab.id === activeTabId)] || 0;
+    const keep = new Set();
+    for (let i = tabs.length - 1; i >= 0; i--) {
+        if (tabs[i].id === activeTabId) { keep.add(i); continue; }
+        if (used + sizes[i] > budget) continue;
+        used += sizes[i];
+        keep.add(i);
+    }
+    return keep.size === tabs.length ? tabs : tabs.filter((_tab, i) => keep.has(i));
+}
+
+/** 写满配额时用：只留小标签，当前标签太大就不记它 */
+export function shrinkLayout(layout) {
+    const tabs = (layout?.tabs || []).filter(tab => JSON.stringify(tab).length <= FALLBACK_TAB_CHARS);
+    return {
+        ...layout,
+        tabs,
+        activeTabId: tabs.some(tab => tab.id === layout?.activeTabId) ? layout.activeTabId : null
+    };
+}
+
 /** 读出来的东西不合格（版本不对、不是对象、JSON 坏了）就返回 null，当作没有存过 */
 export function parseLayout(raw, canPersist) {
     let data = raw;
@@ -122,10 +153,18 @@ export function createSidePaneLayoutStore({ storage, key = SIDE_PANE_LAYOUT_KEY,
     function writeNow() {
         if (timer) { clearTimeout(timer); timer = null; }
         if (!storage || typeof getLayout !== 'function') return;
+        let layout = null;
         try {
-            storage.setItem(key, JSON.stringify(getLayout()));
+            layout = getLayout();
+            storage.setItem(key, JSON.stringify(layout));
         } catch (error) {
-            console.warn('[SidePaneLayout] Failed to save layout:', error);
+            // 多半是配额满了：退一步只存小标签，别让整份布局（含每个对话的收起记忆）从此停存
+            try {
+                if (layout) storage.setItem(key, JSON.stringify(shrinkLayout(layout)));
+                console.warn('[SidePaneLayout] Layout too large to save in full; saved without large tabs:', error);
+            } catch (fallbackError) {
+                console.warn('[SidePaneLayout] Failed to save layout:', fallbackError);
+            }
         }
     }
 
diff --git a/tests/domain-activator.test.js b/tests/domain-activator.test.js
index 2e24fb0d8..031974eb9 100644
--- a/tests/domain-activator.test.js
+++ b/tests/domain-activator.test.js
@@ -195,3 +195,24 @@ test('the terminal domain does not load the executor until a terminal channel is
         activator.unregisterAll();
     }
 });
+
+test('after the final dispose at quit, late calls do not bring a domain back', async () => {
+    const ipc = fakeIpcMain();
+    const activator = createDomainActivator({ ipcMain: ipc, logger: quiet });
+    let inits = 0;
+    const disposed = [];
+    activator.register('git', {
+        channels: ['git:status'],
+        load: () => ({}),
+        init: (_mod, { ipcMain }) => { inits += 1; ipcMain.handle('git:status', () => 'ok'); },
+        dispose: () => disposed.push('git'),
+    });
+    assert.equal(await ipc.invoke('git:status'), 'ok');
+    activator.disposeAll({ final: true });
+    assert.deepEqual(disposed, ['git']);
+    const late = await ipc.invoke('git:status'); // 窗口隐藏后渲染端的轮询还在调
+    assert.deepEqual(late, { success: false, error: 'shutting-down' });
+    assert.equal(inits, 1, 'the domain is not initialized again');
+    assert.equal(activator.stateOf('git'), 'declared');
+    activator.unregisterAll();
+});
diff --git a/tests/side-pane-persistence.test.mjs b/tests/side-pane-persistence.test.mjs
index 8594fe6ab..e73393ef0 100644
--- a/tests/side-pane-persistence.test.mjs
+++ b/tests/side-pane-persistence.test.mjs
@@ -181,3 +181,38 @@ test('restoring after the host picked the conversation mounts nothing from anoth
     await second.controller.dispose();
     second.dom.window.close();
 });
+
+test('a layout over the total budget drops the oldest large tabs but keeps the active one', async () => {
+    const { MAX_PERSISTED_LAYOUT_CHARS } = await import('../modules/ui-system/side-pane/side-pane-persistence.js');
+    const big = i => ({ id: `diff:${i}`, kind: 'notes', title: `d${i}`, payload: { oldCode: 'x'.repeat(60 * 1024), n: i } });
+    const tabs = Array.from({ length: 20 }, (_, i) => big(i));
+    const data = serializeLayout({ tabs, activeTabId: 'diff:0' }, canPersist);
+    assert.ok(JSON.stringify(data).length <= MAX_PERSISTED_LAYOUT_CHARS + 1024);
+    assert.equal(data.activeTabId, 'diff:0', 'the active tab survives even though it is the oldest');
+    assert.ok(data.tabs.some(tab => tab.id === 'diff:19'), 'the newest tabs are kept');
+    assert.equal(data.tabs.some(tab => tab.id === 'diff:1'), false, 'older tabs are dropped first');
+});
+
+test('a quota error still saves the tab list and conversation memory without the large tabs', async () => {
+    const { createSidePaneLayoutStore } = await import('../modules/ui-system/side-pane/side-pane-persistence.js');
+    const data = new Map();
+    const storage = {
+        getItem: key => data.get(key) ?? null,
+        setItem(key, value) {
+            if (value.length > 8 * 1024) throw new Error('QuotaExceededError');
+            data.set(key, value);
+        }
+    };
+    const layout = serializeLayout({
+        tabs: [{ id: 'small', kind: 'notes', title: 's' }, { id: 'large', kind: 'notes', title: 'l', payload: { code: 'x'.repeat(20 * 1024) } }],
+        activeTabId: 'large',
+        collapsedByParent: new Map([['agent:a', true]])
+    }, canPersist);
+    const store = createSidePaneLayoutStore({ storage, getLayout: () => layout });
+    store.flush();
+    const saved = parseLayout(store.load(), canPersist);
+    assert.deepEqual(saved.tabs.map(tab => tab.id), ['small']);
+    assert.equal(saved.activeTabId, null);
+    assert.equal(saved.collapsedByParent.get('agent:a'), true);
+    store.dispose();
+});

From 1a2c6552c9f2ca525efd3785c0caeb9cab3d21f1 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 02:22:47 +0000
Subject: [PATCH 078/143] Floating ask button: reposition after scrolling
 settles

Drag-selecting to the edge auto-scrolls the message list, and the last
selectionchange can come before the last scroll, which left the button
hidden for a live selection. Scrolling still hides it at once; 150ms after
it stops the button is placed at the selection's new position, and not at
all when the selection has scrolled out of view.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DFRovoZHMzeheXKkLNWKG
---
 .../contracts/generated/chat-event-graph.json | 20 +++++++++----------
 modules/renderer/floatingSelectionButton.js   | 16 +++++++++++++--
 tests/side-chat-floating-selection.test.mjs   | 15 ++++++++++++--
 3 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index a2d9550a4..17b0c36fb 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -3611,7 +3611,7 @@
         },
         {
           "file": "modules/renderer/floatingSelectionButton.js",
-          "line": 57,
+          "line": 68,
           "kind": "custom-event-listener"
         },
         {
@@ -5066,7 +5066,7 @@
         },
         {
           "file": "modules/renderer/floatingSelectionButton.js",
-          "line": 57,
+          "line": 68,
           "kind": "custom-event-listener",
           "match": "floatingBtn.addEventListener('click'"
         },
@@ -18826,7 +18826,7 @@
         },
         {
           "file": "modules/renderer/floatingSelectionButton.js",
-          "line": 56,
+          "line": 67,
           "kind": "custom-event-listener"
         },
         {
@@ -18945,7 +18945,7 @@
         },
         {
           "file": "modules/renderer/floatingSelectionButton.js",
-          "line": 56,
+          "line": 67,
           "kind": "custom-event-listener",
           "match": "floatingBtn.addEventListener('mousedown'"
         },
@@ -24983,7 +24983,7 @@
         },
         {
           "file": "modules/renderer/floatingSelectionButton.js",
-          "line": 55,
+          "line": 66,
           "kind": "custom-event-listener"
         },
         {
@@ -25078,7 +25078,7 @@
         },
         {
           "file": "modules/renderer/floatingSelectionButton.js",
-          "line": 55,
+          "line": 66,
           "kind": "custom-event-listener",
           "match": "win.addEventListener('resize'"
         },
@@ -26477,7 +26477,7 @@
         },
         {
           "file": "modules/renderer/floatingSelectionButton.js",
-          "line": 54,
+          "line": 65,
           "kind": "custom-event-listener"
         },
         {
@@ -26540,7 +26540,7 @@
         },
         {
           "file": "modules/renderer/floatingSelectionButton.js",
-          "line": 54,
+          "line": 65,
           "kind": "custom-event-listener",
           "match": "doc.addEventListener('scroll'"
         },
@@ -26836,14 +26836,14 @@
       "consumers": [
         {
           "file": "modules/renderer/floatingSelectionButton.js",
-          "line": 53,
+          "line": 64,
           "kind": "custom-event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/renderer/floatingSelectionButton.js",
-          "line": 53,
+          "line": 64,
           "kind": "custom-event-listener",
           "match": "doc.addEventListener('selectionchange'"
         }
diff --git a/modules/renderer/floatingSelectionButton.js b/modules/renderer/floatingSelectionButton.js
index e3e912ef0..efdc56ccd 100644
--- a/modules/renderer/floatingSelectionButton.js
+++ b/modules/renderer/floatingSelectionButton.js
@@ -13,8 +13,14 @@ export function createFloatingSelectionButton({ doc, win, notify }) {
     };
 
     const hide = () => { floatingBtn.hidden = true; };
-    // 按钮是 fixed 定位在选区视口坐标上；任何滚动或尺寸变化都会让坐标失效（ZCode MarkdownSelectionTooltip 同样在滚动时收起）
-    const onViewportChange = () => { if (!floatingBtn.hidden) hide(); };
+    // 按钮是 fixed 定位在选区视口坐标上；任何滚动或尺寸变化都会让坐标失效（ZCode MarkdownSelectionTooltip 同样在滚动时收起）。
+    // 停下来后按选区的新位置再放一次：拖选到边缘时列表会自己滚，滚完不一定还有 selectionchange
+    let settleTimer = null;
+    const onViewportChange = () => {
+        if (!floatingBtn.hidden) hide();
+        win.clearTimeout(settleTimer);
+        settleTimer = win.setTimeout(onSelectionChange, 150);
+    };
 
     const onSelectionChange = () => {
         const sel = win.getSelection();
@@ -25,6 +31,11 @@ export function createFloatingSelectionButton({ doc, win, notify }) {
             return;
         }
         const rect = range.getBoundingClientRect();
+        // 选区已经滚出视口：不把按钮钉在边上
+        if (rect.bottom < 0 || rect.top > win.innerHeight) {
+            hide();
+            return;
+        }
         floatingBtn.hidden = false;
         const btnWidth = floatingBtn.offsetWidth || 110;
         const left = Math.max(10, Math.min(win.innerWidth - btnWidth - 10, rect.left + rect.width / 2 - btnWidth / 2));
@@ -60,6 +71,7 @@ export function createFloatingSelectionButton({ doc, win, notify }) {
             doc.removeEventListener('selectionchange', onSelectionChange);
             doc.removeEventListener('scroll', onViewportChange, true);
             win.removeEventListener('resize', onViewportChange);
+            win.clearTimeout(settleTimer);
             floatingBtn.removeEventListener('mousedown', onMouseDown);
             floatingBtn.removeEventListener('click', onClick);
         }
diff --git a/tests/side-chat-floating-selection.test.mjs b/tests/side-chat-floating-selection.test.mjs
index c4169618e..48808d497 100644
--- a/tests/side-chat-floating-selection.test.mjs
+++ b/tests/side-chat-floating-selection.test.mjs
@@ -37,13 +37,24 @@ test('floating ask button shows only for main chat selections, not side chat mes
     assert.equal(btn.hidden, true);
 });
 
-test('floating ask button hides when any container scrolls or the window resizes', () => {
+test('floating ask button hides while a container scrolls and comes back at the new position once it settles', async () => {
     const { window, btn, select, handle } = setup();
     select('main');
-    assert.equal(btn.hidden, false);
     window.document.getElementById('chatMessages').dispatchEvent(new window.Event('scroll'));
     assert.equal(btn.hidden, true);
+    await new Promise(resolve => setTimeout(resolve, 200));
+    assert.equal(btn.hidden, false, 'the selection is still there after the scroll stops');
+    window.Range.prototype.getBoundingClientRect = () => ({ left: 100, top: -400, bottom: -380, width: 50, height: 20 });
+    window.document.getElementById('chatMessages').dispatchEvent(new window.Event('scroll'));
+    await new Promise(resolve => setTimeout(resolve, 200));
+    assert.equal(btn.hidden, true, 'a selection scrolled out of view gets no button');
+    handle.dispose();
+});
+
+test('floating ask button hides when the window resizes', () => {
+    const { window, btn, select, handle } = setup();
     select('main');
+    assert.equal(btn.hidden, false);
     window.dispatchEvent(new window.Event('resize'));
     assert.equal(btn.hidden, true);
     handle.dispose();

From e96c7578c53577995dbeede78fd12c095eaa6e27 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 02:25:40 +0000
Subject: [PATCH 079/143] Run the jump-to-workspace quoting test in
 test:workbench

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 78650abf6..7b88a72d2 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
     "test:built-artifact-smoke": "node scripts/test-built-artifact-smoke.mjs",
     "test:chat-transcript-snapshot": "node scripts/test-chat-transcript-snapshot.mjs",
     "test:side-pane": "node --test tests/side-pane-*.test.mjs tests/side-chat-*.test.mjs tests/side-browser-address.test.mjs tests/side-plan-revert-confirmation.test.mjs tests/sidebar-resizer-lifecycle.test.mjs tests/conversation-status-panel.test.mjs tests/domain-activator.test.js tests/browser-handlers.test.js tests/git-service.test.js tests/git-watcher.test.js tests/git-file-diff.test.mjs tests/git-changes-source.test.mjs tests/git-workspace-source.test.mjs",
-    "test:workbench": "node --test tests/conversation-current-source.test.mjs tests/conversation-scope.test.mjs tests/conversation-status-races.test.mjs tests/design-system-boundary.test.mjs tests/group-chat-url.test.js tests/group-stream-watchdog.test.js tests/line-diff-budget.test.mjs tests/main-composer-commands.test.mjs tests/message-file-changes-projectforge.test.mjs tests/message-file-changes.test.mjs tests/messenger-presentation.test.mjs tests/model-trajectory-handlers.test.js tests/model-trajectory-model.test.mjs tests/model-trajectory-recorder.test.js tests/notification-center.test.js tests/popover-window-blur.test.mjs tests/projectforge-changes-source.test.mjs tests/selection-reference.test.mjs tests/shared-source.test.mjs tests/source-handlers-sender.test.js tests/state-subscriptions.test.js tests/terminal-command-run-watch.test.js tests/terminal-native-helper.test.js tests/terminal-package-closure.test.js tests/tool-approval-card-enhancement.test.mjs tests/tool-presentation-settings.test.cjs tests/tool-presentation.test.mjs tests/tool-request-malformed-marker.test.mjs",
+    "test:workbench": "node --test tests/terminal-cd-command.test.js tests/conversation-current-source.test.mjs tests/conversation-scope.test.mjs tests/conversation-status-races.test.mjs tests/design-system-boundary.test.mjs tests/group-chat-url.test.js tests/group-stream-watchdog.test.js tests/line-diff-budget.test.mjs tests/main-composer-commands.test.mjs tests/message-file-changes-projectforge.test.mjs tests/message-file-changes.test.mjs tests/messenger-presentation.test.mjs tests/model-trajectory-handlers.test.js tests/model-trajectory-model.test.mjs tests/model-trajectory-recorder.test.js tests/notification-center.test.js tests/popover-window-blur.test.mjs tests/projectforge-changes-source.test.mjs tests/selection-reference.test.mjs tests/shared-source.test.mjs tests/source-handlers-sender.test.js tests/state-subscriptions.test.js tests/terminal-command-run-watch.test.js tests/terminal-native-helper.test.js tests/terminal-package-closure.test.js tests/tool-approval-card-enhancement.test.mjs tests/tool-presentation-settings.test.cjs tests/tool-presentation.test.mjs tests/tool-request-malformed-marker.test.mjs",
     "check:chat-evidence": "node scripts/check-chat-evidence.mjs",
     "check:chat-release-evidence": "node scripts/check-chat-release-evidence.mjs",
     "write:chat-evidence-manifest": "node scripts/write-chat-evidence-manifest.mjs",

From ec388d1ff20fa05127d0cb5994c2247f4cf684c6 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 02:27:46 +0000
Subject: [PATCH 080/143] Agent settings: keep an unsaved draft per Agent
 across switches

Every Agent shares one settings form and only the Save button persists it,
so switching Agent overwrote unsaved edits, including the ones a failed save
had just tried to write. When the form is switched away while dirty, its
values are kept as that Agent's draft; showing the Agent again restores the
draft over the disk config, keeps the unsaved dot on and says so in a toast.
A successful save or deleting the Agent clears the draft. Drafts are only
taken from a fully populated form, never mid-populate.

The config builder moves out of saveCurrentAgentSettings into
collectAgentDraftConfig so save and draft use the same snapshot. Follows
ZCode's per-scope composer drafts (packages/ui/src/v4/composer/composerDraftStore).

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012AP71nAxrCFEpH7st6asf9
---
 docs/contracts/chat-contracts.json            |   6 +-
 .../contracts/generated/chat-event-graph.json | 154 ++++++++--------
 modules/settingsManager.js                    | 113 +++++++-----
 package.json                                  |   2 +-
 scripts/next-delta-shared-baseline.json       |   4 +-
 tests/settings-agent-draft-retention.test.mjs | 165 ++++++++++++++++++
 6 files changed, 322 insertions(+), 122 deletions(-)
 create mode 100644 tests/settings-agent-draft-retention.test.mjs

diff --git a/docs/contracts/chat-contracts.json b/docs/contracts/chat-contracts.json
index 813dbd145..b883c5845 100644
--- a/docs/contracts/chat-contracts.json
+++ b/docs/contracts/chat-contracts.json
@@ -720,19 +720,19 @@
     "dynamicSites": [
       {
         "file": "modules/settingsManager.js",
-        "line": 722,
+        "line": 753,
         "kind": "custom-event-listener",
         "match": "target.addEventListener(type"
       },
       {
         "file": "modules/settingsManager.js",
-        "line": 2233,
+        "line": 2268,
         "kind": "custom-event-listener",
         "match": "element.addEventListener(eventName"
       },
       {
         "file": "modules/settingsManager.js",
-        "line": 2262,
+        "line": 2297,
         "kind": "custom-event-listener",
         "match": "systemPromptContainer.addEventListener(eventName"
       }
diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 12a5ff813..eeda0afb0 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -1239,7 +1239,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1011,
+          "line": 1046,
           "kind": "custom-event-listener"
         },
         {
@@ -1257,7 +1257,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1011,
+          "line": 1046,
           "kind": "custom-event-listener",
           "match": "settingsContainer.addEventListener('auxclick'"
         },
@@ -1675,7 +1675,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1357,
+          "line": 1392,
           "kind": "custom-event-listener"
         },
         {
@@ -1772,7 +1772,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1357,
+          "line": 1392,
           "kind": "custom-event-listener",
           "match": "vcpServerUrlInput.addEventListener('blur'"
         },
@@ -2348,7 +2348,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1166,
+          "line": 1201,
           "kind": "custom-event-listener"
         },
         {
@@ -2519,7 +2519,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1166,
+          "line": 1201,
           "kind": "custom-event-listener",
           "match": "agentSettingsForm.addEventListener('change'"
         },
@@ -3774,77 +3774,77 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1075,
+          "line": 1110,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1090,
+          "line": 1125,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1091,
+          "line": 1126,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1093,
+          "line": 1128,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1103,
+          "line": 1138,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1110,
+          "line": 1145,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1169,
+          "line": 1204,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1244,
+          "line": 1279,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1250,
+          "line": 1285,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1277,
+          "line": 1312,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1306,
+          "line": 1341,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1637,
+          "line": 1672,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1650,
+          "line": 1685,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1824,
+          "line": 1859,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1832,
+          "line": 1867,
           "kind": "custom-event-listener"
         },
         {
@@ -5249,91 +5249,91 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1075,
+          "line": 1110,
           "kind": "custom-event-listener",
           "match": "refreshModelsBtn.addEventListener('click'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1090,
+          "line": 1125,
           "kind": "custom-event-listener",
           "match": "cancelRegexRuleBtn.addEventListener('click'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1091,
+          "line": 1126,
           "kind": "custom-event-listener",
           "match": "closeRegexRuleModalBtn.addEventListener('click'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1093,
+          "line": 1128,
           "kind": "custom-event-listener",
           "match": "regexRuleModal.addEventListener('click'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1103,
+          "line": 1138,
           "kind": "custom-event-listener",
           "match": "openTopicSummaryModelSelectBtn.addEventListener('click'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1110,
+          "line": 1145,
           "kind": "custom-event-listener",
           "match": "document.addEventListener('click'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1169,
+          "line": 1204,
           "kind": "custom-event-listener",
           "match": "deleteItemBtn.addEventListener('click'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1244,
+          "line": 1279,
           "kind": "custom-event-listener",
           "match": "openModelSelectBtn.addEventListener('click'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1250,
+          "line": 1285,
           "kind": "custom-event-listener",
           "match": "refreshModelsBtn.addEventListener('click'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1277,
+          "line": 1312,
           "kind": "custom-event-listener",
           "match": "refreshTtsModelsBtn.addEventListener('click'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1306,
+          "line": 1341,
           "kind": "custom-event-listener",
           "match": "resetAvatarColorsBtn.addEventListener('click'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1637,
+          "line": 1672,
           "kind": "custom-event-listener",
           "match": "starSpan.addEventListener('click'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1650,
+          "line": 1685,
           "kind": "custom-event-listener",
           "match": "li.addEventListener('click'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1824,
+          "line": 1859,
           "kind": "custom-event-listener",
           "match": "editBtn.addEventListener('click'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1832,
+          "line": 1867,
           "kind": "custom-event-listener",
           "match": "deleteBtn.addEventListener('click'"
         },
@@ -7245,7 +7245,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 986,
+          "line": 1021,
           "kind": "custom-event-listener"
         },
         {
@@ -7379,7 +7379,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 986,
+          "line": 1021,
           "kind": "custom-event-listener",
           "match": "settingsContainer.addEventListener('contextmenu'"
         },
@@ -14649,7 +14649,7 @@
       "producers": [
         {
           "file": "modules/settingsManager.js",
-          "line": 1973,
+          "line": 2008,
           "kind": "custom-event-create"
         }
       ],
@@ -14736,32 +14736,32 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1074,
+          "line": 1109,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1165,
+          "line": 1200,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1247,
+          "line": 1282,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1312,
+          "line": 1347,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1316,
+          "line": 1351,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1344,
+          "line": 1379,
           "kind": "custom-event-listener"
         },
         {
@@ -14909,43 +14909,43 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1074,
+          "line": 1109,
           "kind": "custom-event-listener",
           "match": "modelSearchInput.addEventListener('input'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1165,
+          "line": 1200,
           "kind": "custom-event-listener",
           "match": "agentSettingsForm.addEventListener('input'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1247,
+          "line": 1282,
           "kind": "custom-event-listener",
           "match": "modelSearchInput.addEventListener('input'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1312,
+          "line": 1347,
           "kind": "custom-event-listener",
           "match": "picker.addEventListener('input'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1316,
+          "line": 1351,
           "kind": "custom-event-listener",
           "match": "textInput.addEventListener('input'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1344,
+          "line": 1379,
           "kind": "custom-event-listener",
           "match": "agentCardCssInput.addEventListener('input'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1973,
+          "line": 2008,
           "kind": "custom-event-create",
           "match": "new CustomEvent('input'"
         },
@@ -18326,7 +18326,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1066,
+          "line": 1101,
           "kind": "custom-event-listener"
         },
         {
@@ -18356,7 +18356,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1066,
+          "line": 1101,
           "kind": "custom-event-listener",
           "match": "document.addEventListener('modal-ready'"
         },
@@ -18742,7 +18742,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1027,
+          "line": 1062,
           "kind": "custom-event-listener"
         },
         {
@@ -18862,7 +18862,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1027,
+          "line": 1062,
           "kind": "custom-event-listener",
           "match": "settingsContainer.addEventListener('mousedown'"
         },
@@ -21462,7 +21462,7 @@
       "consumers": [
         {
           "file": "modules/settingsManager.js",
-          "line": 1253,
+          "line": 1288,
           "kind": "preload-subscription"
         },
         {
@@ -21474,7 +21474,7 @@
       "evidence": [
         {
           "file": "modules/settingsManager.js",
-          "line": 1253,
+          "line": 1288,
           "kind": "preload-subscription",
           "match": "electronAPI.onModelsUpdated("
         },
@@ -22517,7 +22517,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1269,
+          "line": 1304,
           "kind": "custom-event-listener"
         },
         {
@@ -22535,7 +22535,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1269,
+          "line": 1304,
           "kind": "custom-event-listener",
           "match": "window.addEventListener('pagehide'"
         },
@@ -26387,7 +26387,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 2026,
+          "line": 2061,
           "kind": "custom-event-listener"
         },
         {
@@ -26447,7 +26447,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 2026,
+          "line": 2061,
           "kind": "custom-event-listener",
           "match": "settingsTab.addEventListener('scroll'"
         },
@@ -28009,12 +28009,12 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1089,
+          "line": 1124,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1143,
+          "line": 1178,
           "kind": "custom-event-listener"
         },
         {
@@ -28070,13 +28070,13 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1089,
+          "line": 1124,
           "kind": "custom-event-listener",
           "match": "regexRuleForm.addEventListener('submit'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1143,
+          "line": 1178,
           "kind": "custom-event-listener",
           "match": "agentSettingsForm.addEventListener('submit'"
         },
@@ -30176,7 +30176,7 @@
       "producers": [
         {
           "file": "modules/settingsManager.js",
-          "line": 183,
+          "line": 193,
           "kind": "custom-event-create"
         }
       ],
@@ -30184,7 +30184,7 @@
       "evidence": [
         {
           "file": "modules/settingsManager.js",
-          "line": 183,
+          "line": 193,
           "kind": "custom-event-create",
           "match": "new CustomEvent('vcp-settings-delete-result'"
         }
@@ -30229,7 +30229,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 177,
+          "line": 187,
           "kind": "custom-event-create"
         },
         {
@@ -30291,7 +30291,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 177,
+          "line": 187,
           "kind": "custom-event-create",
           "match": "new CustomEvent('vcp-settings-save-result'"
         },
@@ -30344,12 +30344,12 @@
       "producers": [
         {
           "file": "modules/settingsManager.js",
-          "line": 472,
+          "line": 501,
           "kind": "custom-event-create"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1350,
+          "line": 1385,
           "kind": "custom-event-create"
         }
       ],
@@ -30363,13 +30363,13 @@
       "evidence": [
         {
           "file": "modules/settingsManager.js",
-          "line": 472,
+          "line": 501,
           "kind": "custom-event-create",
           "match": "new CustomEvent('vcp-settings-surface-updated'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1350,
+          "line": 1385,
           "kind": "custom-event-create",
           "match": "new CustomEvent('vcp-settings-surface-updated'"
         },
@@ -32598,7 +32598,7 @@
     },
     {
       "file": "modules/settingsManager.js",
-      "line": 722,
+      "line": 753,
       "reason": "dynamic listener name: type",
       "kind": "custom-event-listener",
       "match": "target.addEventListener(type",
@@ -32606,7 +32606,7 @@
     },
     {
       "file": "modules/settingsManager.js",
-      "line": 2233,
+      "line": 2268,
       "reason": "dynamic listener name: eventName",
       "kind": "custom-event-listener",
       "match": "element.addEventListener(eventName",
@@ -32614,7 +32614,7 @@
     },
     {
       "file": "modules/settingsManager.js",
-      "line": 2262,
+      "line": 2297,
       "reason": "dynamic listener name: eventName",
       "kind": "custom-event-listener",
       "match": "systemPromptContainer.addEventListener(eventName",
diff --git a/modules/settingsManager.js b/modules/settingsManager.js
index aa370901f..a8f5decc4 100644
--- a/modules/settingsManager.js
+++ b/modules/settingsManager.js
@@ -96,6 +96,16 @@ const settingsManager = (() => {
     let agentSettingsRevision = 0;
     let agentSettingsAutosaveTimer = null;
 
+    // Unsaved Agent drafts kept per agent while the shared form shows another
+    // one. Settings save only on the Save button and every Agent reuses one
+    // form, so switching away used to drop the edits (also after a failed
+    // save). Like ZCode's per-scope composer drafts (composerDraftStore), the
+    // draft comes back when that Agent is shown again; Save or delete clears it.
+    const unsavedAgentDrafts = new Map();
+    // The Agent whose values the form fully holds. Cleared while a populate is
+    // writing the form, so a half-written form is never kept as a draft.
+    let settledAgentId = '';
+
     // Edits that live outside the form's own input/change events (the regex
     // modal, MiMo add/remove buttons) report here so the unsaved-changes dot
     // shows them like any other field.
@@ -264,6 +274,20 @@ const settingsManager = (() => {
     function populateAgentSettingsForm(agentId, agentConfig, viewToken = null) {
         const populateToken = ++agentSettingsPopulateToken;
 
+        const previousAgentId = editingAgentIdInput?.value;
+        if (previousAgentId && previousAgentId === settledAgentId && isAgentSettingsDirty) {
+            try {
+                unsavedAgentDrafts.set(previousAgentId, collectAgentDraftConfig(previousAgentId));
+            } catch (error) {
+                console.warn(`[SettingsManager] Could not keep the unsaved draft for ${previousAgentId}:`, error);
+            }
+        }
+        settledAgentId = '';
+        const retainedDraft = agentConfig && !agentConfig.error ? unsavedAgentDrafts.get(agentId) : null;
+        if (retainedDraft) {
+            agentConfig = { ...agentConfig, ...structuredClone(retainedDraft) };
+        }
+
         // 新增提示词编辑器只是尚未提交到列表的临时草稿，不属于 Agent 配置。
         // 表单 DOM 会被所有 Agent 复用，因此切换 Agent 时必须立即清空，否则 A 的
         // 草稿会继续显示在 B 的设置中，并可能被误添加、误保存到 B。
@@ -466,9 +490,14 @@ const settingsManager = (() => {
             scheduleStickyButtonsRefresh();
             isAgentSettingsDirty = false;
             agentSettingsRevision = 0;
+            settledAgentId = agentId;
             if (typeof globalThis.vcpUpdateFormStateDot === 'function') {
                 globalThis.vcpUpdateFormStateDot('done');
             }
+            if (retainedDraft) {
+                markAgentSettingsDirty();
+                uiHelper.showToastNotification(`已恢复 ${agentConfig.name || agentId} 未保存的修改，点击保存后生效。`, 'info');
+            }
             document.dispatchEvent(new CustomEvent('vcp-settings-surface-updated', {
                 detail: { kind: 'agent', root: agentSettingsForm }
             }));
@@ -492,6 +521,41 @@ const settingsManager = (() => {
         return Number.isFinite(parsedValue) ? parsedValue : null;
     }
 
+    // The form's current values as an Agent config patch. Save persists it;
+    // switching away keeps it as the Agent's unsaved draft.
+    function collectAgentDraftConfig(agentId) {
+        const systemPromptData = promptManager ? (promptManager.collectDraft?.() || {}) : {};
+        const currentConfig = refs.currentSelectedItemRef?.get?.()?.config;
+        const resolvedModelInput = getAgentControl('agentModel') || agentModelInput;
+        const resolvedModel = resolvedModelInput ? resolvedModelInput.value.trim() : (currentConfig?.model || 'gemini-pro');
+        return {
+            name: agentNameInput?.value?.trim?.() || (currentConfig ? currentConfig.name : agentId),
+            ...systemPromptData,
+            model: resolvedModel || 'gemini-pro',
+            temperature: parseOptionalNumberInput(agentTemperatureInput, Number.parseFloat),
+            contextTokenLimit: parseOptionalNumberInput(agentContextTokenLimitInput, value => Number.parseInt(value, 10)),
+            maxOutputTokens: parseOptionalNumberInput(agentMaxOutputTokensInput, value => Number.parseInt(value, 10)),
+            top_p: parseOptionalNumberInput(agentTopPInput, Number.parseFloat),
+            top_k: parseOptionalNumberInput(agentTopKInput, value => Number.parseInt(value, 10)),
+            streamOutput: getAgentControl('agentStreamOutputTrue')?.checked ?? true,
+            ttsVoicePrimary: agentTtsVoicePrimarySelect?.value || '',
+            ttsRegexPrimary: agentTtsRegexPrimaryInput?.value?.trim?.() || '',
+            ttsVoiceSecondary: agentTtsVoiceSecondarySelect?.value || '',
+            ttsRegexSecondary: agentTtsRegexSecondaryInput?.value?.trim?.() || '',
+            ttsDirectorPrompts: [...currentAgentTtsDirectorPrompts],
+            ttsSpeed: parseFloat(agentTtsSpeedSlider?.value || 1),
+            stripRegexes: structuredClone(currentAgentRegexes),
+            avatarBorderColor: agentAvatarBorderColorInput?.value || '',
+            nameTextColor: agentNameTextColorInput?.value || '',
+            customCss: agentCustomCssInput?.value?.trim?.() || '',
+            cardCss: getAgentControl('agentCardCss')?.value?.trim?.() || '',
+            chatCss: getAgentControl('agentChatCss')?.value?.trim?.() || '',
+            disableCustomColors: getAgentControl('disableCustomColors')?.checked || false,
+            useThemeColorsInChat: getAgentControl('useThemeColorsInChat')?.checked || false,
+            uiCollapseStates: getCurrentCollapseStates()
+        };
+    }
+
     /**
      * Handles the submission of the agent settings form, saving the changes.
      * @param {Event} event - The form submission event.
@@ -521,46 +585,12 @@ const settingsManager = (() => {
         }
 
         // Prompt 子模块只维护草稿；统一保存时一次性收集快照。
-        let systemPromptData = {};
-        if (promptManager) {
-            systemPromptData = promptManager.collectDraft?.() || {};
-            if (editingAgentIdInput?.value !== agentId || promptManager.getAgentId?.() !== agentId) {
-                reportSettingsSaveResult(agentSettingsForm, false, 'stale-agent');
-                return { success: false, error: 'stale-agent' };
-            }
-        }
-
-        const currentConfig = refs.currentSelectedItemRef?.get?.()?.config;
-        const resolvedModelInput = getAgentControl('agentModel') || agentModelInput;
-        const resolvedModel = resolvedModelInput ? resolvedModelInput.value.trim() : (currentConfig?.model || 'gemini-pro');
         const saveRevision = agentSettingsRevision;
-
-        const newConfig = {
-            name: agentNameInput?.value?.trim?.() || (currentConfig ? currentConfig.name : agentId),
-            ...systemPromptData,
-            model: resolvedModel || 'gemini-pro',
-            temperature: parseOptionalNumberInput(agentTemperatureInput, Number.parseFloat),
-            contextTokenLimit: parseOptionalNumberInput(agentContextTokenLimitInput, value => Number.parseInt(value, 10)),
-            maxOutputTokens: parseOptionalNumberInput(agentMaxOutputTokensInput, value => Number.parseInt(value, 10)),
-            top_p: parseOptionalNumberInput(agentTopPInput, Number.parseFloat),
-            top_k: parseOptionalNumberInput(agentTopKInput, value => Number.parseInt(value, 10)),
-            streamOutput: getAgentControl('agentStreamOutputTrue')?.checked ?? true,
-            ttsVoicePrimary: agentTtsVoicePrimarySelect?.value || '',
-            ttsRegexPrimary: agentTtsRegexPrimaryInput?.value?.trim?.() || '',
-            ttsVoiceSecondary: agentTtsVoiceSecondarySelect?.value || '',
-            ttsRegexSecondary: agentTtsRegexSecondaryInput?.value?.trim?.() || '',
-            ttsDirectorPrompts: [...currentAgentTtsDirectorPrompts],
-            ttsSpeed: parseFloat(agentTtsSpeedSlider?.value || 1),
-            stripRegexes: structuredClone(currentAgentRegexes),
-            avatarBorderColor: agentAvatarBorderColorInput?.value || '',
-            nameTextColor: agentNameTextColorInput?.value || '',
-            customCss: agentCustomCssInput?.value?.trim?.() || '',
-            cardCss: getAgentControl('agentCardCss')?.value?.trim?.() || '',
-            chatCss: getAgentControl('agentChatCss')?.value?.trim?.() || '',
-            disableCustomColors: getAgentControl('disableCustomColors')?.checked || false,
-            useThemeColorsInChat: getAgentControl('useThemeColorsInChat')?.checked || false,
-            uiCollapseStates: getCurrentCollapseStates()
-        };
+        const newConfig = collectAgentDraftConfig(agentId);
+        if (editingAgentIdInput?.value !== agentId || (promptManager && promptManager.getAgentId?.() !== agentId)) {
+            reportSettingsSaveResult(agentSettingsForm, false, 'stale-agent');
+            return { success: false, error: 'stale-agent' };
+        }
 
         if (!newConfig.name) {
             uiHelper.showToastNotification("Agent名称不能为空！", 'error');
@@ -635,6 +665,7 @@ const settingsManager = (() => {
             return { success: false, error: result?.error || 'save-failed' };
         }
 
+        unsavedAgentDrafts.delete(agentId);
         if (agentSettingsRevision === saveRevision) {
             isAgentSettingsDirty = false;
         }
@@ -784,6 +815,10 @@ const settingsManager = (() => {
             }
 
             if (result && result.success) {
+                if (currentSelectedItem.type === 'agent') {
+                    unsavedAgentDrafts.delete(currentSelectedItem.id);
+                    if (settledAgentId === currentSelectedItem.id) settledAgentId = '';
+                }
                 reportSettingsDeleteResult(agentSettingsForm, true);
                 // Reset state in renderer via refs
                 refs.currentSelectedItemRef.set({ id: null, type: null, name: null, avatarUrl: null, config: null });
diff --git a/package.json b/package.json
index f64155862..1d3803bed 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,7 @@
     "test:launchpad-icons": "node --test tests/launchpad-icons.test.js tests/launchpad-controller.test.js",
     "test:next-ui-empty-state": "node scripts/test-next-ui-empty-state.mjs",
     "test:ui-motion-contract": "node scripts/test-ui-motion-contract.mjs",
-    "check:ui-system": "npm run guard:design-subtraction && npm run guard:classic-parity && npm run guard:classic-retirement && npm run guard:next-delta && npm run guard:ui-interaction && npm run guard:ui-async-state && npm run guard:ui-task-journeys && npm run guard:theme-provenance && npm run test:ui-motion-contract && node --check modules/ui-system/lifecycle-scope.js && node --check VCPDistributedServer/frontend-plugin-loader.js && node --check modules/ui-system/component-manifest.js && node --check modules/ui-system/vcp-ui.js && node --check modules/ui-system/webawesome-runtime-manifest.js && node --check modules/ui-system/webawesome-adapter.js && node --check modules/ui-system/appearance-engine.js && node --check modules/ui-system/appearance-studio.js && node --check modules/ui-system/next-ui-apps.js && node --check modules/ui-system/component-showcase.js && node --check modules/ui-system/webawesome-comparison.js && node --check modules/topTabManager.js && npm run lint:ui-system && npm run guard:ui-system && npm run check:ui-applications && npm run test:ui-system && npm run test:appearance-engine && npm run test:appearance-studio && node scripts/test-next-ui-tab-lifecycle.mjs && node scripts/test-webawesome-adapter.mjs && node --test tests/lifecycle-scope.test.js tests/next-ui-registries.test.mjs tests/topic-list-mode-lifecycle.test.js tests/topic-list-load-robustness.test.js tests/settings-unsaved-indicator.test.mjs && npm run test:bootstrap",
+    "check:ui-system": "npm run guard:design-subtraction && npm run guard:classic-parity && npm run guard:classic-retirement && npm run guard:next-delta && npm run guard:ui-interaction && npm run guard:ui-async-state && npm run guard:ui-task-journeys && npm run guard:theme-provenance && npm run test:ui-motion-contract && node --check modules/ui-system/lifecycle-scope.js && node --check VCPDistributedServer/frontend-plugin-loader.js && node --check modules/ui-system/component-manifest.js && node --check modules/ui-system/vcp-ui.js && node --check modules/ui-system/webawesome-runtime-manifest.js && node --check modules/ui-system/webawesome-adapter.js && node --check modules/ui-system/appearance-engine.js && node --check modules/ui-system/appearance-studio.js && node --check modules/ui-system/next-ui-apps.js && node --check modules/ui-system/component-showcase.js && node --check modules/ui-system/webawesome-comparison.js && node --check modules/topTabManager.js && npm run lint:ui-system && npm run guard:ui-system && npm run check:ui-applications && npm run test:ui-system && npm run test:appearance-engine && npm run test:appearance-studio && node scripts/test-next-ui-tab-lifecycle.mjs && node scripts/test-webawesome-adapter.mjs && node --test tests/lifecycle-scope.test.js tests/next-ui-registries.test.mjs tests/topic-list-mode-lifecycle.test.js tests/topic-list-load-robustness.test.js tests/settings-unsaved-indicator.test.mjs tests/settings-agent-draft-retention.test.mjs && npm run test:bootstrap",
     "test:appearance-engine": "node scripts/test-appearance-engine.mjs",
     "test:appearance-studio": "node scripts/test-appearance-studio.mjs",
     "test:vcp-ui-select-proxy": "node scripts/test-vcp-ui-select-proxy.mjs",
diff --git a/scripts/next-delta-shared-baseline.json b/scripts/next-delta-shared-baseline.json
index e246e27d2..2d373b8de 100644
--- a/scripts/next-delta-shared-baseline.json
+++ b/scripts/next-delta-shared-baseline.json
@@ -24,8 +24,8 @@
     "reason": "Integrated group behavior: JEV mode/context-window fields and invitations; explicit group queue interrupt; optimistic user message IDs survive file sync; settings read/save snapshots preserve the original group and mode data; chat header delegates to its presentation owner. Group form tracks unsaved edits (including speaker reorder) and shows the same 未保存更改 indicator as Agent settings; a successful save clears it, loading a group resets it."
   },
   "modules/settingsManager.js": {
-    "sha256": "1d1a99372dba5059837c4a00d48ed8eb3e983f01323cb664750828e1254585f4",
-    "reason": "Integrated manual-save policy: Agent/prompt edits remain drafts until Save; context changes and collapse no longer implicitly persist; submit captures draft and display identity; regex import merges into the draft; Lucide renders action icons. Replaces the obsolete autosave rationale. Settings display uses a local selection snapshot; a delayed config read cannot overwrite a newer settings view (frozen-selection and A-to-B display regression tests). Regex rule add/edit/delete and MiMo director prompt add/remove mark the draft unsaved like ordinary field edits."
+    "sha256": "22d57ef75999aed5e93af04dbbb4cb92607a7e2bced9dcb13e0272df5853c498",
+    "reason": "Integrated manual-save policy: Agent/prompt edits remain drafts until Save; context changes and collapse no longer implicitly persist; submit captures draft and display identity; regex import merges into the draft; Lucide renders action icons. Replaces the obsolete autosave rationale. Settings display uses a local selection snapshot; a delayed config read cannot overwrite a newer settings view (frozen-selection and A-to-B display regression tests). Regex rule add/edit/delete and MiMo director prompt add/remove mark the draft unsaved like ordinary field edits. Unsaved Agent drafts (including after a failed save) are kept per Agent while the form shows another one and restored with a notice when it is shown again; Save or delete clears them."
   },
   "modules/filterManager.js": {
     "sha256": "2390116ff961f18cdf2d3defd02d5559de9381f891be7e5eb33ef99f98337225",
diff --git a/tests/settings-agent-draft-retention.test.mjs b/tests/settings-agent-draft-retention.test.mjs
new file mode 100644
index 000000000..6b4560b54
--- /dev/null
+++ b/tests/settings-agent-draft-retention.test.mjs
@@ -0,0 +1,165 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { JSDOM } from 'jsdom';
+import fs from 'node:fs';
+import path from 'node:path';
+import { pathToFileURL, fileURLToPath } from 'node:url';
+
+// Agent settings save only on the Save button and every Agent shares one
+// form. Switching Agent used to overwrite unsaved edits, including the ones a
+// failed save had just tried to persist. The draft now stays with its Agent
+// until a save succeeds.
+
+const repoRoot = fileURLToPath(new URL('..', import.meta.url));
+const schema = await import(pathToFileURL(path.join(repoRoot, 'modules/settings/schema/sidebar-surfaces.js')).href);
+const surfaceModule = await import(pathToFileURL(path.join(repoRoot, 'modules/ui-system/settings/settings-sidebar-surface.js')).href);
+const wait = ms => new Promise(resolve => setTimeout(resolve, ms));
+
+async function withAgentSettings(run) {
+    const dom = new JSDOM('<!doctype html><html><body><main id="tabContentSettings" class="active" aria-hidden="false"><div id="agentSettingsContainer"></div><p id="selectAgentPromptForSettings">请选择</p></main></body></html>', { url: 'http://localhost' });
+    const { document } = dom.window;
+    const saved = {
+        window: globalThis.window,
+        document: globalThis.document,
+        requestAnimationFrame: globalThis.requestAnimationFrame,
+        MutationObserver: globalThis.MutationObserver,
+        CustomEvent: globalThis.CustomEvent,
+        setInterval: globalThis.setInterval
+    };
+    const intervals = [];
+    globalThis.window = dom.window;
+    globalThis.document = document;
+    globalThis.requestAnimationFrame = cb => setTimeout(cb, 0);
+    dom.window.requestAnimationFrame = cb => setTimeout(cb, 0);
+    globalThis.MutationObserver = class { observe() {} disconnect() {} takeRecords() { return []; } };
+    globalThis.CustomEvent = dom.window.CustomEvent;
+    globalThis.setInterval = (...args) => {
+        const id = saved.setInterval(...args);
+        id.unref?.();
+        intervals.push(id);
+        return id;
+    };
+
+    try {
+        const root = document.getElementById('tabContentSettings');
+        const surface = surfaceModule.createSettingsSidebarSurface({ document, root });
+        dom.window.VCPSettingsSidebar = surface;
+        const host = document.getElementById('agentSettingsContainer');
+        const form = schema.renderAgentSettingsSurface(host, document);
+        surface.register('agent', host);
+        dom.window.eval(fs.readFileSync(path.join(repoRoot, 'modules/settingsManager.js'), 'utf8'));
+        const sm = dom.window.settingsManager;
+
+        const disk = {
+            'agent-a': { name: 'Alice', customCss: '' },
+            'agent-b': { name: 'Bob', customCss: '.bob {}' }
+        };
+        let saveFails = false;
+        let selected = { id: 'agent-a', type: 'agent' };
+        const toasts = [];
+        sm.init({
+            electronAPI: {
+                saveAgentConfig: async (id, config) => {
+                    if (saveFails) return { success: false, error: 'disk full' };
+                    disk[id] = { ...disk[id], ...config };
+                    return { success: true };
+                },
+                getAgentConfig: async id => structuredClone(disk[id]),
+                sovitsGetModels: async () => ({ models: [] })
+            },
+            uiHelper: { showToastNotification: (msg, type) => toasts.push({ msg, type }), showSaveFeedback() {} },
+            refs: { currentSelectedItemRef: { get: () => selected, set: value => { selected = value; } } },
+            mainRendererFunctions: { getCroppedFile: () => null, resetCroppedFile() {} },
+            elements: {
+                agentSettingsContainer: host,
+                groupSettingsContainer: null,
+                selectItemPromptForSettings: document.getElementById('selectAgentPromptForSettings'),
+                itemSettingsContainerTitle: null,
+                selectedItemNameForSettingsSpan: null,
+                deleteItemBtn: document.getElementById('deleteAgentBtn'),
+                agentSettingsForm: form,
+                editingAgentIdInput: form.querySelector('#editingAgentId'),
+                agentNameInput: form.querySelector('#agentNameInput'),
+                agentAvatarInput: form.querySelector('#agentAvatarInput'),
+                agentAvatarPreview: form.querySelector('#agentAvatarPreview'),
+                agentModelInput: form.querySelector('#agentModel'),
+                agentTemperatureInput: form.querySelector('#agentTemperature'),
+                agentContextTokenLimitInput: form.querySelector('#agentContextTokenLimit'),
+                agentMaxOutputTokensInput: form.querySelector('#agentMaxOutputTokens'),
+                openModelSelectBtn: form.querySelector('#openModelSelectBtn'),
+                topicSummaryModelInput: null,
+                openTopicSummaryModelSelectBtn: null,
+                agentTtsSpeedSlider: form.querySelector('#agentTtsSpeed')
+            }
+        });
+
+        const show = async id => {
+            selected = { id, type: 'agent', config: structuredClone(disk[id]) };
+            await sm.displaySettingsForItem(selected);
+            await wait(10);
+        };
+        const edit = (id, value) => {
+            const input = form.querySelector(`#${id}`);
+            input.value = value;
+            input.dispatchEvent(new dom.window.Event('input', { bubbles: true }));
+        };
+        const save = async () => {
+            form.dispatchEvent(new dom.window.Event('submit', { bubbles: true, cancelable: true }));
+            await wait(30);
+        };
+        const state = () => document.getElementById('formSaveStateIndicator').dataset.state;
+        const value = id => form.querySelector(`#${id}`).value;
+        await run({ show, edit, save, state, value, toasts, disk, setSaveFails: v => { saveFails = v; } });
+    } finally {
+        intervals.forEach(clearInterval);
+        Object.assign(globalThis, saved);
+        dom.window.close();
+    }
+}
+
+test('an edit kept after a failed save survives switching to another Agent and back', () => withAgentSettings(async ({ show, edit, save, state, value, toasts, disk, setSaveFails }) => {
+    await show('agent-a');
+    assert.equal(state(), 'done');
+    edit('agentCustomCss', '.alice { color: red; }');
+    setSaveFails(true);
+    await save();
+    assert.equal(state(), 'warning', 'a failed save leaves the edit unsaved');
+
+    await show('agent-b');
+    assert.equal(value('agentCustomCss'), '.bob {}', 'Agent B shows its own values');
+    assert.equal(state(), 'done', 'Agent B has nothing unsaved');
+
+    toasts.length = 0;
+    await show('agent-a');
+    assert.equal(value('agentCustomCss'), '.alice { color: red; }', 'the unsaved edit comes back with Agent A');
+    assert.equal(state(), 'warning', 'the restored draft is still unsaved');
+    assert.ok(toasts.some(t => t.msg.includes('已恢复')), 'the user is told the draft was restored');
+    assert.equal(disk['agent-a'].customCss, '', 'nothing was written to disk behind the user');
+
+    setSaveFails(false);
+    await save();
+    assert.equal(state(), 'done');
+    assert.equal(disk['agent-a'].customCss, '.alice { color: red; }');
+}));
+
+test('a saved Agent comes back from disk without a stale draft', () => withAgentSettings(async ({ show, edit, save, state, value, toasts }) => {
+    await show('agent-a');
+    edit('agentCustomCss', '.saved {}');
+    await save();
+    await show('agent-b');
+    toasts.length = 0;
+    await show('agent-a');
+    assert.equal(value('agentCustomCss'), '.saved {}');
+    assert.equal(state(), 'done');
+    assert.ok(!toasts.some(t => t.msg.includes('已恢复')));
+}));
+
+test('a clean Agent leaves no draft behind', () => withAgentSettings(async ({ show, state, value, toasts }) => {
+    await show('agent-b');
+    await show('agent-a');
+    toasts.length = 0;
+    await show('agent-b');
+    assert.equal(value('agentCustomCss'), '.bob {}');
+    assert.equal(state(), 'done');
+    assert.equal(toasts.length, 0);
+}));

From 0ad7443cc983b6f33940a48d3adfdea6472847ef Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 02:27:49 +0000
Subject: [PATCH 081/143] Code viewer: scroll line numbers with the code

The editor shell is a flex item of the column-flex .side-code-body, so it
shrank to the body's height. The code column (overflow-x: auto) then
scrolled vertically on its own while the gutter stayed put: at line 1000
the gutter still read 1, 2, 3. The shell no longer shrinks, so the body
scrolls both columns together and the scroll position survives tab
switches. Checked in real Electron on a 5.6k-line file: line 502 shows
next to its own code.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019L2bZomLn4NVoxS4Rv5Bkv
---
 styles/ui-system/side-pane-code-viewer.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/styles/ui-system/side-pane-code-viewer.css b/styles/ui-system/side-pane-code-viewer.css
index d95bcb61c..b117eae0d 100644
--- a/styles/ui-system/side-pane-code-viewer.css
+++ b/styles/ui-system/side-pane-code-viewer.css
@@ -163,6 +163,9 @@ html body[data-vcp-theme="light"] .side-code-body:where(.vcp-ui-scope, .vcp-ui-s
 
 html .side-code-editor-shell:where(.vcp-ui-scope, .vcp-ui-scope *) {
     display: flex;
+    /* 不能被外层的纵向 flex 压扁：压扁后代码栏（overflow-x: auto）会自己纵向滚动，
+       行号栏留在原地，滚到第 1000 行时左边还显示 1、2、3。整块交给 .side-code-body 滚动 */
+    flex-shrink: 0;
     min-height: 100%;
     min-width: 100%;
     font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace;

From b5dd2c5f2799e70f9cf4fe96cbd2b2b376e33c80 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 02:30:57 +0000
Subject: [PATCH 082/143] Sidebar resizers: reachable by keyboard, one settings
 write per adjustment

The left sidebar and notifications resizers had a keydown handler but no
tabindex, so the keyboard could never reach them; each press moved 1px and
wrote settings. They are now focusable vertical separators with an aria
label and aria-value{min,max,now}, move 20px per arrow press like the side
pane handle, show the hover highlight on focus-visible, and write the width
once the keys stop for 400ms or focus leaves (same as the side pane owner,
after ZCode resizable.tsx's debounced layout write). Pointer drags still
write on release.

sidebar-resizer-lifecycle tests now run in check:ui-system.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012AP71nAxrCFEpH7st6asf9
---
 .../contracts/generated/chat-event-graph.json | 67 ++++++++-------
 modules/uiManager.js                          | 84 ++++++++++++++-----
 package.json                                  |  2 +-
 styles/layout.css                             |  3 +-
 tests/sidebar-resizer-lifecycle.test.mjs      | 30 ++++++-
 5 files changed, 136 insertions(+), 50 deletions(-)

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index eeda0afb0..24d480a19 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -1728,6 +1728,11 @@
           "line": 134,
           "kind": "custom-event-listener"
         },
+        {
+          "file": "modules/uiManager.js",
+          "line": 151,
+          "kind": "custom-event-listener"
+        },
         {
           "file": "modules/voice/chatVoiceComposer.js",
           "line": 353,
@@ -1836,6 +1841,12 @@
           "kind": "custom-event-listener",
           "match": "windowRef.addEventListener?.('blur'"
         },
+        {
+          "file": "modules/uiManager.js",
+          "line": 151,
+          "kind": "custom-event-listener",
+          "match": "handle.addEventListener('blur'"
+        },
         {
           "file": "modules/voice/chatVoiceComposer.js",
           "line": 353,
@@ -4474,17 +4485,17 @@
         },
         {
           "file": "modules/uiManager.js",
-          "line": 304,
+          "line": 350,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/uiManager.js",
-          "line": 423,
+          "line": 469,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/uiManager.js",
-          "line": 453,
+          "line": 499,
           "kind": "custom-event-listener"
         },
         {
@@ -6089,19 +6100,19 @@
         },
         {
           "file": "modules/uiManager.js",
-          "line": 304,
+          "line": 350,
           "kind": "custom-event-listener",
           "match": "button.addEventListener('click'"
         },
         {
           "file": "modules/uiManager.js",
-          "line": 423,
+          "line": 469,
           "kind": "custom-event-listener",
           "match": "item.addEventListener('click'"
         },
         {
           "file": "modules/uiManager.js",
-          "line": 453,
+          "line": 499,
           "kind": "custom-event-listener",
           "match": "topicList?.addEventListener('click'"
         },
@@ -7047,7 +7058,7 @@
       "consumers": [
         {
           "file": "modules/uiManager.js",
-          "line": 417,
+          "line": 463,
           "kind": "custom-event-listener"
         }
       ],
@@ -7060,7 +7071,7 @@
         },
         {
           "file": "modules/uiManager.js",
-          "line": 417,
+          "line": 463,
           "kind": "custom-event-listener",
           "match": "document.addEventListener('compact-sidebar-open-topics'"
         }
@@ -12543,7 +12554,7 @@
         },
         {
           "file": "modules/uiManager.js",
-          "line": 412,
+          "line": 458,
           "kind": "custom-event-listener"
         }
       ],
@@ -12610,7 +12621,7 @@
         },
         {
           "file": "modules/uiManager.js",
-          "line": 412,
+          "line": 458,
           "kind": "custom-event-listener",
           "match": "trigger.addEventListener('focus'"
         }
@@ -12641,14 +12652,14 @@
       "consumers": [
         {
           "file": "modules/uiManager.js",
-          "line": 413,
+          "line": 459,
           "kind": "custom-event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/uiManager.js",
-          "line": 413,
+          "line": 459,
           "kind": "custom-event-listener",
           "match": "navigation.addEventListener('focusout'"
         }
@@ -15532,12 +15543,12 @@
         },
         {
           "file": "modules/uiManager.js",
-          "line": 308,
+          "line": 354,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/uiManager.js",
-          "line": 465,
+          "line": 511,
           "kind": "custom-event-listener"
         },
         {
@@ -15911,13 +15922,13 @@
         },
         {
           "file": "modules/uiManager.js",
-          "line": 308,
+          "line": 354,
           "kind": "custom-event-listener",
           "match": "button.addEventListener('keydown'"
         },
         {
           "file": "modules/uiManager.js",
-          "line": 465,
+          "line": 511,
           "kind": "custom-event-listener",
           "match": "document.addEventListener('keydown'"
         },
@@ -18767,7 +18778,7 @@
         },
         {
           "file": "modules/uiManager.js",
-          "line": 335,
+          "line": 381,
           "kind": "custom-event-listener"
         },
         {
@@ -18892,7 +18903,7 @@
         },
         {
           "file": "modules/uiManager.js",
-          "line": 335,
+          "line": 381,
           "kind": "custom-event-listener",
           "match": "button.addEventListener('mousedown'"
         },
@@ -18982,7 +18993,7 @@
         },
         {
           "file": "modules/uiManager.js",
-          "line": 410,
+          "line": 456,
           "kind": "custom-event-listener"
         }
       ],
@@ -19025,7 +19036,7 @@
         },
         {
           "file": "modules/uiManager.js",
-          "line": 410,
+          "line": 456,
           "kind": "custom-event-listener",
           "match": "navigation.addEventListener('mouseenter'"
         }
@@ -19097,7 +19108,7 @@
         },
         {
           "file": "modules/uiManager.js",
-          "line": 411,
+          "line": 457,
           "kind": "custom-event-listener"
         },
         {
@@ -19181,7 +19192,7 @@
         },
         {
           "file": "modules/uiManager.js",
-          "line": 411,
+          "line": 457,
           "kind": "custom-event-listener",
           "match": "navigation.addEventListener('mouseleave'"
         },
@@ -21684,7 +21695,7 @@
         },
         {
           "file": "modules/uiManager.js",
-          "line": 202,
+          "line": 248,
           "kind": "preload-subscription"
         }
       ],
@@ -21703,7 +21714,7 @@
         },
         {
           "file": "modules/uiManager.js",
-          "line": 202,
+          "line": 248,
           "kind": "preload-subscription",
           "match": "electronAPI.onThemeUpdated("
         }
@@ -22973,7 +22984,7 @@
         },
         {
           "file": "modules/uiManager.js",
-          "line": 459,
+          "line": 505,
           "kind": "custom-event-listener"
         },
         {
@@ -23033,7 +23044,7 @@
         },
         {
           "file": "modules/uiManager.js",
-          "line": 459,
+          "line": 505,
           "kind": "custom-event-listener",
           "match": "document.addEventListener('pointerdown'"
         },
@@ -29201,7 +29212,7 @@
         },
         {
           "file": "modules/uiManager.js",
-          "line": 472,
+          "line": 518,
           "kind": "custom-event-listener"
         }
       ],
@@ -29220,7 +29231,7 @@
         },
         {
           "file": "modules/uiManager.js",
-          "line": 472,
+          "line": 518,
           "kind": "custom-event-listener",
           "match": "leftSidebar.addEventListener('transitionend'"
         }
diff --git a/modules/uiManager.js b/modules/uiManager.js
index 559cc7bf8..cd9a85733 100644
--- a/modules/uiManager.js
+++ b/modules/uiManager.js
@@ -62,16 +62,56 @@ const uiManager = (() => {
                 max: parseFloat(computed.maxWidth) || 600
             };
         };
-        const createResizer = (handle, element, fallbackMin, direction, settingKey, beforeBegin) => {
+        const createResizer = (handle, element, fallbackMin, direction, settingKey, label, beforeBegin) => {
             if (!handle || !element || !window.VCPSidebarResizer) return null;
             let dragStyles = null;
+            // A focusable separator, like the side pane's handle and ZCode's
+            // resizable.tsx, so the keyboard handler below can actually run.
+            const syncAria = (width) => {
+                const bounds = getWidthConstraints(element, fallbackMin);
+                handle.setAttribute('aria-valuemin', String(Math.round(bounds.min)));
+                handle.setAttribute('aria-valuemax', String(Math.round(bounds.max)));
+                handle.setAttribute('aria-valuenow', String(Math.round(width)));
+            };
+            handle.setAttribute('role', 'separator');
+            handle.setAttribute('aria-orientation', 'vertical');
+            handle.setAttribute('aria-label', label);
+            if (!handle.hasAttribute('tabindex')) handle.setAttribute('tabindex', '0');
+            syncAria(element.getBoundingClientRect().width);
+            const persistWidth = async (width) => {
+                if (disposed) return;
+                const currentSettings = globalSettingsRef.get();
+                const roundedWidth = Math.round(width);
+                if (currentSettings[settingKey] === roundedWidth) return;
+                const nextSettings = { ...currentSettings, [settingKey]: roundedWidth };
+                globalSettingsRef.set(nextSettings);
+                try {
+                    await track(saveSettingPatch({ [settingKey]: roundedWidth }));
+                    console.log('Sidebar width saved to settings.');
+                } catch (error) {
+                    console.error('Failed to save sidebar width:', error);
+                }
+            };
+            // Arrow keys resize at once; the setting is written once the keys
+            // stop (or focus leaves), not once per key press.
+            let keyboardCommit = null;
+            const flushKeyboardCommit = () => {
+                if (!keyboardCommit) return;
+                const { timer, width } = keyboardCommit;
+                keyboardCommit = null;
+                clearTimeout(timer);
+                void persistWidth(width);
+            };
             const resizer = window.VCPSidebarResizer.create({
                 handle,
                 getValue: () => element.getBoundingClientRect().width,
                 getBounds: () => getWidthConstraints(element, fallbackMin),
-                applyValue: (width) => { element.style.width = `${width}px`; },
+                applyValue: (width) => {
+                    element.style.width = `${width}px`;
+                    syncAria(width);
+                },
                 direction,
-                step: 1,
+                step: 20,
                 beforeBegin,
                 onActiveChange: (active) => {
                     if (active) {
@@ -95,28 +135,34 @@ const uiManager = (() => {
                         dragStyles = null;
                     }
                 },
-                onCommit: async (width) => {
-                    if (disposed) return;
-                    const currentSettings = globalSettingsRef.get();
-                    const roundedWidth = Math.round(width);
-                    if (currentSettings[settingKey] === roundedWidth) return;
-                    const nextSettings = { ...currentSettings, [settingKey]: roundedWidth };
-                    globalSettingsRef.set(nextSettings);
-                    try {
-                        await track(saveSettingPatch({ [settingKey]: roundedWidth }));
-                        console.log('Sidebar width saved to settings.');
-                    } catch (error) {
-                        console.error('Failed to save sidebar width:', error);
+                onCommit: (width, event) => {
+                    if (event?.type !== 'keydown') {
+                        if (keyboardCommit) {
+                            clearTimeout(keyboardCommit.timer);
+                            keyboardCommit = null;
+                        }
+                        void persistWidth(width);
+                        return;
                     }
+                    if (keyboardCommit) clearTimeout(keyboardCommit.timer);
+                    keyboardCommit = { width, timer: setTimeout(flushKeyboardCommit, 400) };
                 },
             });
-            resizers.add(resizer);
-            return resizer;
+            handle.addEventListener('blur', flushKeyboardCommit);
+            const owner = {
+                dispose() {
+                    flushKeyboardCommit();
+                    handle.removeEventListener('blur', flushKeyboardCommit);
+                    resizer.dispose();
+                }
+            };
+            resizers.add(owner);
+            return owner;
         };
 
-        createResizer(resizerLeft, leftSidebar, 180, 1, 'sidebarWidth');
+        createResizer(resizerLeft, leftSidebar, 180, 1, 'sidebarWidth', '调节左侧栏宽度');
         if (!vcpSidePane && resizerRight && rightNotificationsSidebar) {
-            createResizer(resizerRight, rightNotificationsSidebar, 220, -1, 'notificationsSidebarWidth', (event, resume) => {
+            createResizer(resizerRight, rightNotificationsSidebar, 220, -1, 'notificationsSidebarWidth', '调节通知栏宽度', (event, resume) => {
                 if (rightNotificationsSidebar.classList.contains('active')) return true;
                 electronAPI?.sendToggleNotificationsSidebar?.();
                 requestAnimationFrame(resume);
diff --git a/package.json b/package.json
index 1d3803bed..f64786f2e 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,7 @@
     "test:launchpad-icons": "node --test tests/launchpad-icons.test.js tests/launchpad-controller.test.js",
     "test:next-ui-empty-state": "node scripts/test-next-ui-empty-state.mjs",
     "test:ui-motion-contract": "node scripts/test-ui-motion-contract.mjs",
-    "check:ui-system": "npm run guard:design-subtraction && npm run guard:classic-parity && npm run guard:classic-retirement && npm run guard:next-delta && npm run guard:ui-interaction && npm run guard:ui-async-state && npm run guard:ui-task-journeys && npm run guard:theme-provenance && npm run test:ui-motion-contract && node --check modules/ui-system/lifecycle-scope.js && node --check VCPDistributedServer/frontend-plugin-loader.js && node --check modules/ui-system/component-manifest.js && node --check modules/ui-system/vcp-ui.js && node --check modules/ui-system/webawesome-runtime-manifest.js && node --check modules/ui-system/webawesome-adapter.js && node --check modules/ui-system/appearance-engine.js && node --check modules/ui-system/appearance-studio.js && node --check modules/ui-system/next-ui-apps.js && node --check modules/ui-system/component-showcase.js && node --check modules/ui-system/webawesome-comparison.js && node --check modules/topTabManager.js && npm run lint:ui-system && npm run guard:ui-system && npm run check:ui-applications && npm run test:ui-system && npm run test:appearance-engine && npm run test:appearance-studio && node scripts/test-next-ui-tab-lifecycle.mjs && node scripts/test-webawesome-adapter.mjs && node --test tests/lifecycle-scope.test.js tests/next-ui-registries.test.mjs tests/topic-list-mode-lifecycle.test.js tests/topic-list-load-robustness.test.js tests/settings-unsaved-indicator.test.mjs tests/settings-agent-draft-retention.test.mjs && npm run test:bootstrap",
+    "check:ui-system": "npm run guard:design-subtraction && npm run guard:classic-parity && npm run guard:classic-retirement && npm run guard:next-delta && npm run guard:ui-interaction && npm run guard:ui-async-state && npm run guard:ui-task-journeys && npm run guard:theme-provenance && npm run test:ui-motion-contract && node --check modules/ui-system/lifecycle-scope.js && node --check VCPDistributedServer/frontend-plugin-loader.js && node --check modules/ui-system/component-manifest.js && node --check modules/ui-system/vcp-ui.js && node --check modules/ui-system/webawesome-runtime-manifest.js && node --check modules/ui-system/webawesome-adapter.js && node --check modules/ui-system/appearance-engine.js && node --check modules/ui-system/appearance-studio.js && node --check modules/ui-system/next-ui-apps.js && node --check modules/ui-system/component-showcase.js && node --check modules/ui-system/webawesome-comparison.js && node --check modules/topTabManager.js && npm run lint:ui-system && npm run guard:ui-system && npm run check:ui-applications && npm run test:ui-system && npm run test:appearance-engine && npm run test:appearance-studio && node scripts/test-next-ui-tab-lifecycle.mjs && node scripts/test-webawesome-adapter.mjs && node --test tests/lifecycle-scope.test.js tests/next-ui-registries.test.mjs tests/topic-list-mode-lifecycle.test.js tests/topic-list-load-robustness.test.js tests/settings-unsaved-indicator.test.mjs tests/settings-agent-draft-retention.test.mjs tests/sidebar-resizer-lifecycle.test.mjs && npm run test:bootstrap",
     "test:appearance-engine": "node scripts/test-appearance-engine.mjs",
     "test:appearance-studio": "node scripts/test-appearance-studio.mjs",
     "test:vcp-ui-select-proxy": "node scripts/test-vcp-ui-select-proxy.mjs",
diff --git a/styles/layout.css b/styles/layout.css
index 5a46239ea..1ee6287f7 100644
--- a/styles/layout.css
+++ b/styles/layout.css
@@ -80,7 +80,8 @@ body.light-theme .title-bar {
 
 /* 悬停或拖拽时：显示高亮颜色 */
 .resizer:hover,
-.resizer:active {
+.resizer:active,
+.resizer:focus-visible {
     background-color: var(--accent-bg); /* 使用主题强调色 */
 }
 
diff --git a/tests/sidebar-resizer-lifecycle.test.mjs b/tests/sidebar-resizer-lifecycle.test.mjs
index f6e8b66b1..1723bfd47 100644
--- a/tests/sidebar-resizer-lifecycle.test.mjs
+++ b/tests/sidebar-resizer-lifecycle.test.mjs
@@ -357,8 +357,36 @@ test('reinitializing uiManager replaces the old resizer instead of duplicating k
         await f.win.uiManager.init(options);
         const initialSaves = saved.length;
         f.handle.dispatchEvent(new f.win.KeyboardEvent('keydown', { key: 'ArrowRight' }));
+        f.handle.dispatchEvent(new f.win.FocusEvent('blur'));
         await Promise.resolve();
-        assert.equal(f.pane.style.width, '301px');
+        assert.equal(f.pane.style.width, '320px');
         assert.equal(saved.length - initialSaves, 1);
     } finally { await f.win.uiManager?.dispose(); f.close(); }
 });
+
+test('the sidebar resizers are keyboard separators that save once the keys stop', async () => {
+    const f = fixture();
+    try {
+        f.handle.removeAttribute('tabindex');
+        f.pane.getBoundingClientRect = () => ({ width: parseFloat(f.pane.style.width) || 300 });
+        const saved = [];
+        await initManager(f, async patch => { saved.push(patch); return { success: true }; });
+        assert.equal(f.handle.getAttribute('tabindex'), '0', 'the handle must be reachable with Tab');
+        assert.equal(f.handle.getAttribute('role'), 'separator');
+        assert.equal(f.handle.getAttribute('aria-orientation'), 'vertical');
+        assert.ok(f.handle.getAttribute('aria-label'));
+        assert.equal(f.handle.getAttribute('aria-valuemin'), '100');
+        assert.equal(f.handle.getAttribute('aria-valuemax'), '800');
+        assert.equal(f.handle.getAttribute('aria-valuenow'), '300');
+
+        const before = saved.length;
+        for (let i = 0; i < 5; i++) {
+            f.handle.dispatchEvent(new f.win.KeyboardEvent('keydown', { key: 'ArrowRight' }));
+        }
+        assert.equal(f.pane.style.width, '400px', 'each press moves a visible step');
+        assert.equal(f.handle.getAttribute('aria-valuenow'), '400');
+        assert.equal(saved.length - before, 0, 'no settings write per key press');
+        await new Promise(resolve => setTimeout(resolve, 450));
+        assert.equal(saved.length - before, 1, 'one write after the keys stop');
+    } finally { await f.win.uiManager?.dispose(); f.close(); }
+});

From ac7e4f8885f6b31a262ff8d3ab7b28b00d2fedb9 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 02:33:39 +0000
Subject: [PATCH 083/143] Topic list: keyboard navigation and a
 keyboard-operable context menu

Topics could only be reached and opened with the mouse, and the topic
context menu had no menu semantics, no Escape and no focus handling.
Following the Radix listbox and ContextMenu behaviour ZCode's lists use:
- the list is one roving tab stop (the open topic, else the first); arrows,
  Home and End move it, Enter/Space open the topic, Shift+F10 or the menu
  key opens its context menu;
- the menu is role=menu with menuitems, takes focus on open, arrows wrap,
  Home/End jump, Enter/Space activate, Escape/Tab close it and return focus
  to the topic; an action that moves focus itself (title editing) keeps it;
- topics show the focus ring on focus-visible.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012AP71nAxrCFEpH7st6asf9
---
 .../contracts/generated/chat-event-graph.json |  23 ++--
 modules/topicListManager.js                   |  93 ++++++++++++++++
 package.json                                  |   2 +-
 scripts/next-delta-shared-baseline.json       |   4 +-
 styles/ui-system/sidebar.css                  |   5 +
 tests/topic-list-keyboard.test.js             | 102 ++++++++++++++++++
 6 files changed, 220 insertions(+), 9 deletions(-)
 create mode 100644 tests/topic-list-keyboard.test.js

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 24d480a19..3b9e84c63 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -3970,7 +3970,7 @@
         },
         {
           "file": "modules/topicListManager.js",
-          "line": 1318,
+          "line": 1411,
           "kind": "custom-event-listener"
         },
         {
@@ -5482,7 +5482,7 @@
         },
         {
           "file": "modules/topicListManager.js",
-          "line": 1318,
+          "line": 1411,
           "kind": "custom-event-listener",
           "match": "document.addEventListener('click'"
         },
@@ -15388,7 +15388,12 @@
         },
         {
           "file": "modules/topicListManager.js",
-          "line": 1119,
+          "line": 632,
+          "kind": "custom-event-listener"
+        },
+        {
+          "file": "modules/topicListManager.js",
+          "line": 1211,
           "kind": "custom-event-listener"
         },
         {
@@ -15736,7 +15741,13 @@
         },
         {
           "file": "modules/topicListManager.js",
-          "line": 1119,
+          "line": 632,
+          "kind": "custom-event-listener",
+          "match": "menu.addEventListener('keydown'"
+        },
+        {
+          "file": "modules/topicListManager.js",
+          "line": 1211,
           "kind": "custom-event-listener",
           "match": "inputField.addEventListener('keydown'"
         },
@@ -26403,7 +26414,7 @@
         },
         {
           "file": "modules/topicListManager.js",
-          "line": 562,
+          "line": 567,
           "kind": "custom-event-listener"
         },
         {
@@ -26464,7 +26475,7 @@
         },
         {
           "file": "modules/topicListManager.js",
-          "line": 562,
+          "line": 567,
           "kind": "custom-event-listener",
           "match": "scrollContainer.addEventListener('scroll'"
         },
diff --git a/modules/topicListManager.js b/modules/topicListManager.js
index 075f8c746..31528caa0 100644
--- a/modules/topicListManager.js
+++ b/modules/topicListManager.js
@@ -391,6 +391,7 @@ window.topicListManager = (() => {
         li.classList.toggle('active', isCurrentActiveTopic);
         li.classList.toggle('active-topic-glowing', isCurrentActiveTopic);
         li.classList.toggle('has-unread-topic', isPersistentlyUnread);
+        li.tabIndex = isCurrentActiveTopic ? 0 : -1;
 
         const avatarImg = document.createElement('img');
         avatarImg.classList.add('avatar');
@@ -534,6 +535,10 @@ window.topicListManager = (() => {
                 } else {
                     topicListUl.appendChild(fragment);
                 }
+                if (!topicListUl.querySelector('.topic-item[tabindex="0"]')) {
+                    const firstItem = topicListUl.querySelector('.topic-item');
+                    if (firstItem) firstItem.tabIndex = 0;
+                }
 
                 allRendered = currentIndex >= totalCount;
                 isRendering = false;
@@ -562,10 +567,97 @@ window.topicListManager = (() => {
         scrollContainer.addEventListener('scroll', onScroll, { passive: true });
         topicListScrollCleanup = () => scrollContainer.removeEventListener('scroll', onScroll);
 
+        addRenderListener(topicListUl, 'keydown', onTopicListKeydown);
+        addRenderListener(topicListUl, 'focusin', onTopicListFocusIn);
+
         topicListUl.innerHTML = '';
         renderNextBatch(initialCount);
     }
 
+    // Keyboard model of a Radix listbox with a ContextMenu trigger, as ZCode's
+    // lists use: one tab stop that follows focus, arrows/Home/End move it,
+    // Enter/Space open the topic, Shift+F10 or the menu key opens its menu.
+    function onTopicListFocusIn(event) {
+        const item = event.target;
+        if (!item?.classList?.contains('topic-item')) return;
+        item.parentElement?.querySelectorAll('.topic-item[tabindex="0"]').forEach(other => {
+            if (other !== item) other.tabIndex = -1;
+        });
+        item.tabIndex = 0;
+    }
+
+    function onTopicListKeydown(event) {
+        const item = event.target;
+        if (!item?.classList?.contains('topic-item')) return;
+        const items = [...item.parentElement.querySelectorAll('.topic-item')];
+        const index = items.indexOf(item);
+        let next = null;
+        if (event.key === 'ArrowDown') next = items[index + 1];
+        else if (event.key === 'ArrowUp') next = items[index - 1];
+        else if (event.key === 'Home') next = items[0];
+        else if (event.key === 'End') next = items[items.length - 1];
+        else if (event.key === 'Enter' || event.key === ' ') {
+            event.preventDefault();
+            item.click();
+            return;
+        } else if (event.key === 'ContextMenu' || (event.key === 'F10' && event.shiftKey)) {
+            event.preventDefault();
+            const rect = item.getBoundingClientRect();
+            item.dispatchEvent(new MouseEvent('contextmenu', {
+                bubbles: true,
+                cancelable: true,
+                clientX: rect.left + 16,
+                clientY: rect.bottom
+            }));
+            return;
+        } else {
+            return;
+        }
+        event.preventDefault();
+        if (next) next.focus();
+    }
+
+    function wireTopicMenuKeyboard(menu, topicItemElement) {
+        menu.setAttribute('role', 'menu');
+        menu.setAttribute('aria-label', '话题操作');
+        const items = [...menu.querySelectorAll('.context-menu-item')];
+        items.forEach(item => {
+            item.setAttribute('role', 'menuitem');
+            item.tabIndex = -1;
+        });
+        const enabledItems = () => items.filter(item => item.isConnected && !item.classList.contains('disabled'));
+        const returnFocus = () => {
+            if (topicItemElement?.isConnected) topicItemElement.focus();
+        };
+        menu.addEventListener('keydown', event => {
+            const current = enabledItems();
+            const index = current.indexOf(event.target);
+            let next = null;
+            if (event.key === 'ArrowDown') next = current[(index + 1) % current.length];
+            else if (event.key === 'ArrowUp') next = current[(index - 1 + current.length) % current.length];
+            else if (event.key === 'Home') next = current[0];
+            else if (event.key === 'End') next = current[current.length - 1];
+            else if ((event.key === 'Enter' || event.key === ' ') && index >= 0) {
+                event.preventDefault();
+                event.target.click();
+                // An action that moved focus (title editing) keeps it; otherwise
+                // focus goes back to the topic instead of being lost to <body>.
+                if (!document.activeElement || document.activeElement === document.body) returnFocus();
+                return;
+            } else if (event.key === 'Escape' || event.key === 'Tab') {
+                event.preventDefault();
+                closeTopicContextMenu();
+                returnFocus();
+                return;
+            } else {
+                return;
+            }
+            event.preventDefault();
+            next?.focus();
+        });
+        enabledItems()[0]?.focus({ preventScroll: true });
+    }
+
     async function loadTopicList() {
         if (!topicListContainer) {
             console.error("Topic list container (tabContentTopics) not found.");
@@ -1314,6 +1406,7 @@ window.topicListManager = (() => {
         menu.style.top = `${top}px`;
         menu.style.left = `${left}px`;
         menu.style.visibility = 'visible';
+        wireTopicMenuKeyboard(menu, topicItemElement);
 
         document.addEventListener('click', closeTopicContextMenuOnClickOutside, true);
     }
diff --git a/package.json b/package.json
index f64786f2e..08ba9a993 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,7 @@
     "test:launchpad-icons": "node --test tests/launchpad-icons.test.js tests/launchpad-controller.test.js",
     "test:next-ui-empty-state": "node scripts/test-next-ui-empty-state.mjs",
     "test:ui-motion-contract": "node scripts/test-ui-motion-contract.mjs",
-    "check:ui-system": "npm run guard:design-subtraction && npm run guard:classic-parity && npm run guard:classic-retirement && npm run guard:next-delta && npm run guard:ui-interaction && npm run guard:ui-async-state && npm run guard:ui-task-journeys && npm run guard:theme-provenance && npm run test:ui-motion-contract && node --check modules/ui-system/lifecycle-scope.js && node --check VCPDistributedServer/frontend-plugin-loader.js && node --check modules/ui-system/component-manifest.js && node --check modules/ui-system/vcp-ui.js && node --check modules/ui-system/webawesome-runtime-manifest.js && node --check modules/ui-system/webawesome-adapter.js && node --check modules/ui-system/appearance-engine.js && node --check modules/ui-system/appearance-studio.js && node --check modules/ui-system/next-ui-apps.js && node --check modules/ui-system/component-showcase.js && node --check modules/ui-system/webawesome-comparison.js && node --check modules/topTabManager.js && npm run lint:ui-system && npm run guard:ui-system && npm run check:ui-applications && npm run test:ui-system && npm run test:appearance-engine && npm run test:appearance-studio && node scripts/test-next-ui-tab-lifecycle.mjs && node scripts/test-webawesome-adapter.mjs && node --test tests/lifecycle-scope.test.js tests/next-ui-registries.test.mjs tests/topic-list-mode-lifecycle.test.js tests/topic-list-load-robustness.test.js tests/settings-unsaved-indicator.test.mjs tests/settings-agent-draft-retention.test.mjs tests/sidebar-resizer-lifecycle.test.mjs && npm run test:bootstrap",
+    "check:ui-system": "npm run guard:design-subtraction && npm run guard:classic-parity && npm run guard:classic-retirement && npm run guard:next-delta && npm run guard:ui-interaction && npm run guard:ui-async-state && npm run guard:ui-task-journeys && npm run guard:theme-provenance && npm run test:ui-motion-contract && node --check modules/ui-system/lifecycle-scope.js && node --check VCPDistributedServer/frontend-plugin-loader.js && node --check modules/ui-system/component-manifest.js && node --check modules/ui-system/vcp-ui.js && node --check modules/ui-system/webawesome-runtime-manifest.js && node --check modules/ui-system/webawesome-adapter.js && node --check modules/ui-system/appearance-engine.js && node --check modules/ui-system/appearance-studio.js && node --check modules/ui-system/next-ui-apps.js && node --check modules/ui-system/component-showcase.js && node --check modules/ui-system/webawesome-comparison.js && node --check modules/topTabManager.js && npm run lint:ui-system && npm run guard:ui-system && npm run check:ui-applications && npm run test:ui-system && npm run test:appearance-engine && npm run test:appearance-studio && node scripts/test-next-ui-tab-lifecycle.mjs && node scripts/test-webawesome-adapter.mjs && node --test tests/lifecycle-scope.test.js tests/next-ui-registries.test.mjs tests/topic-list-mode-lifecycle.test.js tests/topic-list-load-robustness.test.js tests/settings-unsaved-indicator.test.mjs tests/settings-agent-draft-retention.test.mjs tests/sidebar-resizer-lifecycle.test.mjs tests/topic-list-keyboard.test.js && npm run test:bootstrap",
     "test:appearance-engine": "node scripts/test-appearance-engine.mjs",
     "test:appearance-studio": "node scripts/test-appearance-studio.mjs",
     "test:vcp-ui-select-proxy": "node scripts/test-vcp-ui-select-proxy.mjs",
diff --git a/scripts/next-delta-shared-baseline.json b/scripts/next-delta-shared-baseline.json
index 2d373b8de..2767a6ff9 100644
--- a/scripts/next-delta-shared-baseline.json
+++ b/scripts/next-delta-shared-baseline.json
@@ -12,8 +12,8 @@
     "reason": "Integrated projection behavior: media cleanup before subtree replacement; nested tool-result ranges shield protocol markers; incremental smooth-stream burst handling preserves text order; durable persistence remains outside this projection."
   },
   "modules/topicListManager.js": {
-    "sha256": "50b2475f546cde9b601fb37dcc77562513f57b27823287a64061e85858653b74",
-    "reason": "Integrated topic behavior: configuration/unread loads validate the selected item; sort/title/menu operations capture their original topic target; completed deletion changes the active view only for the same item and topic. Repository, readiness and render listener ownership remain unchanged. Topic search waits 200ms after typing before reloading (Enter is immediate); a rejected config IPC shows an error row instead of a permanent spinner; names and IPC errors render as text."
+    "sha256": "97e9a027a13e37a6eeca4c3165441e7c77ee5f6e978952306a7094ac0cc34e55",
+    "reason": "Integrated topic behavior: configuration/unread loads validate the selected item; sort/title/menu operations capture their original topic target; completed deletion changes the active view only for the same item and topic. Repository, readiness and render listener ownership remain unchanged. Topic search waits 200ms after typing before reloading (Enter is immediate); a rejected config IPC shows an error row instead of a permanent spinner; names and IPC errors render as text. Keyboard: topics are one roving tab stop (arrows/Home/End move, Enter/Space open, Shift+F10 or the menu key opens the context menu); the context menu is a role=menu with arrow navigation, Escape/Tab closing it back onto the topic."
   },
   "modules/itemListManager.js": {
     "sha256": "ae5eca22dd19312f56d5c9d60b6a221c3a5be8cf2d34c1049407b45100cc5393",
diff --git a/styles/ui-system/sidebar.css b/styles/ui-system/sidebar.css
index 59fecb163..b00bfc555 100644
--- a/styles/ui-system/sidebar.css
+++ b/styles/ui-system/sidebar.css
@@ -193,6 +193,11 @@
         outline-offset: 2px;
     }
 
+    html .vcp-ui-scope.sidebar .topic-list .topic-item:focus-visible {
+        outline: 2px solid var(--vcp-ui-focus-ring);
+        outline-offset: -2px;
+    }
+
     html .vcp-ui-scope .next-ui-create-item-trigger svg,
     html .vcp-ui-scope .next-ui-agent-search-trigger svg,
     html .vcp-ui-scope .next-ui-agent-search-close svg,
diff --git a/tests/topic-list-keyboard.test.js b/tests/topic-list-keyboard.test.js
new file mode 100644
index 000000000..883121c0e
--- /dev/null
+++ b/tests/topic-list-keyboard.test.js
@@ -0,0 +1,102 @@
+const test = require('node:test');
+const assert = require('node:assert/strict');
+const fs = require('node:fs');
+const path = require('node:path');
+const { JSDOM } = require('jsdom');
+
+const root = path.resolve(__dirname, '..');
+const source = fs.readFileSync(path.join(root, 'modules/topicListManager.js'), 'utf8');
+const wait = ms => new Promise(resolve => setTimeout(resolve, ms));
+
+async function mountTopics() {
+    const dom = new JSDOM(`<!doctype html><html><body>
+        <section id="tabContentTopics">
+            <div class="topics-header"><input type="text" id="topicSearchInput"></div>
+            <ul id="topicList" class="topic-list"></ul>
+        </section>
+    </body></html>`, { url: 'https://vcpchat.local/main.html', runScripts: 'outside-only', pretendToBeVisual: true });
+    const { window } = dom;
+    window.requestAnimationFrame = callback => setTimeout(callback, 0);
+    window.IntersectionObserver = class { observe() {} unobserve() {} disconnect() {} };
+    window.eval(source);
+    const selected = [];
+    window.topicListManager.init({
+        elements: { topicListContainer: window.document.getElementById('tabContentTopics') },
+        electronAPI: {
+            getAgentConfig: async () => ({
+                id: 'agent-a',
+                topics: [
+                    { id: 't1', name: 'one', createdAt: 1 },
+                    { id: 't2', name: 'two', createdAt: 2 },
+                    { id: 't3', name: 'three', createdAt: 3 }
+                ]
+            })
+        },
+        chatRepository: { getHistory: async () => [] },
+        refs: {
+            currentSelectedItemRef: { get: () => ({ id: 'agent-a', type: 'agent', name: 'Alice' }) },
+            currentTopicIdRef: { get: () => 't2' }
+        },
+        uiHelper: { showToastNotification() {} },
+        mainRendererFunctions: { updateCurrentItemConfig() {}, selectTopic: id => { selected.push(id); } },
+        topicSelectionReadiness: { isReady: () => true, defer() {} }
+    });
+    await window.topicListManager.loadTopicList();
+    await wait(20);
+    const doc = window.document;
+    const item = id => doc.querySelector(`.topic-item[data-topic-id="${id}"]`);
+    const key = (target, keyName, init = {}) => target.dispatchEvent(new window.KeyboardEvent('keydown', { key: keyName, bubbles: true, cancelable: true, ...init }));
+    return { dom, window, doc, item, key, selected };
+}
+
+test('the topic list has one tab stop on the open topic and arrows move it', async () => {
+    const { dom, window, doc, item, key } = await mountTopics();
+    assert.deepEqual(['t1', 't2', 't3'].map(id => item(id).tabIndex), [-1, 0, -1]);
+
+    item('t2').focus();
+    key(item('t2'), 'ArrowDown');
+    assert.equal(doc.activeElement, item('t3'));
+    assert.deepEqual(['t1', 't2', 't3'].map(id => item(id).tabIndex), [-1, -1, 0], 'the tab stop follows focus');
+    key(item('t3'), 'Home');
+    assert.equal(doc.activeElement, item('t1'));
+    key(item('t1'), 'End');
+    assert.equal(doc.activeElement, item('t3'));
+    key(item('t3'), 'ArrowUp');
+    assert.equal(doc.activeElement, item('t2'));
+    window.topicListManager.dispose();
+    dom.window.close();
+});
+
+test('Enter opens the focused topic', async () => {
+    const { dom, window, item, key, selected } = await mountTopics();
+    item('t1').focus();
+    key(item('t1'), 'Enter');
+    await wait(0);
+    assert.deepEqual(selected, ['t1']);
+    window.topicListManager.dispose();
+    dom.window.close();
+});
+
+test('Shift+F10 opens a keyboard menu that Escape closes back onto the topic', async () => {
+    const { dom, window, doc, item, key } = await mountTopics();
+    item('t1').focus();
+    key(item('t1'), 'F10', { shiftKey: true });
+    const menu = doc.getElementById('topicContextMenu');
+    assert.ok(menu, 'the menu opens from the keyboard');
+    assert.equal(menu.getAttribute('role'), 'menu');
+    const items = [...menu.querySelectorAll('[role="menuitem"]')];
+    assert.ok(items.length > 3);
+    assert.equal(doc.activeElement, items[0], 'focus moves into the menu');
+
+    key(items[0], 'ArrowDown');
+    assert.equal(doc.activeElement, items[1]);
+    key(items[1], 'ArrowUp');
+    key(items[0], 'ArrowUp');
+    assert.equal(doc.activeElement, items[items.length - 1], 'arrows wrap like a Radix menu');
+
+    key(doc.activeElement, 'Escape');
+    assert.equal(doc.getElementById('topicContextMenu'), null);
+    assert.equal(doc.activeElement, item('t1'), 'focus returns to the topic');
+    window.topicListManager.dispose();
+    dom.window.close();
+});

From 5a8e8feb4a0ae7922c3b71d50a38c96ea026b12b Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 02:33:51 +0000
Subject: [PATCH 084/143] Side pane batch P: page residency budget, unmounted
 side chat close, regenerate gate

- Web pages (limit-only) get their own residency budget (12) instead of
  sharing the 8 live views with code viewers and terminals, so opening a
  handful of file tabs no longer reloads a logged-in page and drops its
  form and history (ZCode counts browser residency separately).
- Closing a restored side chat that was never shown (x, close others,
  close all) asks first when it has history or a draft; before, only
  mounted tabs had a requestClose and these were deleted silently.
- A concurrent restore no longer deletes a side chat as empty when it was
  created or opened while its history was being read.
- Regenerate marks the side chat busy while it saves the trimmed history,
  so Enter or an interactive button cannot start a second send that left
  the first stream unstoppable.
- The browser address bar returns to the page URL when focus leaves with
  half-typed text.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DFRovoZHMzeheXKkLNWKG
---
 .../contracts/generated/chat-event-graph.json | 48 +++++++++----------
 modules/renderer/sideChatSurfaceOwner.js      | 17 +++++--
 modules/renderer/sideChatWiring.js            | 30 +++++++++++-
 modules/renderer/sidePaneWiring.js            |  2 +-
 .../side-pane/browserSideProvider.js          |  2 +
 .../side-pane/side-pane-controller.js         |  1 +
 .../ui-system/side-pane/side-pane-dormancy.js | 21 +++++---
 .../side-pane/side-pane-tab-close-owner.js    | 11 ++++-
 modules/ui-system/side-pane/tab-types/chat.js |  6 ++-
 tests/side-browser-address.test.mjs           | 17 +++++++
 tests/side-chat-surface-owner.test.mjs        | 48 +++++++++++++++++++
 tests/side-pane-dormancy.test.mjs             | 15 +++++-
 tests/side-pane-mount-timing.test.mjs         | 27 +++++++++++
 tests/side-pane-wiring-modules.test.mjs       | 28 +++++++++++
 14 files changed, 231 insertions(+), 42 deletions(-)

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 9f05f7f5f..b737e34f3 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -3686,12 +3686,12 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 565,
+          "line": 576,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 568,
+          "line": 579,
           "kind": "custom-event-listener"
         },
         {
@@ -4331,17 +4331,17 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1160,
+          "line": 1161,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1166,
+          "line": 1167,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1180,
+          "line": 1181,
           "kind": "custom-event-listener"
         },
         {
@@ -5156,13 +5156,13 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 565,
+          "line": 576,
           "kind": "custom-event-listener",
           "match": "stopBtn.addEventListener('click'"
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 568,
+          "line": 579,
           "kind": "custom-event-listener",
           "match": "persistenceBadge.addEventListener('click'"
         },
@@ -5930,19 +5930,19 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1160,
+          "line": 1161,
           "kind": "custom-event-listener",
           "match": "toggleNotificationsBtn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1166,
+          "line": 1167,
           "kind": "custom-event-listener",
           "match": "expandButton.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1180,
+          "line": 1181,
           "kind": "custom-event-listener",
           "match": "closeSidePaneBtn.addEventListener('click'"
         },
@@ -7117,7 +7117,7 @@
       "consumers": [
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 344,
+          "line": 346,
           "kind": "custom-event-listener"
         },
         {
@@ -7129,7 +7129,7 @@
       "evidence": [
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 344,
+          "line": 346,
           "kind": "custom-event-listener",
           "match": "textarea.addEventListener('compositionend'"
         },
@@ -7147,7 +7147,7 @@
       "consumers": [
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 343,
+          "line": 345,
           "kind": "custom-event-listener"
         },
         {
@@ -7159,7 +7159,7 @@
       "evidence": [
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 343,
+          "line": 345,
           "kind": "custom-event-listener",
           "match": "textarea.addEventListener('compositionstart'"
         },
@@ -7302,7 +7302,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 572,
+          "line": 583,
           "kind": "custom-event-listener"
         },
         {
@@ -7434,7 +7434,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 572,
+          "line": 583,
           "kind": "custom-event-listener",
           "match": "persistenceBadge.addEventListener('contextmenu'"
         },
@@ -14793,7 +14793,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 346,
+          "line": 348,
           "kind": "custom-event-listener"
         },
         {
@@ -14964,7 +14964,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 346,
+          "line": 348,
           "kind": "custom-event-listener",
           "match": "textarea.addEventListener('input'"
         },
@@ -15404,7 +15404,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 352,
+          "line": 354,
           "kind": "custom-event-listener"
         },
         {
@@ -15754,7 +15754,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 352,
+          "line": 354,
           "kind": "custom-event-listener",
           "match": "textarea.addEventListener('keydown'"
         },
@@ -25008,7 +25008,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1200,
+          "line": 1201,
           "kind": "custom-event-listener"
         },
         {
@@ -25108,7 +25108,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1200,
+          "line": 1201,
           "kind": "custom-event-listener",
           "match": "win?.addEventListener?.('resize'"
         },
@@ -28115,7 +28115,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 564,
+          "line": 575,
           "kind": "custom-event-listener"
         },
         {
@@ -28175,7 +28175,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 564,
+          "line": 575,
           "kind": "custom-event-listener",
           "match": "form.addEventListener('submit'"
         },
diff --git a/modules/renderer/sideChatSurfaceOwner.js b/modules/renderer/sideChatSurfaceOwner.js
index 9073af3c6..c53daf69a 100644
--- a/modules/renderer/sideChatSurfaceOwner.js
+++ b/modules/renderer/sideChatSurfaceOwner.js
@@ -116,6 +116,8 @@ export async function mountSideChatSurface(container, {
     let isDisposed = false;
     let isHistoryLoaded = false;
     let isDeletingMessage = false;
+    // 重新回复先存截短的历史再发送：这段 await 期间还没有 activeSendController，另起的发送会和它撞车
+    let isRegenerating = false;
     let isComposing = false;
     let activeOperation = null;
     let activeSendController = null;
@@ -359,7 +361,7 @@ export async function mountSideChatSurface(container, {
     const onSubmit = async (event) => {
         event?.preventDefault?.();
         // 还在生成时不再起第二次发送：它失败后的清理会清掉正在进行的那次，停止按钮随之消失
-        if (isDisposed || !isHistoryLoaded || isDeletingMessage || activeSendController) return;
+        if (isDisposed || !isHistoryLoaded || isDeletingMessage || isRegenerating || activeSendController) return;
         if (!currentModel) {
             updateStatus('请先选择模型', 'error');
             return;
@@ -495,7 +497,16 @@ export async function mountSideChatSurface(container, {
 
     // 重新回复：截掉这条回答对应的提问及其后的所有消息，再用侧栏自己的模型和上下文把提问重新发出
     async function regenerate(assistantId) {
-        if (isDisposed || !isHistoryLoaded || isDeletingMessage || form.hasAttribute('aria-busy')) return;
+        if (isDisposed || !isHistoryLoaded || isDeletingMessage || isRegenerating || activeSendController || form.hasAttribute('aria-busy')) return;
+        isRegenerating = true;
+        try {
+            await regenerateNow(assistantId);
+        } finally {
+            isRegenerating = false;
+        }
+    }
+
+    async function regenerateNow(assistantId) {
         if (!currentModel) {
             updateStatus('请先选择模型', 'error');
             return;
@@ -543,7 +554,7 @@ export async function mountSideChatSurface(container, {
     submitInteractiveContent = (text) => {
         if (isDisposed) return;
         const notify = (message) => chatCapabilities?.uiHelper?.showToastNotification?.(message, 'warning');
-        if (activeSendController || isDeletingMessage || !isHistoryLoaded) {
+        if (activeSendController || isRegenerating || isDeletingMessage || !isHistoryLoaded) {
             notify('辅助对话正在处理上一条消息，请稍后再点。');
             return;
         }
diff --git a/modules/renderer/sideChatWiring.js b/modules/renderer/sideChatWiring.js
index b1224e2e9..9d824d277 100644
--- a/modules/renderer/sideChatWiring.js
+++ b/modules/renderer/sideChatWiring.js
@@ -246,7 +246,9 @@ export function createSideChatWiring({
                 const hasPendingInput = !!input.draft || (Array.isArray(input.references) && input.references.length > 0);
                 if (storedDraft.ok && !hasPendingInput && typeof chatAPI?.getChatHistory === 'function') {
                     const childHistory = await chatAPI.getChatHistory(childAgentId, childTopicId);
-                    if (Array.isArray(childHistory) && childHistory.length === 0) {
+                    // 读历史期间这个子话题可能刚被新建或打开（来回切话题时并发的恢复），那就不是"空的旧侧聊"
+                    const openedMeanwhile = getController().getSnapshot().tabs.some(t => t.descriptor?.child?.topicId === childTopicId);
+                    if (!openedMeanwhile && Array.isArray(childHistory) && childHistory.length === 0) {
                         const removed = await deleteSideChatChild({ electronAPI: chatAPI, agentId: childAgentId, childTopicId });
                         if (removed.ok) sideChatOwner.forgetDraft(item);
                         else console.warn('[SideChat] Failed to clean up empty side chat:', removed.message);
@@ -315,6 +317,30 @@ export function createSideChatWiring({
 
 
     const selectionEntry = win.openSideChatWithSelection;
+    // 还没显示过的辅助对话（恢复出来、没挂载）关闭前同样确认：有记录或草稿就问一句，和挂载后的 requestClose 一致
+    async function requestTabClose(descriptor) {
+        if (typeof uiHelper?.showConfirmDialog !== 'function') return { closed: true };
+        const agentId = descriptor?.child?.itemId || descriptor?.parent?.itemId;
+        const childTopicId = descriptor?.child?.topicId;
+        if (!agentId || !childTopicId) return { closed: true };
+        const stored = sideChatOwner.readDraft(descriptor);
+        const input = stored?.input || {};
+        let hasContent = !!input.draft || (Array.isArray(input.references) && input.references.length > 0);
+        if (!hasContent && typeof chatAPI?.getChatHistory === 'function') {
+            try {
+                const history = await chatAPI.getChatHistory(agentId, childTopicId);
+                // 读不出来时按有记录处理：宁可多问一句
+                hasContent = !Array.isArray(history) || history.length > 0;
+            } catch {
+                hasContent = true;
+            }
+        }
+        if (!hasContent) return { closed: true };
+        const confirmed = await uiHelper.showConfirmDialog(
+            `关闭「${descriptor.title || '辅助对话'}」会删除这段辅助对话的全部记录，无法恢复。`,
+            '关闭辅助对话', '关闭并删除', '取消', true);
+        return confirmed ? { closed: true } : { closed: false, reason: 'USER_CANCELED' };
+    }
     async function onTabClosed(descriptor) {
         const agentId = descriptor?.child?.itemId || descriptor?.parent?.itemId;
         const childTopicId = descriptor?.child?.topicId;
@@ -324,7 +350,7 @@ export function createSideChatWiring({
         else console.warn('[SideChat] Failed to delete closed side chat:', result.message);
     }
     return Object.freeze({
-        provider: sideChatOwner, openSideChat, restoreSessions, onTabClosed,
+        provider: sideChatOwner, openSideChat, restoreSessions, onTabClosed, requestTabClose,
         dispose() {
             sideChatOwner.dispose();
             if (win.openSideChatWithSelection === selectionEntry) {
diff --git a/modules/renderer/sidePaneWiring.js b/modules/renderer/sidePaneWiring.js
index 9374b31e2..65ed69fa2 100644
--- a/modules/renderer/sidePaneWiring.js
+++ b/modules/renderer/sidePaneWiring.js
@@ -71,7 +71,7 @@ export function initWorkspaceSidePane({
         openModelTrajectory: (options = {}) => modelTrajectory.provider.openModelTrajectoryTab(options)
     }));
     const terminal = defineTerminalTabType({ ...deps, onOpenUrl: url => browser.provider.openBrowserTab({ url, forceNew: true }) });
-    for (const definition of [defineNotificationsTabType(), defineChatTabType({ provider: sideChat.provider, openSideChat: sideChat.openSideChat, onClosed: sideChat.onTabClosed }), codeViewer, browser, terminal, toolOutput, planDetail, modelTrajectory]) {
+    for (const definition of [defineNotificationsTabType(), defineChatTabType({ provider: sideChat.provider, openSideChat: sideChat.openSideChat, onClosed: sideChat.onTabClosed, requestClose: sideChat.requestTabClose }), codeViewer, browser, terminal, toolOutput, planDetail, modelTrajectory]) {
         controller.registerTabType(definition);
     }
     // 焦点在侧栏网页里时按键到不了这个窗口，主进程截下副屏快捷键转过来
diff --git a/modules/ui-system/side-pane/browserSideProvider.js b/modules/ui-system/side-pane/browserSideProvider.js
index 2a4b7db39..af04f5331 100644
--- a/modules/ui-system/side-pane/browserSideProvider.js
+++ b/modules/ui-system/side-pane/browserSideProvider.js
@@ -427,6 +427,8 @@ export function createBrowserSideProvider({
                 moreBtn.setAttribute('aria-expanded', 'true');
                 menu.querySelector('[role="menuitem"]:not([disabled])')?.focus();
             };
+            // 地址栏里打了一半就点走：回到当前页面的网址（setAddress 在聚焦时不改它，没有这一步会一直留着半截文字）
+            own.listen(address, 'blur', () => { address.value = currentUrl === 'about:blank' ? '' : currentUrl; });
             own.listen(menu, 'keydown', (event) => {
                 if (event.key === 'Escape' || event.key === 'Tab') {
                     event.preventDefault();
diff --git a/modules/ui-system/side-pane/side-pane-controller.js b/modules/ui-system/side-pane/side-pane-controller.js
index eeeb88510..5acaf5aa2 100644
--- a/modules/ui-system/side-pane/side-pane-controller.js
+++ b/modules/ui-system/side-pane/side-pane-controller.js
@@ -657,6 +657,7 @@ export function createSidePaneController({
             return occurrence ? occurrence.onClosed : getTabType(tab.kind)?.onClosed;
         },
         cancelPendingMount,
+        getRequestClose: tab => getTabType(tab.kind)?.requestClose || null,
         retireTab(tab, entry, options, onFocusMoved) {
             // Read current focus after authorization; the user may have moved elsewhere while it waited.
             const ownedFocus = focus.ownsFocus();
diff --git a/modules/ui-system/side-pane/side-pane-dormancy.js b/modules/ui-system/side-pane/side-pane-dormancy.js
index 39c75f4d7..f11124d04 100644
--- a/modules/ui-system/side-pane/side-pane-dormancy.js
+++ b/modules/ui-system/side-pane/side-pane-dormancy.js
@@ -8,6 +8,8 @@
  * 'limit-only' 的类型（浏览器）不按隐藏时长休眠，只在超过上限时参与淘汰：销毁网页会丢掉表单、登录和后退栈，
  * 代价远高于重建其他视图（对照 ZCode browserTabResidencyPolicy.ts 只按数量淘汰）。
  * 'keep' 的视图不占 maxLiveViews 的名额，否则它们攒多了会把其他标签一切走就挤去休眠。
+ * 'limit-only' 的视图也不占 maxLiveViews，而是有自己的 maxLivePages：连开几个代码查看、终端不能把登录着的网页挤掉
+ * （ZCode 的浏览器驻留上限同样单独计数，其他标签类型不算在里面）。
  * 这里只做判断，不碰 DOM 和定时器，控制器负责执行和定时。
  */
 
@@ -15,6 +17,7 @@ export const DORMANCY_DEFAULTS = Object.freeze({
     hiddenMs: 5 * 60_000,
     otherTopicMs: 30_000,
     maxLiveViews: 8,
+    maxLivePages: 12,
     busyRetryMs: 60_000
 });
 
@@ -40,7 +43,7 @@ const byLeastRecentlyShown = (a, b) => (a.lastShownAt - b.lastShownAt)
  * @returns {{ release: Array<{ tabId: string, reason: 'hidden' | 'other-topic' | 'view-limit' }>, nextCheckAt: number | null }}
  */
 export function selectDormantViews(candidates, options) {
-    const { now, hiddenMs, otherTopicMs, maxLiveViews, busyRetryMs } = { ...DORMANCY_DEFAULTS, ...options };
+    const { now, hiddenMs, otherTopicMs, maxLiveViews, maxLivePages, busyRetryMs } = { ...DORMANCY_DEFAULTS, ...options };
     const release = [];
     const released = new Set();
     let nextCheckAt = null;
@@ -61,18 +64,22 @@ export function selectDormantViews(candidates, options) {
         }
     }
 
-    let live = candidates.filter(candidate => candidate.dormancy !== 'keep').length - released.size;
-    if (live > maxLiveViews) {
-        const victims = candidates
+    const evictOver = (pool, limit) => {
+        let live = pool.filter(candidate => !released.has(candidate.tabId)).length;
+        if (live <= limit) return;
+        const victims = pool
             .filter(candidate => sleepable(candidate) && !candidate.busy && !released.has(candidate.tabId))
             .sort(byLeastRecentlyShown);
         for (const victim of victims) {
-            if (live <= maxLiveViews) break;
+            if (live <= limit) break;
             release.push({ tabId: victim.tabId, reason: 'view-limit' });
+            released.add(victim.tabId);
             live -= 1;
         }
         // 超出上限但剩下的都在忙：过一会儿再看
-        if (live > maxLiveViews && candidates.some(candidate => sleepable(candidate) && candidate.busy)) later(now + busyRetryMs);
-    }
+        if (live > limit && pool.some(candidate => sleepable(candidate) && candidate.busy)) later(now + busyRetryMs);
+    };
+    evictOver(candidates.filter(candidate => candidate.dormancy !== 'keep' && candidate.dormancy !== 'limit-only'), maxLiveViews);
+    evictOver(candidates.filter(candidate => candidate.dormancy === 'limit-only'), maxLivePages);
     return { release, nextCheckAt };
 }
diff --git a/modules/ui-system/side-pane/side-pane-tab-close-owner.js b/modules/ui-system/side-pane/side-pane-tab-close-owner.js
index fd4e4e285..422e550f3 100644
--- a/modules/ui-system/side-pane/side-pane-tab-close-owner.js
+++ b/modules/ui-system/side-pane/side-pane-tab-close-owner.js
@@ -1,6 +1,6 @@
 /** Single and batch closes retain their original page lifetimes through authorization and cleanup. */
 export function createSidePaneTabCloseOwner({
-    isDisposed, getTab, getEntry, getOnClosed, cancelPendingMount, retireTab
+    isDisposed, getTab, getEntry, getOnClosed, cancelPendingMount, retireTab, getRequestClose = () => null
 }) {
     const closing = new Map();
     const disposals = new WeakMap();
@@ -54,6 +54,15 @@ export function createSidePaneTabCloseOwner({
                 const result = await entry.handle?.requestClose?.();
                 if (result?.closed === false) return;
                 if (isDisposed() || getEntry(tabId) !== entry) return;
+            } else if (!entry && !options.discard) {
+                // 没挂载过的标签（恢复后还没显示的辅助对话）没有 handle 可问，由类型自己确认：
+                // 否则在「关闭其他 / 全部」里它们会不经确认就被删掉
+                const requestClose = getRequestClose(tab);
+                if (requestClose) {
+                    const result = await requestClose(tab);
+                    if (result?.closed === false) return;
+                    if (isDisposed() || getEntry(tabId)) return;
+                }
             }
             if (isDisposed()) return;
             const current = getTab(tabId);
diff --git a/modules/ui-system/side-pane/tab-types/chat.js b/modules/ui-system/side-pane/tab-types/chat.js
index f09e4d11c..be1217c98 100644
--- a/modules/ui-system/side-pane/tab-types/chat.js
+++ b/modules/ui-system/side-pane/tab-types/chat.js
@@ -73,8 +73,9 @@ export function sideChatTab(rawDescriptor, tabs = []) {
  * provider：mountTab(descriptor, view, ctx)，返回辅助对话 handle；ctx 原样转交控制器给的挂载上下文（含 view scope）。
  * openSideChat：新标签页入口；不传时不出现在新标签页里。
  * onClosed(descriptor)：标签关掉后调用，用来删掉子话题。
+ * requestClose(descriptor)：还没挂载的标签关闭前确认（挂着的由 handle.requestClose 确认），返回 { closed: false } 取消。
  */
-export function defineChatTabType({ provider, openSideChat = null, onClosed = null }) {
+export function defineChatTabType({ provider, openSideChat = null, onClosed = null, requestClose = null }) {
     return Object.freeze({
         kind: 'chat', label: '辅助对话', icon: 'chat_bubble', searchHint: '辅助对话',
         persist: false,
@@ -88,6 +89,7 @@ export function defineChatTabType({ provider, openSideChat = null, onClosed = nu
         provider: provider ? {
             mountTab: (payload, view, ctx) => provider.mountTab(payload.descriptor, view, ctx)
         } : null,
-        onClosed: typeof onClosed === 'function' ? tab => onClosed({ ...tab.descriptor }) : null
+        onClosed: typeof onClosed === 'function' ? tab => onClosed({ ...tab.descriptor }) : null,
+        requestClose: typeof requestClose === 'function' ? tab => requestClose({ ...tab.descriptor }) : null
     });
 }
diff --git a/tests/side-browser-address.test.mjs b/tests/side-browser-address.test.mjs
index 6401ff7d6..a06ad386d 100644
--- a/tests/side-browser-address.test.mjs
+++ b/tests/side-browser-address.test.mjs
@@ -253,3 +253,20 @@ test('a page playing media stays busy even when muted, until it pauses or naviga
     handle.dispose();
     dom.window.close();
 });
+
+test('half-typed text in the address bar goes back to the page address when focus leaves', async () => {
+    const { JSDOM } = await import('jsdom');
+    const { createBrowserSideProvider } = await import('../modules/ui-system/side-pane/browserSideProvider.js');
+    const dom = new JSDOM('<div id="view"></div>');
+    const provider = createBrowserSideProvider({ document: dom.window.document, api: null, sidePaneController: { updateTab() {} }, notify: () => {} });
+    const view = dom.window.document.getElementById('view');
+    const handle = await provider.mountTab({ id: 'browser:1', kind: 'browser', payload: {} }, view);
+    handle.navigate('https://example.com/');
+    const address = view.querySelector('input');
+    address.focus();
+    address.value = 'foo';
+    address.blur();
+    assert.equal(address.value, 'https://example.com/');
+    handle.dispose();
+    dom.window.close();
+});
diff --git a/tests/side-chat-surface-owner.test.mjs b/tests/side-chat-surface-owner.test.mjs
index d6bb270bf..a53d17dec 100644
--- a/tests/side-chat-surface-owner.test.mjs
+++ b/tests/side-chat-surface-owner.test.mjs
@@ -520,3 +520,51 @@ test('the side chat surface hangs under the view scope the controller passes and
     assert.equal(rendererDisposed, 1);
     dom.window.close();
 });
+
+test('a send started while regenerate is still saving the trimmed history is refused', async () => {
+    const dom = new JSDOM('<div id="sideContainer"></div>');
+    const doc = dom.window.document;
+    const container = doc.getElementById('sideContainer');
+    const base = createMockChatCapabilities();
+    const initial = [{ id: 'u1', role: 'user', content: 'question' }, { id: 'a1', role: 'assistant', content: 'answer' }];
+    base.setHistory(initial);
+    let releaseSave;
+    let saves = 0;
+    const caps = {
+        ...base,
+        repository: {
+            getHistory: async () => initial,
+            saveHistory: () => { saves += 1; return saves === 1 ? new Promise(resolve => { releaseSave = () => resolve({ success: true }); }) : Promise.resolve({ success: true }); }
+        },
+        createRenderer(options) {
+            const owned = base.createRenderer(options);
+            owned.renderer.removeMessageById = () => {};
+            return owned;
+        },
+        uiHelper: { showToastNotification() {} }
+    };
+    const descriptor = {
+        id: 'chat-regen', title: 'R', parent: { itemId: 'agent-1', topicId: 'p' },
+        child: { itemId: 'agent-1', topicId: 'c-regen' }, contextMode: 'blank', model: 'test-model'
+    };
+    const handle = await mountSideChatSurface(container, { descriptor, chatCapabilities: caps });
+    await new Promise(r => setTimeout(r, 20));
+    const list = container.querySelector('.side-chat-messages-container');
+    list.insertAdjacentHTML('beforeend', '<div class="message-item assistant" data-message-id="a1"><div class="details-and-bubble-wrapper"><div class="md-content">answer</div></div></div>');
+    list.querySelector('.message-item.assistant .md-content').dispatchEvent(new dom.window.MouseEvent('contextmenu', { bubbles: true, cancelable: true, clientX: 5, clientY: 5 }));
+    doc.querySelector('#chatContextMenu [data-side-chat-action="regenerate"]').click();
+    await new Promise(r => setTimeout(r, 0));
+    assert.equal(saves, 1, 'regenerate is waiting on the save');
+
+    const textarea = container.querySelector('textarea');
+    textarea.value = 'typed meanwhile';
+    container.querySelector('form').dispatchEvent(new dom.window.Event('submit', { bubbles: true, cancelable: true }));
+    await new Promise(r => setTimeout(r, 0));
+    releaseSave();
+    await new Promise(r => setTimeout(r, 20));
+    assert.equal(textarea.value, 'typed meanwhile', 'the typed text stays in the composer');
+    assert.equal(caps.getSentRequest()?.content, 'question', 'only the regenerated question was sent');
+
+    await handle.dispose();
+    dom.window.close();
+});
diff --git a/tests/side-pane-dormancy.test.mjs b/tests/side-pane-dormancy.test.mjs
index a057c345d..3f97ab539 100644
--- a/tests/side-pane-dormancy.test.mjs
+++ b/tests/side-pane-dormancy.test.mjs
@@ -244,7 +244,7 @@ test('policy: keep views do not take places under the live-view limit', () => {
     assert.deepEqual(release, []);
 });
 
-test('policy: limit-only views never sleep for being hidden, only for the live-view limit', () => {
+test('policy: limit-only views never sleep for being hidden, only for their own page limit', () => {
     const now = 60 * 60_000;
     const hiddenLong = selectDormantViews([
         candidate('browser', { dormancy: 'limit-only', hiddenSince: 0 })
@@ -255,10 +255,21 @@ test('policy: limit-only views never sleep for being hidden, only for the live-v
         candidate('browser-old', { dormancy: 'limit-only', lastShownAt: 1 }),
         candidate('browser-new', { dormancy: 'limit-only', lastShownAt: 2 }),
         candidate('shown', { shown: true, hiddenSince: null, lastShownAt: 3 })
-    ], { now, maxLiveViews: 2 });
+    ], { now, maxLivePages: 1 });
     assert.deepEqual(overLimit.release, [{ tabId: 'browser-old', reason: 'view-limit' }]);
 });
 
+test('policy: opening many code and terminal tabs never pushes a live web page out', () => {
+    const now = 60_000;
+    const views = Array.from({ length: 10 }, (_, i) => candidate(`code-${i}`, { lastShownAt: 10 + i, hiddenSince: now }));
+    const result = selectDormantViews([
+        candidate('browser', { dormancy: 'limit-only', lastShownAt: 1 }),
+        ...views
+    ], { now, maxLiveViews: 8 });
+    assert.equal(result.release.some(entry => entry.tabId === 'browser'), false, 'the oldest view is a page, but it is not evicted');
+    assert.deepEqual(result.release.map(entry => entry.tabId), ['code-0', 'code-1']);
+});
+
 test('collapsing the pane does not put the current tab to sleep', async () => {
     const h = fixture({ hiddenMs: 30 });
     try {
diff --git a/tests/side-pane-mount-timing.test.mjs b/tests/side-pane-mount-timing.test.mjs
index a93379da2..db3b23726 100644
--- a/tests/side-pane-mount-timing.test.mjs
+++ b/tests/side-pane-mount-timing.test.mjs
@@ -142,3 +142,30 @@ test('close others mounts only the tab that stays', async t => {
     assert.deepEqual(mounted, ['keep']);
     assert.equal(ctrl.getSnapshot().activeTabId, 'keep');
 });
+
+test('closing a restored side chat that was never shown still asks first, and a cancel keeps it', async t => {
+    const dom = new JSDOM('<main class="main-content"></main><aside id="pane"><div id="tabs"></div><div id="content"><section class="side-pane-view" id="sidePaneViewNotifications"></section></div></aside>');
+    const doc = dom.window.document;
+    const asked = [];
+    const deleted = [];
+    const ctrl = createSidePaneController({
+        root: doc.getElementById('pane'),
+        tabListElement: doc.getElementById('tabs'),
+        contentContainer: doc.getElementById('content'),
+        tabTypes: [defineChatTabType({
+            provider: { mountTab: async () => ({ dispose: async () => {}, focus() {}, requestClose: async () => ({ closed: true }) }) },
+            requestClose: async descriptor => { asked.push(descriptor.id); return { closed: descriptor.id !== 'keep-me' }; },
+            onClosed: descriptor => { deleted.push(descriptor.id); }
+        })]
+    });
+    t.after(() => { ctrl.dispose?.(); dom.window.close(); });
+    ctrl.setParent(parentOf('a'));
+    await ctrl.openTab(sideChat('shown', 'a'));
+    await ctrl.restoreTabs([sideChat('keep-me', 'a'), sideChat('drop-me', 'a')]);
+
+    await ctrl.closeAllTabs();
+
+    assert.deepEqual(asked.sort(), ['drop-me', 'keep-me'], 'unmounted side chats are asked through the type');
+    assert.deepEqual(deleted.sort(), ['drop-me', 'shown']);
+    assert.ok(ctrl.getSnapshot().tabs.some(tab => tab.id === 'keep-me'), 'cancelling keeps the tab and its history');
+});
diff --git a/tests/side-pane-wiring-modules.test.mjs b/tests/side-pane-wiring-modules.test.mjs
index b9396967b..dfeef08a0 100644
--- a/tests/side-pane-wiring-modules.test.mjs
+++ b/tests/side-pane-wiring-modules.test.mjs
@@ -87,3 +87,31 @@ test('startup restores the saved layout against the current conversation: a pane
         win.close();
     }
 });
+
+test('a never-shown side chat asks before its history is deleted, and an empty one closes quietly', async () => {
+    const { JSDOM } = await import('jsdom');
+    const { createSideChatWiring } = await import('../modules/renderer/sideChatWiring.js');
+    const dom = new JSDOM('<!doctype html><body></body>', { url: 'http://localhost/' });
+    const confirms = [];
+    let answer = false;
+    const histories = { full: [{ id: 'm1', role: 'user', content: 'hi' }], empty: [] };
+    const chatAPI = { getChatHistory: async (_agentId, topicId) => histories[topicId] };
+    const uiHelper = { showConfirmDialog: async message => { confirms.push(message); return answer; }, showToastNotification() {} };
+    const wiring = createSideChatWiring({
+        doc: dom.window.document, win: dom.window, chatAPI, chatRepository: null, chatManager: null, uiHelper,
+        createRenderer: () => null, selectedItemRef: { get: () => null }, topicIdRef: { get: () => 'topic-1' },
+        historyRef: { get: () => [] }, getController: () => ({ getSnapshot: () => ({ tabs: [] }) })
+    });
+    try {
+        const descriptor = topicId => ({ id: `side-${topicId}`, title: '辅助对话 1', parent: { itemId: 'agent-1', topicId: 'topic-1' }, child: { itemId: 'agent-1', topicId } });
+        assert.deepEqual(await wiring.requestTabClose(descriptor('full')), { closed: false, reason: 'USER_CANCELED' });
+        assert.equal(confirms.length, 1);
+        answer = true;
+        assert.deepEqual(await wiring.requestTabClose(descriptor('full')), { closed: true });
+        assert.deepEqual(await wiring.requestTabClose(descriptor('empty')), { closed: true });
+        assert.equal(confirms.length, 2, 'an empty side chat closes without a question');
+    } finally {
+        wiring.dispose?.();
+        dom.window.close();
+    }
+});

From af2ba4361319aab7ee1edc2baba1cbc3b498789f Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 02:36:27 +0000
Subject: [PATCH 085/143] Side pane: don't offer a side chat while a group is
 selected
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In a group chat the new-tab page still listed 辅助对话. Clicking it only
raised a warning toast (请先在主聊天中选择一个助手), even though the user
had a conversation selected. The entry now uses isAvailable to say it
needs an agent conversation, and the controller re-renders entries when
the conversation changes, so the entry disappears in groups and comes
back for agents.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019L2bZomLn4NVoxS4Rv5Bkv
---
 .../contracts/generated/chat-event-graph.json | 16 ++++++------
 modules/renderer/sidePaneWiring.js            |  2 +-
 .../side-pane/side-pane-controller.js         |  6 ++++-
 modules/ui-system/side-pane/tab-types/chat.js |  8 ++++--
 tests/side-pane-advanced-parity.test.mjs      | 25 +++++++++++++++++++
 5 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 7adba5e83..fdb1ce998 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -4331,17 +4331,17 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1160,
+          "line": 1164,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1166,
+          "line": 1170,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1180,
+          "line": 1184,
           "kind": "custom-event-listener"
         },
         {
@@ -5930,19 +5930,19 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1160,
+          "line": 1164,
           "kind": "custom-event-listener",
           "match": "toggleNotificationsBtn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1166,
+          "line": 1170,
           "kind": "custom-event-listener",
           "match": "expandButton.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1180,
+          "line": 1184,
           "kind": "custom-event-listener",
           "match": "closeSidePaneBtn.addEventListener('click'"
         },
@@ -25008,7 +25008,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1200,
+          "line": 1204,
           "kind": "custom-event-listener"
         },
         {
@@ -25108,7 +25108,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1200,
+          "line": 1204,
           "kind": "custom-event-listener",
           "match": "win?.addEventListener?.('resize'"
         },
diff --git a/modules/renderer/sidePaneWiring.js b/modules/renderer/sidePaneWiring.js
index 9374b31e2..1affccec3 100644
--- a/modules/renderer/sidePaneWiring.js
+++ b/modules/renderer/sidePaneWiring.js
@@ -71,7 +71,7 @@ export function initWorkspaceSidePane({
         openModelTrajectory: (options = {}) => modelTrajectory.provider.openModelTrajectoryTab(options)
     }));
     const terminal = defineTerminalTabType({ ...deps, onOpenUrl: url => browser.provider.openBrowserTab({ url, forceNew: true }) });
-    for (const definition of [defineNotificationsTabType(), defineChatTabType({ provider: sideChat.provider, openSideChat: sideChat.openSideChat, onClosed: sideChat.onTabClosed }), codeViewer, browser, terminal, toolOutput, planDetail, modelTrajectory]) {
+    for (const definition of [defineNotificationsTabType(), defineChatTabType({ provider: sideChat.provider, openSideChat: sideChat.openSideChat, onClosed: sideChat.onTabClosed, canOpen: () => controller.getSnapshot().parent?.itemType === 'agent' }), codeViewer, browser, terminal, toolOutput, planDetail, modelTrajectory]) {
         controller.registerTabType(definition);
     }
     // 焦点在侧栏网页里时按键到不了这个窗口，主进程截下副屏快捷键转过来
diff --git a/modules/ui-system/side-pane/side-pane-controller.js b/modules/ui-system/side-pane/side-pane-controller.js
index eeeb88510..4c130a7c0 100644
--- a/modules/ui-system/side-pane/side-pane-controller.js
+++ b/modules/ui-system/side-pane/side-pane-controller.js
@@ -1103,7 +1103,11 @@ export function createSidePaneController({
                 preferredTabId: activeTabByParent.get(nextKey),
                 collapsedPreference: collapsedByParent.get(nextKey)
             });
-            if (state.parent !== previousParent) navigationRevision++;
+            if (state.parent !== previousParent) {
+                navigationRevision++;
+                // 入口是否可用可能取决于当前对话（群聊里不能开辅助对话），换对话时重新列一遍
+                launcher.renderEntries();
+            }
             renderTabList();
             syncViewPanels();
             syncDomVisibility();
diff --git a/modules/ui-system/side-pane/tab-types/chat.js b/modules/ui-system/side-pane/tab-types/chat.js
index f09e4d11c..27aa00b11 100644
--- a/modules/ui-system/side-pane/tab-types/chat.js
+++ b/modules/ui-system/side-pane/tab-types/chat.js
@@ -73,15 +73,19 @@ export function sideChatTab(rawDescriptor, tabs = []) {
  * provider：mountTab(descriptor, view, ctx)，返回辅助对话 handle；ctx 原样转交控制器给的挂载上下文（含 view scope）。
  * openSideChat：新标签页入口；不传时不出现在新标签页里。
  * onClosed(descriptor)：标签关掉后调用，用来删掉子话题。
+ * canOpen()：当前能不能新开辅助对话（群聊里不能）；返回 false 时新标签页里不列这个入口。
  */
-export function defineChatTabType({ provider, openSideChat = null, onClosed = null }) {
+export function defineChatTabType({ provider, openSideChat = null, onClosed = null, canOpen = null }) {
     return Object.freeze({
         kind: 'chat', label: '辅助对话', icon: 'chat_bubble', searchHint: '辅助对话',
         persist: false,
         // 输入框里可能有还没发出去的内容，隐藏再久也不休眠
         dormancy: 'keep',
         entry: typeof openSideChat === 'function'
-            ? { id: 'selection-side-conversation', order: 0, open: () => openSideChat({ forceNew: true }) }
+            ? {
+                id: 'selection-side-conversation', order: 0, open: () => openSideChat({ forceNew: true }),
+                ...(typeof canOpen === 'function' ? { isAvailable: canOpen } : {})
+            }
             : null,
         // openTab({ kind: 'chat', descriptor }) 走这里
         toTab: (payload, tabs) => sideChatTab(payload.descriptor, tabs),
diff --git a/tests/side-pane-advanced-parity.test.mjs b/tests/side-pane-advanced-parity.test.mjs
index b4bf22360..d43765123 100644
--- a/tests/side-pane-advanced-parity.test.mjs
+++ b/tests/side-pane-advanced-parity.test.mjs
@@ -584,6 +584,31 @@ test('Parity: the tools page lists recommended apps under the tool rows', async
     dom.window.close();
 });
 
+test('Parity: the side chat entry is not offered while a group is selected', () => {
+    const dom = createParityTestDOM();
+    const doc = dom.window.document;
+    let ctrl = null;
+    ctrl = createController(dom, {
+        controller: {
+            tabTypes: [defineChatTabType({
+                provider: mockChatProvider(),
+                openSideChat: () => {},
+                canOpen: () => ctrl?.getSnapshot().parent?.itemType === 'agent'
+            })]
+        }
+    });
+    const listed = () => [...doc.querySelectorAll('[data-open-tab-entry]')].map(row => row.getAttribute('data-open-tab-entry'));
+    ctrl.setParent({ itemType: 'agent', itemId: 'agent-1', topicId: 'parent' });
+    assert.deepEqual(listed(), ['selection-side-conversation']);
+    // 切到群聊：控制器的 parent 变成 null，入口跟着消失，而不是点了再弹「请先选择助手」
+    ctrl.setParent(null);
+    assert.deepEqual(listed(), []);
+    ctrl.setParent({ itemType: 'agent', itemId: 'agent-1', topicId: 'parent' });
+    assert.deepEqual(listed(), ['selection-side-conversation']);
+    ctrl.dispose();
+    dom.window.close();
+});
+
 test('Parity: entries can hide themselves with isAvailable', () => {
     const dom = createParityTestDOM();
     const doc = dom.window.document;

From 9a4971f3e9f04412d888a6007f3720a2f85e16b4 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 02:36:44 +0000
Subject: [PATCH 086/143] Agent list: keyboard navigation

Agents and groups could only be selected with the mouse. The list is now
one roving tab stop (the selected item, else the first) that follows focus;
arrows, Home and End move over the items the search filter leaves visible,
and Enter or Space selects, as in the Radix listbox ZCode's lists use.
Items show the focus ring on focus-visible.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012AP71nAxrCFEpH7st6asf9
---
 .../contracts/generated/chat-event-graph.json | 46 +++++++++++----
 modules/itemListManager.js                    | 54 ++++++++++++++++-
 package.json                                  |  2 +-
 scripts/next-delta-shared-baseline.json       |  4 +-
 styles/ui-system/sidebar.css                  |  1 +
 tests/item-list-keyboard.test.js              | 58 +++++++++++++++++++
 6 files changed, 149 insertions(+), 16 deletions(-)
 create mode 100644 tests/item-list-keyboard.test.js

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 3b9e84c63..a199d0070 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -1234,7 +1234,7 @@
       "consumers": [
         {
           "file": "modules/itemListManager.js",
-          "line": 914,
+          "line": 965,
           "kind": "custom-event-listener"
         },
         {
@@ -1251,7 +1251,7 @@
       "evidence": [
         {
           "file": "modules/itemListManager.js",
-          "line": 914,
+          "line": 965,
           "kind": "custom-event-listener",
           "match": "li.addEventListener('auxclick'"
         },
@@ -3540,7 +3540,7 @@
         },
         {
           "file": "modules/itemListManager.js",
-          "line": 925,
+          "line": 976,
           "kind": "custom-event-listener"
         },
         {
@@ -4966,7 +4966,7 @@
         },
         {
           "file": "modules/itemListManager.js",
-          "line": 925,
+          "line": 976,
           "kind": "custom-event-listener",
           "match": "li.addEventListener('click'"
         },
@@ -7051,7 +7051,7 @@
       "producers": [
         {
           "file": "modules/itemListManager.js",
-          "line": 969,
+          "line": 1020,
           "kind": "custom-event-create"
         }
       ],
@@ -7065,7 +7065,7 @@
       "evidence": [
         {
           "file": "modules/itemListManager.js",
-          "line": 969,
+          "line": 1020,
           "kind": "custom-event-create",
           "match": "new CustomEvent('compact-sidebar-open-topics'"
         },
@@ -7221,7 +7221,7 @@
         },
         {
           "file": "modules/itemListManager.js",
-          "line": 953,
+          "line": 1004,
           "kind": "custom-event-listener"
         },
         {
@@ -7348,7 +7348,7 @@
         },
         {
           "file": "modules/itemListManager.js",
-          "line": 953,
+          "line": 1004,
           "kind": "custom-event-listener",
           "match": "li.addEventListener('contextmenu'"
         },
@@ -12631,6 +12631,11 @@
       "name": "focusin",
       "producers": [],
       "consumers": [
+        {
+          "file": "modules/itemListManager.js",
+          "line": 140,
+          "kind": "custom-event-listener"
+        },
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
           "line": 152,
@@ -12638,6 +12643,12 @@
         }
       ],
       "evidence": [
+        {
+          "file": "modules/itemListManager.js",
+          "line": 140,
+          "kind": "custom-event-listener",
+          "match": "itemListUl.addEventListener('focusin'"
+        },
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
           "line": 152,
@@ -15306,6 +15317,11 @@
           "line": 642,
           "kind": "custom-event-listener"
         },
+        {
+          "file": "modules/itemListManager.js",
+          "line": 148,
+          "kind": "custom-event-listener"
+        },
         {
           "file": "modules/notificationRenderer.js",
           "line": 837,
@@ -15643,6 +15659,12 @@
           "kind": "custom-event-listener",
           "match": "menu.addEventListener('keydown'"
         },
+        {
+          "file": "modules/itemListManager.js",
+          "line": 148,
+          "kind": "custom-event-listener",
+          "match": "itemListUl.addEventListener('keydown'"
+        },
         {
           "file": "modules/notificationRenderer.js",
           "line": 837,
@@ -18974,7 +18996,7 @@
       "consumers": [
         {
           "file": "modules/itemListManager.js",
-          "line": 692,
+          "line": 741,
           "kind": "custom-event-listener"
         },
         {
@@ -19011,7 +19033,7 @@
       "evidence": [
         {
           "file": "modules/itemListManager.js",
-          "line": 692,
+          "line": 741,
           "kind": "custom-event-listener",
           "match": "li.addEventListener('mouseenter'"
         },
@@ -19074,7 +19096,7 @@
         },
         {
           "file": "modules/itemListManager.js",
-          "line": 698,
+          "line": 747,
           "kind": "custom-event-listener"
         },
         {
@@ -19149,7 +19171,7 @@
         },
         {
           "file": "modules/itemListManager.js",
-          "line": 698,
+          "line": 747,
           "kind": "custom-event-listener",
           "match": "li.addEventListener('mouseleave'"
         },
diff --git a/modules/itemListManager.js b/modules/itemListManager.js
index 9e95cef85..d8c0a1d93 100644
--- a/modules/itemListManager.js
+++ b/modules/itemListManager.js
@@ -103,6 +103,7 @@ window.itemListManager = (() => {
         currentSelectedItemRef = config.refs.currentSelectedItemRef;
         mainRendererFunctions = config.mainRendererFunctions;
         uiHelper = config.uiHelper; // Store uiHelper
+        bindItemListKeyboard();
 
         ensureOpenHerPersonaAutoRefresh();
         console.log('[ItemListManager] Initialized successfully.');
@@ -115,8 +116,56 @@ window.itemListManager = (() => {
      */
     function highlightActiveItem(itemId, itemType) {
         if (!itemListUl) return;
+        const focusedItem = itemListUl.contains(document.activeElement) ? document.activeElement : null;
         document.querySelectorAll('#agentList li').forEach(item => {
-            item.classList.toggle('active', item.dataset.itemId === itemId && item.dataset.itemType === itemType);
+            const isActive = item.dataset.itemId === itemId && item.dataset.itemType === itemType;
+            item.classList.toggle('active', isActive);
+            if (item.dataset.itemId && !focusedItem) item.tabIndex = isActive ? 0 : -1;
+        });
+        ensureItemTabStop();
+    }
+
+    // Keyboard model of a Radix listbox, as ZCode's lists use: one tab stop
+    // (the active item, else the first) that follows focus; arrows, Home and
+    // End move it; Enter or Space selects the focused Agent or group.
+    function ensureItemTabStop() {
+        if (!itemListUl || itemListUl.querySelector('li[data-item-id][tabindex="0"]')) return;
+        const first = itemListUl.querySelector('li[data-item-id]');
+        if (first) first.tabIndex = 0;
+    }
+
+    function bindItemListKeyboard() {
+        if (!itemListUl || itemListUl.dataset.itemKeyboardBound === 'true') return;
+        itemListUl.dataset.itemKeyboardBound = 'true';
+        itemListUl.addEventListener('focusin', event => {
+            const item = event.target;
+            if (!item?.dataset?.itemId || item.parentElement !== itemListUl) return;
+            itemListUl.querySelectorAll('li[data-item-id][tabindex="0"]').forEach(other => {
+                if (other !== item) other.tabIndex = -1;
+            });
+            item.tabIndex = 0;
+        });
+        itemListUl.addEventListener('keydown', event => {
+            const item = event.target;
+            if (!item?.dataset?.itemId || item.parentElement !== itemListUl) return;
+            const items = [...itemListUl.querySelectorAll('li[data-item-id]')]
+                .filter(candidate => candidate.style.display !== 'none' && !candidate.hidden);
+            const index = items.indexOf(item);
+            let next = null;
+            if (event.key === 'ArrowDown') next = items[index + 1];
+            else if (event.key === 'ArrowUp') next = items[index - 1];
+            else if (event.key === 'Home') next = items[0];
+            else if (event.key === 'End') next = items[items.length - 1];
+            else if (event.key === 'Enter' || event.key === ' ') {
+                event.preventDefault();
+                const data = item._itemData;
+                if (data) mainRendererFunctions.selectItem(data.id, data.type, data.name, data.avatarUrl, data.config || data);
+                return;
+            } else {
+                return;
+            }
+            event.preventDefault();
+            next?.focus();
         });
     }
 
@@ -839,6 +888,8 @@ window.itemListManager = (() => {
         const li = document.createElement('li');
         li.dataset.itemId = item.id;
         li.dataset.itemType = item.type;
+        li._itemData = item;
+        li.tabIndex = -1;
 
         // 创建头像包装器
         const avatarWrapper = document.createElement('div');
@@ -998,6 +1049,7 @@ window.itemListManager = (() => {
         if (currentSelectedItem && currentSelectedItem.id) {
             highlightActiveItem(currentSelectedItem.id, currentSelectedItem.type);
         }
+        ensureItemTabStop();
 
         if (typeof Sortable !== 'undefined') {
             initializeItemSortable();
diff --git a/package.json b/package.json
index 08ba9a993..02ab728b8 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,7 @@
     "test:launchpad-icons": "node --test tests/launchpad-icons.test.js tests/launchpad-controller.test.js",
     "test:next-ui-empty-state": "node scripts/test-next-ui-empty-state.mjs",
     "test:ui-motion-contract": "node scripts/test-ui-motion-contract.mjs",
-    "check:ui-system": "npm run guard:design-subtraction && npm run guard:classic-parity && npm run guard:classic-retirement && npm run guard:next-delta && npm run guard:ui-interaction && npm run guard:ui-async-state && npm run guard:ui-task-journeys && npm run guard:theme-provenance && npm run test:ui-motion-contract && node --check modules/ui-system/lifecycle-scope.js && node --check VCPDistributedServer/frontend-plugin-loader.js && node --check modules/ui-system/component-manifest.js && node --check modules/ui-system/vcp-ui.js && node --check modules/ui-system/webawesome-runtime-manifest.js && node --check modules/ui-system/webawesome-adapter.js && node --check modules/ui-system/appearance-engine.js && node --check modules/ui-system/appearance-studio.js && node --check modules/ui-system/next-ui-apps.js && node --check modules/ui-system/component-showcase.js && node --check modules/ui-system/webawesome-comparison.js && node --check modules/topTabManager.js && npm run lint:ui-system && npm run guard:ui-system && npm run check:ui-applications && npm run test:ui-system && npm run test:appearance-engine && npm run test:appearance-studio && node scripts/test-next-ui-tab-lifecycle.mjs && node scripts/test-webawesome-adapter.mjs && node --test tests/lifecycle-scope.test.js tests/next-ui-registries.test.mjs tests/topic-list-mode-lifecycle.test.js tests/topic-list-load-robustness.test.js tests/settings-unsaved-indicator.test.mjs tests/settings-agent-draft-retention.test.mjs tests/sidebar-resizer-lifecycle.test.mjs tests/topic-list-keyboard.test.js && npm run test:bootstrap",
+    "check:ui-system": "npm run guard:design-subtraction && npm run guard:classic-parity && npm run guard:classic-retirement && npm run guard:next-delta && npm run guard:ui-interaction && npm run guard:ui-async-state && npm run guard:ui-task-journeys && npm run guard:theme-provenance && npm run test:ui-motion-contract && node --check modules/ui-system/lifecycle-scope.js && node --check VCPDistributedServer/frontend-plugin-loader.js && node --check modules/ui-system/component-manifest.js && node --check modules/ui-system/vcp-ui.js && node --check modules/ui-system/webawesome-runtime-manifest.js && node --check modules/ui-system/webawesome-adapter.js && node --check modules/ui-system/appearance-engine.js && node --check modules/ui-system/appearance-studio.js && node --check modules/ui-system/next-ui-apps.js && node --check modules/ui-system/component-showcase.js && node --check modules/ui-system/webawesome-comparison.js && node --check modules/topTabManager.js && npm run lint:ui-system && npm run guard:ui-system && npm run check:ui-applications && npm run test:ui-system && npm run test:appearance-engine && npm run test:appearance-studio && node scripts/test-next-ui-tab-lifecycle.mjs && node scripts/test-webawesome-adapter.mjs && node --test tests/lifecycle-scope.test.js tests/next-ui-registries.test.mjs tests/topic-list-mode-lifecycle.test.js tests/topic-list-load-robustness.test.js tests/settings-unsaved-indicator.test.mjs tests/settings-agent-draft-retention.test.mjs tests/sidebar-resizer-lifecycle.test.mjs tests/topic-list-keyboard.test.js tests/item-list-keyboard.test.js && npm run test:bootstrap",
     "test:appearance-engine": "node scripts/test-appearance-engine.mjs",
     "test:appearance-studio": "node scripts/test-appearance-studio.mjs",
     "test:vcp-ui-select-proxy": "node scripts/test-vcp-ui-select-proxy.mjs",
diff --git a/scripts/next-delta-shared-baseline.json b/scripts/next-delta-shared-baseline.json
index 2767a6ff9..e120fd013 100644
--- a/scripts/next-delta-shared-baseline.json
+++ b/scripts/next-delta-shared-baseline.json
@@ -16,8 +16,8 @@
     "reason": "Integrated topic behavior: configuration/unread loads validate the selected item; sort/title/menu operations capture their original topic target; completed deletion changes the active view only for the same item and topic. Repository, readiness and render listener ownership remain unchanged. Topic search waits 200ms after typing before reloading (Enter is immediate); a rejected config IPC shows an error row instead of a permanent spinner; names and IPC errors render as text. Keyboard: topics are one roving tab stop (arrows/Home/End move, Enter/Space open, Shift+F10 or the menu key opens the context menu); the context menu is a role=menu with arrow navigation, Escape/Tab closing it back onto the topic."
   },
   "modules/itemListManager.js": {
-    "sha256": "ae5eca22dd19312f56d5c9d60b6a221c3a5be8cf2d34c1049407b45100cc5393",
-    "reason": "Integrated catalog behavior: operation-counted speaking indicators survive list refreshes; catalog publication validates the final settings read; unread publication is ordered across navigation and catalog refreshes. Persona WIP is excluded. Load error rows are HTML-escaped."
+    "sha256": "3d70af6ffbfc1b43feb6c7d831663e0fb8286bd56d7b4303f09b358bc4cc7d6d",
+    "reason": "Integrated catalog behavior: operation-counted speaking indicators survive list refreshes; catalog publication validates the final settings read; unread publication is ordered across navigation and catalog refreshes. Persona WIP is excluded. Load error rows are HTML-escaped. Keyboard: the list is one roving tab stop (active item, else first); arrows/Home/End move it over visible items, Enter/Space select."
   },
   "Groupmodules/grouprenderer.js": {
     "sha256": "a88a5e4972d9b3739a8da8f300876f066dd2841bcfa8f41f6ffac664cc36cac8",
diff --git a/styles/ui-system/sidebar.css b/styles/ui-system/sidebar.css
index b00bfc555..0872269f7 100644
--- a/styles/ui-system/sidebar.css
+++ b/styles/ui-system/sidebar.css
@@ -193,6 +193,7 @@
         outline-offset: 2px;
     }
 
+    html .vcp-ui-scope.sidebar .agent-list li:focus-visible,
     html .vcp-ui-scope.sidebar .topic-list .topic-item:focus-visible {
         outline: 2px solid var(--vcp-ui-focus-ring);
         outline-offset: -2px;
diff --git a/tests/item-list-keyboard.test.js b/tests/item-list-keyboard.test.js
new file mode 100644
index 000000000..caba6de99
--- /dev/null
+++ b/tests/item-list-keyboard.test.js
@@ -0,0 +1,58 @@
+const test = require('node:test');
+const assert = require('node:assert/strict');
+const fs = require('node:fs');
+const path = require('node:path');
+const { JSDOM } = require('jsdom');
+
+const source = fs.readFileSync(path.join(__dirname, '..', 'modules/itemListManager.js'), 'utf8');
+
+test('the Agent and group list is one keyboard tab stop with arrow navigation and Enter to select', async () => {
+    const dom = new JSDOM('<!doctype html><html><body><ul id="agentList"></ul></body></html>', {
+        url: 'https://vcpchat.local/main.html', runScripts: 'outside-only'
+    });
+    const { window } = dom;
+    window.eval(source);
+    const selected = [];
+    let current = { id: 'nova', type: 'agent' };
+    window.itemListManager.init({
+        elements: { itemListUl: window.document.getElementById('agentList') },
+        electronAPI: {
+            getAgents: async () => [{ id: 'ada', name: 'Ada' }, { id: 'nova', name: 'Nova' }],
+            getAgentGroups: async () => [{ id: 'council', name: 'Council' }],
+            loadSettings: async () => ({ combinedItemOrder: [], vcpServerUrl: '' }),
+            getUnreadTopicCounts: async () => ({ success: true, counts: {} }),
+        },
+        refs: { currentSelectedItemRef: { get: () => current, set() {} } },
+        mainRendererFunctions: { selectItem: (id, type) => selected.push(`${type}:${id}`) },
+        uiHelper: { showToastNotification() {} },
+    });
+    try {
+        await window.itemListManager.loadItems();
+
+        const doc = window.document;
+        const items = () => [...doc.querySelectorAll('#agentList li[data-item-id]')];
+        const key = (target, name) => target.dispatchEvent(new window.KeyboardEvent('keydown', { key: name, bubbles: true, cancelable: true }));
+        const stops = () => items().filter(li => li.tabIndex === 0).map(li => li.dataset.itemId);
+
+        assert.deepEqual(stops(), ['nova'], 'the selected Agent is the only tab stop');
+        const nova = items().find(li => li.dataset.itemId === 'nova');
+        nova.focus();
+        key(nova, 'Home');
+        assert.equal(doc.activeElement, items()[0]);
+        key(doc.activeElement, 'ArrowDown');
+        assert.equal(doc.activeElement, items()[1]);
+        assert.deepEqual(stops(), [items()[1].dataset.itemId], 'the tab stop follows focus');
+        key(doc.activeElement, 'End');
+        assert.equal(doc.activeElement, items().at(-1));
+
+        const target = doc.activeElement;
+        key(target, 'Enter');
+        assert.deepEqual(selected, [`${target.dataset.itemType}:${target.dataset.itemId}`]);
+
+        items()[0].style.display = 'none';
+        key(items()[1], 'ArrowUp');
+        assert.notEqual(doc.activeElement, items()[0], 'items hidden by the search filter are skipped');
+    } finally {
+        dom.window.close();
+    }
+});

From 04550040ca6e6d1dac03005129ba98be467e4e32 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 02:37:37 +0000
Subject: [PATCH 087/143] Side pane batch Q: code viewer keeps its place,
 concurrent asks keep references
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Code viewer file tabs keep their scroll position when the same file is
  opened again or refreshed, and capture wrap, view mode, the
  outside-workspace consent and scroll when they sleep, restoring them on
  remount (plan detail already did this).
- Wrapped code hides the line-number gutter; fixed-height numbers drifted
  away from wrapped lines.
- A second 在侧栏提问 made while the first side chat is still being created
  adds its own reference after the shared creation finishes instead of
  being dropped (ZCode SessionPane awaits creation per caller).

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DFRovoZHMzeheXKkLNWKG
---
 modules/renderer/sideChatWiring.js            | 13 +++----
 .../ui-system/side-pane/code-viewer/editor.js | 13 ++++++-
 .../side-pane/codeViewerSideProvider.js       | 23 +++++++++--
 styles/ui-system/side-pane-code-viewer.css    |  5 +++
 tests/side-chat-model-and-context.test.mjs    | 38 +++++++++++++++++++
 tests/side-pane-code-viewer.test.mjs          | 37 ++++++++++++++++++
 6 files changed, 116 insertions(+), 13 deletions(-)

diff --git a/modules/renderer/sideChatWiring.js b/modules/renderer/sideChatWiring.js
index 9d824d277..b5fe81f12 100644
--- a/modules/renderer/sideChatWiring.js
+++ b/modules/renderer/sideChatWiring.js
@@ -175,11 +175,7 @@ export function createSideChatWiring({
             return null;
         }
 
-        const handle = await getController().openTab({ kind: 'chat', descriptor });
-        if (options?.reference && handle?.addReference) {
-            handle.addReference(options.reference);
-        }
-        return handle;
+        return getController().openTab({ kind: 'chat', descriptor });
     }
 
     async function openSideChat(options = {}) {
@@ -219,9 +215,12 @@ export function createSideChatWiring({
             }
         }
 
-        // 同一父会话下并发的创建请求合并为一次，避免连点产生多个子会话
-        return dedupeSideChatCreation(`${currentItem.id}:${currentTopicId}`,
+        // 同一父会话下并发的创建请求合并为一次，避免连点产生多个子会话。
+        // 引用由每个调用方在创建完成后各自加上：合并进来的第二次「在侧栏提问」不能把自己的引用丢掉（同 ZCode SessionPane）
+        const handle = await dedupeSideChatCreation(`${currentItem.id}:${currentTopicId}`,
             () => createSideChat(options, currentItem, currentTopicId));
+        if (options?.reference && handle?.addReference) handle.addReference(options.reference);
+        return handle;
     }
 
     async function restoreSessions(agentId, parentTopicId) {
diff --git a/modules/ui-system/side-pane/code-viewer/editor.js b/modules/ui-system/side-pane/code-viewer/editor.js
index 03e87b3e8..426869b44 100644
--- a/modules/ui-system/side-pane/code-viewer/editor.js
+++ b/modules/ui-system/side-pane/code-viewer/editor.js
@@ -192,7 +192,10 @@ export function createCodeViewerEditor({
         body.appendChild(editorShell);
     }
 
-    async function refreshView({ force = false } = {}) {
+    async function refreshView({ force = false, keepScroll = false } = {}) {
+        // 重读同一个文件（再点一次文件名、点刷新）时停在原来的位置，不跳回第一行
+        const top = body.scrollTop;
+        const left = body.scrollLeft;
         const loaded = await loadFileContent({ force });
         if (loaded === false) return;
         if (store.currentMode === 'diff') {
@@ -200,6 +203,10 @@ export function createCodeViewerEditor({
         } else {
             renderCodeView();
         }
+        if (keepScroll) {
+            body.scrollTop = top;
+            body.scrollLeft = left;
+        }
     }
 
     return Object.freeze({
@@ -208,7 +215,9 @@ export function createCodeViewerEditor({
         renderCodeView,
         refreshView,
         // 文件标签被重新打开或点了刷新：重新读盘
-        reload: () => refreshView({ force: true }),
+        reload: () => refreshView({ force: true, keepScroll: true }),
+        get outsideWorkspaceAllowed() { return outsideWorkspaceAllowed; },
+        allowOutsideWorkspace() { outsideWorkspaceAllowed = true; },
         dispose() { readToken++; }
     });
 }
diff --git a/modules/ui-system/side-pane/codeViewerSideProvider.js b/modules/ui-system/side-pane/codeViewerSideProvider.js
index 38968820f..1592e7b59 100644
--- a/modules/ui-system/side-pane/codeViewerSideProvider.js
+++ b/modules/ui-system/side-pane/codeViewerSideProvider.js
@@ -59,19 +59,21 @@ export function createCodeViewerSideProvider({
          * @param {{ scope?: object }} [context] 控制器给的挂载上下文；scope 是这次挂载的 view scope
          * @returns {Promise<Object>} Tab lifecycle handle
          */
-        async mountTab(tab, viewElement, { scope: viewScope = null } = {}) {
+        async mountTab(tab, viewElement, { scope: viewScope = null, restoredState = null } = {}) {
             viewElement.innerHTML = '';
             // 这次挂载的监听和定时器都归 own：控制器释放 view 或调用 dispose 时一起拆掉
             const own = createSidePaneRootScope(viewScope, 'code-viewer');
             const disposed = () => !own.active;
-            let isWrapped = false;
+            // 休眠后重新挂载：换行、视图模式、工作区外读取的确认和滚动位置都照原样回来
+            let isWrapped = restoredState?.isWrapped === true;
 
             const payload = tab.payload || {};
-            let currentMode = payload.mode === 'diff' ? 'diff' : 'view';
+            const openedMode = payload.mode === 'diff' ? 'diff' : 'view';
+            let currentMode = restoredState?.mode === 'diff' || restoredState?.mode === 'view' ? restoredState.mode : openedMode;
             let currentCode = payload.code || '';
             const filePath = payload.filePath || '';
             const oldCode = payload.oldCode || '';
-            const newCode = payload.newCode ?? (currentMode === 'diff' ? currentCode : null);
+            const newCode = payload.newCode ?? (openedMode === 'diff' ? currentCode : null);
             const langMeta = detectLanguage(filePath || tab.title || payload.language, payload.language || 'plaintext');
             let currentLang = langMeta.lang;
             let currentTag = langMeta.tag;
@@ -131,6 +133,7 @@ export function createCodeViewerSideProvider({
             wrapBtn.title = '切换自动换行';
             wrapBtn.setAttribute('aria-label', '自动换行');
             wrapBtn.innerHTML = '<span class="vcp-ui-icon">wrap_text</span>';
+            wrapBtn.classList.toggle('active', isWrapped);
 
             // Copy Code Button
             const copyBtn = doc.createElement('button');
@@ -240,6 +243,7 @@ export function createCodeViewerSideProvider({
                 renderDiffView: (...args) => renderDiffView(...args)
             });
             const { setBodyMessage, renderCodeView, refreshView, reload } = editorOwner;
+            if (restoredState?.outsideWorkspaceAllowed === true) editorOwner.allowOutsideWorkspace();
 
             const diffViewOwner = createCodeViewerDiffView({
                 store,
@@ -327,6 +331,8 @@ export function createCodeViewerSideProvider({
                 await setupPicker();
             } else {
                 await refreshView();
+                if (Number.isFinite(restoredState?.scrollTop)) body.scrollTop = restoredState.scrollTop;
+                if (Number.isFinite(restoredState?.scrollLeft)) body.scrollLeft = restoredState.scrollLeft;
             }
             // 挂载途中被取消：控制器会丢掉这个视图，这里只清掉自己画的内容
             if (disposed()) {
@@ -344,6 +350,15 @@ export function createCodeViewerSideProvider({
                 getMode() {
                     return currentMode;
                 },
+                captureState() {
+                    return {
+                        isWrapped,
+                        mode: currentMode,
+                        outsideWorkspaceAllowed: editorOwner.outsideWorkspaceAllowed,
+                        scrollTop: body.scrollTop,
+                        scrollLeft: body.scrollLeft
+                    };
+                },
                 /** 文件标签重新读盘；片段和差异是快照，不受影响 */
                 reload() {
                     return isFileBacked && !disposed() ? reload() : Promise.resolve();
diff --git a/styles/ui-system/side-pane-code-viewer.css b/styles/ui-system/side-pane-code-viewer.css
index d95bcb61c..9e7f5b323 100644
--- a/styles/ui-system/side-pane-code-viewer.css
+++ b/styles/ui-system/side-pane-code-viewer.css
@@ -225,6 +225,11 @@ html .side-code-editor-shell.is-wrapped .side-code-pre:where(.vcp-ui-scope, .vcp
     word-break: break-all;
 }
 
+/* 换行后一行代码会占好几行高，而行号固定一行一个：继续显示会越往下越对不上，换行时收起行号 */
+html .side-code-editor-shell.is-wrapped .side-code-gutter:where(.vcp-ui-scope, .vcp-ui-scope *) {
+    display: none;
+}
+
 html .side-code-highlighted:where(.vcp-ui-scope, .vcp-ui-scope *) {
     font-family: inherit;
     font-size: inherit;
diff --git a/tests/side-chat-model-and-context.test.mjs b/tests/side-chat-model-and-context.test.mjs
index a78d4f9f9..25d40c46e 100644
--- a/tests/side-chat-model-and-context.test.mjs
+++ b/tests/side-chat-model-and-context.test.mjs
@@ -237,3 +237,41 @@ test('a failed or hung model refresh falls back to the cache instead of failing
     }, { timeoutMs: 20 });
     assert.deepEqual(hung.ids, []);
 });
+
+test('a second ask made while the first side chat is still being created keeps its own reference', async () => {
+    const { createSideChatWiring } = await import('../modules/renderer/sideChatWiring.js');
+    const dom = new JSDOM('<!doctype html><body></body>');
+    const parent = { itemType: 'agent', itemId: 'agent', topicId: 'parent' };
+    const added = [];
+    const handle = { addReference: reference => added.push(reference.text), focus() {} };
+    let releaseChild;
+    let created = 0;
+    const controller = {
+        getSnapshot: () => ({ parent, activeTabId: null, tabs: [] }),
+        async openTab() { return handle; },
+        getTabHandle: () => null,
+        setVisible() {}
+    };
+    const chatAPI = {
+        createSideChatChild: () => { created += 1; return new Promise(resolve => { releaseChild = () => resolve({ success: true, topicId: 'child-1' }); }); },
+        saveSideChatMetadata: async metadata => ({ success: true, metadata })
+    };
+    const wiring = createSideChatWiring({
+        doc: dom.window.document, win: dom.window, chatAPI, chatRepository: null, chatManager: null, uiHelper: null,
+        createRenderer: () => null,
+        selectedItemRef: { get: () => ({ id: 'agent', type: 'agent', name: 'Agent', config: { model: 'm' } }) },
+        topicIdRef: { get: () => 'parent' }, historyRef: { get: () => [] }, getController: () => controller
+    });
+    try {
+        const first = dom.window.openSideChatWithSelection({ selectedText: '引用 A' });
+        const second = dom.window.openSideChatWithSelection({ selectedText: '引用 B' });
+        await new Promise(resolve => setTimeout(resolve, 0));
+        releaseChild();
+        await Promise.all([first, second]);
+        assert.equal(created, 1, 'the two asks share one side chat');
+        assert.deepEqual(added.sort(), ['引用 A', '引用 B']);
+    } finally {
+        wiring.dispose?.();
+        dom.window.close();
+    }
+});
diff --git a/tests/side-pane-code-viewer.test.mjs b/tests/side-pane-code-viewer.test.mjs
index 54fb6aa5c..7cfd044a5 100644
--- a/tests/side-pane-code-viewer.test.mjs
+++ b/tests/side-pane-code-viewer.test.mjs
@@ -452,3 +452,40 @@ test('highlighted html is split per line with spans that cross lines closed and
     ]);
     assert.deepEqual(splitHighlightedLines(''), ['']);
 });
+
+test('a file tab keeps its place on reload and its wrap, mode and consent after sleeping', async () => {
+    const dom = new JSDOM('<section id="view"></section>');
+    const doc = dom.window.document;
+    const view = doc.getElementById('view');
+    const text = Array.from({ length: 3000 }, (_, i) => `line ${i}`).join('\n');
+    const provider = createCodeViewerSideProvider({ document: doc, uiHelper: null, api: {
+        async gitListWorkspaces() { return { success: true, data: { workspaces: [{ id: 'w', path: 'C:/proj' }] } }; },
+        async sourceReadFile() { return { success: false, error: 'unused' }; },
+        async getTextContent() { return { text }; }
+    } });
+    const tab = { id: 'code-viewer:D:/logs/app.log', title: 'app.log', payload: { filePath: 'D:/logs/app.log' } };
+    let handle = await provider.mountTab(tab, view);
+    const body = () => view.querySelector('.side-code-body');
+    assert.match(body().textContent, /不在任何已登记的工作区/, 'outside the workspace it asks first');
+    [...view.querySelectorAll('button')].find(button => button.textContent.includes('读取'))?.click();
+    await new Promise(resolve => setTimeout(resolve, 20));
+    assert.equal(handle.getCode(), text);
+
+    body().scrollTop = 1200;
+    await handle.reload();
+    assert.equal(body().scrollTop, 1200, 'reloading the same file stays at the same line');
+
+    view.querySelector('[data-action="toggle-wrap"]').click();
+    const saved = handle.captureState();
+    await handle.dispose();
+    handle = await provider.mountTab(tab, view, { restoredState: saved });
+    try {
+        assert.equal(handle.getCode(), text, 'the consent given before sleeping still holds');
+        assert.equal(view.querySelector('[data-action="toggle-wrap"]').classList.contains('active'), true);
+        assert.equal(view.querySelector('.side-code-editor-shell').classList.contains('is-wrapped'), true);
+        assert.equal(body().scrollTop, 1200);
+    } finally {
+        await handle.dispose();
+        dom.window.close();
+    }
+});

From 23e05e18d02996162147f67bfdaa23118d769a7e Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 02:38:05 +0000
Subject: [PATCH 088/143] Agent list: keep the search filter when the list is
 rebuilt

The list rebuilds on unread refreshes, saves and reordering, which showed
every item again while the search box still held a term. The rebuild now
re-applies the term in the search box.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012AP71nAxrCFEpH7st6asf9
---
 modules/itemListManager.js                    |  4 ++
 package.json                                  |  2 +-
 scripts/next-delta-shared-baseline.json       |  4 +-
 ...ard.test.js => item-list-behavior.test.js} | 43 +++++++++++++++++++
 4 files changed, 50 insertions(+), 3 deletions(-)
 rename tests/{item-list-keyboard.test.js => item-list-behavior.test.js} (57%)

diff --git a/modules/itemListManager.js b/modules/itemListManager.js
index d8c0a1d93..4b92bd6ee 100644
--- a/modules/itemListManager.js
+++ b/modules/itemListManager.js
@@ -1049,6 +1049,10 @@ window.itemListManager = (() => {
         if (currentSelectedItem && currentSelectedItem.id) {
             highlightActiveItem(currentSelectedItem.id, currentSelectedItem.type);
         }
+        // A rebuild (unread refresh, save, reorder) must not drop an active
+        // search: re-apply the term still in the search box.
+        const activeSearch = document.getElementById('agentSearchInput')?.value;
+        if (activeSearch && activeSearch.trim()) window.uiHelperFunctions?.filterAgentList?.(activeSearch);
         ensureItemTabStop();
 
         if (typeof Sortable !== 'undefined') {
diff --git a/package.json b/package.json
index 02ab728b8..8425bb76a 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,7 @@
     "test:launchpad-icons": "node --test tests/launchpad-icons.test.js tests/launchpad-controller.test.js",
     "test:next-ui-empty-state": "node scripts/test-next-ui-empty-state.mjs",
     "test:ui-motion-contract": "node scripts/test-ui-motion-contract.mjs",
-    "check:ui-system": "npm run guard:design-subtraction && npm run guard:classic-parity && npm run guard:classic-retirement && npm run guard:next-delta && npm run guard:ui-interaction && npm run guard:ui-async-state && npm run guard:ui-task-journeys && npm run guard:theme-provenance && npm run test:ui-motion-contract && node --check modules/ui-system/lifecycle-scope.js && node --check VCPDistributedServer/frontend-plugin-loader.js && node --check modules/ui-system/component-manifest.js && node --check modules/ui-system/vcp-ui.js && node --check modules/ui-system/webawesome-runtime-manifest.js && node --check modules/ui-system/webawesome-adapter.js && node --check modules/ui-system/appearance-engine.js && node --check modules/ui-system/appearance-studio.js && node --check modules/ui-system/next-ui-apps.js && node --check modules/ui-system/component-showcase.js && node --check modules/ui-system/webawesome-comparison.js && node --check modules/topTabManager.js && npm run lint:ui-system && npm run guard:ui-system && npm run check:ui-applications && npm run test:ui-system && npm run test:appearance-engine && npm run test:appearance-studio && node scripts/test-next-ui-tab-lifecycle.mjs && node scripts/test-webawesome-adapter.mjs && node --test tests/lifecycle-scope.test.js tests/next-ui-registries.test.mjs tests/topic-list-mode-lifecycle.test.js tests/topic-list-load-robustness.test.js tests/settings-unsaved-indicator.test.mjs tests/settings-agent-draft-retention.test.mjs tests/sidebar-resizer-lifecycle.test.mjs tests/topic-list-keyboard.test.js tests/item-list-keyboard.test.js && npm run test:bootstrap",
+    "check:ui-system": "npm run guard:design-subtraction && npm run guard:classic-parity && npm run guard:classic-retirement && npm run guard:next-delta && npm run guard:ui-interaction && npm run guard:ui-async-state && npm run guard:ui-task-journeys && npm run guard:theme-provenance && npm run test:ui-motion-contract && node --check modules/ui-system/lifecycle-scope.js && node --check VCPDistributedServer/frontend-plugin-loader.js && node --check modules/ui-system/component-manifest.js && node --check modules/ui-system/vcp-ui.js && node --check modules/ui-system/webawesome-runtime-manifest.js && node --check modules/ui-system/webawesome-adapter.js && node --check modules/ui-system/appearance-engine.js && node --check modules/ui-system/appearance-studio.js && node --check modules/ui-system/next-ui-apps.js && node --check modules/ui-system/component-showcase.js && node --check modules/ui-system/webawesome-comparison.js && node --check modules/topTabManager.js && npm run lint:ui-system && npm run guard:ui-system && npm run check:ui-applications && npm run test:ui-system && npm run test:appearance-engine && npm run test:appearance-studio && node scripts/test-next-ui-tab-lifecycle.mjs && node scripts/test-webawesome-adapter.mjs && node --test tests/lifecycle-scope.test.js tests/next-ui-registries.test.mjs tests/topic-list-mode-lifecycle.test.js tests/topic-list-load-robustness.test.js tests/settings-unsaved-indicator.test.mjs tests/settings-agent-draft-retention.test.mjs tests/sidebar-resizer-lifecycle.test.mjs tests/topic-list-keyboard.test.js tests/item-list-behavior.test.js && npm run test:bootstrap",
     "test:appearance-engine": "node scripts/test-appearance-engine.mjs",
     "test:appearance-studio": "node scripts/test-appearance-studio.mjs",
     "test:vcp-ui-select-proxy": "node scripts/test-vcp-ui-select-proxy.mjs",
diff --git a/scripts/next-delta-shared-baseline.json b/scripts/next-delta-shared-baseline.json
index e120fd013..dd306a549 100644
--- a/scripts/next-delta-shared-baseline.json
+++ b/scripts/next-delta-shared-baseline.json
@@ -16,8 +16,8 @@
     "reason": "Integrated topic behavior: configuration/unread loads validate the selected item; sort/title/menu operations capture their original topic target; completed deletion changes the active view only for the same item and topic. Repository, readiness and render listener ownership remain unchanged. Topic search waits 200ms after typing before reloading (Enter is immediate); a rejected config IPC shows an error row instead of a permanent spinner; names and IPC errors render as text. Keyboard: topics are one roving tab stop (arrows/Home/End move, Enter/Space open, Shift+F10 or the menu key opens the context menu); the context menu is a role=menu with arrow navigation, Escape/Tab closing it back onto the topic."
   },
   "modules/itemListManager.js": {
-    "sha256": "3d70af6ffbfc1b43feb6c7d831663e0fb8286bd56d7b4303f09b358bc4cc7d6d",
-    "reason": "Integrated catalog behavior: operation-counted speaking indicators survive list refreshes; catalog publication validates the final settings read; unread publication is ordered across navigation and catalog refreshes. Persona WIP is excluded. Load error rows are HTML-escaped. Keyboard: the list is one roving tab stop (active item, else first); arrows/Home/End move it over visible items, Enter/Space select."
+    "sha256": "efafc93c658df3f6bec3443a3add2da177d718a01057ef825cca1e1b560cfad2",
+    "reason": "Integrated catalog behavior: operation-counted speaking indicators survive list refreshes; catalog publication validates the final settings read; unread publication is ordered across navigation and catalog refreshes. Persona WIP is excluded. Load error rows are HTML-escaped. Keyboard: the list is one roving tab stop (active item, else first); arrows/Home/End move it over visible items, Enter/Space select. Re-applies the active assistant search after a rebuild."
   },
   "Groupmodules/grouprenderer.js": {
     "sha256": "a88a5e4972d9b3739a8da8f300876f066dd2841bcfa8f41f6ffac664cc36cac8",
diff --git a/tests/item-list-keyboard.test.js b/tests/item-list-behavior.test.js
similarity index 57%
rename from tests/item-list-keyboard.test.js
rename to tests/item-list-behavior.test.js
index caba6de99..e35675bbb 100644
--- a/tests/item-list-keyboard.test.js
+++ b/tests/item-list-behavior.test.js
@@ -56,3 +56,46 @@ test('the Agent and group list is one keyboard tab stop with arrow navigation an
         dom.window.close();
     }
 });
+
+test('rebuilding the list keeps the active assistant search applied', async () => {
+    const dom = new JSDOM('<!doctype html><html><body><input id="agentSearchInput"><ul id="agentList"></ul></body></html>', {
+        url: 'https://vcpchat.local/main.html', runScripts: 'outside-only'
+    });
+    const { window } = dom;
+    window.eval(source);
+    // The real filter lives in ui-helpers; this one hides by name the same way.
+    window.uiHelperFunctions = {
+        filterAgentList(term) {
+            const needle = String(term).trim().toLowerCase();
+            window.document.querySelectorAll('#agentList li').forEach(li => {
+                const name = (li.querySelector('.agent-name')?.textContent || '').toLowerCase();
+                li.style.display = !needle || name.includes(needle) ? '' : 'none';
+            });
+        }
+    };
+    window.itemListManager.init({
+        elements: { itemListUl: window.document.getElementById('agentList') },
+        electronAPI: {
+            getAgents: async () => [{ id: 'ada', name: 'Ada' }, { id: 'nova', name: 'Nova' }],
+            getAgentGroups: async () => [],
+            loadSettings: async () => ({ combinedItemOrder: [], vcpServerUrl: '' }),
+            getUnreadTopicCounts: async () => ({ success: true, counts: {} }),
+        },
+        refs: { currentSelectedItemRef: { get: () => null, set() {} } },
+        mainRendererFunctions: { selectItem() {} },
+        uiHelper: { showToastNotification() {} },
+    });
+    try {
+        await window.itemListManager.loadItems();
+        const input = window.document.getElementById('agentSearchInput');
+        input.value = 'nov';
+        window.uiHelperFunctions.filterAgentList(input.value);
+        await window.itemListManager.loadItems();
+        const visible = [...window.document.querySelectorAll('#agentList li[data-item-id]')]
+            .filter(li => li.style.display !== 'none')
+            .map(li => li.dataset.itemId);
+        assert.deepEqual(visible, ['nova']);
+    } finally {
+        dom.window.close();
+    }
+});

From 9d26983d813b1b4fffa3d7bc06f861c671ac9a49 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 02:41:16 +0000
Subject: [PATCH 089/143] Settings sections: one keyboard control per header,
 labels that point at controls

Every settings section header was a role=button tab stop wrapping the real
chevron button, so keyboard users hit two stops per section and screen
readers met nested buttons. The header is now a plain mouse target and the
chevron button is the single control (as a Radix Accordion trigger), with
aria-controls naming its content. Labels that pointed for= at divs (group
members, member tags, JEV styles, speaker order) now name those containers
as role=group through aria-labelledby, or rely on the list's own label.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012AP71nAxrCFEpH7st6asf9
---
 .../contracts/generated/chat-event-graph.json | 40 ++++++++--------
 modules/settings/schema/sidebar-surfaces.js   | 19 ++++----
 package.json                                  |  2 +-
 tests/settings-section-a11y.test.mjs          | 48 +++++++++++++++++++
 4 files changed, 80 insertions(+), 29 deletions(-)
 create mode 100644 tests/settings-section-a11y.test.mjs

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index a199d0070..1f4c42ca6 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -2324,12 +2324,12 @@
         },
         {
           "file": "modules/settings/schema/sidebar-surfaces.js",
-          "line": 351,
+          "line": 354,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settings/schema/sidebar-surfaces.js",
-          "line": 519,
+          "line": 522,
           "kind": "custom-event-listener"
         },
         {
@@ -2488,13 +2488,13 @@
         },
         {
           "file": "modules/settings/schema/sidebar-surfaces.js",
-          "line": 351,
+          "line": 354,
           "kind": "custom-event-listener",
           "match": "speedInput?.addEventListener('change'"
         },
         {
           "file": "modules/settings/schema/sidebar-surfaces.js",
-          "line": 519,
+          "line": 522,
           "kind": "custom-event-listener",
           "match": "form.addEventListener('change'"
         },
@@ -3740,27 +3740,27 @@
         },
         {
           "file": "modules/settings/schema/sidebar-surfaces.js",
-          "line": 256,
+          "line": 259,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settings/schema/sidebar-surfaces.js",
-          "line": 267,
+          "line": 270,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settings/schema/sidebar-surfaces.js",
-          "line": 294,
+          "line": 297,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settings/schema/sidebar-surfaces.js",
-          "line": 395,
+          "line": 398,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settings/schema/sidebar-surfaces.js",
-          "line": 396,
+          "line": 399,
           "kind": "custom-event-listener"
         },
         {
@@ -5206,31 +5206,31 @@
         },
         {
           "file": "modules/settings/schema/sidebar-surfaces.js",
-          "line": 256,
+          "line": 259,
           "kind": "custom-event-listener",
           "match": "header.addEventListener('click'"
         },
         {
           "file": "modules/settings/schema/sidebar-surfaces.js",
-          "line": 267,
+          "line": 270,
           "kind": "custom-event-listener",
           "match": "toggle.addEventListener('click'"
         },
         {
           "file": "modules/settings/schema/sidebar-surfaces.js",
-          "line": 294,
+          "line": 297,
           "kind": "custom-event-listener",
           "match": "styleHeader.addEventListener('click'"
         },
         {
           "file": "modules/settings/schema/sidebar-surfaces.js",
-          "line": 395,
+          "line": 398,
           "kind": "custom-event-listener",
           "match": "addBtn.addEventListener('click'"
         },
         {
           "file": "modules/settings/schema/sidebar-surfaces.js",
-          "line": 396,
+          "line": 399,
           "kind": "custom-event-listener",
           "match": "importBtn.addEventListener('click'"
         },
@@ -14753,7 +14753,7 @@
         },
         {
           "file": "modules/settings/schema/sidebar-surfaces.js",
-          "line": 350,
+          "line": 353,
           "kind": "custom-event-listener"
         },
         {
@@ -14925,7 +14925,7 @@
         },
         {
           "file": "modules/settings/schema/sidebar-surfaces.js",
-          "line": 350,
+          "line": 353,
           "kind": "custom-event-listener",
           "match": "speedInput?.addEventListener('input'"
         },
@@ -15374,12 +15374,12 @@
         },
         {
           "file": "modules/settings/schema/sidebar-surfaces.js",
-          "line": 260,
+          "line": 263,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settings/schema/sidebar-surfaces.js",
-          "line": 296,
+          "line": 299,
           "kind": "custom-event-listener"
         },
         {
@@ -15727,13 +15727,13 @@
         },
         {
           "file": "modules/settings/schema/sidebar-surfaces.js",
-          "line": 260,
+          "line": 263,
           "kind": "custom-event-listener",
           "match": "header.addEventListener('keydown'"
         },
         {
           "file": "modules/settings/schema/sidebar-surfaces.js",
-          "line": 296,
+          "line": 299,
           "kind": "custom-event-listener",
           "match": "styleHeader.addEventListener('keydown'"
         },
diff --git a/modules/settings/schema/sidebar-surfaces.js b/modules/settings/schema/sidebar-surfaces.js
index c525b8e88..d6d4169c6 100644
--- a/modules/settings/schema/sidebar-surfaces.js
+++ b/modules/settings/schema/sidebar-surfaces.js
@@ -199,20 +199,23 @@ function renderSection(doc, { kind, key, title, tooltip, summaryId, content, con
     const headerId = kind === 'agent'
         ? `${key}ToggleHeader`
         : `group${key[0].toUpperCase()}${key.slice(1)}ToggleHeader`;
+    // The header is a mouse target only. The chevron button is the one
+    // keyboard and screen-reader control, as with a Radix Accordion trigger;
+    // a role=button wrapper around a real button nested two controls.
     const header = el(doc, 'div', {
         class: `${prefix}-settings-section-header`,
         id: headerId,
-        role: 'button',
-        tabindex: '0',
         'aria-expanded': 'false',
     });
     const summary = el(doc, 'span', { class: `${prefix}-settings-section-summary`, id: summaryId }, '');
+    const resolvedContentId = contentId || (kind === 'agent' ? `${key}Content` : `group${key[0].toUpperCase()}${key.slice(1)}Content`);
     const toggle = el(doc, 'button', {
         type: 'button',
         id: kind === 'agent' ? `${key}ToggleBtn` : `group${key[0].toUpperCase()}${key.slice(1)}ToggleBtn`,
         class: `${prefix}-settings-toggle-btn ${prefix}-settings-section-toggle`,
         'aria-label': `切换${title}`,
         'aria-expanded': 'false',
+        'aria-controls': resolvedContentId,
     });
     toggle.innerHTML = SVG_TOGGLE;
     const iconHtml = sectionIconHtml(key);
@@ -230,7 +233,7 @@ function renderSection(doc, { kind, key, title, tooltip, summaryId, content, con
     header.append(titleRow, summary, toggle);
     const contentNode = el(doc, 'div', {
         class: `${prefix}-settings-section-content`,
-        id: contentId || (kind === 'agent' ? `${key}Content` : `group${key[0].toUpperCase()}${key.slice(1)}Content`)
+        id: resolvedContentId
     });
     contentNode.append(content(doc));
     section.append(header, contentNode);
@@ -432,20 +435,20 @@ function renderGroupSectionContent(doc, key) {
             el(doc, 'div', { class: 'agent-identity-main group-identity-main' },
                 el(doc, 'div', { class: 'agent-avatar-wrapper group-avatar-wrapper' }, el(doc, 'img', { id: 'groupAvatarPreview', src: 'assets/default_group_avatar.png', alt: '群组头像预览', class: 'agent-avatar-display group-avatar-display', width: 60, height: 60 }), el(doc, 'label', { for: 'groupAvatarInput', class: 'avatar-upload-overlay', 'aria-label': '更换群组头像' }, buildCameraIcon(doc)), el(doc, 'input', { id: 'groupAvatarInput', type: 'file', accept: 'image/*', hidden: true })),
                 renderField(doc, groupFields[0], 'agent-name-wrapper group-name-wrapper')),
-            el(doc, 'div', { class: 'group-settings-field-shell' }, el(doc, 'label', { for: 'groupMembersList' }, '群组成员', makeHelpBadge(doc, '勾选要加入此群聊的助手成员。')), el(doc, 'div', { id: 'groupMembersList', class: 'group-members-list-container' })));
+            el(doc, 'div', { class: 'group-settings-field-shell' }, el(doc, 'label', { id: 'groupMembersListLabel' }, '群组成员', makeHelpBadge(doc, '勾选要加入此群聊的助手成员。')), el(doc, 'div', { id: 'groupMembersList', class: 'group-members-list-container', role: 'group', 'aria-labelledby': 'groupMembersListLabel' })));
     }
     if (key === 'mode') {
         const mode = renderField(doc, groupFields[1], 'group-settings-field-shell');
         const tags = renderField(doc, groupFields[2], 'group-settings-field-shell');
-        tags.append(el(doc, 'div', { class: 'group-settings-field-shell group-member-tags-shell' }, el(doc, 'label', { class: 'group-settings-field-label', for: 'memberTagsInputs' }, '成员 Tags', makeHelpBadge(doc, '为成员配置触发标签（逗号分隔），在自然随机模式下匹配。')), el(doc, 'div', { id: 'memberTagsInputs' })));
-        const seqLabel = el(doc, 'label', { class: 'group-settings-field-label', for: 'sequentialSpeakerOrderList' }, '顺序发言次序', makeHelpBadge(doc, '拖拽成员或点击上下箭头调整发言顺序。新加入且尚未排序的成员会自动追加到末尾。'));
+        tags.append(el(doc, 'div', { class: 'group-settings-field-shell group-member-tags-shell' }, el(doc, 'label', { class: 'group-settings-field-label', id: 'memberTagsInputsLabel' }, '成员 Tags', makeHelpBadge(doc, '为成员配置触发标签（逗号分隔），在自然随机模式下匹配。')), el(doc, 'div', { id: 'memberTagsInputs', role: 'group', 'aria-labelledby': 'memberTagsInputsLabel' })));
+        const seqLabel = el(doc, 'label', { class: 'group-settings-field-label' }, '顺序发言次序', makeHelpBadge(doc, '拖拽成员或点击上下箭头调整发言顺序。新加入且尚未排序的成员会自动追加到末尾。'));
         const jevSettings = el(doc, 'div', { id: 'jevModeSettingsContainer', class: 'group-settings-field-shell', hidden: true },
             renderField(doc, groupFields[6], 'group-settings-field-shell'),
             el(doc, 'div', { class: 'group-settings-grid' },
                 ...groupFields.slice(7, 14).map(spec => renderField(doc, spec, 'group-settings-field-shell'))),
             el(doc, 'div', { class: 'group-settings-field-shell' },
-                el(doc, 'label', { class: 'group-settings-field-label', for: 'jevMemberStylesInputs' }, '成员发言触发事件风格', makeHelpBadge(doc, '为每位成员填写自然语言描述，告诉 JEV 在什么话题和情境下应提高其发言权重。')),
-                el(doc, 'div', { id: 'jevMemberStylesInputs' })));
+                el(doc, 'label', { class: 'group-settings-field-label', id: 'jevMemberStylesInputsLabel' }, '成员发言触发事件风格', makeHelpBadge(doc, '为每位成员填写自然语言描述，告诉 JEV 在什么话题和情境下应提高其发言权重。')),
+                el(doc, 'div', { id: 'jevMemberStylesInputs', role: 'group', 'aria-labelledby': 'jevMemberStylesInputsLabel' })));
         return el(doc, 'div', { class: 'group-settings-card-shell' }, mode, el(doc, 'div', { id: 'sequentialOrderContainer', class: 'group-settings-field-shell', hidden: true }, seqLabel, el(doc, 'div', { id: 'sequentialSpeakerOrderList', class: 'sequential-speaker-order-list', role: 'list', 'aria-label': '顺序发言次序' })), el(doc, 'div', { id: 'memberTagsContainer', class: 'group-settings-field-shell', hidden: true }, tags), jevSettings);
     }
     if (key === 'model') {
diff --git a/package.json b/package.json
index 8425bb76a..0a7eb9bbd 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,7 @@
     "test:launchpad-icons": "node --test tests/launchpad-icons.test.js tests/launchpad-controller.test.js",
     "test:next-ui-empty-state": "node scripts/test-next-ui-empty-state.mjs",
     "test:ui-motion-contract": "node scripts/test-ui-motion-contract.mjs",
-    "check:ui-system": "npm run guard:design-subtraction && npm run guard:classic-parity && npm run guard:classic-retirement && npm run guard:next-delta && npm run guard:ui-interaction && npm run guard:ui-async-state && npm run guard:ui-task-journeys && npm run guard:theme-provenance && npm run test:ui-motion-contract && node --check modules/ui-system/lifecycle-scope.js && node --check VCPDistributedServer/frontend-plugin-loader.js && node --check modules/ui-system/component-manifest.js && node --check modules/ui-system/vcp-ui.js && node --check modules/ui-system/webawesome-runtime-manifest.js && node --check modules/ui-system/webawesome-adapter.js && node --check modules/ui-system/appearance-engine.js && node --check modules/ui-system/appearance-studio.js && node --check modules/ui-system/next-ui-apps.js && node --check modules/ui-system/component-showcase.js && node --check modules/ui-system/webawesome-comparison.js && node --check modules/topTabManager.js && npm run lint:ui-system && npm run guard:ui-system && npm run check:ui-applications && npm run test:ui-system && npm run test:appearance-engine && npm run test:appearance-studio && node scripts/test-next-ui-tab-lifecycle.mjs && node scripts/test-webawesome-adapter.mjs && node --test tests/lifecycle-scope.test.js tests/next-ui-registries.test.mjs tests/topic-list-mode-lifecycle.test.js tests/topic-list-load-robustness.test.js tests/settings-unsaved-indicator.test.mjs tests/settings-agent-draft-retention.test.mjs tests/sidebar-resizer-lifecycle.test.mjs tests/topic-list-keyboard.test.js tests/item-list-behavior.test.js && npm run test:bootstrap",
+    "check:ui-system": "npm run guard:design-subtraction && npm run guard:classic-parity && npm run guard:classic-retirement && npm run guard:next-delta && npm run guard:ui-interaction && npm run guard:ui-async-state && npm run guard:ui-task-journeys && npm run guard:theme-provenance && npm run test:ui-motion-contract && node --check modules/ui-system/lifecycle-scope.js && node --check VCPDistributedServer/frontend-plugin-loader.js && node --check modules/ui-system/component-manifest.js && node --check modules/ui-system/vcp-ui.js && node --check modules/ui-system/webawesome-runtime-manifest.js && node --check modules/ui-system/webawesome-adapter.js && node --check modules/ui-system/appearance-engine.js && node --check modules/ui-system/appearance-studio.js && node --check modules/ui-system/next-ui-apps.js && node --check modules/ui-system/component-showcase.js && node --check modules/ui-system/webawesome-comparison.js && node --check modules/topTabManager.js && npm run lint:ui-system && npm run guard:ui-system && npm run check:ui-applications && npm run test:ui-system && npm run test:appearance-engine && npm run test:appearance-studio && node scripts/test-next-ui-tab-lifecycle.mjs && node scripts/test-webawesome-adapter.mjs && node --test tests/lifecycle-scope.test.js tests/next-ui-registries.test.mjs tests/topic-list-mode-lifecycle.test.js tests/topic-list-load-robustness.test.js tests/settings-unsaved-indicator.test.mjs tests/settings-agent-draft-retention.test.mjs tests/sidebar-resizer-lifecycle.test.mjs tests/topic-list-keyboard.test.js tests/item-list-behavior.test.js tests/settings-section-a11y.test.mjs && npm run test:bootstrap",
     "test:appearance-engine": "node scripts/test-appearance-engine.mjs",
     "test:appearance-studio": "node scripts/test-appearance-studio.mjs",
     "test:vcp-ui-select-proxy": "node scripts/test-vcp-ui-select-proxy.mjs",
diff --git a/tests/settings-section-a11y.test.mjs b/tests/settings-section-a11y.test.mjs
new file mode 100644
index 000000000..facb00588
--- /dev/null
+++ b/tests/settings-section-a11y.test.mjs
@@ -0,0 +1,48 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { JSDOM } from 'jsdom';
+import path from 'node:path';
+import { pathToFileURL, fileURLToPath } from 'node:url';
+
+const repoRoot = fileURLToPath(new URL('..', import.meta.url));
+const schema = await import(pathToFileURL(path.join(repoRoot, 'modules/settings/schema/sidebar-surfaces.js')).href);
+const labelable = new Set(['INPUT', 'SELECT', 'TEXTAREA', 'BUTTON', 'METER', 'OUTPUT', 'PROGRESS']);
+
+function surfaces() {
+    const dom = new JSDOM('<!doctype html><html><body><div id="agent"></div><div id="group"></div></body></html>');
+    const { document } = dom.window;
+    schema.renderAgentSettingsSurface(document.getElementById('agent'), document);
+    schema.renderGroupSettingsSurface(document.getElementById('group'), document);
+    return { dom, document };
+}
+
+test('section headers hold one keyboard control, the chevron button, which names what it controls', () => {
+    const { dom, document } = surfaces();
+    const headers = document.querySelectorAll('.agent-settings-section-header, .group-settings-section-header');
+    assert.ok(headers.length >= 10);
+    for (const header of headers) {
+        assert.equal(header.getAttribute('role'), null, `${header.id} must not wrap its button in another button`);
+        assert.equal(header.getAttribute('tabindex'), null, `${header.id} must not add a second tab stop`);
+        const toggle = header.querySelector('button.agent-settings-section-toggle, button.group-settings-section-toggle');
+        assert.ok(toggle, `${header.id} keeps its chevron button`);
+        const controlled = document.getElementById(toggle.getAttribute('aria-controls'));
+        assert.ok(controlled?.classList.contains(header.id.startsWith('group') ? 'group-settings-section-content' : 'agent-settings-section-content'),
+            `${toggle.id} aria-controls points at its section content`);
+    }
+    dom.window.close();
+});
+
+test('every label for= points at a form control', () => {
+    const { dom, document } = surfaces();
+    for (const label of document.querySelectorAll('label[for]')) {
+        const target = document.getElementById(label.htmlFor);
+        assert.ok(target, `label for="${label.htmlFor}" has a target`);
+        assert.ok(labelable.has(target.tagName), `label for="${label.htmlFor}" points at a <${target.tagName.toLowerCase()}>`);
+    }
+    for (const id of ['groupMembersList', 'memberTagsInputs', 'jevMemberStylesInputs']) {
+        const group = document.getElementById(id);
+        assert.equal(group.getAttribute('role'), 'group');
+        assert.ok(document.getElementById(group.getAttribute('aria-labelledby'))?.textContent.trim(), `${id} has a visible name`);
+    }
+    dom.window.close();
+});

From dbbf215d12174254f96e121059d9a87fdc4d2eb8 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 02:42:25 +0000
Subject: [PATCH 090/143] Side terminal: stop blinking the cursor

An idle side-pane terminal re-ran style recalc about 55 times a second for
xterm's cursor blink animation, costing ~25ms of renderer time per second
while it stayed visible. ZCode's TerminalSession keeps xterm's default
steady cursor; do the same. Idle renderer time with the terminal tab
active drops to ~5ms/s, the same as the other tabs.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_017bCbRB3E9yajQ3HbdMrjiJ
---
 .../contracts/generated/chat-event-graph.json | 20 +++++++++----------
 .../side-pane/terminalSideProvider.js         |  4 +++-
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 7adba5e83..c88fa65c3 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -665,7 +665,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 288,
+          "line": 290,
           "kind": "custom-event-listener"
         },
         {
@@ -730,7 +730,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 288,
+          "line": 290,
           "kind": "custom-event-listener",
           "match": "signal?.addEventListener('abort'"
         },
@@ -12689,14 +12689,14 @@
       "consumers": [
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 192,
+          "line": 194,
           "kind": "custom-event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 192,
+          "line": 194,
           "kind": "custom-event-listener",
           "match": "screen.addEventListener('focusin'"
         }
@@ -21687,14 +21687,14 @@
       "consumers": [
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 199,
+          "line": 201,
           "kind": "preload-subscription"
         }
       ],
       "evidence": [
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 199,
+          "line": 201,
           "kind": "preload-subscription",
           "match": "api.onTerminalClear("
         }
@@ -21725,14 +21725,14 @@
       "consumers": [
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 194,
+          "line": 196,
           "kind": "preload-subscription"
         }
       ],
       "evidence": [
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 194,
+          "line": 196,
           "kind": "preload-subscription",
           "match": "api.onTerminalData("
         }
@@ -21744,14 +21744,14 @@
       "consumers": [
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 202,
+          "line": 204,
           "kind": "preload-subscription"
         }
       ],
       "evidence": [
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 202,
+          "line": 204,
           "kind": "preload-subscription",
           "match": "api.onTerminalExit("
         }
diff --git a/modules/ui-system/side-pane/terminalSideProvider.js b/modules/ui-system/side-pane/terminalSideProvider.js
index bf92b7d91..8acfc8a39 100644
--- a/modules/ui-system/side-pane/terminalSideProvider.js
+++ b/modules/ui-system/side-pane/terminalSideProvider.js
@@ -102,7 +102,9 @@ export function createTerminalSideProvider({
 
         const initialTheme = buildTerminalTheme(doc, screen);
         const term = new xterm.Terminal({
-            cursorBlink: true,
+            // 光标不闪：xterm 的闪烁动画让侧栏里一个空闲终端每秒重算样式约 55 次（约 2.5% 单核）。
+            // ZCode TerminalSession.tsx 也用 xterm 默认的不闪烁光标。
+            cursorBlink: false,
             fontFamily: 'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace',
             fontSize: 13,
             scrollback: 5000,

From cb6ac0e07356c804c84d2999e2c2c468625ea588 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 02:42:26 +0000
Subject: [PATCH 091/143] Agent list: a rejected catalog read shows an error,
 not a stuck spinner
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

getAgents/getAgentGroups rejections escaped loadItems, so a first load left
"加载列表中..." up for good. Both reads now run together and a rejection is
handled like an { error } result: the error row (or the previous list) shows.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012AP71nAxrCFEpH7st6asf9
---
 modules/itemListManager.js              |  9 ++++++--
 scripts/next-delta-shared-baseline.json |  4 ++--
 tests/item-list-behavior.test.js        | 28 +++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/modules/itemListManager.js b/modules/itemListManager.js
index 4b92bd6ee..d287b0a5e 100644
--- a/modules/itemListManager.js
+++ b/modules/itemListManager.js
@@ -1078,8 +1078,13 @@ window.itemListManager = (() => {
             itemListUl.innerHTML = '<li><div class="loading-spinner-small"></div>加载列表中...</li>';
         }
 
-        const agentsResult = await electronAPI.getAgents();
-        const groupsResult = await electronAPI.getAgentGroups();
+        // A rejected IPC call becomes an error row instead of leaving the
+        // first-load spinner up for good; both reads run together.
+        const asError = error => ({ error: error?.message || String(error) });
+        const [agentsResult, groupsResult] = await Promise.all([
+            Promise.resolve().then(() => electronAPI.getAgents()).catch(asError),
+            Promise.resolve().then(() => electronAPI.getAgentGroups()).catch(asError)
+        ]);
 
         if (loadToken !== activeLoadItemsToken) {
             console.debug('[ItemListManager] Ignoring stale loadItems result.');
diff --git a/scripts/next-delta-shared-baseline.json b/scripts/next-delta-shared-baseline.json
index dd306a549..9db721de3 100644
--- a/scripts/next-delta-shared-baseline.json
+++ b/scripts/next-delta-shared-baseline.json
@@ -16,8 +16,8 @@
     "reason": "Integrated topic behavior: configuration/unread loads validate the selected item; sort/title/menu operations capture their original topic target; completed deletion changes the active view only for the same item and topic. Repository, readiness and render listener ownership remain unchanged. Topic search waits 200ms after typing before reloading (Enter is immediate); a rejected config IPC shows an error row instead of a permanent spinner; names and IPC errors render as text. Keyboard: topics are one roving tab stop (arrows/Home/End move, Enter/Space open, Shift+F10 or the menu key opens the context menu); the context menu is a role=menu with arrow navigation, Escape/Tab closing it back onto the topic."
   },
   "modules/itemListManager.js": {
-    "sha256": "efafc93c658df3f6bec3443a3add2da177d718a01057ef825cca1e1b560cfad2",
-    "reason": "Integrated catalog behavior: operation-counted speaking indicators survive list refreshes; catalog publication validates the final settings read; unread publication is ordered across navigation and catalog refreshes. Persona WIP is excluded. Load error rows are HTML-escaped. Keyboard: the list is one roving tab stop (active item, else first); arrows/Home/End move it over visible items, Enter/Space select. Re-applies the active assistant search after a rebuild."
+    "sha256": "b22a4fbfdbd4bcc022ca1d3728d93ca9681eb2e52e9c6d5c95d8d6001b38d219",
+    "reason": "Integrated catalog behavior: operation-counted speaking indicators survive list refreshes; catalog publication validates the final settings read; unread publication is ordered across navigation and catalog refreshes. Persona WIP is excluded. Load error rows are HTML-escaped. Keyboard: the list is one roving tab stop (active item, else first); arrows/Home/End move it over visible items, Enter/Space select. Re-applies the active assistant search after a rebuild. Agent and group reads run together and a rejected read shows an error row."
   },
   "Groupmodules/grouprenderer.js": {
     "sha256": "a88a5e4972d9b3739a8da8f300876f066dd2841bcfa8f41f6ffac664cc36cac8",
diff --git a/tests/item-list-behavior.test.js b/tests/item-list-behavior.test.js
index e35675bbb..8f6d07a4f 100644
--- a/tests/item-list-behavior.test.js
+++ b/tests/item-list-behavior.test.js
@@ -99,3 +99,31 @@ test('rebuilding the list keeps the active assistant search applied', async () =
         dom.window.close();
     }
 });
+
+test('a rejected catalog IPC shows an error instead of a permanent spinner', async () => {
+    const dom = new JSDOM('<!doctype html><html><body><ul id="agentList"></ul></body></html>', {
+        url: 'https://vcpchat.local/main.html', runScripts: 'outside-only'
+    });
+    const { window } = dom;
+    window.eval(source);
+    window.itemListManager.init({
+        elements: { itemListUl: window.document.getElementById('agentList') },
+        electronAPI: {
+            getAgents: async () => { throw new Error('agents dir unreadable'); },
+            getAgentGroups: async () => [],
+            loadSettings: async () => ({ combinedItemOrder: [], vcpServerUrl: '' }),
+            getUnreadTopicCounts: async () => ({ success: true, counts: {} }),
+        },
+        refs: { currentSelectedItemRef: { get: () => null, set() {} } },
+        mainRendererFunctions: { selectItem() {} },
+        uiHelper: { showToastNotification() {} },
+    });
+    try {
+        await window.itemListManager.loadItems();
+        const list = window.document.getElementById('agentList');
+        assert.equal(list.querySelector('.loading-spinner-small'), null);
+        assert.match(list.textContent, /agents dir unreadable/);
+    } finally {
+        dom.window.close();
+    }
+});

From d242f4385db05227de2ad23e1370c00d85c1214f Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 02:43:53 +0000
Subject: [PATCH 092/143] Side pane batch R: side chats sleep when idle and
 come back where they were

Side chat tabs were marked dormancy 'keep', so every one ever opened kept
its renderer and message DOM alive. They now follow the default policy.
The handle reports isBusy() while a send, regenerate, delete, unsaved
history, picked attachments or an in-place edit would be lost by a
teardown; drafts and references already survive through the draft cache.
captureState() saves the scroll as distance from the bottom, and the
remount anchors to it while older batches render above. Asking with a
reference while the active side chat is remounting reuses it instead of
creating a second chat.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DFRovoZHMzeheXKkLNWKG
---
 .../contracts/generated/chat-event-graph.json | 52 +++++++++----------
 modules/renderer/side-chat/scrolling.js       | 35 +++++++++++--
 modules/renderer/sideChatSurfaceOwner.js      | 18 +++++--
 modules/renderer/sideChatWiring.js            |  4 +-
 modules/ui-system/side-pane/tab-types/chat.js |  4 +-
 tests/side-chat-draft-restore.test.mjs        | 29 ++++++++++-
 tests/side-chat-scrolling.test.mjs            | 35 +++++++++++++
 tests/side-chat-surface-owner.test.mjs        |  3 ++
 8 files changed, 143 insertions(+), 37 deletions(-)

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index b737e34f3..9cf842773 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -3686,12 +3686,12 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 576,
+          "line": 578,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 579,
+          "line": 581,
           "kind": "custom-event-listener"
         },
         {
@@ -5156,13 +5156,13 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 576,
+          "line": 578,
           "kind": "custom-event-listener",
           "match": "stopBtn.addEventListener('click'"
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 579,
+          "line": 581,
           "kind": "custom-event-listener",
           "match": "persistenceBadge.addEventListener('click'"
         },
@@ -7117,7 +7117,7 @@
       "consumers": [
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 346,
+          "line": 348,
           "kind": "custom-event-listener"
         },
         {
@@ -7129,7 +7129,7 @@
       "evidence": [
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 346,
+          "line": 348,
           "kind": "custom-event-listener",
           "match": "textarea.addEventListener('compositionend'"
         },
@@ -7147,7 +7147,7 @@
       "consumers": [
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 345,
+          "line": 347,
           "kind": "custom-event-listener"
         },
         {
@@ -7159,7 +7159,7 @@
       "evidence": [
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 345,
+          "line": 347,
           "kind": "custom-event-listener",
           "match": "textarea.addEventListener('compositionstart'"
         },
@@ -7302,7 +7302,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 583,
+          "line": 585,
           "kind": "custom-event-listener"
         },
         {
@@ -7434,7 +7434,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 583,
+          "line": 585,
           "kind": "custom-event-listener",
           "match": "persistenceBadge.addEventListener('contextmenu'"
         },
@@ -14793,7 +14793,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 348,
+          "line": 350,
           "kind": "custom-event-listener"
         },
         {
@@ -14964,7 +14964,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 348,
+          "line": 350,
           "kind": "custom-event-listener",
           "match": "textarea.addEventListener('input'"
         },
@@ -15399,12 +15399,12 @@
         },
         {
           "file": "modules/renderer/side-chat/scrolling.js",
-          "line": 53,
+          "line": 69,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 354,
+          "line": 356,
           "kind": "custom-event-listener"
         },
         {
@@ -15748,13 +15748,13 @@
         },
         {
           "file": "modules/renderer/side-chat/scrolling.js",
-          "line": 53,
+          "line": 69,
           "kind": "custom-event-listener",
           "match": "root.addEventListener('keydown'"
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 354,
+          "line": 356,
           "kind": "custom-event-listener",
           "match": "textarea.addEventListener('keydown'"
         },
@@ -26487,7 +26487,7 @@
         },
         {
           "file": "modules/renderer/side-chat/scrolling.js",
-          "line": 51,
+          "line": 67,
           "kind": "custom-event-listener"
         },
         {
@@ -26552,7 +26552,7 @@
         },
         {
           "file": "modules/renderer/side-chat/scrolling.js",
-          "line": 51,
+          "line": 67,
           "kind": "custom-event-listener",
           "match": "root.addEventListener('scroll'"
         },
@@ -28115,7 +28115,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 575,
+          "line": 577,
           "kind": "custom-event-listener"
         },
         {
@@ -28175,7 +28175,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 575,
+          "line": 577,
           "kind": "custom-event-listener",
           "match": "form.addEventListener('submit'"
         },
@@ -29283,14 +29283,14 @@
       "consumers": [
         {
           "file": "modules/renderer/side-chat/scrolling.js",
-          "line": 55,
+          "line": 71,
           "kind": "custom-event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/renderer/side-chat/scrolling.js",
-          "line": 55,
+          "line": 71,
           "kind": "custom-event-listener",
           "match": "root.addEventListener('touchmove'"
         }
@@ -29302,7 +29302,7 @@
       "consumers": [
         {
           "file": "modules/renderer/side-chat/scrolling.js",
-          "line": 54,
+          "line": 70,
           "kind": "custom-event-listener"
         },
         {
@@ -29314,7 +29314,7 @@
       "evidence": [
         {
           "file": "modules/renderer/side-chat/scrolling.js",
-          "line": 54,
+          "line": 70,
           "kind": "custom-event-listener",
           "match": "root.addEventListener('touchstart'"
         },
@@ -31733,7 +31733,7 @@
         },
         {
           "file": "modules/renderer/side-chat/scrolling.js",
-          "line": 52,
+          "line": 68,
           "kind": "custom-event-listener"
         },
         {
@@ -31762,7 +31762,7 @@
         },
         {
           "file": "modules/renderer/side-chat/scrolling.js",
-          "line": 52,
+          "line": 68,
           "kind": "custom-event-listener",
           "match": "root.addEventListener('wheel'"
         },
diff --git a/modules/renderer/side-chat/scrolling.js b/modules/renderer/side-chat/scrolling.js
index bd7706d39..2863f21df 100644
--- a/modules/renderer/side-chat/scrolling.js
+++ b/modules/renderer/side-chat/scrolling.js
@@ -13,9 +13,18 @@ export function createSideChatScrolling({
     let stickToBottom = true;
 
     let lastScrollTop = 0;
+    // 休眠后重新挂载时停在原来离底部的距离：历史先渲染最新几条，较早的分批插到上面，
+    // 按距离底部而不是 scrollTop 定位才不会跳。用户自己一滚就放开
+    let anchorFromBottom = null;
+    let anchoredTop = null;
 
     function pinToBottomIfSticky() {
-        if (!store.isDisposed && stickToBottom && root && root.clientHeight > 0) {
+        if (store.isDisposed || !root || root.clientHeight === 0) return;
+        if (anchorFromBottom !== null) {
+            root.scrollTop = Math.max(0, root.scrollHeight - anchorFromBottom);
+            anchoredTop = root.scrollTop;
+            lastScrollTop = root.scrollTop;
+        } else if (stickToBottom) {
             root.scrollTop = root.scrollHeight;
         }
     }
@@ -23,6 +32,10 @@ export function createSideChatScrolling({
     if (root) {
         const onRootScroll = () => {
             if (root.clientHeight === 0) return;
+            if (anchorFromBottom !== null) {
+                if (Math.abs(root.scrollTop - anchoredTop) <= 1) return;
+                anchorFromBottom = null;
+            }
             const distance = root.scrollHeight - root.scrollTop - root.clientHeight;
             const movedUp = root.scrollTop < lastScrollTop - 1;
             // 真正到底（含内容变短被夹回底部）才无条件贴底；往上滚哪怕只滚了一格也算离开，
@@ -35,16 +48,19 @@ export function createSideChatScrolling({
         // 用户意图先于 scroll 事件生效：流式期间 ResizeObserver 可能在滚轮产生的 scroll 事件之前
         // 把视图拽回底部，只靠 scroll 判断就会和滚轮打架（ZCode use-stick-to-bottom 同样监听 wheel 立即脱离）
         const escape = () => {
+            anchorFromBottom = null;
             if (root.scrollHeight > root.clientHeight) stickToBottom = false;
         };
-        const onWheel = (event) => { if (event.deltaY < 0) escape(); };
+        const onWheel = (event) => { anchorFromBottom = null; if (event.deltaY < 0) escape(); };
         const onKeyDown = (event) => {
+            if (['ArrowDown', 'PageDown', 'End', ' '].includes(event.key)) anchorFromBottom = null;
             if (['ArrowUp', 'PageUp', 'Home'].includes(event.key) && !event.target?.closest?.('textarea, input, [contenteditable="true"]')) escape();
         };
         let touchY = null;
         const onTouchStart = (event) => { touchY = event.touches?.[0]?.clientY ?? null; };
         const onTouchMove = (event) => {
             const y = event.touches?.[0]?.clientY;
+            anchorFromBottom = null;
             if (touchY !== null && y > touchY + 2) escape(); // 手指下拉 = 内容往上翻
             touchY = y ?? touchY;
         };
@@ -83,5 +99,18 @@ export function createSideChatScrolling({
         }
     }
 
-    return Object.freeze({ pinToBottomIfSticky, isSticky: () => stickToBottom, resume() { stickToBottom = true; }, dispose() { disposeCleanups.splice(0).forEach(fn => { try { fn(); } catch {} }); } });
+    /** 休眠前存下：贴底的只记贴底，否则记离底部的距离。 */
+    function capture() {
+        if (!root || stickToBottom) return { stick: true };
+        return { stick: false, fromBottom: Math.max(0, root.scrollHeight - root.scrollTop) };
+    }
+
+    function restore(saved) {
+        if (saved?.stick !== false || !Number.isFinite(saved.fromBottom)) return;
+        stickToBottom = false;
+        anchorFromBottom = saved.fromBottom;
+        pinToBottomIfSticky();
+    }
+
+    return Object.freeze({ pinToBottomIfSticky, isSticky: () => stickToBottom, capture, restore, resume() { stickToBottom = true; anchorFromBottom = null; }, dispose() { disposeCleanups.splice(0).forEach(fn => { try { fn(); } catch {} }); } });
 }
diff --git a/modules/renderer/sideChatSurfaceOwner.js b/modules/renderer/sideChatSurfaceOwner.js
index c53daf69a..7f478fc5c 100644
--- a/modules/renderer/sideChatSurfaceOwner.js
+++ b/modules/renderer/sideChatSurfaceOwner.js
@@ -35,7 +35,8 @@ export async function mountSideChatSurface(container, {
     chatCapabilities,
     scope = null,
     onStatusChange = null,
-    draftStore = null
+    draftStore = null,
+    restoredState = null
 } = {}) {
     if (!container || !container.ownerDocument) {
         throw new TypeError('mountSideChatSurface requires a valid container element');
@@ -183,6 +184,7 @@ export async function mountSideChatSurface(container, {
         root
     });
     const { pinToBottomIfSticky } = scrollingOwner;
+    scrollingOwner.restore(restoredState?.scroll);
 
     const liveRegenerateProxy = (id) => liveRegenerate?.(id);
     const messageEditor = createSideChatMessageEditor({
@@ -595,6 +597,16 @@ export async function mountSideChatSurface(container, {
             return currentDescriptor;
         },
         surface,
+        // 隐藏久了控制器会让视图休眠（拆掉、再显示时重挂）；这些状态拆了会丢或会打断，期间不休眠。
+        // 输入框文字和引用不算：拆卸时由 draft-cache / draftStore 存下，重挂时还原
+        isBusy() {
+            return !isDisposed && (Boolean(activeSendController) || isRegenerating || isDeletingMessage
+                || hasUnsavedChanges || attachmentsOwner.count > 0 || messageEditor.isEditing()
+                || form.hasAttribute('aria-busy'));
+        },
+        captureState() {
+            return isDisposed ? null : { scroll: scrollingOwner.capture() };
+        },
         setVisible(visible) {
             if (visible && !isDisposed && isHistoryLoaded) {
                 textarea.focus();
@@ -732,12 +744,12 @@ export function createSideChatSurfaceOwner({
     let ownerDocument = doc;
     const draftStore = createSideChatDraftStore({ getStorage: () => ownerDocument?.defaultView?.localStorage });
     return Object.freeze({
-        async mountTab(descriptor, container, { scope: viewScope = null } = {}) {
+        async mountTab(descriptor, container, { scope: viewScope = null, restoredState = null } = {}) {
             ownerDocument ||= container.ownerDocument;
             const storedInput = draftStore.read(descriptor).input;
             if (storedInput) descriptor = { ...descriptor, ...storedInput };
             // 控制器给了 view scope 就挂在它下面，否则退回 provider 自己的 scope
-            const handle = await mountSurface(container, { descriptor, chatCapabilities, scope: viewScope || scope, draftStore });
+            const handle = await mountSurface(container, { descriptor, chatCapabilities, scope: viewScope || scope, draftStore, restoredState });
             return drafts.ownHandle(handle, descriptor);
         },
         readDraft: descriptor => draftStore.read(descriptor),
diff --git a/modules/renderer/sideChatWiring.js b/modules/renderer/sideChatWiring.js
index b5fe81f12..1308859fc 100644
--- a/modules/renderer/sideChatWiring.js
+++ b/modules/renderer/sideChatWiring.js
@@ -205,7 +205,9 @@ export function createSideChatWiring({
             const activeTab = state.tabs.find(t => t.id === state.activeTabId && t.kind === 'chat');
             const parent = activeTab?.descriptor?.parent;
             if (parent?.itemId === currentItem.id && parent?.topicId === currentTopicId) {
-                const handle = getController().getTabHandle(activeTab.id);
+                // 面板收着放久了这个侧聊可能已经休眠（视图拆了、标签还在）：重新挂上再加，不能另开一个新的
+                const handle = getController().getTabHandle(activeTab.id)
+                    || await getController().openTab({ kind: 'chat', descriptor: activeTab.descriptor });
                 if (handle?.addReference) {
                     handle.addReference(options.reference);
                     getController().setVisible(true);
diff --git a/modules/ui-system/side-pane/tab-types/chat.js b/modules/ui-system/side-pane/tab-types/chat.js
index be1217c98..de2933b76 100644
--- a/modules/ui-system/side-pane/tab-types/chat.js
+++ b/modules/ui-system/side-pane/tab-types/chat.js
@@ -79,8 +79,8 @@ export function defineChatTabType({ provider, openSideChat = null, onClosed = nu
     return Object.freeze({
         kind: 'chat', label: '辅助对话', icon: 'chat_bubble', searchHint: '辅助对话',
         persist: false,
-        // 输入框里可能有还没发出去的内容，隐藏再久也不休眠
-        dormancy: 'keep',
+        // 按默认策略休眠：输入框和引用拆卸时存下、重挂时还原，滚动位置走 captureState；
+        // 发送中、未保存、带着附件或正在编辑时 handle.isBusy() 为 true，不会被拆
         entry: typeof openSideChat === 'function'
             ? { id: 'selection-side-conversation', order: 0, open: () => openSideChat({ forceNew: true }) }
             : null,
diff --git a/tests/side-chat-draft-restore.test.mjs b/tests/side-chat-draft-restore.test.mjs
index 4ca4172a1..c02bf49ad 100644
--- a/tests/side-chat-draft-restore.test.mjs
+++ b/tests/side-chat-draft-restore.test.mjs
@@ -35,7 +35,7 @@ async function fixture(t, legacyInput = {}) {
         async deleteSideChatChild(...args) { deletions.push(args); return call('side-chat:delete-child', ...args); },
         getChatHistory: async (_agent, topic) => JSON.parse(await fs.readFile(path.join(directory, 'agent', 'topics', topic, 'history.json'), 'utf8'))
     };
-    function mountController() {
+    function mountController({ dormancy = null } = {}) {
         let controller;
         const wiring = createSideChatWiring({ doc, win: dom.window, chatAPI,
             chatRepository: { getHistory: (agent, _type, topic) => chatAPI.getChatHistory(agent, topic), saveHistory: async () => ({ success: true }) },
@@ -50,7 +50,7 @@ async function fixture(t, legacyInput = {}) {
             }
         });
         controller = createSidePaneController({ root: doc.getElementById('pane'), tabListElement: doc.getElementById('tabs'),
-            contentContainer: doc.getElementById('content'),
+            contentContainer: doc.getElementById('content'), dormancy,
             tabTypes: [defineChatTabType({ provider: wiring.provider, onClosed: wiring.onTabClosed })] });
         controller.setParent(descriptor.parent);
         const session = { controller, wiring };
@@ -132,3 +132,28 @@ test('automatic empty-child cleanup also removes its empty browser draft without
     assert.equal(f.drafts.read(f.descriptor).input, null);
     assert.equal(f.deletions.length, 1);
 });
+
+test('a side chat put to sleep behind another tab keeps its draft, and a reference asked while it remounts lands in it', async t => {
+    const f = await fixture(t, { composerStorage: 'local' });
+    f.drafts.save(f.descriptor, { draft: 'half typed', references: [{ id: 'ref-1', text: 'first selection' }] });
+    const { controller, wiring } = f.mountController({ dormancy: { hiddenMs: 30 } });
+    controller.registerTabType({ kind: 'note', label: 'Note', provider: { mountTab: () => ({ dispose() {} }) } });
+    await wiring.restoreSessions('agent', 'parent');
+    const tab = controller.getSnapshot().tabs.find(item => item.kind === 'chat');
+    controller.activateTab(tab.id);
+    controller.setVisible(true);
+    await new Promise(r => setTimeout(r, 20));
+    controller.getTabHandle(tab.id).setDraft('half typed, then more');
+    await controller.openTab({ id: 'note:1', kind: 'note', title: 'Note', closable: true, scopeMode: 'global' });
+    await new Promise(r => setTimeout(r, 120));
+    assert.equal(controller.getTabHandle(tab.id), null, 'the hidden side chat view went to sleep');
+    assert.deepEqual(controller.getViewResidency().dormant.map(entry => entry.tabId), [tab.id]);
+
+    // 切回去的同一刻点「在侧栏提问」：视图还在重挂，引用要落进这个侧聊，不能另开一个
+    controller.activateTab(tab.id);
+    const handle = await wiring.openSideChat({ reference: { id: 'ref-2', text: 'second selection' } });
+    assert.deepEqual(controller.getSnapshot().tabs.filter(item => item.kind === 'chat').map(item => item.id), [tab.id], 'no second side chat');
+    assert.equal(handle, controller.getTabHandle(tab.id));
+    assert.equal(handle.getDraft(), 'half typed, then more');
+    assert.deepEqual(handle.getReferences().map(ref => ref.id), ['ref-1', 'ref-2']);
+});
diff --git a/tests/side-chat-scrolling.test.mjs b/tests/side-chat-scrolling.test.mjs
index 3466ac3a6..8718d1d1f 100644
--- a/tests/side-chat-scrolling.test.mjs
+++ b/tests/side-chat-scrolling.test.mjs
@@ -100,3 +100,38 @@ test('keyboard and touch scroll-up intents detach, but arrow keys inside the com
     assert.equal(scrolling.isSticky(), false);
     scrolling.dispose();
 });
+
+test('a remount after sleep keeps the reader the same distance from the bottom while older batches render above', async () => {
+    const before = setup();
+    before.root.scrollTop = 500;
+    before.root.dispatchEvent(new before.win.Event('scroll'));
+    before.root.scrollTop = 200;
+    before.root.dispatchEvent(new before.win.Event('scroll'));
+    const saved = before.scrolling.capture();
+    assert.deepEqual(saved, { stick: false, fromBottom: 800 });
+    before.scrolling.dispose();
+
+    const after = setup();
+    after.root.scrollTop = 0;
+    after.scrolling.restore(saved);
+    assert.equal(after.root.scrollTop, 200);
+    after.grow(400); // 较早的消息分批插到上面
+    after.ro.fire(after.root);
+    after.root.dispatchEvent(new after.win.Event('scroll'));
+    assert.equal(after.root.scrollTop, 600, 'still 800px from the bottom');
+    assert.equal(after.scrolling.isSticky(), false);
+
+    after.root.dispatchEvent(new after.win.WheelEvent('wheel', { deltaY: 40 }));
+    after.root.scrollTop = 650;
+    after.root.dispatchEvent(new after.win.Event('scroll'));
+    after.grow(100);
+    after.ro.fire(after.root);
+    assert.equal(after.root.scrollTop, 650, 'once the reader scrolls, growth no longer moves them');
+    after.scrolling.dispose();
+});
+
+test('a view that was following the bottom comes back following it', () => {
+    const { scrolling } = setup();
+    assert.deepEqual(scrolling.capture(), { stick: true });
+    scrolling.dispose();
+});
diff --git a/tests/side-chat-surface-owner.test.mjs b/tests/side-chat-surface-owner.test.mjs
index a53d17dec..871f15bb7 100644
--- a/tests/side-chat-surface-owner.test.mjs
+++ b/tests/side-chat-surface-owner.test.mjs
@@ -313,8 +313,10 @@ test('side chat attaches picked files to the next send and clears them', async (
 
     const attachBtn = container.querySelector('.side-chat-attach-btn');
     assert.equal(attachBtn.disabled, false, 'enabled once history is loaded');
+    assert.equal(handle.isBusy(), false, 'an idle side chat may sleep');
     attachBtn.click();
     await new Promise(r => setTimeout(r, 10));
+    assert.equal(handle.isBusy(), true, 'picked files are not saved anywhere, so the view must not sleep with them');
     assert.deepEqual(picks, [['agent-1', 'topic-child-attach']]);
     assert.deepEqual(previewed, ['a.txt']);
     assert.equal(container.querySelector('.side-chat-attachment-preview').hidden, false);
@@ -555,6 +557,7 @@ test('a send started while regenerate is still saving the trimmed history is ref
     doc.querySelector('#chatContextMenu [data-side-chat-action="regenerate"]').click();
     await new Promise(r => setTimeout(r, 0));
     assert.equal(saves, 1, 'regenerate is waiting on the save');
+    assert.equal(handle.isBusy(), true, 'a regenerate in flight keeps the view awake');
 
     const textarea = container.querySelector('textarea');
     textarea.value = 'typed meanwhile';

From 2b4ff513525c718329fe3a41646f4c2f1fd92dba Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 02:45:26 +0000
Subject: [PATCH 093/143] Agent list: version avatar URLs by mtime instead of
 re-downloading every refresh

The list appended ?t=Date.now() to every avatar on each rebuild, so every
refresh re-read every avatar file. The main process now versions avatar
URLs by file mtime and the list uses them as is.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012AP71nAxrCFEpH7st6asf9
---
 Groupmodules/groupchat.js                     |  12 +-
 .../contracts/generated/chat-event-graph.json | 160 +++++++++---------
 modules/ipc/agentHandlers.js                  |   7 +-
 modules/ipc/groupChatHandlers.js              |   7 +-
 modules/itemListManager.js                    |   4 +-
 scripts/next-delta-shared-baseline.json       |   4 +-
 tests/item-list-behavior.test.js              |  32 ++++
 7 files changed, 139 insertions(+), 87 deletions(-)

diff --git a/Groupmodules/groupchat.js b/Groupmodules/groupchat.js
index f546cde88..54b091d1d 100644
--- a/Groupmodules/groupchat.js
+++ b/Groupmodules/groupchat.js
@@ -621,7 +621,7 @@ async function getAgentGroups() {
                 if (await fs.pathExists(configPath)) {
                     const config = normalizeGroupModeSettings(await fs.readJson(configPath));
                     if (config.avatar) {
-                        config.avatarUrl = `file://${path.join(groupPath, config.avatar)}?t=${Date.now()}`;
+                        config.avatarUrl = await versionedGroupAvatarUrl(groupPath, config.avatar);
                     } else {
                         config.avatarUrl = null;
                     }
@@ -639,6 +639,14 @@ async function getAgentGroups() {
     }
 }
 
+// Version the avatar URL by modification time so the agent list keeps its
+// cached image until the avatar file actually changes.
+async function versionedGroupAvatarUrl(groupDir, avatarFile) {
+    const avatarPath = path.join(groupDir, avatarFile);
+    const stat = await fs.stat(avatarPath).catch(() => null);
+    return `file://${avatarPath}?v=${stat ? Math.round(stat.mtimeMs) : Date.now()}`;
+}
+
 /**
  * 获取指定 AgentGroup 的配置
  * @param {string} groupId - 群组 ID
@@ -652,7 +660,7 @@ async function getAgentGroupConfig(groupId) {
         if (await fs.pathExists(configPath)) {
             const config = normalizeGroupModeSettings(await fs.readJson(configPath));
             if (config.avatar) {
-                config.avatarUrl = `file://${path.join(groupDir, config.avatar)}?t=${Date.now()}`;
+                config.avatarUrl = await versionedGroupAvatarUrl(groupDir, config.avatar);
             } else {
                 config.avatarUrl = null;
             }
diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 1f4c42ca6..cde45f7a4 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -1234,7 +1234,7 @@
       "consumers": [
         {
           "file": "modules/itemListManager.js",
-          "line": 965,
+          "line": 967,
           "kind": "custom-event-listener"
         },
         {
@@ -1251,7 +1251,7 @@
       "evidence": [
         {
           "file": "modules/itemListManager.js",
-          "line": 965,
+          "line": 967,
           "kind": "custom-event-listener",
           "match": "li.addEventListener('auxclick'"
         },
@@ -3540,7 +3540,7 @@
         },
         {
           "file": "modules/itemListManager.js",
-          "line": 976,
+          "line": 978,
           "kind": "custom-event-listener"
         },
         {
@@ -4966,7 +4966,7 @@
         },
         {
           "file": "modules/itemListManager.js",
-          "line": 976,
+          "line": 978,
           "kind": "custom-event-listener",
           "match": "li.addEventListener('click'"
         },
@@ -7051,7 +7051,7 @@
       "producers": [
         {
           "file": "modules/itemListManager.js",
-          "line": 1020,
+          "line": 1022,
           "kind": "custom-event-create"
         }
       ],
@@ -7065,7 +7065,7 @@
       "evidence": [
         {
           "file": "modules/itemListManager.js",
-          "line": 1020,
+          "line": 1022,
           "kind": "custom-event-create",
           "match": "new CustomEvent('compact-sidebar-open-topics'"
         },
@@ -7221,7 +7221,7 @@
         },
         {
           "file": "modules/itemListManager.js",
-          "line": 1004,
+          "line": 1006,
           "kind": "custom-event-listener"
         },
         {
@@ -7348,7 +7348,7 @@
         },
         {
           "file": "modules/itemListManager.js",
-          "line": 1004,
+          "line": 1006,
           "kind": "custom-event-listener",
           "match": "li.addEventListener('contextmenu'"
         },
@@ -7438,14 +7438,14 @@
       "consumers": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 212,
+          "line": 217,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 212,
+          "line": 217,
           "kind": "event-listener",
           "match": "ipcMain.handle('continue-jev-group-chat'"
         },
@@ -7573,14 +7573,14 @@
       "consumers": [
         {
           "file": "modules/ipc/agentHandlers.js",
-          "line": 387,
+          "line": 392,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/agentHandlers.js",
-          "line": 387,
+          "line": 392,
           "kind": "event-listener",
           "match": "ipcMain.handle('create-agent'"
         },
@@ -7604,14 +7604,14 @@
       "consumers": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 75,
+          "line": 80,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 75,
+          "line": 80,
           "kind": "event-listener",
           "match": "ipcMain.handle('create-agent-group'"
         },
@@ -7697,14 +7697,14 @@
       "consumers": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 116,
+          "line": 121,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 116,
+          "line": 121,
           "kind": "event-listener",
           "match": "ipcMain.handle('create-new-topic-for-group'"
         },
@@ -8367,14 +8367,14 @@
       "consumers": [
         {
           "file": "modules/ipc/agentHandlers.js",
-          "line": 443,
+          "line": 448,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/agentHandlers.js",
-          "line": 443,
+          "line": 448,
           "kind": "event-listener",
           "match": "ipcMain.handle('delete-agent'"
         },
@@ -8398,14 +8398,14 @@
       "consumers": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 91,
+          "line": 96,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 91,
+          "line": 96,
           "kind": "event-listener",
           "match": "ipcMain.handle('delete-agent-group'"
         },
@@ -8460,14 +8460,14 @@
       "consumers": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 120,
+          "line": 125,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 120,
+          "line": 125,
           "kind": "event-listener",
           "match": "ipcMain.handle('delete-group-topic'"
         },
@@ -11466,14 +11466,14 @@
       "consumers": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 225,
+          "line": 230,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 225,
+          "line": 230,
           "kind": "event-listener",
           "match": "ipcMain.handle('enqueue-jev-group-agent'"
         },
@@ -12719,14 +12719,14 @@
       "consumers": [
         {
           "file": "modules/ipc/agentHandlers.js",
-          "line": 243,
+          "line": 248,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/agentHandlers.js",
-          "line": 243,
+          "line": 248,
           "kind": "event-listener",
           "match": "ipcMain.handle('get-agent-config'"
         },
@@ -12750,14 +12750,14 @@
       "consumers": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 83,
+          "line": 88,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 83,
+          "line": 88,
           "kind": "event-listener",
           "match": "ipcMain.handle('get-agent-group-config'"
         },
@@ -12781,14 +12781,14 @@
       "consumers": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 79,
+          "line": 84,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 79,
+          "line": 84,
           "kind": "event-listener",
           "match": "ipcMain.handle('get-agent-groups'"
         },
@@ -12836,7 +12836,7 @@
       "producers": [
         {
           "file": "modules/ipc/agentHandlers.js",
-          "line": 103,
+          "line": 108,
           "kind": "event-send"
         },
         {
@@ -12848,20 +12848,20 @@
       "consumers": [
         {
           "file": "modules/ipc/agentHandlers.js",
-          "line": 118,
+          "line": 123,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/agentHandlers.js",
-          "line": 103,
+          "line": 108,
           "kind": "event-send",
           "match": "ipcMain.invoke('get-agents'"
         },
         {
           "file": "modules/ipc/agentHandlers.js",
-          "line": 118,
+          "line": 123,
           "kind": "event-listener",
           "match": "ipcMain.handle('get-agents'"
         },
@@ -12885,14 +12885,14 @@
       "consumers": [
         {
           "file": "modules/ipc/agentHandlers.js",
-          "line": 99,
+          "line": 104,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/agentHandlers.js",
-          "line": 99,
+          "line": 104,
           "kind": "event-listener",
           "match": "ipcMain.handle('get-agents-metadata'"
         },
@@ -12916,14 +12916,14 @@
       "consumers": [
         {
           "file": "modules/ipc/agentHandlers.js",
-          "line": 476,
+          "line": 481,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/agentHandlers.js",
-          "line": 476,
+          "line": 481,
           "kind": "event-listener",
           "match": "ipcMain.handle('get-all-items'"
         },
@@ -13321,14 +13321,14 @@
       "consumers": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 132,
+          "line": 137,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 132,
+          "line": 137,
           "kind": "event-listener",
           "match": "ipcMain.handle('get-group-chat-history'"
         },
@@ -13352,14 +13352,14 @@
       "consumers": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 112,
+          "line": 117,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 112,
+          "line": 117,
           "kind": "event-listener",
           "match": "ipcMain.handle('get-group-topics'"
         },
@@ -13414,14 +13414,14 @@
       "consumers": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 239,
+          "line": 244,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 239,
+          "line": 244,
           "kind": "event-listener",
           "match": "ipcMain.handle('get-jev-group-chat-state'"
         },
@@ -15058,14 +15058,14 @@
       "consumers": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 243,
+          "line": 248,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 243,
+          "line": 248,
           "kind": "event-listener",
           "match": "ipcMain.handle('interrupt-group-chat-queue'"
         },
@@ -15151,14 +15151,14 @@
       "consumers": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 177,
+          "line": 182,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 177,
+          "line": 182,
           "kind": "event-listener",
           "match": "ipcMain.handle('inviteAgentToSpeak'"
         },
@@ -24584,14 +24584,14 @@
       "consumers": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 253,
+          "line": 258,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 253,
+          "line": 258,
           "kind": "event-listener",
           "match": "ipcMain.handle('redo-group-chat-message'"
         },
@@ -24696,14 +24696,14 @@
       "consumers": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 128,
+          "line": 133,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 128,
+          "line": 133,
           "kind": "event-listener",
           "match": "ipcMain.handle('regenerate-group-topic-title'"
         },
@@ -25256,14 +25256,14 @@
       "consumers": [
         {
           "file": "modules/ipc/agentHandlers.js",
-          "line": 248,
+          "line": 253,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/agentHandlers.js",
-          "line": 248,
+          "line": 253,
           "kind": "event-listener",
           "match": "ipcMain.handle('save-agent-config'"
         },
@@ -25287,14 +25287,14 @@
       "consumers": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 95,
+          "line": 100,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 95,
+          "line": 100,
           "kind": "event-listener",
           "match": "ipcMain.handle('save-agent-group-avatar'"
         },
@@ -25318,14 +25318,14 @@
       "consumers": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 87,
+          "line": 92,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 87,
+          "line": 92,
           "kind": "event-listener",
           "match": "ipcMain.handle('save-agent-group-config'"
         },
@@ -25349,14 +25349,14 @@
       "consumers": [
         {
           "file": "modules/ipc/agentHandlers.js",
-          "line": 229,
+          "line": 234,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/agentHandlers.js",
-          "line": 229,
+          "line": 234,
           "kind": "event-listener",
           "match": "ipcMain.handle('save-agent-order'"
         },
@@ -25411,14 +25411,14 @@
       "consumers": [
         {
           "file": "modules/ipc/agentHandlers.js",
-          "line": 302,
+          "line": 307,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/agentHandlers.js",
-          "line": 302,
+          "line": 307,
           "kind": "event-listener",
           "match": "ipcMain.handle('save-avatar'"
         },
@@ -25535,14 +25535,14 @@
       "consumers": [
         {
           "file": "modules/ipc/agentHandlers.js",
-          "line": 216,
+          "line": 221,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/agentHandlers.js",
-          "line": 216,
+          "line": 221,
           "kind": "event-listener",
           "match": "ipcMain.handle('save-combined-item-order'"
         },
@@ -25659,14 +25659,14 @@
       "consumers": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 136,
+          "line": 141,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 136,
+          "line": 141,
           "kind": "event-listener",
           "match": "ipcMain.handle('save-group-chat-history'"
         },
@@ -25721,14 +25721,14 @@
       "consumers": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 124,
+          "line": 129,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 124,
+          "line": 129,
           "kind": "event-listener",
           "match": "ipcMain.handle('save-group-topic-title'"
         },
@@ -26000,14 +26000,14 @@
       "consumers": [
         {
           "file": "modules/ipc/agentHandlers.js",
-          "line": 457,
+          "line": 462,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/agentHandlers.js",
-          "line": 457,
+          "line": 462,
           "kind": "event-listener",
           "match": "ipcMain.handle('save-user-avatar'"
         },
@@ -26794,14 +26794,14 @@
       "consumers": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 155,
+          "line": 160,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 155,
+          "line": 160,
           "kind": "event-listener",
           "match": "ipcMain.handle('send-group-chat-message'"
         },
@@ -27836,14 +27836,14 @@
       "consumers": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 199,
+          "line": 204,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 199,
+          "line": 204,
           "kind": "event-listener",
           "match": "ipcMain.handle('start-jev-group-chat'"
         },
@@ -30473,17 +30473,17 @@
         },
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 70,
+          "line": 75,
           "kind": "event-send"
         },
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 163,
+          "line": 168,
           "kind": "event-send"
         },
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 258,
+          "line": 263,
           "kind": "event-send"
         }
       ],
@@ -30503,19 +30503,19 @@
         },
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 70,
+          "line": 75,
           "kind": "event-send",
           "match": "mainWindow.webContents.send('vcp-stream-event'"
         },
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 163,
+          "line": 168,
           "kind": "event-send",
           "match": "mainWindow.webContents.send('vcp-stream-event'"
         },
         {
           "file": "modules/ipc/groupChatHandlers.js",
-          "line": 258,
+          "line": 263,
           "kind": "event-send",
           "match": "mainWindow.webContents.send('vcp-stream-event'"
         },
diff --git a/modules/ipc/agentHandlers.js b/modules/ipc/agentHandlers.js
index 6f25274f3..3593de189 100644
--- a/modules/ipc/agentHandlers.js
+++ b/modules/ipc/agentHandlers.js
@@ -23,7 +23,12 @@ async function findAvatarUrl(agentDir, cacheBust = false) {
         const avatarPath = path.join(agentDir, `avatar${ext}`);
         if (await fs.pathExists(avatarPath)) {
             const url = pathToFileURL(avatarPath).toString();
-            return cacheBust ? `${url}?t=${Date.now()}` : url;
+            // Version by modification time: the URL changes when the avatar
+            // does, so lists can reuse the cached image instead of
+            // re-downloading every avatar on every refresh.
+            const stat = await fs.stat(avatarPath).catch(() => null);
+            const version = stat ? Math.round(stat.mtimeMs) : (cacheBust ? Date.now() : null);
+            return version === null ? url : `${url}?v=${version}`;
         }
     }
     return null;
diff --git a/modules/ipc/groupChatHandlers.js b/modules/ipc/groupChatHandlers.js
index 21c39d8e8..02a7bf979 100644
--- a/modules/ipc/groupChatHandlers.js
+++ b/modules/ipc/groupChatHandlers.js
@@ -24,7 +24,12 @@ async function findAvatarUrl(agentDir, cacheBust = false) {
         const avatarPath = path.join(agentDir, `avatar${ext}`);
         if (await fs.pathExists(avatarPath)) {
             const url = pathToFileURL(avatarPath).toString();
-            return cacheBust ? `${url}?t=${Date.now()}` : url;
+            // Version by modification time: the URL changes when the avatar
+            // does, so lists can reuse the cached image instead of
+            // re-downloading every avatar on every refresh.
+            const stat = await fs.stat(avatarPath).catch(() => null);
+            const version = stat ? Math.round(stat.mtimeMs) : (cacheBust ? Date.now() : null);
+            return version === null ? url : `${url}?v=${version}`;
         }
     }
     return null;
diff --git a/modules/itemListManager.js b/modules/itemListManager.js
index d287b0a5e..2736b9835 100644
--- a/modules/itemListManager.js
+++ b/modules/itemListManager.js
@@ -897,7 +897,9 @@ window.itemListManager = (() => {
 
         const avatarImg = document.createElement('img');
         avatarImg.classList.add('avatar');
-        avatarImg.src = item.avatarUrl ? `${item.avatarUrl}${item.avatarUrl.includes('?') ? '&' : '?'}t=${Date.now()}` : (item.type === 'group' ? 'assets/default_group_avatar.png' : 'assets/default_avatar.png');
+        // The main process versions avatar URLs by file mtime, so the URL is
+        // stable until the avatar changes and the browser cache can serve it.
+        avatarImg.src = item.avatarUrl || (item.type === 'group' ? 'assets/default_group_avatar.png' : 'assets/default_avatar.png');
         avatarImg.alt = `${item.name} 头像`;
         avatarImg.onerror = () => { avatarImg.src = (item.type === 'group' ? 'assets/default_group_avatar.png' : 'assets/default_avatar.png'); };
 
diff --git a/scripts/next-delta-shared-baseline.json b/scripts/next-delta-shared-baseline.json
index 9db721de3..0ccbb86ee 100644
--- a/scripts/next-delta-shared-baseline.json
+++ b/scripts/next-delta-shared-baseline.json
@@ -16,8 +16,8 @@
     "reason": "Integrated topic behavior: configuration/unread loads validate the selected item; sort/title/menu operations capture their original topic target; completed deletion changes the active view only for the same item and topic. Repository, readiness and render listener ownership remain unchanged. Topic search waits 200ms after typing before reloading (Enter is immediate); a rejected config IPC shows an error row instead of a permanent spinner; names and IPC errors render as text. Keyboard: topics are one roving tab stop (arrows/Home/End move, Enter/Space open, Shift+F10 or the menu key opens the context menu); the context menu is a role=menu with arrow navigation, Escape/Tab closing it back onto the topic."
   },
   "modules/itemListManager.js": {
-    "sha256": "b22a4fbfdbd4bcc022ca1d3728d93ca9681eb2e52e9c6d5c95d8d6001b38d219",
-    "reason": "Integrated catalog behavior: operation-counted speaking indicators survive list refreshes; catalog publication validates the final settings read; unread publication is ordered across navigation and catalog refreshes. Persona WIP is excluded. Load error rows are HTML-escaped. Keyboard: the list is one roving tab stop (active item, else first); arrows/Home/End move it over visible items, Enter/Space select. Re-applies the active assistant search after a rebuild. Agent and group reads run together and a rejected read shows an error row."
+    "sha256": "0e1ef864be8f412e87baac33f446c541417e4d3a4c41801c4ee5d05d45f6e164",
+    "reason": "Integrated catalog behavior: operation-counted speaking indicators survive list refreshes; catalog publication validates the final settings read; unread publication is ordered across navigation and catalog refreshes. Persona WIP is excluded. Load error rows are HTML-escaped. Keyboard: the list is one roving tab stop (active item, else first); arrows/Home/End move it over visible items, Enter/Space select. Re-applies the active assistant search after a rebuild. Agent and group reads run together and a rejected read shows an error row. Avatar URLs come versioned from the main process and are used as is."
   },
   "Groupmodules/grouprenderer.js": {
     "sha256": "a88a5e4972d9b3739a8da8f300876f066dd2841bcfa8f41f6ffac664cc36cac8",
diff --git a/tests/item-list-behavior.test.js b/tests/item-list-behavior.test.js
index 8f6d07a4f..27f8e643b 100644
--- a/tests/item-list-behavior.test.js
+++ b/tests/item-list-behavior.test.js
@@ -127,3 +127,35 @@ test('a rejected catalog IPC shows an error instead of a permanent spinner', asy
         dom.window.close();
     }
 });
+
+test('reloading the list reuses the avatar URL so the browser cache can serve it', async () => {
+    const dom = new JSDOM('<!doctype html><html><body><ul id="agentList"></ul></body></html>', {
+        url: 'https://vcpchat.local/main.html', runScripts: 'outside-only'
+    });
+    const { window } = dom;
+    window.eval(source);
+    const avatarUrl = 'file:///data/Agents/ada/avatar.png?v=1700000000000';
+    window.itemListManager.init({
+        elements: { itemListUl: window.document.getElementById('agentList') },
+        electronAPI: {
+            getAgents: async () => [{ id: 'ada', name: 'Ada', avatarUrl }],
+            getAgentGroups: async () => [],
+            loadSettings: async () => ({ combinedItemOrder: [], vcpServerUrl: '' }),
+            getUnreadTopicCounts: async () => ({ success: true, counts: {} }),
+        },
+        refs: { currentSelectedItemRef: { get: () => ({ id: null }), set() {} } },
+        mainRendererFunctions: { selectItem() {} },
+        uiHelper: { showToastNotification() {} },
+    });
+    try {
+        const src = () => window.document.querySelector('#agentList li[data-item-id="ada"] img.avatar').getAttribute('src');
+        await window.itemListManager.loadItems();
+        const first = src();
+        await new Promise(resolve => setTimeout(resolve, 5));
+        await window.itemListManager.loadItems();
+        assert.equal(first, avatarUrl, 'the versioned URL from the main process is used as is');
+        assert.equal(src(), first, 'a refresh does not force every avatar to download again');
+    } finally {
+        dom.window.close();
+    }
+});

From 5f18a5baa011a4916a085eca27e6cc62ff3c8120 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 02:48:38 +0000
Subject: [PATCH 094/143] Settings: rebuild only the changed form's dropdowns

When one settings form's select options changed, the rebuild tore down
every form's projections and observers but remounted only its own, so the
group form fell back to bare native selects after an Agent loaded.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012AP71nAxrCFEpH7st6asf9
---
 .../ui-system/settings/select-projection.js   |  9 +-
 package.json                                  |  2 +-
 .../settings-select-projection-forms.test.mjs | 99 +++++++++++++++++++
 3 files changed, 107 insertions(+), 3 deletions(-)
 create mode 100644 tests/settings-select-projection-forms.test.mjs

diff --git a/modules/ui-system/settings/select-projection.js b/modules/ui-system/settings/select-projection.js
index e32e0d130..3cc183e6c 100644
--- a/modules/ui-system/settings/select-projection.js
+++ b/modules/ui-system/settings/select-projection.js
@@ -239,7 +239,10 @@ export function createSelectProjection({ ensurePresentationScope }) {
                     // (programmatic value/selected writes) re-sync the live
                     // projection through the primitive's vcp-uiux-sync hook.
                     if (mutations.some(record => record.type === 'childList')) {
-                        teardownUiuxSelects({ preserveForm: form });
+                        // Only this form's projections: the Agent and group
+                        // forms stay mounted side by side, and the remount
+                        // below restores this form alone.
+                        teardownUiuxSelects({ preserveForm: form, onlyForm: form });
                         // LifecycleScope releases settle their dispose in a
                         // microtask: the old projection must have fully restored
                         // the business DOM before the remount runs, otherwise the
@@ -272,12 +275,14 @@ export function createSelectProjection({ ensurePresentationScope }) {
         }
     }
 
-    function teardownUiuxSelects({ preserveForm = null } = {}) {
+    function teardownUiuxSelects({ preserveForm = null, onlyForm = null } = {}) {
         [...selectObserverStates.values()].forEach(state => {
+            if (onlyForm && state.form !== onlyForm) return;
             releaseObserverState(state, { preserveRebuilding: state.form === preserveForm });
             void state.release?.();
         });
         [...primitiveSelectStates.keys()].forEach(select => {
+            if (onlyForm && !onlyForm.contains(select)) return;
             // stateRelease retracts the keyboard glue, runs the primitive disposer
             // (which restores the original business DOM) and clears the marker.
             // The LifecycleScope release is idempotent and unregisters itself, so
diff --git a/package.json b/package.json
index 0a7eb9bbd..f22426e7c 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,7 @@
     "test:launchpad-icons": "node --test tests/launchpad-icons.test.js tests/launchpad-controller.test.js",
     "test:next-ui-empty-state": "node scripts/test-next-ui-empty-state.mjs",
     "test:ui-motion-contract": "node scripts/test-ui-motion-contract.mjs",
-    "check:ui-system": "npm run guard:design-subtraction && npm run guard:classic-parity && npm run guard:classic-retirement && npm run guard:next-delta && npm run guard:ui-interaction && npm run guard:ui-async-state && npm run guard:ui-task-journeys && npm run guard:theme-provenance && npm run test:ui-motion-contract && node --check modules/ui-system/lifecycle-scope.js && node --check VCPDistributedServer/frontend-plugin-loader.js && node --check modules/ui-system/component-manifest.js && node --check modules/ui-system/vcp-ui.js && node --check modules/ui-system/webawesome-runtime-manifest.js && node --check modules/ui-system/webawesome-adapter.js && node --check modules/ui-system/appearance-engine.js && node --check modules/ui-system/appearance-studio.js && node --check modules/ui-system/next-ui-apps.js && node --check modules/ui-system/component-showcase.js && node --check modules/ui-system/webawesome-comparison.js && node --check modules/topTabManager.js && npm run lint:ui-system && npm run guard:ui-system && npm run check:ui-applications && npm run test:ui-system && npm run test:appearance-engine && npm run test:appearance-studio && node scripts/test-next-ui-tab-lifecycle.mjs && node scripts/test-webawesome-adapter.mjs && node --test tests/lifecycle-scope.test.js tests/next-ui-registries.test.mjs tests/topic-list-mode-lifecycle.test.js tests/topic-list-load-robustness.test.js tests/settings-unsaved-indicator.test.mjs tests/settings-agent-draft-retention.test.mjs tests/sidebar-resizer-lifecycle.test.mjs tests/topic-list-keyboard.test.js tests/item-list-behavior.test.js tests/settings-section-a11y.test.mjs && npm run test:bootstrap",
+    "check:ui-system": "npm run guard:design-subtraction && npm run guard:classic-parity && npm run guard:classic-retirement && npm run guard:next-delta && npm run guard:ui-interaction && npm run guard:ui-async-state && npm run guard:ui-task-journeys && npm run guard:theme-provenance && npm run test:ui-motion-contract && node --check modules/ui-system/lifecycle-scope.js && node --check VCPDistributedServer/frontend-plugin-loader.js && node --check modules/ui-system/component-manifest.js && node --check modules/ui-system/vcp-ui.js && node --check modules/ui-system/webawesome-runtime-manifest.js && node --check modules/ui-system/webawesome-adapter.js && node --check modules/ui-system/appearance-engine.js && node --check modules/ui-system/appearance-studio.js && node --check modules/ui-system/next-ui-apps.js && node --check modules/ui-system/component-showcase.js && node --check modules/ui-system/webawesome-comparison.js && node --check modules/topTabManager.js && npm run lint:ui-system && npm run guard:ui-system && npm run check:ui-applications && npm run test:ui-system && npm run test:appearance-engine && npm run test:appearance-studio && node scripts/test-next-ui-tab-lifecycle.mjs && node scripts/test-webawesome-adapter.mjs && node --test tests/lifecycle-scope.test.js tests/next-ui-registries.test.mjs tests/topic-list-mode-lifecycle.test.js tests/topic-list-load-robustness.test.js tests/settings-unsaved-indicator.test.mjs tests/settings-agent-draft-retention.test.mjs tests/sidebar-resizer-lifecycle.test.mjs tests/topic-list-keyboard.test.js tests/item-list-behavior.test.js tests/settings-select-projection-forms.test.mjs tests/settings-section-a11y.test.mjs && npm run test:bootstrap",
     "test:appearance-engine": "node scripts/test-appearance-engine.mjs",
     "test:appearance-studio": "node scripts/test-appearance-studio.mjs",
     "test:vcp-ui-select-proxy": "node scripts/test-vcp-ui-select-proxy.mjs",
diff --git a/tests/settings-select-projection-forms.test.mjs b/tests/settings-select-projection-forms.test.mjs
new file mode 100644
index 000000000..ab9f9fa34
--- /dev/null
+++ b/tests/settings-select-projection-forms.test.mjs
@@ -0,0 +1,99 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { JSDOM } from 'jsdom';
+import path from 'node:path';
+import { pathToFileURL, fileURLToPath } from 'node:url';
+
+// The Agent and group settings forms stay mounted side by side. Rebuilding
+// one form's dropdowns after its options change (for example when an Agent's
+// voice list loads) used to tear down every form's dropdowns and observers
+// and remount only its own, so the other form fell back to bare native
+// selects until something else refreshed the surface.
+
+const repoRoot = fileURLToPath(new URL('..', import.meta.url));
+
+function createScope() {
+    let active = true;
+    const records = new Set();
+    const scope = {
+        get active() { return active; },
+        own(disposer) {
+            let released = false;
+            const release = () => {
+                if (released) return Promise.resolve();
+                released = true;
+                records.delete(release);
+                return Promise.resolve(disposer());
+            };
+            records.add(release);
+            return release;
+        },
+        child() {
+            const child = createScope();
+            scope.own(() => child.dispose());
+            return child;
+        },
+        async dispose() {
+            if (!active) return;
+            active = false;
+            await Promise.all([...records].reverse().map(release => release()));
+        },
+    };
+    return scope;
+}
+
+test('rebuilding one form\'s dropdowns leaves the other form\'s dropdowns mounted', async () => {
+    const dom = new JSDOM(`<!doctype html><body>
+        <form id="agentSettingsForm"><select id="voice"><option value="a">A</option><option value="b">B</option></select></form>
+        <form id="groupSettingsForm"><select id="groupMode"><option value="seq">Seq</option><option value="free">Free</option></select></form>
+    </body>`);
+    const keys = ['window', 'document', 'Element', 'Node', 'Event', 'MutationObserver', 'Option', 'HTMLElement'];
+    const previous = Object.fromEntries(keys.map(key => [key, globalThis[key]]));
+    const scope = createScope();
+    try {
+        Object.assign(globalThis, Object.fromEntries(keys.map(key => [key, dom.window[key]])));
+        globalThis.window = dom.window;
+        globalThis.document = dom.window.document;
+        dom.window.VCPUIUX = {
+            mountSelect(select, _props, selectScope) {
+                const parent = select.parentNode;
+                const wrap = dom.window.document.createElement('span');
+                wrap.className = 'vcp-uiux-select';
+                parent.insertBefore(wrap, select);
+                wrap.append(select);
+                return selectScope.own(() => {
+                    if (select.parentNode === wrap) parent.insertBefore(select, wrap);
+                    wrap.remove();
+                });
+            },
+        };
+        const { createSelectProjection } = await import(pathToFileURL(path.join(repoRoot, 'modules/ui-system/settings/select-projection.js')).href);
+        const projection = createSelectProjection({ ensurePresentationScope: () => scope });
+        const doc = dom.window.document;
+        const agentForm = doc.getElementById('agentSettingsForm');
+        const groupForm = doc.getElementById('groupSettingsForm');
+        projection.mount(agentForm);
+        projection.mount(groupForm);
+        const wrapped = form => form.querySelectorAll('.vcp-uiux-select').length;
+        assert.equal(wrapped(agentForm), 1);
+        assert.equal(wrapped(groupForm), 1);
+
+        doc.getElementById('voice').append(new dom.window.Option('C', 'c'));
+        await new Promise(resolve => setTimeout(resolve, 60));
+        assert.equal(wrapped(agentForm), 1, 'the Agent form is remounted with its new options');
+        assert.equal(wrapped(groupForm), 1, 'the group form keeps its dropdown');
+
+        doc.getElementById('groupMode').append(new dom.window.Option('Host', 'host'));
+        await new Promise(resolve => setTimeout(resolve, 60));
+        assert.equal(wrapped(groupForm), 1, 'the group form still reacts to its own option changes');
+        assert.equal(doc.getElementById('groupMode').options.length, 3);
+        assert.equal(wrapped(agentForm), 1, 'and the Agent form is left alone in turn');
+    } finally {
+        await scope.dispose();
+        Object.entries(previous).forEach(([key, value]) => {
+            if (value === undefined) delete globalThis[key];
+            else globalThis[key] = value;
+        });
+        dom.window.close();
+    }
+});

From ae9a99bab696d7f6b834f16a8cf3727e93252de1 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 02:48:56 +0000
Subject: [PATCH 095/143] Side pane batch S: bounded terminal replay without
 per-chunk copies, frame-coalesced output IPC

The mirror replay buffer used to concatenate and slice its full 256 KB
window for every PTY chunk, so a flood of output (npm install, cat of a
large file) made the main process copy hundreds of MB per second. It now
keeps chunks with a head index, drops whole chunks from the front and
joins once when a view attaches, starting the replay at a line boundary.
A test feeds the same output with a 64x larger window and requires the
time to stay flat, following DSH's terminal-io budget.

terminalHandlers coalesces each view's output into one terminal:data per
16 ms (or 64 KB), flushes before exit, drops pending output on clear and
on close. The chat contract's dynamic send site moved to line 68.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DFRovoZHMzeheXKkLNWKG
---
 .../PowerShellExecutor/PowerShellExecutor.js  | 49 +++++++++++---
 docs/contracts/chat-contracts.json            |  2 +-
 .../contracts/generated/chat-event-graph.json | 66 +++++++++----------
 modules/ipc/terminalHandlers.js               | 32 +++++++--
 tests/powershell-output-boundaries.test.js    | 51 +++++++++++++-
 tests/terminal-command-run-watch.test.js      | 36 ++++++++++
 6 files changed, 186 insertions(+), 50 deletions(-)

diff --git a/VCPDistributedServer/Plugin/PowerShellExecutor/PowerShellExecutor.js b/VCPDistributedServer/Plugin/PowerShellExecutor/PowerShellExecutor.js
index 96a0ae662..61dd431e2 100644
--- a/VCPDistributedServer/Plugin/PowerShellExecutor/PowerShellExecutor.js
+++ b/VCPDistributedServer/Plugin/PowerShellExecutor/PowerShellExecutor.js
@@ -742,20 +742,50 @@ function dispatchPtyData(rawData) {
 // 输入与尺寸调整直接落到同一个 PTY，AI 工具执行的命令因此对两处都可见。
 const MIRROR_REPLAY_LIMIT = 256 * 1024;
 const mirrorSinks = new Set();
-let replayBuffer = '';
+// 回放缓存按块存：满了从头部整块丢掉，每块均摊 O(1)，只在挂载回放时拼一次。
+// 原来每块都把 256KB 拼接再切片，刷屏输出时主进程每秒要复制几百 MB（同 DSH terminal-io 的有界缓冲预算）
+let replayChunks = [];
+let replayHead = 0;
+let replayLength = 0;
 let mirrorStartupPending = false;
 let mirrorStartupHeld = '';
 
 function emitMirrorData(dataStr) {
     if (!dataStr) return;
     // 侧栏终端可能在会话进行中才挂载，缓存最近输出用于回放。
-    replayBuffer += dataStr;
-    if (replayBuffer.length > MIRROR_REPLAY_LIMIT) {
-        replayBuffer = replayBuffer.slice(-MIRROR_REPLAY_LIMIT);
-    }
+    appendReplay(dataStr);
     notifyMirrors('onData', dataStr);
 }
 
+function appendReplay(dataStr) {
+    replayChunks.push(dataStr);
+    replayLength += dataStr.length;
+    while (replayLength - replayChunks[replayHead].length >= MIRROR_REPLAY_LIMIT) {
+        replayLength -= replayChunks[replayHead].length;
+        replayChunks[replayHead++] = undefined;
+    }
+    if (replayHead > 1024 && replayHead * 2 > replayChunks.length) {
+        replayChunks = replayChunks.slice(replayHead);
+        replayHead = 0;
+    }
+}
+
+function readReplay() {
+    if (replayLength === 0) return '';
+    const text = replayChunks.slice(replayHead).join('');
+    if (text.length <= MIRROR_REPLAY_LIMIT) return text;
+    // 超出的部分从下一行开头回放，不从控制序列中间切开
+    const kept = text.slice(-MIRROR_REPLAY_LIMIT);
+    const lineStart = kept.indexOf('\n');
+    return lineStart >= 0 && lineStart < 4096 ? kept.slice(lineStart + 1) : kept;
+}
+
+function clearReplay() {
+    replayChunks = [];
+    replayHead = 0;
+    replayLength = 0;
+}
+
 /** 结束启动握手：成功时只放出就绪标记之后的内容（通常是提示符），失败时原样放出便于排查。 */
 function releaseMirrorStartup(afterReady = null) {
     if (!mirrorStartupPending) return;
@@ -782,9 +812,10 @@ function notifyMirrors(method, ...args) {
  */
 function attachMirror(sink) {
     mirrorSinks.add(sink);
-    if (replayBuffer) {
+    const replay = readReplay();
+    if (replay) {
         try {
-            sink.onData(replayBuffer);
+            sink.onData(replay);
         } catch (e) {
             console.error('[PowerShellExecutor] Mirror replay failed:', e);
         }
@@ -886,7 +917,7 @@ function createNewPtySession() {
             guiWindow.webContents.send('powershell-clear');
         }
     }
-    replayBuffer = '';
+    clearReplay();
     notifyMirrors('onClear');
 
     let shell = 'bash';
@@ -1927,7 +1958,7 @@ function cleanup() {
 
     // 4. 确保 ptyProcess 状态被重置
     mirrorSinks.clear();
-    replayBuffer = '';
+    clearReplay();
     mirrorStartupPending = false;
     mirrorStartupHeld = '';
     ptyProcess = null;
diff --git a/docs/contracts/chat-contracts.json b/docs/contracts/chat-contracts.json
index 1dad635b9..1aff4003e 100644
--- a/docs/contracts/chat-contracts.json
+++ b/docs/contracts/chat-contracts.json
@@ -526,7 +526,7 @@
     "dynamicSites": [
       {
         "file": "modules/ipc/terminalHandlers.js",
-        "line": 65,
+        "line": 68,
         "kind": "event-send",
         "match": "sender.send(channel"
       }
diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 9cf842773..fab44397d 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -23248,7 +23248,7 @@
       "producers": [
         {
           "file": "VCPDistributedServer/Plugin/PowerShellExecutor/PowerShellExecutor.js",
-          "line": 886,
+          "line": 917,
           "kind": "event-send"
         }
       ],
@@ -23262,7 +23262,7 @@
       "evidence": [
         {
           "file": "VCPDistributedServer/Plugin/PowerShellExecutor/PowerShellExecutor.js",
-          "line": 886,
+          "line": 917,
           "kind": "event-send",
           "match": "guiWindow.webContents.send('powershell-clear'"
         },
@@ -23779,7 +23779,7 @@
       "producers": [
         {
           "file": "VCPDistributedServer/Plugin/PowerShellExecutor/PowerShellExecutor.js",
-          "line": 1485,
+          "line": 1516,
           "kind": "event-send"
         }
       ],
@@ -23793,7 +23793,7 @@
       "evidence": [
         {
           "file": "VCPDistributedServer/Plugin/PowerShellExecutor/PowerShellExecutor.js",
-          "line": 1485,
+          "line": 1516,
           "kind": "event-send",
           "match": "guiWindow.webContents.send('query-visible-text'"
         },
@@ -28413,7 +28413,7 @@
       "producers": [
         {
           "file": "VCPDistributedServer/Plugin/PowerShellExecutor/PowerShellExecutor.js",
-          "line": 1506,
+          "line": 1537,
           "kind": "event-send"
         }
       ],
@@ -28427,7 +28427,7 @@
       "evidence": [
         {
           "file": "VCPDistributedServer/Plugin/PowerShellExecutor/PowerShellExecutor.js",
-          "line": 1506,
+          "line": 1537,
           "kind": "event-send",
           "match": "guiWindow.webContents.send('terminal-paste-request'"
         },
@@ -28451,14 +28451,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 313,
+          "line": 337,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 313,
+          "line": 337,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:cd'"
         },
@@ -28475,7 +28475,7 @@
       "producers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 189,
+          "line": 209,
           "kind": "event-send"
         }
       ],
@@ -28489,7 +28489,7 @@
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 189,
+          "line": 209,
           "kind": "event-send",
           "match": "emit('terminal:clear'"
         },
@@ -28513,14 +28513,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 285,
+          "line": 309,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 285,
+          "line": 309,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:command-run'"
         },
@@ -28563,14 +28563,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 276,
+          "line": 300,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 276,
+          "line": 300,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:command-runs'"
         },
@@ -28594,14 +28594,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 224,
+          "line": 248,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 224,
+          "line": 248,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:create'"
         },
@@ -28618,7 +28618,7 @@
       "producers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 188,
+          "line": 200,
           "kind": "event-send"
         }
       ],
@@ -28632,7 +28632,7 @@
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 188,
+          "line": 200,
           "kind": "event-send",
           "match": "emit('terminal:data'"
         },
@@ -28649,7 +28649,7 @@
       "producers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 190,
+          "line": 210,
           "kind": "event-send"
         }
       ],
@@ -28663,7 +28663,7 @@
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 190,
+          "line": 210,
           "kind": "event-send",
           "match": "emit('terminal:exit'"
         },
@@ -28687,14 +28687,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 258,
+          "line": 282,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 258,
+          "line": 282,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:kill'"
         },
@@ -28718,14 +28718,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 246,
+          "line": 270,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 246,
+          "line": 270,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:resize'"
         },
@@ -28749,14 +28749,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 264,
+          "line": 288,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 264,
+          "line": 288,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:restart'"
         },
@@ -28780,14 +28780,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 307,
+          "line": 331,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 307,
+          "line": 331,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:unwatch-command-runs'"
         },
@@ -28811,14 +28811,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 296,
+          "line": 320,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 296,
+          "line": 320,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:watch-command-runs'"
         },
@@ -28842,14 +28842,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 233,
+          "line": 257,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 233,
+          "line": 257,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:write'"
         },
@@ -32614,7 +32614,7 @@
     },
     {
       "file": "modules/ipc/terminalHandlers.js",
-      "line": 65,
+      "line": 68,
       "reason": "dynamic event name: channel",
       "kind": "event-send",
       "match": "sender.send(channel",
diff --git a/modules/ipc/terminalHandlers.js b/modules/ipc/terminalHandlers.js
index 1c76a2ffc..c927d69d5 100644
--- a/modules/ipc/terminalHandlers.js
+++ b/modules/ipc/terminalHandlers.js
@@ -40,6 +40,9 @@ const MIN_ROWS = 1;
 const MAX_COLS = 500;
 const MAX_ROWS = 200;
 const RUN_NOTIFY_INTERVAL_MS = 120;
+// 输出按帧合并成一次 IPC：刷屏时每秒上千个小块各发一次，渲染端主线程会被消息排满
+const DATA_FLUSH_MS = 16;
+const DATA_FLUSH_CHARS = 64 * 1024;
 
 let workspaceServiceRef = null;
 let loadExecutor = () => require(EXECUTOR_PATH);
@@ -184,11 +187,32 @@ function createView(event, options = {}) {
     const pending = [];
     let released = false;
     const emit = (channel, payload) => (released ? safeSend(sender, channel, payload) : pending.push([channel, payload]));
-    const detach = executor.attachMirror({
-        onData: (data) => emit('terminal:data', { id, data }),
-        onClear: () => emit('terminal:clear', { id }),
-        onExit: (exitCode) => emit('terminal:exit', { id, exitCode: exitCode ?? null }),
+    let dataBuffer = '';
+    let dataTimer = null;
+    const dropData = () => {
+        if (dataTimer) clearTimeout(dataTimer);
+        dataTimer = null;
+        dataBuffer = '';
+    };
+    const flushData = () => {
+        const data = dataBuffer;
+        dropData();
+        if (data) emit('terminal:data', { id, data });
+    };
+    const detachMirror = executor.attachMirror({
+        onData: (data) => {
+            dataBuffer += data;
+            if (dataBuffer.length >= DATA_FLUSH_CHARS) flushData();
+            else if (!dataTimer) dataTimer = setTimeout(flushData, DATA_FLUSH_MS);
+        },
+        // 清屏之前攒着的输出反正要被清掉；退出前先把剩下的发完，顺序不乱
+        onClear: () => { dropData(); emit('terminal:clear', { id }); },
+        onExit: (exitCode) => { flushData(); emit('terminal:exit', { id, exitCode: exitCode ?? null }); },
     });
+    const detach = () => {
+        dropData();
+        detachMirror();
+    };
     setImmediate(() => {
         released = true;
         for (const [channel, payload] of pending.splice(0)) safeSend(sender, channel, payload);
diff --git a/tests/powershell-output-boundaries.test.js b/tests/powershell-output-boundaries.test.js
index cc3648f14..8ed59ee23 100644
--- a/tests/powershell-output-boundaries.test.js
+++ b/tests/powershell-output-boundaries.test.js
@@ -93,13 +93,15 @@ test('the startup handshake is held back from the side-pane mirror until PowerSh
     vm.createContext(context);
     vm.runInContext([
         'const MIRROR_REPLAY_LIMIT = 1024;',
-        "var replayBuffer = '';",
+        'var replayChunks = [], replayHead = 0, replayLength = 0;',
+        pick('appendReplay'),
+        pick('readReplay'),
         'var mirrorStartupPending = true;',
         "var mirrorStartupHeld = '';",
         pick('emitMirrorData'),
         pick('releaseMirrorStartup'),
         pick('dispatchPtyData'),
-        'this.release = releaseMirrorStartup; this.getReplay = () => replayBuffer;'
+        'this.release = releaseMirrorStartup; this.getReplay = readReplay;'
     ].join('\n'), context);
     context.dispatchPtyData("[Console]::OutputEncoding = ...; Write-Host $__vcpReady\r\n__VCP_PTY_READY_x__\r\n");
     assert.deepEqual(notified, [], 'nothing reaches the side pane during startup');
@@ -107,4 +109,47 @@ test('the startup handshake is held back from the side-pane mirror until PowerSh
     context.dispatchPtyData('dir\r\n');
     assert.deepEqual(notified.map(([, data]) => data), ['PS C:\\> ', 'dir\r\n']);
     assert.equal(context.getReplay(), 'PS C:\\> dir\r\n');
-});
\ No newline at end of file
+});
+function loadReplayBuffer(limit) {
+    const source = fs.readFileSync(path.join(__dirname, '../VCPDistributedServer/Plugin/PowerShellExecutor/PowerShellExecutor.js'), 'utf8');
+    const pick = name => {
+        const begin = source.indexOf(`function ${name}(`);
+        return source.slice(begin, source.indexOf('\n}', begin) + 2);
+    };
+    const context = {};
+    vm.createContext(context);
+    vm.runInContext([
+        `const MIRROR_REPLAY_LIMIT = ${limit};`,
+        'var replayChunks = [], replayHead = 0, replayLength = 0;',
+        pick('appendReplay'), pick('readReplay'), pick('clearReplay'),
+        'this.append = appendReplay; this.read = readReplay; this.clear = clearReplay;'
+    ].join('\n'), context);
+    return context;
+}
+
+test('the mirror replay keeps the latest output from a line start and forgets it on clear', () => {
+    const replay = loadReplayBuffer(64);
+    for (let i = 0; i < 40; i++) replay.append(`line ${String(i).padStart(2, '0')}\r\n`);
+    const text = replay.read();
+    assert.ok(text.length <= 64);
+    assert.ok(text.startsWith('line '), 'replay starts at a line, not in the middle of one');
+    assert.ok(text.endsWith('line 39\r\n'));
+    replay.clear();
+    assert.equal(replay.read(), '');
+});
+
+test('appending to a full mirror replay does not rescan the retained window on every chunk', () => {
+    // 同 DSH terminal-io.bench：容量放大 64 倍，喂同样多的输出，耗时不能跟着放大
+    const chunk = 'x'.repeat(63) + '\n';
+    const feed = limit => {
+        const replay = loadReplayBuffer(limit);
+        const started = process.hrtime.bigint();
+        for (let i = 0; i < 16384; i++) replay.append(chunk);
+        replay.read();
+        return Number(process.hrtime.bigint() - started) / 1e6;
+    };
+    const median = limit => [feed(limit), feed(limit), feed(limit)].sort((a, b) => a - b)[1];
+    const small = median(8 * 1024);
+    const large = median(512 * 1024);
+    assert.ok(large <= small * 4 + 25, `small window ${small.toFixed(1)}ms, large window ${large.toFixed(1)}ms`);
+});
diff --git a/tests/terminal-command-run-watch.test.js b/tests/terminal-command-run-watch.test.js
index 373a512c5..b841decd7 100644
--- a/tests/terminal-command-run-watch.test.js
+++ b/tests/terminal-command-run-watch.test.js
@@ -132,3 +132,39 @@ test('jump-to-workspace quotes curly apostrophes for PowerShell and refuses path
     assert.equal(buildChangeDirectoryCommand("/home/it's", 'linux'), "cd '/home/it'\\''s'");
     assert.throws(() => buildChangeDirectoryCommand('C:\\a\nRemove-Item x', 'win32'), /换行/);
 });
+
+test('mirror output is coalesced into one IPC per frame; exit flushes first and kill drops the rest', async () => {
+    let sink = null;
+    let detached = 0;
+    terminalHandlers.initialize({
+        executorLoader: () => ({
+            getSessionState: () => ({ pid: 1, cols: 80, rows: 24 }),
+            resizeSession() {},
+            ensureMirrorSession: () => ({ pid: 1 }),
+            attachMirror(next) { sink = next; return () => { detached += 1; }; }
+        }),
+        commandRunStoreLoader: () => createFakeRunStore()
+    });
+    const page = new FakeSender();
+    const { data: { id } } = await call('terminal:create', page, {});
+    await wait(0);
+    const dataMessages = () => page.sent.filter(m => m.channel === 'terminal:data').map(m => m.payload.data);
+
+    for (let i = 0; i < 500; i++) sink.onData('x');
+    assert.deepEqual(dataMessages(), [], 'nothing is sent per chunk');
+    await wait(40);
+    assert.deepEqual(dataMessages(), ['x'.repeat(500)]);
+
+    sink.onData('a'.repeat(70 * 1024));
+    assert.equal(dataMessages().length, 2, 'a large burst goes out without waiting for the frame');
+
+    sink.onData('bye');
+    sink.onExit(0);
+    assert.deepEqual(page.sent.slice(-2).map(m => m.channel), ['terminal:data', 'terminal:exit']);
+
+    sink.onData('late');
+    await call('terminal:kill', page, id);
+    await wait(40);
+    assert.equal(dataMessages().at(-1), 'bye', 'output buffered when the view closed is not sent');
+    assert.equal(detached, 1);
+});

From 3931887dd12fd37b6f193dc72a9aa9529c414bd1 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 02:50:08 +0000
Subject: [PATCH 096/143] Settings: bind MiMo director editors to the slot's
 own scope

The draft editor and prompt rows listened on the long-lived settings scope,
so disposing the slot left them behind and each remount added another
copy of every handler.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012AP71nAxrCFEpH7st6asf9
---
 .../settings/settings-sidebar-slots.js        |  8 +-
 package.json                                  |  2 +-
 tests/settings-mimo-slot-lifecycle.test.mjs   | 79 +++++++++++++++++++
 3 files changed, 84 insertions(+), 5 deletions(-)
 create mode 100644 tests/settings-mimo-slot-lifecycle.test.mjs

diff --git a/modules/ui-system/settings/settings-sidebar-slots.js b/modules/ui-system/settings/settings-sidebar-slots.js
index 35f217716..5242a4919 100644
--- a/modules/ui-system/settings/settings-sidebar-slots.js
+++ b/modules/ui-system/settings/settings-sidebar-slots.js
@@ -125,15 +125,15 @@ class MimoDirectorSlot {
 
     bindEditor(editor, onInput) {
         if (!editor) return;
-        this.scope.listen(editor, 'focus', () => {
+        this.slotScope.listen(editor, 'focus', () => {
             this.setEditing(true, editor);
             this.resize(editor, true);
         }, undefined, 'mimo-director-focus');
-        this.scope.listen(editor, 'input', () => {
+        this.slotScope.listen(editor, 'input', () => {
             onInput?.(editor.value);
             this.resize(editor, true);
         }, undefined, 'mimo-director-input');
-        this.scope.listen(editor, 'blur', () => {
+        this.slotScope.listen(editor, 'blur', () => {
             this.setEditing(false, editor);
             this.resize(editor, false);
         }, undefined, 'mimo-director-blur');
@@ -171,7 +171,7 @@ class MimoDirectorSlot {
         this.rowScopes.clear();
         this.list.replaceChildren();
         this.prompts.forEach((prompt, index) => {
-            const rowScope = this.scope.child(`mimo-director-row-${index}`);
+            const rowScope = this.slotScope.child(`mimo-director-row-${index}`);
             this.rowScopes.add(rowScope);
             const row = doc.createElement('div');
             row.className = 'tts-director-item';
diff --git a/package.json b/package.json
index f22426e7c..77b23e650 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,7 @@
     "test:launchpad-icons": "node --test tests/launchpad-icons.test.js tests/launchpad-controller.test.js",
     "test:next-ui-empty-state": "node scripts/test-next-ui-empty-state.mjs",
     "test:ui-motion-contract": "node scripts/test-ui-motion-contract.mjs",
-    "check:ui-system": "npm run guard:design-subtraction && npm run guard:classic-parity && npm run guard:classic-retirement && npm run guard:next-delta && npm run guard:ui-interaction && npm run guard:ui-async-state && npm run guard:ui-task-journeys && npm run guard:theme-provenance && npm run test:ui-motion-contract && node --check modules/ui-system/lifecycle-scope.js && node --check VCPDistributedServer/frontend-plugin-loader.js && node --check modules/ui-system/component-manifest.js && node --check modules/ui-system/vcp-ui.js && node --check modules/ui-system/webawesome-runtime-manifest.js && node --check modules/ui-system/webawesome-adapter.js && node --check modules/ui-system/appearance-engine.js && node --check modules/ui-system/appearance-studio.js && node --check modules/ui-system/next-ui-apps.js && node --check modules/ui-system/component-showcase.js && node --check modules/ui-system/webawesome-comparison.js && node --check modules/topTabManager.js && npm run lint:ui-system && npm run guard:ui-system && npm run check:ui-applications && npm run test:ui-system && npm run test:appearance-engine && npm run test:appearance-studio && node scripts/test-next-ui-tab-lifecycle.mjs && node scripts/test-webawesome-adapter.mjs && node --test tests/lifecycle-scope.test.js tests/next-ui-registries.test.mjs tests/topic-list-mode-lifecycle.test.js tests/topic-list-load-robustness.test.js tests/settings-unsaved-indicator.test.mjs tests/settings-agent-draft-retention.test.mjs tests/sidebar-resizer-lifecycle.test.mjs tests/topic-list-keyboard.test.js tests/item-list-behavior.test.js tests/settings-select-projection-forms.test.mjs tests/settings-section-a11y.test.mjs && npm run test:bootstrap",
+    "check:ui-system": "npm run guard:design-subtraction && npm run guard:classic-parity && npm run guard:classic-retirement && npm run guard:next-delta && npm run guard:ui-interaction && npm run guard:ui-async-state && npm run guard:ui-task-journeys && npm run guard:theme-provenance && npm run test:ui-motion-contract && node --check modules/ui-system/lifecycle-scope.js && node --check VCPDistributedServer/frontend-plugin-loader.js && node --check modules/ui-system/component-manifest.js && node --check modules/ui-system/vcp-ui.js && node --check modules/ui-system/webawesome-runtime-manifest.js && node --check modules/ui-system/webawesome-adapter.js && node --check modules/ui-system/appearance-engine.js && node --check modules/ui-system/appearance-studio.js && node --check modules/ui-system/next-ui-apps.js && node --check modules/ui-system/component-showcase.js && node --check modules/ui-system/webawesome-comparison.js && node --check modules/topTabManager.js && npm run lint:ui-system && npm run guard:ui-system && npm run check:ui-applications && npm run test:ui-system && npm run test:appearance-engine && npm run test:appearance-studio && node scripts/test-next-ui-tab-lifecycle.mjs && node scripts/test-webawesome-adapter.mjs && node --test tests/lifecycle-scope.test.js tests/next-ui-registries.test.mjs tests/topic-list-mode-lifecycle.test.js tests/topic-list-load-robustness.test.js tests/settings-unsaved-indicator.test.mjs tests/settings-agent-draft-retention.test.mjs tests/sidebar-resizer-lifecycle.test.mjs tests/topic-list-keyboard.test.js tests/item-list-behavior.test.js tests/settings-select-projection-forms.test.mjs tests/settings-mimo-slot-lifecycle.test.mjs tests/settings-section-a11y.test.mjs && npm run test:bootstrap",
     "test:appearance-engine": "node scripts/test-appearance-engine.mjs",
     "test:appearance-studio": "node scripts/test-appearance-studio.mjs",
     "test:vcp-ui-select-proxy": "node scripts/test-vcp-ui-select-proxy.mjs",
diff --git a/tests/settings-mimo-slot-lifecycle.test.mjs b/tests/settings-mimo-slot-lifecycle.test.mjs
new file mode 100644
index 000000000..4b737d182
--- /dev/null
+++ b/tests/settings-mimo-slot-lifecycle.test.mjs
@@ -0,0 +1,79 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { JSDOM } from 'jsdom';
+import path from 'node:path';
+import { pathToFileURL, fileURLToPath } from 'node:url';
+
+// The MiMo director slot bound its draft editor to the long-lived settings
+// scope instead of its own, so disposing the slot left those listeners
+// behind and every remount added another copy.
+
+const repoRoot = fileURLToPath(new URL('..', import.meta.url));
+const { MimoDirectorSlot } = await import(pathToFileURL(path.join(repoRoot, 'modules/ui-system/settings/settings-sidebar-slots.js')).href);
+
+function createScope() {
+    let active = true;
+    const records = new Set();
+    const scope = {
+        get active() { return active; },
+        own(disposer) {
+            const release = () => { if (records.delete(release)) disposer(); };
+            records.add(release);
+            return release;
+        },
+        listen(target, type, handler, options) {
+            target.addEventListener(type, handler, options);
+            return scope.own(() => target.removeEventListener(type, handler, options));
+        },
+        child() {
+            const child = createScope();
+            scope.own(() => child.dispose());
+            return child;
+        },
+        dispose() {
+            if (!active) return;
+            active = false;
+            [...records].reverse().forEach(release => release());
+        },
+    };
+    return scope;
+}
+
+test('disposing and remounting the MiMo slot leaves one set of editor listeners', () => {
+    const dom = new JSDOM(`<form id="agentSettingsForm"><div class="tts-director-settings">
+        <textarea id="agentTtsDirectorPromptInput"></textarea>
+        <button type="button" id="fillAgentTtsDirectorTemplateBtn"></button>
+        <button type="button" id="addAgentTtsDirectorPromptBtn"></button>
+        <div id="agentTtsDirectorPromptsContainer"></div>
+    </div></form>`);
+    try {
+        const form = dom.window.document.querySelector('form');
+        const input = form.querySelector('#agentTtsDirectorPromptInput');
+        let writes = 0;
+        const manager = {
+            getTtsDirectorPrompts: () => ['已有提示'],
+            setTtsDirectorPrompts: () => { writes += 1; },
+        };
+        const settingsScope = createScope();
+        const type = target => target.dispatchEvent(new dom.window.Event('input', { bubbles: true }));
+
+        const first = new MimoDirectorSlot({ form, scope: settingsScope, manager }).mount();
+        type(input);
+        assert.equal(writes, 1);
+
+        first.dispose();
+        writes = 0;
+        type(input);
+        assert.equal(writes, 0, 'a disposed slot no longer reacts to the draft editor');
+
+        new MimoDirectorSlot({ form, scope: settingsScope, manager }).mount();
+        type(input);
+        assert.equal(writes, 1, 'a remounted slot writes once per edit');
+
+        writes = 0;
+        type(form.querySelector('.tts-director-editor'));
+        assert.equal(writes, 1, 'existing prompt rows are bound once as well');
+    } finally {
+        dom.window.close();
+    }
+});

From 85313c6fc16b0f0f565864950af82a533d3f4bb5 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 02:50:20 +0000
Subject: [PATCH 097/143] Main chat code blocks: keep the side view button
 clickable

Both the side view and copy buttons were pinned to the same top-right
corner, so the copy button covered the side view button completely and
clicking there only copied. Put them in one .vcp-codeblock-actions row,
the same toolbar HTML preview blocks already use.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019L2bZomLn4NVoxS4Rv5Bkv
---
 .../contracts/generated/chat-event-graph.json | 12 ++++-----
 modules/renderer/contentProcessor.js          |  7 +++--
 styles/messageRenderer.css                    |  4 ---
 tests/content-processor-owner.test.mjs        | 26 +++++++++++++++++++
 4 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 147819776..b0e1661c1 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -3601,12 +3601,12 @@
         },
         {
           "file": "modules/renderer/contentProcessor.js",
-          "line": 837,
+          "line": 840,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/renderer/contentProcessor.js",
-          "line": 997,
+          "line": 1000,
           "kind": "custom-event-listener"
         },
         {
@@ -5054,13 +5054,13 @@
         },
         {
           "file": "modules/renderer/contentProcessor.js",
-          "line": 837,
+          "line": 840,
           "kind": "custom-event-listener",
           "match": "actionBtn.addEventListener('click'"
         },
         {
           "file": "modules/renderer/contentProcessor.js",
-          "line": 997,
+          "line": 1000,
           "kind": "custom-event-listener",
           "match": "button.addEventListener('click'"
         },
@@ -18187,7 +18187,7 @@
         },
         {
           "file": "modules/renderer/contentProcessor.js",
-          "line": 926,
+          "line": 929,
           "kind": "custom-event-listener"
         },
         {
@@ -18234,7 +18234,7 @@
         },
         {
           "file": "modules/renderer/contentProcessor.js",
-          "line": 926,
+          "line": 929,
           "kind": "custom-event-listener",
           "match": "ownerWindow.addEventListener('message'"
         },
diff --git a/modules/renderer/contentProcessor.js b/modules/renderer/contentProcessor.js
index 6bed6492f..f85865eb9 100644
--- a/modules/renderer/contentProcessor.js
+++ b/modules/renderer/contentProcessor.js
@@ -688,9 +688,12 @@ function setupSingleCodeCopyButton(preElement, rawText) {
         actions.insertBefore(copyButton, actions.firstChild);
         previewContainer.classList.add('has-code-copy');
     } else {
+        // 两个按钮放进同一行，各自绝对定位会叠在同一个角上，「复制」把「副屏」整个盖住
+        const actions = document.createElement('div');
+        actions.className = 'vcp-codeblock-actions';
+        actions.append(sideViewBtn, copyButton);
         preElement.classList.add('vcp-codeblock-with-copy');
-        preElement.appendChild(sideViewBtn);
-        preElement.appendChild(copyButton);
+        preElement.appendChild(actions);
     }
 
     preElement.dataset.vcpCodeCopy = 'true';
diff --git a/styles/messageRenderer.css b/styles/messageRenderer.css
index df5ba9124..02d02a935 100755
--- a/styles/messageRenderer.css
+++ b/styles/messageRenderer.css
@@ -2627,10 +2627,6 @@ body[data-vcp-theme="light"] .message-item .md-content pre .hljs-meta {
 }
 
 .md-content pre.vcp-codeblock-with-copy .vcp-code-copy-button {
-    position: absolute;
-    top: 8px;
-    right: 8px;
-    z-index: 4;
     opacity: 0;
 }
 
diff --git a/tests/content-processor-owner.test.mjs b/tests/content-processor-owner.test.mjs
index e49dcb080..f337b62bc 100644
--- a/tests/content-processor-owner.test.mjs
+++ b/tests/content-processor-owner.test.mjs
@@ -118,3 +118,29 @@ test('HTML code preview is sandboxed without same-origin authority', () => {
     processor.dispose();
     dom.window.close();
 });
+
+test('long code blocks keep the side view and copy buttons side by side in one toolbar', () => {
+    const lines = Array.from({ length: 8 }, (_, i) => `line ${i}`).join('\n');
+    const dom = new JSDOM(`<body><div id="chat"><div class="md-content"><pre><code class="language-js">${lines}</code></pre></div></div></body>`);
+    const root = dom.window.document.getElementById('chat');
+    const processor = createContentProcessor();
+    processor.initializeContentProcessor({ chatMessagesDiv: root, messageCommands: {}, uiHelper: {} });
+    const previousDocument = globalThis.document;
+    globalThis.document = dom.window.document;
+    try {
+        processor.processRenderedContent(root.querySelector('.md-content'), {});
+    } finally {
+        globalThis.document = previousDocument;
+    }
+
+    const pre = root.querySelector('pre');
+    const toolbars = pre.querySelectorAll(':scope > .vcp-codeblock-actions');
+    assert.equal(toolbars.length, 1);
+    assert.deepEqual(
+        [...toolbars[0].children].map(button => button.getAttribute('aria-label')),
+        ['侧边副屏查看', '复制代码'],
+        'each button pinned to the same corner on its own lets the copy button cover the side view button'
+    );
+    processor.dispose();
+    dom.window.close();
+});

From 949a0fddbf8e7319cbdc43a6b09855ff5bf029f3 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 02:52:16 +0000
Subject: [PATCH 098/143] Side pane batch T: webview preferences allow-list, no
 restart prompt for an exited shell

will-attach-webview now drops every page-supplied web preference except
disablePopups, strips disablewebsecurity/plugins/blinkfeatures from the
attach params, pins webviewTag/plugins/navigateOnDragDrop off and devtools
to unpackaged builds, and guests cannot attach nested webviews (as DSH
browser-guests does). Restarting a terminal whose shell already exited no
longer shows the blocking "commands will be aborted" confirm.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DFRovoZHMzeheXKkLNWKG
---
 .../contracts/generated/chat-event-graph.json | 43 ++++++++++++-------
 modules/ipc/browserHandlers.js                | 20 +++++++--
 .../side-pane/terminalSideProvider.js         |  3 +-
 tests/browser-handlers.test.js                | 13 +++++-
 tests/side-pane-terminal-lifecycle.test.mjs   | 12 ++++++
 5 files changed, 69 insertions(+), 22 deletions(-)

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index fab44397d..5200f6712 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -665,7 +665,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 294,
+          "line": 295,
           "kind": "custom-event-listener"
         },
         {
@@ -730,7 +730,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 294,
+          "line": 295,
           "kind": "custom-event-listener",
           "match": "signal?.addEventListener('abort'"
         },
@@ -1276,14 +1276,14 @@
       "consumers": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 160,
+          "line": 174,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 160,
+          "line": 174,
           "kind": "event-listener",
           "match": "guest.on('before-input-event'"
         }
@@ -1874,14 +1874,14 @@
       "consumers": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 186,
+          "line": 200,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 186,
+          "line": 200,
           "kind": "event-listener",
           "match": "ipcMain.handle('browser:clear-data'"
         },
@@ -1905,14 +1905,14 @@
       "consumers": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 175,
+          "line": 189,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 175,
+          "line": 189,
           "kind": "event-listener",
           "match": "ipcMain.handle('browser:open-external'"
         },
@@ -10032,14 +10032,14 @@
       "consumers": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 144,
+          "line": 156,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 144,
+          "line": 156,
           "kind": "event-listener",
           "match": "host.on('did-attach-webview'"
         }
@@ -15078,14 +15078,14 @@
       "consumers": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 146,
+          "line": 158,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 146,
+          "line": 158,
           "kind": "event-listener",
           "match": "guest.on('input-event'"
         }
@@ -31788,6 +31788,11 @@
           "file": "modules/ipc/browserHandlers.js",
           "line": 125,
           "kind": "event-listener"
+        },
+        {
+          "file": "modules/ipc/browserHandlers.js",
+          "line": 173,
+          "kind": "event-listener"
         }
       ],
       "evidence": [
@@ -31796,6 +31801,12 @@
           "line": 125,
           "kind": "event-listener",
           "match": "host.on('will-attach-webview'"
+        },
+        {
+          "file": "modules/ipc/browserHandlers.js",
+          "line": 173,
+          "kind": "event-listener",
+          "match": "guest.on('will-attach-webview'"
         }
       ]
     },
@@ -31829,7 +31840,7 @@
         },
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 158,
+          "line": 170,
           "kind": "event-listener"
         },
         {
@@ -31847,7 +31858,7 @@
         },
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 158,
+          "line": 170,
           "kind": "event-listener",
           "match": "guest.on('will-navigate'"
         },
@@ -31895,14 +31906,14 @@
       "consumers": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 159,
+          "line": 171,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 159,
+          "line": 171,
           "kind": "event-listener",
           "match": "guest.on('will-redirect'"
         }
diff --git a/modules/ipc/browserHandlers.js b/modules/ipc/browserHandlers.js
index 29d0e6d3f..f8672d6ec 100644
--- a/modules/ipc/browserHandlers.js
+++ b/modules/ipc/browserHandlers.js
@@ -13,7 +13,7 @@
 // - 焦点在网页里时按键到不了主窗口，副屏快捷键在这里截下转给主窗口。
 'use strict';
 
-const { ipcMain: defaultIpcMain, session, shell } = require('electron');
+const { app, ipcMain: defaultIpcMain, session, shell } = require('electron');
 const { createApplicationSenderGuard, resolveWindowWebContents } = require('./applicationSender');
 let getMainWindow = () => null;
 // initialize 可以传入领域激活器给的 ipcMain（见 domainActivator.js），不传就用 Electron 的
@@ -127,10 +127,18 @@ function attachToWindow(mainWindow) {
             event.preventDefault();
             return;
         }
-        delete webPreferences.preload;
-        delete webPreferences.preloadURL;
+        // 白名单而不是黑名单：页面 webpreferences 属性里带进来的其他键（experimentalFeatures 之类）一律去掉，
+        // 只留 allowpopups 对应的 disablePopups（弹窗仍由 setWindowOpenHandler 拒掉后转成侧栏标签）。同 DSH browser-guests
+        for (const key of Object.keys(webPreferences)) {
+            if (key !== 'disablePopups') delete webPreferences[key];
+        }
+        delete params.disablewebsecurity;
+        delete params.plugins;
+        delete params.blinkfeatures;
+        delete params.disableblinkfeatures;
         Object.assign(webPreferences, {
             nodeIntegration: false,
+            nodeIntegrationInWorker: false,
             nodeIntegrationInSubFrames: false,
             contextIsolation: true,
             sandbox: true,
@@ -138,6 +146,10 @@ function attachToWindow(mainWindow) {
             allowRunningInsecureContent: false,
             // 网页的 alert/confirm/prompt 会以应用窗口名义弹原生模态框（可仿冒应用提示）并卡住主窗口；同 DSH browser-guests 直接禁用
             disableDialogs: true,
+            webviewTag: false,
+            plugins: false,
+            navigateOnDragDrop: false,
+            devTools: !app?.isPackaged,
         });
     });
 
@@ -157,6 +169,8 @@ function attachToWindow(mainWindow) {
         };
         guest.on('will-navigate', blockForeignProtocol);
         guest.on('will-redirect', blockForeignProtocol);
+        // 网页里不能再嵌 <webview>
+        guest.on('will-attach-webview', event => event.preventDefault());
         guest.on('before-input-event', (event, input) => {
             const shortcut = matchSidePaneShortcut(input);
             if (!shortcut || host.isDestroyed()) return;
diff --git a/modules/ui-system/side-pane/terminalSideProvider.js b/modules/ui-system/side-pane/terminalSideProvider.js
index bd7a8e558..df60790b7 100644
--- a/modules/ui-system/side-pane/terminalSideProvider.js
+++ b/modules/ui-system/side-pane/terminalSideProvider.js
@@ -256,7 +256,8 @@ export function createTerminalSideProvider({
         session.restart = () => {
             if (session.disposed) return Promise.resolve();
             if (session.connectionOperation) return session.connectionOperation;
-            if (session.sessionId && !doc.defaultView.confirm('重新启动共享终端？AI 工具、终端窗口和所有侧栏视图的当前命令都会中止。')) return;
+            // shell 已经退出时没有可中止的命令，直接重启，不再问
+            if (session.sessionId && !session.exited && !doc.defaultView.confirm('重新启动共享终端？AI 工具、终端窗口和所有侧栏视图的当前命令都会中止。')) return;
             if (!session.sessionId) return session.attach();
             return runConnection(async () => {
                 setStatus('重启中...');
diff --git a/tests/browser-handlers.test.js b/tests/browser-handlers.test.js
index dccca01ac..a9453c527 100644
--- a/tests/browser-handlers.test.js
+++ b/tests/browser-handlers.test.js
@@ -71,9 +71,15 @@ test('attachToWindow locks the partition and strips privileged web preferences',
     host.emit('will-attach-webview', event, {}, { partition: browserHandlers.BROWSER_PARTITION, src: 'vcp://x' });
     assert.equal(prevented, 2);
 
-    const prefs = { preload: 'x.js', preloadURL: 'file:///x.js', nodeIntegration: true, sandbox: false };
-    host.emit('will-attach-webview', event, prefs, { partition: browserHandlers.BROWSER_PARTITION, src: 'https://a.example' });
+    const prefs = { preload: 'x.js', preloadURL: 'file:///x.js', nodeIntegration: true, sandbox: false, experimentalFeatures: true, disablePopups: false };
+    const params = { partition: browserHandlers.BROWSER_PARTITION, src: 'https://a.example', disablewebsecurity: '', plugins: '', blinkfeatures: 'X' };
+    host.emit('will-attach-webview', event, prefs, params);
     assert.equal(prevented, 2);
+    assert.equal('experimentalFeatures' in prefs, false, 'unknown preferences from the page are dropped');
+    assert.equal(prefs.disablePopups, false, 'allowpopups still reaches the window-open handler');
+    assert.equal(prefs.webviewTag, false);
+    assert.equal(prefs.plugins, false);
+    assert.deepEqual(Object.keys(params).sort(), ['partition', 'src']);
     assert.equal('preload' in prefs, false);
     assert.equal('preloadURL' in prefs, false);
     assert.equal(prefs.nodeIntegration, false);
@@ -85,6 +91,9 @@ test('attachToWindow locks the partition and strips privileged web preferences',
     guest.setWindowOpenHandler = (fn) => { guest.openHandler = fn; };
     guest.getURL = () => 'https://a.example/';
     host.emit('did-attach-webview', {}, guest);
+    const nested = { prevented: false, preventDefault() { this.prevented = true; } };
+    guest.emit('will-attach-webview', nested);
+    assert.equal(nested.prevented, true, 'a page cannot nest its own webview');
     // 没有用户输入的弹窗不开标签，鼠标移动也不算
     assert.deepEqual(guest.openHandler({ url: 'https://a.example/x' }), { action: 'deny' });
     guest.emit('input-event', {}, { type: 'mouseMove' });
diff --git a/tests/side-pane-terminal-lifecycle.test.mjs b/tests/side-pane-terminal-lifecycle.test.mjs
index 2514ec512..90b90cd75 100644
--- a/tests/side-pane-terminal-lifecycle.test.mjs
+++ b/tests/side-pane-terminal-lifecycle.test.mjs
@@ -113,6 +113,18 @@ test('repeated restart shares one destructive request and recovers from a reject
     } finally { pending.resolve({ success: true }); await h.cleanup(); }
 });
 
+test('restarting a shell that already exited does not ask about aborting commands', async () => {
+    const h = fixture();
+    try {
+        await h.provider.openTerminalTab();
+        await until(() => h.status().dataset.state === 'connected');
+        h.listeners.get('exit')({ id: 'view:1', exitCode: 0 });
+        h.retry().click();
+        await until(() => h.restarts.length === 1);
+        assert.equal(h.confirmations, 0);
+    } finally { await h.cleanup(); }
+});
+
 test('a late retry result releases only its own view after the tab closes', async () => {
     const pending = Promise.withResolvers();
     let calls = 0;

From f6e0c89c0d6965bde9f042c5f438f9c805344e8c Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 02:56:04 +0000
Subject: [PATCH 099/143] Side chat: a failed non-streaming reply save is no
 longer reported as done

With streaming off, the reply's save result was ignored and the
operation settled completed, so the auxiliary chat showed no unsaved
badge and closed freely; the answer was gone after a restart. It now
settles failed with a persistence error, which the side chat already
turns into the badge and close guard. save-chat-history also returns
success: false on error, like the group handler, so callers that check
success === false see it. Updated the next-delta baseline for
chatManager.js and added the test to test:workbench.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_016hW799u5Ji5k9khDAwu688
---
 modules/chatManager.js                      | 12 ++-
 modules/ipc/chatHandlers.js                 |  2 +-
 package.json                                |  2 +-
 scripts/next-delta-shared-baseline.json     |  4 +-
 tests/helpers/side-chat-surface-fixture.mjs | 99 +++++++++++++++++++++
 tests/side-chat-save-failure.test.mjs       | 24 +++++
 6 files changed, 136 insertions(+), 7 deletions(-)
 create mode 100644 tests/helpers/side-chat-surface-fixture.mjs
 create mode 100644 tests/side-chat-save-failure.test.mjs

diff --git a/modules/chatManager.js b/modules/chatManager.js
index ee605989a..e08abe861 100755
--- a/modules/chatManager.js
+++ b/modules/chatManager.js
@@ -1853,13 +1853,16 @@ export const chatManager = (() => {
 
                     // Fetch the correct history from the file, update it, and save it back.
                     const historyForSave = await getHistory(responseContext.agentId, responseContext.itemType || 'agent', responseContext.topicId);
+                    let persistenceError = null;
                     if (historyForSave && !historyForSave.error) {
                         // Remove any lingering 'thinking' message and add the new one
                         const finalHistory = historyForSave.filter(msg => msg.id !== thinkingMessage.id);
                         finalHistory.push(assistantMessage);
                         
                         // Save the final, complete history to the correct file
-                        await saveHistory(responseContext.agentId, responseContext.itemType || 'agent', responseContext.topicId, finalHistory);
+                        const finalSave = await saveHistory(responseContext.agentId, responseContext.itemType || 'agent', responseContext.topicId, finalHistory);
+                        // 和流式一样：没存下来就按保存失败收尾，侧栏辅助对话据此亮「保存失败」并拦住关闭，而不是当作已完成
+                        if (finalSave?.success === false || finalSave?.error) persistenceError = finalSave.error || '保存聊天记录失败';
 
                         if (isForActiveChat) {
                             // If it's the active chat, also update the UI and in-memory state
@@ -1871,9 +1874,12 @@ export const chatManager = (() => {
                             console.log(`[ChatManager] Saved non-streaming response for background chat: Agent ${responseContext.agentId}, Topic ${responseContext.topicId}`);
                         }
                     } else {
-                         console.error(`[ChatManager] Failed to get history for background save:`, historyForSave.error);
+                         console.error(`[ChatManager] Failed to get history for background save:`, historyForSave?.error);
+                         persistenceError = historyForSave?.error || '读取聊天记录失败';
                     }
-                    settleOwnedStreamOperation?.({ event: { type: 'completed' } });
+                    settleOwnedStreamOperation?.({ event: persistenceError
+                        ? { type: 'failed', outcome: { persistence: { error: persistenceError } } }
+                        : { type: 'completed' } });
                 } else {
                     await removeThinkingFromSource();
                     settleOwnedStreamOperation?.({ event: { type: 'failed', outcome: { transport: { error: 'Unknown response format' } } } });
diff --git a/modules/ipc/chatHandlers.js b/modules/ipc/chatHandlers.js
index ba4743e90..806e0566f 100644
--- a/modules/ipc/chatHandlers.js
+++ b/modules/ipc/chatHandlers.js
@@ -635,7 +635,7 @@ function initialize(mainWindow, context) {
             return { success: true };
         } catch (error) {
             console.error(`保存Agent ${agentId} 话题 ${topicId} 聊天历史失败:`, error);
-            return { error: error.message };
+            return { success: false, error: error.message }; // 同群组：调用方都按 success === false 判失败
         }
     });
 
diff --git a/package.json b/package.json
index 7b88a72d2..5e98b82e7 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
     "test:built-artifact-smoke": "node scripts/test-built-artifact-smoke.mjs",
     "test:chat-transcript-snapshot": "node scripts/test-chat-transcript-snapshot.mjs",
     "test:side-pane": "node --test tests/side-pane-*.test.mjs tests/side-chat-*.test.mjs tests/side-browser-address.test.mjs tests/side-plan-revert-confirmation.test.mjs tests/sidebar-resizer-lifecycle.test.mjs tests/conversation-status-panel.test.mjs tests/domain-activator.test.js tests/browser-handlers.test.js tests/git-service.test.js tests/git-watcher.test.js tests/git-file-diff.test.mjs tests/git-changes-source.test.mjs tests/git-workspace-source.test.mjs",
-    "test:workbench": "node --test tests/terminal-cd-command.test.js tests/conversation-current-source.test.mjs tests/conversation-scope.test.mjs tests/conversation-status-races.test.mjs tests/design-system-boundary.test.mjs tests/group-chat-url.test.js tests/group-stream-watchdog.test.js tests/line-diff-budget.test.mjs tests/main-composer-commands.test.mjs tests/message-file-changes-projectforge.test.mjs tests/message-file-changes.test.mjs tests/messenger-presentation.test.mjs tests/model-trajectory-handlers.test.js tests/model-trajectory-model.test.mjs tests/model-trajectory-recorder.test.js tests/notification-center.test.js tests/popover-window-blur.test.mjs tests/projectforge-changes-source.test.mjs tests/selection-reference.test.mjs tests/shared-source.test.mjs tests/source-handlers-sender.test.js tests/state-subscriptions.test.js tests/terminal-command-run-watch.test.js tests/terminal-native-helper.test.js tests/terminal-package-closure.test.js tests/tool-approval-card-enhancement.test.mjs tests/tool-presentation-settings.test.cjs tests/tool-presentation.test.mjs tests/tool-request-malformed-marker.test.mjs",
+    "test:workbench": "node --test tests/terminal-cd-command.test.js tests/side-chat-save-failure.test.mjs tests/conversation-current-source.test.mjs tests/conversation-scope.test.mjs tests/conversation-status-races.test.mjs tests/design-system-boundary.test.mjs tests/group-chat-url.test.js tests/group-stream-watchdog.test.js tests/line-diff-budget.test.mjs tests/main-composer-commands.test.mjs tests/message-file-changes-projectforge.test.mjs tests/message-file-changes.test.mjs tests/messenger-presentation.test.mjs tests/model-trajectory-handlers.test.js tests/model-trajectory-model.test.mjs tests/model-trajectory-recorder.test.js tests/notification-center.test.js tests/popover-window-blur.test.mjs tests/projectforge-changes-source.test.mjs tests/selection-reference.test.mjs tests/shared-source.test.mjs tests/source-handlers-sender.test.js tests/state-subscriptions.test.js tests/terminal-command-run-watch.test.js tests/terminal-native-helper.test.js tests/terminal-package-closure.test.js tests/tool-approval-card-enhancement.test.mjs tests/tool-presentation-settings.test.cjs tests/tool-presentation.test.mjs tests/tool-request-malformed-marker.test.mjs",
     "check:chat-evidence": "node scripts/check-chat-evidence.mjs",
     "check:chat-release-evidence": "node scripts/check-chat-release-evidence.mjs",
     "write:chat-evidence-manifest": "node scripts/write-chat-evidence-manifest.mjs",
diff --git a/scripts/next-delta-shared-baseline.json b/scripts/next-delta-shared-baseline.json
index 6e0d77e23..78a464832 100644
--- a/scripts/next-delta-shared-baseline.json
+++ b/scripts/next-delta-shared-baseline.json
@@ -1,7 +1,7 @@
 {
   "modules/chatManager.js": {
-    "sha256": "bfab4ad8c512129b679fdc7b9d87d94b6a0ed5daf63c9c77b5dcfdfcc3510941",
-    "reason": "Integrated chat behavior: selection subscriptions for topic side panes; clear old media before navigation; per-conversation side chat context/unread policy; explicit cancellation and non-streaming terminal settlement; one error notice per failed request. Reviewed auxiliary-side-chat reproduction: Stop during delayed history save or request preparation previously still sent generation; renderer-local AbortSignal checks now prevent that send. When upstream interrupt fails, await the existing local stream terminal before placeholder cleanup so accepted partial content is saved instead of deleted. Actual native side owner, internal renderer, manager, preload/IPC/disk and local HTTP before/after evidence; side preparation and partial-cancel regressions. Existing Surface routing and history authority remain in place. Main/group sending without the optional signal keeps its preparation path. Stop while awaiting the first HTTP headers: a locally aborted stream IPC return now awaits the already-owned cancellation terminal instead of showing a service-error notice; the regression keeps the submitted question and leaves the busy state."
+    "sha256": "6302539465234ff6ec1f17bd3d96e539bea0c892635f61c2d1063f1e4b0fe11e",
+    "reason": "Integrated chat behavior: selection subscriptions for topic side panes; clear old media before navigation; per-conversation side chat context/unread policy; explicit cancellation and non-streaming terminal settlement; one error notice per failed request. Reviewed auxiliary-side-chat reproduction: Stop during delayed history save or request preparation previously still sent generation; renderer-local AbortSignal checks now prevent that send. When upstream interrupt fails, await the existing local stream terminal before placeholder cleanup so accepted partial content is saved instead of deleted. Actual native side owner, internal renderer, manager, preload/IPC/disk and local HTTP before/after evidence; side preparation and partial-cancel regressions. Existing Surface routing and history authority remain in place. Main/group sending without the optional signal keeps its preparation path. Stop while awaiting the first HTTP headers: a locally aborted stream IPC return now awaits the already-owned cancellation terminal instead of showing a service-error notice; the regression keeps the submitted question and leaves the busy state. Non-streaming terminal save: a failed reply save (either { success: false } or the agent IPC { error } shape) now settles failed with a persistence error, so the auxiliary side chat shows its unsaved badge and blocks close like streaming does; covered by tests/side-chat-save-failure.test.mjs."
   },
   "modules/messageRenderer.js": {
     "sha256": "f24426207cf95eb4fa3f42e2ee357ed906d0a56ac6b235dd9d996fc39966b6e5",
diff --git a/tests/helpers/side-chat-surface-fixture.mjs b/tests/helpers/side-chat-surface-fixture.mjs
new file mode 100644
index 000000000..37930b25f
--- /dev/null
+++ b/tests/helpers/side-chat-surface-fixture.mjs
@@ -0,0 +1,99 @@
+// 侧栏辅助对话的完整挂载夹具：真实的 chatManager、流式桥和历史持久化，仓库、发送和保存结果由测试注入
+import { JSDOM } from 'jsdom';
+const R = '../../modules';
+const { mountSideChatSurface } = await import(`${R}/renderer/sideChatSurfaceOwner.js`);
+const { createSurfaceConversation } = await import(`${R}/chat/surfaceConversation.js`);
+const { createStreamConsumerRegistry } = await import(`${R}/chat/streamConsumerRegistry.js`);
+const { createVcpStreamBridge } = await import(`${R}/chat/vcpStreamBridge.js`);
+const { createMainChatStreamConsumer } = await import(`${R}/renderer/mainChatStreamConsumer.js`);
+const { createChatHistoryPersistence } = await import(`${R}/chat/chatHistoryPersistence.js`);
+
+export const tick = () => new Promise(resolve => setImmediate(resolve));
+let fixtureId = 0;
+
+export async function fixture(t, { stream = false, seed = [], onSave = null, onSend = null, model = 'fixture', toasts = [] } = {}) {
+    const dom = new JSDOM('<div id="mount"></div>', { pretendToBeVisual: true, url: 'http://localhost/' });
+    const oldWindow = globalThis.window;
+    globalThis.window = dom.window;
+    const { chatManager } = await import(`${R}/chatManager.js?probe=${++fixtureId}`);
+    const doc = dom.window.document;
+    let history = structuredClone(seed), handle, renderer, conversation;
+    const requests = [], statuses = [], saves = [];
+    const repository = {
+        async getHistory() { return structuredClone(history); },
+        async saveHistory(_id, _type, topic, messages) {
+            saves.push({ topic, messages: structuredClone(messages) });
+            const r = onSave ? await onSave(messages, saves.length) : null;
+            if (r) return r;
+            history = structuredClone(messages);
+            return { success: true };
+        },
+    };
+    const descriptor = { id: 'side', model, contextMode: 'references-only',
+        parent: { itemId: 'agent', topicId: 'parent' }, child: { itemId: 'agent', topicId: 'child', config: { model, streamOutput: stream } } };
+    const bridgeHolder = {};
+    handle = await mountSideChatSurface(doc.getElementById('mount'), { descriptor, onStatusChange: s => statuses.push(s),
+        chatCapabilities: { repository, manager: chatManager, listModels: async () => ({ ids: ['gpt-x'], favorites: new Set() }),
+            uiHelper: { showToastNotification: (m, ty) => toasts.push([m, ty]) },
+            createRenderer(options) {
+                const root = options.root;
+                renderer = {
+                    async renderHistory(messages) { root.querySelectorAll('.message-item').forEach(n => n.remove()); for (const m of messages) await renderer.renderMessage(m); },
+                    async renderMessage(message) {
+                        const node = doc.createElement('div'); node.className = 'message-item'; node.dataset.messageId = message.id;
+                        node.textContent = message.content; root.append(node); return node;
+                    },
+                    removeMessageById(id) { root.querySelector(`[data-message-id="${id}"]`)?.remove(); },
+                    startStreamingMessage() {},
+                    appendStreamChunk() {},
+                    async projectStreamTerminal(id, finishReason, context, payload) {
+                        const messages = conversation.historyRef.get().map(m => m.id === id
+                            ? { ...m, content: payload.fullResponse, finishReason, isThinking: false } : m);
+                        conversation.historyRef.set(messages);
+                        await renderer.renderHistory(messages);
+                        return { messageId: id, context, history: messages, content: payload.fullResponse, finishReason };
+                    },
+                };
+                conversation = createSurfaceConversation(options.conversation);
+                return { renderer, conversation, dispose() { conversation.dispose(); } };
+            },
+        },
+    });
+    const routes = createStreamConsumerRegistry(), persistence = createChatHistoryPersistence(repository);
+    const bridge = createVcpStreamBridge({ createConsumer: event => createMainChatStreamConsumer(event, {
+        resolveProjection: id => routes.claim(id), persistTerminal: projected => persistence.commit(projected),
+    }) });
+    bridgeHolder.bridge = bridge;
+    chatManager.init({ chatRepository: repository,
+        streamConsumerRegistry: { register(id, route) {
+            const release = routes.register(id, route);
+            release.cancel = reason => bridge.cancelOperation(id, reason);
+            return release;
+        } },
+        electronAPI: {
+            async getLatestCanvasContent() { return { content: '' }; },
+            async sendToVCP(...args) {
+                requests.push(args);
+                if (onSend) { const r = await onSend(args, bridge); if (r) return r; }
+                if (stream) { bridge.accept({ type: 'data', messageId: args[4], context: args[6], chunk: 'partial' }); return { streamingStarted: true }; }
+                return { choices: [{ message: { content: 'answer' } }] };
+            },
+        },
+        uiHelper: { showToastNotification: (m, ty) => toasts.push([m, ty]), autoResizeTextarea() {} },
+        modules: { messageRenderer: renderer },
+        refs: { currentSelectedItemRef: { get: () => null }, currentTopicIdRef: { get: () => null }, currentChatHistoryRef: { get: () => [], set() {} },
+            attachedFilesRef: { get: () => [] }, globalSettingsRef: { get: () => ({ vcpServerUrl: 'http://fixture.invalid/v1/chat/completions' }) } },
+        elements: {}, mainRendererFunctions: {},
+    });
+    t.after(async () => { try { await handle.dispose(); } catch {} await chatManager.dispose(); await bridge.dispose(); routes.dispose(); dom.window.close(); globalThis.window = oldWindow; });
+    for (let i = 0; i < 5; i++) await tick();
+    const textarea = doc.querySelector('.side-chat-textarea'), form = doc.querySelector('form');
+    const untilIdle = async () => { for (let n = 0; n < 200; n++) { await tick(); if (!form.hasAttribute('aria-busy')) return; } throw new Error('Side composer did not settle'); };
+    return { dom, doc, handle, requests, statuses, saves, toasts, textarea, form, untilIdle, bridge,
+        getHistory: () => history, getConversation: () => conversation,
+        submit(text) { textarea.value = text; form.requestSubmit(); },
+        stop() { doc.querySelector('.side-chat-stop-btn').click(); },
+        statusText: () => doc.querySelector('.side-chat-status-text').textContent,
+        badgeHidden: () => doc.querySelector('.side-chat-persistence-badge')?.hidden,
+    };
+}
diff --git a/tests/side-chat-save-failure.test.mjs b/tests/side-chat-save-failure.test.mjs
new file mode 100644
index 000000000..fde50ef8b
--- /dev/null
+++ b/tests/side-chat-save-failure.test.mjs
@@ -0,0 +1,24 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { fixture } from './helpers/side-chat-surface-fixture.mjs';
+
+// 关掉流式输出时，回复存盘失败也要和流式一样：亮「保存失败」、拦住关闭，而不是当作已完成（重启后回复就没了）
+for (const [label, failure] of [['IPC 的 { error } 形状', { error: 'EACCES: permission denied' }], ['{ success: false }', { success: false, error: 'EACCES: permission denied' }]]) {
+    test(`non-streaming reply whose save fails (${label}) is reported as unsaved`, async t => {
+        const f = await fixture(t, { stream: false, onSave: messages => messages.some(m => m.role === 'assistant') ? failure : null });
+        f.submit('q1');
+        await f.untilIdle();
+        assert.equal(f.badgeHidden(), false, 'the unsaved badge shows');
+        assert.match(f.statusText(), /保存失败/);
+        assert.deepEqual(f.handle.getUnsavedStatus(), { hasUnsavedChanges: true, error: 'EACCES: permission denied' });
+        assert.deepEqual(await f.handle.requestClose(), { closed: false, reason: 'UNSAVED_CHANGES' });
+    });
+}
+
+test('a non-streaming reply that saves fine still completes normally', async t => {
+    const f = await fixture(t, { stream: false });
+    f.submit('q1');
+    await f.untilIdle();
+    assert.equal(f.badgeHidden(), true);
+    assert.deepEqual(f.getHistory().map(m => m.role), ['user', 'assistant']);
+});

From c03abb06a4c2c7f3978f2f291b918458f3bc8b13 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 02:57:48 +0000
Subject: [PATCH 100/143] Side chat: a late save cannot recreate a deleted
 child topic

Deleting the parent topic (or the agent) while a side chat reply was
streaming removed the child directory first; disposing the tab then
cancelled the stream and its terminal save recreated
topics/sidechat_*/history.json without the marker file, an orphan that
delete-child refuses and list-metadata never shows, so the "deleted"
conversation stayed on disk. The history queue now refuses to recreate
a missing side chat child directory; only create-child makes them.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_016hW799u5Ji5k9khDAwu688
---
 modules/services/historyMutationQueue.js |  9 +++++++++
 package.json                             |  2 +-
 tests/history-mutation-queue.test.cjs    | 17 ++++++++++++++++-
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/modules/services/historyMutationQueue.js b/modules/services/historyMutationQueue.js
index 850c15ecb..0886af87b 100644
--- a/modules/services/historyMutationQueue.js
+++ b/modules/services/historyMutationQueue.js
@@ -2,6 +2,9 @@ const fs = require('fs-extra');
 const path = require('path');
 const { randomUUID } = require('crypto');
 
+// 同 sideChatHandlers.js 的 CHILD_ID_PATTERN
+const SIDE_CHAT_CHILD_ID = /^sidechat_\d+_[0-9a-f]+$/;
+
 function validateSegment(value) {
     if (typeof value !== 'string' || !value ||
         /[<>:"/\\|?*\x00-\x1f]/.test(value) ||
@@ -78,6 +81,12 @@ class HistoryMutationQueue {
         conversationKey(descriptor);
         const historyPath = this.getHistoryPath(descriptor.itemId, descriptor.topicId);
         const tempPath = `${historyPath}.${process.pid}.${randomUUID()}.tmp`;
+        // 辅助对话的子话题目录只由 side-chat:create-child 建（带标记文件）。目录没了说明它已被删除
+        // （父话题或助手被删时，流式回复被取消后还会存一次）；这时不能顺手把目录建回来，
+        // 否则会留下没有标记、谁也删不掉也列不出来的孤儿目录
+        if (SIDE_CHAT_CHILD_ID.test(descriptor.topicId) && !await fs.pathExists(path.dirname(historyPath))) {
+            throw new Error('SIDE_CHAT_CHILD_DELETED');
+        }
         await fs.ensureDir(path.dirname(historyPath));
         if (this.fileWatcher) this.fileWatcher.signalInternalSave?.();
         try {
diff --git a/package.json b/package.json
index 5e98b82e7..60edf390f 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
     "test:built-artifact-smoke": "node scripts/test-built-artifact-smoke.mjs",
     "test:chat-transcript-snapshot": "node scripts/test-chat-transcript-snapshot.mjs",
     "test:side-pane": "node --test tests/side-pane-*.test.mjs tests/side-chat-*.test.mjs tests/side-browser-address.test.mjs tests/side-plan-revert-confirmation.test.mjs tests/sidebar-resizer-lifecycle.test.mjs tests/conversation-status-panel.test.mjs tests/domain-activator.test.js tests/browser-handlers.test.js tests/git-service.test.js tests/git-watcher.test.js tests/git-file-diff.test.mjs tests/git-changes-source.test.mjs tests/git-workspace-source.test.mjs",
-    "test:workbench": "node --test tests/terminal-cd-command.test.js tests/side-chat-save-failure.test.mjs tests/conversation-current-source.test.mjs tests/conversation-scope.test.mjs tests/conversation-status-races.test.mjs tests/design-system-boundary.test.mjs tests/group-chat-url.test.js tests/group-stream-watchdog.test.js tests/line-diff-budget.test.mjs tests/main-composer-commands.test.mjs tests/message-file-changes-projectforge.test.mjs tests/message-file-changes.test.mjs tests/messenger-presentation.test.mjs tests/model-trajectory-handlers.test.js tests/model-trajectory-model.test.mjs tests/model-trajectory-recorder.test.js tests/notification-center.test.js tests/popover-window-blur.test.mjs tests/projectforge-changes-source.test.mjs tests/selection-reference.test.mjs tests/shared-source.test.mjs tests/source-handlers-sender.test.js tests/state-subscriptions.test.js tests/terminal-command-run-watch.test.js tests/terminal-native-helper.test.js tests/terminal-package-closure.test.js tests/tool-approval-card-enhancement.test.mjs tests/tool-presentation-settings.test.cjs tests/tool-presentation.test.mjs tests/tool-request-malformed-marker.test.mjs",
+    "test:workbench": "node --test tests/terminal-cd-command.test.js tests/side-chat-save-failure.test.mjs tests/history-mutation-queue.test.cjs tests/conversation-current-source.test.mjs tests/conversation-scope.test.mjs tests/conversation-status-races.test.mjs tests/design-system-boundary.test.mjs tests/group-chat-url.test.js tests/group-stream-watchdog.test.js tests/line-diff-budget.test.mjs tests/main-composer-commands.test.mjs tests/message-file-changes-projectforge.test.mjs tests/message-file-changes.test.mjs tests/messenger-presentation.test.mjs tests/model-trajectory-handlers.test.js tests/model-trajectory-model.test.mjs tests/model-trajectory-recorder.test.js tests/notification-center.test.js tests/popover-window-blur.test.mjs tests/projectforge-changes-source.test.mjs tests/selection-reference.test.mjs tests/shared-source.test.mjs tests/source-handlers-sender.test.js tests/state-subscriptions.test.js tests/terminal-command-run-watch.test.js tests/terminal-native-helper.test.js tests/terminal-package-closure.test.js tests/tool-approval-card-enhancement.test.mjs tests/tool-presentation-settings.test.cjs tests/tool-presentation.test.mjs tests/tool-request-malformed-marker.test.mjs",
     "check:chat-evidence": "node scripts/check-chat-evidence.mjs",
     "check:chat-release-evidence": "node scripts/check-chat-release-evidence.mjs",
     "write:chat-evidence-manifest": "node scripts/write-chat-evidence-manifest.mjs",
diff --git a/tests/history-mutation-queue.test.cjs b/tests/history-mutation-queue.test.cjs
index c40396800..79a71b570 100644
--- a/tests/history-mutation-queue.test.cjs
+++ b/tests/history-mutation-queue.test.cjs
@@ -79,4 +79,19 @@ test('replace retains explicit deletion semantics and dispose rejects new work',
     assert.deepEqual(await queue.read(descriptor()), []);
     await queue.dispose();
     await assert.rejects(queue.replace(descriptor(), []), /disposed/);
-});
\ No newline at end of file
+});
+test('a deleted side chat child topic is not recreated by a late save', async t => {
+    // 父话题被删时子目录已经删掉，流式回复被取消后还会存一次：不能把目录建回来留下孤儿
+    const queue = await fixture(t);
+    const child = { itemId: 'agent-a', itemType: 'agent', topicId: 'sidechat_1700000000000_abc123' };
+    const childDir = path.dirname(queue.getHistoryPath(child.itemId, child.topicId));
+    await assert.rejects(queue.replace(child, [{ id: 'late' }]), /SIDE_CHAT_CHILD_DELETED/);
+    assert.equal(await fs.pathExists(childDir), false);
+
+    // 还在的子话题照常保存；普通话题第一次保存照常建目录
+    await fs.ensureDir(childDir);
+    await queue.replace(child, [{ id: 'kept' }]);
+    assert.deepEqual(await queue.read(child), [{ id: 'kept' }]);
+    await queue.replace(descriptor(), [{ id: 'first' }]);
+    assert.deepEqual(await queue.read(descriptor()), [{ id: 'first' }]);
+});

From 64bd7e7be39ffea1be92b2a669db2f54b272fd37 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 02:59:35 +0000
Subject: [PATCH 101/143] Side chat: regenerate claims the composer before its
 history save

Regenerate first saves the truncated history; during that await the
composer was not busy, so Enter started a second send. The two rounds
shared one stop button and the first to finish hid it (and refilled the
composer) while the other was still generating. The form is now busy
from the start of regenerate, Enter is ignored while busy, and a failed
truncation save releases it.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_016hW799u5Ji5k9khDAwu688
---
 .../contracts/generated/chat-event-graph.json | 16 ++++-----
 modules/renderer/sideChatSurfaceOwner.js      | 12 ++++++-
 package.json                                  |  2 +-
 tests/side-chat-regenerate-busy.test.mjs      | 36 +++++++++++++++++++
 4 files changed, 56 insertions(+), 10 deletions(-)
 create mode 100644 tests/side-chat-regenerate-busy.test.mjs

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 9f05f7f5f..97e41bab9 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -3686,12 +3686,12 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 565,
+          "line": 575,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 568,
+          "line": 578,
           "kind": "custom-event-listener"
         },
         {
@@ -5156,13 +5156,13 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 565,
+          "line": 575,
           "kind": "custom-event-listener",
           "match": "stopBtn.addEventListener('click'"
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 568,
+          "line": 578,
           "kind": "custom-event-listener",
           "match": "persistenceBadge.addEventListener('click'"
         },
@@ -7302,7 +7302,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 572,
+          "line": 582,
           "kind": "custom-event-listener"
         },
         {
@@ -7434,7 +7434,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 572,
+          "line": 582,
           "kind": "custom-event-listener",
           "match": "persistenceBadge.addEventListener('contextmenu'"
         },
@@ -28115,7 +28115,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 564,
+          "line": 574,
           "kind": "custom-event-listener"
         },
         {
@@ -28175,7 +28175,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 564,
+          "line": 574,
           "kind": "custom-event-listener",
           "match": "form.addEventListener('submit'"
         },
diff --git a/modules/renderer/sideChatSurfaceOwner.js b/modules/renderer/sideChatSurfaceOwner.js
index 9073af3c6..dd5e4c884 100644
--- a/modules/renderer/sideChatSurfaceOwner.js
+++ b/modules/renderer/sideChatSurfaceOwner.js
@@ -359,7 +359,7 @@ export async function mountSideChatSurface(container, {
     const onSubmit = async (event) => {
         event?.preventDefault?.();
         // 还在生成时不再起第二次发送：它失败后的清理会清掉正在进行的那次，停止按钮随之消失
-        if (isDisposed || !isHistoryLoaded || isDeletingMessage || activeSendController) return;
+        if (isDisposed || !isHistoryLoaded || isDeletingMessage || activeSendController || form.hasAttribute('aria-busy')) return;
         if (!currentModel) {
             updateStatus('请先选择模型', 'error');
             return;
@@ -517,6 +517,15 @@ export async function mountSideChatSurface(container, {
             _fileManagerData: att._fileManagerData || {}
         }));
         const kept = history.slice(0, questionIndex);
+        // 截断落盘期间就算这一轮在忙：否则这时按回车会另起一轮，两轮抢同一个停止按钮和内存里的历史
+        form.setAttribute('aria-busy', 'true');
+        textarea.disabled = true;
+        const releaseBusy = () => {
+            if (isDisposed) return;
+            form.removeAttribute('aria-busy');
+            textarea.disabled = false;
+            updateComposerState();
+        };
         let saved;
         try {
             saved = await repository.saveHistory(descriptor.child.itemId, 'agent', descriptor.child.topicId, kept);
@@ -524,6 +533,7 @@ export async function mountSideChatSurface(container, {
             saved = { error: error?.message || String(error) };
         }
         if (saved && (saved.success === false || saved.error)) {
+            releaseBusy();
             updateStatus(`重新回复失败：${saved.error || '保存历史出错'}`, 'error');
             return;
         }
diff --git a/package.json b/package.json
index 60edf390f..f46b18db8 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
     "test:built-artifact-smoke": "node scripts/test-built-artifact-smoke.mjs",
     "test:chat-transcript-snapshot": "node scripts/test-chat-transcript-snapshot.mjs",
     "test:side-pane": "node --test tests/side-pane-*.test.mjs tests/side-chat-*.test.mjs tests/side-browser-address.test.mjs tests/side-plan-revert-confirmation.test.mjs tests/sidebar-resizer-lifecycle.test.mjs tests/conversation-status-panel.test.mjs tests/domain-activator.test.js tests/browser-handlers.test.js tests/git-service.test.js tests/git-watcher.test.js tests/git-file-diff.test.mjs tests/git-changes-source.test.mjs tests/git-workspace-source.test.mjs",
-    "test:workbench": "node --test tests/terminal-cd-command.test.js tests/side-chat-save-failure.test.mjs tests/history-mutation-queue.test.cjs tests/conversation-current-source.test.mjs tests/conversation-scope.test.mjs tests/conversation-status-races.test.mjs tests/design-system-boundary.test.mjs tests/group-chat-url.test.js tests/group-stream-watchdog.test.js tests/line-diff-budget.test.mjs tests/main-composer-commands.test.mjs tests/message-file-changes-projectforge.test.mjs tests/message-file-changes.test.mjs tests/messenger-presentation.test.mjs tests/model-trajectory-handlers.test.js tests/model-trajectory-model.test.mjs tests/model-trajectory-recorder.test.js tests/notification-center.test.js tests/popover-window-blur.test.mjs tests/projectforge-changes-source.test.mjs tests/selection-reference.test.mjs tests/shared-source.test.mjs tests/source-handlers-sender.test.js tests/state-subscriptions.test.js tests/terminal-command-run-watch.test.js tests/terminal-native-helper.test.js tests/terminal-package-closure.test.js tests/tool-approval-card-enhancement.test.mjs tests/tool-presentation-settings.test.cjs tests/tool-presentation.test.mjs tests/tool-request-malformed-marker.test.mjs",
+    "test:workbench": "node --test tests/terminal-cd-command.test.js tests/side-chat-save-failure.test.mjs tests/history-mutation-queue.test.cjs tests/side-chat-regenerate-busy.test.mjs tests/conversation-current-source.test.mjs tests/conversation-scope.test.mjs tests/conversation-status-races.test.mjs tests/design-system-boundary.test.mjs tests/group-chat-url.test.js tests/group-stream-watchdog.test.js tests/line-diff-budget.test.mjs tests/main-composer-commands.test.mjs tests/message-file-changes-projectforge.test.mjs tests/message-file-changes.test.mjs tests/messenger-presentation.test.mjs tests/model-trajectory-handlers.test.js tests/model-trajectory-model.test.mjs tests/model-trajectory-recorder.test.js tests/notification-center.test.js tests/popover-window-blur.test.mjs tests/projectforge-changes-source.test.mjs tests/selection-reference.test.mjs tests/shared-source.test.mjs tests/source-handlers-sender.test.js tests/state-subscriptions.test.js tests/terminal-command-run-watch.test.js tests/terminal-native-helper.test.js tests/terminal-package-closure.test.js tests/tool-approval-card-enhancement.test.mjs tests/tool-presentation-settings.test.cjs tests/tool-presentation.test.mjs tests/tool-request-malformed-marker.test.mjs",
     "check:chat-evidence": "node scripts/check-chat-evidence.mjs",
     "check:chat-release-evidence": "node scripts/check-chat-release-evidence.mjs",
     "write:chat-evidence-manifest": "node scripts/write-chat-evidence-manifest.mjs",
diff --git a/tests/side-chat-regenerate-busy.test.mjs b/tests/side-chat-regenerate-busy.test.mjs
new file mode 100644
index 000000000..bb221bff9
--- /dev/null
+++ b/tests/side-chat-regenerate-busy.test.mjs
@@ -0,0 +1,36 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { fixture, tick } from './helpers/side-chat-surface-fixture.mjs';
+
+// 重新回复先要把截断后的历史落盘；这期间按回车不能另起一轮，否则两轮抢同一个停止按钮，
+// 先结束的那轮会把还在生成的那轮的停止按钮藏掉、把内存里的新提问冲掉
+test('Enter during regenerate\'s history save does not start a second send', async t => {
+    const seed = [{ id: 'u1', role: 'user', content: 'q', timestamp: 1 }, { id: 'a1', role: 'assistant', content: 'a', timestamp: 2 }];
+    let release;
+    const gate = new Promise(resolve => { release = resolve; });
+    let first = true;
+    const f = await fixture(t, { stream: true, seed, onSave: async () => { if (first) { first = false; await gate; } return null; } });
+    f.doc.querySelector('[data-message-id="a1"]').dispatchEvent(new f.dom.window.MouseEvent('contextmenu', { bubbles: true, cancelable: true }));
+    f.doc.querySelector('[data-side-chat-action="regenerate"]').click();
+    await tick();
+    assert.equal(f.form.hasAttribute('aria-busy'), true, 'busy from the start of the regenerate');
+    f.submit('new question');
+    await tick(); await tick();
+    release();
+    for (let i = 0; i < 60; i++) await tick();
+    assert.equal(f.requests.length, 1, 'only the regenerated question is sent');
+    assert.equal(f.form.hasAttribute('aria-busy'), true, 'still generating');
+    assert.equal(f.doc.querySelector('.side-chat-stop-btn').hidden, false, 'stop stays available');
+    assert.doesNotMatch(f.statusText(), /发送失败/);
+});
+
+test('a failed regenerate save releases the composer', async t => {
+    const seed = [{ id: 'u1', role: 'user', content: 'q', timestamp: 1 }, { id: 'a1', role: 'assistant', content: 'a', timestamp: 2 }];
+    const f = await fixture(t, { stream: true, seed, onSave: async () => ({ success: false, error: 'disk full' }) });
+    f.doc.querySelector('[data-message-id="a1"]').dispatchEvent(new f.dom.window.MouseEvent('contextmenu', { bubbles: true, cancelable: true }));
+    f.doc.querySelector('[data-side-chat-action="regenerate"]').click();
+    for (let i = 0; i < 10; i++) await tick();
+    assert.match(f.statusText(), /重新回复失败/);
+    assert.equal(f.form.hasAttribute('aria-busy'), false);
+    assert.equal(f.textarea.disabled, false);
+});

From 4d396c750c409d6bd9278f319034d3b1a33c6f70 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 02:59:59 +0000
Subject: [PATCH 102/143] Code viewer: keep the horizontal scrollbar in view
 and line numbers honest when wrapped

Since the line number fix, the code column grew to the file's full
height, so its horizontal scrollbar only appeared after scrolling to the
last line. The code body now scrolls both ways, the shell is as wide as
the longest line, and the gutter stays on the left with position: sticky,
like CodeMirror's gutters.

With wrapping on, one long line took several rows while the gutter kept
one number per row, so every later number was wrong. Hide the gutter
while wrapped; the code is laid out in 200-line chunks, so per-line
alignment would need a row-per-line rewrite.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019L2bZomLn4NVoxS4Rv5Bkv
---
 styles/ui-system/side-pane-code-viewer.css | 24 +++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/styles/ui-system/side-pane-code-viewer.css b/styles/ui-system/side-pane-code-viewer.css
index b117eae0d..f196fc8dc 100644
--- a/styles/ui-system/side-pane-code-viewer.css
+++ b/styles/ui-system/side-pane-code-viewer.css
@@ -168,6 +168,9 @@ html .side-code-editor-shell:where(.vcp-ui-scope, .vcp-ui-scope *) {
     flex-shrink: 0;
     min-height: 100%;
     min-width: 100%;
+    /* 横向也由 .side-code-body 滚动：外壳按最长一行撑宽，横向滚动条贴在视口底部，
+       不会落在几千行代码的最下面 */
+    width: max-content;
     font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace;
     font-size: calc(var(--vcp-ui-font-size) - 2px);
     line-height: 1.5;
@@ -184,6 +187,11 @@ html .side-code-gutter:where(.vcp-ui-scope, .vcp-ui-scope *) {
     font-size: calc(var(--vcp-ui-font-size) - 3px);
     line-height: 1.5;
     box-sizing: border-box;
+    /* 横向滚动时行号停在左边，同 CodeMirror 的 .cm-gutters */
+    position: sticky;
+    left: 0;
+    z-index: 1;
+    background: var(--vcp-ui-bg-primary);
 }
 
 html body[data-vcp-theme="light"] .side-code-gutter:where(.vcp-ui-scope, .vcp-ui-scope *) {
@@ -211,9 +219,7 @@ html .side-code-line-number:where(.vcp-ui-scope, .vcp-ui-scope *) {
 html .side-code-pre:where(.vcp-ui-scope, .vcp-ui-scope *) {
     margin: 0;
     padding: 8px 12px;
-    flex: 1;
-    min-width: 0;
-    overflow-x: auto;
+    flex: 1 0 auto;
     white-space: pre;
     color: var(--primary-text, var(--vcp-ui-port-color-f1f5f9));
     line-height: 18px;
@@ -223,7 +229,19 @@ html body[data-vcp-theme="light"] .side-code-pre:where(.vcp-ui-scope, .vcp-ui-sc
     color: var(--primary-text, var(--vcp-ui-port-color-0f172a));
 }
 
+html .side-code-editor-shell.is-wrapped:where(.vcp-ui-scope, .vcp-ui-scope *) {
+    width: auto;
+}
+
+/* 行号栏一行一个号，自动换行后一行代码占好几行高度，后面的行号全部错位。
+   代码按 200 行一块排版，做不到逐行对齐，换行时先不显示行号 */
+html .side-code-editor-shell.is-wrapped .side-code-gutter:where(.vcp-ui-scope, .vcp-ui-scope *) {
+    display: none;
+}
+
 html .side-code-editor-shell.is-wrapped .side-code-pre:where(.vcp-ui-scope, .vcp-ui-scope *) {
+    flex: 1;
+    min-width: 0;
     white-space: pre-wrap;
     word-break: break-all;
 }

From d9e1a0e26ef28efd97c38fa146ece80888ab53fd Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 03:00:33 +0000
Subject: [PATCH 103/143] Side chat: picking a model clears the "pick a model
 first" error

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_016hW799u5Ji5k9khDAwu688
---
 .../contracts/generated/chat-event-graph.json | 32 +++++++++----------
 modules/renderer/sideChatSurfaceOwner.js      |  7 +++-
 tests/side-chat-regenerate-busy.test.mjs      | 14 ++++++++
 3 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 97e41bab9..6d63eec68 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -3686,12 +3686,12 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 575,
+          "line": 580,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 578,
+          "line": 583,
           "kind": "custom-event-listener"
         },
         {
@@ -5156,13 +5156,13 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 575,
+          "line": 580,
           "kind": "custom-event-listener",
           "match": "stopBtn.addEventListener('click'"
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 578,
+          "line": 583,
           "kind": "custom-event-listener",
           "match": "persistenceBadge.addEventListener('click'"
         },
@@ -7117,7 +7117,7 @@
       "consumers": [
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 344,
+          "line": 349,
           "kind": "custom-event-listener"
         },
         {
@@ -7129,7 +7129,7 @@
       "evidence": [
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 344,
+          "line": 349,
           "kind": "custom-event-listener",
           "match": "textarea.addEventListener('compositionend'"
         },
@@ -7147,7 +7147,7 @@
       "consumers": [
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 343,
+          "line": 348,
           "kind": "custom-event-listener"
         },
         {
@@ -7159,7 +7159,7 @@
       "evidence": [
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 343,
+          "line": 348,
           "kind": "custom-event-listener",
           "match": "textarea.addEventListener('compositionstart'"
         },
@@ -7302,7 +7302,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 582,
+          "line": 587,
           "kind": "custom-event-listener"
         },
         {
@@ -7434,7 +7434,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 582,
+          "line": 587,
           "kind": "custom-event-listener",
           "match": "persistenceBadge.addEventListener('contextmenu'"
         },
@@ -14793,7 +14793,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 346,
+          "line": 351,
           "kind": "custom-event-listener"
         },
         {
@@ -14964,7 +14964,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 346,
+          "line": 351,
           "kind": "custom-event-listener",
           "match": "textarea.addEventListener('input'"
         },
@@ -15404,7 +15404,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 352,
+          "line": 357,
           "kind": "custom-event-listener"
         },
         {
@@ -15754,7 +15754,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 352,
+          "line": 357,
           "kind": "custom-event-listener",
           "match": "textarea.addEventListener('keydown'"
         },
@@ -28115,7 +28115,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 574,
+          "line": 579,
           "kind": "custom-event-listener"
         },
         {
@@ -28175,7 +28175,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 574,
+          "line": 579,
           "kind": "custom-event-listener",
           "match": "form.addEventListener('submit'"
         },
diff --git a/modules/renderer/sideChatSurfaceOwner.js b/modules/renderer/sideChatSurfaceOwner.js
index dd5e4c884..d58dd1030 100644
--- a/modules/renderer/sideChatSurfaceOwner.js
+++ b/modules/renderer/sideChatSurfaceOwner.js
@@ -247,7 +247,12 @@ export async function mountSideChatSurface(container, {
         modelPickerBtn,
         modelPopover,
         persistMetadata: () => persistenceOwner.saveComposerInput(),
-        onModelChange: model => { selectedItem.model = model; if (selectedItem.config) selectedItem.config.model = model; },
+        onModelChange: model => {
+            selectedItem.model = model;
+            if (selectedItem.config) selectedItem.config.model = model;
+            // 发送时提示过「请先选择模型」，选好之后别让这条错误还挂着
+            if (statusText?.textContent === '请先选择模型') updateStatus('就绪');
+        },
         updateComposerState: (...args) => updateComposerState(...args)
     });
     const { updateModel } = modelPickerOwner;
diff --git a/tests/side-chat-regenerate-busy.test.mjs b/tests/side-chat-regenerate-busy.test.mjs
index bb221bff9..ace630605 100644
--- a/tests/side-chat-regenerate-busy.test.mjs
+++ b/tests/side-chat-regenerate-busy.test.mjs
@@ -34,3 +34,17 @@ test('a failed regenerate save releases the composer', async t => {
     assert.equal(f.form.hasAttribute('aria-busy'), false);
     assert.equal(f.textarea.disabled, false);
 });
+
+test('picking a model clears the "pick a model first" error', async t => {
+    const f = await fixture(t, { model: '' });
+    f.textarea.value = 'hi';
+    f.textarea.dispatchEvent(new f.dom.window.KeyboardEvent('keydown', { key: 'Enter', bubbles: true }));
+    await tick();
+    assert.equal(f.statusText(), '请先选择模型');
+    f.doc.querySelector('.side-chat-model-picker-btn').click();
+    for (let i = 0; i < 5; i++) await tick();
+    f.doc.querySelector('.side-chat-model-item[data-model="gpt-x"]').click();
+    for (let i = 0; i < 5; i++) await tick();
+    assert.notEqual(f.statusText(), '请先选择模型');
+    assert.equal(f.doc.querySelector('.side-chat-status-text').classList.contains('error'), false);
+});

From 9b95b7d2df4249760c8f773f1914abb25c2f49a0 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 03:05:33 +0000
Subject: [PATCH 104/143] Code viewer: drop the wrapped-gutter rule #4 and #8
 both added

---
 styles/ui-system/side-pane-code-viewer.css | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/styles/ui-system/side-pane-code-viewer.css b/styles/ui-system/side-pane-code-viewer.css
index e83a53872..f196fc8dc 100644
--- a/styles/ui-system/side-pane-code-viewer.css
+++ b/styles/ui-system/side-pane-code-viewer.css
@@ -246,11 +246,6 @@ html .side-code-editor-shell.is-wrapped .side-code-pre:where(.vcp-ui-scope, .vcp
     word-break: break-all;
 }
 
-/* 换行后一行代码会占好几行高，而行号固定一行一个：继续显示会越往下越对不上，换行时收起行号 */
-html .side-code-editor-shell.is-wrapped .side-code-gutter:where(.vcp-ui-scope, .vcp-ui-scope *) {
-    display: none;
-}
-
 html .side-code-highlighted:where(.vcp-ui-scope, .vcp-ui-scope *) {
     font-family: inherit;
     font-size: inherit;

From fe604d92725dca1563a766d77ecc51820ae60469 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 03:30:23 +0000
Subject: [PATCH 105/143] Side pane: keyboard side chat message menu, tab menu
 placement, silent icons

- Side chat messages are one tab stop with arrow, Home and End
  navigation; Shift+F10 opens the message menu, its items take focus and
  arrow keys, and Escape or Tab returns to the message.
- Shift+F10 on a side pane tab opens the tab menu under the tab instead of
  the window's top-left corner.
- Material ligature icons in the Git page, code viewer, browser toolbar,
  terminal, tab overview and side chat are aria-hidden, so screen readers
  no longer read words like "expand_more" as part of a control's name.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012AP71nAxrCFEpH7st6asf9
---
 .../contracts/generated/chat-event-graph.json | 105 ++++++++++++------
 modules/renderer/side-chat/message-actions.js | 104 ++++++++++++++++-
 modules/renderer/side-chat/references.js      |   2 +-
 .../side-pane/browserSideProvider.js          |   6 +-
 .../ui-system/side-pane/code-viewer/editor.js |   2 +-
 .../side-pane/codeViewerSideProvider.js       |  19 ++--
 modules/ui-system/side-pane/git/cards.js      |   1 +
 modules/ui-system/side-pane/git/git-view.js   |   3 +-
 .../side-pane/side-pane-tab-overview.js       |   3 +-
 .../side-pane/side-pane-tab-strip.js          |  13 ++-
 .../side-pane/terminalSideProvider.js         |   4 +-
 package.json                                  |   2 +-
 styles/ui-system/side-pane-side-chat.css      |   6 +
 tests/side-chat-message-keyboard.test.mjs     | 102 +++++++++++++++++
 tests/side-pane-screen-reader-names.test.mjs  |  72 ++++++++++++
 15 files changed, 381 insertions(+), 63 deletions(-)
 create mode 100644 tests/side-chat-message-keyboard.test.mjs
 create mode 100644 tests/side-pane-screen-reader-names.test.mjs

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 83f751b30..2c59f8041 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -1721,7 +1721,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-overview.js",
-          "line": 254,
+          "line": 255,
           "kind": "custom-event-listener"
         },
         {
@@ -1837,7 +1837,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-overview.js",
-          "line": 254,
+          "line": 255,
           "kind": "custom-event-listener",
           "match": "win?.addEventListener('blur'"
         },
@@ -3652,12 +3652,12 @@
         },
         {
           "file": "modules/renderer/side-chat/message-actions.js",
-          "line": 216,
+          "line": 295,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/renderer/side-chat/message-actions.js",
-          "line": 265,
+          "line": 356,
           "kind": "custom-event-listener"
         },
         {
@@ -4202,7 +4202,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/cards.js",
-          "line": 229,
+          "line": 230,
           "kind": "custom-event-listener"
         },
         {
@@ -4212,7 +4212,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/git-view.js",
-          "line": 260,
+          "line": 261,
           "kind": "custom-event-listener"
         },
         {
@@ -4392,22 +4392,22 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-overview.js",
-          "line": 152,
+          "line": 153,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-overview.js",
-          "line": 162,
+          "line": 163,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-overview.js",
-          "line": 178,
+          "line": 179,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-overview.js",
-          "line": 235,
+          "line": 236,
           "kind": "custom-event-listener"
         },
         {
@@ -5113,13 +5113,13 @@
         },
         {
           "file": "modules/renderer/side-chat/message-actions.js",
-          "line": 216,
+          "line": 295,
           "kind": "custom-event-listener",
           "match": "el.addEventListener('click'"
         },
         {
           "file": "modules/renderer/side-chat/message-actions.js",
-          "line": 265,
+          "line": 356,
           "kind": "custom-event-listener",
           "match": "doc.addEventListener('click'"
         },
@@ -5773,7 +5773,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/cards.js",
-          "line": 229,
+          "line": 230,
           "kind": "custom-event-listener",
           "match": "row.addEventListener('click'"
         },
@@ -5785,7 +5785,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/git-view.js",
-          "line": 260,
+          "line": 261,
           "kind": "custom-event-listener",
           "match": "btn.addEventListener('click'"
         },
@@ -6001,25 +6001,25 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-overview.js",
-          "line": 152,
+          "line": 153,
           "kind": "custom-event-listener",
           "match": "closeBtn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-overview.js",
-          "line": 162,
+          "line": 163,
           "kind": "custom-event-listener",
           "match": "item.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-overview.js",
-          "line": 178,
+          "line": 179,
           "kind": "custom-event-listener",
           "match": "item.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-overview.js",
-          "line": 235,
+          "line": 236,
           "kind": "custom-event-listener",
           "match": "button.addEventListener('click'"
         },
@@ -7308,7 +7308,7 @@
         },
         {
           "file": "modules/renderer/side-chat/message-actions.js",
-          "line": 264,
+          "line": 352,
           "kind": "custom-event-listener"
         },
         {
@@ -7338,7 +7338,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/cards.js",
-          "line": 247,
+          "line": 248,
           "kind": "custom-event-listener"
         },
         {
@@ -7439,7 +7439,7 @@
         },
         {
           "file": "modules/renderer/side-chat/message-actions.js",
-          "line": 264,
+          "line": 352,
           "kind": "custom-event-listener",
           "match": "root?.addEventListener('contextmenu'"
         },
@@ -7475,7 +7475,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/cards.js",
-          "line": 247,
+          "line": 248,
           "kind": "custom-event-listener",
           "match": "row.addEventListener('contextmenu'"
         },
@@ -12703,6 +12703,11 @@
           "line": 140,
           "kind": "custom-event-listener"
         },
+        {
+          "file": "modules/renderer/side-chat/message-actions.js",
+          "line": 354,
+          "kind": "custom-event-listener"
+        },
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
           "line": 194,
@@ -12716,6 +12721,12 @@
           "kind": "custom-event-listener",
           "match": "itemListUl.addEventListener('focusin'"
         },
+        {
+          "file": "modules/renderer/side-chat/message-actions.js",
+          "line": 354,
+          "kind": "custom-event-listener",
+          "match": "root?.addEventListener('focusin'"
+        },
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
           "line": 194,
@@ -14895,7 +14906,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-overview.js",
-          "line": 189,
+          "line": 190,
           "kind": "custom-event-listener"
         }
       ],
@@ -15088,7 +15099,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-overview.js",
-          "line": 189,
+          "line": 190,
           "kind": "custom-event-listener",
           "match": "searchInput.addEventListener('input'"
         }
@@ -15406,7 +15417,17 @@
         },
         {
           "file": "modules/renderer/side-chat/message-actions.js",
-          "line": 266,
+          "line": 286,
+          "kind": "custom-event-listener"
+        },
+        {
+          "file": "modules/renderer/side-chat/message-actions.js",
+          "line": 353,
+          "kind": "custom-event-listener"
+        },
+        {
+          "file": "modules/renderer/side-chat/message-actions.js",
+          "line": 357,
           "kind": "custom-event-listener"
         },
         {
@@ -15621,17 +15642,17 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-overview.js",
-          "line": 215,
+          "line": 216,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-overview.js",
-          "line": 253,
+          "line": 254,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 305,
+          "line": 312,
           "kind": "custom-event-listener"
         },
         {
@@ -15762,7 +15783,19 @@
         },
         {
           "file": "modules/renderer/side-chat/message-actions.js",
-          "line": 266,
+          "line": 286,
+          "kind": "custom-event-listener",
+          "match": "menu.addEventListener('keydown'"
+        },
+        {
+          "file": "modules/renderer/side-chat/message-actions.js",
+          "line": 353,
+          "kind": "custom-event-listener",
+          "match": "root?.addEventListener('keydown'"
+        },
+        {
+          "file": "modules/renderer/side-chat/message-actions.js",
+          "line": 357,
           "kind": "custom-event-listener",
           "match": "doc.addEventListener('keydown'"
         },
@@ -16020,19 +16053,19 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-overview.js",
-          "line": 215,
+          "line": 216,
           "kind": "custom-event-listener",
           "match": "searchInput.addEventListener('keydown'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-overview.js",
-          "line": 253,
+          "line": 254,
           "kind": "custom-event-listener",
           "match": "doc.addEventListener('keydown'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 305,
+          "line": 312,
           "kind": "custom-event-listener",
           "match": "tabListElement.addEventListener('keydown'"
         },
@@ -23096,7 +23129,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-overview.js",
-          "line": 252,
+          "line": 253,
           "kind": "custom-event-listener"
         },
         {
@@ -23154,7 +23187,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-overview.js",
-          "line": 252,
+          "line": 253,
           "kind": "custom-event-listener",
           "match": "doc.addEventListener('pointerdown'"
         },
@@ -26556,7 +26589,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 262,
+          "line": 269,
           "kind": "custom-event-listener"
         },
         {
@@ -26626,7 +26659,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 262,
+          "line": 269,
           "kind": "custom-event-listener",
           "match": "tabListElement.addEventListener('scroll'"
         },
diff --git a/modules/renderer/side-chat/message-actions.js b/modules/renderer/side-chat/message-actions.js
index b668a0b74..cb17d0fb7 100644
--- a/modules/renderer/side-chat/message-actions.js
+++ b/modules/renderer/side-chat/message-actions.js
@@ -106,8 +106,81 @@ export function createSideChatMessageActions({
         return sel.toString().trim();
     }
 
-    function closeMenu() {
+    // 打开菜单的那条消息：Esc、Tab 或执行菜单项后焦点回到这里
+    let returnFocusTo = null;
+
+    function closeMenu({ restoreFocus = false } = {}) {
         doc.getElementById(MENU_ID)?.remove();
+        const target = returnFocusTo;
+        returnFocusTo = null;
+        if (restoreFocus && target?.isConnected) target.focus?.({ preventScroll: true });
+    }
+
+    // 消息列表和话题列表一样只占一个 Tab 停靠点（Radix 的 roving tabindex）：
+    // 上下键、Home、End 在消息间移动，Shift+F10 或菜单键打开这条消息的菜单。
+    function messageItems() {
+        return root ? [...root.querySelectorAll('.message-item')] : [];
+    }
+
+    function setMessageTabStop(target) {
+        for (const item of messageItems()) item.tabIndex = item === target ? 0 : -1;
+    }
+
+    function ensureMessageTabStop() {
+        const items = messageItems();
+        if (!items.length) return;
+        items.forEach(item => {
+            if (!item.hasAttribute('tabindex')) item.tabIndex = -1;
+            if (!item.hasAttribute('aria-keyshortcuts')) item.setAttribute('aria-keyshortcuts', 'Shift+F10');
+        });
+        if (!items.some(item => item.tabIndex === 0)) items[items.length - 1].tabIndex = 0;
+    }
+
+    function onMessageFocusIn(event) {
+        if (event.target?.classList?.contains('message-item') && root.contains(event.target)) setMessageTabStop(event.target);
+    }
+
+    function onMessageKeydown(event) {
+        const current = event.target;
+        if (!current?.classList?.contains('message-item') || event.altKey || event.ctrlKey || event.metaKey) return;
+        const items = messageItems();
+        const index = items.indexOf(current);
+        if (index < 0) return;
+        let next = null;
+        if (event.key === 'ArrowDown') next = items[Math.min(items.length - 1, index + 1)];
+        else if (event.key === 'ArrowUp') next = items[Math.max(0, index - 1)];
+        else if (event.key === 'Home') next = items[0];
+        else if (event.key === 'End') next = items[items.length - 1];
+        else return;
+        event.preventDefault();
+        setMessageTabStop(next);
+        next.focus();
+        next.scrollIntoView?.({ block: 'nearest' });
+    }
+
+    function onMenuKeydown(event) {
+        const menu = event.currentTarget;
+        if (event.key === 'Tab') {
+            event.preventDefault();
+            closeMenu({ restoreFocus: true });
+            return;
+        }
+        if (event.key === 'Enter' || event.key === ' ') {
+            if (event.target?.getAttribute?.('role') !== 'menuitem') return;
+            event.preventDefault();
+            event.target.click();
+            return;
+        }
+        if (!['ArrowDown', 'ArrowUp', 'Home', 'End'].includes(event.key)) return;
+        const items = [...menu.querySelectorAll('[role="menuitem"]')];
+        if (!items.length) return;
+        event.preventDefault();
+        const current = items.indexOf(doc.activeElement);
+        let next = 0;
+        if (event.key === 'End') next = items.length - 1;
+        else if (event.key === 'ArrowDown') next = current < 0 ? 0 : (current + 1) % items.length;
+        else if (event.key === 'ArrowUp') next = current < 0 ? items.length - 1 : (current - 1 + items.length) % items.length;
+        items[next].focus();
     }
 
     function onOutsidePointer(event) {
@@ -116,7 +189,9 @@ export function createSideChatMessageActions({
     }
 
     function onKeydown(event) {
-        if (event.key === 'Escape') closeMenu();
+        if (event.key !== 'Escape') return;
+        const ours = doc.getElementById(MENU_ID)?.dataset.sideChatMenu === 'true';
+        closeMenu({ restoreFocus: ours });
     }
 
     function buildMenu(messageItem, message) {
@@ -207,15 +282,19 @@ export function createSideChatMessageActions({
         menu.className = 'context-menu';
         menu.dataset.sideChatMenu = 'true';
         menu.setAttribute('role', 'menu');
+        menu.setAttribute('aria-label', '消息操作');
+        menu.addEventListener('keydown', onMenuKeydown);
         for (const item of items) {
             const el = doc.createElement('div');
             el.className = item.className ? `context-menu-item ${item.className}` : 'context-menu-item';
             el.dataset.sideChatAction = item.action;
             el.setAttribute('role', 'menuitem');
-            el.innerHTML = `<i class="fas ${item.icon}"></i> ${item.label}`;
+            el.tabIndex = -1;
+            el.innerHTML = `<i class="fas ${item.icon}" aria-hidden="true"></i> `;
+            el.append(item.label);
             el.addEventListener('click', (e) => {
                 e.stopPropagation();
-                closeMenu();
+                closeMenu({ restoreFocus: true });
                 void item.run();
             });
             menu.appendChild(el);
@@ -258,10 +337,22 @@ export function createSideChatMessageActions({
         event.preventDefault();
         event.stopPropagation();
         closeMenu();
-        placeMenu(buildMenu(messageItem, message), event);
+        // 键盘（Shift+F10 / 菜单键）打开时没有指针坐标，贴着这条消息出菜单
+        let anchor = event;
+        if (!event.clientX && !event.clientY && typeof messageItem.getBoundingClientRect === 'function') {
+            const rect = messageItem.getBoundingClientRect();
+            anchor = { clientX: rect.left + 16, clientY: rect.top + 16 };
+        }
+        const menu = buildMenu(messageItem, message);
+        placeMenu(menu, anchor);
+        returnFocusTo = messageItem.tabIndex >= 0 || messageItem.hasAttribute('tabindex') ? messageItem : null;
+        menu.querySelector('[role="menuitem"]')?.focus?.({ preventScroll: true });
     }
 
     root?.addEventListener('contextmenu', onContextMenu);
+    root?.addEventListener('keydown', onMessageKeydown);
+    root?.addEventListener('focusin', onMessageFocusIn);
+    ensureMessageTabStop();
     doc.addEventListener('click', onOutsidePointer, true);
     doc.addEventListener('keydown', onKeydown, true);
 
@@ -270,6 +361,7 @@ export function createSideChatMessageActions({
     if (MutationObserverClass && root) {
         messageObserver = new MutationObserverClass(() => {
             if (store.isDisposed) return;
+            ensureMessageTabStop();
             updateEmptyState();
             pinToBottomIfSticky();
         });
@@ -281,6 +373,8 @@ export function createSideChatMessageActions({
         dispose() {
             messageObserver?.disconnect?.();
             root?.removeEventListener('contextmenu', onContextMenu);
+            root?.removeEventListener('keydown', onMessageKeydown);
+            root?.removeEventListener('focusin', onMessageFocusIn);
             doc.removeEventListener('click', onOutsidePointer, true);
             doc.removeEventListener('keydown', onKeydown, true);
             const menu = doc.getElementById(MENU_ID);
diff --git a/modules/renderer/side-chat/references.js b/modules/renderer/side-chat/references.js
index ddcdf1995..3668e7383 100644
--- a/modules/renderer/side-chat/references.js
+++ b/modules/renderer/side-chat/references.js
@@ -29,7 +29,7 @@ export function createSideChatReferences({
             removeBtn.className = 'side-chat-reference-remove';
             removeBtn.title = '移除引用';
             removeBtn.setAttribute('aria-label', '移除引用');
-            removeBtn.innerHTML = '<span class="vcp-ui-icon">close</span>';
+            removeBtn.innerHTML = '<span class="vcp-ui-icon" aria-hidden="true">close</span>';
             removeBtn.addEventListener('click', (e) => {
                 e.stopPropagation();
                 getHandle().removeReference(ref.id);
diff --git a/modules/ui-system/side-pane/browserSideProvider.js b/modules/ui-system/side-pane/browserSideProvider.js
index af04f5331..6981c530a 100644
--- a/modules/ui-system/side-pane/browserSideProvider.js
+++ b/modules/ui-system/side-pane/browserSideProvider.js
@@ -160,7 +160,7 @@ export function createBrowserSideProvider({
             };
             const iconButton = (icon, label) => {
                 const btn = el('button', 'side-browser-btn', { type: 'button', 'aria-label': label, title: label });
-                btn.innerHTML = `<span class="vcp-ui-icon">${icon}</span>`;
+                btn.innerHTML = `<span class="vcp-ui-icon" aria-hidden="true">${icon}</span>`;
                 return btn;
             };
 
@@ -181,7 +181,7 @@ export function createBrowserSideProvider({
             menu.hidden = true;
             const menuItem = (icon, label, action) => {
                 const item = el('button', 'side-browser-menu-item', { type: 'button', role: 'menuitem', 'data-action': action });
-                item.innerHTML = `<span class="vcp-ui-icon">${icon}</span><span></span>`;
+                item.innerHTML = `<span class="vcp-ui-icon" aria-hidden="true">${icon}</span><span></span>`;
                 item.lastElementChild.textContent = label;
                 return item;
             };
@@ -197,7 +197,7 @@ export function createBrowserSideProvider({
 
             const body = el('div', 'side-browser-body');
             const empty = el('div', 'side-browser-empty');
-            empty.innerHTML = '<span class="vcp-ui-icon">public</span><span class="side-browser-empty-text"></span>';
+            empty.innerHTML = '<span class="vcp-ui-icon" aria-hidden="true">public</span><span class="side-browser-empty-text"></span>';
             empty.querySelector('.side-browser-empty-text').textContent = '粘贴或输入 URL 以打开网页。';
             const notice = el('div', 'side-browser-notice');
             notice.hidden = true;
diff --git a/modules/ui-system/side-pane/code-viewer/editor.js b/modules/ui-system/side-pane/code-viewer/editor.js
index 426869b44..f611f9a6a 100644
--- a/modules/ui-system/side-pane/code-viewer/editor.js
+++ b/modules/ui-system/side-pane/code-viewer/editor.js
@@ -99,7 +99,7 @@ export function createCodeViewerEditor({
     async function loadFileContent({ force = false } = {}) {
         if (!readFile || (fileLoaded && !force)) return true;
         const token = ++readToken;
-        body.innerHTML = '<div class="side-code-loading"><span class="vcp-ui-icon spin">sync</span> 加载文件中...</div>';
+        body.innerHTML = '<div class="side-code-loading"><span class="vcp-ui-icon spin" aria-hidden="true">sync</span> 加载文件中...</div>';
         let result;
         try {
             result = await readFile({ allowOutsideWorkspace: outsideWorkspaceAllowed });
diff --git a/modules/ui-system/side-pane/codeViewerSideProvider.js b/modules/ui-system/side-pane/codeViewerSideProvider.js
index 1592e7b59..5c5e48d00 100644
--- a/modules/ui-system/side-pane/codeViewerSideProvider.js
+++ b/modules/ui-system/side-pane/codeViewerSideProvider.js
@@ -95,6 +95,7 @@ export function createCodeViewerSideProvider({
 
             const fileIcon = doc.createElement('span');
             fileIcon.className = 'vcp-ui-icon side-code-file-icon';
+            fileIcon.setAttribute('aria-hidden', 'true');
             fileIcon.textContent = currentMode === 'diff' ? 'difference' : 'code';
 
             const titleLabel = doc.createElement('span');
@@ -120,8 +121,8 @@ export function createCodeViewerSideProvider({
                 modeToggleBtn.title = currentMode === 'diff' ? '切换为纯代码视图' : '切换为差异对比视图';
                 modeToggleBtn.setAttribute('aria-label', '切换视图');
                 modeToggleBtn.innerHTML = currentMode === 'diff'
-                    ? '<span class="vcp-ui-icon">code</span>'
-                    : '<span class="vcp-ui-icon">difference</span>';
+                    ? '<span class="vcp-ui-icon" aria-hidden="true">code</span>'
+                    : '<span class="vcp-ui-icon" aria-hidden="true">difference</span>';
                 actionsWrapper.appendChild(modeToggleBtn);
             }
 
@@ -132,7 +133,7 @@ export function createCodeViewerSideProvider({
             wrapBtn.setAttribute('data-action', 'toggle-wrap');
             wrapBtn.title = '切换自动换行';
             wrapBtn.setAttribute('aria-label', '自动换行');
-            wrapBtn.innerHTML = '<span class="vcp-ui-icon">wrap_text</span>';
+            wrapBtn.innerHTML = '<span class="vcp-ui-icon" aria-hidden="true">wrap_text</span>';
             wrapBtn.classList.toggle('active', isWrapped);
 
             // Copy Code Button
@@ -142,7 +143,7 @@ export function createCodeViewerSideProvider({
             copyBtn.setAttribute('data-action', 'copy-code');
             copyBtn.title = '复制代码内容';
             copyBtn.setAttribute('aria-label', '复制代码');
-            copyBtn.innerHTML = '<span class="vcp-ui-icon">content_copy</span>';
+            copyBtn.innerHTML = '<span class="vcp-ui-icon" aria-hidden="true">content_copy</span>';
 
             // Insert to Chat Button
             const insertBtn = doc.createElement('button');
@@ -151,7 +152,7 @@ export function createCodeViewerSideProvider({
             insertBtn.setAttribute('data-action', 'insert-chat');
             insertBtn.title = '插入到主聊天输入框';
             insertBtn.setAttribute('aria-label', '插入聊天');
-            insertBtn.innerHTML = '<span class="vcp-ui-icon">format_quote</span>';
+            insertBtn.innerHTML = '<span class="vcp-ui-icon" aria-hidden="true">format_quote</span>';
 
             // External Open Button
             let externalBtn = null;
@@ -174,7 +175,7 @@ export function createCodeViewerSideProvider({
                 reloadBtn.setAttribute('data-action', 'reload-file');
                 reloadBtn.title = '重新读取文件';
                 reloadBtn.setAttribute('aria-label', '重新读取');
-                reloadBtn.innerHTML = '<span class="vcp-ui-icon">refresh</span>';
+                reloadBtn.innerHTML = '<span class="vcp-ui-icon" aria-hidden="true">refresh</span>';
                 actionsWrapper.appendChild(reloadBtn);
             }
 
@@ -196,7 +197,7 @@ export function createCodeViewerSideProvider({
                 pickerToggleBtn.className = 'side-code-action-btn';
                 pickerToggleBtn.title = '选择文件';
                 pickerToggleBtn.setAttribute('aria-label', '选择文件');
-                pickerToggleBtn.innerHTML = '<span class="vcp-ui-icon">folder_open</span>';
+                pickerToggleBtn.innerHTML = '<span class="vcp-ui-icon" aria-hidden="true">folder_open</span>';
                 actionsWrapper.prepend(pickerToggleBtn);
                 container.append(toolbar, picker, body);
             } else {
@@ -299,8 +300,8 @@ export function createCodeViewerSideProvider({
                     langTag.textContent = currentMode === 'diff' ? 'DIFF' : currentTag;
                     modeToggleBtn.title = currentMode === 'diff' ? '切换为纯代码视图' : '切换为差异对比视图';
                     modeToggleBtn.innerHTML = currentMode === 'diff'
-                        ? '<span class="vcp-ui-icon">code</span>'
-                        : '<span class="vcp-ui-icon">difference</span>';
+                        ? '<span class="vcp-ui-icon" aria-hidden="true">code</span>'
+                        : '<span class="vcp-ui-icon" aria-hidden="true">difference</span>';
                     refreshView();
                 });
             }
diff --git a/modules/ui-system/side-pane/git/cards.js b/modules/ui-system/side-pane/git/cards.js
index aa4c85e07..577eaf29a 100644
--- a/modules/ui-system/side-pane/git/cards.js
+++ b/modules/ui-system/side-pane/git/cards.js
@@ -207,6 +207,7 @@ export function createGitCards({
         counts.className = 'side-git-counts';
         const chevron = doc.createElement('span');
         chevron.className = 'vcp-ui-icon side-git-chevron';
+        chevron.setAttribute('aria-hidden', 'true');
         chevron.textContent = 'expand_more';
         meta.append(counts, chevron);
         row.append(label, meta);
diff --git a/modules/ui-system/side-pane/git/git-view.js b/modules/ui-system/side-pane/git/git-view.js
index 8a0297276..f258abd69 100644
--- a/modules/ui-system/side-pane/git/git-view.js
+++ b/modules/ui-system/side-pane/git/git-view.js
@@ -123,7 +123,7 @@ export function mountGitView(host, {
     const refreshBtn = doc.createElement('button');
     refreshBtn.type = 'button';
     refreshBtn.className = 'side-git-refresh-btn';
-    refreshBtn.innerHTML = '<span class="vcp-ui-icon">refresh</span><span>刷新</span>';
+    refreshBtn.innerHTML = '<span class="vcp-ui-icon" aria-hidden="true">refresh</span><span>刷新</span>';
 
     // 下拉做成胶囊（和浏览器工具栏一套）：select 本身去掉原生外观，箭头由外层补上
     const pill = (select, extra) => {
@@ -243,6 +243,7 @@ export function mountGitView(host, {
         empty.innerHTML = '';
         const iconEl = doc.createElement('span');
         iconEl.className = 'vcp-ui-icon side-git-empty-icon';
+        iconEl.setAttribute('aria-hidden', 'true');
         iconEl.textContent = icon;
         const titleEl = doc.createElement('p');
         titleEl.className = 'side-git-empty-title';
diff --git a/modules/ui-system/side-pane/side-pane-tab-overview.js b/modules/ui-system/side-pane/side-pane-tab-overview.js
index 9f64723fc..c6d5b22d7 100644
--- a/modules/ui-system/side-pane/side-pane-tab-overview.js
+++ b/modules/ui-system/side-pane/side-pane-tab-overview.js
@@ -79,6 +79,7 @@ export function createSidePaneTabOverview({
         const icon = doc.createElement('span');
         icon.className = 'vcp-ui-icon';
         icon.classList.add('vcp-side-pane-icon-base');
+        icon.setAttribute('aria-hidden', 'true');
         icon.textContent = name;
         return icon;
     }
@@ -148,7 +149,7 @@ export function createSidePaneTabOverview({
                     closeBtn.className = 'side-pane-tab-close';
                     closeBtn.title = '关闭';
                     closeBtn.setAttribute('aria-label', `关闭 ${tab.title}`);
-                    closeBtn.innerHTML = '<span class="vcp-ui-icon vcp-side-pane-icon-caption">close</span>';
+                    closeBtn.innerHTML = '<span class="vcp-ui-icon vcp-side-pane-icon-caption" aria-hidden="true">close</span>';
                     closeBtn.addEventListener('click', async (e) => {
                         e.stopPropagation();
                         await onClose(tab.id);
diff --git a/modules/ui-system/side-pane/side-pane-tab-strip.js b/modules/ui-system/side-pane/side-pane-tab-strip.js
index a5493f612..0887969c8 100644
--- a/modules/ui-system/side-pane/side-pane-tab-strip.js
+++ b/modules/ui-system/side-pane/side-pane-tab-strip.js
@@ -159,7 +159,7 @@ export function createSidePaneTabStrip({
         btn.setAttribute('aria-selected', String(isActive));
         btn.setAttribute('tabindex', isActive ? '0' : '-1');
         btn.setAttribute('data-tab-id', tab.id);
-        if (isClosable(tab)) btn.setAttribute('aria-keyshortcuts', 'Delete');
+        btn.setAttribute('aria-keyshortcuts', isClosable(tab) ? 'Delete Shift+F10' : 'Shift+F10');
 
         const iconSpan = doc.createElement('span');
         iconSpan.className = 'tab-icon vcp-ui-icon';
@@ -189,7 +189,7 @@ export function createSidePaneTabStrip({
             closeBtn.className = 'side-pane-tab-close';
             closeBtn.setAttribute('aria-label', `关闭 ${tab.title}`);
             closeBtn.setAttribute('tabindex', '-1');
-            closeBtn.innerHTML = '<span class="vcp-ui-icon vcp-side-pane-icon-caption">close</span>';
+            closeBtn.innerHTML = '<span class="vcp-ui-icon vcp-side-pane-icon-caption" aria-hidden="true">close</span>';
             closeBtn.addEventListener('click', (e) => {
                 e.stopPropagation();
                 onClose(tab.id);
@@ -217,7 +217,14 @@ export function createSidePaneTabStrip({
             e.preventDefault();
             e.stopPropagation();
             hideTooltip();
-            onContextMenu(tab.id, e.clientX, e.clientY);
+            // 键盘（Shift+F10 / 菜单键）打开时没有指针坐标，贴着标签下沿出菜单
+            let { clientX: x, clientY: y } = e;
+            if (!x && !y) {
+                const rect = tabItem.getBoundingClientRect();
+                x = rect.left + 8;
+                y = rect.bottom + 4;
+            }
+            onContextMenu(tab.id, x, y);
         });
         return tabItem;
     }
diff --git a/modules/ui-system/side-pane/terminalSideProvider.js b/modules/ui-system/side-pane/terminalSideProvider.js
index 90f5e92fd..ba6c56c7a 100644
--- a/modules/ui-system/side-pane/terminalSideProvider.js
+++ b/modules/ui-system/side-pane/terminalSideProvider.js
@@ -346,14 +346,14 @@ export function createTerminalSideProvider({
             restartBtn.className = 'side-terminal-btn';
             restartBtn.title = '重新启动终端（终端窗口和 AI 共用同一个会话，会一并重置）';
             restartBtn.setAttribute('aria-label', '重新启动终端');
-            restartBtn.innerHTML = '<span class="vcp-ui-icon">refresh</span>';
+            restartBtn.innerHTML = '<span class="vcp-ui-icon" aria-hidden="true">refresh</span>';
 
             const clearBtn = doc.createElement('button');
             clearBtn.type = 'button';
             clearBtn.className = 'side-terminal-btn';
             clearBtn.title = '清屏';
             clearBtn.setAttribute('aria-label', '清屏');
-            clearBtn.innerHTML = '<span class="vcp-ui-icon">delete_sweep</span>';
+            clearBtn.innerHTML = '<span class="vcp-ui-icon" aria-hidden="true">delete_sweep</span>';
 
             // 和浏览器 / Git 顶栏同一套胶囊：工作区下拉一个胶囊，清屏 + 重启合成一个胶囊
             const wsPill = doc.createElement('span');
diff --git a/package.json b/package.json
index 05cb919e3..b076d8c22 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
     "test:launchpad-icons": "node --test tests/launchpad-icons.test.js tests/launchpad-controller.test.js",
     "test:next-ui-empty-state": "node scripts/test-next-ui-empty-state.mjs",
     "test:ui-motion-contract": "node scripts/test-ui-motion-contract.mjs",
-    "check:ui-system": "npm run guard:design-subtraction && npm run guard:classic-parity && npm run guard:classic-retirement && npm run guard:next-delta && npm run guard:ui-interaction && npm run guard:ui-async-state && npm run guard:ui-task-journeys && npm run guard:theme-provenance && npm run test:ui-motion-contract && node --check modules/ui-system/lifecycle-scope.js && node --check VCPDistributedServer/frontend-plugin-loader.js && node --check modules/ui-system/component-manifest.js && node --check modules/ui-system/vcp-ui.js && node --check modules/ui-system/webawesome-runtime-manifest.js && node --check modules/ui-system/webawesome-adapter.js && node --check modules/ui-system/appearance-engine.js && node --check modules/ui-system/appearance-studio.js && node --check modules/ui-system/next-ui-apps.js && node --check modules/ui-system/component-showcase.js && node --check modules/ui-system/webawesome-comparison.js && node --check modules/topTabManager.js && npm run lint:ui-system && npm run guard:ui-system && npm run check:ui-applications && npm run test:ui-system && npm run test:appearance-engine && npm run test:appearance-studio && node scripts/test-next-ui-tab-lifecycle.mjs && node scripts/test-webawesome-adapter.mjs && node --test tests/lifecycle-scope.test.js tests/next-ui-registries.test.mjs tests/topic-list-mode-lifecycle.test.js tests/topic-list-load-robustness.test.js tests/settings-unsaved-indicator.test.mjs tests/settings-agent-draft-retention.test.mjs tests/sidebar-resizer-lifecycle.test.mjs tests/topic-list-keyboard.test.js tests/item-list-behavior.test.js tests/settings-select-projection-forms.test.mjs tests/settings-mimo-slot-lifecycle.test.mjs tests/settings-section-a11y.test.mjs && npm run test:bootstrap",
+    "check:ui-system": "npm run guard:design-subtraction && npm run guard:classic-parity && npm run guard:classic-retirement && npm run guard:next-delta && npm run guard:ui-interaction && npm run guard:ui-async-state && npm run guard:ui-task-journeys && npm run guard:theme-provenance && npm run test:ui-motion-contract && node --check modules/ui-system/lifecycle-scope.js && node --check VCPDistributedServer/frontend-plugin-loader.js && node --check modules/ui-system/component-manifest.js && node --check modules/ui-system/vcp-ui.js && node --check modules/ui-system/webawesome-runtime-manifest.js && node --check modules/ui-system/webawesome-adapter.js && node --check modules/ui-system/appearance-engine.js && node --check modules/ui-system/appearance-studio.js && node --check modules/ui-system/next-ui-apps.js && node --check modules/ui-system/component-showcase.js && node --check modules/ui-system/webawesome-comparison.js && node --check modules/topTabManager.js && npm run lint:ui-system && npm run guard:ui-system && npm run check:ui-applications && npm run test:ui-system && npm run test:appearance-engine && npm run test:appearance-studio && node scripts/test-next-ui-tab-lifecycle.mjs && node scripts/test-webawesome-adapter.mjs && node --test tests/lifecycle-scope.test.js tests/next-ui-registries.test.mjs tests/topic-list-mode-lifecycle.test.js tests/topic-list-load-robustness.test.js tests/settings-unsaved-indicator.test.mjs tests/settings-agent-draft-retention.test.mjs tests/sidebar-resizer-lifecycle.test.mjs tests/topic-list-keyboard.test.js tests/item-list-behavior.test.js tests/settings-select-projection-forms.test.mjs tests/settings-mimo-slot-lifecycle.test.mjs tests/side-chat-message-keyboard.test.mjs tests/side-pane-screen-reader-names.test.mjs tests/settings-section-a11y.test.mjs && npm run test:bootstrap",
     "test:appearance-engine": "node scripts/test-appearance-engine.mjs",
     "test:appearance-studio": "node scripts/test-appearance-studio.mjs",
     "test:vcp-ui-select-proxy": "node scripts/test-vcp-ui-select-proxy.mjs",
diff --git a/styles/ui-system/side-pane-side-chat.css b/styles/ui-system/side-pane-side-chat.css
index 760fd556a..a1d386249 100644
--- a/styles/ui-system/side-pane-side-chat.css
+++ b/styles/ui-system/side-pane-side-chat.css
@@ -242,3 +242,9 @@ html .side-chat-reference-box .vcp-ui-icon:where(.vcp-ui-scope, .vcp-ui-scope *)
     --vcp-ui-icon-size: 12px;
 }
 
+
+/* 消息可用方向键逐条聚焦（见 side-chat/message-actions.js），焦点环与左侧列表一致 */
+html .side-chat-messages-container .message-item:focus-visible:where(.vcp-ui-scope, .vcp-ui-scope *) {
+    outline: 2px solid var(--vcp-ui-focus-ring);
+    outline-offset: 2px;
+}
diff --git a/tests/side-chat-message-keyboard.test.mjs b/tests/side-chat-message-keyboard.test.mjs
new file mode 100644
index 000000000..32a68502d
--- /dev/null
+++ b/tests/side-chat-message-keyboard.test.mjs
@@ -0,0 +1,102 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { JSDOM } from 'jsdom';
+import { createSideChatMessageActions } from '../modules/renderer/side-chat/message-actions.js';
+
+// Side chat messages could only be edited, copied, regenerated or deleted
+// through a right-click menu, and neither the messages nor the menu items
+// could take focus. The list now works like the topic list: one tab stop,
+// arrow keys between messages, Shift+F10 for the menu, Escape back.
+
+function mount() {
+    const dom = new JSDOM('<!doctype html><body><div class="side-chat-messages-container" tabindex="-1"></div><textarea></textarea></body>');
+    const doc = dom.window.document;
+    const root = doc.querySelector('.side-chat-messages-container');
+    const history = [
+        { id: 'q1', role: 'user', content: 'first question' },
+        { id: 'a1', role: 'assistant', content: 'first answer' },
+        { id: 'q2', role: 'user', content: 'second question' }
+    ];
+    for (const message of history) {
+        const item = doc.createElement('div');
+        item.className = `message-item ${message.role}`;
+        item.dataset.messageId = message.id;
+        const content = doc.createElement('div');
+        content.className = 'md-content';
+        content.textContent = message.content;
+        item.append(content);
+        root.append(item);
+    }
+    const edits = [];
+    const owner = createSideChatMessageActions({
+        store: { isDisposed: false },
+        chatCapabilities: { uiHelper: { showToastNotification() {} } },
+        descriptor: { parent: {}, child: {} },
+        doc,
+        root,
+        textarea: doc.querySelector('textarea'),
+        getHistory: () => history,
+        saveHistory: async () => ({ success: true }),
+        removeMessage: async () => {},
+        isBusy: () => false,
+        editMessage: (_item, message) => edits.push(message.id),
+        regenerate: () => {},
+        updateEmptyState() {},
+        pinToBottomIfSticky() {}
+    });
+    const items = () => [...root.querySelectorAll('.message-item')];
+    const key = (target, name, init = {}) => target.dispatchEvent(new dom.window.KeyboardEvent('keydown', { key: name, bubbles: true, cancelable: true, ...init }));
+    const keyboardMenu = target => target.dispatchEvent(new dom.window.MouseEvent('contextmenu', { bubbles: true, cancelable: true, clientX: 0, clientY: 0 }));
+    return { dom, doc, root, owner, items, key, keyboardMenu, edits };
+}
+
+test('side chat messages are one tab stop with arrow, Home and End navigation', () => {
+    const { dom, doc, owner, items, key } = mount();
+    try {
+        const stops = () => items().filter(item => item.tabIndex === 0).map(item => item.dataset.messageId);
+        assert.deepEqual(stops(), ['q2'], 'the newest message is the tab stop');
+        items()[2].focus();
+        key(doc.activeElement, 'ArrowUp');
+        assert.equal(doc.activeElement.dataset.messageId, 'a1');
+        assert.deepEqual(stops(), ['a1'], 'the tab stop follows focus');
+        key(doc.activeElement, 'Home');
+        assert.equal(doc.activeElement.dataset.messageId, 'q1');
+        key(doc.activeElement, 'End');
+        assert.equal(doc.activeElement.dataset.messageId, 'q2');
+    } finally {
+        owner.dispose();
+        dom.window.close();
+    }
+});
+
+test('Shift+F10 on a message opens a focusable menu that Escape closes back to the message', () => {
+    const { dom, doc, owner, items, key, keyboardMenu, edits } = mount();
+    try {
+        const answer = items()[1];
+        answer.focus();
+        keyboardMenu(answer);
+        const menu = doc.getElementById('chatContextMenu');
+        assert.ok(menu, 'the menu opens without a pointer');
+        assert.equal(menu.getAttribute('role'), 'menu');
+        const menuItems = [...menu.querySelectorAll('[role="menuitem"]')];
+        assert.ok(menuItems.length > 1);
+        assert.equal(doc.activeElement, menuItems[0], 'focus moves into the menu');
+        key(doc.activeElement, 'ArrowDown');
+        assert.equal(doc.activeElement, menuItems[1]);
+        key(doc.activeElement, 'End');
+        assert.equal(doc.activeElement, menuItems.at(-1));
+        key(doc.activeElement, 'Escape');
+        assert.equal(doc.getElementById('chatContextMenu'), null);
+        assert.equal(doc.activeElement, answer, 'Escape returns focus to the message');
+
+        keyboardMenu(answer);
+        const edit = doc.querySelector('#chatContextMenu [data-side-chat-action="edit"]');
+        assert.equal(doc.activeElement, edit);
+        key(edit, 'Enter');
+        assert.deepEqual(edits, ['a1'], 'Enter runs the focused menu item');
+        assert.equal(doc.getElementById('chatContextMenu'), null);
+    } finally {
+        owner.dispose();
+        dom.window.close();
+    }
+});
diff --git a/tests/side-pane-screen-reader-names.test.mjs b/tests/side-pane-screen-reader-names.test.mjs
new file mode 100644
index 000000000..fde9477ab
--- /dev/null
+++ b/tests/side-pane-screen-reader-names.test.mjs
@@ -0,0 +1,72 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { JSDOM } from 'jsdom';
+
+import { mountGitView } from '../modules/ui-system/side-pane/git/git-view.js';
+import { createSidePaneTabStrip } from '../modules/ui-system/side-pane/side-pane-tab-strip.js';
+
+// Side pane icons are Material Symbols ligatures: the icon is literal text
+// such as "expand_more". Unless it is aria-hidden, a screen reader reads
+// that word as part of the control's name.
+
+// The text a screen reader takes from an element's content: everything
+// except aria-hidden subtrees.
+function spokenText(element) {
+    const clone = element.cloneNode(true);
+    clone.querySelectorAll('[aria-hidden="true"]').forEach(node => node.remove());
+    return clone.textContent.replace(/\s+/g, ' ').trim();
+}
+
+test('Git rows and the refresh button do not read icon ligature names', async () => {
+    const dom = new JSDOM('<div id="host"></div>', { pretendToBeVisual: true });
+    const host = dom.window.document.getElementById('host');
+    Object.defineProperty(dom.window.HTMLElement.prototype, 'offsetParent', { configurable: true, get() { return this.isConnected ? this.parentNode : null; } });
+    const api = {
+        async gitListWorkspaces() { return { success: true, data: { workspaces: [{ id: 'w', alias: 'w', path: '/w' }], activeWorkspaceId: 'w' } }; },
+        async gitStatus() { return { success: true, data: { isRepo: true, branch: { head: 'main' }, remotes: [], staged: [], changes: [{ path: 'src/app.js', status: 'M' }], conflicts: [] } }; },
+        async gitDiff() { return { success: false, error: 'n/a' }; }
+    };
+    const handle = mountGitView(host, { api, uiHelper: null });
+    await handle.ready;
+    try {
+        const row = host.querySelector('.side-git-row');
+        assert.ok(row);
+        assert.doesNotMatch(spokenText(row), /expand_more/);
+        assert.match(spokenText(row), /app\.js/);
+        assert.equal(spokenText(host.querySelector('.side-git-refresh-btn')), '刷新');
+    } finally {
+        handle.dispose?.();
+        dom.window.close();
+    }
+});
+
+test('Shift+F10 on a side pane tab opens its menu next to the tab, not at the window corner', () => {
+    const dom = new JSDOM('<div class="side-pane-tabs"></div>', { pretendToBeVisual: true });
+    const doc = dom.window.document;
+    const tabList = doc.querySelector('.side-pane-tabs');
+    const tabs = [{ id: 'a', title: 'A' }, { id: 'b', title: 'B' }];
+    const menus = [];
+    const strip = createSidePaneTabStrip({
+        tabListElement: tabList,
+        getTabs: () => tabs,
+        getActiveTabId: () => 'a',
+        isClosable: () => true,
+        onActivate() {},
+        onClose() {},
+        onReorder() {},
+        onContextMenu: (tabId, x, y) => menus.push({ tabId, x, y })
+    });
+    try {
+        strip.render();
+        const item = tabList.querySelector('.side-pane-tab-item[data-tab-id="b"]');
+        item.getBoundingClientRect = () => ({ left: 120, top: 10, right: 200, bottom: 40, width: 80, height: 30 });
+        item.querySelector('[role="tab"]').dispatchEvent(new dom.window.MouseEvent('contextmenu', { bubbles: true, cancelable: true, clientX: 0, clientY: 0 }));
+        assert.deepEqual(menus, [{ tabId: 'b', x: 128, y: 44 }]);
+        item.querySelector('[role="tab"]').dispatchEvent(new dom.window.MouseEvent('contextmenu', { bubbles: true, cancelable: true, clientX: 150, clientY: 25 }));
+        assert.deepEqual(menus[1], { tabId: 'b', x: 150, y: 25 }, 'a pointer right-click still opens at the pointer');
+        assert.equal(spokenText(item.querySelector('.side-pane-tab-close')), '', 'the close button is named by its label alone');
+    } finally {
+        strip.dispose();
+        dom.window.close();
+    }
+});

From 37ace593b45f1507742d599b9f8841e2463f2a3a Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 03:30:33 +0000
Subject: [PATCH 106/143] Side chat dormancy: keep removed references and
 picked model across sleep when storage fails

The in-memory snapshot taken at sleep is the newest state; on wake it now
wins over the stale localStorage entry, so a reference the user removed is
not revived and the model choice is not reverted. Adds dormancy regression
tests (model, debounce, storage failure, quit while dormant, topic switch)
and a busy-until-saved check for streaming replies.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_016hW799u5Ji5k9khDAwu688
---
 modules/renderer/side-chat/draft-cache.js | 14 ++++-
 tests/side-chat-draft-restore.test.mjs    | 75 +++++++++++++++++++++++
 tests/side-chat-save-failure.test.mjs     | 23 ++++++-
 3 files changed, 108 insertions(+), 4 deletions(-)

diff --git a/modules/renderer/side-chat/draft-cache.js b/modules/renderer/side-chat/draft-cache.js
index 62144a826..cbcd3077f 100644
--- a/modules/renderer/side-chat/draft-cache.js
+++ b/modules/renderer/side-chat/draft-cache.js
@@ -14,20 +14,28 @@ export function createSideChatDraftCache() {
         drafts.delete(key);
         const source = cached || descriptor;
         if (typeof source.draft === 'string' && typeof handle.setDraft === 'function' && handle.getDraft?.() !== source.draft) handle.setDraft(source.draft);
+        // 休眠前的内存快照是最新的：它没有的引用是用户删掉的，不能因为 localStorage 没写进去就从旧存档里复活
+        if (cached && Array.isArray(cached.references) && typeof handle.removeReference === 'function') {
+            const keep = new Set(cached.references.map(ref => ref.id));
+            (handle.getReferences?.() || []).filter(ref => !keep.has(ref.id)).forEach(ref => handle.removeReference(ref.id));
+        }
         if (Array.isArray(source.references) && typeof handle.addReference === 'function') {
             source.references.forEach(ref => {
                 if (!handle.getReferences?.().some(current => current.id === ref.id)) handle.addReference(ref);
             });
         }
-        if (descriptor.model && typeof handle.setModel === 'function' && handle.getModel?.() !== descriptor.model) {
-            handle.setModel(descriptor.model);
+        // 模型同理：休眠前选的模型以内存快照为准
+        const model = cached?.model || descriptor.model;
+        if (model && typeof handle.setModel === 'function' && handle.getModel?.() !== model) {
+            handle.setModel(model);
         }
     }
 
     function capture(handle, descriptor) {
         const draft = handle.getDraft?.() || '';
         const references = handle.getReferences?.() || [];
-        drafts.set(childKeyOf(descriptor), { draft, references });
+        const model = handle.getModel?.() || null;
+        drafts.set(childKeyOf(descriptor), { draft, references, model });
     }
 
     function ownHandle(handle, descriptor) {
diff --git a/tests/side-chat-draft-restore.test.mjs b/tests/side-chat-draft-restore.test.mjs
index c02bf49ad..b7336475a 100644
--- a/tests/side-chat-draft-restore.test.mjs
+++ b/tests/side-chat-draft-restore.test.mjs
@@ -157,3 +157,78 @@ test('a side chat put to sleep behind another tab keeps its draft, and a referen
     assert.equal(handle.getDraft(), 'half typed, then more');
     assert.deepEqual(handle.getReferences().map(ref => ref.id), ['ref-1', 'ref-2']);
 });
+
+// 休眠场景：休眠/唤醒、切话题、退出都不能丢草稿、引用和模型
+const sleep = ms => new Promise(r => setTimeout(r, ms));
+async function sleepableSideChat(t, opts = {}) {
+    const f = await fixture(t, { composerStorage: 'local' });
+    f.drafts.save(f.descriptor, { draft: 'start', references: [{ id: 'ref-1', text: 'first selection' }], model: 'm0' });
+    const s = f.mountController({ dormancy: { hiddenMs: 30, ...(opts.dormancy || {}) } });
+    s.controller.registerTabType({ kind: 'note', label: 'Note', provider: { mountTab: () => ({ dispose() {} }) } });
+    await s.wiring.restoreSessions('agent', 'parent');
+    const tab = s.controller.getSnapshot().tabs.find(item => item.kind === 'chat');
+    s.controller.activateTab(tab.id); s.controller.setVisible(true);
+    await sleep(20);
+    const hide = async () => { await s.controller.openTab({ id: 'note:' + Math.random(), kind: 'note', title: 'Note', closable: true, scopeMode: 'global' }); await sleep(120); };
+    const wake = async () => { s.controller.activateTab(tab.id); for (let i = 0; i < 50 && !s.controller.getTabHandle(tab.id); i++) await sleep(5); await sleep(20); return s.controller.getTabHandle(tab.id); };
+    return { f, s, tab, hide, wake, handle: () => s.controller.getTabHandle(tab.id) };
+}
+
+test('a model picked in a side chat survives sleep', async t => {
+    const p = await sleepableSideChat(t);
+    p.handle().setModel('m-new');
+    await p.hide();
+    assert.equal(p.handle(), null);
+    const h = await p.wake();
+    assert.equal(h.getModel(), 'm-new');
+});
+
+test('a draft typed inside the save debounce survives sleep and reaches storage', async t => {
+    const p = await sleepableSideChat(t);
+    const ta = p.f.doc.querySelector('.side-chat-textarea');
+    ta.value = 'typed fast'; ta.dispatchEvent(new p.f.dom.window.Event('input', { bubbles: true }));
+    await p.hide();
+    assert.equal(p.handle(), null);
+    assert.equal(p.f.drafts.read(p.f.descriptor).input.draft, 'typed fast');
+    const h = await p.wake();
+    assert.equal(h.getDraft(), 'typed fast');
+});
+
+test('sleep keeps the latest draft, removed references and model even when localStorage writes fail', async t => {
+    const p = await sleepableSideChat(t);
+    const proto = Object.getPrototypeOf(p.f.dom.window.localStorage);
+    const orig = proto.setItem; proto.setItem = function () { throw new Error('QuotaExceeded'); };
+    try {
+        p.handle().setDraft('new text'); p.handle().removeReference('ref-1'); p.handle().setModel('m-new');
+        await p.hide();
+        const h = await p.wake();
+        assert.equal(h.getDraft(), 'new text');
+        assert.deepEqual(h.getReferences(), [], 'removed reference must not come back');
+        assert.equal(h.getModel(), 'm-new');
+    } finally { proto.setItem = orig; }
+});
+
+test('quitting while a side chat is dormant restores its latest draft on relaunch', async t => {
+    const p = await sleepableSideChat(t);
+    p.handle().setDraft('before quit');
+    await p.hide();
+    p.f.dom.window.dispatchEvent(new p.f.dom.window.Event('pagehide'));
+    await p.s.controller.dispose(); p.s.wiring.dispose();
+    const s2 = p.f.mountController();
+    await s2.wiring.restoreSessions('agent', 'parent');
+    const tab = s2.controller.getSnapshot().tabs.find(item => item.kind === 'chat');
+    assert.equal(s2.controller.getTabHandle(tab.id).getDraft(), 'before quit');
+    assert.equal(s2.controller.getTabHandle(tab.id).getModel(), 'm0');
+});
+
+test('a side chat that sleeps after a topic switch keeps its draft when the topic comes back', async t => {
+    const p = await sleepableSideChat(t, { dormancy: { otherTopicMs: 30 } });
+    p.handle().setDraft('topic draft');
+    p.s.controller.setParent({ ...p.f.descriptor.parent, topicId: 'other' });
+    await sleep(150);
+    assert.equal(p.handle(), null, 'slept after leaving the topic');
+    p.s.controller.setParent(p.f.descriptor.parent);
+    for (let i = 0; i < 50 && !p.handle(); i++) await sleep(5);
+    await sleep(20);
+    assert.equal(p.handle()?.getDraft(), 'topic draft');
+});
diff --git a/tests/side-chat-save-failure.test.mjs b/tests/side-chat-save-failure.test.mjs
index fde50ef8b..8371e5bb5 100644
--- a/tests/side-chat-save-failure.test.mjs
+++ b/tests/side-chat-save-failure.test.mjs
@@ -1,6 +1,6 @@
 import test from 'node:test';
 import assert from 'node:assert/strict';
-import { fixture } from './helpers/side-chat-surface-fixture.mjs';
+import { fixture, tick } from './helpers/side-chat-surface-fixture.mjs';
 
 // 关掉流式输出时，回复存盘失败也要和流式一样：亮「保存失败」、拦住关闭，而不是当作已完成（重启后回复就没了）
 for (const [label, failure] of [['IPC 的 { error } 形状', { error: 'EACCES: permission denied' }], ['{ success: false }', { success: false, error: 'EACCES: permission denied' }]]) {
@@ -22,3 +22,24 @@ test('a non-streaming reply that saves fine still completes normally', async t =
     assert.equal(f.badgeHidden(), true);
     assert.deepEqual(f.getHistory().map(m => m.role), ['user', 'assistant']);
 });
+
+// 回复落盘之前侧聊一直算忙，不会被休眠回收
+test('a streaming side chat stays busy until the reply is on disk', async t => {
+    let bridgeRef, args;
+    const f = await fixture(t, { stream: true, onSend: async (a, bridge) => { bridgeRef = bridge; args = a; return { streamingStarted: true }; } });
+    f.submit('q');
+    for (let i = 0; i < 10; i++) await tick();
+    assert.equal(f.handle.isBusy(), true, 'streaming');
+    bridgeRef.accept({ type: 'data', messageId: args[4], context: args[6], chunk: 'part' });
+    bridgeRef.accept({ type: 'end', messageId: args[4], context: args[6], fullResponse: 'part answer' });
+    let sawIdleBeforeDisk = false;
+    for (let i = 0; i < 100; i++) {
+        await tick();
+        const onDisk = f.getHistory().some(m => m.role === 'assistant' && /part/.test(m.content || ''));
+        if (!f.handle.isBusy() && !onDisk) sawIdleBeforeDisk = true;
+        if (!f.handle.isBusy() && onDisk) break;
+    }
+    assert.equal(sawIdleBeforeDisk, false, 'never idle (sleepable) before the reply is saved');
+    assert.equal(f.handle.isBusy(), false);
+    assert.ok(f.getHistory().some(m => m.role === 'assistant'), JSON.stringify(f.getHistory()));
+});

From 0d256a09a1a1c1f35098d841494c9d960a823455 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 03:32:55 +0000
Subject: [PATCH 107/143] Side chat: a woken side chat returns to the message
 the reader left

Side chats sleep once they have been hidden for a while, so captureState
always runs on a display:none container whose scrollTop and scrollHeight
read 0. The saved distance was therefore 0 and every scrolled-up side
chat came back at the bottom. The position is now remembered on each
scroll and pin while the list is visible.

A distance alone still lands dozens of messages off after a remount,
because the messages below the reader were never laid out again and use
estimated heights. The capture now also records the first visible
message and its offset; the remount keeps the list hidden until that
message is mounted, places it exactly, and keeps it there while older
batches render above. If it never appears, the list shows after 2s
using the distance. Scrolling, keys or touch release it at once.

Measured in Electron with a 120-message side chat parked at message 45:
before, it woke at message 119; now it wakes at message 45 with no
visible scrolling while history batches load.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_017bCbRB3E9yajQ3HbdMrjiJ
---
 .../contracts/generated/chat-event-graph.json | 20 ++---
 modules/renderer/side-chat/scrolling.js       | 71 +++++++++++++--
 tests/side-chat-scrolling.test.mjs            | 88 ++++++++++++++++++-
 3 files changed, 161 insertions(+), 18 deletions(-)

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 83f751b30..556b89d32 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -15426,7 +15426,7 @@
         },
         {
           "file": "modules/renderer/side-chat/scrolling.js",
-          "line": 69,
+          "line": 120,
           "kind": "custom-event-listener"
         },
         {
@@ -15786,7 +15786,7 @@
         },
         {
           "file": "modules/renderer/side-chat/scrolling.js",
-          "line": 69,
+          "line": 120,
           "kind": "custom-event-listener",
           "match": "root.addEventListener('keydown'"
         },
@@ -26531,7 +26531,7 @@
         },
         {
           "file": "modules/renderer/side-chat/scrolling.js",
-          "line": 67,
+          "line": 118,
           "kind": "custom-event-listener"
         },
         {
@@ -26596,7 +26596,7 @@
         },
         {
           "file": "modules/renderer/side-chat/scrolling.js",
-          "line": 67,
+          "line": 118,
           "kind": "custom-event-listener",
           "match": "root.addEventListener('scroll'"
         },
@@ -29327,14 +29327,14 @@
       "consumers": [
         {
           "file": "modules/renderer/side-chat/scrolling.js",
-          "line": 71,
+          "line": 122,
           "kind": "custom-event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/renderer/side-chat/scrolling.js",
-          "line": 71,
+          "line": 122,
           "kind": "custom-event-listener",
           "match": "root.addEventListener('touchmove'"
         }
@@ -29346,7 +29346,7 @@
       "consumers": [
         {
           "file": "modules/renderer/side-chat/scrolling.js",
-          "line": 70,
+          "line": 121,
           "kind": "custom-event-listener"
         },
         {
@@ -29358,7 +29358,7 @@
       "evidence": [
         {
           "file": "modules/renderer/side-chat/scrolling.js",
-          "line": 70,
+          "line": 121,
           "kind": "custom-event-listener",
           "match": "root.addEventListener('touchstart'"
         },
@@ -31777,7 +31777,7 @@
         },
         {
           "file": "modules/renderer/side-chat/scrolling.js",
-          "line": 68,
+          "line": 119,
           "kind": "custom-event-listener"
         },
         {
@@ -31806,7 +31806,7 @@
         },
         {
           "file": "modules/renderer/side-chat/scrolling.js",
-          "line": 68,
+          "line": 119,
           "kind": "custom-event-listener",
           "match": "root.addEventListener('wheel'"
         },
diff --git a/modules/renderer/side-chat/scrolling.js b/modules/renderer/side-chat/scrolling.js
index 2863f21df..1083946c9 100644
--- a/modules/renderer/side-chat/scrolling.js
+++ b/modules/renderer/side-chat/scrolling.js
@@ -4,6 +4,8 @@
  */
 'use strict';
 
+const ANCHOR_WAIT_MS = 2000;
+
 export function createSideChatScrolling({
     store,
     doc,
@@ -17,24 +19,71 @@ export function createSideChatScrolling({
     // 按距离底部而不是 scrollTop 定位才不会跳。用户自己一滚就放开
     let anchorFromBottom = null;
     let anchoredTop = null;
+    // 最近一次可见时的位置：离底部的距离，和顶上第一条看得见的消息及它离容器顶部的偏移。
+    // 休眠总发生在标签隐藏之后，那时容器 display:none，尺寸和 scrollTop 都读成 0，只能用隐藏前记下的值
+    let visibleFromBottom = null;
+    let visibleAnchor = null;
+    // 重挂时按消息定位：没见过的消息高度是估的，光按离底部的距离会偏几十条。
+    // 那条消息挂上之前列表先不显示，免得看着它随分批插入一路滚过去
+    let anchorMessage = null;
+    let anchorTimer = null;
+    const win = doc?.defaultView || globalThis;
+    const messageItems = () => [...root.children].filter(el => el.dataset?.messageId);
+    function firstVisibleMessage() {
+        const items = messageItems();
+        const top = root.getBoundingClientRect().top;
+        let lo = 0, hi = items.length - 1, found = null;
+        while (lo <= hi) {
+            const mid = (lo + hi) >> 1;
+            if (items[mid].getBoundingClientRect().bottom > top) { found = items[mid]; hi = mid - 1; } else lo = mid + 1;
+        }
+        return found ? { id: found.dataset.messageId, offset: found.getBoundingClientRect().top - top } : null;
+    }
+    const rememberPosition = () => {
+        if (!root || root.clientHeight === 0) return;
+        visibleFromBottom = Math.max(0, root.scrollHeight - root.scrollTop);
+        visibleAnchor = stickToBottom ? null : firstVisibleMessage();
+    };
+    function reveal() {
+        if (anchorTimer !== null) win.clearTimeout(anchorTimer);
+        anchorTimer = null;
+        anchorMessage = null;
+        if (root) root.style.visibility = '';
+    }
+    function placeAnchorMessage() {
+        const el = [...root.children].find(item => item.dataset?.messageId === anchorMessage.id);
+        if (!el) return false;
+        root.scrollTop += el.getBoundingClientRect().top - root.getBoundingClientRect().top - anchorMessage.offset;
+        anchorFromBottom = root.scrollHeight - root.scrollTop;
+        if (anchorTimer !== null) win.clearTimeout(anchorTimer);
+        anchorTimer = null;
+        root.style.visibility = '';
+        return true;
+    }
 
     function pinToBottomIfSticky() {
         if (store.isDisposed || !root || root.clientHeight === 0) return;
-        if (anchorFromBottom !== null) {
+        if (anchorMessage && placeAnchorMessage()) {
+            anchoredTop = root.scrollTop;
+            lastScrollTop = root.scrollTop;
+        } else if (anchorFromBottom !== null) {
             root.scrollTop = Math.max(0, root.scrollHeight - anchorFromBottom);
             anchoredTop = root.scrollTop;
             lastScrollTop = root.scrollTop;
         } else if (stickToBottom) {
             root.scrollTop = root.scrollHeight;
         }
+        rememberPosition();
     }
 
     if (root) {
         const onRootScroll = () => {
             if (root.clientHeight === 0) return;
+            rememberPosition();
             if (anchorFromBottom !== null) {
                 if (Math.abs(root.scrollTop - anchoredTop) <= 1) return;
                 anchorFromBottom = null;
+                if (anchorMessage) reveal();
             }
             const distance = root.scrollHeight - root.scrollTop - root.clientHeight;
             const movedUp = root.scrollTop < lastScrollTop - 1;
@@ -49,11 +98,12 @@ export function createSideChatScrolling({
         // 把视图拽回底部，只靠 scroll 判断就会和滚轮打架（ZCode use-stick-to-bottom 同样监听 wheel 立即脱离）
         const escape = () => {
             anchorFromBottom = null;
+            if (anchorMessage) reveal();
             if (root.scrollHeight > root.clientHeight) stickToBottom = false;
         };
-        const onWheel = (event) => { anchorFromBottom = null; if (event.deltaY < 0) escape(); };
+        const onWheel = (event) => { anchorFromBottom = null; if (anchorMessage) reveal(); if (event.deltaY < 0) escape(); };
         const onKeyDown = (event) => {
-            if (['ArrowDown', 'PageDown', 'End', ' '].includes(event.key)) anchorFromBottom = null;
+            if (['ArrowDown', 'PageDown', 'End', ' '].includes(event.key)) { anchorFromBottom = null; if (anchorMessage) reveal(); }
             if (['ArrowUp', 'PageUp', 'Home'].includes(event.key) && !event.target?.closest?.('textarea, input, [contenteditable="true"]')) escape();
         };
         let touchY = null;
@@ -61,6 +111,7 @@ export function createSideChatScrolling({
         const onTouchMove = (event) => {
             const y = event.touches?.[0]?.clientY;
             anchorFromBottom = null;
+            if (anchorMessage) reveal();
             if (touchY !== null && y > touchY + 2) escape(); // 手指下拉 = 内容往上翻
             touchY = y ?? touchY;
         };
@@ -102,15 +153,25 @@ export function createSideChatScrolling({
     /** 休眠前存下：贴底的只记贴底，否则记离底部的距离。 */
     function capture() {
         if (!root || stickToBottom) return { stick: true };
-        return { stick: false, fromBottom: Math.max(0, root.scrollHeight - root.scrollTop) };
+        rememberPosition();
+        if (visibleFromBottom === null) return { stick: true };
+        return visibleAnchor
+            ? { stick: false, fromBottom: visibleFromBottom, anchor: { ...visibleAnchor } }
+            : { stick: false, fromBottom: visibleFromBottom };
     }
 
     function restore(saved) {
         if (saved?.stick !== false || !Number.isFinite(saved.fromBottom)) return;
         stickToBottom = false;
         anchorFromBottom = saved.fromBottom;
+        if (root && typeof saved.anchor?.id === 'string' && Number.isFinite(saved.anchor.offset)) {
+            anchorMessage = { id: saved.anchor.id, offset: saved.anchor.offset };
+            root.style.visibility = 'hidden';
+            // 那条消息被删了或迟迟没挂上：退回按距离定位，列表照常显示
+            anchorTimer = win.setTimeout(() => { anchorTimer = null; reveal(); pinToBottomIfSticky(); }, ANCHOR_WAIT_MS);
+        }
         pinToBottomIfSticky();
     }
 
-    return Object.freeze({ pinToBottomIfSticky, isSticky: () => stickToBottom, capture, restore, resume() { stickToBottom = true; anchorFromBottom = null; }, dispose() { disposeCleanups.splice(0).forEach(fn => { try { fn(); } catch {} }); } });
+    return Object.freeze({ pinToBottomIfSticky, isSticky: () => stickToBottom, capture, restore, resume() { stickToBottom = true; anchorFromBottom = null; if (anchorMessage) reveal(); }, dispose() { if (anchorTimer !== null) win.clearTimeout(anchorTimer); anchorTimer = null; disposeCleanups.splice(0).forEach(fn => { try { fn(); } catch {} }); } });
 }
diff --git a/tests/side-chat-scrolling.test.mjs b/tests/side-chat-scrolling.test.mjs
index 8718d1d1f..59eff54d8 100644
--- a/tests/side-chat-scrolling.test.mjs
+++ b/tests/side-chat-scrolling.test.mjs
@@ -18,10 +18,13 @@ function setup() {
     };
     const root = win.document.getElementById('root');
     let scrollHeight = 1000;
-    Object.defineProperty(root, 'clientHeight', { get: () => 500 });
-    Object.defineProperty(root, 'scrollHeight', { get: () => scrollHeight });
+    let hidden = false;
+    Object.defineProperty(root, 'clientHeight', { get: () => hidden ? 0 : 500 });
+    Object.defineProperty(root, 'scrollHeight', { get: () => hidden ? 0 : scrollHeight });
     const scrolling = createSideChatScrolling({ store: { isDisposed: false }, doc: win.document, root });
-    return { win, root, ro: observers[0], scrolling, grow: (px) => { scrollHeight += px; } };
+    // display:none 的容器：尺寸和 scrollTop 都读成 0
+    const hide = () => { hidden = true; root.scrollTop = 0; };
+    return { win, root, ro: observers[0], scrolling, grow: (px) => { scrollHeight += px; }, hide };
 }
 
 test('a reply that grows after the last pin is still followed to the bottom', async () => {
@@ -130,6 +133,85 @@ test('a remount after sleep keeps the reader the same distance from the bottom w
     after.scrolling.dispose();
 });
 
+test('a view that sleeps while hidden still keeps the distance it had when it was last shown', () => {
+    const { win, root, scrolling, hide } = setup();
+    root.scrollTop = 500;
+    root.dispatchEvent(new win.Event('scroll'));
+    root.scrollTop = 200;
+    root.dispatchEvent(new win.Event('scroll'));
+    hide(); // 切到别的标签；休眠要到隐藏之后才发生
+    assert.deepEqual(scrolling.capture(), { stick: false, fromBottom: 800 });
+    scrolling.dispose();
+});
+
+// 每条消息 100px 高、按顺序排列的列表，矩形跟着 scrollTop 走
+function setupList(ids) {
+    const dom = new JSDOM('<div id="root"></div>');
+    const win = dom.window;
+    const observers = [];
+    win.ResizeObserver = class {
+        constructor(cb) { this.cb = cb; this.targets = new Set(); observers.push(this); }
+        observe(el) { this.targets.add(el); }
+        unobserve(el) { this.targets.delete(el); }
+        disconnect() { this.targets.clear(); }
+        fire() { this.cb([]); }
+    };
+    const root = win.document.getElementById('root');
+    let scrollTop = 0;
+    let hidden = false;
+    const items = () => [...root.children];
+    Object.defineProperty(root, 'clientHeight', { get: () => hidden ? 0 : 300 });
+    Object.defineProperty(root, 'scrollHeight', { get: () => hidden ? 0 : items().length * 100 });
+    Object.defineProperty(root, 'scrollTop', {
+        get: () => hidden ? 0 : scrollTop,
+        set: v => { scrollTop = Math.max(0, Math.min(v, items().length * 100 - 300)); }
+    });
+    root.getBoundingClientRect = () => ({ top: 0, bottom: 300 });
+    const make = id => {
+        const el = win.document.createElement('div');
+        el.dataset.messageId = id;
+        el.getBoundingClientRect = () => { const top = items().indexOf(el) * 100 - scrollTop; return { top, bottom: top + 100 }; };
+        return el;
+    };
+    ids.forEach(id => root.appendChild(make(id)));
+    const scrolling = createSideChatScrolling({ store: { isDisposed: false }, doc: win.document, root });
+    return { win, root, ro: observers[0], scrolling, make, hide: () => { hidden = true; } };
+}
+
+test('a remount lands on the message the reader was looking at, and the list stays hidden until it is there', () => {
+    const ids = Array.from({ length: 10 }, (_, i) => `m_${i}`);
+    const before = setupList(ids);
+    before.root.dispatchEvent(new before.win.WheelEvent('wheel', { deltaY: -40 }));
+    before.root.scrollTop = 350;
+    before.root.dispatchEvent(new before.win.Event('scroll'));
+    before.hide();
+    const saved = before.scrolling.capture();
+    assert.deepEqual(saved, { stick: false, fromBottom: 650, anchor: { id: 'm_3', offset: -50 } });
+    before.scrolling.dispose();
+
+    // 重挂：先渲染最新两条，较早的分批插到上面
+    const after = setupList(['m_8', 'm_9']);
+    after.scrolling.restore(saved);
+    assert.equal(after.root.style.visibility, 'hidden');
+    for (const id of ['m_7', 'm_6', 'm_5', 'm_4']) after.root.prepend(after.make(id));
+    after.ro.fire();
+    assert.equal(after.root.style.visibility, 'hidden', 'm_3 is not mounted yet');
+    for (const id of ['m_3', 'm_2', 'm_1', 'm_0']) after.root.prepend(after.make(id));
+    after.ro.fire();
+    assert.equal(after.root.style.visibility, '');
+    assert.equal(after.root.scrollTop, 350);
+    after.scrolling.dispose();
+});
+
+test('a remount whose anchor message is missing shows the list as soon as the reader scrolls', async () => {
+    const after = setupList(['m_8', 'm_9']);
+    after.scrolling.restore({ stick: false, fromBottom: 100, anchor: { id: 'gone', offset: 0 } });
+    assert.equal(after.root.style.visibility, 'hidden');
+    after.root.dispatchEvent(new after.win.WheelEvent('wheel', { deltaY: 40 }));
+    assert.equal(after.root.style.visibility, '', 'scrolling shows the list at once');
+    after.scrolling.dispose();
+});
+
 test('a view that was following the bottom comes back following it', () => {
     const { scrolling } = setup();
     assert.deepEqual(scrolling.capture(), { stick: true });

From e9451817e47c0ac88aaadbabec2492ca9a5dcd07 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 03:41:18 +0000
Subject: [PATCH 108/143] Trajectory tab: keyboard expansion menu
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The 自定义展开 menu never took focus, had no Escape, and rebuilt its
switches on every toggle so focus fell to the page. Opening it now moves
focus to the first switch, arrow keys move between switches, toggling
keeps focus on the same switch, and Escape or Tab closes it back to the
button, which reports aria-haspopup and aria-expanded.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012AP71nAxrCFEpH7st6asf9
---
 .../contracts/generated/chat-event-graph.json | 20 ++++-----
 .../side-pane/modelTrajectorySideProvider.js  | 44 +++++++++++++++++--
 tests/side-pane-model-trajectory.test.mjs     | 24 ++++++++++
 3 files changed, 74 insertions(+), 14 deletions(-)

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 2c59f8041..77fea7913 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -4222,17 +4222,17 @@
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 348,
+          "line": 351,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 372,
+          "line": 375,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 762,
+          "line": 768,
           "kind": "custom-event-listener"
         },
         {
@@ -5797,19 +5797,19 @@
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 348,
+          "line": 351,
           "kind": "custom-event-listener",
           "match": "more.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 372,
+          "line": 375,
           "kind": "custom-event-listener",
           "match": "head.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 762,
+          "line": 768,
           "kind": "custom-event-listener",
           "match": "item.addEventListener('click'"
         },
@@ -15587,7 +15587,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 373,
+          "line": 376,
           "kind": "custom-event-listener"
         },
         {
@@ -15987,7 +15987,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 373,
+          "line": 376,
           "kind": "custom-event-listener",
           "match": "head.addEventListener('keydown'"
         },
@@ -21658,14 +21658,14 @@
       "consumers": [
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 890,
+          "line": 926,
           "kind": "preload-subscription"
         }
       ],
       "evidence": [
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 890,
+          "line": 926,
           "kind": "preload-subscription",
           "match": "api?.onModelTrajectoryChanged("
         }
diff --git a/modules/ui-system/side-pane/modelTrajectorySideProvider.js b/modules/ui-system/side-pane/modelTrajectorySideProvider.js
index 5e9f49653..9809a0a5e 100644
--- a/modules/ui-system/side-pane/modelTrajectorySideProvider.js
+++ b/modules/ui-system/side-pane/modelTrajectorySideProvider.js
@@ -189,6 +189,9 @@ export function createModelTrajectorySideProvider({
             const menu = h('div', 'side-traj-menu');
             menu.hidden = true;
             menu.setAttribute('role', 'menu');
+            menu.setAttribute('aria-label', '自定义展开');
+            menuBtn.setAttribute('aria-haspopup', 'menu');
+            menuBtn.setAttribute('aria-expanded', 'false');
 
             const scroller = h('div', 'side-traj-scroll');
             const state = h('div', 'side-traj-state');
@@ -514,7 +517,7 @@ export function createModelTrajectorySideProvider({
                 const records = data.records;
                 const has = records.length > 0;
                 for (const btn of [searchBtn, menuBtn, toggleAllBtn, clearBtn]) btn.hidden = !has;
-                if (!has) { menu.hidden = true; closeSearch(); }
+                if (!has) { closeMenu(); closeSearch(); }
                 summaryLine.hidden = !has;
                 summaryLine.textContent = '';
                 if (has) {
@@ -751,6 +754,8 @@ export function createModelTrajectorySideProvider({
                 updateAllRows();
             }
             function renderMenu() {
+                // 切换开关会重建菜单项：键盘用户的焦点留在同一项上，不掉到 body
+                const focusedKind = menu.contains(doc.activeElement) ? doc.activeElement.dataset?.trajectoryExpansionKind : null;
                 menu.innerHTML = '';
                 for (const name of EXPANSION_KINDS) {
                     const item = h('button', 'side-traj-menu-item');
@@ -759,18 +764,49 @@ export function createModelTrajectorySideProvider({
                     item.setAttribute('aria-checked', String(commands[name].expanded));
                     item.dataset.trajectoryExpansionKind = name;
                     item.append(h('span', '', EXPANSION_LABELS[name]), h('span', `side-traj-switch${commands[name].expanded ? ' on' : ''}`));
+                    item.tabIndex = -1;
                     item.addEventListener('click', event => { event.stopPropagation(); toggleKind(name); });
                     menu.appendChild(item);
                 }
+                if (focusedKind) menu.querySelector(`[data-trajectory-expansion-kind="${focusedKind}"]`)?.focus();
+            }
+            function closeMenu({ restoreFocus = false } = {}) {
+                if (menu.hidden) return;
+                const hadFocus = menu.contains(doc.activeElement);
+                menu.hidden = true;
+                menuBtn.setAttribute('aria-expanded', 'false');
+                if (restoreFocus || hadFocus) menuBtn.focus();
             }
             function toggleMenu() {
-                menu.hidden = !menu.hidden;
-                if (!menu.hidden) renderMenu();
+                if (!menu.hidden) { closeMenu(); return; }
+                menu.hidden = false;
+                menuBtn.setAttribute('aria-expanded', 'true');
+                renderMenu();
+                // 和 Radix DropdownMenu 一样：打开即把焦点放进菜单，方向键在开关间移动，Esc 或 Tab 收起回到按钮
+                menu.querySelector('[role="menuitemcheckbox"]')?.focus();
             }
             const onDocumentClick = event => {
-                if (!menu.hidden && !menu.contains(event.target) && !menuBtn.contains(event.target)) menu.hidden = true;
+                if (!menu.hidden && !menu.contains(event.target) && !menuBtn.contains(event.target)) closeMenu();
             };
             own.listen(doc, 'click', onDocumentClick);
+            own.listen(menu, 'keydown', event => {
+                if (event.key === 'Escape' || event.key === 'Tab') {
+                    event.preventDefault();
+                    event.stopPropagation();
+                    closeMenu({ restoreFocus: true });
+                    return;
+                }
+                if (!['ArrowDown', 'ArrowUp', 'Home', 'End'].includes(event.key)) return;
+                const items = [...menu.querySelectorAll('[role="menuitemcheckbox"]')];
+                if (!items.length) return;
+                event.preventDefault();
+                const current = items.indexOf(doc.activeElement);
+                let next = 0;
+                if (event.key === 'End') next = items.length - 1;
+                else if (event.key === 'ArrowDown') next = current < 0 ? 0 : (current + 1) % items.length;
+                else if (event.key === 'ArrowUp') next = current < 0 ? items.length - 1 : (current - 1 + items.length) % items.length;
+                items[next].focus();
+            });
 
             // ---------------------------------------------------------------- 定位到某次调用（来自消息的「查看调用轨迹」）
             function focusCall(requestId) {
diff --git a/tests/side-pane-model-trajectory.test.mjs b/tests/side-pane-model-trajectory.test.mjs
index befbc546f..f25d27779 100644
--- a/tests/side-pane-model-trajectory.test.mjs
+++ b/tests/side-pane-model-trajectory.test.mjs
@@ -441,3 +441,27 @@ test('a reader parked at the top of the trajectory stays there while new calls a
     assert.equal(scroller.scrollTop, 0);
     await handle.dispose();
 });
+
+test('the expansion menu works from the keyboard and keeps focus on the switch being toggled', async () => {
+    const { provider, view, doc, dom } = makeEnv();
+    await provider.mountTab({ id: 'model-trajectory:main' }, view);
+    const menuBtn = view.querySelector('[aria-label="自定义展开"]');
+    const menu = view.querySelector('.side-traj-menu');
+    const key = (target, name) => target.dispatchEvent(new dom.window.KeyboardEvent('keydown', { key: name, bubbles: true, cancelable: true }));
+    assert.equal(menuBtn.getAttribute('aria-haspopup'), 'menu');
+    menuBtn.focus();
+    menuBtn.click();
+    assert.equal(menuBtn.getAttribute('aria-expanded'), 'true');
+    const items = () => [...menu.querySelectorAll('[role="menuitemcheckbox"]')];
+    assert.equal(doc.activeElement, items()[0], 'opening moves focus into the menu');
+    key(doc.activeElement, 'ArrowDown');
+    assert.equal(doc.activeElement, items()[1]);
+    const kind = doc.activeElement.dataset.trajectoryExpansionKind;
+    doc.activeElement.click();
+    assert.equal(doc.activeElement?.dataset.trajectoryExpansionKind, kind, 'toggling a switch keeps focus on it');
+    assert.equal(doc.activeElement.getAttribute('aria-checked'), 'false');
+    key(doc.activeElement, 'Escape');
+    assert.equal(menu.hidden, true);
+    assert.equal(menuBtn.getAttribute('aria-expanded'), 'false');
+    assert.equal(doc.activeElement, menuBtn, 'Escape returns focus to the menu button');
+});

From ef2607a78db76b87f295fd373bdcd50e42d068e8 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 03:45:49 +0000
Subject: [PATCH 109/143] Side pane batch U: keep the side browser in its own
 session, restore scroll saved while hidden

Fixes three regressions found in a review of batches J-T:

- The webview preference allow-list also deleted the partition Electron
  copies into webPreferences, so side browser pages ran in the default
  session: logins vanished and the partition's permission deny, request
  filter and download block no longer applied. The partition (and the
  app zoom factor) are now put back, as DSH re-adds the lease partition.
- Views only sleep while hidden, when a display:none scroller reports 0,
  so side chats came back at the bottom and code viewers at the top.
  Both now keep the last position measured while visible.
- An unmounted side chat whose pending mount landed while its close was
  being confirmed stayed open after the user confirmed; it now closes
  together with the view that mounted meanwhile.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DFRovoZHMzeheXKkLNWKG
---
 .../contracts/generated/chat-event-graph.json | 52 +++++++++----------
 modules/ipc/browserHandlers.js                |  5 ++
 modules/renderer/side-chat/scrolling.js       | 13 ++++-
 .../side-pane/codeViewerSideProvider.js       |  9 +++-
 .../side-pane/side-pane-tab-close-owner.js    |  5 +-
 tests/browser-handlers.test.js                |  5 +-
 tests/side-chat-scrolling.test.mjs            | 26 +++++++++-
 tests/side-pane-code-viewer.test.mjs          |  6 +++
 tests/side-pane-mount-timing.test.mjs         | 34 ++++++++++++
 9 files changed, 120 insertions(+), 35 deletions(-)

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 5200f6712..7cd335782 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -1276,14 +1276,14 @@
       "consumers": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 174,
+          "line": 179,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 174,
+          "line": 179,
           "kind": "event-listener",
           "match": "guest.on('before-input-event'"
         }
@@ -1874,14 +1874,14 @@
       "consumers": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 200,
+          "line": 205,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 200,
+          "line": 205,
           "kind": "event-listener",
           "match": "ipcMain.handle('browser:clear-data'"
         },
@@ -1905,14 +1905,14 @@
       "consumers": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 189,
+          "line": 194,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 189,
+          "line": 194,
           "kind": "event-listener",
           "match": "ipcMain.handle('browser:open-external'"
         },
@@ -10032,14 +10032,14 @@
       "consumers": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 156,
+          "line": 161,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 156,
+          "line": 161,
           "kind": "event-listener",
           "match": "host.on('did-attach-webview'"
         }
@@ -15078,14 +15078,14 @@
       "consumers": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 158,
+          "line": 163,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 158,
+          "line": 163,
           "kind": "event-listener",
           "match": "guest.on('input-event'"
         }
@@ -15399,7 +15399,7 @@
         },
         {
           "file": "modules/renderer/side-chat/scrolling.js",
-          "line": 69,
+          "line": 72,
           "kind": "custom-event-listener"
         },
         {
@@ -15748,7 +15748,7 @@
         },
         {
           "file": "modules/renderer/side-chat/scrolling.js",
-          "line": 69,
+          "line": 72,
           "kind": "custom-event-listener",
           "match": "root.addEventListener('keydown'"
         },
@@ -26487,7 +26487,7 @@
         },
         {
           "file": "modules/renderer/side-chat/scrolling.js",
-          "line": 67,
+          "line": 70,
           "kind": "custom-event-listener"
         },
         {
@@ -26552,7 +26552,7 @@
         },
         {
           "file": "modules/renderer/side-chat/scrolling.js",
-          "line": 67,
+          "line": 70,
           "kind": "custom-event-listener",
           "match": "root.addEventListener('scroll'"
         },
@@ -29283,14 +29283,14 @@
       "consumers": [
         {
           "file": "modules/renderer/side-chat/scrolling.js",
-          "line": 71,
+          "line": 74,
           "kind": "custom-event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/renderer/side-chat/scrolling.js",
-          "line": 71,
+          "line": 74,
           "kind": "custom-event-listener",
           "match": "root.addEventListener('touchmove'"
         }
@@ -29302,7 +29302,7 @@
       "consumers": [
         {
           "file": "modules/renderer/side-chat/scrolling.js",
-          "line": 70,
+          "line": 73,
           "kind": "custom-event-listener"
         },
         {
@@ -29314,7 +29314,7 @@
       "evidence": [
         {
           "file": "modules/renderer/side-chat/scrolling.js",
-          "line": 70,
+          "line": 73,
           "kind": "custom-event-listener",
           "match": "root.addEventListener('touchstart'"
         },
@@ -31733,7 +31733,7 @@
         },
         {
           "file": "modules/renderer/side-chat/scrolling.js",
-          "line": 68,
+          "line": 71,
           "kind": "custom-event-listener"
         },
         {
@@ -31762,7 +31762,7 @@
         },
         {
           "file": "modules/renderer/side-chat/scrolling.js",
-          "line": 68,
+          "line": 71,
           "kind": "custom-event-listener",
           "match": "root.addEventListener('wheel'"
         },
@@ -31791,7 +31791,7 @@
         },
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 173,
+          "line": 178,
           "kind": "event-listener"
         }
       ],
@@ -31804,7 +31804,7 @@
         },
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 173,
+          "line": 178,
           "kind": "event-listener",
           "match": "guest.on('will-attach-webview'"
         }
@@ -31840,7 +31840,7 @@
         },
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 170,
+          "line": 175,
           "kind": "event-listener"
         },
         {
@@ -31858,7 +31858,7 @@
         },
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 170,
+          "line": 175,
           "kind": "event-listener",
           "match": "guest.on('will-navigate'"
         },
@@ -31906,14 +31906,14 @@
       "consumers": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 171,
+          "line": 176,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 171,
+          "line": 176,
           "kind": "event-listener",
           "match": "guest.on('will-redirect'"
         }
diff --git a/modules/ipc/browserHandlers.js b/modules/ipc/browserHandlers.js
index f8672d6ec..f2a950146 100644
--- a/modules/ipc/browserHandlers.js
+++ b/modules/ipc/browserHandlers.js
@@ -129,14 +129,19 @@ function attachToWindow(mainWindow) {
         }
         // 白名单而不是黑名单：页面 webpreferences 属性里带进来的其他键（experimentalFeatures 之类）一律去掉，
         // 只留 allowpopups 对应的 disablePopups（弹窗仍由 setWindowOpenHandler 拒掉后转成侧栏标签）。同 DSH browser-guests
+        // 分区要放回去（Electron 把 params.partition 抄进了 webPreferences），否则网页落到应用默认会话，
+        // 上面给分区装的权限拒绝、请求过滤和下载拦截全都不生效；缩放跟随应用也保留
+        const zoomFactor = webPreferences.zoomFactor;
         for (const key of Object.keys(webPreferences)) {
             if (key !== 'disablePopups') delete webPreferences[key];
         }
+        if (Number.isFinite(zoomFactor)) webPreferences.zoomFactor = zoomFactor;
         delete params.disablewebsecurity;
         delete params.plugins;
         delete params.blinkfeatures;
         delete params.disableblinkfeatures;
         Object.assign(webPreferences, {
+            partition: BROWSER_PARTITION,
             nodeIntegration: false,
             nodeIntegrationInWorker: false,
             nodeIntegrationInSubFrames: false,
diff --git a/modules/renderer/side-chat/scrolling.js b/modules/renderer/side-chat/scrolling.js
index 2863f21df..0fb95efb5 100644
--- a/modules/renderer/side-chat/scrolling.js
+++ b/modules/renderer/side-chat/scrolling.js
@@ -17,6 +17,8 @@ export function createSideChatScrolling({
     // 按距离底部而不是 scrollTop 定位才不会跳。用户自己一滚就放开
     let anchorFromBottom = null;
     let anchoredTop = null;
+    // 休眠只发生在隐藏时，那时 display:none 的容器量出来全是 0：可见时就记下最近的位置
+    let lastVisible = { stick: true };
 
     function pinToBottomIfSticky() {
         if (store.isDisposed || !root || root.clientHeight === 0) return;
@@ -44,6 +46,7 @@ export function createSideChatScrolling({
             else if (movedUp) stickToBottom = false;
             else if (distance < 48 && root.scrollTop > lastScrollTop + 1) stickToBottom = true;
             lastScrollTop = root.scrollTop;
+            lastVisible = measure();
         };
         // 用户意图先于 scroll 事件生效：流式期间 ResizeObserver 可能在滚轮产生的 scroll 事件之前
         // 把视图拽回底部，只靠 scroll 判断就会和滚轮打架（ZCode use-stick-to-bottom 同样监听 wheel 立即脱离）
@@ -100,15 +103,21 @@ export function createSideChatScrolling({
     }
 
     /** 休眠前存下：贴底的只记贴底，否则记离底部的距离。 */
-    function capture() {
-        if (!root || stickToBottom) return { stick: true };
+    function measure() {
+        if (stickToBottom) return { stick: true };
         return { stick: false, fromBottom: Math.max(0, root.scrollHeight - root.scrollTop) };
     }
 
+    function capture() {
+        if (!root) return { stick: true };
+        return root.clientHeight > 0 ? measure() : lastVisible;
+    }
+
     function restore(saved) {
         if (saved?.stick !== false || !Number.isFinite(saved.fromBottom)) return;
         stickToBottom = false;
         anchorFromBottom = saved.fromBottom;
+        lastVisible = { stick: false, fromBottom: saved.fromBottom };
         pinToBottomIfSticky();
     }
 
diff --git a/modules/ui-system/side-pane/codeViewerSideProvider.js b/modules/ui-system/side-pane/codeViewerSideProvider.js
index 1592e7b59..dc16bbc0f 100644
--- a/modules/ui-system/side-pane/codeViewerSideProvider.js
+++ b/modules/ui-system/side-pane/codeViewerSideProvider.js
@@ -339,6 +339,11 @@ export function createCodeViewerSideProvider({
                 viewElement.innerHTML = '';
                 return null;
             }
+            // 休眠只发生在隐藏时，那时 display:none 的 body 读出来的滚动都是 0：位置在可见时就记下
+            let lastScroll = { top: Number(restoredState?.scrollTop) || 0, left: Number(restoredState?.scrollLeft) || 0 };
+            own.listen(body, 'scroll', () => {
+                if (body.clientHeight > 0) lastScroll = { top: body.scrollTop, left: body.scrollLeft };
+            }, { passive: true });
 
             return {
                 focus() {
@@ -355,8 +360,8 @@ export function createCodeViewerSideProvider({
                         isWrapped,
                         mode: currentMode,
                         outsideWorkspaceAllowed: editorOwner.outsideWorkspaceAllowed,
-                        scrollTop: body.scrollTop,
-                        scrollLeft: body.scrollLeft
+                        scrollTop: body.clientHeight > 0 ? body.scrollTop : lastScroll.top,
+                        scrollLeft: body.clientHeight > 0 ? body.scrollLeft : lastScroll.left
                     };
                 },
                 /** 文件标签重新读盘；片段和差异是快照，不受影响 */
diff --git a/modules/ui-system/side-pane/side-pane-tab-close-owner.js b/modules/ui-system/side-pane/side-pane-tab-close-owner.js
index 422e550f3..50245d63b 100644
--- a/modules/ui-system/side-pane/side-pane-tab-close-owner.js
+++ b/modules/ui-system/side-pane/side-pane-tab-close-owner.js
@@ -33,7 +33,7 @@ export function createSidePaneTabCloseOwner({
     function closeTab(tabId, options = {}, expectedLifetime = null, onFocusMoved = null) {
         if (isDisposed() || !tabId) return Promise.resolve();
         const tab = getTab(tabId);
-        const entry = getEntry(tabId);
+        let entry = getEntry(tabId);
         const previous = closing.get(tabId);
         const lifetime = getLifetime(tabId);
         if (expectedLifetime && lifetime !== expectedLifetime) {
@@ -61,7 +61,8 @@ export function createSidePaneTabCloseOwner({
                 if (requestClose) {
                     const result = await requestClose(tab);
                     if (result?.closed === false) return;
-                    if (isDisposed() || getEntry(tabId)) return;
+                    // 确认期间它被挂上了（批量关闭时兜底激活到它）：用户已经同意关闭，连同刚挂上的视图一起关
+                    entry = getEntry(tabId) || null;
                 }
             }
             if (isDisposed()) return;
diff --git a/tests/browser-handlers.test.js b/tests/browser-handlers.test.js
index a9453c527..2a6b96728 100644
--- a/tests/browser-handlers.test.js
+++ b/tests/browser-handlers.test.js
@@ -71,12 +71,15 @@ test('attachToWindow locks the partition and strips privileged web preferences',
     host.emit('will-attach-webview', event, {}, { partition: browserHandlers.BROWSER_PARTITION, src: 'vcp://x' });
     assert.equal(prevented, 2);
 
-    const prefs = { preload: 'x.js', preloadURL: 'file:///x.js', nodeIntegration: true, sandbox: false, experimentalFeatures: true, disablePopups: false };
+    const prefs = { preload: 'x.js', preloadURL: 'file:///x.js', nodeIntegration: true, sandbox: false, experimentalFeatures: true, disablePopups: false,
+        partition: browserHandlers.BROWSER_PARTITION, zoomFactor: 1.25 };
     const params = { partition: browserHandlers.BROWSER_PARTITION, src: 'https://a.example', disablewebsecurity: '', plugins: '', blinkfeatures: 'X' };
     host.emit('will-attach-webview', event, prefs, params);
     assert.equal(prevented, 2);
     assert.equal('experimentalFeatures' in prefs, false, 'unknown preferences from the page are dropped');
     assert.equal(prefs.disablePopups, false, 'allowpopups still reaches the window-open handler');
+    assert.equal(prefs.partition, browserHandlers.BROWSER_PARTITION, 'the guest stays in the locked-down side browser session');
+    assert.equal(prefs.zoomFactor, 1.25);
     assert.equal(prefs.webviewTag, false);
     assert.equal(prefs.plugins, false);
     assert.deepEqual(Object.keys(params).sort(), ['partition', 'src']);
diff --git a/tests/side-chat-scrolling.test.mjs b/tests/side-chat-scrolling.test.mjs
index 8718d1d1f..08ee67f8c 100644
--- a/tests/side-chat-scrolling.test.mjs
+++ b/tests/side-chat-scrolling.test.mjs
@@ -18,10 +18,13 @@ function setup() {
     };
     const root = win.document.getElementById('root');
     let scrollHeight = 1000;
-    Object.defineProperty(root, 'clientHeight', { get: () => 500 });
+    let clientHeight = 500;
+    Object.defineProperty(root, 'clientHeight', { get: () => clientHeight });
     Object.defineProperty(root, 'scrollHeight', { get: () => scrollHeight });
     const scrolling = createSideChatScrolling({ store: { isDisposed: false }, doc: win.document, root });
-    return { win, root, ro: observers[0], scrolling, grow: (px) => { scrollHeight += px; } };
+    // 标签切走后容器 display:none：量出来全是 0
+    const hide = () => { clientHeight = 0; scrollHeight = 0; root.scrollTop = 0; };
+    return { win, root, ro: observers[0], scrolling, hide, grow: (px) => { scrollHeight += px; } };
 }
 
 test('a reply that grows after the last pin is still followed to the bottom', async () => {
@@ -135,3 +138,22 @@ test('a view that was following the bottom comes back following it', () => {
     assert.deepEqual(scrolling.capture(), { stick: true });
     scrolling.dispose();
 });
+
+test('a view put to sleep while hidden saves where the reader was, not the zeros a display:none box reports', () => {
+    const { win, root, scrolling, hide } = setup();
+    root.scrollTop = 500;
+    root.dispatchEvent(new win.Event('scroll'));
+    root.scrollTop = 300;
+    root.dispatchEvent(new win.Event('scroll'));
+    hide();
+    assert.deepEqual(scrolling.capture(), { stick: false, fromBottom: 700 });
+    scrolling.dispose();
+});
+
+test('a remounted view that sleeps again before the reader scrolls keeps the restored place', () => {
+    const { scrolling, hide } = setup();
+    scrolling.restore({ stick: false, fromBottom: 700 });
+    hide();
+    assert.deepEqual(scrolling.capture(), { stick: false, fromBottom: 700 });
+    scrolling.dispose();
+});
diff --git a/tests/side-pane-code-viewer.test.mjs b/tests/side-pane-code-viewer.test.mjs
index 7cfd044a5..363080218 100644
--- a/tests/side-pane-code-viewer.test.mjs
+++ b/tests/side-pane-code-viewer.test.mjs
@@ -471,11 +471,17 @@ test('a file tab keeps its place on reload and its wrap, mode and consent after
     await new Promise(resolve => setTimeout(resolve, 20));
     assert.equal(handle.getCode(), text);
 
+    let shown = true;
+    Object.defineProperty(body(), 'clientHeight', { configurable: true, get: () => (shown ? 400 : 0) });
     body().scrollTop = 1200;
+    body().dispatchEvent(new dom.window.Event('scroll'));
     await handle.reload();
     assert.equal(body().scrollTop, 1200, 'reloading the same file stays at the same line');
 
     view.querySelector('[data-action="toggle-wrap"]').click();
+    // 休眠时标签是隐藏的：display:none 的 body 读出来滚动是 0
+    shown = false;
+    body().scrollTop = 0;
     const saved = handle.captureState();
     await handle.dispose();
     handle = await provider.mountTab(tab, view, { restoredState: saved });
diff --git a/tests/side-pane-mount-timing.test.mjs b/tests/side-pane-mount-timing.test.mjs
index db3b23726..9ee7b2a0f 100644
--- a/tests/side-pane-mount-timing.test.mjs
+++ b/tests/side-pane-mount-timing.test.mjs
@@ -169,3 +169,37 @@ test('closing a restored side chat that was never shown still asks first, and a
     assert.deepEqual(deleted.sort(), ['drop-me', 'shown']);
     assert.ok(ctrl.getSnapshot().tabs.some(tab => tab.id === 'keep-me'), 'cancelling keeps the tab and its history');
 });
+
+test('a side chat whose mount lands while its close is being confirmed still closes once confirmed', async t => {
+    const dom = new JSDOM('<main class="main-content"></main><aside id="pane"><div id="tabs"></div><div id="content"><section class="side-pane-view" id="sidePaneViewNotifications"></section></div></aside>');
+    const doc = dom.window.document;
+    const confirm = Promise.withResolvers();
+    const mount = Promise.withResolvers();
+    const deleted = [];
+    let disposed = 0;
+    const ctrl = createSidePaneController({
+        root: doc.getElementById('pane'),
+        tabListElement: doc.getElementById('tabs'),
+        contentContainer: doc.getElementById('content'),
+        tabTypes: [defineChatTabType({
+            provider: { mountTab: async () => { await mount.promise; return { dispose: async () => { disposed += 1; }, focus() {} }; } },
+            requestClose: () => confirm.promise,
+            onClosed: descriptor => { deleted.push(descriptor.id); }
+        })]
+    });
+    t.after(() => { ctrl.dispose?.(); dom.window.close(); });
+    ctrl.setParent(parentOf('a'));
+    // 补回后面板按这个话题的样子展开并挂载它；挂载还在路上时用户就点了关闭
+    const restoring = ctrl.restoreTabs([sideChat('later', 'a')]);
+    await new Promise(resolve => setTimeout(resolve, 0));
+    assert.equal(ctrl.getTabHandle('later'), null);
+    const closing = ctrl.closeTab('later'); // 挂载还在路上：没有 handle，由类型确认
+    mount.resolve();
+    await restoring;
+    await new Promise(resolve => setTimeout(resolve, 10));
+    confirm.resolve({ closed: true });
+    await closing;
+    assert.equal(ctrl.getSnapshot().tabs.some(tab => tab.id === 'later'), false);
+    assert.deepEqual(deleted, ['later']);
+    assert.equal(disposed, 1, 'the view that mounted meanwhile is released');
+});

From 89339365ab98bc72a23252d35858174f2c62ddaa Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 04:00:14 +0000
Subject: [PATCH 110/143] Side pane: after a restart, come back to the side
 chat the topic was left on

Closing the app with a side chat open and in front brought the pane back
collapsed on a global tool. Three things stacked up:
- A restored side chat got a fresh random id, so the tab remembered for
  the topic could never match again. Restoring now reuses the id saved
  in its metadata.
- restoreLayout dropped remembered tabs that weren't restored yet; side
  chats are never in the layout and come back later, so keep them.
- When the side chat was added back, restoreTabs only re-resolved the
  pane from the notifications fallback. At startup a global tool is in
  front instead, so also re-resolve when the added tab is the one this
  topic was left on and nobody has touched the pane since.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019L2bZomLn4NVoxS4Rv5Bkv
---
 .../contracts/generated/chat-event-graph.json | 20 ++++----
 modules/renderer/sideChatWiring.js            |  5 +-
 .../side-pane/side-pane-controller.js         | 18 +++++--
 tests/side-chat-draft-restore.test.mjs        | 11 +++++
 tests/side-pane-persistence.test.mjs          | 49 +++++++++++++++++++
 5 files changed, 88 insertions(+), 15 deletions(-)

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 83f751b30..dfb46651c 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -4337,22 +4337,22 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 499,
+          "line": 501,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1165,
+          "line": 1175,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1171,
+          "line": 1181,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1185,
+          "line": 1195,
           "kind": "custom-event-listener"
         },
         {
@@ -5935,25 +5935,25 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 499,
+          "line": 501,
           "kind": "custom-event-listener",
           "match": "retry.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1165,
+          "line": 1175,
           "kind": "custom-event-listener",
           "match": "toggleNotificationsBtn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1171,
+          "line": 1181,
           "kind": "custom-event-listener",
           "match": "expandButton.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1185,
+          "line": 1195,
           "kind": "custom-event-listener",
           "match": "closeSidePaneBtn.addEventListener('click'"
         },
@@ -25052,7 +25052,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1205,
+          "line": 1215,
           "kind": "custom-event-listener"
         },
         {
@@ -25152,7 +25152,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1205,
+          "line": 1215,
           "kind": "custom-event-listener",
           "match": "win?.addEventListener?.('resize'"
         },
diff --git a/modules/renderer/sideChatWiring.js b/modules/renderer/sideChatWiring.js
index 1308859fc..fbd8e7eeb 100644
--- a/modules/renderer/sideChatWiring.js
+++ b/modules/renderer/sideChatWiring.js
@@ -269,7 +269,10 @@ export function createSideChatWiring({
                     status: 'ready',
                     draft: input.draft || '',
                     references: Array.isArray(input.references) ? input.references : []
-                }), composerStorage: item.composerStorage } });
+                }),
+                // 沿用存档里的 id：标签 id 每次重启都一样，面板才能按对话记忆回到这个辅助对话
+                ...(typeof item.id === 'string' && item.id ? { id: item.id } : {}),
+                composerStorage: item.composerStorage } });
             } catch (e) {
                 console.warn('[SideChat] Failed to restore side chat tab:', e);
             }
diff --git a/modules/ui-system/side-pane/side-pane-controller.js b/modules/ui-system/side-pane/side-pane-controller.js
index e1eeeb297..8f7cd0d52 100644
--- a/modules/ui-system/side-pane/side-pane-controller.js
+++ b/modules/ui-system/side-pane/side-pane-controller.js
@@ -88,6 +88,8 @@ export function createSidePaneController({
     const activeTabByParent = new Map(); // parentKey -> tabId，最近 50 个对话
     let isDisposed = false;
     let navigationRevision = 0;
+    // 最近一次按对话定下面板时的 navigationRevision；之后没人动过面板，补回来的标签还可以重新定一次
+    let parentResolvedRevision = -1;
     let controller = null;
     const tabRegistry = createSidePaneTabRegistry({
         providers,
@@ -907,6 +909,10 @@ export function createSidePaneController({
                 : [];
             const untouchedFallback = state.parent && ownTabsBefore.length === 0 && !state.visible
                 && isNotificationsTab(state.activeTabId);
+            // 启动时布局先恢复、辅助对话后补回：这时面板落在全局工具上，不是通知兜底，
+            // 但只要补回的是这个对话上次停的标签、期间没人动过面板，也照样回到它
+            const untouchedSinceParent = state.parent && ownTabsBefore.length === 0
+                && navigationRevision === parentResolvedRevision;
             const added = [];
             for (const rawTab of rawTabs) {
                 if (!rawTab) continue;
@@ -928,14 +934,16 @@ export function createSidePaneController({
             }
             if (added.length === 0) return added;
             navigationRevision++;
-            if (untouchedFallback) {
-                const key = parentKeyOf();
+            const key = state.parent ? parentKeyOf() : '';
+            if (untouchedFallback || (untouchedSinceParent && added.includes(activeTabByParent.get(key)))) {
                 state = SidePaneState.setParent(state, state.parent, {
                     force: true,
                     preferredTabId: activeTabByParent.get(key),
                     collapsedPreference: collapsedByParent.get(key)
                 });
             }
+            // 后台补标签不算用户操作
+            if (untouchedSinceParent) parentResolvedRevision = navigationRevision;
             renderTabList();
             syncViewPanels();
             syncDomVisibility();
@@ -1058,12 +1066,12 @@ export function createSidePaneController({
                 state = SidePaneState.activateTab(state, layout.activeTabId);
                 if (layout.visible) state = SidePaneState.setVisible(state, true);
             }
-            const tabIds = new Set(state.tabs.map(tab => tab.id));
             layout.collapsedByParent.forEach((collapsed, key) => {
                 if (!collapsedByParent.has(key)) rememberBounded(collapsedByParent, key, collapsed);
             });
+            // 不按已恢复的标签过滤：辅助对话不进布局存档，要等读回话题后才补回来，到时还要回到它
             layout.activeByParent.forEach((tabId, key) => {
-                if (!activeTabByParent.has(key) && tabIds.has(tabId)) rememberBounded(activeTabByParent, key, tabId);
+                if (!activeTabByParent.has(key)) rememberBounded(activeTabByParent, key, tabId);
             });
             if (state.parent) {
                 const key = parentKeyOf();
@@ -1073,6 +1081,7 @@ export function createSidePaneController({
                     collapsedPreference: collapsedByParent.get(key)
                 });
             }
+            parentResolvedRevision = navigationRevision;
             renderTabList();
             syncViewPanels();
             // 启动时直接落到存档的开合状态，不播动画
@@ -1109,6 +1118,7 @@ export function createSidePaneController({
                 // 入口是否可用可能取决于当前对话（群聊里不能开辅助对话），换对话时重新列一遍
                 launcher.renderEntries();
             }
+            parentResolvedRevision = navigationRevision;
             renderTabList();
             syncViewPanels();
             syncDomVisibility();
diff --git a/tests/side-chat-draft-restore.test.mjs b/tests/side-chat-draft-restore.test.mjs
index b7336475a..32927c7b7 100644
--- a/tests/side-chat-draft-restore.test.mjs
+++ b/tests/side-chat-draft-restore.test.mjs
@@ -86,6 +86,17 @@ test('empty-history side chats restore browser drafts, references and models thr
     await assert.rejects(fs.stat(f.childDir), { code: 'ENOENT' });
 });
 
+test('a restored side chat keeps its saved id, so the pane can return to it after every restart', async t => {
+    const f = await fixture(t, { composerStorage: 'local' });
+    f.drafts.save(f.descriptor, { draft: 'keep me', model: null, references: [] });
+    for (let restart = 0; restart < 2; restart++) {
+        const { controller, wiring } = f.mountController();
+        await wiring.restoreSessions('agent', 'parent');
+        const tab = controller.getSnapshot().tabs.find(item => item.kind === 'chat');
+        assert.equal(tab.id, f.descriptor.id);
+    }
+});
+
 test('legacy file input survives descriptor normalization and migrates only after the browser save; clearing it never revives old input', async t => {
     const f = await fixture(t, { draft: 'legacy draft', references: [{ id: 'legacy-ref', text: 'legacy selection' }], model: 'legacy-model' });
     let session = f.mountController();
diff --git a/tests/side-pane-persistence.test.mjs b/tests/side-pane-persistence.test.mjs
index e73393ef0..d4a83f8bb 100644
--- a/tests/side-pane-persistence.test.mjs
+++ b/tests/side-pane-persistence.test.mjs
@@ -182,6 +182,55 @@ test('restoring after the host picked the conversation mounts nothing from anoth
     second.dom.window.close();
 });
 
+test('after a restart the side chat a topic was left on comes back to the front once it is restored', async () => {
+    const storage = createStorage();
+    const parent = { itemType: 'agent', itemId: 'agent-1', topicId: 'topic-1' };
+    const chat = { kind: 'chat', descriptor: { id: 'side-1', parent, child: { itemType: 'agent', itemId: 'agent-1', topicId: 'child-1' }, title: '辅助' } };
+
+    const first = createPane(storage, []);
+    first.controller.restoreLayout();
+    first.controller.setParent(parent);
+    await first.controller.openTab({ id: 'browser:1', kind: 'browser', title: '浏览器', closable: true, scopeMode: 'global', payload: {} });
+    await first.controller.openTab(chat);
+    const chatId = first.controller.getSnapshot().activeTabId;
+    assert.equal(first.controller.getSnapshot().visible, true);
+    await first.controller.dispose();
+    first.dom.window.close();
+
+    const second = createPane(storage, []);
+    // 宿主先同步当前对话、再恢复存档；辅助对话不进存档，等读回话题后才补回来
+    second.controller.setParent(parent);
+    second.controller.restoreLayout();
+    await second.controller.restoreTabs([chat]);
+    assert.equal(second.controller.getSnapshot().activeTabId, chatId, 'the side chat is back in front, not the browser');
+    assert.equal(second.controller.getSnapshot().visible, true, 'the pane was open on this topic when the app closed');
+    await second.controller.dispose();
+    second.dom.window.close();
+});
+
+test('a side chat restored after the user already moved the pane does not take over', async () => {
+    const storage = createStorage();
+    const parent = { itemType: 'agent', itemId: 'agent-1', topicId: 'topic-1' };
+    const chat = { kind: 'chat', descriptor: { id: 'side-1', parent, child: { itemType: 'agent', itemId: 'agent-1', topicId: 'child-1' }, title: '辅助' } };
+
+    const first = createPane(storage, []);
+    first.controller.restoreLayout();
+    first.controller.setParent(parent);
+    await first.controller.openTab({ id: 'browser:1', kind: 'browser', title: '浏览器', closable: true, scopeMode: 'global', payload: {} });
+    await first.controller.openTab(chat);
+    await first.controller.dispose();
+    first.dom.window.close();
+
+    const second = createPane(storage, []);
+    second.controller.setParent(parent);
+    second.controller.restoreLayout();
+    second.controller.activateTab('browser:1');
+    await second.controller.restoreTabs([chat]);
+    assert.equal(second.controller.getSnapshot().activeTabId, 'browser:1');
+    await second.controller.dispose();
+    second.dom.window.close();
+});
+
 test('a layout over the total budget drops the oldest large tabs but keeps the active one', async () => {
     const { MAX_PERSISTED_LAYOUT_CHARS } = await import('../modules/ui-system/side-pane/side-pane-persistence.js');
     const big = i => ({ id: `diff:${i}`, kind: 'notes', title: `d${i}`, payload: { oldCode: 'x'.repeat(60 * 1024), n: i } });

From b3af5ae9ca25d5f5393176f8623af83b82b651b1 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 04:44:29 +0000
Subject: [PATCH 111/143] Side pane end-to-end smoke: real Electron, every tab
 kind, flat counters

scripts/smoke-side-pane-e2e.mjs launches the app with its own userData,
a mock streaming model, a local test page and a Git workspace, then
drives every side pane tab kind through open, use and close, sleep and
wake over the live-view limit, topic and agent switches, an app restart
with layout restore, and side chat streaming before and after restart.
It fails on renderer or main-process console errors, uncaught exceptions
and unhandled rejections, and when DOM nodes, listeners, scopes,
resources, guest pages or main subscriptions do not return to baseline.
Reintroducing the tooltip bridge leak makes it fail (+648 nodes).

Runs as npm run smoke:side-pane (xvfb-run on Linux) and as a separate
side-pane-e2e job in the Chat Kernel and UI workflow, uploading the
report and Electron log on failure.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01SADzqzusVz3S3z7qBUSy8M
---
 .github/workflows/chat_kernel_ui.yml |  34 ++
 package.json                         |   1 +
 scripts/smoke-side-pane-e2e.mjs      | 514 +++++++++++++++++++++++++++
 3 files changed, 549 insertions(+)
 create mode 100644 scripts/smoke-side-pane-e2e.mjs

diff --git a/.github/workflows/chat_kernel_ui.yml b/.github/workflows/chat_kernel_ui.yml
index fb204971b..3adcc88a3 100644
--- a/.github/workflows/chat_kernel_ui.yml
+++ b/.github/workflows/chat_kernel_ui.yml
@@ -104,3 +104,37 @@ jobs:
 
       - name: Run complete UI system gate
         run: npm run check:ui-system
+
+  side-pane-e2e:
+    name: Side pane end-to-end smoke (real Electron)
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    steps:
+      - name: Checkout
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
+
+      - name: Setup Node 22
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
+        with:
+          node-version: 22
+          cache: npm
+
+      - name: Install dependencies (including Electron runtime)
+        env:
+          PUPPETEER_SKIP_DOWNLOAD: 'true'
+        run: npm ci --omit=optional
+
+      - name: Ensure a virtual display
+        run: command -v xvfb-run || (sudo apt-get update && sudo apt-get install -y xvfb)
+
+      - name: Run side pane smoke
+        env:
+          SIDE_PANE_SMOKE_DIR: ${{ runner.temp }}/side-pane-smoke
+        run: xvfb-run -a -s "-screen 0 1600x1000x24" npm run smoke:side-pane
+
+      - name: Upload smoke evidence
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: side-pane-smoke-evidence
+          path: ${{ runner.temp }}/side-pane-smoke
diff --git a/package.json b/package.json
index 05cb919e3..793fb2e1a 100644
--- a/package.json
+++ b/package.json
@@ -71,6 +71,7 @@
     "vendor:webawesome:check": "node scripts/build-webawesome-runtime.mjs --check vendor/webawesome-runtime",
     "test:ui-system": "node scripts/test-ui-system.mjs && node --test tests/performance-recorder.test.js tests/embedded-app-security.test.js tests/overlay-coordinator.test.js tests/embedded-app-controller.test.js tests/app-tab-host.test.js tests/assistant-search-controller.test.js tests/account-menu-controller.test.js tests/escape-dispatcher.test.js tests/notification-menu-controller.test.js tests/launchpad-controller.test.js tests/creation-controller.test.js tests/global-settings-save.test.mjs tests/task-handle.test.js tests/sender-task-registry.test.js tests/contribution-registry.test.js tests/state-channel.test.js tests/state-authority.test.js tests/settlement.test.js tests/surface-controller.test.js tests/lifecycle-inspector.test.js tests/main-chat-sequence-model.test.js tests/chat-manager-selection-race.test.js tests/history-watcher-lease-manager.test.js tests/message-edit-watcher-failure.test.js tests/stream-manager-terminal-cleanup.test.js tests/theme-handlers.test.js",
     "test:dedicated-preload": "node scripts/test-dedicated-preload-electron.mjs",
+    "smoke:side-pane": "node scripts/smoke-side-pane-e2e.mjs",
     "test:bootstrap": "node --test tests/vcpchat-bootstrap.test.mjs tests/vcpchat-managed-bootstrap-m3-m8.test.mjs tests/vcpchat-platform-boundary.test.mjs",
     "test:launchpad-icons": "node --test tests/launchpad-icons.test.js tests/launchpad-controller.test.js",
     "test:next-ui-empty-state": "node scripts/test-next-ui-empty-state.mjs",
diff --git a/scripts/smoke-side-pane-e2e.mjs b/scripts/smoke-side-pane-e2e.mjs
new file mode 100644
index 000000000..621008eb3
--- /dev/null
+++ b/scripts/smoke-side-pane-e2e.mjs
@@ -0,0 +1,514 @@
+// 副屏端到端冒烟：启动真实 Electron，用 CDP 驱动每类标签的打开、使用、休眠、唤醒、关闭，
+// 加上切话题、切助手、重启恢复和辅助对话流式回复。断言：没有控制台错误和未处理的 rejection，
+// 关掉所有标签后 DOM 节点、JS 监听、scope、资源、guest 页面、主进程推送订阅都回到起点。
+//
+// 用法：node scripts/smoke-side-pane-e2e.mjs [--keep]
+//   Linux 无显示环境用 xvfb-run -a 包一层。--keep 保留临时数据目录和 Electron 日志。
+//   SIDE_PANE_SMOKE_ROUNDS 控制开关轮数（默认 3）。结果写到数据目录下的 smoke-report.json 和 electron.log，
+//   成功且没有 --keep 时删掉数据目录。
+// 自带：模拟的 OpenAI 兼容流式模型服务、测试网页服务、带改动的 Git 工作区、独立的 userData。
+import assert from 'node:assert/strict';
+import fs from 'node:fs';
+import http from 'node:http';
+import net from 'node:net';
+import os from 'node:os';
+import path from 'node:path';
+import { createRequire } from 'node:module';
+import { fileURLToPath } from 'node:url';
+import { spawn, spawnSync, execFileSync } from 'node:child_process';
+
+const root = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');
+const require = createRequire(import.meta.url);
+const electron = require('electron');
+const puppeteer = require('puppeteer');
+const WebSocket = require('ws');
+
+const KEEP = process.argv.includes('--keep');
+const ROUNDS = Number(process.env.SIDE_PANE_SMOKE_ROUNDS || 3);
+const wait = ms => new Promise(resolve => setTimeout(resolve, ms));
+// SIDE_PANE_SMOKE_DIR 指定证据目录（CI 失败时上传），否则用临时目录
+const data = process.env.SIDE_PANE_SMOKE_DIR
+    ? fs.mkdtempSync(path.join(fs.mkdirSync(process.env.SIDE_PANE_SMOKE_DIR, { recursive: true }) || process.env.SIDE_PANE_SMOKE_DIR, 'run-'))
+    : fs.mkdtempSync(path.join(os.tmpdir(), 'vcp-side-pane-smoke-'));
+const appData = path.join(data, 'appdata');
+const workspace = path.join(data, 'workspace');
+fs.mkdirSync(appData);
+
+// 与副屏无关、只因测试环境没有配置而出现的报错（没有 VCP 主服务、没有音频设备等）
+const IGNORED_ERRORS = [
+    /Failed to load resource/i,
+    /ERR_CONNECTION_REFUSED|ERR_TUNNEL_CONNECTION_FAILED|ERR_NAME_NOT_RESOLVED|ERR_INTERNET_DISCONNECTED/,
+    /mainServerUrl or vcpKey is not configured/,
+    /VCPLog|WebSocket connection to/i,
+    /dbus/i,
+    // uiManager 在没有新版时钟/通知标题元素的布局里每次启动都会报，和副屏无关
+    /Digital clock, notification title, or date display element not found/,
+];
+// 类型声明 persist: false 的标签不跨重启恢复（辅助对话、终端、命令输出），见 tab-types/*.js
+const NOT_PERSISTED = /^(sidechat-|terminal:|tool-output:)/;
+
+const report = { startedAt: new Date().toISOString(), data, rounds: ROUNDS, phases: [], errors: [], counters: {} };
+const errors = report.errors;
+let phase = 'startup';
+const recordError = (source, text) => {
+    const line = String(text).slice(0, 600);
+    if (IGNORED_ERRORS.some(re => re.test(line))) return;
+    errors.push({ phase, source, text: line });
+};
+
+// ---- 本地服务 ----
+function listen(server) {
+    return new Promise(resolve => server.listen(0, '127.0.0.1', () => resolve(server.address().port)));
+}
+function freePort() {
+    return new Promise(resolve => { const s = net.createServer().listen(0, '127.0.0.1', () => { const { port } = s.address(); s.close(() => resolve(port)); }); });
+}
+let replies = 0;
+const mockModel = http.createServer((req, res) => {
+    if (req.method === 'GET' && req.url.includes('/models')) {
+        res.writeHead(200, { 'content-type': 'application/json' });
+        return res.end(JSON.stringify({ object: 'list', data: [{ id: 'smoke-model', object: 'model' }] }));
+    }
+    let raw = '';
+    req.on('data', chunk => { raw += chunk; });
+    req.on('end', async () => {
+        let stream = true;
+        try { stream = JSON.parse(raw).stream !== false; } catch { /* 非 JSON 请求按流式处理 */ }
+        const n = ++replies;
+        const text = `SMOKE_REPLY_${n}\n\n- 第一项\n- 第二项 **加粗**\n\n\`\`\`js\nconst x = ${n};\n\`\`\`\n\n` + '段落 '.repeat(60);
+        if (!stream) {
+            res.writeHead(200, { 'content-type': 'application/json' });
+            return res.end(JSON.stringify({ id: 'c' + n, object: 'chat.completion', choices: [{ index: 0, message: { role: 'assistant', content: text }, finish_reason: 'stop' }] }));
+        }
+        res.writeHead(200, { 'content-type': 'text/event-stream', 'cache-control': 'no-cache', connection: 'keep-alive' });
+        for (const part of text.match(/[\s\S]{1,40}/g)) {
+            res.write(`data: ${JSON.stringify({ id: 'c' + n, object: 'chat.completion.chunk', choices: [{ index: 0, delta: { content: part }, finish_reason: null }] })}\n\n`);
+            await wait(10);
+        }
+        res.write(`data: ${JSON.stringify({ id: 'c' + n, object: 'chat.completion.chunk', choices: [{ index: 0, delta: {}, finish_reason: 'stop' }] })}\n\n`);
+        res.end('data: [DONE]\n\n');
+    });
+});
+const pageServer = http.createServer((req, res) => {
+    const id = new URL(req.url, 'http://x').searchParams.get('p') || '0';
+    res.writeHead(200, { 'content-type': 'text/html; charset=utf-8' });
+    res.end(`<!doctype html><title>smoke page ${id}</title><body><h1 id="h">page ${id}</h1><script>let n=0;setInterval(()=>{document.getElementById('h').dataset.n=++n},200)</script>`);
+});
+
+// ---- Git 工作区：一次提交 + 几处改动，计划 / Git 页有内容可显示 ----
+function seedWorkspace() {
+    fs.mkdirSync(workspace);
+    const git = (...args) => execFileSync('git', ['-c', 'user.name=smoke', '-c', 'user.email=smoke@example.com', ...args], { cwd: workspace, stdio: 'ignore' });
+    git('init', '-q');
+    for (let i = 1; i <= 3; i++) fs.writeFileSync(path.join(workspace, `f${i}.txt`), Array.from({ length: 40 }, (_, j) => `file ${i} line ${j}`).join('\n') + '\n');
+    git('add', '.');
+    git('commit', '-q', '-m', 'init');
+    fs.appendFileSync(path.join(workspace, 'f1.txt'), 'changed line\n');
+    fs.writeFileSync(path.join(workspace, 'new.txt'), 'SMOKE_CODE_VIEWER\n');
+}
+
+// ---- Electron 进程 ----
+let child = null;
+let mainWs = null;
+let mainSeq = 0;
+const mainPending = new Map();
+let cdpPort = 0;
+let inspectPort = 0;
+
+async function launch() {
+    cdpPort = await freePort();
+    inspectPort = await freePort();
+    const env = { ...process.env, VCPCHAT_APP_DATA_DIR: appData };
+    delete env.ELECTRON_RUN_AS_NODE;
+    const args = ['.', `--remote-debugging-port=${cdpPort}`, `--inspect=${inspectPort}`];
+    if (process.platform === 'linux') args.push('--no-sandbox');
+    child = spawn(electron, args, { cwd: root, env, windowsHide: true });
+    const logFile = fs.createWriteStream(path.join(data, 'electron.log'), { flags: 'a' });
+    const onOutput = chunk => {
+        logFile.write(chunk);
+        for (const line of String(chunk).split('\n')) {
+            if (/Unhandled(Promise)?Rejection|unhandledRejection|Uncaught Exception|uncaughtException/i.test(line)) recordError('main', line);
+        }
+    };
+    child.stdout.on('data', onOutput);
+    child.stderr.on('data', onOutput);
+    for (let i = 0; i < 120; i++) {
+        try {
+            const list = await (await fetch(`http://127.0.0.1:${inspectPort}/json/list`)).json();
+            if (list[0]?.webSocketDebuggerUrl) {
+                mainWs = new WebSocket(list[0].webSocketDebuggerUrl);
+                await new Promise((resolve, reject) => { mainWs.once('open', resolve); mainWs.once('error', reject); });
+                mainWs.on('message', raw => { const m = JSON.parse(raw); if (mainPending.has(m.id)) { mainPending.get(m.id)(m); mainPending.delete(m.id); } });
+                // 应用退出时连接会被重置，不能让它变成本脚本的未捕获异常
+                mainWs.on('error', () => {});
+                mainWs.on('close', () => { for (const resolve of mainPending.values()) resolve({}); mainPending.clear(); });
+                break;
+            }
+        } catch { /* 还没起来 */ }
+        await wait(500);
+    }
+    assert.ok(mainWs, 'main process inspector did not come up');
+    await mainSend('Runtime.enable');
+    // 主进程里的未处理 rejection 和异常
+    mainWs.on('message', raw => {
+        const m = JSON.parse(raw);
+        if (m.method === 'Runtime.exceptionThrown') recordError('main', m.params.exceptionDetails?.exception?.description || m.params.exceptionDetails?.text);
+    });
+    let browser = null;
+    for (let i = 0; i < 120 && !browser; i++) {
+        try { browser = await puppeteer.connect({ browserURL: `http://127.0.0.1:${cdpPort}`, defaultViewport: null }); } catch { await wait(500); }
+    }
+    assert.ok(browser, 'renderer DevTools endpoint did not come up');
+    let page = null;
+    for (let i = 0; i < 120 && !page; i++) {
+        page = (await browser.pages()).find(p => p.url().endsWith('/main.html')) || null;
+        if (!page) await wait(500);
+    }
+    assert.ok(page, 'main.html window did not open');
+    const client = await page.createCDPSession();
+    await client.send('Runtime.enable');
+    client.on('Runtime.exceptionThrown', e => recordError('renderer', e.exceptionDetails?.exception?.description || e.exceptionDetails?.text));
+    page.on('console', msg => { if (msg.type() === 'error') recordError('console', msg.text()); });
+    await page.waitForFunction(() => !!window.VCPContributions?.commands && !!window.VCPLifecycleInspector, { timeout: 60000 });
+    await wait(3000);
+    return { browser, page, client };
+}
+
+function mainSend(method, params = {}) {
+    const id = ++mainSeq;
+    mainWs.send(JSON.stringify({ id, method, params }));
+    return new Promise(resolve => mainPending.set(id, resolve));
+}
+async function mainEval(expression) {
+    const r = await mainSend('Runtime.evaluate', { expression, includeCommandLineAPI: true, awaitPromise: true, returnByValue: true });
+    return r.result?.result?.value;
+}
+
+async function quit(session) {
+    await session.browser.disconnect().catch(() => {});
+    await mainEval(`process.mainModule.require('electron').app.quit()`).catch(() => {});
+    const closed = await Promise.race([new Promise(resolve => child.once('close', () => resolve(true))), wait(20000).then(() => false)]);
+    if (!closed) stopChild();
+    mainWs?.close();
+    mainWs = null;
+}
+function stopChild() {
+    if (!child?.pid || child.exitCode !== null || child.signalCode !== null) return;
+    if (process.platform === 'win32') spawnSync('taskkill', ['/PID', String(child.pid), '/T', '/F'], { windowsHide: true, stdio: 'ignore' });
+    else child.kill('SIGKILL');
+}
+
+// ---- 测量 ----
+async function measure({ page, client, browser }) {
+    await client.send('HeapProfiler.collectGarbage');
+    await mainSend('HeapProfiler.collectGarbage').catch(() => {});
+    const dom = await client.send('Memory.getDOMCounters');
+    const r = await page.evaluate(async () => {
+        const s = window.VCPLifecycleInspector.snapshot();
+        const m = await window.VCPLifecycleInspector.snapshotMain();
+        return {
+            scopes: s.scopeSummary.activeScopes,
+            resources: s.scopeSummary.activeResources,
+            channelSubs: s.states.reduce((n, c) => n + (c.subscribers || 0), 0),
+            sourceHolders: s.sources.reduce((n, c) => n + (c.holders || 0), 0),
+            tabs: s.sidePane?.tabs?.map(t => ({ id: t.id, kind: t.kind, view: t.view, resources: t.resources?.resources ?? null })) || [],
+            mainSubs: m.subscriptions?.length ?? 0,
+            gitWatchers: m.gitWatchers?.length ?? 0,
+        };
+    });
+    const guests = (await browser.targets()).filter(t => t.type() === 'webview').length;
+    const main = JSON.parse(await mainEval(`(() => { const { ipcMain } = process.mainModule.require('electron'); let n = 0; for (const e of ipcMain.eventNames()) n += ipcMain.listenerCount(e); return JSON.stringify({ ipcListeners: n, handles: process._getActiveHandles().length }); })()`));
+    return { domNodes: dom.nodes, jsListeners: dom.jsEventListeners, ...r, guests, ...main };
+}
+const FLAT_KEYS = ['domNodes', 'jsListeners', 'scopes', 'resources', 'channelSubs', 'sourceHolders', 'guests', 'mainSubs', 'gitWatchers', 'ipcListeners'];
+function assertFlat(label, base, now, tolerance = {}) {
+    const deltas = Object.fromEntries(FLAT_KEYS.map(k => [k, (now[k] ?? 0) - (base[k] ?? 0)]));
+    report.counters[label] = { base: pick(base), now: pick(now), deltas };
+    for (const key of FLAT_KEYS) {
+        const allowed = tolerance[key] ?? 0;
+        assert.ok(deltas[key] <= allowed, `${label}: ${key} grew by ${deltas[key]} (allowed ${allowed}); base ${base[key]}, now ${now[key]}`);
+    }
+}
+const pick = m => Object.fromEntries(FLAT_KEYS.map(k => [k, m[k]]));
+
+// ---- 驱动 ----
+const cmd = (page, tab) => page.evaluate(t => window.VCPContributions.commands.execute('sidepane.open-tab', t), tab);
+async function entry(page, id) {
+    await page.evaluate(() => document.querySelector('.side-pane-home-btn')?.click());
+    await wait(200);
+    const ok = await page.evaluate(id => { const b = document.querySelector(`[data-open-tab-entry="${id}"]`); b?.click(); return !!b; }, id);
+    assert.ok(ok, `launcher entry ${id} missing`);
+}
+const activeView = page => page.evaluate(() => {
+    const v = document.querySelector('.side-pane-view.active');
+    return v ? { text: v.textContent.slice(0, 4000), nodes: v.getElementsByTagName('*').length } : null;
+});
+async function waitIn(page, fn, arg, label, timeout = 20000) {
+    try { await page.waitForFunction(fn, { timeout, polling: 200 }, arg); }
+    catch { throw new Error(`timed out: ${label}`); }
+}
+async function closeAll(page) {
+    for (let i = 0; i < 40; i++) {
+        const left = await page.evaluate(() => { const b = document.querySelector('.side-pane-tab-item .side-pane-tab-close'); b?.click(); return !!b; });
+        if (!left) return;
+        await wait(250);
+        // 有记录的辅助对话关闭前要确认
+        const confirmed = await page.evaluate(() => { const b = [...document.querySelectorAll('.confirm-dialog button')].find(x => x.textContent.includes('关闭并删除')); b?.click(); return !!b; });
+        if (confirmed) await wait(400);
+    }
+    throw new Error('tabs did not close');
+}
+async function sendSideChat(page, text) {
+    await page.evaluate(() => document.querySelector('.side-pane-view.active .side-chat-textarea')?.focus());
+    await page.keyboard.type(text);
+    const before = replies;
+    await page.evaluate(() => document.querySelector('.side-pane-view.active .side-chat-send-btn')?.click());
+    for (let i = 0; i < 150 && replies === before; i++) await wait(100);
+    assert.ok(replies > before, 'side chat send never reached the model');
+    const marker = `SMOKE_REPLY_${replies}`;
+    await waitIn(page, m => {
+        const v = document.querySelector('.side-pane-view.active');
+        return !!v && v.textContent.includes(m) && !v.querySelector('.message-item.streaming, .thinking');
+    }, marker, `streamed reply ${marker}`);
+}
+const chatItems = page => page.evaluate(() => document.querySelectorAll('.side-pane-view.active .message-item').length);
+const activeTabId = page => page.evaluate(() => document.querySelector('.side-pane-tab.active, .side-pane-tab[aria-selected="true"]')?.dataset.tabId || null);
+async function activate(page, id) {
+    await page.evaluate(id => document.querySelector(`.side-pane-tab[data-tab-id="${CSS.escape(id)}"]`)?.click(), id);
+    await wait(id.startsWith('browser') ? 1200 : 500);
+}
+
+function kinds(pageUrl) {
+    const codeFile = path.join(workspace, 'new.txt');
+    return {
+        chat: {
+            open: page => entry(page, 'selection-side-conversation'),
+            use: async page => { await sendSideChat(page, '冒烟问题'); },
+        },
+        terminal: {
+            open: page => entry(page, 'terminal'),
+            use: async page => {
+                const marker = 'SMOKE_TERM_' + Date.now();
+                await waitIn(page, () => !!document.querySelector('.side-pane-view.active .xterm-helper-textarea'), null, 'terminal mounted');
+                await page.evaluate(() => document.querySelector('.side-pane-view.active .xterm-helper-textarea')?.focus());
+                await page.keyboard.type(`echo ${marker}\n`);
+                await waitIn(page, m => (document.querySelector('.side-pane-view.active .xterm-rows, .side-pane-view.active .xterm-accessibility-tree')?.textContent || '').split(m).length > 2, marker, 'terminal echo');
+            },
+        },
+        browser: {
+            open: page => cmd(page, { id: 'browser:smoke', kind: 'browser', title: '浏览器', closable: true, scopeMode: 'global', payload: { url: pageUrl + '?p=1' } }),
+            use: async (page, { browser }) => {
+                const guestAt = async p => { for (let i = 0; i < 80; i++) { if ((await browser.targets()).some(t => t.type() === 'webview' && t.url().includes('p=' + p))) return true; await wait(150); } return false; };
+                assert.ok(await guestAt(1), 'browser guest did not load page 1');
+                await page.evaluate(u => { const a = document.querySelector('.side-pane-view.active .side-browser-address'); a.focus(); a.value = u; a.dispatchEvent(new KeyboardEvent('keydown', { key: 'Enter', bubbles: true })); }, pageUrl + '?p=2');
+                assert.ok(await guestAt(2), 'browser guest did not navigate to page 2');
+            },
+        },
+        'plan-git': {
+            open: page => cmd(page, { id: 'plan-detail:none', kind: 'plan-detail', title: '计划详情', closable: true, scopeMode: 'global', payload: {} }),
+            use: async page => {
+                await wait(600);
+                await page.evaluate(() => [...document.querySelectorAll('.side-pane-view.active button, .side-pane-view.active [role=tab]')].find(b => b.textContent.trim() === 'Git')?.click());
+                await waitIn(page, () => document.querySelectorAll('.side-pane-view.active .side-git-row').length > 0, null, 'git rows');
+            },
+        },
+        'code-viewer': {
+            open: page => cmd(page, { id: 'code-viewer:' + codeFile, kind: 'code-viewer', title: 'new.txt', closable: true, scopeMode: 'global', payload: { filePath: codeFile, mode: 'view', language: 'plaintext' } }),
+            use: page => waitIn(page, () => document.querySelector('.side-pane-view.active')?.textContent.includes('SMOKE_CODE_VIEWER'), null, 'code viewer content'),
+        },
+        trajectory: {
+            open: page => entry(page, 'model-trajectory'),
+            use: page => waitIn(page, () => (document.querySelector('.side-pane-view.active')?.getElementsByTagName('*').length || 0) > 5, null, 'trajectory mounted'),
+        },
+        'tool-output': {
+            open: page => cmd(page, { id: 'tool-output:main', kind: 'tool-output', title: '命令输出', closable: true, scopeMode: 'global' }),
+            use: page => waitIn(page, () => (document.querySelector('.side-pane-view.active')?.getElementsByTagName('*').length || 0) > 3, null, 'tool output mounted'),
+        },
+    };
+}
+
+async function step(name, fn) {
+    phase = name;
+    const t0 = Date.now();
+    process.stdout.write(`[smoke] ${name} ... `);
+    try {
+        const out = await fn();
+        report.phases.push({ name, ms: Date.now() - t0, ok: true, ...(out ? { detail: out } : {}) });
+        console.log(`ok (${Date.now() - t0} ms)`);
+        return out;
+    } catch (error) {
+        report.phases.push({ name, ms: Date.now() - t0, ok: false, error: String(error.stack || error) });
+        console.log('FAILED');
+        throw error;
+    }
+}
+
+async function selectAgent(page, name) {
+    await waitIn(page, n => [...document.querySelectorAll('li[data-item-id]')].some(li => li.textContent.includes(n)), name, `agent ${name} listed`);
+    await page.evaluate(n => [...document.querySelectorAll('li[data-item-id]')].find(li => li.textContent.includes(n)).click(), name);
+    await wait(1200);
+}
+const topicIds = page => page.evaluate(() => [...document.querySelectorAll('#topicList li[data-topic-id]')].map(li => li.dataset.topicId));
+async function pickTopic(page, id) {
+    await page.evaluate(id => document.querySelector(`#topicList li[data-topic-id="${id}"]`)?.click(), id);
+    await wait(900);
+}
+
+// ---- 主流程 ----
+let session = null;
+let exitCode = 1;
+try {
+    seedWorkspace();
+    const modelPort = await listen(mockModel);
+    const pagePort = await listen(pageServer);
+    const pageUrl = `http://127.0.0.1:${pagePort}/page.html`;
+    const K = kinds(pageUrl);
+
+    session = await step('launch', () => launch());
+    await step('seed agents, workspace and model endpoint', async () => {
+        const { page } = session;
+        await page.evaluate(async ({ ws, url }) => {
+            const api = window.chatAPI || window.electronAPI;
+            await api.createAgent('SmokeAgent');
+            await api.createAgent('SmokeAgentB');
+            await api.addWorkspace(ws);
+            const settings = await api.loadSettings();
+            await api.saveSettings({ ...settings, vcpServerUrl: url, vcpApiKey: 'smoke' });
+        }, { ws: workspace, url: `http://127.0.0.1:${modelPort}/v1/chat/completions` });
+        await page.reload({ waitUntil: 'load' });
+        await page.waitForFunction(() => !!window.VCPContributions?.commands, { timeout: 60000 });
+        await wait(3000);
+        await selectAgent(page, 'SmokeAgentB');
+        await selectAgent(page, 'SmokeAgent');
+        if ((await topicIds(page)).length < 2) {
+            await page.evaluate(() => document.getElementById('currentAgentSettingsBtn')?.click());
+            await wait(1500);
+        }
+        const topics = await topicIds(page);
+        assert.ok(topics.length >= 2, `need two topics, have ${topics.length}`);
+        return { topics: topics.length };
+    });
+
+    // 每类走一遍，热身：第一次挂载会加载模块、编译代码，不算增长
+    await step('warm up every tab kind', async () => {
+        for (const [name, k] of Object.entries(K)) { await k.open(session.page); await wait(900); await k.use(session.page, session); await closeAll(session.page); await wait(400); }
+    });
+    const baseline = await measure(session);
+    report.counters.baseline = pick(baseline);
+
+    await step(`open, use and close every tab kind x${ROUNDS}`, async () => {
+        for (let round = 0; round < ROUNDS; round++) {
+            for (const [name, k] of Object.entries(K)) {
+                phase = `open-use-close:${name}`;
+                await k.open(session.page); await wait(900);
+                await k.use(session.page, session);
+                await closeAll(session.page); await wait(400);
+            }
+        }
+        assertFlat('open-use-close', baseline, await measure(session));
+    });
+
+    let historyChat = null;
+    await step('sleep and wake: 10 tabs over the live-view limit', async () => {
+        const { page } = session;
+        await K.chat.open(page); await wait(1000);
+        for (let i = 1; i <= 3; i++) await sendSideChat(page, `休眠前的问题 ${i}`);
+        historyChat = await activeTabId(page);
+        const expected = await chatItems(page);
+        await K.chat.open(page); await wait(800);
+        for (const name of ['terminal', 'browser', 'plan-git', 'trajectory', 'tool-output']) { await K[name].open(page); await wait(900); if (name === 'plan-git') await K[name].use(page, session); }
+        for (const n of [1, 2, 3]) {
+            const f = path.join(workspace, `f${n}.txt`);
+            await cmd(page, { id: 'code-viewer:' + f, kind: 'code-viewer', title: `f${n}.txt`, closable: true, scopeMode: 'global', payload: { filePath: f, mode: 'view', language: 'plaintext' } });
+            await wait(500);
+        }
+        const ids = await page.evaluate(() => [...document.querySelectorAll('.side-pane-tab[data-tab-id]')].map(e => e.dataset.tabId).filter(id => id !== 'notifications'));
+        assert.ok(ids.length >= 10, `expected at least 10 tabs, got ${ids.length}`);
+        const counts = [];
+        let first = null;
+        for (let round = 0; round < 3; round++) {
+            for (const id of ids) { await activate(page, id); if (id === historyChat) counts.push(await chatItems(page)); }
+            const m = await measure(session);
+            const dormant = m.tabs.filter(t => t.view === 'dormant');
+            assert.ok(dormant.length >= 1, 'nothing went dormant over the live-view limit');
+            assert.ok(dormant.every(t => t.resources == null), 'a dormant tab still holds resources');
+            if (first) assertFlat(`sleep-wake round ${round}`, first, m, { domNodes: 30 });
+            else first = m;
+        }
+        assert.ok(counts.every(c => c === expected), `side chat history after wake: ${counts.join(',')} (expected ${expected})`);
+        return { tabs: ids.length, wakeItems: counts };
+    });
+
+    await step('topic switching x6 with side chats open', async () => {
+        const { page } = session;
+        const [a, b] = await topicIds(page);
+        await pickTopic(page, a);
+        const before = await measure(session);
+        for (let i = 0; i < 6; i++) { await pickTopic(page, b); await pickTopic(page, a); }
+        await wait(500);
+        assertFlat('topic switching', before, await measure(session), { domNodes: 30 });
+    });
+
+    await step('agent switching x4', async () => {
+        const { page } = session;
+        const before = await measure(session);
+        for (let i = 0; i < 4; i++) { await selectAgent(page, 'SmokeAgentB'); await selectAgent(page, 'SmokeAgent'); }
+        assertFlat('agent switching', before, await measure(session), { domNodes: 30 });
+    });
+
+    const tabsBeforeRestart = await session.page.evaluate(() => [...document.querySelectorAll('.side-pane-tab[data-tab-id]')].map(e => e.dataset.tabId).filter(id => id !== 'notifications'));
+    await step('restart and restore', async () => {
+        await wait(1500); // 等布局写盘
+        await quit(session);
+        session = await launch();
+        const { page } = session;
+        await selectAgent(page, 'SmokeAgent');
+        const [a] = await topicIds(page);
+        await pickTopic(page, a);
+        await wait(1500);
+        const restored = await page.evaluate(() => [...document.querySelectorAll('.side-pane-tab[data-tab-id]')].map(e => e.dataset.tabId).filter(id => id !== 'notifications'));
+        const expected = tabsBeforeRestart.filter(id => !NOT_PERSISTED.test(id));
+        const missing = expected.filter(id => !restored.includes(id));
+        assert.deepEqual(missing, [], `tabs not restored after restart: ${missing.join(', ')}`);
+        assert.ok(expected.length >= 5, `too few persistable tabs to check restore: ${expected.join(', ')}`);
+        // 恢复的标签都能重新挂载并显示内容
+        for (const id of expected) {
+            await activate(page, id);
+            await waitIn(page, () => (document.querySelector('.side-pane-view.active')?.getElementsByTagName('*').length || 0) > 3, null, `restored tab ${id} mounted`);
+        }
+        await activate(page, expected.find(id => id.startsWith('browser:')));
+        await K.browser.use(page, session);
+        return { restored: restored.length, expected: expected.length };
+    });
+
+    await step('streaming after restart, then close everything', async () => {
+        const { page } = session;
+        await K.chat.open(page); await wait(1000);
+        await sendSideChat(page, '重启后的问题');
+        await closeAll(page); await wait(1500);
+        // 重启后再跑一轮热身，回到同样的起点再比
+        for (const k of Object.values(K)) { await k.open(page); await wait(900); await k.use(page, session); await closeAll(page); await wait(400); }
+        const base2 = await measure(session);
+        for (const k of Object.values(K)) { await k.open(page); await wait(900); await k.use(page, session); await closeAll(page); await wait(400); }
+        assertFlat('after restart', base2, await measure(session));
+    });
+
+    phase = 'done';
+    assert.deepEqual(errors, [], `console errors or unhandled rejections:\n${errors.map(e => `[${e.phase}] ${e.source}: ${e.text}`).join('\n')}`);
+    exitCode = 0;
+    console.log(`Side pane smoke passed (${report.phases.length} phases, ${replies} streamed replies).`);
+} catch (error) {
+    report.failure = String(error.stack || error);
+    console.error(error.message || error);
+    if (errors.length) console.error(errors.map(e => `[${e.phase}] ${e.source}: ${e.text}`).join('\n'));
+} finally {
+    report.finishedAt = new Date().toISOString();
+    fs.writeFileSync(path.join(data, 'smoke-report.json'), JSON.stringify(report, null, 1));
+    if (session) await quit(session).catch(() => {});
+    stopChild();
+    mockModel.close();
+    pageServer.close();
+    if (exitCode === 0 && !KEEP) fs.rmSync(data, { recursive: true, force: true });
+    else console.log('Evidence: ' + data);
+    process.exit(exitCode);
+}

From cc5686ebf22126bcceb2d75eb7fe57085d813d1d Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 04:47:52 +0000
Subject: [PATCH 112/143] Side pane batch V: interaction fixes from a review of
 the integration branch

A fresh adversarial review of #2's head (fixes from seven threads) found
these, each now covered by a test that fails without the fix:

- A mounted side chat with an unsent draft, references or attachments but
  no messages closed (and deleted its child topic) without asking, while
  the same tab unmounted did ask.
- After a restart, a topic whose saved plan tab came back with the layout
  stayed on the plan tab instead of the side chat it was left on.
- The "ask in side pane" button stayed hidden while anything else on the
  page scrolled (a streaming side chat, terminal output); only scrolls of
  the container holding the selection hide it now.
- With two side chats mounted, Esc on the second one's message menu was
  handled by the first and left focus on the body.
- A download link opened in a new tab was dropped: the click was spent on
  the popup. The popup now carries a one-time grant for its URL.
- The code viewer's reveal-in-folder sent a workspace-relative path that
  the git handler resolves against the repo root (subdirectory
  workspaces); it now says base 'workspace'.
- A status push re-rendered a long Git list with only the first batch of
  cards, clamping the reader's scroll back to ~row 110.
- On Linux, a linked worktree's own git dir (index, HEAD) was no longer
  watched once watches became shallow.
- The plan view saved scrollTop 0 when put to sleep while hidden.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DFRovoZHMzeheXKkLNWKG
---
 .../contracts/generated/chat-event-graph.json | 211 +++++++++---------
 modules/ipc/browserHandlers.js                |  29 ++-
 modules/ipc/gitHandlers.js                    |   6 +-
 modules/renderer/floatingSelectionButton.js   |   9 +-
 modules/renderer/side-chat/message-actions.js |  14 +-
 modules/renderer/sideChatSurfaceOwner.js      |   6 +-
 modules/services/gitService.js                |  10 +-
 modules/services/gitWatcher.js                |  10 +-
 .../side-pane/codeViewerSideProvider.js       |   2 +-
 modules/ui-system/side-pane/git/git-view.js   |  10 +-
 .../side-pane/planDetailSideProvider.js       |   5 +-
 .../side-pane/side-pane-controller.js         |   5 +-
 preloads/api/projectForge.js                  |   2 +-
 tests/browser-handlers.test.js                |  29 +++
 tests/git-service.test.js                     |   5 +
 tests/git-watcher.test.js                     |  22 ++
 tests/side-chat-floating-selection.test.mjs   |  12 +
 tests/side-chat-message-delete.test.mjs       |  14 ++
 tests/side-chat-message-keyboard.test.mjs     |  20 ++
 tests/side-pane-git.test.mjs                  |  38 ++++
 tests/side-pane-mount-timing.test.mjs         |  33 +++
 tests/side-pane-plan-detail.test.mjs          |   9 +-
 22 files changed, 377 insertions(+), 124 deletions(-)

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 366daf19e..83a048d59 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -1276,14 +1276,14 @@
       "consumers": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 179,
+          "line": 206,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 179,
+          "line": 206,
           "kind": "event-listener",
           "match": "guest.on('before-input-event'"
         }
@@ -1885,14 +1885,14 @@
       "consumers": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 205,
+          "line": 232,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 205,
+          "line": 232,
           "kind": "event-listener",
           "match": "ipcMain.handle('browser:clear-data'"
         },
@@ -1916,14 +1916,14 @@
       "consumers": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 194,
+          "line": 221,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 194,
+          "line": 221,
           "kind": "event-listener",
           "match": "ipcMain.handle('browser:open-external'"
         },
@@ -2391,7 +2391,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 579,
+          "line": 582,
           "kind": "custom-event-listener"
         }
       ],
@@ -2566,7 +2566,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 579,
+          "line": 582,
           "kind": "custom-event-listener",
           "match": "el.addEventListener('change'"
         }
@@ -3622,7 +3622,7 @@
         },
         {
           "file": "modules/renderer/floatingSelectionButton.js",
-          "line": 68,
+          "line": 75,
           "kind": "custom-event-listener"
         },
         {
@@ -3652,12 +3652,12 @@
         },
         {
           "file": "modules/renderer/side-chat/message-actions.js",
-          "line": 295,
+          "line": 300,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/renderer/side-chat/message-actions.js",
-          "line": 356,
+          "line": 362,
           "kind": "custom-event-listener"
         },
         {
@@ -4212,7 +4212,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/git-view.js",
-          "line": 261,
+          "line": 262,
           "kind": "custom-event-listener"
         },
         {
@@ -4272,67 +4272,67 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 337,
+          "line": 340,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 373,
+          "line": 376,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 410,
+          "line": 413,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 419,
+          "line": 422,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 532,
+          "line": 535,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 595,
+          "line": 598,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 601,
+          "line": 604,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 674,
+          "line": 677,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 701,
+          "line": 704,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 720,
+          "line": 723,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 740,
+          "line": 743,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 771,
+          "line": 774,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 786,
+          "line": 789,
           "kind": "custom-event-listener"
         },
         {
@@ -4342,17 +4342,17 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1175,
+          "line": 1174,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1181,
+          "line": 1180,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1195,
+          "line": 1194,
           "kind": "custom-event-listener"
         },
         {
@@ -5077,7 +5077,7 @@
         },
         {
           "file": "modules/renderer/floatingSelectionButton.js",
-          "line": 68,
+          "line": 75,
           "kind": "custom-event-listener",
           "match": "floatingBtn.addEventListener('click'"
         },
@@ -5113,13 +5113,13 @@
         },
         {
           "file": "modules/renderer/side-chat/message-actions.js",
-          "line": 295,
+          "line": 300,
           "kind": "custom-event-listener",
           "match": "el.addEventListener('click'"
         },
         {
           "file": "modules/renderer/side-chat/message-actions.js",
-          "line": 356,
+          "line": 362,
           "kind": "custom-event-listener",
           "match": "doc.addEventListener('click'"
         },
@@ -5785,7 +5785,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/git-view.js",
-          "line": 261,
+          "line": 262,
           "kind": "custom-event-listener",
           "match": "btn.addEventListener('click'"
         },
@@ -5857,79 +5857,79 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 337,
+          "line": 340,
           "kind": "custom-event-listener",
           "match": "btn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 373,
+          "line": 376,
           "kind": "custom-event-listener",
           "match": "crumbs.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 410,
+          "line": 413,
           "kind": "custom-event-listener",
           "match": "refreshBtn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 419,
+          "line": 422,
           "kind": "custom-event-listener",
           "match": "forgeBtn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 532,
+          "line": 535,
           "kind": "custom-event-listener",
           "match": "row.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 595,
+          "line": 598,
           "kind": "custom-event-listener",
           "match": "toggle.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 601,
+          "line": 604,
           "kind": "custom-event-listener",
           "match": "clear.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 674,
+          "line": 677,
           "kind": "custom-event-listener",
           "match": "headBtn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 701,
+          "line": 704,
           "kind": "custom-event-listener",
           "match": "pick.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 720,
+          "line": 723,
           "kind": "custom-event-listener",
           "match": "pick.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 740,
+          "line": 743,
           "kind": "custom-event-listener",
           "match": "link.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 771,
+          "line": 774,
           "kind": "custom-event-listener",
           "match": "retry.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 786,
+          "line": 789,
           "kind": "custom-event-listener",
           "match": "retry.addEventListener('click'"
         },
@@ -5941,19 +5941,19 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1175,
+          "line": 1174,
           "kind": "custom-event-listener",
           "match": "toggleNotificationsBtn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1181,
+          "line": 1180,
           "kind": "custom-event-listener",
           "match": "expandButton.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1195,
+          "line": 1194,
           "kind": "custom-event-listener",
           "match": "closeSidePaneBtn.addEventListener('click'"
         },
@@ -7133,7 +7133,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 560,
+          "line": 563,
           "kind": "custom-event-listener"
         }
       ],
@@ -7146,7 +7146,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 560,
+          "line": 563,
           "kind": "custom-event-listener",
           "match": "el.addEventListener('compositionend'"
         }
@@ -7163,7 +7163,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 559,
+          "line": 562,
           "kind": "custom-event-listener"
         }
       ],
@@ -7176,7 +7176,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 559,
+          "line": 562,
           "kind": "custom-event-listener",
           "match": "el.addEventListener('compositionstart'"
         }
@@ -7308,7 +7308,7 @@
         },
         {
           "file": "modules/renderer/side-chat/message-actions.js",
-          "line": 352,
+          "line": 358,
           "kind": "custom-event-listener"
         },
         {
@@ -7439,7 +7439,7 @@
         },
         {
           "file": "modules/renderer/side-chat/message-actions.js",
-          "line": 352,
+          "line": 358,
           "kind": "custom-event-listener",
           "match": "root?.addEventListener('contextmenu'"
         },
@@ -10043,14 +10043,14 @@
       "consumers": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 161,
+          "line": 187,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 161,
+          "line": 187,
           "kind": "event-listener",
           "match": "host.on('did-attach-webview'"
         }
@@ -12705,7 +12705,7 @@
         },
         {
           "file": "modules/renderer/side-chat/message-actions.js",
-          "line": 354,
+          "line": 360,
           "kind": "custom-event-listener"
         },
         {
@@ -12723,7 +12723,7 @@
         },
         {
           "file": "modules/renderer/side-chat/message-actions.js",
-          "line": 354,
+          "line": 360,
           "kind": "custom-event-listener",
           "match": "root?.addEventListener('focusin'"
         },
@@ -13875,14 +13875,14 @@
       "consumers": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 188,
+          "line": 190,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 188,
+          "line": 190,
           "kind": "event-listener",
           "match": "handle('git:change-summary'"
         },
@@ -13956,14 +13956,14 @@
       "consumers": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 183,
+          "line": 185,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 183,
+          "line": 185,
           "kind": "event-listener",
           "match": "handle('git:commit-graph'"
         },
@@ -13987,14 +13987,14 @@
       "consumers": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 177,
+          "line": 179,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 177,
+          "line": 179,
           "kind": "event-listener",
           "match": "handle('git:create-branch'"
         },
@@ -14080,14 +14080,14 @@
       "consumers": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 170,
+          "line": 172,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 170,
+          "line": 172,
           "kind": "event-listener",
           "match": "handle('git:list-branches'"
         },
@@ -14173,14 +14173,14 @@
       "consumers": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 164,
+          "line": 165,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 164,
+          "line": 165,
           "kind": "event-listener",
           "match": "handle('git:reveal-path'"
         },
@@ -14266,14 +14266,14 @@
       "consumers": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 172,
+          "line": 174,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/gitHandlers.js",
-          "line": 172,
+          "line": 174,
           "kind": "event-listener",
           "match": "handle('git:switch-branch'"
         },
@@ -14901,7 +14901,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 558,
+          "line": 561,
           "kind": "custom-event-listener"
         },
         {
@@ -15093,7 +15093,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 558,
+          "line": 561,
           "kind": "custom-event-listener",
           "match": "el.addEventListener('input'"
         },
@@ -15111,14 +15111,14 @@
       "consumers": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 163,
+          "line": 189,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 163,
+          "line": 189,
           "kind": "event-listener",
           "match": "guest.on('input-event'"
         }
@@ -15417,17 +15417,17 @@
         },
         {
           "file": "modules/renderer/side-chat/message-actions.js",
-          "line": 286,
+          "line": 291,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/renderer/side-chat/message-actions.js",
-          "line": 353,
+          "line": 359,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/renderer/side-chat/message-actions.js",
-          "line": 357,
+          "line": 363,
           "kind": "custom-event-listener"
         },
         {
@@ -15783,19 +15783,19 @@
         },
         {
           "file": "modules/renderer/side-chat/message-actions.js",
-          "line": 286,
+          "line": 291,
           "kind": "custom-event-listener",
           "match": "menu.addEventListener('keydown'"
         },
         {
           "file": "modules/renderer/side-chat/message-actions.js",
-          "line": 353,
+          "line": 359,
           "kind": "custom-event-listener",
           "match": "root?.addEventListener('keydown'"
         },
         {
           "file": "modules/renderer/side-chat/message-actions.js",
-          "line": 357,
+          "line": 363,
           "kind": "custom-event-listener",
           "match": "doc.addEventListener('keydown'"
         },
@@ -18903,7 +18903,7 @@
         },
         {
           "file": "modules/renderer/floatingSelectionButton.js",
-          "line": 67,
+          "line": 74,
           "kind": "custom-event-listener"
         },
         {
@@ -19022,7 +19022,7 @@
         },
         {
           "file": "modules/renderer/floatingSelectionButton.js",
-          "line": 67,
+          "line": 74,
           "kind": "custom-event-listener",
           "match": "floatingBtn.addEventListener('mousedown'"
         },
@@ -25060,7 +25060,7 @@
         },
         {
           "file": "modules/renderer/floatingSelectionButton.js",
-          "line": 66,
+          "line": 73,
           "kind": "custom-event-listener"
         },
         {
@@ -25085,7 +25085,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1215,
+          "line": 1214,
           "kind": "custom-event-listener"
         },
         {
@@ -25155,7 +25155,7 @@
         },
         {
           "file": "modules/renderer/floatingSelectionButton.js",
-          "line": 66,
+          "line": 73,
           "kind": "custom-event-listener",
           "match": "win.addEventListener('resize'"
         },
@@ -25185,7 +25185,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1215,
+          "line": 1214,
           "kind": "custom-event-listener",
           "match": "win?.addEventListener?.('resize'"
         },
@@ -26554,7 +26554,7 @@
         },
         {
           "file": "modules/renderer/floatingSelectionButton.js",
-          "line": 65,
+          "line": 72,
           "kind": "custom-event-listener"
         },
         {
@@ -26587,6 +26587,11 @@
           "line": 593,
           "kind": "custom-event-listener"
         },
+        {
+          "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
+          "line": 228,
+          "kind": "custom-event-listener"
+        },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
           "line": 269,
@@ -26617,7 +26622,7 @@
         },
         {
           "file": "modules/renderer/floatingSelectionButton.js",
-          "line": 65,
+          "line": 72,
           "kind": "custom-event-listener",
           "match": "doc.addEventListener('scroll'"
         },
@@ -26657,6 +26662,12 @@
           "kind": "custom-event-listener",
           "match": "panel.addEventListener('scroll'"
         },
+        {
+          "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
+          "line": 228,
+          "kind": "custom-event-listener",
+          "match": "body.addEventListener('scroll'"
+        },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
           "line": 269,
@@ -26913,14 +26924,14 @@
       "consumers": [
         {
           "file": "modules/renderer/floatingSelectionButton.js",
-          "line": 64,
+          "line": 71,
           "kind": "custom-event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/renderer/floatingSelectionButton.js",
-          "line": 64,
+          "line": 71,
           "kind": "custom-event-listener",
           "match": "doc.addEventListener('selectionchange'"
         }
@@ -31863,25 +31874,25 @@
       "consumers": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 125,
+          "line": 151,
           "kind": "event-listener"
         },
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 178,
+          "line": 205,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 125,
+          "line": 151,
           "kind": "event-listener",
           "match": "host.on('will-attach-webview'"
         },
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 178,
+          "line": 205,
           "kind": "event-listener",
           "match": "guest.on('will-attach-webview'"
         }
@@ -31893,14 +31904,14 @@
       "consumers": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 109,
+          "line": 134,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 109,
+          "line": 134,
           "kind": "event-listener",
           "match": "ses.on('will-download'"
         }
@@ -31917,7 +31928,7 @@
         },
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 175,
+          "line": 202,
           "kind": "event-listener"
         },
         {
@@ -31935,7 +31946,7 @@
         },
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 175,
+          "line": 202,
           "kind": "event-listener",
           "match": "guest.on('will-navigate'"
         },
@@ -31983,14 +31994,14 @@
       "consumers": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 176,
+          "line": 203,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/browserHandlers.js",
-          "line": 176,
+          "line": 203,
           "kind": "event-listener",
           "match": "guest.on('will-redirect'"
         }
diff --git a/modules/ipc/browserHandlers.js b/modules/ipc/browserHandlers.js
index f2a950146..ccd5b260e 100644
--- a/modules/ipc/browserHandlers.js
+++ b/modules/ipc/browserHandlers.js
@@ -73,6 +73,31 @@ function consumeActivation(guest) {
     return true;
 }
 
+// 用户点开的新标签链接（target=_blank）：那次点击已经被弹窗用掉了，新标签是另一个 guest、没有自己的输入。
+// 新标签加载这个地址直接变成下载时，凭这张一次性的票放行，不然下载链接点了什么都不发生
+const POPUP_GRANT_MS = 15000;
+const popupGrants = new Map();
+
+function normalizeGrantUrl(url) {
+    try { return new URL(url).href; } catch { return null; }
+}
+
+function grantPopup(url) {
+    const key = normalizeGrantUrl(url);
+    if (!key) return;
+    const now = Date.now();
+    for (const [grantUrl, expires] of popupGrants) if (expires <= now) popupGrants.delete(grantUrl);
+    popupGrants.set(key, now + POPUP_GRANT_MS);
+}
+
+function consumePopupGrant(url) {
+    const key = normalizeGrantUrl(url);
+    const expires = key ? popupGrants.get(key) : 0;
+    if (!expires) return false;
+    popupGrants.delete(key);
+    return expires > Date.now();
+}
+
 /**
  * 和渲染进程 side-pane-shortcuts.js 同一套按键：Ctrl/Cmd+Alt+B 展开或收起副屏，Ctrl+PageUp / PageDown 切标签。
  * input 是 before-input-event 的 Electron Input；返回要转发的动作，不是快捷键就返回 null。
@@ -109,7 +134,8 @@ function configureGuestSession(ses) {
     ses.on('will-download', (event, item, guest) => {
         const url = item.getURL();
         event.preventDefault();
-        if (isExternalUrl(url) && consumeActivation(guest)) {
+        const requested = typeof item.getURLChain === 'function' ? item.getURLChain()[0] || url : url;
+        if (isExternalUrl(url) && (consumeActivation(guest) || consumePopupGrant(requested))) {
             Promise.resolve(shell.openExternal(url)).catch(() => {});
         }
     });
@@ -165,6 +191,7 @@ function attachToWindow(mainWindow) {
         });
         guest.setWindowOpenHandler(({ url }) => {
             if (isAllowedPopupUrl(url) && !host.isDestroyed() && consumeActivation(guest)) {
+                grantPopup(url);
                 host.send('browser:open-tab', { url });
             }
             return { action: 'deny' };
diff --git a/modules/ipc/gitHandlers.js b/modules/ipc/gitHandlers.js
index c61f97599..fa45cd0d7 100644
--- a/modules/ipc/gitHandlers.js
+++ b/modules/ipc/gitHandlers.js
@@ -161,8 +161,10 @@ function initialize({ workspaceService = null, mainWindow = null, getMainWindow:
     ), { mutates: true });
 
     // 在系统文件管理器中定位文件：只接受工作区内的相对路径，越界一律拒绝。
-    handle('git:reveal-path', async (workspaceId, relPath) => {
-        const target = await gitService.resolveRevealTarget(resolveWorkspaceRoot(workspaceId), relPath);
+    // base 'workspace'：路径相对工作区（代码查看器）；默认相对仓库根（Git 页的状态条目）
+    handle('git:reveal-path', async (workspaceId, relPath, base) => {
+        const target = await gitService.resolveRevealTarget(resolveWorkspaceRoot(workspaceId), relPath,
+            { base: base === 'workspace' ? 'workspace' : 'repo' });
         shell.showItemInFolder(target);
         return { revealed: true };
     });
diff --git a/modules/renderer/floatingSelectionButton.js b/modules/renderer/floatingSelectionButton.js
index efdc56ccd..6a3545507 100644
--- a/modules/renderer/floatingSelectionButton.js
+++ b/modules/renderer/floatingSelectionButton.js
@@ -16,7 +16,14 @@ export function createFloatingSelectionButton({ doc, win, notify }) {
     // 按钮是 fixed 定位在选区视口坐标上；任何滚动或尺寸变化都会让坐标失效（ZCode MarkdownSelectionTooltip 同样在滚动时收起）。
     // 停下来后按选区的新位置再放一次：拖选到边缘时列表会自己滚，滚完不一定还有 selectionchange
     let settleTimer = null;
-    const onViewportChange = () => {
+    const onViewportChange = (event) => {
+        // 只管会移动选区的滚动：侧栏辅助对话流式贴底、终端输出这些别处的滚动一直在发，不能把按钮一直压着
+        const target = event?.type === 'scroll' ? event.target : null;
+        if (target && target.nodeType === 1) {
+            const sel = win.getSelection();
+            const anchor = sel?.rangeCount ? sel.getRangeAt(0).commonAncestorContainer : null;
+            if (!anchor || !target.contains(anchor)) return;
+        }
         if (!floatingBtn.hidden) hide();
         win.clearTimeout(settleTimer);
         settleTimer = win.setTimeout(onSelectionChange, 150);
diff --git a/modules/renderer/side-chat/message-actions.js b/modules/renderer/side-chat/message-actions.js
index cb17d0fb7..5127a8484 100644
--- a/modules/renderer/side-chat/message-actions.js
+++ b/modules/renderer/side-chat/message-actions.js
@@ -108,6 +108,8 @@ export function createSideChatMessageActions({
 
     // 打开菜单的那条消息：Esc、Tab 或执行菜单项后焦点回到这里
     let returnFocusTo = null;
+    // 这个辅助对话自己打开的菜单：几个辅助对话同时挂着时共用同一个 #chatContextMenu，每个都在 document 上听 Esc
+    let openedMenu = null;
 
     function closeMenu({ restoreFocus = false } = {}) {
         doc.getElementById(MENU_ID)?.remove();
@@ -190,8 +192,11 @@ export function createSideChatMessageActions({
 
     function onKeydown(event) {
         if (event.key !== 'Escape') return;
-        const ours = doc.getElementById(MENU_ID)?.dataset.sideChatMenu === 'true';
-        closeMenu({ restoreFocus: ours });
+        // 只关自己开的菜单：先跑到的别的辅助对话不能把菜单关掉、再让开菜单的那个丢了焦点去处
+        const menu = doc.getElementById(MENU_ID);
+        if (!menu || menu !== openedMenu) return;
+        openedMenu = null;
+        closeMenu({ restoreFocus: true });
     }
 
     function buildMenu(messageItem, message) {
@@ -346,6 +351,7 @@ export function createSideChatMessageActions({
         const menu = buildMenu(messageItem, message);
         placeMenu(menu, anchor);
         returnFocusTo = messageItem.tabIndex >= 0 || messageItem.hasAttribute('tabindex') ? messageItem : null;
+        openedMenu = menu;
         menu.querySelector('[role="menuitem"]')?.focus?.({ preventScroll: true });
     }
 
@@ -377,8 +383,8 @@ export function createSideChatMessageActions({
             root?.removeEventListener('focusin', onMessageFocusIn);
             doc.removeEventListener('click', onOutsidePointer, true);
             doc.removeEventListener('keydown', onKeydown, true);
-            const menu = doc.getElementById(MENU_ID);
-            if (menu?.dataset.sideChatMenu === 'true') menu.remove();
+            if (openedMenu?.isConnected) openedMenu.remove();
+            openedMenu = null;
         }
     });
 }
diff --git a/modules/renderer/sideChatSurfaceOwner.js b/modules/renderer/sideChatSurfaceOwner.js
index c16569399..cc998c973 100644
--- a/modules/renderer/sideChatSurfaceOwner.js
+++ b/modules/renderer/sideChatSurfaceOwner.js
@@ -692,10 +692,12 @@ export async function mountSideChatSurface(container, {
                 chatCapabilities?.uiHelper?.showToastNotification?.('无法关闭标签页：存在未保存的历史记录。请点击保存徽标重试，或右键点击徽标放弃更改。', 'warning');
                 return { closed: false, reason: 'UNSAVED_CHANGES' };
             }
-            // 关闭会删掉子话题；有记录时先确认，免得误点（含「关闭其他 / 全部」）把对话永久删掉
+            // 关闭会删掉子话题；有记录或没发出去的输入时先确认，免得误点（含「关闭其他 / 全部」）把对话永久删掉。
+            // 和没挂载时的 requestTabClose 一样：草稿和引用也算
             const uiHelper = chatCapabilities?.uiHelper;
             const history = liveConversation?.historyRef?.get?.() || [];
-            if (typeof uiHelper?.showConfirmDialog === 'function' && history.length > 0) {
+            const hasInput = Boolean(textarea.value.trim()) || references.length > 0 || attachmentsOwner.count > 0;
+            if (typeof uiHelper?.showConfirmDialog === 'function' && (history.length > 0 || hasInput)) {
                 const confirmed = await uiHelper.showConfirmDialog(
                     `关闭「${descriptor.title || '辅助对话'}」会删除这段辅助对话的全部记录，无法恢复。`,
                     '关闭辅助对话', '关闭并删除', '取消', true);
diff --git a/modules/services/gitService.js b/modules/services/gitService.js
index 7a2f00971..30ad3ed76 100644
--- a/modules/services/gitService.js
+++ b/modules/services/gitService.js
@@ -462,9 +462,15 @@ async function readStatusNow(repo) {
  * 「在文件管理器中打开」的目标：状态条目的路径相对仓库根，工作区可能只是仓库的子目录，
  * 所以按仓库根解析（对照 ZCode gitService.ts toAbsolutePath），再校验仍在工作区内。
  */
-async function resolveRevealTarget(workspaceRoot, relPath) {
+async function resolveRevealTarget(workspaceRoot, relPath, { base = 'repo' } = {}) {
     const repo = await openRepository(workspaceRoot);
-    if (repo) return absoluteInRepo(repo, resolveRepoPath(repo, relPath));
+    if (repo) {
+        // 相对工作区的路径（代码查看器给的）先拼上工作区在仓库里的前缀
+        const repoRel = base === 'workspace' && repo.prefix && typeof relPath === 'string'
+            ? `${repo.prefix}/${IS_WIN ? relPath.replace(/\\/g, '/') : relPath}`
+            : relPath;
+        return absoluteInRepo(repo, resolveRepoPath(repo, repoRel));
+    }
     const root = path.resolve(workspaceRoot);
     const target = path.resolve(root, typeof relPath === 'string' ? relPath : '');
     if (target !== root && !target.startsWith(root + path.sep)) throw new Error('路径不在工作区内。');
diff --git a/modules/services/gitWatcher.js b/modules/services/gitWatcher.js
index ddf451282..3435afdba 100644
--- a/modules/services/gitWatcher.js
+++ b/modules/services/gitWatcher.js
@@ -145,14 +145,16 @@ function createGitWatcher({
                 if (entry.error) reportDegraded(entry);
                 return;
             }
-            for (const dir of outermostDirs(targets.gitDirs || [])) {
-                if (platform === 'linux') {
+            if (platform === 'linux') {
+                // 只浅监听，所以每个 gitDir 都要单独挂：linked worktree 的 index/HEAD 在 .git/worktrees/<名字>/ 下，
+                // 只挂外层的 .git 看不到 git add、切换已有分支
+                for (const dir of new Set((targets.gitDirs || []).map(item => path.resolve(item)))) {
                     open(entry, dir, 'metadata', { recursive: false });
                     const refs = path.join(dir, 'refs');
                     if (exists(refs)) open(entry, refs, 'metadata', { prefix: 'refs/' });
-                } else {
-                    open(entry, dir, 'metadata');
                 }
+            } else {
+                for (const dir of outermostDirs(targets.gitDirs || [])) open(entry, dir, 'metadata');
             }
             const watchContent = platform !== 'linux' && targets.root;
             if (watchContent) open(entry, targets.root, 'content');
diff --git a/modules/ui-system/side-pane/codeViewerSideProvider.js b/modules/ui-system/side-pane/codeViewerSideProvider.js
index 70d9594d9..9405b6976 100644
--- a/modules/ui-system/side-pane/codeViewerSideProvider.js
+++ b/modules/ui-system/side-pane/codeViewerSideProvider.js
@@ -320,7 +320,7 @@ export function createCodeViewerSideProvider({
                             toast(`文件路径：${filePath}`, 'info');
                             return;
                         }
-                        const res = await api.gitRevealPath(match.workspace.id, match.relPath);
+                        const res = await api.gitRevealPath(match.workspace.id, match.relPath, 'workspace');
                         if (!res?.success) throw new Error(res?.error || '无法在文件管理器中显示');
                     } catch (error) {
                         toast(error?.message || String(error), 'error');
diff --git a/modules/ui-system/side-pane/git/git-view.js b/modules/ui-system/side-pane/git/git-view.js
index f258abd69..0831860c3 100644
--- a/modules/ui-system/side-pane/git/git-view.js
+++ b/modules/ui-system/side-pane/git/git-view.js
@@ -196,6 +196,7 @@ export function mountGitView(host, {
     // 1000 个改动时打开 Git 页从约 0.75s 降到 0.24s；3000 个时从 1.9s（最长任务 0.74s）降到 0.41s。
     let listItems = [];
     let listMounted = 0;
+    let renderedSource = null;
     const moreObserver = typeof win.IntersectionObserver === 'function'
         ? new win.IntersectionObserver((entries) => {
             if (entries.some(entry => entry.isIntersecting)) mountMoreCards(listMounted + GIT_LIST_BATCH);
@@ -315,13 +316,20 @@ export function mountGitView(host, {
         const focusedCard = list.contains(doc.activeElement) ? doc.activeElement.closest('.side-git-card') : null;
         const focusKey = focusedCard?.dataset.key ?? null;
         const focusIndex = focusedCard ? Array.prototype.indexOf.call(list.children, focusedCard) : -1;
+        // 同一个列表的重绘（agent 改文件时每次推送都会来）至少挂回原来那么多张，并留在原来的滚动位置：
+        // 只挂第一批的话列表变矮，滚动位置被夹回第一百多行
+        const sameList = renderedSource === currentSource && listItems.length > 0;
+        const previouslyMounted = sameList ? listMounted : 0;
+        const previousScrollTop = sameList ? body.scrollTop : null;
         list.innerHTML = '';
         listItems = items;
         listMounted = 0;
+        renderedSource = currentSource;
         // 展开着的文件和有焦点的文件所在批次一起挂上
         const expandedIndex = items.findIndex(item => cardsOwner.isExpanded(item));
         const focusItemIndex = focusKey !== null ? items.findIndex(item => keyOf(item) === focusKey) : -1;
-        mountMoreCards(Math.max(GIT_LIST_BATCH, expandedIndex + 1, focusItemIndex + 1, focusIndex + 1));
+        mountMoreCards(Math.max(GIT_LIST_BATCH, previouslyMounted, expandedIndex + 1, focusItemIndex + 1, focusIndex + 1));
+        if (previousScrollTop !== null) body.scrollTop = previousScrollTop;
         cardsOwner.prefetch(items);
         if (focusKey !== null) {
             const cards = Array.from(list.querySelectorAll('.side-git-card'));
diff --git a/modules/ui-system/side-pane/planDetailSideProvider.js b/modules/ui-system/side-pane/planDetailSideProvider.js
index 29921da7e..328e2bac0 100644
--- a/modules/ui-system/side-pane/planDetailSideProvider.js
+++ b/modules/ui-system/side-pane/planDetailSideProvider.js
@@ -223,6 +223,9 @@ export function createPlanDetailSideProvider({
             const body = h('div', 'side-plan-body');
             scope.append(chrome, body);
             viewElement.appendChild(scope);
+            // 休眠只发生在隐藏时，那时 display:none 的 body 读出来滚动是 0：可见时就记下位置（body 随视图丢弃，监听不用登记）
+            let lastScrollTop = Number(restoredState?.scrollTop) || 0;
+            body.addEventListener('scroll', () => { if (body.clientHeight > 0) lastScrollTop = body.scrollTop; }, { passive: true });
 
             // 这次挂载里长期存在的订阅、定时器、子视图都归 own，控制器释放 view 或调用 dispose 时一起拆掉。
             // 区块、卡片、按钮每次渲染都重建，它们自己的监听跟着元素一起丢弃，不挂到 own 上
@@ -1057,7 +1060,7 @@ export function createPlanDetailSideProvider({
                 },
                 /** 休眠前记下当前页和滚动位置，重新挂载时回到原处 */
                 captureState() {
-                    return { page: navigation.selected, scrollTop: body.scrollTop };
+                    return { page: navigation.selected, scrollTop: body.clientHeight > 0 ? body.scrollTop : lastScrollTop };
                 },
                 dispose() {
                     // DOM 同步清掉：scope 的释放是异步的，不能等它，免得把紧接着重新挂载的内容一起清掉
diff --git a/modules/ui-system/side-pane/side-pane-controller.js b/modules/ui-system/side-pane/side-pane-controller.js
index 8f7cd0d52..b2ae8cc5c 100644
--- a/modules/ui-system/side-pane/side-pane-controller.js
+++ b/modules/ui-system/side-pane/side-pane-controller.js
@@ -909,10 +909,9 @@ export function createSidePaneController({
                 : [];
             const untouchedFallback = state.parent && ownTabsBefore.length === 0 && !state.visible
                 && isNotificationsTab(state.activeTabId);
-            // 启动时布局先恢复、辅助对话后补回：这时面板落在全局工具上，不是通知兜底，
+            // 启动时布局先恢复、辅助对话后补回：这时面板落在全局工具或随布局恢复的本话题标签（比如计划）上，
             // 但只要补回的是这个对话上次停的标签、期间没人动过面板，也照样回到它
-            const untouchedSinceParent = state.parent && ownTabsBefore.length === 0
-                && navigationRevision === parentResolvedRevision;
+            const untouchedSinceParent = state.parent && navigationRevision === parentResolvedRevision;
             const added = [];
             for (const rawTab of rawTabs) {
                 if (!rawTab) continue;
diff --git a/preloads/api/projectForge.js b/preloads/api/projectForge.js
index 9b469e1cf..271bb6a38 100644
--- a/preloads/api/projectForge.js
+++ b/preloads/api/projectForge.js
@@ -33,7 +33,7 @@ module.exports = {
         gitCreateBranch: invoke('git:create-branch', 'workspaceId', 'name', 'startPoint'),
         gitCommitGraph: invoke('git:commit-graph', 'workspaceId', 'options'),
         gitChangeSummary: invoke('git:change-summary', 'workspaceId'),
-        gitRevealPath: invoke('git:reveal-path', 'workspaceId', 'relPath'),
+        gitRevealPath: invoke('git:reveal-path', 'workspaceId', 'relPath', 'base'),
         // 仓库变了（文件改动、暂存、提交、切分支……）；只推给用 subscribeMainState('git.status', workspaceId) 订阅了的窗口
         onGitChanged: on('git:changed'),
 
diff --git a/tests/browser-handlers.test.js b/tests/browser-handlers.test.js
index 2a6b96728..99d182fcd 100644
--- a/tests/browser-handlers.test.js
+++ b/tests/browser-handlers.test.js
@@ -237,3 +237,32 @@ test('downloads only reach the system browser right after a real input on that p
     download('https://evil.example/b.exe');
     assert.deepEqual(opened, ['https://ok.example/file.zip'], 'one click hands over one download');
 });
+
+test('a download link opened in a new tab is handed over once, on the click that opened the tab', () => {
+    browserHandlers.initialize();
+    const host = new EventEmitter();
+    host.isDestroyed = () => false;
+    host.sent = [];
+    host.send = (channel, payload) => host.sent.push([channel, payload]);
+    browserHandlers.attachToWindow({ webContents: host });
+    const page = new EventEmitter();
+    page.setWindowOpenHandler = (fn) => { page.openHandler = fn; };
+    host.emit('did-attach-webview', {}, page);
+    const popup = new EventEmitter();
+    popup.setWindowOpenHandler = () => {};
+    host.emit('did-attach-webview', {}, popup);
+    const download = (guest, url, chain = [url]) => {
+        guestSession.emit('will-download', { preventDefault() {} }, { getURL: () => url, getURLChain: () => chain }, guest);
+    };
+    opened.length = 0;
+
+    page.emit('input-event', {}, { type: 'mouseDown' });
+    assert.deepEqual(page.openHandler({ url: 'https://files.example/get?id=1' }), { action: 'deny' });
+    assert.deepEqual(host.sent.at(-1), ['browser:open-tab', { url: 'https://files.example/get?id=1' }]);
+    // 新标签加载这个地址，服务器跳转到真正的文件
+    download(popup, 'https://cdn.example/report.pdf', ['https://files.example/get?id=1', 'https://cdn.example/report.pdf']);
+    download(popup, 'https://cdn.example/report.pdf', ['https://files.example/get?id=1', 'https://cdn.example/report.pdf']);
+    assert.deepEqual(opened, ['https://cdn.example/report.pdf'], 'one click, one download');
+    download(popup, 'https://evil.example/x.exe');
+    assert.deepEqual(opened, ['https://cdn.example/report.pdf']);
+});
diff --git a/tests/git-service.test.js b/tests/git-service.test.js
index fd10acc64..6e9e5949b 100644
--- a/tests/git-service.test.js
+++ b/tests/git-service.test.js
@@ -414,6 +414,11 @@ test('reveal targets resolve against the repository root when the workspace is a
     const target = await gitService.resolveRevealTarget(workspace, item.path);
     assert.equal(fs.realpathSync(target), fs.realpathSync(path.join(root, 'pkg', 'sub', 'keep.txt')));
     await assert.rejects(gitService.resolveRevealTarget(workspace, 'README.md'), /不在工作区内/);
+
+    // 代码查看器给的是相对工作区的路径
+    const fromViewer = await gitService.resolveRevealTarget(workspace, 'sub/keep.txt', { base: 'workspace' });
+    assert.equal(fs.realpathSync(fromViewer), fs.realpathSync(path.join(root, 'pkg', 'sub', 'keep.txt')));
+    await assert.rejects(gitService.resolveRevealTarget(workspace, '../README.md', { base: 'workspace' }), /不在工作区内/);
 });
 
 test('a GIT_DIR inherited from the launching shell does not redirect commands to another repository', { skip: SKIP_GIT }, async t => {
diff --git a/tests/git-watcher.test.js b/tests/git-watcher.test.js
index 567ff1074..08566941c 100644
--- a/tests/git-watcher.test.js
+++ b/tests/git-watcher.test.js
@@ -411,3 +411,25 @@ test('on Linux the git directory is watched shallowly and refs/ recursively, nev
     ]);
     watcher.dispose();
 });
+
+test('on Linux a linked worktree also watches its own git dir, where its index and HEAD live', async () => {
+    const { watch, opened, emit } = fakeWatch();
+    const common = path.resolve('/repo/.git');
+    const own = path.join(common, 'worktrees', 'feature');
+    const changes = [];
+    const watcher = createGitWatcher({
+        getTargets: async () => ({ root: path.resolve('/wt'), gitDirs: [own, common] }),
+        onChange: id => changes.push(id),
+        watch, platform: 'linux', logger: quiet, exists: dir => dir === path.join(common, 'refs'),
+    });
+    await watcher.start('ws1');
+    assert.deepEqual(opened.map(item => [item.dir, item.options?.recursive]), [
+        [own, false],
+        [common, false],
+        [path.join(common, 'refs'), true]
+    ]);
+    emit(own, 'index'); // git add 在 worktree 里
+    await new Promise(resolve => setTimeout(resolve, 400));
+    assert.deepEqual(changes, ['ws1']);
+    watcher.dispose();
+});
diff --git a/tests/side-chat-floating-selection.test.mjs b/tests/side-chat-floating-selection.test.mjs
index 48808d497..178b4dcda 100644
--- a/tests/side-chat-floating-selection.test.mjs
+++ b/tests/side-chat-floating-selection.test.mjs
@@ -62,3 +62,15 @@ test('floating ask button hides when the window resizes', () => {
     window.dispatchEvent(new window.Event('resize'));
     assert.equal(btn.hidden, false);
 });
+
+test('scrolling somewhere else (a streaming side chat) does not hide the button over a main chat selection', () => {
+    const { window, btn, select, handle } = setup();
+    select('main');
+    assert.equal(btn.hidden, false);
+    const sideList = window.document.querySelector('.side-chat-surface');
+    for (let i = 0; i < 5; i++) sideList.dispatchEvent(new window.Event('scroll'));
+    assert.equal(btn.hidden, false);
+    window.document.getElementById('chatMessages').dispatchEvent(new window.Event('scroll'));
+    assert.equal(btn.hidden, true, 'the list holding the selection still hides it');
+    handle.dispose();
+});
diff --git a/tests/side-chat-message-delete.test.mjs b/tests/side-chat-message-delete.test.mjs
index 1865c8e58..e32daf1fc 100644
--- a/tests/side-chat-message-delete.test.mjs
+++ b/tests/side-chat-message-delete.test.mjs
@@ -184,6 +184,20 @@ test('closing a side chat that has messages asks first, and keeps it when declin
     assert.equal(f.confirms.length, 2);
 });
 
+test('closing a side chat with no messages but an unsent draft still asks first', async t => {
+    const f = await fixture(t);
+    f.remove('answer');
+    await waitFor(() => !f.doc.querySelector('[data-message-id="answer"]'));
+    f.remove('question');
+    await waitFor(() => !f.doc.querySelector('.message-item'));
+    f.handle.setDraft('a long question I have not sent yet');
+    const before = f.confirms.length;
+    f.answerConfirm(false);
+    assert.deepEqual(await f.handle.requestClose(), { closed: false, reason: 'USER_CANCELED' });
+    assert.equal(f.confirms.length, before + 1, 'the draft alone is worth a confirmation');
+    assert.equal(f.handle.getDraft(), 'a long question I have not sent yet');
+});
+
 test('view trajectory from a side reply asks for the child topic, not the main chat', async t => {
     const f = await fixture(t);
     const executed = [];
diff --git a/tests/side-chat-message-keyboard.test.mjs b/tests/side-chat-message-keyboard.test.mjs
index 32a68502d..231c99a68 100644
--- a/tests/side-chat-message-keyboard.test.mjs
+++ b/tests/side-chat-message-keyboard.test.mjs
@@ -100,3 +100,23 @@ test('Shift+F10 on a message opens a focusable menu that Escape closes back to t
         dom.window.close();
     }
 });
+
+test('with two side chats mounted, Esc on either one\'s message menu returns focus to that message', () => {
+    const dom = new JSDOM(`<div id="a"><div class="message-item assistant" data-message-id="a1">A</div></div><div id="b"><div class="message-item assistant" data-message-id="b1">B</div></div><textarea id="ta"></textarea>`);
+    const { window: win } = dom;
+    const doc = win.document;
+    const mount = id => createSideChatMessageActions({ store: { isDisposed: false }, chatCapabilities: {}, descriptor: {}, doc, root: doc.getElementById(id),
+        textarea: doc.getElementById('ta'), getHistory: () => [{ id: `${id}1`, role: 'assistant', content: 'x' }], isBusy: () => false, updateEmptyState() {}, pinToBottomIfSticky() {} });
+    const owners = [mount('a'), mount('b')];
+    for (const id of ['a', 'b']) {
+        const item = doc.querySelector(`#${id} .message-item`);
+        item.focus();
+        item.dispatchEvent(new win.MouseEvent('contextmenu', { bubbles: true, cancelable: true }));
+        assert.equal(doc.activeElement?.getAttribute('role'), 'menuitem');
+        doc.activeElement.dispatchEvent(new win.KeyboardEvent('keydown', { key: 'Escape', bubbles: true }));
+        assert.equal(doc.getElementById('chatContextMenu'), null);
+        assert.equal(doc.activeElement, item, `focus is back on ${id}'s message`);
+    }
+    owners.forEach(owner => owner.dispose());
+    dom.window.close();
+});
diff --git a/tests/side-pane-git.test.mjs b/tests/side-pane-git.test.mjs
index 940a9aba6..dda78a104 100644
--- a/tests/side-pane-git.test.mjs
+++ b/tests/side-pane-git.test.mjs
@@ -179,3 +179,41 @@ test('a long change list mounts in batches and still mounts the file being focus
     assert.equal(paths().length, 300);
     handle.dispose();
 });
+
+test('a status push while reading deep in a long list keeps the mounted cards and the scroll position', async () => {
+    const dom = new JSDOM('<div id="sideGitHost"></div>', { pretendToBeVisual: true });
+    const win = dom.window;
+    const observers = [];
+    win.IntersectionObserver = class {
+        constructor(callback) { this.callback = callback; this.targets = new Set(); observers.push(this); }
+        observe(target) { this.targets.add(target); }
+        unobserve(target) { this.targets.delete(target); }
+        disconnect() { this.targets.clear(); }
+        fire() { this.callback([...this.targets].map(target => ({ target, isIntersecting: true }))); }
+    };
+    let edits = 0;
+    const api = {
+        async gitListWorkspaces() { return { success: true, data: { workspaces: [{ id: 'ws', alias: 'ws', path: '/code/ws' }], activeWorkspaceId: 'ws' } }; },
+        // agent 每改一次文件，行数统计就变一次
+        async gitStatus() { return { success: true, data: { isRepo: true, staged: [], conflicts: [],
+            changes: Array.from({ length: 300 }, (_, i) => ({ path: `src/file_${i}.js`, status: 'M', added: i === 0 ? edits : 1, removed: 0 })) } }; },
+        async gitDiff(wsId, relPath) {
+            return { success: true, data: { path: relPath, before: { exists: true, binary: false, text: 'a\n' }, after: { exists: true, binary: false, text: 'b\n' } } };
+        }
+    };
+    const host = win.document.getElementById('sideGitHost');
+    const handle = mountGitView(host, { api });
+    await handle.ready;
+    const cards = () => host.querySelectorAll('.side-git-card').length;
+    observers.find(observer => observer.targets.size).fire();
+    assert.equal(cards(), 240);
+    const body = host.querySelector('.side-git-body');
+    body.scrollTop = 5000;
+
+    edits += 1;
+    await handle.refresh();
+    await new Promise(resolve => setTimeout(resolve, 10));
+    assert.equal(cards(), 240, 'the re-render mounts as many cards as were there');
+    assert.equal(body.scrollTop, 5000, 'and stays where the reader was');
+    handle.dispose();
+});
diff --git a/tests/side-pane-mount-timing.test.mjs b/tests/side-pane-mount-timing.test.mjs
index 9ee7b2a0f..47f167beb 100644
--- a/tests/side-pane-mount-timing.test.mjs
+++ b/tests/side-pane-mount-timing.test.mjs
@@ -203,3 +203,36 @@ test('a side chat whose mount lands while its close is being confirmed still clo
     assert.deepEqual(deleted, ['later']);
     assert.equal(disposed, 1, 'the view that mounted meanwhile is released');
 });
+
+test('after a restart the pane goes back to the side chat the topic was left on, even when a saved plan tab came back first', async t => {
+    const store = new Map();
+    const storage = { getItem: key => store.get(key) ?? null, setItem: (key, value) => store.set(key, value), removeItem: key => store.delete(key) };
+    const windows = [];
+    t.after(() => windows.forEach(win => win.close()));
+    const make = () => {
+        const dom = new JSDOM('<main class="main-content"></main><aside id="pane"><div id="tabs"></div><div id="content"><section class="side-pane-view" id="sidePaneViewNotifications"></section></div></aside>');
+        windows.push(dom.window);
+        const doc = dom.window.document;
+        const provider = { mountTab: async () => ({ dispose: async () => {}, focus() {} }) };
+        return createSidePaneController({
+            root: doc.getElementById('pane'), tabListElement: doc.getElementById('tabs'), contentContainer: doc.getElementById('content'),
+            persistence: { storage },
+            tabTypes: [defineChatTabType({ provider }), { kind: 'plan-detail', label: 'plan', icon: 'x', provider }]
+        });
+    };
+    const first = make();
+    first.restoreLayout();
+    first.setParent(parentOf('a'));
+    await first.openTab({ id: 'plan:a', kind: 'plan-detail', title: 'plan', scopeMode: 'topic', parent: parentOf('a'), payload: {} });
+    await first.openTab(sideChat('side-a', 'a'));
+    await first.dispose();
+
+    // 启动顺序同 sidePaneWiring：setParent → restoreLayout（只带回计划标签）→ 辅助对话读回来后 restoreTabs
+    const second = make();
+    second.setParent(parentOf('a'));
+    second.restoreLayout();
+    assert.equal(second.getSnapshot().activeTabId, 'plan:a');
+    await second.restoreTabs([sideChat('side-a', 'a')]);
+    assert.equal(second.getSnapshot().activeTabId, 'side-a');
+    await second.dispose();
+});
diff --git a/tests/side-pane-plan-detail.test.mjs b/tests/side-pane-plan-detail.test.mjs
index 214cab60c..6a23498aa 100644
--- a/tests/side-pane-plan-detail.test.mjs
+++ b/tests/side-pane-plan-detail.test.mjs
@@ -205,7 +205,14 @@ test('a plan view put to sleep comes back on the same page and scroll position',
     const { provider, view, dom } = makeEnv();
     const first = await provider.mountTab({ id: planTabId('p1'), payload: { projectId: 'p1' } }, view);
     view.querySelector('[data-plan-page="timeline"]').click();
-    view.querySelector('.side-plan-body').scrollTop = 80;
+    const planBody = view.querySelector('.side-plan-body');
+    let shown = true;
+    Object.defineProperty(planBody, 'clientHeight', { configurable: true, get: () => (shown ? 400 : 0) });
+    planBody.scrollTop = 80;
+    planBody.dispatchEvent(new dom.window.Event('scroll'));
+    // 休眠时标签是隐藏的：display:none 的 body 读出来滚动是 0
+    shown = false;
+    planBody.scrollTop = 0;
     const saved = first.captureState();
     assert.deepEqual(saved, { page: 'timeline', scrollTop: 80 });
     first.dispose();

From 89318557762f87ad5b5a5c37c248ad7726db4a10 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 04:49:25 +0000
Subject: [PATCH 113/143] Side pane smoke CI: Electron-ABI native modules,
 Electron log on failure

The first CI run never opened main.html: npm ci built native modules for
Node, and the main process threw on start. The job now installs like the
mobile_sync packaging job (npm ci --ignore-scripts, Electron install,
electron-rebuild of better-sqlite3, node-pty and sharp). A failing run
prints the tail of electron.log so the cause shows in the job output.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01SADzqzusVz3S3z7qBUSy8M
---
 .github/workflows/chat_kernel_ui.yml | 12 ++++++++++--
 scripts/smoke-side-pane-e2e.mjs      |  2 ++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/chat_kernel_ui.yml b/.github/workflows/chat_kernel_ui.yml
index 3adcc88a3..a613c0e84 100644
--- a/.github/workflows/chat_kernel_ui.yml
+++ b/.github/workflows/chat_kernel_ui.yml
@@ -119,10 +119,18 @@ jobs:
           node-version: 22
           cache: npm
 
-      - name: Install dependencies (including Electron runtime)
+      # 和 mobile_sync 打包任务一样：先装依赖不跑原生脚本，再按 Electron 的 ABI 重编原生模块，
+      # 按 Node ABI 编出来的原生模块（better-sqlite3 等）在 Electron 里加载不了
+      - name: Install package graph without native lifecycle scripts
         env:
           PUPPETEER_SKIP_DOWNLOAD: 'true'
-        run: npm ci --omit=optional
+        run: npm ci --ignore-scripts
+
+      - name: Install Electron runtime
+        run: node node_modules/electron/install.js
+
+      - name: Rebuild Electron native modules used by the app
+        run: npx electron-rebuild -f -w better-sqlite3,node-pty,sharp
 
       - name: Ensure a virtual display
         run: command -v xvfb-run || (sudo apt-get update && sudo apt-get install -y xvfb)
diff --git a/scripts/smoke-side-pane-e2e.mjs b/scripts/smoke-side-pane-e2e.mjs
index 621008eb3..86737fd5c 100644
--- a/scripts/smoke-side-pane-e2e.mjs
+++ b/scripts/smoke-side-pane-e2e.mjs
@@ -501,6 +501,8 @@ try {
     report.failure = String(error.stack || error);
     console.error(error.message || error);
     if (errors.length) console.error(errors.map(e => `[${e.phase}] ${e.source}: ${e.text}`).join('\n'));
+    // CI 里拿不到界面，把 Electron 日志尾部直接打出来
+    try { console.error('--- electron.log (tail) ---\n' + fs.readFileSync(path.join(data, 'electron.log'), 'utf8').split('\n').slice(-80).join('\n')); } catch { /* 还没启动 */ }
 } finally {
     report.finishedAt = new Date().toISOString();
     fs.writeFileSync(path.join(data, 'smoke-report.json'), JSON.stringify(report, null, 1));

From 5439cceb437100648119ab16c676783af868d943 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 04:56:49 +0000
Subject: [PATCH 114/143] Side pane: follow a topic as soon as it is picked,
 not after its history renders

The side pane switched topics on onSelectionChange, which fires only
after the whole history has rendered in batches. In a 400-message topic
that took about 6.5s, and meanwhile the pane still showed the previous
topic's side chat: typing went into that topic's side chat, and a new
side chat opened for the new topic never appeared and was later cleaned
up as empty.

chatManager now also fires onSelectionIntent as soon as selectTopic or
selectItem sets the topic, and the side pane follows that. Commit
listeners are unchanged. The pane now switches about 40ms after the
click. Updated chatManager's boundary hash and rationale.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019L2bZomLn4NVoxS4Rv5Bkv
---
 .../contracts/generated/chat-event-graph.json |  8 +++---
 modules/chatManager.js                        | 24 ++++++++++++++++++
 modules/renderer/sidePaneHostBindings.js      |  3 +++
 scripts/next-delta-shared-baseline.json       |  4 +--
 tests/chat-manager-selection-race.test.js     | 25 +++++++++++++++++++
 5 files changed, 58 insertions(+), 6 deletions(-)

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 366daf19e..a7eb0e4ed 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -21438,14 +21438,14 @@
       "consumers": [
         {
           "file": "modules/chatManager.js",
-          "line": 378,
+          "line": 389,
           "kind": "preload-subscription"
         }
       ],
       "evidence": [
         {
           "file": "modules/chatManager.js",
-          "line": 378,
+          "line": 389,
           "kind": "preload-subscription",
           "match": "electronAPI.onCanvasContentUpdate("
         }
@@ -21457,14 +21457,14 @@
       "consumers": [
         {
           "file": "modules/chatManager.js",
-          "line": 379,
+          "line": 390,
           "kind": "preload-subscription"
         }
       ],
       "evidence": [
         {
           "file": "modules/chatManager.js",
-          "line": 379,
+          "line": 390,
           "kind": "preload-subscription",
           "match": "electronAPI.onCanvasWindowClosed("
         }
diff --git a/modules/chatManager.js b/modules/chatManager.js
index e08abe861..adee4ff0a 100755
--- a/modules/chatManager.js
+++ b/modules/chatManager.js
@@ -75,6 +75,7 @@ export const chatManager = (() => {
     const forwardTimers = new Set();
     const outgoingPersistenceQueues = new Map();
     const selectionListeners = new Set();
+    const selectionIntentListeners = new Set();
 
     function notifySelectionCommitted() {
         const item = currentSelectedItemRef?.get?.();
@@ -85,6 +86,16 @@ export const chatManager = (() => {
             catch (e) { console.error('[ChatManager] selection listener failed:', e); }
         });
     }
+    // 选中话题的那一刻就通知（历史还在分批渲染）。侧栏要立刻跟上：
+    // 等 notifySelectionCommitted 的话，几百条消息的话题要好几秒，期间还停在上一个话题的辅助对话上
+    function notifySelectionIntent() {
+        const item = currentSelectedItemRef?.get?.();
+        const topicId = currentTopicIdRef?.get?.();
+        selectionIntentListeners.forEach(listener => {
+            try { listener({ item, topicId }); }
+            catch (e) { console.error('[ChatManager] selection intent listener failed:', e); }
+        });
+    }
     const pendingSendContexts = new Set();
     let lastOpenSaveQueue = Promise.resolve();
     let initialized = false;
@@ -676,6 +687,7 @@ export const chatManager = (() => {
                 if (!isSelectionCurrent()) return;
                 currentTopicIdRef.set(topicToLoadId);
                 if (messageRenderer) messageRenderer.setCurrentTopicId(topicToLoadId);
+                notifySelectionIntent();
                 await loadOwnedHistory(topicToLoadId);
             } else if (topics && topics.error) {
                 if (!isSelectionCurrent()) return;
@@ -697,6 +709,7 @@ export const chatManager = (() => {
                         if (defaultTopicResult.success) {
                             currentTopicIdRef.set(defaultTopicResult.topicId);
                             if (messageRenderer) messageRenderer.setCurrentTopicId(defaultTopicResult.topicId);
+                            notifySelectionIntent();
                             await loadOwnedHistory(defaultTopicResult.topicId);
                         } else {
                             if (messageRenderer) messageRenderer.renderMessage({ role: 'system', notice: 'error', content: `创建默认话题失败: ${defaultTopicResult.error}`, timestamp: Date.now() });
@@ -711,6 +724,7 @@ export const chatManager = (() => {
                     if (defaultTopicResult.success) {
                         currentTopicIdRef.set(defaultTopicResult.topicId);
                         if (messageRenderer) messageRenderer.setCurrentTopicId(defaultTopicResult.topicId);
+                        notifySelectionIntent();
                         await loadOwnedHistory(defaultTopicResult.topicId);
                     } else {
                         if (messageRenderer) messageRenderer.renderMessage({ role: 'system', notice: 'error', content: `创建默认群聊话题失败: ${defaultTopicResult.error}`, timestamp: Date.now() });
@@ -816,6 +830,7 @@ export const chatManager = (() => {
                 // Navigation intent ends the old media lease before any IPC await.
                 messageRenderer.clearChat();
             }
+            notifySelectionIntent();
             // Persist the selection intent before watcher/history work. A
             // renderer reload or crash during that work must restore the
             // topic the user actually selected, not the previous durable one.
@@ -2331,6 +2346,7 @@ export const chatManager = (() => {
         for (const timer of forwardTimers) clearTimeout(timer);
         forwardTimers.clear();
         selectionListeners.clear();
+        selectionIntentListeners.clear();
         await Promise.allSettled([
             lastOpenSaveQueue,
             ...outgoingPersistenceQueues.values(),
@@ -2368,5 +2384,13 @@ export const chatManager = (() => {
             }
             return () => {};
         },
+        /** 选中话题时立刻回调（不等历史渲染完）；回调参数同 onSelectionChange */
+        onSelectionIntent(callback) {
+            if (typeof callback === 'function') {
+                selectionIntentListeners.add(callback);
+                return () => selectionIntentListeners.delete(callback);
+            }
+            return () => {};
+        },
     };
 })();
diff --git a/modules/renderer/sidePaneHostBindings.js b/modules/renderer/sidePaneHostBindings.js
index 0128ab368..9530f031d 100644
--- a/modules/renderer/sidePaneHostBindings.js
+++ b/modules/renderer/sidePaneHostBindings.js
@@ -27,6 +27,9 @@ export function createSidePaneHostBindings({ win, chatAPI, uiHelper, chatManager
     };
     const unbindSelection = chatManager?.onSelectionChange?.(syncSidePaneParent);
     if (unbindSelection) subscriptions.add({ dispose: unbindSelection });
+    // 选中话题当下就换：长话题的历史要渲染好几秒，等提交的话侧栏一直停在上一个话题的辅助对话上
+    const unbindIntent = chatManager?.onSelectionIntent?.(syncSidePaneParent);
+    if (unbindIntent) subscriptions.add({ dispose: unbindIntent });
     const initialItem = selectedItemRef.get();
     if (initialItem?.id) syncSidePaneParent({ item: initialItem, topicId: topicIdRef.get() });
 
diff --git a/scripts/next-delta-shared-baseline.json b/scripts/next-delta-shared-baseline.json
index 8957a6d0a..ebc1760b9 100644
--- a/scripts/next-delta-shared-baseline.json
+++ b/scripts/next-delta-shared-baseline.json
@@ -1,7 +1,7 @@
 {
   "modules/chatManager.js": {
-    "sha256": "6302539465234ff6ec1f17bd3d96e539bea0c892635f61c2d1063f1e4b0fe11e",
-    "reason": "Integrated chat behavior: selection subscriptions for topic side panes; clear old media before navigation; per-conversation side chat context/unread policy; explicit cancellation and non-streaming terminal settlement; one error notice per failed request. Reviewed auxiliary-side-chat reproduction: Stop during delayed history save or request preparation previously still sent generation; renderer-local AbortSignal checks now prevent that send. When upstream interrupt fails, await the existing local stream terminal before placeholder cleanup so accepted partial content is saved instead of deleted. Actual native side owner, internal renderer, manager, preload/IPC/disk and local HTTP before/after evidence; side preparation and partial-cancel regressions. Existing Surface routing and history authority remain in place. Main/group sending without the optional signal keeps its preparation path. Stop while awaiting the first HTTP headers: a locally aborted stream IPC return now awaits the already-owned cancellation terminal instead of showing a service-error notice; the regression keeps the submitted question and leaves the busy state. Non-streaming terminal save: a failed reply save (either { success: false } or the agent IPC { error } shape) now settles failed with a persistence error, so the auxiliary side chat shows its unsaved badge and blocks close like streaming does; covered by tests/side-chat-save-failure.test.mjs."
+    "sha256": "c98fcf41051862bb8b1acc55430aad0a70b2ead1b0f2db5aadc5ef4cc4d520d5",
+    "reason": "Integrated chat behavior: selection subscriptions for topic side panes; clear old media before navigation; per-conversation side chat context/unread policy; explicit cancellation and non-streaming terminal settlement; one error notice per failed request. Reviewed auxiliary-side-chat reproduction: Stop during delayed history save or request preparation previously still sent generation; renderer-local AbortSignal checks now prevent that send. When upstream interrupt fails, await the existing local stream terminal before placeholder cleanup so accepted partial content is saved instead of deleted. Actual native side owner, internal renderer, manager, preload/IPC/disk and local HTTP before/after evidence; side preparation and partial-cancel regressions. Existing Surface routing and history authority remain in place. Main/group sending without the optional signal keeps its preparation path. Stop while awaiting the first HTTP headers: a locally aborted stream IPC return now awaits the already-owned cancellation terminal instead of showing a service-error notice; the regression keeps the submitted question and leaves the busy state. Non-streaming terminal save: a failed reply save (either { success: false } or the agent IPC { error } shape) now settles failed with a persistence error, so the auxiliary side chat shows its unsaved badge and blocks close like streaming does; covered by tests/side-chat-save-failure.test.mjs. Selection intent: onSelectionIntent fires as soon as selectTopic or selectItem sets the topic, before history renders, so the side pane follows a long topic immediately instead of showing the previous topic's side chat for seconds; onSelectionChange still fires on commit; covered by tests/chat-manager-selection-race.test.js."
   },
   "modules/messageRenderer.js": {
     "sha256": "f24426207cf95eb4fa3f42e2ee357ed906d0a56ac6b235dd9d996fc39966b6e5",
diff --git a/tests/chat-manager-selection-race.test.js b/tests/chat-manager-selection-race.test.js
index d5115b9ee..ebaaac5eb 100644
--- a/tests/chat-manager-selection-race.test.js
+++ b/tests/chat-manager-selection-race.test.js
@@ -1013,6 +1013,31 @@ test('creating a topic commits a selection event after the empty history identit
  await creating;assert.deepEqual(events,[{topicId:'topic-a-created',history:[]}]);unsubscribe();fixture.dom.window.close();
 });
 
+test('selection intent reaches followers as soon as a topic is picked, before its history has loaded', async () => {
+    const fixture = createFixture();
+    const selected = fixture.chatManager.selectItem('agent-b', 'agent', 'Agent B', null, fixture.configs['agent-b']);
+    await new Promise(resolve => setImmediate(resolve));
+    fixture.topicRequests.get('agent-b').resolve(fixture.configs['agent-b'].topics);
+    await selected;
+
+    const intents = [];
+    const commits = [];
+    const unbindIntent = fixture.chatManager.onSelectionIntent(event => intents.push(event.topicId));
+    const unbindCommit = fixture.chatManager.onSelectionChange(event => commits.push(event.topicId));
+    const save = fixture.holdNextSettingsSave();
+    const selecting = fixture.chatManager.selectTopic('topic-b-2');
+    await save.started.promise;
+    assert.deepEqual(intents, ['topic-b-2'], 'the side pane can follow while history is still loading');
+    assert.deepEqual(commits, []);
+
+    save.release.resolve();
+    await selecting;
+    assert.deepEqual(commits, ['topic-b-2']);
+    unbindIntent();
+    unbindCommit();
+    fixture.dom.window.close();
+});
+
 test('deleting the current assistant tells selection followers that nothing is selected', async () => {
     const fixture = createFixture();
     const selecting = fixture.chatManager.selectItem('agent-a', 'agent', 'Agent A', null, fixture.configs['agent-a']);

From 5447138d83a8d018b70f7fc21c9ed9abcca98258 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 05:18:51 +0000
Subject: [PATCH 115/143] Side pane smoke: let a woken side chat finish
 rendering before counting

One run on #2 @7637efb1 counted 5 of 6 messages half a second after the
third wake; three reruns and nine isolated wakes all showed 6. The check
now waits up to 4 s for the expected count and still fails if messages
are missing after that.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01SADzqzusVz3S3z7qBUSy8M
---
 scripts/smoke-side-pane-e2e.mjs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/scripts/smoke-side-pane-e2e.mjs b/scripts/smoke-side-pane-e2e.mjs
index 86737fd5c..394e5cedf 100644
--- a/scripts/smoke-side-pane-e2e.mjs
+++ b/scripts/smoke-side-pane-e2e.mjs
@@ -272,6 +272,12 @@ async function sendSideChat(page, text) {
     }, marker, `streamed reply ${marker}`);
 }
 const chatItems = page => page.evaluate(() => document.querySelectorAll('.side-pane-view.active .message-item').length);
+// 唤醒后记录按批次渲染，忙的时候半秒内可能还没渲染完：最多等 4 秒到预期条数，少了照样算失败
+async function settledChatItems(page, expected) {
+    let n = await chatItems(page);
+    for (let i = 0; i < 20 && n < expected; i++) { await wait(200); n = await chatItems(page); }
+    return n;
+}
 const activeTabId = page => page.evaluate(() => document.querySelector('.side-pane-tab.active, .side-pane-tab[aria-selected="true"]')?.dataset.tabId || null);
 async function activate(page, id) {
     await page.evaluate(id => document.querySelector(`.side-pane-tab[data-tab-id="${CSS.escape(id)}"]`)?.click(), id);
@@ -427,7 +433,7 @@ try {
         const counts = [];
         let first = null;
         for (let round = 0; round < 3; round++) {
-            for (const id of ids) { await activate(page, id); if (id === historyChat) counts.push(await chatItems(page)); }
+            for (const id of ids) { await activate(page, id); if (id === historyChat) counts.push(await settledChatItems(page, expected)); }
             const m = await measure(session);
             const dormant = m.tabs.filter(t => t.view === 'dormant');
             assert.ok(dormant.length >= 1, 'nothing went dormant over the live-view limit');

From f47d342c19983a6e6d0d917dd793d8d1732eabd1 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 05:48:04 +0000
Subject: [PATCH 116/143] Side pane leak test: wait for queued animation frames
 before counting

test:side-pane failed about one run in seven: "opening and closing every
tab type 20 times returns to where it started" saw intervals 1 vs 0. The
interval is jsdom's own requestAnimationFrame ticker, a 16 ms
setInterval that exists only while a frame is queued. Closing the last
tab collapses the pane, and the collapse animation queues one frame;
whether that frame had already run when the test measured depended on
machine load. Under 8 parallel runs about half failed.

The fixture now tracks queued animation frames and the leak tests wait
for them to run (bounded) before measuring, so jsdom's ticker is gone by
then. Queued frames are reported as animationFrames, so an animation
loop that never stops still fails the test instead of being waited out.

Verified: 0 failures in 40 parallel runs of the leak test and 20 runs of
test:side-pane.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_017bCbRB3E9yajQ3HbdMrjiJ
---
 tests/side-pane-leak.test.mjs | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/tests/side-pane-leak.test.mjs b/tests/side-pane-leak.test.mjs
index 4e6160a4f..37b7af4c5 100644
--- a/tests/side-pane-leak.test.mjs
+++ b/tests/side-pane-leak.test.mjs
@@ -18,9 +18,16 @@ const settle = async () => {
     for (let i = 0; i < 5; i++) await new Promise(resolve => setImmediate(resolve));
     await new Promise(resolve => setTimeout(resolve, 0));
 };
+// 侧栏开合动画会排一帧：jsdom 的 rAF 靠一个 16ms 的 setInterval 驱动，有帧排队时它就在，
+// 机器一忙 intervals 就时有时无。量之前等排着的帧跑完；一直有新帧（停不下来的动画循环）就不等了，
+// 由 animationFrames 报出来
+const drainFrames = async h => {
+    for (let i = 0; i < 20 && h.pendingFrames() > 0; i++) await new Promise(resolve => setTimeout(resolve, 20));
+};
 
 /**
- * 不经过 own.* 的资源也要数到：document / window 上的活监听、没清掉的 setInterval、没 disconnect 的 MutationObserver。
+ * 不经过 own.* 的资源也要数到：document / window 上的活监听、没清掉的 setInterval、还排着的 requestAnimationFrame、
+ * 没 disconnect 的 MutationObserver。
  * 只数这些长寿目标：挂在已移除视图节点上的监听随节点一起丢弃，不算泄漏。
  */
 function instrument(win) {
@@ -54,6 +61,15 @@ function instrument(win) {
         host.clearInterval = id => { intervals.delete(id); return clearI.call(host, id); };
     }
 
+    const frames = new Set();
+    const raf = win.requestAnimationFrame, caf = win.cancelAnimationFrame;
+    win.requestAnimationFrame = callback => {
+        const id = raf.call(win, time => { frames.delete(id); callback(time); });
+        frames.add(id);
+        return id;
+    };
+    win.cancelAnimationFrame = id => { frames.delete(id); return caf.call(win, id); };
+
     const observers = new Set();
     const NativeObserver = win.MutationObserver;
     win.MutationObserver = class extends NativeObserver {
@@ -61,7 +77,9 @@ function instrument(win) {
         disconnect() { observers.delete(this); return super.disconnect(); }
     };
 
-    return () => ({ globalListeners: live.size, intervals: intervals.size, mutationObservers: observers.size });
+    const counts = () => ({ globalListeners: live.size, intervals: intervals.size, animationFrames: frames.size, mutationObservers: observers.size });
+    counts.pendingFrames = () => frames.size;
+    return counts;
 }
 
 const PROJECT = {
@@ -156,7 +174,7 @@ function fixture() {
         ...unmanaged(),
         views: controller.getViewResidency()
     });
-    return { dom, controller, opens, calls, measure,
+    return { dom, controller, opens, calls, measure, pendingFrames: unmanaged.pendingFrames,
         async cleanup() { await controller.dispose(); dom.window.close(); } };
 }
 
@@ -173,6 +191,7 @@ test(`opening and closing every tab type ${CYCLES} times returns to where it sta
             for (const id of openTabIds(h.controller)) await h.controller.closeTab(id);
             await settle();
         }
+        await drainFrames(h);
         const baseline = h.measure();
 
         for (let i = 0; i < CYCLES; i++) {
@@ -183,6 +202,7 @@ test(`opening and closing every tab type ${CYCLES} times returns to where it sta
                 await settle();
             }
         }
+        await drainFrames(h);
         assert.deepEqual(h.measure(), baseline);
         assert.equal(h.calls.kills, h.calls.creates, 'every shell that was started was ended');
         assert.equal(h.calls.watches, h.calls.unwatches, 'every trajectory watch was released');
@@ -198,6 +218,7 @@ test(`views put to sleep and woken ${CYCLES} times leave nothing behind`, async
         assert.equal(ids.length, Object.keys(h.opens).length, 'every tab type opened');
         // 只能有一个视图挂着：切到哪个标签，别的都休眠
         for (const id of ids) { h.controller.activateTab(id); await settle(); }
+        await drainFrames(h);
         const baseline = h.measure();
         assert.equal(baseline.views.live.length, 1);
         assert.equal(baseline.views.dormant.length, ids.length - 1);
@@ -206,6 +227,7 @@ test(`views put to sleep and woken ${CYCLES} times leave nothing behind`, async
         for (let i = 0; i < CYCLES; i++) {
             for (const id of ids) { h.controller.activateTab(id); await settle(); }
         }
+        await drainFrames(h);
         const after = h.measure();
         assert.deepEqual({ ...after, views: null }, { ...baseline, views: null });
         assert.equal(after.views.live.length, 1);

From cc43f4de53ae7f1c960d6716fa344f4bb7798244 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 05:52:55 +0000
Subject: [PATCH 117/143] Composer: keep the send button inside the card when
 the side pane narrows the chat

With the side pane pulled to its 65% maximum the chat column drops to about
360px. The composer kept its fixed 52px side inset and the model picker
refused to shrink below its name, so the action row overflowed and the send
button sat half outside the card (with a long model id, entirely outside).

The inset now gives way below a ~670px column, down to 12px, and the model
picker shrinks and ellipsizes its name the way ZCode's composer toolbar lets
its model trigger shrink; the full name stays in the tooltip. Wide layouts
are unchanged.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019L2bZomLn4NVoxS4Rv5Bkv
---
 styles/ui-next.css                  |  9 ++++++---
 styles/ui-system/chat-input.css     | 21 +++++++++++++++++++++
 tests/chat-bubble-backdrop.test.mjs |  2 +-
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/styles/ui-next.css b/styles/ui-next.css
index 9aeb1ce03..5fd186c2d 100644
--- a/styles/ui-next.css
+++ b/styles/ui-next.css
@@ -1099,10 +1099,13 @@ html body.chat-header-capsule .chat-messages-container {
 }
 
 /* Shared input composer: keep the same horizontal inset in every presentation
-   mode so switching message layouts does not resize the input card. */
+   mode so switching message layouts does not resize the input card. The inset
+   only gives way once the side pane squeezes the chat column below ~670px
+   (it can go down to 35% of the panel, ~360px), down to 12px at ~430px, so
+   the action row keeps the send button inside the card. */
 html body .chat-input-area {
-    padding-left: 52px;
-    padding-right: 52px;
+    padding-left: clamp(12px, calc((100% - 360px) / 6), 52px);
+    padding-right: clamp(12px, calc((100% - 360px) / 6), 52px);
 }
 
 .next-ui-empty-state {
diff --git a/styles/ui-system/chat-input.css b/styles/ui-system/chat-input.css
index 2a62eaf26..12b89e590 100644
--- a/styles/ui-system/chat-input.css
+++ b/styles/ui-system/chat-input.css
@@ -255,3 +255,24 @@ html .vcp-ui-scope .vcp-model-select-menu :is(.vcp-model-select-item, .vcp-model
 html .vcp-ui-scope .vcp-model-select-menu .vcp-model-select-search {
     border-color: var(--vcp-ui-composer-border);
 }
+
+/* A narrow chat column (side pane pulled wide) or a long model id: the picker
+   gives up width and ellipsizes its name before the send button is pushed
+   past the card edge, the way ZCode's composer toolbar lets its model trigger
+   shrink. Unlayered for the same reason as the menu above. */
+html .vcp-ui-scope .chat-input-actions .vcp-model-select {
+    flex: 0 1 auto;
+    min-width: 0;
+}
+
+html .vcp-ui-scope .chat-input-actions .vcp-model-select-trigger {
+    min-width: 0;
+    max-width: 100%;
+}
+
+html .vcp-ui-scope .chat-input-actions .vcp-model-select-label {
+    min-width: 0;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
diff --git a/tests/chat-bubble-backdrop.test.mjs b/tests/chat-bubble-backdrop.test.mjs
index 2203498e4..f68a0aaf3 100644
--- a/tests/chat-bubble-backdrop.test.mjs
+++ b/tests/chat-bubble-backdrop.test.mjs
@@ -24,7 +24,7 @@ test('all chat modes keep the composer overlay free of backdrop-breaking masks',
 test('presentation modes share composer width and padding', () => {
     const css = fs.readFileSync('styles/chat.css', 'utf8');
     const shellCss = fs.readFileSync('styles/ui-next.css', 'utf8');
-    assert.match(shellCss, /html body \.chat-input-area\s*\{[^}]*padding-left:\s*52px;[^}]*padding-right:\s*52px;/);
+    assert.match(shellCss, /html body \.chat-input-area\s*\{[^}]*padding-left:\s*clamp\(12px, [^;]+, 52px\);[^}]*padding-right:\s*clamp\(12px, [^;]+, 52px\);/);
     for (const match of css.matchAll(/([^{}]+)\{([^{}]*)\}/g)) {
         const [, selectors, declarations] = match;
         if (!/chat-presentation-(?:panel|immersive)/.test(selectors)) continue;

From c9b437150de94e2eb81b2b825d8424bc9b30b1fd Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 06:02:07 +0000
Subject: [PATCH 118/143] Notifications: take down the floating copies once the
 side pane shows the list

Approval requests arriving while the side pane was on another tab float as
toasts that never auto-dismiss. Opening the notification page left them
stacked on top of it, so every pending approval showed twice and the
floating column covered the list and its approve-all / reject-all bar.

VCPLog toasts are now tagged, and when the side pane's notification page
becomes visible it calls notificationRenderer.dismissFloatingToasts(),
which removes those floating copies. The list already holds every one of
them, pending approvals included, so nothing is lost; toasts from other
sources are not in the list and stay. New notifications that arrive while
the page is open already skip the toast.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019L2bZomLn4NVoxS4Rv5Bkv
---
 .../contracts/generated/chat-event-graph.json | 28 ++++++++---------
 modules/notificationRenderer.js               | 14 +++++++++
 modules/renderer/sidePaneWiring.js            |  1 +
 .../side-pane/side-pane-controller.js         |  5 ++++
 scripts/next-delta-shared-baseline.json       |  4 +--
 .../notification-renderer-lifecycle.test.mjs  | 30 +++++++++++++++++++
 tests/side-pane-advanced-parity.test.mjs      |  8 ++++-
 7 files changed, 73 insertions(+), 17 deletions(-)

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 00588f69e..07b7126d3 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -4337,22 +4337,22 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 501,
+          "line": 506,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1174,
+          "line": 1179,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1180,
+          "line": 1185,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1194,
+          "line": 1199,
           "kind": "custom-event-listener"
         },
         {
@@ -5935,25 +5935,25 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 501,
+          "line": 506,
           "kind": "custom-event-listener",
           "match": "retry.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1174,
+          "line": 1179,
           "kind": "custom-event-listener",
           "match": "toggleNotificationsBtn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1180,
+          "line": 1185,
           "kind": "custom-event-listener",
           "match": "expandButton.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1194,
+          "line": 1199,
           "kind": "custom-event-listener",
           "match": "closeSidePaneBtn.addEventListener('click'"
         },
@@ -12586,7 +12586,7 @@
         },
         {
           "file": "modules/notificationRenderer.js",
-          "line": 1209,
+          "line": 1222,
           "kind": "custom-event-listener"
         },
         {
@@ -12646,7 +12646,7 @@
         },
         {
           "file": "modules/notificationRenderer.js",
-          "line": 1209,
+          "line": 1222,
           "kind": "custom-event-listener",
           "match": "window.addEventListener('focus'"
         },
@@ -21419,14 +21419,14 @@
       "consumers": [
         {
           "file": "modules/renderer/sidePaneWiring.js",
-          "line": 78,
+          "line": 79,
           "kind": "preload-subscription"
         }
       ],
       "evidence": [
         {
           "file": "modules/renderer/sidePaneWiring.js",
-          "line": 78,
+          "line": 79,
           "kind": "preload-subscription",
           "match": "chatAPI?.onBrowserSidePaneShortcut("
         }
@@ -25085,7 +25085,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1214,
+          "line": 1219,
           "kind": "custom-event-listener"
         },
         {
@@ -25185,7 +25185,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1214,
+          "line": 1219,
           "kind": "custom-event-listener",
           "match": "win?.addEventListener?.('resize'"
         },
diff --git a/modules/notificationRenderer.js b/modules/notificationRenderer.js
index 9f5f5d7a4..680d4926c 100755
--- a/modules/notificationRenderer.js
+++ b/modules/notificationRenderer.js
@@ -1069,6 +1069,8 @@ function renderVCPLogNotification(logData, originalRawMessage = null, notificati
     if (toastContainer && (!notificationsSidebarElement || !notificationsSidebarElement.classList.contains('active')) && shouldShowNotification) {
         const toastBubble = document.createElement('div');
         toastBubble.classList.add('floating-toast-notification');
+        // 列表里有同一条；通知面板打开时按这个标记收走悬浮副本
+        toastBubble.dataset.notificationSource = 'vcplog';
         // 添加创建时间戳
         toastBubble.dataset.createdAt = Date.now().toString();
         populateNotificationElement(toastBubble, true);
@@ -1152,6 +1154,17 @@ function renderVCPLogNotification(logData, originalRawMessage = null, notificati
     }
 }
 
+// 通知面板打开后，悬浮的 VCPLog 通知（含待审批）在列表里都有一份，收走悬浮副本，
+// 免得它们叠在面板上挡住列表和「全部允许 / 全部拒绝」。其他来源的提示不在列表里，保留。
+function dismissFloatingToasts() {
+    const toastContainer = document.getElementById('floating-toast-notifications-container');
+    if (!toastContainer) return;
+    toastContainer.querySelectorAll('.floating-toast-notification[data-notification-source="vcplog"]').forEach(toast => {
+        if (toast.dataset.autoDismissTimeout) clearTimeout(Number(toast.dataset.autoDismissTimeout));
+        toast.remove();
+    });
+}
+
 // 添加窗口焦点变化监听，清理残留的通知元素
 let focusCleanupInitialized = false;
 
@@ -1221,6 +1234,7 @@ function initializeFocusCleanup(options = {}) {
 window.notificationRenderer = {
     updateVCPLogStatus,
     renderVCPLogNotification,
+    dismissFloatingToasts,
     initializeFocusCleanup,
     clearPersistentNotifications,
     buildToolChangeDiff,
diff --git a/modules/renderer/sidePaneWiring.js b/modules/renderer/sidePaneWiring.js
index f2b833b1e..2f81f990d 100644
--- a/modules/renderer/sidePaneWiring.js
+++ b/modules/renderer/sidePaneWiring.js
@@ -42,6 +42,7 @@ export function initWorkspaceSidePane({
         toggleNotificationsBtn,
         notificationsPanel,
         notificationState: win.notificationCenter?.getStateChannel?.() || null,
+        onNotificationsShown: () => win.notificationRenderer?.dismissFloatingToasts?.(),
         expandButton: toggleChatBtn,
         closeSidePaneBtn: closeBtn,
         addTabButton: addBtn,
diff --git a/modules/ui-system/side-pane/side-pane-controller.js b/modules/ui-system/side-pane/side-pane-controller.js
index b2ae8cc5c..b5012de71 100644
--- a/modules/ui-system/side-pane/side-pane-controller.js
+++ b/modules/ui-system/side-pane/side-pane-controller.js
@@ -36,6 +36,8 @@ export function createSidePaneController({
     notificationsPanel = null,
     // notification-center 状态 { counts, connection }；不传就用页面里登记的那一份
     notificationState = null,
+    // 通知页签从看不见变成看得见时调用（收走悬浮通知）
+    onNotificationsShown = null,
     expandButton = null,
     closeSidePaneBtn = null,
     addTabButton = null,
@@ -109,8 +111,11 @@ export function createSidePaneController({
     const parentKeyOf = () => (state.parent ? SidePaneState.getParentKey(state.parent) : '');
 
     // ---- 开合与宽度 ----
+    let notificationsShown = false;
     function syncHeaderButtons(isVisible) {
         const isNotifActive = isVisible && isNotificationsTab(state.activeTabId);
+        if (isNotifActive && !notificationsShown) onNotificationsShown?.();
+        notificationsShown = isNotifActive;
         if (toggleNotificationsBtn) {
             toggleNotificationsBtn.classList.toggle('notification-panel-active', isNotifActive);
             toggleNotificationsBtn.setAttribute('aria-expanded', String(isNotifActive));
diff --git a/scripts/next-delta-shared-baseline.json b/scripts/next-delta-shared-baseline.json
index ebc1760b9..e8259b120 100644
--- a/scripts/next-delta-shared-baseline.json
+++ b/scripts/next-delta-shared-baseline.json
@@ -32,8 +32,8 @@
     "reason": "shared filter authority; canonical menu calls its public API; filter persistence now uses operation-aware path patches to avoid complete-snapshot overwrite"
   },
   "modules/notificationRenderer.js": {
-    "sha256": "3dbdb6e1f01d3d39efff97c271672e1cf0f1ce88977d42fd22ab04f442caa8d8",
-    "reason": "Integrated approval behavior: escaped text/diff previews describe ProjectForge edits and destructive targets; duplicate request cards are rejected; TTL/replay expiry removes actions; settlement cancels its timer; approval requests bypass display filtering. Review uses source at the registration commit f7596f9c because the recorded historical digest has no matching committed blob. The VCPLog connection status is also reported to the side-pane notification center before the optional status element is updated, so the center shows it when the classic status element is absent."
+    "sha256": "2a7d1757b6e4c71761825fb824a440a3614b34453383e843a248352588fdc85b",
+    "reason": "Integrated approval behavior: escaped text/diff previews describe ProjectForge edits and destructive targets; duplicate request cards are rejected; TTL/replay expiry removes actions; settlement cancels its timer; approval requests bypass display filtering. Review uses source at the registration commit f7596f9c because the recorded historical digest has no matching committed blob. The VCPLog connection status is also reported to the side-pane notification center before the optional status element is updated, so the center shows it when the classic status element is absent. VCPLog toasts are tagged and dismissFloatingToasts() takes them down when the side pane's notification page is shown, since the list already holds each of them (pending approvals stay answerable there); toasts from other sources are kept."
   },
   "VCPDistributedServer/frontend-plugin-loader.js": {
     "sha256": "0987ee41ed76c8b4f0963353c4b387f0b46a6202b9e8516aa02cce27568862ca",
diff --git a/tests/notification-renderer-lifecycle.test.mjs b/tests/notification-renderer-lifecycle.test.mjs
index 9bcf94199..51d9860ad 100644
--- a/tests/notification-renderer-lifecycle.test.mjs
+++ b/tests/notification-renderer-lifecycle.test.mjs
@@ -27,3 +27,33 @@ test('notification renderer cancels late toast projection after owner disposal',
     assert.equal(toast.classList.contains('visible'), false);
     dom.window.close();
 });
+
+test('opening the notifications panel takes down the floating copies of VCPLog notifications', () => {
+    const dom = new JSDOM(`<!doctype html><html><body>
+        <div id="floating-toast-notifications-container"><div class="floating-toast-notification info">other</div></div>
+        <aside id="notificationsSidebar"></aside>
+        <ul id="notificationsList"></ul>
+    </body></html>`, { runScripts: 'outside-only' });
+    dom.window.chatAPI = {};
+    dom.window.CSS = { escape: value => String(value) };
+    dom.window.eval(fs.readFileSync('modules/notificationRenderer.js', 'utf8'));
+    const owner = createDomListenerOwner();
+    dom.window.notificationRenderer.configureCapabilities({
+        filterManager: { checkMessageFilter: () => null },
+        listenerOwner: owner,
+    });
+    const doc = dom.window.document;
+    const list = doc.getElementById('notificationsList');
+    dom.window.notificationRenderer.renderVCPLogNotification({ type: 'vcp_log', data: { tool_name: 'X', status: 'success', content: 'ok' } }, null, list, {});
+    dom.window.notificationRenderer.renderVCPLogNotification({ type: 'tool_approval_request', data: { requestId: 'r1', toolName: 'FileOperator', maid: 'A', args: { command: 'WriteFile' }, timestamp: 'now' } }, null, list, {});
+    assert.equal(doc.querySelectorAll('.floating-toast-notification').length, 3);
+
+    dom.window.notificationRenderer.dismissFloatingToasts();
+
+    // the approval stays answerable in the list; toasts from other sources are not in the list, so they stay
+    assert.deepEqual([...doc.querySelectorAll('.floating-toast-notification')].map(toast => toast.textContent), ['other']);
+    assert.equal(list.querySelectorAll('.notification-item').length, 2);
+    assert.ok(list.querySelector('.notification-item [data-tool-approval-request-id="r1"], .notification-item[data-tool-approval-request-id="r1"]'));
+    owner.dispose();
+    dom.window.close();
+});
diff --git a/tests/side-pane-advanced-parity.test.mjs b/tests/side-pane-advanced-parity.test.mjs
index d43765123..35386d949 100644
--- a/tests/side-pane-advanced-parity.test.mjs
+++ b/tests/side-pane-advanced-parity.test.mjs
@@ -402,11 +402,13 @@ test('Parity: notifications live in the new tab page instead of the tab strip',
     const notifications = launcher.querySelector('[data-launcher-section="notifications"]');
     const segment = tabs.querySelector('[data-launcher-tab="notifications"]');
     const notificationState = createNotificationState();
+    let notificationsShown = 0;
     const ctrl = createController(dom, {
         controller: {
             openTabEntries: [{ id: 'a', label: 'A', open() {} }, { id: 'b', label: 'B', open() {} }],
             notificationsPanel: doc.getElementById('notificationsSidebar'),
-            notificationState: notificationState.channel
+            notificationState: notificationState.channel,
+            onNotificationsShown: () => { notificationsShown += 1; }
         }
     });
     const stripTabIds = () => [...doc.querySelectorAll('.side-pane-tabs .side-pane-tab')].map(btn => btn.getAttribute('data-tab-id'));
@@ -422,6 +424,8 @@ test('Parity: notifications live in the new tab page instead of the tab strip',
     assert.equal(tools.hidden, true);
     assert.equal(doc.getElementById('notificationsSidebar').classList.contains('active'), true);
     assert.equal(launcher.dataset.launcherSegment, 'notifications');
+    // 通知页露出来时收走悬浮通知（宿主接的是 notificationRenderer.dismissFloatingToasts）
+    assert.equal(notificationsShown, 1);
 
     // 连接状态挂在通知分类上
     notificationState.setConnection('open', 'VCPLog: 已连接');
@@ -434,9 +438,11 @@ test('Parity: notifications live in the new tab page instead of the tab strip',
     assert.equal(tools.hidden, false);
     assert.equal(notifications.hidden, true);
     assert.equal(doc.getElementById('notificationsSidebar').classList.contains('active'), false);
+    assert.equal(notificationsShown, 1);
     segment.click();
     assert.equal(ctrl.getSnapshot().activeTabId, SidePaneState.NOTIFICATIONS_TAB_ID);
     assert.equal(notifications.hidden, false);
+    assert.equal(notificationsShown, 2);
 
     // 「+」打开的是工具页；打开的标签在标签条上，概览里也没有通知
     doc.getElementById('addSidePaneChatBtn').click();

From 359a9366c001c392330651130e52c7b774503311 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 06:11:15 +0000
Subject: [PATCH 119/143] Side chat: stopping against an unresponsive VCP
 server no longer locks the composer

A non-streaming reply's main-process request has no local abort, so Stop
waited for the upstream interrupt and then for the request itself; with a
hung server the side chat stayed busy for minutes and the late answer was
still written into the stopped turn. Cancellation now settles locally first,
notifies upstream without waiting, and the send stops waiting for the
request once its terminal is cancelled. The upstream interrupt request also
times out after 5s so a streaming stop falls back to the local abort.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_016hW799u5Ji5k9khDAwu688
---
 .../contracts/generated/chat-event-graph.json | 100 +++++++++---------
 modules/chatManager.js                        |  19 +++-
 modules/ipc/chatHandlers.js                   |   5 +-
 scripts/next-delta-shared-baseline.json       |   4 +-
 tests/main-chat-response-body.test.mjs        |  19 +++-
 tests/side-chat-save-failure.test.mjs         |  16 +++
 6 files changed, 103 insertions(+), 60 deletions(-)

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 00588f69e..e314dae27 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -3182,14 +3182,14 @@
       "consumers": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 224,
+          "line": 225,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 224,
+          "line": 225,
           "kind": "event-listener",
           "match": "ipcMain.handle('claim-pending-flowlock-topic'"
         },
@@ -7733,14 +7733,14 @@
       "consumers": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 681,
+          "line": 682,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 681,
+          "line": 682,
           "kind": "event-listener",
           "match": "ipcMain.handle('create-new-topic-for-agent'"
         },
@@ -8589,14 +8589,14 @@
       "consumers": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 724,
+          "line": 725,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 724,
+          "line": 725,
           "kind": "event-listener",
           "match": "ipcMain.handle('delete-topic'"
         },
@@ -12890,14 +12890,14 @@
       "consumers": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 642,
+          "line": 643,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 642,
+          "line": 643,
           "kind": "event-listener",
           "match": "ipcMain.handle('get-agent-topics'"
         },
@@ -13149,14 +13149,14 @@
       "consumers": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 612,
+          "line": 613,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 612,
+          "line": 613,
           "kind": "event-listener",
           "match": "ipcMain.handle('get-chat-history'"
         },
@@ -13616,14 +13616,14 @@
       "consumers": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 1008,
+          "line": 1009,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 1008,
+          "line": 1009,
           "kind": "event-listener",
           "match": "ipcMain.handle('get-original-message-content'"
         },
@@ -13813,14 +13813,14 @@
       "consumers": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 1630,
+          "line": 1633,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 1630,
+          "line": 1633,
           "kind": "event-listener",
           "match": "ipcMain.handle('get-unread-topic-counts'"
         },
@@ -14458,14 +14458,14 @@
       "consumers": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 908,
+          "line": 909,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 908,
+          "line": 909,
           "kind": "event-listener",
           "match": "ipcMain.handle('handle-file-drop'"
         },
@@ -14489,14 +14489,14 @@
       "consumers": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 780,
+          "line": 781,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 780,
+          "line": 781,
           "kind": "event-listener",
           "match": "ipcMain.handle('handle-file-paste'"
         },
@@ -14520,14 +14520,14 @@
       "consumers": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 892,
+          "line": 893,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 892,
+          "line": 893,
           "kind": "event-listener",
           "match": "ipcMain.handle('handle-text-paste-as-file'"
         },
@@ -15198,14 +15198,14 @@
       "consumers": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 1522,
+          "line": 1523,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 1522,
+          "line": 1523,
           "kind": "event-listener",
           "match": "ipcMain.handle('interrupt-vcp-request'"
         },
@@ -16264,14 +16264,14 @@
       "consumers": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 363,
+          "line": 364,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 363,
+          "line": 364,
           "kind": "event-listener",
           "match": "ipcMain.handle('list-pending-flowlock-topics'"
         },
@@ -24768,14 +24768,14 @@
       "consumers": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 529,
+          "line": 530,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 529,
+          "line": 530,
           "kind": "event-listener",
           "match": "ipcMain.handle('regenerate-agent-topic-title'"
         },
@@ -25289,14 +25289,14 @@
       "consumers": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 330,
+          "line": 331,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 330,
+          "line": 331,
           "kind": "event-listener",
           "match": "ipcMain.handle('restore-flowlock-claim'"
         },
@@ -25513,14 +25513,14 @@
       "consumers": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 502,
+          "line": 503,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 502,
+          "line": 503,
           "kind": "event-listener",
           "match": "ipcMain.handle('save-agent-topic-title'"
         },
@@ -25637,14 +25637,14 @@
       "consumers": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 629,
+          "line": 630,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 629,
+          "line": 630,
           "kind": "event-listener",
           "match": "ipcMain.handle('save-chat-history'"
         },
@@ -25823,14 +25823,14 @@
       "consumers": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 427,
+          "line": 428,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 427,
+          "line": 428,
           "kind": "event-listener",
           "match": "ipcMain.handle('save-group-topic-order'"
         },
@@ -25978,14 +25978,14 @@
       "consumers": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 988,
+          "line": 989,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 988,
+          "line": 989,
           "kind": "event-listener",
           "match": "ipcMain.handle('save-pasted-image-to-file'"
         },
@@ -26071,14 +26071,14 @@
       "consumers": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 394,
+          "line": 395,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 394,
+          "line": 395,
           "kind": "event-listener",
           "match": "ipcMain.handle('save-topic-order'"
         },
@@ -26737,14 +26737,14 @@
       "consumers": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 457,
+          "line": 458,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 457,
+          "line": 458,
           "kind": "event-listener",
           "match": "ipcMain.handle('search-topics-by-content'"
         },
@@ -26868,14 +26868,14 @@
       "consumers": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 818,
+          "line": 819,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 818,
+          "line": 819,
           "kind": "event-listener",
           "match": "ipcMain.handle('select-files-to-send'"
         },
@@ -26980,14 +26980,14 @@
       "consumers": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 1040,
+          "line": 1041,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 1040,
+          "line": 1041,
           "kind": "event-listener",
           "match": "ipcMain.handle('send-to-vcp'"
         },
@@ -27104,14 +27104,14 @@
       "consumers": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 1725,
+          "line": 1728,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 1725,
+          "line": 1728,
           "kind": "event-listener",
           "match": "ipcMain.handle('set-topic-unread'"
         },
@@ -29289,14 +29289,14 @@
       "consumers": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 1681,
+          "line": 1684,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 1681,
+          "line": 1684,
           "kind": "event-listener",
           "match": "ipcMain.handle('toggle-topic-lock'"
         },
@@ -30653,7 +30653,7 @@
       "producers": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 1056,
+          "line": 1057,
           "kind": "event-send"
         },
         {
@@ -30682,7 +30682,7 @@
       "evidence": [
         {
           "file": "modules/ipc/chatHandlers.js",
-          "line": 1056,
+          "line": 1057,
           "kind": "event-send",
           "match": "event.sender.send(streamChannel"
         },
diff --git a/modules/chatManager.js b/modules/chatManager.js
index adee4ff0a..c44c02b56 100755
--- a/modules/chatManager.js
+++ b/modules/chatManager.js
@@ -1804,10 +1804,13 @@ export const chatManager = (() => {
                     messageId: thinkingMessage.id,
                     done: ownedStreamTerminal,
                     async cancel(reason) {
-                        try { await interruptCapability?.interrupt?.(thinkingMessage.id); }
-                        catch (error) { console.warn('[ChatManager] Non-streaming interrupt failed; cancelling locally:', error); }
+                        // 非流式请求在主进程里没有本地中止，上游卡住时中止请求本身也会卡住：
+                        // 先在本地收尾、放开输入框，再尽力通知上游，不等它
                         await removeThinkingFromSource();
                         settleOwnedStreamOperation?.({ event: { type: 'cancelled', reason: reason || 'surface-operation-cancelled' } });
+                        Promise.resolve()
+                            .then(() => interruptCapability?.interrupt?.(thinkingMessage.id))
+                            .catch(error => console.warn('[ChatManager] Non-streaming interrupt failed; cancelled locally:', error));
                         return true;
                     },
                 }));
@@ -1815,10 +1818,20 @@ export const chatManager = (() => {
 
             const context = orchestrated.context;
             if (request?.signal?.aborted) return await cancelPreparedSend();
-            const vcpResponse = await singleChatRequestOrchestrator.sendPrepared(
+            const sending = singleChatRequestOrchestrator.sendPrepared(
                 orchestrated,
                 globalSettings
             );
+            // 非流式回答停止后就不再等：服务卡住时主进程的请求可能几分钟都不返回，输入框不能一直锁着；
+            // 迟到的回答直接丢掉，不再写进已经停止的这一轮
+            const settledFirst = !useStreaming && ownedStreamTerminal
+                ? await Promise.race([sending.then(() => false, () => false), ownedStreamTerminal.then(() => true)])
+                : false;
+            if (settledFirst) {
+                sending.catch(() => {});
+                return Object.freeze({ messageId: thinkingMessage.id, terminal: await ownedStreamTerminal });
+            }
+            const vcpResponse = await sending;
 
             // 主动停止可使尚未收到首字的 IPC 请求以错误返回；已有取消操作负责
             // 收尾，不把这次本地 Abort 再渲染成服务端失败。
diff --git a/modules/ipc/chatHandlers.js b/modules/ipc/chatHandlers.js
index 806e0566f..2a958d0ec 100644
--- a/modules/ipc/chatHandlers.js
+++ b/modules/ipc/chatHandlers.js
@@ -165,6 +165,7 @@ function omitUnsetOptionalModelParams(modelConfig = {}) {
 let ipcHandlersRegistered = false;
 const flowlockClaimLocks = new Map();
 const vcpStreamTasks = new SenderTaskRegistry({ label: 'vcp-stream-tasks' });
+const INTERRUPT_TIMEOUT_MS = 5000;
 
 function getVcpStreamTaskSnapshot() {
     return vcpStreamTasks.snapshot();
@@ -1548,7 +1549,9 @@ function initialize(mainWindow, context) {
                 },
                 body: JSON.stringify({
                     requestId: messageId // Corrected to requestId to match user's edit
-                })
+                }),
+                // 服务卡住时中止请求本身也会挂住，停止按钮跟着卡几分钟；超时就走下面的本地收尾
+                signal: AbortSignal.timeout(INTERRUPT_TIMEOUT_MS)
             });
 
             const result = await response.json();
diff --git a/scripts/next-delta-shared-baseline.json b/scripts/next-delta-shared-baseline.json
index ebc1760b9..2628f678e 100644
--- a/scripts/next-delta-shared-baseline.json
+++ b/scripts/next-delta-shared-baseline.json
@@ -1,7 +1,7 @@
 {
   "modules/chatManager.js": {
-    "sha256": "c98fcf41051862bb8b1acc55430aad0a70b2ead1b0f2db5aadc5ef4cc4d520d5",
-    "reason": "Integrated chat behavior: selection subscriptions for topic side panes; clear old media before navigation; per-conversation side chat context/unread policy; explicit cancellation and non-streaming terminal settlement; one error notice per failed request. Reviewed auxiliary-side-chat reproduction: Stop during delayed history save or request preparation previously still sent generation; renderer-local AbortSignal checks now prevent that send. When upstream interrupt fails, await the existing local stream terminal before placeholder cleanup so accepted partial content is saved instead of deleted. Actual native side owner, internal renderer, manager, preload/IPC/disk and local HTTP before/after evidence; side preparation and partial-cancel regressions. Existing Surface routing and history authority remain in place. Main/group sending without the optional signal keeps its preparation path. Stop while awaiting the first HTTP headers: a locally aborted stream IPC return now awaits the already-owned cancellation terminal instead of showing a service-error notice; the regression keeps the submitted question and leaves the busy state. Non-streaming terminal save: a failed reply save (either { success: false } or the agent IPC { error } shape) now settles failed with a persistence error, so the auxiliary side chat shows its unsaved badge and blocks close like streaming does; covered by tests/side-chat-save-failure.test.mjs. Selection intent: onSelectionIntent fires as soon as selectTopic or selectItem sets the topic, before history renders, so the side pane follows a long topic immediately instead of showing the previous topic's side chat for seconds; onSelectionChange still fires on commit; covered by tests/chat-manager-selection-race.test.js."
+    "sha256": "378dc6675c82f6b3ab812c2cfc104332315fd0e0e36a0e3abac0913bcc452d7e",
+    "reason": "Integrated chat behavior: selection subscriptions for topic side panes; clear old media before navigation; per-conversation side chat context/unread policy; explicit cancellation and non-streaming terminal settlement; one error notice per failed request. Reviewed auxiliary-side-chat reproduction: Stop during delayed history save or request preparation previously still sent generation; renderer-local AbortSignal checks now prevent that send. When upstream interrupt fails, await the existing local stream terminal before placeholder cleanup so accepted partial content is saved instead of deleted. Actual native side owner, internal renderer, manager, preload/IPC/disk and local HTTP before/after evidence; side preparation and partial-cancel regressions. Existing Surface routing and history authority remain in place. Main/group sending without the optional signal keeps its preparation path. Stop while awaiting the first HTTP headers: a locally aborted stream IPC return now awaits the already-owned cancellation terminal instead of showing a service-error notice; the regression keeps the submitted question and leaves the busy state. Non-streaming terminal save: a failed reply save (either { success: false } or the agent IPC { error } shape) now settles failed with a persistence error, so the auxiliary side chat shows its unsaved badge and blocks close like streaming does; covered by tests/side-chat-save-failure.test.mjs. Selection intent: onSelectionIntent fires as soon as selectTopic or selectItem sets the topic, before history renders, so the side pane follows a long topic immediately instead of showing the previous topic's side chat for seconds; onSelectionChange still fires on commit; covered by tests/chat-manager-selection-race.test.js. Stop on an unresponsive server: a non-streaming side chat reply settles cancelled locally first and notifies upstream without waiting, and the send no longer waits for the main-process request (which has no local abort) once its terminal is cancelled, so the composer unlocks at once and a late answer is not written into the stopped turn; covered by tests/side-chat-save-failure.test.mjs."
   },
   "modules/messageRenderer.js": {
     "sha256": "f24426207cf95eb4fa3f42e2ee357ed906d0a56ac6b235dd9d996fc39966b6e5",
diff --git a/tests/main-chat-response-body.test.mjs b/tests/main-chat-response-body.test.mjs
index 8423dfb41..d5fe87b8f 100644
--- a/tests/main-chat-response-body.test.mjs
+++ b/tests/main-chat-response-body.test.mjs
@@ -20,7 +20,7 @@ async function waitFor(predicate) {
 
 // Execute the real module and public IPC route, with isolated dependencies.
 // No source rewriting or test-only access to its private stream function.
-function route(fetchResponse, { settings = null } = {}) {
+function route(fetchResponse, { settings = null, abortSignal = AbortSignal } = {}) {
     const handlers = new Map(), module = { exports: {} }, sent = [], warnings = [];
     const dependencies = new Map([
         ['electron', { ipcMain: { handle: (name, fn) => handlers.set(name, fn), on() {} }, dialog: {}, BrowserWindow: {} }],
@@ -36,7 +36,7 @@ function route(fetchResponse, { settings = null } = {}) {
     const load = name => { assert.ok(dependencies.has(name), 'unreviewed fixture dependency: ' + name); return dependencies.get(name); };
     vm.runInNewContext('(function(require,module,exports){' + source + '\n})', {
         console: { log() {}, warn: (...args) => warnings.push(args.join(' ')), error() {} },
-        TextDecoder, URL, fetch: fetchResponse,
+        TextDecoder, URL, fetch: fetchResponse, AbortSignal: abortSignal,
     })(load, module, module.exports);
     module.exports.initialize(null, { USER_DATA_DIR: 'unused-isolated-fixture', APP_DATA_ROOT_IN_PROJECT: 'unused-isolated-fixture', historyMutationQueue: {} });
     const sender = Object.assign(new EventEmitter(), { id: 501, isDestroyed: () => false, send: (channel, event) => sent.push({ channel, event }) });
@@ -48,24 +48,35 @@ function route(fetchResponse, { settings = null } = {}) {
     };
 }
 
-for (const failure of ['rejected', 'transport-error', 'missing-settings']) {
+// hung：服务卡住不回中止请求，超时后照样走本地收尾，停止按钮不跟着卡
+for (const failure of ['rejected', 'transport-error', 'missing-settings', 'hung']) {
     test(`failed interruption (${failure}) releases the caller's HTTP reader without a duplicate terminal`, async () => {
         let controller, aborted = false;
         const body = new ReadableStream({ start(value) { controller = value; } });
         const f = route(async (url, options) => {
             if (url.endsWith('/v1/interrupt')) {
                 if (failure === 'transport-error') throw new Error('interrupt disconnected');
+                if (failure === 'hung') {
+                    // 只有请求自己的超时能让它结束；没有超时就要等满 2 秒
+                    await new Promise((_resolve, reject) => {
+                        setTimeout(() => reject(new Error('interrupt never answered')), 2000);
+                        options.signal?.addEventListener('abort', () => reject(options.signal.reason), { once: true });
+                    });
+                }
                 return { ok: false, status: 404, json: async () => ({ message: 'request not found' }) };
             }
             options.signal.addEventListener('abort', () => {
                 aborted = true; controller.error(new DOMException('locally interrupted', 'AbortError'));
             }, { once: true });
             return { ok: true, body };
-        }, { settings: failure === 'missing-settings' ? null : { vcpServerUrl: 'http://controlled.invalid/v1/chat/completions' } });
+        }, { settings: failure === 'missing-settings' ? null : { vcpServerUrl: 'http://controlled.invalid/v1/chat/completions' },
+            abortSignal: { timeout: () => { const timeout = new AbortController(); setTimeout(() => timeout.abort(new Error('timeout')), 20); return timeout.signal; } } });
         try {
             controller.enqueue(encode('data: {"choices":[{"delta":{"content":"partial"}}]}\n\n'));
             await f.start(); await waitFor(() => f.sent.length === 1);
+            const startedAt = Date.now();
             assert.equal((await f.interrupt()).success, false);
+            assert.ok(Date.now() - startedAt < 1000, 'stopping must not wait for an unresponsive server');
             await waitFor(() => !f.tasks().length);
             assert.equal(aborted, true); assert.equal(body.locked, false);
             assert.deepEqual(f.sent.map(item => item.event.type), ['data']);
diff --git a/tests/side-chat-save-failure.test.mjs b/tests/side-chat-save-failure.test.mjs
index 8371e5bb5..ea7b8f6c4 100644
--- a/tests/side-chat-save-failure.test.mjs
+++ b/tests/side-chat-save-failure.test.mjs
@@ -43,3 +43,19 @@ test('a streaming side chat stays busy until the reply is on disk', async t => {
     assert.equal(f.handle.isBusy(), false);
     assert.ok(f.getHistory().some(m => m.role === 'assistant'), JSON.stringify(f.getHistory()));
 });
+
+// 服务卡住不回时点停止：非流式请求在主进程里中止不了，输入框不能跟着锁到请求超时；迟到的回答也不再写进停止的这一轮
+test('stopping a non-streaming reply from an unresponsive server unlocks at once and drops the late answer', async t => {
+    let answer;
+    const f = await fixture(t, { onSend: () => new Promise(resolve => { answer = resolve; }) });
+    f.submit('q');
+    for (let i = 0; i < 30; i++) await tick();
+    assert.equal(f.handle.isBusy(), true);
+    f.stop();
+    await f.untilIdle();
+    assert.equal(f.handle.isBusy(), false);
+    assert.equal(f.textarea.disabled, false);
+    answer({ choices: [{ message: { content: 'late answer' } }] });
+    for (let i = 0; i < 30; i++) await tick();
+    assert.equal(f.getHistory().some(m => m.role === 'assistant'), false, JSON.stringify(f.getHistory()));
+});

From 956ba441a937131c61fdd2cde861d9713de2054c Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 06:11:51 +0000
Subject: [PATCH 120/143] Side pane smoke: retry removing the temp data dir
 after a passing run

The smoke passed all 9 phases on CI, then failed the job on cleanup:
rmSync hit ENOTEMPTY on appdata/Partitions/vcp-side-browser because an
Electron child process was still writing after the main process exited.
Retry the removal, and if it still fails only warn, since a leftover temp
directory is not a smoke failure.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019L2bZomLn4NVoxS4Rv5Bkv
---
 scripts/smoke-side-pane-e2e.mjs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/scripts/smoke-side-pane-e2e.mjs b/scripts/smoke-side-pane-e2e.mjs
index 394e5cedf..826eff942 100644
--- a/scripts/smoke-side-pane-e2e.mjs
+++ b/scripts/smoke-side-pane-e2e.mjs
@@ -516,7 +516,11 @@ try {
     stopChild();
     mockModel.close();
     pageServer.close();
-    if (exitCode === 0 && !KEEP) fs.rmSync(data, { recursive: true, force: true });
-    else console.log('Evidence: ' + data);
+    if (exitCode === 0 && !KEEP) {
+        // Electron 的子进程可能比主进程晚退出，还在往 Partitions 里写，删目录会撞上 ENOTEMPTY；
+        // 重试几次，仍删不掉也只是留下临时目录，不算冒烟失败
+        try { fs.rmSync(data, { recursive: true, force: true, maxRetries: 10, retryDelay: 300 }); }
+        catch (error) { console.warn(`Could not remove ${data}: ${error.code || error.message}`); }
+    } else console.log('Evidence: ' + data);
     process.exit(exitCode);
 }

From db8c635c183476a28387e279046cc7733a299f99 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 06:13:19 +0000
Subject: [PATCH 121/143] Side pane: reuse tab strip nodes, skip hidden
 overview rebuilds, app dialog for trajectory clear

- The tab strip rebuilt every tab and measured layout in the same frame on
  each render (every browser navigation, switch and parent change). Tabs
  are now reused by id: only added, removed, moved or updated in place,
  and the layout read moves to the next frame.
- The tab overview no longer rebuilds its list while closed; opening it
  renders the current tabs.
- Clearing a conversation's model trajectory asks through the app's
  confirm dialog instead of window.confirm, which froze the whole window,
  and clears the conversation that was shown when Clear was clicked.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012AP71nAxrCFEpH7st6asf9
---
 .../contracts/generated/chat-event-graph.json |  44 ++++----
 .../side-pane/modelTrajectorySideProvider.js  |  12 ++-
 .../side-pane/side-pane-tab-overview.js       |   3 +-
 .../side-pane/side-pane-tab-strip.js          |  77 +++++++++++--
 tests/side-pane-advanced-parity.test.mjs      |   5 +
 tests/side-pane-model-trajectory.test.mjs     |  23 +++-
 tests/side-pane-tab-strip-reuse.test.mjs      | 102 ++++++++++++++++++
 tests/side-pane-tab-strip.test.mjs            |  12 +++
 8 files changed, 240 insertions(+), 38 deletions(-)
 create mode 100644 tests/side-pane-tab-strip-reuse.test.mjs

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 00588f69e..c36b6e1fe 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -1245,7 +1245,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 204,
+          "line": 222,
           "kind": "custom-event-listener"
         }
       ],
@@ -1264,7 +1264,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 204,
+          "line": 222,
           "kind": "custom-event-listener",
           "match": "tabItem.addEventListener('auxclick'"
         }
@@ -4412,12 +4412,12 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 181,
+          "line": 196,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 193,
+          "line": 210,
           "kind": "custom-event-listener"
         },
         {
@@ -6025,13 +6025,13 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 181,
+          "line": 196,
           "kind": "custom-event-listener",
           "match": "btn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 193,
+          "line": 210,
           "kind": "custom-event-listener",
           "match": "closeBtn.addEventListener('click'"
         },
@@ -7343,7 +7343,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 216,
+          "line": 234,
           "kind": "custom-event-listener"
         },
         {
@@ -7481,7 +7481,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 216,
+          "line": 234,
           "kind": "custom-event-listener",
           "match": "tabItem.addEventListener('contextmenu'"
         },
@@ -15652,7 +15652,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 312,
+          "line": 369,
           "kind": "custom-event-listener"
         },
         {
@@ -16065,7 +16065,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 312,
+          "line": 369,
           "kind": "custom-event-listener",
           "match": "tabListElement.addEventListener('keydown'"
         },
@@ -18928,7 +18928,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 201,
+          "line": 219,
           "kind": "custom-event-listener"
         },
         {
@@ -19052,7 +19052,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 201,
+          "line": 219,
           "kind": "custom-event-listener",
           "match": "tabItem.addEventListener('mousedown'"
         },
@@ -19143,7 +19143,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 212,
+          "line": 230,
           "kind": "custom-event-listener"
         },
         {
@@ -19185,7 +19185,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 212,
+          "line": 230,
           "kind": "custom-event-listener",
           "match": "tabItem.addEventListener('mouseenter'"
         },
@@ -19258,7 +19258,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 213,
+          "line": 231,
           "kind": "custom-event-listener"
         },
         {
@@ -19341,7 +19341,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 213,
+          "line": 231,
           "kind": "custom-event-listener",
           "match": "tabItem.addEventListener('mouseleave'"
         },
@@ -21658,14 +21658,14 @@
       "consumers": [
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 926,
+          "line": 932,
           "kind": "preload-subscription"
         }
       ],
       "evidence": [
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 926,
+          "line": 932,
           "kind": "preload-subscription",
           "match": "api?.onModelTrajectoryChanged("
         }
@@ -23134,7 +23134,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 214,
+          "line": 232,
           "kind": "custom-event-listener"
         },
         {
@@ -23193,7 +23193,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 214,
+          "line": 232,
           "kind": "custom-event-listener",
           "match": "tabItem.addEventListener('pointerdown'"
         },
@@ -26594,7 +26594,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 269,
+          "line": 326,
           "kind": "custom-event-listener"
         },
         {
@@ -26670,7 +26670,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-strip.js",
-          "line": 269,
+          "line": 326,
           "kind": "custom-event-listener",
           "match": "tabListElement.addEventListener('scroll'"
         },
diff --git a/modules/ui-system/side-pane/modelTrajectorySideProvider.js b/modules/ui-system/side-pane/modelTrajectorySideProvider.js
index 9809a0a5e..4cc1fae27 100644
--- a/modules/ui-system/side-pane/modelTrajectorySideProvider.js
+++ b/modules/ui-system/side-pane/modelTrajectorySideProvider.js
@@ -877,9 +877,15 @@ export function createModelTrajectorySideProvider({
 
             async function clearAll() {
                 if (!sessionKey) return;
-                const confirmed = typeof win.confirm === 'function' ? win.confirm('清空这个话题的全部调用轨迹？此操作不可撤销。') : true;
-                if (!confirmed) return;
-                const res = await api?.modelTrajectoryClear?.(sessionKey);
+                // 记下点按钮时的话题：确认框开着时切了会话，也只清这一个
+                const key = sessionKey;
+                const message = '清空这个话题的全部调用轨迹？此操作不可撤销。';
+                // 用应用自己的确认框，不用原生 window.confirm（会以应用窗口名义弹系统模态框，卡住整个窗口）
+                const confirmed = typeof uiHelper?.showConfirmDialog === 'function'
+                    ? await uiHelper.showConfirmDialog(message, '清空调用轨迹', '清空', '取消', true)
+                    : (typeof win.confirm === 'function' ? win.confirm(message) : true);
+                if (!confirmed || disposed()) return;
+                const res = await api?.modelTrajectoryClear?.(key);
                 if (res?.success) toast('已清空调用轨迹', 'success');
                 else toast(res?.error || '清空失败', 'error');
             }
diff --git a/modules/ui-system/side-pane/side-pane-tab-overview.js b/modules/ui-system/side-pane/side-pane-tab-overview.js
index c6d5b22d7..8e39a984f 100644
--- a/modules/ui-system/side-pane/side-pane-tab-overview.js
+++ b/modules/ui-system/side-pane/side-pane-tab-overview.js
@@ -263,7 +263,8 @@ export function createSidePaneTabOverview({
         isOpen,
         hide,
         render,
-        refresh: () => render(currentQuery()),
+        // 关着的概览不重建：每次标签变化（浏览器每次导航改标题）都会调到这里，打开时 render 会重画
+        refresh: () => { if (isOpen()) render(currentQuery()); },
         dispose() {
             cleanups.forEach(cleanup => cleanup());
             cleanups.length = 0;
diff --git a/modules/ui-system/side-pane/side-pane-tab-strip.js b/modules/ui-system/side-pane/side-pane-tab-strip.js
index 0887969c8..42d11887d 100644
--- a/modules/ui-system/side-pane/side-pane-tab-strip.js
+++ b/modules/ui-system/side-pane/side-pane-tab-strip.js
@@ -39,6 +39,9 @@ export function createSidePaneTabStrip({
     let dragging = false;
     let layoutRaf = 0;
     let lastRenderedActiveTabId = null;
+    let scrollActivePending = false;
+    let tooltipAnchor = null;
+    const itemEntries = new Map();
 
     // 新增按钮不溢出时住在标签条末尾，溢出时回到右侧操作区原来的位置
     const addButtonHome = addButton?.parentElement || null;
@@ -53,11 +56,13 @@ export function createSidePaneTabStrip({
             tooltipEl.remove();
             tooltipEl = null;
         }
+        tooltipAnchor = null;
     }
 
     function scheduleTooltip(anchor, text) {
         hideTooltip();
         if (!anchor || !text) return;
+        tooltipAnchor = anchor;
         tooltipTimer = win.setTimeout(() => {
             tooltipTimer = null;
             if (dragging || !anchor.isConnected) return;
@@ -114,7 +119,12 @@ export function createSidePaneTabStrip({
         const raf = win.requestAnimationFrame || ((cb) => win.setTimeout(cb, 16));
         layoutRaf = raf(() => {
             layoutRaf = 0;
-            if (!disposed) layout();
+            if (disposed) return;
+            layout();
+            if (scrollActivePending) {
+                scrollActivePending = false;
+                scrollActiveIntoView();
+            }
         });
     }
 
@@ -147,6 +157,11 @@ export function createSidePaneTabStrip({
         else btn.removeAttribute('aria-label');
     }
 
+    // 结构签名：这些变了才重建这一项；标题、激活态等原地更新（同 ZCode 按 key 复用标签节点）
+    function itemSignature(tab) {
+        return `${isClosable(tab) ? 1 : 0}|${getTabIconName(tab, getTabType)}|${tab.id === statusTabId ? 1 : 0}`;
+    }
+
     function createTabItem(tab, isActive) {
         const tabItem = doc.createElement('div');
         tabItem.className = `side-pane-tab-item${isActive ? ' active' : ''}`;
@@ -180,6 +195,8 @@ export function createSidePaneTabStrip({
         }
         btn.addEventListener('click', () => onActivate(tab.id));
         tabItem.appendChild(btn);
+        // 复用时标题会变：监听里读 entry.tab，不读创建时的 tab
+        const entry = { tab, el: tabItem, btn, titleSpan, closeBtn: null, sig: itemSignature(tab) };
 
         // 关闭按钮和标签按钮并列
         const closable = isClosable(tab);
@@ -195,6 +212,7 @@ export function createSidePaneTabStrip({
                 onClose(tab.id);
             });
             tabItem.appendChild(closeBtn);
+            entry.closeBtn = closeBtn;
         }
 
         // 中键关闭（mousedown 拦截浏览器自动滚动，auxclick 关闭且不激活）
@@ -209,7 +227,7 @@ export function createSidePaneTabStrip({
         });
 
         // 标题悬停提示：1.5s 后出现，离开/按下/拖拽即消失
-        tabItem.addEventListener('mouseenter', () => scheduleTooltip(tabItem, tooltipText(tab)));
+        tabItem.addEventListener('mouseenter', () => scheduleTooltip(tabItem, tooltipText(entry.tab)));
         tabItem.addEventListener('mouseleave', hideTooltip);
         tabItem.addEventListener('pointerdown', hideTooltip);
 
@@ -226,33 +244,72 @@ export function createSidePaneTabStrip({
             }
             onContextMenu(tab.id, x, y);
         });
-        return tabItem;
+        return entry;
+    }
+
+    function updateTabItem(entry, tab, isActive) {
+        entry.tab = tab;
+        entry.el.classList.toggle('active', isActive);
+        entry.btn.classList.toggle('active', isActive);
+        entry.btn.setAttribute('aria-selected', String(isActive));
+        entry.btn.setAttribute('tabindex', isActive ? '0' : '-1');
+        // 通知标签的标题由 syncStatus 写
+        if (tab.id !== statusTabId && entry.titleSpan.textContent !== tab.title) entry.titleSpan.textContent = tab.title;
+        entry.closeBtn?.setAttribute('aria-label', `关闭 ${tab.title}`);
+    }
+
+    function nextItem(el) {
+        let node = el?.nextElementSibling || null;
+        while (node && !node.classList?.contains('side-pane-tab-item')) node = node.nextElementSibling;
+        return node;
     }
 
+    // 按 tabId 复用标签节点，只增删、调顺序、改激活态和标题。原来每次（浏览器每次导航改标题、每次切换）都删光重建，
+    // 打断悬停提示，并在同一帧里同步量一次几何；量几何现在推到下一帧（scheduleLayout）。
     function render() {
-        hideTooltip();
-        // 只清标签项：新增按钮在不溢出时会住在标签条里
-        tabListElement.querySelectorAll('.side-pane-tab-item').forEach((el) => el.remove());
         tabListElement.setAttribute('role', 'tablist');
         tabListElement.setAttribute('aria-label', '工作区侧栏标签页');
 
         const activeTabId = getActiveTabId();
         const insertAnchor = addButton?.parentElement === tabListElement ? addButton : null;
-        getTabs().forEach(tab => {
-            tabListElement.insertBefore(createTabItem(tab, tab.id === activeTabId), insertAnchor);
+        const tabs = getTabs();
+        const keep = new Set(tabs.map(tab => tab.id));
+        for (const [id, entry] of itemEntries) {
+            const stale = !keep.has(id) || entry.sig !== itemSignature(tabs.find(tab => tab.id === id));
+            if (!stale) continue;
+            if (tooltipAnchor === entry.el) hideTooltip();
+            entry.el.remove();
+            itemEntries.delete(id);
+        }
+        // 不归本标签条管理的残留项（比如外部插进来的）一并清掉
+        tabListElement.querySelectorAll('.side-pane-tab-item').forEach((el) => {
+            if (![...itemEntries.values()].some(entry => entry.el === el)) el.remove();
         });
+
+        let cursor = tabListElement.querySelector('.side-pane-tab-item');
+        for (const tab of tabs) {
+            const isActive = tab.id === activeTabId;
+            let entry = itemEntries.get(tab.id);
+            if (entry) updateTabItem(entry, tab, isActive);
+            else {
+                entry = createTabItem(tab, isActive);
+                itemEntries.set(tab.id, entry);
+            }
+            if (entry.el === cursor) cursor = nextItem(cursor);
+            else tabListElement.insertBefore(entry.el, cursor || insertAnchor);
+        }
         // 激活的是新标签页或藏起来的通知时没有标签带 tabindex=0，给第一个，标签条仍能用 Tab 键进来
         if (!tabListElement.querySelector('[role="tab"][tabindex="0"]')) {
             tabListElement.querySelector('[role="tab"]')?.setAttribute('tabindex', '0');
         }
         syncStatus();
         onRendered();
-        layout();
         // 新开或切换到的标签在溢出区时滚进可见范围；激活项不变时不打扰用户手动滚动
         if (activeTabId !== lastRenderedActiveTabId) {
             lastRenderedActiveTabId = activeTabId;
-            scrollActiveIntoView();
+            scrollActivePending = true;
         }
+        scheduleLayout();
     }
 
     const sortable = createTabSortable({
diff --git a/tests/side-pane-advanced-parity.test.mjs b/tests/side-pane-advanced-parity.test.mjs
index d43765123..5a4ca99e5 100644
--- a/tests/side-pane-advanced-parity.test.mjs
+++ b/tests/side-pane-advanced-parity.test.mjs
@@ -446,7 +446,10 @@ test('Parity: notifications live in the new tab page instead of the tab strip',
     await ctrl.openTab({ kind: 'chat', descriptor: createDesc('s1', 'c1') });
     assert.deepEqual(stripTabIds(), ['s1']);
     assert.equal(launcher.hidden, true);
+    // 概览关着时不重建，打开后看它列了什么，再关上
+    doc.getElementById('sidePaneTabOverviewBtn').click();
     assert.deepEqual([...doc.querySelectorAll('#sidePaneOpenTabsList .side-pane-overview-item')].map(item => item.getAttribute('data-tab-id')), ['s1']);
+    doc.getElementById('sidePaneTabOverviewBtn').click();
 
     // 小房子回到新标签页上次停的分类：停在工具就回工具，停在通知就回通知
     const homeBtn = doc.getElementById('sidePaneHomeBtn');
@@ -873,7 +876,9 @@ test('tab type registration connects presentation, launcher availability and pro
     assert.equal(tab.icon, 'edit_note');
     assert.equal(tab.typeLabel, 'Custom notes');
     assert.equal(tab.searchHint, 'memo');
+    doc.getElementById('sidePaneTabOverviewBtn').click();
     assert.equal(doc.querySelector('[data-tab-id="custom-notes:1"] .vcp-side-pane-icon-base').textContent, 'edit_note');
+    doc.getElementById('sidePaneTabOverviewBtn').click();
     unregister();
     assert.equal(ctrl.getTabType('custom-notes'), null);
     assert.equal(doc.querySelector('[data-open-tab-entry="custom-notes"]'), null);
diff --git a/tests/side-pane-model-trajectory.test.mjs b/tests/side-pane-model-trajectory.test.mjs
index f25d27779..9882f438c 100644
--- a/tests/side-pane-model-trajectory.test.mjs
+++ b/tests/side-pane-model-trajectory.test.mjs
@@ -29,7 +29,7 @@ function records() {
 const openWindows = [];
 after(() => { openWindows.forEach(win => win.close()); });
 
-function makeEnv({ conversation = { item: { id: 'agent1', name: '小助手' }, topicId: 't1' }, recs = records(), result } = {}) {
+function makeEnv({ conversation = { item: { id: 'agent1', name: '小助手' }, topicId: 't1' }, recs = records(), result, showConfirmDialog } = {}) {
     const dom = new JSDOM('<div id="view"></div>', { pretendToBeVisual: true });
     openWindows.push(dom.window);
     const doc = dom.window.document;
@@ -48,7 +48,7 @@ function makeEnv({ conversation = { item: { id: 'agent1', name: '小助手' }, t
     };
     const sidePaneController = { openTab: async tab => { state.opened.push(tab); return { focus() {} }; }, setVisible() {} };
     const provider = createModelTrajectorySideProvider({
-        document: doc, api, sidePaneController, uiHelper: { showToastNotification: m => state.toasts.push(m) },
+        document: doc, api, sidePaneController, uiHelper: { showToastNotification: m => state.toasts.push(m), ...(showConfirmDialog ? { showConfirmDialog } : {}) },
         getConversation: () => state.conversation,
         onConversationChange: callback => { state.conversationListeners.push(callback); return () => { state.conversationUnsubscribed = true; }; }
     });
@@ -465,3 +465,22 @@ test('the expansion menu works from the keyboard and keeps focus on the switch b
     assert.equal(menuBtn.getAttribute('aria-expanded'), 'false');
     assert.equal(doc.activeElement, menuBtn, 'Escape returns focus to the menu button');
 });
+
+test('clearing asks through the app dialog, not window.confirm, and clears the conversation it was asked for', async () => {
+    let answer;
+    const asked = [];
+    const env = makeEnv({ showConfirmDialog: (...args) => { asked.push(args); return new Promise(resolve => { answer = resolve; }); } });
+    env.dom.window.confirm = () => { throw new Error('native confirm must not be used'); };
+    await env.provider.mountTab({ id: 'x' }, env.view);
+    env.view.querySelector('[aria-label="清空这个话题的调用轨迹"]').click();
+    await wait(5);
+    assert.equal(asked.length, 1, 'the app confirm dialog is shown');
+    assert.equal(asked[0][4], true, 'it is marked as a destructive action');
+    // The user switches conversation while the dialog is open, then confirms
+    env.state.conversation = { item: { id: 'agent2', name: '另一个' }, topicId: 't9' };
+    env.state.conversationListeners.forEach(listener => listener());
+    await wait();
+    answer(true);
+    await wait();
+    assert.deepEqual(env.state.cleared, ['agent1__t1'], 'only the conversation shown when Clear was clicked is cleared');
+});
diff --git a/tests/side-pane-tab-strip-reuse.test.mjs b/tests/side-pane-tab-strip-reuse.test.mjs
new file mode 100644
index 000000000..bdd52ec10
--- /dev/null
+++ b/tests/side-pane-tab-strip-reuse.test.mjs
@@ -0,0 +1,102 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { JSDOM } from 'jsdom';
+import { createSidePaneTabStrip } from '../modules/ui-system/side-pane/side-pane-tab-strip.js';
+
+// The tab strip used to delete and rebuild every tab, then measure layout in
+// the same frame, on each render: every browser navigation (title change),
+// every switch and every parent change. That interrupted the hover tooltip
+// and forced a synchronous reflow. Tabs are now reused by id.
+
+function setup(initialTabs) {
+    const dom = new JSDOM('<div class="side-pane-tabs"></div>', { pretendToBeVisual: true });
+    const win = dom.window;
+    const doc = win.document;
+    const tabList = doc.querySelector('.side-pane-tabs');
+    let tabs = initialTabs;
+    let active = tabs[0].id;
+    let geometryReads = 0;
+    for (const prop of ['clientWidth', 'scrollWidth']) {
+        Object.defineProperty(tabList, prop, { configurable: true, get() { geometryReads += 1; return 400; } });
+    }
+    const strip = createSidePaneTabStrip({
+        tabListElement: tabList,
+        getTabs: () => tabs,
+        getActiveTabId: () => active,
+        isClosable: () => true,
+        onActivate() {},
+        onClose() {},
+        onReorder() {},
+        onContextMenu() {}
+    });
+    const item = id => tabList.querySelector(`.side-pane-tab-item[data-tab-id="${id}"]`);
+    const order = () => [...tabList.querySelectorAll('.side-pane-tab-item')].map(el => el.dataset.tabId);
+    const frame = () => new Promise(resolve => win.requestAnimationFrame(() => resolve()));
+    return {
+        dom, doc, strip, item, order, frame,
+        setTabs: next => { tabs = next; },
+        setActive: id => { active = id; },
+        reads: () => geometryReads,
+        resetReads: () => { geometryReads = 0; }
+    };
+}
+
+test('a title change or a switch updates tabs in place instead of rebuilding the strip', async () => {
+    const env = setup([{ id: 'a', title: 'A' }, { id: 'b', title: 'Loading…' }]);
+    try {
+        env.strip.render();
+        const a = env.item('a');
+        const b = env.item('b');
+
+        env.setTabs([{ id: 'a', title: 'A' }, { id: 'b', title: 'Example Domain' }]);
+        env.setActive('b');
+        env.strip.render();
+        assert.equal(env.item('a'), a, 'the untouched tab keeps its node');
+        assert.equal(env.item('b'), b, 'the renamed tab keeps its node');
+        assert.equal(b.querySelector('.tab-title').textContent, 'Example Domain');
+        assert.equal(b.querySelector('.side-pane-tab-close').getAttribute('aria-label'), '关闭 Example Domain');
+        assert.equal(b.querySelector('[role="tab"]').getAttribute('aria-selected'), 'true');
+        assert.equal(b.querySelector('[role="tab"]').tabIndex, 0);
+        assert.equal(a.querySelector('[role="tab"]').tabIndex, -1);
+        assert.ok(!a.classList.contains('active') && b.classList.contains('active'));
+    } finally {
+        env.strip.dispose();
+        env.dom.window.close();
+    }
+});
+
+test('adding, removing and reordering tabs keeps the surviving nodes in the right order', () => {
+    const env = setup([{ id: 'a', title: 'A' }, { id: 'b', title: 'B' }, { id: 'c', title: 'C' }]);
+    try {
+        env.strip.render();
+        const b = env.item('b');
+        const c = env.item('c');
+        env.setTabs([{ id: 'c', title: 'C' }, { id: 'd', title: 'D' }, { id: 'b', title: 'B' }]);
+        env.strip.render();
+        assert.deepEqual(env.order(), ['c', 'd', 'b']);
+        assert.equal(env.item('a'), null);
+        assert.equal(env.item('b'), b);
+        assert.equal(env.item('c'), c);
+    } finally {
+        env.strip.dispose();
+        env.dom.window.close();
+    }
+});
+
+test('render does not measure layout synchronously; it measures once on the next frame', async () => {
+    const env = setup([{ id: 'a', title: 'A' }, { id: 'b', title: 'B' }]);
+    try {
+        env.strip.render();
+        await env.frame();
+        env.resetReads();
+        env.setTabs([{ id: 'a', title: 'A' }, { id: 'b', title: 'B2' }]);
+        env.strip.render();
+        env.strip.render();
+        assert.equal(env.reads(), 0, 'no geometry read inside render');
+        await env.frame();
+        assert.ok(env.reads() > 0, 'layout runs on the next frame');
+    } finally {
+        env.strip.dispose();
+        env.dom.window.close();
+    }
+});
diff --git a/tests/side-pane-tab-strip.test.mjs b/tests/side-pane-tab-strip.test.mjs
index a030e6faf..e1af53d4a 100644
--- a/tests/side-pane-tab-strip.test.mjs
+++ b/tests/side-pane-tab-strip.test.mjs
@@ -328,3 +328,15 @@ test('controller: the overview only offers recently closed tabs that would show
     assert.equal(doc.querySelectorAll('.side-pane-overview-item.recently-closed').length, 2, 'back in topic A both come back');
     controller.dispose();
 });
+
+test('controller: a closed tab overview is not rebuilt on every tab change, and shows fresh titles when opened', async () => {
+    const { controller, doc } = setup({ notes: notesProvider });
+    await controller.openTab({ id: 'n1', kind: 'notes', title: 'N1', scopeMode: 'global' });
+    const list = doc.getElementById('sidePaneOpenTabsList');
+    const before = [...list.children];
+    controller.updateTab('n1', { title: 'Renamed' });
+    assert.ok(before.length > 0 && [...list.children].every((el, i) => el === before[i]), 'the hidden overview list was left alone');
+    doc.getElementById('sidePaneTabOverviewBtn').click();
+    assert.ok(list.textContent.includes('Renamed'), 'opening the overview renders the current titles');
+    await controller.dispose();
+});

From 5447546fb3c171f40477ee34349ffbedbc3d0bf9 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 06:17:19 +0000
Subject: [PATCH 122/143] Side pane batch W: state-machine and lazy-load
 failure edges

- Tabs waiting on a close confirm are treated as busy and never sleep;
  close-owner picks up a view swapped during the confirm.
- A tab hidden or shown while its mount was pending gets the missed
  suspend/resume once the handle exists.
- Lazy providers tell the user when an open call (launcher entry, file
  link, status row) cannot load the implementation.
- Terminal xterm load failures throw into the pane error page so the
  retry button reloads xterm instead of leaving a dead status line.
- A failed openTab puts focus on the retry button, matching where a
  successful open would put it.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DFRovoZHMzeheXKkLNWKG
---
 .../contracts/generated/chat-event-graph.json | 20 +++++-----
 .../side-pane/side-pane-controller.js         | 32 ++++++++++++++--
 .../side-pane/side-pane-tab-close-owner.js    |  6 ++-
 .../ui-system/side-pane/tab-types/browser.js  |  2 +-
 .../side-pane/tab-types/code-viewer.js        |  2 +-
 .../side-pane/tab-types/lazy-provider.js      | 22 ++++++++++-
 .../side-pane/tab-types/model-trajectory.js   |  2 +-
 .../side-pane/tab-types/plan-detail.js        |  2 +-
 .../ui-system/side-pane/tab-types/terminal.js |  2 +-
 .../side-pane/tab-types/tool-output.js        |  2 +-
 .../side-pane/terminalSideProvider.js         |  4 +-
 tests/side-pane-controller.test.mjs           |  2 +
 tests/side-pane-dormancy.test.mjs             | 23 +++++++++++-
 tests/side-pane-occurrence.test.mjs           | 37 +++++++++++++++++++
 tests/side-pane-terminal-lifecycle.test.mjs   | 24 ++++++++++--
 15 files changed, 152 insertions(+), 30 deletions(-)

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 00588f69e..f3f90e5dd 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -4337,22 +4337,22 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 501,
+          "line": 502,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1174,
+          "line": 1200,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1180,
+          "line": 1206,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1194,
+          "line": 1220,
           "kind": "custom-event-listener"
         },
         {
@@ -5935,25 +5935,25 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 501,
+          "line": 502,
           "kind": "custom-event-listener",
           "match": "retry.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1174,
+          "line": 1200,
           "kind": "custom-event-listener",
           "match": "toggleNotificationsBtn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1180,
+          "line": 1206,
           "kind": "custom-event-listener",
           "match": "expandButton.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1194,
+          "line": 1220,
           "kind": "custom-event-listener",
           "match": "closeSidePaneBtn.addEventListener('click'"
         },
@@ -25085,7 +25085,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1214,
+          "line": 1240,
           "kind": "custom-event-listener"
         },
         {
@@ -25185,7 +25185,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1214,
+          "line": 1240,
           "kind": "custom-event-listener",
           "match": "win?.addEventListener?.('resize'"
         },
diff --git a/modules/ui-system/side-pane/side-pane-controller.js b/modules/ui-system/side-pane/side-pane-controller.js
index b2ae8cc5c..4c6ddac2e 100644
--- a/modules/ui-system/side-pane/side-pane-controller.js
+++ b/modules/ui-system/side-pane/side-pane-controller.js
@@ -378,9 +378,10 @@ export function createSidePaneController({
         mountedTabMap.forEach((entry, tabId) => {
             const tab = state.tabs.find(t => t.id === tabId);
             if (!tab) return;
-            let busy = false;
+            // 正在关（确认框还开着）的标签不休眠，否则确认之后视图已经没了（同 ZCode residency policy 不淘汰进行中的操作）
+            let busy = tabCloseOwner.isClosing(tabId);
             try {
-                busy = entry.handle?.isBusy?.() === true;
+                busy = busy || entry.handle?.isBusy?.() === true;
             } catch (error) {
                 console.error(`[SidePaneController] Failed to ask tab "${tabId}" whether it is busy:`, error);
                 busy = true;
@@ -543,6 +544,7 @@ export function createSidePaneController({
             const viewScope = tabOccurrence.openView();
             // 挂载前先给出可见性，provider 一开始就知道要不要起轮询
             tabOccurrence.setVisible(isTabShown(tabId));
+            const visibleAtMount = tabOccurrence.occurrence.isVisible();
 
             const dormant = dormantTabs.get(tabId);
             let handle = null;
@@ -578,6 +580,16 @@ export function createSidePaneController({
             const entry = { payload, viewElement: view, handle, onClosed, occurrence: tabOccurrence };
             mountedTabMap.set(tabId, entry);
             if (dormantTabs.get(tabId) === dormant) dormantTabs.delete(tabId);
+            // 挂载期间可见性变了（折叠侧栏、切走标签）时 handle 还不在，那次 suspend/resume 落空了，这里补上
+            const visibleNow = tabOccurrence.occurrence.isVisible();
+            if (visibleNow !== visibleAtMount) {
+                try {
+                    if (visibleNow) handle?.resume?.();
+                    else handle?.suspend?.();
+                } catch (error) {
+                    console.error(`[SidePaneController] Failed to ${visibleNow ? 'resume' : 'suspend'} tab "${tabId}":`, error);
+                }
+            }
             return entry;
         })();
 
@@ -640,6 +652,14 @@ export function createSidePaneController({
         return entry?.handle || null;
     }
 
+    // 打开失败时焦点和打开成功一样落到新标签上：那里只有出错页，就落在重试按钮上（键盘用户不用摸回去）
+    function focusMountFailure(tabId, origin) {
+        if (isDisposed || !state.visible || state.activeTabId !== tabId) return;
+        const focusUnchanged = doc.activeElement === origin
+            || (doc.activeElement === doc.body && origin && !origin.isConnected);
+        if (focusUnchanged) failedMounts.get(tabId)?.querySelector?.('.side-pane-mount-error-retry')?.focus?.();
+    }
+
     // 临时标签（如辅助对话）不进“最近关闭”，其他标签都能重新打开
     function rememberClosed(tabObj) {
         if (tabObj.ephemeral || tabObj.reopenable === false || getTabType(tabObj.kind)?.reopenable === false) return;
@@ -891,7 +911,13 @@ export function createSidePaneController({
             // 标签条已经切过去了，面板和内容区同一刻跟上，不等挂载完（慢的挂载期间不会是新标签配旧内容、或标签亮着面板却收着）
             syncViewPanels();
             syncDomVisibility();
-            const entry = await mounting;
+            let entry;
+            try {
+                entry = await mounting;
+            } catch (error) {
+                focusMountFailure(targetTabId, origin);
+                throw error;
+            }
             return finishOpen(targetTabId, entry, origin);
         },
 
diff --git a/modules/ui-system/side-pane/side-pane-tab-close-owner.js b/modules/ui-system/side-pane/side-pane-tab-close-owner.js
index 50245d63b..cf6892c1b 100644
--- a/modules/ui-system/side-pane/side-pane-tab-close-owner.js
+++ b/modules/ui-system/side-pane/side-pane-tab-close-owner.js
@@ -53,7 +53,9 @@ export function createSidePaneTabCloseOwner({
             if (entry && !options.discard) {
                 const result = await entry.handle?.requestClose?.();
                 if (result?.closed === false) return;
-                if (isDisposed() || getEntry(tabId) !== entry) return;
+                if (isDisposed()) return;
+                // 确认期间视图换了（休眠释放、又挂上）：用户已经同意关闭，按现在的样子关；标签本身换了由下面的 lifetime 检查拦住
+                if (getEntry(tabId) !== entry) entry = getEntry(tabId) || null;
             } else if (!entry && !options.discard) {
                 // 没挂载过的标签（恢复后还没显示的辅助对话）没有 handle 可问，由类型自己确认：
                 // 否则在「关闭其他 / 全部」里它们会不经确认就被删掉
@@ -102,5 +104,5 @@ export function createSidePaneTabCloseOwner({
         await Promise.allSettled([...retiring]);
     }
 
-    return { closeTab, closeTabs, getLifetime, forgetLifetime: tabId => lifetimes.delete(tabId), disposeEntry, dispose };
+    return { closeTab, closeTabs, getLifetime, isClosing: tabId => closing.has(tabId), forgetLifetime: tabId => lifetimes.delete(tabId), disposeEntry, dispose };
 }
diff --git a/modules/ui-system/side-pane/tab-types/browser.js b/modules/ui-system/side-pane/tab-types/browser.js
index a8ebd0ad4..c95b513c9 100644
--- a/modules/ui-system/side-pane/tab-types/browser.js
+++ b/modules/ui-system/side-pane/tab-types/browser.js
@@ -4,7 +4,7 @@ export function defineBrowserTabType({ document: doc, window: win, chatAPI, side
     const provider = createLazyProvider(async () => {
         const { createBrowserSideProvider } = await import('../browserSideProvider.js');
         return createBrowserSideProvider({ document: doc, api: chatAPI || win.electronAPI, sidePaneController });
-    }, ['openBrowserTab']);
+    }, ['openBrowserTab'], { label: '浏览器' });
     return Object.freeze({
         kind: 'browser', label: '浏览器', icon: 'public', searchHint: '浏览器', provider,
         dormancy: 'limit-only',
diff --git a/modules/ui-system/side-pane/tab-types/code-viewer.js b/modules/ui-system/side-pane/tab-types/code-viewer.js
index 590ed4af9..d2f5a9b40 100644
--- a/modules/ui-system/side-pane/tab-types/code-viewer.js
+++ b/modules/ui-system/side-pane/tab-types/code-viewer.js
@@ -4,7 +4,7 @@ export function defineCodeViewerTabType({ document: doc, window: win, chatAPI, s
     const provider = createLazyProvider(async () => {
         const { createCodeViewerSideProvider } = await import('../codeViewerSideProvider.js');
         return createCodeViewerSideProvider({ document: doc, api: chatAPI || win.utilityAPI || win.electronAPI, sidePaneController, uiHelper });
-    }, ['openViewer']);
+    }, ['openViewer'], { label: '代码查看', notify: (message, type) => uiHelper?.showToastNotification?.(message, type) });
     const label = '代码查看';
     const icon = 'code';
     return Object.freeze({
diff --git a/modules/ui-system/side-pane/tab-types/lazy-provider.js b/modules/ui-system/side-pane/tab-types/lazy-provider.js
index 08cf9b495..1a7af2505 100644
--- a/modules/ui-system/side-pane/tab-types/lazy-provider.js
+++ b/modules/ui-system/side-pane/tab-types/lazy-provider.js
@@ -6,8 +6,10 @@
 /**
  * @param {() => Promise<object> | object} load 返回真正的 provider
  * @param {string[]} [methods] 除 mountTab 外需要转发的方法（都按异步处理）
+ * @param {{ label?: string, notify?: (message: string, type: string) => void }} [options]
+ *   转发方法（入口按钮、文件链接等）加载失败时提示用户；mountTab 失败由侧栏的出错页负责
  */
-export function createLazyProvider(load, methods = []) {
+export function createLazyProvider(load, methods = [], { label = '', notify = null } = {}) {
     let loading = null;
     let loaded = null;
     const resolve = () => {
@@ -28,8 +30,24 @@ export function createLazyProvider(load, methods = []) {
         load: resolve,
         mountTab: async (...args) => (await resolve()).mountTab(...args)
     };
+    const reportLoadFailure = (error) => {
+        const fn = notify || globalThis.uiHelperFunctions?.showToastNotification;
+        try {
+            fn?.(`${label || '标签页'}加载失败：${error?.message || error}`, 'error');
+        } catch (_error) { /* 提示失败不影响把原错误抛回去 */ }
+    };
     for (const name of methods) {
-        proxy[name] = async (...args) => (await resolve())[name](...args);
+        proxy[name] = async (...args) => {
+            let provider;
+            try {
+                provider = await resolve();
+            } catch (error) {
+                // 点了没反应最难受：至少告诉用户哪个功能没加载出来，下次再点会重新加载
+                reportLoadFailure(error);
+                throw error;
+            }
+            return provider[name](...args);
+        };
     }
     return Object.freeze(proxy);
 }
diff --git a/modules/ui-system/side-pane/tab-types/model-trajectory.js b/modules/ui-system/side-pane/tab-types/model-trajectory.js
index 82e21296b..c45c61768 100644
--- a/modules/ui-system/side-pane/tab-types/model-trajectory.js
+++ b/modules/ui-system/side-pane/tab-types/model-trajectory.js
@@ -8,7 +8,7 @@ export function defineModelTrajectoryTabType({ document: doc, window: win, chatA
             getConversation: () => ({ item: selectedItemRef.get(), topicId: topicIdRef.get() }),
             onConversationChange: (callback) => chatManager?.onSelectionChange?.(callback)
         });
-    }, ['openModelTrajectoryTab']);
+    }, ['openModelTrajectoryTab'], { label: '调用轨迹', notify: (message, type) => uiHelper?.showToastNotification?.(message, type) });
     return Object.freeze({
         kind: 'model-trajectory', label: '调用轨迹', icon: 'monitoring', searchHint: '模型调用 请求 响应 token 轨迹',
         entry: { id: 'model-trajectory', order: 65, open: () => provider.openModelTrajectoryTab() },
diff --git a/modules/ui-system/side-pane/tab-types/plan-detail.js b/modules/ui-system/side-pane/tab-types/plan-detail.js
index 0cdf8f7dd..8705668d6 100644
--- a/modules/ui-system/side-pane/tab-types/plan-detail.js
+++ b/modules/ui-system/side-pane/tab-types/plan-detail.js
@@ -26,7 +26,7 @@ export function definePlanDetailTabType({ document: doc, window: win, chatAPI, s
             });
             return () => { win.clearTimeout(timer); off(); };
         }
-    }), ['openPlanDetailTab']);
+    }), ['openPlanDetailTab'], { label: 'V工程计划', notify: (message, type) => uiHelper?.showToastNotification?.(message, type) });
     return Object.freeze({
         kind: 'plan-detail', label: 'V工程计划', icon: 'checklist', searchHint: '计划', provider,
         entry: { id: 'plan-detail', order: 70, open: () => provider.openPlanDetailTab() }
diff --git a/modules/ui-system/side-pane/tab-types/terminal.js b/modules/ui-system/side-pane/tab-types/terminal.js
index bdc9f3a0f..12f5d4de7 100644
--- a/modules/ui-system/side-pane/tab-types/terminal.js
+++ b/modules/ui-system/side-pane/tab-types/terminal.js
@@ -4,7 +4,7 @@ export function defineTerminalTabType({ document: doc, window: win, chatAPI, sid
     const provider = createLazyProvider(async () => {
         const { createTerminalSideProvider } = await import('../terminalSideProvider.js');
         return createTerminalSideProvider({ document: doc, api: chatAPI || win.electronAPI, sidePaneController, onOpenUrl });
-    }, ['openTerminalTab']);
+    }, ['openTerminalTab'], { label: '终端', notify: (message, type) => uiHelper?.showToastNotification?.(message, type) });
     return Object.freeze({
         kind: 'terminal', label: '终端', icon: 'terminal', searchHint: '终端',
         // 重启后不自动拉起新的 shell
diff --git a/modules/ui-system/side-pane/tab-types/tool-output.js b/modules/ui-system/side-pane/tab-types/tool-output.js
index 2be870511..cd9b9c4f2 100644
--- a/modules/ui-system/side-pane/tab-types/tool-output.js
+++ b/modules/ui-system/side-pane/tab-types/tool-output.js
@@ -4,7 +4,7 @@ export function defineToolOutputTabType({ document: doc, window: win, chatAPI, s
     const provider = createLazyProvider(async () => {
         const { createToolOutputSideProvider } = await import('../toolOutputSideProvider.js');
         return createToolOutputSideProvider({ document: doc, api: chatAPI || win.electronAPI, sidePaneController, uiHelper });
-    }, ['openToolOutputTab']);
+    }, ['openToolOutputTab'], { label: '命令输出', notify: (message, type) => uiHelper?.showToastNotification?.(message, type) });
     return Object.freeze({
         kind: 'tool-output', label: '命令输出', icon: 'description', searchHint: '命令输出',
         // 命令记录只在内存里，重启后没有可看的
diff --git a/modules/ui-system/side-pane/terminalSideProvider.js b/modules/ui-system/side-pane/terminalSideProvider.js
index ba6c56c7a..5a06edca6 100644
--- a/modules/ui-system/side-pane/terminalSideProvider.js
+++ b/modules/ui-system/side-pane/terminalSideProvider.js
@@ -418,8 +418,8 @@ export function createTerminalSideProvider({
                 try {
                     xterm = await xtermLoader(doc);
                 } catch (err) {
-                    renderStatus({ text: `终端组件加载失败: ${err?.message || err}`, state: 'error' });
-                    return { focus() {}, dispose() { viewElement.innerHTML = ''; } };
+                    // 交给侧栏的出错页：带重试按钮，重试会重新加载 xterm，不用关掉标签再开
+                    throw new Error(`终端组件加载失败：${err?.message || err}`, { cause: err });
                 }
                 if (occurrence?.signal?.aborted) return null;
                 session = createSession(xterm, occurrence?.signal || null);
diff --git a/tests/side-pane-controller.test.mjs b/tests/side-pane-controller.test.mjs
index e47dbabfb..d6b54261d 100644
--- a/tests/side-pane-controller.test.mjs
+++ b/tests/side-pane-controller.test.mjs
@@ -318,6 +318,8 @@ test('a failed mount shows an error with a retry instead of a blank pane', async
         assert.equal(views[0].hidden, false, 'the failed tab stays the visible one');
         assert.equal(views[0].querySelector('[role="alert"]').textContent.includes('mount failed'), true);
         assert.equal(views[0].textContent.includes('half drawn'), false, 'what the provider half drew is cleared');
+        assert.equal(root.ownerDocument.activeElement, views[0].querySelector('.side-pane-mount-error-retry'),
+            'focus lands on the retry button like it would on a tab that opened');
 
         views[0].querySelector('.side-pane-mount-error-retry').click();
         await new Promise(resolve => setTimeout(resolve, 0));
diff --git a/tests/side-pane-dormancy.test.mjs b/tests/side-pane-dormancy.test.mjs
index 3f97ab539..7fb08de64 100644
--- a/tests/side-pane-dormancy.test.mjs
+++ b/tests/side-pane-dormancy.test.mjs
@@ -71,6 +71,7 @@ function fixture(dormancy) {
     const root = doc.getElementById('vcpSidePane');
     const mounts = [];
     const busy = new Set();
+    const closeAnswers = new Map(); // tabId → 关闭确认的 promise（模拟确认框还开着）
     const provider = {
         mountTab(payload, view, context) {
             const record = { id: payload.id, view, context, restoredState: context.restoredState, disposed: 0, counter: 0 };
@@ -79,6 +80,7 @@ function fixture(dormancy) {
             return {
                 isBusy: () => busy.has(payload.id),
                 captureState: () => ({ counter: record.counter }),
+                requestClose: () => closeAnswers.get(payload.id) || { closed: true },
                 dispose() { record.disposed++; }
             };
         }
@@ -94,7 +96,7 @@ function fixture(dormancy) {
     controller.registerTabType({ kind: 'pinned', label: 'Pinned', provider, dormancy: 'keep' });
     const live = id => mounts.filter(m => m.id === id && !m.disposed);
     return {
-        controller, mounts, busy, live,
+        controller, mounts, busy, live, closeAnswers,
         residency: () => controller.getViewResidency(),
         async cleanup() { await controller.dispose(); dom.window.close(); }
     };
@@ -285,3 +287,22 @@ test('collapsing the pane does not put the current tab to sleep', async () => {
         assert.equal(h.mounts.length, 1, 'expanding again shows the same view');
     } finally { await h.cleanup(); }
 });
+
+test('a tab whose close is waiting on the confirm dialog does not sleep, and closes once confirmed', async () => {
+    const h = fixture({ hiddenMs: 30 });
+    try {
+        await h.controller.openTab(tab('probe:a'));
+        await h.controller.openTab(tab('probe:b'));
+        const answer = Promise.withResolvers();
+        h.closeAnswers.set('probe:a', answer.promise);
+        const closing = h.controller.closeTab('probe:a');
+        await sleep(80); // 隐藏到期的检查在确认框开着时到了
+        assert.deepEqual(h.residency().dormant, [], 'the tab being closed is not put to sleep');
+        answer.resolve({ closed: true });
+        await closing;
+        assert.equal(h.controller.getSnapshot().tabs.some(t => t.id === 'probe:a'), false);
+        assert.equal(h.mounts[0].disposed, 1);
+    } finally {
+        await h.cleanup();
+    }
+});
diff --git a/tests/side-pane-occurrence.test.mjs b/tests/side-pane-occurrence.test.mjs
index 21e96a5cc..4a5ee735c 100644
--- a/tests/side-pane-occurrence.test.mjs
+++ b/tests/side-pane-occurrence.test.mjs
@@ -262,6 +262,17 @@ test('lazy providers load once on first use and retry after a failed load', asyn
     assert.equal(provider.isLoaded(), true);
 });
 
+test('a lazy provider tells the user when an open call cannot load its implementation', async () => {
+    const notices = [];
+    const provider = createLazyProvider(async () => { throw new Error('chunk missing'); }, ['openThing'], {
+        label: '终端', notify: (message, type) => notices.push({ message, type })
+    });
+    await assert.rejects(provider.openThing(), /chunk missing/);
+    assert.deepEqual(notices, [{ message: '终端加载失败：chunk missing', type: 'error' }]);
+    await assert.rejects(provider.mountTab(), /chunk missing/);
+    assert.equal(notices.length, 1, 'mount failures are left to the pane error page');
+});
+
 test('tab types can declare load() instead of an eager provider', async () => {
     const { dom, options } = createPaneDom();
     let loads = 0;
@@ -277,3 +288,29 @@ test('tab types can declare load() instead of an eager provider', async () => {
     await controller.dispose();
     dom.window.close();
 });
+
+test('a tab collapsed while its mount is still pending is suspended once the mount lands', async () => {
+    const { dom, options } = createPaneDom();
+    const record = { suspends: 0, resumes: 0 };
+    let release;
+    const gate = new Promise(resolve => { release = resolve; });
+    const provider = {
+        async mountTab() {
+            await gate;
+            return { suspend() { record.suspends++; }, resume() { record.resumes++; } };
+        }
+    };
+    const controller = createSidePaneController({ ...options, providers: { probe: provider } });
+    controller.setVisible(true);
+    const opening = controller.openTab(tabOf('probe:slow'));
+    await Promise.resolve();
+    controller.setVisible(false);
+    release();
+    await opening;
+    assert.equal(record.suspends, 1, 'the suspend missed during the mount is delivered');
+
+    controller.setVisible(true);
+    assert.equal(record.resumes, 1);
+    await controller.dispose();
+    dom.window.close();
+});
diff --git a/tests/side-pane-terminal-lifecycle.test.mjs b/tests/side-pane-terminal-lifecycle.test.mjs
index 90b90cd75..34c82952f 100644
--- a/tests/side-pane-terminal-lifecycle.test.mjs
+++ b/tests/side-pane-terminal-lifecycle.test.mjs
@@ -12,13 +12,13 @@ async function until(predicate) {
     }
 }
 
-function fixture({ create = async () => ({ success: true, data: { id: 'view:1', pid: 42 } }), restart, dormancy, onOpenUrl = null } = {}) {
+function fixture({ create = async () => ({ success: true, data: { id: 'view:1', pid: 42 } }), restart, dormancy, onOpenUrl = null, failXtermLoads = 0 } = {}) {
     const dom = new JSDOM('<input id="mainInput"><aside><div class="side-pane-tabs"></div><div class="side-pane-content-container"></div></aside>');
     const doc = dom.window.document, root = doc.querySelector('aside');
     const controller = createSidePaneController({ root, tabListElement: root.querySelector('.side-pane-tabs'),
         contentContainer: root.querySelector('.side-pane-content-container'), dormancy });
     const terminals = [], killed = [], creates = [], restarts = [], listeners = new Map();
-    let unsubscriptions = 0, confirmations = 0;
+    let unsubscriptions = 0, confirmations = 0, xtermLoads = 0;
     dom.window.confirm = () => { confirmations++; return true; };
     class Terminal {
         constructor(options) { this.options = options; this.cols = 80; this.rows = 24; this.output = []; this.disposals = 0; terminals.push(this); }
@@ -44,10 +44,14 @@ function fixture({ create = async () => ({ success: true, data: { id: 'view:1',
         onTerminalData: subscribe('data'), onTerminalClear: subscribe('clear'), onTerminalExit: subscribe('exit')
     };
     const provider = createTerminalSideProvider({ document: doc, api, sidePaneController: controller,
-        xtermLoader: async () => ({ Terminal, FitAddon: null }), onOpenUrl });
+        xtermLoader: async () => {
+            xtermLoads++;
+            if (xtermLoads <= failXtermLoads) throw new Error('无法加载 xterm.js');
+            return { Terminal, FitAddon: null };
+        }, onOpenUrl });
     controller.registerProvider('terminal', provider);
     return { dom, controller, provider, doc, terminals, killed, creates, restarts, listeners,
-        get unsubscriptions() { return unsubscriptions; }, get confirmations() { return confirmations; },
+        get unsubscriptions() { return unsubscriptions; }, get xtermLoads() { return xtermLoads; }, get confirmations() { return confirmations; },
         status: () => root.querySelector('.side-terminal-status'),
         retry: () => root.querySelector('[aria-label="重新启动终端"]'),
         screen: () => doc.querySelector('.side-terminal-screen'),
@@ -55,6 +59,18 @@ function fixture({ create = async () => ({ success: true, data: { id: 'view:1',
         async cleanup() { await controller.dispose(); dom.window.close(); } };
 }
 
+test('a failed xterm load shows the pane retry page and retrying loads it again', async () => {
+    const h = fixture({ failXtermLoads: 1 });
+    await assert.rejects(h.provider.openTerminalTab(), /终端组件加载失败/);
+    const retry = h.doc.querySelector('.side-pane-mount-error-retry');
+    assert.ok(retry, 'the tab stays open on the retry page instead of a dead status line');
+    assert.equal(h.creates.length, 0);
+    retry.click();
+    await until(() => h.creates.length === 1 && !h.doc.querySelector('.side-pane-mount-error-retry'));
+    assert.equal(h.xtermLoads, 2);
+    await h.cleanup();
+});
+
 test('rejected terminal creation leaves a retryable mounted view and releases its resources', async () => {
     let calls = 0;
     const h = fixture({ create: async () => {

From 74c44a4ea907a7733a56adea844426875b8c9339 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 06:32:17 +0000
Subject: [PATCH 123/143] Workspaces: only the main window may add, change or
 remove workspaces

Workspaces decide which directories the Git, code viewer and terminal side
panes can touch, expand into the system prompt and resolve file references,
but their mutating IPC accepted any sender. The voice and assistant windows
load the same chat preload, so a page there could register any directory.
Mutations now use the same application sender guard as the Git, source and
terminal handlers; reads stay open to those windows.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_016hW799u5Ji5k9khDAwu688
---
 .../contracts/generated/chat-event-graph.json | 52 ++++++++--------
 main.js                                       |  2 +-
 modules/ipc/workspaceHandlers.js              | 26 +++++---
 package.json                                  |  2 +-
 tests/workspace-handlers-sender.test.js       | 61 +++++++++++++++++++
 5 files changed, 108 insertions(+), 35 deletions(-)
 create mode 100644 tests/workspace-handlers-sender.test.js

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index e314dae27..b8c4001dc 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -27206,7 +27206,7 @@
         },
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 105,
+          "line": 110,
           "kind": "event-listener"
         },
         {
@@ -27230,7 +27230,7 @@
         },
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 105,
+          "line": 110,
           "kind": "event-listener",
           "match": "settingsManager.on?.('settings-external-updated'"
         },
@@ -27284,7 +27284,7 @@
         },
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 104,
+          "line": 109,
           "kind": "event-listener"
         }
       ],
@@ -27297,7 +27297,7 @@
         },
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 104,
+          "line": 109,
           "kind": "event-listener",
           "match": "settingsManager.on?.('settings-updated'"
         },
@@ -32213,14 +32213,14 @@
       "consumers": [
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 149,
+          "line": 156,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 149,
+          "line": 156,
           "kind": "event-listener",
           "match": "ipcMain.handle('workspaces:add'"
         },
@@ -32244,14 +32244,14 @@
       "consumers": [
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 204,
+          "line": 214,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 204,
+          "line": 214,
           "kind": "event-listener",
           "match": "ipcMain.handle('workspaces:expand-placeholders'"
         },
@@ -32275,14 +32275,14 @@
       "consumers": [
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 213,
+          "line": 223,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 213,
+          "line": 223,
           "kind": "event-listener",
           "match": "ipcMain.handle('workspaces:get-prompt-settings'"
         },
@@ -32306,14 +32306,14 @@
       "consumers": [
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 113,
+          "line": 118,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 113,
+          "line": 118,
           "kind": "event-listener",
           "match": "ipcMain.handle('workspaces:list'"
         },
@@ -32337,14 +32337,14 @@
       "consumers": [
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 141,
+          "line": 147,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 141,
+          "line": 147,
           "kind": "event-listener",
           "match": "ipcMain.handle('workspaces:rebuild'"
         },
@@ -32368,14 +32368,14 @@
       "consumers": [
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 170,
+          "line": 178,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 170,
+          "line": 178,
           "kind": "event-listener",
           "match": "ipcMain.handle('workspaces:remove'"
         },
@@ -32399,14 +32399,14 @@
       "consumers": [
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 129,
+          "line": 135,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 129,
+          "line": 135,
           "kind": "event-listener",
           "match": "ipcMain.handle('workspaces:search'"
         },
@@ -32430,14 +32430,14 @@
       "consumers": [
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 233,
+          "line": 244,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 233,
+          "line": 244,
           "kind": "event-listener",
           "match": "ipcMain.handle('workspaces:select-directory'"
         },
@@ -32461,14 +32461,14 @@
       "consumers": [
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 115,
+          "line": 120,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 115,
+          "line": 120,
           "kind": "event-listener",
           "match": "ipcMain.handle('workspaces:set-active'"
         },
@@ -32492,14 +32492,14 @@
       "consumers": [
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 215,
+          "line": 225,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 215,
+          "line": 225,
           "kind": "event-listener",
           "match": "ipcMain.handle('workspaces:set-prompt-settings'"
         },
@@ -32523,14 +32523,14 @@
       "consumers": [
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 179,
+          "line": 188,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 179,
+          "line": 188,
           "kind": "event-listener",
           "match": "ipcMain.handle('workspaces:update'"
         },
diff --git a/main.js b/main.js
index b1c6d4c66..dc71fc4c7 100644
--- a/main.js
+++ b/main.js
@@ -1514,7 +1514,7 @@ if (!gotTheLock) {
             SETTINGS_FILE
         });
         // 工作区索引在后台预热，不阻塞首屏。
-        workspaceHandlers.initialize({ settingsManager: appSettingsManager, logger: console });
+        workspaceHandlers.initialize({ settingsManager: appSettingsManager, logger: console, getMainWindow: () => mainWindow });
         stateSubscriptions.registerIpc(ipcMain, createApplicationSenderGuard({
             pages: ['main.html', 'ProjectForgemodules/projectforge.html'],
             getMainWebContents: () => resolveWindowWebContents(() => mainWindow),
diff --git a/modules/ipc/workspaceHandlers.js b/modules/ipc/workspaceHandlers.js
index 8bf589153..8ba2879b8 100644
--- a/modules/ipc/workspaceHandlers.js
+++ b/modules/ipc/workspaceHandlers.js
@@ -8,6 +8,7 @@ const { ipcMain, dialog, BrowserWindow } = require('electron');
 const path = require('path');
 const fs = require('fs-extra');
 const fileManager = require('../fileManager');
+const { createApplicationSenderGuard, resolveWindowWebContents } = require('./applicationSender');
 const { WorkspaceIndex, normalizeWorkspaceList, sanitizeAlias } = require('../services/workspaceIndex');
 const {
     normalizePromptSettings,
@@ -36,6 +37,9 @@ let activeWorkspaceId = null;
 let promptSettings = normalizePromptSettings(null);
 let settingsListener = null;
 let externalSettingsListener = null;
+// 增删改工作区只认主窗口：工作区决定 Git、代码查看和终端能碰哪些目录，也会展开进系统提示、
+// 解析文件引用；同样带 chat preload 的语音、助手窗口只读（列表、搜索、展开占位符）。同 git/source/terminal 的守卫
+let isAllowedSender = () => false;
 
 function getWorkspaceIndex() {
     return workspaceIndex;
@@ -90,7 +94,8 @@ async function mutateWorkspaces(mutator) {
     return workspaceIndex.list();
 }
 
-function initialize({ settingsManager, logger = console } = {}) {
+function initialize({ settingsManager, logger = console, getMainWindow = null } = {}) {
+    isAllowedSender = createApplicationSenderGuard({ getMainWebContents: () => resolveWindowWebContents(getMainWindow) });
     settingsManagerRef = settingsManager;
     workspaceIndex?.dispose();
     workspaceIndex = new WorkspaceIndex({ logger });
@@ -112,7 +117,8 @@ function initialize({ settingsManager, logger = console } = {}) {
 
     ipcMain.handle('workspaces:list', () => ({ success: true, ...snapshot() }));
 
-    ipcMain.handle('workspaces:set-active', async (_event, workspaceId = null) => {
+    ipcMain.handle('workspaces:set-active', async (event, workspaceId = null) => {
+        if (!isAllowedSender(event)) return { success: false, error: '当前窗口无权修改工作区。' };
         try {
             const target = typeof workspaceId === 'string' && workspaceId ? workspaceId : null;
             if (target && !workspaceIndex.list().some(ws => ws.id === target && ws.enabled)) {
@@ -138,7 +144,8 @@ function initialize({ settingsManager, logger = console } = {}) {
         }
     });
 
-    ipcMain.handle('workspaces:rebuild', async (_event, workspaceId = null) => {
+    ipcMain.handle('workspaces:rebuild', async (event, workspaceId = null) => {
+        if (!isAllowedSender(event)) return { success: false, error: '当前窗口无权修改工作区。' };
         try {
             return { success: true, workspaces: await workspaceIndex.rebuild(workspaceId || null) };
         } catch (error) {
@@ -146,7 +153,8 @@ function initialize({ settingsManager, logger = console } = {}) {
         }
     });
 
-    ipcMain.handle('workspaces:add', async (_event, rawPath, alias = '') => {
+    ipcMain.handle('workspaces:add', async (event, rawPath, alias = '') => {
+        if (!isAllowedSender(event)) return { success: false, error: '当前窗口无权修改工作区。' };
         try {
             if (typeof rawPath !== 'string' || !rawPath.trim()) {
                 return { success: false, error: '请提供工作区目录路径。' };
@@ -167,7 +175,8 @@ function initialize({ settingsManager, logger = console } = {}) {
         }
     });
 
-    ipcMain.handle('workspaces:remove', async (_event, workspaceId) => {
+    ipcMain.handle('workspaces:remove', async (event, workspaceId) => {
+        if (!isAllowedSender(event)) return { success: false, error: '当前窗口无权修改工作区。' };
         try {
             const workspaces = await mutateWorkspaces(list => list.filter(item => item.id !== workspaceId));
             return { success: true, workspaces };
@@ -176,7 +185,8 @@ function initialize({ settingsManager, logger = console } = {}) {
         }
     });
 
-    ipcMain.handle('workspaces:update', async (_event, workspaceId, patch = {}) => {
+    ipcMain.handle('workspaces:update', async (event, workspaceId, patch = {}) => {
+        if (!isAllowedSender(event)) return { success: false, error: '当前窗口无权修改工作区。' };
         try {
             let conflict = null;
             const workspaces = await mutateWorkspaces(list => list.map(item => {
@@ -212,7 +222,8 @@ function initialize({ settingsManager, logger = console } = {}) {
 
     ipcMain.handle('workspaces:get-prompt-settings', () => ({ success: true, settings: getPromptSettings() }));
 
-    ipcMain.handle('workspaces:set-prompt-settings', async (_event, patch = {}) => {
+    ipcMain.handle('workspaces:set-prompt-settings', async (event, patch = {}) => {
+        if (!isAllowedSender(event)) return { success: false, error: '当前窗口无权修改工作区。' };
         try {
             if (!settingsManagerRef) throw new Error('SettingsManager 未初始化。');
             const source = patch && typeof patch === 'object' && !Array.isArray(patch) ? patch : {};
@@ -231,6 +242,7 @@ function initialize({ settingsManager, logger = console } = {}) {
     });
 
     ipcMain.handle('workspaces:select-directory', async event => {
+        if (!isAllowedSender(event)) return { success: false, error: '当前窗口无权修改工作区。' };
         const owner = BrowserWindow.fromWebContents(event.sender) || undefined;
         const result = await dialog.showOpenDialog(owner, {
             title: '选择工作区目录',
diff --git a/package.json b/package.json
index 6e6eb70ed..27dc5d440 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
     "test:built-artifact-smoke": "node scripts/test-built-artifact-smoke.mjs",
     "test:chat-transcript-snapshot": "node scripts/test-chat-transcript-snapshot.mjs",
     "test:side-pane": "node --test tests/side-pane-*.test.mjs tests/side-chat-*.test.mjs tests/side-browser-address.test.mjs tests/side-plan-revert-confirmation.test.mjs tests/sidebar-resizer-lifecycle.test.mjs tests/conversation-status-panel.test.mjs tests/domain-activator.test.js tests/browser-handlers.test.js tests/git-service.test.js tests/git-watcher.test.js tests/git-file-diff.test.mjs tests/git-changes-source.test.mjs tests/git-workspace-source.test.mjs",
-    "test:workbench": "node --test tests/terminal-cd-command.test.js tests/side-chat-save-failure.test.mjs tests/history-mutation-queue.test.cjs tests/side-chat-regenerate-busy.test.mjs tests/conversation-current-source.test.mjs tests/conversation-scope.test.mjs tests/conversation-status-races.test.mjs tests/design-system-boundary.test.mjs tests/group-chat-url.test.js tests/group-stream-watchdog.test.js tests/line-diff-budget.test.mjs tests/main-composer-commands.test.mjs tests/message-file-changes-projectforge.test.mjs tests/message-file-changes.test.mjs tests/messenger-presentation.test.mjs tests/model-trajectory-handlers.test.js tests/model-trajectory-model.test.mjs tests/model-trajectory-recorder.test.js tests/notification-center.test.js tests/popover-window-blur.test.mjs tests/projectforge-changes-source.test.mjs tests/selection-reference.test.mjs tests/shared-source.test.mjs tests/source-handlers-sender.test.js tests/state-subscriptions.test.js tests/terminal-command-run-watch.test.js tests/terminal-native-helper.test.js tests/terminal-package-closure.test.js tests/tool-approval-card-enhancement.test.mjs tests/tool-presentation-settings.test.cjs tests/tool-presentation.test.mjs tests/tool-request-malformed-marker.test.mjs",
+    "test:workbench": "node --test tests/terminal-cd-command.test.js tests/workspace-handlers-sender.test.js tests/side-chat-save-failure.test.mjs tests/history-mutation-queue.test.cjs tests/side-chat-regenerate-busy.test.mjs tests/conversation-current-source.test.mjs tests/conversation-scope.test.mjs tests/conversation-status-races.test.mjs tests/design-system-boundary.test.mjs tests/group-chat-url.test.js tests/group-stream-watchdog.test.js tests/line-diff-budget.test.mjs tests/main-composer-commands.test.mjs tests/message-file-changes-projectforge.test.mjs tests/message-file-changes.test.mjs tests/messenger-presentation.test.mjs tests/model-trajectory-handlers.test.js tests/model-trajectory-model.test.mjs tests/model-trajectory-recorder.test.js tests/notification-center.test.js tests/popover-window-blur.test.mjs tests/projectforge-changes-source.test.mjs tests/selection-reference.test.mjs tests/shared-source.test.mjs tests/source-handlers-sender.test.js tests/state-subscriptions.test.js tests/terminal-command-run-watch.test.js tests/terminal-native-helper.test.js tests/terminal-package-closure.test.js tests/tool-approval-card-enhancement.test.mjs tests/tool-presentation-settings.test.cjs tests/tool-presentation.test.mjs tests/tool-request-malformed-marker.test.mjs",
     "check:chat-evidence": "node scripts/check-chat-evidence.mjs",
     "check:chat-release-evidence": "node scripts/check-chat-release-evidence.mjs",
     "write:chat-evidence-manifest": "node scripts/write-chat-evidence-manifest.mjs",
diff --git a/tests/workspace-handlers-sender.test.js b/tests/workspace-handlers-sender.test.js
new file mode 100644
index 000000000..1904fb477
--- /dev/null
+++ b/tests/workspace-handlers-sender.test.js
@@ -0,0 +1,61 @@
+'use strict';
+
+// 工作区决定 Git、代码查看、终端能碰哪些目录，也会展开进系统提示、解析文件引用：
+// 增删改只认主窗口。语音、助手窗口同样带 chat preload，只能读。
+const test = require('node:test');
+const assert = require('node:assert/strict');
+const fs = require('node:fs');
+const os = require('node:os');
+const path = require('node:path');
+const Module = require('node:module');
+const { createTrustedMainSender } = require('./helpers/trusted-main-sender.cjs');
+
+const handlers = new Map();
+const originalLoad = Module._load;
+Module._load = function loadWithElectronMock(request, parent, isMain) {
+    if (request === 'electron') {
+        return {
+            ipcMain: { handle: (channel, fn) => handlers.set(channel, fn), removeHandler: channel => handlers.delete(channel), on: () => {} },
+            dialog: { showOpenDialog: async () => ({ canceled: false, filePaths: ['/picked'] }) },
+            BrowserWindow: { fromWebContents: () => null },
+        };
+    }
+    return originalLoad.call(this, request, parent, isMain);
+};
+const workspaceHandlers = require('../modules/ipc/workspaceHandlers');
+Module._load = originalLoad;
+
+const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'vcp-ws-sender-'));
+const main = createTrustedMainSender();
+const voice = createTrustedMainSender('Voicechatmodules/voicechat.html');
+let settings = { workspaces: [] };
+test.before(() => workspaceHandlers.initialize({
+    logger: { warn() {}, log() {}, error() {} },
+    getMainWindow: () => main.mainWindow,
+    settingsManager: {
+        readSettings: async () => settings,
+        updateSettings: async update => { settings = update(settings); return { settings }; },
+        on() {}, off() {},
+    },
+}));
+test.after(() => { workspaceHandlers.dispose?.(); fs.rmSync(dir, { recursive: true, force: true }); });
+
+test('another chat-preload window cannot add, change or remove workspaces', async () => {
+    const calls = [
+        ['workspaces:add', dir], ['workspaces:remove', 'ws'], ['workspaces:update', 'ws', { enabled: false }],
+        ['workspaces:set-active', null], ['workspaces:rebuild', null], ['workspaces:set-prompt-settings', {}],
+        ['workspaces:select-directory'],
+    ];
+    for (const [channel, ...args] of calls) {
+        const result = await handlers.get(channel)(voice.event, ...args);
+        assert.equal(result.success, false, channel);
+    }
+    assert.deepEqual(settings.workspaces, []);
+    assert.equal((await handlers.get('workspaces:list')(voice.event)).success, true, 'reading stays open');
+});
+
+test('the main window can still add a workspace', async () => {
+    const result = await handlers.get('workspaces:add')(main.event, dir);
+    assert.equal(result.success, true, result.error);
+    assert.equal(settings.workspaces.length, 1);
+});

From 554a55c448c757d9a9452c167648068696a40e4e Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 06:34:07 +0000
Subject: [PATCH 124/143] Side chats stay mounted again instead of sleeping

Batch R (d242f438) let side chats sleep when hidden, and 0d256a09 then
added message-anchored scroll restore so a woken one returns to the
reader's place. Both are reverted: side chats go back to dormancy 'keep',
as ZCode force-mounts every non-browser side pane panel
(AnimatedSidePanePanel.tsx) and only suspends browser guests.

The costs that made 'keep' look expensive are already gone: keep views no
longer count toward the eight live views (6afd6086), and restored side
chats are no longer all mounted on a topic switch (6014f754). The leak
pass measured about 118 nodes per side chat plus about 29 per message.
Sleeping added about 110 lines of scroll capture, a list hidden for up to
2s on wake, and a nondeterministic wake count in the smoke test.

Kept: handle.isBusy() (the busy checks and their tests use it),
37ace593's draft-cache snapshot, and the getTabHandle || openTab line in
sideChatWiring. The smoke step now opens five code files so the
non-chat views still exceed the live-view limit.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01KnTGLLVUgUjQG3f4cWBHJw
---
 .../contracts/generated/chat-event-graph.json |  52 +++----
 modules/renderer/side-chat/scrolling.js       |  96 +-----------
 modules/renderer/sideChatSurfaceOwner.js      |  14 +-
 modules/ui-system/side-pane/tab-types/chat.js |   4 +-
 scripts/smoke-side-pane-e2e.mjs               |   9 +-
 tests/side-chat-draft-restore.test.mjs        | 104 +------------
 tests/side-chat-scrolling.test.mjs            | 142 +-----------------
 7 files changed, 45 insertions(+), 376 deletions(-)

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 98034b482..99ee8be9c 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -3697,12 +3697,12 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 593,
+          "line": 591,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 596,
+          "line": 594,
           "kind": "custom-event-listener"
         },
         {
@@ -5167,13 +5167,13 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 593,
+          "line": 591,
           "kind": "custom-event-listener",
           "match": "stopBtn.addEventListener('click'"
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 596,
+          "line": 594,
           "kind": "custom-event-listener",
           "match": "persistenceBadge.addEventListener('click'"
         },
@@ -7128,7 +7128,7 @@
       "consumers": [
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 353,
+          "line": 351,
           "kind": "custom-event-listener"
         },
         {
@@ -7140,7 +7140,7 @@
       "evidence": [
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 353,
+          "line": 351,
           "kind": "custom-event-listener",
           "match": "textarea.addEventListener('compositionend'"
         },
@@ -7158,7 +7158,7 @@
       "consumers": [
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 352,
+          "line": 350,
           "kind": "custom-event-listener"
         },
         {
@@ -7170,7 +7170,7 @@
       "evidence": [
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 352,
+          "line": 350,
           "kind": "custom-event-listener",
           "match": "textarea.addEventListener('compositionstart'"
         },
@@ -7313,7 +7313,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 600,
+          "line": 598,
           "kind": "custom-event-listener"
         },
         {
@@ -7445,7 +7445,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 600,
+          "line": 598,
           "kind": "custom-event-listener",
           "match": "persistenceBadge.addEventListener('contextmenu'"
         },
@@ -14826,7 +14826,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 355,
+          "line": 353,
           "kind": "custom-event-listener"
         },
         {
@@ -14997,7 +14997,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 355,
+          "line": 353,
           "kind": "custom-event-listener",
           "match": "textarea.addEventListener('input'"
         },
@@ -15447,12 +15447,12 @@
         },
         {
           "file": "modules/renderer/side-chat/scrolling.js",
-          "line": 120,
+          "line": 53,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 361,
+          "line": 359,
           "kind": "custom-event-listener"
         },
         {
@@ -15819,13 +15819,13 @@
         },
         {
           "file": "modules/renderer/side-chat/scrolling.js",
-          "line": 120,
+          "line": 53,
           "kind": "custom-event-listener",
           "match": "root.addEventListener('keydown'"
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 361,
+          "line": 359,
           "kind": "custom-event-listener",
           "match": "textarea.addEventListener('keydown'"
         },
@@ -26564,7 +26564,7 @@
         },
         {
           "file": "modules/renderer/side-chat/scrolling.js",
-          "line": 118,
+          "line": 51,
           "kind": "custom-event-listener"
         },
         {
@@ -26634,7 +26634,7 @@
         },
         {
           "file": "modules/renderer/side-chat/scrolling.js",
-          "line": 118,
+          "line": 51,
           "kind": "custom-event-listener",
           "match": "root.addEventListener('scroll'"
         },
@@ -28203,7 +28203,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 592,
+          "line": 590,
           "kind": "custom-event-listener"
         },
         {
@@ -28263,7 +28263,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 592,
+          "line": 590,
           "kind": "custom-event-listener",
           "match": "form.addEventListener('submit'"
         },
@@ -29371,14 +29371,14 @@
       "consumers": [
         {
           "file": "modules/renderer/side-chat/scrolling.js",
-          "line": 122,
+          "line": 55,
           "kind": "custom-event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/renderer/side-chat/scrolling.js",
-          "line": 122,
+          "line": 55,
           "kind": "custom-event-listener",
           "match": "root.addEventListener('touchmove'"
         }
@@ -29390,7 +29390,7 @@
       "consumers": [
         {
           "file": "modules/renderer/side-chat/scrolling.js",
-          "line": 121,
+          "line": 54,
           "kind": "custom-event-listener"
         },
         {
@@ -29402,7 +29402,7 @@
       "evidence": [
         {
           "file": "modules/renderer/side-chat/scrolling.js",
-          "line": 121,
+          "line": 54,
           "kind": "custom-event-listener",
           "match": "root.addEventListener('touchstart'"
         },
@@ -31821,7 +31821,7 @@
         },
         {
           "file": "modules/renderer/side-chat/scrolling.js",
-          "line": 119,
+          "line": 52,
           "kind": "custom-event-listener"
         },
         {
@@ -31850,7 +31850,7 @@
         },
         {
           "file": "modules/renderer/side-chat/scrolling.js",
-          "line": 119,
+          "line": 52,
           "kind": "custom-event-listener",
           "match": "root.addEventListener('wheel'"
         },
diff --git a/modules/renderer/side-chat/scrolling.js b/modules/renderer/side-chat/scrolling.js
index 1083946c9..bd7706d39 100644
--- a/modules/renderer/side-chat/scrolling.js
+++ b/modules/renderer/side-chat/scrolling.js
@@ -4,8 +4,6 @@
  */
 'use strict';
 
-const ANCHOR_WAIT_MS = 2000;
-
 export function createSideChatScrolling({
     store,
     doc,
@@ -15,76 +13,16 @@ export function createSideChatScrolling({
     let stickToBottom = true;
 
     let lastScrollTop = 0;
-    // 休眠后重新挂载时停在原来离底部的距离：历史先渲染最新几条，较早的分批插到上面，
-    // 按距离底部而不是 scrollTop 定位才不会跳。用户自己一滚就放开
-    let anchorFromBottom = null;
-    let anchoredTop = null;
-    // 最近一次可见时的位置：离底部的距离，和顶上第一条看得见的消息及它离容器顶部的偏移。
-    // 休眠总发生在标签隐藏之后，那时容器 display:none，尺寸和 scrollTop 都读成 0，只能用隐藏前记下的值
-    let visibleFromBottom = null;
-    let visibleAnchor = null;
-    // 重挂时按消息定位：没见过的消息高度是估的，光按离底部的距离会偏几十条。
-    // 那条消息挂上之前列表先不显示，免得看着它随分批插入一路滚过去
-    let anchorMessage = null;
-    let anchorTimer = null;
-    const win = doc?.defaultView || globalThis;
-    const messageItems = () => [...root.children].filter(el => el.dataset?.messageId);
-    function firstVisibleMessage() {
-        const items = messageItems();
-        const top = root.getBoundingClientRect().top;
-        let lo = 0, hi = items.length - 1, found = null;
-        while (lo <= hi) {
-            const mid = (lo + hi) >> 1;
-            if (items[mid].getBoundingClientRect().bottom > top) { found = items[mid]; hi = mid - 1; } else lo = mid + 1;
-        }
-        return found ? { id: found.dataset.messageId, offset: found.getBoundingClientRect().top - top } : null;
-    }
-    const rememberPosition = () => {
-        if (!root || root.clientHeight === 0) return;
-        visibleFromBottom = Math.max(0, root.scrollHeight - root.scrollTop);
-        visibleAnchor = stickToBottom ? null : firstVisibleMessage();
-    };
-    function reveal() {
-        if (anchorTimer !== null) win.clearTimeout(anchorTimer);
-        anchorTimer = null;
-        anchorMessage = null;
-        if (root) root.style.visibility = '';
-    }
-    function placeAnchorMessage() {
-        const el = [...root.children].find(item => item.dataset?.messageId === anchorMessage.id);
-        if (!el) return false;
-        root.scrollTop += el.getBoundingClientRect().top - root.getBoundingClientRect().top - anchorMessage.offset;
-        anchorFromBottom = root.scrollHeight - root.scrollTop;
-        if (anchorTimer !== null) win.clearTimeout(anchorTimer);
-        anchorTimer = null;
-        root.style.visibility = '';
-        return true;
-    }
 
     function pinToBottomIfSticky() {
-        if (store.isDisposed || !root || root.clientHeight === 0) return;
-        if (anchorMessage && placeAnchorMessage()) {
-            anchoredTop = root.scrollTop;
-            lastScrollTop = root.scrollTop;
-        } else if (anchorFromBottom !== null) {
-            root.scrollTop = Math.max(0, root.scrollHeight - anchorFromBottom);
-            anchoredTop = root.scrollTop;
-            lastScrollTop = root.scrollTop;
-        } else if (stickToBottom) {
+        if (!store.isDisposed && stickToBottom && root && root.clientHeight > 0) {
             root.scrollTop = root.scrollHeight;
         }
-        rememberPosition();
     }
 
     if (root) {
         const onRootScroll = () => {
             if (root.clientHeight === 0) return;
-            rememberPosition();
-            if (anchorFromBottom !== null) {
-                if (Math.abs(root.scrollTop - anchoredTop) <= 1) return;
-                anchorFromBottom = null;
-                if (anchorMessage) reveal();
-            }
             const distance = root.scrollHeight - root.scrollTop - root.clientHeight;
             const movedUp = root.scrollTop < lastScrollTop - 1;
             // 真正到底（含内容变短被夹回底部）才无条件贴底；往上滚哪怕只滚了一格也算离开，
@@ -97,21 +35,16 @@ export function createSideChatScrolling({
         // 用户意图先于 scroll 事件生效：流式期间 ResizeObserver 可能在滚轮产生的 scroll 事件之前
         // 把视图拽回底部，只靠 scroll 判断就会和滚轮打架（ZCode use-stick-to-bottom 同样监听 wheel 立即脱离）
         const escape = () => {
-            anchorFromBottom = null;
-            if (anchorMessage) reveal();
             if (root.scrollHeight > root.clientHeight) stickToBottom = false;
         };
-        const onWheel = (event) => { anchorFromBottom = null; if (anchorMessage) reveal(); if (event.deltaY < 0) escape(); };
+        const onWheel = (event) => { if (event.deltaY < 0) escape(); };
         const onKeyDown = (event) => {
-            if (['ArrowDown', 'PageDown', 'End', ' '].includes(event.key)) { anchorFromBottom = null; if (anchorMessage) reveal(); }
             if (['ArrowUp', 'PageUp', 'Home'].includes(event.key) && !event.target?.closest?.('textarea, input, [contenteditable="true"]')) escape();
         };
         let touchY = null;
         const onTouchStart = (event) => { touchY = event.touches?.[0]?.clientY ?? null; };
         const onTouchMove = (event) => {
             const y = event.touches?.[0]?.clientY;
-            anchorFromBottom = null;
-            if (anchorMessage) reveal();
             if (touchY !== null && y > touchY + 2) escape(); // 手指下拉 = 内容往上翻
             touchY = y ?? touchY;
         };
@@ -150,28 +83,5 @@ export function createSideChatScrolling({
         }
     }
 
-    /** 休眠前存下：贴底的只记贴底，否则记离底部的距离。 */
-    function capture() {
-        if (!root || stickToBottom) return { stick: true };
-        rememberPosition();
-        if (visibleFromBottom === null) return { stick: true };
-        return visibleAnchor
-            ? { stick: false, fromBottom: visibleFromBottom, anchor: { ...visibleAnchor } }
-            : { stick: false, fromBottom: visibleFromBottom };
-    }
-
-    function restore(saved) {
-        if (saved?.stick !== false || !Number.isFinite(saved.fromBottom)) return;
-        stickToBottom = false;
-        anchorFromBottom = saved.fromBottom;
-        if (root && typeof saved.anchor?.id === 'string' && Number.isFinite(saved.anchor.offset)) {
-            anchorMessage = { id: saved.anchor.id, offset: saved.anchor.offset };
-            root.style.visibility = 'hidden';
-            // 那条消息被删了或迟迟没挂上：退回按距离定位，列表照常显示
-            anchorTimer = win.setTimeout(() => { anchorTimer = null; reveal(); pinToBottomIfSticky(); }, ANCHOR_WAIT_MS);
-        }
-        pinToBottomIfSticky();
-    }
-
-    return Object.freeze({ pinToBottomIfSticky, isSticky: () => stickToBottom, capture, restore, resume() { stickToBottom = true; anchorFromBottom = null; if (anchorMessage) reveal(); }, dispose() { if (anchorTimer !== null) win.clearTimeout(anchorTimer); anchorTimer = null; disposeCleanups.splice(0).forEach(fn => { try { fn(); } catch {} }); } });
+    return Object.freeze({ pinToBottomIfSticky, isSticky: () => stickToBottom, resume() { stickToBottom = true; }, dispose() { disposeCleanups.splice(0).forEach(fn => { try { fn(); } catch {} }); } });
 }
diff --git a/modules/renderer/sideChatSurfaceOwner.js b/modules/renderer/sideChatSurfaceOwner.js
index cc998c973..53fec5310 100644
--- a/modules/renderer/sideChatSurfaceOwner.js
+++ b/modules/renderer/sideChatSurfaceOwner.js
@@ -35,8 +35,7 @@ export async function mountSideChatSurface(container, {
     chatCapabilities,
     scope = null,
     onStatusChange = null,
-    draftStore = null,
-    restoredState = null
+    draftStore = null
 } = {}) {
     if (!container || !container.ownerDocument) {
         throw new TypeError('mountSideChatSurface requires a valid container element');
@@ -184,7 +183,6 @@ export async function mountSideChatSurface(container, {
         root
     });
     const { pinToBottomIfSticky } = scrollingOwner;
-    scrollingOwner.restore(restoredState?.scroll);
 
     const liveRegenerateProxy = (id) => liveRegenerate?.(id);
     const messageEditor = createSideChatMessageEditor({
@@ -612,16 +610,12 @@ export async function mountSideChatSurface(container, {
             return currentDescriptor;
         },
         surface,
-        // 隐藏久了控制器会让视图休眠（拆掉、再显示时重挂）；这些状态拆了会丢或会打断，期间不休眠。
-        // 输入框文字和引用不算：拆卸时由 draft-cache / draftStore 存下，重挂时还原
+        // 发送、重新回复、删除、未保存、带附件或正在编辑时为 true（侧聊按 keep 不休眠，这里只报告忙碌）
         isBusy() {
             return !isDisposed && (Boolean(activeSendController) || isRegenerating || isDeletingMessage
                 || hasUnsavedChanges || attachmentsOwner.count > 0 || messageEditor.isEditing()
                 || form.hasAttribute('aria-busy'));
         },
-        captureState() {
-            return isDisposed ? null : { scroll: scrollingOwner.capture() };
-        },
         setVisible(visible) {
             if (visible && !isDisposed && isHistoryLoaded) {
                 textarea.focus();
@@ -761,12 +755,12 @@ export function createSideChatSurfaceOwner({
     let ownerDocument = doc;
     const draftStore = createSideChatDraftStore({ getStorage: () => ownerDocument?.defaultView?.localStorage });
     return Object.freeze({
-        async mountTab(descriptor, container, { scope: viewScope = null, restoredState = null } = {}) {
+        async mountTab(descriptor, container, { scope: viewScope = null } = {}) {
             ownerDocument ||= container.ownerDocument;
             const storedInput = draftStore.read(descriptor).input;
             if (storedInput) descriptor = { ...descriptor, ...storedInput };
             // 控制器给了 view scope 就挂在它下面，否则退回 provider 自己的 scope
-            const handle = await mountSurface(container, { descriptor, chatCapabilities, scope: viewScope || scope, draftStore, restoredState });
+            const handle = await mountSurface(container, { descriptor, chatCapabilities, scope: viewScope || scope, draftStore });
             return drafts.ownHandle(handle, descriptor);
         },
         readDraft: descriptor => draftStore.read(descriptor),
diff --git a/modules/ui-system/side-pane/tab-types/chat.js b/modules/ui-system/side-pane/tab-types/chat.js
index 119008836..defcd2f83 100644
--- a/modules/ui-system/side-pane/tab-types/chat.js
+++ b/modules/ui-system/side-pane/tab-types/chat.js
@@ -80,8 +80,8 @@ export function defineChatTabType({ provider, openSideChat = null, onClosed = nu
     return Object.freeze({
         kind: 'chat', label: '辅助对话', icon: 'chat_bubble', searchHint: '辅助对话',
         persist: false,
-        // 按默认策略休眠：输入框和引用拆卸时存下、重挂时还原，滚动位置走 captureState；
-        // 发送中、未保存、带着附件或正在编辑时 handle.isBusy() 为 true，不会被拆
+        // 输入框里可能有还没发出去的内容，隐藏再久也不休眠
+        dormancy: 'keep',
         entry: typeof openSideChat === 'function'
             ? {
                 id: 'selection-side-conversation', order: 0, open: () => openSideChat({ forceNew: true }),
diff --git a/scripts/smoke-side-pane-e2e.mjs b/scripts/smoke-side-pane-e2e.mjs
index 394e5cedf..ea86041e0 100644
--- a/scripts/smoke-side-pane-e2e.mjs
+++ b/scripts/smoke-side-pane-e2e.mjs
@@ -100,7 +100,7 @@ function seedWorkspace() {
     fs.mkdirSync(workspace);
     const git = (...args) => execFileSync('git', ['-c', 'user.name=smoke', '-c', 'user.email=smoke@example.com', ...args], { cwd: workspace, stdio: 'ignore' });
     git('init', '-q');
-    for (let i = 1; i <= 3; i++) fs.writeFileSync(path.join(workspace, `f${i}.txt`), Array.from({ length: 40 }, (_, j) => `file ${i} line ${j}`).join('\n') + '\n');
+    for (let i = 1; i <= 5; i++) fs.writeFileSync(path.join(workspace, `f${i}.txt`), Array.from({ length: 40 }, (_, j) => `file ${i} line ${j}`).join('\n') + '\n');
     git('add', '.');
     git('commit', '-q', '-m', 'init');
     fs.appendFileSync(path.join(workspace, 'f1.txt'), 'changed line\n');
@@ -415,7 +415,7 @@ try {
     });
 
     let historyChat = null;
-    await step('sleep and wake: 10 tabs over the live-view limit', async () => {
+    await step('sleep and wake: 12 tabs over the live-view limit', async () => {
         const { page } = session;
         await K.chat.open(page); await wait(1000);
         for (let i = 1; i <= 3; i++) await sendSideChat(page, `休眠前的问题 ${i}`);
@@ -423,13 +423,14 @@ try {
         const expected = await chatItems(page);
         await K.chat.open(page); await wait(800);
         for (const name of ['terminal', 'browser', 'plan-git', 'trajectory', 'tool-output']) { await K[name].open(page); await wait(900); if (name === 'plan-git') await K[name].use(page, session); }
-        for (const n of [1, 2, 3]) {
+        for (const n of [1, 2, 3, 4, 5]) {
             const f = path.join(workspace, `f${n}.txt`);
             await cmd(page, { id: 'code-viewer:' + f, kind: 'code-viewer', title: `f${n}.txt`, closable: true, scopeMode: 'global', payload: { filePath: f, mode: 'view', language: 'plaintext' } });
             await wait(500);
         }
         const ids = await page.evaluate(() => [...document.querySelectorAll('.side-pane-tab[data-tab-id]')].map(e => e.dataset.tabId).filter(id => id !== 'notifications'));
-        assert.ok(ids.length >= 10, `expected at least 10 tabs, got ${ids.length}`);
+        // 辅助对话按 keep 常驻、浏览器另有网页名额，其余 9 个视图（终端、计划、轨迹、命令输出、5 个代码）超出 8 个名额
+        assert.ok(ids.length >= 12, `expected at least 12 tabs, got ${ids.length}`);
         const counts = [];
         let first = null;
         for (let round = 0; round < 3; round++) {
diff --git a/tests/side-chat-draft-restore.test.mjs b/tests/side-chat-draft-restore.test.mjs
index 32927c7b7..cfd726d56 100644
--- a/tests/side-chat-draft-restore.test.mjs
+++ b/tests/side-chat-draft-restore.test.mjs
@@ -35,7 +35,7 @@ async function fixture(t, legacyInput = {}) {
         async deleteSideChatChild(...args) { deletions.push(args); return call('side-chat:delete-child', ...args); },
         getChatHistory: async (_agent, topic) => JSON.parse(await fs.readFile(path.join(directory, 'agent', 'topics', topic, 'history.json'), 'utf8'))
     };
-    function mountController({ dormancy = null } = {}) {
+    function mountController() {
         let controller;
         const wiring = createSideChatWiring({ doc, win: dom.window, chatAPI,
             chatRepository: { getHistory: (agent, _type, topic) => chatAPI.getChatHistory(agent, topic), saveHistory: async () => ({ success: true }) },
@@ -50,7 +50,7 @@ async function fixture(t, legacyInput = {}) {
             }
         });
         controller = createSidePaneController({ root: doc.getElementById('pane'), tabListElement: doc.getElementById('tabs'),
-            contentContainer: doc.getElementById('content'), dormancy,
+            contentContainer: doc.getElementById('content'),
             tabTypes: [defineChatTabType({ provider: wiring.provider, onClosed: wiring.onTabClosed })] });
         controller.setParent(descriptor.parent);
         const session = { controller, wiring };
@@ -143,103 +143,3 @@ test('automatic empty-child cleanup also removes its empty browser draft without
     assert.equal(f.drafts.read(f.descriptor).input, null);
     assert.equal(f.deletions.length, 1);
 });
-
-test('a side chat put to sleep behind another tab keeps its draft, and a reference asked while it remounts lands in it', async t => {
-    const f = await fixture(t, { composerStorage: 'local' });
-    f.drafts.save(f.descriptor, { draft: 'half typed', references: [{ id: 'ref-1', text: 'first selection' }] });
-    const { controller, wiring } = f.mountController({ dormancy: { hiddenMs: 30 } });
-    controller.registerTabType({ kind: 'note', label: 'Note', provider: { mountTab: () => ({ dispose() {} }) } });
-    await wiring.restoreSessions('agent', 'parent');
-    const tab = controller.getSnapshot().tabs.find(item => item.kind === 'chat');
-    controller.activateTab(tab.id);
-    controller.setVisible(true);
-    await new Promise(r => setTimeout(r, 20));
-    controller.getTabHandle(tab.id).setDraft('half typed, then more');
-    await controller.openTab({ id: 'note:1', kind: 'note', title: 'Note', closable: true, scopeMode: 'global' });
-    await new Promise(r => setTimeout(r, 120));
-    assert.equal(controller.getTabHandle(tab.id), null, 'the hidden side chat view went to sleep');
-    assert.deepEqual(controller.getViewResidency().dormant.map(entry => entry.tabId), [tab.id]);
-
-    // 切回去的同一刻点「在侧栏提问」：视图还在重挂，引用要落进这个侧聊，不能另开一个
-    controller.activateTab(tab.id);
-    const handle = await wiring.openSideChat({ reference: { id: 'ref-2', text: 'second selection' } });
-    assert.deepEqual(controller.getSnapshot().tabs.filter(item => item.kind === 'chat').map(item => item.id), [tab.id], 'no second side chat');
-    assert.equal(handle, controller.getTabHandle(tab.id));
-    assert.equal(handle.getDraft(), 'half typed, then more');
-    assert.deepEqual(handle.getReferences().map(ref => ref.id), ['ref-1', 'ref-2']);
-});
-
-// 休眠场景：休眠/唤醒、切话题、退出都不能丢草稿、引用和模型
-const sleep = ms => new Promise(r => setTimeout(r, ms));
-async function sleepableSideChat(t, opts = {}) {
-    const f = await fixture(t, { composerStorage: 'local' });
-    f.drafts.save(f.descriptor, { draft: 'start', references: [{ id: 'ref-1', text: 'first selection' }], model: 'm0' });
-    const s = f.mountController({ dormancy: { hiddenMs: 30, ...(opts.dormancy || {}) } });
-    s.controller.registerTabType({ kind: 'note', label: 'Note', provider: { mountTab: () => ({ dispose() {} }) } });
-    await s.wiring.restoreSessions('agent', 'parent');
-    const tab = s.controller.getSnapshot().tabs.find(item => item.kind === 'chat');
-    s.controller.activateTab(tab.id); s.controller.setVisible(true);
-    await sleep(20);
-    const hide = async () => { await s.controller.openTab({ id: 'note:' + Math.random(), kind: 'note', title: 'Note', closable: true, scopeMode: 'global' }); await sleep(120); };
-    const wake = async () => { s.controller.activateTab(tab.id); for (let i = 0; i < 50 && !s.controller.getTabHandle(tab.id); i++) await sleep(5); await sleep(20); return s.controller.getTabHandle(tab.id); };
-    return { f, s, tab, hide, wake, handle: () => s.controller.getTabHandle(tab.id) };
-}
-
-test('a model picked in a side chat survives sleep', async t => {
-    const p = await sleepableSideChat(t);
-    p.handle().setModel('m-new');
-    await p.hide();
-    assert.equal(p.handle(), null);
-    const h = await p.wake();
-    assert.equal(h.getModel(), 'm-new');
-});
-
-test('a draft typed inside the save debounce survives sleep and reaches storage', async t => {
-    const p = await sleepableSideChat(t);
-    const ta = p.f.doc.querySelector('.side-chat-textarea');
-    ta.value = 'typed fast'; ta.dispatchEvent(new p.f.dom.window.Event('input', { bubbles: true }));
-    await p.hide();
-    assert.equal(p.handle(), null);
-    assert.equal(p.f.drafts.read(p.f.descriptor).input.draft, 'typed fast');
-    const h = await p.wake();
-    assert.equal(h.getDraft(), 'typed fast');
-});
-
-test('sleep keeps the latest draft, removed references and model even when localStorage writes fail', async t => {
-    const p = await sleepableSideChat(t);
-    const proto = Object.getPrototypeOf(p.f.dom.window.localStorage);
-    const orig = proto.setItem; proto.setItem = function () { throw new Error('QuotaExceeded'); };
-    try {
-        p.handle().setDraft('new text'); p.handle().removeReference('ref-1'); p.handle().setModel('m-new');
-        await p.hide();
-        const h = await p.wake();
-        assert.equal(h.getDraft(), 'new text');
-        assert.deepEqual(h.getReferences(), [], 'removed reference must not come back');
-        assert.equal(h.getModel(), 'm-new');
-    } finally { proto.setItem = orig; }
-});
-
-test('quitting while a side chat is dormant restores its latest draft on relaunch', async t => {
-    const p = await sleepableSideChat(t);
-    p.handle().setDraft('before quit');
-    await p.hide();
-    p.f.dom.window.dispatchEvent(new p.f.dom.window.Event('pagehide'));
-    await p.s.controller.dispose(); p.s.wiring.dispose();
-    const s2 = p.f.mountController();
-    await s2.wiring.restoreSessions('agent', 'parent');
-    const tab = s2.controller.getSnapshot().tabs.find(item => item.kind === 'chat');
-    assert.equal(s2.controller.getTabHandle(tab.id).getDraft(), 'before quit');
-    assert.equal(s2.controller.getTabHandle(tab.id).getModel(), 'm0');
-});
-
-test('a side chat that sleeps after a topic switch keeps its draft when the topic comes back', async t => {
-    const p = await sleepableSideChat(t, { dormancy: { otherTopicMs: 30 } });
-    p.handle().setDraft('topic draft');
-    p.s.controller.setParent({ ...p.f.descriptor.parent, topicId: 'other' });
-    await sleep(150);
-    assert.equal(p.handle(), null, 'slept after leaving the topic');
-    p.s.controller.setParent(p.f.descriptor.parent);
-    for (let i = 0; i < 50 && !p.handle(); i++) await sleep(5);
-    await sleep(20);
-    assert.equal(p.handle()?.getDraft(), 'topic draft');
-});
diff --git a/tests/side-chat-scrolling.test.mjs b/tests/side-chat-scrolling.test.mjs
index e394b30e9..3466ac3a6 100644
--- a/tests/side-chat-scrolling.test.mjs
+++ b/tests/side-chat-scrolling.test.mjs
@@ -18,13 +18,10 @@ function setup() {
     };
     const root = win.document.getElementById('root');
     let scrollHeight = 1000;
-    let hidden = false;
-    Object.defineProperty(root, 'clientHeight', { get: () => hidden ? 0 : 500 });
-    Object.defineProperty(root, 'scrollHeight', { get: () => hidden ? 0 : scrollHeight });
+    Object.defineProperty(root, 'clientHeight', { get: () => 500 });
+    Object.defineProperty(root, 'scrollHeight', { get: () => scrollHeight });
     const scrolling = createSideChatScrolling({ store: { isDisposed: false }, doc: win.document, root });
-    // display:none 的容器：尺寸和 scrollTop 都读成 0
-    const hide = () => { hidden = true; root.scrollTop = 0; };
-    return { win, root, ro: observers[0], scrolling, grow: (px) => { scrollHeight += px; }, hide };
+    return { win, root, ro: observers[0], scrolling, grow: (px) => { scrollHeight += px; } };
 }
 
 test('a reply that grows after the last pin is still followed to the bottom', async () => {
@@ -103,136 +100,3 @@ test('keyboard and touch scroll-up intents detach, but arrow keys inside the com
     assert.equal(scrolling.isSticky(), false);
     scrolling.dispose();
 });
-
-test('a remount after sleep keeps the reader the same distance from the bottom while older batches render above', async () => {
-    const before = setup();
-    before.root.scrollTop = 500;
-    before.root.dispatchEvent(new before.win.Event('scroll'));
-    before.root.scrollTop = 200;
-    before.root.dispatchEvent(new before.win.Event('scroll'));
-    const saved = before.scrolling.capture();
-    assert.deepEqual(saved, { stick: false, fromBottom: 800 });
-    before.scrolling.dispose();
-
-    const after = setup();
-    after.root.scrollTop = 0;
-    after.scrolling.restore(saved);
-    assert.equal(after.root.scrollTop, 200);
-    after.grow(400); // 较早的消息分批插到上面
-    after.ro.fire(after.root);
-    after.root.dispatchEvent(new after.win.Event('scroll'));
-    assert.equal(after.root.scrollTop, 600, 'still 800px from the bottom');
-    assert.equal(after.scrolling.isSticky(), false);
-
-    after.root.dispatchEvent(new after.win.WheelEvent('wheel', { deltaY: 40 }));
-    after.root.scrollTop = 650;
-    after.root.dispatchEvent(new after.win.Event('scroll'));
-    after.grow(100);
-    after.ro.fire(after.root);
-    assert.equal(after.root.scrollTop, 650, 'once the reader scrolls, growth no longer moves them');
-    after.scrolling.dispose();
-});
-
-test('a view that sleeps while hidden still keeps the distance it had when it was last shown', () => {
-    const { win, root, scrolling, hide } = setup();
-    root.scrollTop = 500;
-    root.dispatchEvent(new win.Event('scroll'));
-    root.scrollTop = 200;
-    root.dispatchEvent(new win.Event('scroll'));
-    hide(); // 切到别的标签；休眠要到隐藏之后才发生
-    assert.deepEqual(scrolling.capture(), { stick: false, fromBottom: 800 });
-    scrolling.dispose();
-});
-
-// 每条消息 100px 高、按顺序排列的列表，矩形跟着 scrollTop 走
-function setupList(ids) {
-    const dom = new JSDOM('<div id="root"></div>');
-    const win = dom.window;
-    const observers = [];
-    win.ResizeObserver = class {
-        constructor(cb) { this.cb = cb; this.targets = new Set(); observers.push(this); }
-        observe(el) { this.targets.add(el); }
-        unobserve(el) { this.targets.delete(el); }
-        disconnect() { this.targets.clear(); }
-        fire() { this.cb([]); }
-    };
-    const root = win.document.getElementById('root');
-    let scrollTop = 0;
-    let hidden = false;
-    const items = () => [...root.children];
-    Object.defineProperty(root, 'clientHeight', { get: () => hidden ? 0 : 300 });
-    Object.defineProperty(root, 'scrollHeight', { get: () => hidden ? 0 : items().length * 100 });
-    Object.defineProperty(root, 'scrollTop', {
-        get: () => hidden ? 0 : scrollTop,
-        set: v => { scrollTop = Math.max(0, Math.min(v, items().length * 100 - 300)); }
-    });
-    root.getBoundingClientRect = () => ({ top: 0, bottom: 300 });
-    const make = id => {
-        const el = win.document.createElement('div');
-        el.dataset.messageId = id;
-        el.getBoundingClientRect = () => { const top = items().indexOf(el) * 100 - scrollTop; return { top, bottom: top + 100 }; };
-        return el;
-    };
-    ids.forEach(id => root.appendChild(make(id)));
-    const scrolling = createSideChatScrolling({ store: { isDisposed: false }, doc: win.document, root });
-    return { win, root, ro: observers[0], scrolling, make, hide: () => { hidden = true; } };
-}
-
-test('a remount lands on the message the reader was looking at, and the list stays hidden until it is there', () => {
-    const ids = Array.from({ length: 10 }, (_, i) => `m_${i}`);
-    const before = setupList(ids);
-    before.root.dispatchEvent(new before.win.WheelEvent('wheel', { deltaY: -40 }));
-    before.root.scrollTop = 350;
-    before.root.dispatchEvent(new before.win.Event('scroll'));
-    before.hide();
-    const saved = before.scrolling.capture();
-    assert.deepEqual(saved, { stick: false, fromBottom: 650, anchor: { id: 'm_3', offset: -50 } });
-    before.scrolling.dispose();
-
-    // 重挂：先渲染最新两条，较早的分批插到上面
-    const after = setupList(['m_8', 'm_9']);
-    after.scrolling.restore(saved);
-    assert.equal(after.root.style.visibility, 'hidden');
-    for (const id of ['m_7', 'm_6', 'm_5', 'm_4']) after.root.prepend(after.make(id));
-    after.ro.fire();
-    assert.equal(after.root.style.visibility, 'hidden', 'm_3 is not mounted yet');
-    for (const id of ['m_3', 'm_2', 'm_1', 'm_0']) after.root.prepend(after.make(id));
-    after.ro.fire();
-    assert.equal(after.root.style.visibility, '');
-    assert.equal(after.root.scrollTop, 350);
-    after.scrolling.dispose();
-});
-
-test('a remount whose anchor message is missing shows the list as soon as the reader scrolls', async () => {
-    const after = setupList(['m_8', 'm_9']);
-    after.scrolling.restore({ stick: false, fromBottom: 100, anchor: { id: 'gone', offset: 0 } });
-    assert.equal(after.root.style.visibility, 'hidden');
-    after.root.dispatchEvent(new after.win.WheelEvent('wheel', { deltaY: 40 }));
-    assert.equal(after.root.style.visibility, '', 'scrolling shows the list at once');
-    after.scrolling.dispose();
-});
-
-test('a view that was following the bottom comes back following it', () => {
-    const { scrolling } = setup();
-    assert.deepEqual(scrolling.capture(), { stick: true });
-    scrolling.dispose();
-});
-
-test('a view put to sleep while hidden saves where the reader was, not the zeros a display:none box reports', () => {
-    const { win, root, scrolling, hide } = setup();
-    root.scrollTop = 500;
-    root.dispatchEvent(new win.Event('scroll'));
-    root.scrollTop = 300;
-    root.dispatchEvent(new win.Event('scroll'));
-    hide();
-    assert.deepEqual(scrolling.capture(), { stick: false, fromBottom: 700 });
-    scrolling.dispose();
-});
-
-test('a remounted view that sleeps again before the reader scrolls keeps the restored place', () => {
-    const { scrolling, hide } = setup();
-    scrolling.restore({ stick: false, fromBottom: 700 });
-    hide();
-    assert.deepEqual(scrolling.capture(), { stick: false, fromBottom: 700 });
-    scrolling.dispose();
-});

From 47d7f9baf666dad2bf670081d81396523ff85034 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 06:34:27 +0000
Subject: [PATCH 125/143] Side pane dormancy test: mark the busy view before
 the hidden timers start

The 20ms hide timer runs from the second openTab, so on a loaded machine
the probe slept before h.busy.add ran. Under 12-way parallel runs it
failed 23 of 48; with the busy mark first, 0 of 48. CI runs this file
through test:side-pane since 8d2d4295.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01KnTGLLVUgUjQG3f4cWBHJw
---
 tests/side-pane-dormancy.test.mjs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/side-pane-dormancy.test.mjs b/tests/side-pane-dormancy.test.mjs
index 3f97ab539..06ee6626d 100644
--- a/tests/side-pane-dormancy.test.mjs
+++ b/tests/side-pane-dormancy.test.mjs
@@ -140,10 +140,11 @@ test('a view hidden too long sleeps; the tab stays and remounts with what it sav
 test('busy views and keep-type views do not sleep', async () => {
     const h = fixture({ hiddenMs: 20, busyRetryMs: 20 });
     try {
+        // 先标忙再开：20ms 的隐藏计时从第二个 openTab 起就在走，机器一忙后标的会先睡
+        h.busy.add('probe:busy');
         await h.controller.openTab(tab('probe:busy'));
         await h.controller.openTab(tab('probe:keep', { kind: 'pinned' }));
         await h.controller.openTab(tab('probe:front'));
-        h.busy.add('probe:busy');
         await sleep(60);
         await settle();
         assert.equal(h.live('probe:busy').length, 1);

From f04bac7df5b5c33a5d680dff815836379f6f9bf1 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 06:36:28 +0000
Subject: [PATCH 126/143] Side terminal: submit the workspace jump again
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

30f09c53 typed `cd '…'` without Enter so a foreground vim or password
prompt would not receive it. But AI commands are written into the same
PTY without clearing the input line (PowerShellExecutor writes
`${wrappedCommand}\r`), so a jump left unsubmitted is joined to the next
AI command. Under a real PTY on Linux, terminal-handlers.test.js "several
views share one session" fails with `cd '/tmp/…'echo vcp-shared-…` ->
`bash: cd: too many arguments`; on Windows the end marker never prints
and the AI call waits for its timeout. Restoring `\r` makes that test
pass again (only the Windows-only command-run case still fails here).

Curly-quote doubling and the line-break refusal stay. The duplicate
quoting test in terminal-command-run-watch.test.js is folded into
terminal-cd-command.test.js.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01KnTGLLVUgUjQG3f4cWBHJw
---
 modules/ipc/terminalHandlers.js          |  8 ++++----
 tests/terminal-cd-command.test.js        | 15 +++++++++------
 tests/terminal-command-run-watch.test.js |  8 --------
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/modules/ipc/terminalHandlers.js b/modules/ipc/terminalHandlers.js
index c927d69d5..776007672 100644
--- a/modules/ipc/terminalHandlers.js
+++ b/modules/ipc/terminalHandlers.js
@@ -155,14 +155,14 @@ function resolveWorkspacePath(workspaceId) {
 }
 
 // 终端窗口用的是 PowerShell（Windows）/ bash（其它平台）。
-// 只把命令打到输入行、不替用户按回车：前台可能是 vim、python、ssh 或密码提示（busy 只认 AI 跑的命令），
-// 回车会把这串字当成那个程序的输入；提示符后有半截命令时也会拼成别的命令。用户看一眼再回车。
+// 带回车直接执行：AI 命令写进共享 PTY 前不清输入行，只打字不回车的话，留在输入行的跳转会和下一条 AI 命令拼成一行，
+// 结束标记出不来，AI 那边要等到超时（Linux 实测 `cd '…'echo …` → too many arguments）。
 // PowerShell 把 ‘ ’ ‚ ‛（U+2018–U+201B）也当单引号，只转义 ASCII ' 的话，带弯引号的目录名会提前结束字符串。
 // 换行会直接提交半条命令，这种路径不往终端里写
 function buildChangeDirectoryCommand(dir, platform = process.platform) {
     if (/[\r\n]/.test(dir)) throw new Error('工作区路径包含换行，无法在终端里切换。');
-    if (platform === 'win32') return `Set-Location -LiteralPath '${dir.replace(/['\u2018-\u201B]/g, '$&$&')}'`;
-    return `cd '${dir.replace(/'/g, "'\\''")}'`;
+    if (platform === 'win32') return `Set-Location -LiteralPath '${dir.replace(/['\u2018-\u201B]/g, '$&$&')}'\r`;
+    return `cd '${dir.replace(/'/g, "'\\''")}'\r`;
 }
 
 function createView(event, options = {}) {
diff --git a/tests/terminal-cd-command.test.js b/tests/terminal-cd-command.test.js
index 5f527c3b9..aee1ff559 100644
--- a/tests/terminal-cd-command.test.js
+++ b/tests/terminal-cd-command.test.js
@@ -13,17 +13,20 @@ Module._load = function loadWithElectronMock(request, parent, isMain) {
 const { buildChangeDirectoryCommand } = require('../modules/ipc/terminalHandlers');
 Module._load = originalLoad;
 
-test('the jump command is typed but not submitted', () => {
-    // 前台可能是 vim / python / 密码提示：不替用户按回车
+test('the jump command is submitted, so it never joins the next AI command on the input line', () => {
     for (const platform of ['win32', 'linux', 'darwin']) {
-        assert.doesNotMatch(buildChangeDirectoryCommand('/w', platform), /[\r\n]$/);
+        assert.match(buildChangeDirectoryCommand('/w', platform), /'\r$/);
     }
 });
 
 test('PowerShell quoting doubles typographic single quotes too', () => {
     // PowerShell 把 ‘ ’ ‚ ‛ 当单引号；不转义的话目录名能提前结束字符串，后面的部分会被当成命令执行
     const dir = 'D:\\a\u2019; calc; \u2018b';
-    assert.equal(buildChangeDirectoryCommand(dir, 'win32'), "Set-Location -LiteralPath 'D:\\a\u2019\u2019; calc; \u2018\u2018b'");
-    assert.equal(buildChangeDirectoryCommand("D:\\Tom's \u201Aapp\u201B", 'win32'), "Set-Location -LiteralPath 'D:\\Tom''s \u201A\u201Aapp\u201B\u201B'");
-    assert.equal(buildChangeDirectoryCommand("/home/tom's", 'linux'), "cd '/home/tom'\\''s'");
+    assert.equal(buildChangeDirectoryCommand(dir, 'win32'), "Set-Location -LiteralPath 'D:\\a\u2019\u2019; calc; \u2018\u2018b'\r");
+    assert.equal(buildChangeDirectoryCommand("D:\\Tom's \u201Aapp\u201B", 'win32'), "Set-Location -LiteralPath 'D:\\Tom''s \u201A\u201Aapp\u201B\u201B'\r");
+    assert.equal(buildChangeDirectoryCommand("/home/tom's", 'linux'), "cd '/home/tom'\\''s'\r");
+});
+
+test('a workspace path with a line break is refused instead of submitting half a command', () => {
+    assert.throws(() => buildChangeDirectoryCommand('C:\\a\nRemove-Item x', 'win32'), /换行/);
 });
diff --git a/tests/terminal-command-run-watch.test.js b/tests/terminal-command-run-watch.test.js
index b841decd7..14d5bae0b 100644
--- a/tests/terminal-command-run-watch.test.js
+++ b/tests/terminal-command-run-watch.test.js
@@ -125,14 +125,6 @@ test('registering the IPC loads nothing; watch and unwatch are counted per page'
     }
 });
 
-test('jump-to-workspace quotes curly apostrophes for PowerShell and refuses paths with line breaks', () => {
-    const { buildChangeDirectoryCommand } = terminalHandlers;
-    assert.equal(buildChangeDirectoryCommand('C:\\Bob’s repo', 'win32'), "Set-Location -LiteralPath 'C:\\Bob’’s repo'");
-    assert.equal(buildChangeDirectoryCommand("C:\\it's", 'win32'), "Set-Location -LiteralPath 'C:\\it''s'");
-    assert.equal(buildChangeDirectoryCommand("/home/it's", 'linux'), "cd '/home/it'\\''s'");
-    assert.throws(() => buildChangeDirectoryCommand('C:\\a\nRemove-Item x', 'win32'), /换行/);
-});
-
 test('mirror output is coalesced into one IPC per frame; exit flushes first and kill drops the rest', async () => {
     let sink = null;
     let detached = 0;

From b249fac2e1af03a967168679300180322cd9e907 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 06:37:40 +0000
Subject: [PATCH 127/143] Git service: line counts only where they are drawn;
 drop status coalescing

a1bc4c30 added two whole-worktree `git diff --numstat` runs to every
status read. On a VCPChat clone with 600 changed files that took getStatus
from 45ms to 220ms (status 40ms, numstat 181ms), and the cost was paid by
all nine internal callers: push and branch-switch prechecks, branch
listing and the status panel summary, which runs its own
`diff --numstat HEAD` on top. Counts are now read for getStatus (the Git
page) and for the statuses handed back to the renderer after a write.
ZCode reads numstat with status too (gitCliRepo.ts), so it stays there.

9f9a4493's per-repository coalescing is removed. A caller that arrives
while a read is in flight waits for the next read, so the common pair
(status panel plus Git page) still ran two reads, just serially (434ms vs
about 220ms for one). Out-of-order writes back to the Git page are
already handled by 7d962eb8's sequence number.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01KnTGLLVUgUjQG3f4cWBHJw
---
 modules/services/gitService.js | 50 ++++++----------------------------
 tests/git-service.test.js      | 21 +++++---------
 2 files changed, 16 insertions(+), 55 deletions(-)

diff --git a/modules/services/gitService.js b/modules/services/gitService.js
index 30ad3ed76..b1605ccac 100644
--- a/modules/services/gitService.js
+++ b/modules/services/gitService.js
@@ -390,45 +390,13 @@ function withCounts(list, counts) {
     });
 }
 
-// 同一仓库的 status 读取合并：agent 施工时一次 files 推送会让状态面板、Git 页、V工程页各自来读（每次 3 个 git 子进程，
-// Windows 上 spawn 很慢）。在飞时到达的请求不搭这次的车（它可能早于刚发生的改动），而是共享紧随其后的下一次读取，
-// 所以每个调用拿到的都是调用之后才开始的快照，N 个并发调用最多跑两轮（对照 ZCode gitCliRepo reuseInFlightRequest）。
-const statusReads = new Map(); // key -> { current, next }
-
-function readStatus(repo) {
-    const key = `${repo.toplevel}\0${repo.prefix || ''}`;
-    let slot = statusReads.get(key);
-    if (!slot) {
-        slot = { current: null, next: null };
-        statusReads.set(key, slot);
-    }
-    if (!slot.current) {
-        slot.current = readStatusNow(repo).finally(() => settleStatusRead(key, slot));
-        return slot.current;
-    }
-    if (!slot.next) {
-        const queued = Promise.withResolvers();
-        slot.next = { repo, ...queued };
-    }
-    return slot.next.promise;
-}
-
-function settleStatusRead(key, slot) {
-    const queued = slot.next;
-    slot.next = null;
-    if (!queued) {
-        slot.current = null;
-        statusReads.delete(key);
-        return;
-    }
-    slot.current = readStatusNow(queued.repo).finally(() => settleStatusRead(key, slot));
-    slot.current.then(queued.resolve, queued.reject);
-}
-
-async function readStatusNow(repo) {
+// counts 只给要画逐文件行数的调用（Git 页的读取和写操作后的刷新）：两次全工作区 diff --numstat 比 status 本身慢几倍，
+// 推送、切分支前的预检和状态面板的摘要用不到
+async function readStatus(repo, { counts: withDiffCounts = false } = {}) {
     const args = ['status', '--porcelain=v2', '-z', '--branch', '--untracked-files=all'];
     if (repo.prefix) args.push('--', repo.prefix);
-    const [{ stdout }, remotes, counts] = await Promise.all([runGit(repo.toplevel, args), listRemotes(repo), readDiffCounts(repo)]);
+    const noCounts = { staged: new Map(), unstaged: new Map() };
+    const [{ stdout }, remotes, counts] = await Promise.all([runGit(repo.toplevel, args), listRemotes(repo), withDiffCounts ? readDiffCounts(repo) : noCounts]);
     const { branch, entries } = parsePorcelainV2(stdout);
     const truncated = entries.length > MAX_ENTRIES;
     const grouped = groupEntries(truncated ? entries.slice(0, MAX_ENTRIES) : entries);
@@ -480,7 +448,7 @@ async function resolveRevealTarget(workspaceRoot, relPath, { base = 'repo' } = {
 async function getStatus(workspaceRoot) {
     const repo = await openRepository(workspaceRoot);
     if (!repo) return { isRepo: false, root: path.resolve(workspaceRoot) };
-    return readStatus(repo);
+    return readStatus(repo, { counts: true });
 }
 
 /** 串行执行写操作，完成后附带最新状态返回，前端一次往返即可刷新。 */
@@ -488,7 +456,7 @@ async function mutate(workspaceRoot, fn) {
     const repo = await requireRepository(workspaceRoot);
     return withRepoLock(repo, async () => {
         const extra = await fn(repo);
-        const status = await readStatus(repo);
+        const status = await readStatus(repo, { counts: true });
         return { ...(extra || {}), status };
     });
 }
@@ -594,7 +562,7 @@ async function push(workspaceRoot, { setUpstream = false } = {}) {
         }
         const result = await runGit(repo.toplevel, args, { timeout: PUSH_TIMEOUT });
         const output = `${result.stderr.toString('utf8')}${result.stdout.toString('utf8')}`.trim();
-        return { output, remote, status: await readStatus(repo) };
+        return { output, remote, status: await readStatus(repo, { counts: true }) };
     });
 }
 
@@ -742,7 +710,7 @@ async function switchLike(workspaceRoot, action, name, buildArgs) {
         } catch (error) {
             return fail({ code: 'git-error', message: error.message });
         }
-        return { ok: true, action, branchName, changed: true, status: await readStatus(repo) };
+        return { ok: true, action, branchName, changed: true, status: await readStatus(repo, { counts: true }) };
     });
 }
 
diff --git a/tests/git-service.test.js b/tests/git-service.test.js
index 6e9e5949b..38c00bd98 100644
--- a/tests/git-service.test.js
+++ b/tests/git-service.test.js
@@ -456,19 +456,12 @@ test('a switch blocked by local changes reports the files in a form the commit-a
     assert.deepEqual(parseSwitchBlockedFiles(blocked.issues[0].message), { files: ['README.md'], untracked: false });
 });
 
-test('concurrent status reads share one follow-up read that still sees changes made after the first began', { skip: SKIP_GIT }, async t => {
+test('only the Git page read and post-write refreshes pay for per-file line counts', { skip: SKIP_GIT }, async t => {
     const root = createRepo(t);
-    const first = gitService.getStatus(root);
-    // 读取已经在路上时文件变了；之后来的调用不能拿到那次旧读取
-    await new Promise(resolve => setImmediate(resolve));
-    write(root, 'late.js', 'late\n');
-    const followers = await Promise.all(Array.from({ length: 5 }, () => gitService.getStatus(root)));
-    await first;
-    for (const status of followers) {
-        assert.ok(status.changes.some(item => item.path === 'late.js'), 'every later caller sees the late file');
-    }
-    // 每个调用先各自 rev-parse 定位仓库，到达时间有先后；但 6 个调用最多跑 3 轮 status
-    assert.ok(new Set([await first, ...followers]).size <= 3, 'callers that arrive together share reads');
-    const after = await gitService.getStatus(root);
-    assert.notEqual(after, followers[0], 'a call after the reads settle starts a fresh read');
+    write(root, 'README.md', 'changed\nmore\n');
+    const status = await gitService.getStatus(root);
+    const card = status.changes.find(item => item.path === 'README.md');
+    assert.ok(Number.isInteger(card.added), 'the Git page gets line counts');
+    const branches = await gitService.listBranches(root);
+    assert.ok(Array.isArray(branches.branches || branches), 'branch listing still works without counts');
 });

From 095ee8614b1b1c2c1bd9b2cbef2c67c9411ec71d Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 06:38:28 +0000
Subject: [PATCH 128/143] Message file changes: remember skipped messages by
 content, not length

17c29aff skips re-extraction for a message id whose content length is
unchanged, so a message edited to the same length that now contains a
file write never got its file list. The cache now holds the content
string itself (the same string the history already holds) and compares
by identity, which is as cheap.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01KnTGLLVUgUjQG3f4cWBHJw
---
 .../contracts/generated/chat-event-graph.json | 12 +++++-----
 modules/ui-system/message-file-changes.js     |  7 +++---
 tests/message-file-changes.test.mjs           | 22 +++++++++++++++++++
 3 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 99ee8be9c..33c755fed 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -4117,12 +4117,12 @@
         },
         {
           "file": "modules/ui-system/message-file-changes.js",
-          "line": 380,
+          "line": 381,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/message-file-changes.js",
-          "line": 417,
+          "line": 418,
           "kind": "custom-event-listener"
         },
         {
@@ -5671,13 +5671,13 @@
         },
         {
           "file": "modules/ui-system/message-file-changes.js",
-          "line": 380,
+          "line": 381,
           "kind": "custom-event-listener",
           "match": "label.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/message-file-changes.js",
-          "line": 417,
+          "line": 418,
           "kind": "custom-event-listener",
           "match": "button.addEventListener('click'"
         },
@@ -29140,14 +29140,14 @@
       "consumers": [
         {
           "file": "modules/ui-system/message-file-changes.js",
-          "line": 403,
+          "line": 404,
           "kind": "custom-event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ui-system/message-file-changes.js",
-          "line": 403,
+          "line": 404,
           "kind": "custom-event-listener",
           "match": "details.addEventListener('toggle'"
         }
diff --git a/modules/ui-system/message-file-changes.js b/modules/ui-system/message-file-changes.js
index d70d16a7f..1942e7b2c 100644
--- a/modules/ui-system/message-file-changes.js
+++ b/modules/ui-system/message-file-changes.js
@@ -325,7 +325,8 @@ export function createMessageFileChanges({
     const win = doc.defaultView;
     let observer = null;
     let disposed = false;
-    // 没有文件改动的消息记下 id 和内容长度：class 再变（hover、展开等）不用重新提取
+    // 没有文件改动的消息记下 id 和当时的内容（引用历史里同一个字符串）：class 再变（hover、展开等）不用重新提取；
+    // 只记长度的话，编辑后长度没变、却多了文件改动的消息会被跳过
     const noChanges = new Map();
 
     // 一批 mutation 共用一份历史索引和工程根：长历史加载时不再每条消息线性 find、再扫一遍全历史
@@ -348,9 +349,9 @@ export function createMessageFileChanges({
         if (!id) return;
         const record = batch.find(id);
         const raw = typeof record?.content === 'string' ? record.content : '';
-        if (noChanges.get(id) === raw.length) return;
+        if (noChanges.get(id) === raw) return;
         const changes = extractFileChanges(raw);
-        if (changes.length === 0) { noChanges.set(id, raw.length); return; }
+        if (changes.length === 0) { noChanges.set(id, raw); return; }
         noChanges.delete(id);
         // ProjectForge 的路径相对工程根；根目录写在建工程（CreateProject / GetProject）的结果里，可能在更早的消息中
         const roots = changes.some(change => change.projectId) ? batch.roots() : new Map();
diff --git a/tests/message-file-changes.test.mjs b/tests/message-file-changes.test.mjs
index 9cfa6e0c2..e9818edda 100644
--- a/tests/message-file-changes.test.mjs
+++ b/tests/message-file-changes.test.mjs
@@ -184,3 +184,25 @@ test('loading a long history reads the history once per batch, not once per mess
     assert.ok(reads <= 1);
     controller.dispose();
 });
+
+test('a message edited to the same length that now changes files gets its file list', async () => {
+    const dom = new JSDOM('<div id="chatMessages"></div>', { pretendToBeVisual: true });
+    const doc = dom.window.document;
+    const root = doc.getElementById('chatMessages');
+    const changed = confirmed(write('C:/proj/a.js'));
+    const history = [{ id: 'm0', role: 'assistant', content: 'y'.repeat(changed.length) }];
+    const controller = createMessageFileChanges({ document: doc, messagesRoot: root, getHistory: () => history });
+    controller.mount();
+    const item = doc.createElement('div');
+    item.className = 'message-item assistant';
+    item.dataset.messageId = 'm0';
+    item.innerHTML = '<div class="details-and-bubble-wrapper"><div class="md-content">x</div></div>';
+    root.appendChild(item);
+    await wait();
+    assert.equal(root.querySelectorAll('.vcp-file-changes').length, 0);
+    history[0] = { ...history[0], content: changed };
+    item.classList.add('is-hovered');
+    await wait();
+    assert.equal(root.querySelectorAll('.vcp-file-changes').length, 1);
+    controller.dispose();
+});

From a35046350ee39a9c086b343fb9468f1f0b5bd2e2 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 06:39:04 +0000
Subject: [PATCH 129/143] Side browser: switching windows keeps a half-typed
 address

5a8e8feb resets the address bar to the page URL on blur. Chromium also
blurs the focused element when the whole window loses focus, so Alt-Tab
to copy a URL from another app cleared what was typed. The reset now
skips blurs where the document itself has no focus.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01KnTGLLVUgUjQG3f4cWBHJw
---
 .../side-pane/browserSideProvider.js          |  8 ++++++--
 tests/side-browser-address.test.mjs           | 20 +++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/modules/ui-system/side-pane/browserSideProvider.js b/modules/ui-system/side-pane/browserSideProvider.js
index 6981c530a..24b82f40f 100644
--- a/modules/ui-system/side-pane/browserSideProvider.js
+++ b/modules/ui-system/side-pane/browserSideProvider.js
@@ -427,8 +427,12 @@ export function createBrowserSideProvider({
                 moreBtn.setAttribute('aria-expanded', 'true');
                 menu.querySelector('[role="menuitem"]:not([disabled])')?.focus();
             };
-            // 地址栏里打了一半就点走：回到当前页面的网址（setAddress 在聚焦时不改它，没有这一步会一直留着半截文字）
-            own.listen(address, 'blur', () => { address.value = currentUrl === 'about:blank' ? '' : currentUrl; });
+            // 地址栏里打了一半就点走：回到当前页面的网址（setAddress 在聚焦时不改它，没有这一步会一直留着半截文字）。
+            // 切到别的窗口（比如去复制网址）也会触发 blur，那时整个文档都没焦点，打了一半的字要留着
+            own.listen(address, 'blur', () => {
+                if (doc.hasFocus?.() === false) return;
+                address.value = currentUrl === 'about:blank' ? '' : currentUrl;
+            });
             own.listen(menu, 'keydown', (event) => {
                 if (event.key === 'Escape' || event.key === 'Tab') {
                     event.preventDefault();
diff --git a/tests/side-browser-address.test.mjs b/tests/side-browser-address.test.mjs
index a06ad386d..2f259ed24 100644
--- a/tests/side-browser-address.test.mjs
+++ b/tests/side-browser-address.test.mjs
@@ -265,8 +265,28 @@ test('half-typed text in the address bar goes back to the page address when focu
     const address = view.querySelector('input');
     address.focus();
     address.value = 'foo';
+    dom.window.document.hasFocus = () => true; // 焦点在窗口里换了地方（jsdom 在 blur 时报 false，Chromium 报 true）
     address.blur();
     assert.equal(address.value, 'https://example.com/');
     handle.dispose();
     dom.window.close();
 });
+
+test('switching to another window keeps the half-typed address', async () => {
+    const { JSDOM } = await import('jsdom');
+    const { createBrowserSideProvider } = await import('../modules/ui-system/side-pane/browserSideProvider.js');
+    const dom = new JSDOM('<div id="view"></div>');
+    const doc = dom.window.document;
+    const provider = createBrowserSideProvider({ document: doc, api: null, sidePaneController: { updateTab() {} }, notify: () => {} });
+    const view = doc.getElementById('view');
+    const handle = await provider.mountTab({ id: 'browser:1', kind: 'browser', payload: {} }, view);
+    handle.navigate('https://example.com/');
+    const address = view.querySelector('input');
+    address.focus();
+    address.value = 'https://exa';
+    doc.hasFocus = () => false; // 整个窗口失焦（Alt-Tab）
+    address.blur();
+    assert.equal(address.value, 'https://exa');
+    handle.dispose();
+    dom.window.close();
+});

From 21a0a481bc04e7367350b16955575370ae02773d Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 06:39:25 +0000
Subject: [PATCH 130/143] Side pane batch X: maintainability pass

Docs and contracts
- Provider contract in SIDE_PANE_ARCHITECTURE.md now matches the code:
  mount context (scope, occurrence, restoredState), every handle method
  the controller calls, and a lifecycle section with the invariants
  (one mount per id, zero view resources while dormant, what never
  sleeps, suspend/resume follows visibility, failure paths).
- Type-level requestClose, dormancy and load documented; 'detach' and
  isBusy examples describe what the code actually does.
- Stale comments fixed (tab strip, launcher, tab utils, controller maps,
  lazy provider list, nonexistent gitSideProvider.js, eager example).

Duplication
- Menu arrow/Home/End handling shared via moveMenuFocus (4 copies; the
  browser copy had drifted: ArrowUp with nothing focused skipped the
  last item).
- Controller visibility delivery and "focus unchanged" rule each in one
  helper.
- Tool output and trajectory search hints live only in their tab types.

Behaviour
- Terminal restart uses the app confirm dialog (native confirm blocks
  the window); a second click waits on the same dialog.
- Plan detail focus() moves focus into the tab instead of only reloading.

Dead code
- Unused toolOutputTabId / modelTrajectoryTabId exports, side chat
  handle setVisible, an unreachable branch and an unused local in
  side-pane-state.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DFRovoZHMzeheXKkLNWKG
---
 docs/SIDE_PANE_ARCHITECTURE.md                |  49 ++++-
 docs/contracts/chat-contracts.json            |   2 +-
 .../contracts/generated/chat-event-graph.json | 206 +++++++++---------
 modules/renderer/sideChatSurfaceOwner.js      |   6 -
 .../side-pane/browserSideProvider.js          |  12 +-
 .../ui-system/side-pane/git/context-menu.js   |  12 +-
 modules/ui-system/side-pane/menu-position.js  |  16 ++
 .../side-pane/modelTrajectorySideProvider.js  |  19 +-
 .../side-pane/planDetailSideProvider.js       |   8 +-
 .../side-pane/side-pane-controller.js         |  46 ++--
 .../ui-system/side-pane/side-pane-dormancy.js |   2 +-
 .../ui-system/side-pane/side-pane-launcher.js |   2 +-
 .../ui-system/side-pane/side-pane-state.js    |   6 +-
 .../ui-system/side-pane/side-pane-tab-menu.js |  13 +-
 .../side-pane/side-pane-tab-strip.js          |   2 +-
 .../side-pane/side-pane-tab-utils.js          |   2 +-
 .../ui-system/side-pane/side-pane-types.js    |  10 +-
 .../side-pane/tab-types/lazy-provider.js      |   2 +-
 .../ui-system/side-pane/tab-types/terminal.js |   2 +-
 .../side-pane/tab-types/tool-output.js        |   2 +-
 .../side-pane/terminalSideProvider.js         |  23 +-
 .../side-pane/toolOutputSideProvider.js       |   5 +-
 tests/side-pane-menu-keyboard.test.mjs        |  39 ++++
 tests/side-pane-terminal-lifecycle.test.mjs   |  20 +-
 24 files changed, 294 insertions(+), 212 deletions(-)
 create mode 100644 tests/side-pane-menu-keyboard.test.mjs

diff --git a/docs/SIDE_PANE_ARCHITECTURE.md b/docs/SIDE_PANE_ARCHITECTURE.md
index 68490be3e..d5b340949 100644
--- a/docs/SIDE_PANE_ARCHITECTURE.md
+++ b/docs/SIDE_PANE_ARCHITECTURE.md
@@ -26,7 +26,7 @@
 | `side-pane-types.js` | 只有 JSDoc 类型：`SidePaneTab`、`SidePaneTabType`、`SidePaneProvider`、`SidePaneTabHandle` 等契约 | 否 |
 | `side-pane-persistence.js` | 布局存档的序列化、带版本号的校验读取、防抖保存；按对话的记忆最多 50 条（LRU） | 否（只碰 storage） |
 | `side-pane-focus.js` | 焦点归属：记下打开副屏前的焦点，收起时送回；焦点不在副屏里时不挪 | 是（只调 `focus()`） |
-| `side-pane-tab-close-owner.js` | 按挂载 occurrence 合并关闭授权、提交关闭后等待清理、与控制器销毁共用一次 dispose | 否（通过组合者回调提交视图和状态变化） |
+| `side-pane-tab-close-owner.js` | 按标签的这次打开（lifetime）合并关闭授权、提交关闭后等待清理、与控制器销毁共用一次 dispose | 否（通过组合者回调提交视图和状态变化） |
 | `side-pane-shortcuts.js` | 键盘快捷键：Ctrl/Cmd+Alt+B 开合，副屏内 Ctrl+PageUp/PageDown 切标签 | 是（window keydown） |
 | `side-pane-visibility.js` | 宽度比例（默认 45%，20%–65%）、开合动画、动画期间锁定内容宽度 | 是（写 `style.width`） |
 | `side-pane-tab-strip.js` | 标签条渲染、悬停提示、溢出布局与边缘渐隐、拖拽排序、方向键 / 中键关闭、通知标签上的连接状态点 | 是 |
@@ -122,12 +122,12 @@ sidePaneWiring
 
 ## 4. Provider 契约
 
-一个 provider 负责一种 `kind` 的标签，通过标签类型的 `provider` 字段登记：
+一个 provider 负责一种 `kind` 的标签，通过标签类型的 `provider` 字段登记。完整的类型定义在 `side-pane-types.js`（`SidePaneProvider`、`SidePaneMountContext`、`SidePaneTabHandle`），这里只说调用顺序和不变量。
 
 ```js
 const provider = {
-    async mountTab(tab, viewElement) {
-        // 在 viewElement 里渲染，返回 handle
+    async mountTab(tab, viewElement, { scope, occurrence, restoredState }) {
+        // 在 viewElement 里渲染；监听、定时器、订阅挂在 scope 上；返回 handle
         return handle;
     }
 };
@@ -135,14 +135,41 @@ const provider = {
 
 - `tab`：`openTab()` 传入的对象；从存档恢复出来的标签是存下来的标签对象（`payload` 原样带回）。辅助对话类型的 provider 适配层把 `descriptor` 取出来交给辅助对话 owner。
 - `viewElement`：控制器创建的 `<section class="side-pane-view" role="tabpanel">`，provider 只能在它里面渲染。
+- `scope`：这次挂载的 view scope，视图释放（关标签或休眠）时整个拆掉。
+- `occurrence`：标签从打开到关闭的生命周期，休眠不影响它。`occurrence.signal` 关标签时 abort；`occurrence.visible` 由控制器发布。
+- `restoredState`：休眠前 `captureState()` 的返回值，第一次挂载时没有。
+- 只接两个参数的旧 provider 照常工作，资源由它自己的 `dispose` 收。
 
 handle 的方法都是可选的：
 
 | 方法 | 调用时机 |
 | :--- | :--- |
-| `focus()` | 标签被激活或刚打开时 |
+| `focus()` | 标签被激活或刚打开时（焦点没被别处拿走才调） |
+| `suspend()` / `resume()` | 变得不可见 / 重新可见时（收起面板、切标签、窗口切到后台）。只在可见性真的变化时调用，挂载期间错过的那次在挂载完成后补发 |
+| `isBusy()` | 每次评估休眠时；返回 true 就不休眠，过一会再问。抛错按忙处理 |
+| `captureState()` | 休眠前，同步调用；返回值在重新挂载时作为 `restoredState` 交回 |
 | `requestClose()` | 关闭前；返回 `{ closed: false }` 时取消关闭（比如有未保存内容且用户选择留下） |
-| `dispose()` | 关闭或控制器销毁时；可以是异步的。抛错时控制器记日志并照常关闭标签 |
+| `dispose()` | 视图释放时（关闭、休眠或控制器销毁）；可以是异步的。抛错时控制器记日志并照常继续 |
+
+### 生命周期顺序与不变量
+
+一个标签 id 的一生：
+
+```
+openTab ─ 创建 occurrence ─ openView(scope) ─ 发布可见性 ─ mountTab ─┬─ 显示 ⇄ 隐藏（resume / suspend）
+                                                                     ├─ 休眠：captureState → 摘掉视图 → dispose → 关 view scope
+                                                                     │        再显示时：新 view scope → mountTab(restoredState)
+                                                                     └─ 关闭：requestClose → 移除标签和视图 → dispose → occurrence 释放（signal abort）→ onClosed
+```
+
+控制器保证：
+
+1. **一个 id 同时只有一次挂载。** 并发打开等同一次挂载；挂载期间关掉或销毁，刚挂好的 handle 立刻 `dispose`，视图移除，结果不写回。
+2. **休眠后视图资源归零。** 视图的 DOM、view scope 上的监听、定时器和订阅全部释放，只留 `dormantTabs` 里的 `captureState` 结果。要跨休眠保留的东西（比如终端的 shell 会话和画面）只能挂在 `occurrence` 上，关标签时随 `occurrence.signal` 释放。
+3. **正在显示、`isBusy()` 为 true、关闭确认还开着的标签不休眠。** `limit-only`（浏览器）只按数量淘汰，`keep` 不休眠、也不占视图名额。阈值见 `side-pane-dormancy.js`。
+4. **`suspend` / `resume` 与可见性一致。** provider 不用自己探测 DOM，`occurrence.visible` 和最后一次收到的 suspend/resume 总是一致。
+5. **挂载失败不留空白页。** `mountTab` 抛错时 view scope 释放，视图里换成出错提示和「重试」按钮（`.side-pane-mount-error`）。打开时焦点落在重试按钮上；重试会重新挂载，懒加载的 provider 也会重新加载实现。
+6. **懒加载失败要告诉用户。** `tab-types/lazy-provider.js` 的转发方法（入口、文件链接等调用的 `openXxx`）加载失败时弹出提示再抛错，下次调用重新加载；`mountTab` 的失败由第 5 条的出错页负责。
 
 辅助对话 handle 仍向自己的调用方提供草稿、引用和模型方法；控制器只使用上表的通用生命周期方法。输入缓存由辅助对话 provider 的 `side-chat/draft-cache.js` 持有，卸载前保存、再次挂载后恢复；拒绝关闭时不卸载。
 
@@ -163,10 +190,13 @@ handle 的方法都是可选的：
 
    ```js
    export function defineTerminalTabType(deps) {
-       const provider = createTerminalSideProvider(deps);
+       // 实现第一次用到时才加载；openTerminalTab 是要转发的方法
+       const provider = createLazyProvider(async () => (await import('../terminalSideProvider.js'))
+           .createTerminalSideProvider(deps), ['openTerminalTab'], { label: '终端', notify: deps.notify });
        return Object.freeze({
            kind: 'terminal', label: '终端', icon: 'terminal', searchHint: '终端',
            persist: false,
+           dormancy: 'detach',
            entry: { id: 'terminal', order: 50, open: () => provider.openTerminalTab() },
            provider
        });
@@ -180,6 +210,9 @@ handle 的方法都是可选的：
    | :--- | :--- |
    | `toTab(payload, tabs)` | `openTab(payload)` 先经过它变成标签。辅助对话用它校验描述符，并让同一个子话题重复打开时落到已有标签上，所以调用方写 `openTab({ kind: 'chat', descriptor })` |
    | `onClosed(tab)` | 标签关掉、视图拆掉后调用。辅助对话用它删掉子话题；抛错只记日志 |
+   | `requestClose(tab)` | 标签没挂载（从没显示过或在休眠）时关闭前的确认；挂着的由 handle 的 `requestClose` 确认。返回 `{ closed: false }` 取消 |
+   | `dormancy` | 休眠方式，见第 4 节和 `side-pane-dormancy.js`：`none`（默认）、`detach`（终端：控制器同 `none`，provider 自己跨休眠保留会话）、`limit-only`（浏览器）、`keep` |
+   | `load()` | 没给 `provider` 时用它懒加载实现 |
    | `persist: false` | 不随布局持久化。辅助对话（由会话服务恢复）、终端（重启后不自动拉起 shell）、命令输出（记录只在内存里）用它 |
    | `reopenable: false` | 关掉后不进"最近关闭"。标签自己带 `ephemeral: true` 也一样 |
 
@@ -248,6 +281,6 @@ provider 只能修改自己的视图，跨模块动作通过组合者注入的
 
 ## 11. Git 与代码查看器 provider
 
-`gitSideProvider.js` 保留工作区、来源、轮询、状态读取和指定路径定位。`git/diff-model.js` 导出原有纯函数；`git/cards.js` 自己持有展开状态、diff 缓存及数量预取队列；`git/context-menu.js` 负责复制、定位和菜单监听器。入口通过实时读取函数、纯函数依赖及菜单回调连接它们，销毁时统一清理。Git 直接使用 `line-diff.js`，不再依赖代码查看器 provider。
+Git 页由计划详情 provider 挂载（`git/git-view.js`），保留工作区、来源、轮询、状态读取和指定路径定位。`git/diff-model.js` 导出原有纯函数；`git/cards.js` 自己持有展开状态、diff 缓存及数量预取队列；`git/context-menu.js` 负责复制、定位和菜单监听器。入口通过实时读取函数、纯函数依赖及菜单回调连接它们，销毁时统一清理。Git 直接使用 `line-diff.js`，不再依赖代码查看器 provider。
 
 `codeViewerSideProvider.js` 保留工具栏、模式切换及原有 API，组合 `code-viewer/picker.js`、`editor.js` 和 `diff-view.js`。文件选择器保持工作区/路径竞态保护，正文与 diff 通过回调连接；类型检测在 `helpers.js`。HTML 转义共用 `text-escape.js`，两个适配器分别保留代码查看器严格字符串输入和辅助对话原有值转换语义。原入口继续导出 `detectLanguage`、`escapeHtml` 和 `computeLineDiff`。
diff --git a/docs/contracts/chat-contracts.json b/docs/contracts/chat-contracts.json
index 79fee959a..497e963e0 100644
--- a/docs/contracts/chat-contracts.json
+++ b/docs/contracts/chat-contracts.json
@@ -1123,7 +1123,7 @@
     "dynamicSites": [
       {
         "file": "modules/ui-system/side-pane/browserSideProvider.js",
-        "line": 281,
+        "line": 282,
         "kind": "custom-event-listener",
         "match": "guest.addEventListener(name"
       }
diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 54e16d73c..b15959ef7 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -665,7 +665,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 297,
+          "line": 316,
           "kind": "custom-event-listener"
         },
         {
@@ -730,7 +730,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 297,
+          "line": 316,
           "kind": "custom-event-listener",
           "match": "signal?.addEventListener('abort'"
         },
@@ -1696,7 +1696,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/context-menu.js",
-          "line": 133,
+          "line": 125,
           "kind": "custom-event-listener"
         },
         {
@@ -1716,7 +1716,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-menu.js",
-          "line": 105,
+          "line": 96,
           "kind": "custom-event-listener"
         },
         {
@@ -1807,7 +1807,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/context-menu.js",
-          "line": 133,
+          "line": 125,
           "kind": "custom-event-listener",
           "match": "win.addEventListener('blur'"
         },
@@ -1831,7 +1831,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-menu.js",
-          "line": 105,
+          "line": 96,
           "kind": "custom-event-listener",
           "match": "win?.addEventListener('blur'"
         },
@@ -2391,7 +2391,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 582,
+          "line": 584,
           "kind": "custom-event-listener"
         }
       ],
@@ -2566,7 +2566,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 582,
+          "line": 584,
           "kind": "custom-event-listener",
           "match": "el.addEventListener('change'"
         }
@@ -3697,12 +3697,12 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 593,
+          "line": 592,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 596,
+          "line": 595,
           "kind": "custom-event-listener"
         },
         {
@@ -4207,7 +4207,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/context-menu.js",
-          "line": 115,
+          "line": 107,
           "kind": "custom-event-listener"
         },
         {
@@ -4217,22 +4217,22 @@
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 124,
+          "line": 122,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 351,
+          "line": 349,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 375,
+          "line": 373,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 768,
+          "line": 766,
           "kind": "custom-event-listener"
         },
         {
@@ -4272,87 +4272,87 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 340,
+          "line": 342,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 376,
+          "line": 378,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 413,
+          "line": 415,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 422,
+          "line": 424,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 535,
+          "line": 537,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 598,
+          "line": 600,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 604,
+          "line": 606,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 677,
+          "line": 679,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 704,
+          "line": 706,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 723,
+          "line": 725,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 743,
+          "line": 745,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 774,
+          "line": 776,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 789,
+          "line": 791,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 507,
+          "line": 510,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1205,
+          "line": 1203,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1211,
+          "line": 1209,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1225,
+          "line": 1223,
           "kind": "custom-event-listener"
         },
         {
@@ -5167,13 +5167,13 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 593,
+          "line": 592,
           "kind": "custom-event-listener",
           "match": "stopBtn.addEventListener('click'"
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 596,
+          "line": 595,
           "kind": "custom-event-listener",
           "match": "persistenceBadge.addEventListener('click'"
         },
@@ -5779,7 +5779,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/context-menu.js",
-          "line": 115,
+          "line": 107,
           "kind": "custom-event-listener",
           "match": "btn.addEventListener('click'"
         },
@@ -5791,25 +5791,25 @@
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 124,
+          "line": 122,
           "kind": "custom-event-listener",
           "match": "btn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 351,
+          "line": 349,
           "kind": "custom-event-listener",
           "match": "more.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 375,
+          "line": 373,
           "kind": "custom-event-listener",
           "match": "head.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 768,
+          "line": 766,
           "kind": "custom-event-listener",
           "match": "item.addEventListener('click'"
         },
@@ -5857,103 +5857,103 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 340,
+          "line": 342,
           "kind": "custom-event-listener",
           "match": "btn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 376,
+          "line": 378,
           "kind": "custom-event-listener",
           "match": "crumbs.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 413,
+          "line": 415,
           "kind": "custom-event-listener",
           "match": "refreshBtn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 422,
+          "line": 424,
           "kind": "custom-event-listener",
           "match": "forgeBtn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 535,
+          "line": 537,
           "kind": "custom-event-listener",
           "match": "row.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 598,
+          "line": 600,
           "kind": "custom-event-listener",
           "match": "toggle.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 604,
+          "line": 606,
           "kind": "custom-event-listener",
           "match": "clear.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 677,
+          "line": 679,
           "kind": "custom-event-listener",
           "match": "headBtn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 704,
+          "line": 706,
           "kind": "custom-event-listener",
           "match": "pick.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 723,
+          "line": 725,
           "kind": "custom-event-listener",
           "match": "pick.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 743,
+          "line": 745,
           "kind": "custom-event-listener",
           "match": "link.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 774,
+          "line": 776,
           "kind": "custom-event-listener",
           "match": "retry.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 789,
+          "line": 791,
           "kind": "custom-event-listener",
           "match": "retry.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 507,
+          "line": 510,
           "kind": "custom-event-listener",
           "match": "retry.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1205,
+          "line": 1203,
           "kind": "custom-event-listener",
           "match": "toggleNotificationsBtn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1211,
+          "line": 1209,
           "kind": "custom-event-listener",
           "match": "expandButton.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1225,
+          "line": 1223,
           "kind": "custom-event-listener",
           "match": "closeSidePaneBtn.addEventListener('click'"
         },
@@ -7128,25 +7128,25 @@
       "consumers": [
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 353,
+          "line": 352,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 563,
+          "line": 565,
           "kind": "custom-event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 353,
+          "line": 352,
           "kind": "custom-event-listener",
           "match": "textarea.addEventListener('compositionend'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 563,
+          "line": 565,
           "kind": "custom-event-listener",
           "match": "el.addEventListener('compositionend'"
         }
@@ -7158,25 +7158,25 @@
       "consumers": [
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 352,
+          "line": 351,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 562,
+          "line": 564,
           "kind": "custom-event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 352,
+          "line": 351,
           "kind": "custom-event-listener",
           "match": "textarea.addEventListener('compositionstart'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 562,
+          "line": 564,
           "kind": "custom-event-listener",
           "match": "el.addEventListener('compositionstart'"
         }
@@ -7313,7 +7313,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 600,
+          "line": 599,
           "kind": "custom-event-listener"
         },
         {
@@ -7445,7 +7445,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 600,
+          "line": 599,
           "kind": "custom-event-listener",
           "match": "persistenceBadge.addEventListener('contextmenu'"
         },
@@ -12710,7 +12710,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 194,
+          "line": 199,
           "kind": "custom-event-listener"
         }
       ],
@@ -12729,7 +12729,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 194,
+          "line": 199,
           "kind": "custom-event-listener",
           "match": "screen.addEventListener('focusin'"
         }
@@ -14826,7 +14826,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 355,
+          "line": 354,
           "kind": "custom-event-listener"
         },
         {
@@ -14901,7 +14901,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 561,
+          "line": 563,
           "kind": "custom-event-listener"
         },
         {
@@ -14997,7 +14997,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 355,
+          "line": 354,
           "kind": "custom-event-listener",
           "match": "textarea.addEventListener('input'"
         },
@@ -15093,7 +15093,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 561,
+          "line": 563,
           "kind": "custom-event-listener",
           "match": "el.addEventListener('input'"
         },
@@ -15452,7 +15452,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 361,
+          "line": 360,
           "kind": "custom-event-listener"
         },
         {
@@ -15582,12 +15582,12 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/context-menu.js",
-          "line": 132,
+          "line": 124,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 376,
+          "line": 374,
           "kind": "custom-event-listener"
         },
         {
@@ -15632,12 +15632,12 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-menu.js",
-          "line": 86,
+          "line": 77,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-menu.js",
-          "line": 104,
+          "line": 95,
           "kind": "custom-event-listener"
         },
         {
@@ -15825,7 +15825,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 361,
+          "line": 360,
           "kind": "custom-event-listener",
           "match": "textarea.addEventListener('keydown'"
         },
@@ -15981,13 +15981,13 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/context-menu.js",
-          "line": 132,
+          "line": 124,
           "kind": "custom-event-listener",
           "match": "doc.addEventListener('keydown'"
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 376,
+          "line": 374,
           "kind": "custom-event-listener",
           "match": "head.addEventListener('keydown'"
         },
@@ -16041,13 +16041,13 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-menu.js",
-          "line": 86,
+          "line": 77,
           "kind": "custom-event-listener",
           "match": "menu.addEventListener('keydown'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-menu.js",
-          "line": 104,
+          "line": 95,
           "kind": "custom-event-listener",
           "match": "doc.addEventListener('keydown'"
         },
@@ -21400,14 +21400,14 @@
       "consumers": [
         {
           "file": "modules/ui-system/side-pane/browserSideProvider.js",
-          "line": 120,
+          "line": 121,
           "kind": "preload-subscription"
         }
       ],
       "evidence": [
         {
           "file": "modules/ui-system/side-pane/browserSideProvider.js",
-          "line": 120,
+          "line": 121,
           "kind": "preload-subscription",
           "match": "api.onBrowserOpenTab("
         }
@@ -21658,14 +21658,14 @@
       "consumers": [
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 932,
+          "line": 921,
           "kind": "preload-subscription"
         }
       ],
       "evidence": [
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 932,
+          "line": 921,
           "kind": "preload-subscription",
           "match": "api?.onModelTrajectoryChanged("
         }
@@ -21764,14 +21764,14 @@
       "consumers": [
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 202,
+          "line": 207,
           "kind": "preload-subscription"
         }
       ],
       "evidence": [
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 202,
+          "line": 207,
           "kind": "preload-subscription",
           "match": "api.onTerminalClear("
         }
@@ -21802,14 +21802,14 @@
       "consumers": [
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 196,
+          "line": 201,
           "kind": "preload-subscription"
         }
       ],
       "evidence": [
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 196,
+          "line": 201,
           "kind": "preload-subscription",
           "match": "api.onTerminalData("
         }
@@ -21821,14 +21821,14 @@
       "consumers": [
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 210,
+          "line": 215,
           "kind": "preload-subscription"
         }
       ],
       "evidence": [
         {
           "file": "modules/ui-system/side-pane/terminalSideProvider.js",
-          "line": 210,
+          "line": 215,
           "kind": "preload-subscription",
           "match": "api.onTerminalExit("
         }
@@ -23109,7 +23109,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/context-menu.js",
-          "line": 131,
+          "line": 123,
           "kind": "custom-event-listener"
         },
         {
@@ -23124,7 +23124,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-menu.js",
-          "line": 103,
+          "line": 94,
           "kind": "custom-event-listener"
         },
         {
@@ -23163,7 +23163,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/context-menu.js",
-          "line": 131,
+          "line": 123,
           "kind": "custom-event-listener",
           "match": "doc.addEventListener('pointerdown'"
         },
@@ -23181,7 +23181,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-tab-menu.js",
-          "line": 103,
+          "line": 94,
           "kind": "custom-event-listener",
           "match": "doc.addEventListener('pointerdown'"
         },
@@ -25085,7 +25085,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1245,
+          "line": 1243,
           "kind": "custom-event-listener"
         },
         {
@@ -25185,7 +25185,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1245,
+          "line": 1243,
           "kind": "custom-event-listener",
           "match": "win?.addEventListener?.('resize'"
         },
@@ -26589,7 +26589,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 228,
+          "line": 230,
           "kind": "custom-event-listener"
         },
         {
@@ -26664,7 +26664,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 228,
+          "line": 230,
           "kind": "custom-event-listener",
           "match": "body.addEventListener('scroll'"
         },
@@ -28203,7 +28203,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 592,
+          "line": 591,
           "kind": "custom-event-listener"
         },
         {
@@ -28263,7 +28263,7 @@
         },
         {
           "file": "modules/renderer/sideChatSurfaceOwner.js",
-          "line": 592,
+          "line": 591,
           "kind": "custom-event-listener",
           "match": "form.addEventListener('submit'"
         },
@@ -33057,7 +33057,7 @@
     },
     {
       "file": "modules/ui-system/side-pane/browserSideProvider.js",
-      "line": 281,
+      "line": 282,
       "reason": "dynamic listener name: name",
       "kind": "custom-event-listener",
       "match": "guest.addEventListener(name",
diff --git a/modules/renderer/sideChatSurfaceOwner.js b/modules/renderer/sideChatSurfaceOwner.js
index cc998c973..e32f6a26e 100644
--- a/modules/renderer/sideChatSurfaceOwner.js
+++ b/modules/renderer/sideChatSurfaceOwner.js
@@ -280,7 +280,6 @@ export async function mountSideChatSurface(container, {
         const unavailableDispose = () => release('side-chat-unavailable');
         return {
             descriptor,
-            setVisible() {},
             focus() {},
             async requestClose() { return { closed: true }; },
             dispose: unavailableDispose,
@@ -622,11 +621,6 @@ export async function mountSideChatSurface(container, {
         captureState() {
             return isDisposed ? null : { scroll: scrollingOwner.capture() };
         },
-        setVisible(visible) {
-            if (visible && !isDisposed && isHistoryLoaded) {
-                textarea.focus();
-            }
-        },
         focus() {
             if (!isDisposed && isHistoryLoaded) {
                 textarea.focus();
diff --git a/modules/ui-system/side-pane/browserSideProvider.js b/modules/ui-system/side-pane/browserSideProvider.js
index 6981c530a..aeffe4c7d 100644
--- a/modules/ui-system/side-pane/browserSideProvider.js
+++ b/modules/ui-system/side-pane/browserSideProvider.js
@@ -11,6 +11,7 @@
 'use strict';
 
 import { createSidePaneRootScope } from './side-pane-occurrence.js';
+import { moveMenuFocus } from './menu-position.js';
 
 export const BROWSER_PARTITION = 'persist:vcp-side-browser';
 const ALLOWED_PROTOCOLS = new Set(['http:', 'https:', 'about:']); // 同 browserHandlers.js：不开 file: 本地页
@@ -435,16 +436,7 @@ export function createBrowserSideProvider({
                     closeMenu({ restoreFocus: true });
                     return;
                 }
-                if (!['ArrowDown', 'ArrowUp', 'Home', 'End'].includes(event.key)) return;
-                const items = Array.from(menu.querySelectorAll('[role="menuitem"]:not([disabled])'));
-                if (!items.length) return;
-                event.preventDefault();
-                const current = items.indexOf(doc.activeElement);
-                const next = event.key === 'Home' ? 0
-                    : event.key === 'End' ? items.length - 1
-                        : event.key === 'ArrowDown' ? (current + 1) % items.length
-                            : (current - 1 + items.length) % items.length;
-                items[next].focus();
+                moveMenuFocus(event, Array.from(menu.querySelectorAll('[role="menuitem"]:not([disabled])')));
             });
             const onDocumentPointerDown = (event) => {
                 if (!menu.hidden && !menu.contains(event.target) && !moreBtn.contains(event.target)) closeMenu();
diff --git a/modules/ui-system/side-pane/git/context-menu.js b/modules/ui-system/side-pane/git/context-menu.js
index 5377aac89..d628ef2f9 100644
--- a/modules/ui-system/side-pane/git/context-menu.js
+++ b/modules/ui-system/side-pane/git/context-menu.js
@@ -15,6 +15,7 @@
 
 'use strict';
 
+import { moveMenuFocus } from '../menu-position.js';
 
 
 export function createGitContextMenu({
@@ -81,16 +82,7 @@ export function createGitContextMenu({
             return;
         }
         if (!contextMenu.contains(doc.activeElement)) return;
-        if (!['ArrowDown', 'ArrowUp', 'Home', 'End'].includes(event.key)) return;
-        const items = [...contextMenu.querySelectorAll('[role="menuitem"]:not([disabled])')];
-        if (!items.length) return;
-        event.preventDefault();
-        const current = items.indexOf(doc.activeElement);
-        let next = 0;
-        if (event.key === 'End') next = items.length - 1;
-        else if (event.key === 'ArrowDown') next = current < 0 ? 0 : (current + 1) % items.length;
-        else if (event.key === 'ArrowUp') next = current < 0 ? items.length - 1 : (current - 1 + items.length) % items.length;
-        items[next].focus();
+        moveMenuFocus(event, [...contextMenu.querySelectorAll('[role="menuitem"]:not([disabled])')]);
     }
 
     function openContextMenu(event, item) {
diff --git a/modules/ui-system/side-pane/menu-position.js b/modules/ui-system/side-pane/menu-position.js
index ecf56f19d..06122d1b7 100644
--- a/modules/ui-system/side-pane/menu-position.js
+++ b/modules/ui-system/side-pane/menu-position.js
@@ -11,3 +11,19 @@ export function placeMenuAt(menu, x, y, win = menu?.ownerDocument?.defaultView,
     menu.style.left = `${Math.round(Math.max(margin, Math.min(x, viewportWidth - width - margin)))}px`;
     menu.style.top = `${Math.round(Math.max(margin, Math.min(y, viewportHeight - height - margin)))}px`;
 }
+
+/**
+ * 菜单里的方向键：上下循环、Home / End 到头尾；焦点不在菜单项上时，下键到第一项、上键到最后一项。
+ * 处理了返回 true（已 preventDefault），不是这几个键或没有可用项时返回 false。
+ */
+export function moveMenuFocus(event, items) {
+    if (!['ArrowDown', 'ArrowUp', 'Home', 'End'].includes(event.key) || !items.length) return false;
+    event.preventDefault();
+    const current = items.indexOf(items[0]?.ownerDocument?.activeElement);
+    let next = 0;
+    if (event.key === 'End') next = items.length - 1;
+    else if (event.key === 'ArrowDown') next = current < 0 ? 0 : (current + 1) % items.length;
+    else if (event.key === 'ArrowUp') next = current < 0 ? items.length - 1 : (current - 1 + items.length) % items.length;
+    items[next].focus();
+    return true;
+}
diff --git a/modules/ui-system/side-pane/modelTrajectorySideProvider.js b/modules/ui-system/side-pane/modelTrajectorySideProvider.js
index 4cc1fae27..3cdf9b551 100644
--- a/modules/ui-system/side-pane/modelTrajectorySideProvider.js
+++ b/modules/ui-system/side-pane/modelTrajectorySideProvider.js
@@ -17,6 +17,7 @@
 'use strict';
 
 import { createSidePaneRootScope, pollWhileVisible } from './side-pane-occurrence.js';
+import { moveMenuFocus } from './menu-position.js';
 import {
     ROLE_LABELS, formatClockTime, formatDateTime, formatDuration, finishReasonLabel, effectiveFinishReason, sourceLabel,
     buildTimeline, summarizeRecords, buildSearchIndex, findTextMatches,
@@ -41,8 +42,6 @@ const EXPANSION_LABELS = Object.freeze({
     system: ROLE_LABELS.system, user: ROLE_LABELS.user, reasoning: '思考过程', assistant: ROLE_LABELS.assistant, 'tool-call': '工具调用', 'tool-result': ROLE_LABELS.tool
 });
 
-export const modelTrajectoryTabId = () => TAB_ID;
-
 /** 与主进程 sessionKeyFromContext 一致：群聊用群 id，否则用智能体 id，再接话题 id。 */
 export function trajectoryKeyFor(conversation) {
     const itemId = conversation?.item?.id;
@@ -84,8 +83,7 @@ export function createModelTrajectorySideProvider({
                 title: '调用轨迹',
                 icon: 'monitoring',
                 closable: true,
-                scopeMode: 'global',
-                searchHint: '模型调用 请求 响应 token 轨迹'
+                scopeMode: 'global'
             });
             sidePaneController.setVisible?.(true);
             for (const instance of instances) instance.show(requestId);
@@ -796,16 +794,7 @@ export function createModelTrajectorySideProvider({
                     closeMenu({ restoreFocus: true });
                     return;
                 }
-                if (!['ArrowDown', 'ArrowUp', 'Home', 'End'].includes(event.key)) return;
-                const items = [...menu.querySelectorAll('[role="menuitemcheckbox"]')];
-                if (!items.length) return;
-                event.preventDefault();
-                const current = items.indexOf(doc.activeElement);
-                let next = 0;
-                if (event.key === 'End') next = items.length - 1;
-                else if (event.key === 'ArrowDown') next = current < 0 ? 0 : (current + 1) % items.length;
-                else if (event.key === 'ArrowUp') next = current < 0 ? items.length - 1 : (current - 1 + items.length) % items.length;
-                items[next].focus();
+                moveMenuFocus(event, [...menu.querySelectorAll('[role="menuitemcheckbox"]')]);
             });
 
             // ---------------------------------------------------------------- 定位到某次调用（来自消息的「查看调用轨迹」）
@@ -880,7 +869,7 @@ export function createModelTrajectorySideProvider({
                 // 记下点按钮时的话题：确认框开着时切了会话，也只清这一个
                 const key = sessionKey;
                 const message = '清空这个话题的全部调用轨迹？此操作不可撤销。';
-                // 用应用自己的确认框，不用原生 window.confirm（会以应用窗口名义弹系统模态框，卡住整个窗口）
+                // 用应用自己的确认框；原生 window.confirm 会弹系统模态框卡住整个窗口，只在没有应用确认框时退回
                 const confirmed = typeof uiHelper?.showConfirmDialog === 'function'
                     ? await uiHelper.showConfirmDialog(message, '清空调用轨迹', '清空', '取消', true)
                     : (typeof win.confirm === 'function' ? win.confirm(message) : true);
diff --git a/modules/ui-system/side-pane/planDetailSideProvider.js b/modules/ui-system/side-pane/planDetailSideProvider.js
index 328e2bac0..5968dffe1 100644
--- a/modules/ui-system/side-pane/planDetailSideProvider.js
+++ b/modules/ui-system/side-pane/planDetailSideProvider.js
@@ -221,6 +221,8 @@ export function createPlanDetailSideProvider({
             const scope = h('div', 'zc-scope vcp-ui-scope side-plan-scope');
             const chrome = h('div', 'side-plan-chrome');
             const body = h('div', 'side-plan-body');
+            // 标签激活时焦点落在这里（不进 Tab 顺序），键盘用户接着就能在计划里滚动、往下 Tab
+            body.tabIndex = -1;
             scope.append(chrome, body);
             viewElement.appendChild(scope);
             // 休眠只发生在隐藏时，那时 display:none 的 body 读出来滚动是 0：可见时就记下位置（body 随视图丢弃，监听不用登记）
@@ -1037,7 +1039,11 @@ export function createPlanDetailSideProvider({
             }), 'topic-history');
 
             const handle = {
-                focus() { scheduleLoad(); },
+                focus() {
+                    body.focus?.({ preventScroll: true });
+                    // 每次切回来都重读一次：工程变更事件之外的改动（比如别的窗口）也能跟上
+                    scheduleLoad();
+                },
                 suspend() {
                     // 还没到点的重读留到重新显示时再做
                     if (!cancelLoad) return;
diff --git a/modules/ui-system/side-pane/side-pane-controller.js b/modules/ui-system/side-pane/side-pane-controller.js
index 990bcbdd3..7a02ab1ce 100644
--- a/modules/ui-system/side-pane/side-pane-controller.js
+++ b/modules/ui-system/side-pane/side-pane-controller.js
@@ -74,8 +74,8 @@ export function createSidePaneController({
         visible: root.classList.contains('active') || root.getAttribute('aria-hidden') === 'false'
     });
 
-    const mountedTabMap = new Map(); // tabId -> { payload, viewElement, handle, occurrence }
-    const pendingTabMounts = new Map(); // tabId -> mount occurrence; reopening the same id starts a new lifetime
+    const mountedTabMap = new Map(); // tabId -> { payload, viewElement, handle, onClosed, occurrence }
+    const pendingTabMounts = new Map(); // tabId -> { promise, viewElement, canceled, onClosed }：进行中的挂载；同 id 重开会换一个新的
     // 标签打开期间的 scope：第一次挂载时建，关标签才释放；视图休眠只释放它下面的 view scope
     const rootScope = createSidePaneRootScope(scope);
     const occurrences = new Map(); // tabId -> createTabOccurrence()
@@ -328,6 +328,15 @@ export function createSidePaneController({
         return !isDisposed && state.visible && doc.visibilityState !== 'hidden' && tabId === activeViewId && visibleTabIds.has(tabId);
     }
 
+    function deliverVisibility(tabId, handle, shown) {
+        try {
+            if (shown) handle?.resume?.();
+            else handle?.suspend?.();
+        } catch (error) {
+            console.error(`[SidePaneController] Failed to ${shown ? 'resume' : 'suspend'} tab "${tabId}":`, error);
+        }
+    }
+
     // 可见性由容器下发：provider 不用自己探测 DOM；隐藏时 suspend，重新可见时 resume
     function syncOccurrenceVisibility() {
         if (isDisposed) return;
@@ -335,13 +344,7 @@ export function createSidePaneController({
         occurrences.forEach((tabOccurrence, tabId) => {
             const shown = isTabShown(tabId, active);
             if (!tabOccurrence.setVisible(shown)) return;
-            const handle = mountedTabMap.get(tabId)?.handle;
-            try {
-                if (shown) handle?.resume?.();
-                else handle?.suspend?.();
-            } catch (error) {
-                console.error(`[SidePaneController] Failed to ${shown ? 'resume' : 'suspend'} tab "${tabId}":`, error);
-            }
+            deliverVisibility(tabId, mountedTabMap.get(tabId)?.handle, shown);
         });
         noteViewPresence(active);
         evaluateDormancy();
@@ -587,14 +590,7 @@ export function createSidePaneController({
             if (dormantTabs.get(tabId) === dormant) dormantTabs.delete(tabId);
             // 挂载期间可见性变了（折叠侧栏、切走标签）时 handle 还不在，那次 suspend/resume 落空了，这里补上
             const visibleNow = tabOccurrence.occurrence.isVisible();
-            if (visibleNow !== visibleAtMount) {
-                try {
-                    if (visibleNow) handle?.resume?.();
-                    else handle?.suspend?.();
-                } catch (error) {
-                    console.error(`[SidePaneController] Failed to ${visibleNow ? 'resume' : 'suspend'} tab "${tabId}":`, error);
-                }
-            }
+            if (visibleNow !== visibleAtMount) deliverVisibility(tabId, handle, visibleNow);
             return entry;
         })();
 
@@ -610,7 +606,6 @@ export function createSidePaneController({
         return mounting;
     }
 
-    // 恢复出来的标签不在启动时挂载，第一次显示时才挂；焦点留在原处
     // 批量关闭期间兜底激活的标签多半紧接着也要关，等整批关完再挂当时停着的那个
     let batchClosing = 0;
     async function closeBatch(tabs, options, onFocusMoved) {
@@ -623,6 +618,7 @@ export function createSidePaneController({
         }
     }
 
+    // 恢复出来的标签不在启动时挂载，第一次显示时才挂；焦点留在原处
     function mountActiveIfNeeded() {
         if (isDisposed || !state.visible || batchClosing > 0) return;
         const tabId = state.activeTabId;
@@ -643,15 +639,19 @@ export function createSidePaneController({
         rememberBounded(activeTabByParent, parentKey, tabId);
     }
 
+    // 打开期间焦点没被别处拿走：还在发起处，或者发起处随旧视图拆掉、焦点掉到了 body 上
+    function isFocusUnchanged(origin) {
+        return doc.activeElement === origin
+            || (doc.activeElement === doc.body && Boolean(origin) && !origin.isConnected);
+    }
+
     function finishOpen(tabId, entry, origin) {
         if (isDisposed) return null;
         syncViewPanels();
         syncDomVisibility();
         // A background mount can finish after another tab, conversation or input has taken focus.
-        const focusUnchanged = doc.activeElement === origin
-            || (doc.activeElement === doc.body && origin && !origin.isConnected);
         if (state.visible && state.activeTabId === tabId && mountedTabMap.get(tabId) === entry
-            && SidePaneState.getVisibleTabs(state, state.parent).some(tab => tab.id === tabId) && focusUnchanged) {
+            && SidePaneState.getVisibleTabs(state, state.parent).some(tab => tab.id === tabId) && isFocusUnchanged(origin)) {
             entry?.handle?.focus?.();
         }
         return entry?.handle || null;
@@ -660,9 +660,7 @@ export function createSidePaneController({
     // 打开失败时焦点和打开成功一样落到新标签上：那里只有出错页，就落在重试按钮上（键盘用户不用摸回去）
     function focusMountFailure(tabId, origin) {
         if (isDisposed || !state.visible || state.activeTabId !== tabId) return;
-        const focusUnchanged = doc.activeElement === origin
-            || (doc.activeElement === doc.body && origin && !origin.isConnected);
-        if (focusUnchanged) failedMounts.get(tabId)?.querySelector?.('.side-pane-mount-error-retry')?.focus?.();
+        if (isFocusUnchanged(origin)) failedMounts.get(tabId)?.querySelector?.('.side-pane-mount-error-retry')?.focus?.();
     }
 
     // 临时标签（如辅助对话）不进“最近关闭”，其他标签都能重新打开
diff --git a/modules/ui-system/side-pane/side-pane-dormancy.js b/modules/ui-system/side-pane/side-pane-dormancy.js
index f11124d04..1f04eeb81 100644
--- a/modules/ui-system/side-pane/side-pane-dormancy.js
+++ b/modules/ui-system/side-pane/side-pane-dormancy.js
@@ -3,7 +3,7 @@
  *   - 隐藏超过 hiddenMs（默认 5 分钟）；
  *   - 属于别的对话的标签（scopeMode 'topic'）离开当前对话超过 otherTopicMs，来回切换时不会马上重建；
  *   - 同时挂着的视图超过 maxLiveViews 时，最久没显示的先休眠。
- * 不休眠：正在显示的、类型声明 dormancy 'keep' 的、视图报告自己正忙的（加载中、在放声音、命令还在跑……），
+ * 不休眠：正在显示的、类型声明 dormancy 'keep' 的、视图报告自己正忙的（网页在加载或放声音、辅助对话在发送……），
  * 忙的到期后隔 busyRetryMs 再看一次。
  * 'limit-only' 的类型（浏览器）不按隐藏时长休眠，只在超过上限时参与淘汰：销毁网页会丢掉表单、登录和后退栈，
  * 代价远高于重建其他视图（对照 ZCode browserTabResidencyPolicy.ts 只按数量淘汰）。
diff --git a/modules/ui-system/side-pane/side-pane-launcher.js b/modules/ui-system/side-pane/side-pane-launcher.js
index 976a369a9..aa8214e8a 100644
--- a/modules/ui-system/side-pane/side-pane-launcher.js
+++ b/modules/ui-system/side-pane/side-pane-launcher.js
@@ -3,7 +3,7 @@
 import { createSidePaneEntries } from './side-pane-entries.js';
 
 /**
- * 新标签页（引导页）：上面地址栏，下面工具入口。工具入口由各模块通过 registerEntry 自己登记，
+ * 新标签页（引导页）：上面个人资料，下面工具 / 应用 / 通知分段。工具入口由各模块通过 registerEntry 自己登记，
  * 「+」按钮和面板空着时展开也按登记的入口决定打开什么。
  *   isNotificationsActive()   通知标签是不是当前标签（通知页是新标签页里的一个分类）
  *   showNotifications() / showLauncher() / hideMenus()
diff --git a/modules/ui-system/side-pane/side-pane-state.js b/modules/ui-system/side-pane/side-pane-state.js
index 38c6282e7..33f3f13d2 100644
--- a/modules/ui-system/side-pane/side-pane-state.js
+++ b/modules/ui-system/side-pane/side-pane-state.js
@@ -115,10 +115,9 @@ export function resolveSidePaneScopeState(state, parentRef, options = {}) {
         };
     }
 
+    // 记下的标签在这个对话里的话上面已经返回了
     let resolvedActiveTabId = null;
-    if (options.preferredTabId && parentChatTabs.some(t => t.id === options.preferredTabId)) {
-        resolvedActiveTabId = options.preferredTabId;
-    } else if (parentChatTabs.some(t => t.id === state.activeTabId)) {
+    if (parentChatTabs.some(t => t.id === state.activeTabId)) {
         resolvedActiveTabId = state.activeTabId;
     } else {
         resolvedActiveTabId = parentChatTabs[parentChatTabs.length - 1].id;
@@ -233,7 +232,6 @@ export function openTab(state, rawTab) {
         nextTabs = Object.freeze([...state.tabs, newTab]);
     }
 
-    const tabParent = getTabParent({ ...rawTab, scopeMode });
     const isVisibleForCurrentParent = isTabVisibleForParent({ ...rawTab, scopeMode }, state.parent);
 
     return Object.freeze({
diff --git a/modules/ui-system/side-pane/side-pane-tab-menu.js b/modules/ui-system/side-pane/side-pane-tab-menu.js
index d786d9f0a..3322996ec 100644
--- a/modules/ui-system/side-pane/side-pane-tab-menu.js
+++ b/modules/ui-system/side-pane/side-pane-tab-menu.js
@@ -1,7 +1,7 @@
 /* Side pane tab context menu: close this tab, the others, or all of them. */
 'use strict';
 
-import { placeMenuAt } from './menu-position.js';
+import { moveMenuFocus, placeMenuAt } from './menu-position.js';
 
 /**
  * menu 里的按钮用 data-action 区分：close-tab / close-others / close-all。
@@ -72,16 +72,7 @@ export function createSidePaneTabMenu({ menu, getClosableTabs, onAction, onShow
             focusTab(returnTo);
             return;
         }
-        if (e.key !== 'ArrowDown' && e.key !== 'ArrowUp' && e.key !== 'Home' && e.key !== 'End') return;
-        const items = Array.from(menu.querySelectorAll('[role="menuitem"]:not([disabled])'));
-        if (!items.length) return;
-        e.preventDefault();
-        const current = items.indexOf(doc.activeElement);
-        let next = 0;
-        if (e.key === 'End') next = items.length - 1;
-        else if (e.key === 'ArrowDown') next = current < 0 ? 0 : (current + 1) % items.length;
-        else if (e.key === 'ArrowUp') next = current < 0 ? items.length - 1 : (current - 1 + items.length) % items.length;
-        items[next].focus();
+        moveMenuFocus(e, Array.from(menu.querySelectorAll('[role="menuitem"]:not([disabled])')));
     };
     menu.addEventListener('keydown', onMenuKeydown);
     cleanups.push(() => menu.removeEventListener('keydown', onMenuKeydown));
diff --git a/modules/ui-system/side-pane/side-pane-tab-strip.js b/modules/ui-system/side-pane/side-pane-tab-strip.js
index 42d11887d..fea647e87 100644
--- a/modules/ui-system/side-pane/side-pane-tab-strip.js
+++ b/modules/ui-system/side-pane/side-pane-tab-strip.js
@@ -360,7 +360,7 @@ export function createSidePaneTabStrip({
         }
         e.preventDefault();
         if (targetIndex !== currentIndex && targetIndex >= 0 && targetIndex < tabButtons.length) {
-            // 激活会重建标签条，旧按钮随之离开文档；焦点留在标签上（WAI-ARIA Tabs），按 id 找重建后的按钮
+            // 焦点跟着移到新标签上（WAI-ARIA Tabs）；激活后按 id 重新取按钮，不依赖激活前拿到的节点
             const targetId = tabButtons[targetIndex].getAttribute('data-tab-id');
             onActivate(targetId, { focus: false });
             findByTabId(tabListElement, '[role="tab"][data-tab-id]', targetId)?.focus?.();
diff --git a/modules/ui-system/side-pane/side-pane-tab-utils.js b/modules/ui-system/side-pane/side-pane-tab-utils.js
index e5dd8f4aa..3cab913a1 100644
--- a/modules/ui-system/side-pane/side-pane-tab-utils.js
+++ b/modules/ui-system/side-pane/side-pane-tab-utils.js
@@ -58,7 +58,7 @@ export function filterAndRankSearchItems(items, queryParts) {
 // 标签展示
 // ---------------------------------------------------------------------------
 
-// 只有框架自带的两类标签在这里给默认值；其他标签由打开它的模块在 openTab 时带上 typeLabel / icon / searchHint。
+// 没登记类型时的兜底名称和图标（状态模块不认识登记表，只能用这里的）。登记过的类型以 getTabType 返回的声明为准。
 const TYPE_LABELS = Object.freeze({
     notifications: '通知',
     chat: '辅助对话'
diff --git a/modules/ui-system/side-pane/side-pane-types.js b/modules/ui-system/side-pane/side-pane-types.js
index ba5553a89..85cde3a18 100644
--- a/modules/ui-system/side-pane/side-pane-types.js
+++ b/modules/ui-system/side-pane/side-pane-types.js
@@ -60,7 +60,7 @@
  * @property {() => void} [resume] 重新可见时调用
  * @property {() => Promise<void> | void} [dispose] 视图释放时调用，在 view scope 释放之前；
  *   资源都挂在 scope 上的 provider 可以不提供。视图休眠也会调它，要跨休眠保留的东西挂在 occurrence.signal 上
- * @property {() => boolean} [isBusy] 返回 true 时不休眠（加载中、在放声音、命令还在跑）
+ * @property {() => boolean} [isBusy] 返回 true 时不休眠（网页在加载或放声音、辅助对话在发送或有没保存的编辑）
  * @property {() => unknown} [captureState] 休眠前调用，返回值（滚动位置之类）在重新挂载时作为 restoredState 交回
  */
 
@@ -94,14 +94,16 @@
  *   可以是 tab-types/lazy-provider.js 的懒加载代理，第一次挂载或第一次调用 open 函数时才加载实现
  * @property {() => Promise<SidePaneProvider> | SidePaneProvider} [load] 没给 provider 时用它懒加载
  * @property {'none' | 'detach' | 'limit-only' | 'keep'} [dormancy] 隐藏太久时怎么休眠：
- *   none（默认）释放视图、保留标签，再显示时重新挂载；detach 同样释放视图，但 provider 把会话和画面
- *   挂在 occurrence 上，休眠时把画面收进暂存区，重新挂载时接回去（终端），会话不动；
+ *   none（默认）释放视图、保留标签，再显示时重新挂载；detach 对控制器来说和 none 一样，只是声明
+ *   provider 自己把会话和画面挂在 occurrence 上、休眠时收进暂存区、重新挂载时接回去（终端），会话不动；
  *   limit-only 不按隐藏时长休眠，只在挂着的视图超过上限时参与淘汰（浏览器）；
- *   keep 不休眠，也不占视图上限的名额（比如有没发出去的输入）
+ *   keep 不休眠，也不占视图上限的名额。只是暂时不能拆（有没发出去的输入）的用 handle.isBusy()，不用 keep
  * @property {SidePaneOpenTabEntry | null} [entry] 有时出现在新标签页里
  * @property {(payload: object, tabs: readonly SidePaneTab[]) => SidePaneTab} [toTab]
  *   openTab(payload) 先经过它变成标签；可以返回已有标签的 id 让重复打开落到同一个标签上
  * @property {(tab: SidePaneTab) => Promise<void> | void} [onClosed] 标签关掉后调用（视图已经拆掉）
+ * @property {(tab: SidePaneTab) => Promise<{ closed: boolean } | void> | { closed: boolean } | void} [requestClose]
+ *   标签没挂载（从没显示过或在休眠）时关闭前调用；挂着的标签由 handle.requestClose 确认。返回 { closed: false } 拦下
  * @property {boolean} [persist] false 时不随布局持久化
  * @property {boolean} [reopenable] false 时关掉的标签不进"最近关闭"
  */
diff --git a/modules/ui-system/side-pane/tab-types/lazy-provider.js b/modules/ui-system/side-pane/tab-types/lazy-provider.js
index 1a7af2505..5df0f95b0 100644
--- a/modules/ui-system/side-pane/tab-types/lazy-provider.js
+++ b/modules/ui-system/side-pane/tab-types/lazy-provider.js
@@ -1,5 +1,5 @@
 /*
- * 标签实现推迟到第一次用到才加载：启动时只登记类型和入口，终端、浏览器、轨迹、计划详情的代码
+ * 标签实现推迟到第一次用到才加载：启动时只登记类型和入口，终端、浏览器、轨迹、计划详情、代码查看、命令输出的代码
  * 在第一次打开（或第一次调用它的 open 函数）时才 import。加载失败下次调用会重试。
  */
 
diff --git a/modules/ui-system/side-pane/tab-types/terminal.js b/modules/ui-system/side-pane/tab-types/terminal.js
index 12f5d4de7..a1f3f8ffd 100644
--- a/modules/ui-system/side-pane/tab-types/terminal.js
+++ b/modules/ui-system/side-pane/tab-types/terminal.js
@@ -3,7 +3,7 @@ import { createLazyProvider } from './lazy-provider.js';
 export function defineTerminalTabType({ document: doc, window: win, chatAPI, sidePaneController, uiHelper, onOpenUrl }) {
     const provider = createLazyProvider(async () => {
         const { createTerminalSideProvider } = await import('../terminalSideProvider.js');
-        return createTerminalSideProvider({ document: doc, api: chatAPI || win.electronAPI, sidePaneController, onOpenUrl });
+        return createTerminalSideProvider({ document: doc, api: chatAPI || win.electronAPI, sidePaneController, onOpenUrl, uiHelper });
     }, ['openTerminalTab'], { label: '终端', notify: (message, type) => uiHelper?.showToastNotification?.(message, type) });
     return Object.freeze({
         kind: 'terminal', label: '终端', icon: 'terminal', searchHint: '终端',
diff --git a/modules/ui-system/side-pane/tab-types/tool-output.js b/modules/ui-system/side-pane/tab-types/tool-output.js
index cd9b9c4f2..b721ea894 100644
--- a/modules/ui-system/side-pane/tab-types/tool-output.js
+++ b/modules/ui-system/side-pane/tab-types/tool-output.js
@@ -6,7 +6,7 @@ export function defineToolOutputTabType({ document: doc, window: win, chatAPI, s
         return createToolOutputSideProvider({ document: doc, api: chatAPI || win.electronAPI, sidePaneController, uiHelper });
     }, ['openToolOutputTab'], { label: '命令输出', notify: (message, type) => uiHelper?.showToastNotification?.(message, type) });
     return Object.freeze({
-        kind: 'tool-output', label: '命令输出', icon: 'description', searchHint: '命令输出',
+        kind: 'tool-output', label: '命令输出', icon: 'description', searchHint: '命令输出 后台输出 终端',
         // 命令记录只在内存里，重启后没有可看的
         persist: false,
         // 不进启动器：命令输出从状态面板的命令行点进来，单独打开一个空的列表没有意义
diff --git a/modules/ui-system/side-pane/terminalSideProvider.js b/modules/ui-system/side-pane/terminalSideProvider.js
index 5a06edca6..80dc8dc91 100644
--- a/modules/ui-system/side-pane/terminalSideProvider.js
+++ b/modules/ui-system/side-pane/terminalSideProvider.js
@@ -73,8 +73,13 @@ export function createTerminalSideProvider({
     api = (typeof window !== 'undefined' ? window.electronAPI : null),
     sidePaneController = null,
     xtermLoader = loadXterm,
-    onOpenUrl = null // 点击终端里的 http(s) 链接：交给自带浏览器标签打开
+    onOpenUrl = null, // 点击终端里的 http(s) 链接：交给自带浏览器标签打开
+    uiHelper = null
 } = {}) {
+    // 用应用自己的确认框（和其他标签一致）；原生 confirm 会弹系统模态框卡住整个窗口，只在没有应用确认框时退回
+    const confirmAction = async (message, title, confirmText) => (typeof uiHelper?.showConfirmDialog === 'function'
+        ? uiHelper.showConfirmDialog(message, title, confirmText, '取消', true)
+        : doc.defaultView.confirm(message));
     const kind = 'terminal';
     // 标签打开期间的终端会话：xterm、对共享终端的连接、输出订阅都在这里，视图休眠不动它们，关标签才释放
     const sessions = new WeakMap(); // occurrence -> session
@@ -258,8 +263,22 @@ export function createTerminalSideProvider({
         session.restart = () => {
             if (session.disposed) return Promise.resolve();
             if (session.connectionOperation) return session.connectionOperation;
+            // 确认框开着时再点重启：等同一个确认，不叠第二个框
+            if (session.restartConfirm) return session.restartConfirm;
             // shell 已经退出时没有可中止的命令，直接重启，不再问
-            if (session.sessionId && !session.exited && !doc.defaultView.confirm('重新启动共享终端？AI 工具、终端窗口和所有侧栏视图的当前命令都会中止。')) return;
+            if (session.sessionId && !session.exited) {
+                session.restartConfirm = confirmAction('重新启动共享终端？AI 工具、终端窗口和所有侧栏视图的当前命令都会中止。', '重启终端', '重启')
+                    .then(confirmed => {
+                        session.restartConfirm = null;
+                        // 确认框开着时标签关了，或者别处已经开始重连
+                        if (!confirmed || session.disposed) return undefined;
+                        return session.connectionOperation || restartNow();
+                    }, error => { session.restartConfirm = null; console.error('[TerminalSideProvider] Restart confirm failed:', error); });
+                return session.restartConfirm;
+            }
+            return restartNow();
+        };
+        const restartNow = () => {
             if (!session.sessionId) return session.attach();
             return runConnection(async () => {
                 setStatus('重启中...');
diff --git a/modules/ui-system/side-pane/toolOutputSideProvider.js b/modules/ui-system/side-pane/toolOutputSideProvider.js
index 97ffe0bc9..b461be744 100644
--- a/modules/ui-system/side-pane/toolOutputSideProvider.js
+++ b/modules/ui-system/side-pane/toolOutputSideProvider.js
@@ -27,8 +27,6 @@ const STATUS_LABEL = Object.freeze({
     spawn_error: '启动失败'
 });
 
-export const toolOutputTabId = () => TAB_ID;
-
 export function commandRunStatusLabel(status) {
     return STATUS_LABEL[status] || status || '';
 }
@@ -77,8 +75,7 @@ export function createToolOutputSideProvider({
                 title: '命令输出',
                 icon: 'description',
                 closable: true,
-                scopeMode: 'global',
-                searchHint: '后台输出 命令 终端'
+                scopeMode: 'global'
             });
             sidePaneController.setVisible?.(true);
             if (runId) for (const instance of instances) instance.select(runId);
diff --git a/tests/side-pane-menu-keyboard.test.mjs b/tests/side-pane-menu-keyboard.test.mjs
new file mode 100644
index 000000000..244b4f0c0
--- /dev/null
+++ b/tests/side-pane-menu-keyboard.test.mjs
@@ -0,0 +1,39 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { JSDOM } from 'jsdom';
+import { moveMenuFocus } from '../modules/ui-system/side-pane/menu-position.js';
+
+function menu() {
+    const dom = new JSDOM('<button id="outside"></button><div role="menu"><button role="menuitem">a</button><button role="menuitem">b</button><button role="menuitem">c</button></div>');
+    const doc = dom.window.document;
+    const items = [...doc.querySelectorAll('[role="menuitem"]')];
+    const press = key => {
+        const event = new dom.window.KeyboardEvent('keydown', { key, cancelable: true });
+        const handled = moveMenuFocus(event, items);
+        return { handled, prevented: event.defaultPrevented, focused: doc.activeElement?.textContent };
+    };
+    return { doc, items, press };
+}
+
+test('menu arrow keys wrap and Home/End jump to the ends', () => {
+    const { items, press } = menu();
+    items[0].focus();
+    assert.equal(press('ArrowUp').focused, 'c');
+    assert.equal(press('ArrowDown').focused, 'a');
+    assert.equal(press('End').focused, 'c');
+    assert.equal(press('Home').focused, 'a');
+});
+
+test('with focus outside the items, ArrowUp goes to the last item and ArrowDown to the first', () => {
+    const { doc, press } = menu();
+    doc.getElementById('outside').focus();
+    assert.equal(press('ArrowUp').focused, 'c');
+    doc.getElementById('outside').focus();
+    assert.equal(press('ArrowDown').focused, 'a');
+});
+
+test('other keys are left alone', () => {
+    const { items, press } = menu();
+    items[1].focus();
+    assert.deepEqual(press('Enter'), { handled: false, prevented: false, focused: 'b' });
+});
diff --git a/tests/side-pane-terminal-lifecycle.test.mjs b/tests/side-pane-terminal-lifecycle.test.mjs
index 34c82952f..067cd8413 100644
--- a/tests/side-pane-terminal-lifecycle.test.mjs
+++ b/tests/side-pane-terminal-lifecycle.test.mjs
@@ -12,7 +12,7 @@ async function until(predicate) {
     }
 }
 
-function fixture({ create = async () => ({ success: true, data: { id: 'view:1', pid: 42 } }), restart, dormancy, onOpenUrl = null, failXtermLoads = 0 } = {}) {
+function fixture({ create = async () => ({ success: true, data: { id: 'view:1', pid: 42 } }), restart, dormancy, onOpenUrl = null, failXtermLoads = 0, uiHelper = null } = {}) {
     const dom = new JSDOM('<input id="mainInput"><aside><div class="side-pane-tabs"></div><div class="side-pane-content-container"></div></aside>');
     const doc = dom.window.document, root = doc.querySelector('aside');
     const controller = createSidePaneController({ root, tabListElement: root.querySelector('.side-pane-tabs'),
@@ -48,7 +48,7 @@ function fixture({ create = async () => ({ success: true, data: { id: 'view:1',
             xtermLoads++;
             if (xtermLoads <= failXtermLoads) throw new Error('无法加载 xterm.js');
             return { Terminal, FitAddon: null };
-        }, onOpenUrl });
+        }, onOpenUrl, uiHelper });
     controller.registerProvider('terminal', provider);
     return { dom, controller, provider, doc, terminals, killed, creates, restarts, listeners,
         get unsubscriptions() { return unsubscriptions; }, get xtermLoads() { return xtermLoads; }, get confirmations() { return confirmations; },
@@ -129,6 +129,22 @@ test('repeated restart shares one destructive request and recovers from a reject
     } finally { pending.resolve({ success: true }); await h.cleanup(); }
 });
 
+test('restart asks with the app confirm dialog when there is one, and a second click waits on the same dialog', async () => {
+    const answer = Promise.withResolvers();
+    const asked = [];
+    const g = fixture({ uiHelper: { showConfirmDialog: (message, title) => { asked.push(title); return answer.promise; } } });
+    try {
+        await g.provider.openTerminalTab();
+        await until(() => g.status().dataset.state === 'connected');
+        g.retry().click(); g.retry().click();
+        await new Promise(resolve => setImmediate(resolve));
+        assert.deepEqual(asked, ['重启终端'], 'one app dialog, no native confirm');
+        assert.equal(g.confirmations, 0);
+        answer.resolve(true);
+        await until(() => g.restarts.length === 1);
+    } finally { answer.resolve(false); await g.cleanup(); }
+});
+
 test('restarting a shell that already exited does not ask about aborting commands', async () => {
     const h = fixture();
     try {

From 720a8e7db944ea5deef5d58c671a078c8cf23e89 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 06:39:45 +0000
Subject: [PATCH 131/143] Side pane batch X: test plan tab focus

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DFRovoZHMzeheXKkLNWKG
---
 tests/side-pane-plan-detail.test.mjs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tests/side-pane-plan-detail.test.mjs b/tests/side-pane-plan-detail.test.mjs
index 6a23498aa..e8c41216b 100644
--- a/tests/side-pane-plan-detail.test.mjs
+++ b/tests/side-pane-plan-detail.test.mjs
@@ -406,3 +406,12 @@ test('keyboard focus survives the redraws a section toggle, a batch toggle and a
         dom.window.close();
     }
 });
+
+test('activating the plan tab puts keyboard focus inside it', async () => {
+    const { provider, view, dom } = makeEnv();
+    const handle = await provider.mountTab({ id: planTabId('p1'), payload: { projectId: 'p1' } }, view);
+    try {
+        handle.focus();
+        assert.equal(view.contains(dom.window.document.activeElement), true);
+    } finally { handle.dispose(); }
+});

From e22543e8e652b0009b1ccbc00c3b955fcbd754a2 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 06:40:38 +0000
Subject: [PATCH 132/143] Side pane IPC: one caller-window policy enforced
 where channels are registered

The chat and utility preloads are loaded by many windows (voice, assistant,
notes, forum...), and each side pane handler module checked the caller on
its own. ProjectForge's file revert and project delete checked nothing, and
workspaces only after the last fix. A single policy table now lists, per
preload domain, the app pages allowed to call (and the read-only channels
open to other windows). main.js applies it at registration: the domain
activator rejects a wrong window before loading the domain, and the directly
registered workspaces, ProjectForge and source modules get a guarded ipcMain.
Module-level checks stay as a second layer, as DSH asserts the sender per
privileged handler. A contract test calls every channel of every policy
domain from another window, a webview and a subframe, and checks main.js
routes every side pane domain through the policy.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_016hW799u5Ji5k9khDAwu688
---
 docs/contracts/chat-contracts.json            |  25 +-
 .../contracts/generated/chat-event-graph.json | 317 ++++++++----------
 main.js                                       |  20 +-
 modules/ipc/domainActivator.js                |   8 +-
 modules/ipc/projectForgeHandlers.js           |   7 +-
 modules/ipc/sidePaneIpcPolicy.js              |  61 ++++
 modules/ipc/sourceHandlers.js                 |   7 +-
 modules/ipc/workspaceHandlers.js              |  19 +-
 package.json                                  |   2 +-
 tests/side-pane-ipc-sender.test.js            |  89 +++++
 tests/workspace-handlers-sender.test.js       |   5 +-
 11 files changed, 350 insertions(+), 210 deletions(-)
 create mode 100644 modules/ipc/sidePaneIpcPolicy.js
 create mode 100644 tests/side-pane-ipc-sender.test.js

diff --git a/docs/contracts/chat-contracts.json b/docs/contracts/chat-contracts.json
index 79fee959a..da540694b 100644
--- a/docs/contracts/chat-contracts.json
+++ b/docs/contracts/chat-contracts.json
@@ -469,7 +469,7 @@
     "dynamicSites": [
       {
         "file": "modules/ipc/sourceHandlers.js",
-        "line": 32,
+        "line": 34,
         "kind": "event-listener",
         "match": "ipcMain.handle(channel"
       }
@@ -497,17 +497,36 @@
       "Source review of the per-window subscription table; publishers pass fixed channel names declared in preloads/api."
     ]
   },
+  {
+    "id": "source.dynamic.modules.ipc.sidepaneipcpolicy",
+    "kind": "source-review",
+    "owner": "modules/ipc/sidePaneIpcPolicy.js",
+    "status": "reviewed",
+    "dynamic": true,
+    "review": "guardIpcMain wraps the ipcMain handed to the directly registered side pane modules (workspaces, projectForge, source); each explicit registration first passes the caller-window check from SIDE_PANE_IPC_POLICY and otherwise returns a fixed denial without calling the handler.",
+    "dynamicSites": [
+      {
+        "file": "modules/ipc/sidePaneIpcPolicy.js",
+        "line": 53,
+        "kind": "event-listener",
+        "match": "ipcMain.handle(channel"
+      }
+    ],
+    "evidence": [
+      "tests/side-pane-ipc-sender.test.js invokes every channel of each policy domain from another app window, a webview and a subframe and asserts main.js wires every side pane domain through the policy."
+    ]
+  },
   {
     "id": "source.dynamic.modules.ipc.domainactivator",
     "kind": "source-review",
     "owner": "modules/ipc/domainActivator.js",
     "status": "reviewed",
     "dynamic": true,
-    "review": "Registers one forwarding invoke handler per channel listed in preloads/api for the terminal, modelTrajectory, browser and sideChat domains; the first call loads the domain module, which registers its real handlers on a registrar restricted to that domain's own channels. Sender checks stay inside each domain's handlers.",
+    "review": "Registers one forwarding invoke handler per channel listed in preloads/api for the terminal, modelTrajectory, browser and sideChat domains; the first call loads the domain module, which registers its real handlers on a registrar restricted to that domain's own channels. The forwarder first applies the domain's allowSender caller check from modules/ipc/sidePaneIpcPolicy.js, so a rejected window neither reaches a handler nor loads the domain; each domain's own sender checks remain as a second layer.",
     "dynamicSites": [
       {
         "file": "modules/ipc/domainActivator.js",
-        "line": 136,
+        "line": 142,
         "kind": "event-listener",
         "match": "ipcMain.handle(channel"
       }
diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index b8c4001dc..b4ed1155f 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -198,6 +198,7 @@
     "modules/ipc/senderLifetime.js",
     "modules/ipc/settingsHandlers.js",
     "modules/ipc/sideChatHandlers.js",
+    "modules/ipc/sidePaneIpcPolicy.js",
     "modules/ipc/sourceHandlers.js",
     "modules/ipc/sovitsHandlers.js",
     "modules/ipc/stateSubscriptions.js",
@@ -754,14 +755,14 @@
       "consumers": [
         {
           "file": "main.js",
-          "line": 1829,
+          "line": 1833,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "main.js",
-          "line": 1829,
+          "line": 1833,
           "kind": "event-listener",
           "match": "app.on('activate'"
         }
@@ -1295,14 +1296,14 @@
       "consumers": [
         {
           "file": "main.js",
-          "line": 1935,
+          "line": 1939,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "main.js",
-          "line": 1935,
+          "line": 1939,
           "kind": "event-listener",
           "match": "app.on('before-quit'"
         }
@@ -2578,14 +2579,14 @@
       "consumers": [
         {
           "file": "modules/ipc/projectForgeHandlers.js",
-          "line": 34,
+          "line": 36,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/projectForgeHandlers.js",
-          "line": 34,
+          "line": 36,
           "kind": "event-listener",
           "match": "forgeModule.events.on('changed'"
         }
@@ -3138,14 +3139,14 @@
       "consumers": [
         {
           "file": "main.js",
-          "line": 1673,
+          "line": 1677,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "main.js",
-          "line": 1673,
+          "line": 1677,
           "kind": "event-listener",
           "match": "ipcMain.handle('chat-data-service-reconcile'"
         }
@@ -3157,14 +3158,14 @@
       "consumers": [
         {
           "file": "main.js",
-          "line": 1666,
+          "line": 1670,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "main.js",
-          "line": 1666,
+          "line": 1670,
           "kind": "event-listener",
           "match": "ipcMain.handle('chat-data-service-status'"
         }
@@ -6289,7 +6290,7 @@
         },
         {
           "file": "main.js",
-          "line": 1910,
+          "line": 1914,
           "kind": "event-listener"
         },
         {
@@ -6433,7 +6434,7 @@
         },
         {
           "file": "main.js",
-          "line": 1910,
+          "line": 1914,
           "kind": "event-listener",
           "match": "pythonProcess.on('close'"
         },
@@ -7194,14 +7195,14 @@
       "consumers": [
         {
           "file": "main.js",
-          "line": 2095,
+          "line": 2099,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "main.js",
-          "line": 2095,
+          "line": 2099,
           "kind": "event-listener",
           "match": "ipcMain.on('connect-vcplog'"
         },
@@ -8026,12 +8027,12 @@
         },
         {
           "file": "main.js",
-          "line": 1902,
+          "line": 1906,
           "kind": "event-listener"
         },
         {
           "file": "main.js",
-          "line": 1906,
+          "line": 1910,
           "kind": "event-listener"
         },
         {
@@ -8313,13 +8314,13 @@
         },
         {
           "file": "main.js",
-          "line": 1902,
+          "line": 1906,
           "kind": "event-listener",
           "match": "pythonProcess.stdout.on('data'"
         },
         {
           "file": "main.js",
-          "line": 1906,
+          "line": 1910,
           "kind": "event-listener",
           "match": "pythonProcess.stderr.on('data'"
         },
@@ -10429,14 +10430,14 @@
       "consumers": [
         {
           "file": "main.js",
-          "line": 2106,
+          "line": 2110,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "main.js",
-          "line": 2106,
+          "line": 2110,
           "kind": "event-listener",
           "match": "ipcMain.on('disconnect-vcplog'"
         },
@@ -11084,14 +11085,14 @@
       "consumers": [
         {
           "file": "main.js",
-          "line": 1758,
+          "line": 1762,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "main.js",
-          "line": 1758,
+          "line": 1762,
           "kind": "event-listener",
           "match": "ipcMain.handle('embedded-vchat-app:activate'"
         },
@@ -11115,14 +11116,14 @@
       "consumers": [
         {
           "file": "main.js",
-          "line": 1778,
+          "line": 1782,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "main.js",
-          "line": 1778,
+          "line": 1782,
           "kind": "event-listener",
           "match": "ipcMain.handle('embedded-vchat-app:cancel'"
         },
@@ -11146,14 +11147,14 @@
       "consumers": [
         {
           "file": "main.js",
-          "line": 1766,
+          "line": 1770,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "main.js",
-          "line": 1766,
+          "line": 1770,
           "kind": "event-listener",
           "match": "ipcMain.handle('embedded-vchat-app:close'"
         },
@@ -11177,14 +11178,14 @@
       "consumers": [
         {
           "file": "main.js",
-          "line": 1795,
+          "line": 1799,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "main.js",
-          "line": 1795,
+          "line": 1799,
           "kind": "event-listener",
           "match": "ipcMain.handle('embedded-vchat-app:close-all'"
         },
@@ -11208,14 +11209,14 @@
       "consumers": [
         {
           "file": "main.js",
-          "line": 1747,
+          "line": 1751,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "main.js",
-          "line": 1747,
+          "line": 1751,
           "kind": "event-listener",
           "match": "ipcMain.handle('embedded-vchat-app:create'"
         },
@@ -11239,14 +11240,14 @@
       "consumers": [
         {
           "file": "main.js",
-          "line": 1771,
+          "line": 1775,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "main.js",
-          "line": 1771,
+          "line": 1775,
           "kind": "event-listener",
           "match": "ipcMain.handle('embedded-vchat-app:detach'"
         },
@@ -11270,14 +11271,14 @@
       "consumers": [
         {
           "file": "main.js",
-          "line": 1754,
+          "line": 1758,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "main.js",
-          "line": 1754,
+          "line": 1758,
           "kind": "event-listener",
           "match": "ipcMain.handle('embedded-vchat-app:list'"
         },
@@ -11301,14 +11302,14 @@
       "consumers": [
         {
           "file": "main.js",
-          "line": 1801,
+          "line": 1805,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "main.js",
-          "line": 1801,
+          "line": 1805,
           "kind": "event-listener",
           "match": "ipcMain.on('embedded-vchat-app:request-close'"
         },
@@ -11332,14 +11333,14 @@
       "consumers": [
         {
           "file": "main.js",
-          "line": 1762,
+          "line": 1766,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "main.js",
-          "line": 1762,
+          "line": 1766,
           "kind": "event-listener",
           "match": "ipcMain.handle('embedded-vchat-app:set-bounds'"
         },
@@ -11733,7 +11734,7 @@
         },
         {
           "file": "main.js",
-          "line": 1917,
+          "line": 1921,
           "kind": "event-listener"
         },
         {
@@ -12045,7 +12046,7 @@
         },
         {
           "file": "main.js",
-          "line": 1917,
+          "line": 1921,
           "kind": "event-listener",
           "match": "pythonProcess.on('error'"
         },
@@ -12177,14 +12178,14 @@
       "consumers": [
         {
           "file": "main.js",
-          "line": 1891,
+          "line": 1895,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "main.js",
-          "line": 1891,
+          "line": 1895,
           "kind": "event-listener",
           "match": "ipcMain.handle('execute-python-code'"
         },
@@ -12414,14 +12415,14 @@
       "consumers": [
         {
           "file": "main.js",
-          "line": 2129,
+          "line": 2133,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "main.js",
-          "line": 2129,
+          "line": 2133,
           "kind": "event-listener",
           "match": "ipcMain.handle('export-topic-as-markdown'"
         },
@@ -13652,7 +13653,7 @@
         },
         {
           "file": "main.js",
-          "line": 1866,
+          "line": 1870,
           "kind": "event-listener"
         }
       ],
@@ -13665,7 +13666,7 @@
         },
         {
           "file": "main.js",
-          "line": 1866,
+          "line": 1870,
           "kind": "event-listener",
           "match": "ipcMain.handle('get-platform'"
         },
@@ -14594,7 +14595,7 @@
       "producers": [
         {
           "file": "main.js",
-          "line": 1650,
+          "line": 1654,
           "kind": "event-send"
         }
       ],
@@ -14608,7 +14609,7 @@
       "evidence": [
         {
           "file": "main.js",
-          "line": 1650,
+          "line": 1654,
           "kind": "event-send",
           "match": "sender.send('history-file-updated'"
         },
@@ -15167,14 +15168,14 @@
       "consumers": [
         {
           "file": "main.js",
-          "line": 2164,
+          "line": 2168,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "main.js",
-          "line": 2164,
+          "line": 2168,
           "kind": "event-listener",
           "match": "ipcMain.handle('interrupt-group-request'"
         },
@@ -16150,14 +16151,14 @@
       "consumers": [
         {
           "file": "main.js",
-          "line": 1782,
+          "line": 1786,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "main.js",
-          "line": 1782,
+          "line": 1786,
           "kind": "event-listener",
           "match": "ipcMain.handle('lifecycle:get-main-snapshot'"
         },
@@ -18360,14 +18361,14 @@
       "consumers": [
         {
           "file": "main.js",
-          "line": 1820,
+          "line": 1824,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "main.js",
-          "line": 1820,
+          "line": 1824,
           "kind": "event-listener",
           "match": "ipcMain.on('minimize-to-tray'"
         },
@@ -23582,14 +23583,14 @@
       "consumers": [
         {
           "file": "modules/ipc/projectForgeHandlers.js",
-          "line": 104,
+          "line": 107,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/projectForgeHandlers.js",
-          "line": 104,
+          "line": 107,
           "kind": "event-listener",
           "match": "ipcMain.handle('project-forge:delete-project'"
         },
@@ -23613,14 +23614,14 @@
       "consumers": [
         {
           "file": "modules/ipc/projectForgeHandlers.js",
-          "line": 89,
+          "line": 92,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/projectForgeHandlers.js",
-          "line": 89,
+          "line": 92,
           "kind": "event-listener",
           "match": "ipcMain.handle('project-forge:get-batch'"
         },
@@ -23644,14 +23645,14 @@
       "consumers": [
         {
           "file": "modules/ipc/projectForgeHandlers.js",
-          "line": 90,
+          "line": 93,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/projectForgeHandlers.js",
-          "line": 90,
+          "line": 93,
           "kind": "event-listener",
           "match": "ipcMain.handle('project-forge:get-node'"
         },
@@ -23675,14 +23676,14 @@
       "consumers": [
         {
           "file": "modules/ipc/projectForgeHandlers.js",
-          "line": 87,
+          "line": 90,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/projectForgeHandlers.js",
-          "line": 87,
+          "line": 90,
           "kind": "event-listener",
           "match": "ipcMain.handle('project-forge:get-project'"
         },
@@ -23706,14 +23707,14 @@
       "consumers": [
         {
           "file": "modules/ipc/projectForgeHandlers.js",
-          "line": 86,
+          "line": 89,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/projectForgeHandlers.js",
-          "line": 86,
+          "line": 89,
           "kind": "event-listener",
           "match": "ipcMain.handle('project-forge:list-projects'"
         },
@@ -23737,14 +23738,14 @@
       "consumers": [
         {
           "file": "modules/ipc/projectForgeHandlers.js",
-          "line": 91,
+          "line": 94,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/projectForgeHandlers.js",
-          "line": 91,
+          "line": 94,
           "kind": "event-listener",
           "match": "ipcMain.handle('project-forge:revert-file'"
         },
@@ -23768,14 +23769,14 @@
       "consumers": [
         {
           "file": "modules/ipc/projectForgeHandlers.js",
-          "line": 88,
+          "line": 91,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/projectForgeHandlers.js",
-          "line": 88,
+          "line": 91,
           "kind": "event-listener",
           "match": "ipcMain.handle('project-forge:search-history'"
         },
@@ -27011,14 +27012,14 @@
       "consumers": [
         {
           "file": "main.js",
-          "line": 2118,
+          "line": 2122,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "main.js",
-          "line": 2118,
+          "line": 2122,
           "kind": "event-listener",
           "match": "ipcMain.on('send-vcplog-message'"
         },
@@ -27206,7 +27207,7 @@
         },
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 110,
+          "line": 108,
           "kind": "event-listener"
         },
         {
@@ -27230,7 +27231,7 @@
         },
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 110,
+          "line": 108,
           "kind": "event-listener",
           "match": "settingsManager.on?.('settings-external-updated'"
         },
@@ -27284,7 +27285,7 @@
         },
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 109,
+          "line": 107,
           "kind": "event-listener"
         }
       ],
@@ -27297,7 +27298,7 @@
         },
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 109,
+          "line": 107,
           "kind": "event-listener",
           "match": "settingsManager.on?.('settings-updated'"
         },
@@ -27752,20 +27753,8 @@
           "kind": "preload-channel-definition"
         }
       ],
-      "consumers": [
-        {
-          "file": "modules/ipc/sourceHandlers.js",
-          "line": 70,
-          "kind": "event-listener"
-        }
-      ],
+      "consumers": [],
       "evidence": [
-        {
-          "file": "modules/ipc/sourceHandlers.js",
-          "line": 70,
-          "kind": "event-listener",
-          "match": "handle('source:check'"
-        },
         {
           "file": "preloads/api/projectForge.js",
           "line": 44,
@@ -27783,20 +27772,8 @@
           "kind": "preload-channel-definition"
         }
       ],
-      "consumers": [
-        {
-          "file": "modules/ipc/sourceHandlers.js",
-          "line": 52,
-          "kind": "event-listener"
-        }
-      ],
+      "consumers": [],
       "evidence": [
-        {
-          "file": "modules/ipc/sourceHandlers.js",
-          "line": 52,
-          "kind": "event-listener",
-          "match": "handle('source:list-files'"
-        },
         {
           "file": "preloads/api/projectForge.js",
           "line": 41,
@@ -27814,20 +27791,8 @@
           "kind": "preload-channel-definition"
         }
       ],
-      "consumers": [
-        {
-          "file": "modules/ipc/sourceHandlers.js",
-          "line": 54,
-          "kind": "event-listener"
-        }
-      ],
+      "consumers": [],
       "evidence": [
-        {
-          "file": "modules/ipc/sourceHandlers.js",
-          "line": 54,
-          "kind": "event-listener",
-          "match": "handle('source:read-file'"
-        },
         {
           "file": "preloads/api/projectForge.js",
           "line": 42,
@@ -27845,20 +27810,8 @@
           "kind": "preload-channel-definition"
         }
       ],
-      "consumers": [
-        {
-          "file": "modules/ipc/sourceHandlers.js",
-          "line": 59,
-          "kind": "event-listener"
-        }
-      ],
+      "consumers": [],
       "evidence": [
-        {
-          "file": "modules/ipc/sourceHandlers.js",
-          "line": 59,
-          "kind": "event-listener",
-          "match": "handle('source:write-file'"
-        },
         {
           "file": "preloads/api/projectForge.js",
           "line": 43,
@@ -30210,17 +30163,17 @@
         },
         {
           "file": "main.js",
-          "line": 2051,
+          "line": 2055,
           "kind": "event-send"
         },
         {
           "file": "main.js",
-          "line": 2066,
+          "line": 2070,
           "kind": "event-send"
         },
         {
           "file": "main.js",
-          "line": 2069,
+          "line": 2073,
           "kind": "event-send"
         }
       ],
@@ -30240,19 +30193,19 @@
         },
         {
           "file": "main.js",
-          "line": 2051,
+          "line": 2055,
           "kind": "event-send",
           "match": "mainWindow.webContents.send('vcp-log-message'"
         },
         {
           "file": "main.js",
-          "line": 2066,
+          "line": 2070,
           "kind": "event-send",
           "match": "mainWindow.webContents.send('vcp-log-message'"
         },
         {
           "file": "main.js",
-          "line": 2069,
+          "line": 2073,
           "kind": "event-send",
           "match": "mainWindow.webContents.send('vcp-log-message'"
         },
@@ -30269,32 +30222,32 @@
       "producers": [
         {
           "file": "main.js",
-          "line": 2028,
+          "line": 2032,
           "kind": "event-send"
         },
         {
           "file": "main.js",
-          "line": 2041,
+          "line": 2045,
           "kind": "event-send"
         },
         {
           "file": "main.js",
-          "line": 2049,
+          "line": 2053,
           "kind": "event-send"
         },
         {
           "file": "main.js",
-          "line": 2075,
+          "line": 2079,
           "kind": "event-send"
         },
         {
           "file": "main.js",
-          "line": 2088,
+          "line": 2092,
           "kind": "event-send"
         },
         {
           "file": "main.js",
-          "line": 2114,
+          "line": 2118,
           "kind": "event-send"
         }
       ],
@@ -30308,37 +30261,37 @@
       "evidence": [
         {
           "file": "main.js",
-          "line": 2028,
+          "line": 2032,
           "kind": "event-send",
           "match": "mainWindow.webContents.send('vcp-log-status'"
         },
         {
           "file": "main.js",
-          "line": 2041,
+          "line": 2045,
           "kind": "event-send",
           "match": "mainWindow.webContents.send('vcp-log-status'"
         },
         {
           "file": "main.js",
-          "line": 2049,
+          "line": 2053,
           "kind": "event-send",
           "match": "mainWindow.webContents.send('vcp-log-status'"
         },
         {
           "file": "main.js",
-          "line": 2075,
+          "line": 2079,
           "kind": "event-send",
           "match": "mainWindow.webContents.send('vcp-log-status'"
         },
         {
           "file": "main.js",
-          "line": 2088,
+          "line": 2092,
           "kind": "event-send",
           "match": "mainWindow.webContents.send('vcp-log-status'"
         },
         {
           "file": "main.js",
-          "line": 2114,
+          "line": 2118,
           "kind": "event-send",
           "match": "mainWindow.webContents.send('vcp-log-status'"
         },
@@ -31407,14 +31360,14 @@
       "consumers": [
         {
           "file": "main.js",
-          "line": 1630,
+          "line": 1634,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "main.js",
-          "line": 1630,
+          "line": 1634,
           "kind": "event-listener",
           "match": "ipcMain.handle('watcher:begin'"
         },
@@ -31438,14 +31391,14 @@
       "consumers": [
         {
           "file": "main.js",
-          "line": 1637,
+          "line": 1641,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "main.js",
-          "line": 1637,
+          "line": 1641,
           "kind": "event-listener",
           "match": "ipcMain.handle('watcher:start'"
         },
@@ -31469,14 +31422,14 @@
       "consumers": [
         {
           "file": "main.js",
-          "line": 1657,
+          "line": 1661,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "main.js",
-          "line": 1657,
+          "line": 1661,
           "kind": "event-listener",
           "match": "ipcMain.handle('watcher:stop'"
         },
@@ -31964,7 +31917,7 @@
       "consumers": [
         {
           "file": "main.js",
-          "line": 1956,
+          "line": 1960,
           "kind": "event-listener"
         },
         {
@@ -31976,7 +31929,7 @@
       "evidence": [
         {
           "file": "main.js",
-          "line": 1956,
+          "line": 1960,
           "kind": "event-listener",
           "match": "app.on('will-quit'"
         },
@@ -32013,14 +31966,14 @@
       "consumers": [
         {
           "file": "main.js",
-          "line": 1929,
+          "line": 1933,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "main.js",
-          "line": 1929,
+          "line": 1933,
           "kind": "event-listener",
           "match": "app.on('window-all-closed'"
         }
@@ -32213,14 +32166,14 @@
       "consumers": [
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 156,
+          "line": 152,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 156,
+          "line": 152,
           "kind": "event-listener",
           "match": "ipcMain.handle('workspaces:add'"
         },
@@ -32244,14 +32197,14 @@
       "consumers": [
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 214,
+          "line": 207,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 214,
+          "line": 207,
           "kind": "event-listener",
           "match": "ipcMain.handle('workspaces:expand-placeholders'"
         },
@@ -32275,14 +32228,14 @@
       "consumers": [
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 223,
+          "line": 216,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 223,
+          "line": 216,
           "kind": "event-listener",
           "match": "ipcMain.handle('workspaces:get-prompt-settings'"
         },
@@ -32306,14 +32259,14 @@
       "consumers": [
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 118,
+          "line": 116,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 118,
+          "line": 116,
           "kind": "event-listener",
           "match": "ipcMain.handle('workspaces:list'"
         },
@@ -32337,14 +32290,14 @@
       "consumers": [
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 147,
+          "line": 144,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 147,
+          "line": 144,
           "kind": "event-listener",
           "match": "ipcMain.handle('workspaces:rebuild'"
         },
@@ -32368,14 +32321,14 @@
       "consumers": [
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 178,
+          "line": 173,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 178,
+          "line": 173,
           "kind": "event-listener",
           "match": "ipcMain.handle('workspaces:remove'"
         },
@@ -32399,14 +32352,14 @@
       "consumers": [
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 135,
+          "line": 132,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 135,
+          "line": 132,
           "kind": "event-listener",
           "match": "ipcMain.handle('workspaces:search'"
         },
@@ -32430,14 +32383,14 @@
       "consumers": [
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 244,
+          "line": 236,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 244,
+          "line": 236,
           "kind": "event-listener",
           "match": "ipcMain.handle('workspaces:select-directory'"
         },
@@ -32461,14 +32414,14 @@
       "consumers": [
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 120,
+          "line": 118,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 120,
+          "line": 118,
           "kind": "event-listener",
           "match": "ipcMain.handle('workspaces:set-active'"
         },
@@ -32492,14 +32445,14 @@
       "consumers": [
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 225,
+          "line": 218,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 225,
+          "line": 218,
           "kind": "event-listener",
           "match": "ipcMain.handle('workspaces:set-prompt-settings'"
         },
@@ -32523,14 +32476,14 @@
       "consumers": [
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 188,
+          "line": 182,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/workspaceHandlers.js",
-          "line": 188,
+          "line": 182,
           "kind": "event-listener",
           "match": "ipcMain.handle('workspaces:update'"
         },
@@ -32673,7 +32626,7 @@
     },
     {
       "file": "modules/ipc/domainActivator.js",
-      "line": 136,
+      "line": 142,
       "reason": "dynamic event listener name: channel",
       "kind": "event-listener",
       "match": "ipcMain.handle(channel",
@@ -32695,9 +32648,17 @@
       "match": "event.sender.send(channel",
       "contractId": "source.dynamic.modules.ipc.musichandlers"
     },
+    {
+      "file": "modules/ipc/sidePaneIpcPolicy.js",
+      "line": 53,
+      "reason": "dynamic event listener name: channel",
+      "kind": "event-listener",
+      "match": "ipcMain.handle(channel",
+      "contractId": "source.dynamic.modules.ipc.sidepaneipcpolicy"
+    },
     {
       "file": "modules/ipc/sourceHandlers.js",
-      "line": 32,
+      "line": 34,
       "reason": "dynamic event listener name: channel",
       "kind": "event-listener",
       "match": "ipcMain.handle(channel",
diff --git a/main.js b/main.js
index dc71fc4c7..96f63cc30 100644
--- a/main.js
+++ b/main.js
@@ -81,6 +81,7 @@ const promptHandlers = require('./modules/ipc/promptHandlers'); // Import prompt
 const notesHandlers = require('./modules/ipc/notesHandlers'); // Import notes handlers
 const workspaceHandlers = require('./modules/ipc/workspaceHandlers'); // 工作区索引与实时引用
 const projectForgeHandlers = require('./modules/ipc/projectForgeHandlers'); // ProjectForge 施工图 GUI（只读 + 署名回退）
+const { createSidePaneSenderGuard, guardIpcMain } = require('./modules/ipc/sidePaneIpcPolicy'); // 侧栏相关 IPC 的调用方窗口策略
 const gitHandlers = require('./modules/ipc/gitHandlers'); // ProjectForge Git 源代码管理侧栏
 const sourceHandlers = require('./modules/ipc/sourceHandlers'); // ProjectForge 源码浏览 / 轻量编辑侧栏
 // 侧栏终端、调用轨迹、旁聊的 IPC 由领域激活器按需加载（见下方 domainActivator.register），这里不预先 require
@@ -91,7 +92,6 @@ const { configureSharedRecorder } = require('./modules/modelTrajectory');
 const domainActivator = createDomainActivator({ ipcMain });
 // 主进程推送按窗口订阅：只发给订阅了某个主题的窗口（V工程窗口、主窗口的状态面板和侧栏）
 const { createStateSubscriptions } = require('./modules/ipc/stateSubscriptions');
-const { createApplicationSenderGuard, resolveWindowWebContents } = require('./modules/ipc/applicationSender');
 const stateSubscriptions = createStateSubscriptions();
 const assistantHandlers = require('./modules/ipc/assistantHandlers'); // Import assistant handlers
 const musicHandlers = require('./modules/ipc/musicHandlers'); // Import music handlers
@@ -1514,25 +1514,26 @@ if (!gotTheLock) {
             SETTINGS_FILE
         });
         // 工作区索引在后台预热，不阻塞首屏。
-        workspaceHandlers.initialize({ settingsManager: appSettingsManager, logger: console, getMainWindow: () => mainWindow });
-        stateSubscriptions.registerIpc(ipcMain, createApplicationSenderGuard({
-            pages: ['main.html', 'ProjectForgemodules/projectforge.html'],
-            getMainWebContents: () => resolveWindowWebContents(() => mainWindow),
-        }));
-        projectForgeHandlers.initialize({ workspaceService: workspaceHandlers.workspaceService, subscriptions: stateSubscriptions });
+        // 侧栏相关通道统一在注册层检查调用方窗口，策略表见 modules/ipc/sidePaneIpcPolicy.js
+        const sidePaneGuard = domain => createSidePaneSenderGuard(domain, () => mainWindow);
+        workspaceHandlers.initialize({ settingsManager: appSettingsManager, logger: console, ipcMain: guardIpcMain(ipcMain, sidePaneGuard('workspaces')) });
+        stateSubscriptions.registerIpc(ipcMain, sidePaneGuard('state'));
+        projectForgeHandlers.initialize({ workspaceService: workspaceHandlers.workspaceService, subscriptions: stateSubscriptions, ipcMain: guardIpcMain(ipcMain, sidePaneGuard('projectForge')) });
         // Git 也进领域表，但登记时就激活：模块只有 execFile 调用，没什么可省的，
         // 而状态面板首帧就会读工作区列表；仓库监听仍然等到第一个窗口订阅才开始
         domainActivator.register('git', {
+            allowSender: sidePaneGuard('projectForge'),
             channels: gitHandlers.CHANNELS,
             load: () => gitHandlers,
             init: (mod, { ipcMain: domainIpc }) => mod.initialize({ ipcMain: domainIpc, workspaceService: workspaceHandlers.workspaceService, getMainWindow: () => mainWindow, subscriptions: stateSubscriptions }),
             dispose: mod => mod.dispose(),
             eager: true,
         });
-        sourceHandlers.initialize({ workspaceService: workspaceHandlers.workspaceService });
+        sourceHandlers.initialize({ workspaceService: workspaceHandlers.workspaceService, ipcMain: guardIpcMain(ipcMain, sidePaneGuard('projectForge')) });
         const preloadApis = describeApis();
         // 侧栏几个领域启动时只登记通道，第一次调用才 require 并 initialize（状态见 lifecycle:get-main-snapshot 的 domains）
         domainActivator.register('terminal', {
+            allowSender: sidePaneGuard('terminal'),
             channels: channelsForDomain(preloadApis, 'terminal'),
             load: () => require('./modules/ipc/terminalHandlers'), // 侧栏终端（镜像自带终端会话）
             init: (mod, { ipcMain: domainIpc }) => mod.initialize({ ipcMain: domainIpc, workspaceService: workspaceHandlers.workspaceService, getMainWindow: () => mainWindow }),
@@ -1541,6 +1542,7 @@ if (!gotTheLock) {
         // 记录器必须早于 chatHandlers.initialize：聊天请求一发出就要有记录器；查看轨迹的 IPC 才按需激活
         configureSharedRecorder({ rootDir: path.join(APP_DATA_ROOT_IN_PROJECT, 'ModelTrajectory') });
         domainActivator.register('modelTrajectory', {
+            allowSender: sidePaneGuard('modelTrajectory'),
             channels: channelsForDomain(preloadApis, 'modelTrajectory'),
             load: () => require('./modules/ipc/modelTrajectoryHandlers'), // 侧栏调用轨迹（模型请求 / 响应记录）
             init: (mod, { ipcMain: domainIpc }) => mod.initialize({ ipcMain: domainIpc, getMainWindow: () => mainWindow }),
@@ -1548,6 +1550,7 @@ if (!gotTheLock) {
         });
         // 浏览器访客会话的权限和协议限制要在任何 <webview> 出现之前就位，所以登记时就激活
         domainActivator.register('browser', {
+            allowSender: sidePaneGuard('browser'),
             channels: channelsForDomain(preloadApis, 'browser'),
             load: () => browserHandlers,
             init: (mod, { ipcMain: domainIpc }) => mod.initialize({ ipcMain: domainIpc, getMainWindow: () => mainWindow }),
@@ -1618,6 +1621,7 @@ if (!gotTheLock) {
             historyMutationQueue
         });
         domainActivator.register('sideChat', {
+            allowSender: sidePaneGuard('sideChat'),
             channels: channelsForDomain(preloadApis, 'sideChat'),
             load: () => require('./modules/ipc/sideChatHandlers'), // Workspace Side Chat handlers
             init: (mod, { ipcMain: domainIpc }) => mod.initialize({ ipcMain: domainIpc, USER_DATA_DIR, AGENT_DIR, historyMutationQueue, getMainWindow: () => mainWindow }),
diff --git a/modules/ipc/domainActivator.js b/modules/ipc/domainActivator.js
index 08714288f..7fef9aaf4 100644
--- a/modules/ipc/domainActivator.js
+++ b/modules/ipc/domainActivator.js
@@ -71,6 +71,10 @@ function createDomainActivator({ ipcMain, logger = console } = {}) {
 
     function dispatch(domain, channel, event, args) {
         if (shutDown) return { success: false, error: 'shutting-down' };
+        // 调用方窗口不对就到此为止：既不进 handler，也不为它加载、初始化领域（见 sidePaneIpcPolicy.js）
+        if (domain.allowSender && !domain.allowSender(event, channel)) {
+            return { success: false, error: '当前窗口无权调用这个接口。' };
+        }
         if (domain.state !== 'active') {
             try {
                 activate(domain.name);
@@ -92,8 +96,9 @@ function createDomainActivator({ ipcMain, logger = console } = {}) {
      * @param {(mod: any, ctx: { ipcMain: object }) => void} spec.init 用 ctx.ipcMain 注册 handler
      * @param {(mod: any) => void} [spec.dispose]
      * @param {boolean} [spec.eager=false]
+     * @param {(event: any, channel: string) => boolean} [spec.allowSender] 调用方窗口检查，不通过的调用直接拒绝
      */
-    function register(name, { channels, load, init, dispose = null, eager = false } = {}) {
+    function register(name, { channels, load, init, dispose = null, eager = false, allowSender = null } = {}) {
         if (domains.has(name)) throw new Error(`[DomainActivator] 领域重复登记：${name}`);
         if (!Array.isArray(channels) || !channels.length) throw new TypeError(`[DomainActivator] ${name}: channels 不能为空`);
         if (typeof load !== 'function' || typeof init !== 'function') throw new TypeError(`[DomainActivator] ${name}: 需要 load 和 init`);
@@ -107,6 +112,7 @@ function createDomainActivator({ ipcMain, logger = console } = {}) {
             load,
             init,
             dispose,
+            allowSender: typeof allowSender === 'function' ? allowSender : null,
             state: 'declared',
             error: null,
             module: null,
diff --git a/modules/ipc/projectForgeHandlers.js b/modules/ipc/projectForgeHandlers.js
index cf75c2a8c..04b79e609 100644
--- a/modules/ipc/projectForgeHandlers.js
+++ b/modules/ipc/projectForgeHandlers.js
@@ -4,7 +4,9 @@
 // GUI 只读；唯一的写操作是带署名的单文件回退。
 'use strict';
 
-const { ipcMain } = require('electron');
+const { ipcMain: defaultIpcMain } = require('electron');
+// main.js 传入经 sidePaneIpcPolicy 包装过的 ipcMain（先查调用方窗口）；不传就用 Electron 的
+let ipcMain = defaultIpcMain;
 const path = require('path');
 const fs = require('fs');
 
@@ -75,7 +77,8 @@ function wrap(fn) {
  * @param {object} [options.workspaceService]
  * @param {object} [options.subscriptions] stateSubscriptions.js 的订阅表；第一个窗口订阅时才加载插件、挂上变更监听
  */
-function initialize({ workspaceService = null, subscriptions = null } = {}) {
+function initialize({ workspaceService = null, subscriptions = null, ipcMain: injectedIpcMain = null } = {}) {
+    ipcMain = injectedIpcMain || defaultIpcMain;
     workspaceServiceRef = workspaceService;
     CHANNELS.forEach(channel => ipcMain.removeHandler(channel));
     if (subscriptions && subscriptions !== subscriptionsRef) {
diff --git a/modules/ipc/sidePaneIpcPolicy.js b/modules/ipc/sidePaneIpcPolicy.js
new file mode 100644
index 000000000..af05a7826
--- /dev/null
+++ b/modules/ipc/sidePaneIpcPolicy.js
@@ -0,0 +1,61 @@
+// modules/ipc/sidePaneIpcPolicy.js
+// 侧栏相关 IPC 的调用方窗口策略，集中在一张表里，由注册层统一执行（领域激活器的 allowSender、guardIpcMain 包装），
+// 不靠每个 handler 自己记得检查。chat / utility preload 会装进语音、助手、笔记、论坛等很多窗口，
+// 这些窗口能拿到同样的接口；能写文件、跑命令、开终端或浏览器、改工作区的通道只认下面列出的应用页面的真实顶层窗口。
+// 做法同 DSH ipc.ts 的 assertDesktopSender（按通道限定允许的文档来源）；模块内部原有的检查保留，作为第二道。
+'use strict';
+
+const { createApplicationSenderGuard, resolveWindowWebContents } = require('./applicationSender');
+
+const MAIN = Object.freeze(['main.html']);
+// V工程窗口也是 Git、源码、施工图的正当调用方
+const MAIN_AND_FORGE = Object.freeze(['main.html', 'ProjectForgemodules/projectforge.html']);
+
+/**
+ * preload 领域（preloads/api/<领域>.js）→ 允许的页面；open 是对其它带同一 preload 的窗口开放的只读通道。
+ * 新增侧栏领域时加在这里，tests/side-pane-ipc-sender.test.js 会核对表里的每个通道都被拦住。
+ */
+const SIDE_PANE_IPC_POLICY = Object.freeze({
+    browser: { pages: MAIN },
+    terminal: { pages: MAIN },
+    sideChat: { pages: MAIN },
+    modelTrajectory: { pages: MAIN },
+    projectForge: { pages: MAIN_AND_FORGE },
+    state: { pages: MAIN_AND_FORGE },
+    workspaces: {
+        pages: MAIN,
+        open: ['workspaces:list', 'workspaces:search', 'workspaces:expand-placeholders', 'workspaces:get-prompt-settings'],
+    },
+});
+
+const DENIED = Object.freeze({ success: false, error: '当前窗口无权调用这个接口。' });
+
+/**
+ * 某个领域的调用方检查：(event, channel) => boolean。
+ * @param {string} domain SIDE_PANE_IPC_POLICY 的键
+ * @param {() => any} getMainWindow 主窗口可能重建，每次现取
+ */
+function createSidePaneSenderGuard(domain, getMainWindow) {
+    const policy = SIDE_PANE_IPC_POLICY[domain];
+    if (!policy) throw new Error(`[SidePaneIpcPolicy] 未登记的领域：${domain}`);
+    const open = new Set(policy.open || []);
+    const isAllowed = createApplicationSenderGuard({
+        pages: [...policy.pages],
+        getMainWebContents: () => resolveWindowWebContents(getMainWindow),
+    });
+    return (event, channel) => open.has(channel) || isAllowed(event);
+}
+
+/** 给直接注册的模块用：handle 时先过调用方检查，没通过就返回统一的拒绝结果，不进 handler */
+function guardIpcMain(ipcMain, allowSender) {
+    return Object.freeze({
+        handle(channel, handler) {
+            ipcMain.handle(channel, (event, ...args) => (allowSender(event, channel) ? handler(event, ...args) : DENIED));
+        },
+        removeHandler(channel) {
+            ipcMain.removeHandler(channel);
+        },
+    });
+}
+
+module.exports = { SIDE_PANE_IPC_POLICY, DENIED, createSidePaneSenderGuard, guardIpcMain };
diff --git a/modules/ipc/sourceHandlers.js b/modules/ipc/sourceHandlers.js
index 4a6b87872..e80d8bde9 100644
--- a/modules/ipc/sourceHandlers.js
+++ b/modules/ipc/sourceHandlers.js
@@ -5,7 +5,9 @@
 // - 工作区列表复用 git:list-workspaces。
 'use strict';
 
-const { ipcMain } = require('electron');
+const { ipcMain: defaultIpcMain } = require('electron');
+// main.js 传入经 sidePaneIpcPolicy 包装过的 ipcMain（先查调用方窗口）；不传就用 Electron 的
+let ipcMain = defaultIpcMain;
 const sourceService = require('../services/sourceService');
 // 和 Git 侧栏共用同一个守卫：只认应用页面的真实顶层窗口，子 frame 或 webview 自报的 URL 不算
 const { isAllowedSender } = require('./gitHandlers');
@@ -45,7 +47,8 @@ function handle(channel, fn) {
     });
 }
 
-function initialize({ workspaceService = null } = {}) {
+function initialize({ workspaceService = null, ipcMain: injectedIpcMain = null } = {}) {
+    ipcMain = injectedIpcMain || defaultIpcMain;
     workspaceServiceRef = workspaceService;
     CHANNELS.forEach(channel => ipcMain.removeHandler(channel));
 
diff --git a/modules/ipc/workspaceHandlers.js b/modules/ipc/workspaceHandlers.js
index 8ba2879b8..e6fe4de6a 100644
--- a/modules/ipc/workspaceHandlers.js
+++ b/modules/ipc/workspaceHandlers.js
@@ -4,11 +4,11 @@
 // 写入后通过 settings-updated 事件重新 configure 索引。
 'use strict';
 
-const { ipcMain, dialog, BrowserWindow } = require('electron');
+const { ipcMain: defaultIpcMain, dialog, BrowserWindow } = require('electron');
+let ipcMain = defaultIpcMain;
 const path = require('path');
 const fs = require('fs-extra');
 const fileManager = require('../fileManager');
-const { createApplicationSenderGuard, resolveWindowWebContents } = require('./applicationSender');
 const { WorkspaceIndex, normalizeWorkspaceList, sanitizeAlias } = require('../services/workspaceIndex');
 const {
     normalizePromptSettings,
@@ -37,9 +37,6 @@ let activeWorkspaceId = null;
 let promptSettings = normalizePromptSettings(null);
 let settingsListener = null;
 let externalSettingsListener = null;
-// 增删改工作区只认主窗口：工作区决定 Git、代码查看和终端能碰哪些目录，也会展开进系统提示、
-// 解析文件引用；同样带 chat preload 的语音、助手窗口只读（列表、搜索、展开占位符）。同 git/source/terminal 的守卫
-let isAllowedSender = () => false;
 
 function getWorkspaceIndex() {
     return workspaceIndex;
@@ -94,8 +91,9 @@ async function mutateWorkspaces(mutator) {
     return workspaceIndex.list();
 }
 
-function initialize({ settingsManager, logger = console, getMainWindow = null } = {}) {
-    isAllowedSender = createApplicationSenderGuard({ getMainWebContents: () => resolveWindowWebContents(getMainWindow) });
+function initialize({ settingsManager, logger = console, ipcMain: injectedIpcMain = null } = {}) {
+    // 增删改只认主窗口，读取对带同一 preload 的语音、助手窗口开放：由 main.js 传入的包装 ipcMain 按 sidePaneIpcPolicy 执行
+    ipcMain = injectedIpcMain || defaultIpcMain;
     settingsManagerRef = settingsManager;
     workspaceIndex?.dispose();
     workspaceIndex = new WorkspaceIndex({ logger });
@@ -118,7 +116,6 @@ function initialize({ settingsManager, logger = console, getMainWindow = null }
     ipcMain.handle('workspaces:list', () => ({ success: true, ...snapshot() }));
 
     ipcMain.handle('workspaces:set-active', async (event, workspaceId = null) => {
-        if (!isAllowedSender(event)) return { success: false, error: '当前窗口无权修改工作区。' };
         try {
             const target = typeof workspaceId === 'string' && workspaceId ? workspaceId : null;
             if (target && !workspaceIndex.list().some(ws => ws.id === target && ws.enabled)) {
@@ -145,7 +142,6 @@ function initialize({ settingsManager, logger = console, getMainWindow = null }
     });
 
     ipcMain.handle('workspaces:rebuild', async (event, workspaceId = null) => {
-        if (!isAllowedSender(event)) return { success: false, error: '当前窗口无权修改工作区。' };
         try {
             return { success: true, workspaces: await workspaceIndex.rebuild(workspaceId || null) };
         } catch (error) {
@@ -154,7 +150,6 @@ function initialize({ settingsManager, logger = console, getMainWindow = null }
     });
 
     ipcMain.handle('workspaces:add', async (event, rawPath, alias = '') => {
-        if (!isAllowedSender(event)) return { success: false, error: '当前窗口无权修改工作区。' };
         try {
             if (typeof rawPath !== 'string' || !rawPath.trim()) {
                 return { success: false, error: '请提供工作区目录路径。' };
@@ -176,7 +171,6 @@ function initialize({ settingsManager, logger = console, getMainWindow = null }
     });
 
     ipcMain.handle('workspaces:remove', async (event, workspaceId) => {
-        if (!isAllowedSender(event)) return { success: false, error: '当前窗口无权修改工作区。' };
         try {
             const workspaces = await mutateWorkspaces(list => list.filter(item => item.id !== workspaceId));
             return { success: true, workspaces };
@@ -186,7 +180,6 @@ function initialize({ settingsManager, logger = console, getMainWindow = null }
     });
 
     ipcMain.handle('workspaces:update', async (event, workspaceId, patch = {}) => {
-        if (!isAllowedSender(event)) return { success: false, error: '当前窗口无权修改工作区。' };
         try {
             let conflict = null;
             const workspaces = await mutateWorkspaces(list => list.map(item => {
@@ -223,7 +216,6 @@ function initialize({ settingsManager, logger = console, getMainWindow = null }
     ipcMain.handle('workspaces:get-prompt-settings', () => ({ success: true, settings: getPromptSettings() }));
 
     ipcMain.handle('workspaces:set-prompt-settings', async (event, patch = {}) => {
-        if (!isAllowedSender(event)) return { success: false, error: '当前窗口无权修改工作区。' };
         try {
             if (!settingsManagerRef) throw new Error('SettingsManager 未初始化。');
             const source = patch && typeof patch === 'object' && !Array.isArray(patch) ? patch : {};
@@ -242,7 +234,6 @@ function initialize({ settingsManager, logger = console, getMainWindow = null }
     });
 
     ipcMain.handle('workspaces:select-directory', async event => {
-        if (!isAllowedSender(event)) return { success: false, error: '当前窗口无权修改工作区。' };
         const owner = BrowserWindow.fromWebContents(event.sender) || undefined;
         const result = await dialog.showOpenDialog(owner, {
             title: '选择工作区目录',
diff --git a/package.json b/package.json
index 27dc5d440..3f65fbd27 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
     "test:built-artifact-smoke": "node scripts/test-built-artifact-smoke.mjs",
     "test:chat-transcript-snapshot": "node scripts/test-chat-transcript-snapshot.mjs",
     "test:side-pane": "node --test tests/side-pane-*.test.mjs tests/side-chat-*.test.mjs tests/side-browser-address.test.mjs tests/side-plan-revert-confirmation.test.mjs tests/sidebar-resizer-lifecycle.test.mjs tests/conversation-status-panel.test.mjs tests/domain-activator.test.js tests/browser-handlers.test.js tests/git-service.test.js tests/git-watcher.test.js tests/git-file-diff.test.mjs tests/git-changes-source.test.mjs tests/git-workspace-source.test.mjs",
-    "test:workbench": "node --test tests/terminal-cd-command.test.js tests/workspace-handlers-sender.test.js tests/side-chat-save-failure.test.mjs tests/history-mutation-queue.test.cjs tests/side-chat-regenerate-busy.test.mjs tests/conversation-current-source.test.mjs tests/conversation-scope.test.mjs tests/conversation-status-races.test.mjs tests/design-system-boundary.test.mjs tests/group-chat-url.test.js tests/group-stream-watchdog.test.js tests/line-diff-budget.test.mjs tests/main-composer-commands.test.mjs tests/message-file-changes-projectforge.test.mjs tests/message-file-changes.test.mjs tests/messenger-presentation.test.mjs tests/model-trajectory-handlers.test.js tests/model-trajectory-model.test.mjs tests/model-trajectory-recorder.test.js tests/notification-center.test.js tests/popover-window-blur.test.mjs tests/projectforge-changes-source.test.mjs tests/selection-reference.test.mjs tests/shared-source.test.mjs tests/source-handlers-sender.test.js tests/state-subscriptions.test.js tests/terminal-command-run-watch.test.js tests/terminal-native-helper.test.js tests/terminal-package-closure.test.js tests/tool-approval-card-enhancement.test.mjs tests/tool-presentation-settings.test.cjs tests/tool-presentation.test.mjs tests/tool-request-malformed-marker.test.mjs",
+    "test:workbench": "node --test tests/terminal-cd-command.test.js tests/workspace-handlers-sender.test.js tests/side-pane-ipc-sender.test.js tests/side-chat-save-failure.test.mjs tests/history-mutation-queue.test.cjs tests/side-chat-regenerate-busy.test.mjs tests/conversation-current-source.test.mjs tests/conversation-scope.test.mjs tests/conversation-status-races.test.mjs tests/design-system-boundary.test.mjs tests/group-chat-url.test.js tests/group-stream-watchdog.test.js tests/line-diff-budget.test.mjs tests/main-composer-commands.test.mjs tests/message-file-changes-projectforge.test.mjs tests/message-file-changes.test.mjs tests/messenger-presentation.test.mjs tests/model-trajectory-handlers.test.js tests/model-trajectory-model.test.mjs tests/model-trajectory-recorder.test.js tests/notification-center.test.js tests/popover-window-blur.test.mjs tests/projectforge-changes-source.test.mjs tests/selection-reference.test.mjs tests/shared-source.test.mjs tests/source-handlers-sender.test.js tests/state-subscriptions.test.js tests/terminal-command-run-watch.test.js tests/terminal-native-helper.test.js tests/terminal-package-closure.test.js tests/tool-approval-card-enhancement.test.mjs tests/tool-presentation-settings.test.cjs tests/tool-presentation.test.mjs tests/tool-request-malformed-marker.test.mjs",
     "check:chat-evidence": "node scripts/check-chat-evidence.mjs",
     "check:chat-release-evidence": "node scripts/check-chat-release-evidence.mjs",
     "write:chat-evidence-manifest": "node scripts/write-chat-evidence-manifest.mjs",
diff --git a/tests/side-pane-ipc-sender.test.js b/tests/side-pane-ipc-sender.test.js
new file mode 100644
index 000000000..ad989a04f
--- /dev/null
+++ b/tests/side-pane-ipc-sender.test.js
@@ -0,0 +1,89 @@
+'use strict';
+
+// 侧栏相关 IPC 的调用方窗口策略（modules/ipc/sidePaneIpcPolicy.js）：chat / utility preload 会装进很多窗口，
+// 表里每个通道都要在注册层拦住其它窗口和 webview，main.js 的每个侧栏领域都要走这张表。
+const test = require('node:test');
+const assert = require('node:assert/strict');
+const fs = require('node:fs');
+const path = require('node:path');
+const { describeApis } = require('../preloads/core/registry.js');
+const { SIDE_PANE_IPC_POLICY, createSidePaneSenderGuard, guardIpcMain } = require('../modules/ipc/sidePaneIpcPolicy');
+const { createDomainActivator } = require('../modules/ipc/domainActivator');
+const { createTrustedMainSender } = require('./helpers/trusted-main-sender.cjs');
+
+const main = createTrustedMainSender();
+const forge = createTrustedMainSender('ProjectForgemodules/projectforge.html');
+// 带 utility / chat preload 的其它应用窗口
+const otherWindow = createTrustedMainSender('Forummodules/forum.html');
+const guestPage = createTrustedMainSender();
+guestPage.sender.getType = () => 'webview';
+const subframe = createTrustedMainSender();
+subframe.event = { sender: subframe.sender, senderFrame: { url: subframe.sender.mainFrame.url, detached: false } };
+
+const apis = describeApis().filter(api => api.kind !== 'subscription');
+const channelsOf = domain => [...new Set(apis.filter(api => api.domain === domain).map(api => api.channel))];
+
+function fakeIpcMain() {
+    const handlers = new Map();
+    return { handlers, handle: (channel, fn) => handlers.set(channel, fn), removeHandler: channel => handlers.delete(channel) };
+}
+
+for (const [domain, policy] of Object.entries(SIDE_PANE_IPC_POLICY)) {
+    test(`${domain}: every channel rejects other windows, webviews and subframes before reaching its handler`, async () => {
+        const channels = channelsOf(domain);
+        assert.ok(channels.length, `preload domain ${domain} has channels`);
+        const open = new Set(policy.open || []);
+        const allow = createSidePaneSenderGuard(domain, () => main.mainWindow);
+        const ipc = fakeIpcMain();
+        const reached = [];
+        const guarded = guardIpcMain(ipc, allow);
+        // 领域激活器这条路径也查一遍：拒绝时连领域都不加载
+        const activatorIpc = fakeIpcMain();
+        let loaded = false;
+        createDomainActivator({ ipcMain: activatorIpc, logger: { error() {} } }).register(domain, {
+            channels, allowSender: allow,
+            load: () => { loaded = true; return {}; },
+            init: (_mod, { ipcMain: domainIpc }) => channels.forEach(channel => domainIpc.handle(channel, () => ({ success: true }))),
+        });
+        for (const channel of channels) guarded.handle(channel, () => { reached.push(channel); return { success: true }; });
+        for (const channel of channels) {
+            for (const caller of [otherWindow, guestPage, subframe]) {
+                const direct = await ipc.handlers.get(channel)(caller.event);
+                const viaActivator = await activatorIpc.handlers.get(channel)(caller.event);
+                if (open.has(channel)) {
+                    assert.equal(direct.success, true, `${channel} is read-only and open`);
+                } else {
+                    assert.equal(direct.success, false, `${channel} must reject ${caller.sender.getURL()}`);
+                    assert.equal(viaActivator.success, false, `${channel} via activator`);
+                }
+            }
+        }
+        assert.deepEqual(reached.filter(channel => !open.has(channel)), []);
+        if (!open.size) assert.equal(loaded, false, 'a rejected call must not load the domain');
+        for (const channel of channels) {
+            assert.equal((await ipc.handlers.get(channel)(main.event)).success, true, `${channel} from the main window`);
+        }
+        if (policy.pages.includes('ProjectForgemodules/projectforge.html')) {
+            assert.equal((await ipc.handlers.get(channels[0])(forge.event)).success, true, 'the ProjectForge window');
+        }
+    });
+}
+
+test('main.js puts every side pane domain behind the policy', () => {
+    const source = fs.readFileSync(path.join(__dirname, '..', 'main.js'), 'utf8');
+    for (const domain of Object.keys(SIDE_PANE_IPC_POLICY)) {
+        assert.match(source, new RegExp(`sidePaneGuard\\('${domain}'\\)`), domain);
+    }
+    // 领域激活器登记的每个领域都必须带 allowSender
+    const registrations = source.split('domainActivator.register(').slice(1);
+    assert.ok(registrations.length >= 5);
+    for (const block of registrations) {
+        const name = /^'([^']+)'/.exec(block)[1];
+        const body = block.slice(0, block.indexOf('});'));
+        assert.match(body, /allowSender: sidePaneGuard\(/, `domain ${name} registered without allowSender`);
+    }
+    for (const init of ['workspaceHandlers.initialize(', 'projectForgeHandlers.initialize(', 'sourceHandlers.initialize(']) {
+        const line = source.slice(source.indexOf(init)).split('\n')[0];
+        assert.match(line, /ipcMain: guardIpcMain\(ipcMain, sidePaneGuard\(/, init);
+    }
+});
diff --git a/tests/workspace-handlers-sender.test.js b/tests/workspace-handlers-sender.test.js
index 1904fb477..d3d9f90b6 100644
--- a/tests/workspace-handlers-sender.test.js
+++ b/tests/workspace-handlers-sender.test.js
@@ -23,6 +23,7 @@ Module._load = function loadWithElectronMock(request, parent, isMain) {
     return originalLoad.call(this, request, parent, isMain);
 };
 const workspaceHandlers = require('../modules/ipc/workspaceHandlers');
+const { createSidePaneSenderGuard, guardIpcMain } = require('../modules/ipc/sidePaneIpcPolicy');
 Module._load = originalLoad;
 
 const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'vcp-ws-sender-'));
@@ -31,7 +32,9 @@ const voice = createTrustedMainSender('Voicechatmodules/voicechat.html');
 let settings = { workspaces: [] };
 test.before(() => workspaceHandlers.initialize({
     logger: { warn() {}, log() {}, error() {} },
-    getMainWindow: () => main.mainWindow,
+    // 和 main.js 一样经策略表包装
+    ipcMain: guardIpcMain({ handle: (channel, fn) => handlers.set(channel, fn), removeHandler: channel => handlers.delete(channel) },
+        createSidePaneSenderGuard('workspaces', () => main.mainWindow)),
     settingsManager: {
         readSettings: async () => settings,
         updateSettings: async update => { settings = update(settings); return { settings }; },

From bce85f5e44d416e03e1b408ee92615449e825682 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 06:40:57 +0000
Subject: [PATCH 133/143] Side terminal: send the first chunk after quiet at
 once

ae9a99ba coalesces terminal:data into one IPC per 16ms window, but the
window opened on the first chunk, so every key echo reached the screen
about 16ms late. The first chunk after a quiet period now goes out
immediately and opens the window; chunks inside it are batched as
before, and a window that had output opens the next one. ZCode forwards
every chunk (terminalService.ts); flood throughput keeps the batching.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01KnTGLLVUgUjQG3f4cWBHJw
---
 .../contracts/generated/chat-event-graph.json | 81 +++++++++++++------
 modules/ipc/terminalHandlers.js               | 23 +++++-
 tests/terminal-command-run-watch.test.js      | 15 ++--
 3 files changed, 87 insertions(+), 32 deletions(-)

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 33c755fed..34222395d 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -28539,14 +28539,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 337,
+          "line": 354,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 337,
+          "line": 354,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:cd'"
         },
@@ -28563,7 +28563,7 @@
       "producers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 209,
+          "line": 226,
           "kind": "event-send"
         }
       ],
@@ -28577,7 +28577,7 @@
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 209,
+          "line": 226,
           "kind": "event-send",
           "match": "emit('terminal:clear'"
         },
@@ -28601,14 +28601,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 309,
+          "line": 326,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 309,
+          "line": 326,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:command-run'"
         },
@@ -28651,14 +28651,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 300,
+          "line": 317,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 300,
+          "line": 317,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:command-runs'"
         },
@@ -28682,14 +28682,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 248,
+          "line": 265,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 248,
+          "line": 265,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:create'"
         },
@@ -28708,6 +28708,21 @@
           "file": "modules/ipc/terminalHandlers.js",
           "line": 200,
           "kind": "event-send"
+        },
+        {
+          "file": "modules/ipc/terminalHandlers.js",
+          "line": 208,
+          "kind": "event-send"
+        },
+        {
+          "file": "modules/ipc/terminalHandlers.js",
+          "line": 214,
+          "kind": "event-send"
+        },
+        {
+          "file": "modules/ipc/terminalHandlers.js",
+          "line": 222,
+          "kind": "event-send"
         }
       ],
       "consumers": [
@@ -28724,6 +28739,24 @@
           "kind": "event-send",
           "match": "emit('terminal:data'"
         },
+        {
+          "file": "modules/ipc/terminalHandlers.js",
+          "line": 208,
+          "kind": "event-send",
+          "match": "emit('terminal:data'"
+        },
+        {
+          "file": "modules/ipc/terminalHandlers.js",
+          "line": 214,
+          "kind": "event-send",
+          "match": "emit('terminal:data'"
+        },
+        {
+          "file": "modules/ipc/terminalHandlers.js",
+          "line": 222,
+          "kind": "event-send",
+          "match": "emit('terminal:data'"
+        },
         {
           "file": "preloads/api/terminal.js",
           "line": 24,
@@ -28737,7 +28770,7 @@
       "producers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 210,
+          "line": 227,
           "kind": "event-send"
         }
       ],
@@ -28751,7 +28784,7 @@
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 210,
+          "line": 227,
           "kind": "event-send",
           "match": "emit('terminal:exit'"
         },
@@ -28775,14 +28808,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 282,
+          "line": 299,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 282,
+          "line": 299,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:kill'"
         },
@@ -28806,14 +28839,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 270,
+          "line": 287,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 270,
+          "line": 287,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:resize'"
         },
@@ -28837,14 +28870,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 288,
+          "line": 305,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 288,
+          "line": 305,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:restart'"
         },
@@ -28868,14 +28901,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 331,
+          "line": 348,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 331,
+          "line": 348,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:unwatch-command-runs'"
         },
@@ -28899,14 +28932,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 320,
+          "line": 337,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 320,
+          "line": 337,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:watch-command-runs'"
         },
@@ -28930,14 +28963,14 @@
       "consumers": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 257,
+          "line": 274,
           "kind": "event-listener"
         }
       ],
       "evidence": [
         {
           "file": "modules/ipc/terminalHandlers.js",
-          "line": 257,
+          "line": 274,
           "kind": "event-listener",
           "match": "ipcMain.handle('terminal:write'"
         },
diff --git a/modules/ipc/terminalHandlers.js b/modules/ipc/terminalHandlers.js
index 776007672..b7ff99b09 100644
--- a/modules/ipc/terminalHandlers.js
+++ b/modules/ipc/terminalHandlers.js
@@ -40,7 +40,7 @@ const MIN_ROWS = 1;
 const MAX_COLS = 500;
 const MAX_ROWS = 200;
 const RUN_NOTIFY_INTERVAL_MS = 120;
-// 输出按帧合并成一次 IPC：刷屏时每秒上千个小块各发一次，渲染端主线程会被消息排满
+// 刷屏时按帧合并成一次 IPC：每秒上千个小块各发一次，渲染端主线程会被消息排满。静默后的第一块不等（按键回显不加 16ms）
 const DATA_FLUSH_MS = 16;
 const DATA_FLUSH_CHARS = 64 * 1024;
 
@@ -199,11 +199,28 @@ function createView(event, options = {}) {
         dropData();
         if (data) emit('terminal:data', { id, data });
     };
+    // 静默之后的第一块（按键回显）立刻发；之后一个窗口内到的块攒成一次，窗口结束时有积压就发出并再开一个窗口
+    const endWindow = () => {
+        dataTimer = null;
+        if (!dataBuffer) return;
+        const data = dataBuffer;
+        dataBuffer = '';
+        emit('terminal:data', { id, data });
+        dataTimer = setTimeout(endWindow, DATA_FLUSH_MS);
+    };
     const detachMirror = executor.attachMirror({
         onData: (data) => {
+            if (!dataTimer) {
+                emit('terminal:data', { id, data });
+                dataTimer = setTimeout(endWindow, DATA_FLUSH_MS);
+                return;
+            }
             dataBuffer += data;
-            if (dataBuffer.length >= DATA_FLUSH_CHARS) flushData();
-            else if (!dataTimer) dataTimer = setTimeout(flushData, DATA_FLUSH_MS);
+            if (dataBuffer.length >= DATA_FLUSH_CHARS) {
+                const burst = dataBuffer;
+                dataBuffer = '';
+                emit('terminal:data', { id, data: burst });
+            }
         },
         // 清屏之前攒着的输出反正要被清掉；退出前先把剩下的发完，顺序不乱
         onClear: () => { dropData(); emit('terminal:clear', { id }); },
diff --git a/tests/terminal-command-run-watch.test.js b/tests/terminal-command-run-watch.test.js
index 14d5bae0b..68961469d 100644
--- a/tests/terminal-command-run-watch.test.js
+++ b/tests/terminal-command-run-watch.test.js
@@ -125,7 +125,7 @@ test('registering the IPC loads nothing; watch and unwatch are counted per page'
     }
 });
 
-test('mirror output is coalesced into one IPC per frame; exit flushes first and kill drops the rest', async () => {
+test('mirror output after the first chunk is coalesced per frame; exit flushes first and kill drops the rest', async () => {
     let sink = null;
     let detached = 0;
     terminalHandlers.initialize({
@@ -142,21 +142,26 @@ test('mirror output is coalesced into one IPC per frame; exit flushes first and
     await wait(0);
     const dataMessages = () => page.sent.filter(m => m.channel === 'terminal:data').map(m => m.payload.data);
 
+    sink.onData('k');
+    assert.deepEqual(dataMessages(), ['k'], 'the first chunk after quiet (a key echo) goes out at once');
     for (let i = 0; i < 500; i++) sink.onData('x');
-    assert.deepEqual(dataMessages(), [], 'nothing is sent per chunk');
+    assert.equal(dataMessages().length, 1, 'chunks inside the window are not sent one by one');
+    await wait(40);
+    assert.deepEqual(dataMessages(), ['k', 'x'.repeat(500)]);
     await wait(40);
-    assert.deepEqual(dataMessages(), ['x'.repeat(500)]);
 
+    sink.onData('a');
     sink.onData('a'.repeat(70 * 1024));
-    assert.equal(dataMessages().length, 2, 'a large burst goes out without waiting for the frame');
+    assert.equal(dataMessages().length, 4, 'a large burst goes out without waiting for the window');
 
     sink.onData('bye');
     sink.onExit(0);
     assert.deepEqual(page.sent.slice(-2).map(m => m.channel), ['terminal:data', 'terminal:exit']);
 
+    sink.onData('more');
     sink.onData('late');
     await call('terminal:kill', page, id);
     await wait(40);
-    assert.equal(dataMessages().at(-1), 'bye', 'output buffered when the view closed is not sent');
+    assert.equal(dataMessages().at(-1), 'more', 'output buffered when the view closed is not sent');
     assert.equal(detached, 1);
 });

From 3958cf1e91fb03678dd3c99983e49ba689cbbb72 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 06:41:49 +0000
Subject: [PATCH 134/143] Workspace sender test: stub fileManager so it runs
 without optional sharp

CI installs with --omit=optional, and loading the real fileManager pulls in
sharp, which failed the Chat Kernel and UI contracts job. The test only needs
the reference resolver registration.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_016hW799u5Ji5k9khDAwu688
---
 tests/workspace-handlers-sender.test.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/workspace-handlers-sender.test.js b/tests/workspace-handlers-sender.test.js
index d3d9f90b6..0c0cf6b7c 100644
--- a/tests/workspace-handlers-sender.test.js
+++ b/tests/workspace-handlers-sender.test.js
@@ -20,6 +20,9 @@ Module._load = function loadWithElectronMock(request, parent, isMain) {
             BrowserWindow: { fromWebContents: () => null },
         };
     }
+    // fileManager 会加载 sharp（可选依赖，CI 用 --omit=optional 安装）；这里只用到解析器登记
+    if (request === '../fileManager') return { setWorkspaceReferenceResolver() {} };
+    if (request === 'sharp') throw new Error('sharp must not be loaded by this test');
     return originalLoad.call(this, request, parent, isMain);
 };
 const workspaceHandlers = require('../modules/ipc/workspaceHandlers');

From 93c8ad80f8858931971a7e5394c66a7ace4fd6eb Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 06:42:03 +0000
Subject: [PATCH 135/143] Agent settings: a draft with a cleared name keeps the
 Agent's own name

collectAgentDraftConfig falls back to currentSelectedItemRef for an empty
name, and while switching Agents that ref already points at the next
Agent. Clearing A's name, switching to B and back, then saving renamed A
to B. The draft kept on switch now drops an empty name, so the restored
form uses the name on disk. settingsManager.js is a guarded boundary
file; its hash and rationale are updated.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01KnTGLLVUgUjQG3f4cWBHJw
---
 docs/contracts/chat-contracts.json            |   6 +-
 .../contracts/generated/chat-event-graph.json | 146 +++++++++---------
 modules/settingsManager.js                    |   6 +-
 scripts/next-delta-shared-baseline.json       |   4 +-
 tests/settings-agent-draft-retention.test.mjs |  12 ++
 5 files changed, 95 insertions(+), 79 deletions(-)

diff --git a/docs/contracts/chat-contracts.json b/docs/contracts/chat-contracts.json
index 79fee959a..533a6eccc 100644
--- a/docs/contracts/chat-contracts.json
+++ b/docs/contracts/chat-contracts.json
@@ -720,19 +720,19 @@
     "dynamicSites": [
       {
         "file": "modules/settingsManager.js",
-        "line": 753,
+        "line": 757,
         "kind": "custom-event-listener",
         "match": "target.addEventListener(type"
       },
       {
         "file": "modules/settingsManager.js",
-        "line": 2268,
+        "line": 2272,
         "kind": "custom-event-listener",
         "match": "element.addEventListener(eventName"
       },
       {
         "file": "modules/settingsManager.js",
-        "line": 2297,
+        "line": 2301,
         "kind": "custom-event-listener",
         "match": "systemPromptContainer.addEventListener(eventName"
       }
diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 34222395d..4895f244e 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -1240,7 +1240,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1046,
+          "line": 1050,
           "kind": "custom-event-listener"
         },
         {
@@ -1258,7 +1258,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1046,
+          "line": 1050,
           "kind": "custom-event-listener",
           "match": "settingsContainer.addEventListener('auxclick'"
         },
@@ -1676,7 +1676,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1392,
+          "line": 1396,
           "kind": "custom-event-listener"
         },
         {
@@ -1783,7 +1783,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1392,
+          "line": 1396,
           "kind": "custom-event-listener",
           "match": "vcpServerUrlInput.addEventListener('blur'"
         },
@@ -2371,7 +2371,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1201,
+          "line": 1205,
           "kind": "custom-event-listener"
         },
         {
@@ -2542,7 +2542,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1201,
+          "line": 1205,
           "kind": "custom-event-listener",
           "match": "agentSettingsForm.addEventListener('change'"
         },
@@ -3797,77 +3797,77 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1110,
+          "line": 1114,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1125,
+          "line": 1129,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1126,
+          "line": 1130,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1128,
+          "line": 1132,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1138,
+          "line": 1142,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1145,
+          "line": 1149,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1204,
+          "line": 1208,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1279,
+          "line": 1283,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1285,
+          "line": 1289,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1312,
+          "line": 1316,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1341,
+          "line": 1345,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1672,
+          "line": 1676,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1685,
+          "line": 1689,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1859,
+          "line": 1863,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1867,
+          "line": 1871,
           "kind": "custom-event-listener"
         },
         {
@@ -5287,91 +5287,91 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1110,
+          "line": 1114,
           "kind": "custom-event-listener",
           "match": "refreshModelsBtn.addEventListener('click'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1125,
+          "line": 1129,
           "kind": "custom-event-listener",
           "match": "cancelRegexRuleBtn.addEventListener('click'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1126,
+          "line": 1130,
           "kind": "custom-event-listener",
           "match": "closeRegexRuleModalBtn.addEventListener('click'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1128,
+          "line": 1132,
           "kind": "custom-event-listener",
           "match": "regexRuleModal.addEventListener('click'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1138,
+          "line": 1142,
           "kind": "custom-event-listener",
           "match": "openTopicSummaryModelSelectBtn.addEventListener('click'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1145,
+          "line": 1149,
           "kind": "custom-event-listener",
           "match": "document.addEventListener('click'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1204,
+          "line": 1208,
           "kind": "custom-event-listener",
           "match": "deleteItemBtn.addEventListener('click'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1279,
+          "line": 1283,
           "kind": "custom-event-listener",
           "match": "openModelSelectBtn.addEventListener('click'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1285,
+          "line": 1289,
           "kind": "custom-event-listener",
           "match": "refreshModelsBtn.addEventListener('click'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1312,
+          "line": 1316,
           "kind": "custom-event-listener",
           "match": "refreshTtsModelsBtn.addEventListener('click'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1341,
+          "line": 1345,
           "kind": "custom-event-listener",
           "match": "resetAvatarColorsBtn.addEventListener('click'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1672,
+          "line": 1676,
           "kind": "custom-event-listener",
           "match": "starSpan.addEventListener('click'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1685,
+          "line": 1689,
           "kind": "custom-event-listener",
           "match": "li.addEventListener('click'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1859,
+          "line": 1863,
           "kind": "custom-event-listener",
           "match": "editBtn.addEventListener('click'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1867,
+          "line": 1871,
           "kind": "custom-event-listener",
           "match": "deleteBtn.addEventListener('click'"
         },
@@ -7323,7 +7323,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1021,
+          "line": 1025,
           "kind": "custom-event-listener"
         },
         {
@@ -7457,7 +7457,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1021,
+          "line": 1025,
           "kind": "custom-event-listener",
           "match": "settingsContainer.addEventListener('contextmenu'"
         },
@@ -14749,7 +14749,7 @@
       "producers": [
         {
           "file": "modules/settingsManager.js",
-          "line": 2008,
+          "line": 2012,
           "kind": "custom-event-create"
         }
       ],
@@ -14836,32 +14836,32 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1109,
+          "line": 1113,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1200,
+          "line": 1204,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1282,
+          "line": 1286,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1347,
+          "line": 1351,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1351,
+          "line": 1355,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1379,
+          "line": 1383,
           "kind": "custom-event-listener"
         },
         {
@@ -15009,43 +15009,43 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1109,
+          "line": 1113,
           "kind": "custom-event-listener",
           "match": "modelSearchInput.addEventListener('input'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1200,
+          "line": 1204,
           "kind": "custom-event-listener",
           "match": "agentSettingsForm.addEventListener('input'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1282,
+          "line": 1286,
           "kind": "custom-event-listener",
           "match": "modelSearchInput.addEventListener('input'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1347,
+          "line": 1351,
           "kind": "custom-event-listener",
           "match": "picker.addEventListener('input'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1351,
+          "line": 1355,
           "kind": "custom-event-listener",
           "match": "textInput.addEventListener('input'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1379,
+          "line": 1383,
           "kind": "custom-event-listener",
           "match": "agentCardCssInput.addEventListener('input'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 2008,
+          "line": 2012,
           "kind": "custom-event-create",
           "match": "new CustomEvent('input'"
         },
@@ -18492,7 +18492,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1101,
+          "line": 1105,
           "kind": "custom-event-listener"
         },
         {
@@ -18522,7 +18522,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1101,
+          "line": 1105,
           "kind": "custom-event-listener",
           "match": "document.addEventListener('modal-ready'"
         },
@@ -18908,7 +18908,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1062,
+          "line": 1066,
           "kind": "custom-event-listener"
         },
         {
@@ -19028,7 +19028,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1062,
+          "line": 1066,
           "kind": "custom-event-listener",
           "match": "settingsContainer.addEventListener('mousedown'"
         },
@@ -21628,7 +21628,7 @@
       "consumers": [
         {
           "file": "modules/settingsManager.js",
-          "line": 1288,
+          "line": 1292,
           "kind": "preload-subscription"
         },
         {
@@ -21640,7 +21640,7 @@
       "evidence": [
         {
           "file": "modules/settingsManager.js",
-          "line": 1288,
+          "line": 1292,
           "kind": "preload-subscription",
           "match": "electronAPI.onModelsUpdated("
         },
@@ -22683,7 +22683,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1304,
+          "line": 1308,
           "kind": "custom-event-listener"
         },
         {
@@ -22701,7 +22701,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1304,
+          "line": 1308,
           "kind": "custom-event-listener",
           "match": "window.addEventListener('pagehide'"
         },
@@ -26569,7 +26569,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 2061,
+          "line": 2065,
           "kind": "custom-event-listener"
         },
         {
@@ -26640,7 +26640,7 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 2061,
+          "line": 2065,
           "kind": "custom-event-listener",
           "match": "settingsTab.addEventListener('scroll'"
         },
@@ -28208,12 +28208,12 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1124,
+          "line": 1128,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1178,
+          "line": 1182,
           "kind": "custom-event-listener"
         },
         {
@@ -28269,13 +28269,13 @@
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1124,
+          "line": 1128,
           "kind": "custom-event-listener",
           "match": "regexRuleForm.addEventListener('submit'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1178,
+          "line": 1182,
           "kind": "custom-event-listener",
           "match": "agentSettingsForm.addEventListener('submit'"
         },
@@ -30606,12 +30606,12 @@
       "producers": [
         {
           "file": "modules/settingsManager.js",
-          "line": 501,
+          "line": 505,
           "kind": "custom-event-create"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1385,
+          "line": 1389,
           "kind": "custom-event-create"
         }
       ],
@@ -30625,13 +30625,13 @@
       "evidence": [
         {
           "file": "modules/settingsManager.js",
-          "line": 501,
+          "line": 505,
           "kind": "custom-event-create",
           "match": "new CustomEvent('vcp-settings-surface-updated'"
         },
         {
           "file": "modules/settingsManager.js",
-          "line": 1385,
+          "line": 1389,
           "kind": "custom-event-create",
           "match": "new CustomEvent('vcp-settings-surface-updated'"
         },
@@ -32882,7 +32882,7 @@
     },
     {
       "file": "modules/settingsManager.js",
-      "line": 753,
+      "line": 757,
       "reason": "dynamic listener name: type",
       "kind": "custom-event-listener",
       "match": "target.addEventListener(type",
@@ -32890,7 +32890,7 @@
     },
     {
       "file": "modules/settingsManager.js",
-      "line": 2268,
+      "line": 2272,
       "reason": "dynamic listener name: eventName",
       "kind": "custom-event-listener",
       "match": "element.addEventListener(eventName",
@@ -32898,7 +32898,7 @@
     },
     {
       "file": "modules/settingsManager.js",
-      "line": 2297,
+      "line": 2301,
       "reason": "dynamic listener name: eventName",
       "kind": "custom-event-listener",
       "match": "systemPromptContainer.addEventListener(eventName",
diff --git a/modules/settingsManager.js b/modules/settingsManager.js
index a8f5decc4..0b3a27ef3 100644
--- a/modules/settingsManager.js
+++ b/modules/settingsManager.js
@@ -277,7 +277,11 @@ const settingsManager = (() => {
         const previousAgentId = editingAgentIdInput?.value;
         if (previousAgentId && previousAgentId === settledAgentId && isAgentSettingsDirty) {
             try {
-                unsavedAgentDrafts.set(previousAgentId, collectAgentDraftConfig(previousAgentId));
+                const draft = collectAgentDraftConfig(previousAgentId);
+                // 名称框清空时 collectAgentDraftConfig 会回退到 currentSelectedItemRef，切换途中它已经指向新的 Agent，
+                // 草稿里留着就会在恢复后把这个 Agent 存成别人的名字；不记名称，恢复时用磁盘上的
+                if (!agentNameInput?.value?.trim?.()) delete draft.name;
+                unsavedAgentDrafts.set(previousAgentId, draft);
             } catch (error) {
                 console.warn(`[SettingsManager] Could not keep the unsaved draft for ${previousAgentId}:`, error);
             }
diff --git a/scripts/next-delta-shared-baseline.json b/scripts/next-delta-shared-baseline.json
index 2e0873ce3..3af0adba0 100644
--- a/scripts/next-delta-shared-baseline.json
+++ b/scripts/next-delta-shared-baseline.json
@@ -24,8 +24,8 @@
     "reason": "Integrated group behavior: JEV mode/context-window fields and invitations; explicit group queue interrupt; optimistic user message IDs survive file sync; settings read/save snapshots preserve the original group and mode data; chat header delegates to its presentation owner. Group form tracks unsaved edits (including speaker reorder) and shows the same 未保存更改 indicator as Agent settings; a successful save clears it, loading a group resets it."
   },
   "modules/settingsManager.js": {
-    "sha256": "22d57ef75999aed5e93af04dbbb4cb92607a7e2bced9dcb13e0272df5853c498",
-    "reason": "Integrated manual-save policy: Agent/prompt edits remain drafts until Save; context changes and collapse no longer implicitly persist; submit captures draft and display identity; regex import merges into the draft; Lucide renders action icons. Replaces the obsolete autosave rationale. Settings display uses a local selection snapshot; a delayed config read cannot overwrite a newer settings view (frozen-selection and A-to-B display regression tests). Regex rule add/edit/delete and MiMo director prompt add/remove mark the draft unsaved like ordinary field edits. Unsaved Agent drafts (including after a failed save) are kept per Agent while the form shows another one and restored with a notice when it is shown again; Save or delete clears them."
+    "sha256": "55420e21e6dce6bd574331abb369795604a2003951707746c2276da20cdc230c",
+    "reason": "Integrated manual-save policy: Agent/prompt edits remain drafts until Save; context changes and collapse no longer implicitly persist; submit captures draft and display identity; regex import merges into the draft; Lucide renders action icons. Replaces the obsolete autosave rationale. Settings display uses a local selection snapshot; a delayed config read cannot overwrite a newer settings view (frozen-selection and A-to-B display regression tests). Regex rule add/edit/delete and MiMo director prompt add/remove mark the draft unsaved like ordinary field edits. Unsaved Agent drafts (including after a failed save) are kept per Agent while the form shows another one and restored with a notice when it is shown again; Save or delete clears them. A draft whose name field was cleared keeps no name, so restoring it cannot save the Agent under the next Agent's name."
   },
   "modules/filterManager.js": {
     "sha256": "2390116ff961f18cdf2d3defd02d5559de9381f891be7e5eb33ef99f98337225",
diff --git a/tests/settings-agent-draft-retention.test.mjs b/tests/settings-agent-draft-retention.test.mjs
index 6b4560b54..1d2224ad4 100644
--- a/tests/settings-agent-draft-retention.test.mjs
+++ b/tests/settings-agent-draft-retention.test.mjs
@@ -163,3 +163,15 @@ test('a clean Agent leaves no draft behind', () => withAgentSettings(async ({ sh
     assert.equal(state(), 'done');
     assert.equal(toasts.length, 0);
 }));
+
+test('a draft with the name cleared does not take the next Agent\'s name', () => withAgentSettings(async ({ show, edit, save, value, disk }) => {
+    await show('agent-a');
+    edit('agentCustomCss', '.alice {}');
+    edit('agentNameInput', '');
+    await show('agent-b');
+    await show('agent-a');
+    assert.equal(value('agentCustomCss'), '.alice {}', 'the draft came back');
+    assert.notEqual(value('agentNameInput'), 'Bob');
+    await save();
+    assert.notEqual(disk['agent-a'].name, 'Bob', 'saving the restored draft keeps Agent A\'s name');
+}));

From 5ff688f1a103b2a2f447c3ec1eeb7d618406f4cd Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 06:52:37 +0000
Subject: [PATCH 136/143] Side pane tests: assert behavior instead of copy,
 drop fixed sleeps and duplicates

- Content asserts (exact Chinese copy, class names, markup, icon ligatures) are
  replaced by state: data-status / data-state / data-empty-reason / data-reason /
  data-action hooks, aria state, status type/code, and round-tripped user values.
- Fixed-duration sleeps that raced debounces or timers now use node:test
  mock.timers (negative checks tick past the debounce) or the shared
  tests/helpers/wait-for.mjs; per-file waitFor copies are gone.
- Tests coupled to internals (resource labels, private options, storage keys,
  internal call order, monkeypatched queue internals) assert observable effects.
- Duplicates are folded into the surviving test; the vacuous dual-stream test
  now registers a real main-chat route.
- New test for the restore guard: side chats restored after the user moved to
  another tab stay in the background (previously untested).

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012AP71nAxrCFEpH7st6asf9
---
 .../contracts/generated/chat-event-graph.json | 108 ++++-----
 modules/renderer/side-chat/composer-state.js  |   8 +-
 modules/renderer/sideChatSurfaceOwner.js      |   4 +-
 .../side-pane/code-viewer/diff-view.js        |   6 +-
 .../ui-system/side-pane/code-viewer/editor.js |   6 +-
 .../side-pane/code-viewer/file-read.js        |   8 +-
 .../ui-system/side-pane/code-viewer/picker.js |   1 +
 .../side-pane/codeViewerSideProvider.js       |   3 +
 .../ui-system/side-pane/git/context-menu.js   |   7 +-
 modules/ui-system/side-pane/git/git-view.js   |  17 +-
 .../side-pane/modelTrajectorySideProvider.js  |  17 +-
 .../side-pane/planDetailSideProvider.js       |  18 +-
 .../side-pane/terminalSideProvider.js         |   2 +
 modules/ui-system/side-pane/terminalTheme.js  |   6 +-
 .../side-pane/toolOutputSideProvider.js       |   2 +
 tests/helpers/side-chat-surface-fixture.mjs   |   3 +-
 tests/helpers/wait-for.mjs                    |  11 +
 tests/side-chat-audit-probes.test.mjs         | 218 ++---------------
 tests/side-chat-draft-restore.test.mjs        |  43 ++--
 tests/side-chat-draft-save.test.mjs           |  41 ++--
 tests/side-chat-entry-points.test.mjs         |   7 +-
 tests/side-chat-ephemeral-parity.test.mjs     |  27 +--
 tests/side-chat-floating-selection.test.mjs   |  16 +-
 tests/side-chat-integration.test.mjs          | 191 +++------------
 tests/side-chat-interactive-submit.test.mjs   |  29 ++-
 tests/side-chat-ipc-metadata.test.mjs         |  22 ++
 tests/side-chat-message-delete.test.mjs       |  20 +-
 tests/side-chat-model-and-context.test.mjs    |  36 +--
 tests/side-chat-persistence-retry.test.mjs    |  30 ++-
 tests/side-chat-preparation-cancel.test.mjs   |  17 +-
 tests/side-chat-regenerate-busy.test.mjs      |  13 +-
 tests/side-chat-save-failure.test.mjs         |   2 +-
 tests/side-chat-session-service.test.mjs      |  14 ++
 tests/side-chat-surface-owner.test.mjs        | 129 +++-------
 tests/side-chat-topic-binding-parity.test.mjs |  45 +---
 tests/side-pane-advanced-parity.test.mjs      |  99 ++++----
 tests/side-pane-code-viewer.test.mjs          |  56 ++---
 tests/side-pane-commands.test.mjs             |   2 +-
 tests/side-pane-controller.test.mjs           |   1 -
 tests/side-pane-dom-boundary.test.mjs         |  40 ++--
 tests/side-pane-dormancy.test.mjs             |  37 +--
 tests/side-pane-git-ai-scope.test.mjs         |  68 ++----
 tests/side-pane-git-real-backend.test.mjs     |  27 +--
 tests/side-pane-git-refresh-focus.test.mjs    |   8 +-
 tests/side-pane-git-stale-diff.test.mjs       |  20 +-
 tests/side-pane-git.test.mjs                  |  40 ++--
 tests/side-pane-model-trajectory.test.mjs     | 221 ++++++++++--------
 tests/side-pane-mount-timing.test.mjs         |  14 +-
 tests/side-pane-occurrence.test.mjs           |   2 -
 tests/side-pane-persistence.test.mjs          |  57 +----
 tests/side-pane-plan-detail.test.mjs          | 116 +++++----
 tests/side-pane-plan-topic.test.mjs           |  73 +++---
 tests/side-pane-resizer-owner.test.mjs        |  59 ++---
 tests/side-pane-scope-restore.test.mjs        |   5 +
 tests/side-pane-screen-reader-names.test.mjs  |   4 +-
 tests/side-pane-state.test.mjs                |  14 +-
 tests/side-pane-tab-strip-reuse.test.mjs      |   4 +-
 tests/side-pane-tab-strip.test.mjs            |  37 ++-
 tests/side-pane-terminal-lifecycle.test.mjs   |  50 ++--
 tests/side-pane-terminal-theme.test.mjs       |   8 +-
 tests/side-pane-tool-output.test.mjs          | 167 ++++++++-----
 tests/side-pane-view-scope-release.test.mjs   |  29 +--
 tests/side-pane-visibility-animation.test.mjs |   5 +-
 tests/side-pane-wiring-modules.test.mjs       |  15 +-
 64 files changed, 1077 insertions(+), 1328 deletions(-)
 create mode 100644 tests/helpers/wait-for.mjs

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 724deb9e0..eb2ac9e44 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -1696,7 +1696,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/context-menu.js",
-          "line": 133,
+          "line": 134,
           "kind": "custom-event-listener"
         },
         {
@@ -1807,7 +1807,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/context-menu.js",
-          "line": 133,
+          "line": 134,
           "kind": "custom-event-listener",
           "match": "win.addEventListener('blur'"
         },
@@ -2391,7 +2391,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 582,
+          "line": 590,
           "kind": "custom-event-listener"
         }
       ],
@@ -2566,7 +2566,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 582,
+          "line": 590,
           "kind": "custom-event-listener",
           "match": "el.addEventListener('change'"
         }
@@ -4192,12 +4192,12 @@
         },
         {
           "file": "modules/ui-system/side-pane/code-viewer/diff-view.js",
-          "line": 79,
+          "line": 81,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/code-viewer/editor.js",
-          "line": 87,
+          "line": 89,
           "kind": "custom-event-listener"
         },
         {
@@ -4207,12 +4207,12 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/context-menu.js",
-          "line": 115,
+          "line": 116,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/git/git-view.js",
-          "line": 262,
+          "line": 263,
           "kind": "custom-event-listener"
         },
         {
@@ -4222,17 +4222,17 @@
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 351,
+          "line": 355,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 375,
+          "line": 379,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 768,
+          "line": 781,
           "kind": "custom-event-listener"
         },
         {
@@ -4282,57 +4282,57 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 413,
+          "line": 419,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 422,
+          "line": 429,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 535,
+          "line": 543,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 598,
+          "line": 606,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 604,
+          "line": 612,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 677,
+          "line": 686,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 704,
+          "line": 713,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 723,
+          "line": 732,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 743,
+          "line": 753,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 774,
+          "line": 784,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 789,
+          "line": 799,
           "kind": "custom-event-listener"
         },
         {
@@ -5761,13 +5761,13 @@
         },
         {
           "file": "modules/ui-system/side-pane/code-viewer/diff-view.js",
-          "line": 79,
+          "line": 81,
           "kind": "custom-event-listener",
           "match": "more.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/code-viewer/editor.js",
-          "line": 87,
+          "line": 89,
           "kind": "custom-event-listener",
           "match": "read.addEventListener('click'"
         },
@@ -5779,13 +5779,13 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/context-menu.js",
-          "line": 115,
+          "line": 116,
           "kind": "custom-event-listener",
           "match": "btn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/git/git-view.js",
-          "line": 262,
+          "line": 263,
           "kind": "custom-event-listener",
           "match": "btn.addEventListener('click'"
         },
@@ -5797,19 +5797,19 @@
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 351,
+          "line": 355,
           "kind": "custom-event-listener",
           "match": "more.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 375,
+          "line": 379,
           "kind": "custom-event-listener",
           "match": "head.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 768,
+          "line": 781,
           "kind": "custom-event-listener",
           "match": "item.addEventListener('click'"
         },
@@ -5869,67 +5869,67 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 413,
+          "line": 419,
           "kind": "custom-event-listener",
           "match": "refreshBtn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 422,
+          "line": 429,
           "kind": "custom-event-listener",
           "match": "forgeBtn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 535,
+          "line": 543,
           "kind": "custom-event-listener",
           "match": "row.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 598,
+          "line": 606,
           "kind": "custom-event-listener",
           "match": "toggle.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 604,
+          "line": 612,
           "kind": "custom-event-listener",
           "match": "clear.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 677,
+          "line": 686,
           "kind": "custom-event-listener",
           "match": "headBtn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 704,
+          "line": 713,
           "kind": "custom-event-listener",
           "match": "pick.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 723,
+          "line": 732,
           "kind": "custom-event-listener",
           "match": "pick.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 743,
+          "line": 753,
           "kind": "custom-event-listener",
           "match": "link.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 774,
+          "line": 784,
           "kind": "custom-event-listener",
           "match": "retry.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 789,
+          "line": 799,
           "kind": "custom-event-listener",
           "match": "retry.addEventListener('click'"
         },
@@ -7133,7 +7133,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 563,
+          "line": 571,
           "kind": "custom-event-listener"
         }
       ],
@@ -7146,7 +7146,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 563,
+          "line": 571,
           "kind": "custom-event-listener",
           "match": "el.addEventListener('compositionend'"
         }
@@ -7163,7 +7163,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 562,
+          "line": 570,
           "kind": "custom-event-listener"
         }
       ],
@@ -7176,7 +7176,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 562,
+          "line": 570,
           "kind": "custom-event-listener",
           "match": "el.addEventListener('compositionstart'"
         }
@@ -14901,7 +14901,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 561,
+          "line": 569,
           "kind": "custom-event-listener"
         },
         {
@@ -15093,7 +15093,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 561,
+          "line": 569,
           "kind": "custom-event-listener",
           "match": "el.addEventListener('input'"
         },
@@ -15582,12 +15582,12 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/context-menu.js",
-          "line": 132,
+          "line": 133,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 376,
+          "line": 380,
           "kind": "custom-event-listener"
         },
         {
@@ -15981,13 +15981,13 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/context-menu.js",
-          "line": 132,
+          "line": 133,
           "kind": "custom-event-listener",
           "match": "doc.addEventListener('keydown'"
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 376,
+          "line": 380,
           "kind": "custom-event-listener",
           "match": "head.addEventListener('keydown'"
         },
@@ -21658,14 +21658,14 @@
       "consumers": [
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 932,
+          "line": 947,
           "kind": "preload-subscription"
         }
       ],
       "evidence": [
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 932,
+          "line": 947,
           "kind": "preload-subscription",
           "match": "api?.onModelTrajectoryChanged("
         }
@@ -23109,7 +23109,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/context-menu.js",
-          "line": 131,
+          "line": 132,
           "kind": "custom-event-listener"
         },
         {
@@ -23163,7 +23163,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/context-menu.js",
-          "line": 131,
+          "line": 132,
           "kind": "custom-event-listener",
           "match": "doc.addEventListener('pointerdown'"
         },
diff --git a/modules/renderer/side-chat/composer-state.js b/modules/renderer/side-chat/composer-state.js
index a4594dc7e..6e99242e7 100644
--- a/modules/renderer/side-chat/composer-state.js
+++ b/modules/renderer/side-chat/composer-state.js
@@ -13,14 +13,18 @@ export function createSideChatComposerState({
     textarea,
     toolButtons = []
 }) {
-    function updateStatus(text, type = 'normal') {
+    // code：给调用方/测试的机器可读状态（如 'cancelled'），与文案无关
+    function updateStatus(text, type = 'normal', code = null) {
         if (store.isDisposed) return;
         // Like the main composer, progress is shown by the send/stop button; only failures get text.
         const shown = type === 'error' ? text : '';
         statusText.textContent = shown;
         statusText.title = shown;
         statusText.className = 'side-chat-status-text' + (type === 'error' ? ' side-chat-status-error' : '');
-        onStatusChange?.({ text, type });
+        statusText.dataset.statusType = type;
+        if (code) statusText.dataset.statusCode = code;
+        else delete statusText.dataset.statusCode;
+        onStatusChange?.({ text, type, code });
     }
 
     function updateEmptyState() {
diff --git a/modules/renderer/sideChatSurfaceOwner.js b/modules/renderer/sideChatSurfaceOwner.js
index cc998c973..d42f24e3a 100644
--- a/modules/renderer/sideChatSurfaceOwner.js
+++ b/modules/renderer/sideChatSurfaceOwner.js
@@ -444,7 +444,7 @@ export async function mountSideChatSurface(container, {
             if (needsSnapshotRefresh()) await refreshSnapshot();
             if (sendController.signal.aborted) {
                 restoreDraftIfRetracted();
-                updateStatus('已取消');
+                updateStatus('已取消', 'normal', 'cancelled');
                 return;
             }
             const result = await surface.sendMessage({
@@ -459,7 +459,7 @@ export async function mountSideChatSurface(container, {
             const terminalType = result?.terminal?.event?.type;
             if (terminalType === 'cancelled' || terminalType === 'discarded') {
                 restoreDraftIfRetracted();
-                updateStatus('已取消');
+                updateStatus('已取消', 'normal', 'cancelled');
             } else if (terminalType === 'failed') {
                 const transportErr = result.terminal.event.outcome?.transport?.error;
                 const persistenceErr = result.terminal.event.outcome?.persistence?.error;
diff --git a/modules/ui-system/side-pane/code-viewer/diff-view.js b/modules/ui-system/side-pane/code-viewer/diff-view.js
index ff4f686f4..e80fa0462 100644
--- a/modules/ui-system/side-pane/code-viewer/diff-view.js
+++ b/modules/ui-system/side-pane/code-viewer/diff-view.js
@@ -11,7 +11,8 @@
 
 'use strict';
 
-
+// 差异视图一次挂多少行，「显示更多行」再挂下一页
+export const DIFF_PAGE_ROWS = 500;
 
 export function createCodeViewerDiffView({
     store,
@@ -69,8 +70,9 @@ export function createCodeViewerDiffView({
         const more = doc.createElement('button');
         more.type = 'button';
         more.className = 'side-code-action-btn';
+        more.dataset.action = 'diff-more';
         function appendPage() {
-            const end = Math.min(displayed + 500, diffResult.rows.length);
+            const end = Math.min(displayed + DIFF_PAGE_ROWS, diffResult.rows.length);
             while (displayed < end) appendRow(diffResult.rows[displayed++]);
             more.textContent = '显示更多行（剩余 ' + (diffResult.rows.length - displayed) + ' 行）';
             more.hidden = displayed >= diffResult.rows.length;
diff --git a/modules/ui-system/side-pane/code-viewer/editor.js b/modules/ui-system/side-pane/code-viewer/editor.js
index f611f9a6a..3fe97577d 100644
--- a/modules/ui-system/side-pane/code-viewer/editor.js
+++ b/modules/ui-system/side-pane/code-viewer/editor.js
@@ -61,10 +61,11 @@ export function createCodeViewerEditor({
     // 用户点过「读取」后，工作区外的这个文件就不再问
     let outsideWorkspaceAllowed = false;
 
-    function setBodyMessage(text, isError = false) {
+    function setBodyMessage(text, isError = false, reason = null) {
         body.innerHTML = '';
         const msg = doc.createElement('div');
         msg.className = isError ? 'side-code-error' : 'side-code-empty';
+        if (reason) msg.dataset.reason = reason;
         msg.textContent = text;
         body.appendChild(msg);
     }
@@ -83,6 +84,7 @@ export function createCodeViewerEditor({
         const read = doc.createElement('button');
         read.type = 'button';
         read.className = 'side-pane-mount-error-retry';
+        read.dataset.action = 'consent-read';
         read.textContent = '读取这个文件';
         read.addEventListener('click', () => {
             outsideWorkspaceAllowed = true;
@@ -112,7 +114,7 @@ export function createCodeViewerEditor({
             store.currentCode = '';
             fileLoaded = false;
             if (result?.needsConsent) showConsent(result.notice);
-            else if (result?.notice) setBodyMessage(result.notice);
+            else if (result?.notice) setBodyMessage(result.notice, false, result.reason);
             else setBodyMessage(result?.error || '读取文件失败', true);
             return false;
         }
diff --git a/modules/ui-system/side-pane/code-viewer/file-read.js b/modules/ui-system/side-pane/code-viewer/file-read.js
index 6ae838f34..2a87d4155 100644
--- a/modules/ui-system/side-pane/code-viewer/file-read.js
+++ b/modules/ui-system/side-pane/code-viewer/file-read.js
@@ -2,7 +2,7 @@
  * 代码查看器按路径读文件。结果统一成三种：
  *   { ok: true, text }      可以显示（空字符串是合法的空文件）
  *   { ok: false, error }    读取失败，按错误显示
- *   { ok: false, notice }   读到了但不适合预览（二进制、过大），按普通提示显示
+ *   { ok: false, notice }   读到了但不适合预览（二进制、过大），按普通提示显示；reason 标明是哪一种
  * 界面只看 ok，不再从各个接口的返回值里猜。
  */
 
@@ -22,7 +22,7 @@ export async function readFileForViewer(api, filePath, { allowOutsideWorkspace =
     if (fromWorkspace?.result) return fromWorkspace.result;
     // 没有工作区服务的窗口分不清内外，照旧读
     if (fromWorkspace && !fromWorkspace.inWorkspace && !allowOutsideWorkspace) {
-        return { ok: false, needsConsent: true, notice: `这个文件不在任何已登记的工作区里：\n${filePath}` };
+        return { ok: false, reason: 'outside-workspace', needsConsent: true, notice: `这个文件不在任何已登记的工作区里：\n${filePath}` };
     }
     if (typeof api?.getTextContent !== 'function') return { ok: false, error: '当前窗口不支持读取文件' };
     const res = await api.getTextContent(filePath);
@@ -49,9 +49,9 @@ async function readThroughWorkspace(api, filePath) {
     const res = await api.sourceReadFile(match.workspace.id, match.relPath);
     if (!res?.success) return { inWorkspace: true, result: { ok: false, error: res?.error || '读取文件失败' } };
     const file = res.data || {};
-    if (file.binary) return { inWorkspace: true, result: { ok: false, notice: '二进制文件，无法预览' } };
+    if (file.binary) return { inWorkspace: true, result: { ok: false, reason: 'binary', notice: '二进制文件，无法预览' } };
     if (file.tooLarge) {
-        return { inWorkspace: true, result: { ok: false, notice: `文件过大（${Math.round((file.size || 0) / 1024)} KB），无法预览，请在外部编辑器中打开` } };
+        return { inWorkspace: true, result: { ok: false, reason: 'too-large', notice: `文件过大（${Math.round((file.size || 0) / 1024)} KB），无法预览，请在外部编辑器中打开` } };
     }
     // 不是 UTF-8（比如 GBK）时交给附件读取，它会按 GB18030 解码
     if (file.encodingError) return { inWorkspace: true, result: null };
diff --git a/modules/ui-system/side-pane/code-viewer/picker.js b/modules/ui-system/side-pane/code-viewer/picker.js
index b7bf878b4..9dadf8003 100644
--- a/modules/ui-system/side-pane/code-viewer/picker.js
+++ b/modules/ui-system/side-pane/code-viewer/picker.js
@@ -132,6 +132,7 @@ export function createCodeViewerPicker({
                 titleLabel.textContent = name;
                 titleLabel.title = rel;
                 langTag.textContent = store.currentTag;
+                langTag.dataset.lang = store.currentLang;
                 store.currentCode = '';
                 if (file.binary) {
                     setBodyMessage('二进制文件，无法预览');
diff --git a/modules/ui-system/side-pane/codeViewerSideProvider.js b/modules/ui-system/side-pane/codeViewerSideProvider.js
index 9405b6976..6a7c3ddf5 100644
--- a/modules/ui-system/side-pane/codeViewerSideProvider.js
+++ b/modules/ui-system/side-pane/codeViewerSideProvider.js
@@ -106,6 +106,7 @@ export function createCodeViewerSideProvider({
             const langTag = doc.createElement('span');
             langTag.className = 'side-code-lang-tag';
             langTag.textContent = currentMode === 'diff' ? 'DIFF' : currentTag;
+            langTag.dataset.lang = currentMode === 'diff' ? 'diff' : currentLang;
 
             infoWrapper.append(fileIcon, titleLabel, langTag);
 
@@ -197,6 +198,7 @@ export function createCodeViewerSideProvider({
                 pickerToggleBtn.className = 'side-code-action-btn';
                 pickerToggleBtn.title = '选择文件';
                 pickerToggleBtn.setAttribute('aria-label', '选择文件');
+                pickerToggleBtn.setAttribute('data-action', 'toggle-picker');
                 pickerToggleBtn.innerHTML = '<span class="vcp-ui-icon" aria-hidden="true">folder_open</span>';
                 actionsWrapper.prepend(pickerToggleBtn);
                 container.append(toolbar, picker, body);
@@ -298,6 +300,7 @@ export function createCodeViewerSideProvider({
                     currentMode = currentMode === 'diff' ? 'view' : 'diff';
                     fileIcon.textContent = currentMode === 'diff' ? 'difference' : 'code';
                     langTag.textContent = currentMode === 'diff' ? 'DIFF' : currentTag;
+                    langTag.dataset.lang = currentMode === 'diff' ? 'diff' : currentLang;
                     modeToggleBtn.title = currentMode === 'diff' ? '切换为纯代码视图' : '切换为差异对比视图';
                     modeToggleBtn.innerHTML = currentMode === 'diff'
                         ? '<span class="vcp-ui-icon" aria-hidden="true">code</span>'
diff --git a/modules/ui-system/side-pane/git/context-menu.js b/modules/ui-system/side-pane/git/context-menu.js
index 5377aac89..d0779b2a3 100644
--- a/modules/ui-system/side-pane/git/context-menu.js
+++ b/modules/ui-system/side-pane/git/context-menu.js
@@ -100,15 +100,16 @@ export function createGitContextMenu({
         menu.className = 'side-git-context-menu vcp-ui-scope';
         menu.setAttribute('role', 'menu');
         const entries = [
-            { icon: 'folder_open', label: '在文件管理器中打开', disabled: typeof api?.gitRevealPath !== 'function' || item.status === 'D', run: () => revealInFileManager(item) },
-            { icon: 'content_copy', label: '复制绝对路径', run: () => copyText(absolutePathOf(item), '绝对路径') },
-            { icon: 'content_copy', label: '复制相对路径', run: () => copyText(item.path, '相对路径') }
+            { action: 'reveal', icon: 'folder_open', label: '在文件管理器中打开', disabled: typeof api?.gitRevealPath !== 'function' || item.status === 'D', run: () => revealInFileManager(item) },
+            { action: 'copy-abs', icon: 'content_copy', label: '复制绝对路径', run: () => copyText(absolutePathOf(item), '绝对路径') },
+            { action: 'copy-rel', icon: 'content_copy', label: '复制相对路径', run: () => copyText(item.path, '相对路径') }
         ];
         entries.forEach((entry) => {
             const btn = doc.createElement('button');
             btn.type = 'button';
             btn.className = 'side-git-context-item';
             btn.setAttribute('role', 'menuitem');
+            btn.dataset.action = entry.action;
             btn.disabled = Boolean(entry.disabled);
             btn.innerHTML = `<span class="vcp-ui-icon" aria-hidden="true">${entry.icon}</span><span class="side-git-context-label"></span>`;
             btn.lastElementChild.textContent = entry.label;
diff --git a/modules/ui-system/side-pane/git/git-view.js b/modules/ui-system/side-pane/git/git-view.js
index 0831860c3..7123a1bf9 100644
--- a/modules/ui-system/side-pane/git/git-view.js
+++ b/modules/ui-system/side-pane/git/git-view.js
@@ -236,11 +236,12 @@ export function mountGitView(host, {
         return unstaged;
     }
 
-    function showEmpty({ icon = 'description', title, description, action = null }) {
+    function showEmpty({ reason, icon = 'description', title, description, action = null }) {
         list.innerHTML = '';
         listItems = [];
         listMounted = 0;
         empty.hidden = false;
+        empty.dataset.emptyReason = reason;
         empty.innerHTML = '';
         const iconEl = doc.createElement('span');
         iconEl.className = 'vcp-ui-icon side-git-empty-icon';
@@ -267,10 +268,10 @@ export function mountGitView(host, {
     function emptyCopy() {
         if (currentSource === AI_SOURCE) {
             return aiBatch
-                ? { title: '上一轮的改动已经没有未提交内容', description: '这一批涉及的文件都已提交或还原。' }
-                : { title: '当前工作区还没有上一轮文件改动', description: '这个工作区没有 V工程 工程，或工程里还没有施工批次。' };
+                ? { reason: 'ai-committed', title: '上一轮的改动已经没有未提交内容', description: '这一批涉及的文件都已提交或还原。' }
+                : { reason: 'ai-none', title: '当前工作区还没有上一轮文件改动', description: '这个工作区没有 V工程 工程，或工程里还没有施工批次。' };
         }
-        return { title: '当前来源下没有可展示的改动', description: '可以切换其它来源，或等当前工作区产生新的 Git 改动后再查看。' };
+        return { reason: 'no-changes', title: '当前来源下没有可展示的改动', description: '可以切换其它来源，或等当前工作区产生新的 Git 改动后再查看。' };
     }
 
     // ── 复制 / 定位 ─────────────────────────────────────────
@@ -286,6 +287,7 @@ export function mountGitView(host, {
         refreshBtn.classList.toggle('spinning', loading);
         if (!workspaces.length) {
             showEmpty({
+                reason: 'no-workspace',
                 icon: 'folder_x',
                 title: '还没有工作区',
                 description: '添加一个 Git 项目目录后，就能在这里查看它的改动。',
@@ -294,15 +296,15 @@ export function mountGitView(host, {
             return;
         }
         if (loadError) {
-            showEmpty({ icon: 'error', title: '无法加载 Git 改动', description: `Git 返回错误：${loadError}` });
+            showEmpty({ reason: 'load-error', icon: 'error', title: '无法加载 Git 改动', description: `Git 返回错误：${loadError}` });
             return;
         }
         if (!currentStatus) {
-            showEmpty({ title: '加载中', description: '正在读取当前工作区的 Git 状态和文件改动。' });
+            showEmpty({ reason: 'loading', title: '加载中', description: '正在读取当前工作区的 Git 状态和文件改动。' });
             return;
         }
         if (currentStatus.isRepo === false) {
-            showEmpty({ icon: 'folder_x', title: '当前工作区不在 Git 仓库中', description: '请切换到包含 .git 的工作区目录，或先在该目录执行 git init。' });
+            showEmpty({ reason: 'not-repo', icon: 'folder_x', title: '当前工作区不在 Git 仓库中', description: '请切换到包含 .git 的工作区目录，或先在该目录执行 git init。' });
             return;
         }
         const items = visibleItems();
@@ -311,6 +313,7 @@ export function mountGitView(host, {
             return;
         }
         empty.hidden = true;
+        delete empty.dataset.emptyReason;
         // 推送触发的重绘会换掉整张列表：记下焦点所在的行，重建后还给同一个文件（React 按 key 复用节点时焦点本来就不丢，
         // ZCode/DSH 的列表都是这样）；那个文件没了就给同一位置的行
         const focusedCard = list.contains(doc.activeElement) ? doc.activeElement.closest('.side-git-card') : null;
diff --git a/modules/ui-system/side-pane/modelTrajectorySideProvider.js b/modules/ui-system/side-pane/modelTrajectorySideProvider.js
index 4cc1fae27..95a761c3e 100644
--- a/modules/ui-system/side-pane/modelTrajectorySideProvider.js
+++ b/modules/ui-system/side-pane/modelTrajectorySideProvider.js
@@ -133,6 +133,7 @@ export function createModelTrajectorySideProvider({
             let items = [];
             let loading = false;
             let loadError = '';
+            let loadErrorCode = '';
             let loadSeq = 0;
             let cancelReload = null;
             let cancelSearch = null;
@@ -184,6 +185,9 @@ export function createModelTrajectorySideProvider({
             const searchNext = iconButton('arrow_downward', '下一个匹配项', () => moveSearch(1));
             const searchClose = iconButton('close', '关闭搜索', () => closeSearch());
             searchBar.append(icon('search', 'side-traj-search-glyph'), searchInput, searchCount, searchPrev, searchNext, searchClose);
+            // data-action：与文案无关的稳定钩子
+            Object.entries({ search: searchBtn, 'expansion-menu': menuBtn, 'toggle-all': toggleAllBtn, 'open-directory': folderBtn, clear: clearBtn, refresh: refreshBtn, 'search-prev': searchPrev, 'search-next': searchNext, 'search-close': searchClose })
+                .forEach(([action, btn]) => { btn.dataset.action = action; });
             header.append(titleRow, summaryLine, searchBar);
 
             const menu = h('div', 'side-traj-menu');
@@ -520,6 +524,7 @@ export function createModelTrajectorySideProvider({
                 if (!has) { closeMenu(); closeSearch(); }
                 summaryLine.hidden = !has;
                 summaryLine.textContent = '';
+                summaryLine.dataset.callCount = String(records.length);
                 if (has) {
                     const summary = summarizeRecords(records);
                     summaryLine.appendChild(h('span', '', `${records.length} 次调用`));
@@ -542,21 +547,29 @@ export function createModelTrajectorySideProvider({
                 const records = data.records;
                 state.hidden = true;
                 state.className = 'side-traj-state';
+                // data-state：error / service-missing / no-conversation / loading / empty
+                let stateKey = '';
                 if (loadError) {
+                    stateKey = loadErrorCode || 'error';
                     state.hidden = false;
                     state.classList.add('error');
                     state.textContent = '';
                     state.append(h('p', '', '读取调用轨迹失败'), h('p', 'side-traj-state-detail', loadError));
                 } else if (!sessionKey) {
+                    stateKey = 'no-conversation';
                     state.hidden = false;
                     state.textContent = '请先在主聊天里选择一个智能体和话题。';
                 } else if (loading && records.length === 0) {
+                    stateKey = 'loading';
                     state.hidden = false;
                     state.textContent = '正在加载调用轨迹…';
                 } else if (records.length === 0) {
+                    stateKey = 'empty';
                     state.hidden = false;
                     state.textContent = '这个话题还没有模型调用记录。发一条消息后，每次发给模型的请求和它的回答都会记在这里。';
                 }
+                if (stateKey) state.dataset.state = stateKey;
+                else delete state.dataset.state;
                 truncatedNotice.hidden = !data.truncated;
             }
 
@@ -851,15 +864,17 @@ export function createModelTrajectorySideProvider({
                     // 主进程没有这组接口（只刷新了页面、主进程还是旧的）时 invoke 会直接抛错，
                     // 不能让它冒出 mountTab，否则整页被移除、只剩空白
                     const missing = /No handler registered/i.test(String(error?.message || error));
-                    res = { success: false, error: missing ? '调用轨迹服务未启动，请完全退出并重新打开 VCPChat' : (error?.message || '读取调用轨迹失败') };
+                    res = { success: false, error: missing ? '调用轨迹服务未启动，请完全退出并重新打开 VCPChat' : (error?.message || '读取调用轨迹失败'), code: missing ? 'service-missing' : '' };
                 }
                 if (disposed() || seq !== loadSeq) return;
                 loading = false;
                 if (res?.success) {
                     data = res.data;
                     loadError = '';
+                    loadErrorCode = '';
                 } else {
                     loadError = res?.error || '读取调用轨迹失败';
+                    loadErrorCode = res?.code || '';
                 }
                 items = buildTimeline(data.records);
                 renderAll();
diff --git a/modules/ui-system/side-pane/planDetailSideProvider.js b/modules/ui-system/side-pane/planDetailSideProvider.js
index 328e2bac0..b75127d64 100644
--- a/modules/ui-system/side-pane/planDetailSideProvider.js
+++ b/modules/ui-system/side-pane/planDetailSideProvider.js
@@ -34,8 +34,8 @@ const TAB_PREFIX = 'plan-detail:';
 const TOPIC_TAB = 'topic';
 const NO_PROJECT_TAB = 'none';
 const FOLLOW_SKIPPED = Symbol('follow-skipped');
-const REFRESH_DEBOUNCE_MS = 200;
-const FILTER_DEBOUNCE_MS = 300;
+export const REFRESH_DEBOUNCE_MS = 200;
+export const FILTER_DEBOUNCE_MS = 300;
 
 const STATUS_LABEL = Object.freeze({ completed: '已完成', inProgress: '进行中', pending: '待处理' });
 const STATUS_ICON = Object.freeze({ completed: 'check_circle', inProgress: 'arrow_forward', pending: 'radio_button_unchecked' });
@@ -388,7 +388,9 @@ export function createPlanDetailSideProvider({
                     head.appendChild(titleRow);
                     return head;
                 }
-                addCrumb(h('span', 'side-plan-crumb side-plan-context', activity ? '本话题' : '工程全览'));
+                const context = h('span', 'side-plan-crumb side-plan-context', activity ? '本话题' : '工程全览');
+                context.dataset.scope = activity ? 'topic' : 'project';
+                addCrumb(context);
                 if (project.workspace_alias) addCrumb(h('span', 'side-plan-crumb', project.workspace_alias));
                 addCrumb(h('span', 'side-plan-title', project.name || '未命名工程'));
                 crumbs.appendChild(icon('expand_more', 'side-plan-crumb-caret'));
@@ -399,7 +401,11 @@ export function createPlanDetailSideProvider({
                 const updated = when(project.updated_at);
                 if (statusText || updated) {
                     const statusPill = h('div', `side-plan-status status-${status || 'unknown'}`);
-                    if (statusText) statusPill.appendChild(h('span', `side-plan-chip status-${status || 'unknown'}`, statusText));
+                    if (statusText) {
+                        const chip = h('span', `side-plan-chip status-${status || 'unknown'}`, statusText);
+                        chip.dataset.status = status || 'unknown';
+                        statusPill.appendChild(chip);
+                    }
                     if (updated) {
                         statusPill.appendChild(h('span', 'side-plan-updated', updated));
                         // 窄侧栏里时间段会藏起来，悬停状态胶囊仍能看到
@@ -418,6 +424,7 @@ export function createPlanDetailSideProvider({
                     divider.setAttribute('aria-hidden', 'true');
                     actions.appendChild(divider);
                     const forgeBtn = button('side-plan-icon-btn side-plan-forge', null, '完整记录与回退（V工程 页）');
+                    forgeBtn.dataset.action = 'open-forge';
                     forgeBtn.appendChild(icon('open_in_new'));
                     forgeBtn.addEventListener('click', () => onOpenProjectForge(project.id));
                     actions.appendChild(forgeBtn);
@@ -476,6 +483,7 @@ export function createPlanDetailSideProvider({
                 };
                 if (activity) {
                     const s = activity.stats;
+                    Object.assign(stats.dataset, { batches: s.batchCount, nodes: s.nodeCount, files: s.fileCount });
                     stats.append(
                         h('span', '', `${s.batchCount} 批`),
                         h('span', '', `${s.nodeCount} 次改动`),
@@ -624,6 +632,7 @@ export function createPlanDetailSideProvider({
                     return box;
                 }
                 if (!filterRows) {
+                    box.setAttribute('aria-busy', 'true');
                     box.appendChild(h('div', 'side-plan-node-message', '正在筛选…'));
                     return box;
                 }
@@ -737,6 +746,7 @@ export function createPlanDetailSideProvider({
             function renderOtherHint() {
                 if (!activity || !other.count) return null;
                 const hint = h('div', 'side-plan-other-hint');
+                hint.dataset.count = String(other.count);
                 hint.appendChild(h('span', '', `这个工程还有 ${other.count}${other.more ? '+' : ''} 批来自其他话题的施工`));
                 if (onOpenProjectForge) {
                     const link = button('side-plan-link', '在 V工程 页查看');
diff --git a/modules/ui-system/side-pane/terminalSideProvider.js b/modules/ui-system/side-pane/terminalSideProvider.js
index ba6c56c7a..4df0dcfd3 100644
--- a/modules/ui-system/side-pane/terminalSideProvider.js
+++ b/modules/ui-system/side-pane/terminalSideProvider.js
@@ -344,6 +344,7 @@ export function createTerminalSideProvider({
             const restartBtn = doc.createElement('button');
             restartBtn.type = 'button';
             restartBtn.className = 'side-terminal-btn';
+            restartBtn.dataset.action = 'restart';
             restartBtn.title = '重新启动终端（终端窗口和 AI 共用同一个会话，会一并重置）';
             restartBtn.setAttribute('aria-label', '重新启动终端');
             restartBtn.innerHTML = '<span class="vcp-ui-icon" aria-hidden="true">refresh</span>';
@@ -351,6 +352,7 @@ export function createTerminalSideProvider({
             const clearBtn = doc.createElement('button');
             clearBtn.type = 'button';
             clearBtn.className = 'side-terminal-btn';
+            clearBtn.dataset.action = 'clear';
             clearBtn.title = '清屏';
             clearBtn.setAttribute('aria-label', '清屏');
             clearBtn.innerHTML = '<span class="vcp-ui-icon" aria-hidden="true">delete_sweep</span>';
diff --git a/modules/ui-system/side-pane/terminalTheme.js b/modules/ui-system/side-pane/terminalTheme.js
index 0de0295eb..1c2aa7025 100644
--- a/modules/ui-system/side-pane/terminalTheme.js
+++ b/modules/ui-system/side-pane/terminalTheme.js
@@ -48,6 +48,10 @@ export function normalizeCssColor(doc, raw, fallback) {
     }
 }
 
+// 外框没有底色时用的兜底色
+export const LIGHT_FALLBACK_BG = '#fafafa';
+export const DARK_FALLBACK_BG = '#14161a';
+
 const isTransparent = (value) => !value || value === 'transparent' || /^rgba\([^)]*,\s*0\)$/.test(value);
 
 export function buildTerminalTheme(doc, element) {
@@ -55,7 +59,7 @@ export function buildTerminalTheme(doc, element) {
     // 底色和前景由 CSS（.side-terminal-screen 的 background / color）决定，这里只读浏览器算好的结果，
     // 保证 xterm 画布和外框同色，主题切换时也跟着变。
     const computed = element ? doc.defaultView.getComputedStyle(element) : null;
-    const background = isTransparent(computed?.backgroundColor) ? (light ? '#fafafa' : '#14161a') : normalizeCssColor(doc, computed.backgroundColor, light ? '#fafafa' : '#14161a');
+    const background = isTransparent(computed?.backgroundColor) ? (light ? LIGHT_FALLBACK_BG : DARK_FALLBACK_BG) : normalizeCssColor(doc, computed.backgroundColor, light ? LIGHT_FALLBACK_BG : DARK_FALLBACK_BG);
     const foreground = computed?.color ? normalizeCssColor(doc, computed.color, light ? '#1f2937' : '#d4d4d8') : (light ? '#1f2937' : '#d4d4d8');
     return {
         ...(light ? LIGHT_PALETTE : DARK_PALETTE),
diff --git a/modules/ui-system/side-pane/toolOutputSideProvider.js b/modules/ui-system/side-pane/toolOutputSideProvider.js
index 97ffe0bc9..d4f54ff8d 100644
--- a/modules/ui-system/side-pane/toolOutputSideProvider.js
+++ b/modules/ui-system/side-pane/toolOutputSideProvider.js
@@ -122,6 +122,7 @@ export function createToolOutputSideProvider({
             const picker = h('select', 'side-tool-output-picker');
             picker.setAttribute('aria-label', '选择命令');
             const copyBtn = iconButton('content_copy', '复制输出', () => copyOutput());
+            copyBtn.dataset.action = 'copy';
             const refreshBtn = iconButton('refresh', '刷新', () => { void loadSelected(); });
             const actions = h('div', 'side-tool-output-actions');
             actions.append(copyBtn, refreshBtn);
@@ -221,6 +222,7 @@ export function createToolOutputSideProvider({
                 if (!summary) return;
                 const running = summary.status === 'running';
                 const chip = h('span', `side-tool-output-chip status-${summary.status}`);
+                chip.dataset.status = summary.status;
                 chip.append(icon(running ? 'progress_activity' : summary.status === 'completed' ? 'check_circle' : 'cancel', running ? 'spin' : ''), h('span', '', commandRunStatusLabel(summary.status)));
                 const meta = h('span', 'side-tool-output-meta', `${formatRunDuration(summary)} · ${formatRelativeTime(summary.startedAt)}`);
                 statusBar.append(chip, meta);
diff --git a/tests/helpers/side-chat-surface-fixture.mjs b/tests/helpers/side-chat-surface-fixture.mjs
index 37930b25f..188f8d46d 100644
--- a/tests/helpers/side-chat-surface-fixture.mjs
+++ b/tests/helpers/side-chat-surface-fixture.mjs
@@ -89,11 +89,10 @@ export async function fixture(t, { stream = false, seed = [], onSave = null, onS
     for (let i = 0; i < 5; i++) await tick();
     const textarea = doc.querySelector('.side-chat-textarea'), form = doc.querySelector('form');
     const untilIdle = async () => { for (let n = 0; n < 200; n++) { await tick(); if (!form.hasAttribute('aria-busy')) return; } throw new Error('Side composer did not settle'); };
-    return { dom, doc, handle, requests, statuses, saves, toasts, textarea, form, untilIdle, bridge,
+    return { dom, doc, handle, requests, statuses, saves, toasts, textarea, form, untilIdle, bridge, streamRoutes: routes,
         getHistory: () => history, getConversation: () => conversation,
         submit(text) { textarea.value = text; form.requestSubmit(); },
         stop() { doc.querySelector('.side-chat-stop-btn').click(); },
-        statusText: () => doc.querySelector('.side-chat-status-text').textContent,
         badgeHidden: () => doc.querySelector('.side-chat-persistence-badge')?.hidden,
     };
 }
diff --git a/tests/helpers/wait-for.mjs b/tests/helpers/wait-for.mjs
new file mode 100644
index 000000000..11815f66e
--- /dev/null
+++ b/tests/helpers/wait-for.mjs
@@ -0,0 +1,11 @@
+// Await an observable condition instead of sleeping a fixed duration. A fixed
+// sleep either races the timer it waits on or wastes time on a fast runner.
+export async function waitFor(predicate, { timeout = 2000, interval = 5, message = 'condition did not settle' } = {}) {
+    const deadline = Date.now() + timeout;
+    for (;;) {
+        const value = await predicate();
+        if (value) return value;
+        if (Date.now() > deadline) throw new Error(message);
+        await new Promise(resolve => setTimeout(resolve, interval));
+    }
+}
diff --git a/tests/side-chat-audit-probes.test.mjs b/tests/side-chat-audit-probes.test.mjs
index 88a26978f..94c822667 100644
--- a/tests/side-chat-audit-probes.test.mjs
+++ b/tests/side-chat-audit-probes.test.mjs
@@ -1,18 +1,12 @@
-import trustedSenderFixture from './helpers/trusted-main-sender.cjs';
-const trusted = trustedSenderFixture.createTrustedMainSender();
 import test from 'node:test';
 import assert from 'node:assert/strict';
-import fs from 'node:fs/promises';
-import path from 'node:path';
 import { JSDOM } from 'jsdom';
 
 import { createSidePaneController } from '../modules/ui-system/side-pane/side-pane-controller.js';
 import { defineChatTabType } from '../modules/ui-system/side-pane/tab-types/chat.js';
 import { mountSideChatSurface, createSideChatSurfaceOwner } from '../modules/renderer/sideChatSurfaceOwner.js';
 import { buildModelConfig } from '../modules/chat/singleChatRequestOrchestrator.js';
-import * as service from '../modules/chat/sideChatSessionService.js';
 import { captureSelectionReference } from '../modules/ui-system/side-pane/selection-reference.js';
-import * as ipcModule from '../modules/ipc/sideChatHandlers.js';
 import { installMainComposer } from './helpers/main-composer.mjs';
 
 const tick = () => new Promise(resolve => setImmediate(resolve));
@@ -72,7 +66,7 @@ test('R01: Parent change deactivates old tab panel and hides non-visible tabs',
     const visibleTabs = doc.querySelectorAll('[role="tab"][data-tab-id="s1"]');
     const panel = doc.querySelector('[role="tabpanel"][data-tab-id="s1"]');
     assert.equal(visibleTabs.length, 0, 'Tab s1 should not be visible under other-parent');
-    assert.equal(panel.classList.contains('active'), false, 'Old chat panel should be deactivated');
+    assert.equal(panel.hidden, true, 'Old chat panel should be deactivated');
 
     await ctrl.dispose();
     dom.window.close();
@@ -125,7 +119,7 @@ test('R03: Tab close during async mount disposes handle and removes panel withou
     dom.window.close();
 });
 
-test('R04: Agent configuration is resolved and reference length/count quota is enforced', async () => {
+test('R04: Agent configuration reaches the conversation as an effective streaming model config', async () => {
     const dom = new JSDOM('<div id="mount"></div>');
     const caps = createMockCapabilities();
     const handle = await mountSideChatSurface(dom.window.document.getElementById('mount'), {
@@ -134,6 +128,22 @@ test('R04: Agent configuration is resolved and reference length/count quota is e
     });
     await tick();
 
+    const effectiveConfig = buildModelConfig(caps.getSelected());
+    assert.equal(effectiveConfig.model, 'test-model');
+    assert.equal(effectiveConfig.stream, true);
+
+    await handle.dispose();
+    dom.window.close();
+});
+
+test('R04b: Reference length and total quota are enforced', async () => {
+    const dom = new JSDOM('<div id="mount"></div>');
+    const handle = await mountSideChatSurface(dom.window.document.getElementById('mount'), {
+        descriptor: createDescriptor(),
+        chatCapabilities: createMockCapabilities()
+    });
+    await tick();
+
     // Single item exceeding 8000 limit must be rejected
     handle.addReference({ id: 'too-long', text: 'x'.repeat(8001) });
     assert.equal(handle.getReferences().length, 0, 'Single reference exceeding 8000 must be rejected');
@@ -143,16 +153,6 @@ test('R04: Agent configuration is resolved and reference length/count quota is e
         handle.addReference({ id: 'r' + i, text: 'x'.repeat(7999) + i });
     }
 
-    const selectedKeys = Object.keys(caps.getSelected());
-    assert.ok(selectedKeys.includes('config'), 'selectedItem should include config');
-    assert.ok(selectedKeys.includes('model'), 'selectedItem should include model');
-    assert.ok(selectedKeys.includes('systemPrompt'), 'selectedItem should include systemPrompt');
-    assert.ok(selectedKeys.includes('streamOutput'), 'selectedItem should include streamOutput');
-
-    const effectiveConfig = buildModelConfig(caps.getSelected());
-    assert.equal(effectiveConfig.model, 'test-model');
-    assert.equal(effectiveConfig.stream, true);
-
     const refs = handle.getReferences();
     assert.equal(refs.length, 2, 'Should accept only references within total 16000 quota');
     assert.equal(refs.reduce((sum, r) => sum + r.text.length, 0), 16000, 'Quota limit enforces character max (2 * 8000)');
@@ -161,65 +161,6 @@ test('R04: Agent configuration is resolved and reference length/count quota is e
     dom.window.close();
 });
 
-test('R05: Transport failure restores draft & refs; persistence failure blocks close with unsaved state', async () => {
-    // 1. Transport failure
-    {
-        const dom = new JSDOM('<div id="mount"></div>');
-        const doc = dom.window.document;
-        const caps = createMockCapabilities(async () => ({
-            terminal: { event: { type: 'failed', outcome: { transport: { error: 'fixture-failure' } } } }
-        }));
-        const handle = await mountSideChatSurface(doc.getElementById('mount'), {
-            descriptor: createDescriptor(),
-            chatCapabilities: caps
-        });
-        await tick();
-
-        handle.addReference({ id: 'ref', text: 'essential quoted context' });
-        doc.querySelector('textarea').value = 'question';
-        doc.querySelector('form').requestSubmit();
-        await tick();
-        await tick();
-
-        assert.equal(handle.getReferences().length, 1, 'References should be restored on transport failure');
-        assert.equal(doc.querySelector('textarea').value, 'question', 'Draft should be restored on transport failure');
-        assert.ok(doc.querySelector('.side-chat-status-text').textContent.includes('发送失败'), 'Status should show failure');
-        const closeResult = await handle.requestClose();
-        assert.equal(closeResult.closed, true, 'Close permitted after transport failure when restored');
-
-        await handle.dispose();
-        dom.window.close();
-    }
-
-    // 2. Persistence failure
-    {
-        const dom = new JSDOM('<div id="mount"></div>');
-        const doc = dom.window.document;
-        const caps = createMockCapabilities(async () => ({
-            terminal: { event: { type: 'failed', outcome: { persistence: { error: 'fixture-failure' } } } }
-        }));
-        const handle = await mountSideChatSurface(doc.getElementById('mount'), {
-            descriptor: createDescriptor(),
-            chatCapabilities: caps
-        });
-        await tick();
-
-        handle.addReference({ id: 'ref', text: 'essential quoted context' });
-        doc.querySelector('textarea').value = 'question';
-        doc.querySelector('form').requestSubmit();
-        await tick();
-        await tick();
-
-        assert.equal(doc.querySelector('.side-chat-status-text').textContent, '已生成但保存失败');
-        const closeResult = await handle.requestClose();
-        assert.equal(closeResult.closed, false, 'Close should be blocked on unsaved changes');
-        assert.equal(closeResult.reason, 'UNSAVED_CHANGES');
-
-        await handle.dispose();
-        dom.window.close();
-    }
-});
-
 test('R06: Reference added during active send is preserved across completion', async () => {
     let done;
     const dom = new JSDOM('<div id="mount"></div>');
@@ -251,47 +192,6 @@ test('R06: Reference added during active send is preserved across completion', a
     dom.window.close();
 });
 
-test('R07: Stable history filtering excludes isPendingStream, preserves tool_calls & attachments', async () => {
-    const content = [{ type: 'text', text: 'initial' }];
-    const raw = [
-        { id: 'pending', role: 'assistant', content: 'partial', isPendingStream: true },
-        { id: 'a', role: 'assistant', content: 'tool call', tool_calls: [{ id: 't' }] },
-        { id: 't', role: 'tool', content: 'result', tool_call_id: 't' },
-        { id: 'orphan_tool', role: 'tool', content: 'orphan without id' },
-        { id: 'multi', role: 'user', content, attachments: [{ name: 'test.png' }] }
-    ];
-
-    const frozen = ipcModule.filterStableHistory(raw);
-    content[0].text = 'mutated';
-
-    const ids = frozen.map(m => m.id);
-    assert.deepEqual(ids, ['a', 't', 'multi'], 'Pending streams and orphan tools should be excluded');
-    assert.equal(Boolean(frozen.find(m => m.id === 'a').tool_calls), true, 'tool_calls should be retained');
-    assert.equal(frozen.find(m => m.id === 'multi').content[0].text, 'initial', 'multimodal content should be deep-cloned');
-    assert.equal(Boolean(frozen.find(m => m.id === 'multi').attachments), true, 'attachments should be retained');
-});
-
-test('R08: Service reports snapshot and IPC errors as ok:false', async () => {
-    const res = await service.createParentSnapshot({
-        electronAPI: {
-            createSideChatSnapshot: async () => ({ success: false, error: 'disk failure' })
-        },
-        agentId: 'a',
-        parentTopicId: 'p',
-        fallbackHistory: []
-    });
-    assert.equal(res.ok, false);
-    assert.equal(res.code, 'SNAPSHOT_FAILED');
-    assert.equal(res.error, 'disk failure');
-
-    const missingIpc = await service.saveSideChatMetadata({
-        electronAPI: {},
-        metadata: createDescriptor()
-    });
-    assert.equal(missingIpc.ok, false);
-    assert.equal(missingIpc.code, 'UNSUPPORTED');
-});
-
 test('R09: Text selection outside authorized message is rejected', async () => {
     const dom = new JSDOM('<p id="outside">unrelated text</p>');
     const doc = dom.window.document;
@@ -306,41 +206,6 @@ test('R09: Text selection outside authorized message is rejected', async () => {
     dom.window.close();
 });
 
-import os from 'node:os';
-
-test('R10: Metadata includes snapshot & boundary; tab close does not delete snapshot file', async () => {
-    const base = await fs.mkdtemp(path.join(os.tmpdir(), 'vcp-side-chat-ipc-test-'));
-    const handlers = new Map();
-    ipcModule.initialize({
-        USER_DATA_DIR: base, mainWindow: trusted.mainWindow,
-        ipcMain: { handle: (name, fn) => handlers.set(name, fn) },
-        historyMutationQueue: { read: async () => [{ id: 'p1', role: 'user', content: 'parent fact' }] }
-    });
-
-    const call = (name, ...args) => handlers.get(name)(trusted.event, ...args);
-    await fs.mkdir(path.join(base, 'agent/topics/child'), { recursive:true });
-    await fs.writeFile(path.join(base, 'agent/topics/child/sidechat-child.json'), JSON.stringify({schemaVersion:1,ephemeral:true}));
-    const snap = await call('side-chat:create-snapshot', 'agent', 'parent', 'child');
-    const desc = {
-        ...createDescriptor(),
-        contextMode: 'parent-snapshot',
-        snapshotId: snap.snapshotId,
-        parentSnapshot: snap.messages
-    };
-
-    await call('side-chat:save-metadata', desc);
-    const list = await call('side-chat:list-metadata', 'agent', 'parent');
-
-    const snapshotPath = path.join(base, 'agent/topics/child/parent-snapshot.json');
-    const existsBefore = Boolean(await fs.stat(snapshotPath).catch(() => null));
-    assert.equal(existsBefore, true, 'Snapshot file should exist before deletion');
-
-    assert.equal('parentSnapshot' in list.items[0], true, 'Listing should include parentSnapshot');
-    assert.equal(Boolean(list.items[0].snapshotBoundary), true, 'Listing should include snapshotBoundary');
-
-    await fs.rm(base, { recursive: true, force: true });
-});
-
 test('R11: Transport completion does not leave cancelled status', async () => {
     let done;
     const dom = new JSDOM('<div id="mount"></div>');
@@ -360,8 +225,9 @@ test('R11: Transport completion does not leave cancelled status', async () => {
     await tick();
     await tick();
 
-    const statusText = doc.querySelector('.side-chat-status-text').textContent;
-    assert.equal(statusText, '', 'Normal completion leaves no status text, like the main composer');
+    const status = doc.querySelector('.side-chat-status-text');
+    assert.notEqual(status.dataset.statusCode, 'cancelled', 'Normal completion is not reported as cancelled');
+    assert.notEqual(status.dataset.statusType, 'error');
     assert.equal(doc.querySelector('.side-chat-stop-btn').hidden, true);
     assert.equal(doc.querySelector('.side-chat-send-btn').hidden, false);
 
@@ -369,7 +235,7 @@ test('R11: Transport completion does not leave cancelled status', async () => {
     dom.window.close();
 });
 
-test('R12: Send-to-main blocks cross-topic contamination', async () => {
+test('R12: Send-to-main without a main composer leaves the main draft untouched', async () => {
     const dom = new JSDOM('<textarea id="messageInput" data-current-topic="unrelated-topic"></textarea><div id="mount"></div>');
     const doc = dom.window.document;
     doc.getElementById('messageInput').value = 'unrelated draft';
@@ -400,43 +266,6 @@ function sendToMainFromMenu(doc) {
     doc.querySelector('#chatContextMenu [data-side-chat-action="send-to-main"]').click();
 }
 
-test('R13: Persistence retry and explicit discard restore ready state', async () => {
-    const dom = new JSDOM('<div id="mount"></div>');
-    const doc = dom.window.document;
-    let saveCount = 0;
-    const caps = createMockCapabilities(async () => ({
-        terminal: { event: { type: 'failed', outcome: { persistence: { error: 'write-failure' } } } }
-    }));
-    caps.repository.saveHistory = async () => {
-        saveCount++;
-        return { success: true };
-    };
-
-    const handle = await mountSideChatSurface(doc.getElementById('mount'), {
-        descriptor: createDescriptor(),
-        chatCapabilities: caps
-    });
-    await tick();
-
-    doc.querySelector('textarea').value = 'save-me';
-    doc.querySelector('form').requestSubmit();
-    await tick();
-    await tick();
-
-    assert.equal(handle.getUnsavedStatus().hasUnsavedChanges, true);
-    assert.equal(doc.querySelector('.side-chat-persistence-badge').hidden, false);
-
-    // Retry persistence
-    const retryRes = await handle.retryPersistence();
-    assert.equal(retryRes.ok, true);
-    assert.equal(handle.getUnsavedStatus().hasUnsavedChanges, false);
-    assert.equal(doc.querySelector('.side-chat-persistence-badge').hidden, true);
-    assert.equal(saveCount, 1);
-
-    await handle.dispose();
-    dom.window.close();
-});
-
 test('R14: Draft and uncommitted references preserved across tab close and reopen', async () => {
     const provider = createSideChatSurfaceOwner({
         chatCapabilities: {},
@@ -510,7 +339,8 @@ test('R15: Send-to-main validates both item ID and topic ID provenance', async (
     // 3. Correct agent and correct topic -> allowed
     currentTopicMock = 'parent';
     sendToMainFromMenu(doc);
-    assert.equal(doc.getElementById('messageInput').value, 'existing main draft\n\nside answer');
+    const filled = doc.getElementById('messageInput').value;
+    assert.ok(filled.startsWith('existing main draft') && filled.includes('side answer'), filled);
 
     await handle.dispose();
     dom.window.close();
diff --git a/tests/side-chat-draft-restore.test.mjs b/tests/side-chat-draft-restore.test.mjs
index 32927c7b7..cbdf55e5b 100644
--- a/tests/side-chat-draft-restore.test.mjs
+++ b/tests/side-chat-draft-restore.test.mjs
@@ -1,4 +1,4 @@
-import test from 'node:test';
+import test, { mock } from 'node:test';
 import assert from 'node:assert/strict';
 import fs from 'node:fs/promises';
 import os from 'node:os';
@@ -11,6 +11,7 @@ import { createSidePaneController } from '../modules/ui-system/side-pane/side-pa
 import { defineChatTabType } from '../modules/ui-system/side-pane/tab-types/chat.js';
 import { createSideChatDescriptor } from '../modules/chat/sideChatSessionService.js';
 import { createSideChatDraftStore, sideChatDraftKey } from '../modules/renderer/side-chat/draft-store.js';
+import { waitFor } from './helpers/wait-for.mjs';
 
 async function fixture(t, legacyInput = {}) {
     const directory = await fs.mkdtemp(path.join(os.tmpdir(), 'vcp-side-draft-restore-'));
@@ -153,11 +154,10 @@ test('a side chat put to sleep behind another tab keeps its draft, and a referen
     const tab = controller.getSnapshot().tabs.find(item => item.kind === 'chat');
     controller.activateTab(tab.id);
     controller.setVisible(true);
-    await new Promise(r => setTimeout(r, 20));
+    await waitFor(() => controller.getTabHandle(tab.id));
     controller.getTabHandle(tab.id).setDraft('half typed, then more');
     await controller.openTab({ id: 'note:1', kind: 'note', title: 'Note', closable: true, scopeMode: 'global' });
-    await new Promise(r => setTimeout(r, 120));
-    assert.equal(controller.getTabHandle(tab.id), null, 'the hidden side chat view went to sleep');
+    await waitFor(() => controller.getTabHandle(tab.id) === null, { message: 'the hidden side chat view went to sleep' });
     assert.deepEqual(controller.getViewResidency().dormant.map(entry => entry.tabId), [tab.id]);
 
     // 切回去的同一刻点「在侧栏提问」：视图还在重挂，引用要落进这个侧聊，不能另开一个
@@ -170,7 +170,6 @@ test('a side chat put to sleep behind another tab keeps its draft, and a referen
 });
 
 // 休眠场景：休眠/唤醒、切话题、退出都不能丢草稿、引用和模型
-const sleep = ms => new Promise(r => setTimeout(r, ms));
 async function sleepableSideChat(t, opts = {}) {
     const f = await fixture(t, { composerStorage: 'local' });
     f.drafts.save(f.descriptor, { draft: 'start', references: [{ id: 'ref-1', text: 'first selection' }], model: 'm0' });
@@ -179,10 +178,11 @@ async function sleepableSideChat(t, opts = {}) {
     await s.wiring.restoreSessions('agent', 'parent');
     const tab = s.controller.getSnapshot().tabs.find(item => item.kind === 'chat');
     s.controller.activateTab(tab.id); s.controller.setVisible(true);
-    await sleep(20);
-    const hide = async () => { await s.controller.openTab({ id: 'note:' + Math.random(), kind: 'note', title: 'Note', closable: true, scopeMode: 'global' }); await sleep(120); };
-    const wake = async () => { s.controller.activateTab(tab.id); for (let i = 0; i < 50 && !s.controller.getTabHandle(tab.id); i++) await sleep(5); await sleep(20); return s.controller.getTabHandle(tab.id); };
-    return { f, s, tab, hide, wake, handle: () => s.controller.getTabHandle(tab.id) };
+    await waitFor(() => s.controller.getTabHandle(tab.id));
+    const coverWithNote = () => s.controller.openTab({ id: 'note:' + Math.random(), kind: 'note', title: 'Note', closable: true, scopeMode: 'global' });
+    const hide = async () => { await coverWithNote(); await waitFor(() => s.controller.getTabHandle(tab.id) === null, { message: 'side chat did not sleep' }); };
+    const wake = async () => { s.controller.activateTab(tab.id); return waitFor(() => s.controller.getTabHandle(tab.id), { message: 'side chat did not wake' }); };
+    return { f, s, tab, hide, wake, coverWithNote, handle: () => s.controller.getTabHandle(tab.id) };
 }
 
 test('a model picked in a side chat survives sleep', async t => {
@@ -197,10 +197,19 @@ test('a model picked in a side chat survives sleep', async t => {
 test('a draft typed inside the save debounce survives sleep and reaches storage', async t => {
     const p = await sleepableSideChat(t);
     const ta = p.f.doc.querySelector('.side-chat-textarea');
-    ta.value = 'typed fast'; ta.dispatchEvent(new p.f.dom.window.Event('input', { bubbles: true }));
-    await p.hide();
-    assert.equal(p.handle(), null);
-    assert.equal(p.f.drafts.read(p.f.descriptor).input.draft, 'typed fast');
+    // 接管计时器：400ms 的输入防抖确定还没到，只推进 30ms 的休眠
+    mock.timers.enable({ apis: ['setTimeout', 'Date'], now: Date.now() });
+    try {
+        ta.value = 'typed fast'; ta.dispatchEvent(new p.f.dom.window.Event('input', { bubbles: true }));
+        await p.coverWithNote();
+        assert.notEqual(p.handle(), null);
+        mock.timers.tick(30);
+        const stored = () => p.f.drafts.read(p.f.descriptor).input.draft;
+        // 视图释放是异步的：只冲刷 promise，不推进计时器
+        for (let i = 0; i < 50 && (p.handle() || stored() !== 'typed fast'); i++) await new Promise(resolve => setImmediate(resolve));
+        assert.equal(p.handle(), null);
+        assert.equal(stored(), 'typed fast');
+    } finally { mock.timers.reset(); }
     const h = await p.wake();
     assert.equal(h.getDraft(), 'typed fast');
 });
@@ -236,10 +245,8 @@ test('a side chat that sleeps after a topic switch keeps its draft when the topi
     const p = await sleepableSideChat(t, { dormancy: { otherTopicMs: 30 } });
     p.handle().setDraft('topic draft');
     p.s.controller.setParent({ ...p.f.descriptor.parent, topicId: 'other' });
-    await sleep(150);
-    assert.equal(p.handle(), null, 'slept after leaving the topic');
+    await waitFor(() => p.handle() === null, { message: 'slept after leaving the topic' });
     p.s.controller.setParent(p.f.descriptor.parent);
-    for (let i = 0; i < 50 && !p.handle(); i++) await sleep(5);
-    await sleep(20);
-    assert.equal(p.handle()?.getDraft(), 'topic draft');
+    const h = await waitFor(() => p.handle(), { message: 'side chat did not wake' });
+    assert.equal(h.getDraft(), 'topic draft');
 });
diff --git a/tests/side-chat-draft-save.test.mjs b/tests/side-chat-draft-save.test.mjs
index 667bb9c55..95ca35a94 100644
--- a/tests/side-chat-draft-save.test.mjs
+++ b/tests/side-chat-draft-save.test.mjs
@@ -10,13 +10,10 @@ import { saveSideChatMetadata } from '../modules/chat/sideChatSessionService.js'
 import { createSideChatPersistence } from '../modules/renderer/side-chat/persistence.js';
 import { createSideChatDraftStore } from '../modules/renderer/side-chat/draft-store.js';
 
-async function waitFor(predicate) {
-    const deadline = Date.now() + 2000;
-    while (!await predicate()) {
-        if (Date.now() > deadline) throw new Error('Draft save did not settle');
-        await new Promise(resolve => setTimeout(resolve, 5));
-    }
-}
+import { waitFor } from './helpers/wait-for.mjs';
+
+// 失败时状态栏变成可点击重试的按钮
+const offersRetry = status => status.getAttribute('role') === 'button' && status.tabIndex === 0;
 
 async function fixture(t) {
     const directory = await fs.mkdtemp(path.join(os.tmpdir(), 'vcp-side-draft-'));
@@ -39,13 +36,13 @@ async function fixture(t) {
     const doc = dom.window.document, textarea = doc.querySelector('textarea'), status = doc.getElementById('status');
     textarea.value = descriptor.draft;
     const store = { currentDescriptor: descriptor, currentModel: 'model', references: [], isHistoryLoaded: true, isDisposed: false };
-    const toasts = [];
+    const toasts = [], statuses = [];
     let saveOverride, settled = 0;
     const owner = createSideChatPersistence({ store, descriptor, doc, textarea, statusText: status,
         persistenceBadge: doc.getElementById('badge'), repository: {}, getConversation: () => null,
         getSurface: () => { throw new Error('Metadata retry must not reload history'); },
         saveDraft: (metadata, input) => drafts.save(metadata, input),
-        updateStatus(text, type) { status.textContent = type === 'error' ? text : ''; },
+        updateStatus(text, type) { statuses.push({ text, type }); status.textContent = type === 'error' ? text : ''; },
         updateComposerState() {}, updateEmptyState() {},
         chatCapabilities: {
             uiHelper: { showToastNotification: (message, type) => toasts.push({ message, type }) },
@@ -68,7 +65,7 @@ async function fixture(t) {
         assert.ok(directory.startsWith(os.tmpdir() + path.sep));
         await fs.rm(directory, { recursive: true, force: true });
     });
-    return { owner, store, status, textarea, toasts, dom, repair, drafts, descriptor,
+    return { owner, store, status, statuses, textarea, toasts, dom, repair, drafts, descriptor,
         get settled() { return settled; },
         read: async () => JSON.parse(await fs.readFile(metadataPath, 'utf8')),
         setSave(fn) { saveOverride = fn; },
@@ -82,9 +79,8 @@ test('a real side metadata write failure is visible and retry saves the current
     await f.block(); const before = f.settled;
     f.type('my unsent work'); await f.owner.flushInputSave();
     await waitFor(() => f.settled > before);
-    assert.match(f.status.textContent, /未保存.*重试/);
-    assert.equal(f.status.getAttribute('role'), 'button');
-    assert.equal(f.status.tabIndex, 0);
+    assert.ok(offersRetry(f.status));
+    assert.equal(f.statuses.at(-1).type, 'error');
     assert.equal(f.textarea.value, 'my unsent work');
     assert.equal(f.toasts.length, 1);
     assert.equal(f.toasts[0].type, 'error');
@@ -94,7 +90,8 @@ test('a real side metadata write failure is visible and retry saves the current
     f.store.references = [{ id: 'ref', text: 'keep this selection', sourceMessageId: 'saved' }];
     f.store.currentModel = 'new-model';
     f.status.dispatchEvent(new f.dom.window.KeyboardEvent('keydown', { key: 'Enter', bubbles: true, cancelable: true }));
-    await waitFor(() => f.status.textContent === '' && f.settled >= 2);
+    await waitFor(() => f.status.getAttribute('role') === null && f.settled >= 2);
+    assert.notEqual(f.statuses.at(-1).type, 'error', 'a successful retry clears the failure');
     const persisted = await f.read();
     assert.equal(persisted.composerStorage, 'local');
     assert.equal(persisted.draft, undefined);
@@ -113,11 +110,12 @@ test('metadata failure results and thrown errors stay retryable without clearing
     f.setSave(() => { throw new Error('connection lost'); });
     await assert.rejects(f.owner.persistMetadata(), /connection lost/);
     assert.equal(f.toasts.length, 1, 'Repeated failed autosaves must not flood notifications');
-    assert.match(f.status.textContent, /重试/);
-    f.status.textContent = '发送失败：服务端拒绝';
+    assert.ok(offersRetry(f.status));
+    // 状态栏此时显示的是另一条与草稿无关的错误
+    f.status.textContent = 'independent error';
     f.setSave(() => ({ success: true }));
     await f.owner.persistMetadata();
-    assert.equal(f.status.textContent, '发送失败：服务端拒绝');
+    assert.equal(f.status.textContent, 'independent error');
     assert.equal(f.textarea.value, 'old draft');
 });
 
@@ -130,7 +128,7 @@ test('pagehide flush saves an intentionally empty side draft and removes old ref
     f.dom.window.dispatchEvent(new f.dom.window.Event('pagehide'));
     assert.equal(f.drafts.read(f.descriptor).input.draft, '');
     assert.deepEqual(f.drafts.read(f.descriptor).input.references, []);
-    assert.equal(f.status.textContent, '');
+    assert.equal(f.status.getAttribute('role'), null);
     assert.equal(f.toasts.length, 0);
 });
 
@@ -138,12 +136,12 @@ test('browser quota failure retains input and the old file draft; retry saves cu
     const f = await fixture(t);
     f.type('x'.repeat(4096)); await f.owner.flushInputSave();
     assert.equal(f.textarea.value.length, 4096);
-    assert.match(f.status.textContent, /未保存.*重试/);
+    assert.ok(offersRetry(f.status));
     assert.equal(f.toasts.length, 1);
     assert.equal(f.settled, 0, 'Do not clear the legacy file when browser storage failed');
     assert.equal((await f.read()).draft, 'old draft');
     f.type('new input that fits');
-    f.status.click(); await waitFor(() => f.status.textContent === '' && f.settled > 0);
+    f.status.click(); await waitFor(() => f.status.getAttribute('role') === null && f.settled > 0);
     assert.equal(f.drafts.read(f.descriptor).input.draft, 'new input that fits');
     const migrationCalls = f.settled;
     f.type('another edit'); await f.owner.flushInputSave();
@@ -177,6 +175,7 @@ test('a model switch or snapshot refresh still saves session info when browser s
     assert.equal(persisted.model, 'switched-model');
     assert.equal(persisted.draft.length, 4096, 'The file keeps the only copy of the input');
     assert.equal(persisted.composerStorage, undefined);
-    assert.match(f.status.textContent, /草稿未保存.*重试/, 'The draft failure stays visible after the session info saved');
+    assert.ok(offersRetry(f.status), 'The draft failure stays visible after the session info saved');
+    assert.equal(f.statuses.at(-1).type, 'error');
     assert.equal(f.drafts.read(f.descriptor).input, null);
 });
diff --git a/tests/side-chat-entry-points.test.mjs b/tests/side-chat-entry-points.test.mjs
index 399083a1f..65a8f9419 100644
--- a/tests/side-chat-entry-points.test.mjs
+++ b/tests/side-chat-entry-points.test.mjs
@@ -11,13 +11,8 @@ test('the selection "ask in side pane" button survives message-list re-renders',
     assert.ok(button, 'button exists in main.html');
     // #chatMessages 会被整体清空重绘，按钮放在里面会跟着消失
     assert.equal(button.closest('#chatMessages'), null);
-    // lucide 适配器只替换 .vcp-ui-scope 里的图标
-    assert.ok(button.classList.contains('vcp-ui-scope') || button.closest('.vcp-ui-scope'));
+    assert.ok(button.getAttribute('aria-label'), 'the button has an accessible name');
 
     // 初始隐藏，选中消息文字后才出现；点它打开侧聊的行为见 side-chat-model-and-context.test.mjs
     assert.equal(button.hidden, true);
-
-    const list = document.getElementById('chatMessages');
-    list.innerHTML = '';
-    assert.ok(document.getElementById('floatingSelectionSideChatBtn'));
 });
diff --git a/tests/side-chat-ephemeral-parity.test.mjs b/tests/side-chat-ephemeral-parity.test.mjs
index 9179e2046..ccb1cbbbe 100644
--- a/tests/side-chat-ephemeral-parity.test.mjs
+++ b/tests/side-chat-ephemeral-parity.test.mjs
@@ -2,13 +2,10 @@ import test from 'node:test';
 import assert from 'node:assert/strict';
 import { JSDOM } from 'jsdom';
 
-import * as SidePaneState from '../modules/ui-system/side-pane/side-pane-state.js';
 import { createSidePaneController } from '../modules/ui-system/side-pane/side-pane-controller.js';
 import { defineChatTabType } from '../modules/ui-system/side-pane/tab-types/chat.js';
 import { createSideChatDescriptor } from '../modules/chat/sideChatSessionService.js';
 
-const tick = () => new Promise(resolve => setImmediate(resolve));
-
 function createTestDOM() {
     return new JSDOM(`
         <div class="main-content"></div>
@@ -33,18 +30,6 @@ function createTestDOM() {
     `);
 }
 
-test('Parity: createSideChatDescriptor defines ephemeral: true and type: selection-side-chat', () => {
-    const desc = createSideChatDescriptor({
-        parent: { itemId: 'agent-alpha', topicId: 'main-topic' },
-        childTopicId: 'child-topic-1',
-        title: '短暂型选区侧聊'
-    });
-
-    assert.equal(desc.type, 'selection-side-chat');
-    assert.equal(desc.ephemeral, true);
-    assert.equal(desc.child.topicId, 'child-topic-1');
-});
-
 test('Parity: Closing selection-side-chat destroys runtime and is explicitly excluded from recentlyClosedTabs', async () => {
     const dom = createTestDOM();
     const doc = dom.window.document;
@@ -102,13 +87,11 @@ test('Parity: Closing selection-side-chat destroys runtime and is explicitly exc
     assert.equal(closedDescriptors.length, 1);
     assert.equal(closedDescriptors[0].id, desc.id);
 
-    // 4. Tab must NOT appear in Tab Overview as a recently closed tab
-    const overviewBtn = doc.getElementById('sidePaneTabOverviewBtn');
-    overviewBtn.click();
-    await tick();
-
-    const recentlyClosedItems = doc.querySelectorAll('.side-pane-overview-item.recently-closed');
-    assert.equal(recentlyClosedItems.length, 0, 'selection-side-chat must be explicitly excluded from recentlyClosedTabs');
+    // 4. Tab must NOT be offered for reopening as a recently closed tab
+    assert.equal(ctrl.getRecentlyClosedTabs().some(entry => entry.id === desc.id), false,
+        'selection-side-chat must be explicitly excluded from recentlyClosedTabs');
+    assert.equal(await ctrl.reopenClosedTab(desc.id), null);
+    assert.equal(ctrl.getSnapshot().tabs.some(tab => tab.id === desc.id), false);
 
     await ctrl.dispose();
     dom.window.close();
diff --git a/tests/side-chat-floating-selection.test.mjs b/tests/side-chat-floating-selection.test.mjs
index 178b4dcda..3c4201af0 100644
--- a/tests/side-chat-floating-selection.test.mjs
+++ b/tests/side-chat-floating-selection.test.mjs
@@ -1,4 +1,4 @@
-import test from 'node:test';
+import test, { mock } from 'node:test';
 import assert from 'node:assert/strict';
 import { JSDOM } from 'jsdom';
 import { createFloatingSelectionButton } from '../modules/renderer/floatingSelectionButton.js';
@@ -37,16 +37,24 @@ test('floating ask button shows only for main chat selections, not side chat mes
     assert.equal(btn.hidden, true);
 });
 
-test('floating ask button hides while a container scrolls and comes back at the new position once it settles', async () => {
+test('floating ask button hides while a container scrolls and comes back at the new position once it settles', t => {
+    mock.timers.enable({ apis: ['setTimeout'] });
+    t.after(() => mock.timers.reset());
     const { window, btn, select, handle } = setup();
+    // 模块用的是 win.setTimeout：指向被接管的全局计时器
+    window.setTimeout = setTimeout;
+    window.clearTimeout = clearTimeout;
     select('main');
+    mock.timers.tick(0); // JSDOM 异步补发的 selectionchange
     window.document.getElementById('chatMessages').dispatchEvent(new window.Event('scroll'));
     assert.equal(btn.hidden, true);
-    await new Promise(resolve => setTimeout(resolve, 200));
+    mock.timers.tick(149);
+    assert.equal(btn.hidden, true, 'still scrolling');
+    mock.timers.tick(1);
     assert.equal(btn.hidden, false, 'the selection is still there after the scroll stops');
     window.Range.prototype.getBoundingClientRect = () => ({ left: 100, top: -400, bottom: -380, width: 50, height: 20 });
     window.document.getElementById('chatMessages').dispatchEvent(new window.Event('scroll'));
-    await new Promise(resolve => setTimeout(resolve, 200));
+    mock.timers.tick(150);
     assert.equal(btn.hidden, true, 'a selection scrolled out of view gets no button');
     handle.dispose();
 });
diff --git a/tests/side-chat-integration.test.mjs b/tests/side-chat-integration.test.mjs
index 3fd40cddd..785d3e4a6 100644
--- a/tests/side-chat-integration.test.mjs
+++ b/tests/side-chat-integration.test.mjs
@@ -5,6 +5,8 @@ import { createSidePaneController } from '../modules/ui-system/side-pane/side-pa
 import { defineChatTabType } from '../modules/ui-system/side-pane/tab-types/chat.js';
 import { createSideChatSurfaceOwner } from '../modules/renderer/sideChatSurfaceOwner.js';
 import { createSideChatDescriptor, createChildTopicForAgent } from '../modules/chat/sideChatSessionService.js';
+import { fixture } from './helpers/side-chat-surface-fixture.mjs';
+import { waitFor } from './helpers/wait-for.mjs';
 
 test('Full Side Chat lifecycle integration: open, refer, send, and close', async () => {
     const markup = `
@@ -110,10 +112,8 @@ test('Full Side Chat lifecycle integration: open, refer, send, and close', async
 
     // 1. 面板里没有标签、只登记了一个入口时，展开按钮直接打开它
     toggleChatBtn.click();
-    await new Promise(r => setTimeout(r, 20));
+    await waitFor(() => controller.getSnapshot().tabs.length === 2 && controller.getTabHandle(controller.getSnapshot().tabs[1].id));
 
-    // Verify side pane is active and visible
-    assert.equal(sidePane.classList.contains('active'), true);
     assert.equal(controller.getSnapshot().visible, true);
     assert.equal(controller.getSnapshot().tabs.length, 2); // notifications + 1 chat tab
 
@@ -124,7 +124,7 @@ test('Full Side Chat lifecycle integration: open, refer, send, and close', async
     // 2. Verify view was mounted
     const chatView = contentContainer.querySelector(`[data-tab-id="${activeTab.id}"]`);
     assert.ok(chatView);
-    assert.equal(chatView.classList.contains('active'), true);
+    assert.equal(chatView.hidden, false);
 
     const textarea = chatView.querySelector('.side-chat-textarea');
     assert.ok(textarea);
@@ -144,12 +144,8 @@ test('Full Side Chat lifecycle integration: open, refer, send, and close', async
     const form = chatView.querySelector('form');
     form.requestSubmit();
 
-    await new Promise(r => setTimeout(r, 20));
-
-    assert.ok(sentRequest);
-    assert.ok(sentRequest.content.includes('引用：「'));
-    assert.ok(sentRequest.content.includes('Important context line'));
-    assert.ok(sentRequest.content.includes('请分析该行内容'));
+    // 引用和问题的拼装见 side-chat-surface-owner.test.mjs；这里只看请求落在新建的子话题上
+    await waitFor(() => sentRequest && !form.hasAttribute('aria-busy'));
     assert.equal(sentRequest.conversation.topicIdRef.get(), 'topic-child-999');
 
     // 5. Close chat tab
@@ -164,158 +160,29 @@ test('Full Side Chat lifecycle integration: open, refer, send, and close', async
     dom.window.close();
 });
 
-test('Dual stream concurrency: cancelling side chat does not abort main chat stream', async () => {
-    const dom = new JSDOM('<div id="sideContainer"></div>');
-    const container = dom.window.document.getElementById('sideContainer');
-
-    let mainCancelled = false;
-    let sideCancelled = false;
-
-    const mockMainOperation = {
-        cancel: async () => { mainCancelled = true; return true; }
-    };
-    const mockSideOperation = {
-        cancel: async () => { sideCancelled = true; return true; }
-    };
-
-    const mockCapabilities = {
-        repository: {
-            async getHistory() { return []; },
-            async saveHistory() { return { success: true }; }
-        },
-        createRenderer: ({ conversation }) => ({
-            renderer: { async renderHistory() {}, async dispose() {} },
-            conversation: {
-                selectedItemRef: { get: () => conversation.selectedItem },
-                topicIdRef: { get: () => conversation.topicId },
-                historyRef: { get: () => [], set: () => {} },
-                replaceHistory: () => [],
-                dispose: () => {}
-            },
-            dispose: async () => {}
-        }),
-        manager: {
-            async sendMessage(req) {
-                req.onOperation?.(mockSideOperation);
-                return new Promise((resolve) => {
-                    // Simulates ongoing stream
-                    setTimeout(() => {
-                        resolve({ terminal: { event: { type: sideCancelled ? 'cancelled' : 'completed' } } });
-                    }, 50);
-                });
-            }
-        }
-    };
-
-    const descriptor = {
-        id: 'chat-side-stream-1',
-        title: '并发流测试',
-        parent: { itemId: 'agent-1', topicId: 'topic-main' },
-        child: { itemId: 'agent-1', topicId: 'topic-side' },
-        contextMode: 'references-only',
-        model: 'test-model'
-    };
-
-    const sideChatOwner = createSideChatSurfaceOwner({
-        chatCapabilities: mockCapabilities
-    });
-
-    const handle = await sideChatOwner.mountTab(descriptor, container);
-    await new Promise(r => setTimeout(r, 10));
-
-    // Submit side chat message
-    const textarea = container.querySelector('.side-chat-textarea');
-    textarea.value = 'Side chat question';
-    const form = container.querySelector('form');
-    form.requestSubmit();
-
-    // Verify side chat is busy/generating
-    const stopBtn = container.querySelector('.side-chat-stop-btn');
+// 停止辅助对话只取消它自己的流：同一个 chatManager / 流桥上的主聊天流照常接收
+test('Dual stream concurrency: cancelling side chat does not abort main chat stream', async t => {
+    const f = await fixture(t, { stream: true });
+    const main = { chunks: [], settled: null };
+    f.streamRoutes.register('main-stream', { kind: 'main-chat', start() {},
+        append(_id, chunk) { main.chunks.push(chunk); }, settle(result) { main.settled = result; }, release() {} });
+    f.bridge.accept({ type: 'data', messageId: 'main-stream', context: {}, chunk: 'main-1' });
+
+    f.submit('Side chat question');
+    await waitFor(() => f.requests.length === 1 && f.handle.isBusy());
+    await waitFor(() => main.chunks.length === 1);
+    const stopBtn = f.doc.querySelector('.side-chat-stop-btn');
     assert.equal(stopBtn.hidden, false);
 
-    // Click stop on side chat
-    stopBtn.click();
-    await new Promise(r => setTimeout(r, 60));
-
-    // Side chat was cancelled, main chat was untouched
-    assert.equal(sideCancelled, true);
-    assert.equal(mainCancelled, false);
-
-    await handle.dispose();
-    dom.window.close();
-});
-
-test('Parent context snapshot inheritance (P1): child sends frozen parent context without persisting it to child topic', async () => {
-    const dom = new JSDOM('<div id="sideContainer"></div>');
-    const container = dom.window.document.getElementById('sideContainer');
-
-    let sentRequest = null;
-    let savedTopicHistory = null;
-
-    const mockCapabilities = {
-        repository: {
-            async getHistory() { return []; },
-            async saveHistory(itemId, itemType, topicId, history) {
-                savedTopicHistory = history;
-                return { success: true };
-            }
-        },
-        createRenderer: ({ conversation }) => ({
-            renderer: { async renderHistory() {}, async dispose() {} },
-            conversation: {
-                selectedItemRef: { get: () => conversation.selectedItem },
-                topicIdRef: { get: () => conversation.topicId },
-                historyRef: { get: () => [], set: () => {} },
-                replaceHistory: () => [],
-                dispose: () => {}
-            },
-            dispose: async () => {}
-        }),
-        manager: {
-            async sendMessage(req) {
-                sentRequest = req;
-                return { terminal: { event: { type: 'completed' } } };
-            }
-        }
-    };
-
-    const parentHistory = [
-        { role: 'user', content: 'Parent question 1' },
-        { role: 'assistant', content: 'Parent answer 1' }
-    ];
-
-    const descriptor = {
-        id: 'chat-side-inheritance-1',
-        title: '上下文继承测试',
-        parent: { itemId: 'agent-1', topicId: 'topic-main' },
-        child: { itemId: 'agent-1', topicId: 'topic-side' },
-        contextMode: 'parent-snapshot',
-        model: 'test-model',
-        parentSnapshot: parentHistory
-    };
-
-    const sideChatOwner = createSideChatSurfaceOwner({
-        chatCapabilities: mockCapabilities
-    });
-
-    const handle = await sideChatOwner.mountTab(descriptor, container);
-    await new Promise(r => setTimeout(r, 10));
-
-    // Submit side chat message
-    const textarea = container.querySelector('.side-chat-textarea');
-    textarea.value = 'Child question 1';
-    const form = container.querySelector('form');
-    form.requestSubmit();
-
-    await new Promise(r => setTimeout(r, 20));
-
-    assert.ok(sentRequest);
-    assert.equal(typeof sentRequest.conversation.getContextHistory, 'function');
-    const inherited = sentRequest.conversation.getContextHistory();
-    assert.equal(inherited.length, 2);
-    assert.equal(inherited[0].content, 'Parent question 1');
-    assert.equal(inherited[1].content, 'Parent answer 1');
-
-    await handle.dispose();
-    dom.window.close();
+    f.stop();
+    await f.untilIdle();
+    assert.equal(f.statuses.at(-1)?.code, 'cancelled');
+    assert.equal(stopBtn.hidden, true);
+
+    // 主聊天的流还登记着、还在收数据，也没有被结算
+    assert.ok(f.streamRoutes.claim('main-stream'));
+    f.bridge.accept({ type: 'data', messageId: 'main-stream', context: {}, chunk: 'main-2' });
+    await waitFor(() => main.chunks.length === 2);
+    assert.deepEqual(main.chunks, ['main-1', 'main-2']);
+    assert.equal(main.settled, null);
 });
diff --git a/tests/side-chat-interactive-submit.test.mjs b/tests/side-chat-interactive-submit.test.mjs
index 85b2cbdde..df99fae2f 100644
--- a/tests/side-chat-interactive-submit.test.mjs
+++ b/tests/side-chat-interactive-submit.test.mjs
@@ -3,8 +3,10 @@ import test from 'node:test';
 import assert from 'node:assert/strict';
 import { JSDOM } from 'jsdom';
 import { mountSideChatSurface } from '../modules/renderer/sideChatSurfaceOwner.js';
+import { waitFor } from './helpers/wait-for.mjs';
 
-const settle = () => new Promise(resolve => setTimeout(resolve, 10));
+const tick = () => new Promise(resolve => setImmediate(resolve));
+const ready = doc => waitFor(() => !doc.querySelector('.side-chat-send-btn').disabled, { message: 'side chat did not load' });
 
 async function fixture() {
     const dom = new JSDOM('<div id="mount"></div>');
@@ -45,7 +47,7 @@ async function fixture() {
             }
         }
     });
-    await settle();
+    await ready(doc);
     const textarea = doc.querySelector('.side-chat-textarea');
     const stopBtn = doc.querySelector('.side-chat-stop-btn');
     return {
@@ -61,12 +63,12 @@ test('a message button clicked while a reply streams does not start a second sen
     const f = await fixture();
     try {
         f.typeAndSend('first question');
-        await settle();
-        assert.equal(f.sends.length, 1);
+        await waitFor(() => f.sends.length === 1);
         assert.equal(f.stopBtn.hidden, false);
 
         f.clickMessageButton('option A');
-        await settle();
+        await waitFor(() => f.toasts.length > 0);
+        await tick();
         assert.equal(f.sends.length, 1, 'no second send while the first one streams');
         assert.equal(f.stopBtn.hidden, false, 'the running reply can still be stopped');
         assert.ok(f.toasts.some(t => t.type === 'warning'));
@@ -78,29 +80,30 @@ test('a message button does not overwrite or send a typed draft', async () => {
     try {
         f.textarea.value = 'half-written thought';
         f.clickMessageButton('option A');
-        await settle();
+        for (let i = 0; i < 5; i++) await tick();
         assert.equal(f.sends.length, 0);
         assert.equal(f.textarea.value, 'half-written thought');
 
         f.textarea.value = '';
         f.clickMessageButton('option A');
-        await settle();
-        assert.equal(f.sends.length, 1);
+        await waitFor(() => f.sends.length === 1);
     } finally { await f.cleanup(); }
 });
 
-test('a failed send puts the draft back even when the same words were sent successfully before', async () => {
+test('a failed send puts the draft and references back even when the same words were sent successfully before', async () => {
     const dom = new JSDOM('<div id="mount"></div>');
     const doc = dom.window.document;
     let history = [
         { id: 'u-old', role: 'user', content: '继续' },
         { id: 'a-old', role: 'assistant', content: '好的' }
     ];
+    const statuses = [];
     const handle = await mountSideChatSurface(doc.getElementById('mount'), {
         descriptor: {
             id: 'side', title: '侧聊', model: 'model', contextMode: 'references-only',
             parent: { itemId: 'agent', topicId: 'parent' }, child: { itemId: 'agent', topicId: 'child' }
         },
+        onStatusChange: status => statuses.push(status),
         chatCapabilities: {
             repository: { getHistory: async () => history, saveHistory: async () => ({ success: true }) },
             uiHelper: { showToastNotification() {} },
@@ -121,13 +124,15 @@ test('a failed send puts the draft back even when the same words were sent succe
         }
     });
     try {
-        await settle();
+        await ready(doc);
         const textarea = doc.querySelector('.side-chat-textarea');
+        handle.addReference({ id: 'ref', text: 'essential quoted context' });
         textarea.value = '继续';
         doc.querySelector('form').requestSubmit();
-        await settle();
-        await settle();
+        await waitFor(() => !doc.querySelector('form').hasAttribute('aria-busy') && statuses.at(-1)?.type === 'error');
         assert.equal(textarea.value, '继续', 'the draft that failed to send is back in the composer');
+        assert.deepEqual(handle.getReferences().map(ref => ref.id), ['ref'], 'the references that failed to send are back');
+        assert.equal((await handle.requestClose()).closed, true, 'a restored transport failure does not block closing');
     } finally {
         await handle.dispose();
         dom.window.close();
diff --git a/tests/side-chat-ipc-metadata.test.mjs b/tests/side-chat-ipc-metadata.test.mjs
index 81ef34abc..95f4c73be 100644
--- a/tests/side-chat-ipc-metadata.test.mjs
+++ b/tests/side-chat-ipc-metadata.test.mjs
@@ -33,6 +33,25 @@ test('filterStableHistory filters transient/streaming messages and extracts stab
     assert.equal(stable[3].isInherited, true);
 });
 
+test('filterStableHistory drops pending streams and orphan tools, keeps tool_calls and attachments as deep clones', () => {
+    const content = [{ type: 'text', text: 'initial' }];
+    const raw = [
+        { id: 'pending', role: 'assistant', content: 'partial', isPendingStream: true },
+        { id: 'a', role: 'assistant', content: 'tool call', tool_calls: [{ id: 't' }] },
+        { id: 't', role: 'tool', content: 'result', tool_call_id: 't' },
+        { id: 'orphan_tool', role: 'tool', content: 'orphan without id' },
+        { id: 'multi', role: 'user', content, attachments: [{ name: 'test.png' }] }
+    ];
+
+    const frozen = filterStableHistory(raw);
+    content[0].text = 'mutated';
+
+    assert.deepEqual(frozen.map(m => m.id), ['a', 't', 'multi'], 'Pending streams and orphan tools should be excluded');
+    assert.ok(frozen.find(m => m.id === 'a').tool_calls, 'tool_calls should be retained');
+    assert.equal(frozen.find(m => m.id === 'multi').content[0].text, 'initial', 'multimodal content should be deep-cloned');
+    assert.ok(frozen.find(m => m.id === 'multi').attachments, 'attachments should be retained');
+});
+
 test('sideChatHandlers handles metadata lifecycle and snapshot creation with isolated filesystem', async (t) => {
     const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'vcpchat-sidechat-test-'));
 
@@ -107,6 +126,9 @@ test('sideChatHandlers handles metadata lifecycle and snapshot creation with iso
     assert.equal(listRes.items.length, 1);
     assert.equal(listRes.items[0].id, 'sidechat-test-1');
     assert.equal(listRes.items[0].title, '侧聊测试');
+    // 列表从快照文件补回父话题快照与边界
+    assert.equal(listRes.items[0].parentSnapshot.length, 2);
+    assert.equal(listRes.items[0].snapshotBoundary.messageCount, 2);
     assert.equal((await listMetadataHandler(agentId, 'another-parent')).items.length, 0);
 
     // 4. Adversarial: Path traversal attempts must be rejected
diff --git a/tests/side-chat-message-delete.test.mjs b/tests/side-chat-message-delete.test.mjs
index e32daf1fc..efa4d4d36 100644
--- a/tests/side-chat-message-delete.test.mjs
+++ b/tests/side-chat-message-delete.test.mjs
@@ -7,13 +7,7 @@ import { JSDOM } from 'jsdom';
 import queueModule from '../modules/services/historyMutationQueue.js';
 import { mountSideChatSurface } from '../modules/renderer/sideChatSurfaceOwner.js';
 
-async function waitFor(predicate) {
-    const deadline = Date.now() + 2000;
-    while (!predicate()) {
-        if (Date.now() > deadline) throw new Error('Side delete did not settle');
-        await new Promise(resolve => setTimeout(resolve, 5));
-    }
-}
+import { waitFor } from './helpers/wait-for.mjs';
 
 async function fixture(t) {
     const directory = await fs.mkdtemp(path.join(os.tmpdir(), 'vcp-side-delete-'));
@@ -67,7 +61,7 @@ async function fixture(t) {
                         // Match the production renderer's synchronous removal and optional background save.
                         history = history.filter(message => message.id !== id);
                         list.querySelector(`[data-message-id="${id}"]`)?.remove();
-                        removals.push({ id, persist });
+                        removals.push(id);
                         if (persist) void repository.saveHistory('agent', 'agent', 'child', history).catch(() => {});
                     },
                 }, conversation: {
@@ -91,7 +85,7 @@ async function fixture(t) {
         assert.ok(directory.startsWith(os.tmpdir() + path.sep));
         await fs.rm(directory, { recursive: true, force: true });
     });
-    await waitFor(() => doc.querySelector('[data-message-id="answer"]') && !doc.querySelector('.side-chat-textarea').disabled);
+    await waitFor(() => doc.querySelector('[data-message-id="answer"]') && !doc.querySelector('.side-chat-send-btn').disabled);
     function menu(id) {
         doc.querySelector(`[data-message-id="${id}"] .md-content`).dispatchEvent(
             new dom.window.MouseEvent('contextmenu', { bubbles: true, cancelable: true }));
@@ -113,7 +107,7 @@ test('side delete retains the message on a real disk-write failure, shows the er
     await f.blockDiskWrite();
     f.remove('answer');
     await waitFor(() => f.toasts.some(item => item.type === 'error'));
-    assert.match(f.toasts.at(-1).message, /删除失败/);
+    assert.equal(f.toasts.at(-1).type, 'error');
     assert.ok(f.doc.querySelector('[data-message-id="answer"]'));
     assert.deepEqual(f.history(), f.initial);
     assert.equal(f.removals.length, 0);
@@ -124,7 +118,7 @@ test('side delete retains the message on a real disk-write failure, shows the er
     f.remove('answer');
     await waitFor(() => !f.doc.querySelector('[data-message-id="answer"]'));
     assert.deepEqual((await f.read()).map(item => item.id), ['question']);
-    assert.deepEqual(f.removals, [{ id: 'answer', persist: false }]);
+    assert.equal(f.writes.length, 2, 'one save for the failed attempt and one for the retry, no hidden renderer write');
     assert.ok(f.writes.every(write => write.itemId === 'agent' && write.topicId === 'child' && write.itemType === 'agent'));
 });
 
@@ -133,7 +127,7 @@ test('side delete treats a rejected save result as failure without removing live
     f.failWithResult({ success: false, error: 'permission denied' });
     f.remove('answer');
     await waitFor(() => f.toasts.some(item => item.type === 'error'));
-    assert.match(f.toasts.at(-1).message, /删除失败.*消息已保留/);
+    assert.equal(f.toasts.at(-1).type, 'error');
     assert.deepEqual(f.history(), f.initial);
     assert.deepEqual(await f.read(), f.initial);
     assert.ok(f.doc.querySelector('[data-message-id="answer"]'));
@@ -168,7 +162,7 @@ test('pending side deletion keeps typed drafts, blocks send and close, then pers
     assert.equal(f.doc.querySelector('.side-chat-empty-state').hidden, false);
     assert.equal(f.handle.getDraft(), 'keep my next question');
     assert.deepEqual(await f.handle.requestClose(), { closed: true });
-    assert.deepEqual(f.removals, [{ id: 'answer', persist: false }, { id: 'question', persist: false }]);
+    assert.deepEqual(f.removals, ['answer', 'question']);
     assert.equal(f.writes.length, 2, 'one acknowledged save per deletion, no hidden renderer write');
 });
 
diff --git a/tests/side-chat-model-and-context.test.mjs b/tests/side-chat-model-and-context.test.mjs
index 25d40c46e..fd001ec48 100644
--- a/tests/side-chat-model-and-context.test.mjs
+++ b/tests/side-chat-model-and-context.test.mjs
@@ -1,4 +1,4 @@
-import test from 'node:test';
+import test, { mock } from 'node:test';
 import assert from 'node:assert/strict';
 import { JSDOM } from 'jsdom';
 
@@ -86,7 +86,8 @@ test('without any configured model the side chat does not invent one and refuses
     assert.equal(doc.querySelector('.side-chat-send-btn').disabled, true);
     await submit(doc, 'hello');
     assert.equal(caps.sent.length, 0);
-    assert.match(doc.querySelector('.side-chat-status-text').textContent, /选择模型/);
+    assert.equal(doc.querySelector('.side-chat-send-btn').disabled, true);
+    assert.equal(doc.querySelector('.side-chat-status-text').dataset.statusType, 'error');
     await handle.dispose();
 });
 
@@ -160,25 +161,31 @@ test('new side chats are named by the lowest free ordinal under the same parent'
     });
     try {
         await dom.window.openSideChatWithSelection({ selectedText: '一段引用' });
-        assert.deepEqual(opened, ['辅助对话 2'], 'the menu entry opens a side chat with the first free number of this topic');
+        assert.equal(opened.length, 1);
+        assert.equal(Number(opened[0].match(/\d+$/)?.[0]), 2, 'the menu entry opens a side chat with the first free number of this topic');
     } finally {
         wiring.dispose?.();
         dom.window.close();
     }
 });
 
-test('composer autosaves go to browser storage; metadata only migrates once', async () => {
+test('composer autosaves go to browser storage; metadata only migrates once', async t => {
     const saved = [];
     const caps = capabilities({ saveSideChatMetadata: async (meta) => { saved.push(meta); return { success: true }; } });
     const { dom, doc, handle } = await mount(descriptor({ model: 'm' }), caps);
     const textarea = doc.querySelector('textarea');
     const drafts = createSideChatDraftStore({ getStorage: () => dom.window.localStorage });
 
+    mock.timers.enable({ apis: ['setTimeout'] });
+    t.after(() => mock.timers.reset());
     textarea.value = '草稿';
     textarea.dispatchEvent(new dom.window.Event('input', { bubbles: true }));
     handle.addReference({ id: 'r1', text: '引用原文', sourceMessageId: 'msg-1' });
+    mock.timers.tick(399);
+    await new Promise(resolve => setImmediate(resolve));
     assert.equal(saved.length, 0, 'typing is debounced');
-    await new Promise(resolve => setTimeout(resolve, 450));
+    mock.timers.tick(1);
+    for (let i = 0; i < 5; i++) await new Promise(resolve => setImmediate(resolve));
     assert.equal(saved.length, 1);
     assert.equal(saved[0].draft, undefined);
     assert.equal(saved[0].references, undefined);
@@ -186,13 +193,13 @@ test('composer autosaves go to browser storage; metadata only migrates once', as
     assert.equal(drafts.read(handle.descriptor).input.draft, '草稿');
     assert.deepEqual(drafts.read(handle.descriptor).input.references, [{ id: 'r1', text: '引用原文', sourceMessageId: 'msg-1' }]);
 
-    // 页面卸载前未到时间的改动立即写入
-    handle.removeReference('r1');
-    textarea.value = '';
-    dom.window.dispatchEvent(new dom.window.Event('pagehide'));
+    // 迁移后继续输入只写浏览器存储（pagehide 立即写入见 side-chat-draft-save.test.mjs）
+    textarea.value = '再改一次';
+    textarea.dispatchEvent(new dom.window.Event('input', { bubbles: true }));
+    mock.timers.tick(400);
+    for (let i = 0; i < 5; i++) await new Promise(resolve => setImmediate(resolve));
     assert.equal(saved.length, 1);
-    assert.equal(drafts.read(handle.descriptor).input.draft, '');
-    assert.deepEqual(drafts.read(handle.descriptor).input.references, []);
+    assert.equal(drafts.read(handle.descriptor).input.draft, '再改一次');
     await handle.dispose();
 });
 
@@ -209,14 +216,17 @@ test('an empty model cache waits for the real refresh result instead of a fixed
     // 再次打开模型菜单时共用同一次刷新
     const second = listSideChatModels(api);
     await tick();
-    assert.deepEqual(calls, ['cache', 'cache', 'refresh']);
+    const count = name => calls.filter(call => call === name).length;
+    assert.equal(count('refresh'), 1, 'concurrent opens share one refresh');
+    const cacheReads = count('cache');
     assert.equal(settled, false, 'still waiting for the refresh');
     finishRefresh({ success: true, models: [{ id: 'a' }, 'b'] });
     const result = await pending;
     assert.deepEqual(result.ids, ['a', 'b']);
     assert.deepEqual([...result.favorites], ['b']);
     assert.deepEqual((await second).ids, ['a', 'b']);
-    assert.deepEqual(calls, ['cache', 'cache', 'refresh'], 'the refresh result is used directly, no second cache read');
+    assert.equal(count('refresh'), 1);
+    assert.equal(count('cache'), cacheReads, 'the refresh result is used directly, no second cache read');
 
     // 缓存里已经有模型时不触发刷新
     const warm = await listSideChatModels({ getCachedModels: async () => ['x'], refreshModels: () => assert.fail('no refresh') });
diff --git a/tests/side-chat-persistence-retry.test.mjs b/tests/side-chat-persistence-retry.test.mjs
index 009a45e76..7f82615ad 100644
--- a/tests/side-chat-persistence-retry.test.mjs
+++ b/tests/side-chat-persistence-retry.test.mjs
@@ -7,13 +7,7 @@ import { JSDOM } from 'jsdom';
 import queueModule from '../modules/services/historyMutationQueue.js';
 import { mountSideChatSurface } from '../modules/renderer/sideChatSurfaceOwner.js';
 
-async function waitFor(predicate) {
-    const deadline = Date.now() + 2000;
-    while (!predicate()) {
-        if (Date.now() > deadline) throw new Error('Side chat action did not settle');
-        await new Promise(resolve => setTimeout(resolve, 5));
-    }
-}
+import { waitFor } from './helpers/wait-for.mjs';
 
 async function fixture(t) {
     const root = await fs.mkdtemp(path.join(os.tmpdir(), 'vcp-side-retry-'));
@@ -21,10 +15,16 @@ async function fixture(t) {
     const target = { itemId: 'agent', itemType: 'agent', topicId: 'child' };
     const dom = new JSDOM('<div id="mount"></div>');
     const doc = dom.window.document;
-    let history = [], renderer, failNextSave = false, writeStarted = false;
+    let history = [], renderer, failNextSave = false, writeStarted = false, holdNext = null;
     const repository = {
         getHistory: () => queue.read(target),
         saveHistory: async (_item, _type, _topic, next) => {
+            if (holdNext) {
+                const held = holdNext;
+                holdNext = null;
+                writeStarted = true;
+                await held;
+            }
             if (failNextSave) {
                 failNextSave = false;
                 throw new Error('controlled disk write failure');
@@ -82,7 +82,7 @@ async function fixture(t) {
         chatCapabilities: capabilities,
     });
     t.after(async () => { await handle.dispose(); dom.window.close(); await queue.dispose(); await fs.rm(root, { recursive: true, force: true }); });
-    await waitFor(() => !doc.querySelector('.side-chat-textarea').disabled);
+    await waitFor(() => !doc.querySelector('.side-chat-send-btn').disabled);
     doc.querySelector('.side-chat-textarea').value = 'question';
     doc.querySelector('form').requestSubmit();
     await waitFor(() => handle.getUnsavedStatus().hasUnsavedChanges && !doc.querySelector('form').hasAttribute('aria-busy'));
@@ -94,16 +94,10 @@ async function fixture(t) {
     };
     return { doc, handle, action, read: () => queue.read(target), failSave() { failNextSave = true; },
         get writeStarted() { return writeStarted; },
+        // 卡住下一次仓库写入，模拟删除正在落盘
         holdNextWrite() {
             let release;
-            const held = new Promise(resolve => { release = resolve; });
-            const write = queue.write.bind(queue);
-            queue.write = async (...args) => {
-                queue.write = write;
-                writeStarted = true;
-                await held;
-                return write(...args);
-            };
+            holdNext = new Promise(resolve => { release = resolve; });
             t.after(() => release());
             return release;
         },
@@ -145,6 +139,8 @@ test('another failed side retry keeps the unsaved badge and close protection', a
     assert.equal((await f.handle.requestClose()).closed, false);
     assert.equal((await f.handle.retryPersistence()).ok, true);
     assert.deepEqual((await f.read()).map(message => message.id), ['question', 'answer']);
+    assert.equal(f.handle.getUnsavedStatus().hasUnsavedChanges, false);
+    assert.equal(f.doc.querySelector('.side-chat-persistence-badge').hidden, true);
     assert.equal((await f.handle.requestClose()).closed, true);
 });
 
diff --git a/tests/side-chat-preparation-cancel.test.mjs b/tests/side-chat-preparation-cancel.test.mjs
index c78f212ee..454bd2df6 100644
--- a/tests/side-chat-preparation-cancel.test.mjs
+++ b/tests/side-chat-preparation-cancel.test.mjs
@@ -114,7 +114,7 @@ test('stopping while auxiliary history is saving prevents a later generation req
     assert.deepEqual(f.getHistory().map(message => [message.role, message.content]), [['user', 'cancel while saving']]);
     assert.equal(f.doc.querySelector('.side-chat-stop-btn').hidden, true);
     assert.equal(f.doc.querySelector('.side-chat-send-btn').hidden, false);
-    assert.equal(f.statuses.at(-1).text, '已取消');
+    assert.equal(f.statuses.at(-1).code, 'cancelled');
 });
 
 test('stopping during parent snapshot refresh preserves the unsent auxiliary draft and reference', async t => {
@@ -128,7 +128,7 @@ test('stopping during parent snapshot refresh preserves the unsent auxiliary dra
     assert.deepEqual(f.getHistory(), []);
     assert.equal(f.textarea.value, 'unsent question');
     assert.deepEqual(f.handle.getReferences().map(reference => reference.id), ['reference']);
-    assert.equal(f.statuses.at(-1).text, '已取消');
+    assert.equal(f.statuses.at(-1).code, 'cancelled');
 });
 
 test('stopping during request context preparation prevents generation and retains the submitted question', async t => {
@@ -139,7 +139,7 @@ test('stopping during request context preparation prevents generation and retain
     await f.untilIdle();
     assert.equal(f.requests.length, 0);
     assert.deepEqual(f.getHistory().map(message => [message.role, message.content]), [['user', 'question {{VCPChatCanvas}}']]);
-    assert.equal(f.statuses.at(-1).text, '已取消');
+    assert.equal(f.statuses.at(-1).code, 'cancelled');
 });
 
 test('a failed upstream interrupt waits for local terminal persistence and retains the partial auxiliary answer', async t => {
@@ -154,7 +154,7 @@ test('a failed upstream interrupt waits for local terminal persistence and retai
     assert.deepEqual(f.getHistory().map(message => message.content), ['question with partial answer', 'retained partial answer']);
     assert.equal(f.getHistory()[1].finishReason, 'cancelled');
     assert.match(f.doc.getElementById('mount').textContent, /retained partial answer/);
-    assert.equal(f.statuses.at(-1).text, '已取消');
+    assert.equal(f.statuses.at(-1).code, 'cancelled');
 });
 
 test('stopping before the first HTTP response settles as cancellation rather than a service error', async t => {
@@ -163,10 +163,9 @@ test('stopping before the first HTTP response settles as cancellation rather tha
     await f.entered.promise;
     f.stop(); f.gate.resolve();
     await f.untilIdle();
-    assert.equal(f.statuses.at(-1).text, '已取消');
-    assert.equal(f.doc.querySelector('.side-chat-status-error'), null);
+    assert.equal(f.statuses.at(-1).code, 'cancelled');
+    assert.ok(f.statuses.every(status => status.type !== 'error'), JSON.stringify(f.statuses));
     assert.deepEqual(f.getHistory().map(message => message.content), ['stop while waiting for response']);
-    assert.doesNotMatch(f.doc.getElementById('mount').textContent, /发送失败|请求流式回复失败/);
 });
 
 test('a service error exits auxiliary busy state and is shown as an error', async t => {
@@ -174,7 +173,9 @@ test('a service error exits auxiliary busy state and is shown as an error', asyn
     f.submit('a retained question');
     await f.untilIdle();
     assert.equal(f.requests.length, 1);
-    assert.match(f.doc.querySelector('.side-chat-status-error').textContent, /502 fixture service unavailable/);
+    const status = f.doc.querySelector('.side-chat-status-text');
+    assert.equal(status.dataset.statusType, 'error');
+    assert.match(status.textContent, /502 fixture service unavailable/);
     assert.equal(f.doc.querySelector('.side-chat-stop-btn').hidden, true);
     assert.equal(f.textarea.disabled, false);
     assert.deepEqual(f.getHistory().map(message => message.content), ['a retained question']);
diff --git a/tests/side-chat-regenerate-busy.test.mjs b/tests/side-chat-regenerate-busy.test.mjs
index ace630605..3cc782434 100644
--- a/tests/side-chat-regenerate-busy.test.mjs
+++ b/tests/side-chat-regenerate-busy.test.mjs
@@ -14,14 +14,16 @@ test('Enter during regenerate\'s history save does not start a second send', asy
     f.doc.querySelector('[data-side-chat-action="regenerate"]').click();
     await tick();
     assert.equal(f.form.hasAttribute('aria-busy'), true, 'busy from the start of the regenerate');
+    assert.equal(f.handle.isBusy(), true, 'a regenerate in flight keeps the view awake');
     f.submit('new question');
     await tick(); await tick();
     release();
     for (let i = 0; i < 60; i++) await tick();
     assert.equal(f.requests.length, 1, 'only the regenerated question is sent');
+    assert.equal(f.textarea.value, 'new question', 'the typed text stays in the composer');
     assert.equal(f.form.hasAttribute('aria-busy'), true, 'still generating');
     assert.equal(f.doc.querySelector('.side-chat-stop-btn').hidden, false, 'stop stays available');
-    assert.doesNotMatch(f.statusText(), /发送失败/);
+    assert.notEqual(f.statuses.at(-1)?.type, 'error');
 });
 
 test('a failed regenerate save releases the composer', async t => {
@@ -30,7 +32,7 @@ test('a failed regenerate save releases the composer', async t => {
     f.doc.querySelector('[data-message-id="a1"]').dispatchEvent(new f.dom.window.MouseEvent('contextmenu', { bubbles: true, cancelable: true }));
     f.doc.querySelector('[data-side-chat-action="regenerate"]').click();
     for (let i = 0; i < 10; i++) await tick();
-    assert.match(f.statusText(), /重新回复失败/);
+    assert.equal(f.statuses.at(-1)?.type, 'error');
     assert.equal(f.form.hasAttribute('aria-busy'), false);
     assert.equal(f.textarea.disabled, false);
 });
@@ -40,11 +42,12 @@ test('picking a model clears the "pick a model first" error', async t => {
     f.textarea.value = 'hi';
     f.textarea.dispatchEvent(new f.dom.window.KeyboardEvent('keydown', { key: 'Enter', bubbles: true }));
     await tick();
-    assert.equal(f.statusText(), '请先选择模型');
+    assert.equal(f.requests.length, 0);
+    assert.equal(f.statuses.at(-1)?.type, 'error');
     f.doc.querySelector('.side-chat-model-picker-btn').click();
     for (let i = 0; i < 5; i++) await tick();
     f.doc.querySelector('.side-chat-model-item[data-model="gpt-x"]').click();
     for (let i = 0; i < 5; i++) await tick();
-    assert.notEqual(f.statusText(), '请先选择模型');
-    assert.equal(f.doc.querySelector('.side-chat-status-text').classList.contains('error'), false);
+    assert.equal(f.handle.getModel(), 'gpt-x');
+    assert.notEqual(f.statuses.at(-1)?.type, 'error');
 });
diff --git a/tests/side-chat-save-failure.test.mjs b/tests/side-chat-save-failure.test.mjs
index ea7b8f6c4..2b3c46d90 100644
--- a/tests/side-chat-save-failure.test.mjs
+++ b/tests/side-chat-save-failure.test.mjs
@@ -9,7 +9,7 @@ for (const [label, failure] of [['IPC 的 { error } 形状', { error: 'EACCES: p
         f.submit('q1');
         await f.untilIdle();
         assert.equal(f.badgeHidden(), false, 'the unsaved badge shows');
-        assert.match(f.statusText(), /保存失败/);
+        assert.equal(f.statuses.at(-1)?.type, 'error');
         assert.deepEqual(f.handle.getUnsavedStatus(), { hasUnsavedChanges: true, error: 'EACCES: permission denied' });
         assert.deepEqual(await f.handle.requestClose(), { closed: false, reason: 'UNSAVED_CHANGES' });
     });
diff --git a/tests/side-chat-session-service.test.mjs b/tests/side-chat-session-service.test.mjs
index aa01d95be..8703f6897 100644
--- a/tests/side-chat-session-service.test.mjs
+++ b/tests/side-chat-session-service.test.mjs
@@ -26,6 +26,8 @@ test('createSideChatDescriptor validates parent and childTopicId and enforces di
     assert.equal(desc.child.topicId, 'topic-side-1');
     assert.equal(desc.title, '测试侧聊');
     assert.equal(desc.contextMode, 'references-only');
+    assert.equal(desc.type, 'selection-side-chat');
+    assert.equal(desc.ephemeral, true);
     assert.ok(desc.id.startsWith('sidechat-'));
     assert.equal(Object.isFrozen(desc), true);
 });
@@ -182,4 +184,16 @@ test('saveSideChatMetadata, listSideChatsForParent and createParentSnapshot hand
     assert.equal(snapRes.ok, true);
     assert.equal(snapRes.snapshotId, 'snap-123');
     assert.equal(snapRes.messages.length, 1);
+
+    const snapFail = await createParentSnapshot({
+        electronAPI: { createSideChatSnapshot: async () => ({ success: false, error: 'disk failure' }) },
+        agentId: 'a', parentTopicId: 'p', fallbackHistory: []
+    });
+    assert.equal(snapFail.ok, false);
+    assert.equal(snapFail.code, 'SNAPSHOT_FAILED');
+    assert.equal(snapFail.error, 'disk failure');
+
+    const missingIpc = await saveSideChatMetadata({ electronAPI: {}, metadata: meta });
+    assert.equal(missingIpc.ok, false);
+    assert.equal(missingIpc.code, 'UNSUPPORTED');
 });
diff --git a/tests/side-chat-surface-owner.test.mjs b/tests/side-chat-surface-owner.test.mjs
index 871f15bb7..6a367969d 100644
--- a/tests/side-chat-surface-owner.test.mjs
+++ b/tests/side-chat-surface-owner.test.mjs
@@ -6,6 +6,9 @@ import {
     createSideChatSurfaceOwner
 } from '../modules/renderer/sideChatSurfaceOwner.js';
 import { installMainComposer } from './helpers/main-composer.mjs';
+import { waitFor } from './helpers/wait-for.mjs';
+
+const loaded = container => waitFor(() => !container.querySelector('.side-chat-send-btn').disabled, { message: 'side chat history did not load' });
 
 function createMockChatCapabilities() {
     let sentRequest = null;
@@ -107,8 +110,7 @@ test('mountSideChatSurface builds shell, loads history, and transitions to ready
     const sendBtn = container.querySelector('.side-chat-send-btn');
     assert.ok(sendBtn);
 
-    // Wait for history load tick
-    await new Promise(r => setTimeout(r, 10));
+    await loaded(container);
 
     const statusText = container.querySelector('.side-chat-status-text');
     assert.equal(statusText.textContent, '', 'no always-on status text');
@@ -137,7 +139,7 @@ test('submitting side chat formats reference cards and dispatches message', asyn
         chatCapabilities: caps
     });
 
-    await new Promise(r => setTimeout(r, 10));
+    await loaded(container);
 
     // Add reference
     handle.addReference({ id: 'ref-1', text: 'function calculate() { return 42; }', sourceMessageId: 'm1' });
@@ -153,11 +155,8 @@ test('submitting side chat formats reference cards and dispatches message', asyn
     const form = container.querySelector('form');
     form.requestSubmit();
 
-    await new Promise(r => setTimeout(r, 20));
-
-    const sent = caps.getSentRequest();
-    assert.ok(sent);
-    assert.ok(sent.content.includes('引用：「'));
+    const sent = await waitFor(() => caps.getSentRequest());
+    await waitFor(() => !form.hasAttribute('aria-busy'));
     assert.ok(sent.content.includes('function calculate()'));
     assert.ok(sent.content.includes('解释这段代码'));
 
@@ -207,9 +206,9 @@ test('mountSideChatSurface keeps a minimal composer and offers send-to-main on a
     const container = doc.getElementById('sideContainer');
     const mainInput = doc.getElementById('messageInput');
 
-    let toastMessage = null;
+    const toasts = [];
     const uiHelper = {
-        showToastNotification: (msg) => { toastMessage = msg; },
+        showToastNotification: (msg, type) => { toasts.push({ msg, type }); },
         autoResizeTextarea: (el) => { if (el === mainInput) autoResized = true; }
     };
     const caps = { ...createMockChatCapabilities(), uiHelper };
@@ -235,15 +234,11 @@ test('mountSideChatSurface keeps a minimal composer and offers send-to-main on a
         chatCapabilities: caps
     });
 
-    // 1. The composer stays like the main one: no parent link / context button / drawer / 引用 button
-    for (const sel of ['.side-chat-parent-link', '.side-chat-context-toggle-btn', '.side-chat-snapshot-drawer', '.side-chat-mode-badge', '.side-chat-ref-modal-backdrop']) {
-        assert.equal(container.querySelector(sel), null, `${sel} must not exist`);
-    }
+    // 1. The composer offers the main composer's tools, each with an accessible name
     assert.ok(container.querySelector('.side-chat-model-picker-btn'));
-    assert.ok(container.querySelector('.side-chat-send-btn'));
-    // Same tool row as the main composer: + (attach) and emoticons on the left
-    assert.ok(container.querySelector('.side-chat-attach-btn.chat-quick-new-button'));
-    assert.ok(container.querySelector('.side-chat-emoticon-btn.chat-emoticon-button'));
+    assert.ok(container.querySelector('.side-chat-send-btn').getAttribute('aria-label'));
+    assert.ok(container.querySelector('.side-chat-attach-btn').getAttribute('aria-label'));
+    assert.ok(container.querySelector('.side-chat-emoticon-btn').getAttribute('aria-label'));
 
     // 2. The inherited snapshot still feeds the model
     assert.equal(handle.descriptor.parentSnapshot.length, 2);
@@ -257,11 +252,8 @@ test('mountSideChatSurface keeps a minimal composer and offers send-to-main on a
     contentDiv.textContent = 'Here is the recommended algorithm solution.';
     assistantMsg.appendChild(contentDiv);
     msgContainer.appendChild(assistantMsg);
+    await loaded(container);
 
-    // Give MutationObserver a tick to run or trigger observer
-    await new Promise(r => setTimeout(r, 20));
-
-    assert.equal(assistantMsg.querySelector('.side-chat-send-to-main-btn'), null, 'Fill-to-main lives in the context menu, not under the bubble');
     contentDiv.dispatchEvent(new dom.window.MouseEvent('contextmenu', { bubbles: true, cancelable: true, clientX: 10, clientY: 10 }));
     const sendBtn = doc.querySelector('#chatContextMenu [data-side-chat-action="send-to-main"]');
     assert.ok(sendBtn, 'Assistant context menu should offer send-to-main');
@@ -270,7 +262,7 @@ test('mountSideChatSurface keeps a minimal composer and offers send-to-main on a
     assert.equal(doc.getElementById('chatContextMenu'), null, 'Menu closes after an action');
     assert.equal(mainInput.value, 'Here is the recommended algorithm solution.');
     assert.equal(autoResized, true, 'autoResizeTextarea should be called on mainInput');
-    assert.ok(toastMessage && toastMessage.includes('已填入主聊天输入框'));
+    assert.equal(toasts.at(-1)?.type, 'success');
 
     await handle.dispose();
     dom.window.close();
@@ -309,13 +301,11 @@ test('side chat attaches picked files to the next send and clears them', async (
         model: 'test-model'
     };
     const handle = await mountSideChatSurface(container, { descriptor, chatCapabilities: caps });
-    await new Promise(r => setTimeout(r, 10));
-
     const attachBtn = container.querySelector('.side-chat-attach-btn');
-    assert.equal(attachBtn.disabled, false, 'enabled once history is loaded');
+    await waitFor(() => !attachBtn.disabled, { message: 'enabled once history is loaded' });
     assert.equal(handle.isBusy(), false, 'an idle side chat may sleep');
     attachBtn.click();
-    await new Promise(r => setTimeout(r, 10));
+    await waitFor(() => previewed, { message: 'picked files are previewed' });
     assert.equal(handle.isBusy(), true, 'picked files are not saved anywhere, so the view must not sleep with them');
     assert.deepEqual(picks, [['agent-1', 'topic-child-attach']]);
     assert.deepEqual(previewed, ['a.txt']);
@@ -323,8 +313,8 @@ test('side chat attaches picked files to the next send and clears them', async (
 
     // A file alone is enough to send
     container.querySelector('.side-chat-composer').requestSubmit();
-    await new Promise(r => setTimeout(r, 20));
-    const sent = caps.getSentRequest();
+    const sent = await waitFor(() => caps.getSentRequest());
+    await waitFor(() => previewed?.length === 0);
     assert.equal(sent.attachments.length, 1);
     assert.equal(sent.attachments[0].localPath, 'file:///a.txt');
     assert.deepEqual(previewed, []);
@@ -339,6 +329,7 @@ test('side chat message context menu offers per-role actions and deletes through
     const doc = dom.window.document;
     const container = doc.getElementById('sideContainer');
     const removed = [];
+    let writes = 0;
     const base = createMockChatCapabilities();
     base.setHistory([
         { id: 'u1', role: 'user', content: 'raw question' },
@@ -346,9 +337,10 @@ test('side chat message context menu offers per-role actions and deletes through
     ]);
     const caps = {
         ...base,
+        repository: { ...base.repository, async saveHistory() { writes += 1; return { success: true }; } },
         createRenderer(options) {
             const owned = base.createRenderer(options);
-            owned.renderer.removeMessageById = (id, save) => removed.push([id, save]);
+            owned.renderer.removeMessageById = id => removed.push(id);
             return owned;
         },
         uiHelper: {
@@ -365,7 +357,7 @@ test('side chat message context menu offers per-role actions and deletes through
         model: 'test-model'
     };
     const handle = await mountSideChatSurface(container, { descriptor, chatCapabilities: caps });
-    await new Promise(r => setTimeout(r, 20));
+    await loaded(container);
 
     const list = container.querySelector('.side-chat-messages-container');
     list.insertAdjacentHTML('beforeend',
@@ -386,8 +378,9 @@ test('side chat message context menu offers per-role actions and deletes through
     assert.ok(assistantActions.includes('send-to-main') && assistantActions.includes('delete'));
     assert.ok(!assistantActions.includes('edit-again'));
     doc.querySelector('[data-side-chat-action="delete"]').click();
-    await new Promise(r => setTimeout(r, 0));
-    assert.deepEqual(removed, [['a1', false]], 'The side action saves first; renderer removal must not start another save');
+    await waitFor(() => removed.length === 1);
+    assert.deepEqual(removed, ['a1']);
+    assert.equal(writes, 1, 'one save per deletion');
 
     openMenu('.message-item.assistant');
     await handle.dispose();
@@ -421,7 +414,7 @@ test('side chat edits a message in place and regenerates an answer with the side
         },
         createRenderer(options) {
             const owned = base.createRenderer(options);
-            owned.renderer.removeMessageById = (id, save) => removed.push([id, save]);
+            owned.renderer.removeMessageById = id => removed.push(id);
             owned.renderer.updateMessageContent = (id, text) => rerendered.push([id, text]);
             return owned;
         },
@@ -436,7 +429,7 @@ test('side chat edits a message in place and regenerates an answer with the side
         model: 'test-model'
     };
     const handle = await mountSideChatSurface(container, { descriptor, chatCapabilities: caps });
-    await new Promise(r => setTimeout(r, 20));
+    await loaded(container);
 
     const list = container.querySelector('.side-chat-messages-container');
     list.insertAdjacentHTML('beforeend',
@@ -450,8 +443,8 @@ test('side chat edits a message in place and regenerates an answer with the side
     // Edit: textarea replaces the bubble, Escape cancels, save writes the side topic and re-renders
     menuAction('.message-item.assistant', 'edit').click();
     const item = list.querySelector('.message-item.assistant');
-    assert.ok(item.classList.contains('side-chat-editing'));
     let input = item.querySelector('.message-edit-textarea');
+    assert.ok(input, 'an editor opens in place');
     assert.equal(input.value, 'first answer');
     input.dispatchEvent(new dom.window.KeyboardEvent('keydown', { key: 'Escape', bubbles: true }));
     assert.equal(item.querySelector('.message-edit-textarea'), null);
@@ -461,18 +454,17 @@ test('side chat edits a message in place and regenerates an answer with the side
     input = item.querySelector('.message-edit-textarea');
     input.value = 'edited answer';
     item.querySelector('[data-side-chat-edit="save"]').click();
-    await new Promise(r => setTimeout(r, 0));
+    await waitFor(() => rerendered.length === 1);
     assert.deepEqual(saved.at(-1), ['topic-child-edit', ['u1', 'a1']]);
     assert.deepEqual(rerendered, [['a1', 'edited answer']]);
-    assert.equal(item.classList.contains('side-chat-editing'), false);
+    assert.equal(item.querySelector('.message-edit-textarea'), null, 'the editor closes after saving');
 
     // Regenerate: drops the question and answer, then resends the question with its attachments
     assert.equal(menuAction('.message-item.user', 'regenerate'), null, 'Questions have no regenerate');
     menuAction('.message-item.assistant', 'regenerate').click();
-    await new Promise(r => setTimeout(r, 20));
+    const sent = await waitFor(() => caps.getSentRequest());
     assert.deepEqual(saved.at(-1), ['topic-child-edit', []]);
-    assert.deepEqual(removed, [['u1', false], ['a1', false]]);
-    const sent = caps.getSentRequest();
+    assert.deepEqual(removed, ['u1', 'a1']);
     assert.equal(sent.content, 'first question');
     assert.equal(sent.attachments.length, 1);
     assert.equal(sent.attachments[0].localPath, 'file:///a.txt');
@@ -506,68 +498,15 @@ test('the side chat surface hangs under the view scope the controller passes and
         model: 'test-model'
     };
     const handle = await tabType.provider.mountTab({ descriptor }, container, { scope: view });
-    const { diagnostics } = globalThis.VCPLifecycle;
-    const surfaceScope = diagnostics.snapshot().find(scope => scope.parentId === view.id);
-    assert.equal(surfaceScope.label, 'side-chat-chat-scope-1');
-    assert.ok(surfaceScope.resources.some(resource => resource.label === 'side-chat-surface'));
+    assert.ok(container.children.length > 0);
 
     // 控制器只释放 view scope：对话面板一样被拆掉
     await view.dispose('dormant');
     assert.equal(container.children.length, 0);
     assert.equal(rendererDisposed, 1);
-    assert.equal(diagnostics.snapshot().some(scope => scope.id === surfaceScope.id), false);
 
     // 之后再调 dispose 不会重复拆
     await handle.dispose();
     assert.equal(rendererDisposed, 1);
     dom.window.close();
 });
-
-test('a send started while regenerate is still saving the trimmed history is refused', async () => {
-    const dom = new JSDOM('<div id="sideContainer"></div>');
-    const doc = dom.window.document;
-    const container = doc.getElementById('sideContainer');
-    const base = createMockChatCapabilities();
-    const initial = [{ id: 'u1', role: 'user', content: 'question' }, { id: 'a1', role: 'assistant', content: 'answer' }];
-    base.setHistory(initial);
-    let releaseSave;
-    let saves = 0;
-    const caps = {
-        ...base,
-        repository: {
-            getHistory: async () => initial,
-            saveHistory: () => { saves += 1; return saves === 1 ? new Promise(resolve => { releaseSave = () => resolve({ success: true }); }) : Promise.resolve({ success: true }); }
-        },
-        createRenderer(options) {
-            const owned = base.createRenderer(options);
-            owned.renderer.removeMessageById = () => {};
-            return owned;
-        },
-        uiHelper: { showToastNotification() {} }
-    };
-    const descriptor = {
-        id: 'chat-regen', title: 'R', parent: { itemId: 'agent-1', topicId: 'p' },
-        child: { itemId: 'agent-1', topicId: 'c-regen' }, contextMode: 'blank', model: 'test-model'
-    };
-    const handle = await mountSideChatSurface(container, { descriptor, chatCapabilities: caps });
-    await new Promise(r => setTimeout(r, 20));
-    const list = container.querySelector('.side-chat-messages-container');
-    list.insertAdjacentHTML('beforeend', '<div class="message-item assistant" data-message-id="a1"><div class="details-and-bubble-wrapper"><div class="md-content">answer</div></div></div>');
-    list.querySelector('.message-item.assistant .md-content').dispatchEvent(new dom.window.MouseEvent('contextmenu', { bubbles: true, cancelable: true, clientX: 5, clientY: 5 }));
-    doc.querySelector('#chatContextMenu [data-side-chat-action="regenerate"]').click();
-    await new Promise(r => setTimeout(r, 0));
-    assert.equal(saves, 1, 'regenerate is waiting on the save');
-    assert.equal(handle.isBusy(), true, 'a regenerate in flight keeps the view awake');
-
-    const textarea = container.querySelector('textarea');
-    textarea.value = 'typed meanwhile';
-    container.querySelector('form').dispatchEvent(new dom.window.Event('submit', { bubbles: true, cancelable: true }));
-    await new Promise(r => setTimeout(r, 0));
-    releaseSave();
-    await new Promise(r => setTimeout(r, 20));
-    assert.equal(textarea.value, 'typed meanwhile', 'the typed text stays in the composer');
-    assert.equal(caps.getSentRequest()?.content, 'question', 'only the regenerated question was sent');
-
-    await handle.dispose();
-    dom.window.close();
-});
diff --git a/tests/side-chat-topic-binding-parity.test.mjs b/tests/side-chat-topic-binding-parity.test.mjs
index d6c0a0b00..f1fb4a5e8 100644
--- a/tests/side-chat-topic-binding-parity.test.mjs
+++ b/tests/side-chat-topic-binding-parity.test.mjs
@@ -36,7 +36,7 @@ const createDesc = (id, parentTopic, childTopic) => ({
     contextMode: 'references-only'
 });
 
-test('Parity: Switching to a topic with no side chats automatically collapses the side pane', async () => {
+test('Parity: Switching to a topic with no side chats collapses the side pane, and switching back re-expands it', async () => {
     const dom = createTopicBindingTestDOM();
     const doc = dom.window.document;
     const root = doc.getElementById('vcpSidePane');
@@ -61,8 +61,6 @@ test('Parity: Switching to a topic with no side chats automatically collapses th
 
     assert.equal(ctrl.getSnapshot().visible, true, 'Side pane should be visible for Topic A');
     assert.equal(ctrl.getSnapshot().activeTabId, 'side-a1');
-    assert.equal(root.classList.contains('active'), true);
-    assert.equal(root.classList.contains('collapsed'), false);
     // 面板展开时标题栏的展开按钮隐藏，由面板自己的收起按钮接手
     assert.equal(toggleBtn.hidden, true);
     assert.equal(toggleBtn.getAttribute('aria-expanded'), 'true');
@@ -72,50 +70,14 @@ test('Parity: Switching to a topic with no side chats automatically collapses th
     ctrl.setParent(parentB);
 
     assert.equal(ctrl.getSnapshot().visible, false, 'Side pane MUST automatically collapse for topic without side chats');
-    assert.equal(root.classList.contains('active'), false);
-    assert.equal(root.classList.contains('collapsed'), true);
     assert.equal(toggleBtn.hidden, false);
     assert.equal(toggleBtn.getAttribute('aria-expanded'), 'false');
 
-    await ctrl.dispose();
-    dom.window.close();
-});
-
-test('Parity: Switching back to a topic with side chats restores tabs and auto-expands', async () => {
-    const dom = createTopicBindingTestDOM();
-    const doc = dom.window.document;
-    const root = doc.getElementById('vcpSidePane');
-    const tabList = root.querySelector('.side-pane-tabs');
-    const content = root.querySelector('.side-pane-content-container');
-    const toggleBtn = doc.getElementById('toggleSidePaneChatBtn');
-
-    const ctrl = createSidePaneController({
-        root,
-        tabListElement: tabList,
-        contentContainer: content,
-        expandButton: toggleBtn,
-        tabTypes: [defineChatTabType({
-            provider: { mountTab: async () => ({ focus() {}, async requestClose() { return { closed: true }; }, async dispose() {} }) }
-        })]
-    });
-
-    const parentA = { itemType: 'agent', itemId: 'agent-1', topicId: 'topic-a' };
-    const parentB = { itemType: 'agent', itemId: 'agent-1', topicId: 'topic-b' };
-
-    // Topic A opens side-a1
-    ctrl.setParent(parentA);
-    await ctrl.openTab({ kind: 'chat', descriptor: createDesc('side-a1', 'topic-a', 'child-a1') });
-
-    // Switch to Topic B (empty -> collapses)
-    ctrl.setParent(parentB);
-    assert.equal(ctrl.getSnapshot().visible, false);
-
-    // Switch back to Topic A (has side-a1 -> auto-expands and restores side-a1)
+    // 3. Switching back to Topic A restores its tab and auto-expands
     ctrl.setParent(parentA);
     assert.equal(ctrl.getSnapshot().visible, true, 'Should auto-expand when returning to topic with side chats');
     assert.equal(ctrl.getSnapshot().activeTabId, 'side-a1');
-    assert.equal(root.classList.contains('active'), true);
-    assert.equal(root.classList.contains('collapsed'), false);
+    assert.equal(toggleBtn.getAttribute('aria-expanded'), 'true');
 
     await ctrl.dispose();
     dom.window.close();
@@ -240,7 +202,6 @@ test('Parity: Closing the last side chat tab automatically collapses side pane',
     await ctrl.closeTab('side-a1');
 
     assert.equal(ctrl.getSnapshot().visible, false, 'Side pane MUST automatically collapse when last chat tab is closed');
-    assert.equal(root.classList.contains('collapsed'), true);
 
     await ctrl.dispose();
     dom.window.close();
diff --git a/tests/side-pane-advanced-parity.test.mjs b/tests/side-pane-advanced-parity.test.mjs
index a844c8584..7940a6b29 100644
--- a/tests/side-pane-advanced-parity.test.mjs
+++ b/tests/side-pane-advanced-parity.test.mjs
@@ -105,9 +105,6 @@ test('Parity: closing the last closable tab of the conversation collapses the pa
     // 批量关闭时中间步骤不收起
     const kept = SidePaneState.closeTab(s, 's1', { collapseWhenEmpty: false });
     assert.equal(kept.visible, true);
-
-    // 通知页不能关
-    assert.equal(SidePaneState.closeTab(s, SidePaneState.NOTIFICATIONS_TAB_ID), s);
 });
 
 test('Parity: close-others and close-all only touch the current conversation', async () => {
@@ -161,7 +158,9 @@ test('Parity: the add button opens the new tab page with tool rows', async () =>
 
     // 两个入口：打开新标签页，工具按 order 排成列表
     ctrl.registerOpenTabEntry({ id: 'browser', label: '浏览器', order: 50, open: () => opened.push('browser') });
-    assert.equal(addBtn.getAttribute('aria-label'), '新标签页');
+    const launcherLabel = addBtn.getAttribute('aria-label');
+    assert.ok(launcherLabel);
+    assert.notEqual(launcherLabel, '辅助对话', '多个入口时按钮不再代表某一个入口');
     assert.equal(addBtn.hasAttribute('aria-haspopup'), false);
     addBtn.click();
     await tick();
@@ -169,7 +168,7 @@ test('Parity: the add button opens the new tab page with tool rows', async () =>
     assert.equal(launcherView.hidden, false);
     assert.equal(toolsSection.hidden, false);
     const rows = [...launcherView.querySelectorAll('[data-open-tab-entry]')];
-    assert.deepEqual(rows.map(r => r.querySelector('.side-pane-open-tab-button-label').textContent), ['浏览器', '辅助对话']);
+    assert.deepEqual(rows.map(r => r.dataset.openTabEntry), ['browser', 'chat']);
 
     rows[1].click();
     await tick();
@@ -201,13 +200,11 @@ test('Parity: the home button always returns to the new tab page', async () => {
     assert.equal(ctrl.getSnapshot().activeTabId, 'launcher');
     assert.equal(launcherView.hidden, false);
     assert.equal(homeBtn.getAttribute('aria-pressed'), 'true');
-    assert.equal(homeBtn.classList.contains('active'), true);
 
     // 切到别的标签后不再按下，点小房子回到新标签页
     await ctrl.openTab({ kind: 'chat', descriptor: createDesc('s1', 'c1') });
     assert.equal(ctrl.getSnapshot().activeTabId, 's1');
     assert.equal(homeBtn.getAttribute('aria-pressed'), 'false');
-    assert.equal(homeBtn.classList.contains('active'), false);
     homeBtn.click();
     await tick();
     assert.equal(ctrl.getSnapshot().activeTabId, 'launcher');
@@ -234,7 +231,7 @@ test('Parity: the new tab page shows the current assistant and its avatar edit e
     assert.equal(profile.hidden, false);
     assert.equal(profile.querySelector('.side-pane-launcher-name').value, 'Nova');
     assert.equal(profile.querySelector('img').getAttribute('src'), 'nova.png');
-    assert.equal(avatar.getAttribute('aria-label'), '编辑头像');
+    assert.ok(avatar.getAttribute('aria-label'));
     avatar.click();
     assert.deepEqual(edits, ['Nova']);
 
@@ -243,7 +240,9 @@ test('Parity: the new tab page shows the current assistant and its avatar edit e
     doc.getElementById('addSidePaneChatBtn').click();
     await tick();
     assert.equal(profile.querySelector('.side-pane-launcher-name').value, '群组');
-    assert.equal(profile.querySelector('img').getAttribute('src'), 'assets/default_avatar.png');
+    const fallbackSrc = profile.querySelector('img').getAttribute('src');
+    assert.ok(fallbackSrc, '没有头像时用默认图');
+    assert.notEqual(fallbackSrc, 'nova.png');
     assert.equal(avatar.disabled, true);
     avatar.click();
     assert.deepEqual(edits, ['Nova']);
@@ -327,12 +326,13 @@ test('Parity: the new tab page switches between tools and apps', async () => {
 
     assert.equal(tabs.hidden, true, '没有应用来源时只有工具页');
     let providerCalls = 0;
+    let appList = [
+        { id: 'notes', label: '笔记', open: () => opened.push('notes'), mountIcon: (btn, host) => mounted.push([btn.getAttribute('data-launcher-app'), host]) },
+        { id: 'dice', label: '骰子', open: () => opened.push('dice') }
+    ];
     ctrl.setLauncherAppsProvider(() => {
         providerCalls += 1;
-        return [
-            { id: 'notes', label: '笔记', open: () => opened.push('notes'), mountIcon: (btn, host) => mounted.push([btn.getAttribute('data-launcher-app'), host.className]) },
-            { id: 'dice', label: '骰子', open: () => opened.push('dice') }
-        ];
+        return appList;
     });
     assert.equal(tabs.hidden, false);
     assert.equal(tools.hidden, false);
@@ -346,16 +346,18 @@ test('Parity: the new tab page switches between tools and apps', async () => {
     assert.equal(tabs.querySelector('[data-launcher-tab="apps"]').getAttribute('aria-selected'), 'true');
     const cards = [...apps.querySelectorAll('[data-launcher-app]')];
     assert.deepEqual(cards.map(card => card.textContent), ['笔记', '骰子']);
-    assert.deepEqual(mounted, [['notes', 'side-pane-launcher-app-icon']]);
+    assert.deepEqual(mounted.map(([id]) => id), ['notes'], '只有提供了 mountIcon 的应用自己画图标');
+    assert.ok(cards[0].contains(mounted[0][1]), '图标画在这张卡片里');
 
     cards[1].click();
     await tick();
     assert.deepEqual(opened, ['dice']);
 
     // 再次打开新标签页停在应用页并刷新列表
+    appList = [{ id: 'music', label: '音乐', open() {} }];
     ctrl.showLauncher();
-    assert.equal(providerCalls, 2);
     assert.equal(apps.hidden, false);
+    assert.deepEqual([...apps.querySelectorAll('[data-launcher-app]')].map(card => card.getAttribute('data-launcher-app')), ['music']);
 
     // 撤掉应用来源后回到工具页
     ctrl.setLauncherAppsProvider(null);
@@ -422,22 +424,21 @@ test('Parity: notifications live in the new tab page instead of the tab strip',
     assert.equal(segment.getAttribute('aria-selected'), 'true');
     assert.equal(notifications.hidden, false);
     assert.equal(tools.hidden, true);
-    assert.equal(doc.getElementById('notificationsSidebar').classList.contains('active'), true);
-    assert.equal(launcher.dataset.launcherSegment, 'notifications');
     // 通知页露出来时收走悬浮通知（宿主接的是 notificationRenderer.dismissFloatingToasts）
     assert.equal(notificationsShown, 1);
 
     // 连接状态挂在通知分类上
+    const segmentLabelBefore = segment.getAttribute('aria-label');
     notificationState.setConnection('open', 'VCPLog: 已连接');
     assert.equal(segment.querySelector('.side-pane-launcher-tab-status').dataset.status, 'open');
-    assert.equal(segment.getAttribute('aria-label'), '通知，VCPLog 已连接');
+    assert.ok(segment.getAttribute('aria-label'));
+    assert.notEqual(segment.getAttribute('aria-label'), segmentLabelBefore, '读屏能听到连接状态变化');
 
     // 切到工具：离开通知页；再点通知回来
     tabs.querySelector('[data-launcher-tab="tools"]').click();
     assert.equal(ctrl.getSnapshot().activeTabId, SidePaneState.LAUNCHER_TAB_ID);
     assert.equal(tools.hidden, false);
     assert.equal(notifications.hidden, true);
-    assert.equal(doc.getElementById('notificationsSidebar').classList.contains('active'), false);
     assert.equal(notificationsShown, 1);
     segment.click();
     assert.equal(ctrl.getSnapshot().activeTabId, SidePaneState.NOTIFICATIONS_TAB_ID);
@@ -512,26 +513,38 @@ test('Parity: the tools page shows a VCPLog card that opens the notifications',
     assert.equal(tools.hidden, false);
     assert.equal(group.hidden, false);
     assert.equal(card.dataset.status, 'unknown');
-    assert.equal(title.textContent, 'VCPLog 未连接');
-    assert.equal(meta.textContent, '未连接');
-    assert.equal(icon.textContent, 'notifications_off');
+    assert.equal(card.dataset.attention, '');
+    assert.ok(title.textContent);
+    assert.ok(meta.textContent);
+    const offline = { title: title.textContent, icon: icon.textContent };
 
+    // 标题和图标只说连没连上
     notificationState.setConnection('open', 'VCPLog: 已连接');
     assert.equal(card.dataset.status, 'open');
-    assert.equal(title.textContent, 'VCPLog 已连接');
-    assert.equal(meta.textContent, '暂无待处理');
-    assert.equal(icon.textContent, 'notifications');
+    assert.notEqual(title.textContent, offline.title);
+    assert.notEqual(icon.textContent, offline.icon);
+    assert.ok(meta.textContent);
+    assert.equal(card.dataset.attention, '');
 
     // 通知中心更新计数后卡片跟着变
     notificationState.setCounts({ pending: 2, error: 1 });
-    assert.equal(meta.textContent, '2 项待审批 · 1 条错误');
+    assert.match(meta.textContent, /2/);
+    assert.match(meta.textContent, /1/);
     assert.equal(card.dataset.attention, 'pending');
 
-    // 断开时把原因放在第二行
+    // 断开时把原因和计数一起放在第二行
     notificationState.setConnection('closed', 'VCPLog: 连接已断开 (1006)');
-    assert.equal(title.textContent, 'VCPLog 未连接');
-    assert.equal(meta.textContent, '连接已断开 (1006) · 2 项待审批 · 1 条错误');
-    assert.match(card.getAttribute('aria-label'), /打开通知$/);
+    assert.equal(card.dataset.status, 'closed');
+    assert.equal(title.textContent, offline.title);
+    assert.equal(icon.textContent, offline.icon);
+    assert.match(meta.textContent, /1006/);
+    assert.match(meta.textContent, /2/);
+    assert.equal(card.dataset.attention, 'pending');
+    assert.match(card.getAttribute('aria-label'), /1006/, '读屏名称带上断开原因');
+
+    // 只剩错误时提示错误
+    notificationState.setCounts({ pending: 0 });
+    assert.equal(card.dataset.attention, 'error');
 
     card.click();
     assert.equal(ctrl.getSnapshot().activeTabId, SidePaneState.NOTIFICATIONS_TAB_ID);
@@ -643,7 +656,6 @@ test('Parity: tab context menu is scoped, keyboard friendly and closes on Escape
 
     // 外壳的 backdrop-filter 会把 fixed 菜单的定位和背后内容都带偏，所以菜单挂在 body 下
     assert.equal(contextMenu.parentNode, doc.body);
-    assert.ok(contextMenu.classList.contains('vcp-ui-scope'));
 
     ctrl.setParent({ itemType: 'agent', itemId: 'agent-1', topicId: 'parent' });
     await ctrl.openTab({ kind: 'chat', descriptor: createDesc('s1', 'c1') });
@@ -798,7 +810,8 @@ test('Parity: the pane width ratio ignores the stale key and never measures agai
     assert.equal(await widthAfterOpen({ sidePaneWidthRatio: 0.3 }), '30%');
 });
 
-test('Parity: Side Chat Model Picker supports interactive switching', async () => {
+// 点选模型改 getModel 见 side-chat-model-and-context.test.mjs；这里只看弹层收起和 handle.setModel
+test('Parity: Side Chat Model Picker closes on selection and window blur, and follows setModel', async () => {
     const dom = new JSDOM('<div id="mount"></div>');
     const doc = dom.window.document;
 
@@ -833,13 +846,8 @@ test('Parity: Side Chat Model Picker supports interactive switching', async () =
     await tick();
     assert.equal(popover.hidden, false);
 
-    // Click claude-3-5-sonnet
-    const claudeItem = popover.querySelector('[data-model="claude-3-5-sonnet"]');
-    assert.ok(claudeItem);
-    claudeItem.click();
-
-    assert.equal(handle.getModel(), 'claude-3-5-sonnet');
-    assert.equal(doc.querySelector('.side-chat-model-name').textContent, 'claude-3-5-sonnet');
+    // 选中后收起
+    popover.querySelector('[data-model="claude-3-5-sonnet"]').click();
     assert.equal(popover.hidden, true);
 
     // 点进侧栏浏览器的 webview 时主页面只会失焦，弹层也要收起
@@ -882,9 +890,6 @@ test('tab type registration connects presentation, launcher availability and pro
     assert.equal(tab.icon, 'edit_note');
     assert.equal(tab.typeLabel, 'Custom notes');
     assert.equal(tab.searchHint, 'memo');
-    doc.getElementById('sidePaneTabOverviewBtn').click();
-    assert.equal(doc.querySelector('[data-tab-id="custom-notes:1"] .vcp-side-pane-icon-base').textContent, 'edit_note');
-    doc.getElementById('sidePaneTabOverviewBtn').click();
     unregister();
     assert.equal(ctrl.getTabType('custom-notes'), null);
     assert.equal(doc.querySelector('[data-open-tab-entry="custom-notes"]'), null);
@@ -892,19 +897,17 @@ test('tab type registration connects presentation, launcher availability and pro
     dom.window.close();
 });
 
-test('tab type registrations stay local and stale unregistration cannot remove a replacement', async () => {
+// 旧注销不删新声明、无效声明不生效见下面几个测试；这里只看各控制器互不影响
+test('tab type registrations stay local to their controller', async () => {
     const firstDOM = createParityTestDOM();
     const secondDOM = createParityTestDOM();
     const first = createController(firstDOM);
     const second = createController(secondDOM);
-    const stale = first.registerTabType({ kind: 'custom', label: 'Old', entry: { open() {} } });
     first.registerTabType({ kind: 'custom', label: 'New', entry: { open() {} } });
-    stale();
     assert.equal(first.getTabType('custom').label, 'New');
     assert.equal(second.getTabType('custom'), null);
-    assert.match(firstDOM.window.document.querySelector('[data-open-tab-entry="custom"]').textContent, /New/);
-    assert.throws(() => first.registerTabType({ kind: 'invalid', label: 'Invalid', entry: {} }), TypeError);
-    assert.equal(first.getTabType('invalid'), null);
+    assert.ok(firstDOM.window.document.querySelector('[data-open-tab-entry="custom"]'));
+    assert.equal(secondDOM.window.document.querySelector('[data-open-tab-entry="custom"]'), null);
     await Promise.all([first.dispose(), second.dispose()]);
     firstDOM.window.close();
     secondDOM.window.close();
diff --git a/tests/side-pane-code-viewer.test.mjs b/tests/side-pane-code-viewer.test.mjs
index 363080218..99d130d53 100644
--- a/tests/side-pane-code-viewer.test.mjs
+++ b/tests/side-pane-code-viewer.test.mjs
@@ -4,7 +4,9 @@ import { JSDOM } from 'jsdom';
 
 import { createCodeViewerSideProvider } from '../modules/ui-system/side-pane/codeViewerSideProvider.js';
 import * as SidePaneState from '../modules/ui-system/side-pane/side-pane-state.js';
+import { DIFF_PAGE_ROWS } from '../modules/ui-system/side-pane/code-viewer/diff-view.js';
 import { installMainComposer } from './helpers/main-composer.mjs';
+import { waitFor } from './helpers/wait-for.mjs';
 
 test('openViewer opens a workspace-wide tab that becomes active even while a conversation is the parent', async () => {
     const dom = new JSDOM('<div></div>');
@@ -40,8 +42,8 @@ test('mounted viewer preserves code insertion, wrap state and paged diff mode sw
     const handle = await provider.mountTab({ title: 'example.js', payload: { code: current, mode: 'diff', oldCode: before, newCode: after } }, view);
     try {
         assert.equal(handle.getMode(), 'diff');
-        assert.equal(view.querySelectorAll('.side-diff-row').length, 500);
-        const more = [...view.querySelectorAll('button')].find(button => button.textContent.includes('显示更多行'));
+        assert.equal(view.querySelectorAll('.side-diff-row').length, DIFF_PAGE_ROWS);
+        const more = view.querySelector('[data-action="diff-more"]');
         more.click();
         assert.equal(view.querySelectorAll('.side-diff-row').length, 601);
         assert.equal(more.hidden, true);
@@ -90,9 +92,9 @@ test('workspace picker ignores stale reads and detaches its controls on dispose'
         await new Promise(resolve => setImmediate(resolve));
         assert.equal(handle.getCode(), 'const newest: number = 2;\n');
         assert.equal(view.querySelector('.side-code-title').textContent, 'new.ts');
-        assert.equal(view.querySelector('.side-code-lang-tag').textContent, 'TS');
+        assert.equal(view.querySelector('[data-lang]').dataset.lang, 'typescript');
         const picker = view.querySelector('.side-code-picker');
-        const toggle = view.querySelector('[aria-label="选择文件"]');
+        const toggle = view.querySelector('[data-action="toggle-picker"]');
         const collapsed = picker.classList.contains('is-collapsed');
         handle.dispose();
         toggle.click();
@@ -180,8 +182,9 @@ test('workspace picker is keyboard usable and returns focus to its toggle after
     try {
         const filter = view.querySelector('.side-code-picker-filter');
         const list = view.querySelector('.side-code-picker-list');
-        const toggle = view.querySelector('[aria-label="选择文件"]');
-        assert.equal(filter.getAttribute('aria-label'), '搜索文件名');
+        const toggle = view.querySelector('[data-action="toggle-picker"]');
+        assert.ok(toggle.getAttribute('aria-label'), 'the icon-only toggle has an accessible name');
+        assert.ok(filter.getAttribute('aria-label'), 'the filter has an accessible name');
         assert.notEqual(list.getAttribute('role'), 'listbox', 'rows are buttons, not options');
         assert.equal(toggle.getAttribute('aria-expanded'), 'true');
 
@@ -225,7 +228,7 @@ test('a failed file read shows an error instead of an empty file, and a real emp
     const empty = await provider.mountTab(fileTab('C:/proj/empty.txt'), doc.getElementById('empty'));
     try {
         const missingView = doc.getElementById('missing');
-        assert.match(missingView.querySelector('.side-code-error')?.textContent || '', /读取文件失败/);
+        assert.ok(missingView.querySelector('.side-code-error')?.textContent.trim(), 'the failure is shown as an error');
         assert.equal(missingView.querySelector('.side-code-editor-shell'), null);
         assert.equal(missing.getCode(), '');
 
@@ -256,15 +259,19 @@ test('workspace files are read through the source service and report binary, too
     } });
     const view = doc.getElementById('view');
     const expectations = [
-        ['bin.dat', '.side-code-empty', /二进制文件/],
-        ['big.log', '.side-code-empty', /文件过大（6144 KB）/],
-        ['gone.js', '.side-code-error', /文件不存在/],
+        ['bin.dat', '.side-code-empty[data-reason="binary"]', null],
+        ['big.log', '.side-code-empty[data-reason="too-large"]', /6144/],
+        // 后端给的错误原样显示
+        ['gone.js', '.side-code-error', /gone\.js/],
         ['ok.js', '.side-code-pre', /const ok = 1;/]
     ];
     for (const [name, selector, pattern] of expectations) {
         const handle = await provider.mountTab(fileTab(`C:/repo/src/${name}`), view);
         try {
-            assert.match(view.querySelector(selector)?.textContent || '', pattern, name);
+            const shown = view.querySelector(selector);
+            assert.ok(shown, name);
+            if (pattern) assert.match(shown.textContent, pattern, name);
+            if (name !== 'ok.js') assert.equal(handle.getCode(), '', name);
         } finally {
             handle.dispose();
         }
@@ -312,7 +319,8 @@ test('reopening an already open file re-reads it from disk, while snippets keep
         // 删除后重新读取：显示错误，不再保留旧内容
         disk = null;
         await first.reload();
-        assert.match(view.querySelector('.side-code-error').textContent, /读取文件失败/);
+        assert.ok(view.querySelector('.side-code-error'));
+        assert.equal(view.querySelector('.side-code-pre'), null, 'the old content is gone');
         assert.equal(first.getCode(), '');
 
         const snippetView = doc.createElement('section');
@@ -343,7 +351,8 @@ test('large files only render the first preview chunk, cut at a line end', async
         const shownLines = view.querySelectorAll('.side-code-line-number').length;
         assert.equal(shownLines, Math.floor(PREVIEW_CHAR_LIMIT / (line.length + 1)));
         assert.ok(view.querySelector('.side-code-pre').textContent.split('\n').every(row => row === line));
-        assert.equal(view.querySelector('.side-code-truncated-note').textContent, `文件较大（共 20000 行），只预览前 ${shownLines} 行；完整内容请在外部编辑器中查看。`);
+        const note = view.querySelector('.side-code-truncated-note').textContent;
+        assert.ok(note.includes(String(20000)) && note.includes(String(shownLines)), 'the note gives the total and the previewed line count');
         // 复制和插入用的仍是完整内容
         assert.equal(handle.getCode(), text);
     } finally {
@@ -370,8 +379,9 @@ test('the file button reveals a workspace file in the file manager and never ope
         const view = doc.createElement('section');
         doc.body.append(view);
         const handle = await provider.mountTab({ title: 'f', payload: { filePath } }, view);
+        const before = revealed.length + toasts.length;
         view.querySelector('[data-action="open-external"]').click();
-        await new Promise(resolve => setTimeout(resolve, 10));
+        await waitFor(() => revealed.length + toasts.length > before, { message: 'the file button did nothing' });
         await handle?.dispose?.();
     };
     await click('C:\\proj\\src\\a.js');
@@ -397,13 +407,12 @@ test('a path outside every workspace is only read after the user asks for it', a
     try {
         assert.deepEqual(reads, [], 'nothing is read before the user agrees');
         assert.equal(handle.getCode(), '');
-        assert.match(view.textContent, /不在任何已登记的工作区里/);
         assert.match(view.textContent, /\.ssh/);
-        const consent = [...view.querySelectorAll('button')].find(b => b.textContent === '读取这个文件');
+        const consent = view.querySelector('[data-action="consent-read"]');
+        assert.ok(consent?.textContent.trim(), 'it asks with a named button');
         consent.click();
-        await new Promise(resolve => setTimeout(resolve, 10));
+        await waitFor(() => handle.getCode() === 'PRIVATE KEY', { message: 'consent never read the file' });
         assert.deepEqual(reads, ['C:\\Users\\me\\.ssh\\id_rsa']);
-        assert.equal(handle.getCode(), 'PRIVATE KEY');
 
         // 工作区里的文件照常直接读
         const inside = doc.createElement('section');
@@ -427,10 +436,6 @@ test('code is rendered in chunks whose text and line numbers stay continuous', a
     const view = doc.getElementById('view');
     const handle = await provider.mountTab({ title: 'chunks.txt', payload: { code, language: 'plaintext' } }, view);
     try {
-        const codeChunks = view.querySelectorAll('.side-code-pre .side-code-chunk');
-        const gutterChunks = view.querySelectorAll('.side-code-gutter .side-code-chunk');
-        assert.equal(codeChunks.length, 3);
-        assert.deepEqual([...gutterChunks].map(chunk => chunk.children.length), [CODE_CHUNK_LINES, CODE_CHUNK_LINES, 50]);
         assert.equal(view.querySelector('.side-code-pre').textContent, code);
         assert.equal(view.querySelectorAll('.side-code-line-number').length, lineCount);
         assert.equal([...view.querySelectorAll('.side-code-line-number')].at(-1).textContent, String(lineCount));
@@ -466,10 +471,9 @@ test('a file tab keeps its place on reload and its wrap, mode and consent after
     const tab = { id: 'code-viewer:D:/logs/app.log', title: 'app.log', payload: { filePath: 'D:/logs/app.log' } };
     let handle = await provider.mountTab(tab, view);
     const body = () => view.querySelector('.side-code-body');
-    assert.match(body().textContent, /不在任何已登记的工作区/, 'outside the workspace it asks first');
-    [...view.querySelectorAll('button')].find(button => button.textContent.includes('读取'))?.click();
-    await new Promise(resolve => setTimeout(resolve, 20));
-    assert.equal(handle.getCode(), text);
+    assert.equal(handle.getCode(), '', 'outside the workspace it asks first');
+    view.querySelector('[data-action="consent-read"]').click();
+    await waitFor(() => handle.getCode() === text, { message: 'consent never read the file' });
 
     let shown = true;
     Object.defineProperty(body(), 'clientHeight', { configurable: true, get: () => (shown ? 400 : 0) });
diff --git a/tests/side-pane-commands.test.mjs b/tests/side-pane-commands.test.mjs
index a68c5cf72..2745f51d9 100644
--- a/tests/side-pane-commands.test.mjs
+++ b/tests/side-pane-commands.test.mjs
@@ -100,7 +100,7 @@ test('a command id that is already taken is left alone instead of failing the si
     try {
         const registration = registerSidePaneCommands({ win: fakeWindow(), controller: fakeController(), commands, openModelTrajectory() {} });
         assert.equal(commands.execute('sidepane.open-tab'), 'existing');
-        assert.equal(warnings.length, 1);
+        assert.ok(warnings.length >= 1, 'the conflict is reported');
         await registration.dispose();
         assert.equal(commands.get('sidepane.open-tab').handler, existing, '卸载侧栏不注销别人的命令');
     } finally {
diff --git a/tests/side-pane-controller.test.mjs b/tests/side-pane-controller.test.mjs
index e47dbabfb..7a924d978 100644
--- a/tests/side-pane-controller.test.mjs
+++ b/tests/side-pane-controller.test.mjs
@@ -112,7 +112,6 @@ test('SidePaneController showNotifications and openChat mount views and sync vis
     await controller.closeTab('side-chat-test');
     assert.equal(disposed, true);
     assert.equal(controller.getSnapshot().activeTabId, 'notifications');
-    assert.equal(controller.getSnapshot().visible, false, '最后一个可关的标签关掉后面板收起');
     assert.equal(tabListElement.children.length, 1);
     assert.equal(notifView.classList.contains('active'), true);
     assert.equal(contentContainer.querySelector('[data-tab-id="side-chat-test"]'), null);
diff --git a/tests/side-pane-dom-boundary.test.mjs b/tests/side-pane-dom-boundary.test.mjs
index 6edf2e18b..49f3c31f7 100644
--- a/tests/side-pane-dom-boundary.test.mjs
+++ b/tests/side-pane-dom-boundary.test.mjs
@@ -14,13 +14,21 @@ const ROOTS = [
     'modules/renderer/sidePaneCommands.js',
 ];
 
+// 主窗口里原来调侧栏全局函数的地方，只查全局函数这一条
+const CONSUMERS = [
+    'modules/renderer/messageContextMenu.js',
+    'modules/renderer/contentProcessor.js',
+    'modules/event-listeners.js',
+];
+const GLOBAL_CALL = { pattern: /\b(?:win|window|ownerWindow)\??\.(?:openModelTrajectory|vcpSidePaneController)\b/, why: 'window 上的全局函数：用命令' };
+
 const FORBIDDEN = [
     { pattern: /['"`#](notificationsSidebar|vcpLogConnectionStatus|notificationToolbar|notificationsList)\b/, why: '通知面板的元素：读 notification-center 状态' },
     { pattern: /notification-chip-count/, why: '通知计数：读 notification-center 状态' },
     { pattern: /['"`#]chatMessages\b/, why: '主聊天消息区：订阅 conversation.current' },
     { pattern: /['"`#]messageInput\b/, why: '主输入框：用 composer.insert-text 命令' },
     { pattern: /(?:doc|document)\??\.querySelector(?:All)?\([^)]*data-action/, why: '别处的按钮：用命令' },
-    { pattern: /\b(?:win|window|ownerWindow)\??\.(?:openModelTrajectory|vcpSidePaneController)\b/, why: 'window 上的全局函数：用命令' },
+    GLOBAL_CALL,
 ];
 
 function listFiles(target) {
@@ -35,22 +43,18 @@ function listFiles(target) {
 
 test('side pane code reaches other modules through channels and commands, not their DOM', () => {
     const offences = [];
-    for (const file of ROOTS.flatMap(listFiles)) {
-        const lines = fs.readFileSync(file, 'utf8').split(/\r?\n/);
-        lines.forEach((line, index) => {
-            if (/^\s*(?:\/\/|\*|\/\*)/.test(line)) return;
-            for (const { pattern, why } of FORBIDDEN) {
-                if (pattern.test(line)) offences.push(`${file.replace(/\\/g, '/')}:${index + 1} ${why}\n    ${line.trim()}`);
-            }
-        });
-    }
+    const scan = (files, rules) => {
+        for (const file of files) {
+            const lines = fs.readFileSync(file, 'utf8').split(/\r?\n/);
+            lines.forEach((line, index) => {
+                if (/^\s*(?:\/\/|\*|\/\*)/.test(line)) return;
+                for (const { pattern, why } of rules) {
+                    if (pattern.test(line)) offences.push(`${file.replace(/\\/g, '/')}:${index + 1} ${why}\n    ${line.trim()}`);
+                }
+            });
+        }
+    };
+    scan(ROOTS.flatMap(listFiles), FORBIDDEN);
+    scan(CONSUMERS, [GLOBAL_CALL]);
     assert.deepEqual(offences, []);
 });
-
-test('the main window no longer exposes side pane globals', () => {
-    const wiring = fs.readFileSync('modules/renderer/sidePaneWiring.js', 'utf8');
-    assert.doesNotMatch(wiring, /win\.(?:openModelTrajectory|vcpSidePaneController)\s*=/);
-    for (const file of ['modules/renderer/messageContextMenu.js', 'modules/renderer/contentProcessor.js', 'modules/event-listeners.js']) {
-        assert.doesNotMatch(fs.readFileSync(file, 'utf8'), /\b(?:openModelTrajectory|vcpSidePaneController)\b/, file);
-    }
-});
diff --git a/tests/side-pane-dormancy.test.mjs b/tests/side-pane-dormancy.test.mjs
index 3f97ab539..546d3db15 100644
--- a/tests/side-pane-dormancy.test.mjs
+++ b/tests/side-pane-dormancy.test.mjs
@@ -1,11 +1,10 @@
 // 副屏视图休眠：隐藏太久、离开所属对话、同时挂着的视图太多时只释放视图，标签留着，再显示时重新挂载并拿回之前存下的状态
-import test from 'node:test';
+import test, { mock } from 'node:test';
 import assert from 'node:assert/strict';
 import { JSDOM } from 'jsdom';
 import { createSidePaneController } from '../modules/ui-system/side-pane/side-pane-controller.js';
 import { selectDormantViews, DORMANCY_DEFAULTS } from '../modules/ui-system/side-pane/side-pane-dormancy.js';
 
-const sleep = ms => new Promise(resolve => setTimeout(resolve, ms));
 const settle = () => new Promise(resolve => setImmediate(resolve));
 
 const candidate = (tabId, fields = {}) => ({
@@ -61,7 +60,10 @@ test('policy: when only busy views are over the limit it tries again later', ()
     assert.equal(nextCheckAt, DORMANCY_DEFAULTS.busyRetryMs);
 });
 
+// 休眠检查走全局 setTimeout，策略时间走注入的 now：两者一起前进，不用真睡
 function fixture(dormancy) {
+    let clock = 0;
+    mock.timers.enable({ apis: ['setTimeout'] });
     const dom = new JSDOM(`
         <aside id="vcpSidePane" class="vcp-side-pane">
             <div class="side-pane-tabs"></div>
@@ -88,7 +90,7 @@ function fixture(dormancy) {
         tabListElement: root.querySelector('.side-pane-tabs'),
         contentContainer: root.querySelector('.side-pane-content-container'),
         providers: { probe: provider },
-        dormancy
+        dormancy: { ...dormancy, now: () => clock }
     });
     controller.registerTabType({ kind: 'probe', label: 'Probe', provider });
     controller.registerTabType({ kind: 'pinned', label: 'Pinned', provider, dormancy: 'keep' });
@@ -96,7 +98,14 @@ function fixture(dormancy) {
     return {
         controller, mounts, busy, live,
         residency: () => controller.getViewResidency(),
-        async cleanup() { await controller.dispose(); dom.window.close(); }
+        async advance(ms) {
+            clock += ms;
+            mock.timers.tick(ms);
+            await settle();
+        },
+        async cleanup() {
+            try { await controller.dispose(); dom.window.close(); } finally { mock.timers.reset(); }
+        }
     };
 }
 
@@ -109,8 +118,9 @@ test('a view hidden too long sleeps; the tab stays and remounts with what it sav
         await h.controller.openTab(tab('probe:b'));
         const [first] = h.mounts;
         first.counter = 7;
-        await sleep(80);
-        await settle();
+        await h.advance(29);
+        assert.equal(first.disposed, 0, 'not yet past the threshold');
+        await h.advance(1);
 
         assert.equal(first.disposed, 1, 'the hidden view was released');
         assert.equal(first.context.scope.disposed, true, 'its view scope went with it');
@@ -144,14 +154,12 @@ test('busy views and keep-type views do not sleep', async () => {
         await h.controller.openTab(tab('probe:keep', { kind: 'pinned' }));
         await h.controller.openTab(tab('probe:front'));
         h.busy.add('probe:busy');
-        await sleep(60);
-        await settle();
+        await h.advance(20);
         assert.equal(h.live('probe:busy').length, 1);
         assert.equal(h.live('probe:keep').length, 1);
 
         h.busy.delete('probe:busy');
-        await sleep(60);
-        await settle();
+        await h.advance(20);
         assert.equal(h.live('probe:busy').length, 0, 'once idle it sleeps at the next check');
         assert.equal(h.live('probe:keep').length, 1);
     } finally { await h.cleanup(); }
@@ -161,8 +169,11 @@ test('views beyond the live-view limit sleep least recently shown first', async
     const h = fixture({ maxLiveViews: 2 });
     try {
         await h.controller.openTab(tab('probe:1'));
+        await h.advance(1);
         await h.controller.openTab(tab('probe:2'));
+        await h.advance(1);
         h.controller.activateTab('probe:1');
+        await h.advance(1);
         await h.controller.openTab(tab('probe:3'));
         await settle();
         assert.deepEqual(h.residency().live.sort(), ['probe:1', 'probe:3']);
@@ -222,8 +233,7 @@ test('diagnostics count what each live view still holds, including what its prov
         const live = h.controller.getDiagnostics().tabs.find(t => t.id === 'probe:b');
         assert.deepEqual(live.resources, { scopes: 2, resources: 3, byType: { listener: 2, interval: 1 } });
 
-        await sleep(80);
-        await settle();
+        await h.advance(30);
         const dormant = h.controller.getDiagnostics().tabs.find(t => t.id === 'probe:a');
         assert.equal(dormant.view, 'dormant');
         assert.equal(dormant.resources, null, 'a sleeping view holds nothing');
@@ -275,8 +285,7 @@ test('collapsing the pane does not put the current tab to sleep', async () => {
     try {
         await h.controller.openTab(tab('probe:a'));
         h.controller.setVisible(false);
-        await sleep(80);
-        await settle();
+        await h.advance(60);
 
         assert.deepEqual(h.residency().live, ['probe:a']);
         assert.deepEqual(h.residency().dormant, []);
diff --git a/tests/side-pane-git-ai-scope.test.mjs b/tests/side-pane-git-ai-scope.test.mjs
index d1aa3c613..405a793f5 100644
--- a/tests/side-pane-git-ai-scope.test.mjs
+++ b/tests/side-pane-git-ai-scope.test.mjs
@@ -5,7 +5,10 @@ import { mountGitView, filterAiTouched, latestAiBatch, followGitWorkspace } from
 import { getProjectForgeChangesSource } from '../modules/ui-system/sources/projectforge-changes.js';
 import { getGitChangesSource } from '../modules/ui-system/sources/git-changes.js';
 
-const wait = (ms = 60) => new Promise(resolve => setTimeout(resolve, ms));
+import { waitFor } from './helpers/wait-for.mjs';
+
+// 没有计时器参与（graceMs: 0）；「什么都没发生」只需把挂起的 promise 链走完
+const flush = async (rounds = 5) => { for (let i = 0; i < rounds; i++) await new Promise(resolve => setImmediate(resolve)); };
 
 test('filterAiTouched aligns absolute / relative / windows paths by suffix', () => {
     const items = [{ path: 'src/a.js' }, { path: 'docs/b.md' }, { path: 'README.md' }];
@@ -76,55 +79,54 @@ test('the 上一轮 source narrows changes to the newest V工程 batch and follo
     try {
         assert.equal(files(view).length, 3, 'default source lists the unstaged changes');
         const select = view.querySelector('.side-git-source-select');
-        assert.ok([...select.options].some(o => o.value === 'ai-last' && o.textContent === '上一轮'));
+        assert.ok([...select.options].some(o => o.value === 'ai-last' && o.textContent.trim()));
 
         select.value = 'ai-last';
         select.dispatchEvent(new win.Event('change'));
-        await wait();
-        assert.deepEqual(files(view), ['src/a.js']);
+        await waitFor(() => files(view).join() === 'src/a.js', { message: 'ai-last never narrowed the list' });
         assert.equal(view.querySelector('.side-git-ai-banner'), null, 'no extra banner');
 
         // V工程 记了新一批：不用手动刷新
         setTimeline([{ id: 3, kind: 'edit', reason: '改文档', files: ['docs/b.md', 'notes.txt'] }]);
         state.forgeHandler({ projectId: 'p1' });
-        await wait(200);
-        assert.deepEqual(files(view).sort(), ['docs/b.md', 'notes.txt']);
+        await waitFor(() => files(view).sort().join() === 'docs/b.md,notes.txt', { message: 'a new V工程 batch never re-narrowed the list' });
 
         // 批次里的文件都已提交
         setTimeline([{ id: 4, kind: 'edit', reason: '已提交的', files: ['gone.js'] }]);
         state.forgeHandler({ projectId: 'p1' });
-        await wait(200);
-        assert.equal(view.querySelector('.side-git-empty-title').textContent, '上一轮的改动已经没有未提交内容');
+        const empty = view.querySelector('.side-git-empty');
+        await waitFor(() => empty.dataset.emptyReason === 'ai-committed', { message: 'committed batch never showed its empty state' });
+        assert.equal(empty.hidden, false);
+        assert.equal(files(view).length, 0);
+        assert.ok(empty.textContent.trim());
 
         // 没有任何批次
         setTimeline([]);
         state.forgeHandler({ projectId: 'p1' });
-        await wait(200);
-        assert.equal(view.querySelector('.side-git-empty-title').textContent, '当前工作区还没有上一轮文件改动');
+        await waitFor(() => empty.dataset.emptyReason === 'ai-none', { message: 'no batch never showed its empty state' });
+        assert.equal(empty.hidden, false);
+        assert.equal(files(view).length, 0);
 
         select.value = 'unstaged';
         select.dispatchEvent(new win.Event('change'));
-        await wait();
-        assert.equal(files(view).length, 3);
+        await waitFor(() => files(view).length === 3, { message: 'switching back never relisted the changes' });
+        assert.equal(empty.hidden, true);
     } finally {
         await handle.dispose();
         assert.equal(state.forgeHandler, null, 'V工程 subscription released');
     }
 });
 
-test('a pushed repository change refreshes the tab; only the shown workspace is subscribed', async () => {
+// 当前工作区推送触发重读、看不见时不读、展开后补读一次，见 side-pane-git-push-visibility.test.mjs
+test('only the shown workspace is subscribed; pushes for another workspace are ignored', async () => {
     const { gitView, state } = makeEnv({ batches: [] });
     const handle = await gitView.mount();
     try {
         assert.deepEqual(gitSubs(state), [['+', 'git.status', 'ws1']]);
         const before = state.statusCalls;
-        state.pushGit({ workspaceId: 'ws1', reason: 'commit' });
-        await wait();
-        assert.equal(state.statusCalls, before + 1);
-
         state.pushGit({ workspaceId: 'ws2', reason: 'files' });
-        await wait();
-        assert.equal(state.statusCalls, before + 1, 'other workspaces are ignored');
+        await flush();
+        assert.equal(state.statusCalls, before, 'other workspaces are ignored');
     } finally {
         await handle.dispose();
     }
@@ -132,38 +134,12 @@ test('a pushed repository change refreshes the tab; only the shown workspace is
     assert.equal(state.gitHandlers.size, 0);
 });
 
-test('a change while the side pane is collapsed is read when the tab is shown again', async () => {
-    const { win, view, gitView, state } = makeEnv({ batches: [] });
-    const handle = await gitView.mount();
-    const pane = win.document.createElement('div');
-    pane.className = 'vcp-side-pane';
-    win.document.body.appendChild(pane);
-    pane.appendChild(view);
-    try {
-        pane.setAttribute('aria-hidden', 'true');
-        const before = state.statusCalls;
-        state.pushGit({ workspaceId: 'ws1', reason: 'files' });
-        await wait();
-        assert.equal(state.statusCalls, before, 'nothing is read while hidden');
-
-        pane.setAttribute('aria-hidden', 'false');
-        handle.refreshIfStale();
-        await wait();
-        assert.equal(state.statusCalls, before + 1);
-        handle.refreshIfStale();
-        await wait();
-        assert.equal(state.statusCalls, before + 1, 'read once, then up to date');
-    } finally {
-        await handle.dispose();
-    }
-});
-
 test('following a topic workspace switches the mounted tab and moves the subscription', async () => {
     const { win, view, gitView, state } = makeEnv({ batches: [] });
     const handle = await gitView.mount();
     try {
         followGitWorkspace(win, 'ws2');
-        await wait();
+        await waitFor(() => gitSubs(state).at(-1)?.[2] === 'ws2', { message: 'subscription never moved to ws2' });
         assert.equal(view.querySelector('.side-git-ws-select, select:not(.side-git-source-select)')?.value, 'ws2');
         assert.deepEqual(gitSubs(state).slice(-2), [['-', 'git.status', 'ws1'], ['+', 'git.status', 'ws2']]);
         assert.equal(win.localStorage.getItem('vcp-projectforge-git-workspace'), 'ws2');
diff --git a/tests/side-pane-git-real-backend.test.mjs b/tests/side-pane-git-real-backend.test.mjs
index 416cafbc2..319506fc7 100644
--- a/tests/side-pane-git-real-backend.test.mjs
+++ b/tests/side-pane-git-real-backend.test.mjs
@@ -8,6 +8,7 @@ import path from 'node:path';
 import { JSDOM } from 'jsdom';
 
 import { mountGitView } from '../modules/ui-system/side-pane/git/git-view.js';
+import { waitFor } from './helpers/wait-for.mjs';
 
 const require = createRequire(import.meta.url);
 const gitService = require('../modules/services/gitService.js');
@@ -41,14 +42,8 @@ function createBackedApi(workspaces, calls) {
     };
 }
 
-const tick = (ms = 150) => new Promise(resolve => setTimeout(resolve, ms));
-async function waitFor(check, timeoutMs = 5000) {
-    const started = Date.now();
-    while (Date.now() - started < timeoutMs) {
-        if (check()) return;
-        await tick(50);
-    }
-}
+// 真实 git 子进程比 mock 慢，放宽等待上限
+const settles = (check, message) => waitFor(check, { timeout: 5000, interval: 20, message });
 
 test('the Git view lists and diffs the changes of a real repository', async () => {
     const root = fs.mkdtempSync(path.join(os.tmpdir(), 'vcp-git-side-'));
@@ -85,13 +80,13 @@ test('the Git view lists and diffs the changes of a real repository', async () =
         assert.deepEqual(paths(), ['a.txt', 'new.txt']);
 
         // +N/-N show up on the collapsed row, computed from the real diff
-        await waitFor(() => view.querySelector('[data-path="a.txt"] .text-diff-added'));
+        await settles(() => view.querySelector('[data-path="a.txt"] .text-diff-added'), 'counts never painted');
         assert.equal(view.querySelector('[data-path="a.txt"] .text-diff-added').textContent, '+1');
         assert.equal(view.querySelector('[data-path="a.txt"] .text-diff-removed').textContent, '-0');
 
         // expanding renders the real diff with the added line
         view.querySelector('[data-path="a.txt"] .side-git-row').click();
-        await waitFor(() => view.querySelector('[data-path="a.txt"] .side-git-diff-table'));
+        await settles(() => view.querySelector('[data-path="a.txt"] .side-git-diff-table'), 'expanded diff never rendered');
         const addedRows = [...view.querySelectorAll('[data-path="a.txt"] tr.diff-line.add .diff-content')].map(td => td.textContent);
         assert.deepEqual(addedRows, ['+three']);
 
@@ -100,15 +95,14 @@ test('the Git view lists and diffs the changes of a real repository', async () =
         await handle.refresh();
         assert.deepEqual(paths(), ['new.txt']);
         pick('staged');
-        await waitFor(() => paths().join() === 'a.txt');
-        assert.deepEqual(paths(), ['a.txt']);
+        await settles(() => paths().join() === 'a.txt', 'staged source never listed a.txt');
 
         // nothing staged after a commit -> empty state
         git(repo, 'commit', '-m', 'feat: update a');
         await handle.refresh();
         assert.equal(paths().length, 0);
         assert.equal(view.querySelector('.side-git-empty').hidden, false);
-        assert.equal(view.querySelector('.side-git-empty-title').textContent, '当前来源下没有可展示的改动');
+        assert.equal(view.querySelector('.side-git-empty').dataset.emptyReason, 'no-changes');
     } finally {
         await handle.dispose();
         try {
@@ -129,8 +123,11 @@ test('the Git view shows an add-workspace action when none are registered', asyn
     });
     await handle.ready;
     try {
-        assert.ok(view.querySelector('.side-git-empty-add'));
-        assert.equal(view.querySelector('.side-git-empty-title').textContent, '还没有工作区');
+        const empty = view.querySelector('.side-git-empty');
+        assert.equal(empty.hidden, false);
+        assert.equal(empty.dataset.emptyReason, 'no-workspace');
+        const add = empty.querySelector('button');
+        assert.ok(add && add.textContent.trim(), 'the empty state offers a named add-workspace action');
     } finally {
         await handle.dispose();
     }
diff --git a/tests/side-pane-git-refresh-focus.test.mjs b/tests/side-pane-git-refresh-focus.test.mjs
index 8b6827473..58315d4c5 100644
--- a/tests/side-pane-git-refresh-focus.test.mjs
+++ b/tests/side-pane-git-refresh-focus.test.mjs
@@ -3,6 +3,7 @@ import assert from 'node:assert/strict';
 import { JSDOM } from 'jsdom';
 
 import { mountGitView } from '../modules/ui-system/side-pane/git/git-view.js';
+import { waitFor } from './helpers/wait-for.mjs';
 
 // 文件一改主进程就推送，Git 列表静默重绘；键盘用户正停在某一行时焦点不能掉到 body
 test('a quiet refresh that redraws the list keeps focus on the same file row', async () => {
@@ -20,7 +21,6 @@ test('a quiet refresh that redraws the list keeps focus on the same file row', a
     const handle = mountGitView(host, { api, uiHelper: null });
     await handle.ready;
     const row = path => host.querySelector(`.side-git-card[data-path="${path}"] .side-git-row`);
-    const settle = () => new Promise(resolve => setTimeout(resolve, 20));
     try {
         row('b.js').focus();
         assert.equal(doc.activeElement, row('b.js'));
@@ -28,15 +28,13 @@ test('a quiet refresh that redraws the list keeps focus on the same file row', a
         // 新增一个文件：整张列表重建，焦点仍在 b.js
         changes = [{ path: 'new.js', status: 'U' }, ...changes];
         dom.window.dispatchEvent(new dom.window.Event('focus'));
-        await settle();
-        assert.ok(host.querySelector('.side-git-card[data-path="new.js"]'), 'list was redrawn');
+        await waitFor(() => host.querySelector('.side-git-card[data-path="new.js"]'), { message: 'list was never redrawn' });
         assert.equal(doc.activeElement, row('b.js'));
 
         // 聚焦的文件被提交掉了：焦点给同一位置的行，不掉到 body
         changes = changes.filter(item => item.path !== 'b.js');
         dom.window.dispatchEvent(new dom.window.Event('focus'));
-        await settle();
-        assert.equal(row('b.js'), null);
+        await waitFor(() => row('b.js') === null, { message: 'committed file never left the list' });
         assert.ok(host.contains(doc.activeElement) && doc.activeElement.isConnected, 'focus stays in the list');
         assert.equal(doc.activeElement.classList.contains('side-git-row'), true);
     } finally {
diff --git a/tests/side-pane-git-stale-diff.test.mjs b/tests/side-pane-git-stale-diff.test.mjs
index e5055e441..b722025a7 100644
--- a/tests/side-pane-git-stale-diff.test.mjs
+++ b/tests/side-pane-git-stale-diff.test.mjs
@@ -5,7 +5,7 @@ import { JSDOM } from 'jsdom';
 import { mountGitView } from '../modules/ui-system/side-pane/git/git-view.js';
 import { getGitChangesSource } from '../modules/ui-system/sources/git-changes.js';
 
-const wait = ms => new Promise(resolve => setTimeout(resolve, ms));
+import { waitFor } from './helpers/wait-for.mjs';
 
 function fixture() {
     const dom = new JSDOM('<section id="view"></section>', { pretendToBeVisual: true });
@@ -38,21 +38,18 @@ test('line counts and the expanded diff follow a second edit of a modified file'
     const f = fixture();
     try {
         await f.view.ready;
-        await wait(20);
-        assert.equal(f.counts(), '+1-0');
+        await waitFor(() => f.counts() === '+1-0', { message: 'status counts never painted' });
         assert.equal(f.state.diffs, 0, 'counts come with the status, not from one diff per file');
 
         f.view.element.querySelector('.side-git-row').click();
-        await wait(20);
-        assert.equal(f.view.element.querySelectorAll('.side-git-diff-table .diff-line.add').length, 1);
+        await waitFor(() => f.view.element.querySelectorAll('.side-git-diff-table .diff-line.add').length === 1, { message: 'expanded diff never rendered' });
 
         f.state.after = 'a\nb\nc\nd\n';
         f.state.added = 4;
         f.push();
-        await wait(50);
-        assert.equal(f.counts(), '+4-0');
+        await waitFor(() => f.counts() === '+4-0', { message: 'push never refreshed the counts' });
         assert.equal(f.view.element.querySelector('.side-git-row').getAttribute('aria-expanded'), 'true', 'the open file stays open');
-        assert.equal(f.view.element.querySelectorAll('.side-git-diff-table .diff-line.add').length, 4);
+        await waitFor(() => f.view.element.querySelectorAll('.side-git-diff-table .diff-line.add').length === 4, { message: 'open diff kept the stale text' });
     } finally { f.cleanup(); }
 });
 
@@ -63,14 +60,13 @@ test('copying the absolute path of a file in a subdirectory workspace uses the r
         value: { writeText: async text => { copied.push(text); } } });
     try {
         await f.view.ready;
-        await wait(20);
+        await waitFor(() => f.view.element.querySelector('.side-git-row'), { message: 'row never rendered' });
         const row = f.view.element.querySelector('.side-git-row');
         row.dispatchEvent(new f.dom.window.MouseEvent('contextmenu', { bubbles: true, cancelable: true, clientX: 5, clientY: 5 }));
-        const item = [...f.doc.querySelectorAll('[role="menuitem"], .side-git-context-menu button')]
-            .find(el => el.textContent.includes('复制绝对路径'));
+        const item = f.doc.querySelector('[role="menuitem"][data-action="copy-abs"]');
         assert.ok(item, 'the context menu offers the absolute path');
         item.click();
-        await wait(10);
+        await waitFor(() => copied.length === 1, { message: 'absolute path never copied' });
         assert.deepEqual(copied, ['/repo/pkg/x.js']);
     } finally { f.cleanup(); }
 });
diff --git a/tests/side-pane-git.test.mjs b/tests/side-pane-git.test.mjs
index dda78a104..1b13a4b75 100644
--- a/tests/side-pane-git.test.mjs
+++ b/tests/side-pane-git.test.mjs
@@ -3,6 +3,7 @@ import assert from 'node:assert/strict';
 import { JSDOM } from 'jsdom';
 
 import { mountGitView } from '../modules/ui-system/side-pane/git/git-view.js';
+import { waitFor } from './helpers/wait-for.mjs';
 
 test('the Git view has source select, flat change cards, expandable diff, context menu', async () => {
     const dom = new JSDOM(`
@@ -52,10 +53,8 @@ test('the Git view has source select, flat change cards, expandable diff, contex
     // header: one source select + one refresh button, nothing else (single workspace => no workspace picker)
     assert.deepEqual([...viewElement.querySelectorAll('.side-git-source-select option')].map(o => o.value), ['unstaged', 'staged']);
     assert.equal(viewElement.querySelector('.side-git-ws-select').hidden, true);
-    assert.match(viewElement.querySelector('.side-git-refresh-btn').textContent, /刷新/);
-    for (const gone of ['.side-git-branch-badge', '.side-git-sync-badge', '.side-git-commit-input', '.side-git-group', '.side-git-row-action-btn', '.side-git-graph-btn']) {
-        assert.equal(viewElement.querySelector(gone), null, gone + ' must not exist');
-    }
+    const headerControls = [...viewElement.querySelector('.side-git-header').querySelectorAll('select, button, input, textarea')].filter(el => !el.hidden);
+    assert.deepEqual(headerControls.map(el => el.tagName), ['SELECT', 'BUTTON']);
 
     // flat list, default source = unstaged
     const cards = () => [...viewElement.querySelectorAll('.side-git-card')];
@@ -63,8 +62,8 @@ test('the Git view has source select, flat change cards, expandable diff, contex
     assert.equal(cards()[0].querySelector('.side-git-file-name').textContent, 'unstaged.js');
     assert.equal(cards()[0].querySelector('.side-git-file-dir').textContent, 'src');
 
-    // +N -N are filled in without expanding
-    await new Promise(resolve => setTimeout(resolve, 30));
+    // +N -N are filled in without expanding (no counts in the status => computed from the fetched diff)
+    await waitFor(() => cards()[0].querySelector('.text-diff-added'), { message: 'diff-stat counts never painted' });
     assert.equal(cards()[0].querySelector('.text-diff-added').textContent, '+3');
     assert.equal(cards()[0].querySelector('.text-diff-removed').textContent, '-1');
 
@@ -72,13 +71,12 @@ test('the Git view has source select, flat change cards, expandable diff, contex
     const row = cards()[0].querySelector('.side-git-row');
     assert.equal(row.getAttribute('aria-expanded'), 'false');
     row.click();
-    await new Promise(resolve => setTimeout(resolve, 20));
+    await waitFor(() => cards()[0].querySelector('.side-git-diff-table'), { message: 'expanded diff never rendered' });
     assert.equal(row.getAttribute('aria-expanded'), 'true');
     assert.equal(cards()[0].querySelector('.side-git-diff').hidden, false);
-    assert.ok(cards()[0].querySelector('.side-git-diff-table'));
     // only one file is open at a time: opening another closes the first
     cards()[1].querySelector('.side-git-row').click();
-    await new Promise(resolve => setTimeout(resolve, 20));
+    await waitFor(() => cards()[1].querySelector('.side-git-row').getAttribute('aria-expanded') === 'true', { message: 'second file never opened' });
     assert.equal(row.getAttribute('aria-expanded'), 'false');
     assert.equal(cards()[0].querySelector('.side-git-diff').hidden, true);
     assert.equal(cards()[1].querySelector('.side-git-row').getAttribute('aria-expanded'), 'true');
@@ -87,15 +85,14 @@ test('the Git view has source select, flat change cards, expandable diff, contex
 
     // a deleted file cannot be revealed in the file manager
     cards()[2].querySelector('.side-git-row').dispatchEvent(new dom.window.MouseEvent('contextmenu', { bubbles: true, cancelable: true, clientX: 10, clientY: 10 }));
-    assert.equal(doc.querySelector('.side-git-context-item').disabled, true);
+    assert.equal(doc.querySelector('[data-action="reveal"]').disabled, true);
     doc.dispatchEvent(new dom.window.KeyboardEvent('keydown', { key: 'Escape' }));
 
     // staged source
     const select = viewElement.querySelector('.side-git-source-select');
     select.value = 'staged';
     select.dispatchEvent(new dom.window.Event('change'));
-    await new Promise(resolve => setTimeout(resolve, 20));
-    assert.deepEqual(cards().map(c => c.dataset.path), ['src/staged.js']);
+    await waitFor(() => cards().map(c => c.dataset.path).join() === 'src/staged.js', { message: 'staged source never listed' });
 
     // keyboard: Shift+F10 on a row opens the menu with focus inside, arrows move, Escape returns focus to the row
     const kbRow = cards()[0].querySelector('.side-git-row');
@@ -115,21 +112,22 @@ test('the Git view has source select, flat change cards, expandable diff, contex
 
     // context menu: reveal / copy absolute / copy relative
     cards()[0].querySelector('.side-git-row').dispatchEvent(new dom.window.MouseEvent('contextmenu', { bubbles: true, cancelable: true, clientX: 10, clientY: 10 }));
-    const items = [...doc.querySelectorAll('.side-git-context-item')];
-    assert.deepEqual(items.map(i => i.querySelector('.side-git-context-label').textContent), ['在文件管理器中打开', '复制绝对路径', '复制相对路径']);
-    items[2].click();
-    await new Promise(resolve => setTimeout(resolve, 5));
+    const items = [...doc.querySelectorAll('[role="menuitem"]')];
+    assert.deepEqual(items.map(i => i.dataset.action), ['reveal', 'copy-abs', 'copy-rel']);
+    assert.ok(items.every(i => i.textContent.trim()), 'every menu item has a visible name');
+    doc.querySelector('[data-action="copy-rel"]').click();
+    await waitFor(() => copied.length === 1, { message: 'relative path never copied' });
     assert.deepEqual(copied, ['src/staged.js']);
     assert.equal(doc.querySelector('.side-git-context-menu'), null, 'menu closes after choosing');
 
     cards()[0].querySelector('.side-git-row').dispatchEvent(new dom.window.MouseEvent('contextmenu', { bubbles: true, cancelable: true, clientX: 10, clientY: 10 }));
-    [...doc.querySelectorAll('.side-git-context-item')][1].click();
-    await new Promise(resolve => setTimeout(resolve, 5));
+    doc.querySelector('[data-action="copy-abs"]').click();
+    await waitFor(() => copied.length === 2, { message: 'absolute path never copied' });
     assert.equal(copied[1], '/code/vcpchat/src/staged.js');
 
     cards()[0].querySelector('.side-git-row').dispatchEvent(new dom.window.MouseEvent('contextmenu', { bubbles: true, cancelable: true, clientX: 10, clientY: 10 }));
-    [...doc.querySelectorAll('.side-git-context-item')][0].click();
-    await new Promise(resolve => setTimeout(resolve, 5));
+    doc.querySelector('[data-action="reveal"]').click();
+    await waitFor(() => revealed.length === 1, { message: 'reveal never requested' });
     assert.deepEqual(revealed, [['ws-demo', 'src/staged.js']]);
 
     await handle.dispose();
@@ -212,7 +210,7 @@ test('a status push while reading deep in a long list keeps the mounted cards an
 
     edits += 1;
     await handle.refresh();
-    await new Promise(resolve => setTimeout(resolve, 10));
+    await new Promise(resolve => setImmediate(resolve));
     assert.equal(cards(), 240, 'the re-render mounts as many cards as were there');
     assert.equal(body.scrollTop, 5000, 'and stays where the reader was');
     handle.dispose();
diff --git a/tests/side-pane-model-trajectory.test.mjs b/tests/side-pane-model-trajectory.test.mjs
index 9882f438c..2c3595ab0 100644
--- a/tests/side-pane-model-trajectory.test.mjs
+++ b/tests/side-pane-model-trajectory.test.mjs
@@ -1,10 +1,19 @@
-import test, { after } from 'node:test';
+import test, { after, mock } from 'node:test';
 import assert from 'node:assert/strict';
 import { JSDOM } from 'jsdom';
 import { createModelTrajectorySideProvider, trajectoryKeyFor, EXPANSION_KINDS } from '../modules/ui-system/side-pane/modelTrajectorySideProvider.js';
 import { createSidePaneRootScope } from '../modules/ui-system/side-pane/side-pane-occurrence.js';
-
-const wait = (ms = 30) => new Promise(resolve => setTimeout(resolve, ms));
+import { waitFor } from './helpers/wait-for.mjs';
+
+// 只冲掉 IPC stub 的 promise；setImmediate 不被 mock.timers 接管
+const settle = async () => { for (let i = 0; i < 5; i += 1) await new Promise(resolve => setImmediate(resolve)); };
+// 重读（80ms）和搜索（120ms）的防抖都走 lifecycle scope 的全局 setTimeout：挂载前接管，用 tick 推进
+const RELOAD_MS = 80;
+const SEARCH_MS = 120;
+const fakeTimers = (t) => {
+    mock.timers.enable({ apis: ['setTimeout'] });
+    t.after(() => mock.timers.reset());
+};
 const msg = (role, text) => ({ role, parts: [{ kind: 'text', text }] });
 const TOOL_REQ = '<<<[TOOL_REQUEST]>>>\ntool_name:「始」FileOperator「末」,\ncommand:「始」ReadFile「末」\n<<<[END_TOOL_REQUEST]>>>';
 
@@ -78,16 +87,17 @@ test('mountTab renders summary, call cards, deltas, and error block', async () =
     const handle = await provider.mountTab({ id: 'model-trajectory:main' }, view);
     assert.equal(state.watch, 1);
     assert.equal(state.lists[0][0], 'agent1__t1');
-    const summary = view.querySelector('.side-traj-summary').textContent;
-    assert.match(summary, /2 次调用/);
-    assert.match(summary, /1,280 tok/);
-    assert.match(summary, /deepseek-v4/);
+    const summary = view.querySelector('.side-traj-summary');
+    assert.equal(summary.dataset.callCount, '2');
+    assert.match(summary.textContent, /1,?280/);
+    assert.match(summary.textContent, /deepseek-v4/);
     const cards = view.querySelectorAll('.side-traj-call');
     assert.equal(cards.length, 2);
+    const meta = cards[0].querySelector('.side-traj-call-meta').textContent;
     assert.match(cards[0].textContent, /01/);
-    assert.match(cards[0].textContent, /IN 1,200/);
-    assert.match(cards[0].textContent, /OUT 80/);
-    assert.match(cards[0].textContent, /1\.50s/);
+    assert.match(meta, /1,?200/);
+    assert.match(meta, /\b80\b/);
+    assert.match(meta, /1\.50?\D/);
     assert.equal(cards[0].querySelectorAll('.side-traj-section-input .side-traj-row').length, 2);
     const secondInputs = cards[1].querySelectorAll('.side-traj-section-input .side-traj-row');
     assert.equal(secondInputs.length, 1);
@@ -101,91 +111,100 @@ test('mountTab renders summary, call cards, deltas, and error block', async () =
 test('rows toggle, expand-all and per-kind menu switches follow the command versions', async () => {
     const { provider, view, doc } = makeEnv();
     await provider.mountTab({ id: 'model-trajectory:main' }, view);
-    const userRow = view.querySelector('.side-traj-row[data-trajectory-role="user"]');
-    assert.ok(userRow.classList.contains('open'));
-    userRow.querySelector('.side-traj-row-head').click();
-    assert.ok(!userRow.classList.contains('open'));
-    view.querySelector('[aria-label="自定义展开"]').click();
-    assert.equal(view.querySelectorAll('.side-traj-menu-item').length, EXPANSION_KINDS.length);
+    const expanded = role => view.querySelector(`.side-traj-row[data-trajectory-role="${role}"] .side-traj-row-head`).getAttribute('aria-expanded');
+    assert.equal(expanded('user'), 'true');
+    view.querySelector('.side-traj-row[data-trajectory-role="user"] .side-traj-row-head').click();
+    assert.equal(expanded('user'), 'false');
+    view.querySelector('[data-action="expansion-menu"]').click();
+    assert.equal(view.querySelectorAll('[role="menuitemcheckbox"]').length, EXPANSION_KINDS.length);
     view.querySelector('[data-trajectory-expansion-kind="system"]').click();
-    const systemRow = view.querySelector('.side-traj-row[data-trajectory-role="system"]');
-    assert.ok(!systemRow.classList.contains('open'));
-    view.querySelector('[aria-label="全部展开"]').click();
-    assert.ok(systemRow.classList.contains('open'));
-    assert.ok(userRow.classList.contains('open'));
+    assert.equal(expanded('system'), 'false');
+    view.querySelector('[data-action="toggle-all"]').click();
+    assert.equal(expanded('system'), 'true');
+    assert.equal(expanded('user'), 'true');
     doc.body.click();
     assert.equal(view.querySelector('.side-traj-menu').hidden, true);
 });
 
-test('search counts matches, handles no-match, and Escape closes', async () => {
+test('search counts matches, handles no-match, and Escape closes', async (t) => {
+    fakeTimers(t);
     const { provider, view } = makeEnv();
     await provider.mountTab({ id: 'model-trajectory:main' }, view);
-    view.querySelector('[aria-label="搜索调用轨迹"]').click();
+    view.querySelector('[data-action="search"]').click();
     const input = view.querySelector('.side-traj-search-input');
     const count = view.querySelector('.side-traj-search-count');
     typeInto(input, 'hello');
-    await wait(200);
+    mock.timers.tick(SEARCH_MS - 1);
+    assert.equal(count.textContent, '0/0', 'debounced');
+    mock.timers.tick(1);
     assert.equal(count.textContent, '1/1');
     typeInto(input, 'zzz-nothing');
-    await wait(200);
+    mock.timers.tick(SEARCH_MS);
     assert.equal(count.textContent, '0/0');
     typeInto(input, 'FileOperator');
-    await wait(200);
+    mock.timers.tick(SEARCH_MS);
     assert.match(count.textContent, /^1\/\d+$/);
     assert.notEqual(count.textContent, '1/1');
-    view.querySelector('[aria-label="下一个匹配项"]').click();
+    view.querySelector('[data-action="search-next"]').click();
     assert.match(count.textContent, /^2\//);
     input.dispatchEvent(new input.ownerDocument.defaultView.KeyboardEvent('keydown', { key: 'Escape', bubbles: true }));
     assert.equal(view.querySelector('.side-traj-search').hidden, true);
 });
 
-test('a collapsed row containing the active match is revealed', async () => {
+test('a collapsed row containing the active match is revealed', async (t) => {
+    fakeTimers(t);
     const { provider, view } = makeEnv();
     await provider.mountTab({ id: 'model-trajectory:main' }, view);
-    const toolResultRow = view.querySelector('.side-traj-row[data-trajectory-role="tool-result"]');
-    toolResultRow.querySelector('.side-traj-row-head').click();
-    assert.ok(!toolResultRow.classList.contains('open'));
-    view.querySelector('[aria-label="搜索调用轨迹"]').click();
+    const head = view.querySelector('.side-traj-row[data-trajectory-role="tool-result"] .side-traj-row-head');
+    head.click();
+    assert.equal(head.getAttribute('aria-expanded'), 'false');
+    view.querySelector('[data-action="search"]').click();
     typeInto(view.querySelector('.side-traj-search-input'), 'hello world');
-    await wait(200);
-    assert.ok(toolResultRow.classList.contains('open'));
-    assert.ok(toolResultRow.classList.contains('revealed'));
+    mock.timers.tick(SEARCH_MS);
+    assert.equal(head.getAttribute('aria-expanded'), 'true');
 });
 
 test('copy button copies the message content', async () => {
     const { provider, view, state } = makeEnv();
     await provider.mountTab({ id: 'model-trajectory:main' }, view);
     view.querySelector('.side-traj-row[data-trajectory-role="user"] .side-traj-row-copy').click();
-    await wait();
+    await waitFor(() => state.copied.length === 1, { message: 'nothing copied' });
     assert.deepEqual(state.copied, ['帮我读一下文件']);
 });
 
-test('change events reload only for the current session', async () => {
+test('change events reload only for the current session', async (t) => {
+    fakeTimers(t);
     const { provider, view, state, fire } = makeEnv();
     await provider.mountTab({ id: 'model-trajectory:main' }, view);
     const before = state.lists.length;
     fire({ sessionKey: 'other__x', id: 'z', status: 'completed' });
-    await wait(150);
+    mock.timers.tick(RELOAD_MS * 2);
+    await settle();
     assert.equal(state.lists.length, before);
     state.recs = [...state.recs, { ...records()[0], id: 'call_c', startedAt: 1700000009000 }];
     fire({ sessionKey: 'agent1__t1', id: 'call_c', status: 'completed' });
-    await wait(150);
+    fire({ sessionKey: 'agent1__t1', id: 'call_c', status: 'completed' });
+    mock.timers.tick(RELOAD_MS);
+    await settle();
+    assert.equal(state.lists.length, before + 1, 'a burst of changes is read once');
     assert.equal(view.querySelectorAll('.side-traj-call').length, 3);
 });
 
-test('empty and no-conversation states, list errors, clear', async () => {
+test('empty and no-conversation states, list errors, clear', async (t) => {
     let env = makeEnv({ conversation: { item: null, topicId: null } });
     await env.provider.mountTab({ id: 'x' }, env.view);
-    assert.match(env.view.querySelector('.side-traj-state').textContent, /请先在主聊天里选择/);
+    assert.equal(env.view.querySelector('.side-traj-state').hidden, false);
+    assert.equal(env.view.querySelector('.side-traj-state').dataset.state, 'no-conversation');
     assert.equal(env.state.lists.length, 0);
 
     env = makeEnv({ recs: [] });
     await env.provider.mountTab({ id: 'x' }, env.view);
-    assert.match(env.view.querySelector('.side-traj-state').textContent, /还没有模型调用记录/);
-    assert.equal(env.view.querySelector('[aria-label="搜索调用轨迹"]').hidden, true);
+    assert.equal(env.view.querySelector('.side-traj-state').dataset.state, 'empty');
+    assert.equal(env.view.querySelector('[data-action="search"]').hidden, true);
 
     env = makeEnv({ result: { success: false, error: 'boom' } });
     await env.provider.mountTab({ id: 'x' }, env.view);
+    assert.equal(env.view.querySelector('.side-traj-state').dataset.state, 'error');
     assert.match(env.view.querySelector('.side-traj-state').textContent, /boom/);
 
     // 主进程还是旧的（没注册这组接口）：invoke 抛错，页面要留着并提示重启，而不是让 mountTab 抛出
@@ -196,13 +215,17 @@ test('empty and no-conversation states, list errors, clear', async () => {
         getConversation: () => env.state.conversation
     });
     const handle = await failing.mountTab({ id: 'x' }, env.view);
-    assert.match(env.view.querySelector('.side-traj-state').textContent, /完全退出并重新打开/);
+    // 没有切换通知时它会轮询兜底：断言失败也要拆掉，否则定时器让进程退不出去
+    t.after(() => handle.dispose());
+    assert.equal(env.view.querySelector('.side-traj-state').hidden, false);
+    assert.equal(env.view.querySelector('.side-traj-state').dataset.state, 'service-missing');
     await handle.dispose();
 
     env = makeEnv();
     await env.provider.mountTab({ id: 'x' }, env.view);
-    env.view.querySelector('[aria-label="清空这个话题的调用轨迹"]').click();
-    await wait();
+    assert.equal(env.view.querySelector('.side-traj-state').dataset.state, undefined, 'no state panel over a populated timeline');
+    env.view.querySelector('[data-action="clear"]').click();
+    await waitFor(() => env.state.cleared.length === 1, { message: 'clear did not run' });
     assert.deepEqual(env.state.cleared, ['agent1__t1']);
 });
 
@@ -212,8 +235,7 @@ test('switching conversation reloads through the selection subscription, and dis
     assert.equal(state.conversationListeners.length, 1);
     state.conversation = { item: { id: 'agent2', name: '另一个' }, topicId: 't9' };
     state.conversationListeners[0]();
-    await wait(80);
-    assert.equal(state.lists.at(-1)[0], 'agent2__t9');
+    await waitFor(() => state.lists.at(-1)[0] === 'agent2__t9', { message: 'did not reload the new conversation' });
     await handle.dispose();
     assert.ok(state.conversationUnsubscribed);
 });
@@ -249,14 +271,16 @@ function installObserver(win) {
     return observers;
 }
 
-test('cards are built lazily: the newest ones at once, the rest when scrolled near, searched or focused', async () => {
+test('cards are built lazily: the newest ones at once, the rest when scrolled near, searched or focused', async (t) => {
+    fakeTimers(t);
     const env = makeEnv({ recs: manyRecords(8) });
     const observers = installObserver(env.dom.window);
     const handle = await env.provider.mountTab({ id: 'x' }, env.view);
     const cards = [...env.view.querySelectorAll('.side-traj-call')];
     assert.equal(cards.length, 8);
-    const pending = () => cards.filter(card => card.querySelector('.side-traj-call-body.pending')).map(card => card.dataset.trajectoryCall.split(':')[0]);
-    assert.deepEqual(pending(), ['call_0', 'call_1', 'call_2', 'call_3', 'call_4']);
+    // 未构建的卡片没有消息行；按卡片序号（最旧在前）记
+    const pending = () => cards.flatMap((card, index) => (card.querySelector('.side-traj-row') ? [] : [index]));
+    assert.deepEqual(pending(), [0, 1, 2, 3, 4]);
     assert.equal(cards[0].querySelector('.side-traj-row'), null, 'an unbuilt card has no message rows');
     assert.equal(observers[0].targets.size, 5);
 
@@ -265,39 +289,46 @@ test('cards are built lazily: the newest ones at once, the rest when scrolled ne
     assert.equal(observers[0].targets.has(cards[3]), false);
 
     // 搜索命中的卡片（call_1）会先构建出来
-    env.view.querySelector('.side-traj-icon-btn[title="搜索调用轨迹"]').click();
+    env.view.querySelector('[data-action="search"]').click();
     typeInto(env.view.querySelector('.side-traj-search-input'), '独有词');
-    await wait(200);
+    mock.timers.tick(SEARCH_MS);
     assert.equal(env.view.querySelector('.side-traj-search-count').textContent, '1/1');
-    assert.equal(pending().includes('call_1'), false);
+    assert.equal(pending().includes(1), false);
 
     // 消息右键「查看调用轨迹」：定位到 m0，卡片构建并闪烁
     await env.provider.openModelTrajectoryTab({ requestId: 'm0' });
-    assert.equal(pending().includes('call_0'), false);
+    assert.equal(pending().includes(0), false);
     assert.ok(cards[0].classList.contains('flash'));
     await handle.dispose();
 });
 
-test('focusing a reply without a recorded call says so once; cached tokens and omitted context are shown', async () => {
+test('focusing a reply without a recorded call says so once; cached tokens and omitted context are shown', async (t) => {
+    fakeTimers(t);
     const recs = manyRecords(2);
     recs[1].response.usage = { inputTokens: 900, outputTokens: 50, totalTokens: 950, cachedInputTokens: 640, reasoningTokens: 30 };
     recs[1].request.omittedMessages = 7;
     const env = makeEnv({ recs });
     const handle = await env.provider.mountTab({ id: 'x' }, env.view);
     const card = env.view.querySelectorAll('.side-traj-call')[1];
-    assert.match(card.querySelector('.side-traj-call-meta').textContent, /缓存 640/);
-    assert.match([...card.querySelectorAll('.side-traj-call-meta span')].find(el => /OUT/.test(el.textContent)).title, /思考 30/);
-    assert.match(card.querySelector('.side-traj-call-note').textContent, /更早的 7 条/);
+    assert.match(card.querySelector('.side-traj-call-meta').textContent, /\b640\b/);
+    // 思考 token 数挂在输出 token 那一段的 title 上
+    assert.match([...card.querySelectorAll('.side-traj-call-meta span')].find(el => /\b50\b/.test(el.textContent)).title, /\b30\b/);
+    assert.match(card.querySelector('.side-traj-call-note').textContent, /\b7\b/);
 
+    const toasts = env.state.toasts.length;
     await env.provider.openModelTrajectoryTab({ requestId: 'no-such-message' });
-    assert.equal(env.state.toasts.filter(text => /没有对应的调用记录/.test(text)).length, 1);
+    assert.equal(env.state.toasts.length, toasts + 1);
     env.fire({ sessionKey: 'agent1__t1', id: 'call_1', status: 'completed' });
-    await wait(150);
-    assert.equal(env.state.toasts.filter(text => /没有对应的调用记录/.test(text)).length, 1, 'a later reload does not repeat the notice');
+    const reads = env.state.lists.length;
+    mock.timers.tick(RELOAD_MS);
+    await settle();
+    assert.equal(env.state.lists.length, reads + 1);
+    assert.equal(env.state.toasts.length, toasts + 1, 'a later reload does not repeat the notice');
     await handle.dispose();
 });
 
-test('a hidden tab defers change events and conversation switches until it is shown again', async () => {
+test('a hidden tab defers change events and conversation switches until it is shown again', async (t) => {
+    fakeTimers(t);
     const { provider, view, state, fire } = makeEnv();
     let visible = true;
     const handle = await provider.mountTab({ id: 'x' }, view, { occurrence: { isVisible: () => visible } });
@@ -310,12 +341,17 @@ test('a hidden tab defers change events and conversation switches until it is sh
     state.recs = [...state.recs, { ...records()[0], id: 'call_c', startedAt: 1700000009000 }];
     fire({ sessionKey: 'agent1__t1', id: 'call_c', status: 'completed' });
     fire({ sessionKey: 'agent1__t1', id: 'call_c', status: 'completed' });
-    await wait(150);
+    // 取消定时器的 clearTimeout 在 scope 的微任务里执行：先冲掉再推进时间
+    await settle();
+    mock.timers.tick(RELOAD_MS * 2);
+    await settle();
     assert.equal(state.lists.length, mounted);
 
     visible = true;
     handle.resume();
-    await wait(80);
+    await settle();
+    mock.timers.tick(RELOAD_MS * 2);
+    await settle();
     assert.equal(state.lists.length, mounted + 1);
     assert.equal(view.querySelectorAll('.side-traj-call').length, 3);
 
@@ -324,11 +360,12 @@ test('a hidden tab defers change events and conversation switches until it is sh
     handle.suspend();
     state.conversation = { item: { id: 'agent2', name: '另一个' }, topicId: 't9' };
     state.conversationListeners[0]();
-    await wait(80);
+    mock.timers.tick(RELOAD_MS * 2);
+    await settle();
     assert.equal(state.lists.length, mounted + 1);
     visible = true;
     handle.resume();
-    await wait(80);
+    await settle();
     assert.equal(state.lists.at(-1)[0], 'agent2__t9');
 
     // 期间没有变化就不重读
@@ -337,7 +374,8 @@ test('a hidden tab defers change events and conversation switches until it is sh
     handle.suspend();
     visible = true;
     handle.resume();
-    await wait(80);
+    mock.timers.tick(RELOAD_MS * 2);
+    await settle();
     assert.equal(state.lists.length, settled);
     await handle.dispose();
 });
@@ -348,8 +386,7 @@ test('releasing only the view scope tears down every listener, timer and subscri
     await env.provider.mountTab({ id: 'x' }, env.view, { scope: view });
     const { diagnostics } = globalThis.VCPLifecycle;
     const owned = diagnostics.snapshot().find(scope => scope.parentId === view.id);
-    const types = new Set(owned.resources.map(resource => resource.type));
-    assert.ok(types.has('listener') && types.has('subscription'), 'resources are held by the view scope');
+    assert.ok(owned, 'the tab scope hangs off the view scope');
 
     // 控制器让标签休眠时只释放 view scope，不一定先调 handle.dispose
     await view.dispose('dormant');
@@ -367,7 +404,7 @@ test('closing the trajectory tab while the push registration is pending leaves n
     env.api.onModelTrajectoryChanged = () => { subscribed += 1; return () => {}; };
     const view = createSidePaneRootScope(null, 'test-view');
     const mounting = env.provider.mountTab({ id: 'x' }, env.view, { scope: view });
-    await wait(5);
+    await waitFor(() => finishWatch, { message: 'watch was not requested' });
     await view.dispose('mount-canceled');
     finishWatch({ success: true });
     assert.equal(await mounting, null);
@@ -384,26 +421,26 @@ test('opening from a side chat reads the child topic and finds its reply; a main
     assert.equal(env.state.lists.at(-1)[0], 'agent1__t1');
 
     const child = { item: { id: 'agent1', name: '辅助对话 1' }, topicId: 'sidechat_1' };
+    const lastKey = () => env.state.lists.at(-1)[0];
+    const toasts = env.state.toasts.length;
     await env.provider.openModelTrajectoryTab({ requestId: 'm1', conversation: child });
-    await wait(50);
-    assert.equal(env.state.lists.at(-1)[0], 'agent1__sidechat_1');
-    assert.ok(env.view.querySelectorAll('.side-traj-call')[1].classList.contains('flash'));
-    assert.equal(env.state.toasts.filter(text => /没有对应的调用记录/.test(text)).length, 0);
+    await waitFor(() => lastKey() === 'agent1__sidechat_1', { message: 'child topic not read' });
+    await waitFor(() => env.view.querySelectorAll('.side-traj-call')[1]?.classList.contains('flash'), { message: 'reply not focused' });
+    assert.equal(env.state.toasts.length, toasts, 'no "not found" notice for a reply that exists');
 
     env.state.conversation = { item: { id: 'agent2', name: '另一个' }, topicId: 't9' };
     env.state.conversationListeners[0]();
-    await wait(50);
-    assert.equal(env.state.lists.at(-1)[0], 'agent2__t9');
+    await waitFor(() => lastKey() === 'agent2__t9', { message: 'main chat switch not followed' });
 
     await env.provider.openModelTrajectoryTab({ requestId: 'm0', conversation: child });
-    await wait(50);
+    await waitFor(() => lastKey() === 'agent1__sidechat_1');
     await env.provider.openModelTrajectoryTab();
-    await wait(50);
-    assert.equal(env.state.lists.at(-1)[0], 'agent2__t9', 'opening from the main chat follows the main chat again');
+    await waitFor(() => lastKey() === 'agent2__t9', { message: 'opening from the main chat follows the main chat again' });
     await handle.dispose();
 });
 
-test('rebuilding cards on every change does not pile up listener records on the view scope', async () => {
+test('rebuilding cards on every change does not pile up listener records on the view scope', async (t) => {
+    fakeTimers(t);
     const env = makeEnv({ recs: manyRecords(3) });
     const view = createSidePaneRootScope(null, 'test-view');
     const handle = await env.provider.mountTab({ id: 'x' }, env.view, { scope: view });
@@ -413,19 +450,21 @@ test('rebuilding cards on every change does not pile up listener records on the
     for (let i = 0; i < 10; i++) {
         env.state.recs = env.state.recs.map(record => ({ ...record, endedAt: record.endedAt + 1 }));
         env.fire({ sessionKey: 'agent1__t1' });
-        await wait(150);
+        mock.timers.tick(RELOAD_MS);
+        await settle();
     }
     assert.ok(env.state.lists.length > 10, 'the cards were rebuilt on each change');
     assert.equal(owned(), before);
     // 行内的复制按钮仍然能用
     env.view.querySelector('.side-traj-row-copy:not([disabled])').click();
-    await wait();
+    await settle();
     assert.equal(env.state.copied.length, 1);
     await handle.dispose();
     await view.dispose('test');
 });
 
-test('a reader parked at the top of the trajectory stays there while new calls arrive', async () => {
+test('a reader parked at the top of the trajectory stays there while new calls arrive', async (t) => {
+    fakeTimers(t);
     const env = makeEnv({ recs: manyRecords(4) });
     const handle = await env.provider.mountTab({ id: 'x' }, env.view);
     const scroller = env.view.querySelector('.side-traj-scroll');
@@ -436,7 +475,8 @@ test('a reader parked at the top of the trajectory stays there while new calls a
     scroller.dispatchEvent(new env.dom.window.Event('scroll'));
     env.state.recs = [...env.state.recs, ...manyRecords(6).slice(4)];
     env.fire({ sessionKey: 'agent1__t1' });
-    await wait(150);
+    mock.timers.tick(RELOAD_MS);
+    await settle();
     assert.equal(env.view.querySelectorAll('.side-traj-call').length, 6);
     assert.equal(scroller.scrollTop, 0);
     await handle.dispose();
@@ -445,7 +485,7 @@ test('a reader parked at the top of the trajectory stays there while new calls a
 test('the expansion menu works from the keyboard and keeps focus on the switch being toggled', async () => {
     const { provider, view, doc, dom } = makeEnv();
     await provider.mountTab({ id: 'model-trajectory:main' }, view);
-    const menuBtn = view.querySelector('[aria-label="自定义展开"]');
+    const menuBtn = view.querySelector('[data-action="expansion-menu"]');
     const menu = view.querySelector('.side-traj-menu');
     const key = (target, name) => target.dispatchEvent(new dom.window.KeyboardEvent('keydown', { key: name, bubbles: true, cancelable: true }));
     assert.equal(menuBtn.getAttribute('aria-haspopup'), 'menu');
@@ -472,15 +512,14 @@ test('clearing asks through the app dialog, not window.confirm, and clears the c
     const env = makeEnv({ showConfirmDialog: (...args) => { asked.push(args); return new Promise(resolve => { answer = resolve; }); } });
     env.dom.window.confirm = () => { throw new Error('native confirm must not be used'); };
     await env.provider.mountTab({ id: 'x' }, env.view);
-    env.view.querySelector('[aria-label="清空这个话题的调用轨迹"]').click();
-    await wait(5);
-    assert.equal(asked.length, 1, 'the app confirm dialog is shown');
+    env.view.querySelector('[data-action="clear"]').click();
+    await waitFor(() => asked.length === 1, { message: 'the app confirm dialog is shown' });
     assert.equal(asked[0][4], true, 'it is marked as a destructive action');
     // The user switches conversation while the dialog is open, then confirms
     env.state.conversation = { item: { id: 'agent2', name: '另一个' }, topicId: 't9' };
     env.state.conversationListeners.forEach(listener => listener());
-    await wait();
+    await waitFor(() => env.state.lists.at(-1)[0] === 'agent2__t9');
     answer(true);
-    await wait();
+    await waitFor(() => env.state.cleared.length > 0, { message: 'nothing cleared' });
     assert.deepEqual(env.state.cleared, ['agent1__t1'], 'only the conversation shown when Clear was clicked is cleared');
 });
diff --git a/tests/side-pane-mount-timing.test.mjs b/tests/side-pane-mount-timing.test.mjs
index 47f167beb..3f471d8bf 100644
--- a/tests/side-pane-mount-timing.test.mjs
+++ b/tests/side-pane-mount-timing.test.mjs
@@ -196,7 +196,8 @@ test('a side chat whose mount lands while its close is being confirmed still clo
     const closing = ctrl.closeTab('later'); // 挂载还在路上：没有 handle，由类型确认
     mount.resolve();
     await restoring;
-    await new Promise(resolve => setTimeout(resolve, 10));
+    for (let i = 0; i < 5; i++) await new Promise(resolve => setImmediate(resolve));
+    assert.ok(ctrl.getTabHandle('later'), 'the mount landed before the close was confirmed');
     confirm.resolve({ closed: true });
     await closing;
     assert.equal(ctrl.getSnapshot().tabs.some(tab => tab.id === 'later'), false);
@@ -234,5 +235,16 @@ test('after a restart the pane goes back to the side chat the topic was left on,
     assert.equal(second.getSnapshot().activeTabId, 'plan:a');
     await second.restoreTabs([sideChat('side-a', 'a')]);
     assert.equal(second.getSnapshot().activeTabId, 'side-a');
+    assert.equal(second.getSnapshot().visible, true, 'the pane was open on this topic when the app closed');
     await second.dispose();
+
+    // 补回之前用户自己切到了别的标签：补回的辅助对话留在后台，不把面板拽回去
+    const third = make();
+    t.after(() => third.dispose());
+    third.setParent(parentOf('a'));
+    third.restoreLayout();
+    third.showNotifications();
+    await third.restoreTabs([sideChat('side-a', 'a')]);
+    assert.equal(third.getSnapshot().activeTabId, 'notifications');
+    assert.ok(third.getSnapshot().tabs.some(tab => tab.id === 'side-a'));
 });
diff --git a/tests/side-pane-occurrence.test.mjs b/tests/side-pane-occurrence.test.mjs
index 21e96a5cc..daf033c6b 100644
--- a/tests/side-pane-occurrence.test.mjs
+++ b/tests/side-pane-occurrence.test.mjs
@@ -59,7 +59,6 @@ test('a tab gets an occurrence scope and a view scope, both released when it clo
 
     const [mount] = mounts;
     assert.equal(mount.scope.active, true);
-    assert.equal(mount.scope.parent.label, 'tab:probe:1');
     assert.equal(mount.occurrence.id, 'probe:1');
     assert.equal(mount.occurrence.signal.aborted, false);
     doc.dispatchEvent(new dom.window.Event('probe'));
@@ -193,7 +192,6 @@ test('pollWhileVisible runs no timers while hidden and catches up when shown aga
 
         mock.timers.tick(10 * 60_000);
         assert.equal(calls, 0, 'never visible, never polled');
-        assert.equal(view.snapshot().resources.some(r => r.type === 'child-scope'), false);
 
         tab.setVisible(true);
         assert.equal(calls, 1, 'first show after a long hidden period catches up once');
diff --git a/tests/side-pane-persistence.test.mjs b/tests/side-pane-persistence.test.mjs
index d4a83f8bb..e6856eb2c 100644
--- a/tests/side-pane-persistence.test.mjs
+++ b/tests/side-pane-persistence.test.mjs
@@ -4,7 +4,7 @@ import { JSDOM } from 'jsdom';
 import { createSidePaneController } from '../modules/ui-system/side-pane/side-pane-controller.js';
 import { defineChatTabType } from '../modules/ui-system/side-pane/tab-types/chat.js';
 import {
-    PARENT_MEMORY_LIMIT, MAX_PERSISTED_TAB_CHARS, SIDE_PANE_LAYOUT_VERSION,
+    PARENT_MEMORY_LIMIT, MAX_PERSISTED_TAB_CHARS, SIDE_PANE_LAYOUT_KEY, SIDE_PANE_LAYOUT_VERSION,
     parseLayout, rememberBounded, serializeLayout, sanitizeTab
 } from '../modules/ui-system/side-pane/side-pane-persistence.js';
 
@@ -116,7 +116,7 @@ test('controller saves the layout and lazily restores it after a restart', async
     await first.controller.dispose(); // flushes the pending save
     first.dom.window.close();
 
-    const saved = JSON.parse(storage.data.get('vcp.sidePane.layout.v1'));
+    const saved = JSON.parse(storage.data.get(SIDE_PANE_LAYOUT_KEY));
     assert.deepEqual(saved.tabs.map(t => t.id), ['notes', 'browser:1'], 'terminal and chat tabs are not persisted');
 
     const mounts = [];
@@ -141,12 +141,12 @@ test('controller saves the layout and lazily restores it after a restart', async
 
 test('nothing is written before restoreLayout runs, so an early render cannot wipe the saved layout', async () => {
     const storage = createStorage();
-    storage.setItem('vcp.sidePane.layout.v1', JSON.stringify({ version: 1, tabs: [{ id: 'notes', kind: 'notes' }] }));
+    storage.setItem(SIDE_PANE_LAYOUT_KEY, JSON.stringify({ version: 1, tabs: [{ id: 'notes', kind: 'notes' }] }));
     const pane = createPane(storage, []);
     await pane.controller.openTab({ id: 'browser:1', kind: 'browser', title: '浏览器', closable: true, scopeMode: 'global' });
     await pane.controller.dispose();
     pane.dom.window.close();
-    assert.deepEqual(JSON.parse(storage.data.get('vcp.sidePane.layout.v1')).tabs.map(t => t.id), ['notes']);
+    assert.deepEqual(JSON.parse(storage.data.get(SIDE_PANE_LAYOUT_KEY)).tabs.map(t => t.id), ['notes']);
 });
 
 test('restoring after the host picked the conversation mounts nothing from another topic and does not animate', async () => {
@@ -182,55 +182,6 @@ test('restoring after the host picked the conversation mounts nothing from anoth
     second.dom.window.close();
 });
 
-test('after a restart the side chat a topic was left on comes back to the front once it is restored', async () => {
-    const storage = createStorage();
-    const parent = { itemType: 'agent', itemId: 'agent-1', topicId: 'topic-1' };
-    const chat = { kind: 'chat', descriptor: { id: 'side-1', parent, child: { itemType: 'agent', itemId: 'agent-1', topicId: 'child-1' }, title: '辅助' } };
-
-    const first = createPane(storage, []);
-    first.controller.restoreLayout();
-    first.controller.setParent(parent);
-    await first.controller.openTab({ id: 'browser:1', kind: 'browser', title: '浏览器', closable: true, scopeMode: 'global', payload: {} });
-    await first.controller.openTab(chat);
-    const chatId = first.controller.getSnapshot().activeTabId;
-    assert.equal(first.controller.getSnapshot().visible, true);
-    await first.controller.dispose();
-    first.dom.window.close();
-
-    const second = createPane(storage, []);
-    // 宿主先同步当前对话、再恢复存档；辅助对话不进存档，等读回话题后才补回来
-    second.controller.setParent(parent);
-    second.controller.restoreLayout();
-    await second.controller.restoreTabs([chat]);
-    assert.equal(second.controller.getSnapshot().activeTabId, chatId, 'the side chat is back in front, not the browser');
-    assert.equal(second.controller.getSnapshot().visible, true, 'the pane was open on this topic when the app closed');
-    await second.controller.dispose();
-    second.dom.window.close();
-});
-
-test('a side chat restored after the user already moved the pane does not take over', async () => {
-    const storage = createStorage();
-    const parent = { itemType: 'agent', itemId: 'agent-1', topicId: 'topic-1' };
-    const chat = { kind: 'chat', descriptor: { id: 'side-1', parent, child: { itemType: 'agent', itemId: 'agent-1', topicId: 'child-1' }, title: '辅助' } };
-
-    const first = createPane(storage, []);
-    first.controller.restoreLayout();
-    first.controller.setParent(parent);
-    await first.controller.openTab({ id: 'browser:1', kind: 'browser', title: '浏览器', closable: true, scopeMode: 'global', payload: {} });
-    await first.controller.openTab(chat);
-    await first.controller.dispose();
-    first.dom.window.close();
-
-    const second = createPane(storage, []);
-    second.controller.setParent(parent);
-    second.controller.restoreLayout();
-    second.controller.activateTab('browser:1');
-    await second.controller.restoreTabs([chat]);
-    assert.equal(second.controller.getSnapshot().activeTabId, 'browser:1');
-    await second.controller.dispose();
-    second.dom.window.close();
-});
-
 test('a layout over the total budget drops the oldest large tabs but keeps the active one', async () => {
     const { MAX_PERSISTED_LAYOUT_CHARS } = await import('../modules/ui-system/side-pane/side-pane-persistence.js');
     const big = i => ({ id: `diff:${i}`, kind: 'notes', title: `d${i}`, payload: { oldCode: 'x'.repeat(60 * 1024), n: i } });
diff --git a/tests/side-pane-plan-detail.test.mjs b/tests/side-pane-plan-detail.test.mjs
index 6a23498aa..5f1dbf8d4 100644
--- a/tests/side-pane-plan-detail.test.mjs
+++ b/tests/side-pane-plan-detail.test.mjs
@@ -1,8 +1,23 @@
-import test from 'node:test';
+import test, { mock } from 'node:test';
 import assert from 'node:assert/strict';
 import { JSDOM } from 'jsdom';
-import { buildPlanModel, createPlanDetailSideProvider, planTabId, resolveDefaultProject } from '../modules/ui-system/side-pane/planDetailSideProvider.js';
+import { buildPlanModel, createPlanDetailSideProvider, planTabId, resolveDefaultProject, REFRESH_DEBOUNCE_MS } from '../modules/ui-system/side-pane/planDetailSideProvider.js';
 import { getProjectForgeChangesSource } from '../modules/ui-system/sources/projectforge-changes.js';
+import { waitFor } from './helpers/wait-for.mjs';
+
+const settle = async () => { for (let i = 0; i < 10; i += 1) await new Promise(resolve => setImmediate(resolve)); };
+// 重读防抖走 lifecycle scope 的全局 setTimeout：用假时钟推过防抖，再把 promise 链冲完。
+// 开了假时钟就不能再用 waitFor（它自己也靠 setTimeout）
+function useFakeTimers(t) {
+    mock.timers.enable({ apis: ['setTimeout'] });
+    t.after(() => mock.timers.reset());
+}
+// 先冲微任务：scope 取消定时器是在微任务里 clearTimeout 的，真实时钟下早于到点
+async function passDebounce() {
+    await settle();
+    mock.timers.tick(REFRESH_DEBOUNCE_MS);
+    await settle();
+}
 
 const DETAIL = {
     project: { id: 'p1', name: '算法工程', status: 'active', created_by: 'Nova', updated_at: '2026-09-30T01:00:00.000Z', root: 'C:\\w', stats: { added: 83, removed: 10 } },
@@ -77,7 +92,7 @@ test('openPlanDetailTab opens a per-project tab with a searchable title', async
     assert.equal(calls.opened.length, 1);
     assert.equal(calls.opened[0].id, planTabId('p1'));
     assert.equal(calls.opened[0].kind, 'plan-detail');
-    assert.equal(calls.opened[0].title, '计划 · 算法工程');
+    assert.match(calls.opened[0].title, /算法工程/);
     assert.equal(calls.opened[0].payload.projectId, 'p1');
 });
 
@@ -88,35 +103,38 @@ test('openPlanDetailTab tells the user instead of opening an empty tab when ther
     assert.equal(calls.toasts.length, 1);
 });
 
-test('mountTab renders plan, files, timeline and reloads on matching change events', async () => {
+test('mountTab renders plan, files, timeline and reloads on matching change events', async (t) => {
     const { provider, calls, view, fire, wasUnsubscribed } = makeEnv();
     const handle = await provider.mountTab({ id: planTabId('p1'), payload: { projectId: 'p1' } }, view);
     assert.equal(calls.get, 1);
     assert.equal(view.querySelector('.side-plan-title').textContent, '算法工程');
     assert.equal(view.querySelectorAll('.side-plan-todo').length, 3);
     assert.equal(view.querySelector('.side-plan-todo.blocked').dataset.todoStatus, 'pending');
-    assert.match(view.querySelector('.side-plan-progress-text').textContent, /1\/3 已完成/);
     assert.equal(view.querySelectorAll('.side-plan-batch').length, 2);
     assert.equal(view.querySelectorAll('.side-plan-file').length, 1);
     assert.equal(view.querySelector('.side-plan-progress').value, 1);
     assert.equal(view.querySelector('.side-plan-progress').max, 3);
-    assert.equal(view.querySelector('.side-plan-progress-line .side-plan-pct').textContent, '33%', '计数行靠右给出百分比');
-    assert.equal(view.querySelector('.side-plan-progress-line + .side-plan-progress') !== null, true, '进度条单独占一行，在计数下面');
 
     // 折叠章节
     view.querySelector('[data-plan-section="files"] .side-plan-section-title').click();
     assert.equal(view.querySelectorAll('.side-plan-file').length, 0);
 
     // 其他工程的变更不触发刷新，本工程的会
+    useFakeTimers(t);
     fire({ projectId: 'other' });
-    await new Promise(r => setTimeout(r, 300));
+    await passDebounce();
     assert.equal(calls.get, 1);
     fire({ projectId: 'p1' });
-    await new Promise(r => setTimeout(r, 300));
+    await settle();
+    mock.timers.tick(REFRESH_DEBOUNCE_MS - 1);
+    await settle();
+    assert.equal(calls.get, 1, 'the reload waits for the debounce');
+    mock.timers.tick(1);
+    await settle();
     assert.equal(calls.get, 2);
 
     // V工程按钮
-    view.querySelector('.side-plan-actions .side-plan-icon-btn:last-child').click();
+    view.querySelector('[data-action="open-forge"]').click();
     assert.equal(calls.forge, true);
 
     await handle.dispose();
@@ -132,10 +150,10 @@ test('the breadcrumb pill switches to any project, filters a long list and close
         projectForgeGetProject: async (id) => { calls.get += 1; return { success: true, data: { ...DETAIL, project: { ...DETAIL.project, id, name: projects.find(p => p.id === id).name } } }; }
     });
     const handle = await provider.mountTab({ id: planTabId('p1'), payload: { projectId: 'p1' } }, view);
-    const tick = () => new Promise(r => setTimeout(r, 20));
+    const pickerItems = () => view.querySelectorAll('.side-plan-picker-item');
 
     view.querySelector('.side-plan-crumbs').click();
-    await tick();
+    await waitFor(() => pickerItems().length, { message: 'picker did not list projects' });
     // 全局标签没有「本话题用过」分组；删掉的工程不列，最近更新的在前
     assert.equal(view.querySelectorAll('.side-plan-picker-label').length, 0);
     const ids = [...view.querySelectorAll('.side-plan-picker-item')].map(b => b.dataset.projectId);
@@ -149,17 +167,19 @@ test('the breadcrumb pill switches to any project, filters a long list and close
     assert.equal(view.querySelector('.side-plan-picker'), null);
     assert.equal(doc.activeElement, view.querySelector('.side-plan-crumbs'));
 
+    // 切换工程：页面换内容，标签记住新工程并钉住
     view.querySelector('.side-plan-crumbs').click();
-    await tick();
+    await waitFor(() => view.querySelector('.side-plan-picker-item[data-project-id="p3"]'));
     view.querySelector('.side-plan-picker-item[data-project-id="p3"]').click();
-    await tick();
-    assert.equal(view.querySelector('.side-plan-title').textContent, '工程3');
-    assert.equal(calls.updated.at(-1).title, '计划 · 工程3');
+    assert.equal(view.querySelector('.side-plan-picker'), null);
+    await waitFor(() => view.querySelector('.side-plan-title')?.textContent === '工程3', { message: 'project did not switch' });
+    assert.match(calls.updated.at(-1).title, /工程3/);
+    assert.equal(calls.updated.at(-1).payload.projectId, 'p3');
     assert.equal(calls.updated.at(-1).payload.pinned, true);
     handle.dispose();
 });
 
-test('plan pages navigate by keyboard and retain their scroll positions across refreshes', async () => {
+test('plan pages navigate by keyboard and retain their scroll positions across refreshes', async (t) => {
     const { provider, view, dom, fire } = makeEnv();
     const handle = await provider.mountTab({ id: planTabId('p1'), payload: { projectId: 'p1' } }, view);
     const body = view.querySelector('.side-plan-body');
@@ -167,9 +187,6 @@ test('plan pages navigate by keyboard and retain their scroll positions across r
     const panel = () => view.querySelector('[role="tabpanel"]:not([hidden])');
     assert.equal(selected().dataset.planPage, 'plan');
     assert.equal(panel().dataset.planPagePanel, 'plan');
-    assert.equal(view.querySelector('.side-plan-header .side-plan-progress'), null);
-    assert.equal(view.querySelector('.side-plan-header .side-plan-stats'), null);
-    assert.equal(view.querySelector('.side-plan-header').textContent.includes('C:\\w'), false);
     body.scrollTop = 120;
     selected().dispatchEvent(new dom.window.KeyboardEvent('keydown', { key: 'ArrowRight', bubbles: true }));
     assert.equal(panel().dataset.planPagePanel, 'timeline');
@@ -185,10 +202,11 @@ test('plan pages navigate by keyboard and retain their scroll positions across r
     assert.ok(panel().querySelector('.side-git-container'), 'the Git page mounts when it is first shown');
     selected().dispatchEvent(new dom.window.KeyboardEvent('keydown', { key: 'ArrowLeft', bubbles: true }));
     assert.equal(panel().dataset.planPagePanel, 'details');
-    assert.match(panel().textContent, /创建者.*Nova/);
+    assert.match(panel().textContent, /Nova/);
     body.scrollTop = 30;
+    useFakeTimers(t);
     fire({ projectId: 'p1' });
-    await new Promise(resolve => setTimeout(resolve, 320));
+    await passDebounce();
     assert.equal(panel().dataset.planPagePanel, 'details');
     assert.equal(body.scrollTop, 30);
     view.querySelector('[data-plan-page="timeline"]').click();
@@ -232,7 +250,7 @@ test('mountTab shows a retryable empty state when the project cannot be read', a
     handle.dispose();
 });
 
-test('a failed refresh keeps the last plan on screen with a retry banner', async () => {
+test('a failed refresh keeps the last plan on screen with a retry banner', async (t) => {
     let fail = false;
     const { provider, view, fire } = makeEnv({
         projectForgeGetProject: async () => (fail ? { success: false, error: '网络断开' } : { success: true, data: DETAIL })
@@ -241,45 +259,48 @@ test('a failed refresh keeps the last plan on screen with a retry banner', async
     assert.equal(view.querySelectorAll('.side-plan-todo').length, 3);
 
     fail = true;
+    useFakeTimers(t);
     fire({ projectId: 'p1' });
-    await new Promise(r => setTimeout(r, 300));
+    await passDebounce();
     assert.equal(view.querySelectorAll('.side-plan-todo').length, 3, 'content is kept');
     assert.match(view.querySelector('.side-plan-stale').textContent, /网络断开/);
 
     fail = false;
     view.querySelector('.side-plan-stale button').click();
-    await new Promise(r => setTimeout(r, 50));
+    await settle();
     assert.equal(view.querySelector('.side-plan-stale'), null);
     handle.dispose();
 });
 
-test('a project soft-deleted while its tab is open is marked deleted, not 进行中', async () => {
+test('a project soft-deleted while its tab is open is marked deleted, not active', async (t) => {
     // 真实返回：软删除后 GetProject 仍然成功，status 还是 active，只多了 deleted_at / deleted_by
     let deleted = false;
     const { provider, view, fire } = makeEnv({
         projectForgeGetProject: async () => ({ success: true, data: deleted ? { ...DETAIL, project: { ...DETAIL.project, deleted_at: '2026-09-30T02:00:00.000Z', deleted_by: 'Nova' } } : DETAIL })
     });
     const handle = await provider.mountTab({ id: planTabId('p1'), payload: { projectId: 'p1' } }, view);
-    assert.equal(view.querySelector('.side-plan-chip').textContent, '进行中');
+    assert.equal(view.querySelector('.side-plan-chip').dataset.status, 'active');
     assert.equal(view.querySelector('.side-plan-deleted'), null);
 
     deleted = true;
+    useFakeTimers(t);
     fire({ projectId: 'p1' });
-    await new Promise(r => setTimeout(r, 300));
-    assert.equal(view.querySelector('.side-plan-chip').textContent, '已删除');
-    assert.ok(view.querySelector('.side-plan-chip.status-deleted'));
-    assert.match(view.querySelector('.side-plan-deleted').textContent, /已被 Nova 删除.*RestoreProjects/);
+    await passDebounce();
+    assert.equal(view.querySelector('.side-plan-chip').dataset.status, 'deleted');
+    assert.match(view.querySelector('.side-plan-deleted').textContent, /Nova/, 'the banner names who deleted it');
     assert.equal(view.querySelectorAll('.side-plan-todo').length, 3, 'the plan stays readable');
     handle.dispose();
 });
 
-test('a renamed project renames its tab, once', async () => {
+test('a renamed project renames its tab, once', async (t) => {
     const { provider, calls, view, fire } = makeEnv();
     const handle = await provider.mountTab({ id: planTabId('p1'), payload: { projectId: 'p1', projectName: '旧名字' } }, view);
     assert.equal(calls.updated.length, 1);
-    assert.equal(calls.updated[0].title, '计划 · 算法工程');
+    assert.match(calls.updated[0].title, /算法工程/);
+    useFakeTimers(t);
     fire({ projectId: 'p1' });
-    await new Promise(r => setTimeout(r, 300));
+    await passDebounce();
+    assert.equal(calls.get, 2, 'the refresh did run');
     assert.equal(calls.updated.length, 1, 'an unchanged name does not touch the tab again');
     handle.dispose();
 });
@@ -324,18 +345,17 @@ test('the Git page opens on the project workspace and follows a project switch',
         gitListWorkspaces: async () => ({ success: true, data: { workspaces: [{ id: 'ws0', alias: 'zero', path: '/z' }, { id: 'ws1', alias: 'one', path: '/a' }, { id: 'ws2', alias: 'two', path: '/b' }], activeWorkspaceId: 'ws0' } }),
         gitStatus: async (id) => { statusFor.push(id); return { success: true, data: { isRepo: true, staged: [], conflicts: [], changes: [] } }; }
     });
-    const wait = (ms = 30) => new Promise(resolve => setTimeout(resolve, ms));
     const handle = await provider.mountTab({ id: planTabId('p1'), payload: { projectId: 'p1' } }, view);
     assert.deepEqual(statusFor, [], 'Git is not read until its page is shown');
     view.querySelector('[data-plan-page="git"]').click();
-    await wait();
+    await waitFor(() => statusFor.length, { message: 'Git status was not read' });
     assert.equal(statusFor.at(-1), 'ws1');
     assert.equal(view.querySelector('.side-git-ws-select').value, 'ws1');
 
     view.querySelector('.side-plan-crumbs').click();
-    await wait();
+    await waitFor(() => view.querySelector('.side-plan-picker-item[data-project-id="p2"]'));
     view.querySelector('.side-plan-picker-item[data-project-id="p2"]').click();
-    await wait(60);
+    await waitFor(() => statusFor.at(-1) === 'ws2', { message: 'Git did not follow the project switch' });
     assert.equal(view.querySelector('.side-plan-title').textContent, '旁支工程');
     assert.equal(view.querySelector('.side-git-ws-select').value, 'ws2');
     assert.equal(statusFor.at(-1), 'ws2');
@@ -344,11 +364,12 @@ test('the Git page opens on the project workspace and follows a project switch',
     dom.window.close();
 });
 
-test('a hidden plan tab reads the project once when shown again, not on every change', async () => {
+test('a hidden plan tab reads the project once when shown again, not on every change', async (t) => {
     const { provider, calls, view, fire } = makeEnv();
     let visible = true;
     const handle = await provider.mountTab({ id: planTabId('p1'), payload: { projectId: 'p1' } }, view, { occurrence: { isVisible: () => visible } });
     assert.equal(calls.get, 1);
+    useFakeTimers(t);
 
     // 已经排上的重读在藏起来时取消
     fire({ projectId: 'p1' });
@@ -356,12 +377,12 @@ test('a hidden plan tab reads the project once when shown again, not on every ch
     handle.suspend();
     fire({ projectId: 'p1' });
     fire({ projectId: 'p1' });
-    await new Promise(r => setTimeout(r, 300));
+    await passDebounce();
     assert.equal(calls.get, 1);
 
     visible = true;
     handle.resume();
-    await new Promise(r => setTimeout(r, 300));
+    await passDebounce();
     assert.equal(calls.get, 2);
 
     // 期间没有变化就不重读
@@ -369,13 +390,13 @@ test('a hidden plan tab reads the project once when shown again, not on every ch
     handle.suspend();
     visible = true;
     handle.resume();
-    await new Promise(r => setTimeout(r, 300));
+    await passDebounce();
     assert.equal(calls.get, 2);
     handle.dispose();
 });
 
-test('keyboard focus survives the redraws a section toggle, a batch toggle and a background refresh cause', async () => {
-    const { provider, view, dom, fire } = makeEnv();
+test('keyboard focus survives the redraws a section toggle, a batch toggle and a background refresh cause', async (t) => {
+    const { provider, calls, view, dom, fire } = makeEnv();
     const doc = dom.window.document;
     const handle = await provider.mountTab({ id: planTabId('p1'), payload: { projectId: 'p1' } }, view);
     try {
@@ -393,12 +414,15 @@ test('keyboard focus survives the redraws a section toggle, a batch toggle and a
         const batchKey = batchHead().dataset.focusKey;
         batchHead().focus();
         batchHead().click();
-        await new Promise(resolve => setTimeout(resolve, 20));
+        await settle();
         assert.equal(view.contains(doc.activeElement), true);
         assert.equal(doc.activeElement?.dataset?.focusKey, batchKey, 'the batch header keeps focus after it expands');
 
+        const reads = calls.get;
+        useFakeTimers(t);
         fire({ projectId: 'p1' });
-        await new Promise(resolve => setTimeout(resolve, 320));
+        await passDebounce();
+        assert.equal(calls.get, reads + 1, 'the background refresh ran');
         assert.equal(view.contains(doc.activeElement), true);
         assert.equal(doc.activeElement?.dataset?.focusKey, batchKey, 'a background refresh does not throw focus to <body>');
     } finally {
diff --git a/tests/side-pane-plan-topic.test.mjs b/tests/side-pane-plan-topic.test.mjs
index 92d4030b3..9046670c3 100644
--- a/tests/side-pane-plan-topic.test.mjs
+++ b/tests/side-pane-plan-topic.test.mjs
@@ -1,11 +1,12 @@
-import test from 'node:test';
+import test, { mock } from 'node:test';
 import assert from 'node:assert/strict';
 import { JSDOM } from 'jsdom';
-import { createPlanDetailSideProvider, planTabId } from '../modules/ui-system/side-pane/planDetailSideProvider.js';
+import { createPlanDetailSideProvider, planTabId, FILTER_DEBOUNCE_MS } from '../modules/ui-system/side-pane/planDetailSideProvider.js';
 import { buildTopicActivity, locateTopicBatches, narrowSearchRows, searchParams, TIMELINE_LIMIT } from '../modules/ui-system/side-pane/plan-detail/topic-activity.js';
 import { readRevertBatches } from '../modules/ui-system/conversation-scope.js';
+import { waitFor } from './helpers/wait-for.mjs';
 
-const tick = (ms = 20) => new Promise(r => setTimeout(r, ms));
+const settle = async () => { for (let i = 0; i < 10; i += 1) await new Promise(resolve => setImmediate(resolve)); };
 
 const node = (id, batchId, file, op = 'edit', added = 1, removed = 0) => ({ id, batch_id: batchId, file_path: file, op, added, removed, created_at: '2026-10-01T01:00:00.000Z' });
 const BATCHES = {
@@ -111,13 +112,14 @@ test('a topic tab shows only the topic\'s batches, its stats, the project switch
     // b99 不在这个工程的时间线范围内，不去查
     assert.deepEqual(calls.getBatch, [['p1', 2]]);
     assert.deepEqual([...view.querySelectorAll('.side-plan-batch')].map(li => li.dataset.batchId), ['2']);
-    assert.match(view.querySelector('.side-plan-stats').textContent, /1 批.*2 次改动.*2 个文件/);
-    assert.equal(view.querySelector('.side-plan-context').textContent, '本话题', 'the scope lives in the breadcrumb, not the stats row');
-    assert.match(view.querySelector('[data-plan-section="timeline"] .side-plan-section-meta').textContent, /本话题 1 批/);
+    const stats = view.querySelector('.side-plan-stats').dataset;
+    assert.deepEqual([stats.batches, stats.nodes, stats.files], ['1', '2', '2'], 'stats count only this topic\'s batches');
+    assert.equal(view.querySelector('.side-plan-crumbs .side-plan-context').dataset.scope, 'topic', 'the scope lives in the breadcrumb');
     assert.equal(view.querySelector('.side-plan-crumbs').getAttribute('aria-haspopup'), 'listbox');
-    assert.match(view.querySelector('.side-plan-other-hint').textContent, /还有 1 批来自其他话题/);
+    // b1 在时间线里但不属于本话题
+    assert.equal(view.querySelector('.side-plan-other-hint').dataset.count, '1');
     view.querySelector('.side-plan-other-hint .side-plan-link').click();
-    view.querySelector('.side-plan-forge').click();
+    view.querySelector('[data-action="open-forge"]').click();
     assert.deepEqual(calls.forge, ['p1', 'p1']);
 
     // 展开批次 → 节点行
@@ -129,21 +131,19 @@ test('a topic tab shows only the topic\'s batches, its stats, the project switch
     view.querySelector('[data-plan-section="report"] .side-plan-section-title').click();
     assert.equal(view.querySelector('.side-plan-report').textContent, '验收：全部通过');
 
-    // 面包屑胶囊打开工程菜单：话题用过的工程排在前面，当前工程打勾
+    // 面包屑胶囊打开工程菜单：话题用过的工程单独一组排在前面，当前工程打勾
     view.querySelector('.side-plan-crumbs').click();
-    await tick();
+    await waitFor(() => view.querySelector('.side-plan-picker-item'), { message: 'picker did not list projects' });
     assert.equal(view.querySelector('.side-plan-crumbs').getAttribute('aria-expanded'), 'true');
-    assert.deepEqual([...view.querySelectorAll('.side-plan-picker-label')].map(n => n.textContent), ['本话题用过']);
+    assert.equal(view.querySelectorAll('.side-plan-picker-label').length, 1);
     assert.deepEqual([...view.querySelectorAll('.side-plan-picker-item')].map(b => b.dataset.projectId), ['p1', 'p2']);
     assert.equal(view.querySelector('.side-plan-picker-item[aria-selected="true"]').dataset.projectId, 'p1');
-    // 切换到话题用过的另一个工程
+    // 切换到话题用过的另一个工程（切换并钉住标签见 side-pane-plan-detail）：那里本话题没有施工
     view.querySelector('.side-plan-picker-item[data-project-id="p2"]').click();
-    assert.equal(view.querySelector('.side-plan-picker'), null);
-    await tick();
-    assert.equal(view.querySelector('.side-plan-title').textContent, '旁支工程');
-    assert.equal(calls.updated.at(-1).payload.projectId, 'p2');
-    assert.equal(calls.updated.at(-1).payload.pinned, true);
-    assert.match(view.querySelector('[data-plan-section="timeline"]').textContent, /这个话题还没有在这个工程里施工/);
+    await waitFor(() => view.querySelector('.side-plan-title')?.textContent === '旁支工程', { message: 'project did not switch' });
+    assert.ok(view.querySelector('[data-plan-section="timeline"]'));
+    assert.equal(view.querySelectorAll('.side-plan-batch').length, 0);
+    assert.equal(view.querySelector('.side-plan-other-hint'), null);
     handle.dispose();
     dom.window.close();
 });
@@ -152,7 +152,7 @@ test('clicking a file filters the timeline to that exact file within this topic'
     const { provider, calls, tab, view, dom } = makeTopicEnv();
     const handle = await provider.mountTab(tab, view);
     [...view.querySelectorAll('.side-plan-file-btn')].find(b => b.querySelector('.side-plan-file-name').textContent === 'a.py').click();
-    await tick();
+    await waitFor(() => view.querySelector('.side-plan-filter-results .side-plan-node-row'), { message: 'filter results did not render' });
     assert.equal(view.querySelector('[role="tab"][aria-selected="true"]').dataset.planPage, 'timeline');
     assert.equal(view.querySelector('[role="tabpanel"]:not([hidden])').dataset.planPagePanel, 'timeline');
     assert.equal(calls.search.at(-1).file, 'a.py');
@@ -165,7 +165,7 @@ test('clicking a file filters the timeline to that exact file within this topic'
 
     // 点参与者按人筛选
     view.querySelector('.side-plan-contributor-btn').click();
-    await tick();
+    await waitFor(() => calls.search.at(-1)?.byMaid, { message: 'contributor filter did not search' });
     assert.equal(calls.search.at(-1).byMaid, 'Nova');
     handle.dispose();
     dom.window.close();
@@ -194,7 +194,7 @@ for (const settlement of ['resolve', 'reject']) {
             assert.equal(requests.length, 1, 'the new debounced read has not started');
             assert.equal(view.querySelector('[data-node-id="777"]'), null);
             assert.doesNotMatch(view.querySelector('.side-plan-filter-results').textContent, /old filter failed/);
-            assert.match(view.querySelector('.side-plan-filter-results').textContent, /正在筛选/);
+            assert.equal(view.querySelector('.side-plan-filter-results').getAttribute('aria-busy'), 'true', 'shows the new filter as loading');
             assert.equal(dom.window.document.activeElement.dataset.filter, 'keyword');
             const operation = view.querySelector('[data-filter="op"]');
             operation.value = 'edit';
@@ -211,7 +211,7 @@ for (const settlement of ['resolve', 'reject']) {
     });
 }
 
-test('typing into the history filter with an input method keeps the same input element until composition ends', async () => {
+test('typing into the history filter with an input method keeps the same input element until composition ends', async (t) => {
     const requests = [];
     const { provider, tab, view, dom } = makeTopicEnv({ api: {
         projectForgeSearchHistory(params) {
@@ -220,19 +220,26 @@ test('typing into the history filter with an input method keeps the same input e
         }
     } });
     const handle = await provider.mountTab(tab, view);
+    // 筛选防抖走 lifecycle scope 的全局 setTimeout
+    mock.timers.enable({ apis: ['setTimeout'] });
+    t.after(() => mock.timers.reset());
     try {
         const input = view.querySelector('[data-filter="keyword"]');
         input.focus();
         input.dispatchEvent(new dom.window.CompositionEvent('compositionstart'));
         input.value = 'zhong';
         input.dispatchEvent(new dom.window.InputEvent('input', { isComposing: true }));
-        await new Promise(resolve => setTimeout(resolve, 400));
+        await settle();
+        mock.timers.tick(FILTER_DEBOUNCE_MS);
+        await settle();
         assert.equal(view.querySelector('[data-filter="keyword"]'), input, 'the composing input is not replaced');
         assert.equal(requests.length, 0, 'no search while composing');
 
         input.value = '中';
         input.dispatchEvent(new dom.window.CompositionEvent('compositionend'));
-        await new Promise(resolve => setTimeout(resolve, 400));
+        await settle();
+        mock.timers.tick(FILTER_DEBOUNCE_MS);
+        await settle();
         assert.equal(requests.length, 1);
         assert.equal(requests[0].keyword, '中');
         assert.equal(dom.window.document.activeElement.dataset.filter, 'keyword');
@@ -247,7 +254,7 @@ test('a node opens its diff and can be reverted with a remembered signature; the
     const handle = await provider.mountTab(tab, view);
     view.querySelector('.side-plan-batch-head').click();
     view.querySelector('.side-plan-node-row').click();
-    await tick();
+    await waitFor(() => view.querySelector('.side-plan-diff'), { message: 'node diff did not open' });
     assert.ok(view.querySelector('.side-plan-node'));
     assert.ok(view.querySelector('.side-plan-diff .diff-line.add'));
     assert.ok(view.querySelector('.side-plan-diff .diff-line.del'));
@@ -255,24 +262,27 @@ test('a node opens its diff and can be reverted with a remembered signature; the
 
     // 没署名不让回退
     view.querySelector('.side-plan-revert-before').click();
-    await tick();
+    await settle();
     assert.equal(calls.revert.length, 0);
     assert.equal(calls.toasts.at(-1)[1], 'error');
 
     view.querySelector('.side-plan-signature').value = '小明';
     view.querySelector('.side-plan-revert-before').click();
-    await tick();
+    await waitFor(() => calls.revert.length === 1, { message: 'dry run did not start' });
     assert.deepEqual(calls.revert[0], { projectId: 'p1', nodeId: 3, mode: 'before', signature: '小明', reason: '', dryRun: true });
     assert.equal(view.querySelector('.side-plan-revert-confirm').hidden, false);
     view.querySelector('.side-plan-revert-ok').click();
-    await tick();
+    await waitFor(() => !view.querySelector('.side-plan-node'), { message: 'revert did not return to the list' });
     assert.equal(calls.revert[1].force, false);
     assert.equal(calls.revert[1].dryRun, undefined);
-    assert.equal(storage.getItem('vcp-projectforge-signature'), '小明');
     assert.deepEqual(readRevertBatches(storage, 'agent:nova:t1'), [12]);
     // 回到列表
-    assert.equal(view.querySelector('.side-plan-node'), null);
     assert.ok(view.querySelector('.side-plan-timeline'));
+    // 再打开节点：署名记住了
+    if (!view.querySelector('.side-plan-node-row')) view.querySelector('.side-plan-batch-head').click();
+    view.querySelector('.side-plan-node-row').click();
+    await waitFor(() => view.querySelector('.side-plan-signature'), { message: 'node did not reopen' });
+    assert.equal(view.querySelector('.side-plan-signature').value, '小明');
     handle.dispose();
     dom.window.close();
 });
@@ -285,8 +295,7 @@ test('reveal focuses a todo or a section, opening it when collapsed', async () =
     const handle = await provider.mountTab({ ...tab, payload: { focus: { todoId: 8 } } }, view);
     assert.equal(view.querySelector('.side-plan-todo[data-todo-id="8"]').classList.contains('is-flash'), false, '新开的标签还没显示，先不定位');
     shown = true;
-    await new Promise(resolve => setTimeout(resolve, 80));
-    assert.ok(view.querySelector('.side-plan-todo[data-todo-id="8"]').classList.contains('is-flash'), '显示出来后再滚过去');
+    await waitFor(() => view.querySelector('.side-plan-todo[data-todo-id="8"]').classList.contains('is-flash'), { message: '显示出来后再滚过去' });
     handle.reveal({ focus: { section: 'report' } });
     assert.ok(view.querySelector('[data-plan-section="report"]').classList.contains('is-flash'));
     assert.ok(view.querySelector('.side-plan-report'));
diff --git a/tests/side-pane-resizer-owner.test.mjs b/tests/side-pane-resizer-owner.test.mjs
index 01cb99f01..e274fbfc2 100644
--- a/tests/side-pane-resizer-owner.test.mjs
+++ b/tests/side-pane-resizer-owner.test.mjs
@@ -2,46 +2,6 @@ import test from 'node:test';
 import assert from 'node:assert/strict';
 import { createSidePaneResizerOwner } from '../modules/ui-system/side-pane/side-pane-resizer-owner.js';
 
-test('createSidePaneResizerOwner initializes VCPSidebarResizer with direction -1 and pointer events', () => {
-    let capturedOptions = null;
-    const fakeHandle = {
-        ownerDocument: {
-            body: { style: {}, classList: { toggle() {} } },
-        },
-    };
-    const fakePane = {
-        style: { width: '360px' },
-        getBoundingClientRect: () => ({ width: 360 }),
-    };
-
-    const mockFactory = (options) => {
-        capturedOptions = options;
-        return {
-            refresh() {},
-            dispose() { capturedOptions = null; },
-        };
-    };
-
-    const owner = createSidePaneResizerOwner({
-        handle: fakeHandle,
-        paneElement: fakePane,
-        resizerFactory: mockFactory,
-        windowRef: { innerWidth: 1200, PointerEvent: function PointerEvent() {} },
-    });
-
-    assert.ok(capturedOptions);
-    assert.equal(capturedOptions.direction, -1);
-    assert.equal(capturedOptions.eventNames.down, 'pointerdown');
-
-    // Check bounds calculation: total 1200, maxRatio 0.65 -> 780, minRemainder 1200 - 420 -> 780
-    const bounds = capturedOptions.getBounds();
-    assert.equal(bounds.min, 240);
-    assert.equal(bounds.max, 780);
-
-    owner.dispose();
-    assert.equal(capturedOptions, null);
-});
-
 test('createSidePaneResizerOwner notifies width commit and binds lifecycle scope', () => {
     let appliedWidth = 0;
     let committedWidth = 0;
@@ -63,7 +23,7 @@ test('createSidePaneResizerOwner notifies width commit and binds lifecycle scope
         factoryOptions = options;
         return {
             refresh() {},
-            dispose() {},
+            dispose() { factoryOptions = null; },
         };
     };
 
@@ -74,7 +34,7 @@ test('createSidePaneResizerOwner notifies width commit and binds lifecycle scope
         },
     };
 
-    createSidePaneResizerOwner({
+    const owner = createSidePaneResizerOwner({
         handle: fakeHandle,
         paneElement: fakePane,
         resizerFactory: mockFactory,
@@ -90,6 +50,9 @@ test('createSidePaneResizerOwner notifies width commit and binds lifecycle scope
 
     factoryOptions.onCommit(400);
     assert.equal(committedWidth, 400);
+
+    owner.dispose();
+    assert.equal(factoryOptions, null, 'disposing the owner disposes the resizer');
 });
 
 test('one arrow key press moves the side pane once and commits once', async () => {
@@ -128,9 +91,12 @@ test('one arrow key press moves the side pane once and commits once', async () =
     assert.deepEqual(commits, [420]);
     press('ArrowRight');
     assert.equal(width, 400);
+    // 1200 宽的窗口：上限 780，下限 240
     press('End');
     assert.equal(width, 780);
-    assert.deepEqual(commits, [420, 400, 780]);
+    press('Home');
+    assert.equal(width, 240);
+    assert.deepEqual(commits, [420, 400, 780, 240]);
 });
 
 test('holding an arrow key resizes on every press but saves the width once, after the keys stop', async () => {
@@ -150,12 +116,14 @@ test('holding an arrow key resizes on every press but saves the width once, afte
     let width = 400;
     const pane = { style: {}, getBoundingClientRect: () => ({ width }) };
     const commits = [];
+    let pending = null;
     const owner = createSidePaneResizerOwner({
         handle,
         paneElement: pane,
         resizerFactory: win.VCPSidebarResizer.create,
         documentRef: { querySelector: () => null, addEventListener() {}, removeEventListener() {} },
-        windowRef: { innerWidth: 1200, setTimeout, clearTimeout },
+        // 手动调度保存的计时器：不用真的等
+        windowRef: { innerWidth: 1200, setTimeout: (fn) => { pending = fn; return 1; }, clearTimeout: () => { pending = null; } },
         keyboardCommitDelayMs: 30,
         onWidthChange: w => { width = w; },
         onWidthCommit: w => commits.push(w),
@@ -165,7 +133,8 @@ test('holding an arrow key resizes on every press but saves the width once, afte
     for (let i = 0; i < 5; i++) press('ArrowLeft');
     assert.equal(width, 500, 'every press resizes right away');
     assert.deepEqual(commits, [], 'nothing is saved while keys are still coming');
-    await new Promise(resolve => setTimeout(resolve, 60));
+    assert.ok(pending, 'a save is scheduled');
+    pending();
     assert.deepEqual(commits, [500]);
 
     press('End');
diff --git a/tests/side-pane-scope-restore.test.mjs b/tests/side-pane-scope-restore.test.mjs
index 4512ee6d7..a1aa674a8 100644
--- a/tests/side-pane-scope-restore.test.mjs
+++ b/tests/side-pane-scope-restore.test.mjs
@@ -52,6 +52,11 @@ test('a global tool keeps the pane state when no topic tab is remembered', () =>
     assert.equal(backOnA.activeTabId, browser.id);
     // 全局工具不跟着话题的收起偏好走
     assert.equal(backOnA.visible, true);
+
+    // 用户自己收起后换话题：仍停在全局工具上，也不自己展开
+    const collapsed = SidePaneState.setParent(SidePaneState.setVisible(backOnA, false), topicB);
+    assert.equal(collapsed.activeTabId, browser.id);
+    assert.equal(collapsed.visible, false);
 });
 
 test('another topic\'s side chat is never restored as the preferred tab', () => {
diff --git a/tests/side-pane-screen-reader-names.test.mjs b/tests/side-pane-screen-reader-names.test.mjs
index fde9477ab..82ee843d5 100644
--- a/tests/side-pane-screen-reader-names.test.mjs
+++ b/tests/side-pane-screen-reader-names.test.mjs
@@ -33,7 +33,9 @@ test('Git rows and the refresh button do not read icon ligature names', async ()
         assert.ok(row);
         assert.doesNotMatch(spokenText(row), /expand_more/);
         assert.match(spokenText(row), /app\.js/);
-        assert.equal(spokenText(host.querySelector('.side-git-refresh-btn')), '刷新');
+        const refreshName = spokenText(host.querySelector('.side-git-refresh-btn'));
+        assert.ok(refreshName, 'the refresh button has a spoken name');
+        assert.doesNotMatch(refreshName, /refresh|sync/);
     } finally {
         handle.dispose?.();
         dom.window.close();
diff --git a/tests/side-pane-state.test.mjs b/tests/side-pane-state.test.mjs
index b6a05d841..ce7f855b0 100644
--- a/tests/side-pane-state.test.mjs
+++ b/tests/side-pane-state.test.mjs
@@ -47,7 +47,7 @@ test('chat tab type validates the descriptor and reuses the tab of an open child
 
     assert.throws(() => {
         openChat(s0, { id: 'invalid' });
-    }, /SideChatDescriptor requires a parent conversation reference/);
+    }, TypeError);
 
     assert.throws(() => {
         openChat(s0, {
@@ -55,7 +55,7 @@ test('chat tab type validates the descriptor and reuses the tab of an open child
             parent: { itemType: 'agent', itemId: 'a', topicId: 'same' },
             child: { itemType: 'agent', itemId: 'a', topicId: 'same' },
         });
-    }, /Child topicId must differ from parent topicId/);
+    });
 
     const desc1 = {
         id: 'side-1',
@@ -144,16 +144,6 @@ test('getVisibleTabs filters chat tabs by parent conversation reference', () =>
     assert.deepEqual(SidePaneState.getClosableVisibleTabs(SidePaneState.setParent(state, null)), []);
 });
 
-test('global tools retain selection and visibility across topic changes', () => {
- let state=SidePaneState.createInitialSidePaneState();
- state=SidePaneState.openTab(state,{id:'git-global',kind:'git',scopeMode:'global'});
- state=SidePaneState.setParent(state,{itemId:'a',topicId:'new',itemType:'agent'});
- assert.equal(state.activeTabId,'git-global');assert.equal(state.visible,true);
- state=SidePaneState.setVisible(state,false);
- state=SidePaneState.setParent(state,{itemId:'b',topicId:'other',itemType:'agent'});
- assert.equal(state.activeTabId,'git-global');assert.equal(state.visible,false);
-});
-
 test('updateTab changes title and payload without activating the tab', () => {
     let s = SidePaneState.openTab(SidePaneState.createInitialSidePaneState(), { id: 'b1', kind: 'browser', title: '浏览器', payload: {} });
     s = SidePaneState.openTab(s, { id: 'n1', kind: 'notes', title: '笔记' });
diff --git a/tests/side-pane-tab-strip-reuse.test.mjs b/tests/side-pane-tab-strip-reuse.test.mjs
index bdd52ec10..ab8ab0da7 100644
--- a/tests/side-pane-tab-strip-reuse.test.mjs
+++ b/tests/side-pane-tab-strip-reuse.test.mjs
@@ -54,11 +54,11 @@ test('a title change or a switch updates tabs in place instead of rebuilding the
         assert.equal(env.item('a'), a, 'the untouched tab keeps its node');
         assert.equal(env.item('b'), b, 'the renamed tab keeps its node');
         assert.equal(b.querySelector('.tab-title').textContent, 'Example Domain');
-        assert.equal(b.querySelector('.side-pane-tab-close').getAttribute('aria-label'), '关闭 Example Domain');
+        assert.equal(b.querySelector('.side-pane-tab-close').getAttribute('aria-label').includes('Example Domain'), true);
         assert.equal(b.querySelector('[role="tab"]').getAttribute('aria-selected'), 'true');
         assert.equal(b.querySelector('[role="tab"]').tabIndex, 0);
         assert.equal(a.querySelector('[role="tab"]').tabIndex, -1);
-        assert.ok(!a.classList.contains('active') && b.classList.contains('active'));
+        assert.equal(a.querySelector('[role="tab"]').getAttribute('aria-selected'), 'false');
     } finally {
         env.strip.dispose();
         env.dom.window.close();
diff --git a/tests/side-pane-tab-strip.test.mjs b/tests/side-pane-tab-strip.test.mjs
index e1af53d4a..8355b50d8 100644
--- a/tests/side-pane-tab-strip.test.mjs
+++ b/tests/side-pane-tab-strip.test.mjs
@@ -37,14 +37,20 @@ test('search ranking: title prefix beats word prefix beats substring beats hint
 });
 
 test('tab presentation helpers: type labels and search hints', () => {
-    assert.equal(getTabTypeLabel({ kind: 'notifications' }), '通知');
-    assert.equal(getTabTypeLabel({ kind: 'chat' }), '辅助对话');
-    assert.equal(getTabTypeLabel({ kind: 'terminal', typeLabel: '终端' }), '终端');
-    assert.equal(getTabTypeLabel({ kind: 'unknown' }), '标签页');
+    // 打开标签的模块给的 typeLabel 原样使用；框架类型和未知类型都有非空的默认名
+    assert.equal(getTabTypeLabel({ kind: 'terminal', typeLabel: 'My Shell' }), 'My Shell');
+    assert.equal(getTabTypeLabel({ kind: 'x', typeLabel: '' }, () => ({ label: 'From registry' })), 'From registry');
+    for (const kind of ['notifications', 'chat', 'unknown']) assert.ok(getTabTypeLabel({ kind }), kind);
+    assert.notEqual(getTabTypeLabel({ kind: 'notifications' }), getTabTypeLabel({ kind: 'chat' }));
     assert.equal(getTabSearchHint({ kind: 'browser', searchHint: 'https://a.test/x' }), 'https://a.test/x');
     assert.equal(getTabSearchHint({ kind: 'browser', url: 'https://a.test/x' }), '');
-    assert.equal(formatRelativeTime(1000, 1000 + 30_000), '刚刚');
-    assert.equal(formatRelativeTime(0, 5 * 60_000), '5分钟前');
+    // 半分钟内与五分钟前给出不同的相对时间，五分钟的数字要出现
+    const justNow = formatRelativeTime(1000, 1000 + 30_000);
+    const fiveMin = formatRelativeTime(0, 5 * 60_000);
+    assert.ok(justNow);
+    assert.notEqual(justNow, fiveMin);
+    assert.match(fiveMin, /5/);
+    assert.equal(formatRelativeTime(0, 10_000), justNow, 'everything under a minute reads the same');
 });
 
 test('resolveTabsOverflow uses the min-width budget and ignores where the add button lives', () => {
@@ -147,8 +153,6 @@ test('controller: closed non-chat tabs are remembered and can really be reopened
     await controller.openTab({ id: 'n1', kind: 'notes', title: 'N1', scopeMode: 'global', searchHint: 'file:///x' });
     await controller.closeTab('n1');
 
-    // 关掉最后一个可关的标签后面板收起（与通知之外没有内容时一致）
-    assert.equal(controller.getSnapshot().visible, false);
     const closed = controller.getRecentlyClosedTabs();
     assert.equal(closed.length, 1);
     assert.equal(closed[0].id, 'n1');
@@ -262,14 +266,23 @@ test('controller: the 通知 tab mirrors the VCPLog connection status', async ()
     });
     controller.show?.();
     const tab = () => root.querySelector('.side-pane-tab[data-tab-id="notifications"]');
+    const title = () => tab().querySelector('.tab-title').textContent;
     assert.equal(tab().querySelector('.side-pane-tab-status').dataset.status, 'connecting');
-    assert.equal(tab().getAttribute('aria-label'), '通知，VCPLog: 连接中...');
-    assert.equal(tab().querySelector('.tab-title').textContent, 'VCPLog 连接中...');
+    // 读屏名带上通知中心发布的状态文字；标签上能看到的标题也跟着状态走
+    assert.ok(tab().getAttribute('aria-label').includes('VCPLog: 连接中...'));
+    const connectingTitle = title();
+    assert.ok(connectingTitle);
 
     notificationState.publish({ ...notificationState.get(), connection: { status: 'open', text: 'VCPLog: 已连接' } });
     assert.equal(tab().querySelector('.side-pane-tab-status').dataset.status, 'open');
-    assert.equal(tab().getAttribute('aria-label'), '通知，VCPLog: 已连接');
-    assert.equal(tab().querySelector('.tab-title').textContent, 'VCPLog 已连接');
+    assert.ok(tab().getAttribute('aria-label').includes('VCPLog: 已连接'));
+    assert.ok(title());
+    assert.notEqual(title(), connectingTitle);
+
+    // 没有状态文字时不留过期的读屏名
+    notificationState.publish({ ...notificationState.get(), connection: { status: 'closed', text: '' } });
+    assert.equal(tab().querySelector('.side-pane-tab-status').dataset.status, 'closed');
+    assert.equal(tab().hasAttribute('aria-label'), false);
     controller.dispose();
     dom.window.close();
 });
diff --git a/tests/side-pane-terminal-lifecycle.test.mjs b/tests/side-pane-terminal-lifecycle.test.mjs
index 90b90cd75..300ba34e8 100644
--- a/tests/side-pane-terminal-lifecycle.test.mjs
+++ b/tests/side-pane-terminal-lifecycle.test.mjs
@@ -1,22 +1,22 @@
-import test from 'node:test';
+import test, { mock } from 'node:test';
 import assert from 'node:assert/strict';
 import { JSDOM } from 'jsdom';
 import { createTerminalSideProvider } from '../modules/ui-system/side-pane/terminalSideProvider.js';
 import { createSidePaneController } from '../modules/ui-system/side-pane/side-pane-controller.js';
 
-async function until(predicate) {
-    const deadline = Date.now() + 2000;
-    while (!predicate()) {
-        assert.ok(Date.now() < deadline, 'terminal operation did not settle');
-        await new Promise(resolve => setImmediate(resolve));
-    }
-}
+import { waitFor } from './helpers/wait-for.mjs';
+
+const until = predicate => waitFor(predicate, { message: 'terminal operation did not settle' });
+const settle = () => new Promise(resolve => setImmediate(resolve));
 
 function fixture({ create = async () => ({ success: true, data: { id: 'view:1', pid: 42 } }), restart, dormancy, onOpenUrl = null } = {}) {
     const dom = new JSDOM('<input id="mainInput"><aside><div class="side-pane-tabs"></div><div class="side-pane-content-container"></div></aside>');
     const doc = dom.window.document, root = doc.querySelector('aside');
+    // 休眠时间走注入的时钟，配合 mock.timers 推进，不用真睡
+    let clock = 0;
     const controller = createSidePaneController({ root, tabListElement: root.querySelector('.side-pane-tabs'),
-        contentContainer: root.querySelector('.side-pane-content-container'), dormancy });
+        contentContainer: root.querySelector('.side-pane-content-container'),
+        dormancy: dormancy && { ...dormancy, now: () => clock } });
     const terminals = [], killed = [], creates = [], restarts = [], listeners = new Map();
     let unsubscriptions = 0, confirmations = 0;
     dom.window.confirm = () => { confirmations++; return true; };
@@ -49,9 +49,19 @@ function fixture({ create = async () => ({ success: true, data: { id: 'view:1',
     return { dom, controller, provider, doc, terminals, killed, creates, restarts, listeners,
         get unsubscriptions() { return unsubscriptions; }, get confirmations() { return confirmations; },
         status: () => root.querySelector('.side-terminal-status'),
-        retry: () => root.querySelector('[aria-label="重新启动终端"]'),
+        retry: () => root.querySelector('[data-action="restart"]'),
         screen: () => doc.querySelector('.side-terminal-screen'),
         stash: () => doc.querySelector('[data-side-terminal-stash]'),
+        // 切到别的标签让终端隐藏 ms 毫秒；面板收起时当前标签不休眠
+        async hideFor(ms) {
+            mock.timers.enable({ apis: ['setTimeout'] });
+            try {
+                controller.showNotifications();
+                clock += ms;
+                mock.timers.tick(ms);
+                await settle();
+            } finally { mock.timers.reset(); }
+        },
         async cleanup() { await controller.dispose(); dom.window.close(); } };
 }
 
@@ -71,7 +81,7 @@ test('rejected terminal creation leaves a retryable mounted view and releases it
         assert.equal(h.status().dataset.state, 'connected');
         await h.controller.closeTab('terminal:main');
         assert.deepEqual(h.killed, ['view:recovered']);
-        assert.equal(h.unsubscriptions, 3);
+        assert.equal(h.listeners.size, 0);
         assert.equal(h.terminals[0].disposals, 1);
     } finally { await h.cleanup(); }
 });
@@ -150,7 +160,7 @@ test('terminal handle disposal is idempotent and ignores queued output afterward
         const output = [...h.terminals[0].output];
         handle.dispose(); emit({ id: 'view:1', data: 'late output' });
         assert.equal(h.terminals[0].disposals, 1);
-        assert.equal(h.unsubscriptions, 3);
+        assert.equal(h.listeners.size, 0);
         assert.deepEqual(h.terminals[0].output, output);
         assert.deepEqual(h.killed, ['view:1']);
     } finally { await h.cleanup(); }
@@ -176,9 +186,7 @@ test('a sleeping terminal keeps its shell: the screen waits in the stash and com
     try {
         const handle = await h.provider.openTerminalTab();
         await until(() => handle.getSessionId() === 'view:1');
-        // 切到别的标签让终端隐藏；面板收起时当前标签不休眠
-        h.controller.showNotifications();
-        await new Promise(resolve => setTimeout(resolve, 60));
+        await h.hideFor(20);
         await until(() => h.controller.getViewResidency().dormant.length === 1);
 
         assert.equal(h.stash()?.contains(h.screen()), true, 'the screen is parked, not destroyed');
@@ -200,7 +208,7 @@ test('a sleeping terminal keeps its shell: the screen waits in the stash and com
         await h.controller.closeTab('terminal:main');
         assert.deepEqual(h.killed, ['view:1']);
         assert.equal(h.terminals[0].disposals, 1);
-        assert.equal(h.unsubscriptions, 3);
+        assert.equal(h.listeners.size, 0);
     } finally { await h.cleanup(); }
 });
 
@@ -209,9 +217,7 @@ test('closing a terminal tab while it sleeps ends the parked session', async ()
     try {
         await h.provider.openTerminalTab();
         await until(() => h.status().dataset.state === 'connected');
-        // 切到别的标签让终端隐藏；面板收起时当前标签不休眠
-        h.controller.showNotifications();
-        await new Promise(resolve => setTimeout(resolve, 60));
+        await h.hideFor(20);
         await until(() => h.stash()?.contains(h.screen()) === true);
         await h.controller.closeTab('terminal:main');
         await until(() => h.killed.length === 1);
@@ -235,13 +241,11 @@ test('a live terminal view holds its buttons and size observer through the view
         const handle = await h.provider.openTerminalTab();
         await until(() => handle.getSessionId() === 'view:1');
         const live = terminalTab().resources;
-        assert.equal(live.byType.listener, 3, 'workspace jump, clear and restart listen through the view scope');
+        assert.ok(live.byType.listener > 0, 'toolbar controls listen through the view scope');
         assert.equal(live.byType.observer, 1);
         assert.equal(observers[0].targets.size, 1);
 
-        // 切到别的标签让终端隐藏；面板收起时当前标签不休眠
-        h.controller.showNotifications();
-        await new Promise(resolve => setTimeout(resolve, 60));
+        await h.hideFor(20);
         await until(() => terminalTab().view === 'dormant');
         assert.equal(terminalTab().resources, null);
         assert.equal(observers[0].targets.size, 0, 'the parked screen is no longer observed');
diff --git a/tests/side-pane-terminal-theme.test.mjs b/tests/side-pane-terminal-theme.test.mjs
index 9051948e7..aeaf37f43 100644
--- a/tests/side-pane-terminal-theme.test.mjs
+++ b/tests/side-pane-terminal-theme.test.mjs
@@ -1,7 +1,7 @@
 import test from 'node:test';
 import assert from 'node:assert/strict';
 import { JSDOM } from 'jsdom';
-import { buildTerminalTheme, DARK_PALETTE, LIGHT_PALETTE, isLightTheme, normalizeCssColor } from '../modules/ui-system/side-pane/terminalTheme.js';
+import { buildTerminalTheme, DARK_PALETTE, LIGHT_PALETTE, isLightTheme, normalizeCssColor, LIGHT_FALLBACK_BG, DARK_FALLBACK_BG } from '../modules/ui-system/side-pane/terminalTheme.js';
 
 function makeDoc(bodyAttrs = '') {
     const dom = new JSDOM(`<body ${bodyAttrs}><div id="screen"></div></body>`, { pretendToBeVisual: true });
@@ -29,7 +29,7 @@ test('light theme (data attribute or class) gets the light palette', () => {
         const theme = buildTerminalTheme(doc, doc.getElementById('screen'));
         assert.equal(isLightTheme(doc), true, attrs);
         assert.equal(theme.yellow, LIGHT_PALETTE.yellow);
-        assert.equal(theme.background, '#fafafa', 'falls back when the frame has no background');
+        assert.equal(theme.background, LIGHT_FALLBACK_BG, 'falls back when the frame has no background');
     }
 });
 
@@ -62,11 +62,11 @@ test('mounted terminal: xterm theme follows the frame and switches with the ligh
         const screen = view.querySelector('.side-terminal-screen');
         assert.ok(screen && terminals[0], "terminal mounted");
         assert.equal(screen.getAttribute('style'), null, 'no inline style: the frame color comes from CSS');
-        assert.equal(terminals[0].options.theme.background, '#14161a');
+        assert.equal(terminals[0].options.theme.background, DARK_FALLBACK_BG);
         doc.body.setAttribute('data-vcp-theme', 'light');
         await new Promise(resolve => dom.window.queueMicrotask(resolve));
         assert.equal(terminals[0].options.theme.red, LIGHT_PALETTE.red);
-        assert.equal(terminals[0].options.theme.background, '#fafafa');
+        assert.equal(terminals[0].options.theme.background, LIGHT_FALLBACK_BG);
     } finally {
         await handle?.dispose?.();
         dom.window.close();
diff --git a/tests/side-pane-tool-output.test.mjs b/tests/side-pane-tool-output.test.mjs
index 5f77f8ea7..b40e0bf1f 100644
--- a/tests/side-pane-tool-output.test.mjs
+++ b/tests/side-pane-tool-output.test.mjs
@@ -1,17 +1,39 @@
-import test from 'node:test';
+import test, { afterEach, mock } from 'node:test';
 import assert from 'node:assert/strict';
 import { JSDOM } from 'jsdom';
 import { commandRunStatusLabel, createToolOutputSideProvider, formatRunDuration } from '../modules/ui-system/side-pane/toolOutputSideProvider.js';
 import { getCommandRunsSource } from '../modules/ui-system/sources/terminal-command-runs.js';
+import { waitFor } from './helpers/wait-for.mjs';
 
-const wait = (ms = 30) => new Promise(resolve => setTimeout(resolve, ms));
+// 只冲掉 IPC stub 的 promise；setImmediate 不被 mock.timers 接管
+// 断言失败时也拆掉挂着的标签，否则运行中命令的走秒定时器会让进程挂住
+const live = new Set();
+afterEach(async () => {
+    mock.timers.reset();
+    for (const handle of [...live]) await handle.dispose();
+});
+
+const settle = async () => { for (let i = 0; i < 5; i += 1) await new Promise(resolve => setImmediate(resolve)); };
+
+test('formatRunDuration switches units by magnitude; every status has its own label', () => {
+    const unit = (text) => text.replace(/[\d.\s]/g, '');
+    const ms = formatRunDuration({ startedAt: 1000, endedAt: 1400 });
+    const sec = formatRunDuration({ startedAt: 0, endedAt: 1500 });
+    const min = formatRunDuration({ startedAt: 0, endedAt: 125000 });
+    assert.match(ms, /^400\D/);
+    assert.match(sec, /^1\.5\D/);
+    assert.match(min, /^2\D+05\D/);
+    assert.notEqual(unit(ms), unit(sec), 'below 1s uses a different unit than seconds');
+    assert.notEqual(unit(min), unit(sec), 'a minute or more adds a minutes unit');
+    // 没结束的命令按传入的 now 计时
+    assert.match(formatRunDuration({ startedAt: 1000 }, 3000), /^2\.0\D/);
+    assert.equal(formatRunDuration({}), '');
 
-test('formatRunDuration and status labels', () => {
-    assert.equal(formatRunDuration({ startedAt: 1000, endedAt: 1400 }), '400 毫秒');
-    assert.equal(formatRunDuration({ startedAt: 0, endedAt: 1500 }), '1.5 秒');
-    assert.equal(formatRunDuration({ startedAt: 0, endedAt: 125000 }), '2 分 05 秒');
-    assert.equal(formatRunDuration({ startedAt: 1000 }, 3000), '2.0 秒');
-    assert.equal(commandRunStatusLabel('timed_out'), '已超时');
+    const statuses = ['running', 'completed', 'cancelled', 'timed_out', 'spawn_error'];
+    const labels = statuses.map(commandRunStatusLabel);
+    assert.ok(labels.every(Boolean));
+    assert.equal(new Set(labels).size, statuses.length);
+    assert.equal(commandRunStatusLabel('mystery'), 'mystery', 'unknown statuses fall back to the raw value');
 });
 
 function makeEnv({ runs, details, runningReloadMs = 60 }) {
@@ -37,6 +59,14 @@ function makeEnv({ runs, details, runningReloadMs = 60 }) {
         setVisible() {}
     };
     const provider = createToolOutputSideProvider({ document: doc, api, sidePaneController, runningReloadMs, uiHelper: { showToastNotification: (m) => state.toasts.push(m) } });
+    const mountTab = provider.mountTab.bind(provider);
+    provider.mountTab = async (...args) => {
+        const handle = await mountTab(...args);
+        const dispose = handle.dispose.bind(handle);
+        handle.dispose = () => { live.delete(handle); return dispose(); };
+        live.add(handle);
+        return handle;
+    };
     return { dom, doc, provider, state, view: doc.getElementById('view'), fire: (s) => changed?.(s), wasUnsubscribed: () => unsubscribed };
 }
 
@@ -62,37 +92,44 @@ test('mountTab follows the latest run, streams updates, and lets the user pick a
     assert.equal(state.watch, 1);
     assert.deepEqual(state.gets, ['r2']);
     assert.equal(view.querySelector('.side-tool-output-text').textContent, 'running tests…\n');
-    assert.match(view.querySelector('.side-tool-output-chip').textContent, /运行中/);
+    assert.equal(view.querySelector('.side-tool-output-chip').dataset.status, 'running');
     assert.equal(view.querySelector('.side-tool-output-command').textContent, 'npm test');
     assert.equal(view.querySelectorAll('.side-tool-output-picker option').length, 2);
 
     // 输出增长与完成
     state.details.r2 = { ...RUNS[0], status: 'completed', endedAt: Date.now(), output: 'running tests…\nok\n', truncated: false };
     fire({ id: 'r2', command: 'npm test', status: 'completed', startedAt: RUNS[0].startedAt, endedAt: Date.now() });
-    await wait(150);
-    assert.match(view.querySelector('.side-tool-output-text').textContent, /ok/);
-    assert.match(view.querySelector('.side-tool-output-chip').textContent, /已完成/);
+    await waitFor(() => /ok/.test(view.querySelector('.side-tool-output-text').textContent), { message: 'output did not grow' });
+    assert.equal(view.querySelector('.side-tool-output-chip').dataset.status, 'completed');
 
     // 没手动选过：新命令自动跟过去
     state.details.r3 = { id: 'r3', command: 'echo hi', status: 'running', startedAt: Date.now(), endedAt: null, output: 'hi\n', truncated: false };
     fire({ id: 'r3', command: 'echo hi', status: 'running', startedAt: Date.now(), endedAt: null });
-    await wait(150);
-    assert.equal(view.querySelector('.side-tool-output-command').textContent, 'echo hi');
+    await waitFor(() => view.querySelector('.side-tool-output-command').textContent === 'echo hi', { message: 'did not follow the new run' });
+    await waitFor(() => state.gets.includes('r3'));
 
     // 手动选旧命令后，新命令不再抢焦点，并显示截断提示
     const picker = view.querySelector('.side-tool-output-picker');
     picker.value = 'r1';
     picker.dispatchEvent(new view.ownerDocument.defaultView.Event('change'));
-    await wait();
-    assert.equal(view.querySelector('.side-tool-output-command').textContent, 'git status');
-    assert.equal(view.querySelector('.side-tool-output-notice').hidden, false);
-    fire({ id: 'r4', command: 'later', status: 'running', startedAt: Date.now(), endedAt: null });
-    await wait(150);
     assert.equal(view.querySelector('.side-tool-output-command').textContent, 'git status');
+    await waitFor(() => view.querySelector('.side-tool-output-notice').hidden === false, { message: 'truncation notice not shown' });
+    const picks = state.gets.length;
+    mock.timers.enable({ apis: ['setTimeout'] });
+    try {
+        fire({ id: 'r4', command: 'later', status: 'running', startedAt: Date.now(), endedAt: null });
+        mock.timers.tick(1000);
+        await settle();
+        assert.equal(view.querySelector('.side-tool-output-command').textContent, 'git status');
+        assert.equal(view.querySelector('.side-tool-output-picker').value, 'r1');
+        assert.equal(state.gets.length, picks, 'a new run does not steal a manual pick');
+    } finally {
+        mock.timers.reset();
+    }
 
     // 复制
-    view.querySelector('.side-tool-output-actions button').click();
-    await wait();
+    view.querySelector('[data-action="copy"]').click();
+    await waitFor(() => state.copied.length === 1, { message: 'nothing copied' });
     assert.deepEqual(state.copied, ['On branch main\n']);
 
     await handle.dispose();
@@ -104,16 +141,15 @@ test('openToolOutputTab with a runId selects that run in an already-mounted tab'
     const { provider, view } = makeEnv({ runs: RUNS, details: DETAILS });
     const handle = await provider.mountTab({ id: 'tool-output:main' }, view);
     await provider.openToolOutputTab({ runId: 'r1' });
-    await wait();
     assert.equal(view.querySelector('.side-tool-output-command').textContent, 'git status');
     await handle.dispose();
 });
 
 test('a run picked in a mounted tab does not stick to the tab after it sleeps and remounts', async () => {
-    const { provider, view } = makeEnv({ runs: RUNS, details: DETAILS });
+    const { provider, state, view } = makeEnv({ runs: RUNS, details: DETAILS });
     const first = await provider.mountTab({ id: 'tool-output:main' }, view);
     await provider.openToolOutputTab({ runId: 'r1' });
-    await wait();
+    await waitFor(() => state.gets.includes('r1'));
     await first.dispose(); // 休眠
     const again = await provider.mountTab({ id: 'tool-output:main' }, view);
     assert.equal(view.querySelector('.side-tool-output-command').textContent, 'npm test', 'follows the latest run again');
@@ -132,7 +168,6 @@ test('shows a helpful empty state when no command has run', async () => {
     const { provider, view } = makeEnv({ runs: [], details: {} });
     const handle = await provider.mountTab({ id: 'tool-output:main' }, view);
     assert.equal(view.querySelector('.side-tool-output-empty').hidden, false);
-    assert.match(view.querySelector('.side-tool-output-empty').textContent, /PowerShellExecutor/);
     assert.equal(view.querySelector('.side-tool-output-picker').disabled, true);
     await handle.dispose();
 });
@@ -150,16 +185,19 @@ test('scrolling up pauses following and freezes the output; returning to the bot
     Object.defineProperty(wrap, 'scrollTop', { get: () => top, set: (v) => { top = v; }, configurable: true });
     const scroll = (to) => { top = to; wrap.dispatchEvent(new dom.window.Event('scroll')); };
     const update = async (output) => {
+        const reads = state.gets.length;
         state.details.r2 = { ...RUNS[0], output, truncated: false };
         fire({ id: 'r2', command: 'npm test', status: 'running', startedAt: RUNS[0].startedAt, endedAt: null });
-        await wait(150);
+        // 读到了新输出（读取完成后才会渲染）
+        await waitFor(() => state.gets.length > reads);
+        await settle();
     };
 
     scroll(800); // 跟随中滚到底
     assert.equal(follow.hidden, true);
     scroll(300); // 向上滚：暂停
     assert.equal(follow.hidden, false);
-    assert.equal(follow.getAttribute('aria-label'), '回到底部');
+    assert.ok(follow.getAttribute('aria-label'));
 
     await update('first\nsecond\n');
     assert.equal(text.textContent, 'running tests…\n', 'output stays frozen while paused');
@@ -187,8 +225,7 @@ test('a failed output query shows an inline error with a retry instead of a toas
 
     state.details.r2 = { ...RUNS[0], output: 'back\n', truncated: false };
     view.querySelector('.side-tool-output-error-retry').click();
-    await wait();
-    assert.equal(bar.hidden, true);
+    await waitFor(() => bar.hidden === true, { message: 'retry did not clear the error' });
     assert.equal(view.querySelector('.side-tool-output-text').textContent, 'back\n');
     await handle.dispose();
 });
@@ -196,46 +233,66 @@ test('a failed output query shows an inline error with a retry instead of a toas
 test('a hidden tab keeps only the latest update and catches up when shown again', async () => {
     const { provider, state, view, fire } = makeEnv({ runs: RUNS, details: DETAILS });
     let visible = true;
+    // 挂载前就接管定时器：走秒的 interval 要由同一套（假）计时器创建和清除
+    mock.timers.enable({ apis: ['setTimeout', 'setInterval'] });
     const handle = await provider.mountTab({ id: 'tool-output:main' }, view, { occurrence: { isVisible: () => visible } });
     assert.deepEqual(state.gets, ['r2']);
+    try {
+        visible = false;
+        handle.suspend();
+        const startedAt = Date.now();
+        state.details.r3 = { id: 'r3', command: 'echo hi', status: 'running', startedAt, endedAt: null, output: 'hi\n', truncated: false };
+        fire({ id: 'r3', command: 'echo hi', status: 'running', startedAt, endedAt: null });
+        mock.timers.tick(1000);
+        await settle();
+        state.details.r3 = { ...state.details.r3, status: 'completed', endedAt: Date.now(), output: 'hi\nbye\n' };
+        fire({ id: 'r3', command: 'echo hi', status: 'completed', startedAt, endedAt: Date.now() });
+        mock.timers.tick(1000);
+        await settle();
+        // 藏着的时候不读输出、不重画
+        assert.deepEqual(state.gets, ['r2']);
+        assert.equal(view.querySelector('.side-tool-output-command').textContent, 'npm test');
 
-    visible = false;
-    handle.suspend();
-    const startedAt = Date.now();
-    state.details.r3 = { id: 'r3', command: 'echo hi', status: 'running', startedAt, endedAt: null, output: 'hi\n', truncated: false };
-    fire({ id: 'r3', command: 'echo hi', status: 'running', startedAt, endedAt: null });
-    await wait(150);
-    state.details.r3 = { ...state.details.r3, status: 'completed', endedAt: Date.now(), output: 'hi\nbye\n' };
-    fire({ id: 'r3', command: 'echo hi', status: 'completed', startedAt, endedAt: Date.now() });
-    await wait(150);
-    // 藏着的时候不读输出、不重画
-    assert.deepEqual(state.gets, ['r2']);
-    assert.equal(view.querySelector('.side-tool-output-command').textContent, 'npm test');
-
-    visible = true;
-    handle.resume();
-    await wait(150);
-    // 重新显示时按最新一份列表跟到新命令，只读一次输出
-    assert.equal(view.querySelector('.side-tool-output-command').textContent, 'echo hi');
-    assert.match(view.querySelector('.side-tool-output-chip').textContent, /已完成/);
-    assert.equal(view.querySelector('.side-tool-output-text').textContent, 'hi\nbye\n');
-    assert.deepEqual(state.gets, ['r2', 'r3']);
-    await handle.dispose();
+        visible = true;
+        handle.resume();
+        mock.timers.tick(60);
+        await settle();
+        // 重新显示时按最新一份列表跟到新命令，只读一次输出
+        assert.equal(view.querySelector('.side-tool-output-command').textContent, 'echo hi');
+        assert.equal(view.querySelector('.side-tool-output-chip').dataset.status, 'completed');
+        assert.equal(view.querySelector('.side-tool-output-text').textContent, 'hi\nbye\n');
+        mock.timers.tick(1000);
+        await settle();
+        assert.deepEqual(state.gets, ['r2', 'r3']);
+    } finally {
+        await handle.dispose();
+        mock.timers.reset();
+    }
 });
 
-test('a command that keeps printing is re-read at most once per interval, with one read in flight', async () => {
+test('a command that keeps printing is re-read at most once per interval, with one read in flight', async (t) => {
     const { provider, state, view, fire } = makeEnv({ runs: RUNS, details: { r2: { ...RUNS[0], output: 'a\n', truncated: false } }, runningReloadMs: 800 });
+    mock.timers.enable({ apis: ['setTimeout', 'setInterval'] });
+    t.after(() => mock.timers.reset());
     const handle = await provider.mountTab({ id: 'tool-output:main' }, view);
-    await wait(20);
+    await settle();
     const before = state.gets.length;
     for (let i = 0; i < 6; i += 1) {
         state.details.r2 = { ...RUNS[0], output: `line ${i}\n`, truncated: false };
         fire({ id: 'r2', command: 'npm test', status: 'running', startedAt: RUNS[0].startedAt, endedAt: null });
-        await wait(100);
+        mock.timers.tick(100);
+        await settle();
     }
     assert.equal(state.gets.length, before, 'no re-read inside the interval');
-    await wait(400);
+    mock.timers.tick(199);
+    await settle();
+    assert.equal(state.gets.length, before, 'still none just before the interval ends');
+    mock.timers.tick(1);
+    await settle();
     assert.equal(state.gets.length, before + 1, 'one re-read after the interval');
     assert.equal(view.querySelector('.side-tool-output-text').textContent, 'line 5\n', 'and it shows the latest output');
+    mock.timers.tick(800);
+    await settle();
+    assert.equal(state.gets.length, before + 1, 'no further reads without new output');
     await handle.dispose();
 });
diff --git a/tests/side-pane-view-scope-release.test.mjs b/tests/side-pane-view-scope-release.test.mjs
index 10124b732..1a4ee2427 100644
--- a/tests/side-pane-view-scope-release.test.mjs
+++ b/tests/side-pane-view-scope-release.test.mjs
@@ -1,10 +1,10 @@
-import test from 'node:test';
+import test, { mock } from 'node:test';
 import assert from 'node:assert/strict';
 import { JSDOM } from 'jsdom';
 
 import { createSidePaneRootScope } from '../modules/ui-system/side-pane/side-pane-occurrence.js';
 import { createCodeViewerSideProvider } from '../modules/ui-system/side-pane/codeViewerSideProvider.js';
-import { createPlanDetailSideProvider, planTabId } from '../modules/ui-system/side-pane/planDetailSideProvider.js';
+import { createPlanDetailSideProvider, planTabId, REFRESH_DEBOUNCE_MS } from '../modules/ui-system/side-pane/planDetailSideProvider.js';
 import { createBrowserSideProvider } from '../modules/ui-system/side-pane/browserSideProvider.js';
 import { getProjectForgeChangesSource } from '../modules/ui-system/sources/projectforge-changes.js';
 
@@ -25,18 +25,17 @@ test('releasing only the view scope detaches every control of the code viewer',
     const element = doc.getElementById('view');
     const handle = await provider.mountTab({ title: '代码', payload: {} }, element, { scope: view });
     try {
-        const [owned] = scopesUnder(view);
-        assert.equal(owned.label, 'code-viewer');
-        assert.ok(owned.resources.some(resource => resource.label.startsWith('picker:')), 'the picker listens through the view scope');
-        assert.ok(view.resourceSummary().byType.listener > 0);
+        assert.ok(scopesUnder(view).length > 0, 'the viewer owns a scope under the view');
+        assert.ok(view.resourceSummary().byType.listener > 0, 'the controls listen through the view scope');
 
         const picker = element.querySelector('.side-code-picker');
-        const toggle = element.querySelector('[aria-label="选择文件"]');
+        const toggle = element.querySelector('[data-action="toggle-picker"]');
         const collapsed = picker.classList.contains('is-collapsed');
         await view.dispose('dormant');
         toggle.click();
         assert.equal(picker.classList.contains('is-collapsed'), collapsed, 'the toggle no longer reacts');
         assert.equal(scopesUnder(view).length, 0);
+        assert.equal(view.resourceSummary().byType.listener ?? 0, 0);
         assert.equal(view.resourceSummary().resources, 0);
     } finally {
         await handle.dispose();
@@ -64,7 +63,7 @@ test('a code viewer whose view is released while it is still loading gives up in
     dom.window.close();
 });
 
-test('releasing only the view scope stops the plan page following project changes', async () => {
+test('releasing only the view scope stops the plan page following project changes', async (t) => {
     const dom = new JSDOM('<div id="view"></div>', { pretendToBeVisual: true });
     const doc = dom.window.document;
     let changed = null;
@@ -85,12 +84,17 @@ test('releasing only the view scope stops the plan page following project change
     const handle = await provider.mountTab({ id: planTabId('p1'), payload: { projectId: 'p1' } }, doc.getElementById('view'), { scope: view });
     try {
         assert.equal(typeof changed, 'function');
-        assert.ok(view.resourceSummary().byType['shared-source'] > 0 || view.resourceSummary().byType.subscription > 0);
+        assert.ok(view.resourceSummary().resources > 0);
+        // 释放前已经排上一次防抖重读：释放后推过防抖也不能再读
+        mock.timers.enable({ apis: ['setTimeout'] });
+        t.after(() => mock.timers.reset());
+        const before = gets;
+        changed({ projectId: 'p1' });
         await view.dispose('dormant');
         assert.equal(changed, null, 'the push subscription is returned');
         assert.equal(scopesUnder(view).length, 0);
-        const before = gets;
-        await new Promise(resolve => setTimeout(resolve, 300));
+        mock.timers.tick(REFRESH_DEBOUNCE_MS);
+        for (let i = 0; i < 10; i += 1) await new Promise(resolve => setImmediate(resolve));
         assert.equal(gets, before, 'no debounced reload fires after the release');
     } finally {
         await handle.dispose();
@@ -113,8 +117,7 @@ test('releasing only the view scope removes the browser tab and its popup subscr
     const handle = await provider.mountTab({ id: 'browser:1', kind: 'browser', payload: {} }, element, { scope: view });
     try {
         assert.equal(typeof openTabListener, 'function');
-        const labels = scopesUnder(view)[0].resources.map(resource => resource.label);
-        assert.ok(labels.includes('menu-outside-pointerdown') && labels.includes('browser-tab-entry'));
+        assert.ok(view.resourceSummary().resources > 0);
         await view.dispose('dormant');
         assert.equal(openTabListener, null, 'the last browser tab gives the popup push back');
         assert.equal(scopesUnder(view).length, 0);
diff --git a/tests/side-pane-visibility-animation.test.mjs b/tests/side-pane-visibility-animation.test.mjs
index 68a75a83c..f63ea6009 100644
--- a/tests/side-pane-visibility-animation.test.mjs
+++ b/tests/side-pane-visibility-animation.test.mjs
@@ -27,8 +27,6 @@ test('reopening while the close animation runs ends expanded, not collapsed', as
     await frame();
     transitionEnd();
 
-    assert.ok(root.classList.contains('active'));
-    assert.ok(!root.classList.contains('collapsed'));
     assert.equal(root.getAttribute('aria-hidden'), null);
     assert.equal(visibility.isAnimating(), false);
     visibility.dispose();
@@ -58,8 +56,7 @@ test('closing while the open animation runs ends collapsed', async () => {
     await frame();
     transitionEnd();
 
-    assert.ok(root.classList.contains('collapsed'));
-    assert.ok(!root.classList.contains('active'));
     assert.equal(root.getAttribute('aria-hidden'), 'true');
+    assert.equal(visibility.isAnimating(), false);
     visibility.dispose();
 });
diff --git a/tests/side-pane-wiring-modules.test.mjs b/tests/side-pane-wiring-modules.test.mjs
index dfeef08a0..489a59897 100644
--- a/tests/side-pane-wiring-modules.test.mjs
+++ b/tests/side-pane-wiring-modules.test.mjs
@@ -1,14 +1,10 @@
 import test from 'node:test';
 import assert from 'node:assert/strict';
+import { SIDE_PANE_LAYOUT_KEY } from '../modules/ui-system/side-pane/side-pane-persistence.js';
 
-// 渲染进程的副屏接线只在 Electron 里跑，其他测试大多按文本读它们；这里至少保证整张导入图能被解析，
-// 语法错误不会等到窗口白屏才发现
-test('side pane renderer wiring modules parse and export their factories', async () => {
-    const sidePane = await import('../modules/renderer/sidePaneWiring.js');
-    const sideChat = await import('../modules/renderer/sideChatWiring.js');
+// sidePaneWiring / sideChatWiring 下面的测试都会真的跑；宿主绑定只在 Electron 里用，这里至少保证它能被解析
+test('side pane host bindings module parses and exports its factory', async () => {
     const host = await import('../modules/renderer/sidePaneHostBindings.js');
-    assert.equal(typeof sidePane.initWorkspaceSidePane, 'function');
-    assert.equal(typeof sideChat.createSideChatWiring, 'function');
     assert.equal(typeof host.createSidePaneHostBindings, 'function');
 });
 
@@ -57,7 +53,7 @@ test('startup restores the saved layout against the current conversation: a pane
     const win = dom.window;
     const doc = win.document;
     const topicA = { itemType: 'agent', itemId: 'agent-1', topicId: 'topic-a' };
-    win.localStorage.setItem('vcp.sidePane.layout.v1', JSON.stringify({
+    win.localStorage.setItem(SIDE_PANE_LAYOUT_KEY, JSON.stringify({
         version: 1,
         tabs: [{ id: 'plan:a', kind: 'plan-detail', title: '计划', closable: true, scopeMode: 'topic', parent: topicA, payload: { projectId: 'p1' } }],
         activeTabId: 'plan:a', visible: true, activeByParent: [], collapsedByParent: []
@@ -82,6 +78,9 @@ test('startup restores the saved layout against the current conversation: a pane
         assert.ok(controller.getSnapshot().tabs.some(tab => tab.id === 'plan:a'), 'the saved tab was restored');
         assert.equal(controller.getSnapshot().visible, false);
         assert.equal(classHistory.some(className => /\bactive\b/.test(className)), false, `pane never opened: ${classHistory.join(' | ')}`);
+        // 副屏不再往主窗口挂全局函数，别的模块走命令
+        assert.equal(win.vcpSidePaneController, undefined);
+        assert.equal(win.openModelTrajectory, undefined);
     } finally {
         for (const owner of subscriptions.reverse()) await owner.dispose?.();
         win.close();

From ee99d90ccd793b41e878a485774e3c7f243f20c6 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 06:54:00 +0000
Subject: [PATCH 137/143] Notifications: closed toasts no longer pile up in the
 window's listener owner

Every VCPLog toast registered its transitionend listener on the main
window's DOM listener owner, which lives for the whole session and only
released registrations on dispose. When the 500ms fallback removed the toast
before transitionend fired (or the toast was dismissed by the notification
page), the owner kept the listener and with it the detached toast forever:
about 27 DOM nodes and 3 listeners per notification in a real Electron run.

The owner now drops registrations that have finished (fired timeouts, fired
once listeners), its timer cancel closure no longer shares scope with the
callback, the toast's transitionend listener lives on the toast itself, and
toast timers are left to fire and no-op instead of being cleared from outside.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01SADzqzusVz3S3z7qBUSy8M
---
 docs/contracts/chat-contracts.json            | 21 +------
 .../contracts/generated/chat-event-graph.json | 33 ++++++-----
 modules/notificationRenderer.js               | 57 +++++--------------
 modules/renderer/domListenerOwner.js          | 39 ++++++++++---
 scripts/next-delta-shared-baseline.json       |  4 +-
 tests/dom-listener-owner.test.mjs             | 23 ++++++++
 .../notification-renderer-lifecycle.test.mjs  | 41 +++++++++++++
 7 files changed, 130 insertions(+), 88 deletions(-)

diff --git a/docs/contracts/chat-contracts.json b/docs/contracts/chat-contracts.json
index 79fee959a..7f17b7363 100644
--- a/docs/contracts/chat-contracts.json
+++ b/docs/contracts/chat-contracts.json
@@ -628,25 +628,6 @@
       "Source review at integration base 8eb9593a; exact operation matches below; new or changed dynamic sites still fail the contract gate."
     ]
   },
-  {
-    "id": "source.dynamic.modules.notificationrenderer",
-    "kind": "source-review",
-    "owner": "modules/notificationRenderer.js",
-    "status": "reviewed",
-    "dynamic": true,
-    "review": "DOM listener adapter: event type is supplied by module-local UI bindings; it forwards to the specified target. Existing scope, abort signal or caller cleanup owns the listener. This registers the source site without claiming a long-session lifetime measurement.",
-    "dynamicSites": [
-      {
-        "file": "modules/notificationRenderer.js",
-        "line": 19,
-        "kind": "custom-event-listener",
-        "match": "target?.addEventListener?.(type"
-      }
-    ],
-    "evidence": [
-      "Source review at integration base 8eb9593a; exact operation matches below; new or changed dynamic sites still fail the contract gate."
-    ]
-  },
   {
     "id": "source.dynamic.modules.renderer.domlistenerowner",
     "kind": "source-review",
@@ -657,7 +638,7 @@
     "dynamicSites": [
       {
         "file": "modules/renderer/domListenerOwner.js",
-        "line": 9,
+        "line": 15,
         "kind": "custom-event-listener",
         "match": "target.addEventListener(type"
       }
diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 724deb9e0..d05d9e83c 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -3582,7 +3582,7 @@
         },
         {
           "file": "modules/notificationRenderer.js",
-          "line": 836,
+          "line": 830,
           "kind": "custom-event-listener"
         },
         {
@@ -5029,7 +5029,7 @@
         },
         {
           "file": "modules/notificationRenderer.js",
-          "line": 836,
+          "line": 830,
           "kind": "custom-event-listener",
           "match": "reasonInput.addEventListener('click'"
         },
@@ -12586,7 +12586,7 @@
         },
         {
           "file": "modules/notificationRenderer.js",
-          "line": 1222,
+          "line": 1195,
           "kind": "custom-event-listener"
         },
         {
@@ -12646,7 +12646,7 @@
         },
         {
           "file": "modules/notificationRenderer.js",
-          "line": 1222,
+          "line": 1195,
           "kind": "custom-event-listener",
           "match": "window.addEventListener('focus'"
         },
@@ -15402,7 +15402,7 @@
         },
         {
           "file": "modules/notificationRenderer.js",
-          "line": 837,
+          "line": 831,
           "kind": "custom-event-listener"
         },
         {
@@ -15765,7 +15765,7 @@
         },
         {
           "file": "modules/notificationRenderer.js",
-          "line": 837,
+          "line": 831,
           "kind": "custom-event-listener",
           "match": "reasonInput.addEventListener('keydown'"
         },
@@ -29418,6 +29418,11 @@
       "name": "transitionend",
       "producers": [],
       "consumers": [
+        {
+          "file": "modules/notificationRenderer.js",
+          "line": 967,
+          "kind": "custom-event-listener"
+        },
         {
           "file": "modules/ui-helpers.js",
           "line": 724,
@@ -29435,6 +29440,12 @@
         }
       ],
       "evidence": [
+        {
+          "file": "modules/notificationRenderer.js",
+          "line": 967,
+          "kind": "custom-event-listener",
+          "match": "toastElement.addEventListener('transitionend'"
+        },
         {
           "file": "modules/ui-helpers.js",
           "line": 724,
@@ -32807,17 +32818,9 @@
       "match": "target.addEventListener(type",
       "contractId": "source.dynamic.modules.notificationcenter"
     },
-    {
-      "file": "modules/notificationRenderer.js",
-      "line": 19,
-      "reason": "dynamic listener name: type",
-      "kind": "custom-event-listener",
-      "match": "target?.addEventListener?.(type",
-      "contractId": "source.dynamic.modules.notificationrenderer"
-    },
     {
       "file": "modules/renderer/domListenerOwner.js",
-      "line": 9,
+      "line": 15,
       "reason": "dynamic listener name: type",
       "kind": "custom-event-listener",
       "match": "target.addEventListener(type",
diff --git a/modules/notificationRenderer.js b/modules/notificationRenderer.js
index 680d4926c..4495784e4 100755
--- a/modules/notificationRenderer.js
+++ b/modules/notificationRenderer.js
@@ -14,12 +14,6 @@ function scheduleNotificationTimeout(callback, delay) {
         : setTimeout(callback, delay);
 }
 
-function listenNotification(target, type, handler, options) {
-    if (notificationLifecycleOwner?.add) return notificationLifecycleOwner.add(target, type, handler, options);
-    target?.addEventListener?.(type, handler, options);
-    return true;
-}
-
 /**
  * @typedef {Object} VCPLogStatus
  * @property {'open'|'closed'|'error'|'connecting'} status
@@ -907,13 +901,8 @@ function renderVCPLogNotification(logData, originalRawMessage = null, notificati
                 // 审核请求防误触：悬浮通知本体点击不关闭，必须点“允许/拒绝”。
                 element.onclick = null;
             } else {
-                element.onclick = () => {
-                    // 清除自动消失的timeout（如果有的话）
-                    if (element.dataset.autoDismissTimeout) {
-                        clearTimeout(parseInt(element.dataset.autoDismissTimeout));
-                    }
-                    closeToastNotification(element);
-                }; // Click on bubble itself still closes it
+                // 自动消失的定时器不在这里清：它到点发现浮卡已经不在会直接返回，并从 owner 里注销自己
+                element.onclick = () => closeToastNotification(element); // Click on bubble itself still closes it
             }
         } else { // For persistent list item
             const copyButton = document.createElement('button');
@@ -966,21 +955,16 @@ function renderVCPLogNotification(logData, originalRawMessage = null, notificati
     };
 
     const closeToastNotification = (toastElement) => {
+        if (toastElement.classList.contains('exiting')) return;
         toastElement.classList.add('exiting');
-        
-        // 设置一个fallback timeout，确保元素一定会被移除
-        const fallbackTimeout = scheduleNotificationTimeout(() => {
-            if (toastElement.parentNode) {
-                toastElement.parentNode.removeChild(toastElement);
-            }
-        }, 500); // 500ms后强制移除，即使transition没有完成
-        
-        listenNotification(toastElement, 'transitionend', () => {
-            clearTimeout(fallbackTimeout); // 如果transition正常完成，清除fallback
-            if (toastElement.parentNode) {
-                toastElement.parentNode.removeChild(toastElement);
-            }
-        }, { once: true });
+        const removeToast = () => toastElement.parentNode?.removeChild(toastElement);
+
+        // 500ms 后强制移除，即使 transition 没有完成；触发后 owner 会自己删掉这条登记，不再单独 clearTimeout
+        scheduleNotificationTimeout(removeToast, 500);
+
+        // 监听挂在浮卡自己身上，随浮卡一起回收：交给窗口级 owner 的话，transition 没跑完就被
+        // 强制移除时 transitionend 永远不来，owner 会一直攥着这张浮卡
+        toastElement.addEventListener('transitionend', removeToast, { once: true });
     };
 
     const settleApprovalListItem = (approvalElement, decision) => {
@@ -1091,22 +1075,14 @@ function renderVCPLogNotification(logData, originalRawMessage = null, notificati
             }
         }
 
-        let autoDismissTimeout;
-        if (autoDismissDelay === Infinity) {
-            // 永久显示，不设置自动消失定时器
-            autoDismissTimeout = null;
-        } else {
-            autoDismissTimeout = scheduleNotificationTimeout(() => {
+        // 永久显示的不设定时器；到点时浮卡已被手动关掉或面板收走就什么也不做
+        if (autoDismissDelay !== Infinity) {
+            scheduleNotificationTimeout(() => {
                 if (toastBubble.parentNode && toastBubble.classList.contains('visible') && !toastBubble.classList.contains('exiting')) {
                     closeToastNotification(toastBubble);
                 }
             }, autoDismissDelay);
         }
-        
-        // 保存timeout ID，以便在手动关闭时清除（如果有的话）
-        if (autoDismissTimeout) {
-            toastBubble.dataset.autoDismissTimeout = autoDismissTimeout.toString();
-        }
     } else if (toastContainer && notificationsSidebarElement && notificationsSidebarElement.classList.contains('active')) {
         // console.log('Notification sidebar is active, suppressing floating toast.');
     } else if (filterResult && filterResult.action === 'hide') {
@@ -1159,10 +1135,7 @@ function renderVCPLogNotification(logData, originalRawMessage = null, notificati
 function dismissFloatingToasts() {
     const toastContainer = document.getElementById('floating-toast-notifications-container');
     if (!toastContainer) return;
-    toastContainer.querySelectorAll('.floating-toast-notification[data-notification-source="vcplog"]').forEach(toast => {
-        if (toast.dataset.autoDismissTimeout) clearTimeout(Number(toast.dataset.autoDismissTimeout));
-        toast.remove();
-    });
+    toastContainer.querySelectorAll('.floating-toast-notification[data-notification-source="vcplog"]').forEach(toast => toast.remove());
 }
 
 // 添加窗口焦点变化监听，清理残留的通知元素
diff --git a/modules/renderer/domListenerOwner.js b/modules/renderer/domListenerOwner.js
index 858e7e52e..3bec633b0 100644
--- a/modules/renderer/domListenerOwner.js
+++ b/modules/renderer/domListenerOwner.js
@@ -1,25 +1,37 @@
 /** Owns DOM event registrations for one renderer lifecycle and removes them on dispose. */
 export function createDomListenerOwner({ reportError = console.error } = {}) {
-    const registrations = [];
+    // 已经结束的登记（触发过的定时器、触发过的 once 监听）要及时删掉：
+    // 主窗口的 owner 活一整个会话，只增不减会把每条通知的浮卡和回调都留在内存里
+    const registrations = new Set();
     let disposed = false;
     let capturingOwned = false;
     const add = (target, type, handler, options) => {
         if (disposed || !target?.addEventListener || typeof handler !== 'function') return false;
+        let remove = null;
+        const listener = options?.once === true
+            ? function onceListener(...args) { registrations.delete(remove); return handler.apply(this, args); }
+            : handler;
         capturingOwned = true;
-        try { target.addEventListener(type, handler, options); } finally { capturingOwned = false; }
-        registrations.push(() => target.removeEventListener?.(type, handler, options));
+        try { target.addEventListener(type, listener, options); } finally { capturingOwned = false; }
+        remove = () => target.removeEventListener?.(type, listener, options);
+        registrations.add(remove);
         return true;
     };
     const own = resource => {
         if (disposed || !resource) return resource;
         const dispose = typeof resource === 'function' ? resource : (resource.disconnect || resource.dispose || resource.abort);
-        if (typeof dispose === 'function') registrations.push(() => dispose.call(resource));
+        if (typeof dispose === 'function') registrations.add(() => dispose.call(resource));
         return resource;
     };
     const timeout = (callback, delay) => {
         if (disposed || typeof callback !== 'function') return null;
-        const handle = setTimeout(() => { if (!disposed) callback(); }, delay);
-        registrations.push(() => clearTimeout(handle));
+        let remove = null;
+        const handle = setTimeout(() => {
+            registrations.delete(remove);
+            if (!disposed) callback();
+        }, delay);
+        remove = timerCanceller(handle);
+        registrations.add(remove);
         return handle;
     };
     const capture = () => {
@@ -29,7 +41,7 @@ export function createDomListenerOwner({ reportError = console.error } = {}) {
         const owner = EventTarget.prototype;
         owner.addEventListener = function(type, handler, options) {
             if (!capturingOwned && typeof handler === 'function') {
-                registrations.push(() => originalRemove.call(this, type, handler, options));
+                registrations.add(() => originalRemove.call(this, type, handler, options));
             }
             return originalAdd.call(this, type, handler, options);
         };
@@ -38,9 +50,18 @@ export function createDomListenerOwner({ reportError = console.error } = {}) {
     const dispose = () => {
         if (disposed) return;
         disposed = true;
-        for (const remove of registrations.splice(0).reverse()) {
+        const pending = [...registrations].reverse();
+        registrations.clear();
+        for (const remove of pending) {
             try { remove(); } catch (error) { reportError('[DomListenerOwner] remove failed', error); }
         }
     };
-    return Object.freeze({ add, own, timeout, capture, dispose });
+    const size = () => registrations.size;
+    return Object.freeze({ add, own, timeout, capture, dispose, size });
+}
+
+// 在独立作用域里建取消函数：和回调同一个闭包的话，外部直接 clearTimeout 掉的定时器
+// 会让这条登记连同回调（和回调引用的 DOM）一起留到 owner 销毁
+function timerCanceller(handle) {
+    return () => clearTimeout(handle);
 }
diff --git a/scripts/next-delta-shared-baseline.json b/scripts/next-delta-shared-baseline.json
index 2e0873ce3..3d46ced92 100644
--- a/scripts/next-delta-shared-baseline.json
+++ b/scripts/next-delta-shared-baseline.json
@@ -32,8 +32,8 @@
     "reason": "shared filter authority; canonical menu calls its public API; filter persistence now uses operation-aware path patches to avoid complete-snapshot overwrite"
   },
   "modules/notificationRenderer.js": {
-    "sha256": "2a7d1757b6e4c71761825fb824a440a3614b34453383e843a248352588fdc85b",
-    "reason": "Integrated approval behavior: escaped text/diff previews describe ProjectForge edits and destructive targets; duplicate request cards are rejected; TTL/replay expiry removes actions; settlement cancels its timer; approval requests bypass display filtering. Review uses source at the registration commit f7596f9c because the recorded historical digest has no matching committed blob. The VCPLog connection status is also reported to the side-pane notification center before the optional status element is updated, so the center shows it when the classic status element is absent. VCPLog toasts are tagged and dismissFloatingToasts() takes them down when the side pane's notification page is shown, since the list already holds each of them (pending approvals stay answerable there); toasts from other sources are kept."
+    "sha256": "8c0c9de5b7102270739d275f7b5d74adafea8096a02c6dffd1cb040ace1c11e9",
+    "reason": "Integrated approval behavior: escaped text/diff previews describe ProjectForge edits and destructive targets; duplicate request cards are rejected; TTL/replay expiry removes actions; settlement cancels its timer; approval requests bypass display filtering. Review uses source at the registration commit f7596f9c because the recorded historical digest has no matching committed blob. The VCPLog connection status is also reported to the side-pane notification center before the optional status element is updated, so the center shows it when the classic status element is absent. VCPLog toasts are tagged and dismissFloatingToasts() takes them down when the side pane's notification page is shown, since the list already holds each of them (pending approvals stay answerable there); toasts from other sources are kept. Toast close registers transitionend on the toast itself and the auto-dismiss timer is no longer cleared externally, so closed or panel-dismissed toasts are not retained by the window-lifetime listener owner."
   },
   "VCPDistributedServer/frontend-plugin-loader.js": {
     "sha256": "0987ee41ed76c8b4f0963353c4b387f0b46a6202b9e8516aa02cce27568862ca",
diff --git a/tests/dom-listener-owner.test.mjs b/tests/dom-listener-owner.test.mjs
index 79f7f49be..5faa827f8 100644
--- a/tests/dom-listener-owner.test.mjs
+++ b/tests/dom-listener-owner.test.mjs
@@ -8,3 +8,26 @@ test('DOM listener owner removes registrations and ignores late adds', () => {
     assert.equal(owner.add(target, 'click', handler), true); owner.dispose(); owner.dispose(); assert.equal(owner.add(target, 'click', handler), false);
     assert.equal(added.length, 1); assert.equal(removed.length, 1); assert.equal(removed[0][1], handler);
 });
+
+test('fired timeouts and once listeners drop out of the owner; dispose still clears the rest', async () => {
+    const owner = createDomListenerOwner();
+    const target = new EventTarget();
+    let fired = 0, persistent = 0, late = 0;
+    owner.add(target, 'ping', () => { persistent += 1; });
+    owner.add(target, 'once', () => { fired += 1; }, { once: true });
+    owner.timeout(() => { fired += 1; }, 5);
+    owner.timeout(() => { late += 1; }, 60000);
+    assert.equal(owner.size(), 4);
+
+    target.dispatchEvent(new Event('once'));
+    target.dispatchEvent(new Event('once'));
+    await new Promise(resolve => setTimeout(resolve, 20));
+    assert.equal(fired, 2);
+    assert.equal(owner.size(), 2);
+
+    owner.dispose();
+    target.dispatchEvent(new Event('ping'));
+    assert.equal(persistent, 0);
+    assert.equal(late, 0);
+    assert.equal(owner.size(), 0);
+});
diff --git a/tests/notification-renderer-lifecycle.test.mjs b/tests/notification-renderer-lifecycle.test.mjs
index 51d9860ad..6e292ed93 100644
--- a/tests/notification-renderer-lifecycle.test.mjs
+++ b/tests/notification-renderer-lifecycle.test.mjs
@@ -57,3 +57,44 @@ test('opening the notifications panel takes down the floating copies of VCPLog n
     owner.dispose();
     dom.window.close();
 });
+
+test('closed toasts and fired timers leave nothing behind in the window-lifetime owner', async t => {
+    const dom = new JSDOM(`<!doctype html><html><body>
+        <div id="floating-toast-notifications-container"></div>
+        <aside id="notificationsSidebar"></aside>
+        <ul id="notificationsList"></ul>
+    </body></html>`, { runScripts: 'outside-only' });
+    dom.window.chatAPI = {};
+    dom.window.eval(fs.readFileSync('modules/notificationRenderer.js', 'utf8'));
+    const owner = createDomListenerOwner();
+    // 失败时也要停掉 30s 的定期清理，否则测试进程挂住
+    t.after(() => { owner.dispose(); dom.window.close(); });
+    // 50ms 后自动收起，走 closeToastNotification 的强制移除分支（jsdom 不跑 transition）
+    dom.window.notificationRenderer.configureCapabilities({
+        filterManager: { checkMessageFilter: () => ({ action: 'show', duration: 0.05 }) },
+        listenerOwner: owner,
+    });
+    const doc = dom.window.document;
+    const list = doc.getElementById('notificationsList');
+    dom.window.notificationRenderer.renderVCPLogNotification({ type: 'vcp_log', data: { tool_name: 'X', status: 'success', content: 'warm up' } }, null, list, {});
+    await new Promise(resolve => setTimeout(resolve, 700));
+    const baseline = owner.size();
+
+    for (let i = 0; i < 20; i++) {
+        dom.window.notificationRenderer.renderVCPLogNotification({ type: 'vcp_log', data: { tool_name: 'X', status: 'success', content: 'n' + i } }, null, list, {});
+    }
+    assert.equal(doc.querySelectorAll('.floating-toast-notification').length, 20);
+    await new Promise(resolve => setTimeout(resolve, 700));
+    assert.equal(doc.querySelectorAll('.floating-toast-notification').length, 0);
+    assert.equal(owner.size(), baseline);
+
+    // 通知面板打开时被收走、被点掉的浮卡也一样
+    for (let i = 0; i < 10; i++) {
+        dom.window.notificationRenderer.renderVCPLogNotification({ type: 'vcp_log', data: { tool_name: 'X', status: 'success', content: 'm' + i } }, null, list, {});
+    }
+    doc.querySelector('.floating-toast-notification').onclick();
+    dom.window.notificationRenderer.dismissFloatingToasts();
+    assert.equal(doc.querySelectorAll('.floating-toast-notification').length, 0);
+    await new Promise(resolve => setTimeout(resolve, 700));
+    assert.equal(owner.size(), baseline);
+});

From 791bfd96fb936db795f9e9343bf3863fae5dcfb9 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 07:02:40 +0000
Subject: [PATCH 138/143] fix(side-chat): Stop keeps the reply that already
 streamed

If the reply finished on its own while a slow interrupt request was
pending, the failed interrupt deleted it as if it were an empty
placeholder (side chat and main chat). Now only a still-streaming
placeholder is removed. If upstream accepts the interrupt but never
sends a terminal, the side chat stops locally after 3s and saves the
partial as cancelled instead of staying busy.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_016hW799u5Ji5k9khDAwu688
---
 .../contracts/generated/chat-event-graph.json |  8 +-
 modules/chatManager.js                        | 21 ++++-
 modules/renderer/mainChatSendOwner.js         |  3 +-
 scripts/next-delta-shared-baseline.json       |  4 +-
 tests/helpers/side-chat-surface-fixture.mjs   |  4 +-
 tests/main-chat-send-owner.test.mjs           | 24 ++++++
 tests/side-chat-stop-partial.test.mjs         | 84 +++++++++++++++++++
 7 files changed, 136 insertions(+), 12 deletions(-)
 create mode 100644 tests/side-chat-stop-partial.test.mjs

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index b4ed1155f..56eb07283 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -21439,14 +21439,14 @@
       "consumers": [
         {
           "file": "modules/chatManager.js",
-          "line": 389,
+          "line": 396,
           "kind": "preload-subscription"
         }
       ],
       "evidence": [
         {
           "file": "modules/chatManager.js",
-          "line": 389,
+          "line": 396,
           "kind": "preload-subscription",
           "match": "electronAPI.onCanvasContentUpdate("
         }
@@ -21458,14 +21458,14 @@
       "consumers": [
         {
           "file": "modules/chatManager.js",
-          "line": 390,
+          "line": 397,
           "kind": "preload-subscription"
         }
       ],
       "evidence": [
         {
           "file": "modules/chatManager.js",
-          "line": 390,
+          "line": 397,
           "kind": "preload-subscription",
           "match": "electronAPI.onCanvasWindowClosed("
         }
diff --git a/modules/chatManager.js b/modules/chatManager.js
index c44c02b56..503061f39 100755
--- a/modules/chatManager.js
+++ b/modules/chatManager.js
@@ -6,6 +6,13 @@ import {
 } from './chat/singleChatRequestOrchestrator.js';
 import { publishConversationSelection } from './ui-system/sources/conversation-current.js';
 
+// 上游接受中止后等它自己收尾的上限；过了仍没有终态就在本地停止，保留已收到的部分
+const INTERRUPT_SETTLE_MS = 3000;
+const settlesWithin = (promise, ms) => new Promise(resolve => {
+    const timer = setTimeout(() => resolve(false), ms);
+    promise.then(() => { clearTimeout(timer); resolve(true); }, () => { clearTimeout(timer); resolve(true); });
+});
+
 export const chatManager = (() => {
     // --- Private Variables ---
     let electronAPI;
@@ -1573,6 +1580,7 @@ export const chatManager = (() => {
         let thinkingMessageItem = null;
         let releaseStreamConsumerRoute = null;
         let settleOwnedStreamOperation = null;
+        let ownedStreamSettled = false;
         const ownedStreamTerminal = request?.awaitTerminal
             ? new Promise(resolve => { settleOwnedStreamOperation = resolve; })
             : null;
@@ -1758,7 +1766,10 @@ export const chatManager = (() => {
                             append: (messageId, chunk, streamContext) => request.domRenderer.appendStreaming(messageId, chunk, streamContext),
                             projectTerminal: (messageId, finishReason, streamContext, payload) => request.domRenderer.projectStreamTerminal(messageId, finishReason, streamContext, payload),
                         } : {}),
-                        settle: result => settleOwnedStreamOperation?.(result),
+                        settle: result => {
+                            ownedStreamSettled = true;
+                            settleOwnedStreamOperation?.(result);
+                        },
                         release: () => {
                             releaseStreamConsumerRoute?.();
                             releaseStreamConsumerRoute = null;
@@ -1776,9 +1787,13 @@ export const chatManager = (() => {
                             let interrupted = null;
                             try { interrupted = await interruptCapability?.interrupt?.(thinkingMessage.id); }
                             catch (error) { console.warn('[ChatManager] Surface interrupt request failed; cancelling locally:', error); }
-                            if (interrupted?.success === true) return true;
+                            // 上游接受了中止却一直不发终态时，不能让侧聊一直忙着：等一会儿仍没收尾就在本地停
+                            if (interrupted?.success === true && (!ownedStreamTerminal || await settlesWithin(ownedStreamTerminal, INTERRUPT_SETTLE_MS))) return true;
+                            // 中止请求可能要等好几秒，期间回答已经自己收尾（路由随之释放）；
+                            // 这时它是一条完整或已停止的回答，不能再当占位删掉
+                            if (ownedStreamSettled) return true;
                             const res = await releaseStreamConsumerRoute?.cancel?.(reason || 'surface-operation-cancelled');
-                            if (res?.kind) return true;
+                            if (res?.kind || ownedStreamSettled) return true;
                             settleOwnedStreamOperation?.({ event: { type: 'cancelled', reason: reason || 'surface-operation-cancelled' } });
                             await removeThinkingFromSource();
                             return res !== false;
diff --git a/modules/renderer/mainChatSendOwner.js b/modules/renderer/mainChatSendOwner.js
index b98a5291a..51143eab5 100644
--- a/modules/renderer/mainChatSendOwner.js
+++ b/modules/renderer/mainChatSendOwner.js
@@ -96,7 +96,8 @@ export function createMainChatSendOwner({
             result.error || 'interrupt-request-failed'
         );
         if (disposed) return false;
-        if (!localOutcome) {
+        // 中止请求可能要等好几秒，期间回答已经自己收尾；那时它不再是占位，不能删
+        if (!localOutcome && getInterruptibleMessage()?.id === activeMessage.id) {
             streamProjection?.discardStreamingMessage?.(activeMessage.id);
             historyRef.set(historyRef.get().filter(message => message?.id !== activeMessage.id));
             messageRenderer?.removeMessageById?.(activeMessage.id, false);
diff --git a/scripts/next-delta-shared-baseline.json b/scripts/next-delta-shared-baseline.json
index 2628f678e..d37b79a63 100644
--- a/scripts/next-delta-shared-baseline.json
+++ b/scripts/next-delta-shared-baseline.json
@@ -1,7 +1,7 @@
 {
   "modules/chatManager.js": {
-    "sha256": "378dc6675c82f6b3ab812c2cfc104332315fd0e0e36a0e3abac0913bcc452d7e",
-    "reason": "Integrated chat behavior: selection subscriptions for topic side panes; clear old media before navigation; per-conversation side chat context/unread policy; explicit cancellation and non-streaming terminal settlement; one error notice per failed request. Reviewed auxiliary-side-chat reproduction: Stop during delayed history save or request preparation previously still sent generation; renderer-local AbortSignal checks now prevent that send. When upstream interrupt fails, await the existing local stream terminal before placeholder cleanup so accepted partial content is saved instead of deleted. Actual native side owner, internal renderer, manager, preload/IPC/disk and local HTTP before/after evidence; side preparation and partial-cancel regressions. Existing Surface routing and history authority remain in place. Main/group sending without the optional signal keeps its preparation path. Stop while awaiting the first HTTP headers: a locally aborted stream IPC return now awaits the already-owned cancellation terminal instead of showing a service-error notice; the regression keeps the submitted question and leaves the busy state. Non-streaming terminal save: a failed reply save (either { success: false } or the agent IPC { error } shape) now settles failed with a persistence error, so the auxiliary side chat shows its unsaved badge and blocks close like streaming does; covered by tests/side-chat-save-failure.test.mjs. Selection intent: onSelectionIntent fires as soon as selectTopic or selectItem sets the topic, before history renders, so the side pane follows a long topic immediately instead of showing the previous topic's side chat for seconds; onSelectionChange still fires on commit; covered by tests/chat-manager-selection-race.test.js. Stop on an unresponsive server: a non-streaming side chat reply settles cancelled locally first and notifies upstream without waiting, and the send no longer waits for the main-process request (which has no local abort) once its terminal is cancelled, so the composer unlocks at once and a late answer is not written into the stopped turn; covered by tests/side-chat-save-failure.test.mjs."
+    "sha256": "67a32e7ff9088999cb781033ec745ff3f376f15c107cac766d9764003f1fa77f",
+    "reason": "Integrated chat behavior: selection subscriptions for topic side panes; clear old media before navigation; per-conversation side chat context/unread policy; explicit cancellation and non-streaming terminal settlement; one error notice per failed request. Reviewed auxiliary-side-chat reproduction: Stop during delayed history save or request preparation previously still sent generation; renderer-local AbortSignal checks now prevent that send. When upstream interrupt fails, await the existing local stream terminal before placeholder cleanup so accepted partial content is saved instead of deleted. Actual native side owner, internal renderer, manager, preload/IPC/disk and local HTTP before/after evidence; side preparation and partial-cancel regressions. Existing Surface routing and history authority remain in place. Main/group sending without the optional signal keeps its preparation path. Stop while awaiting the first HTTP headers: a locally aborted stream IPC return now awaits the already-owned cancellation terminal instead of showing a service-error notice; the regression keeps the submitted question and leaves the busy state. Non-streaming terminal save: a failed reply save (either { success: false } or the agent IPC { error } shape) now settles failed with a persistence error, so the auxiliary side chat shows its unsaved badge and blocks close like streaming does; covered by tests/side-chat-save-failure.test.mjs. Selection intent: onSelectionIntent fires as soon as selectTopic or selectItem sets the topic, before history renders, so the side pane follows a long topic immediately instead of showing the previous topic's side chat for seconds; onSelectionChange still fires on commit; covered by tests/chat-manager-selection-race.test.js. Stop on an unresponsive server: a non-streaming side chat reply settles cancelled locally first and notifies upstream without waiting, and the send no longer waits for the main-process request (which has no local abort) once its terminal is cancelled, so the composer unlocks at once and a late answer is not written into the stopped turn; covered by tests/side-chat-save-failure.test.mjs. Stop keeps what was already streamed: if the reply finishes by itself while a slow interrupt request is pending (the stream route is already released), the failed interrupt no longer deletes it as a placeholder; if upstream accepts the interrupt but never sends a terminal, the side chat stops locally after 3s and saves the partial as cancelled; covered by tests/side-chat-stop-partial.test.mjs."
   },
   "modules/messageRenderer.js": {
     "sha256": "f24426207cf95eb4fa3f42e2ee357ed906d0a56ac6b235dd9d996fc39966b6e5",
diff --git a/tests/helpers/side-chat-surface-fixture.mjs b/tests/helpers/side-chat-surface-fixture.mjs
index 37930b25f..87de6f2b7 100644
--- a/tests/helpers/side-chat-surface-fixture.mjs
+++ b/tests/helpers/side-chat-surface-fixture.mjs
@@ -11,7 +11,7 @@ const { createChatHistoryPersistence } = await import(`${R}/chat/chatHistoryPers
 export const tick = () => new Promise(resolve => setImmediate(resolve));
 let fixtureId = 0;
 
-export async function fixture(t, { stream = false, seed = [], onSave = null, onSend = null, model = 'fixture', toasts = [] } = {}) {
+export async function fixture(t, { stream = false, seed = [], onSave = null, onSend = null, model = 'fixture', toasts = [], interrupt = null } = {}) {
     const dom = new JSDOM('<div id="mount"></div>', { pretendToBeVisual: true, url: 'http://localhost/' });
     const oldWindow = globalThis.window;
     globalThis.window = dom.window;
@@ -80,7 +80,7 @@ export async function fixture(t, { stream = false, seed = [], onSave = null, onS
             },
         },
         uiHelper: { showToastNotification: (m, ty) => toasts.push([m, ty]), autoResizeTextarea() {} },
-        modules: { messageRenderer: renderer },
+        modules: { messageRenderer: renderer, ...(interrupt ? { interruptHandler: interrupt } : {}) },
         refs: { currentSelectedItemRef: { get: () => null }, currentTopicIdRef: { get: () => null }, currentChatHistoryRef: { get: () => [], set() {} },
             attachedFilesRef: { get: () => [] }, globalSettingsRef: { get: () => ({ vcpServerUrl: 'http://fixture.invalid/v1/chat/completions' }) } },
         elements: {}, mainRendererFunctions: {},
diff --git a/tests/main-chat-send-owner.test.mjs b/tests/main-chat-send-owner.test.mjs
index 922f491d7..830e56128 100644
--- a/tests/main-chat-send-owner.test.mjs
+++ b/tests/main-chat-send-owner.test.mjs
@@ -91,6 +91,30 @@ test('send owner preserves failed-interrupt local cleanup', async () => {
     ]);
 });
 
+test('failed interrupt keeps a reply that finished while the interrupt was pending', async () => {
+    const message = { id: 'message-f', role: 'assistant', isThinking: true };
+    const element = { isConnected: true, classList: { contains: () => true } };
+    const calls = [];
+    let resolveInterrupt;
+    const owner = createMainChatSendOwner({
+        button: button(), messagesRoot: { querySelector: () => element }, historyRef: ref([message]),
+        selectedItemRef: ref({ id: 'agent-a', type: 'agent' }), topicIdRef: ref('topic-a'),
+        streamProjection: { discardStreamingMessage: id => calls.push(['discard', id]) },
+        chatAPI: {}, interruptHandler: { interrupt: () => new Promise(resolve => { resolveInterrupt = resolve; }) },
+        getAdapter: () => ({ cancelStream: async id => (calls.push(['cancel', id]), null) }),
+        getChatManager: () => null,
+        messageRenderer: { removeMessageById: id => calls.push(['remove', id]) },
+        notify: () => {},
+    });
+    const pending = owner.interrupt();
+    // 回答在中止请求返回前正常结束：不再是 thinking，也不再 streaming
+    message.isThinking = false;
+    element.classList.contains = () => false;
+    resolveInterrupt({ success: false, error: 'Unexpected token' });
+    await pending;
+    assert.deepEqual(calls, [['cancel', 'message-f']]);
+});
+
 test('send owner suppresses late interrupt completion after dispose', async () => {
     let resolveInterrupt;
     const calls = [];
diff --git a/tests/side-chat-stop-partial.test.mjs b/tests/side-chat-stop-partial.test.mjs
new file mode 100644
index 000000000..2a916bcd6
--- /dev/null
+++ b/tests/side-chat-stop-partial.test.mjs
@@ -0,0 +1,84 @@
+// 侧聊点停止：已经流出来的部分要留下并标为已停止（和主聊天一致），停止之后才到的内容不再写进来。
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { fixture, tick } from './helpers/side-chat-surface-fixture.mjs';
+
+const wait = ms => new Promise(resolve => setTimeout(resolve, ms));
+const untilNotBusy = async (form, ms) => {
+    const deadline = Date.now() + ms;
+    while (Date.now() < deadline) { if (!form.hasAttribute('aria-busy')) return true; await wait(20); }
+    return false;
+};
+const assistant = f => f.getHistory().filter(message => message.role === 'assistant');
+const open = async (t, options) => {
+    const f = await fixture(t, options);
+    f.submit('问题');
+    for (let i = 0; i < 30; i++) await tick();
+    return f;
+};
+
+test('上游拒绝中止：保留已流出的部分并标为已停止，之后到的内容丢掉', async t => {
+    let send;
+    const f = await open(t, {
+        stream: true,
+        interrupt: { async interrupt() { return { success: false, error: 'rejected' }; } },
+        onSend: async (args, bridge) => {
+            send = { args, bridge };
+            bridge.accept({ type: 'data', messageId: args[4], context: args[6], chunk: '已经流出的半截' });
+            return { streamingStarted: true };
+        },
+    });
+    f.stop();
+    assert.equal(await untilNotBusy(f.form, 2000), true);
+    send.bridge.accept({ type: 'data', messageId: send.args[4], context: send.args[6], chunk: '停止后才到' });
+    send.bridge.accept({ type: 'end', messageId: send.args[4], context: send.args[6] });
+    for (let i = 0; i < 30; i++) await tick();
+    const [message] = assistant(f);
+    assert.equal(message?.content, '已经流出的半截');
+    assert.equal(message?.finishReason, 'cancelled');
+    assert.match(f.doc.body.textContent, /已经流出的半截/);
+    assert.doesNotMatch(f.doc.body.textContent, /停止后才到/);
+});
+
+test('中止请求很慢、期间回答已经自己收尾：停止不能把这条回答删掉', async t => {
+    let send;
+    let answerInterrupt;
+    const f = await open(t, {
+        stream: true,
+        // 和模拟服务一样：中止接口回得比原回答还晚，最后还是失败
+        interrupt: { interrupt: () => new Promise(resolve => { answerInterrupt = resolve; }) },
+        onSend: async (args, bridge) => {
+            send = { args, bridge };
+            bridge.accept({ type: 'data', messageId: args[4], context: args[6], chunk: '完整的回答' });
+            return { streamingStarted: true };
+        },
+    });
+    f.stop();
+    for (let i = 0; i < 10; i++) await tick();
+    send.bridge.accept({ type: 'end', messageId: send.args[4], context: send.args[6] });
+    for (let i = 0; i < 30; i++) await tick();
+    answerInterrupt({ success: false, error: 'Unexpected token d in JSON' });
+    assert.equal(await untilNotBusy(f.form, 2000), true);
+    for (let i = 0; i < 30; i++) await tick();
+    const [message] = assistant(f);
+    assert.equal(message?.content, '完整的回答');
+    assert.equal(assistant(f).length, 1);
+    assert.match(f.doc.body.textContent, /完整的回答/);
+});
+
+test('上游接受中止却一直不收尾：几秒后本地停止，保留已流出的部分', async t => {
+    const f = await open(t, {
+        stream: true,
+        interrupt: { async interrupt() { return { success: true }; } },
+        onSend: async (args, bridge) => {
+            bridge.accept({ type: 'data', messageId: args[4], context: args[6], chunk: '已经流出的半截' });
+            return { streamingStarted: true };
+        },
+    });
+    f.stop();
+    assert.equal(await untilNotBusy(f.form, 6000), true, '侧聊停在忙碌状态');
+    for (let i = 0; i < 30; i++) await tick();
+    const [message] = assistant(f);
+    assert.equal(message?.content, '已经流出的半截');
+    assert.equal(message?.finishReason, 'cancelled');
+});

From e3dac07e6ad4fb099447f69a2b60dfc23787c176 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 07:06:32 +0000
Subject: [PATCH 139/143] wip: batch Y state UI fixes

---
 modules/renderer/side-chat/composer-state.js  |  5 +-
 modules/renderer/side-chat/persistence.js     | 12 ++++-
 .../ui-system/side-pane/code-viewer/editor.js |  8 ++-
 .../ui-system/side-pane/code-viewer/picker.js | 22 ++++++--
 modules/ui-system/side-pane/git/cards.js      | 53 +++++++++++++++----
 modules/ui-system/side-pane/git/git-view.js   | 27 ++++++++--
 .../side-pane/modelTrajectorySideProvider.js  |  9 ++--
 .../side-pane/planDetailSideProvider.js       | 40 +++++++++-----
 .../side-pane/toolOutputSideProvider.js       | 27 +++++++---
 styles/ui-system/side-pane-code-viewer.css    |  5 +-
 styles/ui-system/side-pane-motion.css         |  5 +-
 tests/side-chat-history-load-state.test.mjs   | 37 +++++++++++++
 tests/side-pane-code-viewer.test.mjs          | 26 +++++++++
 tests/side-pane-git-load-states.test.mjs      | 42 +++++++++++++++
 tests/side-pane-git-stale-diff.test.mjs       | 46 +++++++++++++++-
 tests/side-pane-model-trajectory.test.mjs     | 13 +++++
 tests/side-pane-plan-detail.test.mjs          |  6 ++-
 tests/side-pane-plan-topic.test.mjs           | 30 +++++++++++
 tests/side-pane-tool-output.test.mjs          | 32 ++++++++++-
 19 files changed, 388 insertions(+), 57 deletions(-)
 create mode 100644 tests/side-chat-history-load-state.test.mjs
 create mode 100644 tests/side-pane-git-load-states.test.mjs

diff --git a/modules/renderer/side-chat/composer-state.js b/modules/renderer/side-chat/composer-state.js
index a4594dc7e..3e21e5913 100644
--- a/modules/renderer/side-chat/composer-state.js
+++ b/modules/renderer/side-chat/composer-state.js
@@ -23,12 +23,13 @@ export function createSideChatComposerState({
         onStatusChange?.({ text, type });
     }
 
-    function updateEmptyState() {
+    // 历史还没读回来（或读失败）时不显示「辅助对话」引导：那时不是空对话，消息随后才出来
+    function updateEmptyState({ historyPending = false } = {}) {
         if (!root) return;
         const emptyState = root.querySelector('.side-chat-empty-state');
         if (!emptyState) return;
         const messageItems = root.querySelectorAll('.message-item');
-        emptyState.hidden = messageItems.length > 0;
+        emptyState.hidden = historyPending || messageItems.length > 0;
     }
 
     function updateComposerState() {
diff --git a/modules/renderer/side-chat/persistence.js b/modules/renderer/side-chat/persistence.js
index 8c8b05023..8c46073fc 100644
--- a/modules/renderer/side-chat/persistence.js
+++ b/modules/renderer/side-chat/persistence.js
@@ -214,6 +214,7 @@ export function createSideChatPersistence({
 
     async function loadHistoryFn() {
         updateStatus('正在加载历史...');
+        updateEmptyState({ historyPending: true });
         try {
             const res = await getSurface().loadHistory(
                 descriptor.child.itemId,
@@ -223,6 +224,10 @@ export function createSideChatPersistence({
             );
             if (store.isDisposed) return res;
             store.isHistoryLoaded = true;
+            if (!metadataSaveFailed) {
+                statusText.removeAttribute('tabindex');
+                statusText.removeAttribute('role');
+            }
             textarea.disabled = false;
             updateComposerState();
             updateEmptyState();
@@ -231,7 +236,10 @@ export function createSideChatPersistence({
         } catch (err) {
             if (store.isDisposed) return;
             store.isHistoryLoaded = false;
-            updateStatus(`加载历史失败：${err.message} (点击重试)`, 'error');
+            updateStatus(`加载历史失败：${err.message}（点击重试）`, 'error');
+            // 键盘也能重试：状态文字这时当按钮用
+            statusText.tabIndex = 0;
+            statusText.setAttribute('role', 'button');
             throw err;
         }
     }
@@ -247,7 +255,7 @@ export function createSideChatPersistence({
     });
 
     const onStatusKeydown = (event) => {
-        if (metadataSaveFailed && (event.key === 'Enter' || event.key === ' ')) {
+        if ((metadataSaveFailed || !store.isHistoryLoaded) && (event.key === 'Enter' || event.key === ' ')) {
             event.preventDefault();
             statusText.click();
         }
diff --git a/modules/ui-system/side-pane/code-viewer/editor.js b/modules/ui-system/side-pane/code-viewer/editor.js
index f611f9a6a..e8a417c85 100644
--- a/modules/ui-system/side-pane/code-viewer/editor.js
+++ b/modules/ui-system/side-pane/code-viewer/editor.js
@@ -99,14 +99,18 @@ export function createCodeViewerEditor({
     async function loadFileContent({ force = false } = {}) {
         if (!readFile || (fileLoaded && !force)) return true;
         const token = ++readToken;
-        body.innerHTML = '<div class="side-code-loading"><span class="vcp-ui-icon spin" aria-hidden="true">sync</span> 加载文件中...</div>';
+        // 重读已经显示着的文件：内容留在原处，读完原地换掉；先清成一行「加载文件中」会让整页缩下去再撑开、滚动跳回去
+        const refreshingShown = fileLoaded;
+        if (refreshingShown) body.setAttribute('aria-busy', 'true');
+        else body.innerHTML = '<div class="side-code-loading"><span class="vcp-ui-icon spin" aria-hidden="true">sync</span> 加载文件中…</div>';
         let result;
         try {
             result = await readFile({ allowOutsideWorkspace: outsideWorkspaceAllowed });
         } catch (err) {
-            result = { ok: false, error: `读取文件失败: ${err?.message || err}` };
+            result = { ok: false, error: `读取文件失败：${err?.message || err}` };
         }
         if (store.isDisposed || token !== readToken) return false;
+        if (refreshingShown) body.removeAttribute('aria-busy');
         if (!result?.ok) {
             // 失败时不保留旧内容，免得复制/插入拿到已经不存在的文件内容
             store.currentCode = '';
diff --git a/modules/ui-system/side-pane/code-viewer/picker.js b/modules/ui-system/side-pane/code-viewer/picker.js
index b7bf878b4..300edfbab 100644
--- a/modules/ui-system/side-pane/code-viewer/picker.js
+++ b/modules/ui-system/side-pane/code-viewer/picker.js
@@ -91,7 +91,7 @@ export function createCodeViewerPicker({
                 const res = await api.sourceListFiles(activeWorkspaceId);
                 if (store.isDisposed || token !== listToken) return;
                 if (!res?.success) {
-                    note.textContent = res?.error || '读取文件列表失败';
+                    showListError(res?.error || '读取文件列表失败');
                     return;
                 }
                 files = res.data?.files || [];
@@ -101,10 +101,21 @@ export function createCodeViewerPicker({
                 }
             } catch (err) {
                 if (store.isDisposed || token !== listToken) return;
-                note.textContent = `读取文件列表失败: ${err?.message || err}`;
+                showListError(`读取文件列表失败：${err?.message || err}`);
             }
         }
 
+        // 换个工作区再换回来才会重读，太绕：出错时就地给一个重试
+        function showListError(message) {
+            note.textContent = message;
+            const retry = doc.createElement('button');
+            retry.type = 'button';
+            retry.className = 'side-code-picker-retry';
+            retry.textContent = '重试';
+            retry.addEventListener('click', () => { void loadFiles(); });
+            note.append(' ', retry);
+        }
+
         async function openFile(rel) {
             const token = ++readToken;
             const workspaceId = activeWorkspaceId;
@@ -116,7 +127,7 @@ export function createCodeViewerPicker({
                 if (el.dataset.path === rel) el.setAttribute('aria-current', 'true');
                 else el.removeAttribute('aria-current');
             });
-            setBodyMessage('加载文件中...');
+            setBodyMessage('加载文件中…');
             try {
                 const res = await api.sourceReadFile(workspaceId, rel);
                 if (!isCurrent()) return;
@@ -149,7 +160,7 @@ export function createCodeViewerPicker({
                 }
             } catch (err) {
                 if (!isCurrent()) return;
-                setBodyMessage(`读取文件失败: ${err?.message || err}`, true);
+                setBodyMessage(`读取文件失败：${err?.message || err}`, true);
             }
         }
 
@@ -207,7 +218,8 @@ export function createCodeViewerPicker({
             if (!res?.success || workspaces.length === 0) {
                 wsSelect.disabled = true;
                 filterInput.disabled = true;
-                note.textContent = '还没有工作区，请先在 Git 标签页或设置中添加工作区';
+                // 读失败不能说成「还没有工作区」，那会让用户去添加一个已经有的工作区
+                note.textContent = res?.success ? '还没有工作区，请先在 Git 标签页或设置中添加工作区' : `读取工作区失败：${res?.error || '未知错误'}`;
                 return;
             }
             for (const ws of workspaces) {
diff --git a/modules/ui-system/side-pane/git/cards.js b/modules/ui-system/side-pane/git/cards.js
index 577eaf29a..ccb74c063 100644
--- a/modules/ui-system/side-pane/git/cards.js
+++ b/modules/ui-system/side-pane/git/cards.js
@@ -32,6 +32,8 @@ export function createGitCards({
     let disposed = false;
     const expanded = new Set();
     const diffCache = new Map();
+    // 缓存作废时展开着的 diff 先留着上一份：重新取的这段时间照旧显示，不缩成一行「加载中…」再撑开（对照 ZCode GitPane 重取时保留旧 diff）
+    const previousDiff = new Map();
     let countQueue = [];
     let countWorkers = 0;
     // 缓存作废一次加一；作废前发出的请求回来时不再写缓存（对照 ZCode GitPane diffGenerationRef）
@@ -65,9 +67,14 @@ export function createGitCards({
                     };
                 }
             } catch (err) {
-                result = { state: 'unavailable', message: err.message || '暂时无法预览这个 Diff。' };
+                // 读失败不进缓存：重新展开或点重试会再取，不会一直停在这条错误上
+                result = { state: 'error', message: err.message || '暂时无法预览这个 Diff。' };
+            }
+            if (requestedWorkspace === store.currentWorkspaceId && requestedGeneration === generation && !disposed && !store.isDisposed) {
+                if (result.state === 'error') diffCache.delete(key);
+                else diffCache.set(key, result);
+                previousDiff.delete(key);
             }
-            if (requestedWorkspace === store.currentWorkspaceId && requestedGeneration === generation && !disposed && !store.isDisposed) diffCache.set(key, result);
             return result;
         })();
         diffCache.set(key, { state: 'loading', promise });
@@ -113,13 +120,30 @@ export function createGitCards({
         }
     }
 
-    function renderDiffBody(item, container) {
-        const cached = diffCache.get(keyOf(item));
+    function renderDiffBody(item, container, { result = null, onRetry = null } = {}) {
+        const current = result || diffCache.get(keyOf(item));
+        const cached = (!current || current.state === 'loading') ? (previousDiff.get(keyOf(item)) || current) : current;
         container.innerHTML = '';
         if (!cached || cached.state === 'loading') {
             container.innerHTML = '<div class="side-git-diff-loading">加载中…</div>';
             return;
         }
+        if (cached.state === 'error') {
+            const msg = doc.createElement('div');
+            msg.className = 'side-git-diff-message side-git-diff-error';
+            msg.setAttribute('role', 'alert');
+            msg.textContent = `读取差异失败：${cached.message}`;
+            if (onRetry) {
+                const retry = doc.createElement('button');
+                retry.type = 'button';
+                retry.className = 'side-git-empty-add side-git-diff-retry';
+                retry.textContent = '重试';
+                retry.addEventListener('click', onRetry);
+                msg.append(' ', retry);
+            }
+            container.appendChild(msg);
+            return;
+        }
         if (cached.state !== 'ready') {
             const msg = doc.createElement('div');
             msg.className = 'side-git-diff-message';
@@ -219,10 +243,12 @@ export function createGitCards({
         card.appendChild(diffBox);
 
         const open = () => {
+            const openedGeneration = generation;
             renderDiffBody(item, diffBox);
-            fetchDiff(item).then(() => {
-                if (disposed || store.isDisposed || !expanded.has(key)) return;
-                renderDiffBody(item, diffBox);
+            fetchDiff(item).then((result) => {
+                // 缓存作废后的旧结果不画：列表重绘时会用新卡片重新取
+                if (disposed || store.isDisposed || !expanded.has(key) || openedGeneration !== generation) return;
+                renderDiffBody(item, diffBox, { result: result?.state === 'error' ? result : null, onRetry: open });
                 paintCounts(item, card);
             });
         };
@@ -258,11 +284,20 @@ export function createGitCards({
     }
     function clearExpanded() { expanded.clear(); }
     function clearDiff() { expanded.clear(); invalidate(); }
-    function invalidate() { generation += 1; diffCache.clear(); countQueue = []; }
+    function invalidate() {
+        generation += 1;
+        previousDiff.clear();
+        expanded.forEach((key) => {
+            const cached = diffCache.get(key);
+            if (cached?.state === 'ready') previousDiff.set(key, cached);
+        });
+        diffCache.clear();
+        countQueue = [];
+    }
     function reset() { clearDiff(); countQueue = []; }
     function expand(item) { expanded.clear(); expanded.add(keyOf(item)); }
     function hasExpanded() { return expanded.size > 0; }
     function isExpanded(item) { return expanded.has(keyOf(item)); }
 
-    return Object.freeze({ buildCard, cardFor, prefetch, reset, clearDiff, invalidate, clearExpanded, expand, hasExpanded, isExpanded, dispose() { disposed = true; countQueue = []; expanded.clear(); diffCache.clear(); } });
+    return Object.freeze({ buildCard, cardFor, prefetch, reset, clearDiff, invalidate, clearExpanded, expand, hasExpanded, isExpanded, dispose() { disposed = true; countQueue = []; expanded.clear(); diffCache.clear(); previousDiff.clear(); } });
 }
diff --git a/modules/ui-system/side-pane/git/git-view.js b/modules/ui-system/side-pane/git/git-view.js
index 0831860c3..7c2a3c521 100644
--- a/modules/ui-system/side-pane/git/git-view.js
+++ b/modules/ui-system/side-pane/git/git-view.js
@@ -77,6 +77,8 @@ export function mountGitView(host, {
     let aiLoadSeq = 0;
     let currentStatus = null;
     let loadError = null;
+    // 工作区列表读回来之前不能说「还没有工作区」：那是加载中
+    let workspacesLoaded = false;
     let loading = false;
     // 监听、推送订阅、右键菜单都归 own；宿主释放 scope 或调用 dispose 时一起拆掉
     const own = createSidePaneRootScope(scope, 'git-view');
@@ -284,6 +286,16 @@ export function mountGitView(host, {
         if (disposed()) return;
         refreshBtn.disabled = loading;
         refreshBtn.classList.toggle('spinning', loading);
+        // 先错误、再加载中、最后才是空（对照 ZCode GitPane）：读失败不能显示成「还没有工作区」叫用户去添加
+        if (loadError) {
+            showEmpty({ icon: 'error', title: '无法加载 Git 改动', description: `Git 返回错误：${loadError}`,
+                action: { label: '重试', run: retryLoad } });
+            return;
+        }
+        if (!workspacesLoaded) {
+            showEmpty({ title: '加载中', description: '正在读取当前工作区的 Git 状态和文件改动。' });
+            return;
+        }
         if (!workspaces.length) {
             showEmpty({
                 icon: 'folder_x',
@@ -293,10 +305,6 @@ export function mountGitView(host, {
             });
             return;
         }
-        if (loadError) {
-            showEmpty({ icon: 'error', title: '无法加载 Git 改动', description: `Git 返回错误：${loadError}` });
-            return;
-        }
         if (!currentStatus) {
             showEmpty({ title: '加载中', description: '正在读取当前工作区的 Git 状态和文件改动。' });
             return;
@@ -421,12 +429,21 @@ export function mountGitView(host, {
         }
     }
 
+    function retryLoad() {
+        loadError = null;
+        if (workspacesLoaded && currentWorkspaceId) void refreshStatus({ quiet: false });
+        else { render(); void loadWorkspaces(); }
+    }
+
     async function loadWorkspaces({ preferPath = null } = {}) {
-        if (!api?.gitListWorkspaces) return;
+        if (!api?.gitListWorkspaces) { workspacesLoaded = true; render(); return; }
         try {
             const res = await api.gitListWorkspaces();
+            if (disposed()) return;
             if (!res?.success) throw new Error(res?.error || '加载工作区失败');
             workspaces = Array.isArray(res.data?.workspaces) ? res.data.workspaces : [];
+            workspacesLoaded = true;
+            loadError = null;
             const activeId = res.data?.activeWorkspaceId || null;
             wsSelect.innerHTML = '';
             workspaces.forEach(ws => {
diff --git a/modules/ui-system/side-pane/modelTrajectorySideProvider.js b/modules/ui-system/side-pane/modelTrajectorySideProvider.js
index 3cdf9b551..5d5fc2246 100644
--- a/modules/ui-system/side-pane/modelTrajectorySideProvider.js
+++ b/modules/ui-system/side-pane/modelTrajectorySideProvider.js
@@ -129,7 +129,8 @@ export function createModelTrajectorySideProvider({
             let conversationLabel = '';
             let data = { records: [], truncated: false, total: 0 };
             let items = [];
-            let loading = false;
+            // 挂载时还没确定话题，先算加载中：否则订阅推送的那一下会闪出「请先选择智能体和话题」
+            let loading = true;
             let loadError = '';
             let loadSeq = 0;
             let cancelReload = null;
@@ -545,12 +546,12 @@ export function createModelTrajectorySideProvider({
                     state.classList.add('error');
                     state.textContent = '';
                     state.append(h('p', '', '读取调用轨迹失败'), h('p', 'side-traj-state-detail', loadError));
-                } else if (!sessionKey) {
-                    state.hidden = false;
-                    state.textContent = '请先在主聊天里选择一个智能体和话题。';
                 } else if (loading && records.length === 0) {
                     state.hidden = false;
                     state.textContent = '正在加载调用轨迹…';
+                } else if (!sessionKey) {
+                    state.hidden = false;
+                    state.textContent = '请先在主聊天里选择一个智能体和话题。';
                 } else if (records.length === 0) {
                     state.hidden = false;
                     state.textContent = '这个话题还没有模型调用记录。发一条消息后，每次发给模型的请求和它的回答都会记在这里。';
diff --git a/modules/ui-system/side-pane/planDetailSideProvider.js b/modules/ui-system/side-pane/planDetailSideProvider.js
index 5968dffe1..44bb5c435 100644
--- a/modules/ui-system/side-pane/planDetailSideProvider.js
+++ b/modules/ui-system/side-pane/planDetailSideProvider.js
@@ -622,7 +622,11 @@ export function createPlanDetailSideProvider({
             function renderFilterResults() {
                 const box = h('div', 'side-plan-filter-results');
                 if (filterError) {
-                    box.appendChild(h('div', 'side-plan-warning', `筛选失败：${filterError}`));
+                    const warning = h('div', 'side-plan-warning', `筛选失败：${filterError}`);
+                    const retry = button('zc-btn zc-btn-ghost side-plan-retry', '重试');
+                    retry.addEventListener('click', () => { void runSearch(); });
+                    warning.appendChild(retry);
+                    box.appendChild(warning);
                     return box;
                 }
                 if (!filterRows) {
@@ -771,11 +775,7 @@ export function createPlanDetailSideProvider({
                     // 没有工程：计划页给出原因，Git 页照常可用
                     const box = h('div', 'side-plan-empty side-plan-error');
                     box.appendChild(h('div', '', loading ? '正在读取 V工程 计划…' : (errorText || '没有找到这个工程，可能已被删除')));
-                    if (!loading) {
-                        const retry = button('zc-btn zc-btn-ghost', '重试');
-                        retry.addEventListener('click', () => load());
-                        box.appendChild(retry);
-                    }
+                    if (!loading) box.appendChild(retryButton());
                     const pages = navigation.render([{ key: 'plan', label: '计划', content: [box] }, gitPage]);
                     chrome.append(renderHeader(), pages.tabs);
                     body.appendChild(pages.panels);
@@ -787,9 +787,7 @@ export function createPlanDetailSideProvider({
                 if (staleError) {
                     const banner = h('div', 'side-plan-warning side-plan-stale');
                     banner.setAttribute('role', 'alert');
-                    const retry = button('zc-btn zc-btn-ghost', '重试');
-                    retry.addEventListener('click', () => load());
-                    banner.append(h('span', '', `刷新失败，显示的是上一次的内容：${staleError}`), retry);
+                    banner.append(h('span', '', `刷新失败，显示的是上一次的内容：${staleError}`), retryButton());
                     body.appendChild(banner);
                 }
                 if (pendingFocus) navigation.select(navigation.pageForFocus(pendingFocus), scrollTop);
@@ -876,7 +874,8 @@ export function createPlanDetailSideProvider({
                 body.querySelector('[data-plan-section="timeline"]')?.scrollIntoView?.({ block: 'start' });
             }
 
-            async function runSearch() {
+            /** @param {{ background?: boolean }} [options] 后台刷新时结果原地换掉，不先清空成「正在筛选…」再撑开 */
+            async function runSearch({ background = false } = {}) {
                 cancelFilter?.();
                 cancelFilter = null;
                 const seq = ++filterSeq;
@@ -886,9 +885,11 @@ export function createPlanDetailSideProvider({
                     render();
                     return;
                 }
-                filterRows = null;
-                filterError = '';
-                render();
+                if (!background || filterError) {
+                    filterRows = null;
+                    filterError = '';
+                    render();
+                }
                 const pid = model.project.id;
                 try {
                     const rows = await call(api.projectForgeSearchHistory(searchParams(pid, filters)));
@@ -951,6 +952,17 @@ export function createPlanDetailSideProvider({
 
             let lastScope = { projectIds: [], batchIds: new Set(), key: '' };
 
+            // 点了重试马上有反应：按钮变成「正在重试…」并禁用，读完由 render() 换掉；再失败也看得出确实重试过
+            function retryButton() {
+                const retry = button('zc-btn zc-btn-ghost side-plan-retry', '重试');
+                retry.addEventListener('click', () => {
+                    retry.disabled = true;
+                    retry.textContent = '正在重试…';
+                    void load();
+                });
+                return retry;
+            }
+
             async function load() {
                 const seq = ++refreshSeq;
                 loading = true;
@@ -1015,7 +1027,7 @@ export function createPlanDetailSideProvider({
                 }
                 loading = false;
                 followProjectWorkspace();
-                if (hasFilters(filters) && model) runSearch();
+                if (hasFilters(filters) && model) runSearch({ background: true });
                 else render();
             }
 
diff --git a/modules/ui-system/side-pane/toolOutputSideProvider.js b/modules/ui-system/side-pane/toolOutputSideProvider.js
index b461be744..8409f2d32 100644
--- a/modules/ui-system/side-pane/toolOutputSideProvider.js
+++ b/modules/ui-system/side-pane/toolOutputSideProvider.js
@@ -144,7 +144,10 @@ export function createToolOutputSideProvider({
             const errorText = h('span', 'side-tool-output-error-text');
             const retryBtn = h('button', 'side-tool-output-error-retry', '重试');
             retryBtn.type = 'button';
-            own.listen(retryBtn, 'click', () => { void loadSelected(); });
+            own.listen(retryBtn, 'click', () => {
+                if (listError) { listError = ''; renderOutput(); commandRunsSource?.invalidate?.(); }
+                else void loadSelected();
+            });
             errorBar.append(errorText, retryBtn);
             const notice = h('div', 'side-tool-output-notice');
             notice.hidden = true;
@@ -159,6 +162,8 @@ export function createToolOutputSideProvider({
             let manual = Boolean(requestedRunId);
             let detail = null;
             let loadError = '';
+            // 命令列表本身读失败（不是某条输出读失败）：不能显示成「还没有命令记录」
+            let listError = '';
             let follow = true;
             let previousTop = 0;
             let loadSeq = 0;
@@ -227,14 +232,16 @@ export function createToolOutputSideProvider({
 
             const renderOutput = () => {
                 const hasRuns = runs.length > 0;
-                empty.hidden = hasRuns;
-                empty.textContent = hasRuns ? '' : '还没有命令记录。让管家用 PowerShellExecutor 跑一条命令，输出会显示在这里。';
+                // 先错误、再加载中、最后才是空：列表还没回来或者读失败时都不是「没有命令」
+                empty.hidden = hasRuns || Boolean(listError);
+                empty.textContent = hasRuns ? '' : (seeded ? '还没有命令记录。让管家用 PowerShellExecutor 跑一条命令，输出会显示在这里。' : '加载中…');
                 outputWrap.hidden = !hasRuns;
                 notice.hidden = !detail?.truncated;
                 if (detail?.truncated) notice.textContent = '输出过长，只显示最后一部分。完整内容请在终端里查看。';
                 copyBtn.disabled = !detail?.output;
-                errorBar.hidden = !loadError;
-                errorText.textContent = loadError;
+                const shownError = hasRuns ? loadError : listError;
+                errorBar.hidden = !shownError;
+                errorText.textContent = shownError;
                 if (!detail) { output.textContent = hasRuns ? (loadError ? '' : '加载中…') : ''; return; }
                 if (!follow) return; // 用户在翻看上面的内容：冻结输出，回到底部时再补上
                 output.textContent = detail.output || (detail.status === 'running' ? '（暂无输出）' : '（没有输出）');
@@ -267,6 +274,9 @@ export function createToolOutputSideProvider({
                 let res;
                 try {
                     res = await api?.terminalGetCommandRun?.(selectedId);
+                } catch (error) {
+                    // IPC 直接抛错也要落到错误条上，不能停在「加载中…」
+                    res = { success: false, error: error?.message || String(error) };
                 } finally {
                     loadInFlight = false;
                 }
@@ -276,7 +286,7 @@ export function createToolOutputSideProvider({
                     detail = res.data;
                     loadError = '';
                 } else {
-                    detail = null;
+                    // 读失败不清掉已经显示的输出（命令还在跑时每秒都在读，偶尔一次失败不该把整屏输出换成错误）
                     loadError = res?.error || '读取命令输出失败';
                 }
                 renderAll();
@@ -316,14 +326,15 @@ export function createToolOutputSideProvider({
             }
 
             // 数据源每次变化都给整份列表；变了的那条是新对象，其余保持原样，据此判断要不要重新读输出
-            const onRuns = ({ status, data }) => {
+            const onRuns = ({ status, data, error }) => {
                 if (disposed()) return;
                 if (seeded && suspended) {
-                    hiddenUpdate = { status, data };
+                    hiddenUpdate = { status, data, error };
                     return;
                 }
                 const previous = runs;
                 runs = Array.isArray(data) ? data : [];
+                listError = status === 'error' ? (error || '读取命令记录失败') : '';
                 if (!seeded) {
                     if (status === 'ready' || status === 'error') seeding = seed();
                     else renderPicker();
diff --git a/styles/ui-system/side-pane-code-viewer.css b/styles/ui-system/side-pane-code-viewer.css
index f196fc8dc..2451b2a67 100644
--- a/styles/ui-system/side-pane-code-viewer.css
+++ b/styles/ui-system/side-pane-code-viewer.css
@@ -449,4 +449,7 @@ html .side-code-empty:where(.vcp-ui-scope, .vcp-ui-scope *) {
     text-align: center;
 }
 
-
+/* 文件列表读失败时的「重试」：和备注文字同一行，链接样式 */
+html .side-code-picker-retry:where(.vcp-ui-scope, .vcp-ui-scope *) {
+    border: 0; padding: 0; background: none; color: var(--vcp-ui-accent, currentColor); font: inherit; text-decoration: underline; cursor: pointer;
+}
diff --git a/styles/ui-system/side-pane-motion.css b/styles/ui-system/side-pane-motion.css
index d7b97d587..baab689a6 100644
--- a/styles/ui-system/side-pane-motion.css
+++ b/styles/ui-system/side-pane-motion.css
@@ -54,6 +54,9 @@ html .side-chat-model-popover[hidden]:where(.vcp-ui-scope, .vcp-ui-scope *) {
     }
 }
 
+/* 代码查看「加载文件中」前面的同步图标：原来没有对应的转动规则，图标是静止的 */
+html .side-code-loading .vcp-ui-icon.spin:where(.vcp-ui-scope, .vcp-ui-scope *) { animation: vcp-ui-spin 900ms linear infinite; }
+
 /* 减少动态效果：弹层直接出现，滑块直接到位，状态点不再呼吸，转圈的图标停住。
  * 这个文件排在侧栏样式最后，选择器写到和原规则一样具体就能盖住。 */
 @media (prefers-reduced-motion: reduce) {
@@ -69,7 +72,7 @@ html .side-chat-model-popover[hidden]:where(.vcp-ui-scope, .vcp-ui-scope *) {
 
     html .side-pane-launcher-tab-status[data-status]:where(.vcp-ui-scope, .vcp-ui-scope *),
     html .side-pane-launcher-notice[data-status] .side-pane-launcher-notice-dot:where(.vcp-ui-scope, .vcp-ui-scope *),
-    html :is(.side-traj-call.flash, .side-traj-pill .spin, .side-traj-icon-btn.loading .vcp-ui-icon, .side-traj-icon-btn.loading svg, .side-git-refresh-btn.spinning svg):where(.vcp-ui-scope, .vcp-ui-scope *) {
+    html :is(.side-traj-call.flash, .side-traj-pill .spin, .side-code-loading .vcp-ui-icon.spin, .side-traj-icon-btn.loading .vcp-ui-icon, .side-traj-icon-btn.loading svg, .side-git-refresh-btn.spinning svg):where(.vcp-ui-scope, .vcp-ui-scope *) {
         animation: none;
     }
 }
diff --git a/tests/side-chat-history-load-state.test.mjs b/tests/side-chat-history-load-state.test.mjs
new file mode 100644
index 000000000..84858d944
--- /dev/null
+++ b/tests/side-chat-history-load-state.test.mjs
@@ -0,0 +1,37 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { JSDOM } from 'jsdom';
+import { createSideChatPersistence } from '../modules/renderer/side-chat/persistence.js';
+
+function fixture(loadHistory) {
+    const dom = new JSDOM('<textarea disabled></textarea><span id="status"></span><button id="badge" hidden></button>');
+    const doc = dom.window.document, status = doc.getElementById('status');
+    const descriptor = { id: 'side', parent: { itemId: 'agent', topicId: 'p' }, child: { itemId: 'agent', topicId: 'c' }, references: [] };
+    const store = { currentDescriptor: descriptor, references: [], isHistoryLoaded: false, isDisposed: false };
+    const emptyCalls = [];
+    const owner = createSideChatPersistence({ store, descriptor, doc, textarea: doc.querySelector('textarea'), statusText: status,
+        persistenceBadge: doc.getElementById('badge'), repository: {}, getConversation: () => null,
+        getSurface: () => ({ loadHistory }), saveDraft: () => ({ success: true }),
+        updateStatus(text, type) { status.textContent = type === 'error' ? text : ''; },
+        updateComposerState() {}, updateEmptyState: (options) => emptyCalls.push(options || {}),
+        chatCapabilities: { uiHelper: { showToastNotification() {} } } });
+    return { dom, status, store, owner, emptyCalls };
+}
+
+test('the side chat intro stays hidden while history loads, and a failed load can be retried from the keyboard', async () => {
+    let attempts = 0;
+    const f = fixture(async () => { attempts++; if (attempts === 1) throw new Error('disk busy'); return { success: true }; });
+    try {
+        await f.owner.loadHistoryFn().catch(() => {});
+        assert.deepEqual(f.emptyCalls[0], { historyPending: true }, 'the intro is hidden as soon as loading starts');
+        assert.match(f.status.textContent, /加载历史失败/);
+        assert.equal(f.status.getAttribute('role'), 'button');
+        assert.equal(f.status.tabIndex, 0);
+
+        f.status.dispatchEvent(new f.dom.window.KeyboardEvent('keydown', { key: 'Enter', bubbles: true }));
+        for (let i = 0; i < 20 && !f.store.isHistoryLoaded; i++) await new Promise(r => setTimeout(r, 5));
+        assert.equal(attempts, 2);
+        assert.equal(f.store.isHistoryLoaded, true);
+        assert.equal(f.status.hasAttribute('role'), false);
+    } finally { f.owner.dispose(); f.dom.window.close(); }
+});
diff --git a/tests/side-pane-code-viewer.test.mjs b/tests/side-pane-code-viewer.test.mjs
index 363080218..079af656f 100644
--- a/tests/side-pane-code-viewer.test.mjs
+++ b/tests/side-pane-code-viewer.test.mjs
@@ -495,3 +495,29 @@ test('a file tab keeps its place on reload and its wrap, mode and consent after
         dom.window.close();
     }
 });
+
+test('reloading a file that is on screen keeps it visible until the new text arrives', async () => {
+    const dom = new JSDOM('<section id="view"></section>');
+    const doc = dom.window.document;
+    const view = doc.getElementById('view');
+    let gate = null;
+    const provider = createCodeViewerSideProvider({ document: doc, uiHelper: null, sidePaneController: null, api: {
+        async getTextContent() { if (gate) await gate; return { text: 'line one' }; }
+    } });
+    const handle = await provider.mountTab({ title: 'notes.txt', payload: { filePath: 'C:/proj/notes.txt' } }, view);
+    try {
+        assert.match(view.querySelector('.side-code-pre').textContent, /line one/);
+        const pending = Promise.withResolvers();
+        gate = pending.promise;
+        const reloading = handle.reload();
+        await new Promise(resolve => setImmediate(resolve));
+        assert.equal(view.querySelector('.side-code-loading'), null, 'no one-line loading row in place of the file');
+        assert.ok(view.querySelector('.side-code-pre'), 'the file stays up while it is re-read');
+        pending.resolve();
+        await reloading;
+        assert.match(view.querySelector('.side-code-pre').textContent, /line one/);
+    } finally {
+        handle.dispose();
+        dom.window.close();
+    }
+});
diff --git a/tests/side-pane-git-load-states.test.mjs b/tests/side-pane-git-load-states.test.mjs
new file mode 100644
index 000000000..5705e1175
--- /dev/null
+++ b/tests/side-pane-git-load-states.test.mjs
@@ -0,0 +1,42 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { JSDOM } from 'jsdom';
+
+import { mountGitView } from '../modules/ui-system/side-pane/git/git-view.js';
+
+function mount(api) {
+    const dom = new JSDOM('<div id="host"></div>', { pretendToBeVisual: true });
+    const view = dom.window.document.getElementById('host');
+    const handle = mountGitView(view, { api, uiHelper: { showToastNotification() {} } });
+    const empty = () => view.querySelector('.side-git-empty');
+    return { dom, view, handle, title: () => empty()?.querySelector('.side-git-empty-title')?.textContent, button: () => empty()?.querySelector('button') };
+}
+
+const workspace = { id: 'ws', alias: 'demo', path: '/code/demo' };
+const status = { isRepo: true, branch: { head: 'main' }, remotes: [], staged: [], changes: [{ path: 'a.js', status: 'M' }], conflicts: [] };
+
+test('before the workspace list arrives the Git view says it is loading, not that there are no workspaces', async () => {
+    const list = Promise.withResolvers();
+    const { title, handle, dom } = mount({ gitListWorkspaces: () => list.promise, gitStatus: async () => ({ success: true, data: status }) });
+    assert.equal(title(), '加载中');
+    list.resolve({ success: true, data: { workspaces: [workspace], activeWorkspaceId: 'ws' } });
+    await handle.ready;
+    dom.window.close();
+});
+
+test('a failed workspace list shows the error with a retry, and retrying loads the changes', async () => {
+    let calls = 0;
+    const { title, button, handle, view, dom } = mount({
+        gitListWorkspaces: async () => (++calls === 1 ? { success: false, error: 'IPC down' } : { success: true, data: { workspaces: [workspace], activeWorkspaceId: 'ws' } }),
+        gitStatus: async () => ({ success: true, data: status }),
+        gitDiff: async () => ({ success: false })
+    });
+    await handle.ready;
+    assert.equal(title(), '无法加载 Git 改动', 'not "还没有工作区"');
+    assert.equal(button()?.textContent, '重试');
+    button().click();
+    for (let i = 0; i < 20 && !view.querySelector('.side-git-card'); i++) await new Promise(r => setTimeout(r, 5));
+    assert.equal(calls, 2);
+    assert.ok(view.querySelector('.side-git-card'));
+    dom.window.close();
+});
diff --git a/tests/side-pane-git-stale-diff.test.mjs b/tests/side-pane-git-stale-diff.test.mjs
index e5055e441..2997cba62 100644
--- a/tests/side-pane-git-stale-diff.test.mjs
+++ b/tests/side-pane-git-stale-diff.test.mjs
@@ -11,14 +11,19 @@ function fixture() {
     const dom = new JSDOM('<section id="view"></section>', { pretendToBeVisual: true });
     const doc = dom.window.document;
     const listeners = new Set();
-    const state = { after: 'a\n', added: 1, diffs: 0, toplevel: '/repo' };
+    const state = { after: 'a\n', added: 1, diffs: 0, toplevel: '/repo', diffGate: null, diffFails: 0 };
     const api = {
         async gitListWorkspaces() { return { success: true, data: { workspaces: [{ id: 'w', path: '/repo/pkg' }] } }; },
         async gitStatus() {
             return { success: true, data: { isRepo: true, toplevel: state.toplevel, prefix: 'pkg', staged: [], conflicts: [],
                 changes: [{ path: 'pkg/x.js', status: 'M', added: state.added, removed: 0 }] } };
         },
-        async gitDiff() { state.diffs += 1; return { success: true, data: { before: { text: '' }, after: { text: state.after } } }; },
+        async gitDiff() {
+            state.diffs += 1;
+            if (state.diffGate) await state.diffGate;
+            if (state.diffFails > 0) { state.diffFails -= 1; return { success: false, error: 'git busy' }; }
+            return { success: true, data: { before: { text: '' }, after: { text: state.after } } };
+        },
         onGitChanged(cb) { listeners.add(cb); return () => listeners.delete(cb); },
         async subscribeMainState() { return {}; },
         async unsubscribeMainState() { return {}; }
@@ -74,3 +79,40 @@ test('copying the absolute path of a file in a subdirectory workspace uses the r
         assert.deepEqual(copied, ['/repo/pkg/x.js']);
     } finally { f.cleanup(); }
 });
+
+test('while an edited file\'s diff is refetched the open diff keeps showing the previous one instead of collapsing', async () => {
+    const f = fixture();
+    try {
+        await f.view.ready;
+        f.view.element.querySelector('.side-git-row').click();
+        await wait(20);
+        const gate = Promise.withResolvers();
+        f.state.diffGate = gate.promise;
+        f.state.after = 'a\nb\n';
+        f.state.added = 2;
+        f.push();
+        await wait(30);
+        assert.equal(f.view.element.querySelector('.side-git-diff-loading'), null, 'no one-line "加载中…" while refetching');
+        assert.equal(f.view.element.querySelectorAll('.side-git-diff-table .diff-line.add').length, 1, 'the previous diff stays up');
+        f.state.diffGate = null;
+        gate.resolve();
+        await wait(30);
+        assert.equal(f.view.element.querySelectorAll('.side-git-diff-table .diff-line.add').length, 2);
+    } finally { f.cleanup(); }
+});
+
+test('a diff that failed to load is not cached and can be retried in place', async () => {
+    const f = fixture();
+    try {
+        await f.view.ready;
+        f.state.diffFails = 1;
+        f.view.element.querySelector('.side-git-row').click();
+        await wait(20);
+        const retry = f.view.element.querySelector('.side-git-diff-retry');
+        assert.ok(retry, 'the failure offers a retry');
+        assert.match(f.view.element.querySelector('.side-git-diff-error').textContent, /git busy/);
+        retry.click();
+        await wait(20);
+        assert.equal(f.view.element.querySelectorAll('.side-git-diff-table .diff-line.add').length, 1);
+    } finally { f.cleanup(); }
+});
diff --git a/tests/side-pane-model-trajectory.test.mjs b/tests/side-pane-model-trajectory.test.mjs
index 9882f438c..420334fa1 100644
--- a/tests/side-pane-model-trajectory.test.mjs
+++ b/tests/side-pane-model-trajectory.test.mjs
@@ -484,3 +484,16 @@ test('clearing asks through the app dialog, not window.confirm, and clears the c
     await wait();
     assert.deepEqual(env.state.cleared, ['agent1__t1'], 'only the conversation shown when Clear was clicked is cleared');
 });
+
+test('while the tab is still subscribing it says it is loading, not that no conversation is selected', async () => {
+    const { provider, view, api } = makeEnv();
+    const watch = Promise.withResolvers();
+    api.modelTrajectoryWatch = () => watch.promise;
+    const mounting = provider.mountTab({ id: 'model-trajectory:main' }, view);
+    await Promise.resolve();
+    assert.equal(view.querySelector('.side-traj-state').textContent, '正在加载调用轨迹…');
+    watch.resolve({ success: true });
+    const handle = await mounting;
+    assert.notEqual(view.querySelector('.side-traj-state').textContent, '请先在主聊天里选择一个智能体和话题。');
+    handle.dispose();
+});
diff --git a/tests/side-pane-plan-detail.test.mjs b/tests/side-pane-plan-detail.test.mjs
index e8c41216b..59d26f1cd 100644
--- a/tests/side-pane-plan-detail.test.mjs
+++ b/tests/side-pane-plan-detail.test.mjs
@@ -228,7 +228,11 @@ test('mountTab shows a retryable empty state when the project cannot be read', a
     const { provider, view } = makeEnv({ projectForgeGetProject: async () => ({ success: false, error: '工程不存在' }) });
     const handle = await provider.mountTab({ id: planTabId('zz'), payload: { projectId: 'zz' } }, view);
     assert.match(view.textContent, /工程不存在/);
-    assert.ok(view.querySelector('.side-plan-error button'));
+    const retry = view.querySelector('.side-plan-error button');
+    assert.ok(retry);
+    retry.click();
+    assert.equal(retry.disabled, true, 'the click shows right away that a retry is running');
+    assert.equal(retry.textContent, '正在重试…');
     handle.dispose();
 });
 
diff --git a/tests/side-pane-plan-topic.test.mjs b/tests/side-pane-plan-topic.test.mjs
index 92d4030b3..ee6d2d0ac 100644
--- a/tests/side-pane-plan-topic.test.mjs
+++ b/tests/side-pane-plan-topic.test.mjs
@@ -293,3 +293,33 @@ test('reveal focuses a todo or a section, opening it when collapsed', async () =
     handle.dispose();
     dom.window.close();
 });
+
+test('a background refresh with a filter on swaps the results in place instead of flashing "正在筛选…"', async () => {
+    const requests = [];
+    const { provider, tab, view, dom } = makeTopicEnv({ api: {
+        projectForgeSearchHistory(params) {
+            const request = Promise.withResolvers();
+            requests.push({ params, ...request });
+            return request.promise;
+        }
+    } });
+    const handle = await provider.mountTab(tab, view);
+    try {
+        [...view.querySelectorAll('.side-plan-file-btn')].find(button => button.querySelector('.side-plan-file-name').textContent === 'a.py').click();
+        requests[0].resolve({ success: true, data: [node(777, 2, 'a.py')] });
+        await new Promise(resolve => setTimeout(resolve, 20));
+        assert.ok(view.querySelector('[data-node-id="777"]'));
+
+        handle.focus(); // 切回标签：后台重读一次，筛选也跟着重跑
+        for (let i = 0; i < 100 && requests.length < 2; i++) await new Promise(resolve => setTimeout(resolve, 20));
+        assert.equal(requests.length, 2);
+        assert.doesNotMatch(view.querySelector('.side-plan-filter-results').textContent, /正在筛选/);
+        assert.ok(view.querySelector('[data-node-id="777"]'), 'the previous results stay while the new ones load');
+        requests[1].resolve({ success: true, data: [node(888, 2, 'a.py')] });
+        await new Promise(resolve => setTimeout(resolve, 20));
+        assert.ok(view.querySelector('[data-node-id="888"]'));
+    } finally {
+        handle.dispose();
+        dom.window.close();
+    }
+});
diff --git a/tests/side-pane-tool-output.test.mjs b/tests/side-pane-tool-output.test.mjs
index 5f77f8ea7..9dcf605f2 100644
--- a/tests/side-pane-tool-output.test.mjs
+++ b/tests/side-pane-tool-output.test.mjs
@@ -22,7 +22,7 @@ function makeEnv({ runs, details, runningReloadMs = 60 }) {
     let unsubscribed = false;
     Object.defineProperty(dom.window.navigator, 'clipboard', { value: { writeText: async (text) => { state.copied.push(text); } } });
     const api = {
-        terminalListCommandRuns: async () => ({ success: true, data: state.runs }),
+        terminalListCommandRuns: async () => (state.listError ? { success: false, error: state.listError } : { success: true, data: state.runs }),
         terminalGetCommandRun: async (id) => {
             state.gets.push(id);
             return state.details[id] ? { success: true, data: state.details[id] } : { success: false, error: '这条命令记录已被清理。' };
@@ -239,3 +239,33 @@ test('a command that keeps printing is re-read at most once per interval, with o
     assert.equal(view.querySelector('.side-tool-output-text').textContent, 'line 5\n', 'and it shows the latest output');
     await handle.dispose();
 });
+
+test('a failed command list shows an error with a retry, not "no commands yet"', async () => {
+    const { provider, state, view } = makeEnv({ runs: RUNS, details: DETAILS });
+    state.listError = '终端服务未启动';
+    const handle = await provider.mountTab({ id: 'tool-output:main' }, view);
+    assert.equal(view.querySelector('.side-tool-output-empty').hidden, true);
+    const bar = view.querySelector('.side-tool-output-error');
+    assert.equal(bar.hidden, false);
+    assert.match(bar.textContent, /终端服务未启动/);
+
+    state.listError = '';
+    view.querySelector('.side-tool-output-error-retry').click();
+    await wait(200);
+    assert.equal(bar.hidden, true);
+    assert.match(view.querySelector('.side-tool-output-text').textContent, /^running tests…/);
+    await handle.dispose();
+});
+
+test('a failed reload while a command runs keeps the output on screen', async () => {
+    const { provider, state, view, fire } = makeEnv({ runs: RUNS, details: { ...DETAILS } });
+    const handle = await provider.mountTab({ id: 'tool-output:main' }, view);
+    const shown = view.querySelector('.side-tool-output-text').textContent;
+    assert.match(shown, /^running tests…/);
+    delete state.details.r2;
+    fire({ ...RUNS[0], updatedAt: Date.now() });
+    await wait(120);
+    assert.equal(view.querySelector('.side-tool-output-error').hidden, false);
+    assert.equal(view.querySelector('.side-tool-output-text').textContent, shown, 'the last output stays');
+    await handle.dispose();
+});

From 9773d95b0199665eb1eb5e8072d74d893e01f56f Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 07:10:54 +0000
Subject: [PATCH 140/143] Side pane batch Y: loading, error and retry states
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

States now go error, then loading, then empty (as ZCode GitPane does),
so a load in progress or a failed read is never shown as "nothing here":
- Git: no "还没有工作区 / 添加工作区" before the workspace list arrives
  or when it fails; the error has a retry.
- Code viewer picker: a failed workspace read says so; the file list
  error has an in-place retry.
- Trajectory: no "请先选择智能体和话题" flash while subscribing.
- Tool output: a failed command list shows the error with a retry
  instead of "还没有命令记录"; a rejected output read lands on the error
  bar instead of hanging on "加载中…"; a failed reload during a running
  command keeps the output on screen.
- Side chat: the intro stays hidden while history loads; the history
  retry works from the keyboard.

Layout and feedback:
- Git diff: an open diff keeps the previous text while an edited file
  is refetched instead of collapsing to one line; failed diffs are not
  cached and have a retry.
- Plan: retry buttons switch to "正在重试…" at once; a background
  refresh with a filter swaps results in place; filter errors retry.
- Code viewer: reloading a shown file keeps it until the new text
  arrives; its loading icon actually spins.

Docs: dormancy notes follow #14 (side chats stay mounted).
Tests for the new cases use waitFor instead of fixed sleeps.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DFRovoZHMzeheXKkLNWKG
---
 .../contracts/generated/chat-event-graph.json | 94 ++++++++++++-------
 tests/side-pane-git-stale-diff.test.mjs       | 26 ++---
 tests/side-pane-tool-output.test.mjs          |  6 +-
 3 files changed, 73 insertions(+), 53 deletions(-)

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 8c30a926a..ac4545a41 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -3688,7 +3688,7 @@
         },
         {
           "file": "modules/renderer/side-chat/persistence.js",
-          "line": 239,
+          "line": 247,
           "kind": "custom-event-listener"
         },
         {
@@ -4201,9 +4201,19 @@
           "line": 89,
           "kind": "custom-event-listener"
         },
+        {
+          "file": "modules/ui-system/side-pane/code-viewer/picker.js",
+          "line": 115,
+          "kind": "custom-event-listener"
+        },
         {
           "file": "modules/ui-system/side-pane/git/cards.js",
-          "line": 230,
+          "line": 141,
+          "kind": "custom-event-listener"
+        },
+        {
+          "file": "modules/ui-system/side-pane/git/cards.js",
+          "line": 256,
           "kind": "custom-event-listener"
         },
         {
@@ -4213,7 +4223,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/git-view.js",
-          "line": 263,
+          "line": 265,
           "kind": "custom-event-listener"
         },
         {
@@ -4223,17 +4233,17 @@
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 353,
+          "line": 354,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 377,
+          "line": 378,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 779,
+          "line": 780,
           "kind": "custom-event-listener"
         },
         {
@@ -4308,32 +4318,32 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 688,
+          "line": 635,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 715,
+          "line": 692,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 734,
+          "line": 719,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 755,
+          "line": 738,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 786,
+          "line": 759,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 801,
+          "line": 968,
           "kind": "custom-event-listener"
         },
         {
@@ -5156,7 +5166,7 @@
         },
         {
           "file": "modules/renderer/side-chat/persistence.js",
-          "line": 239,
+          "line": 247,
           "kind": "custom-event-listener",
           "match": "statusText.addEventListener('click'"
         },
@@ -5772,9 +5782,21 @@
           "kind": "custom-event-listener",
           "match": "read.addEventListener('click'"
         },
+        {
+          "file": "modules/ui-system/side-pane/code-viewer/picker.js",
+          "line": 115,
+          "kind": "custom-event-listener",
+          "match": "retry.addEventListener('click'"
+        },
         {
           "file": "modules/ui-system/side-pane/git/cards.js",
-          "line": 230,
+          "line": 141,
+          "kind": "custom-event-listener",
+          "match": "retry.addEventListener('click'"
+        },
+        {
+          "file": "modules/ui-system/side-pane/git/cards.js",
+          "line": 256,
           "kind": "custom-event-listener",
           "match": "row.addEventListener('click'"
         },
@@ -5786,7 +5808,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/git-view.js",
-          "line": 263,
+          "line": 265,
           "kind": "custom-event-listener",
           "match": "btn.addEventListener('click'"
         },
@@ -5798,19 +5820,19 @@
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 353,
+          "line": 354,
           "kind": "custom-event-listener",
           "match": "more.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 377,
+          "line": 378,
           "kind": "custom-event-listener",
           "match": "head.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 779,
+          "line": 780,
           "kind": "custom-event-listener",
           "match": "item.addEventListener('click'"
         },
@@ -5900,37 +5922,37 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 688,
+          "line": 635,
           "kind": "custom-event-listener",
-          "match": "headBtn.addEventListener('click'"
+          "match": "retry.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 715,
+          "line": 692,
           "kind": "custom-event-listener",
-          "match": "pick.addEventListener('click'"
+          "match": "headBtn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 734,
+          "line": 719,
           "kind": "custom-event-listener",
           "match": "pick.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 755,
+          "line": 738,
           "kind": "custom-event-listener",
-          "match": "link.addEventListener('click'"
+          "match": "pick.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 786,
+          "line": 759,
           "kind": "custom-event-listener",
-          "match": "retry.addEventListener('click'"
+          "match": "link.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 801,
+          "line": 968,
           "kind": "custom-event-listener",
           "match": "retry.addEventListener('click'"
         },
@@ -7339,7 +7361,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/cards.js",
-          "line": 248,
+          "line": 274,
           "kind": "custom-event-listener"
         },
         {
@@ -7476,7 +7498,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/git/cards.js",
-          "line": 248,
+          "line": 274,
           "kind": "custom-event-listener",
           "match": "row.addEventListener('contextmenu'"
         },
@@ -15443,7 +15465,7 @@
         },
         {
           "file": "modules/renderer/side-chat/persistence.js",
-          "line": 255,
+          "line": 263,
           "kind": "custom-event-listener"
         },
         {
@@ -15588,7 +15610,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 378,
+          "line": 379,
           "kind": "custom-event-listener"
         },
         {
@@ -15814,7 +15836,7 @@
         },
         {
           "file": "modules/renderer/side-chat/persistence.js",
-          "line": 255,
+          "line": 263,
           "kind": "custom-event-listener",
           "match": "statusText.addEventListener('keydown'"
         },
@@ -15988,7 +16010,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 378,
+          "line": 379,
           "kind": "custom-event-listener",
           "match": "head.addEventListener('keydown'"
         },
@@ -21659,14 +21681,14 @@
       "consumers": [
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 936,
+          "line": 937,
           "kind": "preload-subscription"
         }
       ],
       "evidence": [
         {
           "file": "modules/ui-system/side-pane/modelTrajectorySideProvider.js",
-          "line": 936,
+          "line": 937,
           "kind": "preload-subscription",
           "match": "api?.onModelTrajectoryChanged("
         }
diff --git a/tests/side-pane-git-stale-diff.test.mjs b/tests/side-pane-git-stale-diff.test.mjs
index 18f498d0a..fe1675790 100644
--- a/tests/side-pane-git-stale-diff.test.mjs
+++ b/tests/side-pane-git-stale-diff.test.mjs
@@ -78,22 +78,24 @@ test('copying the absolute path of a file in a subdirectory workspace uses the r
 
 test('while an edited file\'s diff is refetched the open diff keeps showing the previous one instead of collapsing', async () => {
     const f = fixture();
+    const adds = () => f.view.element.querySelectorAll('.side-git-diff-table .diff-line.add').length;
     try {
         await f.view.ready;
+        await waitFor(() => f.view.element.querySelector('.side-git-row'), { message: 'row never rendered' });
         f.view.element.querySelector('.side-git-row').click();
-        await wait(20);
+        await waitFor(() => adds() === 1, { message: 'expanded diff never rendered' });
         const gate = Promise.withResolvers();
         f.state.diffGate = gate.promise;
+        const diffsBefore = f.state.diffs;
         f.state.after = 'a\nb\n';
         f.state.added = 2;
         f.push();
-        await wait(30);
-        assert.equal(f.view.element.querySelector('.side-git-diff-loading'), null, 'no one-line "加载中…" while refetching');
-        assert.equal(f.view.element.querySelectorAll('.side-git-diff-table .diff-line.add').length, 1, 'the previous diff stays up');
+        await waitFor(() => f.state.diffs > diffsBefore, { message: 'push never refetched the open diff' });
+        assert.equal(f.view.element.querySelector('.side-git-diff-loading'), null, 'no one-line loading row while refetching');
+        assert.equal(adds(), 1, 'the previous diff stays up');
         f.state.diffGate = null;
         gate.resolve();
-        await wait(30);
-        assert.equal(f.view.element.querySelectorAll('.side-git-diff-table .diff-line.add').length, 2);
+        await waitFor(() => adds() === 2, { message: 'the new diff never replaced the old one' });
     } finally { f.cleanup(); }
 });
 
@@ -101,14 +103,12 @@ test('a diff that failed to load is not cached and can be retried in place', asy
     const f = fixture();
     try {
         await f.view.ready;
+        await waitFor(() => f.view.element.querySelector('.side-git-row'), { message: 'row never rendered' });
         f.state.diffFails = 1;
         f.view.element.querySelector('.side-git-row').click();
-        await wait(20);
-        const retry = f.view.element.querySelector('.side-git-diff-retry');
-        assert.ok(retry, 'the failure offers a retry');
-        assert.match(f.view.element.querySelector('.side-git-diff-error').textContent, /git busy/);
-        retry.click();
-        await wait(20);
-        assert.equal(f.view.element.querySelectorAll('.side-git-diff-table .diff-line.add').length, 1);
+        await waitFor(() => f.view.element.querySelector('.side-git-diff-retry'), { message: 'the failure offers no retry' });
+        assert.ok(f.view.element.querySelector('.side-git-diff-error[role="alert"]'));
+        f.view.element.querySelector('.side-git-diff-retry').click();
+        await waitFor(() => f.view.element.querySelectorAll('.side-git-diff-table .diff-line.add').length === 1, { message: 'retry never loaded the diff' });
     } finally { f.cleanup(); }
 });
diff --git a/tests/side-pane-tool-output.test.mjs b/tests/side-pane-tool-output.test.mjs
index 6a6dd07ed..df7cdceeb 100644
--- a/tests/side-pane-tool-output.test.mjs
+++ b/tests/side-pane-tool-output.test.mjs
@@ -308,8 +308,7 @@ test('a failed command list shows an error with a retry, not "no commands yet"',
 
     state.listError = '';
     view.querySelector('.side-tool-output-error-retry').click();
-    await wait(200);
-    assert.equal(bar.hidden, true);
+    await waitFor(() => bar.hidden && /^running tests…/.test(view.querySelector('.side-tool-output-text').textContent), { message: 'retry never loaded the command list' });
     assert.match(view.querySelector('.side-tool-output-text').textContent, /^running tests…/);
     await handle.dispose();
 });
@@ -321,8 +320,7 @@ test('a failed reload while a command runs keeps the output on screen', async ()
     assert.match(shown, /^running tests…/);
     delete state.details.r2;
     fire({ ...RUNS[0], updatedAt: Date.now() });
-    await wait(120);
-    assert.equal(view.querySelector('.side-tool-output-error').hidden, false);
+    await waitFor(() => !view.querySelector('.side-tool-output-error').hidden, { message: 'the failed reload never surfaced' });
     assert.equal(view.querySelector('.side-tool-output-text').textContent, shown, 'the last output stays');
     await handle.dispose();
 });

From 9e0b65c3a9c6617fe8280e9c647a7ef3dd185f3b Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 07:17:52 +0000
Subject: [PATCH 141/143] Run the new notification, listener owner, side chat
 stop and main chat send owner tests in test:workbench

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01UCGGgmHsCToooXTgSXpmq9
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3f65fbd27..db825948d 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
     "test:built-artifact-smoke": "node scripts/test-built-artifact-smoke.mjs",
     "test:chat-transcript-snapshot": "node scripts/test-chat-transcript-snapshot.mjs",
     "test:side-pane": "node --test tests/side-pane-*.test.mjs tests/side-chat-*.test.mjs tests/side-browser-address.test.mjs tests/side-plan-revert-confirmation.test.mjs tests/sidebar-resizer-lifecycle.test.mjs tests/conversation-status-panel.test.mjs tests/domain-activator.test.js tests/browser-handlers.test.js tests/git-service.test.js tests/git-watcher.test.js tests/git-file-diff.test.mjs tests/git-changes-source.test.mjs tests/git-workspace-source.test.mjs",
-    "test:workbench": "node --test tests/terminal-cd-command.test.js tests/workspace-handlers-sender.test.js tests/side-pane-ipc-sender.test.js tests/side-chat-save-failure.test.mjs tests/history-mutation-queue.test.cjs tests/side-chat-regenerate-busy.test.mjs tests/conversation-current-source.test.mjs tests/conversation-scope.test.mjs tests/conversation-status-races.test.mjs tests/design-system-boundary.test.mjs tests/group-chat-url.test.js tests/group-stream-watchdog.test.js tests/line-diff-budget.test.mjs tests/main-composer-commands.test.mjs tests/message-file-changes-projectforge.test.mjs tests/message-file-changes.test.mjs tests/messenger-presentation.test.mjs tests/model-trajectory-handlers.test.js tests/model-trajectory-model.test.mjs tests/model-trajectory-recorder.test.js tests/notification-center.test.js tests/popover-window-blur.test.mjs tests/projectforge-changes-source.test.mjs tests/selection-reference.test.mjs tests/shared-source.test.mjs tests/source-handlers-sender.test.js tests/state-subscriptions.test.js tests/terminal-command-run-watch.test.js tests/terminal-native-helper.test.js tests/terminal-package-closure.test.js tests/tool-approval-card-enhancement.test.mjs tests/tool-presentation-settings.test.cjs tests/tool-presentation.test.mjs tests/tool-request-malformed-marker.test.mjs",
+    "test:workbench": "node --test tests/main-chat-send-owner.test.mjs tests/notification-renderer-lifecycle.test.mjs tests/dom-listener-owner.test.mjs tests/side-chat-stop-partial.test.mjs tests/terminal-cd-command.test.js tests/workspace-handlers-sender.test.js tests/side-pane-ipc-sender.test.js tests/side-chat-save-failure.test.mjs tests/history-mutation-queue.test.cjs tests/side-chat-regenerate-busy.test.mjs tests/conversation-current-source.test.mjs tests/conversation-scope.test.mjs tests/conversation-status-races.test.mjs tests/design-system-boundary.test.mjs tests/group-chat-url.test.js tests/group-stream-watchdog.test.js tests/line-diff-budget.test.mjs tests/main-composer-commands.test.mjs tests/message-file-changes-projectforge.test.mjs tests/message-file-changes.test.mjs tests/messenger-presentation.test.mjs tests/model-trajectory-handlers.test.js tests/model-trajectory-model.test.mjs tests/model-trajectory-recorder.test.js tests/notification-center.test.js tests/popover-window-blur.test.mjs tests/projectforge-changes-source.test.mjs tests/selection-reference.test.mjs tests/shared-source.test.mjs tests/source-handlers-sender.test.js tests/state-subscriptions.test.js tests/terminal-command-run-watch.test.js tests/terminal-native-helper.test.js tests/terminal-package-closure.test.js tests/tool-approval-card-enhancement.test.mjs tests/tool-presentation-settings.test.cjs tests/tool-presentation.test.mjs tests/tool-request-malformed-marker.test.mjs",
     "check:chat-evidence": "node scripts/check-chat-evidence.mjs",
     "check:chat-release-evidence": "node scripts/check-chat-release-evidence.mjs",
     "write:chat-evidence-manifest": "node scripts/write-chat-evidence-manifest.mjs",

From 89340870e7f2a86de6b0e81f926f852f04967035 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 07:37:23 +0000
Subject: [PATCH 142/143] Side pane batch Z: persistence and restore fixes

- Plan detail: a focus target from the status panel is applied once and
  then cleared from the saved tab, so restart or wake no longer jumps back.
- Side chat restore keeps the saved createdAt, so lists keep their order.
- A local-only side chat draft that cannot be read now warns the user
  instead of silently restoring blank.
- Width persistence logs a {success:false} settings save result.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DFRovoZHMzeheXKkLNWKG
---
 .../contracts/generated/chat-event-graph.json | 24 +++++++++----------
 modules/renderer/sideChatWiring.js            |  9 ++++++-
 .../side-pane/planDetailSideProvider.js       |  3 +++
 .../side-pane/side-pane-controller.js         |  4 +++-
 tests/side-chat-draft-restore.test.mjs        | 24 ++++++++++++++++---
 tests/side-pane-plan-detail.test.mjs          | 14 +++++++++++
 6 files changed, 61 insertions(+), 17 deletions(-)

diff --git a/docs/contracts/generated/chat-event-graph.json b/docs/contracts/generated/chat-event-graph.json
index 24c04bc51..07bc8f45c 100644
--- a/docs/contracts/generated/chat-event-graph.json
+++ b/docs/contracts/generated/chat-event-graph.json
@@ -4343,27 +4343,27 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 968,
+          "line": 971,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 510,
+          "line": 512,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1203,
+          "line": 1205,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1209,
+          "line": 1211,
           "kind": "custom-event-listener"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1223,
+          "line": 1225,
           "kind": "custom-event-listener"
         },
         {
@@ -5952,31 +5952,31 @@
         },
         {
           "file": "modules/ui-system/side-pane/planDetailSideProvider.js",
-          "line": 968,
+          "line": 971,
           "kind": "custom-event-listener",
           "match": "retry.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 510,
+          "line": 512,
           "kind": "custom-event-listener",
           "match": "retry.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1203,
+          "line": 1205,
           "kind": "custom-event-listener",
           "match": "toggleNotificationsBtn.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1209,
+          "line": 1211,
           "kind": "custom-event-listener",
           "match": "expandButton.addEventListener('click'"
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1223,
+          "line": 1225,
           "kind": "custom-event-listener",
           "match": "closeSidePaneBtn.addEventListener('click'"
         },
@@ -25108,7 +25108,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1243,
+          "line": 1245,
           "kind": "custom-event-listener"
         },
         {
@@ -25208,7 +25208,7 @@
         },
         {
           "file": "modules/ui-system/side-pane/side-pane-controller.js",
-          "line": 1243,
+          "line": 1245,
           "kind": "custom-event-listener",
           "match": "win?.addEventListener?.('resize'"
         },
diff --git a/modules/renderer/sideChatWiring.js b/modules/renderer/sideChatWiring.js
index fbd8e7eeb..4acf57d06 100644
--- a/modules/renderer/sideChatWiring.js
+++ b/modules/renderer/sideChatWiring.js
@@ -244,6 +244,11 @@ export function createSideChatWiring({
                 const childAgentId = item.child.itemId || agentId;
                 const storedDraft = sideChatOwner.readDraft(item);
                 const input = storedDraft.input || item;
+                // 草稿只存在本机（composerStorage local）时这份就是唯一的一份：读坏了要告诉用户，不能悄悄变成空白
+                if (!storedDraft.ok && item.composerStorage === 'local') {
+                    console.warn('[SideChat] Failed to read side chat draft:', storedDraft.error);
+                    notify(`辅助对话「${item.title || '未命名'}」保存的草稿读不出来，已按空白恢复`, 'warning');
+                }
                 const hasPendingInput = !!input.draft || (Array.isArray(input.references) && input.references.length > 0);
                 if (storedDraft.ok && !hasPendingInput && typeof chatAPI?.getChatHistory === 'function') {
                     const childHistory = await chatAPI.getChatHistory(childAgentId, childTopicId);
@@ -264,7 +269,7 @@ export function createSideChatWiring({
                     contextMode: item.contextMode,
                     snapshotId: item.snapshotId,
                     parentSnapshot: item.parentSnapshot || [],
-                    model: input.model || item.descriptor?.model || null,
+                    model: input.model || null,
                     open: true,
                     status: 'ready',
                     draft: input.draft || '',
@@ -272,6 +277,8 @@ export function createSideChatWiring({
                 }),
                 // 沿用存档里的 id：标签 id 每次重启都一样，面板才能按对话记忆回到这个辅助对话
                 ...(typeof item.id === 'string' && item.id ? { id: item.id } : {}),
+                // 创建时间也沿用存档：辅助对话按它排序，换成重启时间的话改一次模型存一下档，顺序就乱了
+                ...(Number.isFinite(item.createdAt) ? { createdAt: item.createdAt } : {}),
                 composerStorage: item.composerStorage } });
             } catch (e) {
                 console.warn('[SideChat] Failed to restore side chat tab:', e);
diff --git a/modules/ui-system/side-pane/planDetailSideProvider.js b/modules/ui-system/side-pane/planDetailSideProvider.js
index 2720106ca..b4aaf86f4 100644
--- a/modules/ui-system/side-pane/planDetailSideProvider.js
+++ b/modules/ui-system/side-pane/planDetailSideProvider.js
@@ -835,6 +835,9 @@ export function createPlanDetailSideProvider({
                 if (!pendingFocus || !model) return;
                 const { todoId, section: sectionKey } = pendingFocus;
                 pendingFocus = null;
+                // 定位只做一次：从存档里也抹掉，否则重启或休眠后重新挂载会再跳回这条，盖掉用户后来停的页面
+                const current = sidePaneController?.getSnapshot?.()?.tabs?.find?.(t => t.id === tab.id);
+                if (current?.payload?.focus) sidePaneController?.updateTab?.(tab.id, { payload: { ...current.payload, focus: null } });
                 const todoSelector = todoId !== undefined && todoId !== null ? `.side-plan-todo[data-todo-id="${String(todoId).replace(/"/g, '')}"]` : '';
                 if (!(todoSelector && body.querySelector(todoSelector)) && sectionKey && collapsed[sectionKey]) {
                     collapsed[sectionKey] = false;
diff --git a/modules/ui-system/side-pane/side-pane-controller.js b/modules/ui-system/side-pane/side-pane-controller.js
index 7a02ab1ce..813e47596 100644
--- a/modules/ui-system/side-pane/side-pane-controller.js
+++ b/modules/ui-system/side-pane/side-pane-controller.js
@@ -189,12 +189,14 @@ export function createSidePaneController({
                 }
                 if (electronAPI?.saveSettings) {
                     try {
-                        await electronAPI.saveSettings({
+                        const result = await electronAPI.saveSettings({
                             __vcpSettingsOps: [
                                 { op: 'set', path: ['notificationsSidebarWidth'], value: width },
                                 { op: 'set', path: ['sidePaneWidthRatio'], value: ratio }
                             ]
                         });
+                        // 主进程写盘失败时不抛异常，只回 success:false；不记下来的话重启后宽度悄悄退回旧值，无从排查
+                        if (result?.success === false) console.error('[SidePaneController] Failed to persist width:', result.error || result.status);
                     } catch (err) {
                         console.error('[SidePaneController] Failed to persist width:', err);
                     }
diff --git a/tests/side-chat-draft-restore.test.mjs b/tests/side-chat-draft-restore.test.mjs
index f75649098..55b6d1ea2 100644
--- a/tests/side-chat-draft-restore.test.mjs
+++ b/tests/side-chat-draft-restore.test.mjs
@@ -25,7 +25,7 @@ async function fixture(t, legacyInput = {}) {
     const childDir = path.join(directory, 'agent', 'topics', child.topicId);
     const dom = new JSDOM('<aside id="pane"><div id="tabs"></div><div id="content"></div></aside>', { url: 'https://side-chat.test' });
     const doc = dom.window.document, drafts = createSideChatDraftStore({ getStorage: () => dom.window.localStorage });
-    const deletions = [], sessions = [], metadataWrites = [];
+    const deletions = [], sessions = [], metadataWrites = [], toasts = [];
     const chatAPI = {
         listSideChatMetadata: (...args) => call('side-chat:list-metadata', ...args),
         saveSideChatMetadata: (...args) => {
@@ -40,7 +40,8 @@ async function fixture(t, legacyInput = {}) {
         let controller;
         const wiring = createSideChatWiring({ doc, win: dom.window, chatAPI,
             chatRepository: { getHistory: (agent, _type, topic) => chatAPI.getChatHistory(agent, topic), saveHistory: async () => ({ success: true }) },
-            chatManager: { sendMessage() { throw new Error('No generation during restoration'); } }, uiHelper: {},
+            chatManager: { sendMessage() { throw new Error('No generation during restoration'); } },
+            uiHelper: { showToastNotification: (message, type) => toasts.push({ message, type }) },
             selectedItemRef: { get: () => ({ id: 'agent', type: 'agent', config: { model: 'default-model' } }) },
             topicIdRef: { get: () => 'parent' }, historyRef: { get: () => [] }, getController: () => controller,
             createRenderer({ conversation }) {
@@ -65,7 +66,7 @@ async function fixture(t, legacyInput = {}) {
         assert.ok(directory.startsWith(os.tmpdir() + path.sep));
         await fs.rm(directory, { recursive: true, force: true });
     });
-    return { dom, doc, drafts, descriptor, childDir, deletions, mountController,
+    return { dom, doc, drafts, descriptor, childDir, deletions, toasts, mountController,
         settleMetadata: () => Promise.all(metadataWrites),
         metadata: async () => JSON.parse(await fs.readFile(path.join(childDir, 'sidechat-metadata.json'), 'utf8')) };
 }
@@ -98,6 +99,19 @@ test('a restored side chat keeps its saved id, so the pane can return to it afte
     }
 });
 
+test('a restored side chat keeps its saved creation time, so saving it after a restart does not reorder the list', async t => {
+    const f = await fixture(t, { composerStorage: 'local', createdAt: 1_000 });
+    f.drafts.save(f.descriptor, { draft: 'keep me', model: null, references: [] });
+    const { controller, wiring } = f.mountController();
+    await wiring.restoreSessions('agent', 'parent');
+    const tab = controller.getSnapshot().tabs.find(item => item.kind === 'chat');
+    assert.equal(tab.descriptor.createdAt, 1_000);
+    controller.getTabHandle(tab.id).setDraft('edited');
+    f.dom.window.dispatchEvent(new f.dom.window.Event('blur'));
+    await f.settleMetadata();
+    assert.equal((await f.metadata()).createdAt, 1_000);
+});
+
 test('legacy file input survives descriptor normalization and migrates only after the browser save; clearing it never revives old input', async t => {
     const f = await fixture(t, { draft: 'legacy draft', references: [{ id: 'legacy-ref', text: 'legacy selection' }], model: 'legacy-model' });
     let session = f.mountController();
@@ -132,6 +146,10 @@ test('unreadable browser drafts cannot authorize automatic deletion of an empty-
     assert.equal(f.deletions.length, 0);
     assert.ok(controller.getSnapshot().tabs.some(item => item.kind === 'chat'));
     assert.ok((await fs.stat(f.childDir)).isDirectory());
+    // 草稿只存本机，读坏了就是丢了：要告诉用户，而不是悄悄换成空白
+    assert.equal(f.toasts.length, 1);
+    assert.equal(f.toasts[0].type, 'warning');
+    assert.match(f.toasts[0].message, /草稿读不出来/);
 });
 
 test('automatic empty-child cleanup also removes its empty browser draft without reviving legacy file input', async t => {
diff --git a/tests/side-pane-plan-detail.test.mjs b/tests/side-pane-plan-detail.test.mjs
index ebc712326..24b7ff874 100644
--- a/tests/side-pane-plan-detail.test.mjs
+++ b/tests/side-pane-plan-detail.test.mjs
@@ -76,6 +76,7 @@ function makeEnv(overrides = {}) {
     const sidePaneController = {
         openTab: async (tab) => { calls.opened.push(tab); return { focus() {} }; },
         setVisible() {},
+        getSnapshot: () => ({ tabs: calls.tabs || [] }),
         updateTab: (id, patch) => { calls.updated = [...(calls.updated || []), { id, ...patch }]; }
     };
     const provider = createPlanDetailSideProvider({
@@ -443,3 +444,16 @@ test('activating the plan tab puts keyboard focus inside it', async () => {
         assert.equal(view.contains(dom.window.document.activeElement), true);
     } finally { handle.dispose(); }
 });
+
+test('a focus target from the status panel is applied once and then cleared from the saved tab', async () => {
+    const { provider, view, calls } = makeEnv();
+    const tab = { id: planTabId('p1'), payload: { projectId: 'p1', projectName: '算法工程', pinned: true, focus: { todoId: 2 } } };
+    calls.tabs = [tab];
+    const handle = await provider.mountTab(tab, view);
+    try {
+        for (let i = 0; i < 50 && !(calls.updated || []).length; i++) await new Promise(r => setTimeout(r, 10));
+        const cleared = (calls.updated || []).find(u => u.id === tab.id && u.payload && u.payload.focus === null);
+        assert.ok(cleared, 'the saved tab no longer carries the focus target, so a restart or wake does not jump back');
+        assert.equal(cleared.payload.projectId, 'p1', 'the rest of the payload is kept');
+    } finally { handle.dispose(); }
+});

From 513fcba48cf852f7017ca4608003894089c5e5ff Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 7 Oct 2026 07:43:24 +0000
Subject: [PATCH 143/143] Side pane batch Z: keep trajectory reading position
 across dormancy

The trajectory tab sleeps after 5 minutes hidden. Waking it reset every
collapsed row and jumped the view to the bottom. It now captures its
expansion overrides, commands and scroll position, and restores them
when the remount still shows the same conversation.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DFRovoZHMzeheXKkLNWKG
---
 .../side-pane/modelTrajectorySideProvider.js  | 18 ++++++++++++-
 tests/side-pane-model-trajectory.test.mjs     | 27 +++++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/modules/ui-system/side-pane/modelTrajectorySideProvider.js b/modules/ui-system/side-pane/modelTrajectorySideProvider.js
index 7d244d74c..77a54dd61 100644
--- a/modules/ui-system/side-pane/modelTrajectorySideProvider.js
+++ b/modules/ui-system/side-pane/modelTrajectorySideProvider.js
@@ -91,7 +91,7 @@ export function createModelTrajectorySideProvider({
             return handle;
         },
 
-        async mountTab(tab, viewElement, { scope: viewScope = null, occurrence = null } = {}) {
+        async mountTab(tab, viewElement, { scope: viewScope = null, restoredState = null, occurrence = null } = {}) {
             if (!viewElement) return null;
             viewElement.innerHTML = '';
             viewElement.classList.add('side-traj-view');
@@ -954,9 +954,25 @@ export function createModelTrajectorySideProvider({
                 else own.interval(() => { if (!doc.hidden) void followTick(); }, FOLLOW_POLL_MS, 'trajectory-follow');
             }
             await load();
+            // 休眠前的阅读位置：还是同一个会话才接回展开 / 收起和滚动位置，否则藏了 5 分钟回来就被收回默认并拉到底
+            if (restoredState && !disposed() && restoredState.sessionKey === sessionKey && sessionKey) {
+                if (Array.isArray(restoredState.overrides)) overrides = new Map(restoredState.overrides);
+                if (restoredState.commands) commands = restoredState.commands;
+                if (Number.isFinite(restoredState.version)) version = restoredState.version;
+                renderHeader();
+                renderMenu();
+                updateAllRows();
+                if (restoredState.stickToBottom === false && Number.isFinite(restoredState.scrollTop)) {
+                    stickToBottom = false;
+                    scroller.scrollTop = restoredState.scrollTop;
+                }
+            }
 
             return {
                 focus() { searchOpen ? searchInput.focus() : scroller.focus?.({ preventScroll: true }); },
+                captureState() {
+                    return { sessionKey, overrides: [...overrides], commands, version, stickToBottom, scrollTop: scroller.scrollTop };
+                },
                 suspend() {
                     // 还没到点的重读留到重新显示时再做
                     if (!cancelReload) return;
diff --git a/tests/side-pane-model-trajectory.test.mjs b/tests/side-pane-model-trajectory.test.mjs
index 167235d85..49ece8f5b 100644
--- a/tests/side-pane-model-trajectory.test.mjs
+++ b/tests/side-pane-model-trajectory.test.mjs
@@ -536,3 +536,30 @@ test('while the tab is still subscribing it says it is loading, not that no conv
     assert.notEqual(view.querySelector('.side-traj-state').textContent, '请先在主聊天里选择一个智能体和话题。');
     handle.dispose();
 });
+
+test('a trajectory tab woken from dormancy keeps the rows the reader collapsed and where they were reading, for the same conversation only', async () => {
+    const env = makeEnv();
+    const head = (view, role) => view.querySelector(`.side-traj-row[data-trajectory-role="${role}"] .side-traj-row-head`);
+    const first = await env.provider.mountTab({ id: 'model-trajectory:main' }, env.view);
+    head(env.view, 'user').click();
+    env.view.querySelector('[data-action="expansion-menu"]').click();
+    env.view.querySelector('[data-trajectory-expansion-kind="system"]').click();
+    const saved = { ...first.captureState(), stickToBottom: false, scrollTop: 120 };
+    await first.dispose();
+
+    const view = env.doc.createElement('div');
+    env.doc.body.appendChild(view);
+    const woken = await env.provider.mountTab({ id: 'model-trajectory:main' }, view, { restoredState: saved });
+    assert.equal(head(view, 'user').getAttribute('aria-expanded'), 'false');
+    assert.equal(head(view, 'system').getAttribute('aria-expanded'), 'false');
+    assert.equal(view.querySelector('.side-traj-scroll').scrollTop, 120);
+    await woken.dispose();
+
+    // 换了会话就不接旧的展开状态
+    env.state.conversation = { item: { id: 'agent1', name: '小助手' }, topicId: 't2' };
+    const other = env.doc.createElement('div');
+    env.doc.body.appendChild(other);
+    const switched = await env.provider.mountTab({ id: 'model-trajectory:main' }, other, { restoredState: saved });
+    assert.equal(head(other, 'user').getAttribute('aria-expanded'), 'true');
+    await switched.dispose();
+});