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。

弹出页签窗口:关窗即关闭该页签,只有「合并回侧边栏」才送回

Dash0c777d8945ae
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
index 382e008b7e..26663bca42 100644
--- a/apps/desktop/src/main/sidebar-tab-window/__tests__/controller.test.ts
+++ b/apps/desktop/src/main/sidebar-tab-window/__tests__/controller.test.ts
@@ -21,8 +21,7 @@ import type {
} 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_CLOSE_REQUESTED_CHANNEL,
SIDEBAR_TAB_WINDOW_VISIBILITY_CHANGED_CHANNEL,
} from '../../../shared/sidebarTabWindow.js';
import {
@@ -238,7 +237,7 @@ describe('SidebarTabWindowsController', () => {
expect(h.returned).toHaveLength(1);
});
- it('asks the renderer to merge on native close and merges without a snapshot after the grace period', () => {
+ it('turns native close into a tab-close request and never returns the tab by itself', () => {
const h = makeHarness();
h.controller.open(request('tab-a'));
const win = h.created[0];
@@ -246,22 +245,32 @@ describe('SidebarTabWindowsController', () => {
h.controller.markPresentationReady(h.wc(win));
win.close();
- // 原生关窗被拦下,先请求 renderer 交回快照。
+ // 原生关窗被拦下,转达给 renderer 走 closeTab;窗口留着等页签真正消失。
expect(win.isDestroyed()).toBe(false);
expect(
- h.sends.filter((s) => s.channel === SIDEBAR_TAB_WINDOW_MERGE_REQUESTED_CHANNEL),
+ h.sends.filter((s) => s.channel === SIDEBAR_TAB_WINDOW_CLOSE_REQUESTED_CHANNEL),
).toHaveLength(1);
- // 重复关窗不重复请求。
+ // 上一次可能被插件确认框否决,再次关窗要再转达一次。
win.close();
expect(
- h.sends.filter((s) => s.channel === SIDEBAR_TAB_WINDOW_MERGE_REQUESTED_CHANNEL),
- ).toHaveLength(1);
+ h.sends.filter((s) => s.channel === SIDEBAR_TAB_WINDOW_CLOSE_REQUESTED_CHANNEL),
+ ).toHaveLength(2);
+ vi.advanceTimersByTime(60_000);
+ expect(win.isDestroyed()).toBe(false);
expect(h.returned).toHaveLength(0);
- vi.advanceTimersByTime(SIDEBAR_TAB_WINDOW_MERGE_GRACE_MS);
+ // renderer 关掉页签后请求销毁:不交回页签。
+ h.controller.closeForTab('tab-a');
expect(win.destroy).toHaveBeenCalledOnce();
- expect(h.returned).toEqual([
- { sessionId: 's1', tabId: 'tab-a', snapshot: null, reason: 'merge' },
+ expect(h.returned).toHaveLength(0);
+
+ // renderer 还没挂上时没人能执行关闭流程:页签交回侧边栏而不是丢掉。
+ const cold = makeHarness();
+ cold.controller.open(request('tab-b'));
+ cold.created[0].close();
+ expect(cold.created[0].destroy).toHaveBeenCalledOnce();
+ expect(cold.returned).toEqual([
+ { sessionId: 's1', tabId: 'tab-b', snapshot: null, reason: 'merge' },
]);
});
diff --git a/apps/desktop/src/main/sidebar-tab-window/controller.ts b/apps/desktop/src/main/sidebar-tab-window/controller.ts
index 831383f659..32f73615c6 100644
--- a/apps/desktop/src/main/sidebar-tab-window/controller.ts
+++ b/apps/desktop/src/main/sidebar-tab-window/controller.ts
@@ -3,7 +3,9 @@
* 依赖注入可测)。
*
* 模型:每个弹出的页签(tabId)一扇窗。主窗的侧边栏继续存在并显示其余页签;
- * 弹出窗口关闭(合并按钮 / 红绿灯 / ⌘W / 崩溃)= 页签回到侧边栏。没有
+ * 「合并回侧边栏」按钮 = 页签回到侧边栏;关窗(红绿灯 / ⌘W / Windows X)= 关闭该页签
+ * (与侧边栏里关页签同一条 store.closeTab 流程,插件清理与确认拦截照常);崩溃 = 页签
+ * 回到侧边栏(数据不丢)。没有
* 「偏好」可落盘:弹出是本次运行期的视图态,客户端重启后所有页签都回到主窗。
*
* 生命周期基线对齐 docs/dev-rules/electron-security-and-process-boundaries.md §3.1
@@ -13,8 +15,8 @@
* 延迟补一扇 spare。
* - 双阶段就绪:renderer-ready(壳已挂载,可接收指派)→ presentation-ready
* (被指派页签的首份内容已提交)后才 show;超时只展示已挂载的 Loading 壳。
- * - 关闭即销毁而非隐藏复用:页签回到侧边栏后窗口没有可复用的内容,隐藏保活
- * 只会按页签数囤积 renderer;§3.1 的隐藏复用面向「同一内容反复打开」的窗口,
+ * - 关闭即销毁而非隐藏复用:页签关掉 / 回到侧边栏后窗口没有可复用的内容,隐藏
+ * 保活只会按页签数囤积 renderer;§3.1 的隐藏复用面向「同一内容反复打开」的窗口,
* 这里由 spare 预热承担「下次弹出不冷启动」。
* - 故障隔离且恢复有界:弹出窗口崩溃 / 加载失败 → 销毁并把页签交回侧边栏
* (侧边栏本身就是安全态,不重建 renderer 循环);spare 崩溃最多自动补建一次。
@@ -35,9 +37,8 @@ import type {
} from '../../shared/sidebarTabWindow.js';
import {
SIDEBAR_TAB_WINDOW_ASSIGNED_CHANNEL,
+ SIDEBAR_TAB_WINDOW_CLOSE_REQUESTED_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';
@@ -77,9 +78,7 @@ interface WindowSlot {
visible: boolean;
pendingOpen: boolean;
destroyingWindow: boolean;
- mergeRequested: boolean;
openTimeout: NodeJS.Timeout | null;
- mergeGraceTimeout: NodeJS.Timeout | null;
}
export class SidebarTabWindowsController {
@@ -303,16 +302,14 @@ export class SidebarTabWindowsController {
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 交回内存态快照,再销毁。
+ // 原生关窗 = 关闭这个页签:交给 renderer 走 closeTab,页签消失后它再请求销毁窗口。
event.preventDefault();
- this.requestMergeFromNative(slot);
+ this.requestCloseFromNative(slot);
});
win.on('show', () => this.onNativeVisibilityChanged(slot, true));
win.on('hide', () => this.onNativeVisibilityChanged(slot, false));
@@ -372,27 +369,20 @@ export class SidebarTabWindowsController {
if (slot.assignment) this.broadcast();
}
- private requestMergeFromNative(slot: WindowSlot): void {
+ private requestCloseFromNative(slot: WindowSlot): void {
if (!slot.assignment) {
- // spare 没有页签可交回,直接丢弃。
+ // 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 里,页签消失后它再调 close-for-tab。
+ this.deps.sendToWindow(slot.win, SIDEBAR_TAB_WINDOW_CLOSE_REQUESTED_CHANNEL, undefined);
+ return;
}
- // 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?.();
+ // renderer 还没挂上(冷开 / 重载中),无人能执行关闭流程:不丢数据,把页签交回侧边栏。
+ this.finishSlot(slot, null, 'merge');
}
/** 页签离开本窗口:销毁窗口、通知主窗接回页签、广播。 */
@@ -530,10 +520,6 @@ export class SidebarTabWindowsController {
private clearTimeouts(slot: WindowSlot): void {
this.clearOpenTimeout(slot);
- if (slot.mergeGraceTimeout) {
- clearTimeout(slot.mergeGraceTimeout);
- slot.mergeGraceTimeout = null;
- }
}
private broadcast(): void {
diff --git a/apps/desktop/src/preload/sidebarWindowPreload.ts b/apps/desktop/src/preload/sidebarWindowPreload.ts
index aab4e32a0d..7708989ec4 100644
--- a/apps/desktop/src/preload/sidebarWindowPreload.ts
+++ b/apps/desktop/src/preload/sidebarWindowPreload.ts
@@ -36,7 +36,7 @@ import {
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_CLOSE_REQUESTED_CHANNEL,
SIDEBAR_TAB_WINDOW_PRESENTATION_READY_CHANNEL,
SIDEBAR_TAB_WINDOW_RENDERER_READY_CHANNEL,
SIDEBAR_TAB_WINDOW_VISIBILITY_CHANGED_CHANNEL,
@@ -424,8 +424,8 @@ contextBridge.exposeInMainWorld('electronAPI', {
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),
+ onCloseRequested: (cb: () => void): (() => void) =>
+ onPayload(SIDEBAR_TAB_WINDOW_CLOSE_REQUESTED_CHANNEL, cb),
onVisibilityChanged: (cb: (payload: { visible: boolean }) => void): (() => void) =>
onPayload(SIDEBAR_TAB_WINDOW_VISIBILITY_CHANGED_CHANNEL, cb),
onLocaleChanged: (cb: (locale: SupportedLocale) => void): (() => void) =>
diff --git a/apps/desktop/src/renderer/components/layout/SidebarTabWindowLayout.tsx b/apps/desktop/src/renderer/components/layout/SidebarTabWindowLayout.tsx
index b738ad2461..fb3391dba8 100644
--- a/apps/desktop/src/renderer/components/layout/SidebarTabWindowLayout.tsx
+++ b/apps/desktop/src/renderer/components/layout/SidebarTabWindowLayout.tsx
@@ -11,10 +11,12 @@
* - 46px 自绘 chrome:整条 drag region;mac 左端红绿灯让位、win 右端 WindowControls
* (close = 合并回侧边栏);中部页签图标 + 标题(复用插件的 TabPillIcon /
* TabPillTitle);右端「合并回侧边栏」按钮。
- * - 合并回侧边栏是唯一出口(按钮 / ⌘W / 原生关窗请求 / 协同页签「在主窗查看」):
- * 不可持久化会话附本页签内存态,main 销毁窗口并把页签交回主窗。
- * - 页签在本窗口里被关掉(guest 自关 / agent close):桶里找不到它 → 通知 main
- * 销毁窗口(不交回)。
+ * - 「合并回侧边栏」(按钮 / 协同页签「在主窗查看」):不可持久化会话附本页签内存态,
+ * main 销毁窗口并把页签交回主窗。
+ * - 关窗 = 关闭页签(⌘W / 红绿灯 / Windows X / 原生关窗请求):走 store.closeTab,
+ * 与侧边栏里关页签同一流程(插件 onBeforeClose、确认拦截照常,被否决则窗口留着)。
+ * - 页签从桶里消失(上面的关闭 / guest 自关 / agent close):通知 main 销毁窗口
+ * (不交回)。
* - 显隐推送:隐藏时模糊焦点、重挂 chrome(复用隐藏窗口不继承上次 hover 态)。
*
* 与 SidebarWindowLayout 一样挂 useDeviceLinkRemoteProjects / makerChatStore 监听:
@@ -31,7 +33,7 @@ import { useDeviceLinkRemoteProjects } from '@/features/device-link/useDeviceLin
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 { closeTab, 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';
@@ -162,15 +164,24 @@ export function SidebarTabWindowLayout() {
});
}, [assignment]);
- // 原生关窗(红绿灯 / 系统关闭 / Windows X):main 先请求本 renderer 交回快照。
+ // 关窗 = 关闭这个页签。closeTab 内部跑插件 onBeforeClose / 确认拦截,被否决就什么
+ // 都不发生;页签真的消失后,上面的 effect 再请求 main 销毁窗口。
+ const closeOwnTab = useCallback(() => {
+ if (!assignment || leavingRef.current) return;
+ void closeTab(assignment.sessionId, assignment.tabId).catch((err) => {
+ log.warn('close popped-out tab failed', err);
+ });
+ }, [assignment]);
+
+ // 原生关窗(红绿灯 / 系统关闭 / Windows X):main 拦下后转达到这里。
useEffect(() => {
- return api?.onMergeRequested?.(() => mergeBack()) ?? undefined;
- }, [api, mergeBack]);
+ return api?.onCloseRequested?.(() => closeOwnTab()) ?? undefined;
+ }, [api, closeOwnTab]);
- // ⌘W / Ctrl+W:本窗口整个就是一个页签,关窗 = 合并回侧边栏(不关页签)。
+ // ⌘W / Ctrl+W:本窗口整个就是一个页签,与侧边栏里 ⌘W 关当前页签同义。
useCloseShortcutShellOwner();
useAppShortcut('close-tab-or-window', () => {
- mergeBack();
+ closeOwnTab();
return true;
});
@@ -221,7 +232,7 @@ export function SidebarTabWindowLayout() {
className="flex h-full shrink-0 items-center"
style={{ WebkitAppRegion: 'no-drag' } as React.CSSProperties}
>
- <WindowControls key={windowChromeRevision} onClose={mergeBack} />
+ <WindowControls key={windowChromeRevision} onClose={closeOwnTab} />
</div>
)}
</div>
diff --git a/apps/desktop/src/renderer/vite-env.d.ts b/apps/desktop/src/renderer/vite-env.d.ts
index 27bf314d02..969808abc8 100644
--- a/apps/desktop/src/renderer/vite-env.d.ts
+++ b/apps/desktop/src/renderer/vite-env.d.ts
@@ -2096,7 +2096,7 @@ interface ElectronAPI {
mergeBack?: (
snapshot: import('../shared/sidebarTabWindow').SidebarTabReturnSnapshot | null,
) => Promise<void>;
- onMergeRequested?: (cb: () => void) => () => void;
+ onCloseRequested?: (cb: () => void) => () => void;
onVisibilityChanged?: (cb: (payload: { visible: boolean }) => void) => () => void;
onLocaleChanged?: (
cb: (locale: import('../shared/locale').SupportedLocale) => void,
diff --git a/apps/desktop/src/shared/sidebarTabWindow.ts b/apps/desktop/src/shared/sidebarTabWindow.ts
index a3fd9dca4e..11c8c407a4 100644
--- a/apps/desktop/src/shared/sidebarTabWindow.ts
+++ b/apps/desktop/src/shared/sidebarTabWindow.ts
@@ -3,7 +3,7 @@
*
* 与 shared/rightSidebarWindow.ts(整栏子窗口)的差异:按 **tabId 多实例**。
* 用户把正在看的页签弹出到自己的窗口,主窗口的侧边栏继续存在并显示其余页签;
- * 弹出窗口关闭 = 页签合并回侧边栏。三方共用:main(controller / IPC)、preload
+ * 关闭弹出窗口 = 关闭该页签,「合并回侧边栏」按钮才把页签送回。三方共用:main(controller / IPC)、preload
* (桥接签名)、renderer(主窗镜像 store + 弹出窗口根组件)。只放纯类型与
* channel 常量,不放运行时代码。
*/
@@ -73,12 +73,13 @@ export const SIDEBAR_TAB_WINDOW_GET_ASSIGNMENT_CHANNEL = 'sidebar-tab-window:get
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):用户经原生入口关窗(红绿灯 / 系统关闭 / Windows X)。
+ * 关窗 = 关闭这个页签:renderer 走 store.closeTab(插件 onBeforeClose、确认拦截照常),
+ * 页签从桶里消失后再由 renderer 请求 close-for-tab 销毁窗口;被否决则窗口留着。
+ */
+export const SIDEBAR_TAB_WINDOW_CLOSE_REQUESTED_CHANNEL = 'sidebar-tab-window:close-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/dev-rules/electron-security-and-process-boundaries.md b/docs/dev-rules/electron-security-and-process-boundaries.md
index 64c4ec56d3..d85cfbd1f6 100644
--- a/docs/dev-rules/electron-security-and-process-boundaries.md
+++ b/docs/dev-rules/electron-security-and-process-boundaries.md
@@ -117,8 +117,9 @@ Renderer 可以负责组件渲染、交互状态、表单状态、展示数据
或同步等待业务数据。
按内容多实例、内容回到主窗即结束的窗口(右侧栏单页签弹出窗口,
-`main/sidebar-tab-window/controller.ts`)对「隐藏复用」取另一种等价形式:页签合并回侧边栏后
-窗口没有可复用的内容,普通关闭即销毁;「准备成本移出点击路径」由一扇未指派的预热 spare
+`main/sidebar-tab-window/controller.ts`)对「隐藏复用」取另一种等价形式:关窗即关闭该页签
+(经 renderer 走与侧边栏相同的 closeTab 流程),页签关掉或合并回侧边栏后窗口没有可复用的
+内容,随即销毁;「准备成本移出点击路径」由一扇未指派的预热 spare
窗口承担(弹出时只做指派 → 首份内容 → `show()`),指派后再延迟补一扇。崩溃不重建 renderer,
而是把页签交回侧边栏(侧边栏本身就是安全态),这同样满足「恢复有界」。