Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(sidebar): 开窗失败向调用方报错并延后释放页签状态;仅全局页签的弹出窗口可用切页签快捷键
Dash5c0cdb886b66
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.tsindex 75d9dd2f39..726a0fee20 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@@ -414,6 +414,24 @@ describe('SidebarTabWindowsController', () => {expect(h.returned.find((payload) => payload.tabId === 'tab-n')?.snapshot).toBeNull();});+ // 测试价值+ // - 生产入口与可观察结果:open 在窗口创建失败时返回 false(成功为 true);调用方据此不释放浏览器+ // webview、不记窗口放置。+ // - Bug / 规则依据:review「createWindow 抛错时 IPC 仍当成功,页签状态被提前释放」。+ // - 现有覆盖缺口:创建失败路径没有断言。+ // - 最小失败输入:createWindow 抛错且没有 spare。+ it('reports a failed pop-out when no window can be created', () => {+ const h = makeHarness({+ createWindow: () => {+ throw new Error('boom');+ },+ });+ expect(h.controller.open(request('tab-a'))).toBe(false);+ expect(h.controller.isTabPoppedOut('tab-a')).toBe(false);+ const ok = makeHarness();+ expect(ok.controller.open(request('tab-a'))).toBe(true);+ });+// 测试价值// - 生产入口与可观察结果:任务页签合并回侧栏后,窗口只剩全局页签时 getAssignment 的 sessionId// 为 null,另一任务的页签可以搬进这扇窗,而不是被旧任务绑定挡在门外新开一扇。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.tsindex 2a2e105e15..789850ccb3 100644--- a/apps/desktop/src/main/sidebar-tab-window/__tests__/ipc.test.ts+++ b/apps/desktop/src/main/sidebar-tab-window/__tests__/ipc.test.ts@@ -53,7 +53,7 @@ function handlers() {function makeController() {return {getState: vi.fn(() => ({})),- open: vi.fn(),+ open: vi.fn(() => true),focus: vi.fn(),closeForTab: vi.fn(),mergeBack: vi.fn(),@@ -153,6 +153,10 @@ describe('sidebar-tab-window IPC', () => {persistable: false,},});++ // 控制器没开出窗口:调用方必须收到拒绝,不能当成功。+ controller.open.mockReturnValueOnce(false);+ await expect(call(open, { sender: mainSender }, validRequest)).rejects.toThrow(/INTERNAL/);});it('lets the main window or the owning tab window close a window for a closed tab, nobody else', async () => {diff --git a/apps/desktop/src/main/sidebar-tab-window/controller.ts b/apps/desktop/src/main/sidebar-tab-window/controller.tsindex e02f697dfe..8b99e16894 100644--- a/apps/desktop/src/main/sidebar-tab-window/controller.ts+++ b/apps/desktop/src/main/sidebar-tab-window/controller.ts@@ -157,13 +157,13 @@ export class SidebarTabWindowsController {/*** 把页签弹出到独立窗口。已弹出则只聚焦。指定 targetWindowId 且该窗口能接(同一* 任务或任一方是全局)→ 搬进去;否则新开一扇:优先消费预热的 spare,没有时冷建- * (首份内容前不显示,超时展示 Loading 壳)。+ * (首份内容前不显示,超时展示 Loading 壳)。返回 false = 没能开出窗口(已销毁 / 创建失败)。*/- open(request: SidebarTabWindowOpenRequest): void {- if (this.disposed) return;+ open(request: SidebarTabWindowOpenRequest): boolean {+ if (this.disposed) return false;if (this.tabToWindow.has(request.tabId)) {this.focus(request.tabId);- return;+ return true;}const target = request.targetWindowId ? this.slots.get(request.targetWindowId) : undefined;if (target?.assignment && !target.win.isDestroyed() && this.canHost(target, request)) {@@ -175,10 +175,11 @@ export class SidebarTabWindowsController {tabId: request.tabId,windowId: target.assignment.windowId,});- return;+ return true;}const slot = this.takeSpare() ?? this.createSlot();- if (!slot) return;+ // 窗口没建出来:告诉调用方失败,它才能不释放浏览器 webview / 不记窗口放置。+ if (!slot) return false;const windowId = `w${++this.windowSeq}`;slot.assignment = {windowId,@@ -203,6 +204,7 @@ export class SidebarTabWindowsController {sessionId: request.sessionId,prewarmed: slot.rendererReady,});+ return true;}/** 窗口能否接下这个页签:全局页签哪里都能去;任务页签只进同任务或尚无任务的窗口。 */diff --git a/apps/desktop/src/main/sidebar-tab-window/ipc.ts b/apps/desktop/src/main/sidebar-tab-window/ipc.tsindex bcd54b5de6..effed6f429 100644--- a/apps/desktop/src/main/sidebar-tab-window/ipc.ts+++ b/apps/desktop/src/main/sidebar-tab-window/ipc.ts@@ -169,7 +169,9 @@ export function registerSidebarTabWindowIpc(opts: {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);+ if (!controller.open(request)) {+ throwIpcError('INTERNAL', 'failed to open the sidebar tab window');+ }});ipcMain.handle(MAKER_INVOKE.SIDEBAR_TAB_WINDOW_FOCUS, (event, tabId: unknown) => {diff --git a/apps/desktop/src/renderer/components/layout/MainLayout.tsx b/apps/desktop/src/renderer/components/layout/MainLayout.tsxindex 847aa130f3..116f3061f8 100644--- a/apps/desktop/src/renderer/components/layout/MainLayout.tsx+++ b/apps/desktop/src/renderer/components/layout/MainLayout.tsx@@ -1132,22 +1132,30 @@ export function MainLayout() {// 全局页签(插件视图)不属于任何任务:无桶快照,也没有任务级资源要释放。const globalTab = findGlobalTab(tabId);if (globalTab) {- // 插件视图弹过窗口:记住,下次从左侧栏入口点开直接进窗口。+ // 插件视图弹过窗口:记住,下次从左侧栏入口点开直接进窗口(开成功后才记,开失败不留错误记忆)。const instanceId = (globalTab.state as PluginViewTabState | null)?.instanceId;- if (instanceId) rememberPluginWindowPlacement(instanceId, true);- void api.open({ tabId, sessionId: null, context, handoff: null, ...target }).catch((err) => {- applicationMenuLog.warn('pop out global sidebar tab failed', { tabId, err });- });+ void api+ .open({ tabId, sessionId: null, context, handoff: null, ...target })+ .then(() => {+ if (instanceId) rememberPluginWindowPlacement(instanceId, true);+ })+ .catch((err) => {+ applicationMenuLog.warn('pop out global sidebar tab failed', { tabId, err });+ });return;}const sessionId = rightSidebarSessionIdRef.current;if (!sessionId) return;const tab = getBucket(sessionId).tabs.find((candidate) => candidate.id === tabId);if (!tab) return;- if (tab.kind === 'web-browser') browserWebviewPool.release(tabId);- if (tab.kind === 'terminal') markPtyDetached(tabId);+ // 窗口真的建出来之后才释放主窗里的浏览器 webview / 标记终端已分离:+ // 开窗失败(main 抛错)时页面状态原样留在侧栏,不被销毁重载。void api.open({ tabId, sessionId, context, handoff: getTabSnapshot(sessionId), ...target })+ .then(() => {+ if (tab.kind === 'web-browser') browserWebviewPool.release(tabId);+ if (tab.kind === 'terminal') markPtyDetached(tabId);+ }).catch((err) => {applicationMenuLog.warn('pop out sidebar tab failed', { sessionId, tabId, err });});diff --git a/apps/desktop/src/renderer/features/right-sidebar/RightSidebarShell.tsx b/apps/desktop/src/renderer/features/right-sidebar/RightSidebarShell.tsxindex 62629579b4..4abdc0097d 100644--- a/apps/desktop/src/renderer/features/right-sidebar/RightSidebarShell.tsx+++ b/apps/desktop/src/renderer/features/right-sidebar/RightSidebarShell.tsx@@ -695,7 +695,8 @@ export function RightSidebarShell({const handleCycleTab = useCallback((direction: RightTabDirection): boolean => {- if (!sessionId) return false;+ // 独立页签窗口的激活位只在窗口本地,只有全局页签的窗口没有任务也要能切。+ if (!sessionId && !soloMode) return false;// 右侧栏存在但折叠 / 单 tab 时按键语义是 no-op,仍需消费以免漏给系统菜单。if (!shellVisible || tabs.length < 2) return true;const activeIndex = tabs.findIndex((tab) => tab.id === activeTabId);@@ -710,15 +711,15 @@ export function RightSidebarShell({handleActivate(nextTabId);return true;},- [activeTabId, handleActivate, sessionId, shellVisible, tabs],+ [activeTabId, handleActivate, sessionId, shellVisible, soloMode, tabs],);useAppShortcut('right-tab-prev', () => handleCycleTab('prev'), {- enabled: Boolean(sessionId) && (isPrimaryGroup || soloMode),+ enabled: soloMode || (Boolean(sessionId) && isPrimaryGroup),stopImmediate: true,});useAppShortcut('right-tab-next', () => handleCycleTab('next'), {- enabled: Boolean(sessionId) && (isPrimaryGroup || soloMode),+ enabled: soloMode || (Boolean(sessionId) && isPrimaryGroup),stopImmediate: true,});@@ -770,7 +771,7 @@ export function RightSidebarShell({useEffect(() => {// 只排除主窗的边组;独立页签窗口自己就是页签的承载方,浏览器 webview 转发的快捷键要收。- if (!sessionId || (!isPrimaryGroup && !soloMode)) return;+ if (!soloMode && (!sessionId || !isPrimaryGroup)) return;const off = window.electronAPI.onRsbBrowserCommand(({ command }) => {if (command === 'right-tab-prev') {handleCycleTab('prev');