Beautiful, AI-native markdown IDE and LLM wiki
TypeScript 2nd-brainagent-skillsclaudecodexcompany-braindocsknowledge-knowledge-baseknowledge-managementllmllm-wikillm-wiki-karpathymarkdownmarkdown-editormdmdxnotespkmsecond-brainskills
fix(ok): make the Agents panel auto-open deterministic across reloads (#4536)
Nick Gomez2b383e773ee1
diff --git a/.changeset/agents-panel-reload-visibility-level.md b/.changeset/agents-panel-reload-visibility-level.mdnew file mode 100644index 000000000..7b24e09f1--- /dev/null+++ b/.changeset/agents-panel-reload-visibility-level.md@@ -0,0 +1,6 @@+---+"@inkeep/open-knowledge": patch+"@inkeep/open-knowledge-desktop": patch+---++Reloading with live agent threads no longer forces the agents panel open. The panel reopens at the state you left it in, and only threads that go live after the reload reveal it. Browsers and projects with nothing recorded start closed and remember from the first session after updating.diff --git a/docs/content/features/editor.mdx b/docs/content/features/editor.mdxindex f697a908c..5b7078fd0 100644--- a/docs/content/features/editor.mdx+++ b/docs/content/features/editor.mdx@@ -146,6 +146,8 @@ Rename a tab by double-clicking it or pressing `F2`; the name you set pins overThe desktop app restores the Terminal's placement, right-panel width, tab order, active tab, and tab names after a full app restart. A full quit ends the shell processes and discards their scrollback; the restored tabs start new shells. This differs from moving, hiding, or reloading the editor window, which keeps the existing live sessions.+The Agents panel keeps its own open/closed memory: on the web it is remembered in your browser, on desktop with the project, where it also survives a full app restart and is restored at launch. A reload reopens the panel at that remembered state: threads already live at the reload never change it, so a panel you left closed stays closed, and a thread that goes live after the reload opens it. While the panel is closed, a dot on the **Open agents panel** tab marks live threads. A browser or a project with no recorded panel state starts with the panel closed and records the state from its first session onward.+On a narrow window, the right-side Terminal and Agents panel cannot remain open together. Opening either one closes the other and shows an in-app notice; closing the visible panel does not reopen the one that was displaced.The shells run at full user privilege. To turn the terminal off for a project on this machine, use **Settings ▸ Terminal** or set `terminal.enabled: false` in `.ok/local/config.yml` (see the [configuration reference](../reference/configuration.mdx)); the setting is project-local, never shared via git or sync, and not agent-settable — only a human can flip it. On Windows, set `terminal.shell` in the same file to an absolute shell executable if you want to override automatic PowerShell and `cmd.exe` discovery. PowerShell, `cmd.exe`, and Git Bash (`bash.exe`) support OpenKnowledge-managed launches (agent chat tabs and fixed commands such as **Resolve in terminal** or **Install Slidev**) and dropped-file path insertion. A different existing executable remains active for plain terminal tabs and shows a capability notice; requested agent and command launches open only the plain shell without running the agent or command, and dropped-file paths are refused. Enter WSL by running `wsl` inside a supported shell rather than setting `wsl.exe` as the override.diff --git a/packages/app/package.json b/packages/app/package.jsonindex bb4c75342..18e5fde98 100644--- a/packages/app/package.json+++ b/packages/app/package.json@@ -37,7 +37,7 @@"measure:stress": "bash scripts/measure-stress.sh","measure:sweep": "bash scripts/measure-sweep.sh","perf:compare": "bash scripts/perf-compare.sh",- "test:e2e": "playwright test tests/stress/list-item-drag.e2e.ts tests/stress/ux-interactions.e2e.ts tests/stress/file-tree-create.e2e.ts tests/stress/file-tree-drag-to-root.e2e.ts tests/stress/file-tree-deselect-to-root.e2e.ts tests/stress/file-tree-collapse-spaced-folder.e2e.ts tests/stress/sidebar-file-list-fills.e2e.ts tests/stress/file-tree-sticky-collapse.e2e.ts tests/stress/file-tree-collapse-persistence.e2e.ts tests/stress/file-tree-fractional-zoom.e2e.ts tests/stress/create-then-rename-editable.e2e.ts tests/stress/find-replace.e2e.ts tests/stress/editor-tabs.e2e.ts tests/stress/crdt-stress.e2e.ts tests/stress/slash-command.e2e.ts tests/stress/paste-fidelity.e2e.ts tests/stress/fr-7a-disconnect-source-mode.e2e.ts tests/stress/docs-open.e2e.ts tests/stress/frozen-table-headers.e2e.ts tests/stress/asset-embed.e2e.ts tests/stress/asset-embed-advanced.e2e.ts tests/stress/asset-click-dispatch.e2e.ts tests/stress/handoff.e2e.ts tests/stress/multi-agent-presence.e2e.ts tests/stress/editor-mode-persistence.e2e.ts tests/stress/lint-config-toggle.e2e.ts tests/stress/plugin-enable-notice.e2e.ts tests/stress/schema-edit-fields-view.e2e.ts tests/stress/sidebar-search-pill.e2e.ts tests/stress/navigation-history.e2e.ts tests/stress/command-palette-semantic.e2e.ts tests/stress/agent-activity-panel.e2e.ts tests/stress/drop-pipeline-auto-open.e2e.ts tests/stress/command-palette-flicker.e2e.ts tests/stress/cm6-list-hanging-indent.e2e.ts tests/stress/ng7-rapid-nav-coherence.e2e.ts tests/stress/reveal-on-activate.e2e.ts tests/stress/selection-indicator.e2e.ts tests/stress/new-file-cross-doc-bleed.e2e.ts tests/stress/new-item-shortcut-fast-path.e2e.ts tests/stress/editor-mode-flip-cross-doc-bleed.e2e.ts tests/stress/editor-area-viewport-resize.e2e.ts tests/stress/qa-sidebar-responsive.e2e.ts tests/stress/prd-6955-reassertion-repro.e2e.ts tests/stress/prd-6955-reassertion-wedge.e2e.ts tests/stress/prd-6914-repro.e2e.ts tests/stress/showall-lazy-tree.e2e.ts tests/stress/tabs-component-strip.e2e.ts tests/stress/source-find-scroll.e2e.ts tests/stress/harness-app-warmth.e2e.ts tests/stress/qa-canary-authoring-both-modes.e2e.ts tests/stress/qa-canary-live-typing.e2e.ts tests/stress/keystroke-cadence-danger-space.e2e.ts tests/stress/jsx-unregistered-backspace-delete.e2e.ts tests/stress/jsx-unregistered-ime-concurrent.e2e.ts tests/stress/jsx-backspace-delete.e2e.ts tests/stress/link-authoring-bytes.e2e.ts tests/stress/link-authoring-apex.e2e.ts tests/stress/command-palette-parity.e2e.ts tests/stress/settings-search.e2e.ts tests/stress/okf-generated-index-settings.e2e.ts tests/stress/okf-recommended-skill-install.e2e.ts tests/stress/chip-popover-positioning.e2e.ts tests/stress/docs-open-scroll-restore.e2e.ts tests/stress/file-tree-decoration-chip-strip-repro.e2e.ts tests/stress/grip-click-nodeselect.e2e.ts tests/stress/jsx-halo-semantics.e2e.ts tests/stress/jsx-image-body-click.e2e.ts tests/stress/jsx-prop-panel-placeholder.e2e.ts tests/stress/jsx-range-encompass-halo.e2e.ts tests/stress/jsx-wildcard-convert.e2e.ts tests/stress/markdown-lint.e2e.ts tests/stress/frontmatter-schema-badge.e2e.ts tests/stress/frontmatter-glob-picker.e2e.ts tests/stress/unified-problems.e2e.ts tests/stress/mid-type-recovery.e2e.ts tests/stress/observer-a-multi-client.e2e.ts tests/stress/outline-toolbar-occlusion.e2e.ts tests/stress/selection-surface-pane-clip.e2e.ts tests/stress/quiet-tree-hidden-doc.e2e.ts tests/stress/raw-mdx-fallback-onblur-upgrade.e2e.ts tests/stress/rename-noext-probe.e2e.ts tests/stress/show-ok-folders.e2e.ts tests/stress/source-polish.e2e.ts tests/stress/warm-skeleton-scroll-restore.e2e.ts tests/stress/props-toggle-scroll-preserve.e2e.ts tests/stress/yjs-no-dual-import.e2e.ts tests/stress/graph-panel-surfaces.e2e.ts tests/stress/asset-embed-real-fidelity.e2e.ts tests/stress/image-invalid-placeholder.e2e.ts tests/stress/local-target-audit.e2e.ts tests/stress/rename-content-preservation.e2e.ts tests/stress/rename-consolidation.e2e.ts tests/stress/outline-active-heading.e2e.ts tests/stress/outline-navigation.e2e.ts tests/stress/prd-7627-default-swatch.e2e.ts tests/stress/clipboard-dollar-math-source-fallback.e2e.ts tests/stress/source-mode-undo-keymap.e2e.ts tests/stress/source-undo-mode-flip.e2e.ts tests/stress/timeline-recovered-restore.e2e.ts tests/stress/blank-line-preservation.e2e.ts tests/stress/landing-helpers.e2e.ts tests/stress/agent-follow-scroll.e2e.ts tests/stress/mode-switch-landing.e2e.ts tests/stress/mode-switch-ordinal-divergence.e2e.ts tests/stress/comment-annotation-visibility.e2e.ts tests/stress/comment-opens-in-panel.e2e.ts tests/stress/qa-miles-edge-blanks.e2e.ts tests/stress/prop-upload.e2e.ts tests/stress/slash-command-auto-open.e2e.ts tests/stress/clipboard-relative-url-source-fallback.e2e.ts tests/stress/editor-split-view.e2e.ts tests/stress/language-load-failure.e2e.ts tests/stress/language-first-paint.e2e.ts tests/stress/user-text-direction.e2e.ts tests/stress/pseudolocale.e2e.ts tests/stress/language-picker.e2e.ts tests/stress/zh-hans-coverage-sweep.e2e.ts tests/stress/preview-tab-promotion.e2e.ts tests/stress/cv-paint-lock-click.e2e.ts tests/stress/cv-auto-paint-lock-click.e2e.ts tests/stress/history-traversal-preview-tab.e2e.ts tests/stress/tab-close-scroll-restore.e2e.ts tests/stress/skills-sidebar-open.e2e.ts tests/stress/trailing-affordance.e2e.ts tests/stress/text-doc-composer-inset.e2e.ts tests/stress/agents-settings-accessible-names.e2e.ts tests/stress/composer-growth-eof-reveal.e2e.ts tests/stress/theme-fade.e2e.ts tests/stress/theme-color-conversion.e2e.ts tests/stress/composer-open-caret-reveal.e2e.ts tests/stress/spellcheck-browser-absence.e2e.ts",+ "test:e2e": "playwright test tests/stress/list-item-drag.e2e.ts tests/stress/ux-interactions.e2e.ts tests/stress/file-tree-create.e2e.ts tests/stress/file-tree-drag-to-root.e2e.ts tests/stress/file-tree-deselect-to-root.e2e.ts tests/stress/file-tree-collapse-spaced-folder.e2e.ts tests/stress/sidebar-file-list-fills.e2e.ts tests/stress/file-tree-sticky-collapse.e2e.ts tests/stress/file-tree-collapse-persistence.e2e.ts tests/stress/file-tree-fractional-zoom.e2e.ts tests/stress/create-then-rename-editable.e2e.ts tests/stress/find-replace.e2e.ts tests/stress/editor-tabs.e2e.ts tests/stress/crdt-stress.e2e.ts tests/stress/slash-command.e2e.ts tests/stress/paste-fidelity.e2e.ts tests/stress/fr-7a-disconnect-source-mode.e2e.ts tests/stress/docs-open.e2e.ts tests/stress/frozen-table-headers.e2e.ts tests/stress/asset-embed.e2e.ts tests/stress/asset-embed-advanced.e2e.ts tests/stress/asset-click-dispatch.e2e.ts tests/stress/handoff.e2e.ts tests/stress/multi-agent-presence.e2e.ts tests/stress/editor-mode-persistence.e2e.ts tests/stress/lint-config-toggle.e2e.ts tests/stress/plugin-enable-notice.e2e.ts tests/stress/schema-edit-fields-view.e2e.ts tests/stress/sidebar-search-pill.e2e.ts tests/stress/navigation-history.e2e.ts tests/stress/command-palette-semantic.e2e.ts tests/stress/agent-activity-panel.e2e.ts tests/stress/drop-pipeline-auto-open.e2e.ts tests/stress/command-palette-flicker.e2e.ts tests/stress/cm6-list-hanging-indent.e2e.ts tests/stress/ng7-rapid-nav-coherence.e2e.ts tests/stress/reveal-on-activate.e2e.ts tests/stress/selection-indicator.e2e.ts tests/stress/new-file-cross-doc-bleed.e2e.ts tests/stress/new-item-shortcut-fast-path.e2e.ts tests/stress/editor-mode-flip-cross-doc-bleed.e2e.ts tests/stress/editor-area-viewport-resize.e2e.ts tests/stress/qa-sidebar-responsive.e2e.ts tests/stress/prd-6955-reassertion-repro.e2e.ts tests/stress/prd-6955-reassertion-wedge.e2e.ts tests/stress/prd-6914-repro.e2e.ts tests/stress/showall-lazy-tree.e2e.ts tests/stress/tabs-component-strip.e2e.ts tests/stress/source-find-scroll.e2e.ts tests/stress/harness-app-warmth.e2e.ts tests/stress/qa-canary-authoring-both-modes.e2e.ts tests/stress/qa-canary-live-typing.e2e.ts tests/stress/keystroke-cadence-danger-space.e2e.ts tests/stress/jsx-unregistered-backspace-delete.e2e.ts tests/stress/jsx-unregistered-ime-concurrent.e2e.ts tests/stress/jsx-backspace-delete.e2e.ts tests/stress/link-authoring-bytes.e2e.ts tests/stress/link-authoring-apex.e2e.ts tests/stress/command-palette-parity.e2e.ts tests/stress/settings-search.e2e.ts tests/stress/okf-generated-index-settings.e2e.ts tests/stress/okf-recommended-skill-install.e2e.ts tests/stress/chip-popover-positioning.e2e.ts tests/stress/docs-open-scroll-restore.e2e.ts tests/stress/file-tree-decoration-chip-strip-repro.e2e.ts tests/stress/grip-click-nodeselect.e2e.ts tests/stress/jsx-halo-semantics.e2e.ts tests/stress/jsx-image-body-click.e2e.ts tests/stress/jsx-prop-panel-placeholder.e2e.ts tests/stress/jsx-range-encompass-halo.e2e.ts tests/stress/jsx-wildcard-convert.e2e.ts tests/stress/markdown-lint.e2e.ts tests/stress/frontmatter-schema-badge.e2e.ts tests/stress/frontmatter-glob-picker.e2e.ts tests/stress/unified-problems.e2e.ts tests/stress/mid-type-recovery.e2e.ts tests/stress/observer-a-multi-client.e2e.ts tests/stress/outline-toolbar-occlusion.e2e.ts tests/stress/selection-surface-pane-clip.e2e.ts tests/stress/quiet-tree-hidden-doc.e2e.ts tests/stress/raw-mdx-fallback-onblur-upgrade.e2e.ts tests/stress/rename-noext-probe.e2e.ts tests/stress/show-ok-folders.e2e.ts tests/stress/source-polish.e2e.ts tests/stress/warm-skeleton-scroll-restore.e2e.ts tests/stress/props-toggle-scroll-preserve.e2e.ts tests/stress/yjs-no-dual-import.e2e.ts tests/stress/graph-panel-surfaces.e2e.ts tests/stress/asset-embed-real-fidelity.e2e.ts tests/stress/image-invalid-placeholder.e2e.ts tests/stress/local-target-audit.e2e.ts tests/stress/rename-content-preservation.e2e.ts tests/stress/rename-consolidation.e2e.ts tests/stress/outline-active-heading.e2e.ts tests/stress/outline-navigation.e2e.ts tests/stress/prd-7627-default-swatch.e2e.ts tests/stress/clipboard-dollar-math-source-fallback.e2e.ts tests/stress/source-mode-undo-keymap.e2e.ts tests/stress/source-undo-mode-flip.e2e.ts tests/stress/timeline-recovered-restore.e2e.ts tests/stress/blank-line-preservation.e2e.ts tests/stress/landing-helpers.e2e.ts tests/stress/agent-follow-scroll.e2e.ts tests/stress/mode-switch-landing.e2e.ts tests/stress/mode-switch-ordinal-divergence.e2e.ts tests/stress/comment-annotation-visibility.e2e.ts tests/stress/comment-opens-in-panel.e2e.ts tests/stress/qa-miles-edge-blanks.e2e.ts tests/stress/prop-upload.e2e.ts tests/stress/slash-command-auto-open.e2e.ts tests/stress/clipboard-relative-url-source-fallback.e2e.ts tests/stress/editor-split-view.e2e.ts tests/stress/language-load-failure.e2e.ts tests/stress/language-first-paint.e2e.ts tests/stress/user-text-direction.e2e.ts tests/stress/pseudolocale.e2e.ts tests/stress/language-picker.e2e.ts tests/stress/zh-hans-coverage-sweep.e2e.ts tests/stress/preview-tab-promotion.e2e.ts tests/stress/cv-paint-lock-click.e2e.ts tests/stress/cv-auto-paint-lock-click.e2e.ts tests/stress/history-traversal-preview-tab.e2e.ts tests/stress/tab-close-scroll-restore.e2e.ts tests/stress/skills-sidebar-open.e2e.ts tests/stress/trailing-affordance.e2e.ts tests/stress/text-doc-composer-inset.e2e.ts tests/stress/agents-settings-accessible-names.e2e.ts tests/stress/composer-growth-eof-reveal.e2e.ts tests/stress/theme-fade.e2e.ts tests/stress/theme-color-conversion.e2e.ts tests/stress/composer-open-caret-reveal.e2e.ts tests/stress/spellcheck-browser-absence.e2e.ts tests/stress/agents-panel-reload-visibility.e2e.ts","test:e2e:install-browsers": "playwright install chromium webkit firefox","test:visual": "playwright test --config playwright.visual.config.ts","test:visual:update": "playwright test --config playwright.visual.config.ts --update-snapshots",diff --git a/packages/app/src/components/EditorArea.dom.test.tsx b/packages/app/src/components/EditorArea.dom.test.tsxindex 1fd6be65a..7e3170b51 100644--- a/packages/app/src/components/EditorArea.dom.test.tsx+++ b/packages/app/src/components/EditorArea.dom.test.tsx@@ -13,6 +13,10 @@ let settingsRouteOpen = false;let closeSettingsRouteMock = vi.fn(() => {});let shellProps: SettingsDialogShellProps[] = [];let toastInfoMessages: string[] = [];+const railPanelOnResizeById = new Map<+ string,+ ((size: { asPercentage: number; inPixels: number }) => void) | null+>();vi.doMock('sonner', async (importOriginal) => {const actual = await importOriginal<typeof import('sonner')>();@@ -232,16 +236,21 @@ vi.doMock('@/components/ui/resizable', () => ({id,minSize,maxSize,+ onResize,}: {children: ReactNode;id?: string;minSize?: string | number;maxSize?: string | number;- }) => (- <div id={id} data-min-size={minSize} data-max-size={maxSize}>- {children}- </div>- ),+ onResize?: (size: { asPercentage: number; inPixels: number }) => void;+ }) => {+ if (id != null) railPanelOnResizeById.set(id, onResize ?? null);+ return (+ <div id={id} data-min-size={minSize} data-max-size={maxSize}>+ {children}+ </div>+ );+ },ResizableHandle: ({ onPointerDown }: { onPointerDown?: (e: unknown) => void }) => (<div data-testid="resizable-handle" onPointerDown={onPointerDown} />),@@ -319,6 +328,7 @@ const { EditorArea } = await import('./EditorArea');const { TooltipProvider } = await import('@/components/ui/tooltip');const { emitLocalMenuAction } = await import('@/lib/local-menu-action-bus');const { requestDocPanelTab } = await import('./doc-panel-events');+const { AGENTS_COLUMN_ID, TERMINAL_COLUMN_ID } = await import('./editor-area-rail-registry');function renderEditorArea() {return render(@@ -1506,3 +1516,346 @@ describe('EditorArea doc-panel tab requests', () => {expect(groupSetLayoutCalls).toHaveLength(1);});});++describe('EditorArea rail mount inert', () => {+ const railProps = {+ editorMode: 'wysiwyg',+ onModeChange: () => {},+ activeTab: 'timeline',+ onActiveTabChange: () => {},+ onAgentsVisibleChange: () => {},+ } as const;++ beforeEach(() => {+ cleanup();+ panelIsCollapsed = false;+ railPanelOnResizeById.clear();+ });++ const renderArea = (props: Record<string, unknown>) =>+ render(+ <TooltipProvider>+ <EditorArea {...railProps} {...props} />+ </TooltipProvider>,+ );++ test('both rail mounts are inert while their columns are absent', () => {+ const { container } = renderArea({});++ expect(+ container.querySelector('[data-agents-panel-mount]')?.getAttribute('inert'),+ ).not.toBeNull();+ expect(+ container.querySelector('[data-terminal-panel-mount]')?.getAttribute('inert'),+ ).not.toBeNull();+ });++ test('both rail mounts stay focusable while their columns are open', () => {+ const { container } = renderArea({+ agentsVisible: true,+ terminalBridge: { terminal: {} } as never,+ terminalVisible: true,+ terminalPlacement: 'right',+ });++ expect(container.querySelector('[data-agents-panel-mount]')?.getAttribute('inert')).toBeNull();+ expect(+ container.querySelector('[data-terminal-panel-mount]')?.getAttribute('inert'),+ ).toBeNull();+ });++ test('a drag-collapsed rail column stays focusable while the hold bridges the drag and goes inert once pointerup clears its presence', () => {+ const RailVisibilityHost = () => {+ const [agentsVisible, setAgentsVisible] = useState(true);+ const [terminalVisible, setTerminalVisible] = useState(true);+ return (+ <TooltipProvider>+ <EditorArea+ {...railProps}+ agentsVisible={agentsVisible}+ onAgentsVisibleChange={setAgentsVisible}+ terminalBridge={{ terminal: {} } as never}+ terminalVisible={terminalVisible}+ terminalPlacement="right"+ onTerminalVisibleChange={setTerminalVisible}+ />+ </TooltipProvider>+ );+ };+ const { container } = render(<RailVisibilityHost />);+ const agentsMount = () => container.querySelector('[data-agents-panel-mount]');+ const terminalMount = () => container.querySelector('[data-terminal-panel-mount]');+ const railHandle = (position: -1 | -2) => {+ const handle = screen.getAllByTestId('resizable-handle').at(position);+ if (handle == null) throw new Error('rail resize handle not found');+ return handle;+ };+ expect(agentsMount()?.getAttribute('inert')).toBeNull();+ expect(terminalMount()?.getAttribute('inert')).toBeNull();++ act(() => {+ fireEvent.pointerDown(railHandle(-1), { pointerId: 1 });+ });+ act(() => {+ railPanelOnResizeById.get(AGENTS_COLUMN_ID)?.({ asPercentage: 0, inPixels: 0 });+ });+ expect(agentsMount()?.getAttribute('inert')).toBeNull();++ panelIsCollapsed = true;+ act(() => {+ fireEvent.pointerUp(window, { pointerId: 1 });+ });+ expect(agentsMount()?.getAttribute('inert')).not.toBeNull();++ act(() => {+ fireEvent.pointerDown(railHandle(-2), { pointerId: 2 });+ });+ act(() => {+ railPanelOnResizeById.get(TERMINAL_COLUMN_ID)?.({ asPercentage: 0, inPixels: 0 });+ });+ expect(terminalMount()?.getAttribute('inert')).toBeNull();++ act(() => {+ fireEvent.pointerUp(window, { pointerId: 2 });+ });+ expect(terminalMount()?.getAttribute('inert')).not.toBeNull();+ expect(agentsMount()?.getAttribute('inert')).not.toBeNull();+ });++ test('a present-but-measured-collapsed rail reports isShowing false so reveal focus waits for expansion', () => {+ const placements: Array<{+ agents?: { isShowing?: boolean };+ terminal?: { isShowing?: boolean };+ }> = [];+ const { container } = renderArea({+ agentsVisible: true,+ terminalBridge: { terminal: {} } as never,+ terminalVisible: true,+ terminalPlacement: 'right',+ onSessionPlacements: (placement: unknown) =>+ placements.push(+ placement as {+ agents?: { isShowing?: boolean };+ terminal?: { isShowing?: boolean };+ },+ ),+ });+ expect(placements.at(-1)?.agents?.isShowing).toBe(true);+ expect(placements.at(-1)?.terminal?.isShowing).toBe(true);++ act(() => {+ railPanelOnResizeById.get(AGENTS_COLUMN_ID)?.({ asPercentage: 0, inPixels: 0 });+ });+ expect(+ container.querySelector('[data-agents-panel-mount]')?.getAttribute('inert'),+ ).not.toBeNull();+ expect(placements.at(-1)?.agents?.isShowing).toBe(false);++ act(() => {+ railPanelOnResizeById.get(TERMINAL_COLUMN_ID)?.({ asPercentage: 0, inPixels: 0 });+ });+ expect(+ container.querySelector('[data-terminal-panel-mount]')?.getAttribute('inert'),+ ).not.toBeNull();+ expect(placements.at(-1)?.terminal?.isShowing).toBe(false);++ act(() => {+ railPanelOnResizeById.get(AGENTS_COLUMN_ID)?.({ asPercentage: 25, inPixels: 300 });+ });+ expect(container.querySelector('[data-agents-panel-mount]')?.getAttribute('inert')).toBeNull();+ expect(placements.at(-1)?.agents?.isShowing).toBe(true);++ act(() => {+ railPanelOnResizeById.get(TERMINAL_COLUMN_ID)?.({ asPercentage: 25, inPixels: 300 });+ });+ expect(+ container.querySelector('[data-terminal-panel-mount]')?.getAttribute('inert'),+ ).toBeNull();+ expect(placements.at(-1)?.terminal?.isShowing).toBe(true);+ });++ test('a drag that dips a rail to zero and back — repeatedly — never flips its showing signal', () => {+ const placements: Array<{+ agents?: { isShowing?: boolean };+ terminal?: { isShowing?: boolean };+ }> = [];+ const { container } = renderArea({+ agentsVisible: true,+ terminalBridge: { terminal: {} } as never,+ terminalVisible: true,+ terminalPlacement: 'right',+ onSessionPlacements: (placement: unknown) =>+ placements.push(+ placement as {+ agents?: { isShowing?: boolean };+ terminal?: { isShowing?: boolean };+ },+ ),+ });+ expect(placements.at(-1)?.agents?.isShowing).toBe(true);+ expect(placements.at(-1)?.terminal?.isShowing).toBe(true);++ const railHandle = (position: -1 | -2) => {+ const handle = screen.getAllByTestId('resizable-handle').at(position);+ if (handle == null) throw new Error('rail resize handle not found');+ return handle;+ };+ const dip = (columnId: string) => {+ act(() => {+ railPanelOnResizeById.get(columnId)?.({ asPercentage: 0, inPixels: 0 });+ });+ };+ const recover = (columnId: string) => {+ act(() => {+ railPanelOnResizeById.get(columnId)?.({ asPercentage: 25, inPixels: 300 });+ });+ };++ const agentsDragStart = placements.length;+ act(() => {+ fireEvent.pointerDown(railHandle(-1), { pointerId: 1 });+ });+ for (let i = 0; i < 2; i += 1) {+ dip(AGENTS_COLUMN_ID);+ expect(+ container.querySelector('[data-agents-panel-mount]')?.getAttribute('inert'),+ ).toBeNull();+ expect(placements.at(-1)?.agents?.isShowing).toBe(true);+ recover(AGENTS_COLUMN_ID);+ expect(+ container.querySelector('[data-agents-panel-mount]')?.getAttribute('inert'),+ ).toBeNull();+ expect(placements.at(-1)?.agents?.isShowing).toBe(true);+ }+ act(() => {+ fireEvent.pointerUp(window, { pointerId: 1 });+ });+ expect(placements.at(-1)?.agents?.isShowing).toBe(true);+ expect(+ placements.slice(agentsDragStart).some((placement) => placement.agents?.isShowing === false),+ ).toBe(false);++ const terminalDragStart = placements.length;+ act(() => {+ fireEvent.pointerDown(railHandle(-2), { pointerId: 2 });+ });+ for (let i = 0; i < 2; i += 1) {+ dip(TERMINAL_COLUMN_ID);+ expect(+ container.querySelector('[data-terminal-panel-mount]')?.getAttribute('inert'),+ ).toBeNull();+ expect(placements.at(-1)?.terminal?.isShowing).toBe(true);+ recover(TERMINAL_COLUMN_ID);+ expect(+ container.querySelector('[data-terminal-panel-mount]')?.getAttribute('inert'),+ ).toBeNull();+ expect(placements.at(-1)?.terminal?.isShowing).toBe(true);+ }+ act(() => {+ fireEvent.pointerUp(window, { pointerId: 2 });+ });+ expect(placements.at(-1)?.terminal?.isShowing).toBe(true);+ expect(+ placements+ .slice(terminalDragStart)+ .some((placement) => placement.terminal?.isShowing === false),+ ).toBe(false);++ act(() => {+ railPanelOnResizeById.get(AGENTS_COLUMN_ID)?.({ asPercentage: 0, inPixels: 0 });+ });+ expect(placements.at(-1)?.agents?.isShowing).toBe(false);+ act(() => {+ railPanelOnResizeById.get(TERMINAL_COLUMN_ID)?.({ asPercentage: 0, inPixels: 0 });+ });+ expect(placements.at(-1)?.terminal?.isShowing).toBe(false);+ });++ test('a pointercancel at measured collapse holds the showing signal until the drag-free expansion lands', () => {+ const placements: Array<{+ agents?: { isShowing?: boolean };+ terminal?: { isShowing?: boolean };+ }> = [];+ const { container } = renderArea({+ agentsVisible: true,+ terminalBridge: { terminal: {} } as never,+ terminalVisible: true,+ terminalPlacement: 'right',+ onSessionPlacements: (placement: unknown) =>+ placements.push(+ placement as {+ agents?: { isShowing?: boolean };+ terminal?: { isShowing?: boolean };+ },+ ),+ });++ const railHandle = (position: -1 | -2) => {+ const handle = screen.getAllByTestId('resizable-handle').at(position);+ if (handle == null) throw new Error('rail resize handle not found');+ return handle;+ };++ const agentsDragStart = placements.length;+ act(() => {+ fireEvent.pointerDown(railHandle(-1), { pointerId: 1 });+ });+ act(() => {+ railPanelOnResizeById.get(AGENTS_COLUMN_ID)?.({ asPercentage: 0, inPixels: 0 });+ });+ panelIsCollapsed = true;+ act(() => {+ fireEvent.pointerCancel(window, { pointerId: 1 });+ });+ expect(container.querySelector('[data-agents-panel-mount]')?.getAttribute('inert')).toBeNull();+ expect(placements.at(-1)?.agents?.isShowing).toBe(true);+ expect(+ placements.slice(agentsDragStart).some((placement) => placement.agents?.isShowing === false),+ ).toBe(false);++ panelIsCollapsed = false;+ act(() => {+ railPanelOnResizeById.get(AGENTS_COLUMN_ID)?.({ asPercentage: 25, inPixels: 300 });+ });+ expect(container.querySelector('[data-agents-panel-mount]')?.getAttribute('inert')).toBeNull();+ expect(placements.at(-1)?.agents?.isShowing).toBe(true);+ act(() => {+ railPanelOnResizeById.get(AGENTS_COLUMN_ID)?.({ asPercentage: 0, inPixels: 0 });+ });+ expect(placements.at(-1)?.agents?.isShowing).toBe(false);++ const terminalDragStart = placements.length;+ act(() => {+ fireEvent.pointerDown(railHandle(-2), { pointerId: 2 });+ });+ act(() => {+ railPanelOnResizeById.get(TERMINAL_COLUMN_ID)?.({ asPercentage: 0, inPixels: 0 });+ });+ panelIsCollapsed = true;+ act(() => {+ fireEvent.pointerCancel(window, { pointerId: 2 });+ });+ expect(+ container.querySelector('[data-terminal-panel-mount]')?.getAttribute('inert'),+ ).toBeNull();+ expect(placements.at(-1)?.terminal?.isShowing).toBe(true);+ expect(+ placements+ .slice(terminalDragStart)+ .some((placement) => placement.terminal?.isShowing === false),+ ).toBe(false);++ panelIsCollapsed = false;+ act(() => {+ railPanelOnResizeById.get(TERMINAL_COLUMN_ID)?.({ asPercentage: 25, inPixels: 300 });+ });+ expect(+ container.querySelector('[data-terminal-panel-mount]')?.getAttribute('inert'),+ ).toBeNull();+ expect(placements.at(-1)?.terminal?.isShowing).toBe(true);+ act(() => {+ railPanelOnResizeById.get(TERMINAL_COLUMN_ID)?.({ asPercentage: 0, inPixels: 0 });+ });+ expect(placements.at(-1)?.terminal?.isShowing).toBe(false);+ });+});diff --git a/packages/app/src/components/EditorArea.tsx b/packages/app/src/components/EditorArea.tsxindex 2f8909bc0..ede64fb41 100644--- a/packages/app/src/components/EditorArea.tsx+++ b/packages/app/src/components/EditorArea.tsx@@ -388,12 +388,20 @@ function EditorAreaInner({const agentsColumnPresent = !noteWindow && agentsVisible;const terminalColumnPresent = !noteWindow && terminalVisible && terminalPlacement === 'right';+ const [agentsColumnCollapsed, setAgentsColumnCollapsed] = useState(false);+ const [terminalColumnCollapsed, setTerminalColumnCollapsed] = useState(false);+ const [agentsShowingHold, setAgentsShowingHold] = useState(false);+ const [terminalShowingHold, setTerminalShowingHold] = useState(false);const resizableRailColumnPresent = terminalColumnPresent || agentsColumnPresent;const rightRevealTabPresent = !noteWindow && !agentsVisible && onRevealAgents != null;const terminalContainer =terminalPlacement === 'right' ? rightTerminalContainer : bottomTerminalContainer;- const terminalShowing = terminalVisible && terminalContainer != null;- const agentsShowing = agentsColumnPresent && agentsContainer != null;+ const terminalShowing =+ terminalVisible &&+ terminalContainer != null &&+ (terminalPlacement !== 'right' || !terminalColumnCollapsed || terminalShowingHold);+ const agentsShowing =+ agentsColumnPresent && (!agentsColumnCollapsed || agentsShowingHold) && agentsContainer != null;useEffect(() => {onSessionPlacements?.({terminal: { container: terminalContainer, isShowing: terminalShowing },@@ -408,6 +416,10 @@ function EditorAreaInner({agentsShowing,terminalEditorRegion,]);+ useEffect(() => {+ if (!agentsColumnPresent) setAgentsShowingHold(false);+ if (!terminalColumnPresent) setTerminalShowingHold(false);+ }, [agentsColumnPresent, terminalColumnPresent]);useEffect(() => {isCollapsedRef.current = isCollapsed;@@ -745,6 +757,7 @@ function EditorAreaInner({setDragging: (dragging: boolean) => void,draggingRef: { current: boolean },onCommit?: () => void,+ onDragEnd?: () => void,) {endHandleDragRef.current?.();setDragging(true);@@ -755,6 +768,7 @@ function EditorAreaInner({endHandleDragRef.current = null;setDragging(false);draggingRef.current = false;+ onDragEnd?.();}function onPointerUp(event: PointerEvent) {if (event.pointerId !== pointerId) return;@@ -1386,6 +1400,9 @@ function EditorAreaInner({onTerminalVisibleChange?.(false);}},+ () => {+ if (!terminalColumnPanelRef.current?.isCollapsed()) setTerminalShowingHold(false);+ },);}}/>@@ -1402,6 +1419,12 @@ function EditorAreaInner({terminalWidthPxRef.current = size.inPixels;debouncedWriteTerminalWidth(size.inPixels);}+ setTerminalColumnCollapsed(size.inPixels === 0);+ if (size.inPixels === 0 && isDraggingTerminalHandleRef.current) {+ setTerminalShowingHold(true);+ } else if (size.inPixels > 0 && !isDraggingTerminalHandleRef.current) {+ setTerminalShowingHold(false);+ }reclaimHiddenRailColumn(TERMINAL_COLUMN_ID, terminalColumnPresent, size.inPixels);}}className="flex flex-col"@@ -1409,6 +1432,7 @@ function EditorAreaInner({<divref={setRightTerminalContainer}data-terminal-panel-mount=""+ inert={!terminalColumnPresent || (terminalColumnCollapsed && !terminalShowingHold)}className="flex min-h-0 flex-1 flex-col overflow-hidden"/></ResizablePanel>@@ -1431,6 +1455,9 @@ function EditorAreaInner({onAgentsVisibleChange?.(false);}},+ () => {+ if (!agentsColumnPanelRef.current?.isCollapsed()) setAgentsShowingHold(false);+ },);}}/>@@ -1447,6 +1474,12 @@ function EditorAreaInner({agentsWidthPxRef.current = size.inPixels;debouncedWriteAgentsWidth(size.inPixels);}+ setAgentsColumnCollapsed(size.inPixels === 0);+ if (size.inPixels === 0 && isDraggingAgentsHandleRef.current) {+ setAgentsShowingHold(true);+ } else if (size.inPixels > 0 && !isDraggingAgentsHandleRef.current) {+ setAgentsShowingHold(false);+ }reclaimHiddenRailColumn(AGENTS_COLUMN_ID, agentsColumnPresent, size.inPixels);}}className="flex flex-col"@@ -1455,6 +1488,7 @@ function EditorAreaInner({<divref={setAgentsContainer}data-agents-panel-mount=""+ inert={!agentsColumnPresent || (agentsColumnCollapsed && !agentsShowingHold)}className="flex min-h-0 flex-1 flex-col overflow-hidden"/></ResizablePanel>diff --git a/packages/app/src/components/EditorPane.agents-panel-reload-visibility.dom.test.tsx b/packages/app/src/components/EditorPane.agents-panel-reload-visibility.dom.test.tsxnew file mode 100644index 000000000..618ed74ea--- /dev/null+++ b/packages/app/src/components/EditorPane.agents-panel-reload-visibility.dom.test.tsx@@ -0,0 +1,935 @@+import type { ThreadInfo } from '@inkeep/open-knowledge-core/acp/thread-protocol';+import * as actualLinguiMacro from '@lingui/react/macro';+import { act, cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react';+import type { ReactNode } from 'react';+import { useEffect, useState, useSyncExternalStore } from 'react';+import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest';+import { TooltipProvider } from '@/components/ui/tooltip';+import { reloadEnabledAgentsFromStorage } from '@/lib/acp/enabled-agents';+import type { OkDesktopBridge } from '@/lib/desktop-bridge-types';+import {+ readWebDockSessionOrder,+ writeAgentsPanelLevel,+ writeDockSessionOrder,+} from '@/lib/dock-session-persistence';+import { emitLocalMenuAction } from '@/lib/local-menu-action-bus';++let openThreads: ThreadInfo[] = [];+let archivedThreads: ThreadInfo[] = [];+let connectionStatus: 'idle' | 'connecting' | 'open' | 'closed' = 'open';+let rosterThreadIds: ReadonlySet<string> | null = null;+const storeListeners = new Set<() => void>();++function notifyStore() {+ for (const listener of storeListeners) listener();+}++function setOpenThreads(next: ThreadInfo[]) {+ openThreads = next;+ notifyStore();+}++function deliverRosterThreads(next: ThreadInfo[]) {+ if (rosterThreadIds === null) {+ rosterThreadIds = new Set(next.map((info) => info.threadId));+ }+ setOpenThreads(next);+}++function pushLiveThreads(next: ThreadInfo[]) {+ setOpenThreads(next);+}++function subscribeStore(callback: () => void) {+ storeListeners.add(callback);+ return () => storeListeners.delete(callback);+}++vi.doMock('@/lib/acp/thread-client', () => ({+ useOpenAgentThreadTabs: () =>+ useSyncExternalStore(+ subscribeStore,+ () => openThreads,+ () => openThreads,+ ),+ useInitialRosterThreadIds: () => rosterThreadIds,+ useArchivedAgentThreads: () =>+ useSyncExternalStore(+ subscribeStore,+ () => archivedThreads,+ () => archivedThreads,+ ),+ useAgentThreadConnection: () =>+ useSyncExternalStore(+ subscribeStore,+ () => connectionStatus,+ () => connectionStatus,+ ),+ useAgentThreadUnread: () => false,+ getAgentThreadClient: () => ({+ closeThread: vi.fn(),+ renameThread: vi.fn(),+ openArchivedThread: vi.fn(),+ deleteThread: vi.fn(),+ markThreadViewed: () => {},+ }),+ ThreadChannelUnavailableError: class ThreadChannelUnavailableError extends Error {},+}));++vi.doMock('@/components/acp/ThreadView', () => ({+ ThreadView: ({ info }: { info: ThreadInfo }) => (+ <div data-testid="thread-view" data-thread-id={info.threadId} />+ ),+}));++const registerAgent = vi.fn((_agent: unknown) => {});++const { pickEffectiveDefaultAgent } = await vi.importActual<+ typeof import('@/lib/acp/registered-agents')+>('@/lib/acp/registered-agents');++vi.doMock('@/lib/acp/registered-agents', () => ({+ useRegisteredAgents: () => [],+ useDefaultRegisteredAgent: () => null,+ getDefaultRegisteredAgent: () => null,+ registerAgent,+ pickEffectiveDefaultAgent,+ hydrateRegisteredAgentMeta: () => {},+}));++vi.doMock('sonner', () => ({+ toast: { error: vi.fn(), info: vi.fn(), success: vi.fn(), warning: vi.fn(), message: vi.fn() },+}));++vi.doMock('@/lib/acp/launch-agent-thread', () => ({+ launchAgentThread: vi.fn(() => Promise.resolve('started' as const)),+ hasInflightThreadLaunch: () => false,+}));++vi.doMock('@tanstack/react-query', () => ({+ useQuery: () => ({ data: undefined, isLoading: false, isError: false }),+}));++vi.doMock('@lingui/react/macro', () => ({+ ...actualLinguiMacro,+ Trans: ({ children }: { children: ReactNode }) => <>{children}</>,+ Plural: ({ value, one, other }: { value: number; one: string; other: string }) => (+ <>{(value === 1 ? one : other).replace('#', String(value))}</>+ ),+ useLingui: () => ({+ t: (strings: TemplateStringsArray, ...values: unknown[]) =>+ strings.reduce((acc, part, index) => `${acc}${part}${values[index] ?? ''}`, ''),+ }),+}));++vi.doMock('@/hooks/use-git-sync-status', () => ({+ useGitSyncStatus: () => ({ hasRemote: false, pushPermission: { checkStatus: 'allowed' } }),+}));++vi.doMock('@/lib/config-provider', () => ({+ useConfigContext: () => ({+ projectConfig: null,+ projectLocalConfig: null,+ projectLocalSynced: false,+ projectSynced: false,+ }),+}));++vi.doMock('@/lib/use-workspace', () => ({+ useWorkspace: () => ({ contentDir: '/tmp/project', pathSeparator: '/' }),+}));++vi.doMock('@/editor/DocumentContext', () => ({+ useDocumentContext: () => ({+ activeDocName: 'docs/notes',+ collabUrl: 'ws://test',+ activeProvider: undefined,+ }),+ isBlobRunnerNewTabId: () => false,+}));++vi.doMock('@/editor/preview-tab-promotion', () => ({+ requestPreviewTabPromotion: () => {},+}));++vi.doMock('@/editor/use-editor-mode', () => ({+ useEditorMode: () => ['wysiwyg', () => {}],+}));++vi.doMock('./EditorHeader', () => ({+ EditorHeader: ({ children }: { children?: ReactNode }) => (+ <div data-testid="editor-header">{children}</div>+ ),+}));++vi.doMock('./EditorArea', () => ({+ EditorArea: ({+ agentsVisible,+ onAgentsVisibleChange,+ onRevealAgents,+ onSessionPlacements,+ }: {+ agentsVisible?: boolean;+ onAgentsVisibleChange?: (visible: boolean) => void;+ onRevealAgents?: () => void;+ onSessionPlacements?: (placements: unknown) => void;+ }) => {+ const [agentsContainer] = useState(() => document.createElement('div'));+ const [terminalContainer] = useState(() => document.createElement('div'));+ useEffect(() => {+ onSessionPlacements?.({+ terminal: { container: terminalContainer, isShowing: false },+ agents: { container: agentsContainer, isShowing: agentsVisible === true },+ editorRegion: document.createElement('div'),+ });+ }, [agentsContainer, terminalContainer, agentsVisible, onSessionPlacements]);+ if (agentsVisible)+ return (+ <div data-testid="agents-column">+ <button+ type="button"+ data-testid="agents-collapse"+ onClick={() => onAgentsVisibleChange?.(false)}+ />+ </div>+ );+ if (onRevealAgents != null)+ return (+ <button type="button" data-testid="agents-reveal-tab" onClick={() => onRevealAgents()} />+ );+ return null;+ },+}));++vi.doMock('./acp/AgentThreadClientBinder', () => ({+ AgentThreadClientBinder: () => null,+}));++vi.doMock('@/lib/terminal-telemetry', () => ({+ recordTerminalOpened: () => {},+ recordShellConsentGranted: () => undefined,+}));++vi.doMock('./AuthModal', () => ({+ AuthModal: () => <div data-testid="auth-modal" />,+}));++vi.doMock('@/editor/components/TagDialog', () => ({+ TagDialog: () => <div data-testid="tag-dialog" />,+}));++vi.doMock('./AutoSyncOnboardingDialog', () => ({+ AutoSyncOnboardingDialog: () => <div data-testid="auto-sync-onboarding" />,+}));++const { EditorPane } = await import('./EditorPane');++type DockStatePayload = {+ terminalVisible: boolean;+ agentPanelVisible: boolean;+};++function makeThread(overrides: Partial<ThreadInfo> & { threadId: string }): ThreadInfo {+ return {+ agent: { id: 'a', name: 'Agent', source: 'registry' },+ title: overrides.threadId,+ status: 'ready',+ createdAt: 1,+ lastActivityAt: 1,+ lastSeq: 0,+ archived: false,+ ...overrides,+ };+}++function seedPersistedAgentsPanelLevel(agentPanelVisible: boolean): void {+ writeDockSessionOrder(null, 'agents', { order: ['t1'], activeKey: 't1' });+ writeAgentsPanelLevel(null, agentPanelVisible);+}++function seedLegacyRecordWithoutPanelLevel(): void {+ writeDockSessionOrder(null, 'agents', { order: ['t1'], activeKey: 't1' });+}++function readPersistedAgentsPanelLevel(): boolean | undefined {+ return readWebDockSessionOrder('agents')?.agentPanelVisible;+}++function deferredDockState(): {+ promise: Promise<DockStatePayload>;+ resolve: (state: DockStatePayload) => void;+ reject: (reason: unknown) => void;+} {+ let resolve!: (state: DockStatePayload) => void;+ let reject!: (reason: unknown) => void;+ const promise = new Promise<DockStatePayload>((res, rej) => {+ resolve = res;+ reject = rej;+ });+ return { promise, resolve, reject };+}++function installDesktopBridge(+ getDockState: () => Promise<DockStatePayload>,+ hooks: { onViewMenuStateChanged?: (state: Record<string, unknown>) => void } = {},+): void {+ (window as { okDesktop?: unknown }).okDesktop = {+ config: { ptyAvailable: true },+ platform: 'darwin',+ onMenuAction: () => () => {},+ editor: {+ notifyViewMenuStateChanged: (state: Record<string, unknown>) =>+ hooks.onViewMenuStateChanged?.(state),+ },+ terminal: {+ getDockState,+ setDockState: () => ({ ok: true as const }),+ cliInstalledMap: async () => ({+ claude: true,+ codex: false,+ opencode: false,+ cursor: false,+ }),+ },+ } as unknown as OkDesktopBridge;+}++async function renderPane(expectedStoreSubscribers: number): Promise<void> {+ render(+ <TooltipProvider>+ <EditorPane />+ </TooltipProvider>,+ );+ await act(async () => {});+ await vi.dynamicImportSettled();+ await act(async () => {});+ await waitFor(+ () => expect(storeListeners.size).toBeGreaterThanOrEqual(expectedStoreSubscribers),+ { timeout: 5_000 },+ );+}++describe('EditorPane agents-panel reload visibility', () => {+ beforeEach(() => {+ openThreads = [];+ archivedThreads = [];+ connectionStatus = 'open';+ rosterThreadIds = null;+ localStorage.clear();+ reloadEnabledAgentsFromStorage();+ });++ afterEach(() => {+ cleanup();+ delete (window as { okDesktop?: unknown }).okDesktop;+ });++ test('web: a fresh mount restores a persisted open agents panel', async () => {+ seedPersistedAgentsPanelLevel(true);++ await renderPane(3);++ expect(screen.queryByTestId('agents-column')).not.toBeNull();+ expect(screen.queryByTestId('agents-reveal-tab')).toBeNull();+ });++ test('web: the reload roster snapshot does not reveal a panel persisted closed', async () => {+ seedPersistedAgentsPanelLevel(false);++ await renderPane(3);++ expect(screen.queryByTestId('agents-column')).toBeNull();+ expect(screen.queryByTestId('agents-reveal-tab')).not.toBeNull();++ await act(async () => {+ deliverRosterThreads([makeThread({ threadId: 't1' })]);+ });++ expect(screen.queryByTestId('agents-column')).toBeNull();+ });++ test('web: a thread going live after the reload roster snapshot reveals the persisted-closed panel', async () => {+ seedPersistedAgentsPanelLevel(false);++ await renderPane(3);++ await act(async () => {+ deliverRosterThreads([makeThread({ threadId: 't1' })]);+ });+ await act(async () => {+ pushLiveThreads([+ makeThread({ threadId: 't1' }),+ makeThread({ threadId: 't2', createdAt: 2, lastActivityAt: 2 }),+ ]);+ });++ expect(screen.queryByTestId('agents-column')).not.toBeNull();+ });++ test('web: a thread arriving after an empty reload roster reveals the persisted-closed panel', async () => {+ seedPersistedAgentsPanelLevel(false);++ await renderPane(3);++ await act(async () => {+ deliverRosterThreads([]);+ });+ await act(async () => {+ pushLiveThreads([makeThread({ threadId: 't1' })]);+ });++ expect(screen.queryByTestId('agents-column')).not.toBeNull();+ });++ test('web: a thread arriving after a persisted-open reload is collapsed reveals the panel', async () => {+ seedPersistedAgentsPanelLevel(true);++ await renderPane(3);++ expect(screen.queryByTestId('agents-column')).not.toBeNull();++ await act(async () => {+ deliverRosterThreads([makeThread({ threadId: 't1' })]);+ });+ await act(async () => {+ fireEvent.click(screen.getByTestId('agents-collapse'));+ });++ expect(screen.queryByTestId('agents-reveal-tab')).not.toBeNull();++ await act(async () => {+ pushLiveThreads([+ makeThread({ threadId: 't1' }),+ makeThread({ threadId: 't2', createdAt: 2, lastActivityAt: 2 }),+ ]);+ });++ expect(screen.queryByTestId('agents-column')).not.toBeNull();+ });++ test('web: a legacy record without the panel level starts closed and the roster does not reveal it', async () => {+ seedLegacyRecordWithoutPanelLevel();++ await renderPane(3);++ expect(screen.queryByTestId('agents-column')).toBeNull();+ expect(screen.queryByTestId('agents-reveal-tab')).not.toBeNull();++ await act(async () => {+ deliverRosterThreads([makeThread({ threadId: 't1' })]);+ });++ expect(screen.queryByTestId('agents-column')).toBeNull();+ });++ test('desktop: a roster snapshot landing while the dock restore is pending does not reveal the closed panel', async () => {+ const pendingDockState = deferredDockState();+ installDesktopBridge(() => pendingDockState.promise);++ await renderPane(6);++ expect(screen.queryByTestId('agents-column')).toBeNull();+ expect(screen.queryByTestId('agents-reveal-tab')).not.toBeNull();++ await act(async () => {+ deliverRosterThreads([makeThread({ threadId: 't1' })]);+ });++ expect(screen.queryByTestId('agents-column')).toBeNull();++ await act(async () => {+ pendingDockState.resolve({ terminalVisible: false, agentPanelVisible: false });+ });++ expect(screen.queryByTestId('agents-column')).toBeNull();+ });++ test('desktop: a live thread arriving while the dock restore is pending reveals the panel once the restore settles', async () => {+ const pendingDockState = deferredDockState();+ installDesktopBridge(() => pendingDockState.promise);++ await renderPane(6);++ await act(async () => {+ deliverRosterThreads([makeThread({ threadId: 't1' })]);+ });+ await act(async () => {+ pushLiveThreads([+ makeThread({ threadId: 't1' }),+ makeThread({ threadId: 't2', createdAt: 2, lastActivityAt: 2 }),+ ]);+ });++ expect(screen.queryByTestId('agents-column')).toBeNull();++ await act(async () => {+ pendingDockState.resolve({ terminalVisible: false, agentPanelVisible: false });+ });++ expect(screen.queryByTestId('agents-column')).not.toBeNull();+ });++ test('web: the persist write keeps the agents-panel level closed through the reload roster snapshot', async () => {+ seedPersistedAgentsPanelLevel(false);++ await renderPane(3);++ expect(readPersistedAgentsPanelLevel()).toBe(false);++ await act(async () => {+ deliverRosterThreads([makeThread({ threadId: 't1' })]);+ });++ expect(screen.queryByTestId('agents-column')).toBeNull();+ expect(readPersistedAgentsPanelLevel()).toBe(false);+ });++ test('web: revealing the agents panel persists the open level', async () => {+ await renderPane(3);++ expect(readPersistedAgentsPanelLevel()).toBe(false);++ await act(async () => {+ fireEvent.click(screen.getByTestId('agents-reveal-tab'));+ });++ expect(screen.queryByTestId('agents-column')).not.toBeNull();+ expect(readPersistedAgentsPanelLevel()).toBe(true);+ });++ test('desktop: a toggle during a pending dock restore survives settlement with the toggled level', async () => {+ const pendingDockState = deferredDockState();+ const viewMenuStates: Array<Record<string, unknown>> = [];+ installDesktopBridge(() => pendingDockState.promise, {+ onViewMenuStateChanged: (state) => viewMenuStates.push(state),+ });++ await renderPane(6);++ await act(async () => {+ fireEvent.click(screen.getByTestId('agents-reveal-tab'));+ });++ expect(screen.queryByTestId('agents-column')).not.toBeNull();++ await act(async () => {+ pendingDockState.resolve({ terminalVisible: false, agentPanelVisible: false });+ });++ expect(screen.queryByTestId('agents-column')).not.toBeNull();++ const levelPublish = [...viewMenuStates]+ .reverse()+ .find((state) => 'agentPanelVisible' in state);+ expect(levelPublish?.agentPanelVisible).toBe(true);+ });++ test('desktop: a live thread after the dock restore settles reveals the persisted-closed panel', async () => {+ const pendingDockState = deferredDockState();+ installDesktopBridge(() => pendingDockState.promise);++ await renderPane(6);++ await act(async () => {+ deliverRosterThreads([makeThread({ threadId: 't1' })]);+ });+ await act(async () => {+ pendingDockState.resolve({ terminalVisible: false, agentPanelVisible: false });+ });+ await act(async () => {+ pushLiveThreads([+ makeThread({ threadId: 't1' }),+ makeThread({ threadId: 't2', createdAt: 2, lastActivityAt: 2 }),+ ]);+ });++ expect(screen.queryByTestId('agents-column')).not.toBeNull();+ });++ test('web: an arrival after the roster collapses to zero reveals the persisted-closed panel', async () => {+ deliverRosterThreads([makeThread({ threadId: 't1' })]);+ seedPersistedAgentsPanelLevel(false);++ await renderPane(3);++ expect(screen.queryByTestId('agents-column')).toBeNull();++ await act(async () => {+ pushLiveThreads([]);+ });++ expect(screen.queryByTestId('agents-column')).toBeNull();++ await act(async () => {+ pushLiveThreads([makeThread({ threadId: 't2', createdAt: 2, lastActivityAt: 2 })]);+ });++ expect(screen.queryByTestId('agents-column')).not.toBeNull();+ });++ test('desktop: a hung dock-state restore force-settles at the deadline, warns, writes nothing, and a thread arriving afterwards still reveals the panel', async () => {+ vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] });+ const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});+ const hungDockState = deferredDockState();+ const viewMenuStates: Array<Record<string, unknown>> = [];+ installDesktopBridge(() => hungDockState.promise, {+ onViewMenuStateChanged: (state) => viewMenuStates.push(state),+ });++ try {+ await Promise.all([import('./SessionsHost'), import('./acp/AgentThreadClientBinder')]);+ render(+ <TooltipProvider>+ <EditorPane />+ </TooltipProvider>,+ );+ await act(async () => {});+ expect(storeListeners.size).toBeGreaterThanOrEqual(6);++ expect(screen.queryByTestId('agents-column')).toBeNull();+ expect(viewMenuStates).not.toContainEqual({ terminalVisible: false });++ await act(async () => {+ vi.advanceTimersByTime(5_000);+ });++ expect(+ warnSpy.mock.calls.some((call) =>+ String(call[0]).includes(+ 'dock-state restore exceeded its 5000ms bound; the agents panel and terminal start closed and only that un-restored level is withheld from the view menu and the dock record, so a later reveal or toggle still publishes',+ ),+ ),+ ).toBe(true);+ expect(viewMenuStates).not.toContainEqual({ terminalVisible: false });+ expect(viewMenuStates).not.toContainEqual({ agentPanelVisible: false });++ await act(async () => {+ pushLiveThreads([+ makeThread({ threadId: 't1' }),+ makeThread({ threadId: 't2', createdAt: 2, lastActivityAt: 2 }),+ ]);+ });++ expect(screen.queryByTestId('agents-column')).not.toBeNull();+ expect(viewMenuStates).toContainEqual({ agentPanelVisible: true });+ expect(viewMenuStates).not.toContainEqual({ terminalVisible: false });++ await act(async () => {+ hungDockState.resolve({ terminalVisible: true, agentPanelVisible: false });+ });++ expect(viewMenuStates).not.toContainEqual({ terminalVisible: true });+ expect(screen.queryByTestId('agents-column')).not.toBeNull();+ } finally {+ vi.useRealTimers();+ warnSpy.mockRestore();+ }+ });++ test('desktop: a failed dock-state restore settles without writing the un-restored defaults', async () => {+ const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});+ const failingDockState = deferredDockState();+ const viewMenuStates: Array<Record<string, unknown>> = [];+ installDesktopBridge(() => failingDockState.promise, {+ onViewMenuStateChanged: (state) => viewMenuStates.push(state),+ });++ try {+ await Promise.all([import('./SessionsHost'), import('./acp/AgentThreadClientBinder')]);+ render(+ <TooltipProvider>+ <EditorPane />+ </TooltipProvider>,+ );+ await act(async () => {});++ await act(async () => {+ failingDockState.reject(new Error('dock-state ipc failed'));+ });++ expect(viewMenuStates).toContainEqual({ terminalPlacement: 'bottom' });+ expect(viewMenuStates).not.toContainEqual({ terminalVisible: false });+ expect(viewMenuStates).not.toContainEqual({ agentPanelVisible: false });++ await act(async () => {+ fireEvent.click(screen.getByTestId('agents-reveal-tab'));+ });++ expect(viewMenuStates).toContainEqual({ agentPanelVisible: true });+ } finally {+ errorSpy.mockRestore();+ }+ });++ test('desktop: a panel opened and closed before an ABANDONED settle publishes the closed level, and the untouched terminal level stays withheld', async () => {+ vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] });+ const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});+ const hungDockState = deferredDockState();+ const viewMenuStates: Array<Record<string, unknown>> = [];+ installDesktopBridge(() => hungDockState.promise, {+ onViewMenuStateChanged: (state) => viewMenuStates.push(state),+ });++ try {+ await Promise.all([import('./SessionsHost'), import('./acp/AgentThreadClientBinder')]);+ render(+ <TooltipProvider>+ <EditorPane />+ </TooltipProvider>,+ );+ await act(async () => {});++ await act(async () => {+ fireEvent.click(screen.getByTestId('agents-reveal-tab'));+ });+ await act(async () => {+ fireEvent.click(screen.getByTestId('agents-collapse'));+ });+ expect(viewMenuStates).not.toContainEqual({ agentPanelVisible: true });+ expect(viewMenuStates).not.toContainEqual({ agentPanelVisible: false });++ await act(async () => {+ vi.advanceTimersByTime(5_000);+ });++ expect(viewMenuStates).toContainEqual({ agentPanelVisible: false });+ expect(viewMenuStates).not.toContainEqual({ terminalVisible: false });+ } finally {+ vi.useRealTimers();+ warnSpy.mockRestore();+ }+ });++ test('desktop: a panel opened and closed before a REJECTED read publishes the closed level too', async () => {+ const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});+ const failingDockState = deferredDockState();+ const viewMenuStates: Array<Record<string, unknown>> = [];+ installDesktopBridge(() => failingDockState.promise, {+ onViewMenuStateChanged: (state) => viewMenuStates.push(state),+ });++ try {+ await Promise.all([import('./SessionsHost'), import('./acp/AgentThreadClientBinder')]);+ render(+ <TooltipProvider>+ <EditorPane />+ </TooltipProvider>,+ );+ await act(async () => {});++ await act(async () => {+ fireEvent.click(screen.getByTestId('agents-reveal-tab'));+ });+ await act(async () => {+ fireEvent.click(screen.getByTestId('agents-collapse'));+ });+ expect(viewMenuStates).not.toContainEqual({ agentPanelVisible: false });++ await act(async () => {+ failingDockState.reject(new Error('dock-state ipc failed'));+ });++ expect(viewMenuStates).toContainEqual({ agentPanelVisible: false });+ expect(viewMenuStates).not.toContainEqual({ terminalVisible: false });+ } finally {+ errorSpy.mockRestore();+ }+ });++ test('desktop: a rejection landing after the force-settle deadline does not re-gate later levels', async () => {+ vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] });+ const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});+ const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});+ const hungDockState = deferredDockState();+ const viewMenuStates: Array<Record<string, unknown>> = [];+ installDesktopBridge(() => hungDockState.promise, {+ onViewMenuStateChanged: (state) => viewMenuStates.push(state),+ });++ try {+ await Promise.all([import('./SessionsHost'), import('./acp/AgentThreadClientBinder')]);+ render(+ <TooltipProvider>+ <EditorPane />+ </TooltipProvider>,+ );+ await act(async () => {});++ await act(async () => {+ vi.advanceTimersByTime(5_000);+ });++ await act(async () => {+ fireEvent.click(screen.getByTestId('agents-reveal-tab'));+ });++ expect(viewMenuStates).toContainEqual({ agentPanelVisible: true });++ const lateRejection = new Error('dock-state ipc failed after the deadline');+ await act(async () => {+ hungDockState.reject(lateRejection);+ });++ expect(+ errorSpy.mock.calls.some(+ (call) =>+ String(call[0]).includes('dock-state restore failed') && call[1] === lateRejection,+ ),+ ).toBe(true);++ await act(async () => {+ fireEvent.click(screen.getByTestId('agents-collapse'));+ });++ expect(viewMenuStates).toContainEqual({ agentPanelVisible: false });+ } finally {+ vi.useRealTimers();+ warnSpy.mockRestore();+ errorSpy.mockRestore();+ }+ });++ test('desktop: a toggle during a pending dock restore survives the force-settle deadline with the toggled level', async () => {+ vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] });+ const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});+ const hungDockState = deferredDockState();+ const viewMenuStates: Array<Record<string, unknown>> = [];+ installDesktopBridge(() => hungDockState.promise, {+ onViewMenuStateChanged: (state) => viewMenuStates.push(state),+ });++ try {+ await Promise.all([import('./SessionsHost'), import('./acp/AgentThreadClientBinder')]);+ render(+ <TooltipProvider>+ <EditorPane />+ </TooltipProvider>,+ );+ await act(async () => {});++ await act(async () => {+ fireEvent.click(screen.getByTestId('agents-reveal-tab'));+ });++ expect(screen.queryByTestId('agents-column')).not.toBeNull();+ expect(viewMenuStates).not.toContainEqual({ agentPanelVisible: true });++ await act(async () => {+ vi.advanceTimersByTime(5_000);+ });++ expect(screen.queryByTestId('agents-column')).not.toBeNull();+ expect(viewMenuStates).toContainEqual({ agentPanelVisible: true });+ expect(viewMenuStates).not.toContainEqual({ agentPanelVisible: false });+ } finally {+ vi.useRealTimers();+ warnSpy.mockRestore();+ }+ });++ test('desktop: a toggle during a pending dock restore survives a restore rejection with the toggled level', async () => {+ const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});+ const failingDockState = deferredDockState();+ const viewMenuStates: Array<Record<string, unknown>> = [];+ installDesktopBridge(() => failingDockState.promise, {+ onViewMenuStateChanged: (state) => viewMenuStates.push(state),+ });++ try {+ await Promise.all([import('./SessionsHost'), import('./acp/AgentThreadClientBinder')]);+ render(+ <TooltipProvider>+ <EditorPane />+ </TooltipProvider>,+ );+ await act(async () => {});++ await act(async () => {+ fireEvent.click(screen.getByTestId('agents-reveal-tab'));+ });++ expect(viewMenuStates).not.toContainEqual({ agentPanelVisible: true });++ await act(async () => {+ failingDockState.reject(new Error('dock-state ipc failed'));+ });++ expect(screen.queryByTestId('agents-column')).not.toBeNull();+ expect(viewMenuStates).toContainEqual({ agentPanelVisible: true });+ expect(viewMenuStates).not.toContainEqual({ agentPanelVisible: false });+ } finally {+ errorSpy.mockRestore();+ }+ });++ test('desktop: a terminal toggle during a pending dock restore survives the force-settle deadline with the toggled level', async () => {+ vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] });+ const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});+ const hungDockState = deferredDockState();+ const viewMenuStates: Array<Record<string, unknown>> = [];+ installDesktopBridge(() => hungDockState.promise, {+ onViewMenuStateChanged: (state) => viewMenuStates.push(state),+ });++ try {+ await Promise.all([import('./SessionsHost'), import('./acp/AgentThreadClientBinder')]);+ render(+ <TooltipProvider>+ <EditorPane />+ </TooltipProvider>,+ );+ await act(async () => {});++ await act(async () => {+ emitLocalMenuAction('toggle-terminal');+ });++ expect(viewMenuStates).not.toContainEqual({ terminalVisible: true });++ await act(async () => {+ vi.advanceTimersByTime(5_000);+ });++ expect(viewMenuStates).toContainEqual({ terminalVisible: true });+ expect(viewMenuStates).not.toContainEqual({ terminalVisible: false });+ } finally {+ vi.useRealTimers();+ warnSpy.mockRestore();+ }+ });++ test('desktop: an on-time dock restore clears the deadline so no late bound-exceeded warn fires', async () => {+ vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] });+ const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});+ const deferred = deferredDockState();+ installDesktopBridge(() => deferred.promise);++ try {+ await Promise.all([import('./SessionsHost'), import('./acp/AgentThreadClientBinder')]);+ render(+ <TooltipProvider>+ <EditorPane />+ </TooltipProvider>,+ );+ await act(async () => {});+ expect(storeListeners.size).toBeGreaterThanOrEqual(6);++ await act(async () => {+ deferred.resolve({ terminalVisible: false, agentPanelVisible: true });+ });++ expect(screen.queryByTestId('agents-column')).not.toBeNull();++ await act(async () => {+ vi.advanceTimersByTime(10_000);+ });++ expect(+ warnSpy.mock.calls.some((call) => String(call[0]).includes('exceeded its 5000ms bound')),+ ).toBe(false);+ } finally {+ vi.useRealTimers();+ warnSpy.mockRestore();+ }+ });+});diff --git a/packages/app/src/components/EditorPane.dom.test.tsx b/packages/app/src/components/EditorPane.dom.test.tsxindex f13c5e6a5..18f3d5475 100644--- a/packages/app/src/components/EditorPane.dom.test.tsx+++ b/packages/app/src/components/EditorPane.dom.test.tsx@@ -964,14 +964,16 @@ describe('EditorPane session-panel wiring', () => {expect(agents.getAttribute('data-thread-launch-image-parts')).toBe('1');});- test('desktop: a rejecting getDockState still settles the gate so the view-menu push converges', async () => {+ test('desktop: a rejecting getDockState still settles the gate (placement push lands; visibility stays silent)', async () => {const desk = makeOkDesktopStub(async () => {throw new Error('ipc boom');});(window as { okDesktop?: unknown }).okDesktop = desk.stub;await renderEditorPane();- expect(desk.viewMenuPushes).toContainEqual({ terminalVisible: false });+ expect(desk.viewMenuPushes).toContainEqual({ terminalPlacement: 'bottom' });+ expect(desk.viewMenuPushes).not.toContainEqual({ terminalVisible: false });+ expect(desk.viewMenuPushes).not.toContainEqual({ agentPanelVisible: false });expect(screen.getByTestId('terminal-dock').getAttribute('data-visible')).toBe('false');});diff --git a/packages/app/src/components/EditorPane.tsx b/packages/app/src/components/EditorPane.tsxindex eaf7690a6..46f8933be 100644--- a/packages/app/src/components/EditorPane.tsx+++ b/packages/app/src/components/EditorPane.tsx@@ -32,10 +32,12 @@ import { useNoPushPermissionToast } from '@/hooks/use-no-push-permission-toast';import { useWorktreeAutoSyncNotice } from '@/hooks/use-worktree-autosync-notice';import { authPromptStore } from '@/lib/auth-prompt-store';import { useConfigContext } from '@/lib/config-provider';+import { readWebDockSessionOrder } from '@/lib/dock-session-persistence';import { matchesKeyboardShortcut, matchesRendererShortcut } from '@/lib/keyboard-shortcuts';import { subscribeLocalMenuAction } from '@/lib/local-menu-action-bus';import { isNoteWindow } from '@/lib/note-window-mode';import { isOverlayLayerOpen } from '@/lib/overlay-layers';+import { RESTORE_SETTLE_TIMEOUT_MS } from '@/lib/restore-settle-timeout';import { readTerminalPlacement, writeTerminalPlacement } from '@/lib/terminal-placement-store';import { readTerminalRightWidth, writeTerminalRightWidth } from '@/lib/terminal-right-width-store';import { recordTerminalOpened } from '@/lib/terminal-telemetry';@@ -108,6 +110,42 @@ function NoteWindowModeToggle({);}+interface RestoreVisibilityGate {+ pendingWithhold: boolean;+ levelEstablished: boolean;+ lastLevel: boolean;+}++const RESTORE_UNESTABLISHED_LEVEL = false;++function makeRestoreVisibilityGate(mountLevel: boolean): RestoreVisibilityGate {+ return { pendingWithhold: false, levelEstablished: false, lastLevel: mountLevel };+}++function armRestoreVisibilityGate(gate: { current: RestoreVisibilityGate }): void {+ gate.current.pendingWithhold = true;+}++function resetRestoreVisibilityGate(gate: { current: RestoreVisibilityGate }): void {+ gate.current.pendingWithhold = false;+ gate.current.levelEstablished = false;+}++function noteRestoreVisibilityLevel(+ gate: { current: RestoreVisibilityGate },+ visible: boolean,+): void {+ if (gate.current.lastLevel === visible) return;+ gate.current.lastLevel = visible;+ gate.current.levelEstablished = true;+}++function consumeRestoreVisibilityGate(gate: { current: RestoreVisibilityGate }): boolean {+ if (!gate.current.pendingWithhold) return true;+ gate.current.pendingWithhold = false;+ return gate.current.levelEstablished;+}+interface EditorPaneProps {onOpenSearch?: () => void;}@@ -137,7 +175,7 @@ export function EditorPane({ onOpenSearch }: EditorPaneProps = {}) {desktopBridge != null &&desktopBridge.terminal != null &&desktopBridge.config.ptyAvailable === true;- const [terminalVisible, setTerminalVisible] = useState(false);+ const [terminalVisible, setTerminalVisible] = useState<boolean>(RESTORE_UNESTABLISHED_LEVEL);const [terminalRestoreRevealNonce, setTerminalRestoreRevealNonce] = useState(0);const [terminalPlacement, setTerminalPlacement] = useState<TerminalPlacement>(() =>readTerminalPlacement(),@@ -149,10 +187,20 @@ export function EditorPane({ onOpenSearch }: EditorPaneProps = {}) {useEffect(() => {writeTerminalRightWidth(terminalRightWidth);}, [terminalRightWidth]);- const [agentsVisible, setAgentsVisible] = useState(false);+ const [agentsVisible, setAgentsVisible] = useState<boolean>(() =>+ desktopBridge == null+ ? (readWebDockSessionOrder('agents')?.agentPanelVisible ?? false)+ : RESTORE_UNESTABLISHED_LEVEL,+ );const installedClis = useInstalledClis();const [dockRestoreSettled, setDockRestoreSettled] = useState(false);const restoreRevealRef = useRef(false);+ const terminalRestoreGateRef = useRef<RestoreVisibilityGate>(+ makeRestoreVisibilityGate(terminalVisible),+ );+ const agentsRestoreGateRef = useRef<RestoreVisibilityGate>(+ makeRestoreVisibilityGate(agentsVisible),+ );const [terminalLaunch, setTerminalLaunch] = useState<TerminalLaunchIntent | null>(null);const [terminalCommand, setTerminalCommand] = useState<{id: TerminalCommandId;@@ -313,7 +361,9 @@ export function EditorPane({ onOpenSearch }: EditorPaneProps = {}) {useEffect(() => {if (window.okDesktop == null) return;+ noteRestoreVisibilityLevel(terminalRestoreGateRef, terminalVisible);if (!dockRestoreSettled) return;+ if (!consumeRestoreVisibilityGate(terminalRestoreGateRef)) return;setViewMenuState({ terminalVisible });window.okDesktop.editor.notifyViewMenuStateChanged({ terminalVisible });}, [terminalVisible, dockRestoreSettled]);@@ -327,7 +377,9 @@ export function EditorPane({ onOpenSearch }: EditorPaneProps = {}) {useEffect(() => {if (window.okDesktop == null) return;+ noteRestoreVisibilityLevel(agentsRestoreGateRef, agentsVisible);if (!dockRestoreSettled) return;+ if (!consumeRestoreVisibilityGate(agentsRestoreGateRef)) return;setViewMenuState({ agentPanelVisible: agentsVisible });window.okDesktop.editor.notifyViewMenuStateChanged({ agentPanelVisible: agentsVisible });}, [agentsVisible, dockRestoreSettled]);@@ -359,24 +411,47 @@ export function EditorPane({ onOpenSearch }: EditorPaneProps = {}) {return;}let cancelled = false;+ let abandoned = false;+ const restoreDeadline = window.setTimeout(() => {+ abandoned = true;+ armRestoreVisibilityGate(terminalRestoreGateRef);+ armRestoreVisibilityGate(agentsRestoreGateRef);+ console.warn(+ `[dock] dock-state restore exceeded its ${RESTORE_SETTLE_TIMEOUT_MS}ms bound; the agents panel and terminal start closed and only that un-restored level is withheld from the view menu and the dock record, so a later reveal or toggle still publishes`,+ );+ setDockRestoreSettled(true);+ }, RESTORE_SETTLE_TIMEOUT_MS);void bridge.terminal.getDockState().then((state) => {- if (cancelled) return;- if (state.agentPanelVisible) setAgentsVisible(true);+ if (cancelled || abandoned) return;+ setAgentsVisible((current) => (current ? current : state.agentPanelVisible === true));if (!state.terminalVisible) return;restoreRevealRef.current = true;setTerminalRestoreRevealNonce((nonce) => nonce + 1);setTerminalVisible(true);}).catch((err) => {- console.error('[terminal] dock-state restore failed; staying hidden:', err);+ if (cancelled) return;+ if (!abandoned) {+ armRestoreVisibilityGate(terminalRestoreGateRef);+ armRestoreVisibilityGate(agentsRestoreGateRef);+ }+ console.error(+ '[dock] dock-state restore failed; the agents panel and terminal start closed and only that un-restored level is withheld from the view menu and the dock record, so a later reveal or toggle still publishes:',+ err,+ );}).finally(() => {+ window.clearTimeout(restoreDeadline);if (!cancelled) setDockRestoreSettled(true);});return () => {cancelled = true;+ abandoned = true;+ window.clearTimeout(restoreDeadline);+ resetRestoreVisibilityGate(terminalRestoreGateRef);+ resetRestoreVisibilityGate(agentsRestoreGateRef);};}, [noteWindow]);@@ -521,6 +596,7 @@ export function EditorPane({ onOpenSearch }: EditorPaneProps = {}) {terminalCapable={terminalAvailable}visible={agentsVisible}onVisibleChange={setAgentsVisible}+ agentsVisibilityRestoreSettled={desktopBridge == null || dockRestoreSettled}threadLaunch={threadLaunch}installedClis={installedClis}container={placements.agents.container}diff --git a/packages/app/src/components/SessionsHost.agents.dom.test.tsx b/packages/app/src/components/SessionsHost.agents.dom.test.tsxindex 60ff2c631..953b8359f 100644--- a/packages/app/src/components/SessionsHost.agents.dom.test.tsx+++ b/packages/app/src/components/SessionsHost.agents.dom.test.tsx@@ -17,13 +17,24 @@ import { requestPreferredSession } from './handoff/preferred-session-events';import { requestActiveTerminalInput } from './handoff/terminal-input-events';import { subscribeToTerminalLaunchRequests } from './handoff/terminal-launch-events';import { _resetReusableSession, getReusableSession } from './reusable-session-store';+import {+ dispatchReorderChord,+ dispatchTabChord,+ focusFirstTab,+ tabTitles,+} from './sessions-host-tabs.test-helper';let openThreads: ThreadInfo[] = [];const storeListeners = new Set<() => void>();let archivedThreads: ThreadInfo[] = [];+let initialRosterIds: ReadonlySet<string> | null = null;function notifyStore() {for (const l of storeListeners) l();}+function setInitialRosterIds(next: ReadonlySet<string> | null) {+ initialRosterIds = next;+ notifyStore();+}function setOpenThreads(next: ThreadInfo[]) {openThreads = next;notifyStore();@@ -60,6 +71,12 @@ vi.doMock('@/lib/acp/thread-client', () => ({() => openThreads,() => openThreads,),+ useInitialRosterThreadIds: () =>+ useSyncExternalStore(+ subscribeStore,+ () => initialRosterIds,+ () => initialRosterIds,+ ),useArchivedAgentThreads: () =>useSyncExternalStore(subscribeStore,@@ -83,12 +100,16 @@ vi.doMock('@/lib/acp/thread-client', () => ({ThreadChannelUnavailableError: class ThreadChannelUnavailableError extends Error {},}));+let threadViewHeld = false;vi.doMock('@/components/acp/ThreadView', () => ({- ThreadView: ({ info }: { info: ThreadInfo }) => (- <div data-testid="thread-view" data-thread-id={info.threadId}>- <textarea data-testid="agent-thread-composer" />- </div>- ),+ ThreadView: ({ info }: { info: ThreadInfo }) =>+ threadViewHeld ? (+ <div data-testid="thread-view-pending" data-thread-id={info.threadId} />+ ) : (+ <div data-testid="thread-view" data-thread-id={info.threadId}>+ <textarea data-testid="agent-thread-composer" />+ </div>+ ),}));type MockAgent = {@@ -164,6 +185,12 @@ function makeThread(overrides: Partial<ThreadInfo> & { threadId: string }): Thre};}+function agentsDockWrites(setDockState: ReturnType<typeof vi.fn>) {+ return setDockState.mock.calls.filter(+ (call) => (call[0] as { surface?: string }).surface === 'agents',+ );+}+function makeTerminalBridge(): OkDesktopBridge {return {terminal: {@@ -179,6 +206,8 @@ function makeTerminalBridge(): OkDesktopBridge {type HarnessControl = {setVisible: (v: boolean) => void;setThreadLaunch: (t: ThreadLaunchIntent | null) => void;+ setRestoreSettled: (v: boolean) => void;+ setBridge: (b: OkDesktopBridge | null) => void;rerender: () => void;};@@ -187,25 +216,37 @@ function makeControl(): { current: HarnessControl | null } {}function Harness({- bridge = null,+ bridge: initialBridge = null,initialVisible = true,onVisibleChange,threadLaunch: initialThreadLaunch = null,control,+ initiallyRestoreSettled = true,+ onRequestEditorFocus,}: {bridge?: OkDesktopBridge | null;initialVisible?: boolean;onVisibleChange?: (v: boolean) => void;threadLaunch?: ThreadLaunchIntent | null;control?: { current: HarnessControl | null };+ initiallyRestoreSettled?: boolean;+ onRequestEditorFocus?: () => void;}) {const [container, setContainer] = useState<HTMLDivElement | null>(null);const [visible, setVisible] = useState(initialVisible);const [threadLaunch, setThreadLaunch] = useState(initialThreadLaunch);+ const [restoreSettled, setRestoreSettled] = useState(initiallyRestoreSettled);+ const [bridge, setBridge] = useState(initialBridge);const [, setTick] = useState(0);useEffect(() => {if (control != null)- control.current = { setVisible, setThreadLaunch, rerender: () => setTick((n) => n + 1) };+ control.current = {+ setVisible,+ setThreadLaunch,+ setRestoreSettled,+ setBridge,+ rerender: () => setTick((n) => n + 1),+ };}, [control]);return (<TooltipProvider>@@ -215,6 +256,7 @@ function Harness({bridge={bridge}terminalCapable={bridge != null}visible={visible}+ agentsVisibilityRestoreSettled={restoreSettled}threadLaunch={threadLaunch}onVisibleChange={(v) => {onVisibleChange?.(v);@@ -223,17 +265,540 @@ function Harness({installedClis={{}}container={container}isShowing={visible && container != null}- onRequestEditorFocus={() => {}}+ onRequestEditorFocus={onRequestEditorFocus ?? (() => {})}/></TooltipProvider>);}+describe('SessionsHost — agents desktop order-restore gate', () => {+ beforeEach(() => {+ openThreads = [];+ initialRosterIds = null;+ localStorage.clear();+ });++ test('a hung order restore settles at the deadline: persistence stays suppressed, the warn fires, and a late read does not clobber placement', async () => {+ vi.useFakeTimers();+ const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});+ let resolveDockState: (state: unknown) => void = () => {};+ const setDockState = vi.fn(() => ({ ok: true as const }));+ const bridge = {+ terminal: {+ getDockState: () =>+ new Promise((resolve) => {+ resolveDockState = resolve;+ }),+ setDockState,+ },+ editor: { notifyViewMenuStateChanged: vi.fn() },+ } as unknown as OkDesktopBridge;++ try {+ render(<Harness bridge={bridge} initialVisible={false} />);++ expect(setDockState).not.toHaveBeenCalled();++ act(() => {+ vi.advanceTimersByTime(5_000);+ });+ expect(+ warnSpy.mock.calls.some((call) =>+ String(call[0]).includes('dock order restore exceeded its 5000ms bound'),+ ),+ ).toBe(true);+ expect(+ warnSpy.mock.calls.some((call) =>+ String(call[0]).includes('the saved tab set is left untouched'),+ ),+ ).toBe(true);++ act(() => {+ setOpenThreads([+ makeThread({ threadId: 't1', title: 'One' }),+ makeThread({ threadId: 't2', title: 'Two', createdAt: 2, lastActivityAt: 2 }),+ ]);+ });+ expect(agentsDockWrites(setDockState)).toHaveLength(0);+ expect(+ warnSpy.mock.calls.some((call) =>+ String(call[0]).includes('[agents] dock persistence withheld'),+ ),+ ).toBe(true);++ await act(async () => {+ resolveDockState({+ terminalVisible: false,+ agentPanelVisible: false,+ agents: { order: ['t2', 't1'], activeKey: null },+ });+ });++ act(() => {+ setOpenThreads([makeThread({ threadId: 't1', title: 'One' })]);+ });+ act(() => {+ setOpenThreads([+ makeThread({ threadId: 't1', title: 'One' }),+ makeThread({ threadId: 't2', title: 'Two', createdAt: 2, lastActivityAt: 2 }),+ ]);+ });++ expect(agentsDockWrites(setDockState)).toHaveLength(0);+ expect(screen.getByRole('tab', { name: /One/ })).toBeDefined();+ const tabs = screen.getAllByRole('tab').map((tab) => tab.textContent);+ expect(tabs.indexOf('Two')).toBeGreaterThan(tabs.indexOf('One'));+ } finally {+ vi.useRealTimers();+ warnSpy.mockRestore();+ }+ });++ test('a REJECTING dock-state read suppresses agents persistence so the saved order survives', async () => {+ const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});+ const setDockState = vi.fn(() => ({ ok: true as const }));+ const bridge = {+ terminal: {+ getDockState: () => Promise.reject(new Error('ipc torn down mid-reload')),+ setDockState,+ },+ editor: { notifyViewMenuStateChanged: vi.fn() },+ } as unknown as OkDesktopBridge;++ try {+ render(<Harness bridge={bridge} initialVisible={false} />);+ await act(async () => {});++ act(() => {+ setOpenThreads([+ makeThread({ threadId: 't1', title: 'One' }),+ makeThread({ threadId: 't2', title: 'Two', createdAt: 2, lastActivityAt: 2 }),+ ]);+ });++ expect(agentsDockWrites(setDockState)).toHaveLength(0);+ expect(+ warnSpy.mock.calls.some((call) =>+ String(call[0]).includes('[agents] dock persistence withheld'),+ ),+ ).toBe(true);+ } finally {+ warnSpy.mockRestore();+ }+ });++ test('a completed order restore persists a genuine change with the restored placement', async () => {+ let resolveDockState: (state: unknown) => void = () => {};+ const setDockState = vi.fn(() => ({ ok: true as const }));+ const bridge = {+ terminal: {+ getDockState: () =>+ new Promise((resolve) => {+ resolveDockState = resolve;+ }),+ setDockState,+ },+ editor: { notifyViewMenuStateChanged: vi.fn() },+ } as unknown as OkDesktopBridge;++ render(<Harness bridge={bridge} initialVisible={false} />);++ await act(async () => {+ resolveDockState({+ terminalVisible: false,+ agentPanelVisible: false,+ agents: { order: ['t2', 't1'], activeKey: 't2' },+ });+ });++ act(() => {+ setOpenThreads([+ makeThread({ threadId: 't1', title: 'One' }),+ makeThread({ threadId: 't2', title: 'Two', createdAt: 2, lastActivityAt: 2 }),+ ]);+ });++ const writes = agentsDockWrites(setDockState);+ expect(writes.length).toBeGreaterThan(0);+ expect(writes.at(-1)?.[0]).toMatchObject({ surface: 'agents', order: ['t2', 't1'] });+ });++ test('a completed order restore does not persist the empty settle beat before the roster lands', async () => {+ let resolveDockState: (state: unknown) => void = () => {};+ const setDockState = vi.fn(() => ({ ok: true as const }));+ const bridge = {+ terminal: {+ getDockState: () =>+ new Promise((resolve) => {+ resolveDockState = resolve;+ }),+ setDockState,+ },+ editor: { notifyViewMenuStateChanged: vi.fn() },+ } as unknown as OkDesktopBridge;++ render(<Harness bridge={bridge} initialVisible={false} />);++ await act(async () => {+ resolveDockState({+ terminalVisible: false,+ agentPanelVisible: false,+ agents: { order: ['t2', 't1'], activeKey: 't2' },+ });+ });+ await act(async () => {});++ expect(agentsDockWrites(setDockState)).toEqual([]);++ act(() => {+ setOpenThreads([+ makeThread({ threadId: 't1', title: 'One' }),+ makeThread({ threadId: 't2', title: 'Two', createdAt: 2, lastActivityAt: 2 }),+ ]);+ });++ const writes = agentsDockWrites(setDockState);+ expect(writes.length).toBeGreaterThan(0);+ expect(writes.at(-1)?.[0]).toMatchObject({ surface: 'agents', order: ['t2', 't1'] });+ });++ test('a thread going live before the visibility restore settles reveals the dock once the gate opens', async () => {+ const onVisibleChange = vi.fn((_v: boolean) => {});+ const control = makeControl();+ render(+ <Harness+ initialVisible={false}+ onVisibleChange={onVisibleChange}+ control={control}+ initiallyRestoreSettled={false}+ />,+ );+ await act(async () => {});+ expect(onVisibleChange).not.toHaveBeenCalled();++ act(() => {+ setOpenThreads([makeThread({ threadId: 't1', title: 'Window arrival' })]);+ });+ expect(onVisibleChange).not.toHaveBeenCalled();++ act(() => {+ control.current?.setRestoreSettled(true);+ });++ await waitFor(() => expect(onVisibleChange).toHaveBeenCalledWith(true));+ });++ test('a hung agents order restore settles without starting a thread', () => {+ vi.useFakeTimers();+ const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});+ mockRegisteredAgent = { source: 'registry', id: 'claude-acp', name: 'Claude Agent' };+ launchAgentThread.mockClear();+ const bridge = {+ terminal: {+ getDockState: () => new Promise(() => {}),+ setDockState: vi.fn(() => ({ ok: true as const })),+ },+ editor: { notifyViewMenuStateChanged: vi.fn() },+ } as unknown as OkDesktopBridge;++ try {+ render(<Harness bridge={bridge} initialVisible />);++ act(() => {+ vi.advanceTimersByTime(5_000);+ });++ expect(+ warnSpy.mock.calls.some((call) =>+ String(call[0]).includes('dock order restore exceeded its 5000ms bound'),+ ),+ ).toBe(true);+ expect(launchAgentThread).not.toHaveBeenCalled();+ } finally {+ mockRegisteredAgent = null;+ vi.useRealTimers();+ warnSpy.mockRestore();+ }+ });++ test('a first roster frame that arrives EMPTY still delivers the empty agents order once settled', async () => {+ let resolveDockState: (state: unknown) => void = () => {};+ const setDockState = vi.fn(() => ({ ok: true as const }));+ const bridge = {+ terminal: {+ getDockState: () =>+ new Promise((resolve) => {+ resolveDockState = resolve;+ }),+ setDockState,+ },+ editor: { notifyViewMenuStateChanged: vi.fn() },+ } as unknown as OkDesktopBridge;++ render(<Harness bridge={bridge} initialVisible={false} />);++ await act(async () => {+ resolveDockState({ terminalVisible: false, agentPanelVisible: false });+ });+ await act(async () => {});++ expect(agentsDockWrites(setDockState)).toEqual([]);++ act(() => {+ setInitialRosterIds(new Set());+ });++ const writes = agentsDockWrites(setDockState);+ expect(writes.length).toBeGreaterThan(0);+ expect(writes.at(-1)?.[0]).toMatchObject({ surface: 'agents', order: [], activeKey: null });+ });++ test('after a REJECTED read, the user reordering the tabs releases suppression and persists the arrangement', async () => {+ const setDockState = vi.fn(() => ({ ok: true as const }));+ const bridge = {+ platform: 'darwin',+ terminal: {+ getDockState: () => Promise.reject(new Error('ipc torn down mid-reload')),+ setDockState,+ },+ editor: { notifyViewMenuStateChanged: vi.fn() },+ } as unknown as OkDesktopBridge;++ render(<Harness bridge={bridge} initialVisible />);+ await act(async () => {});++ act(() => {+ setOpenThreads([+ makeThread({ threadId: 't1', title: 'One' }),+ makeThread({ threadId: 't2', title: 'Two', createdAt: 2, lastActivityAt: 2 }),+ ]);+ });+ expect(agentsDockWrites(setDockState)).toHaveLength(0);++ focusFirstTab();+ expect(dispatchReorderChord('ArrowRight').defaultPrevented).toBe(true);++ expect(tabTitles()).toEqual(['Two', 'One']);+ const writes = agentsDockWrites(setDockState);+ expect(writes).toHaveLength(2);+ expect(writes[0]?.[0]).toMatchObject({+ surface: 'agents',+ order: ['t1', 't2'],+ activeKey: 't1',+ });+ expect(writes[1]?.[0]).toMatchObject({ surface: 'agents', order: ['t2', 't1'] });+ });++ test('after an ABANDONED read, the user reordering the tabs releases suppression and persists the arrangement', async () => {+ vi.useFakeTimers();+ const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});+ const setDockState = vi.fn(() => ({ ok: true as const }));+ const bridge = {+ platform: 'darwin',+ terminal: {+ getDockState: () => new Promise(() => {}),+ setDockState,+ },+ editor: { notifyViewMenuStateChanged: vi.fn() },+ } as unknown as OkDesktopBridge;++ try {+ render(<Harness bridge={bridge} initialVisible />);++ act(() => {+ vi.advanceTimersByTime(5_000);+ });+ expect(+ warnSpy.mock.calls.some((call) =>+ String(call[0]).includes('dock order restore exceeded its 5000ms bound'),+ ),+ ).toBe(true);++ act(() => {+ setOpenThreads([+ makeThread({ threadId: 't1', title: 'One' }),+ makeThread({ threadId: 't2', title: 'Two', createdAt: 2, lastActivityAt: 2 }),+ ]);+ });+ expect(agentsDockWrites(setDockState)).toHaveLength(0);++ focusFirstTab();+ expect(dispatchReorderChord('ArrowRight').defaultPrevented).toBe(true);++ expect(tabTitles()).toEqual(['Two', 'One']);+ const writes = agentsDockWrites(setDockState);+ expect(writes).toHaveLength(2);+ expect(writes[0]?.[0]).toMatchObject({+ surface: 'agents',+ order: ['t1', 't2'],+ activeKey: 't1',+ });+ expect(writes[1]?.[0]).toMatchObject({ surface: 'agents', order: ['t2', 't1'] });+ } finally {+ vi.useRealTimers();+ warnSpy.mockRestore();+ }+ });++ test('after a REJECTED read, a roster arrival withholds but activating a tab releases, and both records reach the log', async () => {+ const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});+ const setDockState = vi.fn(() => ({ ok: true as const }));+ const bridge = {+ platform: 'darwin',+ terminal: {+ getDockState: () => Promise.reject(new Error('ipc torn down mid-reload')),+ setDockState,+ },+ editor: { notifyViewMenuStateChanged: vi.fn() },+ } as unknown as OkDesktopBridge;++ try {+ render(<Harness bridge={bridge} initialVisible />);+ await act(async () => {});++ act(() => {+ setOpenThreads([makeThread({ threadId: 't1', title: 'One' })]);+ });+ act(() => {+ setOpenThreads([+ makeThread({ threadId: 't1', title: 'One' }),+ makeThread({ threadId: 't2', title: 'Two', createdAt: 2, lastActivityAt: 2 }),+ ]);+ });+ expect(tabTitles()).toEqual(['One', 'Two']);+ expect(agentsDockWrites(setDockState)).toHaveLength(0);+ expect(+ warnSpy.mock.calls.filter((call) =>+ String(call[0]).includes('[agents] dock persistence withheld'),+ ),+ ).toHaveLength(1);+ expect(+ warnSpy.mock.calls.some((call) =>+ String(call[0]).includes('[agents] dock persistence resumed'),+ ),+ ).toBe(false);++ act(() => {+ screen.getByTestId('terminal-new-chat').focus();+ });+ await act(async () => {});+ expect(agentsDockWrites(setDockState)).toHaveLength(0);++ expect(dispatchTabChord('1').defaultPrevented).toBe(true);+ await act(async () => {});++ const writes = agentsDockWrites(setDockState);+ expect(writes.length).toBeGreaterThan(0);+ expect(writes.at(-1)?.[0]).toMatchObject({+ surface: 'agents',+ order: ['t1', 't2'],+ activeKey: 't1',+ });+ expect(+ warnSpy.mock.calls.filter((call) =>+ String(call[0]).includes(+ '[agents] dock persistence resumed: a user arrangement established the tab set the restore did not',+ ),+ ),+ ).toHaveLength(1);+ } finally {+ warnSpy.mockRestore();+ }+ });++ test('re-activating the tab already active does not release suppression', async () => {+ const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});+ const setDockState = vi.fn(() => ({ ok: true as const }));+ const bridge = {+ platform: 'darwin',+ terminal: {+ getDockState: () => Promise.reject(new Error('ipc torn down mid-reload')),+ setDockState,+ },+ editor: { notifyViewMenuStateChanged: vi.fn() },+ } as unknown as OkDesktopBridge;++ try {+ render(<Harness bridge={bridge} initialVisible />);+ await act(async () => {});++ act(() => {+ setOpenThreads([makeThread({ threadId: 't1', title: 'One' })]);+ });+ act(() => {+ setOpenThreads([+ makeThread({ threadId: 't1', title: 'One' }),+ makeThread({ threadId: 't2', title: 'Two', createdAt: 2, lastActivityAt: 2 }),+ ]);+ });+ expect(tabTitles()).toEqual(['One', 'Two']);+ expect(agentsDockWrites(setDockState)).toHaveLength(0);++ act(() => {+ screen.getByTestId('terminal-new-chat').focus();+ });+ await act(async () => {});++ expect(dispatchTabChord('2').defaultPrevented).toBe(true);+ await act(async () => {});++ expect(agentsDockWrites(setDockState)).toHaveLength(0);+ expect(+ warnSpy.mock.calls.some((call) =>+ String(call[0]).includes('[agents] dock persistence resumed'),+ ),+ ).toBe(false);++ expect(dispatchTabChord('1').defaultPrevented).toBe(true);+ await act(async () => {});+ expect(agentsDockWrites(setDockState).length).toBeGreaterThan(0);+ } finally {+ warnSpy.mockRestore();+ }+ });++ test('roster churn alone never releases suppression: only a user gesture does', async () => {+ const setDockState = vi.fn(() => ({ ok: true as const }));+ const bridge = {+ platform: 'darwin',+ terminal: {+ getDockState: () => Promise.reject(new Error('ipc torn down mid-reload')),+ setDockState,+ },+ editor: { notifyViewMenuStateChanged: vi.fn() },+ } as unknown as OkDesktopBridge;++ render(<Harness bridge={bridge} initialVisible />);+ await act(async () => {});++ act(() => {+ setOpenThreads([makeThread({ threadId: 't1', title: 'One' })]);+ });+ expect(agentsDockWrites(setDockState)).toHaveLength(0);++ act(() => {+ setOpenThreads([+ makeThread({ threadId: 't1', title: 'One' }),+ makeThread({ threadId: 't2', title: 'Two', createdAt: 2, lastActivityAt: 2 }),+ ]);+ });+ expect(agentsDockWrites(setDockState)).toHaveLength(0);++ act(() => {+ setOpenThreads([+ makeThread({ threadId: 't2', title: 'Two', createdAt: 2, lastActivityAt: 2 }),+ ]);+ });+ expect(agentsDockWrites(setDockState)).toHaveLength(0);+ });+});+describe('SessionsHost — agents panel (web / no bridge)', () => {beforeEach(() => {openThreads = [];archivedThreads = [];connectionStatus = 'open';+ threadViewHeld = false;closeThread.mockClear();renameThread.mockClear();openArchivedThread.mockClear();@@ -246,6 +811,7 @@ describe('SessionsHost — agents panel (web / no bridge)', () => {catalogData = undefined;mockRegisteredAgent = null;mockPersistedDefaultAgent = null;+ initialRosterIds = null;localStorage.clear();reloadEnabledAgentsFromStorage();});@@ -393,6 +959,216 @@ describe('SessionsHost — agents panel (web / no bridge)', () => {expect(onVisibleChange).not.toHaveBeenCalled();});+ test('revealing the dock focuses the active session', async () => {+ const control = makeControl();+ setOpenThreads([makeThread({ threadId: 't1', title: 'Pre-existing' })]);+ render(<Harness initialVisible={false} control={control} />);+ await screen.findByTestId('thread-view');+ act(() => {+ (document.activeElement as HTMLElement | null)?.blur?.();+ });+ expect(document.activeElement).not.toBe(screen.getByTestId('agent-thread-composer'));++ act(() => {+ control.current?.setVisible(true);+ });++ expect(document.activeElement).toBe(screen.getByTestId('agent-thread-composer'));+ });++ test('collapsing the dock hands focus back to the editor', async () => {+ const user = userEvent.setup();+ const onVisibleChange = vi.fn((_v: boolean) => {});+ const onRequestEditorFocus = vi.fn(() => {});+ setOpenThreads([makeThread({ threadId: 't1', title: 'Pre-existing' })]);+ render(+ <Harness onVisibleChange={onVisibleChange} onRequestEditorFocus={onRequestEditorFocus} />,+ );+ await screen.findByTestId('thread-view');++ await user.click(screen.getByRole('button', { name: 'Collapse agent panel' }));++ expect(onVisibleChange).toHaveBeenCalledWith(false);+ expect(onRequestEditorFocus).toHaveBeenCalled();+ });++ test('revealing the dock before the thread view loads focuses the session when it arrives', async () => {+ const control = makeControl();+ threadViewHeld = true;+ setOpenThreads([makeThread({ threadId: 't1', title: 'Pre-existing' })]);+ render(<Harness initialVisible={false} control={control} />);+ await act(async () => {});++ act(() => {+ control.current?.setVisible(true);+ });+ expect(screen.queryByTestId('agent-thread-composer')).toBeNull();++ threadViewHeld = false;+ act(() => {+ control.current?.rerender();+ });++ await waitFor(() =>+ expect(document.activeElement).toBe(screen.getByTestId('agent-thread-composer')),+ );+ });++ test('a late-arriving thread view does not steal focus from elsewhere', async () => {+ const control = makeControl();+ threadViewHeld = true;+ const focusCalls: string[] = [];+ const origFocus = HTMLElement.prototype.focus;+ Object.defineProperty(HTMLElement.prototype, 'focus', {+ value: function focusProbe(this: HTMLElement) {+ focusCalls.push(`${this.tagName}:${this.getAttribute('data-testid') ?? ''}`);+ return origFocus.call(this);+ },+ configurable: true,+ writable: true,+ });+ setOpenThreads([makeThread({ threadId: 't1', title: 'Pre-existing' })]);+ render(<Harness initialVisible={false} control={control} />);+ await act(async () => {});++ act(() => {+ control.current?.setVisible(true);+ });+ const outside = document.createElement('input');+ document.body.appendChild(outside);+ outside.focus();+ expect(document.activeElement).toBe(outside);++ threadViewHeld = false;+ act(() => {+ control.current?.rerender();+ });+ await screen.findByTestId('thread-view');++ try {+ expect(document.activeElement).toBe(outside);+ } catch (error) {+ throw new Error(+ `focus calls were: [${focusCalls.join(' | ')}]; underlying: ${String(error)}`,+ );+ } finally {+ Object.defineProperty(HTMLElement.prototype, 'focus', {+ value: origFocus,+ configurable: true,+ writable: true,+ });+ outside.remove();+ }+ });++ test('a late-arriving thread view lands focus on the next mutation after the user defocuses', async () => {+ const control = makeControl();+ threadViewHeld = true;+ setOpenThreads([makeThread({ threadId: 't1', title: 'Pre-existing' })]);+ render(<Harness initialVisible={false} control={control} />);+ await act(async () => {});++ act(() => {+ control.current?.setVisible(true);+ });+ const outside = document.createElement('input');+ document.body.appendChild(outside);+ outside.focus();++ threadViewHeld = false;+ act(() => {+ control.current?.rerender();+ });+ await screen.findByTestId('thread-view');+ expect(document.activeElement).toBe(outside);++ outside.blur();+ threadViewHeld = true;+ act(() => {+ control.current?.rerender();+ });+ threadViewHeld = false;+ act(() => {+ control.current?.rerender();+ });++ await waitFor(() =>+ expect(document.activeElement).toBe(screen.getByTestId('agent-thread-composer')),+ );+ outside.remove();+ });++ test('a reveal focus that never lands retires at the deadline with a warn', async () => {+ vi.useFakeTimers();+ const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});+ const control = makeControl();+ threadViewHeld = true;+ setOpenThreads([makeThread({ threadId: 't1', title: 'Pre-existing' })]);+ render(<Harness initialVisible={false} control={control} />);+ await act(async () => {});++ try {+ act(() => {+ control.current?.setVisible(true);+ });+ act(() => {+ vi.advanceTimersByTime(5_000);+ });+ expect(+ warnSpy.mock.calls.some((call) =>+ String(call[0]).includes('reveal focus did not land within its 5000ms bound'),+ ),+ ).toBe(true);++ threadViewHeld = false;+ await act(async () => {+ control.current?.rerender();+ });+ expect(screen.getByTestId('thread-view')).toBeDefined();+ expect(document.activeElement).not.toBe(screen.getByTestId('agent-thread-composer'));+ } finally {+ vi.useRealTimers();+ warnSpy.mockRestore();+ }+ });++ test('a reveal focus that lands and is then released to body before the deadline does not warn', async () => {+ vi.useFakeTimers();+ const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});+ const control = makeControl();+ threadViewHeld = true;+ setOpenThreads([makeThread({ threadId: 't1', title: 'Pre-existing' })]);+ render(<Harness initialVisible={false} control={control} />);+ await act(async () => {});++ try {+ act(() => {+ control.current?.setVisible(true);+ });+ threadViewHeld = false;+ act(() => {+ control.current?.rerender();+ });+ await act(async () => {});+ const composer = screen.getByTestId('agent-thread-composer');+ expect(document.activeElement).toBe(composer);++ composer.blur();+ expect(document.activeElement).toBe(document.body);++ act(() => {+ vi.advanceTimersByTime(5_000);+ });+ expect(+ warnSpy.mock.calls.some((call) =>+ String(call[0]).includes('reveal focus did not land within its 5000ms bound'),+ ),+ ).toBe(false);+ } finally {+ vi.useRealTimers();+ warnSpy.mockRestore();+ }+ });test('the history menu reopens an archived conversation as a tab', async () => {const user = userEvent.setup();render(<Harness />);@@ -899,6 +1675,36 @@ describe('SessionsHost — agents panel (web / no bridge)', () => {expect(launchAgentThread.mock.calls[0][0]).toEqual({ source: 'registry', id: 'claude-acp' });});+ test('re-subscribing the agents order restore keeps a reveal seed another effect owes', async () => {+ window.location.hash = '';+ mockRegisteredAgent = null;+ const control = makeControl();+ const makeDockBridge = () =>+ ({+ terminal: {+ getDockState: async () => ({ terminalVisible: false, agentPanelVisible: false }),+ setDockState: vi.fn(() => ({ ok: true as const })),+ },+ editor: { notifyViewMenuStateChanged: vi.fn() },+ }) as unknown as OkDesktopBridge;++ render(<Harness bridge={makeDockBridge()} initialVisible={false} control={control} />);+ await act(async () => {});++ act(() => control.current?.setVisible(true));+ expect(launchAgentThread).not.toHaveBeenCalled();++ await act(async () => {+ control.current?.setBridge(makeDockBridge());+ });++ mockRegisteredAgent = { source: 'registry', id: 'claude-acp', name: 'Claude Agent' };+ act(() => control.current?.rerender());++ expect(launchAgentThread).toHaveBeenCalledTimes(1);+ expect(launchAgentThread.mock.calls[0][0]).toEqual({ source: 'registry', id: 'claude-acp' });+ });+test('a reveal owed a conversation drops the debt if the panel closes first', () => {mockRegisteredAgent = null;const control = makeControl();diff --git a/packages/app/src/components/SessionsHost.terminal-rehydration.dom.test.tsx b/packages/app/src/components/SessionsHost.terminal-rehydration.dom.test.tsxindex 7f6483d54..f96a709d7 100644--- a/packages/app/src/components/SessionsHost.terminal-rehydration.dom.test.tsx+++ b/packages/app/src/components/SessionsHost.terminal-rehydration.dom.test.tsx@@ -4,9 +4,17 @@ import { useEffect, useState } from 'react';import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest';import { TooltipProvider } from '@/components/ui/tooltip';import type { OkDesktopBridge } from '@/lib/desktop-bridge-types';+import { emitLocalMenuAction } from '@/lib/local-menu-action-bus';+import {+ dispatchReorderChord,+ dispatchTabChord,+ focusFirstTab,+ tabTitles,+} from './sessions-host-tabs.test-helper';vi.doMock('@/lib/acp/thread-client', () => ({useOpenAgentThreadTabs: () => [],+ useInitialRosterThreadIds: () => null,useArchivedAgentThreads: () => [],useAgentThreadConnection: () => 'open',useAgentThreadUnread: () => false,@@ -322,4 +330,176 @@ describe('SessionsHost — terminal dock rehydration must always settle', () =>expect(adoptedAfter).toEqual(adoptedBefore);expect(adoptedAfter).not.toContain('pty-late');});++ test('after a rejected read, the user reordering the tabs releases suppression and persists the arrangement', async () => {+ const setDockState = vi.fn(async () => ({ ok: true }));+ const getDockState = vi.fn(async () => {+ throw new Error('ipc exploded');+ });+ const list = vi.fn(async () => [+ { ptyId: 'pty-a', customLabel: 'build', ordinal: 1 },+ { ptyId: 'pty-b', customLabel: 'server', ordinal: 2 },+ ]);+ render(+ <Harness+ bridge={makeBridge({ getDockState, list, setDockState })}+ restoreNonce={1}+ startVisible+ />,+ );+ await revealAndSettle(1_000);++ expect(tabTitles()).toEqual(['build', 'server']);+ expect(setDockState).not.toHaveBeenCalled();++ focusFirstTab();+ expect(dispatchReorderChord('ArrowRight').defaultPrevented).toBe(true);+ await revealAndSettle(0);++ expect(tabTitles()).toEqual(['server', 'build']);+ const writes = setDockState.mock.calls.filter(+ (call) => (call[0] as { surface?: string }).surface === 'terminal',+ );+ expect(writes.length).toBeGreaterThan(0);+ expect(writes.at(-1)?.[0]).toMatchObject({+ surface: 'terminal',+ order: ['pty-b', 'pty-a'],+ });+ });++ test('after a rejected read, opening a new tab releases suppression and persists the grown tab set', async () => {+ const setDockState = vi.fn(async () => ({ ok: true }));+ const getDockState = vi.fn(async () => {+ throw new Error('ipc exploded');+ });+ const list = vi.fn(async () => [+ { ptyId: 'pty-a', customLabel: 'build', ordinal: 1 },+ { ptyId: 'pty-b', customLabel: 'server', ordinal: 2 },+ ]);+ render(+ <Harness+ bridge={makeBridge({ getDockState, list, setDockState })}+ restoreNonce={1}+ startVisible+ />,+ );+ await revealAndSettle(1_000);++ expect(tabTitles()).toEqual(['build', 'server']);+ expect(setDockState).not.toHaveBeenCalled();++ act(() => {+ emitLocalMenuAction('new-terminal');+ });+ await revealAndSettle(0);++ expect(tabTitles()).toHaveLength(3);+ const writes = setDockState.mock.calls.filter(+ (call) => (call[0] as { surface?: string }).surface === 'terminal',+ );+ expect(writes.length).toBeGreaterThan(0);+ expect(writes.at(-1)?.[0]).toMatchObject({+ surface: 'terminal',+ order: ['pty-a', 'pty-b', 'pty-fresh'],+ });+ });++ test('after a rejected read, the tab chord releases suppression and persists the active key', async () => {+ const setDockState = vi.fn(async () => ({ ok: true }));+ const getDockState = vi.fn(async () => {+ throw new Error('ipc exploded');+ });+ const list = vi.fn(async () => [+ { ptyId: 'pty-a', customLabel: 'build', ordinal: 1 },+ { ptyId: 'pty-b', customLabel: 'server', ordinal: 2 },+ ]);+ render(+ <Harness+ bridge={makeBridge({ getDockState, list, setDockState })}+ restoreNonce={1}+ startVisible+ />,+ );+ await revealAndSettle(1_000);++ expect(tabTitles()).toEqual(['build', 'server']);+ expect(setDockState).not.toHaveBeenCalled();++ act(() => {+ screen.getByTestId('terminal-new-chat').focus();+ });+ await revealAndSettle(0);+ expect(setDockState).not.toHaveBeenCalled();++ expect(dispatchTabChord('1').defaultPrevented).toBe(true);+ await revealAndSettle(0);++ expect(tabTitles()).toEqual(['build', 'server']);+ const writes = setDockState.mock.calls.filter(+ (call) => (call[0] as { surface?: string }).surface === 'terminal',+ );+ expect(writes.length).toBeGreaterThan(0);+ expect(writes.at(-1)?.[0]).toMatchObject({+ surface: 'terminal',+ order: ['pty-a', 'pty-b'],+ activeKey: 'pty-a',+ });+ });++ test('after a rejected read, selecting a tab in the strip releases suppression on its own', async () => {+ const setDockState = vi.fn(async () => ({ ok: true }));+ const getDockState = vi.fn(async () => {+ throw new Error('ipc exploded');+ });+ const list = vi.fn(async () => [+ { ptyId: 'pty-a', customLabel: 'build', ordinal: 1 },+ { ptyId: 'pty-b', customLabel: 'server', ordinal: 2 },+ ]);+ render(+ <Harness+ bridge={makeBridge({ getDockState, list, setDockState })}+ restoreNonce={1}+ startVisible+ />,+ );+ await revealAndSettle(1_000);++ expect(tabTitles()).toEqual(['build', 'server']);+ expect(setDockState).not.toHaveBeenCalled();++ focusFirstTab();+ await revealAndSettle(0);++ const writes = setDockState.mock.calls.filter(+ (call) => (call[0] as { surface?: string }).surface === 'terminal',+ );+ expect(writes.length).toBeGreaterThan(0);+ expect(writes.at(-1)?.[0]).toMatchObject({+ surface: 'terminal',+ order: ['pty-a', 'pty-b'],+ activeKey: 'pty-a',+ });+ });++ test('after a rejected read, adopting PTYs alone never releases suppression', async () => {+ const setDockState = vi.fn(async () => ({ ok: true }));+ const getDockState = vi.fn(async () => {+ throw new Error('ipc exploded');+ });+ const list = vi.fn(async () => [+ { ptyId: 'pty-a', customLabel: 'build', ordinal: 1 },+ { ptyId: 'pty-b', customLabel: 'server', ordinal: 2 },+ ]);+ render(+ <Harness+ bridge={makeBridge({ getDockState, list, setDockState })}+ restoreNonce={1}+ startVisible+ />,+ );+ await revealAndSettle(10_000);++ expect(tabTitles()).toEqual(['build', 'server']);+ expect(setDockState).not.toHaveBeenCalled();+ });});diff --git a/packages/app/src/components/SessionsHost.tsx b/packages/app/src/components/SessionsHost.tsxindex 0f49a3593..7189d2e16 100644--- a/packages/app/src/components/SessionsHost.tsx+++ b/packages/app/src/components/SessionsHost.tsx@@ -44,6 +44,7 @@ import {useAgentThreadConnection,useAgentThreadUnread,useArchivedAgentThreads,+ useInitialRosterThreadIds,useOpenAgentThreadTabs,} from '@/lib/acp/thread-client';import { stageThreadDraft } from '@/lib/acp/thread-draft-staging';@@ -52,14 +53,15 @@ import {type DockSessionOrder,type DockSurface,readDockRestoreState,- readDockSessionOrder,readWebDockSessionOrder,+ writeAgentsPanelLevel,writeDockSessionOrder,} from '@/lib/dock-session-persistence';import { matchesPrimaryModifier, type ShortcutPlatform } from '@/lib/keyboard-shortcuts';import { subscribeLocalMenuAction } from '@/lib/local-menu-action-bus';import type { NewSessionChoice } from '@/lib/new-session-choice';import { isOverlayLayerOpen } from '@/lib/overlay-layers';+import { RESTORE_SETTLE_TIMEOUT_MS } from '@/lib/restore-settle-timeout';import { usePreferBareTerminal, writePreferBareTerminal } from '@/lib/terminal-new-tab-store';import {parseStickyCliId,@@ -111,6 +113,24 @@ interface ThreadSessionDescriptor extends BaseSessionDescriptor {}type SessionDescriptor = TerminalSessionDescriptor | ThreadSessionDescriptor;+type SessionOpenProvenance = 'user' | 'restore-seed';++function applyReorder(+ current: readonly SessionDescriptor[],+ newOrderIds: readonly string[],+): SessionDescriptor[] | null {+ if (newOrderIds.length !== current.length) return null;+ const byId = new Map(current.map((session) => [session.id, session]));+ const next: SessionDescriptor[] = [];+ for (const id of newOrderIds) {+ const session = byId.get(id);+ if (session == null) return null;+ next.push(session);+ }+ if (next.every((session, index) => session === current[index])) return null;+ return next;+}+function makeSessionId(counter: number): string {return `terminal-session-${counter}`;}@@ -119,22 +139,22 @@ function escapeSelector(id: string): string {return typeof CSS !== 'undefined' && CSS.escape ? CSS.escape(id) : id;}+function terminalSessionFocusSelector(id: string): string {+ return `[data-terminal-session="${escapeSelector(id)}"] .xterm-helper-textarea`;+}++function threadSessionFocusSelector(id: string): string {+ return `[data-session-id="${escapeSelector(id)}"] [data-testid="agent-thread-composer"]`;+}+function focusTerminalSession(id: string) {if (id === '') return;- document- .querySelector<HTMLElement>(- `[data-terminal-session="${escapeSelector(id)}"] .xterm-helper-textarea`,- )- ?.focus();+ document.querySelector<HTMLElement>(terminalSessionFocusSelector(id))?.focus();}function focusThreadSession(id: string) {if (id === '') return;- document- .querySelector<HTMLElement>(- `[data-session-id="${escapeSelector(id)}"] [data-testid="agent-thread-composer"]`,- )- ?.focus();+ document.querySelector<HTMLElement>(threadSessionFocusSelector(id))?.focus();}function focusSession(session: SessionDescriptor) {@@ -228,10 +248,9 @@ function ThreadTabIcon({);}-interface SessionsHostProps {+interface SessionsHostSharedProps {readonly bridge: OkDesktopBridge | null;readonly terminalCapable?: boolean;- readonly surface: SessionSurface;readonly terminalPlacement?: TerminalPlacement;readonly onTerminalPlacementChange?: (placement: TerminalPlacement) => void;readonly reserveRightRevealTabGutter?: boolean;@@ -247,7 +266,19 @@ interface SessionsHostProps {readonly onRequestEditorFocus: () => void;}-const TERMINAL_RESTORE_TIMEOUT_MS = 5_000;+type SessionsHostProps = SessionsHostSharedProps &+ (+ | {+ readonly surface: Extract<SessionSurface, 'agents-panel'>;+ readonly agentsVisibilityRestoreSettled: boolean;+ }+ | {+ readonly surface: Extract<SessionSurface, 'terminal-dock' | 'terminal-window'>;+ readonly agentsVisibilityRestoreSettled?: never;+ }+ );++const REVEAL_FOCUS_LANDING_TIMEOUT_MS = 5_000;const TERMINAL_DOCK_KINDS: Record<Exclude<LauncherSelection['kind'], 'thread' | 'none'>, true> = {cli: true,@@ -265,6 +296,7 @@ export function SessionsHost({terminalRestoreRevealNonce = 0,visible,onVisibleChange,+ agentsVisibilityRestoreSettled,launch = null,commandLaunch = null,threadLaunch = null,@@ -281,6 +313,7 @@ export function SessionsHost({const terminalAvailable = hostTerminals && terminalCapable && bridge?.terminal != null;const edge: SessionPanelEdge = hostThreads ? 'right' : terminalPlacement;const persistSurface: DockSurface = hostThreads ? 'agents' : 'terminal';+ const persistedPanelLevel = hostThreads && visible;const persistsOrder = !isWindow;const shortcutPlatform: ShortcutPlatform | undefined =bridge?.platform === 'darwin'@@ -302,6 +335,8 @@ export function SessionsHost({}, [hostEl, container]);const canRehydrate = hostTerminals && typeof bridge?.terminal?.list === 'function';+ const restoresDesktopDockOrder =+ hostThreads && typeof bridge?.terminal?.getDockState === 'function';const coldSeedTerminal = !canRehydrate && terminalAvailable && visible;@@ -332,7 +367,9 @@ export function SessionsHost({const [activeSessionId, setActiveSessionId] = useState(() =>coldSeedTerminal ? makeSessionId(1) : '',);- const [rehydrationSettled, setRehydrationSettled] = useState(!canRehydrate);+ const [rehydrationSettled, setRehydrationSettled] = useState(+ !canRehydrate && !restoresDesktopDockOrder,+ );const rehydratedRef = useRef(false);const activeSessionIdRef = useRef(activeSessionId);const sessionsRef = useRef(sessions);@@ -345,6 +382,8 @@ export function SessionsHost({const seedOwedRef = useRef(false);const restoreAbandonedRef = useRef(false);const restoreUnreadRef = useRef(false);+ const userArrangedRef = useRef(false);+ const rosterPopulatedRef = useRef(false);const persistDeclineLoggedRef = useRef(false);const persistSuppressedRef = useRef<() => boolean>(() => false);const lastHandledCommandNonceRef = useRef<number | null>(null);@@ -377,12 +416,12 @@ export function SessionsHost({function dockPersistSuppressed(): boolean {if (!persistsOrder) return true;- if (canRehydrate && !rehydrationSettled) return true;- if (restoreUnreadRef.current) {+ if (!rehydrationSettled) return true;+ if (restoreUnreadRef.current && !userArrangedRef.current) {if (!persistDeclineLoggedRef.current) {persistDeclineLoggedRef.current = true;console.warn(- '[terminal] dock persistence suppressed for this window: the restore did not complete, so the saved tab set is left untouched',+ `[${hostThreads ? 'agents' : 'terminal'}] dock persistence withheld: the restore did not complete, so the saved tab set is left untouched`,);}return true;@@ -397,15 +436,14 @@ export function SessionsHost({.map((session) => computePersistKey(session, ptyMap)).filter((key): key is string => key != null);const active = sessionsRef.current.find((s) => s.id === activeSessionIdRef.current);- writeDockSessionOrder(- bridge,- persistSurface,- {- order,- activeKey: active != null ? computePersistKey(active, ptyMap) : null,- },- buildTerminalRestartSnapshot(sessionsRef.current, activeSessionIdRef.current),- );+ const activeKey = active != null ? computePersistKey(active, ptyMap) : null;+ const snapshot = buildTerminalRestartSnapshot(sessionsRef.current, activeSessionIdRef.current);+ if (hostThreads) {+ writeDockSessionOrder(bridge, 'agents', { order, activeKey }, snapshot);+ writeAgentsPanelLevel(bridge, visible);+ } else {+ writeDockSessionOrder(bridge, 'terminal', { order, activeKey }, snapshot);+ }}function setSessionPtyId(id: string, ptyId: string | null) {@@ -429,7 +467,9 @@ export function SessionsHost({function openSession(launchForSession: TerminalLaunchIntent | null,commandForSession: TerminalCommandId | null = null,+ provenance: SessionOpenProvenance,) {+ if (provenance === 'user') noteUserArrangement();pendingActiveKeyRef.current = null;sessionCounterRef.current += 1;const id = makeSessionId(sessionCounterRef.current);@@ -476,14 +516,14 @@ export function SessionsHost({? { kind: 'terminal' }: { kind: 'agent', agent: null };- function openNewChatSession(cli: TerminalCli) {+ function openNewChatSession(cli: TerminalCli, provenance: SessionOpenProvenance) {stripLaunchNonceRef.current += 1;- openSession({ prompt: null, cli, nonce: stripLaunchNonceRef.current });+ openSession({ prompt: null, cli, nonce: stripLaunchNonceRef.current }, null, provenance);}function launchSelectedNewTab() {- if (newSessionChoice.kind === 'terminal') openSession(null);- else if (newSessionChoice.kind === 'cli') openNewChatSession(newSessionChoice.cli);+ if (newSessionChoice.kind === 'terminal') openSession(null, null, 'user');+ else if (newSessionChoice.kind === 'cli') openNewChatSession(newSessionChoice.cli, 'user');else if (newSessionChoice.kind === 'agent' && newSessionChoice.agent != null)void launchAgentThread({ source: newSessionChoice.agent.source, id: newSessionChoice.agent.id },@@ -505,8 +545,9 @@ export function SessionsHost({);return true;}- if (newSessionChoice.kind === 'terminal') openSession(null);- else if (newSessionChoice.kind === 'cli') openNewChatSession(newSessionChoice.cli);+ if (newSessionChoice.kind === 'terminal') openSession(null, null, 'restore-seed');+ else if (newSessionChoice.kind === 'cli')+ openNewChatSession(newSessionChoice.cli, 'restore-seed');return true;}@@ -633,12 +674,12 @@ export function SessionsHost({function pickNewChatCli(cli: TerminalCli) {writePreferBareTerminal(false);saveStickyAgent(terminalCliId(cli));- openNewChatSession(cli);+ openNewChatSession(cli, 'user');}function pickNewChatTerminal() {writePreferBareTerminal(true);- openSession(null);+ openSession(null, null, 'user');}function pickNewChatAgent(agent: RegisteredAgent) {@@ -693,19 +734,19 @@ export function SessionsHost({const announcerRef = useRef<HTMLSpanElement>(null);const announceTimerRef = useRef<number | null>(null);+ function noteUserArrangement() {+ if (persistDeclineLoggedRef.current) {+ console.warn(+ `[${hostThreads ? 'agents' : 'terminal'}] dock persistence resumed: a user arrangement established the tab set the restore did not`,+ );+ }+ userArrangedRef.current = true;+ persistDeclineLoggedRef.current = false;+ }+function reorderSessions(newOrderIds: readonly string[]) {- setSessions((prev) => {- if (newOrderIds.length !== prev.length) return prev;- const byId = new Map(prev.map((session) => [session.id, session]));- const next: SessionDescriptor[] = [];- for (const id of newOrderIds) {- const session = byId.get(id);- if (session == null) return prev;- next.push(session);- }- if (next.every((session, index) => session === prev[index])) return prev;- return next;- });+ if (applyReorder(sessionsRef.current, newOrderIds) != null) noteUserArrangement();+ setSessions((prev) => applyReorder(prev, newOrderIds) ?? prev);const orderedPtyIds = newOrderIds.map((id) => ptyIdBySessionRef.current.get(id)).filter((ptyId): ptyId is string => ptyId != null);@@ -732,6 +773,7 @@ export function SessionsHost({launchSelectedNewTab();}+ const noteUserArrangementRef = useRef(noteUserArrangement);const moveActiveSessionRef = useRef(moveActiveSession);const openSessionRef = useRef(openSession);const seedOnRevealRef = useRef(seedOnReveal);@@ -743,6 +785,7 @@ export function SessionsHost({const current = sessionsRef.current;const index = current.findIndex((session) => session.id === id);if (index === -1) return;+ noteUserArrangement();const session = current[index];const isLast = current.length === 1;pendingActiveKeyRef.current = null;@@ -771,9 +814,11 @@ export function SessionsHost({dispatchAskAiRef.current = dispatchAskAi;revealForReuseRef.current = revealForReuse;launchPreferredSessionRef.current = launchPreferredSession;+ noteUserArrangementRef.current = noteUserArrangement;moveActiveSessionRef.current = moveActiveSession;activeSessionIdRef.current = activeSessionId;sessionsRef.current = sessions;+ if (sessions.length > 0) rosterPopulatedRef.current = true;closeActiveRef.current = () => {const active = sessionsRef.current.find((s) => s.id === activeSessionIdRef.current);if (active?.kind === 'terminal') {@@ -785,25 +830,44 @@ export function SessionsHost({};});+ const initialRosterThreadIds = useInitialRosterThreadIds();+useEffect(() => {if (!persistsOrder) return;if (!rehydrationSettled) return;if (persistSuppressedRef.current()) return;+ if (+ hostThreads &&+ sessions.length === 0 &&+ !rosterPopulatedRef.current &&+ (initialRosterThreadIds === null || initialRosterThreadIds.size > 0)+ ) {+ writeAgentsPanelLevel(bridge, persistedPanelLevel);+ return;+ }const ptyMap = ptyIdBySessionRef.current;const order = sessions.map((session) => computePersistKey(session, ptyMap)).filter((key): key is string => key != null);const active = sessions.find((s) => s.id === activeSessionId);- writeDockSessionOrder(- bridge,- persistSurface,- {- order,- activeKey: active != null ? computePersistKey(active, ptyMap) : null,- },- buildTerminalRestartSnapshot(sessions, activeSessionId),- );- }, [sessions, activeSessionId, persistsOrder, persistSurface, bridge, rehydrationSettled]);+ const activeKey = active != null ? computePersistKey(active, ptyMap) : null;+ const snapshot = buildTerminalRestartSnapshot(sessions, activeSessionId);+ if (hostThreads) {+ writeDockSessionOrder(bridge, 'agents', { order, activeKey }, snapshot);+ writeAgentsPanelLevel(bridge, persistedPanelLevel);+ } else {+ writeDockSessionOrder(bridge, 'terminal', { order, activeKey }, snapshot);+ }+ }, [+ sessions,+ activeSessionId,+ persistsOrder,+ bridge,+ rehydrationSettled,+ persistedPanelLevel,+ hostThreads,+ initialRosterThreadIds,+ ]);useEffect(() => {if (!hostThreads) return;@@ -862,13 +926,27 @@ export function SessionsHost({}}, [openThreadTabs, hostThreads]);- const prevLiveThreadCountRef = useRef(liveThreadCount);+ const liveThreadIds = openThreadTabs+ .filter((info) => info.archived !== true)+ .map((info) => info.threadId);+ const prevLiveThreadIdsRef = useRef<readonly string[]>(liveThreadIds);useEffect(() => {if (!hostThreads) return;- const previous = prevLiveThreadCountRef.current;- prevLiveThreadCountRef.current = liveThreadCount;- if (liveThreadCount > previous && !visible) onVisibleChange(true);- }, [liveThreadCount, visible, hostThreads, onVisibleChange]);+ if (!agentsVisibilityRestoreSettled) return;+ const previous = prevLiveThreadIdsRef.current;+ prevLiveThreadIdsRef.current = liveThreadIds;+ const added = liveThreadIds.filter((id) => !previous.includes(id));+ if (added.length === 0 || visible) return;+ const absorbsReloadSnapshot = added.every((id) => initialRosterThreadIds?.has(id) === true);+ if (!absorbsReloadSnapshot) onVisibleChange(true);+ }, [+ liveThreadIds,+ hostThreads,+ agentsVisibilityRestoreSettled,+ visible,+ initialRosterThreadIds,+ onVisibleChange,+ ]);useEffect(() => {const pending = pendingActiveKeyRef.current;@@ -897,12 +975,12 @@ export function SessionsHost({if (launch != null && launch.nonce !== lastHandledLaunchNonceRef.current) {lastHandledLaunchNonceRef.current = launch.nonce;- openSessionRef.current(launch);+ openSessionRef.current(launch, null, 'user');return;}if (commandLaunch != null && commandLaunch.nonce !== lastHandledCommandNonceRef.current) {lastHandledCommandNonceRef.current = commandLaunch.nonce;- openSessionRef.current(null, commandLaunch.id);+ openSessionRef.current(null, commandLaunch.id, 'user');return;}const threadLaunchPending =@@ -988,13 +1066,13 @@ export function SessionsHost({const restoreDeadline = window.setTimeout(() => {abandoned = true;console.warn(- `[terminal] dock restore exceeded its ${TERMINAL_RESTORE_TIMEOUT_MS}ms bound; cold-starting instead of waiting`,+ `[terminal] dock restore exceeded its ${RESTORE_SETTLE_TIMEOUT_MS}ms bound; cold-starting instead of waiting`,);restoreAbandonedRef.current = true;restoreUnreadRef.current = true;seedOwedRef.current = true;settle();- }, TERMINAL_RESTORE_TIMEOUT_MS);+ }, RESTORE_SETTLE_TIMEOUT_MS);const finish = () => {window.clearTimeout(restoreDeadline);if (!abandoned) settle();@@ -1114,6 +1192,7 @@ export function SessionsHost({rehydratedRef.current = false;restoreAbandonedRef.current = false;restoreUnreadRef.current = false;+ userArrangedRef.current = false;seedOwedRef.current = false;persistDeclineLoggedRef.current = false;};@@ -1123,14 +1202,38 @@ export function SessionsHost({if (canRehydrate || !persistsOrder) return;if (typeof bridge?.terminal?.getDockState !== 'function') return;let cancelled = false;- void readDockSessionOrder(bridge, persistSurface).then((persisted) => {- if (cancelled || persisted == null) return;- reloadOrderRef.current = persisted.order;- const activationTookOver = pendingActiveKeyRef.current !== null;- if (!activationTookOver) pendingActiveKeyRef.current = persisted.activeKey;- });+ let abandoned = false;+ const settle = () => {+ if (!cancelled) setRehydrationSettled(true);+ };+ const restoreDeadline = window.setTimeout(() => {+ abandoned = true;+ console.warn(+ `[agents] dock order restore exceeded its ${RESTORE_SETTLE_TIMEOUT_MS}ms bound; the saved tab set is left untouched`,+ );+ restoreUnreadRef.current = true;+ settle();+ }, RESTORE_SETTLE_TIMEOUT_MS);+ void readDockRestoreState(bridge, persistSurface)+ .then(({ sessionOrder: persisted, failed: restoreReadFailed }) => {+ if (cancelled || abandoned) return;+ if (restoreReadFailed) restoreUnreadRef.current = true;+ if (persisted != null) {+ reloadOrderRef.current = persisted.order;+ const activationTookOver = pendingActiveKeyRef.current !== null;+ if (!activationTookOver) pendingActiveKeyRef.current = persisted.activeKey;+ }+ })+ .finally(() => {+ window.clearTimeout(restoreDeadline);+ settle();+ });return () => {cancelled = true;+ window.clearTimeout(restoreDeadline);+ restoreUnreadRef.current = false;+ userArrangedRef.current = false;+ persistDeclineLoggedRef.current = false;};}, [bridge, canRehydrate, persistsOrder, persistSurface]);@@ -1167,7 +1270,7 @@ export function SessionsHost({if (!hostTerminals) return;return subscribeLocalMenuAction((action) => {if (action === 'new-terminal') {- if (terminalAvailable) openSessionRef.current(null);+ if (terminalAvailable) openSessionRef.current(null, null, 'user');} else if (action === 'kill-terminal') closeActiveRef.current();else if (action === 'close-active-tab-or-window' && isWindow) closeActiveRef.current();});@@ -1184,6 +1287,7 @@ export function SessionsHost({if (target == null) return;event.preventDefault();event.stopPropagation();+ if (target.id !== activeSessionIdRef.current) noteUserArrangementRef.current();setActiveSessionId(target.id);queueMicrotask(() => focusSession(target));}@@ -1234,17 +1338,61 @@ export function SessionsHost({bridge?.editor.notifyViewMenuStateChanged({ terminalLive });}, [bridge, sessions, hostTerminals]);+ const focusInsideHostRef = useRef(false);+ useEffect(() => {+ if (hostEl == null) return;+ const syncFocusSnapshot = () => {+ focusInsideHostRef.current = focusInsideHost(hostEl);+ };+ document.addEventListener('focusin', syncFocusSnapshot, true);+ syncFocusSnapshot();+ return () => document.removeEventListener('focusin', syncFocusSnapshot, true);+ }, [hostEl]);useLayoutEffect(() => {if (isShowing || visible) return;- if (!focusInsideHost(hostEl)) return;+ if (!focusInsideHostRef.current) return;+ focusInsideHostRef.current = false;onRequestEditorFocus();- }, [isShowing, visible, hostEl, onRequestEditorFocus]);+ }, [isShowing, visible, onRequestEditorFocus]);useEffect(() => {if (!isShowing) return;const active = sessionsRef.current.find((s) => s.id === activeSessionIdRef.current);- if (active != null) focusSession(active);- }, [isShowing]);+ if (active == null) return;+ focusSession(active);+ if (hostEl == null || focusInsideHost(hostEl)) return;+ let landed = false;+ const recordLanding = (event: FocusEvent) => {+ if (hostEl.contains(event.target as Node | null)) landed = true;+ };+ document.addEventListener('focusin', recordLanding, true);+ const observer = new MutationObserver(() => {+ if (focusInsideHost(hostEl)) {+ landed = true;+ observer.disconnect();+ return;+ }+ if (document.activeElement == null || document.activeElement === document.body) {+ focusSession(active);+ }+ });+ observer.observe(hostEl, { subtree: true, childList: true });+ const deadline = window.setTimeout(() => {+ observer.disconnect();+ const focusNowhere =+ document.activeElement == null || document.activeElement === document.body;+ if (!landed && focusNowhere) {+ console.warn(+ `[${hostThreads ? 'agents' : 'terminal'}] reveal focus did not land within its ${REVEAL_FOCUS_LANDING_TIMEOUT_MS}ms bound`,+ );+ }+ }, REVEAL_FOCUS_LANDING_TIMEOUT_MS);+ return () => {+ document.removeEventListener('focusin', recordLanding, true);+ observer.disconnect();+ window.clearTimeout(deadline);+ };+ }, [isShowing, hostEl, hostThreads]);const activeThreadIdForView = (() => {const active = sessions.find((s) => s.id === activeSessionId);@@ -1306,6 +1454,7 @@ export function SessionsHost({sessionKind={hostThreads ? 'agent' : 'terminal'}activeSessionId={activeSessionId}onSelect={(id) => {+ if (id !== activeSessionIdRef.current) noteUserArrangement();pendingActiveKeyRef.current = null;setActiveSessionId(id);}}@@ -1324,7 +1473,14 @@ export function SessionsHost({edge={edge}onPlacementChange={surface === 'terminal-dock' ? onTerminalPlacementChange : undefined}reserveRightRevealTabGutter={reserveRightRevealTabGutter}- onCollapse={isWindow ? undefined : () => onVisibleChange(false)}+ onCollapse={+ isWindow+ ? undefined+ : () => {+ onVisibleChange(false);+ onRequestEditorFocus();+ }+ }draggable={isWindow}className="h-full">diff --git a/packages/app/src/components/TerminalRevealTab.dom.test.tsx b/packages/app/src/components/TerminalRevealTab.dom.test.tsxindex 844f9dcf1..05e70473b 100644--- a/packages/app/src/components/TerminalRevealTab.dom.test.tsx+++ b/packages/app/src/components/TerminalRevealTab.dom.test.tsx@@ -1,11 +1,32 @@+import type { ThreadInfo } from '@inkeep/open-knowledge-core/acp/thread-protocol';import { cleanup, render, screen } from '@testing-library/react';import userEvent from '@testing-library/user-event';import { afterEach, describe, expect, test, vi } from 'vitest';import { TooltipProvider } from '@/components/ui/tooltip';-import { TerminalRevealTab } from './TerminalRevealTab';++let openThreads: ThreadInfo[] = [];++vi.doMock('@/lib/acp/thread-client', () => ({+ useOpenAgentThreadTabs: () => openThreads,+}));++const { TerminalRevealTab } = await import('./TerminalRevealTab');const LABEL = { bottom: 'Open terminal', right: 'Open agents panel' } as const;+function makeThread(overrides: Partial<ThreadInfo> & { threadId: string }): ThreadInfo {+ return {+ agent: { id: 'a', name: 'Agent', source: 'registry' },+ title: overrides.threadId,+ status: 'ready',+ createdAt: 1,+ lastActivityAt: 1,+ lastSeq: 0,+ archived: false,+ ...overrides,+ };+}+function renderTab(edge: 'bottom' | 'right') {const onReveal = vi.fn(() => {});render(@@ -17,7 +38,10 @@ function renderTab(edge: 'bottom' | 'right') {}describe('TerminalRevealTab', () => {- afterEach(() => cleanup());+ afterEach(() => {+ cleanup();+ openThreads = [];+ });test('names the panel it reopens and fires onReveal on click', async () => {const user = userEvent.setup();@@ -61,4 +85,45 @@ describe('TerminalRevealTab', () => {const tooltip = await screen.findByRole('tooltip');expect(tooltip.textContent).toContain(LABEL.bottom);});++ test('a live thread surfaces a presence dot on the agents edge while the panel is closed', () => {+ openThreads = [+ makeThread({ threadId: 't1', title: 'Working' }),+ makeThread({ threadId: 't2', title: 'Also working', createdAt: 2, lastActivityAt: 2 }),+ makeThread({ threadId: 't3', title: 'Third', createdAt: 3, lastActivityAt: 3 }),+ ];++ renderTab('right');++ expect(screen.getByTestId('agents-reveal-live-dot')).toBeTruthy();+ expect(screen.getByTestId('agents-reveal-live-dot').getAttribute('aria-hidden')).toBe('true');+ expect(+ screen.getByRole('button', { name: 'Open agents panel — 3 live agent threads' }),+ ).toBeTruthy();+ });++ test('one live thread names the panel with the singular live count', () => {+ openThreads = [makeThread({ threadId: 't1', title: 'Working' })];++ renderTab('right');++ expect(+ screen.getByRole('button', { name: 'Open agents panel — 1 live agent thread' }),+ ).toBeTruthy();+ });++ test('no presence dot without live threads, on the terminal edge, or for archived-only threads', () => {+ renderTab('right');+ expect(screen.queryByTestId('agents-reveal-live-dot')).toBeNull();+ cleanup();++ openThreads = [makeThread({ threadId: 't1', title: 'Working' })];+ renderTab('bottom');+ expect(screen.queryByTestId('agents-reveal-live-dot')).toBeNull();+ cleanup();++ openThreads = [makeThread({ threadId: 't1', title: 'History', archived: true })];+ renderTab('right');+ expect(screen.queryByTestId('agents-reveal-live-dot')).toBeNull();+ });});diff --git a/packages/app/src/components/TerminalRevealTab.tsx b/packages/app/src/components/TerminalRevealTab.tsxindex 636cee691..2e323b455 100644--- a/packages/app/src/components/TerminalRevealTab.tsx+++ b/packages/app/src/components/TerminalRevealTab.tsx@@ -1,7 +1,9 @@+import { plural } from '@lingui/core/macro';import { useLingui } from '@lingui/react/macro';import { ChevronLeftIcon, ChevronUpIcon } from 'lucide-react';import { Button } from '@/components/ui/button';import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip';+import { useOpenAgentThreadTabs } from '@/lib/acp/thread-client';import { cn } from '@/lib/utils';import type { SessionPanelEdge } from './TerminalTabStrip';@@ -14,7 +16,16 @@ interface TerminalRevealTabProps {export function TerminalRevealTab({ edge, onReveal, className }: TerminalRevealTabProps) {const { t } = useLingui();const rightEdge = edge === 'right';- const label = rightEdge ? t`Open agents panel` : t`Open terminal`;+ const openThreadTabs = useOpenAgentThreadTabs();+ const liveThreadCount = openThreadTabs.filter((info) => info.archived !== true).length;+ const label = rightEdge+ ? liveThreadCount > 0+ ? t`Open agents panel — ${plural(liveThreadCount, {+ one: '# live agent thread',+ other: '# live agent threads',+ })}`+ : t`Open agents panel`+ : t`Open terminal`;return (<Tooltip><TooltipTrigger asChild>@@ -36,6 +47,13 @@ export function TerminalRevealTab({ edge, onReveal, className }: TerminalRevealT) : (<ChevronUpIcon aria-hidden="true" />)}+ {rightEdge && liveThreadCount > 0 ? (+ <span+ aria-hidden="true"+ data-testid="agents-reveal-live-dot"+ className="absolute top-1 end-1 size-1.5 rounded-full bg-emerald-600 ring-1 ring-background"+ />+ ) : null}</Button></TooltipTrigger><TooltipContent side={rightEdge ? 'left' : 'top'} sideOffset={8}>diff --git a/packages/app/src/components/resizable-panel-pointercancel-collapse-drift.dom.test.tsx b/packages/app/src/components/resizable-panel-pointercancel-collapse-drift.dom.test.tsxnew file mode 100644index 000000000..c47876b16--- /dev/null+++ b/packages/app/src/components/resizable-panel-pointercancel-collapse-drift.dom.test.tsx@@ -0,0 +1,103 @@+import { act, cleanup, render } from '@testing-library/react';+import { Group, Panel, Separator, useGroupRef, usePanelRef } from 'react-resizable-panels';+import { afterEach, describe, expect, test } from 'vitest';++function withOffsetWidth(px: number, fn: () => Promise<void>) {+ const proto = window.HTMLElement.prototype;+ const original = Object.getOwnPropertyDescriptor(proto, 'offsetWidth');+ Object.defineProperty(proto, 'offsetWidth', { configurable: true, get: () => px });+ const restore = () => {+ if (original) Object.defineProperty(proto, 'offsetWidth', original);+ else Reflect.deleteProperty(proto, 'offsetWidth');+ };+ return fn().finally(restore);+}++let capturedGroupRef: ReturnType<typeof useGroupRef> | null = null;+let capturedPanelRef: ReturnType<typeof usePanelRef> | null = null;++afterEach(() => {+ cleanup();+ capturedGroupRef = null;+ capturedPanelRef = null;+});++const GROUP_SIZE = 900;+const RIGHT_DEFAULT_PCT = 40;+const COLLAPSE_TRAVEL_PX = GROUP_SIZE;++function CollapsibleRightGroup() {+ const groupRef = useGroupRef();+ const panelRef = usePanelRef();+ capturedGroupRef = groupRef;+ capturedPanelRef = panelRef;+ return (+ <Group orientation="horizontal" groupRef={groupRef} style={{ width: GROUP_SIZE }}>+ <Panel id="editor" minSize="10%">+ editor+ </Panel>+ <Separator />+ {}+ <Panel+ id="right"+ collapsible+ collapsedSize={0}+ minSize="20%"+ defaultSize={`${RIGHT_DEFAULT_PCT}%`}+ panelRef={panelRef}+ >+ right+ </Panel>+ </Group>+ );+}++function pointerEvent(type: string, init: MouseEventInit) {+ return new MouseEvent(type, { bubbles: true, cancelable: true, ...init });+}++describe('react-resizable-panels collapse observable the showing-hold mock assumes', () => {+ test('a real drag that dips the right panel to measured collapse still reads collapsed at pointercancel and releases on a drag-free expansion', async () => {+ await withOffsetWidth(GROUP_SIZE, async () => {+ await act(async () => {+ render(<CollapsibleRightGroup />);+ });+ const group = capturedGroupRef?.current;+ const panel = capturedPanelRef?.current;+ if (!group || !panel) throw new Error('imperative handles were not attached');++ const separator = document.querySelector('[data-separator]');+ if (!separator) throw new Error('separator element was not rendered');++ expect(panel.isCollapsed()).toBe(false);++ await act(async () => {+ separator.dispatchEvent(pointerEvent('pointerdown', { clientX: 0, clientY: 0, button: 0 }));+ });+ await act(async () => {+ document.dispatchEvent(+ pointerEvent('pointerleave', { clientX: COLLAPSE_TRAVEL_PX, clientY: 0 }),+ );+ });++ expect(group.getLayout().right).toBe(0);+ expect(panel.isCollapsed()).toBe(true);++ await act(async () => {+ document.dispatchEvent(+ pointerEvent('pointercancel', { clientX: COLLAPSE_TRAVEL_PX, clientY: 0 }),+ );+ });++ expect(group.getLayout().right).toBe(0);+ expect(panel.isCollapsed()).toBe(true);++ await act(async () => {+ panel.expand();+ });++ expect(group.getLayout().right).toBeGreaterThan(0);+ expect(panel.isCollapsed()).toBe(false);+ });+ });+});diff --git a/packages/app/src/components/sessions-host-tabs.test-helper.ts b/packages/app/src/components/sessions-host-tabs.test-helper.tsnew file mode 100644index 000000000..51b4c2d53--- /dev/null+++ b/packages/app/src/components/sessions-host-tabs.test-helper.ts@@ -0,0 +1,40 @@+import { act, screen } from '@testing-library/react';++export function tabTitles(): string[] {+ return screen.getAllByRole('tab').map((tab) => tab.textContent ?? '');+}++export function focusFirstTab() {+ const tab = screen.getAllByRole('tab')[0] as HTMLElement | undefined;+ if (tab == null) throw new Error('no tab to focus');+ act(() => {+ tab.focus();+ });+}++export function dispatchReorderChord(key: 'ArrowLeft' | 'ArrowRight'): KeyboardEvent {+ const event = new KeyboardEvent('keydown', {+ key,+ metaKey: true,+ shiftKey: true,+ cancelable: true,+ bubbles: true,+ });+ act(() => {+ window.dispatchEvent(event);+ });+ return event;+}++export function dispatchTabChord(digit: string): KeyboardEvent {+ const event = new KeyboardEvent('keydown', {+ key: digit,+ metaKey: true,+ cancelable: true,+ bubbles: true,+ });+ act(() => {+ window.dispatchEvent(event);+ });+ return event;+}diff --git a/packages/app/src/lib/acp/thread-client.test.ts b/packages/app/src/lib/acp/thread-client.test.tsindex c0c102dc7..4f35a98bd 100644--- a/packages/app/src/lib/acp/thread-client.test.ts+++ b/packages/app/src/lib/acp/thread-client.test.ts@@ -24,6 +24,166 @@ describe('AgentThreadClient store snapshots', () => {});});+describe('initial roster attribution (agents-panel reload absorb)', () => {+ const info = (threadId: string): ThreadInfo => ({+ threadId,+ agent: { id: 'a', name: 'A', source: 'custom' },+ title: threadId,+ status: 'ready',+ createdAt: 1,+ lastActivityAt: 1,+ modes: null,+ configOptions: null,+ lastSeq: -1,+ });++ function makeClient(): { client: AgentThreadClient; frame: (f: ThreadServerFrame) => void } {+ const client = new AgentThreadClient();+ const internals = client as unknown as { handleFrame: (f: ThreadServerFrame) => void };+ return { client, frame: (f) => internals.handleFrame.call(client, f) };+ }++ class FakeSocket {+ static OPEN = 1;+ readyState = 0;+ onopen: (() => void) | null = null;+ onmessage: ((event: { data: unknown }) => void) | null = null;+ onclose: (() => void) | null = null;+ onerror: (() => void) | null = null;+ send(_raw: string): void {}+ close(): void {}+ open(): void {+ this.readyState = FakeSocket.OPEN;+ this.onopen?.();+ }+ }++ test('a fresh client has recorded no roster', () => {+ expect(makeClient().client.getInitialRosterThreadIds()).toBeNull();+ });++ test('the first threads frame records its thread ids once', () => {+ const { client, frame } = makeClient();+ frame({ op: 'threads', threads: [info('t1'), info('t2')] });++ const roster = client.getInitialRosterThreadIds();+ expect(roster).not.toBeNull();+ expect([...(roster as ReadonlySet<string>)].sort()).toEqual(['t1', 't2']);+ });++ test('a later threads frame does not re-record the roster', () => {+ const { client, frame } = makeClient();+ frame({ op: 'threads', threads: [info('t1')] });+ const roster = client.getInitialRosterThreadIds();++ frame({ op: 'threads', threads: [info('t1'), info('t9')] });++ expect(client.getInitialRosterThreadIds()).toBe(roster);+ expect(client.getInitialRosterThreadIds()?.has('t9')).toBe(false);+ });++ test('a second threads frame after an empty first roster does not re-record', () => {+ const { client, frame } = makeClient();+ frame({ op: 'threads', threads: [] });+ const roster = client.getInitialRosterThreadIds();++ frame({ op: 'threads', threads: [info('t1')] });++ expect(client.getInitialRosterThreadIds()).toBe(roster);+ expect(client.getInitialRosterThreadIds()?.size).toBe(0);+ });++ test('created and resumed pushes never record a roster', () => {+ const { client, frame } = makeClient();+ frame({ op: 'created', reqId: 'r1', info: info('t1') });+ expect(client.getInitialRosterThreadIds()).toBeNull();++ frame({ op: 'resumed', reqId: 'r2', info: info('t1') });+ expect(client.getInitialRosterThreadIds()).toBeNull();+ });++ test('an empty first roster records an empty set, not null', () => {+ const { client, frame } = makeClient();+ frame({ op: 'threads', threads: [] });++ const roster = client.getInitialRosterThreadIds();+ expect(roster).not.toBeNull();+ expect(roster?.size).toBe(0);+ });++ test('retargeting setUrl resets the roster so the next session records its own', () => {+ vi.stubGlobal('WebSocket', FakeSocket);+ try {+ const client = new AgentThreadClient();+ const internals = client as unknown as { handleFrame: (f: ThreadServerFrame) => void };+ const frame = (f: ThreadServerFrame) => internals.handleFrame.call(client, f);++ client.setUrl('ws://session-a');+ frame({ op: 'threads', threads: [info('a1'), info('a2')] });+ expect(client.getInitialRosterThreadIds()).not.toBeNull();++ client.setUrl('ws://session-b');+ frame({ op: 'threads', threads: [info('b1')] });++ const roster = client.getInitialRosterThreadIds();+ expect([...(roster ?? [])]).toEqual(['b1']);+ expect(['b1'].every((id) => roster?.has(id) === true)).toBe(true);+ } finally {+ vi.unstubAllGlobals();+ }+ });++ test('a same-session reconnect keeps the roster — the drop is not a retarget', async () => {+ vi.useFakeTimers();+ vi.stubGlobal('WebSocket', FakeSocket);+ try {+ const client = new AgentThreadClient();+ const internals = client as unknown as {+ handleFrame: (f: ThreadServerFrame) => void;+ ws: FakeSocket | null;+ };+ const frame = (f: ThreadServerFrame) => internals.handleFrame.call(client, f);++ client.setUrl('ws://session-a');+ internals.ws?.open();+ frame({ op: 'threads', threads: [info('t1'), info('t2')] });+ const roster = client.getInitialRosterThreadIds();+ expect(roster).not.toBeNull();++ internals.ws?.onclose?.();+ await vi.runAllTimersAsync();+ internals.ws?.open();+ frame({ op: 'threads', threads: [info('t1'), info('t2')] });++ expect(client.getInitialRosterThreadIds()).toBe(roster);+ } finally {+ vi.useRealTimers();+ vi.unstubAllGlobals();+ }+ });++ test('the first roster capture notifies subscribers even when the roster is empty', () => {+ const { client, frame } = makeClient();+ let notifications = 0;+ client.subscribe(() => {+ notifications += 1;+ });++ frame({ op: 'threads', threads: [] });++ expect(notifications).toBe(1);+ expect(client.getInitialRosterThreadIds()?.size).toBe(0);+ });++ test('the roster records the live population only, excluding archived ids', () => {+ const { client, frame } = makeClient();+ frame({ op: 'threads', threads: [info('t1'), { ...info('t2'), archived: true }] });++ const roster = client.getInitialRosterThreadIds();+ expect([...(roster ?? [])]).toEqual(['t1']);+ });+});+describe('batched event delivery', () => {const info: ThreadInfo = {threadId: 't1',diff --git a/packages/app/src/lib/acp/thread-client.ts b/packages/app/src/lib/acp/thread-client.tsindex 194a42876..90da84ca1 100644--- a/packages/app/src/lib/acp/thread-client.ts+++ b/packages/app/src/lib/acp/thread-client.ts@@ -87,6 +87,7 @@ export class AgentThreadClient {private reqCounter = 0;private status: ThreadConnectionStatus = 'idle';private version = 0;+ private initialRosterIds: ReadonlySet<string> | null = null;markThreadViewed = (threadId: string): void => {const state = this.threads.get(threadId);@@ -110,6 +111,10 @@ export class AgentThreadClient {setUrl(url: string | null): void {if (url === this.url) return;this.url = url;+ if (this.initialRosterIds !== null) {+ this.initialRosterIds = null;+ this.bump();+ }this.teardownSocket();if (url !== null) this.connect();else this.setStatus('idle');@@ -160,6 +165,8 @@ export class AgentThreadClient {getThread = (threadId: string): ThreadState | null => this.threads.get(threadId) ?? null;+ getInitialRosterThreadIds = (): ReadonlySet<string> | null => this.initialRosterIds;+private readonly modelBuilders = new Map<string, ThreadRenderModelBuilder>();getThreadModel = (threadId: string): ThreadRenderModel | null => {const state = this.threads.get(threadId);@@ -544,6 +551,12 @@ export class AgentThreadClient {return;}case 'threads': {+ if (this.initialRosterIds === null) {+ this.initialRosterIds = new Set(+ frame.threads.filter((info) => info.archived !== true).map((info) => info.threadId),+ );+ this.bump();+ }const seen = new Set<string>();for (const info of frame.threads) {seen.add(info.threadId);@@ -779,6 +792,14 @@ export function useOpenAgentThreadTabs(): ThreadInfo[] {return useSyncExternalStore(client.subscribe, client.getOpenTabs, client.getOpenTabs);}+export function useInitialRosterThreadIds(): ReadonlySet<string> | null {+ return useSyncExternalStore(+ client.subscribe,+ client.getInitialRosterThreadIds,+ client.getInitialRosterThreadIds,+ );+}+export function useArchivedAgentThreads(): ThreadInfo[] {return useSyncExternalStore(client.subscribe,diff --git a/packages/app/src/lib/dock-session-persistence.agents-overload.test-helper.ts b/packages/app/src/lib/dock-session-persistence.agents-overload.test-helper.tsnew file mode 100644index 000000000..d506b7a1f--- /dev/null+++ b/packages/app/src/lib/dock-session-persistence.agents-overload.test-helper.ts@@ -0,0 +1,6 @@+import { type WebAgentsDockSessionOrder, writeDockSessionOrder } from './dock-session-persistence';++export function writeAgentsOrderFromStoredRecord(record: WebAgentsDockSessionOrder): void {+ // @ts-expect-error the agents overload must reject agentPanelVisible structurally, so a variable already typed as a stored record cannot smuggle a level through the order writer+ writeDockSessionOrder(null, 'agents', record);+}diff --git a/packages/app/src/lib/dock-session-persistence.dom.test.ts b/packages/app/src/lib/dock-session-persistence.dom.test.tsnew file mode 100644index 000000000..86b4450fd--- /dev/null+++ b/packages/app/src/lib/dock-session-persistence.dom.test.ts@@ -0,0 +1,175 @@+import { afterEach, describe, expect, test, vi } from 'vitest';+import type { OkDesktopBridge } from '@/lib/desktop-bridge-types';+import {+ readWebDockSessionOrder,+ writeAgentsPanelLevel,+ writeDockSessionOrder,+} from './dock-session-persistence';+import { writeAgentsOrderFromStoredRecord } from './dock-session-persistence.agents-overload.test-helper';++describe('web dock store — agents-panel visibility level', () => {+ afterEach(() => {+ localStorage.clear();+ });++ test('a persisted closed panel level survives the write-read round trip', () => {+ writeDockSessionOrder(null, 'agents', { order: ['t1'], activeKey: 't1' });+ writeAgentsPanelLevel(null, false);++ expect(readWebDockSessionOrder('agents')?.agentPanelVisible).toBe(false);+ expect(readWebDockSessionOrder('agents')).toMatchObject({ order: ['t1'], activeKey: 't1' });+ });++ test('a persisted open panel level survives the write-read round trip', () => {+ writeDockSessionOrder(null, 'agents', { order: ['t1'], activeKey: 't1' });+ writeAgentsPanelLevel(null, true);++ expect(readWebDockSessionOrder('agents')?.agentPanelVisible).toBe(true);+ });++ test('a terminal-surface record carries no panel level', () => {+ writeDockSessionOrder(null, 'terminal', { order: ['pty-1'], activeKey: 'pty-1' });++ expect(readWebDockSessionOrder('terminal')).toEqual({+ order: ['pty-1'],+ activeKey: 'pty-1',+ });+ expect('agentPanelVisible' in (readWebDockSessionOrder('terminal') ?? {})).toBe(false);+ });++ test('a stored non-boolean panel level is dropped on read', () => {+ localStorage.setItem(+ 'ok-agent-session-order-v1',+ JSON.stringify({ order: ['t1'], activeKey: 't1', agentPanelVisible: 'yes' }),+ );++ expect(readWebDockSessionOrder('agents')).toEqual({ order: ['t1'], activeKey: 't1' });+ expect('agentPanelVisible' in (readWebDockSessionOrder('agents') ?? {})).toBe(false);+ });++ test('a quota-failed level write resolves without throwing and warns with the failing key', () => {+ const warn = vi.spyOn(console, 'warn').mockImplementation(() => {});+ const setItem = vi.spyOn(Storage.prototype, 'setItem').mockImplementation(() => {+ throw new DOMException('QuotaExceededError', 'QuotaExceededError');+ });++ expect(() => writeAgentsPanelLevel(null, true)).not.toThrow();+ expect(String(warn.mock.calls[0]?.[0])).toContain('writing ok-agent-session-order-v1 failed');++ setItem.mockRestore();+ warn.mockRestore();+ });++ test('a stored unparseable record warns it is being ignored and reads as absent', () => {+ const warn = vi.spyOn(console, 'warn').mockImplementation(() => {});+ localStorage.setItem('ok-agent-session-order-v1', 'not json');++ expect(readWebDockSessionOrder('agents')).toBeNull();+ expect(String(warn.mock.calls[0]?.[0])).toContain('not valid JSON');++ warn.mockRestore();+ });++ test('an order-only write preserves the stored panel level', () => {+ writeAgentsPanelLevel(null, true);++ writeDockSessionOrder(null, 'agents', { order: ['t1'], activeKey: 't1' });++ expect(readWebDockSessionOrder('agents')?.agentPanelVisible).toBe(true);+ expect(readWebDockSessionOrder('agents')).toMatchObject({ order: ['t1'], activeKey: 't1' });+ });++ test('a corrupt stored record does not cancel the level write', () => {+ const warn = vi.spyOn(console, 'warn').mockImplementation(() => {});+ localStorage.setItem('ok-agent-session-order-v1', 'not json');++ writeAgentsPanelLevel(null, true);++ expect(readWebDockSessionOrder('agents')?.agentPanelVisible).toBe(true);+ warn.mockRestore();+ });++ test('a level write over a record that could not be read is withheld and says so', () => {+ const warn = vi.spyOn(console, 'warn').mockImplementation(() => {});+ const stored = JSON.stringify({ order: ['t1'], activeKey: 't1', agentPanelVisible: false });+ localStorage.setItem('ok-agent-session-order-v1', stored);+ const getItem = vi.spyOn(Storage.prototype, 'getItem').mockImplementation(() => {+ throw new DOMException('denied', 'SecurityError');+ });++ writeAgentsPanelLevel(null, true);++ getItem.mockRestore();+ expect(localStorage.getItem('ok-agent-session-order-v1')).toBe(stored);+ expect(+ warn.mock.calls.some((call) =>+ String(call[0]).includes(+ 'ok-agent-session-order-v1 could not be read; withholding this write rather than overwriting the unread record',+ ),+ ),+ ).toBe(true);+ warn.mockRestore();+ });++ test('an order write over a record that could not be read is withheld and says so', () => {+ const warn = vi.spyOn(console, 'warn').mockImplementation(() => {});+ const stored = JSON.stringify({ order: ['t1'], activeKey: 't1', agentPanelVisible: true });+ localStorage.setItem('ok-agent-session-order-v1', stored);+ const getItem = vi.spyOn(Storage.prototype, 'getItem').mockImplementation(() => {+ throw new DOMException('denied', 'SecurityError');+ });++ writeDockSessionOrder(null, 'agents', { order: ['t2'], activeKey: 't2' });++ getItem.mockRestore();+ expect(localStorage.getItem('ok-agent-session-order-v1')).toBe(stored);+ expect(+ warn.mock.calls.some((call) =>+ String(call[0]).includes(+ 'ok-agent-session-order-v1 could not be read; withholding this write rather than overwriting the unread record',+ ),+ ),+ ).toBe(true);+ warn.mockRestore();+ });++ test('an order write cannot carry a caller-supplied panel level past the stored one', () => {+ writeAgentsPanelLevel(null, false);++ writeAgentsOrderFromStoredRecord({ order: ['t1'], activeKey: 't1', agentPanelVisible: true });++ expect(readWebDockSessionOrder('agents')).toEqual({+ order: ['t1'],+ activeKey: 't1',+ agentPanelVisible: false,+ });+ });++ test('a desktop terminal bridge keeps the level write off the web record', () => {+ const bridge = { terminal: {} } as unknown as OkDesktopBridge;+ localStorage.setItem(+ 'ok-agent-session-order-v1',+ JSON.stringify({ order: ['t1'], activeKey: 't1', agentPanelVisible: true }),+ );++ writeAgentsPanelLevel(bridge, false);++ expect(readWebDockSessionOrder('agents')?.agentPanelVisible).toBe(true);+ expect(readWebDockSessionOrder('agents')).toMatchObject({ order: ['t1'], activeKey: 't1' });+ });++ test('a bridge-backed agents write pins the setDockState payload to order and activeKey', () => {+ const setDockState = vi.fn(() => ({ ok: true as const }));+ const bridge = { terminal: { setDockState } } as unknown as OkDesktopBridge;++ writeDockSessionOrder(bridge, 'agents', { order: ['t2', 't1'], activeKey: 't2' });++ expect(setDockState).toHaveBeenCalledTimes(1);+ expect(setDockState.mock.calls[0]?.[0]).toEqual({+ surface: 'agents',+ order: ['t2', 't1'],+ activeKey: 't2',+ });+ expect('agentPanelVisible' in (setDockState.mock.calls[0]?.[0] ?? {})).toBe(false);+ });+});diff --git a/packages/app/src/lib/dock-session-persistence.test.ts b/packages/app/src/lib/dock-session-persistence.test.tsindex fed543d90..b3b31138a 100644--- a/packages/app/src/lib/dock-session-persistence.test.ts+++ b/packages/app/src/lib/dock-session-persistence.test.ts@@ -2,7 +2,6 @@ import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest';import type { OkDesktopBridge } from '@/lib/desktop-bridge-types';import {readDockRestoreState,- readDockSessionOrder,readWebDockSessionOrder,writeDockSessionOrder,} from './dock-session-persistence';@@ -106,13 +105,11 @@ describe('desktop backend (bridge)', () => {agents: { order: ['thread-a', 'thread-b'], activeKey: 'thread-b' },});- await expect(readDockSessionOrder(bridge, 'terminal')).resolves.toEqual({- order: ['pty-1'],- activeKey: 'pty-1',+ await expect(readDockRestoreState(bridge, 'terminal')).resolves.toMatchObject({+ sessionOrder: { order: ['pty-1'], activeKey: 'pty-1' },});- await expect(readDockSessionOrder(bridge, 'agents')).resolves.toEqual({- order: ['thread-a', 'thread-b'],- activeKey: 'thread-b',+ await expect(readDockRestoreState(bridge, 'agents')).resolves.toMatchObject({+ sessionOrder: { order: ['thread-a', 'thread-b'], activeKey: 'thread-b' },});});@@ -180,28 +177,19 @@ describe('desktop backend (bridge)', () => {test('an absent sub-record reads null (fresh launch → cold start)', async () => {const { bridge } = makeDesktopBridge({ terminal: { order: ['pty-1'], activeKey: 'pty-1' } });- await expect(readDockSessionOrder(bridge, 'agents')).resolves.toBeNull();+ await expect(readDockRestoreState(bridge, 'agents')).resolves.toMatchObject({+ sessionOrder: null,+ });});test('an empty retained record reads null rather than seeding an empty arrangement', async () => {const { bridge } = makeDesktopBridge({ agents: { order: [], activeKey: null } });- await expect(readDockSessionOrder(bridge, 'agents')).resolves.toBeNull();- });-- test('a rejecting getDockState reads null so the host cold-starts instead of hanging', async () => {- const bridge = {- terminal: {- getDockState: async () => {- throw new Error('ipc torn down mid-reload');- },- setDockState: () => {},- },- } as unknown as OkDesktopBridge;-- await expect(readDockSessionOrder(bridge, 'terminal')).resolves.toBeNull();+ await expect(readDockRestoreState(bridge, 'agents')).resolves.toMatchObject({+ sessionOrder: null,+ });});- test('a rejecting dock-state read settles the complete restore state', async () => {+ test('a rejecting dock-state read reads null, reports the failure, and settles the complete restore state', async () => {const bridge = {terminal: {getDockState: async () => {@@ -254,9 +242,8 @@ describe('desktop backend (bridge)', () => {writeDockSessionOrder(sessionOnly, 'terminal', { order: ['pty-1'], activeKey: 'pty-1' });expect(localStorageStub.getItem('ok-dock-session-order-v1')).not.toBeNull();- await expect(readDockSessionOrder(sessionOnly, 'terminal')).resolves.toEqual({- order: ['pty-1'],- activeKey: 'pty-1',+ await expect(readDockRestoreState(sessionOnly, 'terminal')).resolves.toMatchObject({+ sessionOrder: { order: ['pty-1'], activeKey: 'pty-1' },});});});diff --git a/packages/app/src/lib/dock-session-persistence.ts b/packages/app/src/lib/dock-session-persistence.tsindex b40d0a3cd..cc32d68d7 100644--- a/packages/app/src/lib/dock-session-persistence.ts+++ b/packages/app/src/lib/dock-session-persistence.ts@@ -7,6 +7,10 @@ export interface DockSessionOrder {readonly activeKey: string | null;}+export interface WebAgentsDockSessionOrder extends DockSessionOrder {+ readonly agentPanelVisible?: boolean;+}+export interface DockRestoreState {readonly sessionOrder: DockSessionOrder | null;readonly terminalSnapshot: OkTerminalRestartSnapshot | undefined;@@ -18,30 +22,104 @@ const WEB_STORAGE_KEYS: Record<DockSurface, string> = {agents: 'ok-agent-session-order-v1',};-function coerceOrder(raw: { order?: unknown; activeKey?: unknown }): DockSessionOrder {+function coerceOrder(raw: {+ order?: unknown;+ activeKey?: unknown;+ agentPanelVisible?: unknown;+}): WebAgentsDockSessionOrder {const order = Array.isArray(raw.order)? raw.order.filter((k): k is string => typeof k === 'string'): [];const activeKey = typeof raw.activeKey === 'string' ? raw.activeKey : null;- return { order, activeKey };+ const agentPanelVisible =+ typeof raw.agentPanelVisible === 'boolean' ? raw.agentPanelVisible : undefined;+ return agentPanelVisible === undefined+ ? { order, activeKey }+ : { order, activeKey, agentPanelVisible };}-export function readWebDockSessionOrder(surface: DockSurface): DockSessionOrder | null {- if (typeof window === 'undefined') return null;+type WebRecordRead =+ | { readonly status: 'absent' }+ | { readonly status: 'parsed'; readonly record: WebAgentsDockSessionOrder }+ | { readonly status: 'corrupt' }+ | { readonly status: 'blocked' };++function readWebRecord(surface: DockSurface): WebRecordRead {+ if (typeof window === 'undefined') return { status: 'absent' };+ let raw: string | null;try {- const raw = window.localStorage.getItem(WEB_STORAGE_KEYS[surface]);- if (raw === null) return null;- return coerceOrder(JSON.parse(raw) as { order?: unknown; activeKey?: unknown });- } catch {+ raw = window.localStorage.getItem(WEB_STORAGE_KEYS[surface]);+ } catch (err) {+ console.warn(+ `[dock-session-persistence] reading ${WEB_STORAGE_KEYS[surface]} failed: ${String(err)}`,+ );+ return { status: 'blocked' };+ }+ if (raw === null) return { status: 'absent' };+ try {+ return {+ status: 'parsed',+ record: coerceOrder(+ JSON.parse(raw) as { order?: unknown; activeKey?: unknown; agentPanelVisible?: unknown },+ ),+ };+ } catch (err) {+ console.warn(+ `[dock-session-persistence] stored ${WEB_STORAGE_KEYS[surface]} record was not valid JSON; ignoring it: ${String(err)}`,+ );+ return { status: 'corrupt' };+ }+}++function mergeAgentsWebRecord(fields: {+ readonly order?: readonly string[];+ readonly activeKey?: string | null;+ readonly agentPanelVisible?: boolean;+}): WebAgentsDockSessionOrder | null {+ const read = readWebRecord('agents');+ if (read.status === 'blocked') {+ console.warn(+ `[dock-session-persistence] ${WEB_STORAGE_KEYS.agents} could not be read; withholding this write rather than overwriting the unread record`,+ );return null;}+ const current = read.status === 'parsed' ? read.record : null;+ const order = [...(fields.order ?? current?.order ?? [])];+ const activeKey =+ fields.activeKey !== undefined ? fields.activeKey : (current?.activeKey ?? null);+ const agentPanelVisible = fields.agentPanelVisible ?? current?.agentPanelVisible;+ return agentPanelVisible === undefined+ ? { order, activeKey }+ : { order, activeKey, agentPanelVisible };}-function writeWeb(surface: DockSurface, state: DockSessionOrder): void {+export function readWebDockSessionOrder(surface: 'terminal'): DockSessionOrder | null;+export function readWebDockSessionOrder(surface: 'agents'): WebAgentsDockSessionOrder | null;+export function readWebDockSessionOrder(surface: DockSurface): DockSessionOrder | null;+export function readWebDockSessionOrder(surface: DockSurface): DockSessionOrder | null {+ const read = readWebRecord(surface);+ return read.status === 'parsed' ? read.record : null;+}++function writeWeb(surface: DockSurface, state: WebAgentsDockSessionOrder): void {if (typeof window === 'undefined') return;try {window.localStorage.setItem(WEB_STORAGE_KEYS[surface], JSON.stringify(state));- } catch {}+ } catch (err) {+ console.warn(+ `[dock-session-persistence] writing ${WEB_STORAGE_KEYS[surface]} failed: ${String(err)}`,+ );+ }+}++export function writeAgentsPanelLevel(+ bridge: OkDesktopBridge | null | undefined,+ level: boolean,+): void {+ if (bridge?.terminal != null) return;+ const merged = mergeAgentsWebRecord({ agentPanelVisible: level });+ if (merged === null) return;+ writeWeb('agents', merged);}export async function readDockRestoreState(@@ -71,13 +149,18 @@ export async function readDockRestoreState(};}-export function readDockSessionOrder(+export function writeDockSessionOrder(bridge: OkDesktopBridge | null | undefined,- surface: DockSurface,-): Promise<DockSessionOrder | null> {- return readDockRestoreState(bridge, surface).then((state) => state.sessionOrder);-}-+ surface: 'terminal',+ state: DockSessionOrder,+ terminalSnapshot?: OkTerminalRestartSnapshot,+): void;+export function writeDockSessionOrder(+ bridge: OkDesktopBridge | null | undefined,+ surface: 'agents',+ state: DockSessionOrder & { readonly agentPanelVisible?: never },+ terminalSnapshot?: OkTerminalRestartSnapshot,+): void;export function writeDockSessionOrder(bridge: OkDesktopBridge | null | undefined,surface: DockSurface,@@ -111,5 +194,11 @@ export function writeDockSessionOrder(return;}if (bridge?.terminal != null) return;+ if (surface === 'agents') {+ const merged = mergeAgentsWebRecord({ order: state.order, activeKey: state.activeKey });+ if (merged === null) return;+ writeWeb('agents', merged);+ return;+ }writeWeb(surface, state);}diff --git a/packages/app/src/lib/restore-settle-timeout.ts b/packages/app/src/lib/restore-settle-timeout.tsnew file mode 100644index 000000000..030bb60bf--- /dev/null+++ b/packages/app/src/lib/restore-settle-timeout.ts@@ -0,0 +1 @@+export const RESTORE_SETTLE_TIMEOUT_MS = 5_000;diff --git a/packages/app/src/locales/ar/messages.json b/packages/app/src/locales/ar/messages.jsonindex 6cdbacef7..f0c4bfacd 100644--- a/packages/app/src/locales/ar/messages.json+++ b/packages/app/src/locales/ar/messages.json@@ -4469,6 +4469,21 @@"i04BJx": ["موجودة خارج هذا المشروع — للقراءة فقط هنا."],"i09An-": ["تمت استعادة نسخة سابقة (", ["0"], ")"],"i1flq_": ["اقتراحات روابط الويكي"],+ "i25FHa": [+ "فتح لوحة الوكلاء — ",+ [+ "liveThreadCount",+ "plural",+ {+ "zero": ["#", " خيوط وكلاء نشطة"],+ "one": ["خيط وكيل نشط واحد"],+ "two": ["خيطا وكيل نشطَين"],+ "few": ["#", " خيوط وكلاء نشطة"],+ "many": ["#", " خيط وكيل نشطا"],+ "other": ["#", " خيط وكيل نشط"]+ }+ ]+ ],"i3f2kh": ["لا توجد أوامر مطابقة."],"i6o7XB": ["البحث عن اللغات"],"i92eAT": ["سننشئ مستودعًا ونبدأ المزامنة — بلا حاجة إلى طرفية."],diff --git a/packages/app/src/locales/ar/messages.po b/packages/app/src/locales/ar/messages.poindex 33c4b1e58..fc123d7f5 100644--- a/packages/app/src/locales/ar/messages.po+++ b/packages/app/src/locales/ar/messages.po@@ -9647,6 +9647,10 @@ msgstr "فتح لوحة النشاط لـ {tooltipName}، يحرّر {realCurrenmsgid "Open agents panel"msgstr "فتح لوحة الوكلاء"+#: src/components/TerminalRevealTab.tsx+msgid "Open agents panel — {liveThreadCount, plural, one {# live agent thread} other {# live agent threads}}"+msgstr "فتح لوحة الوكلاء — {liveThreadCount, plural, zero {# خيوط وكلاء نشطة} one {خيط وكيل نشط واحد} two {خيطا وكيل نشطَين} few {# خيوط وكلاء نشطة} many {# خيط وكيل نشطا} other {# خيط وكيل نشط}}"+#: src/lib/keyboard-shortcuts.tsmsgid "Open an existing project folder from disk."msgstr "افتح مجلد مشروع موجودًا من القرص."diff --git a/packages/app/src/locales/bn/messages.json b/packages/app/src/locales/bn/messages.jsonindex b15a27aed..5b45fa38d 100644--- a/packages/app/src/locales/bn/messages.json+++ b/packages/app/src/locales/bn/messages.json@@ -3770,6 +3770,14 @@"i04BJx": ["এই প্রকল্পের বাইরে অবস্থিত — এখানে শুধুমাত্র-পঠনযোগ্য।"],"i09An-": ["একটি পুরোনো সংস্করণ ফিরিয়ে আনা হয়েছে (", ["0"], ")"],"i1flq_": ["উইকি লিংকের পরামর্শ"],+ "i25FHa": [+ "এজেন্ট প্যানেল খুলুন — ",+ [+ "liveThreadCount",+ "plural",+ { "one": ["#", " সক্রিয় এজেন্ট থ্রেড"], "other": ["#", " সক্রিয় এজেন্ট থ্রেড"] }+ ]+ ],"i3f2kh": ["মিলে যাওয়া কোনো কমান্ড নেই।"],"i6o7XB": ["ভাষা খুঁজুন"],"i92eAT": ["আমরা একটি রিপোজিটরি তৈরি করে সিঙ্ক শুরু করব — কোনো টার্মিনাল লাগবে না।"],diff --git a/packages/app/src/locales/bn/messages.po b/packages/app/src/locales/bn/messages.poindex eb3619c71..d5b25262f 100644--- a/packages/app/src/locales/bn/messages.po+++ b/packages/app/src/locales/bn/messages.po@@ -9643,6 +9643,10 @@ msgstr "{tooltipName}-এর জন্য কার্যকলাপ প্যmsgid "Open agents panel"msgstr "এজেন্ট প্যানেল খুলুন"+#: src/components/TerminalRevealTab.tsx+msgid "Open agents panel — {liveThreadCount, plural, one {# live agent thread} other {# live agent threads}}"+msgstr "এজেন্ট প্যানেল খুলুন — {liveThreadCount, plural, one {# সক্রিয় এজেন্ট থ্রেড} other {# সক্রিয় এজেন্ট থ্রেড}}"+#: src/lib/keyboard-shortcuts.tsmsgid "Open an existing project folder from disk."msgstr "ডিস্ক থেকে একটি বিদ্যমান প্রকল্প ফোল্ডার খুলুন।"diff --git a/packages/app/src/locales/en/messages.json b/packages/app/src/locales/en/messages.jsonindex 15f9c60cb..ca7779423 100644--- a/packages/app/src/locales/en/messages.json+++ b/packages/app/src/locales/en/messages.json@@ -3891,6 +3891,14 @@"i04BJx": ["Lives outside this project — read-only here."],"i09An-": ["Restored an earlier version (", ["0"], ")"],"i1flq_": ["Wiki link suggestions"],+ "i25FHa": [+ "Open agents panel — ",+ [+ "liveThreadCount",+ "plural",+ { "one": ["#", " live agent thread"], "other": ["#", " live agent threads"] }+ ]+ ],"i3f2kh": ["No matching commands."],"i6o7XB": ["Search languages"],"i92eAT": ["We'll create a repository and start syncing — no terminal needed."],diff --git a/packages/app/src/locales/en/messages.po b/packages/app/src/locales/en/messages.poindex fe5b8a433..cbfc080e0 100644--- a/packages/app/src/locales/en/messages.po+++ b/packages/app/src/locales/en/messages.po@@ -9647,6 +9647,10 @@ msgstr "Open activity panel for {tooltipName}, editing {realCurrentDoc}"msgid "Open agents panel"msgstr "Open agents panel"+#: src/components/TerminalRevealTab.tsx+msgid "Open agents panel — {liveThreadCount, plural, one {# live agent thread} other {# live agent threads}}"+msgstr "Open agents panel — {liveThreadCount, plural, one {# live agent thread} other {# live agent threads}}"+#: src/lib/keyboard-shortcuts.tsmsgid "Open an existing project folder from disk."msgstr "Open an existing project folder from disk."diff --git a/packages/app/src/locales/es/messages.json b/packages/app/src/locales/es/messages.jsonindex 114566571..e9cb443aa 100644--- a/packages/app/src/locales/es/messages.json+++ b/packages/app/src/locales/es/messages.json@@ -4540,6 +4540,18 @@"i04BJx": ["Vive fuera de este proyecto — aquí es de solo lectura."],"i09An-": ["Se restauró una versión anterior (", ["0"], ")"],"i1flq_": ["Sugerencias de enlaces wiki"],+ "i25FHa": [+ "Abrir el panel de agentes — ",+ [+ "liveThreadCount",+ "plural",+ {+ "one": ["#", " hilo de agente activo"],+ "many": ["#", " hilos de agente activos"],+ "other": ["#", " hilos de agente activos"]+ }+ ]+ ],"i3f2kh": ["Ningún comando coincide."],"i6o7XB": ["Buscar idiomas"],"i92eAT": ["Crearemos un repositorio y empezaremos a sincronizar; no hace falta terminal."],diff --git a/packages/app/src/locales/es/messages.po b/packages/app/src/locales/es/messages.poindex 3693caa9f..d0bb6d54a 100644--- a/packages/app/src/locales/es/messages.po+++ b/packages/app/src/locales/es/messages.po@@ -9647,6 +9647,10 @@ msgstr "Abrir el panel de actividad de {tooltipName}, que está editando {realCumsgid "Open agents panel"msgstr "Abrir el panel de agentes"+#: src/components/TerminalRevealTab.tsx+msgid "Open agents panel — {liveThreadCount, plural, one {# live agent thread} other {# live agent threads}}"+msgstr "Abrir el panel de agentes — {liveThreadCount, plural, one {# hilo de agente activo} many {# hilos de agente activos} other {# hilos de agente activos}}"+#: src/lib/keyboard-shortcuts.tsmsgid "Open an existing project folder from disk."msgstr "Abre desde el disco una carpeta de proyecto existente."diff --git a/packages/app/src/locales/fr/messages.json b/packages/app/src/locales/fr/messages.jsonindex d879de1be..60a9228a6 100644--- a/packages/app/src/locales/fr/messages.json+++ b/packages/app/src/locales/fr/messages.json@@ -4575,6 +4575,18 @@"i04BJx": ["Vit hors de ce projet — lecture seule ici."],"i09An-": ["Version antérieure restaurée (", ["0"], ")"],"i1flq_": ["Suggestions de liens wiki"],+ "i25FHa": [+ "Ouvrir le panneau des agents — ",+ [+ "liveThreadCount",+ "plural",+ {+ "one": ["#", " fil d'agent actif"],+ "many": ["#", " fils d'agents actifs"],+ "other": ["#", " fils d'agents actifs"]+ }+ ]+ ],"i3f2kh": ["Aucune commande correspondante."],"i6o7XB": ["Rechercher des langues"],"i92eAT": [diff --git a/packages/app/src/locales/fr/messages.po b/packages/app/src/locales/fr/messages.poindex 69f75b69f..db0a935e7 100644--- a/packages/app/src/locales/fr/messages.po+++ b/packages/app/src/locales/fr/messages.po@@ -9647,6 +9647,10 @@ msgstr "Ouvrir le panneau d'activité de {tooltipName}, qui modifie {realCurrentmsgid "Open agents panel"msgstr "Ouvrir le panneau des agents"+#: src/components/TerminalRevealTab.tsx+msgid "Open agents panel — {liveThreadCount, plural, one {# live agent thread} other {# live agent threads}}"+msgstr "Ouvrir le panneau des agents — {liveThreadCount, plural, one {# fil d'agent actif} many {# fils d'agents actifs} other {# fils d'agents actifs}}"+#: src/lib/keyboard-shortcuts.tsmsgid "Open an existing project folder from disk."msgstr "Ouvrez un dossier de projet existant depuis le disque."diff --git a/packages/app/src/locales/hi/messages.json b/packages/app/src/locales/hi/messages.jsonindex 9dfdd0861..11a10a782 100644--- a/packages/app/src/locales/hi/messages.json+++ b/packages/app/src/locales/hi/messages.json@@ -3763,6 +3763,14 @@"i04BJx": ["इस प्रोजेक्ट के बाहर है — यहाँ केवल पढ़ने योग्य।"],"i09An-": ["एक पुराना संस्करण बहाल किया गया (", ["0"], ")"],"i1flq_": ["विकी लिंक सुझाव"],+ "i25FHa": [+ "एजेंट पैनल खोलें — ",+ [+ "liveThreadCount",+ "plural",+ { "one": ["#", " सक्रिय एजेंट थ्रेड"], "other": ["#", " सक्रिय एजेंट थ्रेड"] }+ ]+ ],"i3f2kh": ["कोई मेल खाता कमांड नहीं।"],"i6o7XB": ["भाषाएँ खोजें"],"i92eAT": ["हम एक रिपॉज़िटरी बनाकर सिंक शुरू कर देंगे — किसी टर्मिनल की ज़रूरत नहीं।"],diff --git a/packages/app/src/locales/hi/messages.po b/packages/app/src/locales/hi/messages.poindex 11d8cbcf3..f8ea762b4 100644--- a/packages/app/src/locales/hi/messages.po+++ b/packages/app/src/locales/hi/messages.po@@ -9643,6 +9643,10 @@ msgstr "{tooltipName} के लिए गतिविधि पैनल खोmsgid "Open agents panel"msgstr "एजेंट पैनल खोलें"+#: src/components/TerminalRevealTab.tsx+msgid "Open agents panel — {liveThreadCount, plural, one {# live agent thread} other {# live agent threads}}"+msgstr "एजेंट पैनल खोलें — {liveThreadCount, plural, one {# सक्रिय एजेंट थ्रेड} other {# सक्रिय एजेंट थ्रेड}}"+#: src/lib/keyboard-shortcuts.tsmsgid "Open an existing project folder from disk."msgstr "डिस्क से कोई मौजूदा प्रोजेक्ट फ़ोल्डर खोलें।"diff --git a/packages/app/src/locales/id/messages.json b/packages/app/src/locales/id/messages.jsonindex 64d4a09e2..151036706 100644--- a/packages/app/src/locales/id/messages.json+++ b/packages/app/src/locales/id/messages.json@@ -3924,6 +3924,10 @@"i04BJx": ["Berada di luar proyek ini — hanya-baca di sini."],"i09An-": ["Versi terdahulu dipulihkan (", ["0"], ")"],"i1flq_": ["Saran tautan wiki"],+ "i25FHa": [+ "Buka panel agen — ",+ ["liveThreadCount", "plural", { "other": ["#", " utas agen aktif"] }]+ ],"i3f2kh": ["Tidak ada perintah yang cocok."],"i6o7XB": ["Cari bahasa"],"i92eAT": [diff --git a/packages/app/src/locales/id/messages.po b/packages/app/src/locales/id/messages.poindex 600b8c160..101941ce5 100644--- a/packages/app/src/locales/id/messages.po+++ b/packages/app/src/locales/id/messages.po@@ -9643,6 +9643,10 @@ msgstr "Buka panel aktivitas untuk {tooltipName}, yang sedang menyunting {realCumsgid "Open agents panel"msgstr "Buka panel agen"+#: src/components/TerminalRevealTab.tsx+msgid "Open agents panel — {liveThreadCount, plural, one {# live agent thread} other {# live agent threads}}"+msgstr "Buka panel agen — {liveThreadCount, plural, other {# utas agen aktif}}"+#: src/lib/keyboard-shortcuts.tsmsgid "Open an existing project folder from disk."msgstr "Membuka folder proyek yang sudah ada dari disk."diff --git a/packages/app/src/locales/ko/messages.json b/packages/app/src/locales/ko/messages.jsonindex 840b5ecce..e23270535 100644--- a/packages/app/src/locales/ko/messages.json+++ b/packages/app/src/locales/ko/messages.json@@ -3753,6 +3753,10 @@"i04BJx": ["이 프로젝트 밖에 있습니다 — 여기서는 읽기 전용입니다."],"i09An-": ["이전 버전 (", ["0"], ")으로 복원했습니다"],"i1flq_": ["위키 링크 제안"],+ "i25FHa": [+ "에이전트 패널 열기 — ",+ ["liveThreadCount", "plural", { "other": ["#", " 실행 중인 에이전트 대화"] }]+ ],"i3f2kh": ["일치하는 명령이 없습니다."],"i6o7XB": ["언어 검색"],"i92eAT": ["저장소를 만들고 동기화를 시작합니다. 터미널은 필요하지 않습니다."],diff --git a/packages/app/src/locales/ko/messages.po b/packages/app/src/locales/ko/messages.poindex 540d4948c..24ab3674d 100644--- a/packages/app/src/locales/ko/messages.po+++ b/packages/app/src/locales/ko/messages.po@@ -9647,6 +9647,10 @@ msgstr "{tooltipName} 활동 패널 열기, {realCurrentDoc} 편집 중"msgid "Open agents panel"msgstr "에이전트 패널 열기"+#: src/components/TerminalRevealTab.tsx+msgid "Open agents panel — {liveThreadCount, plural, one {# live agent thread} other {# live agent threads}}"+msgstr "에이전트 패널 열기 — {liveThreadCount, plural, other {# 실행 중인 에이전트 대화}}"+#: src/lib/keyboard-shortcuts.tsmsgid "Open an existing project folder from disk."msgstr "디스크에서 기존 프로젝트 폴더를 엽니다."diff --git a/packages/app/src/locales/pseudo/messages.json b/packages/app/src/locales/pseudo/messages.jsonindex fc4cf5795..cfb4f6e21 100644--- a/packages/app/src/locales/pseudo/messages.json+++ b/packages/app/src/locales/pseudo/messages.json@@ -3891,6 +3891,14 @@"i04BJx": ["Ĺĩvēś ōũţśĩďē ţĥĩś ƥŕōĴēćţ — ŕēàď-ōńĺŷ ĥēŕē."],"i09An-": ["Ŕēśţōŕēď àń ēàŕĺĩēŕ vēŕśĩōń (", ["0"], ")"],"i1flq_": ["Ŵĩķĩ ĺĩńķ śũĝĝēśţĩōńś"],+ "i25FHa": [+ "Ōƥēń àĝēńţś ƥàńēĺ — ",+ [+ "liveThreadCount",+ "plural",+ { "one": ["#", " ĺĩvē àĝēńţ ţĥŕēàď"], "other": ["#", " ĺĩvē àĝēńţ ţĥŕēàďś"] }+ ]+ ],"i3f2kh": ["Ńō ḿàţćĥĩńĝ ćōḿḿàńďś."],"i6o7XB": ["Śēàŕćĥ ĺàńĝũàĝēś"],"i92eAT": ["Ŵē'ĺĺ ćŕēàţē à ŕēƥōśĩţōŕŷ àńď śţàŕţ śŷńćĩńĝ — ńō ţēŕḿĩńàĺ ńēēďēď."],diff --git a/packages/app/src/locales/pseudo/messages.po b/packages/app/src/locales/pseudo/messages.poindex 6b68903f1..c2cf684a0 100644--- a/packages/app/src/locales/pseudo/messages.po+++ b/packages/app/src/locales/pseudo/messages.po@@ -9643,6 +9643,10 @@ msgstr ""msgid "Open agents panel"msgstr ""+#: src/components/TerminalRevealTab.tsx+msgid "Open agents panel — {liveThreadCount, plural, one {# live agent thread} other {# live agent threads}}"+msgstr ""+#: src/lib/keyboard-shortcuts.tsmsgid "Open an existing project folder from disk."msgstr ""diff --git a/packages/app/src/locales/pt-BR/messages.json b/packages/app/src/locales/pt-BR/messages.jsonindex 9fca11ca1..ac01cb885 100644--- a/packages/app/src/locales/pt-BR/messages.json+++ b/packages/app/src/locales/pt-BR/messages.json@@ -4448,6 +4448,18 @@"i04BJx": ["Vive fora deste projeto — somente leitura aqui."],"i09An-": ["Uma versão anterior foi restaurada (", ["0"], ")"],"i1flq_": ["Sugestões de link wiki"],+ "i25FHa": [+ "Abrir o painel de agentes — ",+ [+ "liveThreadCount",+ "plural",+ {+ "one": ["#", " conversa de agente ativa"],+ "many": ["#", " conversas de agente ativas"],+ "other": ["#", " conversas de agente ativas"]+ }+ ]+ ],"i3f2kh": ["Nenhum comando corresponde."],"i6o7XB": ["Pesquisar idiomas"],"i92eAT": ["Vamos criar um repositório e começar a sincronizar — sem precisar de terminal."],diff --git a/packages/app/src/locales/pt-BR/messages.po b/packages/app/src/locales/pt-BR/messages.poindex 51cda31d5..85c40c40f 100644--- a/packages/app/src/locales/pt-BR/messages.po+++ b/packages/app/src/locales/pt-BR/messages.po@@ -9643,6 +9643,10 @@ msgstr "Abrir o painel de atividade de {tooltipName}, que está editando {realCumsgid "Open agents panel"msgstr "Abrir o painel de agentes"+#: src/components/TerminalRevealTab.tsx+msgid "Open agents panel — {liveThreadCount, plural, one {# live agent thread} other {# live agent threads}}"+msgstr "Abrir o painel de agentes — {liveThreadCount, plural, one {# conversa de agente ativa} many {# conversas de agente ativas} other {# conversas de agente ativas}}"+#: src/lib/keyboard-shortcuts.tsmsgid "Open an existing project folder from disk."msgstr "Abre do disco uma pasta de projeto existente."diff --git a/packages/app/src/locales/ur/messages.json b/packages/app/src/locales/ur/messages.jsonindex a0a73c537..2693f70f1 100644--- a/packages/app/src/locales/ur/messages.json+++ b/packages/app/src/locales/ur/messages.json@@ -3974,6 +3974,14 @@"i04BJx": ["اس پروجیکٹ سے باہر ہے — یہاں صرف پڑھنے کے لیے۔"],"i09An-": ["ایک پرانا ورژن بحال کر دیا گیا (", ["0"], ")"],"i1flq_": ["وکی لنک کی تجاویز"],+ "i25FHa": [+ "ایجنٹس کا پینل کھولیں — ",+ [+ "liveThreadCount",+ "plural",+ { "one": ["#", " فعال ایجنٹ تھریڈ"], "other": ["#", " فعال ایجنٹ تھریڈ"] }+ ]+ ],"i3f2kh": ["کوئی مماثل کمانڈ نہیں۔"],"i6o7XB": ["زبانیں تلاش کریں"],"i92eAT": ["ہم ایک ریپازٹری بنا کر مطابقت پذیری شروع کر دیں گے — کسی ٹرمینل کی ضرورت نہیں۔"],diff --git a/packages/app/src/locales/ur/messages.po b/packages/app/src/locales/ur/messages.poindex 26eae423f..7f5c35541 100644--- a/packages/app/src/locales/ur/messages.po+++ b/packages/app/src/locales/ur/messages.po@@ -9647,6 +9647,10 @@ msgstr "{tooltipName} کے لیے سرگرمی کا پینل کھولیں، {reamsgid "Open agents panel"msgstr "ایجنٹس کا پینل کھولیں"+#: src/components/TerminalRevealTab.tsx+msgid "Open agents panel — {liveThreadCount, plural, one {# live agent thread} other {# live agent threads}}"+msgstr "ایجنٹس کا پینل کھولیں — {liveThreadCount, plural, one {# فعال ایجنٹ تھریڈ} other {# فعال ایجنٹ تھریڈ}}"+#: src/lib/keyboard-shortcuts.tsmsgid "Open an existing project folder from disk."msgstr "ڈسک سے موجودہ پروجیکٹ کا فولڈر کھولیں۔"diff --git a/packages/app/src/locales/zh-Hans/messages.json b/packages/app/src/locales/zh-Hans/messages.jsonindex 793e0a283..efc7998f1 100644--- a/packages/app/src/locales/zh-Hans/messages.json+++ b/packages/app/src/locales/zh-Hans/messages.json@@ -3406,6 +3406,10 @@"i04BJx": ["位于此项目之外 — 在这里只读。"],"i09An-": ["已恢复到较早的版本(", ["0"], ")"],"i1flq_": ["维基链接建议"],+ "i25FHa": [+ "打开智能体面板 — ",+ ["liveThreadCount", "plural", { "other": ["#", " 个进行中的智能体线程"] }]+ ],"i3f2kh": ["没有匹配的命令。"],"i6o7XB": ["搜索语言"],"i92eAT": ["我们会创建一个仓库并开始同步——不需要用终端。"],diff --git a/packages/app/src/locales/zh-Hans/messages.po b/packages/app/src/locales/zh-Hans/messages.poindex 33dc4fa8e..899f71c76 100644--- a/packages/app/src/locales/zh-Hans/messages.po+++ b/packages/app/src/locales/zh-Hans/messages.po@@ -9647,6 +9647,10 @@ msgstr "打开 {tooltipName} 的活动面板,它正在编辑 {realCurrentDoc}"msgid "Open agents panel"msgstr "打开智能体面板"+#: src/components/TerminalRevealTab.tsx+msgid "Open agents panel — {liveThreadCount, plural, one {# live agent thread} other {# live agent threads}}"+msgstr "打开智能体面板 — {liveThreadCount, plural, other {# 个进行中的智能体线程}}"+#: src/lib/keyboard-shortcuts.tsmsgid "Open an existing project folder from disk."msgstr "从磁盘打开一个已有的项目文件夹。"diff --git a/packages/app/src/locales/zh-Hant/messages.json b/packages/app/src/locales/zh-Hant/messages.jsonindex 6f84458bb..8b39ba70e 100644--- a/packages/app/src/locales/zh-Hant/messages.json+++ b/packages/app/src/locales/zh-Hant/messages.json@@ -3424,6 +3424,10 @@"i04BJx": ["位於此專案之外 — 在這裡唯讀。"],"i09An-": ["已還原到較早的版本(", ["0"], ")"],"i1flq_": ["維基連結建議"],+ "i25FHa": [+ "開啟代理面板 — ",+ ["liveThreadCount", "plural", { "other": ["#", " 個進行中的代理執行緒"] }]+ ],"i3f2kh": ["沒有相符的指令。"],"i6o7XB": ["搜尋語言"],"i92eAT": ["我們會建立一個儲存庫並開始同步——不必用終端機。"],diff --git a/packages/app/src/locales/zh-Hant/messages.po b/packages/app/src/locales/zh-Hant/messages.poindex fa5333056..d5aaa0596 100644--- a/packages/app/src/locales/zh-Hant/messages.po+++ b/packages/app/src/locales/zh-Hant/messages.po@@ -9647,6 +9647,10 @@ msgstr "開啟 {tooltipName} 的活動面板,它正在編輯 {realCurrentDoc}"msgid "Open agents panel"msgstr "開啟代理面板"+#: src/components/TerminalRevealTab.tsx+msgid "Open agents panel — {liveThreadCount, plural, one {# live agent thread} other {# live agent threads}}"+msgstr "開啟代理面板 — {liveThreadCount, plural, other {# 個進行中的代理執行緒}}"+#: src/lib/keyboard-shortcuts.tsmsgid "Open an existing project folder from disk."msgstr "從磁碟開啟一個既有的專案資料夾。"diff --git a/packages/app/tests/stress/agents-panel-reload-visibility.e2e.ts b/packages/app/tests/stress/agents-panel-reload-visibility.e2e.tsnew file mode 100644index 000000000..df199ab1b--- /dev/null+++ b/packages/app/tests/stress/agents-panel-reload-visibility.e2e.ts@@ -0,0 +1,465 @@+import { mkdirSync, writeFileSync } from 'node:fs';+import { dirname, join } from 'node:path';+import type { Page } from '@playwright/test';+import { expect, test } from './_helpers';++const AGENTS_PANEL_MOUNT = '[data-agents-panel-mount]';+const AGENTS_REVEAL_TAB = '[data-terminal-reveal="right"]';+const COLLAPSE_AGENT_PANEL_BUTTON = 'Collapse agent panel';+const SESSIONS_CHUNK_GLOB = '**/src/components/SessionsHost*';+const CONFIG_RESPONSE_GLOB = '**/api/config';+const AGENTS_ORDER_STORAGE_KEY = 'ok-agent-session-order-v1';+const SEED_AGENT_ID = 'panel-level-fixture-agent';+const BOOT_TIMEOUT_MS = 30_000;+const ROSTER_TIMEOUT_MS = 30_000;+const EMPTY_AGENT_CATALOG = { agents: [], stale: false, maxThreads: 8 };++interface ThreadFrame {+ op: string;+ reqId?: string;+ threads?: Array<{ threadId: string; archived?: boolean }>;+ info?: { threadId: string };+}++type SocketFrameSender = (frame: Record<string, unknown>) => void;++interface FrameRecorder {+ readonly frames: ThreadFrame[];+ unparseableCount: number;+}++type RouteMarkRoute = 'config-response' | 'roster-frame' | 'sessions-chunk-response';++interface RouteMark {+ route: RouteMarkRoute;+ at: number;+}++function observedOrder(marks: RouteMark[]): RouteMarkRoute[] {+ const seen = new Set<RouteMarkRoute>();+ const order: RouteMarkRoute[] = [];+ for (const mark of marks) {+ if (seen.has(mark.route)) continue;+ seen.add(mark.route);+ order.push(mark.route);+ }+ return order;+}++async function waitForRouteMark(+ marks: RouteMark[],+ route: RouteMarkRoute,+ timeoutMessage: string,+): Promise<void> {+ const deadline = Date.now() + ROSTER_TIMEOUT_MS;+ while (!marks.some((mark) => mark.route === route)) {+ if (Date.now() >= deadline) throw new Error(timeoutMessage);+ await new Promise((resolve) => setTimeout(resolve, 50));+ }+}++async function withThreadSocket<T>(+ port: number,+ run: (send: SocketFrameSender, frames: ThreadFrame[], recorder: FrameRecorder) => Promise<T>,+): Promise<T> {+ const ws = new WebSocket(`ws://127.0.0.1:${port}/collab/thread`);+ const recorder: FrameRecorder = { frames: [], unparseableCount: 0 };+ ws.addEventListener('message', (ev) => {+ try {+ recorder.frames.push(JSON.parse(String(ev.data)) as ThreadFrame);+ } catch {+ recorder.unparseableCount += 1;+ }+ });+ await new Promise<void>((resolve, reject) => {+ const timer = setTimeout(() => reject(new Error('thread socket open timeout')), 15_000);+ ws.addEventListener('open', () => {+ clearTimeout(timer);+ resolve();+ });+ ws.addEventListener('error', () => {+ clearTimeout(timer);+ reject(new Error('thread socket failed to open'));+ });+ });+ try {+ return await run((frame) => ws.send(JSON.stringify(frame)), recorder.frames, recorder);+ } finally {+ try {+ ws.close();+ } catch {}+ }+}++async function latestRoster(+ send: SocketFrameSender,+ frames: ThreadFrame[],+ recorder: FrameRecorder,+ timeoutMs = 10_000,+): Promise<Array<{ threadId: string; archived?: boolean }>> {+ send({ op: 'list' });+ const deadline = Date.now() + timeoutMs;+ while (Date.now() < deadline) {+ const snapshot = frames.filter((frame) => frame.op === 'threads').at(-1);+ if (snapshot?.threads) return snapshot.threads;+ await new Promise((resolve) => setTimeout(resolve, 100));+ }+ throw new Error(+ `thread roster never arrived (${recorder.unparseableCount} unparseable frame(s) observed)`,+ );+}++async function purgeLiveThreads(port: number): Promise<void> {+ const live = (await withThreadSocket(port, latestRoster)).filter(+ (thread) => thread.archived !== true,+ );+ for (const thread of live) {+ await withThreadSocket(port, async (send, frames, recorder) => {+ send({ op: 'close', threadId: thread.threadId });+ const closeDeadline = Date.now() + 20_000;+ let archived = false;+ let discarded = false;+ while (Date.now() < closeDeadline) {+ const errored = recorder.frames.find((frame) => frame.op === 'error');+ if (errored) {+ throw new Error(+ `purge close rejected for ${thread.threadId}: ${JSON.stringify(errored)}`,+ );+ }+ const snapshot = frames.filter((frame) => frame.op === 'threads').at(-1);+ const entry = snapshot?.threads?.find((t) => t.threadId === thread.threadId);+ if (entry === undefined) {+ discarded = true;+ break;+ }+ if (entry.archived === true) {+ archived = true;+ break;+ }+ await new Promise((resolve) => setTimeout(resolve, 100));+ }+ if (!archived && !discarded) {+ throw new Error(+ `purge close confirmation never arrived for ${thread.threadId} (${recorder.unparseableCount} unparseable frame(s) observed)`,+ );+ }+ if (discarded) return;+ send({ op: 'delete', threadId: thread.threadId });+ const deadline = Date.now() + 20_000;+ while (Date.now() < deadline) {+ const errored = recorder.frames.find((frame) => frame.op === 'error');+ if (errored) {+ throw new Error(+ `purge delete rejected for ${thread.threadId}: ${JSON.stringify(errored)}`,+ );+ }+ const snapshot = frames.filter((frame) => frame.op === 'threads').at(-1);+ if (snapshot?.threads && !snapshot.threads.some((t) => t.threadId === thread.threadId)) {+ return;+ }+ await new Promise((resolve) => setTimeout(resolve, 100));+ }+ throw new Error(+ `purge delete confirmation never arrived for ${thread.threadId} (${recorder.unparseableCount} unparseable frame(s) observed)`,+ );+ });+ }+ const remaining = (await withThreadSocket(port, latestRoster)).filter(+ (thread) => thread.archived !== true,+ );+ if (remaining.length > 0) {+ throw new Error(+ `live threads survived the roster purge: ${remaining.map((t) => t.threadId).join(', ')}`,+ );+ }+}++async function seedLiveThread(port: number, contentDir: string): Promise<void> {+ const agentsFile = join(contentDir, '.ok', 'local', 'acp-agents.json');+ mkdirSync(dirname(agentsFile), { recursive: true });+ writeFileSync(+ agentsFile,+ `${JSON.stringify(+ [{ id: SEED_AGENT_ID, name: 'Panel Level Fixture', command: '/bin/false' }],+ null,+ 2,+ )}\n`,+ );++ await withThreadSocket(port, async (send, frames) => {+ send({ op: 'create', reqId: 'e2e-seed-1', agent: { source: 'custom', id: SEED_AGENT_ID } });+ const deadline = Date.now() + 15_000;+ while (Date.now() < deadline) {+ const created = frames.find(+ (frame) => frame.op === 'created' && frame.reqId === 'e2e-seed-1',+ );+ if (created?.info) return;+ const errored = frames.find((frame) => frame.op === 'error');+ if (errored) throw new Error(`seed create failed: ${JSON.stringify(errored)}`);+ await new Promise((resolve) => setTimeout(resolve, 100));+ }+ throw new Error('seed create never returned a created frame');+ });+}++async function stubAgentCatalog(page: Page): Promise<void> {+ await page.route('**/api/acp/catalog', (route) => route.fulfill({ json: EMPTY_AGENT_CATALOG }));+}++function nextRosterDelivery(page: Page, marks?: RouteMark[]): Promise<void> {+ return new Promise((resolve, reject) => {+ const timer = setTimeout(+ () => reject(new Error('thread socket never delivered its roster')),+ ROSTER_TIMEOUT_MS,+ );+ page.on('websocket', (socket) => {+ if (!socket.url().includes('/collab/thread')) return;+ socket.on('framereceived', (frame) => {+ if (typeof frame.payload !== 'string') return;+ if (!frame.payload.includes('"op":"threads"')) return;+ marks?.push({ route: 'roster-frame', at: Date.now() });+ clearTimeout(timer);+ resolve();+ });+ });+ });+}++function settleAfterRoster(page: Page): Promise<void> {+ return page.evaluate(+ () =>+ new Promise<void>((resolve) => {+ requestAnimationFrame(() => {+ requestAnimationFrame(() => resolve());+ });+ }),+ );+}++async function openAppWithRoster(page: Page): Promise<void> {+ const roster = nextRosterDelivery(page);+ await page.goto('/');+ await page.waitForFunction(() => Boolean(window.__acpThreadHarness), null, {+ timeout: BOOT_TIMEOUT_MS,+ });+ await roster;+ await settleAfterRoster(page);+}++async function openAgentsPanel(page: Page): Promise<void> {+ const mount = page.locator(AGENTS_PANEL_MOUNT);+ const revealTab = page.locator(AGENTS_REVEAL_TAB);+ await expect+ .poll(async () => (await mount.isVisible()) || (await revealTab.isVisible()), {+ timeout: BOOT_TIMEOUT_MS,+ })+ .toBe(true);+ const revealed = await revealTab.isVisible();+ if (revealed) {+ await revealTab.click({ timeout: 5_000 }).catch(() => {});+ }+ await expect(mount).toBeVisible({ timeout: BOOT_TIMEOUT_MS });+ if (revealed) {+ await expect+ .poll(+ () =>+ page.evaluate(() => document.activeElement?.closest('[data-agents-panel-mount]') != null),+ { timeout: 10_000 },+ )+ .toBe(true);+ }+ await settleAfterRoster(page);+}++async function waitForAgentsHostSettled(page: Page): Promise<void> {+ await expect(page.locator(`${AGENTS_PANEL_MOUNT} [role="tablist"]`)).toHaveCount(1, {+ timeout: BOOT_TIMEOUT_MS,+ });+}++async function settleAgentsHostAfterReload(page: Page): Promise<void> {+ await page.waitForFunction(() => Boolean(window.__acpThreadHarness), null, {+ timeout: BOOT_TIMEOUT_MS,+ });+ await waitForAgentsHostSettled(page);+}++async function collapseAgentsPanel(page: Page): Promise<void> {+ await page+ .getByRole('button', { name: COLLAPSE_AGENT_PANEL_BUTTON })+ .click({ timeout: BOOT_TIMEOUT_MS });+ await expect(page.locator(AGENTS_REVEAL_TAB)).toBeVisible({ timeout: BOOT_TIMEOUT_MS });+ await settleAfterRoster(page);+}++async function expectPersistedPanelLevel(page: Page, level: boolean): Promise<void> {+ await expect+ .poll(+ async () =>+ page.evaluate((key) => {+ const raw = window.localStorage.getItem(key);+ if (raw === null) return null;+ const record = JSON.parse(raw) as Record<string, unknown>;+ return typeof record.agentPanelVisible === 'boolean' ? record.agentPanelVisible : null;+ }, AGENTS_ORDER_STORAGE_KEY),+ { timeout: BOOT_TIMEOUT_MS },+ )+ .toBe(level);+}++async function reloadAndSettle(page: Page, marks?: RouteMark[]): Promise<void> {+ const roster = nextRosterDelivery(page, marks);+ await page.reload();+ await roster;+ await settleAfterRoster(page);+}++test.setTimeout(180_000);++test.describe('agents panel reload visibility level', () => {+ test.afterEach(async ({ workerServer }) => {+ await purgeLiveThreads(workerServer.port);+ });++ test('a panel closed before a roster-delayed reload stays closed after it (level written by real open and collapse clicks and asserted in localStorage before reload; storage-coercion edge cases are pinned by the co-located DOM suites)', async ({+ page,+ workerServer,+ }) => {+ await purgeLiveThreads(workerServer.port);+ await seedLiveThread(workerServer.port, workerServer.contentDir);+ await stubAgentCatalog(page);+ await openAppWithRoster(page);++ await openAgentsPanel(page);+ await expectPersistedPanelLevel(page, true);+ await collapseAgentsPanel(page);+ await expectPersistedPanelLevel(page, false);++ const marks: RouteMark[] = [];+ await page.route(SESSIONS_CHUNK_GLOB, async (route) => {+ await route.continue();+ marks.push({ route: 'sessions-chunk-response', at: Date.now() });+ });+ await page.route(CONFIG_RESPONSE_GLOB, async (route) => {+ await waitForRouteMark(+ marks,+ 'sessions-chunk-response',+ 'sessions chunk never preceded the config response',+ );+ await route.continue();+ marks.push({ route: 'config-response', at: Date.now() });+ });++ await reloadAndSettle(page, marks);++ await expect+ .poll(() => observedOrder(marks), { timeout: BOOT_TIMEOUT_MS })+ .toEqual(['sessions-chunk-response', 'config-response', 'roster-frame']);++ await settleAgentsHostAfterReload(page);++ await expect(page.locator(AGENTS_REVEAL_TAB)).toBeVisible();+ await expect(page.locator(AGENTS_PANEL_MOUNT)).not.toBeVisible();+ });++ test('a panel closed before a roster-first reload stays closed and a later thread still reveals (level written by real open and collapse clicks and asserted in localStorage before reload; storage-coercion edge cases are pinned by the co-located DOM suites)', async ({+ page,+ workerServer,+ }) => {+ await purgeLiveThreads(workerServer.port);+ await seedLiveThread(workerServer.port, workerServer.contentDir);+ await stubAgentCatalog(page);+ await openAppWithRoster(page);++ await openAgentsPanel(page);+ await expectPersistedPanelLevel(page, true);+ await collapseAgentsPanel(page);+ await expectPersistedPanelLevel(page, false);++ const marks: RouteMark[] = [];+ await page.route(SESSIONS_CHUNK_GLOB, async (route) => {+ await waitForRouteMark(+ marks,+ 'roster-frame',+ 'roster frame never preceded the sessions chunk',+ );+ await route.continue();+ marks.push({ route: 'sessions-chunk-response', at: Date.now() });+ });++ await reloadAndSettle(page, marks);++ await expect+ .poll(() => observedOrder(marks), { timeout: BOOT_TIMEOUT_MS })+ .toEqual(['roster-frame', 'sessions-chunk-response']);++ await settleAgentsHostAfterReload(page);++ await expect(page.locator(AGENTS_REVEAL_TAB)).toBeVisible();+ await expect(page.locator(AGENTS_PANEL_MOUNT)).not.toBeVisible();++ await page.evaluate(() => {+ const harness = window.__acpThreadHarness;+ if (harness === undefined) throw new Error('ACP thread harness is not installed');+ harness.openThread({+ agent: { id: 'late-arrival-agent', name: 'Late Arrival', source: 'registry' },+ title: 'Late arrival thread',+ });+ });++ await expect(page.locator(AGENTS_PANEL_MOUNT)).toBeVisible({ timeout: ROSTER_TIMEOUT_MS });+ });++ test('a panel open before a natural reload stays open after it (level written by a real open click and asserted in localStorage before reload; storage-coercion edge cases are pinned by the co-located DOM suites)', async ({+ page,+ workerServer,+ }) => {+ await purgeLiveThreads(workerServer.port);+ await seedLiveThread(workerServer.port, workerServer.contentDir);+ await stubAgentCatalog(page);+ await openAppWithRoster(page);++ await openAgentsPanel(page);+ await expectPersistedPanelLevel(page, true);++ await reloadAndSettle(page);++ await expect(page.locator(AGENTS_PANEL_MOUNT)).toBeVisible();+ await expect(page.locator(AGENTS_REVEAL_TAB)).not.toBeVisible();+ });++ test('a panel open before a roster-first reload stays open after it (level written by a real open click and asserted in localStorage before reload; storage-coercion edge cases are pinned by the co-located DOM suites)', async ({+ page,+ workerServer,+ }) => {+ await purgeLiveThreads(workerServer.port);+ await seedLiveThread(workerServer.port, workerServer.contentDir);+ await stubAgentCatalog(page);+ await openAppWithRoster(page);++ await openAgentsPanel(page);+ await expectPersistedPanelLevel(page, true);++ const marks: RouteMark[] = [];+ await page.route(SESSIONS_CHUNK_GLOB, async (route) => {+ await waitForRouteMark(+ marks,+ 'roster-frame',+ 'roster frame never preceded the sessions chunk',+ );+ await route.continue();+ marks.push({ route: 'sessions-chunk-response', at: Date.now() });+ });++ await reloadAndSettle(page, marks);++ await expect+ .poll(() => observedOrder(marks), { timeout: BOOT_TIMEOUT_MS })+ .toEqual(['roster-frame', 'sessions-chunk-response']);++ await settleAgentsHostAfterReload(page);++ await expect(page.locator(AGENTS_PANEL_MOUNT)).toBeVisible();+ await expect(page.locator(AGENTS_REVEAL_TAB)).not.toBeVisible();+ });+});diff --git a/packages/desktop/src/main/agent-panel-level-persistence.test.ts b/packages/desktop/src/main/agent-panel-level-persistence.test.tsnew file mode 100644index 000000000..95b3c71b2--- /dev/null+++ b/packages/desktop/src/main/agent-panel-level-persistence.test.ts@@ -0,0 +1,164 @@+import { describe, expect, test, vi } from 'vitest';+import {+ emptyState,+ getTerminalDockState,+ type PersistedTerminalDockState,+ setTerminalDockState,+} from './state-store';+import {+ applyAgentPanelVisibilityUpdate,+ commitTerminalDockState,+ resolveRestoredAgentPanelVisible,+} from './terminal-dock-persistence';++type LegacyDockState = Omit<PersistedTerminalDockState, 'agentPanelVisible'>;+type DockStateUpdate = { agentPanelVisible?: boolean; terminalVisible?: boolean };++const PROJECT = '/project';+const EMPTY_SNAPSHOT = { tabs: [], activeOrdinal: null };++describe('desktop persisted dock state — agents-panel visibility level', () => {+ test('an empty dock state defaults the agents-panel level to closed', () => {+ expect(getTerminalDockState(emptyState(), PROJECT).agentPanelVisible).toBe(false);+ });++ test('a legacy record without the agents-panel level parses to closed', () => {+ const legacy: LegacyDockState = {+ terminalVisible: true,+ terminalSnapshot: EMPTY_SNAPSHOT,+ };++ const state = setTerminalDockState(emptyState(), PROJECT, legacy as PersistedTerminalDockState);++ expect(getTerminalDockState(state, PROJECT).agentPanelVisible).toBe(false);+ expect(getTerminalDockState(state, PROJECT).terminalVisible).toBe(true);+ expect(getTerminalDockState(state, PROJECT).terminalSnapshot).toEqual(EMPTY_SNAPSHOT);+ });++ test('the agents-panel level survives the set-get round trip in both directions', () => {+ const open: PersistedTerminalDockState = {+ terminalVisible: false,+ terminalSnapshot: EMPTY_SNAPSHOT,+ agentPanelVisible: true,+ };+ const openState = setTerminalDockState(emptyState(), PROJECT, open);+ expect(getTerminalDockState(openState, PROJECT).agentPanelVisible).toBe(true);+ expect(getTerminalDockState(openState, PROJECT).terminalVisible).toBe(false);++ const closed: PersistedTerminalDockState = {+ terminalVisible: true,+ terminalSnapshot: EMPTY_SNAPSHOT,+ agentPanelVisible: false,+ };+ const closedState = setTerminalDockState(emptyState(), PROJECT, closed);+ expect(getTerminalDockState(closedState, PROJECT).agentPanelVisible).toBe(false);+ expect(getTerminalDockState(closedState, PROJECT).terminalVisible).toBe(true);+ });++ test('commitTerminalDockState persists the agents-panel level beside terminalVisible', () => {+ const update: DockStateUpdate = { terminalVisible: true, agentPanelVisible: true };++ const outcome = commitTerminalDockState({+ current: emptyState(),+ stateKey: PROJECT,+ update,+ save: () => true,+ });++ expect(outcome.result).toEqual({ ok: true });+ const dockState = getTerminalDockState(outcome.state, PROJECT);+ expect(dockState.agentPanelVisible).toBe(true);+ expect(dockState.terminalVisible).toBe(true);+ });++ test('recommitting an unchanged agents-panel level skips the durable write', () => {+ const first: DockStateUpdate = { agentPanelVisible: true };+ const committed = commitTerminalDockState({+ current: emptyState(),+ stateKey: PROJECT,+ update: first,+ save: () => true,+ });+ expect(committed.result).toEqual({ ok: true });++ const save = vi.fn(() => true);+ const second: DockStateUpdate = { agentPanelVisible: true };+ const outcome = commitTerminalDockState({+ current: committed.state,+ stateKey: PROJECT,+ update: second,+ save,+ });++ expect(save).not.toHaveBeenCalled();+ expect(outcome).toEqual({ state: committed.state, result: { ok: true } });+ });+});++describe('resolveRestoredAgentPanelVisible', () => {+ test('the in-memory level for a live window wins over the persisted record', () => {+ expect(+ resolveRestoredAgentPanelVisible({+ inMemory: true,+ persisted: {+ terminalVisible: false,+ terminalSnapshot: EMPTY_SNAPSHOT,+ agentPanelVisible: false,+ },+ }),+ ).toBe(true);+ });++ test('the persisted record is the fallback once the in-memory window map is gone', () => {+ expect(+ resolveRestoredAgentPanelVisible({+ inMemory: undefined,+ persisted: {+ terminalVisible: false,+ terminalSnapshot: EMPTY_SNAPSHOT,+ agentPanelVisible: true,+ },+ }),+ ).toBe(true);+ expect(+ resolveRestoredAgentPanelVisible({+ inMemory: undefined,+ persisted: {+ terminalVisible: false,+ terminalSnapshot: EMPTY_SNAPSHOT,+ agentPanelVisible: false,+ },+ }),+ ).toBe(false);+ });++ test('no record at all resolves to closed', () => {+ expect(resolveRestoredAgentPanelVisible({ inMemory: undefined, persisted: null })).toBe(false);+ });+});++describe('applyAgentPanelVisibilityUpdate', () => {+ test('a level update is remembered for the window and persisted', () => {+ const rememberForWindow = vi.fn();+ const persist = vi.fn(() => ({ ok: true }) as const);+ const warnPersistFailed = vi.fn();++ applyAgentPanelVisibilityUpdate({ rememberForWindow, persist, warnPersistFailed }, true);++ expect(rememberForWindow).toHaveBeenCalledWith(true);+ expect(persist).toHaveBeenCalledWith(true);+ expect(warnPersistFailed).not.toHaveBeenCalled();+ });++ test('a failed persist is surfaced as a warning', () => {+ const rememberForWindow = vi.fn();+ const persist = vi.fn(() => ({ ok: false, reason: 'persist-failed' }) as const);+ const warnPersistFailed = vi.fn();++ applyAgentPanelVisibilityUpdate({ rememberForWindow, persist, warnPersistFailed }, false);++ expect(rememberForWindow).toHaveBeenCalledWith(false);+ expect(persist).toHaveBeenCalledWith(false);+ expect(warnPersistFailed).toHaveBeenCalledWith('persist-failed');+ });+});diff --git a/packages/desktop/src/main/index.ts b/packages/desktop/src/main/index.tsindex 516d36718..355fd1556 100644--- a/packages/desktop/src/main/index.ts+++ b/packages/desktop/src/main/index.ts@@ -468,7 +468,11 @@ import {isTerminalConsentedWithGrace,readTerminalShellSetting,} from './terminal-consent.ts';-import { commitTerminalDockState } from './terminal-dock-persistence.ts';+import {+ applyAgentPanelVisibilityUpdate,+ commitTerminalDockState,+ resolveRestoredAgentPanelVisible,+} from './terminal-dock-persistence.ts';import { observeTerminalLaunch } from './terminal-gate-observation.ts';import { type TerminalReaper, wireWindowTerminalReap } from './terminal-lifecycle.ts';import {@@ -991,6 +995,7 @@ function persistTerminalDockForWindow(update: Partial<{terminalVisible: boolean;terminalSnapshot: OkTerminalRestartSnapshot;+ agentPanelVisible: boolean;}>,): OkTerminalDockStateWriteResult {const stateKey = terminalStateKey(win);@@ -3962,7 +3967,10 @@ function registerIpcHandlers() {const orders = dockOrderForWindow.get(win.id);return {terminalVisible: dockVisibleForWindow.get(win.id) ?? persisted?.terminalVisible ?? false,- agentPanelVisible: agentPanelVisibleForWindow.get(win.id) ?? false,+ agentPanelVisible: resolveRestoredAgentPanelVisible({+ inMemory: agentPanelVisibleForWindow.get(win.id),+ persisted,+ }),terminal: orders?.terminal,terminalSnapshot: terminalSnapshotForWindow.get(win.id) ?? persisted?.terminalSnapshot,agents: orders?.agents,@@ -4326,8 +4334,21 @@ function registerIpcHandlers() {);}}- if (state.agentPanelVisible !== undefined)- agentPanelVisibleForWindow.set(win.id, state.agentPanelVisible);+ if (state.agentPanelVisible !== undefined) {+ applyAgentPanelVisibilityUpdate(+ {+ rememberForWindow: (visible) => agentPanelVisibleForWindow.set(win.id, visible),+ persist: (visible) =>+ persistTerminalDockForWindow(win, { agentPanelVisible: visible }),+ warnPersistFailed: (reason) =>+ getLogger('terminal').warn(+ { reason },+ 'agents panel visibility persistence failed',+ ),+ },+ state.agentPanelVisible,+ );+ }}}refreshApplicationMenu();diff --git a/packages/desktop/src/main/state-store.ts b/packages/desktop/src/main/state-store.tsindex cab6d994b..64047da75 100644--- a/packages/desktop/src/main/state-store.ts+++ b/packages/desktop/src/main/state-store.ts@@ -64,6 +64,7 @@ export interface ProjectSessionState {export interface PersistedTerminalDockState {terminalVisible: boolean;terminalSnapshot: OkTerminalRestartSnapshot;+ agentPanelVisible: boolean;}export type UpdateChannel = 'latest' | 'beta';@@ -438,6 +439,7 @@ function emptyTerminalDockState(): PersistedTerminalDockState {return {terminalVisible: false,terminalSnapshot: { tabs: [], activeOrdinal: null },+ agentPanelVisible: false,};}@@ -485,6 +487,7 @@ function parsePersistedTerminalDockState(raw: unknown): PersistedTerminalDockStareturn {terminalVisible: obj.terminalVisible === true,terminalSnapshot: normalizeTerminalRestartSnapshot(obj.terminalSnapshot),+ agentPanelVisible: obj.agentPanelVisible === true,};}diff --git a/packages/desktop/src/main/terminal-dock-persistence.test.ts b/packages/desktop/src/main/terminal-dock-persistence.test.tsindex 5fdbbff4d..a4f0af796 100644--- a/packages/desktop/src/main/terminal-dock-persistence.test.ts+++ b/packages/desktop/src/main/terminal-dock-persistence.test.ts@@ -24,6 +24,7 @@ describe('commitTerminalDockState', () => {expect(getTerminalDockState(outcome.state, '/project')).toEqual({terminalVisible: false,terminalSnapshot: { tabs: [], activeOrdinal: null },+ agentPanelVisible: false,});});@@ -47,6 +48,7 @@ describe('commitTerminalDockState', () => {const current = setTerminalDockState(emptyState(), '/project', {terminalVisible: true,terminalSnapshot,+ agentPanelVisible: false,});const save = vi.fn(() => true);diff --git a/packages/desktop/src/main/terminal-dock-persistence.ts b/packages/desktop/src/main/terminal-dock-persistence.tsindex fc967f531..b1a874912 100644--- a/packages/desktop/src/main/terminal-dock-persistence.ts+++ b/packages/desktop/src/main/terminal-dock-persistence.ts@@ -3,7 +3,12 @@ import type {OkTerminalDockStateWriteResult,OkTerminalRestartSnapshot,} from '@inkeep/open-knowledge-core/desktop-bridge';-import { type AppState, getTerminalDockState, setTerminalDockState } from './state-store';+import {+ type AppState,+ getTerminalDockState,+ type PersistedTerminalDockState,+ setTerminalDockState,+} from './state-store';interface CommitTerminalDockStateInput {readonly current: AppState;@@ -11,6 +16,7 @@ interface CommitTerminalDockStateInput {readonly update: Partial<{terminalVisible: boolean;terminalSnapshot: OkTerminalRestartSnapshot;+ agentPanelVisible: boolean;}>;readonly save: (state: AppState) => boolean;}@@ -32,3 +38,28 @@ export function commitTerminalDockState({if (!save(next)) return { state: current, result: { ok: false, reason: 'persist-failed' } };return { state: next, result: { ok: true } };}++export function resolveRestoredAgentPanelVisible({+ inMemory,+ persisted,+}: {+ readonly inMemory: boolean | undefined;+ readonly persisted: PersistedTerminalDockState | null | undefined;+}): boolean {+ return inMemory ?? persisted?.agentPanelVisible ?? false;+}++export interface AgentPanelVisibilityUpdateDeps {+ readonly rememberForWindow: (visible: boolean) => void;+ readonly persist: (visible: boolean) => OkTerminalDockStateWriteResult;+ readonly warnPersistFailed: (reason: string) => void;+}++export function applyAgentPanelVisibilityUpdate(+ deps: AgentPanelVisibilityUpdateDeps,+ visible: boolean,+): void {+ deps.rememberForWindow(visible);+ const result = deps.persist(visible);+ if (!result.ok) deps.warnPersistFailed(result.reason);+}diff --git a/packages/desktop/tests/main/state-store.test.ts b/packages/desktop/tests/main/state-store.test.tsindex aae67944d..517e138c2 100644--- a/packages/desktop/tests/main/state-store.test.ts+++ b/packages/desktop/tests/main/state-store.test.ts@@ -272,6 +272,7 @@ describe('state-store (terminal full-restart state)', () => {expect(getTerminalDockState(parsed ?? emptyState(), '/tmp/project')).toEqual({terminalVisible: false,terminalSnapshot: { tabs: [], activeOrdinal: null },+ agentPanelVisible: false,});});@@ -285,6 +286,7 @@ describe('state-store (terminal full-restart state)', () => {],activeOrdinal: 1,},+ agentPanelVisible: false,});const parsed = parseAppState(JSON.parse(JSON.stringify(state)));expect(getTerminalDockState(parsed ?? emptyState(), '/tmp/project')).toEqual(@@ -317,6 +319,7 @@ describe('state-store (terminal full-restart state)', () => {tabs: [{ ordinal: 2, customLabel: 'Build' }],activeOrdinal: null,},+ agentPanelVisible: false,});});@@ -325,6 +328,7 @@ describe('state-store (terminal full-restart state)', () => {state = setTerminalDockState(state, '/tmp/project', {terminalVisible: true,terminalSnapshot: { tabs: [{ ordinal: 1, customLabel: null }], activeOrdinal: 1 },+ agentPanelVisible: false,});expect(removeRecentProject(state, '/tmp/project').terminalDockStates).toEqual({});});diff --git a/packages/desktop/tests/smoke/terminal-movement.e2e.ts b/packages/desktop/tests/smoke/terminal-movement.e2e.tsindex f00db7822..d2ce2766d 100644--- a/packages/desktop/tests/smoke/terminal-movement.e2e.ts+++ b/packages/desktop/tests/smoke/terminal-movement.e2e.ts@@ -525,7 +525,7 @@ test.describe('Terminal placement continuity — live Electron', () => {test('renderer restart restores the right layout and its live active terminal', async ({captureStderrFor,}) => {- test.setTimeout(290_000);+ test.setTimeout(300_000);const s = seed({ skipRestoreState: true });const app = await launchApp(s);captureStderrFor(app, { home: s.tmpHome, cleanupDirs: [s.tmpHome, s.projectDir] });@@ -610,6 +610,15 @@ test.describe('Terminal placement continuity — live Electron', () => {await page.evaluate(() => {window.okDesktop?.editor.notifyViewMenuStateChanged({ agentPanelVisible: true });});+ await expect+ .poll(+ async () =>+ page.evaluate(() =>+ window.okDesktop?.terminal?.getDockState()?.then((state) => state.agentPanelVisible),+ ),+ { timeout: 10_000 },+ )+ .toBe(true);await page.reload({ waitUntil: 'domcontentloaded' });// STOP: this notice auto-dismisses 4s after firing (sonner TOAST_LIFETIME; <Toaster> sets no duration), so assert it before slower waits.