Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

侧边栏「弹出」改为按页签弹出独立窗口,侧边栏留在主窗口

Dash23d01f2c541d
diff --git a/apps/desktop/src/main/bootstrap-electron.ts b/apps/desktop/src/main/bootstrap-electron.ts
index af62289111..996b551ca7 100644
--- a/apps/desktop/src/main/bootstrap-electron.ts
+++ b/apps/desktop/src/main/bootstrap-electron.ts
@@ -752,6 +752,10 @@ import { isResourceUsageOpenSender } from './resource-usage-window/open-sender.j
import { GhostPanelWindowsController } from './ghost-panel-window/controller.js';
import { createGhostPanelWindow } from './ghost-panel-window/window.js';
import { registerGhostPanelWindowIpc } from './ghost-panel-window/ipc.js';
+import { SidebarTabWindowsController } from './sidebar-tab-window/controller.js';
+import { createSidebarTabWindow } from './sidebar-tab-window/window.js';
+import { registerSidebarTabWindowIpc } from './sidebar-tab-window/ipc.js';
+import { setRightSidebarTabsChangeBroadcaster } from './localDb/ipc/rightSidebarTabs.js';
import {
patchGhostPanelWindowEntry,
readGhostPanelWindowsSettings,
@@ -2346,6 +2350,58 @@ const ghostPanelWindowsController = new GhostPanelWindowsController({
});
registerGhostPanelWindowIpc(ghostPanelWindowsController);
+// ── 右侧栏单页签独立窗口(sidebar tab window)────────────────────────────
+// 每个弹出的页签一扇窗:侧栏「在独立窗口中打开」→ open(request);主窗侧栏把该
+// 页签从投影里隐藏(数据仍在它的桶 / SQLite),弹出窗口按同一会话水合后只渲染这
+// 一个页签。关窗 / 合并 / 崩溃 → notifyTabReturned 交回主窗。状态机见
+// sidebar-tab-window/controller.ts。deps 同样全 lazy(isQuitting 声明在后)。
+const sidebarTabWindowsController = new SidebarTabWindowsController({
+ createWindow: (cascadeIndex) => createSidebarTabWindow(cascadeIndex),
+ broadcastState: (state) => {
+ for (const win of BrowserWindow.getAllWindows()) {
+ if (win.isDestroyed()) continue;
+ try {
+ win.webContents.send(MAKER_PUSH.SIDEBAR_TAB_WINDOW_STATE_CHANGED, state);
+ } catch {
+ // window torn down mid-broadcast — ignore
+ }
+ }
+ },
+ sendToWindow: (win, channel, payload) => {
+ try {
+ win.webContents.send(channel, payload);
+ } catch {
+ /* ignore */
+ }
+ },
+ notifyTabReturned: (payload) => {
+ const main = mainWindowRef;
+ if (!main || main.isDestroyed()) return;
+ try {
+ main.webContents.send(MAKER_PUSH.SIDEBAR_TAB_WINDOW_TAB_RETURNED, payload);
+ } catch {
+ /* main window torn down */
+ }
+ },
+ isQuitting: () => isQuitting,
+ log: createLogger('sidebar-tab-window-controller'),
+});
+registerSidebarTabWindowIpc({
+ controller: sidebarTabWindowsController,
+ getMainWindow: () => mainWindowRef,
+});
+// 同一会话的页签同时活在主窗与弹出窗口时,一方落库后通知其它 renderer 刷新。
+setRightSidebarTabsChangeBroadcaster((sessionId, senderWebContentsId) => {
+ for (const win of BrowserWindow.getAllWindows()) {
+ if (win.isDestroyed() || win.webContents.id === senderWebContentsId) continue;
+ try {
+ win.webContents.send(MAKER_PUSH.RIGHT_SIDEBAR_TABS_CHANGED, { sessionId });
+ } catch {
+ /* window torn down mid-broadcast */
+ }
+ }
+});
+
// ── 资源监视器辅助窗口 ──────────────────────────────────────────────
// 单实例轻量辅助窗口:顶部菜单「资源监视器」→ open()。不需要 detach/attach 偏好、
// 不需要 session 上下文转发。后台预热后常驻复用,普通关窗只隐藏。
@@ -2425,7 +2481,13 @@ registerTabOpResultHandler({
// `mainWindowRef`, assigned later in `createMainWindow`). `ensureHost` lets
// an automation tab-op pop the sidebar window first when the user prefers
// detached mode but has the window closed.
-setMainWindowAccessorForBackend(() => rsbWindowController.getHostWebContents());
+// 按页签路由:被弹出到独立窗口的页签由那扇窗口的 renderer 承载,带 tabId 的
+// tab-op(focus / close / ensure)必须落到它的 store;其余(open / probe)仍走侧栏宿主。
+setMainWindowAccessorForBackend((op) => {
+ const tabId = op && 'tabId' in op && typeof op.tabId === 'string' ? op.tabId : null;
+ const popped = tabId ? sidebarTabWindowsController.getWebContentsForTab(tabId) : null;
+ return popped ?? rsbWindowController.getHostWebContents();
+});
setEnsureHostForBackend((sessionId) => rsbWindowController.ensureOpenForAutomation({ sessionId }));
setIsDetachedForBackend(() => readRsbWindowSettings().detached);
setBrowserSessionUploadRootResolver(async (sessionId) => {
@@ -3038,6 +3100,7 @@ ipcMain.handle('app-menu:set-locale', (_event, locale: unknown): { ok: true } =>
remoteDesktopViewerWindows.setLocale(currentApplicationMenuLocale);
rsbWindowController.setLocale(currentApplicationMenuLocale);
ghostPanelWindowsController.setLocale(currentApplicationMenuLocale);
+ sidebarTabWindowsController.setLocale(currentApplicationMenuLocale);
refreshGhostLocalization();
const mainWindow = mainWindowRef && !mainWindowRef.isDestroyed() ? mainWindowRef : null;
if (mainWindow) {
@@ -3942,6 +4005,7 @@ const createWindow = () => {
remoteDesktopViewerWindows.reset();
rsbWindowController.destroyWindow();
ghostPanelWindowsController.destroyAllWindows();
+ sidebarTabWindowsController.destroyAllWindows();
if (mainWindowRef === mainWindow) mainWindowRef = null;
setDeepLinkMainWindow(null);
});
@@ -4077,9 +4141,10 @@ const createWindow = () => {
currentApplicationMenuLocale ?? getPreferredApplicationLocale(),
);
remoteDesktopViewerWindows.prewarm();
- // 右侧栏子窗口预热:复刻资源用量窗口模式,主窗口可见后后台创建
- // 隐藏 BrowserWindow 并加载轻量 renderer,后续 detach 点击仅 show+focus。
- rsbWindowController.prewarm();
+ // 侧栏「弹出」已改为按页签弹出(sidebar tab window):预热一扇未指派的隐藏
+ // 窗口,弹出时直接指派 → 首份内容 → show。整栏子窗口(rsbWindowController)
+ // 不再有用户入口,不再预热,避免启动期多养一个隐藏 renderer。
+ sidebarTabWindowsController.prewarm();
// 插件面板保持按需创建:分离状态不跨重启恢复,多实例也不在启动期全量预热。
}, 1_500);
resourceUsagePrewarmTimer.unref?.();
@@ -9864,6 +9929,7 @@ onQuit('windows-process-scan-workers', disposeWindowsProcessScanWorkers, 'sync')
onQuit('resource-usage-window', () => resourceUsageWindowController.dispose(), 'sync');
onQuit('rsb-window', () => rsbWindowController.dispose(), 'sync');
onQuit('ghost-panel-windows', () => ghostPanelWindowsController.dispose(), 'sync');
+onQuit('sidebar-tab-windows', () => sidebarTabWindowsController.dispose(), 'sync');
onQuit('app-badge-clear', () => clearAllSessionAttention(), 'sync');
onQuit('session-drag-preview', () => disposeSessionDragPreview(), 'sync');
onQuit('input-devices', () => disposeInputDevices(), 'async');
diff --git a/apps/desktop/src/main/localDb/ipc/rightSidebarTabs.ts b/apps/desktop/src/main/localDb/ipc/rightSidebarTabs.ts
index baa9ce1df6..947296296d 100644
--- a/apps/desktop/src/main/localDb/ipc/rightSidebarTabs.ts
+++ b/apps/desktop/src/main/localDb/ipc/rightSidebarTabs.ts
@@ -33,6 +33,31 @@ import { createLogger } from '../../logger.js';
const log = createLogger('rightSidebarTabs');
+/**
+ * 变更广播:同一会话的页签可能同时活在主窗侧边栏与弹出的单页签窗口里,两个
+ * renderer 各有一份 store 缓存。任何写操作落库后通知**其它** renderer 按 DB 刷新
+ * (renderer 只覆盖自己不承载的页签,见 store.refreshSessionFromDb)。由
+ * bootstrap 注入实际的 BrowserWindow 广播实现;未注入(单测)时静默。
+ */
+type RightSidebarTabsChangeBroadcaster = (sessionId: string, senderWebContentsId: number) => void;
+let changeBroadcaster: RightSidebarTabsChangeBroadcaster | null = null;
+
+export function setRightSidebarTabsChangeBroadcaster(
+ broadcaster: RightSidebarTabsChangeBroadcaster | null,
+): void {
+ changeBroadcaster = broadcaster;
+}
+
+function broadcastChange(sessionId: string, event: { sender?: { id?: number } }): void {
+ if (!changeBroadcaster) return;
+ try {
+ // 受信 sender 校验已在各 handler 入口完成;这里只取 id 用于排除发起方。
+ changeBroadcaster(sessionId, event.sender?.id ?? -1);
+ } catch (err) {
+ log.warn('right sidebar tabs change broadcast failed', { sessionId, err });
+ }
+}
+
/** 单 session 最多 20 个 tab,超抛 RIGHT_SIDEBAR_TOO_MANY_TABS。 */
const MAX_TABS_PER_SESSION = 20;
const SINGLETON_TAB_KINDS = new Set(['subagents']);
@@ -192,9 +217,11 @@ export function registerRightSidebarTabsIpc(): void {
.where(and(eq(rightSidebarTabs.sessionId, sessionId), eq(rightSidebarTabs.kind, kind)))
.limit(1);
if (!canonical) throw new Error(`failed to ensure ${kind} tab for session ${sessionId}`);
+ const created = canonical.id === id;
+ if (created) broadcastChange(sessionId, event);
return {
tab: rowToTab(canonical),
- created: canonical.id === id,
+ created,
persistable: true,
};
});
@@ -239,6 +266,7 @@ export function registerRightSidebarTabsIpc(): void {
target: rightSidebarTabs.id,
set: { kind, position, state: stateJson, updatedAt: now },
});
+ broadcastChange(sessionId, event);
return { ok: true };
});
@@ -250,7 +278,7 @@ export function registerRightSidebarTabsIpc(): void {
// SELECT 验证存在再 DELETE,不用 `.delete().returning()` —— 本仓 SQLite 上不使用
// drizzle 的 update/delete `.returning()`(grep 验证全仓 0 处)。
const exists = await db
- .select({ id: rightSidebarTabs.id })
+ .select({ id: rightSidebarTabs.id, sessionId: rightSidebarTabs.sessionId })
.from(rightSidebarTabs)
.where(eq(rightSidebarTabs.id, id))
.limit(1);
@@ -258,6 +286,7 @@ export function registerRightSidebarTabsIpc(): void {
throwIpcError('NOT_FOUND', `tab ${id} not found`);
}
await db.delete(rightSidebarTabs).where(eq(rightSidebarTabs.id, id));
+ broadcastChange(exists[0].sessionId, event);
return { ok: true };
});
@@ -293,6 +322,7 @@ export function registerRightSidebarTabsIpc(): void {
.set({ isActive: true, updatedAt: now })
.where(and(eq(rightSidebarTabs.id, targetId), eq(rightSidebarTabs.sessionId, sessionId)));
}
+ broadcastChange(sessionId, event);
return { ok: true };
});
@@ -321,6 +351,7 @@ export function registerRightSidebarTabsIpc(): void {
and(eq(rightSidebarTabs.id, orderedIds[i]), eq(rightSidebarTabs.sessionId, sessionId)),
);
}
+ broadcastChange(sessionId, event);
return { ok: true };
});
diff --git a/apps/desktop/src/main/maker-ipc/channels.ts b/apps/desktop/src/main/maker-ipc/channels.ts
index b8ab797889..02513c1926 100644
--- a/apps/desktop/src/main/maker-ipc/channels.ts
+++ b/apps/desktop/src/main/maker-ipc/channels.ts
@@ -758,6 +758,18 @@ export const MAKER_INVOKE = {
GHOST_PANEL_WINDOW_GET_STATE: 'maker:ghost-panel-window:get-state',
GHOST_PANEL_WINDOW_OPEN: 'maker:ghost-panel-window:open',
GHOST_PANEL_WINDOW_SET_DETACHED: 'maker:ghost-panel-window:set-detached',
+ /**
+ * 右侧栏单页签独立窗口(sidebar tab window)——每个弹出的页签一扇窗。
+ * 状态机见 main/sidebar-tab-window/controller.ts。
+ * - GET_STATE: 拉全量 { <tabId>: { sessionId, open } }
+ * - OPEN(request): 主窗把当前页签弹出到独立窗口(已弹出则聚焦)
+ * - FOCUS(tabId): 聚焦已弹出页签的窗口(agent focus / 用户切换到被弹出页签)
+ * - CLOSE_FOR_TAB(tabId): 页签已在宿主里关闭,销毁窗口且不交回页签
+ */
+ SIDEBAR_TAB_WINDOW_GET_STATE: 'maker:sidebar-tab-window:get-state',
+ SIDEBAR_TAB_WINDOW_OPEN: 'maker:sidebar-tab-window:open',
+ SIDEBAR_TAB_WINDOW_FOCUS: 'maker:sidebar-tab-window:focus',
+ SIDEBAR_TAB_WINDOW_CLOSE_FOR_TAB: 'maker:sidebar-tab-window:close-for-tab',
/**
* 会话内 /goal 自主续跑(goal-host)——
* - GOAL_SET: 设/替换目标并立刻发首轮。入参 { sessionId, objective, agentKind, budgetTokens? }(budgetTokens 留空=不设预算)
@@ -1055,6 +1067,18 @@ export const MAKER_PUSH = {
* (主窗布局过滤 + 各子窗口自身都消费)。
*/
GHOST_PANEL_WINDOW_STATE_CHANGED: 'maker:ghost-panel-window:state-changed',
+ /**
+ * 右侧栏单页签独立窗口状态广播(全量 SidebarTabWindowsState)——发所有窗口
+ * (主窗侧栏据此隐藏已弹出页签;弹出窗口自身不消费)。
+ */
+ SIDEBAR_TAB_WINDOW_STATE_CHANGED: 'maker:sidebar-tab-window:state-changed',
+ /** 页签从弹出窗口回到侧边栏,只发主窗口。payload = SidebarTabReturnedPayload。 */
+ SIDEBAR_TAB_WINDOW_TAB_RETURNED: 'maker:sidebar-tab-window:tab-returned',
+ /**
+ * 某会话的右侧栏页签持久化数据被另一个 renderer 改动(弹出窗口 ↔ 主窗)。
+ * 发给除改动发起方之外的所有窗口。payload = RightSidebarTabsChangedPayload。
+ */
+ RIGHT_SIDEBAR_TABS_CHANGED: 'maker:right-sidebar-tabs:changed',
} as const;
/**
diff --git a/apps/desktop/src/main/mcp-integrations/browser.ts b/apps/desktop/src/main/mcp-integrations/browser.ts
index c18efcf24e..d33a588fe8 100644
--- a/apps/desktop/src/main/mcp-integrations/browser.ts
+++ b/apps/desktop/src/main/mcp-integrations/browser.ts
@@ -29,6 +29,7 @@ import {
type BrowserBackend,
} from './browser-backend/index.js';
import { getRsbBrowserBridge } from '../rsb-browser-bridge/index.js';
+import type { RsbBrowserBridgeTabOp } from '../../shared/rsbBrowserBridge.js';
import {
readBrowserBackendSettings,
writeBrowserBackendKind,
@@ -274,10 +275,11 @@ function createRsbBackend(): RsbWebviewBackend {
// Lazy main-window lookup. Phase 2 uses the same pattern; once the host
// window is available the dispatch lands cleanly, before that the request
// rejects with `host renderer not available`.
- getHostWebContents: () => {
+ getHostWebContents: (op) => {
// bootstrap-electron owns mainWindowRef; we read it through the public
- // helper to avoid a circular import.
- const win = readMainWindowForBackend();
+ // helper to avoid a circular import. The op lets bootstrap route tab-ops
+ // for popped-out tabs to the window that actually hosts them.
+ const win = readMainWindowForBackend(op);
return win;
},
// detached 偏好开 + 侧边栏子窗口关着时,tab-op 前先把子窗口拉起来并等
@@ -324,17 +326,19 @@ const browserBackendHealthService = new BrowserBackendHealthService(backendContr
* `setMainWindowAccessorForBackend`. Without this the RsbWebviewBackend has
* no way to reach the renderer for tab-op dispatch.
*/
-let mainWindowAccessor: () => Electron.WebContents | null = () => null;
+type HostWebContentsAccessor = (op?: RsbBrowserBridgeTabOp) => Electron.WebContents | null;
-function readMainWindowForBackend(): Electron.WebContents | null {
- return mainWindowAccessor();
+let mainWindowAccessor: HostWebContentsAccessor = () => null;
+
+function readMainWindowForBackend(op?: RsbBrowserBridgeTabOp): Electron.WebContents | null {
+ return mainWindowAccessor(op);
}
/**
* Bootstrap hook. Called from `bootstrap-electron.ts` once `mainWindowRef` is
* known. Idempotent re-binds are safe.
*/
-export function setMainWindowAccessorForBackend(accessor: () => Electron.WebContents | null): void {
+export function setMainWindowAccessorForBackend(accessor: HostWebContentsAccessor): void {
mainWindowAccessor = accessor;
}
diff --git a/apps/desktop/src/main/right-sidebar-window/window.ts b/apps/desktop/src/main/right-sidebar-window/window.ts
index cb8eb27a34..08249b87eb 100644
--- a/apps/desktop/src/main/right-sidebar-window/window.ts
+++ b/apps/desktop/src/main/right-sidebar-window/window.ts
@@ -9,6 +9,10 @@
*
* frame / 外链守卫 / acceptFirstMouse 复刻 secondary-windows.ts(会话多开副窗)。
* 独立的窗口位置记忆文件 right-sidebar-window-state.json(不与主窗 window-state.json 串)。
+ *
+ * `createSidebarHostWindow` 是整栏子窗口与单页签弹出窗口(sidebar-tab-window/window.ts)
+ * 共用的工厂:两种窗口承载同一套侧栏插件(webview / 终端 / 文件浏览器 …),preload、
+ * 安全字段、外链守卫与崩溃隔离登记完全相同,只有启动参数、尺寸与位置记忆文件不同。
*/
import { BrowserWindow, app, nativeTheme } from 'electron';
@@ -27,7 +31,27 @@ import { installWindowHiddenBroadcast } from '../windowHiddenBroadcast.js';
const log = createLogger('right-sidebar-window');
-export function createRightSidebarWindow(): BrowserWindow {
+export interface SidebarHostWindowOptions {
+ /** 启动 URL 查询参数;renderer 入口据此分流(`sidebarWindow=1` 必须在内)。 */
+ query: Record<string, string>;
+ /** 窗口位置记忆文件名(userData 下)。 */
+ stateFile: string;
+ defaultWidth: number;
+ defaultHeight: number;
+ minWidth: number;
+ minHeight: number;
+ /**
+ * 同类窗口已开 N 扇时的层叠偏移序号:多扇弹出窗口共用一份位置记忆,不偏移会
+ * 完全重叠、用户以为只弹出了一扇。0 = 原位。
+ */
+ cascadeIndex?: number;
+ /** 日志标签。 */
+ logLabel: string;
+}
+
+const CASCADE_STEP_PX = 28;
+
+export function createSidebarHostWindow(options: SidebarHostWindowOptions): BrowserWindow {
const platformOptions =
process.platform === 'darwin'
? { titleBarStyle: 'hidden' as const, trafficLightPosition: { x: 12, y: 16 } }
@@ -37,22 +61,23 @@ export function createRightSidebarWindow(): BrowserWindow {
const swallowActivationClick = readWindowBehaviorSettings().swallowActivationClick;
const windowState = windowStateKeeper({
- defaultWidth: 520,
- defaultHeight: 860,
- file: 'right-sidebar-window-state.json',
+ defaultWidth: options.defaultWidth,
+ defaultHeight: options.defaultHeight,
+ file: options.stateFile,
// The window is prewarmed while hidden on every launch. Restoring either
// presentation mode can make Electron show it before the controller opens it.
maximize: false,
fullScreen: false,
});
+ const cascade = (options.cascadeIndex ?? 0) * CASCADE_STEP_PX;
const win = new BrowserWindow({
- x: windowState.x,
- y: windowState.y,
+ x: windowState.x === undefined ? undefined : windowState.x + cascade,
+ y: windowState.y === undefined ? undefined : windowState.y + cascade,
width: windowState.width,
height: windowState.height,
- minWidth: 360,
- minHeight: 480,
+ minWidth: options.minWidth,
+ minHeight: options.minHeight,
title: BRAND_NAME,
icon: app.isPackaged
? path.join(process.resourcesPath, 'icon.png')
@@ -104,22 +129,34 @@ export function createRightSidebarWindow(): BrowserWindow {
// ready-to-show: 窗口以 show:false 创建,由 controller 的双阶段就绪握手
// (renderer-ready → presentation-ready) 控制展示时机,此处不做任何展示。
win.once('ready-to-show', () => {
- // no-op — display is governed by RsbWindowController
+ // no-op — display is governed by the owning controller
});
const hash = '/sidebar-window';
if (MAIN_WINDOW_VITE_DEV_SERVER_URL) {
const url = new URL(MAIN_WINDOW_VITE_DEV_SERVER_URL);
- url.searchParams.set('sidebarWindow', '1');
+ for (const [key, value] of Object.entries(options.query)) url.searchParams.set(key, value);
url.hash = hash;
void win.loadURL(url.toString());
} else {
void win.loadFile(path.join(__dirname, `../renderer/${MAIN_WINDOW_VITE_NAME}/index.html`), {
- query: { sidebarWindow: '1' },
+ query: options.query,
hash,
});
}
- log.info('right-sidebar window created');
+ log.info(`${options.logLabel} created`);
return win;
}
+
+export function createRightSidebarWindow(): BrowserWindow {
+ return createSidebarHostWindow({
+ query: { sidebarWindow: '1' },
+ stateFile: 'right-sidebar-window-state.json',
+ defaultWidth: 520,
+ defaultHeight: 860,
+ minWidth: 360,
+ minHeight: 480,
+ logLabel: 'right-sidebar window',
+ });
+}
diff --git a/apps/desktop/src/main/rsb-browser-bridge/renderer-bridge.ts b/apps/desktop/src/main/rsb-browser-bridge/renderer-bridge.ts
index 39683d9aea..d4025b419f 100644
--- a/apps/desktop/src/main/rsb-browser-bridge/renderer-bridge.ts
+++ b/apps/desktop/src/main/rsb-browser-bridge/renderer-bridge.ts
@@ -37,8 +37,14 @@ interface PendingRequest {
}
export interface RendererBridgeOptions {
- /** Resolves to the host renderer to talk to; null when no main window. */
- getHostWebContents: () => WebContents | null;
+ /**
+ * Resolves to the host renderer to talk to; null when no main window.
+ * Receives the op being dispatched so tab-scoped ops (focus / close /
+ * ensure) can land in the window that currently hosts that tab — a tab
+ * popped out into its own sidebar tab window lives in a different renderer
+ * than the embedded sidebar.
+ */
+ getHostWebContents: (op?: RsbBrowserBridgeTabOp) => WebContents | null;
/**
* Optional pre-dispatch hook: awaited before resolving the host webContents.
* Used by the detached right-sidebar window — when the user prefers the
@@ -112,7 +118,7 @@ export async function dispatchTabOp(
await opts.ensureHost(sessionId);
assertActive?.();
}
- const wc = opts.getHostWebContents();
+ const wc = opts.getHostWebContents(op);
if (!wc || wc.isDestroyed()) {
return Promise.reject(new Error('host renderer not available'));
}
diff --git a/apps/desktop/src/main/sidebar-tab-window/__tests__/controller.test.ts b/apps/desktop/src/main/sidebar-tab-window/__tests__/controller.test.ts
new file mode 100644
index 0000000000..382e008b7e
--- /dev/null
+++ b/apps/desktop/src/main/sidebar-tab-window/__tests__/controller.test.ts
@@ -0,0 +1,351 @@
+// SidebarTabWindowsController lifecycle state-machine tests (DI only, no electron).
+//
+// 测试价值
+// - 生产入口与可观察结果:controller.open / mergeBack / closeForTab / 握手与窗口事件;
+// 可观察的是 BrowserWindow 的 show / focus / destroy 时序、发给弹出窗口的指派 / 合并
+// 请求、发给主窗的 tab-returned 通知与全量状态广播。
+// - Bug / 规则依据:electron-security-and-process-boundaries.md §3.1(首份内容前不显示、
+// 预热不抢焦点、崩溃恢复有界、原生关窗不得卡住);本 PR 把侧栏「弹出」改为单页签窗口。
+// - 现有覆盖缺口:right-sidebar-window / ghost-panel-window 的用例针对各自状态机,
+// 本 controller 的 spare 预热 + 指派、合并交回、原生关窗宽限超时都是新路径。
+// - 最小失败输入:见各用例(单页签 open → 握手 → 关闭)。
+// - tier:unit(mock deps 驱动状态机,fake timers 走超时)。
+// - 实测耗时:< 1s。
+
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import type { BrowserWindow, WebContents } from 'electron';
+
+import type {
+ SidebarTabReturnedPayload,
+ SidebarTabWindowsState,
+} from '../../../shared/sidebarTabWindow.js';
+import {
+ SIDEBAR_TAB_WINDOW_ASSIGNED_CHANNEL,
+ SIDEBAR_TAB_WINDOW_MERGE_GRACE_MS,
+ SIDEBAR_TAB_WINDOW_MERGE_REQUESTED_CHANNEL,
+ SIDEBAR_TAB_WINDOW_VISIBILITY_CHANGED_CHANNEL,
+} from '../../../shared/sidebarTabWindow.js';
+import {
+ SidebarTabWindowsController,
+ type SidebarTabWindowsControllerDeps,
+} from '../controller.js';
+
+interface FakeWindow {
+ on: ReturnType<typeof vi.fn>;
+ close: ReturnType<typeof vi.fn>;
+ destroy: ReturnType<typeof vi.fn>;
+ hide: ReturnType<typeof vi.fn>;
+ show: ReturnType<typeof vi.fn>;
+ focus: ReturnType<typeof vi.fn>;
+ restore: ReturnType<typeof vi.fn>;
+ isMinimized: () => boolean;
+ isVisible: () => boolean;
+ isDestroyed: () => boolean;
+ webContents: { id: number; on: ReturnType<typeof vi.fn>; isDestroyed: () => boolean };
+ emitWindowEvent: (event: string, ...args: unknown[]) => void;
+ emitWebContentsEvent: (event: string, ...args: unknown[]) => void;
+}
+
+let nextId = 1;
+function fakeWindow(): FakeWindow {
+ const id = nextId++;
+ const winListeners = new Map<string, (...args: unknown[]) => void>();
+ const wcListeners = new Map<string, (...args: unknown[]) => void>();
+ let destroyed = false;
+ let visible = false;
+ const win: FakeWindow = {
+ on: vi.fn((event: string, cb: (...args: unknown[]) => void) => {
+ winListeners.set(event, cb);
+ }),
+ close: vi.fn(() => {
+ let prevented = false;
+ winListeners.get('close')?.({
+ preventDefault: () => {
+ prevented = true;
+ },
+ });
+ if (prevented) return;
+ destroyed = true;
+ visible = false;
+ winListeners.get('closed')?.();
+ }),
+ destroy: vi.fn(() => {
+ destroyed = true;
+ visible = false;
+ winListeners.get('closed')?.();
+ }),
+ hide: vi.fn(() => {
+ visible = false;
+ }),
+ show: vi.fn(() => {
+ visible = true;
+ }),
+ focus: vi.fn(),
+ restore: vi.fn(),
+ isMinimized: () => false,
+ isVisible: () => visible,
+ isDestroyed: () => destroyed,
+ webContents: {
+ id,
+ on: vi.fn((event: string, cb: (...args: unknown[]) => void) => {
+ wcListeners.set(event, cb);
+ }),
+ isDestroyed: () => destroyed,
+ },
+ emitWindowEvent: (event, ...args) => {
+ if (event === 'hide') visible = false;
+ if (event === 'show') visible = true;
+ winListeners.get(event)?.(...args);
+ },
+ emitWebContentsEvent: (event, ...args) => wcListeners.get(event)?.(...args),
+ };
+ return win;
+}
+
+function makeHarness() {
+ let quitting = false;
+ const created: FakeWindow[] = [];
+ const broadcasts: SidebarTabWindowsState[] = [];
+ const sends: Array<{ winId: number; channel: string; payload: unknown }> = [];
+ const returned: SidebarTabReturnedPayload[] = [];
+ const deps: SidebarTabWindowsControllerDeps = {
+ createWindow: () => {
+ const win = fakeWindow();
+ created.push(win);
+ return win as unknown as BrowserWindow;
+ },
+ broadcastState: (state) => {
+ broadcasts.push(state);
+ },
+ sendToWindow: (win, channel, payload) => {
+ sends.push({ winId: (win as unknown as FakeWindow).webContents.id, channel, payload });
+ },
+ notifyTabReturned: (payload) => {
+ returned.push(payload);
+ },
+ isQuitting: () => quitting,
+ log: { info: vi.fn(), warn: vi.fn(), error: vi.fn() },
+ };
+ const controller = new SidebarTabWindowsController(deps);
+ return {
+ controller,
+ created,
+ broadcasts,
+ sends,
+ returned,
+ setQuitting: (value: boolean) => {
+ quitting = value;
+ },
+ wc: (win: FakeWindow) => win.webContents as unknown as WebContents,
+ };
+}
+
+const request = (tabId: string, sessionId = 's1') => ({
+ tabId,
+ sessionId,
+ context: { workdir: '/repo', remoteHostId: null, deviceLinkDeviceId: null },
+ handoff: null,
+});
+
+beforeEach(() => {
+ vi.useFakeTimers();
+});
+
+afterEach(() => {
+ vi.useRealTimers();
+});
+
+describe('SidebarTabWindowsController', () => {
+ it('prewarms a hidden spare and only shows it after the assigned tab presents content', () => {
+ const h = makeHarness();
+ h.controller.prewarm();
+ expect(h.created).toHaveLength(1);
+ const spare = h.created[0];
+ expect(spare.show).not.toHaveBeenCalled();
+ expect(spare.focus).not.toHaveBeenCalled();
+ h.controller.markRendererReady(h.wc(spare));
+ // 预热窗口壳就绪但未指派:不展示、不广播任何页签状态。
+ expect(h.controller.getState()).toEqual({});
+
+ h.controller.open(request('tab-a'));
+ // spare 被直接消费,没有再冷建窗口;指派随即送达(壳已就绪)。
+ expect(h.created).toHaveLength(1);
+ const assigned = h.sends.find((s) => s.channel === SIDEBAR_TAB_WINDOW_ASSIGNED_CHANNEL);
+ expect(assigned?.payload).toMatchObject({ tabId: 'tab-a', sessionId: 's1' });
+ expect(h.controller.getState()).toEqual({ 'tab-a': { sessionId: 's1', open: true } });
+ // 首份内容前不显示。
+ expect(spare.show).not.toHaveBeenCalled();
+ h.controller.markPresentationReady(h.wc(spare));
+ expect(spare.show).toHaveBeenCalledOnce();
+ expect(spare.focus).toHaveBeenCalledOnce();
+ expect(
+ h.sends.some(
+ (s) =>
+ s.channel === SIDEBAR_TAB_WINDOW_VISIBILITY_CHANGED_CHANNEL &&
+ (s.payload as { visible: boolean }).visible === true,
+ ),
+ ).toBe(true);
+ expect(h.controller.getWebContentsForTab('tab-a')).toBe(h.wc(spare));
+ expect(h.controller.isTabPoppedOut('tab-a')).toBe(true);
+
+ // 指派后延迟补一扇 spare,供下一次弹出。
+ vi.advanceTimersByTime(2_000);
+ expect(h.created).toHaveLength(2);
+ expect(h.created[1].show).not.toHaveBeenCalled();
+ });
+
+ it('cold-opens when no spare exists and delivers the assignment once the shell mounts', () => {
+ const h = makeHarness();
+ h.controller.open(request('tab-a'));
+ expect(h.created).toHaveLength(1);
+ const win = h.created[0];
+ expect(h.sends.filter((s) => s.channel === SIDEBAR_TAB_WINDOW_ASSIGNED_CHANNEL)).toHaveLength(
+ 0,
+ );
+ h.controller.markRendererReady(h.wc(win));
+ expect(h.sends.filter((s) => s.channel === SIDEBAR_TAB_WINDOW_ASSIGNED_CHANNEL)).toHaveLength(
+ 1,
+ );
+ // 重载后的 renderer 主动取指派也拿得到同一份。
+ expect(h.controller.getAssignment(h.wc(win))).toMatchObject({ tabId: 'tab-a' });
+ expect(win.show).not.toHaveBeenCalled();
+
+ // 同一页签再次 open = 聚焦已有窗口,不建第二扇。
+ h.controller.markPresentationReady(h.wc(win));
+ h.controller.open(request('tab-a'));
+ expect(h.created).toHaveLength(1);
+ expect(win.focus).toHaveBeenCalledTimes(2);
+ });
+
+ it('returns the tab to the sidebar with its snapshot on merge-back and destroys the window', () => {
+ const h = makeHarness();
+ h.controller.open(request('tab-a'));
+ const win = h.created[0];
+ h.controller.markRendererReady(h.wc(win));
+ h.controller.markPresentationReady(h.wc(win));
+
+ const snapshot = {
+ sessionId: 's1',
+ tab: { id: 'tab-a', kind: 'web-browser', state: { url: 'x' } },
+ };
+ h.controller.mergeBack(h.wc(win), snapshot);
+ expect(win.destroy).toHaveBeenCalledOnce();
+ expect(h.returned).toEqual([{ sessionId: 's1', tabId: 'tab-a', snapshot, reason: 'merge' }]);
+ expect(h.broadcasts.at(-1)).toEqual({});
+ expect(h.controller.getWebContentsForTab('tab-a')).toBeNull();
+ // 未知 sender 的 merge-back 被忽略。
+ h.controller.mergeBack({} as WebContents, null);
+ expect(h.returned).toHaveLength(1);
+ });
+
+ it('asks the renderer to merge on native close and merges without a snapshot after the grace period', () => {
+ const h = makeHarness();
+ h.controller.open(request('tab-a'));
+ const win = h.created[0];
+ h.controller.markRendererReady(h.wc(win));
+ h.controller.markPresentationReady(h.wc(win));
+
+ win.close();
+ // 原生关窗被拦下,先请求 renderer 交回快照。
+ expect(win.isDestroyed()).toBe(false);
+ expect(
+ h.sends.filter((s) => s.channel === SIDEBAR_TAB_WINDOW_MERGE_REQUESTED_CHANNEL),
+ ).toHaveLength(1);
+ // 重复关窗不重复请求。
+ win.close();
+ expect(
+ h.sends.filter((s) => s.channel === SIDEBAR_TAB_WINDOW_MERGE_REQUESTED_CHANNEL),
+ ).toHaveLength(1);
+ expect(h.returned).toHaveLength(0);
+
+ vi.advanceTimersByTime(SIDEBAR_TAB_WINDOW_MERGE_GRACE_MS);
+ expect(win.destroy).toHaveBeenCalledOnce();
+ expect(h.returned).toEqual([
+ { sessionId: 's1', tabId: 'tab-a', snapshot: null, reason: 'merge' },
+ ]);
+ });
+
+ it('closes a window whose tab was closed in the sidebar without returning the tab', () => {
+ const h = makeHarness();
+ h.controller.open(request('tab-a'));
+ const win = h.created[0];
+ h.controller.closeForTab('tab-a');
+ expect(win.destroy).toHaveBeenCalledOnce();
+ expect(h.returned).toHaveLength(0);
+ expect(h.controller.getState()).toEqual({});
+ // 未弹出的页签 no-op。
+ h.controller.closeForTab('tab-missing');
+ expect(h.created).toHaveLength(1);
+ });
+
+ it('returns the tab to the sidebar when the popped-out renderer crashes, with no rebuild loop', () => {
+ const h = makeHarness();
+ h.controller.open(request('tab-a'));
+ const win = h.created[0];
+ h.controller.markRendererReady(h.wc(win));
+ h.controller.markPresentationReady(h.wc(win));
+ win.emitWebContentsEvent('render-process-gone', {}, { reason: 'crashed' });
+ expect(win.destroy).toHaveBeenCalledOnce();
+ expect(h.returned).toEqual([
+ { sessionId: 's1', tabId: 'tab-a', snapshot: null, reason: 'crash' },
+ ]);
+ // 不为崩溃的页签窗口自动重建 renderer:之后活着的只有补建的未指派 spare。
+ vi.advanceTimersByTime(10_000);
+ expect(h.controller.getState()).toEqual({});
+ expect(h.controller.isTabPoppedOut('tab-a')).toBe(false);
+ expect(h.created.filter((w) => !w.isDestroyed())).toHaveLength(1);
+ expect(h.sends.filter((s) => s.channel === SIDEBAR_TAB_WINDOW_ASSIGNED_CHANNEL)).toHaveLength(
+ 1,
+ );
+ });
+
+ it('replaces a crashed spare at most once', () => {
+ const h = makeHarness();
+ h.controller.prewarm();
+ h.created[0].emitWebContentsEvent('render-process-gone', {}, { reason: 'oom' });
+ vi.advanceTimersByTime(2_000);
+ expect(h.created).toHaveLength(2);
+ h.created[1].emitWebContentsEvent('render-process-gone', {}, { reason: 'oom' });
+ vi.advanceTimersByTime(10_000);
+ expect(h.created).toHaveLength(2);
+ expect(h.returned).toHaveLength(0);
+ });
+
+ it('falls back on the open timeout: shows a mounted shell, returns the tab if nothing mounted', () => {
+ const mounted = makeHarness();
+ mounted.controller.open(request('tab-a'));
+ const win = mounted.created[0];
+ mounted.controller.markRendererReady(mounted.wc(win));
+ vi.advanceTimersByTime(5_000);
+ // 壳已挂载但首份内容迟迟不来:展示 Loading 壳而不是永久隐藏。
+ expect(win.show).toHaveBeenCalledOnce();
+ expect(mounted.returned).toHaveLength(0);
+
+ const blank = makeHarness();
+ blank.controller.open(request('tab-b'));
+ vi.advanceTimersByTime(5_000);
+ // 壳都没挂上:不展示空白窗口,页签回到侧边栏。
+ expect(blank.created[0].show).not.toHaveBeenCalled();
+ expect(blank.created[0].destroy).toHaveBeenCalledOnce();
+ expect(blank.returned).toEqual([
+ { sessionId: 's1', tabId: 'tab-b', snapshot: null, reason: 'crash' },
+ ]);
+ });
+
+ it('ignores handshakes from unrelated senders and tears everything down on dispose', () => {
+ const h = makeHarness();
+ h.controller.prewarm();
+ h.controller.open(request('tab-a'));
+ const win = h.created[0];
+ h.controller.markPresentationReady({} as WebContents);
+ expect(win.show).not.toHaveBeenCalled();
+
+ h.setQuitting(true);
+ h.controller.dispose();
+ expect(h.created.every((w) => w.isDestroyed())).toBe(true);
+ // 退出时的销毁不交回页签(主窗 renderer 已不在)。
+ expect(h.returned).toHaveLength(0);
+ h.controller.open(request('tab-b'));
+ expect(h.created).toHaveLength(1);
+ });
+});
diff --git a/apps/desktop/src/main/sidebar-tab-window/__tests__/ipc.test.ts b/apps/desktop/src/main/sidebar-tab-window/__tests__/ipc.test.ts
new file mode 100644
index 0000000000..fd585e14a2
--- /dev/null
+++ b/apps/desktop/src/main/sidebar-tab-window/__tests__/ipc.test.ts
@@ -0,0 +1,185 @@
+// 测试价值
+// - 生产入口与可观察结果:registerSidebarTabWindowIpc 注册的 handler;可观察的是
+// 非主窗 sender 的弹出请求被拒(PERMISSION_DENIED)、坏 payload 被拒(INVALID_PARAMS)、
+// 只有页签窗口自己或主窗能对它发 close-for-tab,合法请求原样交给 controller。
+// - Bug / 规则依据:electron-security-and-process-boundaries.md「所有 open / close / ready
+// IPC 都校验真实 sender」;弹出请求带 handoff(不可持久化会话内存态)不能被任意 renderer 伪造。
+// - 现有覆盖缺口:controller 单测注入 deps,不经过 IPC 边界。
+// - 最小失败输入:副窗 sender 调 open;缺 tabId 的 payload;无关 sender 调 close-for-tab。
+// - tier:unit(electron ipcMain 以内存 map 桩替)。
+// - 实测耗时:< 1s。
+
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+vi.mock('electron', () => {
+ const ipcMainHandlers = new Map<string, (e: unknown, ...args: unknown[]) => unknown>();
+ return {
+ ipcMain: {
+ handle: vi.fn((channel: string, fn: (e: unknown, ...args: unknown[]) => unknown) => {
+ ipcMainHandlers.set(channel, fn);
+ }),
+ on: vi.fn(),
+ __handlers: ipcMainHandlers,
+ },
+ };
+});
+vi.mock('../../security/trustedAppRenderer.js', () => ({
+ assertTrustedAppRendererEvent: vi.fn(),
+}));
+
+import { ipcMain, type BrowserWindow } from 'electron';
+
+import { MAKER_INVOKE } from '../../maker-ipc/channels.js';
+import { SIDEBAR_TAB_WINDOW_MERGE_BACK_CHANNEL } from '../../../shared/sidebarTabWindow.js';
+import { registerSidebarTabWindowIpc } from '../ipc.js';
+import type { SidebarTabWindowsController } from '../controller.js';
+
+/** handler 内同步 throw 与异步 reject 统一成 rejected promise,便于用 rejects 断言。 */
+function call(fn: (e: unknown, ...args: unknown[]) => unknown, event: unknown, ...args: unknown[]) {
+ return Promise.resolve().then(() => fn(event, ...args));
+}
+
+function handlers() {
+ return (
+ ipcMain as unknown as {
+ __handlers: Map<string, (e: unknown, ...args: unknown[]) => unknown>;
+ }
+ ).__handlers;
+}
+
+function makeController() {
+ return {
+ getState: vi.fn(() => ({})),
+ open: vi.fn(),
+ focus: vi.fn(),
+ closeForTab: vi.fn(),
+ mergeBack: vi.fn(),
+ getAssignment: vi.fn(() => null),
+ markRendererReady: vi.fn(),
+ markPresentationReady: vi.fn(),
+ slotForSender: vi.fn<(sender: unknown) => { assignment: { tabId: string } } | null>(() => null),
+ };
+}
+
+const mainSender = { id: 1 };
+const otherSender = { id: 2 };
+const validRequest = {
+ tabId: 'tab-a',
+ sessionId: 's1',
+ context: { workdir: '/repo', remoteHostId: null, deviceLinkDeviceId: null },
+};
+
+beforeEach(() => {
+ handlers().clear();
+});
+
+function register(controller: ReturnType<typeof makeController>) {
+ registerSidebarTabWindowIpc({
+ controller: controller as unknown as SidebarTabWindowsController,
+ getMainWindow: () =>
+ ({ isDestroyed: () => false, webContents: mainSender }) as unknown as BrowserWindow,
+ });
+}
+
+describe('sidebar-tab-window IPC', () => {
+ it('only the main window may pop a tab out, and the payload must be well-formed', async () => {
+ const controller = makeController();
+ register(controller);
+ const open = handlers().get(MAKER_INVOKE.SIDEBAR_TAB_WINDOW_OPEN)!;
+
+ await expect(call(open, { sender: otherSender }, validRequest)).rejects.toThrow(
+ /PERMISSION_DENIED/,
+ );
+ await expect(
+ call(open, { sender: mainSender }, { ...validRequest, tabId: '' }),
+ ).rejects.toThrow(/INVALID_PARAMS/);
+ await expect(
+ call(
+ open,
+ { sender: mainSender },
+ { ...validRequest, context: { subagentsAvailable: 'yes' } },
+ ),
+ ).rejects.toThrow(/INVALID_PARAMS/);
+ await expect(
+ call(
+ open,
+ { sender: mainSender },
+ {
+ ...validRequest,
+ handoff: { sessionId: 's1', tabs: [], activeTabId: null, persistable: true },
+ },
+ ),
+ ).rejects.toThrow(/INVALID_PARAMS/);
+ expect(controller.open).not.toHaveBeenCalled();
+
+ await call(
+ open,
+ { sender: mainSender },
+ {
+ ...validRequest,
+ handoff: {
+ sessionId: 's1',
+ tabs: [{ id: 'tab-a', kind: 'web-browser', state: { url: 'https://x' } }],
+ activeTabId: 'tab-a',
+ persistable: false,
+ },
+ },
+ );
+ expect(controller.open).toHaveBeenCalledWith({
+ tabId: 'tab-a',
+ sessionId: 's1',
+ context: { workdir: '/repo', remoteHostId: null, deviceLinkDeviceId: null },
+ handoff: {
+ sessionId: 's1',
+ tabs: [{ id: 'tab-a', kind: 'web-browser', state: { url: 'https://x' } }],
+ activeTabId: 'tab-a',
+ persistable: false,
+ },
+ });
+ });
+
+ it('lets the main window or the owning tab window close a window for a closed tab, nobody else', async () => {
+ const controller = makeController();
+ controller.slotForSender.mockImplementation((sender: unknown) =>
+ sender === otherSender ? { assignment: { tabId: 'tab-a' } } : null,
+ );
+ register(controller);
+ const close = handlers().get(MAKER_INVOKE.SIDEBAR_TAB_WINDOW_CLOSE_FOR_TAB)!;
+
+ await call(close, { sender: mainSender }, 'tab-a');
+ await call(close, { sender: otherSender }, 'tab-a');
+ expect(controller.closeForTab).toHaveBeenCalledTimes(2);
+ await expect(call(close, { sender: otherSender }, 'tab-b')).rejects.toThrow(
+ /PERMISSION_DENIED/,
+ );
+ await expect(call(close, { sender: { id: 3 } }, 'tab-a')).rejects.toThrow(/PERMISSION_DENIED/);
+ expect(controller.closeForTab).toHaveBeenCalledTimes(2);
+ });
+
+ it('accepts merge-back only from a managed tab window and validates the snapshot', async () => {
+ const controller = makeController();
+ controller.slotForSender.mockImplementation((sender: unknown) =>
+ sender === otherSender ? { assignment: { tabId: 'tab-a' } } : null,
+ );
+ register(controller);
+ const merge = handlers().get(SIDEBAR_TAB_WINDOW_MERGE_BACK_CHANNEL)!;
+
+ await call(merge, { sender: mainSender }, null);
+ expect(controller.mergeBack).not.toHaveBeenCalled();
+ await expect(call(merge, { sender: otherSender }, { sessionId: 's1' })).rejects.toThrow(
+ /INVALID_PARAMS/,
+ );
+ await call(
+ merge,
+ { sender: otherSender },
+ {
+ sessionId: 's1',
+ tab: { id: 'tab-a', kind: 'terminal', state: { created: true } },
+ },
+ );
+ expect(controller.mergeBack).toHaveBeenCalledWith(otherSender, {
+ sessionId: 's1',
+ tab: { id: 'tab-a', kind: 'terminal', state: { created: true } },
+ });
+ });
+});
diff --git a/apps/desktop/src/main/sidebar-tab-window/controller.ts b/apps/desktop/src/main/sidebar-tab-window/controller.ts
new file mode 100644
index 0000000000..831383f659
--- /dev/null
+++ b/apps/desktop/src/main/sidebar-tab-window/controller.ts
@@ -0,0 +1,542 @@
+/**
+ * SidebarTabWindowsController —— 右侧栏单页签独立窗口的状态机(main 侧单例,
+ * 依赖注入可测)。
+ *
+ * 模型:每个弹出的页签(tabId)一扇窗。主窗的侧边栏继续存在并显示其余页签;
+ * 弹出窗口关闭(合并按钮 / 红绿灯 / ⌘W / 崩溃)= 页签回到侧边栏。没有
+ * 「偏好」可落盘:弹出是本次运行期的视图态,客户端重启后所有页签都回到主窗。
+ *
+ * 生命周期基线对齐 docs/dev-rules/electron-security-and-process-boundaries.md §3.1
+ * 与 ghost-panel-window/controller.ts:
+ * - 预热:主窗首帧稳定后后台创建一扇**未指派**的隐藏窗口(spare);弹出时直接
+ * 指派页签给它,用户点击路径只剩「指派 → 首份内容 → show+focus」。指派后再
+ * 延迟补一扇 spare。
+ * - 双阶段就绪:renderer-ready(壳已挂载,可接收指派)→ presentation-ready
+ * (被指派页签的首份内容已提交)后才 show;超时只展示已挂载的 Loading 壳。
+ * - 关闭即销毁而非隐藏复用:页签回到侧边栏后窗口没有可复用的内容,隐藏保活
+ * 只会按页签数囤积 renderer;§3.1 的隐藏复用面向「同一内容反复打开」的窗口,
+ * 这里由 spare 预热承担「下次弹出不冷启动」。
+ * - 故障隔离且恢复有界:弹出窗口崩溃 / 加载失败 → 销毁并把页签交回侧边栏
+ * (侧边栏本身就是安全态,不重建 renderer 循环);spare 崩溃最多自动补建一次。
+ *
+ * 不直接 import electron —— BrowserWindow 的创建 / 广播全部由 bootstrap-electron
+ * 注入,单测用 mock deps 直接驱动状态机。
+ */
+
+import type { BrowserWindow, WebContents } from 'electron';
+
+import type { RsbWindowTabSnapshot } from '../../shared/rightSidebarWindow.js';
+import type {
+ SidebarTabReturnSnapshot,
+ SidebarTabReturnedPayload,
+ SidebarTabWindowAssignment,
+ SidebarTabWindowOpenRequest,
+ SidebarTabWindowsState,
+} from '../../shared/sidebarTabWindow.js';
+import {
+ SIDEBAR_TAB_WINDOW_ASSIGNED_CHANNEL,
+ SIDEBAR_TAB_WINDOW_LOCALE_CHANGED_CHANNEL,
+ SIDEBAR_TAB_WINDOW_MERGE_GRACE_MS,
+ SIDEBAR_TAB_WINDOW_MERGE_REQUESTED_CHANNEL,
+ SIDEBAR_TAB_WINDOW_VISIBILITY_CHANGED_CHANNEL,
+} from '../../shared/sidebarTabWindow.js';
+import type { SupportedLocale } from '../../shared/locale.js';
+
+interface ControllerLogger {
+ info(message: string, ...args: unknown[]): void;
+ warn(message: string, ...args: unknown[]): void;
+ error(message: string, ...args: unknown[]): void;
+}
+
+export interface SidebarTabWindowsControllerDeps {
+ /** 创建隐藏窗口;cascadeIndex = 当前已指派窗口数,工厂据此层叠位置。 */
+ createWindow: (cascadeIndex: number) => BrowserWindow;
+ /** 状态变化广播(所有窗口)。 */
+ broadcastState: (state: SidebarTabWindowsState) => void;
+ /** main → 某扇弹出窗口。 */
+ sendToWindow: (win: BrowserWindow, channel: string, payload: unknown) => void;
+ /** 页签回到侧边栏:只发给主窗 renderer。 */
+ notifyTabReturned: (payload: SidebarTabReturnedPayload) => void;
+ isQuitting: () => boolean;
+ log: ControllerLogger;
+}
+
+const DEFAULT_OPEN_TIMEOUT_MS = 5000;
+const SPARE_REPLENISH_DELAY_MS = 1_500;
+const MAX_SPARE_RECOVERY_ATTEMPTS = 1;
+
+interface WindowSlot {
+ win: BrowserWindow;
+ /** null = 预热中的 spare,尚未承载任何页签。 */
+ assignment: SidebarTabWindowAssignment | null;
+ /** 随指派一次性交付的不可持久化会话快照。 */
+ handoff: RsbWindowTabSnapshot | null;
+ assignmentDelivered: boolean;
+ rendererReady: boolean;
+ presentationReady: boolean;
+ visible: boolean;
+ pendingOpen: boolean;
+ destroyingWindow: boolean;
+ mergeRequested: boolean;
+ openTimeout: NodeJS.Timeout | null;
+ mergeGraceTimeout: NodeJS.Timeout | null;
+}
+
+export class SidebarTabWindowsController {
+ private readonly slots = new Map<string, WindowSlot>();
+ private spare: WindowSlot | null = null;
+ private spareRecoveryAttempts = 0;
+ private replenishTimer: NodeJS.Timeout | null = null;
+ private disposed = false;
+ private locale: SupportedLocale | null = null;
+
+ constructor(private readonly deps: SidebarTabWindowsControllerDeps) {}
+
+ // ══════════════════════════════════════════════════════════════════════
+ // 公共接口
+ // ══════════════════════════════════════════════════════════════════════
+
+ getState(): SidebarTabWindowsState {
+ const out: SidebarTabWindowsState = {};
+ for (const [tabId, slot] of this.slots) {
+ if (!slot.assignment || slot.win.isDestroyed()) continue;
+ out[tabId] = {
+ sessionId: slot.assignment.sessionId,
+ open: slot.visible || slot.pendingOpen,
+ };
+ }
+ return out;
+ }
+
+ /** 后台预热一扇未指派的隐藏窗口。幂等:已有活着的 spare 时 no-op。 */
+ prewarm(): void {
+ if (this.disposed) return;
+ if (this.spare && !this.spare.win.isDestroyed()) return;
+ this.spare = this.createSlot();
+ }
+
+ setLocale(locale: SupportedLocale): void {
+ this.locale = locale;
+ for (const slot of this.allSlots()) {
+ if (slot.win.isDestroyed()) continue;
+ try {
+ slot.win.webContents.send(SIDEBAR_TAB_WINDOW_LOCALE_CHANGED_CHANNEL, locale);
+ } catch {
+ // Window may be tearing down.
+ }
+ }
+ }
+
+ /**
+ * 把页签弹出到独立窗口。已弹出则只聚焦。优先消费预热的 spare;没有时冷建
+ * (首份内容前不显示,超时展示 Loading 壳)。
+ */
+ open(request: SidebarTabWindowOpenRequest): void {
+ if (this.disposed) return;
+ const existing = this.slots.get(request.tabId);
+ if (existing) {
+ this.focus(request.tabId);
+ return;
+ }
+ const slot = this.takeSpare() ?? this.createSlot();
+ if (!slot) return;
+ slot.assignment = {
+ tabId: request.tabId,
+ sessionId: request.sessionId,
+ context: request.context,
+ };
+ slot.handoff = request.handoff ?? null;
+ slot.assignmentDelivered = false;
+ slot.presentationReady = false;
+ slot.pendingOpen = true;
+ this.slots.set(request.tabId, slot);
+ if (slot.rendererReady) this.deliverAssignment(slot);
+ this.scheduleOpenFallback(slot);
+ this.broadcast();
+ this.scheduleSpareReplenish();
+ this.deps.log.info('sidebar tab window assigned', {
+ tabId: request.tabId,
+ sessionId: request.sessionId,
+ prewarmed: slot.rendererReady,
+ });
+ }
+
+ /** 聚焦已弹出页签的窗口;未弹出 / 仍在等首份内容时 no-op。 */
+ focus(tabId: string): void {
+ const slot = this.slots.get(tabId);
+ if (!slot || slot.win.isDestroyed()) return;
+ if (!slot.visible) return;
+ if (slot.win.isMinimized()) slot.win.restore();
+ slot.win.show();
+ slot.win.focus();
+ }
+
+ /**
+ * 页签已在宿主 renderer 里关闭(agent close / 关闭全部 / guest 自关):销毁窗口,
+ * 不交回页签。
+ */
+ closeForTab(tabId: string): void {
+ const slot = this.slots.get(tabId);
+ if (!slot) return;
+ this.disposeSlot(slot);
+ this.broadcast();
+ this.deps.log.info('sidebar tab window closed for closed tab', { tabId });
+ }
+
+ /** 弹出窗口 renderer 请求合并回侧边栏(按钮 / ⌘W / 响应原生关窗请求)。 */
+ mergeBack(sender: WebContents, snapshot: SidebarTabReturnSnapshot | null): void {
+ const slot = this.slotForSender(sender);
+ if (!slot?.assignment) return;
+ this.finishSlot(slot, snapshot, 'merge');
+ }
+
+ getAssignment(sender: WebContents): SidebarTabWindowOpenRequest | null {
+ const slot = this.slotForSender(sender);
+ if (!slot?.assignment) return null;
+ slot.assignmentDelivered = true;
+ return { ...slot.assignment, handoff: slot.handoff };
+ }
+
+ // ── 双阶段就绪 ──────────────────────────────────────────────────────
+
+ markRendererReady(sender: WebContents): void {
+ const slot = this.slotForSender(sender);
+ if (!slot) return;
+ slot.rendererReady = true;
+ if (this.locale) {
+ try {
+ sender.send(SIDEBAR_TAB_WINDOW_LOCALE_CHANGED_CHANNEL, this.locale);
+ } catch {
+ // Renderer may be tearing down.
+ }
+ }
+ if (slot.assignment && !slot.assignmentDelivered) this.deliverAssignment(slot);
+ }
+
+ markPresentationReady(sender: WebContents): void {
+ const slot = this.slotForSender(sender);
+ if (!slot?.assignment) return;
+ slot.presentationReady = true;
+ if (slot.pendingOpen) this.showAndFocus(slot);
+ }
+
+ /** 查找 sender 对应的 slot(含 spare);非本 controller 管理的窗口返回 null。 */
+ slotForSender(sender: WebContents): WindowSlot | null {
+ for (const slot of this.allSlots()) {
+ if (!slot.win.isDestroyed() && slot.win.webContents === sender) return slot;
+ }
+ return null;
+ }
+
+ /** 页签所在弹出窗口的 WebContents;未弹出返回 null。tab-op / 命令按页签路由用。 */
+ getWebContentsForTab(tabId: string): WebContents | null {
+ const slot = this.slots.get(tabId);
+ if (!slot || slot.win.isDestroyed()) return null;
+ return slot.win.webContents;
+ }
+
+ isTabPoppedOut(tabId: string): boolean {
+ const slot = this.slots.get(tabId);
+ return Boolean(slot && !slot.win.isDestroyed());
+ }
+
+ // ── 生命周期 ────────────────────────────────────────────────────────
+
+ /** 主窗口销毁时回收所有窗口(含 spare);主窗 renderer 已不在,不交回页签。 */
+ destroyAllWindows(): void {
+ this.clearReplenishTimer();
+ for (const slot of this.allSlots()) {
+ this.clearTimeouts(slot);
+ slot.destroyingWindow = true;
+ try {
+ if (!slot.win.isDestroyed()) slot.win.destroy();
+ } catch {
+ /* already gone */
+ }
+ }
+ this.slots.clear();
+ this.spare = null;
+ this.spareRecoveryAttempts = 0;
+ }
+
+ /** 应用退出时永久停止。 */
+ dispose(): void {
+ if (this.disposed) return;
+ this.disposed = true;
+ this.destroyAllWindows();
+ }
+
+ // ══════════════════════════════════════════════════════════════════════
+ // 内部:窗口创建与生命周期
+ // ══════════════════════════════════════════════════════════════════════
+
+ private allSlots(): WindowSlot[] {
+ const out = [...this.slots.values()];
+ if (this.spare) out.push(this.spare);
+ return out;
+ }
+
+ private takeSpare(): WindowSlot | null {
+ const spare = this.spare;
+ this.spare = null;
+ if (!spare || spare.win.isDestroyed()) return null;
+ return spare;
+ }
+
+ private createSlot(): WindowSlot | null {
+ let win: BrowserWindow;
+ try {
+ win = this.deps.createWindow(this.slots.size);
+ } catch (error) {
+ this.deps.log.warn('sidebar tab window creation failed', {
+ error: error instanceof Error ? error.message : String(error),
+ });
+ return null;
+ }
+ const slot: WindowSlot = {
+ win,
+ assignment: null,
+ handoff: null,
+ assignmentDelivered: false,
+ rendererReady: false,
+ presentationReady: false,
+ visible: false,
+ pendingOpen: false,
+ destroyingWindow: false,
+ mergeRequested: false,
+ openTimeout: null,
+ mergeGraceTimeout: null,
+ };
+
+ win.on('close', (event) => {
+ if (slot.destroyingWindow || this.disposed || this.deps.isQuitting()) return;
+ // 原生关窗 = 合并回侧边栏。先让 renderer 交回内存态快照,再销毁。
+ event.preventDefault();
+ this.requestMergeFromNative(slot);
+ });
+ win.on('show', () => this.onNativeVisibilityChanged(slot, true));
+ win.on('hide', () => this.onNativeVisibilityChanged(slot, false));
+ win.on('closed', () => this.onClosed(slot));
+ win.webContents.on('did-start-navigation', (_event, _url, isInPlace, isMainFrame) => {
+ if (isMainFrame && !isInPlace) this.onRendererReloadStarted(slot);
+ });
+ win.webContents.on(
+ 'did-fail-load',
+ (_event, errorCode, errorDescription, _validatedUrl, isMainFrame) => {
+ if (isMainFrame && errorCode !== -3) {
+ this.invalidateSlot(slot, `load failed (${errorCode}): ${errorDescription}`);
+ }
+ },
+ );
+ win.webContents.on('render-process-gone', (_event, details) => {
+ this.invalidateSlot(slot, `renderer process gone: ${details.reason}`);
+ });
+ return slot;
+ }
+
+ private deliverAssignment(slot: WindowSlot): void {
+ if (!slot.assignment || slot.win.isDestroyed()) return;
+ slot.assignmentDelivered = true;
+ this.deps.sendToWindow(slot.win, SIDEBAR_TAB_WINDOW_ASSIGNED_CHANNEL, {
+ ...slot.assignment,
+ handoff: slot.handoff,
+ });
+ }
+
+ private showAndFocus(slot: WindowSlot): void {
+ this.clearOpenTimeout(slot);
+ slot.pendingOpen = false;
+ if (slot.win.isDestroyed()) return;
+ if (slot.win.isMinimized()) slot.win.restore();
+ slot.win.show();
+ slot.win.focus();
+ slot.visible = true;
+ this.deps.sendToWindow(slot.win, SIDEBAR_TAB_WINDOW_VISIBILITY_CHANGED_CHANNEL, {
+ visible: true,
+ });
+ this.broadcast();
+ }
+
+ private onNativeVisibilityChanged(slot: WindowSlot, visible: boolean): void {
+ if (slot.win.isDestroyed() || slot.destroyingWindow || this.disposed) return;
+ if (slot.visible === visible && !slot.pendingOpen) return;
+ slot.visible = visible;
+ if (visible) slot.pendingOpen = false;
+ try {
+ this.deps.sendToWindow(slot.win, SIDEBAR_TAB_WINDOW_VISIBILITY_CHANGED_CHANNEL, {
+ visible,
+ });
+ } catch {
+ // Native visibility can change while the renderer is tearing down.
+ }
+ if (slot.assignment) this.broadcast();
+ }
+
+ private requestMergeFromNative(slot: WindowSlot): void {
+ if (!slot.assignment) {
+ // spare 没有页签可交回,直接丢弃。
+ this.disposeSlot(slot);
+ return;
+ }
+ if (slot.mergeRequested) return;
+ slot.mergeRequested = true;
+ if (slot.rendererReady) {
+ this.deps.sendToWindow(slot.win, SIDEBAR_TAB_WINDOW_MERGE_REQUESTED_CHANNEL, undefined);
+ }
+ // renderer 卡死 / 未就绪时不能让窗口永远关不掉:超时按无快照合并。
+ slot.mergeGraceTimeout = setTimeout(() => {
+ slot.mergeGraceTimeout = null;
+ if (slot.win.isDestroyed()) return;
+ this.deps.log.warn('sidebar tab window merge grace elapsed, merging without snapshot', {
+ tabId: slot.assignment?.tabId,
+ });
+ this.finishSlot(slot, null, 'merge');
+ }, SIDEBAR_TAB_WINDOW_MERGE_GRACE_MS);
+ slot.mergeGraceTimeout.unref?.();
+ }
+
+ /** 页签离开本窗口:销毁窗口、通知主窗接回页签、广播。 */
+ private finishSlot(
+ slot: WindowSlot,
+ snapshot: SidebarTabReturnSnapshot | null,
+ reason: SidebarTabReturnedPayload['reason'],
+ ): void {
+ const assignment = slot.assignment;
+ this.disposeSlot(slot);
+ if (assignment && !this.deps.isQuitting()) {
+ // 先交回页签再广播状态:主窗 renderer 按序处理,刷新状态时页签尚未重新
+ // 投影进侧边栏,避免先画旧状态再跳变。
+ this.deps.notifyTabReturned({
+ sessionId: assignment.sessionId,
+ tabId: assignment.tabId,
+ snapshot: snapshot && snapshot.tab.id === assignment.tabId ? snapshot : null,
+ reason,
+ });
+ }
+ this.broadcast();
+ this.deps.log.info('sidebar tab window finished', {
+ tabId: assignment?.tabId,
+ reason,
+ withSnapshot: snapshot !== null,
+ });
+ }
+
+ private onClosed(slot: WindowSlot): void {
+ this.clearTimeouts(slot);
+ if (this.spare === slot) this.spare = null;
+ const tabId = slot.assignment?.tabId;
+ if (tabId !== undefined && this.slots.get(tabId) === slot) this.slots.delete(tabId);
+ if (slot.destroyingWindow || this.deps.isQuitting()) return;
+ // 不经 controller 的销毁(理论上不该发生):页签照样交回侧边栏,不让它消失。
+ if (slot.assignment) {
+ this.deps.notifyTabReturned({
+ sessionId: slot.assignment.sessionId,
+ tabId: slot.assignment.tabId,
+ snapshot: null,
+ reason: 'crash',
+ });
+ this.broadcast();
+ }
+ }
+
+ // ── 超时 ────────────────────────────────────────────────────────────
+
+ private scheduleOpenFallback(slot: WindowSlot): void {
+ this.clearOpenTimeout(slot);
+ slot.openTimeout = setTimeout(() => {
+ slot.openTimeout = null;
+ if (slot.win.isDestroyed() || !slot.pendingOpen) return;
+ // 壳都没挂上:展示只会是空白窗口,按 §3.1 作废并让页签回到侧边栏。
+ if (!slot.rendererReady) {
+ this.invalidateSlot(slot, 'renderer readiness timed out');
+ return;
+ }
+ if (!slot.visible) this.showAndFocus(slot);
+ }, DEFAULT_OPEN_TIMEOUT_MS);
+ slot.openTimeout.unref?.();
+ }
+
+ private clearOpenTimeout(slot: WindowSlot): void {
+ if (!slot.openTimeout) return;
+ clearTimeout(slot.openTimeout);
+ slot.openTimeout = null;
+ }
+
+ private scheduleSpareReplenish(): void {
+ if (this.disposed || this.replenishTimer) return;
+ this.replenishTimer = setTimeout(() => {
+ this.replenishTimer = null;
+ this.prewarm();
+ }, SPARE_REPLENISH_DELAY_MS);
+ this.replenishTimer.unref?.();
+ }
+
+ private clearReplenishTimer(): void {
+ if (!this.replenishTimer) return;
+ clearTimeout(this.replenishTimer);
+ this.replenishTimer = null;
+ }
+
+ // ── 崩溃恢复 ────────────────────────────────────────────────────────
+
+ private onRendererReloadStarted(slot: WindowSlot): void {
+ if (slot.win.isDestroyed()) return;
+ slot.rendererReady = false;
+ slot.presentationReady = false;
+ slot.assignmentDelivered = false;
+ // 可见窗口重载:等新 renderer 重新拿指派并提交首份内容;窗口本身不隐藏,
+ // 避免闪烁。超时兜底与冷开一致。
+ if (slot.assignment && (slot.visible || slot.pendingOpen)) {
+ slot.pendingOpen = true;
+ this.scheduleOpenFallback(slot);
+ }
+ }
+
+ private invalidateSlot(slot: WindowSlot, reason: string): void {
+ if (slot.win.isDestroyed()) return;
+ if (!slot.assignment) {
+ // spare 坏了:丢弃,最多自动补建一次;稳定后由下一次 open 的 replenish 重置。
+ this.deps.log.warn('sidebar tab spare window invalidated', { reason });
+ this.disposeSlot(slot);
+ if (this.spareRecoveryAttempts >= MAX_SPARE_RECOVERY_ATTEMPTS) {
+ this.deps.log.error('sidebar tab spare window recovery exhausted', { reason });
+ return;
+ }
+ this.spareRecoveryAttempts += 1;
+ this.scheduleSpareReplenish();
+ return;
+ }
+ this.deps.log.warn('sidebar tab window invalidated, returning tab to sidebar', {
+ tabId: slot.assignment.tabId,
+ reason,
+ });
+ this.finishSlot(slot, null, 'crash');
+ }
+
+ // ── 销毁 ────────────────────────────────────────────────────────────
+
+ private disposeSlot(slot: WindowSlot): void {
+ this.clearTimeouts(slot);
+ if (this.spare === slot) this.spare = null;
+ const tabId = slot.assignment?.tabId;
+ if (tabId !== undefined && this.slots.get(tabId) === slot) this.slots.delete(tabId);
+ slot.destroyingWindow = true;
+ try {
+ if (!slot.win.isDestroyed()) slot.win.destroy();
+ } catch {
+ /* already gone */
+ }
+ }
+
+ private clearTimeouts(slot: WindowSlot): void {
+ this.clearOpenTimeout(slot);
+ if (slot.mergeGraceTimeout) {
+ clearTimeout(slot.mergeGraceTimeout);
+ slot.mergeGraceTimeout = null;
+ }
+ }
+
+ private broadcast(): void {
+ this.deps.broadcastState(this.getState());
+ }
+}
diff --git a/apps/desktop/src/main/sidebar-tab-window/ipc.ts b/apps/desktop/src/main/sidebar-tab-window/ipc.ts
new file mode 100644
index 0000000000..d845954403
--- /dev/null
+++ b/apps/desktop/src/main/sidebar-tab-window/ipc.ts
@@ -0,0 +1,199 @@
+/**
+ * registerSidebarTabWindowIpc —— 右侧栏单页签独立窗口的 IPC 注册。
+ *
+ * 全部委托给 SidebarTabWindowsController,这里只做:
+ * - sender 归属校验:弹出 / 聚焦 / 关闭由主窗发起(弹出窗口自己也可以
+ * 对自己承载的页签发 close-for-tab:页签在它里面被 guest 自关时);
+ * 就绪握手、取指派、合并回侧边栏只认弹出窗口自身;
+ * - payload 运行时校验(throwIpcError INVALID_PARAMS)。
+ */
+
+import { ipcMain, type BrowserWindow } from 'electron';
+
+import { MAKER_INVOKE } from '../maker-ipc/channels.js';
+import { createLogger } from '../logger.js';
+import { assertTrustedAppRendererEvent } from '../security/trustedAppRenderer.js';
+import { requireObject, requireString, throwIpcError } from '../utils/ipcValidate.js';
+import { MAX_STATE_JSON_BYTES } from '../../shared/rightSidebarTabState.js';
+import type { RsbWindowTabSnapshot } from '../../shared/rightSidebarWindow.js';
+import type {
+ SidebarTabReturnSnapshot,
+ SidebarTabWindowContext,
+ SidebarTabWindowOpenRequest,
+} from '../../shared/sidebarTabWindow.js';
+import {
+ SIDEBAR_TAB_WINDOW_GET_ASSIGNMENT_CHANNEL,
+ SIDEBAR_TAB_WINDOW_MERGE_BACK_CHANNEL,
+ SIDEBAR_TAB_WINDOW_PRESENTATION_READY_CHANNEL,
+ SIDEBAR_TAB_WINDOW_RENDERER_READY_CHANNEL,
+} from '../../shared/sidebarTabWindow.js';
+import type { SidebarTabWindowsController } from './controller.js';
+
+const log = createLogger('sidebar-tab-window-ipc');
+
+const MAX_ID_LENGTH = 512;
+const MAX_HANDOFF_TABS = 20;
+
+function requireId(value: unknown, name: string): string {
+ const id = requireString(value, name);
+ if (id.length > MAX_ID_LENGTH) throwIpcError('INVALID_PARAMS', `${name} is too long`);
+ return id;
+}
+
+function optionalNullableString(value: unknown, name: string): string | null | undefined {
+ if (value === undefined || value === null) return value;
+ return requireId(value, name);
+}
+
+function parseContext(raw: unknown): SidebarTabWindowContext {
+ const obj = requireObject(raw, 'context');
+ const workdir = optionalNullableString(obj.workdir, 'context.workdir') ?? null;
+ const remoteHostId = optionalNullableString(obj.remoteHostId, 'context.remoteHostId') ?? null;
+ const deviceLinkDeviceId = optionalNullableString(
+ obj.deviceLinkDeviceId,
+ 'context.deviceLinkDeviceId',
+ );
+ if (obj.subagentsAvailable !== undefined && typeof obj.subagentsAvailable !== 'boolean') {
+ throwIpcError('INVALID_PARAMS', 'context.subagentsAvailable must be boolean');
+ }
+ return {
+ workdir,
+ remoteHostId,
+ ...(deviceLinkDeviceId !== undefined ? { deviceLinkDeviceId } : {}),
+ ...(typeof obj.subagentsAvailable === 'boolean'
+ ? { subagentsAvailable: obj.subagentsAvailable }
+ : {}),
+ };
+}
+
+function parseTabRow(raw: unknown, name: string): { id: string; kind: string; state: unknown } {
+ const tab = requireObject(raw, name);
+ const id = requireId(tab.id, `${name}.id`);
+ const kind = requireId(tab.kind, `${name}.kind`);
+ let stateJson: string | undefined;
+ try {
+ stateJson = JSON.stringify(tab.state);
+ } catch {
+ throwIpcError('INVALID_PARAMS', `${name}.state is not JSON-serializable`);
+ }
+ if (
+ typeof stateJson !== 'string' ||
+ Buffer.byteLength(stateJson, 'utf8') > MAX_STATE_JSON_BYTES
+ ) {
+ throwIpcError('RIGHT_SIDEBAR_STATE_TOO_LARGE', `${name}.state is too large`);
+ }
+ return { id, kind, state: tab.state };
+}
+
+/** 弹出时主窗交付的不可持久化会话整桶快照(与 RSB 窗口 handoff 同一形状)。 */
+function parseHandoff(raw: unknown): RsbWindowTabSnapshot | null {
+ if (raw === undefined || raw === null) return null;
+ const snapshot = requireObject(raw, 'handoff');
+ const sessionId = requireId(snapshot.sessionId, 'handoff.sessionId');
+ if (snapshot.persistable !== false) {
+ throwIpcError('INVALID_PARAMS', 'handoff must be non-persistable');
+ }
+ if (!Array.isArray(snapshot.tabs) || snapshot.tabs.length > MAX_HANDOFF_TABS) {
+ throwIpcError('INVALID_PARAMS', 'handoff.tabs must be an array');
+ }
+ const activeTabId = snapshot.activeTabId;
+ if (
+ activeTabId !== null &&
+ (typeof activeTabId !== 'string' || activeTabId.length > MAX_ID_LENGTH)
+ ) {
+ throwIpcError('INVALID_PARAMS', 'handoff.activeTabId is invalid');
+ }
+ const tabs = snapshot.tabs.map((rawTab, index) => parseTabRow(rawTab, `handoff.tabs[${index}]`));
+ return { sessionId, tabs, activeTabId, persistable: false };
+}
+
+/** 合并回侧边栏时弹出窗口交回的单页签快照。 */
+function parseReturnSnapshot(raw: unknown): SidebarTabReturnSnapshot | null {
+ if (raw === undefined || raw === null) return null;
+ const snapshot = requireObject(raw, 'snapshot');
+ const sessionId = requireId(snapshot.sessionId, 'snapshot.sessionId');
+ const tab = parseTabRow(snapshot.tab, 'snapshot.tab');
+ return { sessionId, tab };
+}
+
+function parseOpenRequest(raw: unknown): SidebarTabWindowOpenRequest {
+ const obj = requireObject(raw, 'open request');
+ return {
+ tabId: requireId(obj.tabId, 'tabId'),
+ sessionId: requireId(obj.sessionId, 'sessionId'),
+ context: parseContext(obj.context),
+ handoff: parseHandoff(obj.handoff),
+ };
+}
+
+export function registerSidebarTabWindowIpc(opts: {
+ controller: SidebarTabWindowsController;
+ getMainWindow: () => BrowserWindow | null;
+}): void {
+ const { controller, getMainWindow } = opts;
+
+ const isMainWindowSender = (sender: Electron.WebContents): boolean => {
+ const main = getMainWindow();
+ return Boolean(main && !main.isDestroyed() && sender === main.webContents);
+ };
+
+ ipcMain.handle(MAKER_INVOKE.SIDEBAR_TAB_WINDOW_GET_STATE, (event) => {
+ assertTrustedAppRendererEvent(event);
+ return controller.getState();
+ });
+
+ ipcMain.handle(MAKER_INVOKE.SIDEBAR_TAB_WINDOW_OPEN, (event, payload: unknown) => {
+ assertTrustedAppRendererEvent(event);
+ const request = parseOpenRequest(payload);
+ if (!isMainWindowSender(event.sender)) {
+ log.warn('SIDEBAR_TAB_WINDOW_OPEN from non-main-window sender, dropped');
+ throwIpcError('PERMISSION_DENIED', 'only the main window can pop out a tab');
+ }
+ controller.open(request);
+ });
+
+ ipcMain.handle(MAKER_INVOKE.SIDEBAR_TAB_WINDOW_FOCUS, (event, tabId: unknown) => {
+ assertTrustedAppRendererEvent(event);
+ const id = requireId(tabId, 'tabId');
+ controller.focus(id);
+ });
+
+ ipcMain.handle(MAKER_INVOKE.SIDEBAR_TAB_WINDOW_CLOSE_FOR_TAB, (event, tabId: unknown) => {
+ assertTrustedAppRendererEvent(event);
+ const id = requireId(tabId, 'tabId');
+ const ownSlot = controller.slotForSender(event.sender);
+ const ownsTab = ownSlot?.assignment?.tabId === id;
+ if (!isMainWindowSender(event.sender) && !ownsTab) {
+ log.warn('SIDEBAR_TAB_WINDOW_CLOSE_FOR_TAB from unrelated sender, dropped', { tabId: id });
+ throwIpcError('PERMISSION_DENIED', 'sender does not own this tab');
+ }
+ controller.closeForTab(id);
+ });
+
+ // ── 弹出窗口自身 ─────────────────────────────────────────────────────
+
+ ipcMain.handle(SIDEBAR_TAB_WINDOW_GET_ASSIGNMENT_CHANNEL, (event) => {
+ assertTrustedAppRendererEvent(event);
+ return controller.getAssignment(event.sender);
+ });
+
+ ipcMain.handle(SIDEBAR_TAB_WINDOW_RENDERER_READY_CHANNEL, (event) => {
+ assertTrustedAppRendererEvent(event);
+ controller.markRendererReady(event.sender);
+ });
+
+ ipcMain.handle(SIDEBAR_TAB_WINDOW_PRESENTATION_READY_CHANNEL, (event) => {
+ assertTrustedAppRendererEvent(event);
+ controller.markPresentationReady(event.sender);
+ });
+
+ ipcMain.handle(SIDEBAR_TAB_WINDOW_MERGE_BACK_CHANNEL, (event, rawSnapshot: unknown) => {
+ assertTrustedAppRendererEvent(event);
+ const snapshot = parseReturnSnapshot(rawSnapshot);
+ if (!controller.slotForSender(event.sender)) {
+ log.warn('SIDEBAR_TAB_WINDOW_MERGE_BACK from non-tab-window sender, ignored');
+ return;
+ }
+ controller.mergeBack(event.sender, snapshot);
+ });
+}
diff --git a/apps/desktop/src/main/sidebar-tab-window/window.ts b/apps/desktop/src/main/sidebar-tab-window/window.ts
new file mode 100644
index 0000000000..095c56e914
--- /dev/null
+++ b/apps/desktop/src/main/sidebar-tab-window/window.ts
@@ -0,0 +1,26 @@
+/**
+ * createSidebarTabWindow —— 右侧栏单页签独立窗口的 BrowserWindow 工厂。
+ *
+ * 复用 right-sidebar-window/window.ts 的 `createSidebarHostWindow`:同一份
+ * sidebarWindowPreload、同一组安全字段、同样的外链守卫与崩溃隔离登记——弹出窗口
+ * 承载的是侧栏里同一套页签插件(内置浏览器需要 webviewTag)。差异只在启动参数
+ * (`sidebarWindow=1&sidebarTabWindow=1`,renderer 入口据此只挂 SidebarTabWindowLayout)、
+ * 默认尺寸与独立的位置记忆文件;多扇同时打开时按序层叠,避免完全重叠。
+ */
+
+import type { BrowserWindow } from 'electron';
+
+import { createSidebarHostWindow } from '../right-sidebar-window/window.js';
+
+export function createSidebarTabWindow(cascadeIndex: number): BrowserWindow {
+ return createSidebarHostWindow({
+ query: { sidebarWindow: '1', sidebarTabWindow: '1' },
+ stateFile: 'sidebar-tab-window-state.json',
+ defaultWidth: 520,
+ defaultHeight: 760,
+ minWidth: 360,
+ minHeight: 420,
+ cascadeIndex,
+ logLabel: 'sidebar tab window',
+ });
+}
diff --git a/apps/desktop/src/preload/preload.ts b/apps/desktop/src/preload/preload.ts
index 865dba980b..ba9430f85a 100644
--- a/apps/desktop/src/preload/preload.ts
+++ b/apps/desktop/src/preload/preload.ts
@@ -246,6 +246,11 @@ import type {
RsbWindowTabHandoff,
} from '../shared/rightSidebarWindow';
import { RSB_WINDOW_TAB_HANDOFF_CHANNEL } from '../shared/rightSidebarWindow';
+import type {
+ SidebarTabReturnedPayload,
+ SidebarTabWindowOpenRequest,
+ SidebarTabWindowsState,
+} from '../shared/sidebarTabWindow';
import {
RSB_NATIVE_POPUP_CLAIM_CHANNEL,
RSB_NATIVE_POPUP_CLOSE_CHANNEL,
@@ -552,6 +557,12 @@ const fanOutRsbWindowTabHandoff = createIpcFanOut(RSB_WINDOW_TAB_HANDOFF_CHANNEL
const fanOutGhostPanelWindowStateChanged = createIpcFanOut(
'maker:ghost-panel-window:state-changed',
);
+// 右侧栏单页签独立窗口(sidebar tab window)状态 / 页签交回 / 页签持久化变更推送
+const fanOutSidebarTabWindowStateChanged = createIpcFanOut(
+ 'maker:sidebar-tab-window:state-changed',
+);
+const fanOutSidebarTabWindowTabReturned = createIpcFanOut('maker:sidebar-tab-window:tab-returned');
+const fanOutRightSidebarTabsChanged = createIpcFanOut('maker:right-sidebar-tabs:changed');
const fanOutBinaryDownloadProgress = createIpcFanOut('binary-download-progress');
// Settings →「电脑使用」cua-driver 更新的下载进度(main 侧采样后广播)
const fanOutComputerDriverUpdateProgress = createIpcFanOut('computer-driver-update-progress');
@@ -2014,6 +2025,26 @@ contextBridge.exposeInMainWorld('electronAPI', {
open: (): Promise<void> => ipcRenderer.invoke(RESOURCE_USAGE_WINDOW_OPEN_CHANNEL),
},
+ // ── 右侧栏单页签独立窗口(sidebar tab window)──────────────────────────
+ // 每个弹出的页签一扇窗。状态机在 main(sidebar-tab-window/controller.ts),
+ // 主窗只 invoke + 订阅广播;弹出窗口自身的握手桥在 sidebarWindowPreload。
+ sidebarTabWindow: {
+ getState: (): Promise<SidebarTabWindowsState> =>
+ ipcRenderer.invoke('maker:sidebar-tab-window:get-state'),
+ /** 把页签弹出到独立窗口;已弹出则聚焦。 */
+ open: (request: SidebarTabWindowOpenRequest): Promise<void> =>
+ ipcRenderer.invoke('maker:sidebar-tab-window:open', request),
+ focus: (tabId: string): Promise<void> =>
+ ipcRenderer.invoke('maker:sidebar-tab-window:focus', tabId),
+ /** 页签已在侧边栏关闭:销毁其弹出窗口,不交回。 */
+ closeForTab: (tabId: string): Promise<void> =>
+ ipcRenderer.invoke('maker:sidebar-tab-window:close-for-tab', tabId),
+ onStateChanged: (cb: (state: SidebarTabWindowsState) => void): (() => void) =>
+ fanOutSidebarTabWindowStateChanged((data) => cb(data as SidebarTabWindowsState)),
+ onTabReturned: (cb: (payload: SidebarTabReturnedPayload) => void): (() => void) =>
+ fanOutSidebarTabWindowTabReturned((data) => cb(data as SidebarTabReturnedPayload)),
+ },
+
agentIsland: {
setVisibleSession: (sessionId: string | string[] | null): Promise<{ ok: true }> =>
ipcRenderer.invoke(AGENT_ISLAND_SET_VISIBLE_SESSION_CHANNEL, sessionId),
@@ -5767,6 +5798,9 @@ contextBridge.exposeInMainWorld('electronAPI', {
/** 一次性重写 session 内 tab position(orderedIds 数组下标 = 新 position)。 */
reorder: (input: { sessionId: string; orderedIds: string[] }): Promise<unknown> =>
ipcRenderer.invoke('local-db:right-sidebar-tabs:reorder', input),
+ /** 其它 renderer(弹出的单页签窗口)改动了某会话的页签持久化数据。 */
+ onChanged: (cb: (payload: { sessionId: string }) => void): (() => void) =>
+ fanOutRightSidebarTabsChanged((data) => cb(data as { sessionId: string })),
},
subagentRuns: {
/** Durable Cindy-owned Subagent records for one parent task. */
diff --git a/apps/desktop/src/preload/sidebarWindowPreload.ts b/apps/desktop/src/preload/sidebarWindowPreload.ts
index a9cd9ea12b..aab4e32a0d 100644
--- a/apps/desktop/src/preload/sidebarWindowPreload.ts
+++ b/apps/desktop/src/preload/sidebarWindowPreload.ts
@@ -31,6 +31,21 @@ import {
RSB_WINDOW_VISIBILITY_CHANGED_CHANNEL,
} from '../shared/rightSidebarWindow';
import type { RsbWindowTabHandoff } from '../shared/rightSidebarWindow';
+import {
+ SIDEBAR_TAB_WINDOW_ASSIGNED_CHANNEL,
+ SIDEBAR_TAB_WINDOW_GET_ASSIGNMENT_CHANNEL,
+ SIDEBAR_TAB_WINDOW_LOCALE_CHANGED_CHANNEL,
+ SIDEBAR_TAB_WINDOW_MERGE_BACK_CHANNEL,
+ SIDEBAR_TAB_WINDOW_MERGE_REQUESTED_CHANNEL,
+ SIDEBAR_TAB_WINDOW_PRESENTATION_READY_CHANNEL,
+ SIDEBAR_TAB_WINDOW_RENDERER_READY_CHANNEL,
+ SIDEBAR_TAB_WINDOW_VISIBILITY_CHANGED_CHANNEL,
+} from '../shared/sidebarTabWindow';
+import type {
+ SidebarTabReturnSnapshot,
+ SidebarTabWindowOpenRequest,
+ SidebarTabWindowsState,
+} from '../shared/sidebarTabWindow';
type ApplicationMenuLocale = SupportedLocale;
@@ -384,6 +399,39 @@ contextBridge.exposeInMainWorld('electronAPI', {
// 鈹€鈹€ RSB tab 鎸佷箙鍖?杞婚噺,浠?RSB 闇€瑕? 鈹€鈹€鈹€鈹€鈹€鈹€鈹€鈹€鈹€鈹€鈹€鈹€鈹€鈹€鈹€鈹€鈹€鈹€鈹€鈹€鈹€鈹€鈹€鈹€鈹€鈹€鈹€鈹€鈹€
+ // ── 右侧栏单页签独立窗口(sidebar tab window)─────────────────────────────
+ // 本 preload 同时服务整栏子窗口与单页签弹出窗口(同一工厂 / 同一 renderer 入口,
+ // 按 `?sidebarTabWindow=1` 分流)。弹出窗口只需要:取 / 收指派、双阶段就绪握手、
+ // 合并回侧边栏、响应原生关窗与显隐;状态镜像供其内 store 判断页签归属。
+ sidebarTabWindow: {
+ getState: (): Promise<SidebarTabWindowsState> =>
+ ipcRenderer.invoke('maker:sidebar-tab-window:get-state'),
+ onStateChanged: (cb: (state: SidebarTabWindowsState) => void): (() => void) =>
+ onPayload('maker:sidebar-tab-window:state-changed', cb),
+ /** 聚焦另一扇弹出窗口(本窗口内切到被弹出页签时)。 */
+ focus: (tabId: string): Promise<void> =>
+ ipcRenderer.invoke('maker:sidebar-tab-window:focus', tabId),
+ /** 本窗口承载的页签已被关闭:销毁本窗口,不交回页签。 */
+ closeForTab: (tabId: string): Promise<void> =>
+ ipcRenderer.invoke('maker:sidebar-tab-window:close-for-tab', tabId),
+ getAssignment: (): Promise<SidebarTabWindowOpenRequest | null> =>
+ ipcRenderer.invoke(SIDEBAR_TAB_WINDOW_GET_ASSIGNMENT_CHANNEL),
+ onAssigned: (cb: (assignment: SidebarTabWindowOpenRequest) => void): (() => void) =>
+ onPayload(SIDEBAR_TAB_WINDOW_ASSIGNED_CHANNEL, cb),
+ rendererReady: (): Promise<void> =>
+ ipcRenderer.invoke(SIDEBAR_TAB_WINDOW_RENDERER_READY_CHANNEL),
+ presentationReady: (): Promise<void> =>
+ ipcRenderer.invoke(SIDEBAR_TAB_WINDOW_PRESENTATION_READY_CHANNEL),
+ mergeBack: (snapshot: SidebarTabReturnSnapshot | null): Promise<void> =>
+ ipcRenderer.invoke(SIDEBAR_TAB_WINDOW_MERGE_BACK_CHANNEL, snapshot),
+ onMergeRequested: (cb: () => void): (() => void) =>
+ onPayload(SIDEBAR_TAB_WINDOW_MERGE_REQUESTED_CHANNEL, cb),
+ onVisibilityChanged: (cb: (payload: { visible: boolean }) => void): (() => void) =>
+ onPayload(SIDEBAR_TAB_WINDOW_VISIBILITY_CHANGED_CHANNEL, cb),
+ onLocaleChanged: (cb: (locale: SupportedLocale) => void): (() => void) =>
+ onPayload(SIDEBAR_TAB_WINDOW_LOCALE_CHANGED_CHANNEL, cb),
+ },
+
rightSidebarTabs: {
list: (input: { sessionId: string }): Promise<unknown> =>
ipcRenderer.invoke('local-db:right-sidebar-tabs:list', input),
@@ -489,6 +537,9 @@ contextBridge.exposeInMainWorld('electronAPI', {
close: (input: unknown): Promise<unknown> => ipcRenderer.invoke('local-db:right-sidebar-tabs:close', input),
setActive: (input: unknown): Promise<unknown> => ipcRenderer.invoke('local-db:right-sidebar-tabs:setActive', input),
reorder: (input: unknown): Promise<unknown> => ipcRenderer.invoke('local-db:right-sidebar-tabs:reorder', input),
+ /** 其它 renderer 改动了某会话的页签持久化数据(主窗 ↔ 弹出窗口)。 */
+ onChanged: (cb: (payload: { sessionId: string }) => void): (() => void) =>
+ onPayload('maker:right-sidebar-tabs:changed', cb),
},
subagentRuns: {
list: (input: unknown): Promise<unknown> => ipcRenderer.invoke('local-db:subagent-runs:list', input),
diff --git a/apps/desktop/src/renderer/components/layout/MainLayout.tsx b/apps/desktop/src/renderer/components/layout/MainLayout.tsx
index f73660b053..8a61e438ea 100644
--- a/apps/desktop/src/renderer/components/layout/MainLayout.tsx
+++ b/apps/desktop/src/renderer/components/layout/MainLayout.tsx
@@ -52,11 +52,17 @@ import {
ensureHydrated,
getBucket,
getTabSnapshot,
+ importReturnedTabState,
importTabSnapshot,
+ refreshSessionFromDb,
resetCachesForHostTransition,
+ setActiveTab,
} from '@/features/right-sidebar/store';
import { browserWebviewPool } from '@/features/right-sidebar/lib/browserWebviewPool';
-import { markAllPtyDetached } from '@/features/right-sidebar/plugins/terminal/lib/xtermPool';
+import {
+ markAllPtyDetached,
+ markPtyDetached,
+} from '@/features/right-sidebar/plugins/terminal/lib/xtermPool';
import {
bootstrapRsbWindowState,
getRsbWindowUiState,
@@ -335,6 +341,10 @@ export function MainLayout() {
remoteHostId: string | null;
deviceLinkDeviceId?: string | null;
}>({ workdir: '', remoteHostId: null, deviceLinkDeviceId: undefined });
+ const rightSidebarWorkdirInfoRef = useRef(rightSidebarWorkdirInfo);
+ rightSidebarWorkdirInfoRef.current = rightSidebarWorkdirInfo;
+ const rightSidebarSubagentsAvailableRef = useRef(rightSidebarSubagentsAvailable);
+ rightSidebarSubagentsAvailableRef.current = rightSidebarSubagentsAvailable;
const setRightSidebarWorkdir = useCallback(
(workdir: string, remoteHostId: string | null = null, deviceLinkDeviceId?: string | null) =>
// 同值 bailout(返回 prev 引用):恢复"字符串 state 同值不重渲染"的旧语义。
@@ -1076,14 +1086,72 @@ export function MainLayout() {
void bootstrapRsbWindowState();
}, []);
- // 4) 「在新窗口打开」入口(mac 浮层 / win TabBar 按钮共用):开偏好 + 弹出。
- const handleDetachRightSidebar = useCallback(() => {
+ // 4) 「在独立窗口中打开」页签(Shell 顶栏按钮作用于当前页签 / 页签右键菜单):
+ // 只把这一个页签弹出到自己的窗口,侧边栏继续留在主窗显示其余页签。
+ // 弹出前释放本窗对该页签的独占资源:浏览器 webview 归还池(弹出窗口会重新
+ // 物化并向 main 重新登记),终端标记 PTY 未附着(弹出窗口 re-attach 抢走 sink,
+ // 交回后本窗必须再 attach 一次)。不可持久化会话附整桶内存快照。
+ const handleDetachRightSidebarTab = useCallback((tabId: string) => {
if (isSecondaryWindow()) return;
- writeCollapsedFor(rightSidebarSessionId, false);
- const snapshot = getTabSnapshot(rightSidebarSessionId);
- const handoff = snapshot ? { snapshots: [snapshot] } : undefined;
- void window.electronAPI.rightSidebarWindow.setDetached(true, handoff).catch(() => undefined);
- }, [rightSidebarSessionId]);
+ const sessionId = rightSidebarSessionIdRef.current;
+ if (!sessionId) return;
+ const tab = getBucket(sessionId).tabs.find((candidate) => candidate.id === tabId);
+ if (!tab) return;
+ const api = window.electronAPI.sidebarTabWindow;
+ if (!api?.open) return;
+ if (tab.kind === 'web-browser') browserWebviewPool.release(tabId);
+ if (tab.kind === 'terminal') markPtyDetached(tabId);
+ const info = rightSidebarWorkdirInfoRef.current;
+ void api
+ .open({
+ tabId,
+ sessionId,
+ context: {
+ workdir: info.workdir || null,
+ remoteHostId: info.remoteHostId,
+ deviceLinkDeviceId: info.deviceLinkDeviceId,
+ subagentsAvailable: rightSidebarSubagentsAvailableRef.current,
+ },
+ handoff: getTabSnapshot(sessionId),
+ })
+ .catch((err) => {
+ applicationMenuLog.warn('pop out sidebar tab failed', { sessionId, tabId, err });
+ });
+ }, []);
+
+ // 5) 页签从弹出窗口回到侧边栏(合并 / 关窗 / 崩溃):刷新它的数据副本并选中。
+ // 可持久化会话按 SQLite 强制刷新该页签(弹出期间的改动都在 DB);不可持久化
+ // 会话用交回的内存态覆盖。终端同样要重新 attach PTY。侧边栏若因「最后一个页签
+ // 被弹出」而收起,接回时展开。
+ useEffect(() => {
+ if (isSecondaryWindow()) return;
+ const api = window.electronAPI.sidebarTabWindow;
+ if (!api?.onTabReturned) return;
+ return api.onTabReturned(({ sessionId, tabId, snapshot }) => {
+ markPtyDetached(tabId);
+ const refreshed = snapshot
+ ? Promise.resolve(importReturnedTabState(snapshot))
+ : refreshSessionFromDb(sessionId, { forceTabIds: [tabId] });
+ void refreshed
+ .catch((err) => {
+ applicationMenuLog.warn('refresh returned sidebar tab failed', { sessionId, tabId, err });
+ })
+ .then(() => {
+ if (rightSidebarSessionIdRef.current !== sessionId) return;
+ void setActiveTab(sessionId, tabId).catch((err) => {
+ applicationMenuLog.warn('activate returned sidebar tab failed', {
+ sessionId,
+ tabId,
+ err,
+ });
+ });
+ if (isRightSidebarCollapsedRef.current && !rsbDetachedRef.current) {
+ writeCollapsedFor(sessionId, false);
+ setIsRightSidebarCollapsed(false);
+ }
+ });
+ });
+ }, []);
const handlePageZoomIn = useCallback(() => {
void window.electronAPI.pageZoomIn();
@@ -1644,7 +1712,7 @@ export function MainLayout() {
remoteHostId={rightSidebarWorkdirInfo.remoteHostId}
deviceLinkDeviceId={rightSidebarWorkdirInfo.deviceLinkDeviceId}
subagentsAvailable={rightSidebarSubagentsAvailable}
- onDetach={isSecondaryWindow() ? undefined : handleDetachRightSidebar}
+ onDetachTab={isSecondaryWindow() ? undefined : handleDetachRightSidebarTab}
// M2:面板贴左时 detach / maximize 由 Shell 顶栏右端自渲染
// (面板自属控件跟面板走);折叠 toggle 恒在窗口右上浮层,不下沉。
panelSide={rightSidebarSide}
diff --git a/apps/desktop/src/renderer/components/layout/RightSidebar.tsx b/apps/desktop/src/renderer/components/layout/RightSidebar.tsx
index 52b7a64338..5fa62080d3 100644
--- a/apps/desktop/src/renderer/components/layout/RightSidebar.tsx
+++ b/apps/desktop/src/renderer/components/layout/RightSidebar.tsx
@@ -76,9 +76,9 @@ interface RightSidebarProps {
reserveLeftChromeActions?: boolean;
/** 工具面板位于最左且左侧栏为 rail 时,顶栏承接 ChromeActions 的 no-drag 命中区。 */
railChromeActionsHitHole?: boolean;
- /** 「在新窗口中打开侧边栏」:开偏好 + 弹出子窗口。Win 端 TabBar 内渲染按钮
- * (Mac 走 MainLayout 浮层,不经此 prop)。 */
- onDetach?: () => void;
+ /** 「在独立窗口中打开」某个页签:主窗侧栏继续存在,只把该页签弹出到自己的窗口。
+ * Shell 的顶栏按钮作用于当前页签,页签右键菜单作用于被点的页签。 */
+ onDetachTab?: (tabId: string) => void;
/** M2(mac 交换态):面板当前贴哪条边。透传给 Shell —— 'left' 时 Shell 顶栏
* 右端渲染 detach / maximize 真按钮(折叠 toggle 恒在 MainLayout 窗口右上浮层)。 */
panelSide?: 'left' | 'right';
@@ -102,7 +102,7 @@ export const RightSidebar = forwardRef<RightSidebarHandle, RightSidebarProps>(fu
remoteHostId,
deviceLinkDeviceId,
subagentsAvailable,
- onDetach,
+ onDetachTab,
panelSide,
onAllTabsClosed,
},
@@ -275,7 +275,7 @@ export const RightSidebar = forwardRef<RightSidebarHandle, RightSidebarProps>(fu
isMaximized={isMaximized}
reserveLeftChromeActions={reserveLeftChromeActions}
railChromeActionsHitHole={railChromeActionsHitHole}
- onDetach={onDetach}
+ onDetachTab={onDetachTab}
// B3:主窗口内嵌形态 Tab 条空白处 = 拖面板手势面(窗口拖动走左栏顶行)。
chromeWindowDrag={false}
panelSide={panelSide}
diff --git a/apps/desktop/src/renderer/components/layout/SidebarTabWindowLayout.tsx b/apps/desktop/src/renderer/components/layout/SidebarTabWindowLayout.tsx
new file mode 100644
index 0000000000..b738ad2461
--- /dev/null
+++ b/apps/desktop/src/renderer/components/layout/SidebarTabWindowLayout.tsx
@@ -0,0 +1,259 @@
+/**
+ * SidebarTabWindowLayout —— 右侧栏单页签独立窗口的根组件。
+ *
+ * 窗口由 main/sidebar-tab-window/window.ts 打开(`?sidebarWindow=1&sidebarTabWindow=1`),
+ * 由 sidebar-window-entry.tsx 分流进来。本组件:
+ * - 等 main 指派页签(预热的 spare 窗口在壳挂载后才收到指派;重载时主动
+ * getAssignment 拿回):登记 soloTabId、导入不可持久化会话的内存快照,再把
+ * 会话交给 RightSidebarShell(soloTabId 形态:只投影 / 挂载这一个页签)。
+ * - 双阶段就绪握手:mount → rendererReady;被指派页签所在桶水合且页签在场 →
+ * presentationReady,main 这时才 show。
+ * - 46px 自绘 chrome:整条 drag region;mac 左端红绿灯让位、win 右端 WindowControls
+ * (close = 合并回侧边栏);中部页签图标 + 标题(复用插件的 TabPillIcon /
+ * TabPillTitle);右端「合并回侧边栏」按钮。
+ * - 合并回侧边栏是唯一出口(按钮 / ⌘W / 原生关窗请求 / 协同页签「在主窗查看」):
+ * 不可持久化会话附本页签内存态,main 销毁窗口并把页签交回主窗。
+ * - 页签在本窗口里被关掉(guest 自关 / agent close):桶里找不到它 → 通知 main
+ * 销毁窗口(不交回)。
+ * - 显隐推送:隐藏时模糊焦点、重挂 chrome(复用隐藏窗口不继承上次 hover 态)。
+ *
+ * 与 SidebarWindowLayout 一样挂 useDeviceLinkRemoteProjects / makerChatStore 监听:
+ * device-link 远程会话镜像是每个 renderer 一份,协同 / 后台任务等页签靠它路由。
+ */
+
+import { useCallback, useEffect, useMemo, useRef, useState, useSyncExternalStore } from 'react';
+import { useTranslation } from 'react-i18next';
+import { PanelRight } from 'lucide-react';
+
+import { RightSidebarShell } from '@/features/right-sidebar/RightSidebarShell';
+import { ToastContainer } from '@/components/ui/toast';
+import { useDeviceLinkRemoteProjects } from '@/features/device-link/useDeviceLinkRemoteProjects';
+import { mergeSidebarWindowBack } from '@/features/right-sidebar/lib/mergeSidebarWindowBack';
+import { setSoloTabId } from '@/features/right-sidebar/lib/tabHosting';
+import { getTabKind, hydrateTabState } from '@/features/right-sidebar/registry';
+import { getBucket, importTabSnapshot, subscribe } from '@/features/right-sidebar/store';
+import { iconForTabKind, labelKeyForTabKind } from '@/features/right-sidebar/TabBar';
+import { WindowControls } from '@/components/title-bar/WindowControls';
+import { ChromeIconButton } from '@/components/title-bar/ChromeIconButton';
+import { useAppShortcut } from '@/hooks/useAppShortcut';
+import { useCloseShortcutShellOwner } from '@/hooks/useCloseWindowShortcut';
+import { useLocale } from '@/hooks/useLocale';
+import { createLogger } from '@/lib/logger';
+import { makerChatStore } from '@/lib/makerChatStore';
+import { GhostMediaLightboxHost } from '@/cindy-brain/GhostMediaLightboxHost';
+import { ensureGhostPanelsRegistered, useGhostPanelsSync } from '@/cindy-brain/ghostPanels';
+import type { SidebarTabWindowOpenRequest } from '../../../shared/sidebarTabWindow';
+
+const log = createLogger('SidebarTabWindowLayout');
+
+export function SidebarTabWindowLayout() {
+ const { t } = useTranslation();
+ const { effectiveLocale, setLocale } = useLocale();
+ ensureGhostPanelsRegistered();
+ useGhostPanelsSync();
+ useEffect(() => {
+ // 弹出窗口需要实时事件维护页签内容,但认证失败后的凭证读取、会话重启与消息重发
+ // 必须只由主 renderer 执行。
+ makerChatStore.initGlobalListeners({ ownsRemoteAuthRetry: false, ownsRemoteListCache: false });
+ }, []);
+ const isMac = window.electronAPI?.platform === 'darwin';
+ const api = window.electronAPI?.sidebarTabWindow;
+ const [assignment, setAssignment] = useState<SidebarTabWindowOpenRequest | null>(null);
+ const [windowVisible, setWindowVisible] = useState(false);
+ useDeviceLinkRemoteProjects(windowVisible, 'sidebar');
+ const presentationReadySentRef = useRef(false);
+ const leavingRef = useRef(false);
+ const [windowChromeRevision, setWindowChromeRevision] = useState(0);
+
+ const applyAssignment = useCallback((next: SidebarTabWindowOpenRequest) => {
+ setAssignment((prev) => {
+ if (prev?.tabId === next.tabId && prev.sessionId === next.sessionId) return prev;
+ // 必须早于 Shell 的 ensureHydrated:不可持久化会话只能从这份快照水合。
+ if (next.handoff) importTabSnapshot(next.handoff);
+ setSoloTabId(next.tabId);
+ leavingRef.current = false;
+ presentationReadySentRef.current = false;
+ return next;
+ });
+ }, []);
+
+ // mount:订阅指派推送 + 主动拉一次(重载 / 推送早于订阅)+ renderer-ready 握手。
+ useEffect(() => {
+ if (!api) return;
+ let cancelled = false;
+ const offAssigned = api.onAssigned?.((next) => {
+ if (!cancelled) applyAssignment(next);
+ });
+ void api
+ .getAssignment?.()
+ .then((next) => {
+ if (!cancelled && next) applyAssignment(next);
+ })
+ .catch((err) => log.warn('getAssignment failed', err));
+ void api.rendererReady?.().catch((err) => {
+ log.warn('renderer-ready handshake failed', err);
+ });
+ return () => {
+ cancelled = true;
+ offAssigned?.();
+ };
+ }, [api, applyAssignment]);
+
+ useEffect(() => {
+ return (
+ api?.onLocaleChanged?.((locale) => {
+ if (locale !== effectiveLocale) setLocale(locale);
+ }) ?? undefined
+ );
+ }, [api, effectiveLocale, setLocale]);
+
+ // 显隐:隐藏时模糊焦点 + 重挂 chrome;显示时同样先模糊,避免继承旧焦点。
+ useEffect(() => {
+ return (
+ api?.onVisibilityChanged?.((payload) => {
+ setWindowVisible(payload.visible);
+ if (document.activeElement instanceof HTMLElement) document.activeElement.blur();
+ if (!payload.visible) setWindowChromeRevision((revision) => revision + 1);
+ }) ?? undefined
+ );
+ }, [api]);
+
+ const sessionId = assignment?.sessionId ?? null;
+ const tabId = assignment?.tabId ?? null;
+ const subscribeBucket = useCallback(
+ (onChange: () => void) =>
+ subscribe((changedSessionId) => {
+ if (changedSessionId === sessionId) onChange();
+ }),
+ [sessionId],
+ );
+ const getBucketSnapshot = useCallback(() => getBucket(sessionId), [sessionId]);
+ const bucket = useSyncExternalStore(subscribeBucket, getBucketSnapshot);
+ const tab = useMemo(
+ () => (tabId ? (bucket.tabs.find((candidate) => candidate.id === tabId) ?? null) : null),
+ [bucket.tabs, tabId],
+ );
+
+ // presentation-ready:被指派页签的桶已水合且页签在场 → main 可以展示窗口。
+ useEffect(() => {
+ if (presentationReadySentRef.current || !assignment || !bucket.hydrated || !tab) return;
+ presentationReadySentRef.current = true;
+ void api?.presentationReady?.().catch((err) => {
+ log.warn('presentation-ready handshake failed', err);
+ });
+ }, [api, assignment, bucket.hydrated, tab]);
+
+ // 页签已不在桶里(本窗口内被关闭):销毁本窗口,不交回。
+ useEffect(() => {
+ if (!assignment || !bucket.hydrated || tab || leavingRef.current) return;
+ leavingRef.current = true;
+ void api?.closeForTab(assignment.tabId).catch((err) => {
+ leavingRef.current = false;
+ log.warn('close window for closed tab failed', err);
+ });
+ }, [api, assignment, bucket.hydrated, tab]);
+
+ const mergeBack = useCallback(() => {
+ if (!assignment || leavingRef.current) return;
+ leavingRef.current = true;
+ void mergeSidebarWindowBack(assignment.sessionId).catch((err) => {
+ leavingRef.current = false;
+ log.warn('merge tab back failed', err);
+ });
+ }, [assignment]);
+
+ // 原生关窗(红绿灯 / 系统关闭 / Windows X):main 先请求本 renderer 交回快照。
+ useEffect(() => {
+ return api?.onMergeRequested?.(() => mergeBack()) ?? undefined;
+ }, [api, mergeBack]);
+
+ // ⌘W / Ctrl+W:本窗口整个就是一个页签,关窗 = 合并回侧边栏(不关页签)。
+ useCloseShortcutShellOwner();
+ useAppShortcut('close-tab-or-window', () => {
+ mergeBack();
+ return true;
+ });
+
+ const plugin = tab ? getTabKind(tab.kind) : null;
+ const hydratedState = tab ? hydrateTabState(plugin, tab.state) : null;
+ const FallbackIcon = tab ? iconForTabKind(tab.kind) : PanelRight;
+ const IconNode = plugin?.TabPillIcon;
+ const TitleNode = plugin?.TabPillTitle;
+ const context = assignment?.context;
+
+ return (
+ <div className="flex h-screen flex-col bg-content-area text-foreground">
+ <div
+ className="relative flex h-[46px] shrink-0 items-center border-b border-[var(--border-default)] bg-[var(--panel-bg)]"
+ style={{ WebkitAppRegion: 'drag' } as React.CSSProperties}
+ >
+ <div className={isMac ? 'w-20 shrink-0' : 'w-3 shrink-0'} />
+ <div className="flex min-w-0 flex-1 items-center gap-2">
+ <span className="shrink-0 text-[var(--text-tertiary)]">
+ {tab && IconNode ? (
+ <IconNode state={hydratedState} sessionId={sessionId} active />
+ ) : (
+ <FallbackIcon size={14} />
+ )}
+ </span>
+ <span className="truncate text-13 text-[var(--text-secondary)]">
+ {tab ? (
+ TitleNode ? (
+ <TitleNode state={hydratedState} sessionId={sessionId} active t={t} />
+ ) : (
+ t(labelKeyForTabKind(tab.kind))
+ )
+ ) : (
+ t('rightSidebar.tabWindow.title')
+ )}
+ </span>
+ </div>
+ <div
+ className="flex shrink-0 items-center gap-0.5 pr-2"
+ style={{ WebkitAppRegion: 'no-drag' } as React.CSSProperties}
+ >
+ <ChromeIconButton onClick={mergeBack} aria-label={t('rightSidebar.tabWindow.mergeBack')}>
+ <PanelRight size={14} />
+ </ChromeIconButton>
+ </div>
+ {!isMac && (
+ <div
+ className="flex h-full shrink-0 items-center"
+ style={{ WebkitAppRegion: 'no-drag' } as React.CSSProperties}
+ >
+ <WindowControls key={windowChromeRevision} onClose={mergeBack} />
+ </div>
+ )}
+ </div>
+
+ <div className="relative flex flex-1 flex-col overflow-hidden">
+ {assignment && (
+ <RightSidebarShell
+ sessionId={sessionId}
+ workdir={context?.workdir ?? ''}
+ remoteHostId={context?.remoteHostId ?? null}
+ deviceLinkDeviceId={context?.deviceLinkDeviceId}
+ subagentsAvailable={context?.subagentsAvailable}
+ shellVisible={windowVisible}
+ isMac={isMac}
+ soloTabId={assignment.tabId}
+ />
+ )}
+ {(!windowVisible || !assignment || !tab) && (
+ <div className="absolute inset-0 z-10 flex items-center justify-center bg-[var(--panel-bg)]">
+ <span className="text-13 text-[var(--text-tertiary)]">
+ {assignment && bucket.hydrated && !tab
+ ? t('rightSidebar.tabWindow.closed')
+ : t('rightSidebar.tabWindow.loading')}
+ </span>
+ </div>
+ )}
+ </div>
+ <ToastContainer />
+ <GhostMediaLightboxHost
+ key={windowVisible && sessionId ? sessionId : 'hidden'}
+ sessionId={windowVisible && sessionId ? sessionId : undefined}
+ />
+ </div>
+ );
+}
diff --git a/apps/desktop/src/renderer/features/right-sidebar/RightSidebarShell.tsx b/apps/desktop/src/renderer/features/right-sidebar/RightSidebarShell.tsx
index d5a98c0066..6ac8ab52dc 100644
--- a/apps/desktop/src/renderer/features/right-sidebar/RightSidebarShell.tsx
+++ b/apps/desktop/src/renderer/features/right-sidebar/RightSidebarShell.tsx
@@ -65,6 +65,7 @@ import { initPopupRouter, setPopupFallbackSession } from './lib/popupRouter';
import { TabBodyErrorBoundary } from './TabBodyErrorBoundary';
import { useRetainedBrowserTabHosts } from './hooks/useRetainedBrowserTabHosts';
import { useInstalledGhosts } from '@/cindy-brain/useInstalledGhosts';
+import { useSidebarTabWindowsState } from '@/lib/sidebarTabWindowState';
import {
mergeAvailableTabOrder,
projectAvailableTabs,
@@ -120,8 +121,18 @@ interface RightSidebarShellProps {
reserveLeftChromeActions?: boolean;
/** 工具面板处于最左 rail 邻位时,顶栏为浮动 ChromeActions 挖 no-drag 命中区并预留布局空间。 */
railChromeActionsHitHole?: boolean;
- /** 「在新窗口中打开侧边栏」;仅 Win 端 TabBar 内渲染按钮(Mac 走 MainLayout 浮层)。 */
- onDetach?: () => void;
+ /**
+ * 「在独立窗口中打开」页签:主窗侧栏继续存在,只把该页签弹出到自己的窗口。
+ * 顶栏按钮作用于当前激活页签(没有激活页签时不渲染);页签右键菜单作用于被点
+ * 的页签。弹出窗口(soloTabId 形态)与会话副窗不传。
+ */
+ onDetachTab?: (tabId: string) => void;
+ /**
+ * 单页签独立窗口形态:Shell 只投影并挂载这一个页签,不渲染 TabBar / 合并顶栏 /
+ * 空态,不写激活位,也不向 main 上报「活跃侧栏会话」(主窗仍是侧栏宿主权威)。
+ * 该页签从桶里消失(被关闭)后 Shell 渲染为空,由 SidebarTabWindowLayout 关窗。
+ */
+ soloTabId?: string;
/** TabBar 横带是否作为窗口拖拽区(见 TabBar 同名 prop):主窗口内嵌形态传
* false(空白处 = 拖面板手势面);detached 子窗口不传,默认 true。 */
chromeWindowDrag?: boolean;
@@ -151,13 +162,15 @@ export function RightSidebarShell({
onShowSidebar,
onMaximize,
isMaximized,
- onDetach,
+ onDetachTab,
+ soloTabId,
chromeWindowDrag = true,
panelSide = 'right',
onAllTabsClosed,
reserveLeftChromeActions = false,
railChromeActionsHitHole = false,
}: RightSidebarShellProps) {
+ const soloMode = typeof soloTabId === 'string';
const { isFullscreen } = useMacFullscreen();
const chromeActionsLeft =
isMac && !isFullscreen
@@ -177,6 +190,9 @@ export function RightSidebarShell({
: 0;
const { t } = useTranslation();
const installedGhosts = useInstalledGhosts();
+ // 已弹出到独立窗口的页签:数据留在桶里,但本 Shell 不投影、不挂 body。
+ // 弹出窗口自身(soloMode)反过来只投影自己承载的那一个。
+ const poppedOutTabs = useSidebarTabWindowsState();
// RSB browser bridge (Phase 2):在 Shell 整个生命周期内只 init 一次。bridge 内部
// 自带 idempotent guard,strict-mode 双 effect / 重复挂载都安全。bridge 绑定
@@ -204,6 +220,13 @@ export function RightSidebarShell({
);
const getBucketSnapshot = useCallback(() => getBucket(sessionId), [sessionId]);
const bucket = useSyncExternalStore(subscribeBucket, getBucketSnapshot);
+ const hiddenTabIds = useMemo<ReadonlySet<string> | undefined>(() => {
+ if (soloMode) {
+ return new Set(bucket.tabs.map((tab) => tab.id).filter((id) => id !== soloTabId));
+ }
+ const ids = Object.keys(poppedOutTabs);
+ return ids.length > 0 ? new Set(ids) : undefined;
+ }, [bucket.tabs, poppedOutTabs, soloMode, soloTabId]);
const previousShellVisibleRef = useRef(shellVisible);
const subagentsEligibilityKnown = typeof subagentsAvailable === 'boolean';
const subagentsEnabled = subagentsAvailable === true;
@@ -213,7 +236,10 @@ export function RightSidebarShell({
// null 也推(切到非 RSB 路由时),让 main 端清掉 active session — 否则
// 之前的 sessionId 会成 stale 引用。隐藏的分离窗口只是预热/待命实例,不能
// 覆盖主窗口当前的浏览器 session。setActiveSession 失败容错(preload 未就绪)。
- if (shellVisible) {
+ // 单页签独立窗口不是侧栏宿主,不上报(主窗仍是「活跃侧栏会话」权威)。
+ if (soloMode) {
+ // no-op
+ } else if (shellVisible) {
void window.electronAPI?.rsbBrowserBridge
?.setActiveSession({ sessionId })
.catch(() => undefined);
@@ -229,7 +255,7 @@ export function RightSidebarShell({
void ensureHydrated(sessionId).catch((err) => {
log.error('ensureHydrated failed', { sessionId, err });
});
- }, [sessionId, shellVisible]);
+ }, [sessionId, shellVisible, soloMode]);
// Subagents eligibility is tri-state: `undefined` while the session row is
// still loading, then true/false once the harness is known. Folding unknown
@@ -242,8 +268,16 @@ export function RightSidebarShell({
() => ({
installedGhosts: remoteHostId || deviceLinkDeviceId !== null ? [] : installedGhosts,
subagentsAvailable: subagentsEnabled || !subagentsEligibilityKnown,
+ hiddenTabIds,
}),
- [installedGhosts, remoteHostId, deviceLinkDeviceId, subagentsEligibilityKnown, subagentsEnabled],
+ [
+ hiddenTabIds,
+ installedGhosts,
+ remoteHostId,
+ deviceLinkDeviceId,
+ subagentsEligibilityKnown,
+ subagentsEnabled,
+ ],
);
const projectedTabs = useMemo(
() => projectAvailableTabs(bucket.tabs, bucket.activeTabId, tabAvailability),
@@ -322,7 +356,8 @@ export function RightSidebarShell({
// provisional during that window, so converging it would persist a decision
// taken from incomplete information and destroy the restored selection.
useEffect(() => {
- if (!subagentsEligibilityKnown) return;
+ // 单页签独立窗口不写激活位:它只投影自己承载的页签,激活位归主窗侧栏管。
+ if (soloMode || !subagentsEligibilityKnown) return;
if (!bucket.hydrated || !sessionId || bucket.activeTabId === activeTabId) return;
void setActiveTab(sessionId, activeTabId).catch((err) => {
log.error('unavailable active-tab reconciliation failed', {
@@ -331,7 +366,14 @@ export function RightSidebarShell({
err,
});
});
- }, [activeTabId, bucket.activeTabId, bucket.hydrated, sessionId, subagentsEligibilityKnown]);
+ }, [
+ activeTabId,
+ bucket.activeTabId,
+ bucket.hydrated,
+ sessionId,
+ soloMode,
+ subagentsEligibilityKnown,
+ ]);
const prevTabCountRef = useRef<number | null>(null);
useEffect(() => {
@@ -372,7 +414,7 @@ export function RightSidebarShell({
// 这些 kind 已无渲染方,
// 留着只会落到 PlaceholderBody 变成"敬请期待"的死页签。
useEffect(() => {
- if (!bucket.hydrated || !sessionId) return;
+ if (soloMode || !bucket.hydrated || !sessionId) return;
const legacyGhostTabs = bucket.tabs.filter((tab) =>
tab.kind.startsWith('ghost:') ||
tab.kind === ('bot-delegations' as TabKindId) ||
@@ -388,7 +430,7 @@ export function RightSidebarShell({
}
}
})();
- }, [bucket.hydrated, bucket.tabs, sessionId]);
+ }, [bucket.hydrated, bucket.tabs, sessionId, soloMode]);
// 关掉最后一个 tab → 通知 host 自动收起侧栏。只在 tab 数「从 >0 变 0」的转变时
// 触发,不是"等于 0"就触发:
@@ -564,6 +606,12 @@ export function RightSidebarShell({
return off;
}, [handleCycleTab, sessionId]);
+ // 顶栏「在独立窗口中打开」作用于当前激活页签;没有激活页签时不渲染按钮。
+ const handleDetachActiveTab = useMemo(
+ () => (onDetachTab && activeTabId ? () => onDetachTab(activeTabId) : undefined),
+ [activeTabId, onDetachTab],
+ );
+
const bodyHosts = useRetainedBrowserTabHosts(
bucket.hydrated
? tabs
@@ -574,7 +622,7 @@ export function RightSidebarShell({
return (
<div className="flex h-full min-h-0 flex-1 flex-col overflow-hidden">
- {unifiedTopbar ? (
+ {soloMode ? null : unifiedTopbar ? (
<div
data-testid="right-sidebar-unified-topbar"
// bg 走 --panel-bg 与下方 TabBar / Body 同源(2026-07-21 用户裁决:CINDY 下
@@ -637,6 +685,7 @@ export function RightSidebarShell({
onAdd={handleAdd}
onCloseOthers={handleCloseOthers}
onCloseAll={handleCloseAll}
+ onDetachTab={onDetachTab}
pillVariant="chip"
addButtonWrapperClassName="h-[30px]"
subagentsAvailable={subagentsEnabled}
@@ -648,7 +697,9 @@ export function RightSidebarShell({
className="flex h-full shrink-0 items-center gap-0.5"
style={{ WebkitAppRegion: 'no-drag' } as React.CSSProperties}
>
- {onDetach && <RightSidebarDetach size="toolbar" onDetach={onDetach} />}
+ {handleDetachActiveTab && (
+ <RightSidebarDetach size="toolbar" onDetach={handleDetachActiveTab} />
+ )}
{onMaximize && (
<RightSidebarMaximize
size="toolbar"
@@ -689,7 +740,8 @@ export function RightSidebarShell({
onShowSidebar={onShowSidebar}
panelSide={panelSide}
isMaximized={isMaximized}
- onDetach={onDetach}
+ onDetach={handleDetachActiveTab}
+ onDetachTab={onDetachTab}
onCloseOthers={handleCloseOthers}
onCloseAll={handleCloseAll}
chromeWindowDrag={chromeWindowDrag}
@@ -700,7 +752,7 @@ export function RightSidebarShell({
{/* 首次切到某 session 时 cache 尚未 hydrate(等 IPC list 回包),保留 panel
背景而非闪 EmptyState —— EmptyState 是"真的没 tab"的 Welcome 内容。
sessionId 为 null 也走这条:Shell 不显示任何内容(无激活会话)。 */}
- {!bucket.hydrated ? null : tabs.length === 0 ? (
+ {!bucket.hydrated || soloMode ? null : tabs.length === 0 ? (
// tab 列表为空时永远渲染 EmptyState。审查页签只通过「+」dropdown 或
// EmptyState 的"打开审查"入口由用户主动创建。
<EmptyState
diff --git a/apps/desktop/src/renderer/features/right-sidebar/TabBar.tsx b/apps/desktop/src/renderer/features/right-sidebar/TabBar.tsx
index 228a55e9c1..e4885e680e 100644
--- a/apps/desktop/src/renderer/features/right-sidebar/TabBar.tsx
+++ b/apps/desktop/src/renderer/features/right-sidebar/TabBar.tsx
@@ -68,11 +68,13 @@ interface TabBarProps {
onCloseOthers?: (keepTabId: string) => void;
/** Tab pill 右键菜单 "关闭所有"。 */
onCloseAll?: () => void;
- /** 「在新窗口中打开侧边栏」(开偏好 + 弹出子窗口);仅 showWindowControls=true
- * (Win 端)时渲染在 maximize 左侧。Mac 端按钮走 MainLayout 浮层。
+ /** 「在独立窗口中打开」当前激活页签;仅 showWindowControls=true(Win 端)时
+ * 渲染在 maximize 左侧。Mac 端按钮在 Shell 合并顶栏右端。
* Windows 主窗口展开态同时传入 onCloseSidebar,折叠按钮归属本 TabBar;
* 折叠后再由聊天区角上的 chip 提供展开入口。 */
onDetach?: () => void;
+ /** 页签右键菜单「在独立窗口中打开」:作用于被点的页签。 */
+ onDetachTab?: (tabId: string) => void;
/** 本条横带是否作为**窗口**拖拽区(B3):主窗口内嵌形态传 false —— 空白处是
* "拖面板"手势面(窗口拖拽区收不到鼠标事件,二者物理互斥;拖窗走左栏顶行);
* detached 子窗口等其它宿主不传,默认 true 维持经典拖窗行为。 */
@@ -91,6 +93,8 @@ interface TabStripProps {
onAdd: (kind: TabKindId) => void;
onCloseOthers?: (keepTabId: string) => void;
onCloseAll?: () => void;
+ /** Tab pill 右键菜单「在独立窗口中打开」。 */
+ onDetachTab?: (tabId: string) => void;
className?: string;
/**
* pill 视觉变体:
@@ -150,11 +154,11 @@ const KIND_LABEL_KEY: Record<BuiltinTabKindId, string> = {
* (2026-07-09 事故:dev 分支写入 kind='orca-workers',release 端
* KIND_ICON[kind] 取到 undefined 渲染 <undefined/> → React #130 全屏崩溃。)
*/
-function iconForTabKind(kind: TabKindId): LucideIcon {
+export function iconForTabKind(kind: TabKindId): LucideIcon {
return (KIND_ICON as Partial<Record<string, LucideIcon>>)[kind] ?? Puzzle;
}
-function labelKeyForTabKind(kind: TabKindId): string {
+export function labelKeyForTabKind(kind: TabKindId): string {
// 插件页签的意识被停用/卸下(plugin 已注销)时,pill 兜底显示「插件面板」
// 而非「未知标签页」——kind 前缀本身就能识别它是谁的地盘。
if (kind.startsWith('ghost:')) return 'rightSidebar.tabs.kinds.ghostPanel';
@@ -201,6 +205,7 @@ export function TabBar({
onCloseOthers,
onCloseAll,
onDetach,
+ onDetachTab,
chromeWindowDrag = true,
subagentsAvailable = false,
}: TabBarProps) {
@@ -225,6 +230,7 @@ export function TabBar({
onAdd={onAdd}
onCloseOthers={onCloseOthers}
onCloseAll={onCloseAll}
+ onDetachTab={onDetachTab}
addButtonWrapperClassName="h-[36px]"
addButtonClassName="mt-[3px]"
subagentsAvailable={subagentsAvailable}
@@ -290,6 +296,7 @@ export function TabStrip({
onAdd,
onCloseOthers,
onCloseAll,
+ onDetachTab,
className,
pillVariant = 'flush',
addButtonWrapperClassName,
@@ -512,6 +519,17 @@ export function TabStrip({
>
{t('rightSidebar.tabs.contextMenu.closeAll')}
</DropdownMenuItem>
+ {onDetachTab && (
+ <DropdownMenuItem
+ onClick={() => {
+ const id = contextMenu.tabId;
+ closeContextMenu();
+ onDetachTab(id);
+ }}
+ >
+ {t('rightSidebar.tabs.contextMenu.openInWindow')}
+ </DropdownMenuItem>
+ )}
</>
)}
</DropdownMenuContent>
diff --git a/apps/desktop/src/renderer/features/right-sidebar/__tests__/RightSidebarShell.test.ts b/apps/desktop/src/renderer/features/right-sidebar/__tests__/RightSidebarShell.test.ts
index 632f035926..c513fca5cc 100644
--- a/apps/desktop/src/renderer/features/right-sidebar/__tests__/RightSidebarShell.test.ts
+++ b/apps/desktop/src/renderer/features/right-sidebar/__tests__/RightSidebarShell.test.ts
@@ -73,6 +73,10 @@ import {
type SidebarVisibilityRequestOptions,
} from '../lib/sidebarCommands';
import { _resetStore, closeTab, getBucket, setActiveTab } from '../store';
+import {
+ __resetSidebarTabWindowsStateForTest,
+ __setSidebarTabWindowsStateForTest,
+} from '@/lib/sidebarTabWindowState';
import { toast } from '@/lib/toast';
import { writePanelCollapsed } from '@/layout/collapsePrefs';
import { CHROME_ACTIONS_GEOMETRY } from '@/components/layout/chromeActionsGeometry';
@@ -294,6 +298,7 @@ describe('RightSidebarShell empty state', () => {
_resetRsbBrowserBridgeForTests();
_resetPopupRouterForTests();
_resetNativePopupTabsForTests();
+ __resetSidebarTabWindowsStateForTest();
delete (window as unknown as { electronAPI?: unknown }).electronAPI;
});
@@ -1229,9 +1234,14 @@ describe('RightSidebarShell empty state', () => {
it('keeps mac panel actions in the panel topbar without reserving a hidden show trigger', async () => {
// 展开态没有固定唤起入口;detach / maximize / 收起始终属于面板自身。
- const onDetach = vi.fn();
+ // 「在独立窗口中打开」作用于当前页签:有激活页签时才渲染,回调带该页签 id。
+ const onDetachTab = vi.fn();
const onMaximize = vi.fn();
const onCloseSidebar = vi.fn();
+ tabsIpc.list.mockResolvedValueOnce({
+ tabs: [{ id: 'tab-pop', kind: 'file-browser', state: null }],
+ activeTabId: 'tab-pop',
+ });
const { unmount } = render(
createElement(RightSidebarShell, {
sessionId: 's1',
@@ -1240,23 +1250,29 @@ describe('RightSidebarShell empty state', () => {
isMac: true,
unifiedTopbar: true,
panelSide: 'left',
- onDetach,
+ onDetachTab,
onMaximize,
onCloseSidebar,
}),
);
- await waitFor(() => expect(screen.getByText('rightSidebar.tabs.empty.title')).toBeTruthy());
+ await waitFor(() =>
+ expect(
+ screen.getByRole('button', { name: 'rightSidebar.tabs.controls.detachAria' }),
+ ).toBeTruthy(),
+ );
const actions = screen.getByTestId('right-sidebar-topbar-actions');
expect(actions).toBeTruthy();
screen.getByRole('button', { name: 'rightSidebar.tabs.controls.detachAria' }).click();
- expect(onDetach).toHaveBeenCalledOnce();
+ expect(onDetachTab).toHaveBeenCalledWith('tab-pop');
screen.getByRole('button', { name: 'rightSidebar.tabs.controls.maximizeAria' }).click();
expect(onMaximize).toHaveBeenCalledOnce();
screen.getByRole('button', { name: 'contentHeader.collapsePanel' }).click();
expect(onCloseSidebar).toHaveBeenCalledOnce();
expect(screen.queryByTestId('right-sidebar-fixed-trigger-spacer')).toBeNull();
unmount();
+ // 后两次渲染回到空会话(store 是模块级单例,先清掉上面水合进来的页签)。
+ _resetStore();
// maximize 后面板占据最右边缘,仍保留自属控件,但不为隐藏的唤起入口留空。
const { unmount: unmountMax } = render(
@@ -1268,7 +1284,7 @@ describe('RightSidebarShell empty state', () => {
unifiedTopbar: true,
panelSide: 'left',
isMaximized: true,
- onDetach,
+ onDetachTab,
onMaximize,
onCloseSidebar,
}),
@@ -1276,6 +1292,10 @@ describe('RightSidebarShell empty state', () => {
await waitFor(() => expect(screen.getByText('rightSidebar.tabs.empty.title')).toBeTruthy());
expect(screen.getByTestId('right-sidebar-topbar-actions')).toBeTruthy();
expect(screen.queryByTestId('right-sidebar-fixed-trigger-spacer')).toBeNull();
+ // 没有页签就没有可弹出的目标:按钮不渲染。
+ expect(
+ screen.queryByRole('button', { name: 'rightSidebar.tabs.controls.detachAria' }),
+ ).toBeNull();
unmountMax();
// 贴右时同样保留面板自属控件,不显示无效唤起入口,也不留空。
@@ -1286,7 +1306,7 @@ describe('RightSidebarShell empty state', () => {
remoteHostId: null,
isMac: true,
unifiedTopbar: true,
- onDetach,
+ onDetachTab,
onMaximize,
onCloseSidebar,
}),
@@ -1294,7 +1314,6 @@ describe('RightSidebarShell empty state', () => {
await waitFor(() => expect(screen.getByText('rightSidebar.tabs.empty.title')).toBeTruthy());
expect(screen.getByTestId('right-sidebar-topbar-actions')).toBeTruthy();
expect(screen.queryByTestId('right-sidebar-fixed-trigger-spacer')).toBeNull();
- expect(screen.getByRole('button', { name: 'rightSidebar.tabs.controls.detachAria' })).toBeTruthy();
expect(screen.getByRole('button', { name: 'contentHeader.collapsePanel' })).toBeTruthy();
});
@@ -1310,7 +1329,7 @@ describe('RightSidebarShell empty state', () => {
onCloseSidebar,
onShowSidebar,
onMaximize: vi.fn(),
- onDetach: vi.fn(),
+ onDetachTab: vi.fn(),
}),
);
@@ -1344,7 +1363,7 @@ describe('RightSidebarShell empty state', () => {
isMac: false,
onCloseSidebar: vi.fn(),
onMaximize: vi.fn(),
- onDetach: vi.fn(),
+ onDetachTab: vi.fn(),
}),
);
@@ -1470,6 +1489,89 @@ describe('RightSidebarShell empty state', () => {
await new Promise((resolve) => setTimeout(resolve, 0));
expect(onAllTabsClosed).not.toHaveBeenCalled();
});
+
+ // 测试价值
+ // - 生产入口与可观察结果:RightSidebarShell 渲染同一会话桶;页签弹出到独立窗口
+ // (sidebarTabWindowState 镜像)后主窗侧栏不再显示它的 pill 与 body,激活位落到
+ // 仍在侧栏的页签并落库;窗口关闭(镜像清空)后 pill 回来。弹出窗口自身
+ // (soloTabId)只挂那一个页签、不画 TabBar / 空态、不写激活位。
+ // - Bug / 规则依据:侧栏「弹出」从整栏改为单页签(本 PR);webview / 终端不能双实例,
+ // 两个 renderer 投影同一页签就是双实例。
+ // - 现有覆盖缺口:相邻用例只覆盖可用性过滤(subagents / retired),没有跨窗口归属。
+ // - 最小失败输入:两页签会话 + 镜像标记 active 页签已弹出。
+ // - tier:unit(jsdom,进程内 store 与镜像,无 IPC)。
+ it('hides popped-out tabs from the sidebar and keeps the solo window on its own tab', async () => {
+ registerTabKind({
+ kind: 'terminal',
+ menu: { kind: 'terminal', labelKey: 'terminal', icon: Globe, order: 2, enabled: true },
+ TabPillTitle: () => createElement('span', null, 'terminal-pill'),
+ TabBody: () => createElement('div', null, 'terminal-body'),
+ defaultState: () => ({}),
+ });
+ try {
+ tabsIpc.list.mockResolvedValue({
+ tabs: [
+ { id: 'tab-files', kind: 'file-browser', state: null },
+ { id: 'tab-term', kind: 'terminal', state: {} },
+ ],
+ activeTabId: 'tab-term',
+ });
+ const { unmount } = render(
+ createElement(RightSidebarShell, {
+ sessionId: 's1',
+ workdir: '/tmp/repo',
+ remoteHostId: null,
+ isMac: true,
+ unifiedTopbar: true,
+ subagentsAvailable: false,
+ }),
+ );
+ await waitFor(() => expect(screen.getByText('terminal-pill')).toBeTruthy());
+ expect(screen.getByText('rightSidebar.tabs.kinds.fileBrowser')).toBeTruthy();
+
+ // 终端页签弹出:侧栏不再显示它,激活位移到文件页签并落库。
+ act(() => {
+ __setSidebarTabWindowsStateForTest({ 'tab-term': { sessionId: 's1', open: true } });
+ });
+ await waitFor(() => expect(screen.queryByText('terminal-pill')).toBeNull());
+ expect(screen.queryByText('terminal-body')).toBeNull();
+ expect(screen.getByText('rightSidebar.tabs.kinds.fileBrowser')).toBeTruthy();
+ await waitFor(() =>
+ expect(tabsIpc.setActive).toHaveBeenCalledWith({ sessionId: 's1', id: 'tab-files' }),
+ );
+ expect(getBucket('s1').tabs).toHaveLength(2);
+
+ // 窗口关闭(镜像清空):页签回到侧栏。
+ act(() => {
+ __setSidebarTabWindowsStateForTest({});
+ });
+ await waitFor(() => expect(screen.getByText('terminal-pill')).toBeTruthy());
+ unmount();
+
+ // 弹出窗口自身:只挂被指派页签,没有 TabBar / 空态,不改激活位。
+ tabsIpc.setActive.mockClear();
+ _resetStore();
+ render(
+ createElement(RightSidebarShell, {
+ sessionId: 's1',
+ workdir: '/tmp/repo',
+ remoteHostId: null,
+ isMac: true,
+ subagentsAvailable: false,
+ soloTabId: 'tab-term',
+ }),
+ );
+ await waitFor(() => expect(screen.getByText('terminal-body')).toBeTruthy());
+ expect(screen.queryByTestId('right-sidebar-tab-bar')).toBeNull();
+ expect(screen.queryByTestId('right-sidebar-unified-topbar')).toBeNull();
+ expect(screen.queryByText('rightSidebar.tabs.empty.title')).toBeNull();
+ expect(screen.queryByText('rightSidebar.tabs.kinds.fileBrowser')).toBeNull();
+ await new Promise((resolve) => setTimeout(resolve, 0));
+ expect(tabsIpc.setActive).not.toHaveBeenCalled();
+ } finally {
+ unregisterTabKind('terminal');
+ }
+ });
});
describe('RightSidebarShell 跨 session popup 归属', () => {
diff --git a/apps/desktop/src/renderer/features/right-sidebar/__tests__/store.test.ts b/apps/desktop/src/renderer/features/right-sidebar/__tests__/store.test.ts
index 67c2668f69..51f56901a0 100644
--- a/apps/desktop/src/renderer/features/right-sidebar/__tests__/store.test.ts
+++ b/apps/desktop/src/renderer/features/right-sidebar/__tests__/store.test.ts
@@ -1372,3 +1372,212 @@ describe('device-link remote sessions (memory-only tabs)', () => {
expect(stub.upsert).toHaveBeenCalledTimes(1);
});
});
+
+// 测试价值
+// - 生产入口与可观察结果:refreshSessionFromDb / setActiveTab / closeTab / getSingleTabSnapshot /
+// importReturnedTabState 与 localDb.rightSidebarTabs.onChanged 订阅;可观察的是同一会话桶在
+// 「主窗侧栏 + 弹出的单页签窗口」两个 renderer 并存时的合并结果:本 renderer 承载的页签
+// 以本地为准、弹出页签以 SQLite 为准、对方新增 / 关闭的页签同步进出、切到弹出页签 = 聚焦
+// 其窗口、关掉弹出页签 = 销毁其窗口。
+// - Bug / 规则依据:本 PR 把侧栏「弹出」从整栏改为单页签,首次出现两个 renderer 共享一个
+// 会话桶;没有合并规则会互相用旧快照覆盖(弹出窗口里改的 URL 合并回来后丢失)。
+// - 现有覆盖缺口:上面的 handoff 用例只覆盖整栏迁移(单宿主交接),没有双宿主并存。
+// - 最小失败输入:两页签会话,其中一个标记为已弹出,再按 DB 快照刷新。
+// - tier:unit(jsdom,进程内 store + 状态镜像)。
+// - 实测耗时:与本文件其余用例一起 < 5s。
+describe('cross-renderer sync for popped-out tabs', () => {
+ let ipc: IpcStub;
+ let sidebarTabWindow: { focus: ReturnType<typeof vi.fn>; closeForTab: ReturnType<typeof vi.fn> };
+ let onChangedListeners: Array<(payload: { sessionId: string }) => void>;
+ let popped: typeof import('@/lib/sidebarTabWindowState');
+
+ beforeEach(async () => {
+ store = await import('../store');
+ popped = await import('@/lib/sidebarTabWindowState');
+ store._resetStore();
+ popped.__resetSidebarTabWindowsStateForTest();
+ _resetTabKindRegistry();
+ ipc = makeIpcStub();
+ installIpc(ipc);
+ onChangedListeners = [];
+ sidebarTabWindow = {
+ focus: vi.fn(async () => undefined),
+ closeForTab: vi.fn(async () => undefined),
+ };
+ Object.assign((window as unknown as { electronAPI: Record<string, unknown> }).electronAPI, {
+ sidebarTabWindow,
+ });
+ Object.assign(ipc, {
+ onChanged: vi.fn((cb: (payload: { sessionId: string }) => void) => {
+ onChangedListeners.push(cb);
+ return () => undefined;
+ }),
+ });
+ });
+
+ afterEach(() => {
+ store._resetStore();
+ popped.__resetSidebarTabWindowsStateForTest();
+ _resetTabKindRegistry();
+ vi.useRealTimers();
+ });
+
+ async function hydrateTwoTabs(sessionId = 's1') {
+ ipc.list.mockResolvedValueOnce({
+ tabs: [
+ { id: 'tab-files', kind: 'file-browser', state: { path: 'a' } },
+ { id: 'tab-web', kind: 'web-browser', state: { url: 'https://old' } },
+ ],
+ activeTabId: 'tab-files',
+ });
+ await store.ensureHydrated(sessionId);
+ }
+
+ it('merges a DB refresh: hosted tabs stay local, popped tabs take DB, foreign adds/removes apply', async () => {
+ await hydrateTwoTabs();
+ popped.__setSidebarTabWindowsStateForTest({ 'tab-web': { sessionId: 's1', open: true } });
+ // 本窗对承载页签的乐观改动(写还在途)不能被对方的刷新覆盖。
+ void store.patchTabState('s1', 'tab-files', () => ({ path: 'local-edit' }));
+ ipc.list.mockResolvedValueOnce({
+ tabs: [
+ { id: 'tab-files', kind: 'file-browser', state: { path: 'db-stale' } },
+ { id: 'tab-web', kind: 'web-browser', state: { url: 'https://new' } },
+ { id: 'tab-new', kind: 'terminal', state: { created: true } },
+ ],
+ activeTabId: 'tab-new',
+ });
+
+ await store.refreshSessionFromDb('s1');
+
+ expect(store.getBucket('s1')).toEqual({
+ hydrated: true,
+ tabs: [
+ { id: 'tab-files', kind: 'file-browser', state: { path: 'local-edit' } },
+ { id: 'tab-web', kind: 'web-browser', state: { url: 'https://new' } },
+ { id: 'tab-new', kind: 'terminal', state: { created: true } },
+ ],
+ // 对方新建并激活、且由本窗承载的页签接管激活位。
+ activeTabId: 'tab-new',
+ });
+
+ // 对方关掉了 tab-new;本窗承载的 tab-files 仍以本地为准。
+ ipc.list.mockResolvedValueOnce({
+ tabs: [
+ { id: 'tab-files', kind: 'file-browser', state: { path: 'db-stale' } },
+ { id: 'tab-web', kind: 'web-browser', state: { url: 'https://new' } },
+ ],
+ activeTabId: 'tab-files',
+ });
+ await store.refreshSessionFromDb('s1');
+ expect(store.getBucket('s1').tabs.map((t) => t.id)).toEqual(['tab-files', 'tab-web']);
+ expect(store.getBucket('s1').activeTabId).toBe('tab-files');
+ });
+
+ it('force-refreshes a returned tab from DB even though the mirror already marks it hosted', async () => {
+ await hydrateTwoTabs();
+ // 页签交回后镜像已清空(= 本窗承载),但本地副本是弹出前的旧值。
+ ipc.list.mockResolvedValueOnce({
+ tabs: [
+ { id: 'tab-files', kind: 'file-browser', state: { path: 'a' } },
+ { id: 'tab-web', kind: 'web-browser', state: { url: 'https://edited-in-window' } },
+ ],
+ activeTabId: 'tab-files',
+ });
+ await store.refreshSessionFromDb('s1', { forceTabIds: ['tab-web'] });
+ expect(store.getBucket('s1').tabs[1].state).toEqual({ url: 'https://edited-in-window' });
+ });
+
+ it('does not resurrect a tab that this renderer is closing while the DB row still exists', async () => {
+ await hydrateTwoTabs();
+ let resolveClose!: (value: { ok: true }) => void;
+ ipc.close.mockImplementationOnce(
+ () =>
+ new Promise<{ ok: true }>((resolve) => {
+ resolveClose = resolve;
+ }),
+ );
+ const closing = store.closeTab('s1', 'tab-web');
+ await Promise.resolve();
+ expect(store.getBucket('s1').tabs.map((t) => t.id)).toEqual(['tab-files']);
+ ipc.list.mockResolvedValueOnce({
+ tabs: [
+ { id: 'tab-files', kind: 'file-browser', state: { path: 'a' } },
+ { id: 'tab-web', kind: 'web-browser', state: { url: 'https://old' } },
+ ],
+ activeTabId: 'tab-files',
+ });
+ await store.refreshSessionFromDb('s1');
+ expect(store.getBucket('s1').tabs.map((t) => t.id)).toEqual(['tab-files']);
+ resolveClose({ ok: true });
+ await closing;
+ });
+
+ it('activating a popped-out tab focuses its window instead of moving the sidebar marker', async () => {
+ await hydrateTwoTabs();
+ popped.__setSidebarTabWindowsStateForTest({ 'tab-web': { sessionId: 's1', open: true } });
+ await store.setActiveTab('s1', 'tab-web');
+ expect(sidebarTabWindow.focus).toHaveBeenCalledWith('tab-web');
+ expect(store.getBucket('s1').activeTabId).toBe('tab-files');
+ expect(ipc.setActive).not.toHaveBeenCalled();
+ });
+
+ it('closing a popped-out tab in the sidebar tears down its window without returning it', async () => {
+ await hydrateTwoTabs();
+ popped.__setSidebarTabWindowsStateForTest({ 'tab-web': { sessionId: 's1', open: true } });
+ await store.closeTab('s1', 'tab-web');
+ expect(ipc.close).toHaveBeenCalledWith({ id: 'tab-web' });
+ expect(sidebarTabWindow.closeForTab).toHaveBeenCalledWith('tab-web');
+ });
+
+ it('coalesces change broadcasts into one DB refresh per session', async () => {
+ vi.useFakeTimers();
+ await hydrateTwoTabs();
+ expect(onChangedListeners).toHaveLength(1);
+ ipc.list.mockClear();
+ ipc.list.mockResolvedValue({
+ tabs: [
+ { id: 'tab-files', kind: 'file-browser', state: { path: 'a' } },
+ { id: 'tab-web', kind: 'web-browser', state: { url: 'https://burst' } },
+ ],
+ activeTabId: 'tab-files',
+ });
+ popped.__setSidebarTabWindowsStateForTest({ 'tab-web': { sessionId: 's1', open: true } });
+ onChangedListeners[0]({ sessionId: 's1' });
+ onChangedListeners[0]({ sessionId: 's1' });
+ onChangedListeners[0]({ sessionId: 's1' });
+ expect(ipc.list).not.toHaveBeenCalled();
+ await vi.advanceTimersByTimeAsync(200);
+ expect(ipc.list).toHaveBeenCalledTimes(1);
+ expect(store.getBucket('s1').tabs[1].state).toEqual({ url: 'https://burst' });
+ });
+
+ it('hands a memory-only tab back through a single-tab snapshot', async () => {
+ ipc.list.mockResolvedValueOnce({ tabs: [], activeTabId: null, persistable: false });
+ await store.ensureHydrated('mem-s1');
+ const tab = await store.addTab('mem-s1', 'web-browser' as never, { url: 'https://a' });
+ expect(store.getSingleTabSnapshot('mem-s1', tab.id)).toEqual({
+ sessionId: 'mem-s1',
+ tab: { id: tab.id, kind: 'web-browser', state: { url: 'https://a' } },
+ });
+ // 可持久化会话不交内存态(以 SQLite 为准)。
+ await hydrateTwoTabs('s1');
+ expect(store.getSingleTabSnapshot('s1', 'tab-web')).toBeNull();
+
+ store.importReturnedTabState({
+ sessionId: 'mem-s1',
+ tab: { id: tab.id, kind: 'web-browser', state: { url: 'https://edited' } },
+ });
+ expect(store.getBucket('mem-s1').tabs[0].state).toEqual({ url: 'https://edited' });
+ // 未知页签 / 未加载会话:不新增、不报错。
+ store.importReturnedTabState({
+ sessionId: 'mem-s1',
+ tab: { id: 'ghost', kind: 'web-browser', state: {} },
+ });
+ store.importReturnedTabState({
+ sessionId: 'never-loaded',
+ tab: { id: 'x', kind: 'y', state: {} },
+ });
+ expect(store.getBucket('mem-s1').tabs).toHaveLength(1);
+ expect(store.getBucket('never-loaded').hydrated).toBe(false);
+ });
+});
diff --git a/apps/desktop/src/renderer/features/right-sidebar/lib/mergeSidebarWindowBack.ts b/apps/desktop/src/renderer/features/right-sidebar/lib/mergeSidebarWindowBack.ts
index fde050f961..c8a0a834e7 100644
--- a/apps/desktop/src/renderer/features/right-sidebar/lib/mergeSidebarWindowBack.ts
+++ b/apps/desktop/src/renderer/features/right-sidebar/lib/mergeSidebarWindowBack.ts
@@ -5,9 +5,18 @@
* setDetached(false) 交接给主窗;可持久化会话的快照为 null,主窗按 SQLite 重新水合。
*/
-import { getTabSnapshot } from '../store';
+import { isSidebarTabWindow } from '@/lib/sidebarTabWindow';
+import { getSingleTabSnapshot, getTabSnapshot } from '../store';
+import { getSoloTabId } from './tabHosting';
export async function mergeSidebarWindowBack(sessionId: string | null | undefined): Promise<void> {
+ // 单页签独立窗口:只交回自己承载的那个页签(不可持久化会话附内存态),窗口随之关闭。
+ if (isSidebarTabWindow()) {
+ const tabId = getSoloTabId();
+ const snapshot = tabId ? getSingleTabSnapshot(sessionId, tabId) : null;
+ await window.electronAPI.sidebarTabWindow?.mergeBack?.(snapshot);
+ return;
+ }
const snapshot = getTabSnapshot(sessionId);
const handoff = snapshot ? { snapshots: [snapshot] } : undefined;
await window.electronAPI.rightSidebarWindow.setDetached(false, handoff);
diff --git a/apps/desktop/src/renderer/features/right-sidebar/lib/tabHosting.ts b/apps/desktop/src/renderer/features/right-sidebar/lib/tabHosting.ts
new file mode 100644
index 0000000000..a9703c233c
--- /dev/null
+++ b/apps/desktop/src/renderer/features/right-sidebar/lib/tabHosting.ts
@@ -0,0 +1,36 @@
+/**
+ * tabHosting —— 「这个页签的内容由本 renderer 承载吗」。
+ *
+ * 同一会话的页签桶可能同时水合在两个 renderer 里:主窗侧边栏 + 若干弹出的单页签
+ * 窗口。每个页签只由一个 renderer 真正挂载它的 body(webview / 终端 / 文件树),
+ * 其它 renderer 只持有它的数据副本:
+ * - 主窗 / 副窗:承载所有**未弹出**的页签;
+ * - 弹出窗口:只承载被指派给它的那一个页签。
+ *
+ * store 据此决定跨 renderer 刷新时哪些页签以本地为准(承载方)、哪些以 SQLite
+ * 为准(非承载方),Shell 据此隐藏非承载页签。
+ */
+
+import { isSidebarTabWindow } from '@/lib/sidebarTabWindow';
+import { isTabPoppedOut } from '@/lib/sidebarTabWindowState';
+
+let soloTabId: string | null = null;
+
+/** 弹出窗口收到指派后登记自己承载的页签;主窗不调用。 */
+export function setSoloTabId(tabId: string | null): void {
+ soloTabId = tabId;
+}
+
+export function getSoloTabId(): string | null {
+ return soloTabId;
+}
+
+export function isTabHostedHere(tabId: string): boolean {
+ if (isSidebarTabWindow()) return soloTabId !== null && tabId === soloTabId;
+ return !isTabPoppedOut(tabId);
+}
+
+/** 仅测试用。 */
+export function __resetTabHostingForTest(): void {
+ soloTabId = null;
+}
diff --git a/apps/desktop/src/renderer/features/right-sidebar/plugins/terminal/lib/xtermPool.ts b/apps/desktop/src/renderer/features/right-sidebar/plugins/terminal/lib/xtermPool.ts
index b64a2414a8..00c5a6ae32 100644
--- a/apps/desktop/src/renderer/features/right-sidebar/plugins/terminal/lib/xtermPool.ts
+++ b/apps/desktop/src/renderer/features/right-sidebar/plugins/terminal/lib/xtermPool.ts
@@ -123,6 +123,15 @@ export function markAllPtyDetached(): void {
for (const entry of pool.values()) entry.ptyAttached = false;
}
+/**
+ * 单个页签在「侧边栏 ↔ 单页签独立窗口」间迁移时调用(弹出前 / 交回后各一次):
+ * 只复位这一个 entry 的 ptyAttached,其余终端页签不受影响。语义同 markAllPtyDetached。
+ */
+export function markPtyDetached(tabId: string): void {
+ const entry = pool.get(tabId);
+ if (entry) entry.ptyAttached = false;
+}
+
/** 仅供 plugin.onBeforeClose 调用:真正销毁实例 + 释放 GPU/DOM 资源。 */
export function disposeXterm(tabId: string): void {
const entry = pool.get(tabId);
diff --git a/apps/desktop/src/renderer/features/right-sidebar/store.ts b/apps/desktop/src/renderer/features/right-sidebar/store.ts
index 0414eb5e8a..514a745085 100644
--- a/apps/desktop/src/renderer/features/right-sidebar/store.ts
+++ b/apps/desktop/src/renderer/features/right-sidebar/store.ts
@@ -26,8 +26,12 @@ import { getTabKind } from './registry';
import { browserWebviewPool } from './lib/browserWebviewPool';
import { unmarkPopupSpawnedTab } from './lib/popupTabs';
import { closeNativePopupForTab } from './lib/nativePopupTabs';
+import { isTabHostedHere } from './lib/tabHosting';
+import { isSidebarTabWindow } from '@/lib/sidebarTabWindow';
+import { isTabPoppedOut } from '@/lib/sidebarTabWindowState';
import type { TabKindId, TabState } from './types';
import type { RsbWindowTabSnapshot } from '../../../shared/rightSidebarWindow';
+import type { SidebarTabReturnSnapshot } from '../../../shared/sidebarTabWindow';
const log = createLogger('rightSidebar.store');
@@ -56,6 +60,15 @@ const memoryOnlySessions = new Set<string>();
const pendingHandoffBuckets = new Map<string, TabBucket>();
const closeInterceptors = new Map<string, TabCloseInterceptor>();
const patchRevisions = new Map<string, number>();
+/**
+ * 正在关闭(乐观移除已生效、close IPC 在途)的 tabId。跨 renderer 刷新
+ * (refreshSessionFromDb)在这段窗口里仍能从 DB 读到该行,不能把它重新加回 cache。
+ */
+const closingTabIds = new Set<string>();
+/** 跨 renderer 变更广播的按会话合并计时器:弹出窗口里的 URL / title 连发不逐条重拉。 */
+const refreshTimers = new Map<string, ReturnType<typeof setTimeout>>();
+const REFRESH_DEBOUNCE_MS = 120;
+let tabsChangeSubscribed = false;
/**
* 进行中的 tab 创建(tabId → 该 tab 是否**落库成功**)。
*
@@ -514,6 +527,165 @@ export function importTabSnapshot(snapshot: RsbWindowTabSnapshot): void {
setBucket(snapshot.sessionId, bucket);
}
+/** 弹出窗口合并回侧边栏时交回的单页签内存态(仅不可持久化会话;其余返回 null)。 */
+export function getSingleTabSnapshot(
+ sessionId: string | null | undefined,
+ tabId: string,
+): SidebarTabReturnSnapshot | null {
+ if (!sessionId) return null;
+ const bucket = cache.get(sessionId);
+ if (!bucket?.hydrated || shouldPersist(sessionId)) return null;
+ const tab = bucket.tabs.find((t) => t.id === tabId);
+ if (!tab) return null;
+ return { sessionId, tab: { id: tab.id, kind: tab.kind, state: tab.state } };
+}
+
+/**
+ * 页签从弹出窗口回到侧边栏(不可持久化会话):用交回的内存态覆盖本 renderer 里
+ * 该页签的数据副本。页签在本 renderer 的桶里从未消失(弹出期间只是不投影),
+ * 所以只做替换;桶未加载时无处可放,记日志丢弃(重开会话即重建)。
+ */
+export function importReturnedTabState(snapshot: SidebarTabReturnSnapshot): void {
+ const bucket = cache.get(snapshot.sessionId);
+ if (!bucket?.hydrated) {
+ log.warn('returned tab state dropped: session bucket not hydrated here', {
+ sessionId: snapshot.sessionId,
+ tabId: snapshot.tab.id,
+ });
+ return;
+ }
+ const idx = bucket.tabs.findIndex((t) => t.id === snapshot.tab.id);
+ if (idx < 0) return;
+ const tabs = [...bucket.tabs];
+ tabs[idx] = { ...tabs[idx], kind: snapshot.tab.kind as TabKindId, state: snapshot.tab.state };
+ setBucket(snapshot.sessionId, { tabs });
+}
+
+function tabsEqual(a: readonly TabState[], b: readonly TabState[]): boolean {
+ if (a.length !== b.length) return false;
+ for (let i = 0; i < a.length; i += 1) {
+ if (a[i] === b[i]) continue;
+ if (a[i].id !== b[i].id || a[i].kind !== b[i].kind) return false;
+ if (JSON.stringify(a[i].state) !== JSON.stringify(b[i].state)) return false;
+ }
+ return true;
+}
+
+/**
+ * 跨 renderer 刷新:另一个 renderer(弹出的单页签窗口 ↔ 主窗侧边栏)改动了该会话
+ * 的页签持久化数据后,按 SQLite 合并本地桶。合并规则(唯一判据 isTabHostedHere):
+ * - 本 renderer **承载**的页签以本地为准(乐观更新与在途写不被对方的旧快照覆盖);
+ * - 非承载页签以 DB 为准:对方新增的加进来、对方关掉的拿掉、状态取 DB;
+ * - `forceTabIds` 里的页签无条件取 DB(页签刚从弹出窗口交回,状态镜像可能已把
+ * 它标回「本地承载」,但本地副本是弹出前的旧值);
+ * - 本地有、DB 没有的页签:创建还在途的保留,其余视为已被对方(或会话删除)关掉,
+ * 承载方顺带释放它的资源;正在关闭的页签不回加;
+ * - activeTabId 以本地为准,只有对方**新建并激活**的、且由本 renderer 承载的
+ * 页签才接管激活位(弹出的文件浏览器里「在浏览器打开」→ 侧边栏新页签直接可见)。
+ * 本 renderer 没加载过该会话时无需合并(下次 ensureHydrated 自然读到最新)。
+ */
+export async function refreshSessionFromDb(
+ sessionId: string,
+ opts: { forceTabIds?: readonly string[] } = {},
+): Promise<void> {
+ const ipc = ipcApi();
+ if (!ipc || !shouldPersist(sessionId)) return;
+ const before = cache.get(sessionId);
+ if (!before?.hydrated) return;
+ const generation = cacheGeneration;
+ let result: RightSidebarTabsListResult;
+ try {
+ result = (await ipc.list({ sessionId })) as RightSidebarTabsListResult;
+ } catch (err) {
+ log.warn('refreshSessionFromDb list failed', { sessionId, err });
+ return;
+ }
+ if (generation !== cacheGeneration) return;
+ const current = cache.get(sessionId);
+ if (!current?.hydrated) return;
+ if (result.persistable === false) {
+ markMemoryOnlySession(sessionId);
+ return;
+ }
+ const force = new Set(opts.forceTabIds ?? []);
+ const keepLocal = (tabId: string) => !force.has(tabId) && isTabHostedHere(tabId);
+ const localById = new Map(current.tabs.map((tab) => [tab.id, tab]));
+ const dbTabs: TabState[] = result.tabs.map((row) => ({
+ id: row.id,
+ kind: row.kind as TabKindId,
+ state: sanitizeHydratedTabState(row.kind, row.state),
+ }));
+ const dbIds = new Set(dbTabs.map((tab) => tab.id));
+ const merged: TabState[] = [];
+ const newlyAdded = new Set<string>();
+ for (const dbTab of dbTabs) {
+ const local = localById.get(dbTab.id);
+ if (local && keepLocal(dbTab.id)) {
+ merged.push(local);
+ continue;
+ }
+ if (!local) {
+ if (closingTabIds.has(dbTab.id)) continue;
+ newlyAdded.add(dbTab.id);
+ }
+ merged.push(dbTab);
+ }
+ current.tabs.forEach((local, index) => {
+ if (dbIds.has(local.id)) return;
+ if (pendingTabCreates.has(local.id)) {
+ merged.splice(Math.min(index, merged.length), 0, local);
+ return;
+ }
+ if (closingTabIds.has(local.id)) return;
+ if (keepLocal(local.id)) forgetClosedTab(sessionId, local.id, local.kind);
+ });
+ let activeTabId = current.activeTabId;
+ if (
+ result.activeTabId &&
+ result.activeTabId !== activeTabId &&
+ newlyAdded.has(result.activeTabId) &&
+ isTabHostedHere(result.activeTabId)
+ ) {
+ activeTabId = result.activeTabId;
+ }
+ if (activeTabId !== null && !merged.some((tab) => tab.id === activeTabId)) {
+ activeTabId = merged[0]?.id ?? null;
+ }
+ if (activeTabId === current.activeTabId && tabsEqual(current.tabs, merged)) return;
+ setBucket(sessionId, { tabs: merged, activeTabId });
+}
+
+function scheduleRefreshFromDb(sessionId: string): void {
+ const existing = refreshTimers.get(sessionId);
+ if (existing) clearTimeout(existing);
+ refreshTimers.set(
+ sessionId,
+ setTimeout(() => {
+ refreshTimers.delete(sessionId);
+ void refreshSessionFromDb(sessionId).catch((err) => {
+ log.warn('refreshSessionFromDb failed', { sessionId, err });
+ });
+ }, REFRESH_DEBOUNCE_MS),
+ );
+}
+
+/** 惰性订阅 main 的页签变更广播(整个 renderer 只订一次;无桥环境静默)。 */
+function ensureTabsChangeSubscription(): void {
+ if (tabsChangeSubscribed) return;
+ const ipc = ipcApi();
+ if (!ipc?.onChanged) return;
+ tabsChangeSubscribed = true;
+ try {
+ ipc.onChanged(({ sessionId }) => {
+ if (typeof sessionId !== 'string' || !sessionId) return;
+ scheduleRefreshFromDb(sessionId);
+ });
+ } catch (err) {
+ tabsChangeSubscribed = false;
+ log.warn('subscribe right sidebar tabs change failed', { err });
+ }
+}
+
/**
* 宿主切换时清掉旧 renderer cache,并同步恢复 main 已转发到本 renderer 的快照。
*
@@ -545,6 +717,7 @@ export function findSessionIdByTabId(tabId: string): string | null {
/** 首次访问 sessionId 触发 IPC list 拉取;后续命中 cache 即 noop。dedupe 并发请求。 */
export async function ensureHydrated(sessionId: string): Promise<void> {
if (!sessionId) return;
+ ensureTabsChangeSubscription();
const current = cache.get(sessionId);
if (current?.hydrated) return;
const pending = pendingHandoffBuckets.get(sessionId);
@@ -812,6 +985,14 @@ function forgetClosedTab(sessionId: string, tabId: string, kind: TabKindId): voi
if (kind === 'web-browser') browserWebviewPool.release(tabId);
unmarkPopupSpawnedTab(tabId);
closeNativePopupForTab(tabId);
+ // 被弹出到独立窗口的页签在侧边栏里被关掉(agent close / 关闭全部 / 会话删除):
+ // 它的窗口没有内容可交回,直接销毁。弹出窗口自己承载的页签关闭时由
+ // SidebarTabWindowLayout 感知 bucket 变化后关窗,不走这里。
+ if (!isSidebarTabWindow() && isTabPoppedOut(tabId)) {
+ void window.electronAPI?.sidebarTabWindow?.closeForTab(tabId).catch((err) => {
+ log.warn('close sidebar tab window for closed tab failed', { tabId, err });
+ });
+ }
}
/**
@@ -872,6 +1053,7 @@ export async function closeTab(
}
}
+ closingTabIds.add(tabId);
const mutation = enqueueCloseMutation(sessionId, async () => {
// 队列内重取快照:排在前面的关闭可能已经动过这个 bucket(甚至已经关掉了本
// tab)。用旧快照算 nextTabs / 回滚基线正是并发出错的根源。
@@ -1007,6 +1189,8 @@ export async function closeTab(
}
throw err;
}
+ }).finally(() => {
+ closingTabIds.delete(tabId);
});
return mutation;
}
@@ -1023,6 +1207,12 @@ export async function closeAllTabs(sessionId: string): Promise<void> {
export async function setActiveTab(sessionId: string, tabId: string | null): Promise<void> {
const prev = getBucket(sessionId);
if (tabId === prev.activeTabId) return;
+ // 目标页签活在弹出的独立窗口里:侧边栏没有它的 body 可切,「激活它」= 把那扇
+ // 窗口叫到前台(用户点单例入口 / agent focus 都走这里)。
+ if (tabId !== null && !isSidebarTabWindow() && isTabPoppedOut(tabId)) {
+ await window.electronAPI?.sidebarTabWindow?.focus(tabId);
+ return;
+ }
// closeTab 已把关闭中的 tab 从 bucket 乐观移除:若此时用户点击该 tab(或
// 并发命令调 setActiveTab),activeTabId 会指向 tabs 里不存在的 id —— sidebar
// 无法渲染对应 body;close 落库后 DB 里也没有 active row。提前守门,拒绝激活
@@ -1149,6 +1339,10 @@ export function _resetStore(): void {
closeInterceptors.clear();
pendingTabCreates.clear();
closeMutationQueues.clear();
+ closingTabIds.clear();
+ for (const timer of refreshTimers.values()) clearTimeout(timer);
+ refreshTimers.clear();
+ tabsChangeSubscribed = false;
resetStateWriteQueue();
listeners.clear();
}
diff --git a/apps/desktop/src/renderer/features/right-sidebar/tabAvailability.ts b/apps/desktop/src/renderer/features/right-sidebar/tabAvailability.ts
index 1987c0c21d..cceb8e3677 100644
--- a/apps/desktop/src/renderer/features/right-sidebar/tabAvailability.ts
+++ b/apps/desktop/src/renderer/features/right-sidebar/tabAvailability.ts
@@ -6,6 +6,11 @@ import type { TabState } from './types';
export interface RightSidebarTabAvailability {
installedGhosts: readonly InstalledGhost[];
subagentsAvailable: boolean;
+ /**
+ * 已弹出到独立窗口的页签:数据仍在桶里,但本 Shell 不投影、不挂 body,其
+ * 窗口关闭后再回到投影。缺省 = 没有弹出。
+ */
+ hiddenTabIds?: ReadonlySet<string>;
}
function retiredTab(
@@ -30,6 +35,7 @@ function retiredTab(
function isUnavailableTab(tab: TabState, availability: RightSidebarTabAvailability): boolean {
return (
+ availability.hiddenTabIds?.has(tab.id) === true ||
(!CINDY_MAKE_ENABLED && tab.kind === 'cindy-make') ||
retiredTab(tab, availability) === null ||
(tab.kind === 'subagents' && !availability.subagentsAvailable)
diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.json
index 767d7b96f5..9688574c58 100644
--- a/apps/desktop/src/renderer/i18n/locales/en/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json
@@ -8032,6 +8032,12 @@
"mergeBack": "Merge back to main window",
"followPlaceholder": "The sidebar follows the main window's current session"
},
+ "tabWindow": {
+ "title": "Sidebar tab",
+ "mergeBack": "Merge back into the sidebar",
+ "loading": "Loading…",
+ "closed": "This tab has been closed"
+ },
"emptyTitle": "Reserved area",
"emptyDesc": "Right sidebar content will be added in future iterations.",
"tabs": {
@@ -8060,12 +8066,13 @@
"maximizeAria": "Maximize sidebar",
"restoreAria": "Restore sidebar",
"closeAria": "Close sidebar",
- "detachAria": "Open sidebar in a new window"
+ "detachAria": "Open the current tab in a new window"
},
"contextMenu": {
"close": "Close",
"closeOthers": "Close others",
- "closeAll": "Close all"
+ "closeAll": "Close all",
+ "openInWindow": "Open in a new window"
},
"empty": {
"eyebrow": "Right Sidebar",
diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.json
index 5150a9f4a9..80f2ca4c49 100644
--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json
@@ -8000,6 +8000,12 @@
"mergeBack": "メインウィンドウに戻す",
"followPlaceholder": "サイドバーはメインウィンドウの現在のセッションに追従します"
},
+ "tabWindow": {
+ "title": "サイドバーのタブ",
+ "mergeBack": "サイドバーに戻す",
+ "loading": "読み込み中…",
+ "closed": "このタブは閉じられました"
+ },
"emptyTitle": "準備中の領域",
"emptyDesc": "右サイドバーのコンテンツは今後のアップデートで追加されます。",
"tabs": {
@@ -8028,12 +8034,13 @@
"maximizeAria": "サイドバーを最大化",
"restoreAria": "最大化を解除",
"closeAria": "サイドバーを閉じる",
- "detachAria": "サイドバーを新しいウィンドウで開く"
+ "detachAria": "現在のタブを新しいウィンドウで開く"
},
"contextMenu": {
"close": "閉じる",
"closeOthers": "他のタブを閉じる",
- "closeAll": "すべて閉じる"
+ "closeAll": "すべて閉じる",
+ "openInWindow": "新しいウィンドウで開く"
},
"empty": {
"eyebrow": "右サイドバー",
diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.json
index bb36b0a8f9..6081d22bae 100644
--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json
@@ -8000,6 +8000,12 @@
"mergeBack": "메인 창으로 되돌리기",
"followPlaceholder": "사이드바는 메인 창의 현재 세션을 따라갑니다"
},
+ "tabWindow": {
+ "title": "사이드바 탭",
+ "mergeBack": "사이드바로 되돌리기",
+ "loading": "불러오는 중…",
+ "closed": "이 탭은 닫혔습니다"
+ },
"emptyTitle": "준비 중인 영역",
"emptyDesc": "오른쪽 사이드바 콘텐츠는 향후 업데이트에서 추가됩니다.",
"tabs": {
@@ -8028,12 +8034,13 @@
"maximizeAria": "사이드바 최대화",
"restoreAria": "최대화 해제",
"closeAria": "사이드바 닫기",
- "detachAria": "사이드바를 새 창에서 열기"
+ "detachAria": "현재 탭을 새 창에서 열기"
},
"contextMenu": {
"close": "닫기",
"closeOthers": "다른 탭 닫기",
- "closeAll": "모두 닫기"
+ "closeAll": "모두 닫기",
+ "openInWindow": "새 창에서 열기"
},
"empty": {
"eyebrow": "오른쪽 사이드바",
diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
index c3d2eea399..c49c2e57d2 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
@@ -8000,6 +8000,12 @@
"mergeBack": "合并回主窗口",
"followPlaceholder": "侧边栏跟随主窗口的当前任务"
},
+ "tabWindow": {
+ "title": "侧边栏标签",
+ "mergeBack": "合并回侧边栏",
+ "loading": "正在加载…",
+ "closed": "该标签已关闭"
+ },
"emptyTitle": "预留区域",
"emptyDesc": "右侧边栏内容将在后续迭代加入",
"tabs": {
@@ -8028,12 +8034,13 @@
"maximizeAria": "最大化侧栏",
"restoreAria": "退出最大化",
"closeAria": "关闭侧栏",
- "detachAria": "在新窗口中打开侧边栏"
+ "detachAria": "在独立窗口中打开当前标签"
},
"contextMenu": {
"close": "关闭",
"closeOthers": "关闭其他",
- "closeAll": "关闭所有"
+ "closeAll": "关闭所有",
+ "openInWindow": "在独立窗口中打开"
},
"empty": {
"eyebrow": "右侧栏",
diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
index 176d7f2ab1..5c3753cb97 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
@@ -8000,6 +8000,12 @@
"mergeBack": "合併回主視窗",
"followPlaceholder": "側邊欄跟隨主視窗的當前任務"
},
+ "tabWindow": {
+ "title": "側邊欄標籤",
+ "mergeBack": "合併回側邊欄",
+ "loading": "正在載入…",
+ "closed": "該標籤已關閉"
+ },
"emptyTitle": "預留區域",
"emptyDesc": "右側邊欄內容將在後續迭代加入",
"tabs": {
@@ -8028,12 +8034,13 @@
"maximizeAria": "最大化側欄",
"restoreAria": "退出最大化",
"closeAria": "關閉側欄",
- "detachAria": "在新視窗中開啟側邊欄"
+ "detachAria": "在獨立視窗中開啟目前標籤"
},
"contextMenu": {
"close": "關閉",
"closeOthers": "關閉其他",
- "closeAll": "關閉所有"
+ "closeAll": "關閉所有",
+ "openInWindow": "在獨立視窗中開啟"
},
"empty": {
"eyebrow": "右側欄",
diff --git a/apps/desktop/src/renderer/lib/sidebarTabWindow.ts b/apps/desktop/src/renderer/lib/sidebarTabWindow.ts
new file mode 100644
index 0000000000..4dc9568432
--- /dev/null
+++ b/apps/desktop/src/renderer/lib/sidebarTabWindow.ts
@@ -0,0 +1,17 @@
+/**
+ * sidebarTabWindow —— 判断当前 renderer 是否运行在「右侧栏单页签独立窗口」里。
+ *
+ * 弹出窗口由 main/sidebar-tab-window/window.ts 用启动参数
+ * `?sidebarWindow=1&sidebarTabWindow=1` 打开:`sidebarWindow=1` 让它沿用整栏子窗口
+ * 的全部「我不是主窗」语义(isSidebarWindow:登录 / 环境检查 / 不可导航主路由等),
+ * `sidebarTabWindow=1` 再把 renderer 入口分流到 SidebarTabWindowLayout(只挂一个页签)。
+ *
+ * 与 sidebarWindow.ts 同款:单次读取启动 URL,值在窗口生命周期内不变。
+ */
+export function isSidebarTabWindow(): boolean {
+ try {
+ return new URLSearchParams(window.location.search).get('sidebarTabWindow') === '1';
+ } catch {
+ return false;
+ }
+}
diff --git a/apps/desktop/src/renderer/lib/sidebarTabWindowState.ts b/apps/desktop/src/renderer/lib/sidebarTabWindowState.ts
new file mode 100644
index 0000000000..f104deb412
--- /dev/null
+++ b/apps/desktop/src/renderer/lib/sidebarTabWindowState.ts
@@ -0,0 +1,91 @@
+/**
+ * sidebarTabWindowState —— 右侧栏单页签独立窗口状态的 renderer 端镜像。
+ *
+ * Source of truth 在 main(sidebar-tab-window/controller.ts):tabId → { sessionId, open },
+ * 经 `maker:sidebar-tab-window:state-changed` 广播到所有窗口。这里只做内存镜像 +
+ * useSyncExternalStore 订阅;不落盘,客户端重启后所有页签回到主窗。
+ *
+ * 消费方:RightSidebarShell(主窗 / 副窗侧栏把已弹出的页签从投影里隐藏)、
+ * store(切到被弹出页签 = 聚焦其窗口;关掉被弹出页签 = 销毁其窗口)。
+ * 弹出窗口自身不消费(它只认自己的指派)。
+ *
+ * 首帧走异步拉取而非 sendSync:弹出状态不跨重启,冷启动时镜像必然为空,不存在
+ * 「先画出已弹出页签再消失」的跳变;运行期的变化全部由广播同步驱动。
+ */
+
+import { useSyncExternalStore } from 'react';
+
+import type { SidebarTabWindowsState } from '../../shared/sidebarTabWindow';
+
+const EMPTY_STATE: SidebarTabWindowsState = Object.freeze({}) as SidebarTabWindowsState;
+
+let state: SidebarTabWindowsState = EMPTY_STATE;
+const subscribers = new Set<() => void>();
+let wired = false;
+let bootstrapPromise: Promise<void> | null = null;
+
+function setState(next: SidebarTabWindowsState): void {
+ state = next ?? EMPTY_STATE;
+ subscribers.forEach((cb) => cb());
+}
+
+/** 惰性绑定 main 广播(整个 renderer 只绑一次,fan-out 在 preload 层)并拉一次全量。 */
+function ensureWired(): void {
+ if (wired) return;
+ wired = true;
+ const api = typeof window !== 'undefined' ? window.electronAPI?.sidebarTabWindow : undefined;
+ if (!api) return;
+ // 无桥环境(jsdom 单测 / stub 不全)视同"没有任何弹出",不是错误。
+ try {
+ if (typeof api.onStateChanged === 'function') api.onStateChanged((next) => setState(next));
+ } catch {
+ // ignore
+ }
+ if (!bootstrapPromise && typeof api.getState === 'function') {
+ try {
+ bootstrapPromise = api
+ .getState()
+ .then((next) => setState(next))
+ .catch(() => undefined);
+ } catch {
+ bootstrapPromise = null;
+ }
+ }
+}
+
+export function getSidebarTabWindowsState(): SidebarTabWindowsState {
+ ensureWired();
+ return state;
+}
+
+/** 该页签当前是否活在弹出窗口里(非 hook,store 等纯函数路径用)。 */
+export function isTabPoppedOut(tabId: string): boolean {
+ return getSidebarTabWindowsState()[tabId] !== undefined;
+}
+
+function subscribe(cb: () => void): () => void {
+ ensureWired();
+ subscribers.add(cb);
+ return () => {
+ subscribers.delete(cb);
+ };
+}
+
+/** React hook:订阅全量镜像(引用变化 = 有广播)。 */
+export function useSidebarTabWindowsState(): SidebarTabWindowsState {
+ return useSyncExternalStore(subscribe, getSidebarTabWindowsState);
+}
+
+/** 仅测试用。 */
+export function __setSidebarTabWindowsStateForTest(next: SidebarTabWindowsState): void {
+ wired = true;
+ setState(next);
+}
+
+/** 仅测试用。 */
+export function __resetSidebarTabWindowsStateForTest(): void {
+ state = EMPTY_STATE;
+ subscribers.clear();
+ wired = false;
+ bootstrapPromise = null;
+}
diff --git a/apps/desktop/src/renderer/sidebar-window-entry.tsx b/apps/desktop/src/renderer/sidebar-window-entry.tsx
index ddacc8db58..813900208f 100644
--- a/apps/desktop/src/renderer/sidebar-window-entry.tsx
+++ b/apps/desktop/src/renderer/sidebar-window-entry.tsx
@@ -5,7 +5,8 @@
* 直接渲染 SidebarWindowLayout,不经过 main-entry.tsx 的完整 App 链
* (完整 App 包含 maker-ipc 会话、登录、设置、语音等上千行启动代码)。
*
- * 由 index.tsx 的 ?sidebarWindow=1 分发进入。
+ * 由 index.tsx 的 ?sidebarWindow=1 分发进入;再按 ?sidebarTabWindow=1 分流:
+ * 整栏子窗口挂 SidebarWindowLayout,单页签独立窗口挂 SidebarTabWindowLayout。
*/
import { createRoot } from 'react-dom/client';
@@ -20,6 +21,8 @@ import './styles/globals.css';
import { TopLevelErrorBoundary } from './components/error/TopLevelErrorBoundary';
import { SidebarWindowLayout } from './components/layout/SidebarWindowLayout';
+import { SidebarTabWindowLayout } from './components/layout/SidebarTabWindowLayout';
+import { isSidebarTabWindow } from './lib/sidebarTabWindow';
import { AuthProvider } from './contexts/AuthContext';
import { ConfirmDialogProvider } from './components/ui/confirm-dialog-provider';
import { applyFontSettings, getInitialFontSettings } from './hooks/useFontSettings';
@@ -46,7 +49,7 @@ createRoot(rootElement).render(
<ConfirmDialogProvider>
<AuthProvider enableSessionExpiredPrompt={false}>
<WallpaperSettingsProvider>
- <SidebarWindowLayout />
+ {isSidebarTabWindow() ? <SidebarTabWindowLayout /> : <SidebarWindowLayout />}
</WallpaperSettingsProvider>
</AuthProvider>
</ConfirmDialogProvider>
diff --git a/apps/desktop/src/renderer/vite-env.d.ts b/apps/desktop/src/renderer/vite-env.d.ts
index d9f25f6978..27bf314d02 100644
--- a/apps/desktop/src/renderer/vite-env.d.ts
+++ b/apps/desktop/src/renderer/vite-env.d.ts
@@ -2067,6 +2067,42 @@ interface ElectronAPI {
resolveCloseRequest: (approved: boolean) => Promise<void>;
};
+ /**
+ * 右侧栏单页签独立窗口(每个弹出的页签一扇窗;状态机在 main)。
+ * 主窗用 open / focus / closeForTab / onStateChanged / onTabReturned;
+ * 弹出窗口自身(sidebarWindowPreload)另有 getAssignment / 握手 / mergeBack 等。
+ */
+ sidebarTabWindow: {
+ getState: () => Promise<import('../shared/sidebarTabWindow').SidebarTabWindowsState>;
+ open?: (
+ request: import('../shared/sidebarTabWindow').SidebarTabWindowOpenRequest,
+ ) => Promise<void>;
+ focus: (tabId: string) => Promise<void>;
+ closeForTab: (tabId: string) => Promise<void>;
+ onStateChanged: (
+ cb: (state: import('../shared/sidebarTabWindow').SidebarTabWindowsState) => void,
+ ) => () => void;
+ onTabReturned?: (
+ cb: (payload: import('../shared/sidebarTabWindow').SidebarTabReturnedPayload) => void,
+ ) => () => void;
+ getAssignment?: () => Promise<
+ import('../shared/sidebarTabWindow').SidebarTabWindowOpenRequest | null
+ >;
+ onAssigned?: (
+ cb: (assignment: import('../shared/sidebarTabWindow').SidebarTabWindowOpenRequest) => void,
+ ) => () => void;
+ rendererReady?: () => Promise<void>;
+ presentationReady?: () => Promise<void>;
+ mergeBack?: (
+ snapshot: import('../shared/sidebarTabWindow').SidebarTabReturnSnapshot | null,
+ ) => Promise<void>;
+ onMergeRequested?: (cb: () => void) => () => void;
+ onVisibilityChanged?: (cb: (payload: { visible: boolean }) => void) => () => void;
+ onLocaleChanged?: (
+ cb: (locale: import('../shared/locale').SupportedLocale) => void,
+ ) => () => void;
+ };
+
agentIsland: {
setVisibleSession: (sessionId: string | string[] | null) => Promise<{ ok: true }>;
setEnabled: (enabled: boolean) => Promise<{ ok: true }>;
@@ -5011,6 +5047,8 @@ interface ElectronAPI {
close: (input: { id: string }) => Promise<{ ok: true }>;
setActive: (input: { sessionId: string; id: string | null }) => Promise<{ ok: true }>;
reorder: (input: { sessionId: string; orderedIds: string[] }) => Promise<{ ok: true }>;
+ /** 其它 renderer(主窗 ↔ 弹出的单页签窗口)改动了某会话的页签持久化数据。 */
+ onChanged?: (cb: (payload: { sessionId: string }) => void) => () => void;
};
subagentRuns: {
list: (
diff --git a/apps/desktop/src/shared/sidebarTabWindow.ts b/apps/desktop/src/shared/sidebarTabWindow.ts
new file mode 100644
index 0000000000..a3fd9dca4e
--- /dev/null
+++ b/apps/desktop/src/shared/sidebarTabWindow.ts
@@ -0,0 +1,84 @@
+/**
+ * 右侧栏「单个页签独立窗口」(sidebar tab window)的跨进程共享类型。
+ *
+ * 与 shared/rightSidebarWindow.ts(整栏子窗口)的差异:按 **tabId 多实例**。
+ * 用户把正在看的页签弹出到自己的窗口,主窗口的侧边栏继续存在并显示其余页签;
+ * 弹出窗口关闭 = 页签合并回侧边栏。三方共用:main(controller / IPC)、preload
+ * (桥接签名)、renderer(主窗镜像 store + 弹出窗口根组件)。只放纯类型与
+ * channel 常量,不放运行时代码。
+ */
+
+import type { RsbWindowTabSnapshot } from './rightSidebarWindow.js';
+
+/** 弹出窗口承载页签所需的会话渲染上下文,由主窗在弹出瞬间一次性交付。 */
+export interface SidebarTabWindowContext {
+ workdir: string | null;
+ remoteHostId: string | null;
+ /** device-link 会话归属:null = 已确认本机,undefined = 尚未解析。 */
+ deviceLinkDeviceId?: string | null;
+ subagentsAvailable?: boolean;
+}
+
+/** main 指派给某扇弹出窗口的页签身份;窗口整个生命周期只承载这一个页签。 */
+export interface SidebarTabWindowAssignment {
+ tabId: string;
+ sessionId: string;
+ context: SidebarTabWindowContext;
+}
+
+/** 主窗 → main 的弹出请求。handoff 只对不可持久化会话(device-link 远程)非空。 */
+export interface SidebarTabWindowOpenRequest extends SidebarTabWindowAssignment {
+ handoff?: RsbWindowTabSnapshot | null;
+}
+
+/** 弹出窗口合并回侧边栏时交回的单页签内存态(仅不可持久化会话)。 */
+export interface SidebarTabReturnSnapshot {
+ sessionId: string;
+ tab: { id: string; kind: string; state: unknown };
+}
+
+/** 单扇弹出窗口的运行时状态;只在当前进程有效,不跨重启。 */
+export interface SidebarTabWindowEntryState {
+ sessionId: string;
+ /** 窗口是否已经展示(或正在等待首份内容后展示)。 */
+ open: boolean;
+}
+
+/** 全量状态:tabId → 窗口状态。没有条目 = 该页签没有弹出。 */
+export type SidebarTabWindowsState = Record<string, SidebarTabWindowEntryState>;
+
+/** main → 主窗:页签离开弹出窗口,回到侧边栏(合并 / 窗口崩溃)。 */
+export interface SidebarTabReturnedPayload {
+ sessionId: string;
+ tabId: string;
+ /** 不可持久化会话交回的内存态;可持久化会话为 null,主窗按 SQLite 刷新。 */
+ snapshot: SidebarTabReturnSnapshot | null;
+ reason: 'merge' | 'crash';
+}
+
+/** main → 所有窗口:某会话的页签持久化数据被其它 renderer 改动。 */
+export interface RightSidebarTabsChangedPayload {
+ sessionId: string;
+}
+
+// ── IPC channel 常量 ──────────────────────────────────────────────────
+/** renderer → main(invoke):弹出窗口壳已挂载。 */
+export const SIDEBAR_TAB_WINDOW_RENDERER_READY_CHANNEL = 'sidebar-tab-window:renderer-ready';
+/** renderer → main(invoke):被指派页签的首份内容已提交。 */
+export const SIDEBAR_TAB_WINDOW_PRESENTATION_READY_CHANNEL =
+ 'sidebar-tab-window:presentation-ready';
+/** renderer → main(invoke):读取本窗口的指派(重载 / 预热窗口晚于指派挂载时用)。 */
+export const SIDEBAR_TAB_WINDOW_GET_ASSIGNMENT_CHANNEL = 'sidebar-tab-window:get-assignment';
+/** renderer → main(invoke):把页签合并回侧边栏并关闭本窗口。 */
+export const SIDEBAR_TAB_WINDOW_MERGE_BACK_CHANNEL = 'sidebar-tab-window:merge-back';
+/** main → 弹出窗口(send):指派页签。 */
+export const SIDEBAR_TAB_WINDOW_ASSIGNED_CHANNEL = 'sidebar-tab-window:assigned';
+/** main → 弹出窗口(send):用户经原生入口关窗,renderer 需带快照调用 merge-back。 */
+export const SIDEBAR_TAB_WINDOW_MERGE_REQUESTED_CHANNEL = 'sidebar-tab-window:merge-requested';
+/** main → 弹出窗口(send):显示 / 隐藏切换。 */
+export const SIDEBAR_TAB_WINDOW_VISIBILITY_CHANGED_CHANNEL =
+ 'sidebar-tab-window:visibility-changed';
+export const SIDEBAR_TAB_WINDOW_LOCALE_CHANGED_CHANNEL = 'sidebar-tab-window:locale-changed';
+
+/** 原生关窗后等待 renderer 交回快照的上限;超时按无快照合并,窗口不会卡住不关。 */
+export const SIDEBAR_TAB_WINDOW_MERGE_GRACE_MS = 1_500;
diff --git a/docs/design-rules/DESIGN.md b/docs/design-rules/DESIGN.md
index c966a992d5..6b0965e7b7 100644
--- a/docs/design-rules/DESIGN.md
+++ b/docs/design-rules/DESIGN.md
@@ -807,7 +807,7 @@ Cindy Desktop is an Electron app: layout responds to window resizing, not page b
### Desktop Window
-- Minimum window size: **800 × 600** for the main window and secondary session windows (enforced at the BrowserWindow level — `apps/desktop/src/main/bootstrap-electron.ts` / `secondary-windows.ts`). The detached right-sidebar window has its own smaller floor of **360 × 480** (`right-sidebar-window/window.ts`) — layouts hosted there must stay legible down to that width
+- Minimum window size: **800 × 600** for the main window and secondary session windows (enforced at the BrowserWindow level — `apps/desktop/src/main/bootstrap-electron.ts` / `secondary-windows.ts`). The detached right-sidebar window has its own smaller floor of **360 × 480** (`right-sidebar-window/window.ts`), and a popped-out single sidebar tab window floors at **360 × 420** (`sidebar-tab-window/window.ts`) — layouts hosted there must stay legible down to that width
- The sidebar is collapsible; region dividers and paddings hold as the window narrows, and content reflows fluidly
- Chat stream and composer reflow with the window; code blocks keep horizontal scroll instead of wrapping
- Ordinary control sizes and paddings follow their §4 component treatments at every window size. Registered shapes and their hit regions follow their owning component treatments and §5 Interaction constraints; the usage charts' dense date targets use the Equivalent route only under the conditions stated there. Window resizing does not waive the applicable target requirements or authorize changing a mark's registered geometry.
diff --git a/docs/design-rules/design-inventory.md b/docs/design-rules/design-inventory.md
index f8205ebf31..060ebd5cac 100644
--- a/docs/design-rules/design-inventory.md
+++ b/docs/design-rules/design-inventory.md
@@ -39,7 +39,7 @@
| `desktop.plugins.app-main` | desktop | 插件主视图 | hash `/apps/:ghostId`(GhostMainViewFeatureLayout) | GhostMainViewFeatureLayout, GhostMainViewHost | apps/desktop/src/renderer/features/plugin/GhostMainViewFeatureLayout.tsx, apps/desktop/src/renderer/features/plugin/GhostMainViewHost.tsx | 0 | 0 | 0 |
| `desktop.plugins.installed` | desktop | 已装插件 | hash `/plugins`(GhostPluginPage) | AddMarketplaceDialog, GhostPluginDetailView, GhostPluginPage, MarketPluginDetailView, MyPublishesSection, PluginManagementLayout, PluginScopePicker, UpdateAllDialog | apps/desktop/src/renderer/features/plugin/AddMarketplaceDialog.tsx, apps/desktop/src/renderer/features/plugin/GhostPluginDetailView.tsx, apps/desktop/src/renderer/features/plugin/GhostPluginPage.tsx, apps/desktop/src/renderer/features/plugin/MarketPluginDetailView.tsx, apps/desktop/src/renderer/features/plugin/MyPublishesSection.tsx, apps/desktop/src/renderer/features/plugin/PluginManagementLayout.tsx, apps/desktop/src/renderer/features/plugin/PluginScopePicker.tsx, apps/desktop/src/renderer/features/plugin/UpdateAllDialog.tsx, apps/desktop/src/renderer/features/plugin/plugin-motion.css | 27 | 0 | 48 |
| `desktop.settings` | desktop | 设置 | hash `/settings`(SettingsView;tab 含 general / personalization / providers / billing / usage / voice-input / im-bot / shortcuts / agent-island / import / remote-control / ghosts / builtin-tools / computer-use / help / about) | SettingsView | apps/desktop/src/renderer/components/settings/AboutSection.settings-search.ts, apps/desktop/src/renderer/components/settings/AboutSection.tsx, apps/desktop/src/renderer/components/settings/AccountDeletionSection.tsx, apps/desktop/src/renderer/components/settings/AddProviderWizard.tsx, apps/desktop/src/renderer/components/settings/AgentIslandSection.settings-search.ts, apps/desktop/src/renderer/components/settings/AgentIslandSection.tsx, apps/desktop/src/renderer/components/settings/AgentResourceSection.settings-search.ts, apps/desktop/src/renderer/components/settings/AgentResourceSection.tsx, apps/desktop/src/renderer/components/settings/AppearanceSection.settings-search.ts, apps/desktop/src/renderer/components/settings/AppearanceSection.tsx, apps/desktop/src/renderer/components/settings/AuxiliaryModelSection.tsx, apps/desktop/src/renderer/components/settings/AvatarCropEditor.tsx, apps/desktop/src/renderer/components/settings/BetaChannelCell.tsx, apps/desktop/src/renderer/components/settings/BillingSettings.settings-search.ts, apps/desktop/src/renderer/components/settings/BrowserBackendSubsection.tsx, apps/desktop/src/renderer/components/settings/BrowserRealProfileSubsection.tsx, apps/desktop/src/renderer/components/settings/BuiltinToolsSection.settings-search.ts, apps/desktop/src/renderer/components/settings/BuiltinToolsSection.tsx, apps/desktop/src/renderer/components/settings/ChatEmbeddingCell.tsx, apps/desktop/src/renderer/components/settings/ChipMetricsSection.tsx, apps/desktop/src/renderer/components/settings/CindyMakeSection.settings-search.ts, apps/desktop/src/renderer/components/settings/CindyMakeSection.tsx, apps/desktop/src/renderer/components/settings/CollaborationSection.settings-search.ts, apps/desktop/src/renderer/components/settings/CollaborationSection.tsx, apps/desktop/src/renderer/components/settings/CompactionSection.tsx, apps/desktop/src/renderer/components/settings/ComposerSendShortcutSection.tsx, apps/desktop/src/renderer/components/settings/ComputerPermissionGuideWindow.tsx, apps/desktop/src/renderer/components/settings/ComputerPermissionRow.tsx, apps/desktop/src/renderer/components/settings/ComputerUseSection.settings-search.ts, apps/desktop/src/renderer/components/settings/ComputerUseSection.tsx, apps/desktop/src/renderer/components/settings/CustomProviderRuntimeFillOverlay.tsx, apps/desktop/src/renderer/components/settings/DefaultOverrideControls.tsx, apps/desktop/src/renderer/components/settings/DialogueDirectorySection.tsx, apps/desktop/src/renderer/components/settings/DingTalkBotSection.tsx, apps/desktop/src/renderer/components/settings/DiscordBotSection.tsx, apps/desktop/src/renderer/components/settings/DownloadMeter.tsx, apps/desktop/src/renderer/components/settings/ExperimentalSection.tsx, apps/desktop/src/renderer/components/settings/FeishuBotNotificationSection.tsx, apps/desktop/src/renderer/components/settings/FeishuBotSection.tsx, apps/desktop/src/renderer/components/settings/FontFamilyPicker.tsx, apps/desktop/src/renderer/components/settings/GeneralSettings.settings-search.ts, apps/desktop/src/renderer/components/settings/GenericGamepadLayout.tsx, apps/desktop/src/renderer/components/settings/GitSafetySection.settings-search.ts, apps/desktop/src/renderer/components/settings/GitSafetySection.tsx, apps/desktop/src/renderer/components/settings/HarnessVersionMenuRow.tsx, apps/desktop/src/renderer/components/settings/HelpAssistantPanel.tsx, apps/desktop/src/renderer/components/settings/HelpSection.settings-search.ts, apps/desktop/src/renderer/components/settings/HelpSection.tsx, apps/desktop/src/renderer/components/settings/HelpThreadView.tsx, apps/desktop/src/renderer/components/settings/HookConnectionsSection.tsx, apps/desktop/src/renderer/components/settings/HookWorkspacePrefsEditor.tsx, apps/desktop/src/renderer/components/settings/ImBotSection.settings-search.ts, apps/desktop/src/renderer/components/settings/ImBotSection.tsx, apps/desktop/src/renderer/components/settings/ImChannelSettingsCard.tsx, apps/desktop/src/renderer/components/settings/ImDefaultSettingsSection.tsx, apps/desktop/src/renderer/components/settings/ImLifecycleAnnouncementSection.tsx, apps/desktop/src/renderer/components/settings/InputDeviceConnectionStatus.tsx, apps/desktop/src/renderer/components/settings/JoyConGamepadLayout.tsx, apps/desktop/src/renderer/components/settings/KeyboardShortcutsSection.settings-search.ts, apps/desktop/src/renderer/components/settings/KeyboardShortcutsSection.tsx, apps/desktop/src/renderer/components/settings/LanguageSection.tsx, apps/desktop/src/renderer/components/settings/LayoutResetControl.tsx, apps/desktop/src/renderer/components/settings/LinkOpenSection.tsx, apps/desktop/src/renderer/components/settings/LlamaCppCandidates.tsx, apps/desktop/src/renderer/components/settings/LlamaCppProviderDetail.tsx, apps/desktop/src/renderer/components/settings/LocalModelDownloadUI.tsx, apps/desktop/src/renderer/components/settings/LocalOllamaInstall.tsx, apps/desktop/src/renderer/components/settings/LocalPackagingTag.tsx, apps/desktop/src/renderer/components/settings/LogoutSection.tsx, apps/desktop/src/renderer/components/settings/LspBetaCell.tsx, apps/desktop/src/renderer/components/settings/McpServerDialog.tsx, apps/desktop/src/renderer/components/settings/McpServersSection.tsx, apps/desktop/src/renderer/components/settings/MemorySection.tsx, apps/desktop/src/renderer/components/settings/MessageNavRailCell.tsx, apps/desktop/src/renderer/components/settings/ModelAdvancedDrawer.tsx, apps/desktop/src/renderer/components/settings/ModelPriceOverrideDialog.tsx, apps/desktop/src/renderer/components/settings/MyDevicesPanel.tsx, apps/desktop/src/renderer/components/settings/NotificationSection.settings-search.ts, apps/desktop/src/renderer/components/settings/NotificationSection.tsx, apps/desktop/src/renderer/components/settings/OAuthDeviceCodeCard.tsx, apps/desktop/src/renderer/components/settings/OllamaProviderDetail.tsx, apps/desktop/src/renderer/components/settings/OwnRemoteProviders.tsx, apps/desktop/src/renderer/components/settings/PersonalizationDetails.settings-search.ts, apps/desktop/src/renderer/components/settings/PersonalizationSettings.settings-search.ts, apps/desktop/src/renderer/components/settings/PiKernelVersionRow.tsx, apps/desktop/src/renderer/components/settings/PiPackagesSection.tsx, apps/desktop/src/renderer/components/settings/PlayStationGamepadLayout.tsx, apps/desktop/src/renderer/components/settings/ProfileEditDialog.tsx, apps/desktop/src/renderer/components/settings/ProviderConnectionDialog.tsx, apps/desktop/src/renderer/components/settings/ProviderImportDialog.tsx, apps/desktop/src/renderer/components/settings/ProvidersSection.settings-search.ts, apps/desktop/src/renderer/components/settings/ProvidersSection.tsx, apps/desktop/src/renderer/components/settings/ReadOnlyProviderModels.tsx, apps/desktop/src/renderer/components/settings/RemoteControlSection.settings-search.ts, apps/desktop/src/renderer/components/settings/RemoteControlSection.tsx, apps/desktop/src/renderer/components/settings/RemoteDesktopPermissions.tsx, apps/desktop/src/renderer/components/settings/RemoteDesktopSetting.tsx, apps/desktop/src/renderer/components/settings/RemoteHostDetail.tsx, apps/desktop/src/renderer/components/settings/RemoteSection.tsx, apps/desktop/src/renderer/components/settings/SessionImportSection.settings-search.ts, apps/desktop/src/renderer/components/settings/SessionImportSection.tsx, apps/desktop/src/renderer/components/settings/SessionRuntimeFallbackCell.tsx, apps/desktop/src/renderer/components/settings/SessionShareImportWizard.tsx, apps/desktop/src/renderer/components/settings/SettingsCatalogPanel.settings-search.ts, apps/desktop/src/renderer/components/settings/SettingsCatalogPanel.tsx, apps/desktop/src/renderer/components/settings/SettingsSearchBox.tsx, apps/desktop/src/renderer/components/settings/SettingsSearchNavigation.ts, apps/desktop/src/renderer/components/settings/SettingsSidebarNav.tsx, apps/desktop/src/renderer/components/settings/SettingsTextInput.tsx, apps/desktop/src/renderer/components/settings/SettingsView.tsx, apps/desktop/src/renderer/components/settings/SharedTasks.settings-search.ts, apps/desktop/src/renderer/components/settings/SilentEncryptedRetryCell.tsx, apps/desktop/src/renderer/components/settings/SshKeySetupDialog.tsx, apps/desktop/src/renderer/components/settings/StorageManagementCard.settings-search.ts, apps/desktop/src/renderer/components/settings/StorageManagementCard.tsx, apps/desktop/src/renderer/components/settings/StreamFadeSection.tsx, apps/desktop/src/renderer/components/settings/SubagentModelSection.settings-search.ts, apps/desktop/src/renderer/components/settings/SubagentModelSection.tsx, apps/desktop/src/renderer/components/settings/SwitchProGamepadLayout.tsx, apps/desktop/src/renderer/components/settings/TelegramBehaviorSettings.tsx, apps/desktop/src/renderer/components/settings/TelegramBotSection.tsx, apps/desktop/src/renderer/components/settings/TelegramRemoteDevices.tsx, apps/desktop/src/renderer/components/settings/TerminalShellSection.tsx, apps/desktop/src/renderer/components/settings/TipsSection.settings-search.ts, apps/desktop/src/renderer/components/settings/TipsSection.tsx, apps/desktop/src/renderer/components/settings/UnifiedModelList.tsx, apps/desktop/src/renderer/components/settings/UserProfileCard.tsx, apps/desktop/src/renderer/components/settings/UserPromptSection.tsx, apps/desktop/src/renderer/components/settings/VisionBridgeSection.settings-search.ts, apps/desktop/src/renderer/components/settings/VisionBridgeSection.tsx, apps/desktop/src/renderer/components/settings/VoiceInputSection.settings-search.ts, apps/desktop/src/renderer/components/settings/VoiceInputSection.tsx, apps/desktop/src/renderer/components/settings/VoiceSpeakerEnrollmentDialog.tsx, apps/desktop/src/renderer/components/settings/VoiceSpeakerFilterCard.tsx, apps/desktop/src/renderer/components/settings/WallpaperSection.tsx, apps/desktop/src/renderer/components/settings/WechatBotSection.tsx, apps/desktop/src/renderer/components/settings/WecomBotSection.tsx, apps/desktop/src/renderer/components/settings/WindowBehaviorSection.settings-search.ts, apps/desktop/src/renderer/components/settings/WindowBehaviorSection.tsx, apps/desktop/src/renderer/components/settings/WorkLouderCodexKeyboardLayout.tsx, apps/desktop/src/renderer/components/settings/WorkLouderCodexKeycapGlyphs.tsx, apps/desktop/src/renderer/components/settings/WorkLouderCodexSettings.tsx, apps/desktop/src/renderer/components/settings/WorktreeRecycleCard.settings-search.ts, apps/desktop/src/renderer/components/settings/WorktreeRecycleCard.tsx, apps/desktop/src/renderer/components/settings/XUsageGuide.tsx, apps/desktop/src/renderer/components/settings/XboxGamepadLayout.tsx, apps/desktop/src/renderer/components/settings/XboxGamepadSettings.tsx, apps/desktop/src/renderer/components/settings/androidStatusPresentation.ts, apps/desktop/src/renderer/components/settings/avatarCropGeometry.ts, apps/desktop/src/renderer/components/settings/avatarCropImage.ts, apps/desktop/src/renderer/components/settings/billingVisibility.ts, apps/desktop/src/renderer/components/settings/browserOpenForLoginError.ts, apps/desktop/src/renderer/components/settings/cindyMakeVisibility.ts, apps/desktop/src/renderer/components/settings/computerPermissionFlow.ts, apps/desktop/src/renderer/components/settings/contacts/ContactDetailPane.tsx, apps/desktop/src/renderer/components/settings/contacts/ContactsImportDialog.tsx, apps/desktop/src/renderer/components/settings/contacts/ContactsListPane.tsx, apps/desktop/src/renderer/components/settings/contacts/ContactsManagerDialog.tsx, apps/desktop/src/renderer/components/settings/contacts/ContactsSection.tsx, apps/desktop/src/renderer/components/settings/contacts/startContactsAiSession.ts, apps/desktop/src/renderer/components/settings/dialogueDirectoryDisplay.ts, apps/desktop/src/renderer/components/settings/dualSenseSilhouette.ts, apps/desktop/src/renderer/components/settings/feishuBotPresentation.ts, apps/desktop/src/renderer/components/settings/fontFamilyValue.ts, apps/desktop/src/renderer/components/settings/gamepadLayoutPrimitives.tsx, apps/desktop/src/renderer/components/settings/gamepadSilhouetteGeom.ts, apps/desktop/src/renderer/components/settings/hookWorkspacePrefsLogic.ts, apps/desktop/src/renderer/components/settings/imBotVisibility.ts, apps/desktop/src/renderer/components/settings/imDefaultSettingsLogic.ts, apps/desktop/src/renderer/components/settings/joyConSilhouette.ts, apps/desktop/src/renderer/components/settings/modelManagementPresentation.ts, apps/desktop/src/renderer/components/settings/modelManagementState.ts, apps/desktop/src/renderer/components/settings/myDevicesModel.ts, apps/desktop/src/renderer/components/settings/providerAssetModule.ts, apps/desktop/src/renderer/components/settings/realProfilePermissionGuide.ts, apps/desktop/src/renderer/components/settings/settingsRowClasses.ts, apps/desktop/src/renderer/components/settings/settingsSearchCatalog.ts, apps/desktop/src/renderer/components/settings/settingsSearchTypes.ts, apps/desktop/src/renderer/components/settings/switchProSilhouette.ts, apps/desktop/src/renderer/components/settings/ultimateC1Silhouette.ts, apps/desktop/src/renderer/components/settings/usage/UsageBarsTooltip.tsx, apps/desktop/src/renderer/components/settings/usage/UsageBreakdownTables.tsx, apps/desktop/src/renderer/components/settings/usage/UsageDeviceSelect.tsx, apps/desktop/src/renderer/components/settings/usage/UsageFilterSelect.tsx, apps/desktop/src/renderer/components/settings/usage/UsageHistorySection.settings-search.ts, apps/desktop/src/renderer/components/settings/usage/UsageHistorySection.tsx, apps/desktop/src/renderer/components/settings/usage/UsageStatRow.tsx, apps/desktop/src/renderer/components/settings/usage/UsageTaskTable.tsx, apps/desktop/src/renderer/components/settings/usage/UsageTokenBars.tsx, apps/desktop/src/renderer/components/settings/usage/formatUsagePercent.ts, apps/desktop/src/renderer/components/settings/usage/usageCharts.css, apps/desktop/src/renderer/components/settings/usage/usageHistoryColors.ts, apps/desktop/src/renderer/components/settings/usage/usageHistoryStats.ts, apps/desktop/src/renderer/components/settings/usageVisibility.ts, apps/desktop/src/renderer/components/settings/useProviderSubscriptionCard.ts, apps/desktop/src/renderer/components/settings/useSettingsEscape.ts, apps/desktop/src/renderer/components/settings/useSettingsSectionTarget.ts, apps/desktop/src/renderer/components/settings/wizardRecommend.ts, apps/desktop/src/renderer/components/settings/workLouderCodexCommandCopy.ts, apps/desktop/src/renderer/components/settings/xboxSeriesSilhouette.ts, apps/desktop/src/renderer/styles/sortable.css | 136 | 95 | 542 |
-| `desktop.shell.main-layout` | desktop | 主窗口壳(标题栏 / 左右栏 / 内容区) | main BrowserWindow → renderer/index.tsx → main-entry.tsx → App → MainLayout (`#/` 受保护壳) | ChromeActions, DeviceSectionHeader, FeishuConflictDialogHost, GhostMediaLightboxHost, MainLayout, ProjectsSection, RightSidebar, RightSidebarShell, SessionShareImportWizard, Sidebar, UpdateNoticeDialog, WindowControls | apps/desktop/src/renderer/cindy-brain/GhostMediaLightboxHost.tsx, apps/desktop/src/renderer/components/UpdateNoticeDialog.tsx, apps/desktop/src/renderer/components/feishuBot/FeishuConflictDialog.tsx, apps/desktop/src/renderer/components/feishuBot/FeishuConflictDialogHost.tsx, apps/desktop/src/renderer/components/layout/AppBadgeAttentionSync.tsx, apps/desktop/src/renderer/components/layout/BrowserWebviewPool.tsx, apps/desktop/src/renderer/components/layout/ChromeActions.tsx, apps/desktop/src/renderer/components/layout/ContentHeader.tsx, apps/desktop/src/renderer/components/layout/CredentialStoreBanner.tsx, apps/desktop/src/renderer/components/layout/FadeSwitcher.tsx, apps/desktop/src/renderer/components/layout/GhostPanelWindowLayout.tsx, apps/desktop/src/renderer/components/layout/GlobalDropImportListener.tsx, apps/desktop/src/renderer/components/layout/MainEntryRedirect.tsx, apps/desktop/src/renderer/components/layout/MainLayout.tsx, apps/desktop/src/renderer/components/layout/RightSidebar.tsx, apps/desktop/src/renderer/components/layout/RightSidebarDetach.tsx, apps/desktop/src/renderer/components/layout/RightSidebarMaximize.tsx, apps/desktop/src/renderer/components/layout/RightSidebarToggle.tsx, apps/desktop/src/renderer/components/layout/SidebarWindowLayout.tsx, apps/desktop/src/renderer/components/layout/WallpaperVideo.tsx, apps/desktop/src/renderer/components/layout/chromeActionsGeometry.ts, apps/desktop/src/renderer/components/layout/chromeActionsLayout.ts, apps/desktop/src/renderer/components/layout/railChromeActions.ts, apps/desktop/src/renderer/components/layout/windowDrag.tsx, apps/desktop/src/renderer/components/settings/SessionShareImportWizard.tsx, apps/desktop/src/renderer/components/sidebar/AccountSwitcherDialog.tsx, apps/desktop/src/renderer/components/sidebar/AttentionDot.tsx, apps/desktop/src/renderer/components/sidebar/DatabaseSizeWarningBanner.tsx, apps/desktop/src/renderer/components/sidebar/GhostMainViewNavEntries.tsx, apps/desktop/src/renderer/components/sidebar/MobileDownloadDialog.tsx, apps/desktop/src/renderer/components/sidebar/NavigationCountBadge.tsx, apps/desktop/src/renderer/components/sidebar/Sidebar.tsx, apps/desktop/src/renderer/components/sidebar/SidebarIconButton.tsx, apps/desktop/src/renderer/components/sidebar/SidebarNavigationCustomize.tsx, apps/desktop/src/renderer/components/sidebar/SidebarTopNav.tsx, apps/desktop/src/renderer/components/sidebar/SortableList.tsx, apps/desktop/src/renderer/components/sidebar/UpdateBanner.tsx, apps/desktop/src/renderer/components/sidebar/UserInfoSection.tsx, apps/desktop/src/renderer/components/sidebar/VendorIcon.tsx, apps/desktop/src/renderer/components/sidebar/VendorReadinessBadge.tsx, apps/desktop/src/renderer/components/sidebar/WorktreeBadge.tsx, apps/desktop/src/renderer/components/sidebar/sidebarNavigationPrefs.ts, apps/desktop/src/renderer/components/sidebar/useHoverOpenMenu.ts, apps/desktop/src/renderer/components/title-bar/ChromeIconButton.tsx, apps/desktop/src/renderer/components/title-bar/MenuButton.tsx, apps/desktop/src/renderer/components/title-bar/WindowControls.tsx, apps/desktop/src/renderer/features/cc-agent/sidebar/DeviceSectionHeader.tsx, apps/desktop/src/renderer/features/cc-agent/sidebar/sections/ProjectsSection.tsx, apps/desktop/src/renderer/features/right-sidebar/AddTabDropdown.tsx, apps/desktop/src/renderer/features/right-sidebar/EmptyState.tsx, apps/desktop/src/renderer/features/right-sidebar/RightSidebarShell.tsx, apps/desktop/src/renderer/features/right-sidebar/TabBar.tsx, apps/desktop/src/renderer/features/right-sidebar/TabBodyErrorBoundary.tsx, apps/desktop/src/renderer/features/right-sidebar/hooks/useBrowserWebview.ts, apps/desktop/src/renderer/features/right-sidebar/hooks/useNativePopupSurface.ts, apps/desktop/src/renderer/features/right-sidebar/hooks/useRetainedBrowserTabHosts.ts, apps/desktop/src/renderer/features/right-sidebar/lib/browserPartition.ts, apps/desktop/src/renderer/features/right-sidebar/lib/browserWebviewPool.ts, apps/desktop/src/renderer/features/right-sidebar/lib/detachedSidebarRouting.ts, apps/desktop/src/renderer/features/right-sidebar/lib/executeSidebarCommand.ts, apps/desktop/src/renderer/features/right-sidebar/lib/lastTurnChangedFiles.ts, apps/desktop/src/renderer/features/right-sidebar/lib/mergeSidebarWindowBack.ts, apps/desktop/src/renderer/features/right-sidebar/lib/nativePopupTabs.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openBackgroundTasksTab.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openBotWorkbenchTab.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openInSidebarBrowser.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openInSidebarFileBrowser.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openRoutinesTab.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openSubagentsTab.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openTerminalShortcut.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openTurnReview.ts, apps/desktop/src/renderer/features/right-sidebar/lib/popupRouter.ts, apps/desktop/src/renderer/features/right-sidebar/lib/popupTabs.ts, apps/desktop/src/renderer/features/right-sidebar/lib/rsbBrowserBridge.ts, apps/desktop/src/renderer/features/right-sidebar/lib/sidebarCommands.ts, apps/desktop/src/renderer/features/right-sidebar/lib/sidebarHostSession.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/BackgroundTasksBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/WorkflowAgentStrip.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/WorkflowProgressTree.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/chatTaskFocusIntent.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/listSessionTasks.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/workflowProgressModel.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/bot-workbench/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/cindy-make/CindyMakeTabBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/cindy-make/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/file-browser/FileBrowserBody.css, apps/desktop/src/renderer/features/right-sidebar/plugins/file-browser/FileBrowserBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/file-browser/dropExternalFile.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/file-browser/fileTreeImagePreview.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/file-browser/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/file-browser/useSessionScopedTreeWidth.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/index.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/orca-workers/OrcaWorkersAttentionIcon.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/orca-workers/OrcaWorkersTabBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/orca-workers/actions.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/orca-workers/closeDecision.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/orca-workers/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/resource-usage/ResourceUsageBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/resource-usage/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/resource-usage/resource-usage.css, apps/desktop/src/renderer/features/right-sidebar/plugins/resource-usage/subscription.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/retired-feature/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/review/DiffViewer/ImageDiffPreview.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/review/DiffViewer/MarkdownDiffPreview.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/review/DiffViewer/PlainUnifiedDiff.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/review/DiffViewer/diffRows.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/DiffViewer/highlight.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/DiffViewer/inlineDiff.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/DiffViewer/useDiffHighlights.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/ReviewTabBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/review/diffExpansionPreference.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/fileTree.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/gitApplyCommand.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/review/markdownPreview.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/useLastTurnFilter.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/useReviewGitState.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/useReviewSource.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/routines/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/ConversationStream.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/DetailView.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/RunList.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/SubagentChrome.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/SubagentToolCard.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/SubagentsBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/subagentChangeFence.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/subagentConversation.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/subagentFormat.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/terminal/TerminalTabBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/terminal/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/terminal/lib/xtermPool.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/BrowserChrome.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/BrowserCommentPopover.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/BrowserTabBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/browserCommentEditorDraft.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/lib/parseOmnibox.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/useBrowserComment.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/useLocalHtmlAutoReload.ts, apps/desktop/src/renderer/features/right-sidebar/registry.ts, apps/desktop/src/renderer/features/right-sidebar/store.ts, apps/desktop/src/renderer/features/right-sidebar/tabAvailability.ts, apps/desktop/src/renderer/features/right-sidebar/types.ts, apps/desktop/src/renderer/layout/LayoutRoot.tsx, apps/desktop/src/renderer/layout/PanelDragController.tsx, apps/desktop/src/renderer/layout/PanelDragPrototype.tsx, apps/desktop/src/renderer/layout/collapsePrefs.ts, apps/desktop/src/renderer/layout/layoutDevTools.ts, apps/desktop/src/renderer/layout/panePlacement.tsx, apps/desktop/src/renderer/layout/paneWidths.tsx, apps/desktop/src/renderer/layout/panelMaximize.tsx, apps/desktop/src/renderer/styles/generated/tokens.css, apps/desktop/src/renderer/styles/globals.css | 143 | 46 | 196 |
+| `desktop.shell.main-layout` | desktop | 主窗口壳(标题栏 / 左右栏 / 内容区) | main BrowserWindow → renderer/index.tsx → main-entry.tsx → App → MainLayout (`#/` 受保护壳) | ChromeActions, DeviceSectionHeader, FeishuConflictDialogHost, GhostMediaLightboxHost, MainLayout, ProjectsSection, RightSidebar, RightSidebarShell, SessionShareImportWizard, Sidebar, UpdateNoticeDialog, WindowControls | apps/desktop/src/renderer/cindy-brain/GhostMediaLightboxHost.tsx, apps/desktop/src/renderer/components/UpdateNoticeDialog.tsx, apps/desktop/src/renderer/components/feishuBot/FeishuConflictDialog.tsx, apps/desktop/src/renderer/components/feishuBot/FeishuConflictDialogHost.tsx, apps/desktop/src/renderer/components/layout/AppBadgeAttentionSync.tsx, apps/desktop/src/renderer/components/layout/BrowserWebviewPool.tsx, apps/desktop/src/renderer/components/layout/ChromeActions.tsx, apps/desktop/src/renderer/components/layout/ContentHeader.tsx, apps/desktop/src/renderer/components/layout/CredentialStoreBanner.tsx, apps/desktop/src/renderer/components/layout/FadeSwitcher.tsx, apps/desktop/src/renderer/components/layout/GhostPanelWindowLayout.tsx, apps/desktop/src/renderer/components/layout/GlobalDropImportListener.tsx, apps/desktop/src/renderer/components/layout/MainEntryRedirect.tsx, apps/desktop/src/renderer/components/layout/MainLayout.tsx, apps/desktop/src/renderer/components/layout/RightSidebar.tsx, apps/desktop/src/renderer/components/layout/RightSidebarDetach.tsx, apps/desktop/src/renderer/components/layout/RightSidebarMaximize.tsx, apps/desktop/src/renderer/components/layout/RightSidebarToggle.tsx, apps/desktop/src/renderer/components/layout/SidebarTabWindowLayout.tsx, apps/desktop/src/renderer/components/layout/SidebarWindowLayout.tsx, apps/desktop/src/renderer/components/layout/WallpaperVideo.tsx, apps/desktop/src/renderer/components/layout/chromeActionsGeometry.ts, apps/desktop/src/renderer/components/layout/chromeActionsLayout.ts, apps/desktop/src/renderer/components/layout/railChromeActions.ts, apps/desktop/src/renderer/components/layout/windowDrag.tsx, apps/desktop/src/renderer/components/settings/SessionShareImportWizard.tsx, apps/desktop/src/renderer/components/sidebar/AccountSwitcherDialog.tsx, apps/desktop/src/renderer/components/sidebar/AttentionDot.tsx, apps/desktop/src/renderer/components/sidebar/DatabaseSizeWarningBanner.tsx, apps/desktop/src/renderer/components/sidebar/GhostMainViewNavEntries.tsx, apps/desktop/src/renderer/components/sidebar/MobileDownloadDialog.tsx, apps/desktop/src/renderer/components/sidebar/NavigationCountBadge.tsx, apps/desktop/src/renderer/components/sidebar/Sidebar.tsx, apps/desktop/src/renderer/components/sidebar/SidebarIconButton.tsx, apps/desktop/src/renderer/components/sidebar/SidebarNavigationCustomize.tsx, apps/desktop/src/renderer/components/sidebar/SidebarTopNav.tsx, apps/desktop/src/renderer/components/sidebar/SortableList.tsx, apps/desktop/src/renderer/components/sidebar/UpdateBanner.tsx, apps/desktop/src/renderer/components/sidebar/UserInfoSection.tsx, apps/desktop/src/renderer/components/sidebar/VendorIcon.tsx, apps/desktop/src/renderer/components/sidebar/VendorReadinessBadge.tsx, apps/desktop/src/renderer/components/sidebar/WorktreeBadge.tsx, apps/desktop/src/renderer/components/sidebar/sidebarNavigationPrefs.ts, apps/desktop/src/renderer/components/sidebar/useHoverOpenMenu.ts, apps/desktop/src/renderer/components/title-bar/ChromeIconButton.tsx, apps/desktop/src/renderer/components/title-bar/MenuButton.tsx, apps/desktop/src/renderer/components/title-bar/WindowControls.tsx, apps/desktop/src/renderer/features/cc-agent/sidebar/DeviceSectionHeader.tsx, apps/desktop/src/renderer/features/cc-agent/sidebar/sections/ProjectsSection.tsx, apps/desktop/src/renderer/features/right-sidebar/AddTabDropdown.tsx, apps/desktop/src/renderer/features/right-sidebar/EmptyState.tsx, apps/desktop/src/renderer/features/right-sidebar/RightSidebarShell.tsx, apps/desktop/src/renderer/features/right-sidebar/TabBar.tsx, apps/desktop/src/renderer/features/right-sidebar/TabBodyErrorBoundary.tsx, apps/desktop/src/renderer/features/right-sidebar/hooks/useBrowserWebview.ts, apps/desktop/src/renderer/features/right-sidebar/hooks/useNativePopupSurface.ts, apps/desktop/src/renderer/features/right-sidebar/hooks/useRetainedBrowserTabHosts.ts, apps/desktop/src/renderer/features/right-sidebar/lib/browserPartition.ts, apps/desktop/src/renderer/features/right-sidebar/lib/browserWebviewPool.ts, apps/desktop/src/renderer/features/right-sidebar/lib/detachedSidebarRouting.ts, apps/desktop/src/renderer/features/right-sidebar/lib/executeSidebarCommand.ts, apps/desktop/src/renderer/features/right-sidebar/lib/lastTurnChangedFiles.ts, apps/desktop/src/renderer/features/right-sidebar/lib/mergeSidebarWindowBack.ts, apps/desktop/src/renderer/features/right-sidebar/lib/nativePopupTabs.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openBackgroundTasksTab.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openBotWorkbenchTab.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openInSidebarBrowser.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openInSidebarFileBrowser.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openRoutinesTab.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openSubagentsTab.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openTerminalShortcut.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openTurnReview.ts, apps/desktop/src/renderer/features/right-sidebar/lib/popupRouter.ts, apps/desktop/src/renderer/features/right-sidebar/lib/popupTabs.ts, apps/desktop/src/renderer/features/right-sidebar/lib/rsbBrowserBridge.ts, apps/desktop/src/renderer/features/right-sidebar/lib/sidebarCommands.ts, apps/desktop/src/renderer/features/right-sidebar/lib/sidebarHostSession.tsx, apps/desktop/src/renderer/features/right-sidebar/lib/tabHosting.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/BackgroundTasksBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/WorkflowAgentStrip.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/WorkflowProgressTree.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/chatTaskFocusIntent.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/listSessionTasks.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/workflowProgressModel.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/bot-workbench/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/cindy-make/CindyMakeTabBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/cindy-make/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/file-browser/FileBrowserBody.css, apps/desktop/src/renderer/features/right-sidebar/plugins/file-browser/FileBrowserBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/file-browser/dropExternalFile.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/file-browser/fileTreeImagePreview.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/file-browser/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/file-browser/useSessionScopedTreeWidth.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/index.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/orca-workers/OrcaWorkersAttentionIcon.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/orca-workers/OrcaWorkersTabBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/orca-workers/actions.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/orca-workers/closeDecision.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/orca-workers/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/resource-usage/ResourceUsageBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/resource-usage/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/resource-usage/resource-usage.css, apps/desktop/src/renderer/features/right-sidebar/plugins/resource-usage/subscription.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/retired-feature/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/review/DiffViewer/ImageDiffPreview.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/review/DiffViewer/MarkdownDiffPreview.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/review/DiffViewer/PlainUnifiedDiff.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/review/DiffViewer/diffRows.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/DiffViewer/highlight.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/DiffViewer/inlineDiff.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/DiffViewer/useDiffHighlights.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/ReviewTabBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/review/diffExpansionPreference.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/fileTree.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/gitApplyCommand.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/review/markdownPreview.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/useLastTurnFilter.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/useReviewGitState.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/useReviewSource.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/routines/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/ConversationStream.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/DetailView.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/RunList.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/SubagentChrome.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/SubagentToolCard.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/SubagentsBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/subagentChangeFence.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/subagentConversation.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/subagentFormat.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/terminal/TerminalTabBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/terminal/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/terminal/lib/xtermPool.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/BrowserChrome.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/BrowserCommentPopover.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/BrowserTabBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/browserCommentEditorDraft.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/lib/parseOmnibox.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/useBrowserComment.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/useLocalHtmlAutoReload.ts, apps/desktop/src/renderer/features/right-sidebar/registry.ts, apps/desktop/src/renderer/features/right-sidebar/store.ts, apps/desktop/src/renderer/features/right-sidebar/tabAvailability.ts, apps/desktop/src/renderer/features/right-sidebar/types.ts, apps/desktop/src/renderer/layout/LayoutRoot.tsx, apps/desktop/src/renderer/layout/PanelDragController.tsx, apps/desktop/src/renderer/layout/PanelDragPrototype.tsx, apps/desktop/src/renderer/layout/collapsePrefs.ts, apps/desktop/src/renderer/layout/layoutDevTools.ts, apps/desktop/src/renderer/layout/panePlacement.tsx, apps/desktop/src/renderer/layout/paneWidths.tsx, apps/desktop/src/renderer/layout/panelMaximize.tsx, apps/desktop/src/renderer/styles/generated/tokens.css, apps/desktop/src/renderer/styles/globals.css | 143 | 46 | 196 |
| `desktop.skillhub.local` | desktop | SkillHub 本地技能 | hash `/skillhub/local` 及统一详情 `/skillhub/detail`(旧详情链接重定向) | InstallTargetPicker, PluginManagementLayout, SkillDetailLayout, SkillhubDetailRoute, SkillhubDetailView, SkillhubFeatureLayout, SkillhubHomeView, SkillhubLocalLayout, SkillhubMarketDetailView | apps/desktop/src/renderer/features/plugin/PluginManagementLayout.tsx, apps/desktop/src/renderer/features/skillhub/SkillhubDetailRoute.tsx, apps/desktop/src/renderer/features/skillhub/SkillhubDetailView.tsx, apps/desktop/src/renderer/features/skillhub/SkillhubFeatureLayout.tsx, apps/desktop/src/renderer/features/skillhub/SkillhubHomeView.tsx, apps/desktop/src/renderer/features/skillhub/SkillhubLocalLayout.tsx, apps/desktop/src/renderer/features/skillhub/SkillhubMarketDetailView.tsx, apps/desktop/src/renderer/features/skillhub/components/InstallTargetPicker.tsx, apps/desktop/src/renderer/features/skillhub/components/SkillDetailLayout.tsx | 35 | 0 | 43 |
| `desktop.skillhub.market` | desktop | SkillHub 市场 | hash `/skillhub/market`(SkillhubMarketListView) | InstallTargetPicker, MarketCard, MarketInfoEditDialog, SkillhubMarketDetailView, SkillhubMarketListView, VisibilityEditorDialog | apps/desktop/src/renderer/features/skillhub/SkillhubMarketDetailView.tsx, apps/desktop/src/renderer/features/skillhub/SkillhubMarketListView.tsx, apps/desktop/src/renderer/features/skillhub/components/HomeMarketCard.tsx, apps/desktop/src/renderer/features/skillhub/components/InstallTargetPicker.tsx, apps/desktop/src/renderer/features/skillhub/components/LocalSkillControls.tsx, apps/desktop/src/renderer/features/skillhub/components/MarketCard.tsx, apps/desktop/src/renderer/features/skillhub/components/MarketInfoEditDialog.tsx, apps/desktop/src/renderer/features/skillhub/components/MarketInstallStatus.tsx, apps/desktop/src/renderer/features/skillhub/components/MarketListError.tsx, apps/desktop/src/renderer/features/skillhub/components/MarketLocalSkills.tsx, apps/desktop/src/renderer/features/skillhub/components/MarketPreviewTree.tsx, apps/desktop/src/renderer/features/skillhub/components/OfficialSkillBadge.tsx, apps/desktop/src/renderer/features/skillhub/components/PlatformTagSelector.tsx, apps/desktop/src/renderer/features/skillhub/components/SkillCategoryFilterBar.tsx, apps/desktop/src/renderer/features/skillhub/components/SkillDetailLayout.tsx, apps/desktop/src/renderer/features/skillhub/components/SkillIcon.tsx, apps/desktop/src/renderer/features/skillhub/components/SkillTagList.tsx, apps/desktop/src/renderer/features/skillhub/components/TeamScopePicker.tsx, apps/desktop/src/renderer/features/skillhub/components/VisibilityEditorDialog.tsx | 43 | 0 | 37 |
| `desktop.window.computer-permission-guide` | desktop | 电脑使用权限引导 | `?view=computer-permission-guide` → ComputerPermissionGuideWindow;backdrop 同文件 | ComputerPermissionBackdrop, ComputerPermissionGuideWindow | apps/desktop/src/main/computer-permission-guide/MacComputerPermissionGuideNativeHost.ts, apps/desktop/src/main/computer-permission-guide/placement.ts, apps/desktop/src/main/computer-permission-guide/request.ts, apps/desktop/src/main/computer-permission-guide/switch-target.ts, apps/desktop/src/main/computer-permission-guide/window.ts, apps/desktop/src/renderer/components/settings/ComputerPermissionGuideWindow.tsx | 7 | 2 | 9 |
@@ -48,7 +48,7 @@
| `desktop.window.resource-usage` | desktop | 资源用量窗口 | `?resourceUsageWindow=1` → renderer/resource-usage-entry.tsx(不走 router.tsx) | ResourceUsageWindowLayout, ResourceUsageWindowRoot | apps/desktop/src/main/resource-usage-window/controller.ts, apps/desktop/src/main/resource-usage-window/ipc.ts, apps/desktop/src/main/resource-usage-window/open-sender.ts, apps/desktop/src/main/resource-usage-window/registry.ts, apps/desktop/src/main/resource-usage-window/window.ts, apps/desktop/src/renderer/components/resource-usage/ResourceUsageWindowLayout.tsx, apps/desktop/src/renderer/resource-usage-entry.tsx, apps/desktop/src/renderer/styles/generated/tokens.css, apps/desktop/src/renderer/styles/globals.css | 77 | 38 | 15 |
| `desktop.window.review-artifact-confirm` | desktop | Review 成果确认窗 | main/reviewer/reviewArtifactConfirmWindow.ts 内联 HTML/CSS(不走 renderer 路由) | reviewArtifactConfirmWindow | apps/desktop/src/main/reviewer/reviewArtifactConfirmWindow.ts | 8 | 18 | 2 |
| `desktop.window.session-drag-preview` | desktop | 会话拖拽预览 | main/session-drag-preview.ts 透明预览窗 | session-drag-preview | apps/desktop/src/main/session-drag-preview.ts | 0 | 1 | 0 |
-| `desktop.window.sidebar` | desktop | 右侧栏独立窗口 | `?sidebarWindow=1` → renderer/sidebar-window-entry.tsx;hash `/sidebar-window` | RightSidebar, RightSidebarShell, SidebarWindowLayout | apps/desktop/src/main/right-sidebar-window/controller.ts, apps/desktop/src/main/right-sidebar-window/ipc.ts, apps/desktop/src/main/right-sidebar-window/registry.ts, apps/desktop/src/main/right-sidebar-window/resolveHostContext.ts, apps/desktop/src/main/right-sidebar-window/settings-store.ts, apps/desktop/src/main/right-sidebar-window/window.ts, apps/desktop/src/renderer/components/layout/SidebarWindowLayout.tsx, apps/desktop/src/renderer/features/right-sidebar/AddTabDropdown.tsx, apps/desktop/src/renderer/features/right-sidebar/EmptyState.tsx, apps/desktop/src/renderer/features/right-sidebar/RightSidebarShell.tsx, apps/desktop/src/renderer/features/right-sidebar/TabBar.tsx, apps/desktop/src/renderer/features/right-sidebar/TabBodyErrorBoundary.tsx, apps/desktop/src/renderer/features/right-sidebar/hooks/useBrowserWebview.ts, apps/desktop/src/renderer/features/right-sidebar/hooks/useNativePopupSurface.ts, apps/desktop/src/renderer/features/right-sidebar/hooks/useRetainedBrowserTabHosts.ts, apps/desktop/src/renderer/features/right-sidebar/lib/browserPartition.ts, apps/desktop/src/renderer/features/right-sidebar/lib/browserWebviewPool.ts, apps/desktop/src/renderer/features/right-sidebar/lib/detachedSidebarRouting.ts, apps/desktop/src/renderer/features/right-sidebar/lib/executeSidebarCommand.ts, apps/desktop/src/renderer/features/right-sidebar/lib/lastTurnChangedFiles.ts, apps/desktop/src/renderer/features/right-sidebar/lib/mergeSidebarWindowBack.ts, apps/desktop/src/renderer/features/right-sidebar/lib/nativePopupTabs.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openBackgroundTasksTab.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openBotWorkbenchTab.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openInSidebarBrowser.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openInSidebarFileBrowser.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openRoutinesTab.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openSubagentsTab.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openTerminalShortcut.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openTurnReview.ts, apps/desktop/src/renderer/features/right-sidebar/lib/popupRouter.ts, apps/desktop/src/renderer/features/right-sidebar/lib/popupTabs.ts, apps/desktop/src/renderer/features/right-sidebar/lib/rsbBrowserBridge.ts, apps/desktop/src/renderer/features/right-sidebar/lib/sidebarCommands.ts, apps/desktop/src/renderer/features/right-sidebar/lib/sidebarHostSession.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/BackgroundTasksBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/WorkflowAgentStrip.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/WorkflowProgressTree.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/chatTaskFocusIntent.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/listSessionTasks.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/workflowProgressModel.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/bot-workbench/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/cindy-make/CindyMakeTabBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/cindy-make/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/file-browser/FileBrowserBody.css, apps/desktop/src/renderer/features/right-sidebar/plugins/file-browser/FileBrowserBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/file-browser/dropExternalFile.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/file-browser/fileTreeImagePreview.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/file-browser/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/file-browser/useSessionScopedTreeWidth.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/index.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/orca-workers/OrcaWorkersAttentionIcon.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/orca-workers/OrcaWorkersTabBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/orca-workers/actions.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/orca-workers/closeDecision.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/orca-workers/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/resource-usage/ResourceUsageBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/resource-usage/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/resource-usage/resource-usage.css, apps/desktop/src/renderer/features/right-sidebar/plugins/resource-usage/subscription.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/retired-feature/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/review/DiffViewer/ImageDiffPreview.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/review/DiffViewer/MarkdownDiffPreview.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/review/DiffViewer/PlainUnifiedDiff.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/review/DiffViewer/diffRows.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/DiffViewer/highlight.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/DiffViewer/inlineDiff.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/DiffViewer/useDiffHighlights.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/ReviewTabBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/review/diffExpansionPreference.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/fileTree.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/gitApplyCommand.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/review/markdownPreview.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/useLastTurnFilter.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/useReviewGitState.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/useReviewSource.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/routines/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/ConversationStream.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/DetailView.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/RunList.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/SubagentChrome.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/SubagentToolCard.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/SubagentsBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/subagentChangeFence.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/subagentConversation.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/subagentFormat.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/terminal/TerminalTabBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/terminal/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/terminal/lib/xtermPool.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/BrowserChrome.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/BrowserCommentPopover.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/BrowserTabBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/browserCommentEditorDraft.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/lib/parseOmnibox.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/useBrowserComment.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/useLocalHtmlAutoReload.ts, apps/desktop/src/renderer/features/right-sidebar/registry.ts, apps/desktop/src/renderer/features/right-sidebar/store.ts, apps/desktop/src/renderer/features/right-sidebar/tabAvailability.ts, apps/desktop/src/renderer/features/right-sidebar/types.ts, apps/desktop/src/renderer/sidebar-window-entry.tsx, apps/desktop/src/renderer/styles/generated/tokens.css, apps/desktop/src/renderer/styles/globals.css | 110 | 45 | 115 |
+| `desktop.window.sidebar` | desktop | 右侧栏独立窗口 | `?sidebarWindow=1` → renderer/sidebar-window-entry.tsx;hash `/sidebar-window` | RightSidebar, RightSidebarShell, SidebarWindowLayout | apps/desktop/src/main/right-sidebar-window/controller.ts, apps/desktop/src/main/right-sidebar-window/ipc.ts, apps/desktop/src/main/right-sidebar-window/registry.ts, apps/desktop/src/main/right-sidebar-window/resolveHostContext.ts, apps/desktop/src/main/right-sidebar-window/settings-store.ts, apps/desktop/src/main/right-sidebar-window/window.ts, apps/desktop/src/renderer/components/layout/SidebarWindowLayout.tsx, apps/desktop/src/renderer/features/right-sidebar/AddTabDropdown.tsx, apps/desktop/src/renderer/features/right-sidebar/EmptyState.tsx, apps/desktop/src/renderer/features/right-sidebar/RightSidebarShell.tsx, apps/desktop/src/renderer/features/right-sidebar/TabBar.tsx, apps/desktop/src/renderer/features/right-sidebar/TabBodyErrorBoundary.tsx, apps/desktop/src/renderer/features/right-sidebar/hooks/useBrowserWebview.ts, apps/desktop/src/renderer/features/right-sidebar/hooks/useNativePopupSurface.ts, apps/desktop/src/renderer/features/right-sidebar/hooks/useRetainedBrowserTabHosts.ts, apps/desktop/src/renderer/features/right-sidebar/lib/browserPartition.ts, apps/desktop/src/renderer/features/right-sidebar/lib/browserWebviewPool.ts, apps/desktop/src/renderer/features/right-sidebar/lib/detachedSidebarRouting.ts, apps/desktop/src/renderer/features/right-sidebar/lib/executeSidebarCommand.ts, apps/desktop/src/renderer/features/right-sidebar/lib/lastTurnChangedFiles.ts, apps/desktop/src/renderer/features/right-sidebar/lib/mergeSidebarWindowBack.ts, apps/desktop/src/renderer/features/right-sidebar/lib/nativePopupTabs.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openBackgroundTasksTab.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openBotWorkbenchTab.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openInSidebarBrowser.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openInSidebarFileBrowser.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openRoutinesTab.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openSubagentsTab.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openTerminalShortcut.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openTurnReview.ts, apps/desktop/src/renderer/features/right-sidebar/lib/popupRouter.ts, apps/desktop/src/renderer/features/right-sidebar/lib/popupTabs.ts, apps/desktop/src/renderer/features/right-sidebar/lib/rsbBrowserBridge.ts, apps/desktop/src/renderer/features/right-sidebar/lib/sidebarCommands.ts, apps/desktop/src/renderer/features/right-sidebar/lib/sidebarHostSession.tsx, apps/desktop/src/renderer/features/right-sidebar/lib/tabHosting.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/BackgroundTasksBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/WorkflowAgentStrip.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/WorkflowProgressTree.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/chatTaskFocusIntent.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/listSessionTasks.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/workflowProgressModel.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/bot-workbench/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/cindy-make/CindyMakeTabBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/cindy-make/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/file-browser/FileBrowserBody.css, apps/desktop/src/renderer/features/right-sidebar/plugins/file-browser/FileBrowserBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/file-browser/dropExternalFile.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/file-browser/fileTreeImagePreview.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/file-browser/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/file-browser/useSessionScopedTreeWidth.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/index.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/orca-workers/OrcaWorkersAttentionIcon.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/orca-workers/OrcaWorkersTabBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/orca-workers/actions.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/orca-workers/closeDecision.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/orca-workers/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/resource-usage/ResourceUsageBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/resource-usage/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/resource-usage/resource-usage.css, apps/desktop/src/renderer/features/right-sidebar/plugins/resource-usage/subscription.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/retired-feature/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/review/DiffViewer/ImageDiffPreview.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/review/DiffViewer/MarkdownDiffPreview.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/review/DiffViewer/PlainUnifiedDiff.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/review/DiffViewer/diffRows.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/DiffViewer/highlight.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/DiffViewer/inlineDiff.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/DiffViewer/useDiffHighlights.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/ReviewTabBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/review/diffExpansionPreference.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/fileTree.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/gitApplyCommand.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/review/markdownPreview.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/useLastTurnFilter.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/useReviewGitState.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/useReviewSource.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/routines/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/ConversationStream.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/DetailView.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/RunList.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/SubagentChrome.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/SubagentToolCard.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/SubagentsBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/subagentChangeFence.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/subagentConversation.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/subagentFormat.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/terminal/TerminalTabBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/terminal/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/terminal/lib/xtermPool.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/BrowserChrome.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/BrowserCommentPopover.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/BrowserTabBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/browserCommentEditorDraft.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/lib/parseOmnibox.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/useBrowserComment.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/useLocalHtmlAutoReload.ts, apps/desktop/src/renderer/features/right-sidebar/registry.ts, apps/desktop/src/renderer/features/right-sidebar/store.ts, apps/desktop/src/renderer/features/right-sidebar/tabAvailability.ts, apps/desktop/src/renderer/features/right-sidebar/types.ts, apps/desktop/src/renderer/sidebar-window-entry.tsx, apps/desktop/src/renderer/styles/generated/tokens.css, apps/desktop/src/renderer/styles/globals.css | 110 | 45 | 115 |
| `desktop.window.voice-dictionary-toast` | desktop | 语音词典 Toast 窗 | `?view=voice-input-dictionary-toast` → main-entry.tsx → VoiceInputDictionaryToast | VoiceInputDictionaryToast | apps/desktop/src/renderer/voice-input/VoiceInputDictionaryToast.tsx | 6 | 0 | 2 |
| `desktop.window.voice-overlay` | desktop | 语音输入浮窗 | `?view=voice-input-overlay` → main-entry.tsx → VoiceInputOverlay | VoiceInputOverlay, VoiceInputStatusNotice | apps/desktop/src/main/voice-input/global.ts, apps/desktop/src/renderer/styles/generated/tokens.css, apps/desktop/src/renderer/styles/globals.css, apps/desktop/src/renderer/voice-input/VoiceInputOverlay.tsx, apps/desktop/src/renderer/voice-input/VoiceInputStatusNotice.tsx | 82 | 38 | 20 |
| `mobile.account-deletion` | mobile | 账号注销 | app/account-deletion.tsx | AdaptiveWindow, AnchoredPullDownMenu, AnchoredPullDownMenu.android, AndroidUpdateSheet, AppText, AuthContext, BlurBackdrop, CenteredScreen, ConnectionBanner, ConnectionNoticeOverlay, DeviceLinkContext, FoldTouchpad, HomeEntryProvider, HomeHeaderGlassButton, HomeHeaderGlassButton.ios, HomeNativeStackHeader, HomeStackHeader, IncomingShareBridge, McpAppViews, MobileLoginHandoffContext, MobileLoginHandoffStage, MobileOutboxBridge, MobilePrimitives, NativeBottomSheet, NativeBottomSheet.android, NativeChromeBackButton.ios, NativeChromeButton.ios, NativeMcpAppSurface, NativePullDownMenu, NativeRemoteDesktopView, NativeResidentHistory, NativeSwitch, OutsideTap, PermissionGuide, PermissionGuideView, PermissionGuideView.ios, PushNotificationsBridge, QuietSyncIndicator, RecentMessageHistories, RemoteDesktopActionButton, RemoteDesktopActionButton.ios, RemoteDesktopBackButton, RemoteDesktopBackButton.ios, RemoteDesktopChrome, RemoteDesktopChrome.ios, RemoteDesktopClipboardButton, RemoteDesktopControls, RemoteDesktopDisplaySettings, RemoteDesktopHost, RemoteDesktopIcons, RemoteDesktopMouseControls, RemoteDesktopMouseControls.ios, RemoteDesktopNetworkStatus, RemoteDesktopPanelButton, RemoteDesktopPanelButton.ios, RemoteDesktopScreen, RemoteDesktopSecuritySettings, RemoteDesktopWindows, RemoteHistoryPrefetchBridge, ResidentHomeList, SheetModal, SimpleStackHeader, StartupSplashOverlay, ThemeProvider, _layout, account-deletion, gestureHandler, nativeToolbarMenuItems, peerFileTransport, useLocale | apps/mobile/app/_layout.tsx, apps/mobile/app/account-deletion.tsx, apps/mobile/src/auth/AuthContext.tsx, apps/mobile/src/auth/MobileLoginHandoffContext.tsx, apps/mobile/src/components/AppText.tsx, apps/mobile/src/components/CenteredScreen.tsx, apps/mobile/src/components/ConnectionBanner.tsx, apps/mobile/src/components/ConnectionNoticeOverlay.tsx, apps/mobile/src/components/MobileLoginHandoffStage.tsx, apps/mobile/src/components/MobilePrimitives.tsx, apps/mobile/src/components/QuietSyncIndicator.tsx, apps/mobile/src/components/StartupSplashOverlay.tsx, apps/mobile/src/device-link/DeviceLinkContext.tsx, apps/mobile/src/device-link/peerFileTransport.tsx, apps/mobile/src/i18n/useLocale.tsx, apps/mobile/src/notifications/PushNotificationsBridge.tsx, apps/mobile/src/platform/AdaptiveWindow.tsx, apps/mobile/src/platform/OutsideTap.tsx, apps/mobile/src/platform/chrome/AnchoredPullDownMenu.android.tsx, apps/mobile/src/platform/chrome/AnchoredPullDownMenu.tsx, apps/mobile/src/platform/chrome/HomeNativeStackHeader.tsx, apps/mobile/src/platform/chrome/HomeStackHeader.tsx, apps/mobile/src/platform/chrome/NativeChromeBackButton.ios.tsx, apps/mobile/src/platform/chrome/NativeChromeButton.ios.tsx, apps/mobile/src/platform/chrome/NativePullDownMenu.tsx, apps/mobile/src/platform/chrome/NativeSwitch.tsx, apps/mobile/src/platform/chrome/SimpleStackHeader.tsx, apps/mobile/src/platform/chrome/nativeToolbarMenuItems.tsx, apps/mobile/src/platform/gestureHandler.tsx, apps/mobile/src/remote-desktop/FoldTouchpad.tsx, apps/mobile/src/remote-desktop/NativeRemoteDesktopView.tsx, apps/mobile/src/remote-desktop/PermissionGuide.tsx, apps/mobile/src/remote-desktop/PermissionGuideView.ios.tsx, apps/mobile/src/remote-desktop/PermissionGuideView.tsx, apps/mobile/src/remote-desktop/RemoteDesktopActionButton.ios.tsx, apps/mobile/src/remote-desktop/RemoteDesktopActionButton.tsx, apps/mobile/src/remote-desktop/RemoteDesktopBackButton.ios.tsx, apps/mobile/src/remote-desktop/RemoteDesktopBackButton.tsx, apps/mobile/src/remote-desktop/RemoteDesktopChrome.ios.tsx, apps/mobile/src/remote-desktop/RemoteDesktopChrome.tsx, apps/mobile/src/remote-desktop/RemoteDesktopClipboardButton.tsx, apps/mobile/src/remote-desktop/RemoteDesktopControls.tsx, apps/mobile/src/remote-desktop/RemoteDesktopDisplaySettings.tsx, apps/mobile/src/remote-desktop/RemoteDesktopHost.tsx, apps/mobile/src/remote-desktop/RemoteDesktopIcons.tsx, apps/mobile/src/remote-desktop/RemoteDesktopMouseControls.ios.tsx, apps/mobile/src/remote-desktop/RemoteDesktopMouseControls.tsx, apps/mobile/src/remote-desktop/RemoteDesktopNetworkStatus.tsx, apps/mobile/src/remote-desktop/RemoteDesktopPanelButton.ios.tsx, apps/mobile/src/remote-desktop/RemoteDesktopPanelButton.tsx, apps/mobile/src/remote-desktop/RemoteDesktopScreen.tsx, apps/mobile/src/remote-desktop/RemoteDesktopSecuritySettings.tsx, apps/mobile/src/remote-desktop/RemoteDesktopWindows.tsx, apps/mobile/src/remote-desktop/viewerHtml.ts, apps/mobile/src/session/BlurBackdrop.tsx, apps/mobile/src/session/HomeEntryProvider.tsx, apps/mobile/src/session/HomeHeaderGlassButton.ios.tsx, apps/mobile/src/session/HomeHeaderGlassButton.tsx, apps/mobile/src/session/IncomingShareBridge.tsx, apps/mobile/src/session/McpAppViews.tsx, apps/mobile/src/session/MobileOutboxBridge.tsx, apps/mobile/src/session/NativeBottomSheet.android.tsx, apps/mobile/src/session/NativeBottomSheet.tsx, apps/mobile/src/session/NativeMcpAppSurface.tsx, apps/mobile/src/session/NativeResidentHistory.tsx, apps/mobile/src/session/RecentMessageHistories.tsx, apps/mobile/src/session/RemoteHistoryPrefetchBridge.tsx, apps/mobile/src/session/ResidentHomeList.tsx, apps/mobile/src/session/SheetModal.tsx, apps/mobile/src/theme/ThemeProvider.tsx, apps/mobile/src/theme/navigationTheme.ts, apps/mobile/src/theme/tokens.ts, apps/mobile/src/update/AndroidUpdateSheet.tsx | 0 | 214 | 59 |
diff --git a/docs/dev-rules/electron-security-and-process-boundaries.md b/docs/dev-rules/electron-security-and-process-boundaries.md
index 827bbdc365..64c4ec56d3 100644
--- a/docs/dev-rules/electron-security-and-process-boundaries.md
+++ b/docs/dev-rules/electron-security-and-process-boundaries.md
@@ -116,13 +116,21 @@ Renderer 可以负责组件渲染、交互状态、表单状态、展示数据
必须区分冷启动与热打开,并确认热打开链路没有重新创建 BrowserWindow、重新加载 Renderer
或同步等待业务数据。
+按内容多实例、内容回到主窗即结束的窗口(右侧栏单页签弹出窗口,
+`main/sidebar-tab-window/controller.ts`)对「隐藏复用」取另一种等价形式:页签合并回侧边栏后
+窗口没有可复用的内容,普通关闭即销毁;「准备成本移出点击路径」由一扇未指派的预热 spare
+窗口承担(弹出时只做指派 → 首份内容 → `show()`),指派后再延迟补一扇。崩溃不重建 renderer,
+而是把页签交回侧边栏(侧边栏本身就是安全态),这同样满足「恢复有界」。
+
确因透明窗口、全局热键窗口、系统级浮层等平台约束不能复用完整基线时,必须在实现前于代码
注释和测试中写明冲突点;例外只豁免冲突项,其余预热、就绪握手、安全配置、状态清理与故障
隔离要求仍然适用。
-`webviewTag` 默认关闭;受控例外目前有三处——主界面与右侧栏子窗口(内置浏览器需要),
-以及插件面板独立窗口(`main/ghost-panel-window/window.ts`,仅承载 ghost 分区面板
-webview)——所有例外都必须继续由 `webview-security.ts` 在 `will-attach-webview` 阶段
+`webviewTag` 默认关闭;受控例外目前有三类——主界面与右侧栏子窗口(内置浏览器需要;
+右侧栏整栏子窗口与单页签弹出窗口共用 `main/right-sidebar-window/window.ts` 的
+`createSidebarHostWindow` 工厂与 `sidebarWindowPreload`,`main/sidebar-tab-window/window.ts`
+只改启动参数、尺寸与位置记忆),以及插件面板独立窗口(`main/ghost-panel-window/window.ts`,
+仅承载 ghost 分区面板 webview)——所有例外都必须继续由 `webview-security.ts` 在 `will-attach-webview` 阶段
覆盖 Renderer 传入的全部安全选项(hardener 挂在 `web-contents-created`,对所有窗口
全局生效,ghost 附加闸只认分区与地址、不认宿主窗口)。