Beautiful, AI-native markdown IDE and LLM wiki
TypeScript 2nd-brainagent-skillsclaudecodexcompany-braindocsknowledge-knowledge-baseknowledge-managementllmllm-wikillm-wiki-karpathymarkdownmarkdown-editormdmdxnotespkmsecond-brainskills
Split terminal and agents into separate panels (#3049)
serafin-garciaad450e333b3b
diff --git a/.changeset/split-terminal-and-agents-panels.md b/.changeset/split-terminal-and-agents-panels.mdnew file mode 100644index 000000000..206d3d219--- /dev/null+++ b/.changeset/split-terminal-and-agents-panels.md@@ -0,0 +1,11 @@+---+"@inkeep/open-knowledge": minor+---++The terminal and agent conversations are now two separate panels instead of one shared dock. The terminal owns the bottom of the editor and still opens with ⌘J; agent conversations own the right panel and open with ⌘L. Both can be open at once, each keeps its own size, tabs, and reload state, and closing one leaves the other alone — so you no longer have to give up your terminal to see an agent. The dock-position toggle is gone with the split; a terminal that used to sit in the right panel moves to the bottom on first launch, and the right panel keeps the width you had set.++A new tab in the terminal panel opens a plain shell by default — you no longer get dropped into a CLI you never chose. The New button's dropdown still lists every terminal CLI, though, so you can start a tab directly in one; that choice sticks, and the + button, ⌘J, and ⇧⌘J repeat it until you pick Terminal again. The agents panel's New button remains dedicated to in-app agents. Sending a passage to AI — from the selection bubble, a code block's Ask action, or ⌘J with selected text — still uses your preferred AI and reveals the panel where it runs.++The agents panel now keeps a small tab on the right edge whenever it is closed, so a conversation is always one click away even if you have never opened the panel. The terminal no longer has an edge tab of its own — ⌘J and the View menu open it — which clears the bottom-right corner it used to share with the Ask AI composer.++The bottom Ask AI composer moves from ⌘L to ⇧⌘L (Ctrl+Shift+L on Windows and Linux), and now hides whenever either panel is open — both are already places to type a request, so it stepped aside rather than offering a third.diff --git a/packages/app/src/components/BottomComposer.dom.test.tsx b/packages/app/src/components/BottomComposer.dom.test.tsxindex d225bb4b6..ed9f6dc96 100644--- a/packages/app/src/components/BottomComposer.dom.test.tsx+++ b/packages/app/src/components/BottomComposer.dom.test.tsx@@ -3,7 +3,7 @@** The rich `@`-mention input (`ComposerMentionInput`) is mocked with a plain* textarea double that mirrors its imperative handle + `onEmptyChange`/`onSubmit`- * contract, so these tests stay focused on the shell's responsibilities: the ⌘L+ * contract, so these tests stay focused on the shell's responsibilities: the ⇧⌘L* focus shortcut, the rotating/reduced-motion placeholder, agent-picker +* sticky-default wiring, Claude CLI terminal routing, the pending + clear flow,* and the defensive null-input toast. The real input's mention behavior +@@ -357,16 +357,32 @@ function getInput() {return screen.getByRole('textbox', { name: 'Ask AI' }) as HTMLTextAreaElement;}-function dispatchOpenAskAiShortcut() {+function makeOpenAskAiEvent() {+ // ⇧⌘L on mac / Ctrl+Shift+L elsewhere. `code` (not `key`) is what the registry+ // matches: shift makes the layout emit 'L', so keying off `key` would be+ // case-sensitive for no reason.const meta = new KeyboardEvent('keydown', {- key: 'l',+ key: 'L',+ code: 'KeyL',metaKey: true,+ shiftKey: true,bubbles: true,cancelable: true,});- const event = matchesKeyboardShortcut(meta, 'open-ask-ai')+ return matchesKeyboardShortcut(meta, 'open-ask-ai')? meta- : new KeyboardEvent('keydown', { key: 'l', ctrlKey: true, bubbles: true, cancelable: true });+ : new KeyboardEvent('keydown', {+ key: 'L',+ code: 'KeyL',+ ctrlKey: true,+ shiftKey: true,+ bubbles: true,+ cancelable: true,+ });+}++function dispatchOpenAskAiShortcut() {+ const event = makeOpenAskAiEvent();act(() => {window.dispatchEvent(event);});@@ -451,7 +467,7 @@ describe('BottomComposer (shell behavior)', () => {}});- test('the ⌘L shortcut focuses the persistent field', async () => {+ test('the ⇧⌘L shortcut focuses the persistent field', async () => {await renderComposer();const input = getInput();expect(document.activeElement).not.toBe(input);@@ -478,7 +494,7 @@ describe('BottomComposer (shell behavior)', () => {expect(document.activeElement).not.toBe(getInput());});- test('⌘L is ignored while a native form field is focused (no caret theft)', async () => {+ test('⇧⌘L is ignored while a native form field is focused (no caret theft)', async () => {await renderComposer();const composerInput = getInput();// A real native form field elsewhere in the page (e.g. a rename / search box).@@ -488,22 +504,9 @@ describe('BottomComposer (shell behavior)', () => {act(() => nativeField.focus());expect(document.activeElement).toBe(nativeField);- // Dispatch ⌘L FROM the native field — the window capture handler sees it+ // Dispatch ⇧⌘L FROM the native field — the window capture handler sees it// with `event.target` = the native input and must bail before preventDefault.- const meta = new KeyboardEvent('keydown', {- key: 'l',- metaKey: true,- bubbles: true,- cancelable: true,- });- const event = matchesKeyboardShortcut(meta, 'open-ask-ai')- ? meta- : new KeyboardEvent('keydown', {- key: 'l',- ctrlKey: true,- bubbles: true,- cancelable: true,- });+ const event = makeOpenAskAiEvent();act(() => {nativeField.dispatchEvent(event);});@@ -1288,7 +1291,7 @@ describe('BottomComposer (dismiss / reopen)', () => {expect(screen.queryByRole('textbox', { name: 'Ask AI' })).toBeNull();});- test('⌘L while dismissed reopens (calls onReopen) instead of focusing', async () => {+ test('⇧⌘L while dismissed reopens (calls onReopen) instead of focusing', async () => {const onReopen = vi.fn(() => {});await renderComposer('notes', { dismissed: true, onReopen });@@ -1378,25 +1381,15 @@ describe('BottomComposer (failure + defensive guards)', () => {});/**- * ⌘L is registered capture-phase on `window`, so it also outruns anything an+ * ⇧⌘L is registered capture-phase on `window`, so it also outruns anything an* overlay installs. `defaultPrevented` is the load-bearing signal here: the- * handler cancels the keystroke before emitting, so an uncancelled ⌘L proves+ * handler cancels the keystroke before emitting, so an uncancelled ⇧⌘L proves* the handler declined rather than proving the focus trap bounced it back.*/-describe('BottomComposer ⌘L — overlay gate', () => {- function askAiEvent() {- const meta = new KeyboardEvent('keydown', {- key: 'l',- metaKey: true,- bubbles: true,- cancelable: true,- });- return matchesKeyboardShortcut(meta, 'open-ask-ai')- ? meta- : new KeyboardEvent('keydown', { key: 'l', ctrlKey: true, bubbles: true, cancelable: true });- }+describe('BottomComposer ⇧⌘L — overlay gate', () => {+ const askAiEvent = makeOpenAskAiEvent;- test('claims ⌘L with no overlay open', async () => {+ test('claims ⇧⌘L with no overlay open', async () => {await renderComposer();const event = askAiEvent();@@ -1407,7 +1400,7 @@ describe('BottomComposer ⌘L — overlay gate', () => {expect(event.defaultPrevented).toBe(true);});- test('declines ⌘L while an overlay owns the keyboard', async () => {+ test('declines ⇧⌘L while an overlay owns the keyboard', async () => {enableInstalledDesktopTargets();const { BottomComposer } = await import('./BottomComposer');const { Dialog, DialogContent, DialogDescription, DialogTitle } = await import(diff --git a/packages/app/src/components/BottomComposer.tsx b/packages/app/src/components/BottomComposer.tsxindex af8ca3a7b..5b21a8a22 100644--- a/packages/app/src/components/BottomComposer.tsx+++ b/packages/app/src/components/BottomComposer.tsx@@ -14,7 +14,7 @@* carries a segmented "Ask <agent>" send control (the shared* `AgentSplitButton`: primary submit + joined agent-picker chevron), a* rotating-suggestion placeholder that cross-fades between prompts while- * empty, and the ⌘L focus shortcut.+ * empty, and the ⇧⌘L focus shortcut.** Submitting dispatches the typed instruction to the resolved default agent* (first installed, or the user's sticky pick) scoped to the current doc or@@ -122,10 +122,10 @@ function markdownRelativePathStem(path: string): string | null {}/**- * Whether a keydown originated inside a native form field. ⌘L should still fire+ * Whether a keydown originated inside a native form field. ⇧⌘L should still fire* from the ProseMirror body (a contentEditable root), so this is deliberately* NARROWER than `isEditableShortcutTarget` — only native INPUT/TEXTAREA/SELECT- * are excluded, so ⌘L never steals a caret out of a real form field (e.g. the+ * are excluded, so ⇧⌘L never steals a caret out of a real form field (e.g. the* rename input, a search box).*/function isNativeTextControl(target: EventTarget | null): boolean {@@ -221,7 +221,7 @@ export function BottomComposer({* touched-file lifecycle, scroll-inset/caret machinery) are skipped. */folderPath?: string;/** When dismissed, the field collapses to nothing (the host shows a reopen- * badge in the footer); the component stays mounted so ⌘L can reopen it. Doc+ * badge in the footer); the component stays mounted so ⇧⌘L can reopen it. Doc* mode only — folder mode is always visible (no footer to dock a badge in). */dismissed?: boolean;onDismiss?: () => void;@@ -385,7 +385,7 @@ export function BottomComposer({};}, [dismissed, surface, docName, folderMode]);- // Mirror the latest dismissed/onReopen into refs so the once-bound ⌘L handler+ // Mirror the latest dismissed/onReopen into refs so the once-bound ⇧⌘L handler// reads current values without re-subscribing (refs written in an effect, not// during render, keeps React Compiler happy).const dismissedRef = useRef(dismissed);@@ -395,7 +395,7 @@ export function BottomComposer({onReopenRef.current = onReopen;});- // Single open+focus path, shared by ⌘L and the editor's "Ask AI" selection+ // Single open+focus path, shared by ⇧⌘L and the editor's "Ask AI" selection// affordance (the bubble-menu button dispatches the same event): if the field// is dismissed it reopens first (the reopen effect below then focuses on the// dismissed -> visible flip); otherwise it focuses the input directly.@@ -407,13 +407,13 @@ export function BottomComposer({return subscribeToOpenAskAiComposer(openAndFocus);}, []);- // ⌘L routes through the shared event so the button and the shortcut never+ // ⇧⌘L routes through the shared event so the button and the shortcut never// duplicate the reopen/focus logic.useEffect(() => {const onKeyDown = (event: KeyboardEvent) => {if (!matchesKeyboardShortcut(event, 'open-ask-ai')) return;if (isOverlayLayerOpen()) return;- // Don't hijack ⌘L when the caret is in a native form field (rename input,+ // Don't hijack ⇧⌘L when the caret is in a native form field (rename input,// search box, …) — only swallow it for the editor body / global context.if (isNativeTextControl(event.target)) return;event.preventDefault();@@ -424,7 +424,7 @@ export function BottomComposer({}, []);// Focus the input only on a genuine reopen (dismissed true -> false), so a- // badge click or ⌘L lands the caret in the field. Comparing against the+ // badge click or ⇧⌘L lands the caret in the field. Comparing against the// PREVIOUS dismissed value (rather than a "skip the first render" ref) keeps// the mount itself from focusing — and, crucially, survives React StrictMode's// dev-only effect double-invoke, which defeats a skip-first-render ref (the@@ -933,7 +933,7 @@ export function BottomComposer({};// Dismissed: render nothing (the host shows the footer reopen badge). The- // component stays mounted above this point so the ⌘L handler can reopen it.+ // component stays mounted above this point so the ⇧⌘L handler can reopen it.if (dismissed) return null;// Compact, Cursor-style selection chip: `name (range)` — the doc basename@@ -962,7 +962,7 @@ export function BottomComposer({// the card stacks its children vertically. The card markup is mode-agnostic;// only the outer host wrapper (overlay vs in-flow) differs below.const card = (- // biome-ignore lint/a11y/noStaticElementInteractions: pointer clicks only delegate focus to the composer's editable; keyboard users focus it directly (Tab / ⌘L).+ // biome-ignore lint/a11y/noStaticElementInteractions: pointer clicks only delegate focus to the composer's editable; keyboard users focus it directly (Tab / ⇧⌘L).<divref={cardRef}// Click anywhere in the card's whitespace (padding, row gaps, the spacediff --git a/packages/app/src/components/CommandPalette.dom.test.tsx b/packages/app/src/components/CommandPalette.dom.test.tsxindex f932d6cbd..aa7c50c9d 100644--- a/packages/app/src/components/CommandPalette.dom.test.tsx+++ b/packages/app/src/components/CommandPalette.dom.test.tsx@@ -990,6 +990,11 @@ describe('Cmd+K menu-parity backfill', () => {{ testid: 'command-palette-toggle-sidebar', query: 'sidebar', id: 'toggle-sidebar' },{ testid: 'command-palette-toggle-doc-panel', query: 'document panel', id: 'toggle-doc-panel' },{ testid: 'command-palette-toggle-terminal', query: 'hide terminal', id: 'toggle-terminal' },+ {+ testid: 'command-palette-toggle-agent-panel',+ query: 'agents',+ id: 'toggle-agent-panel',+ },{testid: 'command-palette-toggle-show-hidden-files',query: 'hidden files',diff --git a/packages/app/src/components/EditorArea.dom.test.tsx b/packages/app/src/components/EditorArea.dom.test.tsxindex 3887cb320..58da42298 100644--- a/packages/app/src/components/EditorArea.dom.test.tsx+++ b/packages/app/src/components/EditorArea.dom.test.tsx@@ -98,11 +98,21 @@ vi.doMock('@/editor/DocumentContext', () => ({}));vi.doMock('@/components/EmptyEditorState', () => ({- // Forward terminalDock so the EditorArea -> EmptyEditorState prop wiring is- // observable (the empty state collapses to the header-only view whenever a- // terminal is up, in either dock).- EmptyEditorState: ({ terminalDock }: { terminalDock?: string | null }) => (- <div data-testid="empty-editor-state" data-terminal-dock={String(terminalDock)} />+ // Forward both panel flags so the EditorArea -> EmptyEditorState prop wiring is+ // observable (the empty state collapses to the header-only view whenever+ // either panel is up).+ EmptyEditorState: ({+ terminalOpen,+ agentsOpen,+ }: {+ terminalOpen?: boolean;+ agentsOpen?: boolean;+ }) => (+ <div+ data-testid="empty-editor-state"+ data-terminal-open={String(terminalOpen === true)}+ data-agents-open={String(agentsOpen === true)}+ />),}));@@ -230,6 +240,7 @@ vi.doMock('@/lib/use-settings-route', () => ({}));const { EditorArea } = await import('./EditorArea');+const { TooltipProvider } = await import('@/components/ui/tooltip');function renderEditorArea() {return render(@@ -289,7 +300,6 @@ describe('EditorArea empty-state terminal host', () => {terminalBridge={{} as never}terminalVisibleonTerminalVisibleChange={() => {}}- terminalDock="bottom"/>,);@@ -297,33 +307,29 @@ describe('EditorArea empty-state terminal host', () => {expect(dock.getAttribute('data-visible')).toBe('true');const emptyState = dock.querySelector('[data-testid="empty-editor-state"]');expect(emptyState).not.toBeNull();- // EditorArea forwards the dock position so the empty state collapses to the+ // EditorArea forwards the open panel so the empty state collapses to the// header-only view (composer bubble dropped) while the terminal is up.- expect(emptyState?.getAttribute('data-terminal-dock')).toBe('bottom');+ expect(emptyState?.getAttribute('data-terminal-open')).toBe('true');+ expect(emptyState?.getAttribute('data-agents-open')).toBe('false');});- test('collapses the empty state to the header-only view when the terminal is right-docked', () => {+ test('collapses the empty state to the header-only view when the agents panel is open', () => {render(<EditorAreaeditorMode="wysiwyg"onModeChange={() => {}}activeTab="timeline"onActiveTabChange={() => {}}- terminalBridge={{} as never}- terminalVisible- onTerminalVisibleChange={() => {}}- // Right is the default dock. Either dock position collapses the empty- // state — the open terminal is its own AI entry point, so the composer- // bubble must not compete with it.- terminalDock="right"+ // Either panel collapses the empty state — an open panel is its own AI+ // entry point, so the composer bubble must not compete with it.+ agentsVisible+ onAgentsVisibleChange={() => {}}/>,);- const dock = screen.getByTestId('terminal-dock');- expect(dock.getAttribute('data-visible')).toBe('true');- const emptyState = dock.querySelector('[data-testid="empty-editor-state"]');- expect(emptyState).not.toBeNull();- expect(emptyState?.getAttribute('data-terminal-dock')).toBe('right');+ const emptyState = screen.getByTestId('empty-editor-state');+ expect(emptyState.getAttribute('data-agents-open')).toBe('true');+ expect(emptyState.getAttribute('data-terminal-open')).toBe('false');});test('renders the empty state; the dock shell is present but inactive on the web host', () => {@@ -338,23 +344,22 @@ describe('EditorArea empty-state terminal host', () => {// The dock shell is host-agnostic now, but with nothing docked it stays inactive.expect(screen.getByTestId('terminal-dock').getAttribute('data-visible')).toBe('false');- // Pins the `terminalVisible ? position : null` forwarding: without an open- // dock the empty state must receive null, or it would collapse to header-only- // on every new tab.- expect(screen.getByTestId('empty-editor-state').getAttribute('data-terminal-dock')).toBe(- 'null',- );+ // Pins the forwarding: with neither panel open the empty state must receive+ // both flags false, or it would collapse to header-only on every new tab.+ const emptyState = screen.getByTestId('empty-editor-state');+ expect(emptyState.getAttribute('data-terminal-open')).toBe('false');+ expect(emptyState.getAttribute('data-agents-open')).toBe('false');});});-describe('EditorArea right-rail layout assert on terminal-column mount/unmount', () => {+describe('EditorArea right-rail layout assert on agents-column mount/unmount', () => {// react-resizable-panels caches layouts per panel-ID set and restores the// cached layout whenever the set changes — so before the corrective assert,- // hiding the right-docked terminal resurrected a doc panel the user had- // closed while it was up (and revealing it restored equally stale state).- // These pin the assert: on every terminal-column presence flip, EditorArea- // writes one full corrected layout through the group handle, preserving the- // doc panel's pre-flip state and routing the difference to the editor.+ // hiding the right column resurrected a doc panel the user had closed while it+ // was up (and revealing it restored equally stale state). These pin the+ // assert: on every agents-column presence flip, EditorArea writes one full+ // corrected layout through the group handle, preserving the doc panel's+ // pre-flip state and routing the difference to the editor.const setViewportWidth = (px: number) => {Object.defineProperty(window, 'innerWidth', {value: px,@@ -369,8 +374,7 @@ describe('EditorArea right-rail layout assert on terminal-column mount/unmount',activeTab: 'timeline',onActiveTabChange: () => {},terminalBridge: {} as never,- terminalDock: 'right',- onTerminalVisibleChange: () => {},+ onAgentsVisibleChange: () => {},} as const;// px→% conversion basis fixed by the panel mock: 340px at 25% → 1360px.@@ -385,17 +389,17 @@ describe('EditorArea right-rail layout assert on terminal-column mount/unmount',panelIsCollapsed = false;});- test('hiding the terminal re-asserts the collapsed doc panel over the stale panel-set restore', async () => {+ test('hiding the agents panel re-asserts the collapsed doc panel over the stale panel-set restore', async () => {// Below 1280px the doc panel starts collapsed (no pin), so the intended// post-hide state is "collapsed" even though the cached two-panel layout// (mimicked) says expanded.setViewportWidth(1024);- const view = render(<EditorArea {...baseProps} terminalVisible />);+ const view = render(<EditorArea {...baseProps} agentsVisible />);expect(groupSetLayoutCalls).toHaveLength(0);// The stale two-panel layout the library restores on unmount: doc panel// expanded to 30% — the resurrection this assert corrects.groupLayout = { 'editor-main': 70, 'doc-panel': 30 };- view.rerender(<EditorArea {...baseProps} terminalVisible={false} />);+ view.rerender(<EditorArea {...baseProps} agentsVisible={false} />);// Flush the microtask-deferred assert.await act(async () => {});const corrected = groupSetLayoutCalls.at(-1);@@ -404,40 +408,40 @@ describe('EditorArea right-rail layout assert on terminal-column mount/unmount',expect(corrected?.['editor-main']).toBe(100);});- test('revealing the terminal keeps the open doc panel open despite a stale cached layout', async () => {+ test('revealing the agents panel keeps the open doc panel open despite a stale cached layout', async () => {// At 1400px the doc panel starts open. A stale three-panel cached layout// could say anything; the assert must restore the pre-reveal state (open)- // at the persisted width, with the terminal at its own persisted width.+ // at the persisted width, with the agents column at its own persisted width.setViewportWidth(1400);- const view = render(<EditorArea {...baseProps} terminalVisible={false} />);- groupLayout = { 'editor-main': 45, 'doc-panel': 25, 'terminal-column': 30 };- view.rerender(<EditorArea {...baseProps} terminalVisible />);+ const view = render(<EditorArea {...baseProps} agentsVisible={false} />);+ groupLayout = { 'editor-main': 45, 'doc-panel': 25, 'agents-column': 30 };+ view.rerender(<EditorArea {...baseProps} agentsVisible />);await act(async () => {});const corrected = groupSetLayoutCalls.at(-1);expect(corrected).toBeDefined();// Exact pins against the mock's deterministic basis: doc panel at its- // persisted default (320px), terminal at its persisted default (480px),+ // persisted default (320px), agents column at its persisted default (480px),// editor absorbing the remainder.expect(corrected?.['doc-panel']).toBeCloseTo(pctOf(320), 3);- expect(corrected?.['terminal-column']).toBeCloseTo(pctOf(480), 3);+ expect(corrected?.['agents-column']).toBeCloseTo(pctOf(480), 3);expect(corrected?.['editor-main']).toBeCloseTo(100 - pctOf(320) - pctOf(480), 3);});- test('releasing a terminal-handle drag with the column snapped shut hides the terminal', async () => {- // Drag-to-close: the pointerup handler checks the terminal panel's+ test('releasing an agents-handle drag with the column snapped shut hides the panel', async () => {+ // Drag-to-close: the pointerup handler checks the agents panel's// isCollapsed() and turns a snapped-shut column into a real hide.setViewportWidth(1400);const visibleChanges: boolean[] = [];render(<EditorArea{...baseProps}- terminalVisible- onTerminalVisibleChange={(visible: boolean) => {+ agentsVisible+ onAgentsVisibleChange={(visible: boolean) => {visibleChanges.push(visible);}}/>,);- // The empty view renders no doc panel, so the only handle is the terminal's.+ // The empty view renders no doc panel, so the only handle is the column's.const handle = screen.getByTestId('resizable-handle');act(() => {fireEvent.pointerDown(handle);@@ -449,14 +453,14 @@ describe('EditorArea right-rail layout assert on terminal-column mount/unmount',expect(visibleChanges.at(-1)).toBe(false);});- test('releasing a terminal-handle drag with the column still open does NOT hide the terminal', async () => {+ test('releasing an agents-handle drag with the column still open does NOT hide the panel', async () => {setViewportWidth(1400);const visibleChanges: boolean[] = [];render(<EditorArea{...baseProps}- terminalVisible- onTerminalVisibleChange={(visible: boolean) => {+ agentsVisible+ onAgentsVisibleChange={(visible: boolean) => {visibleChanges.push(visible);}}/>,@@ -472,6 +476,50 @@ describe('EditorArea right-rail layout assert on terminal-column mount/unmount',});});+// Exactly ONE panel advertises itself with a persistent edge tab, and EditorArea+// owns that one: the agents panel (an agent conversation is worth a one-click+// return, and a chord is not discoverable). The terminal deliberately has none —+// ⌘J and the View menu are its entry points. Its absence is asserted in+// TerminalDock.dom.test.tsx, which renders the real dock; TerminalDock is mocked+// here, so a terminal-tab assertion in this file could never fail.+describe('EditorArea session-panel edge reveal tabs', () => {+ const revealProps = {+ editorMode: 'wysiwyg',+ onModeChange: () => {},+ activeTab: 'timeline',+ onActiveTabChange: () => {},+ terminalBridge: { terminal: {} } as never,+ onAgentsVisibleChange: () => {},+ onTerminalVisibleChange: () => {},+ onRevealAgents: () => {},+ } as const;++ beforeEach(() => {+ cleanup();+ docCtx = EMPTY_DOC_CTX;+ });++ // Ungated on having conversations: a never-opened panel still advertises+ // itself, since its cold entry (the New button) is a fine place to land.+ // The reveal tab carries a Radix tooltip, so it needs the provider in scope.+ const renderArea = (props: Record<string, unknown>) =>+ render(+ <TooltipProvider>+ <EditorArea {...revealProps} {...props} />+ </TooltipProvider>,+ );++ test('the agents tab is up while the panel is hidden, even with no conversations', () => {+ renderArea({ agentsVisible: false });+ expect(screen.getByRole('button', { name: 'Open agents panel' })).toBeTruthy();+ });++ test('the agents tab goes away once the panel is open', () => {+ renderArea({ agentsVisible: true });+ expect(screen.queryByRole('button', { name: 'Open agents panel' })).toBeNull();+ });+});+describe('EditorArea folder-view terminal host', () => {beforeEach(() => {cleanup();diff --git a/packages/app/src/components/EditorArea.tsx b/packages/app/src/components/EditorArea.tsxindex 9f3f12fb4..ec2d320b8 100644--- a/packages/app/src/components/EditorArea.tsx+++ b/packages/app/src/components/EditorArea.tsx@@ -5,7 +5,6 @@ import {parseExternalSkillDocName,} from '@inkeep/open-knowledge-core';import { Trans, useLingui } from '@lingui/react/macro';-import { useTheme } from 'next-themes';import {lazy,type ReactNode,@@ -48,6 +47,11 @@ import { useDocumentStats } from '@/hooks/use-document-stats';import { useLifecycleStatus } from '@/hooks/use-lifecycle-status';import { useSelectionStats } from '@/hooks/use-selection-stats';import { closeAgentDiff, useAgentDiffView } from '@/lib/agent-diff-store';+import {+ getInitialAgentsPanelWidth,+ MIN_AGENTS_PANEL_WIDTH,+ writeAgentsPanelWidth,+} from '@/lib/agents-panel-width-store';import type { OkDesktopBridge } from '@/lib/desktop-bridge-types';import { docNameFromHash, hashFromDocName } from '@/lib/doc-hash';import { getInitialDocPanelWidth, writeDocPanelWidth } from '@/lib/doc-panel-width-store';@@ -61,12 +65,6 @@ import {} from '@/lib/share/pending-receive-nav-store';import { RIGHT_COLLAPSE_THRESHOLD, resolvePartition } from '@/lib/sidebar-partition';import { applyToggle, readPins, resolveEffectiveState } from '@/lib/sidebar-pin-store';-import type { TerminalDockPosition } from '@/lib/terminal-dock-store';-import {- getInitialTerminalWidth,- MIN_TERMINAL_WIDTH,- writeTerminalWidth,-} from '@/lib/terminal-width-store';import { closeTimelineDiff, useTimelineDiffView } from '@/lib/timeline-diff-store';import { useSettingsRoute } from '@/lib/use-settings-route';import { cn } from '@/lib/utils';@@ -82,7 +80,6 @@ import { shouldPaintOverlay } from './editor-area-overlay';import { computeStickyRepinLayout } from './editor-area-sticky-repin';import { TerminalDock } from './TerminalDock';import { TerminalRevealTab } from './TerminalRevealTab';-import { useLiveXtermTheme } from './use-live-xterm-theme';const LazyActivityModeContent = lazy(async () => {const mod = await import('@/components/ActivityModeContent');@@ -144,23 +141,29 @@ const DOC_PANEL_MAX_SIZE = '600px';// residual absorber and intentionally has no id (an explicit id on it changes how// the library redistributes an imperative resize), so the right-rail layout assert// finds it as the one live panel id that is not one of these.-const RIGHT_PANEL_IDS = new Set(['doc-panel', 'terminal-column', 'agent-panel']);+const RIGHT_PANEL_IDS = new Set(['doc-panel', 'agents-column', 'agent-panel']);/**- * Where + whether the terminal should attach right now. EditorArea computes this- * (it knows the view kind and the bottom/right mount containers) and- * reports it UP to EditorPane, which owns the long-lived session host. The host is- * mounted above EditorArea so a dock toggle (which remounts EditorArea's subtree)- * can't re-spawn the terminal — the VS Code / Zed pattern of owning the terminal- * above the movable layout and re-attaching the view.+ * Where + whether ONE session panel should attach right now. EditorArea computes+ * this (it knows the view kind and the mount containers) and reports it UP to+ * EditorPane, which owns the long-lived session hosts. The hosts are mounted+ * above EditorArea so a view-kind change (which remounts EditorArea's subtree)+ * can't re-spawn a PTY — the VS Code / Zed pattern of owning the terminal above+ * the layout and re-attaching the view.*/-export interface TerminalPlacement {- /** The DOM container to portal the live terminal into (bottom dock or right region). */+interface SessionPanelPlacement {+ /** The DOM container to portal that panel's live sessions into. */readonly container: HTMLElement | null;- /** Whether the terminal is on screen (drives focus). */+ /** Whether the panel is on screen (drives focus). */readonly isShowing: boolean;- readonly dockPosition: TerminalDockPosition;- /** Focus target for returning focus to the editor when the terminal hides. */+}++/** Both panels' placements plus the shared focus-return target, reported in one+ * callback so EditorPane takes a single state update per layout change. */+export interface SessionPlacements {+ readonly terminal: SessionPanelPlacement;+ readonly agents: SessionPanelPlacement;+ /** Focus target for returning focus to the editor when a panel hides. */readonly editorRegion: HTMLElement | null;}@@ -171,31 +174,26 @@ interface EditorAreaProps {onActiveTabChange: (tab: PanelTab) => void;/*** Desktop bridge for the docked terminal — `null` on the web host (no shell).- * When present, the terminal docks either under the editor (bottom, via- * `TerminalDock`'s vertical split) or as its own resizable column to the right- * (`#terminal-column`, the far-right column past the doc/agent panel). The live- * session host is owned by EditorPane and portals into whichever container is- * active, so the PTY survives tab switches, view-kind changes, and dock moves.- * State is owned by EditorPane and threaded down via these props.+ * When present, the terminal docks under the editor via `TerminalDock`'s+ * vertical split. The live session host is owned by EditorPane and portals into+ * the container this component renders, so the PTY survives tab switches and+ * view-kind changes. State is owned by EditorPane and threaded down via these+ * props.*/terminalBridge?: OkDesktopBridge | null;terminalVisible?: boolean;onTerminalVisibleChange?: (visible: boolean) => void;- /** Terminal dock position (right default | bottom). When `'right'` the terminal- * is its own column to the right of the doc/agent panel (MD | PANE | TERMINAL)- * instead of docking under the editor. */- terminalDock?: TerminalDockPosition;- /** Whether the sessions dock currently holds any tab (terminal or thread),- * reported up from the host. Placement predicates key off dock-visible-&-has-tabs- * rather than the bridge, so the dock column renders on web (thread tabs only). */- terminalHasSessions?: boolean;- /** Report the terminal's attach point up to EditorPane (which owns the session- * host). See {@link TerminalPlacement}. */- onTerminalPlacement?: (placement: TerminalPlacement) => void;- /** Reveal the sessions dock and seed the preferred New-session choice if none is- * open — drives the edge "Open session dock" tab shown while the- * dock is hidden. Provided on every host now (web reveals thread tabs). */- onRevealTerminal?: () => void;+ /** Agents-panel visibility. Its own resizable column to the right of the+ * doc/agent panel (`#agents-column`, MD | PANE | AGENTS). Independent of the+ * terminal — both panels can be open at once. */+ agentsVisible?: boolean;+ onAgentsVisibleChange?: (visible: boolean) => void;+ /** Report both panels' attach points up to EditorPane (which owns the session+ * hosts). See {@link SessionPlacements}. */+ onSessionPlacements?: (placements: SessionPlacements) => void;+ /** Reveal the agents panel — drives the right edge tab shown while it is+ * hidden. Provided on every host (agent threads are server-hosted). */+ onRevealAgents?: () => void;}export function EditorArea(props: EditorAreaProps) {@@ -255,18 +253,12 @@ function EditorAreaInner({terminalBridge,terminalVisible = false,onTerminalVisibleChange,- terminalDock = 'right',- terminalHasSessions = false,- onTerminalPlacement,- onRevealTerminal,+ agentsVisible = false,+ onAgentsVisibleChange,+ onSessionPlacements,+ onRevealAgents,}: EditorAreaProps) {const { t } = useLingui();- const { resolvedTheme } = useTheme();- // Paint the right-docked terminal column with the xterm canvas color so the tab- // strip + chrome read as one continuous surface with the terminal — matching the- // bottom dock (TerminalDock applies the same fill). Without it the strip shows- // the app background and reads as a black seam above the terminal.- const xtermBackground = useLiveXtermTheme(resolvedTheme).background;const {activeDocName,activeProvider,@@ -392,10 +384,10 @@ function EditorAreaInner({rightPartitionRef.current = rightPartition;}, [rightPartition]);const panelRef = usePanelRef();- // Independent ref for the terminal column (MD | PANE | TERMINAL). Bound only- // while that column is mounted (right-docked + visible); the sticky-width RO- // pins it the same way it pins the doc panel.- const terminalColumnPanelRef = usePanelRef();+ // Independent ref for the agents column (MD | PANE | AGENTS). Bound only while+ // that column is mounted (agents panel visible); the sticky-width RO pins it+ // the same way it pins the doc panel.+ const agentsColumnPanelRef = usePanelRef();const [initialRightCollapsed] = useState(() => {const pins = readPins();return resolveEffectiveState('right', rightPartition, pins) === 'collapsed';@@ -405,69 +397,53 @@ function EditorAreaInner({// the observer on every isCollapsed flip.const isCollapsedRef = useRef(isCollapsed);- // The terminal's right-dock mount point — a dedicated column to the right of the- // doc panels (MD | PANE | TERMINAL). The session host portals into this element- // when the terminal is right-docked and visible.- const [rightTerminalContainer, setRightTerminalContainer] = useState<HTMLDivElement | null>(null);+ // The agents panel's mount point — a dedicated column to the right of the doc+ // panels (MD | PANE | AGENTS), present across EVERY view kind (the column just+ // has no doc panel beside it on asset / large-file / empty views).+ const [agentsContainer, setAgentsContainer] = useState<HTMLDivElement | null>(null);// The bottom-dock mount + the editor-region focus target, reported up by- // TerminalDock (the bottom shell). The session host portals into the active- // container and returns focus to the editor region when the terminal hides.+ // TerminalDock (the bottom shell). The terminal host portals into the container+ // and both hosts return focus to the editor region when they hide.const [bottomTerminalContainer, setBottomTerminalContainer] = useState<HTMLDivElement | null>(null,);const [terminalEditorRegion, setTerminalEditorRegion] = useState<HTMLDivElement | null>(null);- // Terminal placement, computed early (before the view branches) so it can be- // reported up to EditorPane regardless of which branch renders. When right-- // docked the terminal is its own far-right column past the doc panels, present- // across EVERY view kind (the column just has no doc panel beside it on- // asset / large-file / empty views). This is why the dock stays on the right- // even when there's nothing else to put there.- // Whether the desktop bridge can host TERMINAL-kind tabs (a session-only bridge- // has no `terminal` surface). The dock, its placement, and the reveal tab now- // key off dock visibility rather than `terminalBridge != null`, so the column- // renders on the web host (thread tabs only). `terminalAvailable` gates only the- // terminal-*kind* reveal reason (a cold reveal that can spawn a shell).- const terminalAvailable = terminalBridge?.terminal != null;- const rightDocked = terminalDock === 'right';- const terminalDockPosition: TerminalDockPosition = rightDocked ? 'right' : 'bottom';- // Whether the far-right dock column participates in the panel group this render.- // Drives the panel-set-change layout assert below and the collapsed doc-panel- // neutralization — compute it up here so effects can depend on it. Un-gated from- // the bridge: on web the column hosts thread tabs. The host renders a starting /- // empty state while a session spins up, so keying off visibility (not has-tabs)- // keeps the dock's feedback immediate during the seconds-long agent spawn.- const terminalColumnPresent = rightDocked && terminalVisible;- // The edge "Show sessions" reveal tab is up while the dock is hidden. A terminal- // surface always shows it (revealing can seed a shell); a thread-only surface- // shows it only with latched tabs to return to (its cold entry is the handoff- // menu, not this tab). It floats over a corner other UI also wants: bottom-dock- // over the editor footer's bottom-right, right-dock over the far-right top.- const revealTabHidden =- !terminalVisible && onRevealTerminal != null && (terminalAvailable || terminalHasSessions);- const bottomRevealTabPresent = revealTabHidden && !rightDocked;- const rightRevealTabPresent = revealTabHidden && rightDocked;- const rightTerminalShowing = rightDocked && terminalVisible && rightTerminalContainer != null;- const activeTerminalContainer = rightTerminalShowing- ? rightTerminalContainer- : bottomTerminalContainer;- const terminalShowing =- (rightDocked ? rightTerminalShowing : terminalVisible) && activeTerminalContainer != null;- // Report the attach point up to EditorPane (which owns the long-lived session- // host). EditorArea only says where to attach — the VS Code / Zed pattern of- // owning the terminal above the layout that moves.+ // Placements are computed early (before the view branches) so they can be+ // reported up to EditorPane regardless of which branch renders.+ //+ // Whether the far-right agents column participates in the panel group this+ // render. Drives the panel-set-change layout assert below and the collapsed+ // doc-panel neutralization — compute it up here so effects can depend on it.+ // Keyed off visibility rather than has-tabs so the panel's feedback is+ // immediate during the seconds-long agent spawn.+ const agentsColumnPresent = agentsVisible;+ // The agents panel is the one surface with a persistent edge affordance: it is+ // discoverable in a way a chord is not, and an agent conversation is the thing a+ // user is most likely to want back. Ungated on having conversations — an empty+ // panel opens on its New button, which is a fine cold entry.+ //+ // The terminal has NO reveal tab. It is a developer surface reached by ⌘J (and+ // the View menu), and a second permanent tab hovering over the editor footer's+ // bottom-right was clutter competing with the Ask AI composer for that corner.+ const rightRevealTabPresent = !agentsVisible && onRevealAgents != null;+ const terminalShowing = terminalVisible && bottomTerminalContainer != null;+ const agentsShowing = agentsVisible && agentsContainer != null;+ // Report the attach points up to EditorPane (which owns the long-lived session+ // hosts). EditorArea only says where to attach — the VS Code / Zed pattern of+ // owning the terminal above the layout that changes.useEffect(() => {- onTerminalPlacement?.({- container: activeTerminalContainer,- isShowing: terminalShowing,- dockPosition: terminalDockPosition,+ onSessionPlacements?.({+ terminal: { container: bottomTerminalContainer, isShowing: terminalShowing },+ agents: { container: agentsContainer, isShowing: agentsShowing },editorRegion: terminalEditorRegion,});}, [- onTerminalPlacement,- activeTerminalContainer,+ onSessionPlacements,+ bottomTerminalContainer,terminalShowing,- terminalDockPosition,+ agentsContainer,+ agentsShowing,terminalEditorRegion,]);@@ -502,26 +478,26 @@ function EditorAreaInner({}, 100);}- // The terminal column carries the same sticky-pixel-width treatment as the doc+ // The agents column carries the same sticky-pixel-width treatment as the doc// panel — its own persisted width, drag-tracking ref, and RO-pin — so it does// not grow proportionally when the container widens.- const [initialTerminalWidthPx] = useState(() => getInitialTerminalWidth());- const terminalWidthPxRef = useRef(initialTerminalWidthPx);- const [isDraggingTerminalHandle, setIsDraggingTerminalHandle] = useState(false);- const isDraggingTerminalHandleRef = useRef(false);- const terminalWriteTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);- function debouncedWriteTerminalWidth(px: number) {- if (terminalWriteTimerRef.current != null) clearTimeout(terminalWriteTimerRef.current);- terminalWriteTimerRef.current = setTimeout(() => {- writeTerminalWidth(px);- terminalWriteTimerRef.current = null;+ const [initialAgentsWidthPx] = useState(() => getInitialAgentsPanelWidth());+ const agentsWidthPxRef = useRef(initialAgentsWidthPx);+ const [isDraggingAgentsHandle, setIsDraggingAgentsHandle] = useState(false);+ const isDraggingAgentsHandleRef = useRef(false);+ const agentsWriteTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);+ function debouncedWriteAgentsWidth(px: number) {+ if (agentsWriteTimerRef.current != null) clearTimeout(agentsWriteTimerRef.current);+ agentsWriteTimerRef.current = setTimeout(() => {+ writeAgentsPanelWidth(px);+ agentsWriteTimerRef.current = null;}, 100);}useEffect(() => () => {if (writeTimerRef.current != null) clearTimeout(writeTimerRef.current);- if (terminalWriteTimerRef.current != null) clearTimeout(terminalWriteTimerRef.current);+ if (agentsWriteTimerRef.current != null) clearTimeout(agentsWriteTimerRef.current);},[],);@@ -540,24 +516,24 @@ function EditorAreaInner({// Group-level imperative handle. Layout corrections MUST go through// `setLayout` (the whole layout in one shot): the per-panel imperative APIs// (`resize`/`collapse`/`expand`) always exchange space with the panel's flex- // NEIGHBOR, and in the EDITOR | doc-panel | terminal-column order that+ // NEIGHBOR, and in the EDITOR | doc-panel | agents-column order that// neighbor is never the editor — a doc-panel collapse dumps its width into- // the terminal, and re-pinning the terminal hands it right back to the doc+ // the agents column, and re-pinning it hands the width right back to the doc// panel. Only a full-layout write can route deltas to the editor. The layout// math lives in `computeStickyRepinLayout` (unit-tested).const groupRef = useGroupRef();- // Live mirror of `terminalColumnPresent` for subscribers with narrow deps.- const terminalColumnPresentRef = useRef(terminalColumnPresent);+ // Live mirror of `agentsColumnPresent` for subscribers with narrow deps.+ const agentsColumnPresentRef = useRef(agentsColumnPresent);useEffect(() => {- terminalColumnPresentRef.current = terminalColumnPresent;- }, [terminalColumnPresent]);+ agentsColumnPresentRef.current = agentsColumnPresent;+ }, [agentsColumnPresent]);// Pixel basis for px→% conversion in `assertRightRailLayout`. Layout// percentages are relative to the group's panel space; derive the basis from// a panel whose percentage and pixel width are both known (immune to the// separator widths the container includes), falling back to the container.function resolveGroupPxWidth(): number | null {- for (const ref of [panelRef, terminalColumnPanelRef]) {+ for (const ref of [panelRef, agentsColumnPanelRef]) {const size = ref.current?.getSize();// The `> 1` floor excludes collapsed/near-zero panels: px / ~0% diverges// (Infinity at exactly 0), which would corrupt every layout assertion@@ -572,12 +548,12 @@ function EditorAreaInner({// Write the intended right-rail layout in one `setLayout` call: the doc// panel at its persisted width (or pinned shut at 0 when collapsed), the- // terminal column at its persisted width, other rail panels (agent-panel)+ // agents column at its persisted width, other rail panels (agent-panel)// untouched, and the EDITOR absorbing the remainder. This is the single// correction primitive for every path where the library would otherwise// misroute space.function assertRightRailLayout(docCollapsed: boolean) {- if (isDraggingDocHandleRef.current || isDraggingTerminalHandleRef.current) return;+ if (isDraggingDocHandleRef.current || isDraggingAgentsHandleRef.current) return;const group = groupRef.current;if (group == null) return;// The imperative handles throw once their group/panel has unregistered,@@ -595,8 +571,8 @@ function EditorAreaInner({if ('doc-panel' in layout) {pinnedPx['doc-panel'] = docCollapsed ? 0 : docPanelWidthPxRef.current;}- if ('terminal-column' in layout) {- pinnedPx['terminal-column'] = terminalWidthPxRef.current;+ if ('agents-column' in layout) {+ pinnedPx['agents-column'] = agentsWidthPxRef.current;}if (Object.keys(pinnedPx).length === 0) return;const next = computeStickyRepinLayout({@@ -623,10 +599,10 @@ function EditorAreaInner({// Expand the doc panel from a non-toggle path (tab request, avatar click,// width-threshold crossing). Same routing rule as togglePanel: with the- // terminal column mounted, go through the full-layout assert so the width- // comes from the editor rather than the terminal.+ // agents column mounted, go through the full-layout assert so the width+ // comes from the editor rather than the agents column.function expandDocPanel() {- if (terminalColumnPresentRef.current) {+ if (agentsColumnPresentRef.current) {assertRightRailLayout(false);} else {panelRef.current?.expand();@@ -643,19 +619,19 @@ function EditorAreaInner({// threshold and immediately invokes the toggle before React commits the// new partition.const partition = rightPartitionRef.current;- // With the terminal column mounted, expand/collapse must route through the+ // With the agents column mounted, expand/collapse must route through the// full-layout assert so the space comes from / returns to the editor — the- // per-panel APIs would exchange it with the terminal column instead.+ // per-panel APIs would exchange it with the agents column instead.if (isCollapsed) {applyToggle('right', partition, 'open');- if (terminalColumnPresentRef.current) {+ if (agentsColumnPresentRef.current) {assertRightRailLayout(false);} else {panelRef.current?.expand();}} else {applyToggle('right', partition, 'collapsed');- if (terminalColumnPresentRef.current) {+ if (agentsColumnPresentRef.current) {assertRightRailLayout(true);} else {panelRef.current?.collapse();@@ -676,7 +652,7 @@ function EditorAreaInner({// but until it does any effect reading `isCollapsed` (focus-safety,// notifyViewMenuStateChanged) would see the pre-collapse value.setIsCollapsed(nextCollapsed);- if (terminalColumnPresentRef.current) {+ if (agentsColumnPresentRef.current) {assertRightRailLayout(nextCollapsed);} else if (nextCollapsed) {panelRef.current?.collapse();@@ -697,8 +673,8 @@ function EditorAreaInner({// a window resize or a LEFT-sidebar collapse — not on a right-panel collapse,// which is internal flex redistribution. react-resizable-panels sizes every// panel as a percentage of the group, so without correction the pixel-sized- // doc panel and terminal column grow proportionally with the container (the- // terminal measured 480px → 673px on a left-sidebar collapse). One full-layout+ // doc panel and agents column grow proportionally with the container (the+ // column measured 480px → 673px on a left-sidebar collapse). One full-layout// write restores both pins with the container delta flowing to the editor;// sequential per-panel `resize` calls would fight each other — each one// re-balances against its flex neighbor, knocking the other off its pin.@@ -756,8 +732,8 @@ function EditorAreaInner({// react-resizable-panels caches layouts keyed by the panel-ID set and// restores the cached layout whenever the set changes — so mounting or- // unmounting the terminal column would resurrect whatever doc-panel state the- // OTHER panel set last saw (e.g. hiding the terminal re-opened a doc panel+ // unmounting the agents column would resurrect whatever doc-panel state the+ // OTHER panel set last saw (e.g. hiding the panel re-opened a doc panel// the user had closed while it was up). Re-assert the intended layout on// every panel-set change: the doc panel keeps its pre-change collapsed state,// both rail widths stay pinned, and the editor absorbs the difference. The@@ -765,15 +741,15 @@ function EditorAreaInner({// panel-set change triggers, so the correction is deferred one microtask to// land after it (still ahead of paint — `setLayout` notifies the panels'// external stores synchronously).- const prevTerminalColumnPresentRef = useRef(terminalColumnPresent);+ const prevAgentsColumnPresentRef = useRef(agentsColumnPresent);useLayoutEffect(() => {- if (prevTerminalColumnPresentRef.current === terminalColumnPresent) return;- prevTerminalColumnPresentRef.current = terminalColumnPresent;+ if (prevAgentsColumnPresentRef.current === agentsColumnPresent) return;+ prevAgentsColumnPresentRef.current = agentsColumnPresent;const docCollapsed = isCollapsed;queueMicrotask(() => {assertRightRailLayoutRef.current(docCollapsed);});- }, [terminalColumnPresent, isCollapsed]);+ }, [agentsColumnPresent, isCollapsed]);useLayoutEffect(() => {if (!isCollapsed) return;@@ -866,7 +842,7 @@ function EditorAreaInner({let viewContent: ReactNode;let rightPanel: ReactNode = null;- // The terminal column (when right-docked + visible) is rendered once at the+ // The agents column (when visible) is rendered once at the// panel-group level below, to the right of `rightPanel`, so the branches here// only resolve the view content and its own doc/agent panel.if (activeTarget?.kind === 'large-file') {@@ -887,6 +863,7 @@ function EditorAreaInner({// list is a discrete table, not a continuous document.const showFolderComposer = shouldShowFolderComposer({terminalVisible,+ agentsVisible,isEmbedded,});viewContent = (@@ -1080,14 +1057,11 @@ function EditorAreaInner({// carries an AI entry point, so the Skills composer would compete with it.viewContent = <SkillsBasePage sessionsDockOpen={terminalVisible} />;} else {- // The empty state collapses to the header-only view while a terminal is- // open in EITHER dock — the open terminal is its own AI entry point, so- // the composer bubble + starter packs would compete with it. The dock- // position picks the header pose (bottom-anchored above the bottom dock;- // centered beside the right column).- viewContent = (- <EmptyEditorState terminalDock={terminalVisible ? terminalDockPosition : null} />- );+ // The empty state collapses to the header-only view while EITHER session+ // panel is open — an open panel is its own AI entry point, so the composer+ // bubble + starter packs would compete with it. Which panel picks the+ // header pose (bottom-anchored above the dock; centered beside the column).+ viewContent = <EmptyEditorState terminalOpen={terminalVisible} agentsOpen={agentsVisible} />;}} else {const isSourceMode = editorMode === 'source';@@ -1101,7 +1075,7 @@ function EditorAreaInner({}// Visibility for the open doc's "Ask AI" composer — the pure gate in- // bottom-composer-gate.ts (hidden while the docked terminal is open, in+ // bottom-composer-gate.ts (hidden while either session panel is open, in// embedded webviews, and with no doc open). The folder overview mounts its// own instance under shouldShowFolderComposer. Positioning and the// --ask-composer-height scroll inset are documented at the render site@@ -1109,6 +1083,7 @@ function EditorAreaInner({const showBottomComposer =shouldShowBottomComposer({terminalVisible,+ agentsVisible,isEmbedded,activeDocName,}) &&@@ -1235,7 +1210,7 @@ function EditorAreaInner({isPanelCollapsed={isPanelCollapsed}onTogglePanel={togglePanel}// When the doc panel is collapsed, the action cluster reaches the- // far-right corner where the terminal reveal tab sits — shift it left+ // far-right corner where the agents reveal tab sits — shift it left// so the three stay in one row instead of overlapping.reserveRightGutter={rightRevealTabPresent && isPanelCollapsed}/>@@ -1264,15 +1239,14 @@ function EditorAreaInner({? { onReopen: () => setComposerDismissed(false) }: null}- reserveRightGutter={bottomRevealTabPresent}/></div>);viewContent = editorContent;- // While the terminal column is open and the doc panel is closed, the+ // While the agents column is open and the doc panel is closed, the// collapsed doc panel sits as a zero-width flex neighbor between the editor- // and the terminal. Its own handle is disabled whenever it is collapsed+ // and the agents column. Its own handle is disabled whenever it is collapsed// (see the ResizableHandle below), but drags on the TERMINAL's handle still// route through the collapsed panel: the library snap-expands it once the// drag crosses half its min size, instead of returning the space to the@@ -1280,9 +1254,9 @@ function EditorAreaInner({// skip it (deltas flow through to the editor) and `minSize 0` disarms the// snap-expand threshold. Imperative paths (`setLayout`, `expand`) still// move it, so the toolbar toggle keeps working. Scoped to- // terminal-column-present: without the terminal no drag can reach the+ // agents-column-present: without that column no drag can reach the// collapsed panel at all.- const docPanelNeutralized = terminalColumnPresent && isCollapsed;+ const docPanelNeutralized = agentsColumnPresent && isCollapsed;rightPanel = (<><ResizableHandle@@ -1290,9 +1264,9 @@ function EditorAreaInner({withHandle={!isCollapsed}// A collapsed panel is not drag-resizable: the toolbar toggle and// ⌥⌘B are its single open mechanism (mirrors TerminalDock's- // hidden-dock handle and the terminal column, which unmounts its+ // hidden-dock handle and the agents column, which unmounts its// handle entirely when hidden). Disabling while collapsed also- // keeps this handle from overlapping the right-docked terminal's+ // keeps this handle from overlapping the agents column's// handle at the same pixel seam, and from being a misclick target// under embedded AI-editor hosts whose own container chrome sits at// the iframe edge.@@ -1353,64 +1327,58 @@ function EditorAreaInner({// A single TerminalDock wraps the active view's left column. The skeleton// below is structurally identical for every view kind, so the dock keeps one// React position and its PTY survives tab switches and view-kind changes. It- // renders on EVERY host now (web too) — the sessions dock is host-agnostic — so- // a bottom-docked thread has a mount container. The live session host lives in- // EditorPane (above this component) so a dock toggle — which remounts- // EditorArea's subtree — can't re-spawn it. Here we render only the bottom layout- // shell, which reports its mount + editor region up (via onTerminalPlacement).+ // renders on every host; where no shell can spawn it simply stays collapsed.+ // The live session host lives in EditorPane (above this component) so a+ // view-kind change — which remounts EditorArea's subtree — can't re-spawn it.+ // Here we render only the bottom layout+ // shell, which reports its mount + editor region up (via onSessionPlacements).const leftColumn = (<TerminalDockvisible={terminalVisible}onVisibleChange={onTerminalVisibleChange ?? (() => {})}- dockPosition={terminalDockPosition}onBottomContainer={setBottomTerminalContainer}onEditorRegion={setTerminalEditorRegion}- onReveal={onRevealTerminal}- showRevealTab={bottomRevealTabPresent}>{viewContent}</TerminalDock>);// The terminal column sits to the RIGHT of the doc/agent panel- // (MD | PANE | TERMINAL) when right-docked and visible — the far-right column,- // its own independent resizable column rather than a tenant of the panel region.- // The mount div is a callback ref so the session host (owned in EditorPane)- // portals into it; it unmounts to null when the terminal hides or bottom-docks.- const terminalColumn = terminalColumnPresent ? (+ // (MD | PANE | AGENTS) — the far-right column, its own independent resizable+ // column rather than a tenant of the panel region. The mount div is a callback+ // ref so the session host (owned in EditorPane) portals into it; it unmounts to+ // null when the panel hides.+ const agentsColumn = agentsColumnPresent ? (<><ResizableHandlewithHandleonPointerDown={() => {- setIsDraggingTerminalHandle(true);- isDraggingTerminalHandleRef.current = true;+ setIsDraggingAgentsHandle(true);+ isDraggingAgentsHandleRef.current = true;const handleUp = () => {- setIsDraggingTerminalHandle(false);- isDraggingTerminalHandleRef.current = false;+ setIsDraggingAgentsHandle(false);+ isDraggingAgentsHandleRef.current = false;window.removeEventListener('pointerup', handleUp);// Drag-to-close: releasing with the column snapped shut hides the- // terminal (unmounting the column), mirroring the doc panel's+ // agents panel (unmounting the column), mirroring the doc panel's// drag-to-close affordance. Deferred to pointerup — hiding// mid-drag would unmount the separator under the active drag.- if (terminalColumnPanelRef.current?.isCollapsed()) {- onTerminalVisibleChange?.(false);+ if (agentsColumnPanelRef.current?.isCollapsed()) {+ onAgentsVisibleChange?.(false);}};window.addEventListener('pointerup', handleUp);}}/><ResizablePanel- id="terminal-column"- panelRef={terminalColumnPanelRef}- // Paint the column with the xterm canvas color so the tab strip reads as- // one surface with the terminal (mirrors TerminalDock's bottom panel).- style={{ backgroundColor: xtermBackground }}- defaultSize={`${initialTerminalWidthPx}px`}- minSize={`${MIN_TERMINAL_WIDTH}px`}- // The terminal can be dragged wide — up to 95% of the group — leaving the+ id="agents-column"+ panelRef={agentsColumnPanelRef}+ defaultSize={`${initialAgentsWidthPx}px`}+ minSize={`${MIN_AGENTS_PANEL_WIDTH}px`}+ // The panel can be dragged wide — up to 95% of the group — leaving the// editor a 5% sliver (its panel `minSize` while this column is mounted).- // Pair the two: the terminal's max plus the editor's min must sum to 100%- // or the drag can't reach it. Mirrors the bottom dock's 95%/5% split.+ // Pair the two: this max plus the editor's min must sum to 100% or the+ // drag can't reach it. Mirrors the bottom dock's 95%/5% split.maxSize="95%"// Collapsible so a drag past half the min width snaps the column shut —// the pointerup handler above turns that into a real hide.@@ -1419,37 +1387,34 @@ function EditorAreaInner({onResize={(size) => {// Persist only on a user drag — the sticky-width RO replays the// persisted value through onResize too and must not overwrite it.- if (size.inPixels > 0 && isDraggingTerminalHandleRef.current) {- terminalWidthPxRef.current = size.inPixels;- debouncedWriteTerminalWidth(size.inPixels);+ if (size.inPixels > 0 && isDraggingAgentsHandleRef.current) {+ agentsWidthPxRef.current = size.inPixels;+ debouncedWriteAgentsWidth(size.inPixels);}}}className={cn('flex flex-col',- !isDraggingTerminalHandle &&+ !isDraggingAgentsHandle &&'transition-[flex-grow] duration-200 ease-out motion-reduce:transition-none motion-reduce:duration-0',)}>- {/* Mount point for the session host's stable host div when right-docked. */}- <div- ref={setRightTerminalContainer}- className="flex min-h-0 flex-1 flex-col overflow-hidden"- />+ {/* Mount point for the agents host's stable host div. */}+ <div ref={setAgentsContainer} className="flex min-h-0 flex-1 flex-col overflow-hidden" /></ResizablePanel></>) : null;// The editor absorbs the residual width whenever something on the right claims- // space — the doc panel (when present and not collapsed) or the terminal column.+ // space — the doc panel (when present and not collapsed) or the agents column.const editorAbsorbsResidual =- (rightPanel != null && !initialRightCollapsed) || terminalColumnPresent;+ (rightPanel != null && !initialRightCollapsed) || agentsColumnPresent;- // The right-dock reveal tab pins to the far-right column edge here; the- // bottom-dock tab lives inside TerminalDock, pinned to the bottom of the editor- // column where that terminal docks. (Both gated by `revealTabHidden` above.)+ // The agents reveal tab pins to the far-right column edge here; the terminal's+ // tab lives inside TerminalDock, pinned to the bottom of the editor column.+ // (Each gated by its own predicate above; both can be up at once.)- // Order: EDITOR | doc/agent panel | terminal column. The terminal is the- // far-right column when right-docked, so it renders AFTER `rightPanel`.+ // Order: EDITOR | doc/agent panel | agents column. The agents panel is the+ // far-right column, so it renders AFTER `rightPanel`.return (<divclassName="relative flex min-h-0 flex-1"@@ -1461,7 +1426,7 @@ function EditorAreaInner({<ResizablePanelGrouporientation="horizontal"groupRef={groupRef}- data-dragging={isDraggingDocHandle || isDraggingTerminalHandle || undefined}+ data-dragging={isDraggingDocHandle || isDraggingAgentsHandle || undefined}><ResizablePanel// No explicit id: an id here changed how react-resizable-panels@@ -1476,31 +1441,27 @@ function EditorAreaInner({// 95%/5% split (see the terminal column's maxSize below; the pair must// sum to 100% or the drag can't reach the max). Without the terminal// the 30% floor keeps the editor usable against the doc panel.- minSize={terminalColumnPresent ? '5%' : '30%'}+ minSize={agentsColumnPresent ? '5%' : '30%'}// Editor takes full width only when nothing on the right claims space;// otherwise it absorbs the residual while the pixel-sized doc panel and// terminal column hold their widths.{...(editorAbsorbsResidual ? {} : { defaultSize: '100%' })}className={cn(- !(isDraggingDocHandle || isDraggingTerminalHandle) &&+ !(isDraggingDocHandle || isDraggingAgentsHandle) &&'transition-[flex-grow] duration-200 ease-out motion-reduce:transition-none motion-reduce:duration-0',)}>{leftColumn}</ResizablePanel>{rightPanel}- {terminalColumn}+ {agentsColumn}</ResizablePanelGroup>{rightRevealTabPresent ? (// Pinned to the far-right top, vertically in line with the toolbar's// action buttons. When the doc panel is collapsed those buttons reach this// same corner; the toolbar shifts its cluster left (reserveRightGutter) so// all three sit in one row rather than overlapping.- <TerminalRevealTab- dockPosition="right"- onReveal={onRevealTerminal}- className="top-2.5 right-0"- />+ <TerminalRevealTab edge="right" onReveal={onRevealAgents} className="top-2.5 right-0" />) : null}</div>);diff --git a/packages/app/src/components/EditorFooter.tsx b/packages/app/src/components/EditorFooter.tsxindex 3da349a77..14b7376a9 100644--- a/packages/app/src/components/EditorFooter.tsx+++ b/packages/app/src/components/EditorFooter.tsx@@ -7,7 +7,6 @@ import {useEditorFooterIdentity,} from '@/hooks/use-editor-footer-identity';import type { DocumentStats } from '@/lib/document-stats';-import { cn } from '@/lib/utils';interface EditorFooterProps {stats: DocumentStats;@@ -21,10 +20,6 @@ interface EditorFooterProps {/** When set, a "Ask AI" reopen badge renders next to the stats — shown only* while the bottom composer is dismissed. Clicking it reopens the composer. */composerBadge?: { onReopen: () => void } | null;- /** Reserve extra right padding so the right-aligned stats clear the- * bottom-dock "Open session dock" reveal tab, which floats over the footer's- * bottom-right corner when the terminal is hidden. */- reserveRightGutter?: boolean;}export function EditorFooter({@@ -32,7 +27,6 @@ export function EditorFooter({selectionStats,showStats = true,composerBadge,- reserveRightGutter = false,}: EditorFooterProps) {const { t } = useLingui();const identity = useEditorFooterIdentity();@@ -50,11 +44,7 @@ export function EditorFooter({? t`Selection statistics`: t`Document statistics`}- className={cn(- 'relative flex h-6 shrink-0 items-center justify-between gap-3 bg-background px-3 text-2xs text-muted-foreground',- // Clear the bottom-dock reveal tab that floats over the bottom-right.- reserveRightGutter && 'pr-12',- )}+ className="relative flex h-6 shrink-0 items-center justify-between gap-3 bg-background px-3 text-2xs text-muted-foreground"><divaria-hiddendiff --git a/packages/app/src/components/EditorPane.dom.test.tsx b/packages/app/src/components/EditorPane.dom.test.tsxindex e6ae4bd76..0a8dc26ab 100644--- a/packages/app/src/components/EditorPane.dom.test.tsx+++ b/packages/app/src/components/EditorPane.dom.test.tsx@@ -16,6 +16,7 @@ import {import { VIEW_IN_SOURCE_EVENT, type ViewInSourceDetail } from '@/editor/view-in-source-event';import { subscribeToPreferredSessionRequests } from './handoff/preferred-session-events';import { subscribeToActiveTerminalInput } from './handoff/terminal-input-events';+import { requestAgentThreadLaunch } from './handoff/thread-launch-events';// The doc the mocked DocumentContext reports (see the useDocumentContext mock).const TEST_DOC = 'docs/notes';@@ -159,11 +160,11 @@ vi.doMock('./EditorHeader', () => ({EditorHeader: () => <div data-testid="editor-header" />,}));-// EditorArea renders the bottom layout shell + reports the terminal placement up;-// the live session host now lives in EditorPane as a sibling of EditorArea (so a-// dock toggle can't remount it). EditorPane still owns the open/⌘J/menu/telemetry-// state. The EditorArea mock is a bare stand-in; the TerminalSessionsHost mock-// (below) surfaces the threaded `visible` + `launch` props so these tests keep+// EditorArea renders the layout shells + reports both panels' placements up; the+// live session hosts live in EditorPane as siblings of EditorArea (so a view-kind+// change can't remount them). EditorPane still owns the open/⌘J/⌘L/menu/telemetry+// state. The EditorArea mock is a bare stand-in; the SessionsHost mock (below)+// surfaces the threaded `surface` + `visible` + `launch` props so these tests keep// asserting EditorPane's wiring across the prop boundary.vi.doMock('./EditorArea', () => ({EditorArea: () => <div data-testid="editor-area" />,@@ -173,27 +174,37 @@ vi.doMock('./EditorArea', () => ({vi.doMock('./acp/AgentThreadClientBinder', () => ({AgentThreadClientBinder: () => null,}));-// The sessions host now mounts UNCONDITIONALLY (web too) — a shell and an agent-// are just tabs of a different kind. It receives `bridge` (null on web) so these-// tests assert EditorPane's wiring across the prop boundary, including which host-// gets a live bridge.-vi.doMock('./TerminalSessionsHost', () => ({- TerminalSessionsHost: ({+// EditorPane mounts the host twice — the agents panel unconditionally (agent+// threads are server-hosted, so it works on web) and the terminal dock only where+// a shell can spawn. One mock serves both; the testid is keyed by `surface` so a+// test can assert on the panel it means. `data-terminal-capable` pins the GLOBAL+// capability fact both hosts need for the Ask-AI arbitration.+vi.doMock('./SessionsHost', () => ({+ SessionsHost: ({+ surface,bridge,+ terminalCapable,visible,launch,+ threadLaunch,}: {+ surface: string;bridge?: unknown;+ terminalCapable?: boolean;visible?: boolean;launch?: { nonce: number; stagePaste?: string } | null;+ threadLaunch?: { nonce: number; agentId?: string; prompt?: string | null } | null;}) => {return (<div- data-testid="terminal-dock"+ data-testid={surface === 'agents-panel' ? 'agents-panel' : 'terminal-dock'}data-has-bridge={String(bridge != null)}+ data-terminal-capable={String(terminalCapable === true)}data-visible={String(visible)}data-launch-nonce={launch ? String(launch.nonce) : 'none'}data-launch-stage={launch?.stagePaste ?? 'none'}+ data-thread-launch-nonce={threadLaunch ? String(threadLaunch.nonce) : 'none'}+ data-thread-launch-agent={threadLaunch?.agentId ?? 'none'}/>);},@@ -405,17 +416,25 @@ describe('EditorPane auto-sync onboarding gate', () => {// Minimal faithful stand-in for the desktop bridge surfaces EditorPane's// terminal wiring touches: `onMenuAction` (subscribe), the View-menu-state push,-// `terminal.getDockState` (read once on mount to restore dock visibility after a-// reload), and `terminal.cliInstalledMap` (read once on mount for the New-chat-// default CLI). The real `window.okDesktop` always exposes these, so an empty-// `{}` stub would no longer model the boundary now that EditorPane calls them on-// mount. getDockState resolves `visible: false` so the restore is a no-op —-// these tests exercise the start-hidden toggle/launch behavior.+// `terminal.getDockState` (read once on mount to restore BOTH panels' visibility+// after a reload), and `terminal.cliInstalledMap` (read once on mount for the+// New-chat default CLI). The real `window.okDesktop` always exposes these, so an+// empty `{}` stub would no longer model the boundary now that EditorPane calls+// them on mount. getDockState resolves both panels hidden so the restore is a+// no-op — these tests exercise the start-hidden toggle/launch behavior.+type DockStateResult = { terminalVisible: boolean; agentPanelVisible: boolean };function makeOkDesktopStub(- getDockState: () => Promise<{ visible: boolean }> = async () => ({ visible: false }),+ getDockState: () => Promise<DockStateResult> = async () => ({+ terminalVisible: false,+ agentPanelVisible: false,+ }),) {const menuHandlers: Array<(action: string) => void> = [];- const viewMenuPushes: Array<{ terminalVisible?: boolean; canViewInSource?: boolean }> = [];+ const viewMenuPushes: Array<{+ terminalVisible?: boolean;+ agentPanelVisible?: boolean;+ canViewInSource?: boolean;+ }> = [];return {viewMenuPushes,dispatchMenuAction(action: string) {@@ -436,6 +455,7 @@ function makeOkDesktopStub(editor: {notifyViewMenuStateChanged(state: {terminalVisible?: boolean;+ agentPanelVisible?: boolean;canViewInSource?: boolean;}) {viewMenuPushes.push(state);@@ -454,7 +474,7 @@ function makeOkDesktopStub(};}-describe('EditorPane terminal dock wiring', () => {+describe('EditorPane session-panel wiring', () => {afterEach(() => {cleanup();delete (window as { okDesktop?: unknown }).okDesktop;@@ -464,41 +484,85 @@ describe('EditorPane terminal dock wiring', () => {clearPendingSourceNavigationsForTest();});- test('web host mounts the sessions host (host-agnostic) with no desktop bridge', async () => {+ test('web host mounts the agents panel only — no shell can spawn, so no terminal dock', async () => {await renderEditorPane();- // The unified sessions dock is host-agnostic now — it mounts on web too (thread- // tabs only), just without a desktop bridge (terminal-kind affordances gate on- // the bridge inside the host).- const dock = screen.getByTestId('terminal-dock');- expect(dock).toBeTruthy();- expect(dock.getAttribute('data-has-bridge')).toBe('false');+ // Agent threads are server-hosted, so the agents panel is universal. The+ // terminal dock is NOT mounted where no PTY can spawn: an empty dock there+ // would be a control that can never do anything.+ const agents = screen.getByTestId('agents-panel');+ expect(agents.getAttribute('data-has-bridge')).toBe('false');+ expect(agents.getAttribute('data-terminal-capable')).toBe('false');+ expect(screen.queryByTestId('terminal-dock')).toBeNull();expect(screen.getByTestId('editor-header')).toBeTruthy();expect(screen.getByTestId('editor-area')).toBeTruthy();});- test('desktop host mounts the sessions host with a live bridge under the editor area', async () => {+ test('desktop host mounts BOTH panels as siblings of the editor area', async () => {(window as { okDesktop?: unknown }).okDesktop = makeOkDesktopStub().stub;await renderEditorPane();- // The header and the live session host are both siblings of the editor area- // (the host lives in EditorPane so a dock toggle can't remount it). On desktop- // the host gets a live bridge.+ // Both hosts live in EditorPane (above EditorArea) so a view-kind change+ // can't remount them, and both get the live bridge + the same global+ // terminal-capability fact the Ask-AI arbitration resolves against.expect(screen.getByTestId('editor-header')).toBeTruthy();expect(screen.getByTestId('editor-area')).toBeTruthy();- const dock = screen.getByTestId('terminal-dock');- expect(dock).not.toBeNull();- expect(dock.getAttribute('data-has-bridge')).toBe('true');+ for (const testid of ['terminal-dock', 'agents-panel']) {+ const panel = screen.getByTestId(testid);+ expect(panel.getAttribute('data-has-bridge')).toBe('true');+ expect(panel.getAttribute('data-terminal-capable')).toBe('true');+ }});- test('desktop: toggle-terminal menu action flips dock visibility and pushes the view-menu state', async () => {+ test('desktop: the two panels open and close independently', async () => {+ const desk = makeOkDesktopStub();+ (window as { okDesktop?: unknown }).okDesktop = desk.stub;+ await renderEditorPane();++ const terminal = () => screen.getByTestId('terminal-dock').getAttribute('data-visible');+ const agents = () => screen.getByTestId('agents-panel').getAttribute('data-visible');+ expect(terminal()).toBe('false');+ expect(agents()).toBe('false');++ // ⌘L opens the agents panel and leaves the terminal alone.+ act(() => desk.dispatchMenuAction('toggle-agent-panel'));+ expect(agents()).toBe('true');+ expect(terminal()).toBe('false');++ // ⌘J then opens the terminal — both are up at once, the whole point of the+ // split. Toggling one must never close the other.+ act(() => desk.dispatchMenuAction('toggle-terminal'));+ expect(agents()).toBe('true');+ expect(terminal()).toBe('true');++ act(() => desk.dispatchMenuAction('toggle-agent-panel'));+ expect(agents()).toBe('false');+ expect(terminal()).toBe('true');+ });++ test('desktop: each panel pushes its own view-menu field, never the other', async () => {+ const desk = makeOkDesktopStub();+ (window as { okDesktop?: unknown }).okDesktop = desk.stub;+ await renderEditorPane();++ act(() => desk.dispatchMenuAction('toggle-agent-panel'));++ // The agents push carries agentPanelVisible ONLY — main merges partials, so a+ // push that also carried terminalVisible would clobber the terminal's+ // retained per-window state on every ⌘L.+ const agentsPush = desk.viewMenuPushes.at(-1);+ expect(agentsPush).toEqual({ agentPanelVisible: true });+ });++ test('desktop: toggle-terminal flips terminal visibility and pushes the view-menu state', async () => {const desk = makeOkDesktopStub();(window as { okDesktop?: unknown }).okDesktop = desk.stub;await renderEditorPane();expect(screen.getByTestId('terminal-dock').getAttribute('data-visible')).toBe('false');// Mount pushes terminalVisible:false so the View menu reads "Show Terminal".- expect(desk.viewMenuPushes.at(-1)).toEqual({ terminalVisible: false });+ // Both panels push on mount, so name the field rather than taking the last.+ expect(desk.viewMenuPushes).toContainEqual({ terminalVisible: false });act(() => desk.dispatchMenuAction('toggle-terminal'));expect(screen.getByTestId('terminal-dock').getAttribute('data-visible')).toBe('true');@@ -676,12 +740,18 @@ describe('EditorPane terminal dock wiring', () => {config: { ptyAvailable: true },onMenuAction: () => () => {},editor: {- notifyViewMenuStateChanged(state: { terminalVisible?: boolean }) {+ notifyViewMenuStateChanged(state: {+ terminalVisible?: boolean;+ agentPanelVisible?: boolean;+ }) {if (state.terminalVisible !== undefined) retainedDockVisible = state.terminalVisible;},},terminal: {- getDockState: async () => ({ visible: retainedDockVisible }),+ getDockState: async () => ({+ terminalVisible: retainedDockVisible,+ agentPanelVisible: false,+ }),},};@@ -693,6 +763,70 @@ describe('EditorPane terminal dock wiring', () => {expect(terminalOpenedCalls).toHaveLength(0);});+ // The agents half of "each panel keeps its own reload state". The terminal+ // half is covered above; without this the `if (state.agentPanelVisible)`+ // restore branch is never exercised, so deleting it — or letting the field+ // name drift across the IPC seam — would leave the panel collapsed after every+ // reload with nothing catching it.+ test('desktop: a reload re-expands an agents panel that was open before it', async () => {+ (window as { okDesktop?: unknown }).okDesktop = {+ config: { ptyAvailable: true },+ onMenuAction: () => () => {},+ editor: { notifyViewMenuStateChanged() {} },+ terminal: {+ getDockState: async () => ({ terminalVisible: false, agentPanelVisible: true }),+ },+ };++ await renderEditorPane();++ expect(screen.getByTestId('agents-panel').getAttribute('data-visible')).toBe('true');+ // Independent: restoring one panel must not drag the other open with it.+ expect(screen.getByTestId('terminal-dock').getAttribute('data-visible')).toBe('false');+ });++ test('desktop: a reload with BOTH panels retained restores both', async () => {+ (window as { okDesktop?: unknown }).okDesktop = {+ config: { ptyAvailable: true },+ onMenuAction: () => () => {},+ editor: { notifyViewMenuStateChanged() {} },+ terminal: {+ getDockState: async () => ({ terminalVisible: true, agentPanelVisible: true }),+ },+ };++ await renderEditorPane();++ expect(screen.getByTestId('agents-panel').getAttribute('data-visible')).toBe('true');+ expect(screen.getByTestId('terminal-dock').getAttribute('data-visible')).toBe('true');+ });++ // The agents panel's launch intent had no coverage: the host mock captured+ // `launch` but dropped `threadLaunch`, so nothing proved EditorPane forwards it+ // (or that it reveals the panel first — a thread launched into a hidden panel+ // is invisible work).+ test('an agent-thread launch request reveals the agents panel and forwards the intent', async () => {+ await renderEditorPane();+ expect(screen.getByTestId('agents-panel').getAttribute('data-visible')).toBe('false');++ await act(async () => {+ requestAgentThreadLaunch({+ agentSource: 'registry',+ agentId: 'acme-agent',+ prompt: 'summarize this doc',+ docName: TEST_DOC,+ titleHint: null,+ });+ });++ const agents = screen.getByTestId('agents-panel');+ expect(agents.getAttribute('data-visible')).toBe('true');+ expect(agents.getAttribute('data-thread-launch-agent')).toBe('acme-agent');+ // A fresh one-shot: the nonce is what makes a repeat request a NEW launch+ // rather than a no-op re-render of the same intent.+ expect(agents.getAttribute('data-thread-launch-nonce')).not.toBe('none');+ });+test('desktop: a rejecting getDockState still settles the gate so the view-menu push converges', async () => {// getDockState rejects (IPC torn down mid-reload). The restore's `.finally`// must still settle dockRestoreSettled so the deferred mount push lands —@@ -705,12 +839,16 @@ describe('EditorPane terminal dock wiring', () => {(window as { okDesktop?: unknown }).okDesktop = desk.stub;await renderEditorPane();- expect(desk.viewMenuPushes.at(-1)).toEqual({ terminalVisible: false });+ expect(desk.viewMenuPushes).toContainEqual({ terminalVisible: false });// With no restored state the dock stays hidden (the breadcrumb is logged).expect(screen.getByTestId('terminal-dock').getAttribute('data-visible')).toBe('false');});- test('web host: a Cmd/Ctrl+J keydown is intercepted (the toggle handler is wired)', async () => {+ // With no selection AND no shell to spawn, ⌘J has nothing to do on the web+ // host, so it must leave the browser's own ⌘J alone. It used to preventDefault+ // and then hit a guard that can never be false — swallowing the chord for a+ // no-op. The selection-send path below is the half that DOES act here.+ test('web host: a Cmd/Ctrl+J keydown with no selection is NOT swallowed', async () => {await renderEditorPane();const init: KeyboardEventInit = { key: 'j', cancelable: true, bubbles: true };@@ -719,6 +857,22 @@ describe('EditorPane terminal dock wiring', () => {const event = new KeyboardEvent('keydown', init);window.dispatchEvent(event);+ expect(event.defaultPrevented).toBe(false);+ });++ // ⌘L's twin. On desktop the native menu accelerator covers this, but the web+ // host has only the renderer listener and no fallback — if it were ever moved+ // inside the `window.okDesktop != null` early-return, or bound to the wrong+ // phase, ⌘L would silently do nothing there.+ test('web host: a Cmd/Ctrl+L keydown is intercepted (the agents toggle is wired)', async () => {+ await renderEditorPane();++ const init: KeyboardEventInit = { key: 'l', cancelable: true, bubbles: true };+ if (isMacOS()) init.metaKey = true;+ else init.ctrlKey = true;+ const event = new KeyboardEvent('keydown', init);+ window.dispatchEvent(event);+expect(event.defaultPrevented).toBe(true);});@@ -749,13 +903,15 @@ describe('EditorPane terminal dock wiring', () => {input.stop();preferred.stop();- // The dock reveals and the host is asked to open the user's preferred AI.- // EditorPane deliberately names no CLI: resolving here could only ever yield- // a CLI, which is what made ⇧⌘J ignore a preferred ACP agent.- const dock = screen.getByTestId('terminal-dock');- expect(dock.getAttribute('data-visible')).toBe('true');+ // The hosts are asked to open the user's preferred AI. EditorPane names no+ // CLI and reveals NO panel: resolving here could only ever yield a CLI (what+ // made ⇧⌘J ignore a preferred ACP agent), and with two panels this pane+ // cannot know which one should end up on screen — the host that owns the+ // resolved kind reveals itself.expect(preferred.count).toBe(1);- expect(dock.getAttribute('data-launch-nonce')).toBe('none');+ expect(screen.getByTestId('terminal-dock').getAttribute('data-visible')).toBe('false');+ expect(screen.getByTestId('agents-panel').getAttribute('data-visible')).toBe('false');+ expect(screen.getByTestId('terminal-dock').getAttribute('data-launch-nonce')).toBe('none');expect(input.texts).toEqual([]);});@@ -772,11 +928,10 @@ describe('EditorPane terminal dock wiring', () => {input.stop();preferred.stop();- // The passage rides the Ask-AI channel with `newTab` set, so the host opens a- // fresh session in whichever family the user prefers instead of reusing one.- // Nothing is auto-run and no CLI is named here.+ // The passage rides the Ask-AI channel with `newTab` set, so the host that+ // owns the preferred family opens a fresh session instead of reusing one, and+ // reveals its own panel. Nothing is auto-run and no CLI is named here.const dock = screen.getByTestId('terminal-dock');- expect(dock.getAttribute('data-visible')).toBe('true');expect(input.details).toHaveLength(1);expect(input.details[0]?.newTab).toBe(true);expect(input.details[0]?.text).toContain('some highlighted text');@@ -801,14 +956,20 @@ describe('EditorPane terminal dock wiring', () => {expect(event.defaultPrevented).toBe(true);});- test('web host: ⇧⌘J is a no-op (no terminal to open)', async () => {+ test('web host: ⇧⌘J still asks for a preferred-AI session (the agents panel can answer)', async () => {await renderEditorPane();+ const preferred = capturePreferredSessionRequests();const event = new KeyboardEvent('keydown', shiftJKeydownInit());- window.dispatchEvent(event);- expect(event.defaultPrevented).toBe(false);- // The sessions dock still mounts host-agnostic (thread tabs), but ⇧⌘J is a- // terminal-launch accelerator: with no desktop bridge it stages nothing.- expect(screen.getByTestId('terminal-dock').getAttribute('data-launch-nonce')).toBe('none');+ act(() => {+ window.dispatchEvent(event);+ });+ preferred.stop();++ // ⇧⌘J used to be gated on a terminal being available, which made it dead on+ // web. Agent threads are server-hosted, so the agents panel can always answer+ // — the chord is universal now and claims the keystroke.+ expect(event.defaultPrevented).toBe(true);+ expect(preferred.count).toBe(1);});test('desktop: ⌘J with a selection sends the passage to the host for reuse (no toggle, no launch)', async () => {@@ -823,10 +984,11 @@ describe('EditorPane terminal dock wiring', () => {input.stop();// ⌘J means "continue where I am when that makes sense", so `newTab` is unset- // and the host decides: a running CLI or an open agent thread takes the- // passage, otherwise it launches the preferred AI. EditorPane reveals the dock- // and stages nothing itself — whether the active tab is a CLI, a bare shell, or- // an agent thread is knowledge only the host has.+ // and the hosts decide: a running CLI or an open agent thread takes the+ // passage, otherwise the owner of the preferred family launches one and+ // reveals itself. EditorPane stages nothing and reveals nothing — whether the+ // active tab is a CLI, a bare shell, or an agent thread is knowledge only a+ // host has.const dock = screen.getByTestId('terminal-dock');expect(input.details).toHaveLength(1);expect(input.details[0]?.newTab).toBe(false);@@ -835,7 +997,8 @@ describe('EditorPane terminal dock wiring', () => {// Trailing soft newlines land the caret on a blank line below the passage.expect(input.details[0]?.text.endsWith('\n\n')).toBe(true);expect(dock.getAttribute('data-launch-nonce')).toBe('none');- expect(dock.getAttribute('data-visible')).toBe('true');+ // The selection send replaces the toggle, so ⌘J did NOT open the terminal.+ expect(dock.getAttribute('data-visible')).toBe('false');});test('desktop: ⌘J with no selection still toggles and stages nothing', async () => {diff --git a/packages/app/src/components/EditorPane.tsx b/packages/app/src/components/EditorPane.tsxindex 1103278fd..a2c2cf8a5 100644--- a/packages/app/src/components/EditorPane.tsx+++ b/packages/app/src/components/EditorPane.tsx@@ -27,18 +27,13 @@ import { useConfigContext } from '@/lib/config-provider';import { matchesKeyboardShortcut } from '@/lib/keyboard-shortcuts';import { subscribeLocalMenuAction } from '@/lib/local-menu-action-bus';import { isOverlayLayerOpen } from '@/lib/overlay-layers';-import {- getInitialTerminalDock,- type TerminalDockPosition,- writeTerminalDock,-} from '@/lib/terminal-dock-store';import { recordTerminalOpened } from '@/lib/terminal-telemetry';import { setViewMenuState } from '@/lib/view-menu-state-store';import { AuthModal } from './AuthModal';import { AutoSyncOnboardingDialog } from './AutoSyncOnboardingDialog';import { resolveAutoSyncOnboarding } from './auto-sync-onboarding-gate';import { type PanelTab, TABS } from './DocPanel';-import { EditorArea, type TerminalPlacement } from './EditorArea';+import { EditorArea, type SessionPlacements } from './EditorArea';import { EditorHeader } from './EditorHeader';import { composeTerminalSelectionPaste } from './handoff/compose-terminal-selection';import { requestPreferredSession } from './handoff/preferred-session-events';@@ -60,8 +55,8 @@ const AgentThreadClientBinder = lazy(() =>default: mod.AgentThreadClientBinder,})),);-const TerminalSessionsHost = lazy(() =>- import('./TerminalSessionsHost').then((mod) => ({ default: mod.TerminalSessionsHost })),+const SessionsHost = lazy(() =>+ import('./SessionsHost').then((mod) => ({ default: mod.SessionsHost })),);/**@@ -152,14 +147,14 @@ export function EditorPane({ onOpenSearch }: EditorPaneProps = {}) {desktopBridge.terminal != null &&desktopBridge.config.ptyAvailable === true;const [terminalVisible, setTerminalVisible] = useState(false);+ // The agents panel is independent of the terminal — different edge, different+ // kind, its own toggle (⌘L). Universal: agent threads are server-hosted, so it+ // works on the web host and where pty does not.+ const [agentsVisible, setAgentsVisible] = useState(false);// Which launchable CLIs are on PATH (desktop probe, cached ~60s in main).// Handed to the sessions host, which folds it into its launcher resolution.// Shared with the Ask-X bubble.const installedClis = useInstalledClis();- // Whether the dock currently holds any session (reported up by the host).- // Keeps the edge reveal tab available on a host with no terminal once threads- // are open, so a hidden dock is still reachable there.- const [hasSessions, setHasSessions] = useState(false);// Gates the View-menu visibility push (below) until the mount-time dock-state// restore has read main's retained per-window visibility. Without the gate the// reconnecting renderer's initial `false` push overwrites that retained value@@ -180,31 +175,14 @@ export function EditorPane({ onOpenSearch }: EditorPaneProps = {}) {// twin of `terminalLaunch`. Both buses target the one host now.const [threadLaunch, setThreadLaunch] = useState<ThreadLaunchIntent | null>(null);const threadLaunchNonceRef = useRef(0);- // Where the terminal docks (right default | bottom), persisted per machine.- // Moving the terminal is also a request to see it, so the setter reveals the- // dock — re-docking a hidden terminal that stays hidden would feel inert.- const [terminalDock, setTerminalDockState] =- useState<TerminalDockPosition>(getInitialTerminalDock);- function setTerminalDock(next: TerminalDockPosition) {- setTerminalDockState(next);- writeTerminalDock(next);- setTerminalVisible(true);- }- // The tab strip's dock-toggle button flips between the bottom dock and the right- // column. Reading `terminalDock` from the render closure is correct for the click- // path: React commits each click in its own render, so the closure is always the- // freshly-committed position — a double-click flips back and forth as expected.- function toggleTerminalDock() {- setTerminalDock(terminalDock === 'right' ? 'bottom' : 'right');- }- // The live terminal session host is mounted HERE (below), above EditorArea, so a- // dock toggle — which remounts EditorArea's subtree — can't re-spawn the terminal- // (the VS Code / Zed pattern: own the terminal above the movable layout, re-attach- // the view). EditorArea reports where to attach via onTerminalPlacement.- const [terminalPlacement, setTerminalPlacement] = useState<TerminalPlacement>({- container: null,- isShowing: false,- dockPosition: 'bottom',+ // The live session hosts are mounted HERE (below), above EditorArea, so a+ // view-kind change — which remounts EditorArea's subtree — can't re-spawn a+ // terminal (the VS Code / Zed pattern: own the terminal above the layout that+ // changes, re-attach the view). EditorArea reports where each panel attaches+ // via onSessionPlacements.+ const [placements, setPlacements] = useState<SessionPlacements>({+ terminal: { container: null, isShowing: false },+ agents: { container: null, isShowing: false },editorRegion: null,});// Monotonic source for the launch nonce. It must survive the hide-clear of@@ -213,27 +191,25 @@ export function EditorPane({ onOpenSearch }: EditorPaneProps = {}) {// the dock would then dedup away as a repeat.const launchNonceRef = useRef(0);- // "New chat" with the preferred AI: reveal the dock and let the host resolve- // and open it. The host's `launchSelectedNewTab` spans all three families- // (in-app agent / CLI / bare shell) and honors the Configure-agents toggles;- // resolving a CLI here instead could only ever produce a CLI, never the in-app- // agent a user may prefer.+ // "New chat" with the preferred AI: let the hosts resolve, open, and reveal.+ // Their resolution spans all three families (in-app agent / CLI / bare shell)+ // and honors the Configure-agents toggles; resolving a CLI here instead could+ // only ever produce a CLI, never the in-app agent a user may prefer — and this+ // pane cannot know which panel should end up on screen.function launchNewChat() {- setTerminalVisible(true);requestPreferredSession();}- // Reveal the sessions dock; the host seeds it when it opens empty. Drives the- // edge "Show sessions" reveal tab and the View → Show Terminal item; leaves the- // right doc-panel untouched (the two coexist).+ // Reveal the agents panel; the host seeds it when it opens empty. Drives the+ // right edge reveal tab and ⌘L; leaves the other panels untouched (all coexist).//// Seeding is deliberately NOT done here. The host's `seedOnReveal` resolves the// whole preferred-AI space (in-app agent / CLI / bare shell, enablement-aware);// this pane can only see the CLI slice. Launching from here would set a launch// intent that PREEMPTS that seed, forcing a CLI on a user whose preferred AI is// an in-app agent.- function revealTerminal() {- setTerminalVisible(true);+ function revealAgents() {+ setAgentsVisible(true);}const syncStatus = useGitSyncStatus();@@ -278,23 +254,26 @@ export function EditorPane({ onOpenSearch }: EditorPaneProps = {}) {// instance needed, so it works even from the OS-captured ⌘J menu accelerator)// and composes the same grounded prompt the Ask-AI selection button sends.//- // Where it lands is the HOST's call, not this pane's: it owns both the live- // session state and the preferred-AI resolution, so ⌘J reuses a running CLI or- // an open agent thread, and otherwise launches whichever AI the user prefers.- // Resolving here instead would limit ⌘J to the CLI slice this pane can see,- // ignoring a preferred in-app agent.+ // Which panel it lands in is the HOSTS' call, not this pane's: they own the+ // live session state and both resolve the same preferred AI, so the passage+ // reuses a running CLI in the bottom dock or an open thread in the agents+ // panel, and the winner reveals itself. Resolving here instead would limit ⌘J+ // to the CLI slice this pane can see, ignoring a preferred in-app agent — and+ // this pane cannot know which panel is the right one anyway.+ //+ // Deliberately NOT gated on a terminal being available: the agents panel is+ // universal, so a selection send works on the web host too.//// Returns true when a selection was staged (caller skips the toggle / new-tab- // fallback). No-ops on the web host (no terminal).+ // fallback).function sendSelectionToTerminal(newTab: boolean): boolean {- if (!terminalAvailable || activeDocName == null) return false;+ if (activeDocName == null) return false;const snapshot = getSelectionContext(activeDocName, editorMode);const selectionMarkdown = snapshot?.markdown ?? '';if (selectionMarkdown.trim() === '') return false;// Trailing soft newlines (\n, not \r — no submit) drop the CLI input caret// onto a blank line below the staged passage.const staged = `${composeTerminalSelectionPaste(activeDocName, selectionMarkdown)}\n\n`;- setTerminalVisible(true);// Raw selected material, not an instruction — written and left for the user// to extend and send, on a CLI and on an agent thread alike.requestActiveTerminalInput(staged, { newTab, submit: false });@@ -320,6 +299,8 @@ export function EditorPane({ onOpenSearch }: EditorPaneProps = {}) {// the toggle). The dock adds the new tab itself off the same action; this// only owns visibility and covers the case where no dock is mounted yet.setTerminalVisible(true);+ } else if (action === 'toggle-agent-panel') {+ setAgentsVisible((visible) => !visible);}});}, []);@@ -329,24 +310,48 @@ export function EditorPane({ onOpenSearch }: EditorPaneProps = {}) {function handleKeyDown(event: KeyboardEvent) {if (!matchesKeyboardShortcut(event, 'toggle-terminal-panel')) return;if (isOverlayLayerOpen()) return;+ // Claim the chord only when we will actually act on it. A selection send is+ // the whole of ⌘J on a shell-less host; with no selection AND no shell there+ // is nothing to toggle, so let the browser keep its own ⌘J rather than+ // swallowing it for a no-op.+ if (sendSelectionToTerminalEvent(false)) {+ event.preventDefault();+ return;+ }+ if (!terminalAvailable) return;event.preventDefault();- if (sendSelectionToTerminalEvent(false)) return;setTerminalVisible((visible) => !visible);}// Capture phase so a focused xterm textarea can't swallow ⌘J first.window.addEventListener('keydown', handleKeyDown, { capture: true });return () => window.removeEventListener('keydown', handleKeyDown, { capture: true });+ }, [terminalAvailable]);++ // ⌘L / Ctrl+L toggles the agents panel. Same dual wiring as ⌘J — on desktop the+ // View menu item's accelerator is OS-captured and dispatches `toggle-agent-panel`+ // (handled above), so this window keydown is the web host's stand-in. Unlike ⌘J+ // it has no selection-send behavior: a selection goes to whichever panel the+ // user's preferred AI lives in, which the hosts arbitrate off ⌘J.+ useEffect(() => {+ if (window.okDesktop != null) return;+ function handleKeyDown(event: KeyboardEvent) {+ if (!matchesKeyboardShortcut(event, 'toggle-agent-panel')) return;+ if (isOverlayLayerOpen()) return;+ event.preventDefault();+ setAgentsVisible((visible) => !visible);+ }+ window.addEventListener('keydown', handleKeyDown, { capture: true });+ return () => window.removeEventListener('keydown', handleKeyDown, { capture: true });}, []);// ⇧⌘J / Ctrl+Shift+J: open a fresh session with the preferred AI. With a// selection, that selection is staged into the new session (always fresh, never- // reusing the active tab); otherwise the host opens a promptless one. Both paths+ // reusing the active tab); otherwise the hosts open a promptless one. Both paths// resolve to whichever AI the user prefers (in-app agent / CLI / bare shell),- // not a hardcoded CLI. Renderer-owned on both hosts (no menu item claims ⇧⌘J),- // capture-phase so a focused xterm can't swallow it. No-ops on the web host (no- // terminal surface).+ // not a hardcoded CLI, and the panel that owns the resolved kind reveals itself.+ // Renderer-owned on both hosts (no menu item claims ⇧⌘J), capture-phase so a+ // focused xterm can't swallow it. Universal — the agents panel can always answer.useEffect(() => {- if (!terminalAvailable) return;function handleKeyDown(event: KeyboardEvent) {if (!matchesKeyboardShortcut(event, 'new-terminal-tab')) return;if (isOverlayLayerOpen()) return;@@ -355,7 +360,7 @@ export function EditorPane({ onOpenSearch }: EditorPaneProps = {}) {}window.addEventListener('keydown', handleKeyDown, { capture: true });return () => window.removeEventListener('keydown', handleKeyDown, { capture: true });- }, [terminalAvailable]);+ }, []);// CLI launch — "Open in terminal" from a handoff menu, or the sessions host// resolving an Ask AI / selection send to a CLI. Open the dock (the terminal is@@ -383,13 +388,13 @@ export function EditorPane({ onOpenSearch }: EditorPaneProps = {}) {}, []);// "Start an agent" launch — a handoff-menu click fires a window event naming a- // catalog agent + the composed prompt. Reveal the dock AND carry the intent to- // the host as a fresh one-shot (the host resolves the agent / opens the catalog- // and creates the thread). Universal — agent threads are server-hosted, so- // unlike the terminal bus this one has no desktop gate.+ // catalog agent + the composed prompt. Reveal the AGENTS panel AND carry the+ // intent to its host as a fresh one-shot (the host resolves the agent / opens+ // the catalog and creates the thread). Universal — agent threads are+ // server-hosted, so unlike the terminal bus this one has no desktop gate.useEffect(() => {return subscribeToAgentThreadLaunchRequests((detail: AgentThreadLaunchDetail) => {- setTerminalVisible(true);+ setAgentsVisible(true);threadLaunchNonceRef.current += 1;setThreadLaunch({agentSource: detail.agentSource,@@ -433,14 +438,24 @@ export function EditorPane({ onOpenSearch }: EditorPaneProps = {}) {window.okDesktop.editor.notifyViewMenuStateChanged({ terminalVisible });}, [terminalVisible, dockRestoreSettled]);- // Restore the dock's expanded state after a renderer reload: main retains the- // per-window visibility (written by the gated push above once this settles),- // so a reloaded window re-expands the dock when it was open before the reload.- // Reads false after a fresh launch (main has no retained state), so the dock- // stays hidden. Run-once; only ever expands (never force-hides), so a user+ // The agents panel's twin of the push above, behind the same restore gate for+ // the same reason: its retained per-window visibility is what a reloaded window+ // re-expands from, and a mount-initial `false` would overwrite it first.+ useEffect(() => {+ if (window.okDesktop == null) return;+ if (!dockRestoreSettled) return;+ setViewMenuState({ agentPanelVisible: agentsVisible });+ window.okDesktop.editor.notifyViewMenuStateChanged({ agentPanelVisible: agentsVisible });+ }, [agentsVisible, dockRestoreSettled]);++ // Restore both panels' expanded state after a renderer reload: main retains the+ // per-window visibility of each (written by the gated pushes above once this+ // settles), so a reloaded window re-expands whichever were open before the+ // reload. Reads false after a fresh launch (main has no retained state), so+ // both stay hidden. Run-once; only ever expands (never force-hides), so a user// toggle that races the restore is never overridden closed. Settling the gate- // (always, even on a read failure) releases the deferred push so the View menu- // converges. Desktop-only.+ // (always, even on a read failure) releases the deferred pushes so the View+ // menu converges. Desktop-only.useEffect(() => {const bridge = window.okDesktop;if (bridge == null) return;@@ -458,7 +473,9 @@ export function EditorPane({ onOpenSearch }: EditorPaneProps = {}) {void bridge.terminal.getDockState().then((state) => {- if (cancelled || !state.visible) return;+ if (cancelled) return;+ if (state.agentPanelVisible) setAgentsVisible(true);+ if (!state.terminalVisible) return;// The restore — not the user — is driving this reveal; mark it so the// adoption telemetry below skips it.restoreRevealRef.current = true;@@ -467,7 +484,7 @@ export function EditorPane({ onOpenSearch }: EditorPaneProps = {}) {.catch((err) => {// Leave a breadcrumb instead of swallowing: a restore failure is// otherwise indistinguishable from "main had no retained state", and the- // dock silently stays hidden. Mirrors the list() catch in TerminalDock.+ // panels silently stay hidden. Mirrors the list() catch in TerminalDock.console.error('[terminal] dock-state restore failed; staying hidden:', err);}).finally(() => {@@ -619,13 +636,11 @@ export function EditorPane({ onOpenSearch }: EditorPaneProps = {}) {}}onOpenSearch={onOpenSearch}/>- {/* The editor takes the row's full width. The unified sessions dock- (terminals + agent threads) docks WITHIN EditorArea — bottom, or its own+ {/* The editor takes the row's full width. Both session panels live WITHIN+ EditorArea — the terminal beneath the editor, the agents panel as its ownright column past the doc panels; EditorArea owns that layout. The live- session host is mounted below (above EditorArea) so a dock move never- remounts it. `terminalAvailable` folds in `ptyAvailable`, so on- Windows/Linux (no bundled node-pty) the bridge passes as null and the- dock behaves web-like — thread tabs only, no terminal-kind affordances. */}+ hosts are mounted below (above EditorArea) so a view-kind change never+ remounts them. */}<div className="flex min-h-0 flex-1 overflow-hidden"><div className="flex min-w-0 flex-1 flex-col"><EditorArea@@ -636,33 +651,48 @@ export function EditorPane({ onOpenSearch }: EditorPaneProps = {}) {terminalBridge={terminalAvailable ? desktopBridge : null}terminalVisible={terminalVisible}onTerminalVisibleChange={setTerminalVisible}- terminalDock={terminalDock}- terminalHasSessions={hasSessions}- onTerminalPlacement={setTerminalPlacement}- onRevealTerminal={revealTerminal}+ agentsVisible={agentsVisible}+ onAgentsVisibleChange={setAgentsVisible}+ onSessionPlacements={setPlacements}+ onRevealAgents={revealAgents}/></div></div>- {/* The sessions dock host mounts UNCONDITIONALLY — a shell and an agent are- just tabs of a different kind, and agents are server-hosted, so the dock- is host-agnostic (web = thread tabs only, as is win/linux where pty is- unavailable). Terminal-kind affordances gate on the bridge inside the host. */}+ {/* The agents host mounts UNCONDITIONALLY — agent threads are server-hosted,+ so the panel works on the web host and on Windows/Linux where pty is+ unavailable. The terminal host mounts only where a shell can actually+ spawn (`terminalAvailable` folds in `ptyAvailable`); an empty terminal+ dock on those hosts would be a control that can never do anything. */}<Suspense fallback={null}>- <TerminalSessionsHost- bridge={terminalAvailable ? desktopBridge : null}- visible={terminalVisible}- onVisibleChange={setTerminalVisible}- launch={terminalLaunch}+ <SessionsHost+ surface="agents-panel"+ bridge={desktopBridge}+ terminalCapable={terminalAvailable}+ visible={agentsVisible}+ onVisibleChange={setAgentsVisible}threadLaunch={threadLaunch}installedClis={installedClis}- container={terminalPlacement.container}- isShowing={terminalPlacement.isShowing}- onRequestEditorFocus={() => terminalPlacement.editorRegion?.focus()}- dockPosition={terminalDock}- onToggleDock={toggleTerminalDock}- onHasSessionsChange={setHasSessions}+ container={placements.agents.container}+ isShowing={placements.agents.isShowing}+ onRequestEditorFocus={() => placements.editorRegion?.focus()}/></Suspense>+ {terminalAvailable ? (+ <Suspense fallback={null}>+ <SessionsHost+ surface="terminal-dock"+ bridge={desktopBridge}+ terminalCapable+ visible={terminalVisible}+ onVisibleChange={setTerminalVisible}+ launch={terminalLaunch}+ installedClis={installedClis}+ container={placements.terminal.container}+ isShowing={placements.terminal.isShowing}+ onRequestEditorFocus={() => placements.editorRegion?.focus()}+ />+ </Suspense>+ ) : null}<AuthModalopen={authModalOpen}onOpenChange={setAuthModalOpen}diff --git a/packages/app/src/components/EmptyEditorState.dom.test.tsx b/packages/app/src/components/EmptyEditorState.dom.test.tsxindex f920f5ad2..93f57ccc7 100644--- a/packages/app/src/components/EmptyEditorState.dom.test.tsx+++ b/packages/app/src/components/EmptyEditorState.dom.test.tsx@@ -67,26 +67,32 @@ afterEach(cleanup);// dependencies bind to the stubs rather than the real modules.const { EmptyEditorState } = await import('./EmptyEditorState');-describe('EmptyEditorState terminal-aware collapse', () => {- test('no terminal: renders the full view (composer surface present)', async () => {- render(<EmptyEditorState terminalDock={null} />);+describe('EmptyEditorState session-panel-aware collapse', () => {+ test('neither panel open: renders the full view (composer surface present)', async () => {+ render(<EmptyEditorState />);await waitFor(() => expect(screen.getByTestId('create-view')).toBeTruthy());expect(screen.queryByTestId('empty-state-header')).toBeNull();});- test('bottom-docked terminal: header-only, bottom-anchored above the dock', async () => {- render(<EmptyEditorState terminalDock="bottom" />);+ test('terminal open: header-only, bottom-anchored above the dock', async () => {+ render(<EmptyEditorState terminalOpen />);const header = await screen.findByTestId('empty-state-header');expect(screen.queryByTestId('create-view')).toBeNull();- const pose = header.closest('.justify-end');- expect(pose).not.toBeNull();+ expect(header.closest('.justify-end')).not.toBeNull();});- test('right-docked terminal: header-only too (the composer bubble must not compete), centered', async () => {- render(<EmptyEditorState terminalDock="right" />);+ test('agents panel open: header-only too (the composer bubble must not compete), centered', async () => {+ render(<EmptyEditorState agentsOpen />);const header = await screen.findByTestId('empty-state-header');expect(screen.queryByTestId('create-view')).toBeNull();- const pose = header.closest('.justify-center');- expect(pose).not.toBeNull();+ // The right column leaves the vertical space intact, so the header centers.+ expect(header.closest('.justify-center')).not.toBeNull();+ });++ test('both panels open: the bottom dock wins the pose (it is what takes the space)', async () => {+ render(<EmptyEditorState terminalOpen agentsOpen />);+ const header = await screen.findByTestId('empty-state-header');+ expect(screen.queryByTestId('create-view')).toBeNull();+ expect(header.closest('.justify-end')).not.toBeNull();});});diff --git a/packages/app/src/components/EmptyEditorState.tsx b/packages/app/src/components/EmptyEditorState.tsxindex d01f79abe..3edd1ed91 100644--- a/packages/app/src/components/EmptyEditorState.tsx+++ b/packages/app/src/components/EmptyEditorState.tsx@@ -16,14 +16,16 @@ import { emitCreateTopLevelFile } from '@/lib/create-file-events';import type { OkPackId } from '@/lib/desktop-bridge-types';import { subscribeToDocumentsChanged } from '@/lib/documents-events';import { fetchDocumentListShared } from '@/lib/documents-fetch';-import type { TerminalDockPosition } from '@/lib/terminal-dock-store';import { cn } from '@/lib/utils';export function EmptyEditorState({- terminalDock = null,+ terminalOpen = false,+ agentsOpen = false,}: {- /** Where the visible terminal is docked, or null when no terminal is open. */- terminalDock?: TerminalDockPosition | null;+ /** Whether the bottom terminal dock is open. */+ terminalOpen?: boolean;+ /** Whether the right agents panel is open. */+ agentsOpen?: boolean;}) {const [seedDialogOpen, setSeedDialogOpen] = useState(false);const [seedDialogInitialPackId, setSeedDialogInitialPackId] = useState<OkPackId | undefined>(@@ -109,15 +111,14 @@ export function EmptyEditorState({if (!next) setSeedDialogInitialPackId(undefined);}- // When the terminal is open (an empty-state CLI launch), keep the header —- // blob + headline + subtitle, left-aligned in the same column as the full- // view — but drop the composer bubble + starter-pack list: the terminal is- // its own AI entry point, so the composer would be a competing dispatch- // affordance in either dock position. Bottom dock: `justify-end`- // bottom-anchors the header just above the dock so it rides up/down as the- // terminal is resized (matching the prior blob-only pose). Right dock keeps- // its vertical space, so the header centers instead.- if (terminalDock !== null) {+ // With a session panel open (an empty-state launch), keep the header — blob ++ // headline + subtitle, left-aligned in the same column as the full view — but+ // drop the composer bubble + starter-pack list: the panel is its own AI entry+ // point, so the composer would be a competing dispatch affordance. An open+ // BOTTOM dock takes vertical space, so `justify-end` bottom-anchors the header+ // just above it and the header rides up/down as the dock is resized. The right+ // agents panel leaves the vertical space intact, so the header centers.+ if (terminalOpen || agentsOpen) {return (// `@container/emptystate` scopes the child media queries to the editor// pane's own width, not the window's — a narrow split-view pane gets the@@ -126,7 +127,7 @@ export function EmptyEditorState({<divclassName={cn('@container/emptystate flex min-h-0 flex-1 flex-col items-center pb-8 pt-10',- terminalDock === 'bottom' ? 'justify-end' : 'justify-center',+ terminalOpen ? 'justify-end' : 'justify-center',)}><div className="flex w-full flex-col items-center px-4 @md/emptystate:px-10 @2xl/emptystate:px-16">diff --git a/packages/app/src/components/OnboardingCard.tsx b/packages/app/src/components/OnboardingCard.tsxindex d98f7f5fc..7099aae7d 100644--- a/packages/app/src/components/OnboardingCard.tsx+++ b/packages/app/src/components/OnboardingCard.tsx@@ -4,10 +4,10 @@* 1. Create your first project — always pre-checked (endowed progress; the* user is already inside their first project when the card shows).* 2. Create your first file — shows the ⌘N shortcut.- * 3. Ask AI — shows the ⌘L shortcut.+ * 3. Ask AI — shows the ⇧⌘L shortcut.** The card is informational: steps check off as the user performs the actions- * (⌘N, ⌘L) in the editor; the rows themselves are not interactive. The+ * (⌘N, ⇧⌘L) in the editor; the rows themselves are not interactive. The* completion checkbox is a decorative, full-opacity status indicator* (aria-hidden); completion is conveyed to assistive tech via the strikethrough* label plus an sr-only marker.diff --git a/packages/app/src/components/TerminalSessionsHost.threads.dom.test.tsx b/packages/app/src/components/SessionsHost.agents.dom.test.tsxsimilarity index 87%rename from packages/app/src/components/TerminalSessionsHost.threads.dom.test.tsxrename to packages/app/src/components/SessionsHost.agents.dom.test.tsxindex 9236eda60..e09ee6881 100644--- a/packages/app/src/components/TerminalSessionsHost.threads.dom.test.tsx+++ b/packages/app/src/components/SessionsHost.agents.dom.test.tsx@@ -1,10 +1,16 @@/**- * Behavioral tests for the sessions dock hosting AGENT THREADS (the unified-dock- * half of the host). TerminalGate + ThreadView + the thread store are stubbed so- * the assertions pin what the host owns for thread tabs: mirroring the server- * thread list into tabs, kind-aware close (archive) + focus (composer), rename →- * server, and auto-reveal on a new live thread. The terminal half is covered by- * TerminalDock.dom.test.tsx (same host).+ * Behavioral tests for the AGENTS PANEL surface of the shared session host.+ * TerminalGate + ThreadView + the thread store are stubbed so the assertions pin+ * what the host owns for thread tabs: mirroring the server thread list into tabs,+ * close (archive) + focus (composer), rename → server, and auto-reveal on a new+ * live thread. The terminal surface is covered by TerminalDock.dom.test.tsx (same+ * component, different `surface`).+ *+ * The "Ask AI honors the preferred AI" block below is the regression guard for+ * the cross-panel arbitration: both docked hosts resolve the SAME preferred AI+ * from global capabilities, and each answers only for the kinds it owns. These+ * tests assert the agents panel takes `thread` and `none`, and declines `cli`+ * (which the terminal dock picks up off the same event).*/import type { ThreadInfo } from '@inkeep/open-knowledge-core/acp/thread-protocol';@@ -100,7 +106,7 @@ vi.doMock('@/lib/acp/registered-agents', () => ({useDefaultRegisteredAgent: () => mockRegisteredAgent,getDefaultRegisteredAgent: () => mockRegisteredAgent,registerAgent: () => {},- // Real code loaded here imports these too (TerminalSessionsHost →+ // Real code loaded here imports these too (SessionsHost →// pickEffectiveDefaultAgent; catalog → hydrateRegisteredAgentMeta). A// mock.module replaces the whole module, so any omitted export becomes an// unresolved import that fails the file (and can cascade to siblings).@@ -117,7 +123,7 @@ vi.doMock('@tanstack/react-query', () => ({useQuery: () => ({ data: catalogData, isLoading: false, isError: false }),}));-const { TerminalSessionsHost } = await import('./TerminalSessionsHost');+const { SessionsHost } = await import('./SessionsHost');/** Two distinguishable agents, so a stale publish names a visibly wrong one. */const FIRST_AGENT = { id: 'a1', name: 'First Agent', source: 'registry' } as const;@@ -164,8 +170,13 @@ function Harness({return (<TooltipProvider><div ref={setContainer} data-testid="dock-container" />- <TerminalSessionsHost+ <SessionsHost+ surface="agents-panel"bridge={bridge}+ // The agents panel reads terminal capability for the GLOBAL Ask-AI+ // resolution only — it never spawns a PTY itself. Mirrors EditorPane,+ // which hands both hosts the same whole-app fact.+ terminalCapable={bridge != null}visible={visible}onVisibleChange={(v) => {onVisibleChange?.(v);@@ -175,13 +186,12 @@ function Harness({container={container}isShowing={visible && container != null}onRequestEditorFocus={() => {}}- dockPosition="bottom"/></TooltipProvider>);}-describe('TerminalSessionsHost — agent-thread hosting (web / no bridge)', () => {+describe('SessionsHost — agents panel (web / no bridge)', () => {beforeEach(() => {openThreads = [];archivedThreads = [];@@ -515,7 +525,7 @@ describe('TerminalSessionsHost — agent-thread hosting (web / no bridge)', () =// Closes the triangle: the channel and `launchSelectedNewTab` are each tested// alone, but nothing fired a request into a mounted host. A stale closure or an// event-name drift would slip past both endpoint tests.- test('a promptless preferred-session request opens the preferred agent', async () => {+ test('a promptless preferred-session request opens a thread when an agent is preferred', async () => {mockRegisteredAgent = { source: 'registry', id: 'acme-agent', name: 'Acme' };render(<Harness />);await screen.findByTestId('terminal-new-chat');@@ -525,27 +535,39 @@ describe('TerminalSessionsHost — agent-thread hosting (web / no bridge)', () =});expect(launchAgentThread).toHaveBeenCalledTimes(1);- const [agent, prompt, , , stagedDraft] = launchAgentThread.mock.calls[0];- expect(agent).toEqual({ source: 'registry', id: 'acme-agent' });- // Promptless: ⇧⌘J with no selection carries nothing to run or stage.- // Normalized because this path omits the optional 5th arg rather than- // passing an explicit null — the invariant is "no staged draft", not which- // of the two nullish encodings the call site happens to use.- expect(prompt).toBeNull();- expect(stagedDraft ?? null).toBeNull();+ expect(launchAgentThread.mock.calls[0][0]).toEqual({ source: 'registry', id: 'acme-agent' });});- // The CLI family must carry the SAME distinction, or ⇧⌘J would auto-run a- // raw passage the moment no agent is configured.+ // The other half of the ⇧⌘J partition: no in-app agent means the preferred AI+ // is a CLI or a shell, both of which belong to the terminal dock. Declining+ // here is what stops the two panels each opening a session for one press.+ test('a promptless preferred-session request is left to the terminal dock with no agent', async () => {+ render(<Harness bridge={makeTerminalBridge()} />);+ await screen.findByTestId('terminal-new-chat');++ await act(async () => {+ requestPreferredSession();+ });++ expect(launchAgentThread).not.toHaveBeenCalled();+ });++ // Arbitration, the half this panel owns: with no in-app agent the preferred+ // AI resolves to a CLI, which belongs to the TERMINAL dock. This panel must+ // decline outright rather than launch one — a CLI started from here would+ // have no PTY surface to live in, and the terminal dock (answering the same+ // event, with the same resolution) would open a second one. The answering+ // half is asserted in TerminalDock.dom.test.tsx.test.each([- { submit: true, stage: false, label: 'an Ask AI instruction runs' },- { submit: false, stage: true, label: 'a selection send stages' },- ])('with NO agent set up, $label on the CLI', async ({ submit, stage }) => {- const launches: { prompt: string; cli: string; stage: boolean }[] = [];+ { submit: true, label: 'an Ask AI instruction' },+ { submit: false, label: 'a selection send' },+ ])('with NO agent set up, $label is left to the terminal dock', async ({ submit }) => {+ const launches: unknown[] = [];const stopLaunch = subscribeToTerminalLaunchRequests((prompt, cli, opts) =>- launches.push({ prompt, cli, stage: opts.stage }),+ launches.push({ prompt, cli, ...opts }),);- render(<Harness bridge={makeTerminalBridge()} />);+ const onVisibleChange = vi.fn((_v: boolean) => {});+ render(<Harness bridge={makeTerminalBridge()} onVisibleChange={onVisibleChange} />);await screen.findByTestId('terminal-new-chat');await act(async () => {@@ -553,11 +575,11 @@ describe('TerminalSessionsHost — agent-thread hosting (web / no bridge)', () =});stopLaunch();- // No in-app agent → the CLI family is next in the uniform precedence, so the- // passage still reaches an AI. Claude here is the resolver's install-nudge- // default, not a hardcoded sender-side choice.+ // Nothing at all: no thread, no CLI launch of its own, and — the part a+ // silent mis-claim would break — no reveal of a panel that has no answer.expect(launchAgentThread).not.toHaveBeenCalled();- expect(launches).toEqual([{ prompt: 'fix this lint error', cli: 'claude', stage }]);+ expect(launches).toEqual([]);+ expect(onVisibleChange).not.toHaveBeenCalled();});test('with nothing set up, an Ask AI send opens Configure agents (no silent shell)', async () => {diff --git a/packages/app/src/components/TerminalSessionsHost.tsx b/packages/app/src/components/SessionsHost.tsxsimilarity index 74%rename from packages/app/src/components/TerminalSessionsHost.tsxrename to packages/app/src/components/SessionsHost.tsxindex 5584ef4ac..0f21899fd 100644--- a/packages/app/src/components/TerminalSessionsHost.tsx+++ b/packages/app/src/components/SessionsHost.tsx@@ -19,7 +19,11 @@ import { TabsContent } from '@/components/ui/tabs';import { isInAppAgentEnabled } from '@/lib/acp/agent-visibility';import { useEnabledOverrides } from '@/lib/acp/enabled-agents';import { launchAgentThread } from '@/lib/acp/launch-agent-thread';-import { enabledTerminalClis, resolveLauncherSelection } from '@/lib/acp/launcher-selection';+import {+ enabledTerminalClis,+ type LauncherSelection,+ resolveLauncherSelection,+} from '@/lib/acp/launcher-selection';import {getDefaultRegisteredAgent,pickEffectiveDefaultAgent,@@ -38,6 +42,7 @@ import { stageThreadDraft } from '@/lib/acp/thread-draft-staging';import type { OkDesktopBridge } from '@/lib/desktop-bridge-types';import {type DockSessionOrder,+ type DockSurface,readDockSessionOrder,readWebDockSessionOrder,writeDockSessionOrder,@@ -45,16 +50,13 @@ import {import { subscribeLocalMenuAction } from '@/lib/local-menu-action-bus';import type { NewSessionChoice } from '@/lib/new-session-choice';import { isOverlayLayerOpen } from '@/lib/overlay-layers';-import type { TerminalDockPosition } from '@/lib/terminal-dock-store';-import {- getInitialPreferBareTerminal,- writePreferBareTerminal,-} from '@/lib/terminal-new-tab-store';+import { usePreferBareTerminal, writePreferBareTerminal } from '@/lib/terminal-new-tab-store';import {- loadStickyAgent,+ parseStickyCliId,saveStickyAgent,terminalCliId,threadAgentId,+ useStickyAgent,} from '@/lib/unified-agent-store';import { openAgentSettings } from '@/lib/use-settings-route';import { cn } from '@/lib/utils';@@ -77,16 +79,20 @@ import {import { requestTerminalLaunch } from './handoff/terminal-launch-events';import { TerminalGate } from './TerminalGate';import { TerminalNewChatButton } from './TerminalNewChatButton';-import { type TerminalTabDescriptor, TerminalTabStrip } from './TerminalTabStrip';--/** A session the host keeps as a tab. Two kinds share one ordered list + one- * active id (the unified sessions dock). Terminal fields carry PTY state; the- * thread variant carries only its server-owned `threadId` (its live title +- * status come from the thread store). `ordinal` is a shared monotonic number the- * panel render sorts by (so a tab reorder never moves a panel's DOM node); the- * terminal positional label ("Terminal N") also reads it. `id` is a stable- * client identity: `terminal-session-<n>` for a terminal, the threadId itself- * for a thread. */+import {+ type SessionPanelEdge,+ type TerminalTabDescriptor,+ TerminalTabStrip,+} from './TerminalTabStrip';++/** A session the host keeps as a tab. A given host instance holds ONE kind (see+ * {@link SessionSurface}); the union is shared because the tab model is. Terminal+ * fields carry PTY state; the thread member carries only its server-owned+ * `threadId` (its live title + status come from the thread store). `ordinal` is a+ * monotonic number the panel render sorts by (so a tab reorder never moves a+ * panel's DOM node); the terminal positional label ("Terminal N") also reads it.+ * `id` is a stable client identity: `terminal-session-<n>` for a terminal, the+ * threadId itself for a thread. */interface BaseSessionDescriptor {readonly id: string;readonly ordinal: number;@@ -149,11 +155,21 @@ function focusInsideHost(hostEl: HTMLElement | null): boolean {return hostEl?.contains(document.activeElement) ?? false;}+/**+ * Which surface a host instance is. Each owns one edge and one session kind:+ * the terminal dock owns the bottom and PTYs, the agents panel owns the right+ * and ACP threads, and the standalone terminal window is its own window. The+ * host is one component because the tab mechanics (order, active tab, rename,+ * reorder, reload placement, focus) are identical across all three; only the+ * kind gates and chrome differ.+ */+export type SessionSurface = 'terminal-dock' | 'agents-panel' | 'terminal-window';+/** Focus-gate for the host's capture-phase chords (⌘1–9, ⌘⇧←/→): always in the- * window variant (the whole window IS the terminal), in the dock only while- * focus sits inside the host. */-function chordTargetsHost(hostEl: HTMLElement | null, variant: 'dock' | 'window'): boolean {- return variant === 'window' || focusInsideHost(hostEl);+ * standalone window (the whole window IS the terminal), in a docked panel only+ * while focus sits inside the host. */+function chordTargetsHost(hostEl: HTMLElement | null, isWindow: boolean): boolean {+ return isWindow || focusInsideHost(hostEl);}/** Colour of a thread tab's status dot, by lifecycle. Transitional states pulse;@@ -206,24 +222,34 @@ function threadTabIcon(info: ThreadInfo | undefined): ReactNode {);}-interface TerminalSessionsHostProps {+interface SessionsHostProps {/**- * Desktop bridge, or `null` on the web host. The host mounts unconditionally- * now — a shell and an agent are just tabs of a different kind in one dock, and- * agents are server-hosted, so the dock is host-agnostic. Terminal-*kind*- * affordances (creation, PTY bodies, reload adopt) gate on the bridge exposing a- * `terminal` surface; thread tabs work with no bridge at all.+ * Desktop bridge, or `null` on the web host. Passed to EVERY surface, including+ * the agents panel — the panel has no terminal affordances but still persists+ * its tab order through main's per-window store. Terminal-*kind* affordances+ * (creation, PTY bodies, reload adopt) additionally gate on {@link terminalCapable}+ * and the bridge exposing a `terminal` surface; thread tabs need neither.*/readonly bridge: OkDesktopBridge | null;/**- * Which surface hosts the sessions. `'dock'` (default) is the editor's sessions- * dock: terminals AND agent threads, visibility-driven seeding, dock-toggle +- * collapse controls, ⌘1–9 scoped to focus inside the host. `'window'` is the- * standalone terminal window: terminals ONLY (no agent threads), always visible,- * seeds its first tab on mount, the tab row doubles as the macOS title bar, no- * dock/collapse controls, and ⌘1–9 is scope-free.+ * Whether this host CAN spawn a PTY at all — the caller's `terminal` surface ++ * `ptyAvailable` check. Read by every surface, not just the terminal ones: the+ * Ask-AI arbitration resolves the preferred AI against the whole space (see+ * {@link SessionsHost}), so the agents panel needs the same global answer the+ * terminal dock would compute or the two would disagree about where a passage+ * belongs.+ */+ readonly terminalCapable?: boolean;+ /**+ * Which surface this host is. `'terminal-dock'` is the bottom panel: terminals+ * only, visibility-driven seeding, a collapse control, ⌘1–9 scoped to focus+ * inside the host. `'agents-panel'` is the right panel: agent threads only,+ * otherwise identical chrome. `'terminal-window'` is the standalone terminal+ * window: terminals only, always visible, seeds its first tab on mount, the tab+ * row doubles as the macOS title bar, no collapse control, and ⌘1–9 is+ * scope-free.*/- readonly variant?: 'dock' | 'window';+ readonly surface: SessionSurface;/** Controlled visibility. The host reflects it and reports close-last back* through {@link onVisibleChange}; it never owns it. */readonly visible: boolean;@@ -231,44 +257,67 @@ interface TerminalSessionsHostProps {/** "Open in terminal" launch intent — each new intent opens its own terminal tab. */readonly launch?: TerminalLaunchIntent | null;/** "Start an agent" launch intent — each new intent opens its own thread tab (or- * the agent catalog when no concrete agent is resolvable). Dock variant only. */+ * the agent catalog when no concrete agent is resolvable). Agents panel only. */readonly threadLaunch?: ThreadLaunchIntent | null;/** Which CLIs are on PATH (desktop probe). The New split-button resolves its* default CLI from this + the sticky pick. */readonly installedClis?: Partial<Record<TerminalCli, boolean>>;- /** The DOM container the live session subtree portals into right now (bottom- * dock mount or right region tenant). Null only transiently before a container- * attaches. */+ /** The DOM container the live session subtree portals into. Null only+ * transiently before the container attaches. */readonly container: HTMLElement | null;- /** Whether the dock is actually on screen — drives focus in/out. */+ /** Whether the panel is actually on screen — drives focus in/out. */readonly isShowing: boolean;- /** Return focus to the editor when the dock hides or the last tab closes. */+ /** Return focus to the editor when the panel hides or the last tab closes. */readonly onRequestEditorFocus: () => void;- /** Current dock position — passed to the strip's dock-toggle + collapse controls. */- readonly dockPosition?: TerminalDockPosition;- /** Flip the dock between bottom and right. Dock variant only. */- readonly onToggleDock?: () => void;- /** Reports whether ANY session (terminal or thread) is open, so the placement- * owner (EditorArea via EditorPane) can render the dock column/shell. */- readonly onHasSessionsChange?: (hasSessions: boolean) => void;}/**- * Owns the unified session collection (terminals + agent threads) and the single- * stable host div. Mounted ONCE at a stable position ABOVE the editor's resizable- * panel group so a dock change cannot remount it — live shells, scrollback,- * transcripts, and tabs survive the move. The sessions render into the host div- * via a portal whose target never changes; the host div is appended into whichever- * {@link container} is active (bottom dock ↔ right region).+ * The kinds the TERMINAL side owns — the exact complement of the agents panel's+ * `thread` / `none`. Typed as a total `Record` on purpose: a bare `!agentsPanelKind`+ * complement keeps the partition total, but "total" is not "correct" — a new+ * `LauncherSelection` member would silently fall to the terminal dock, which may+ * be the wrong owner. This makes adding one a compile error here instead.+ */+const TERMINAL_DOCK_KINDS: Record<Exclude<LauncherSelection['kind'], 'thread' | 'none'>, true> = {+ cli: true,+ terminal: true,+ desktop: true,+};++/**+ * Owns one panel's session collection and its single stable host div. Mounted+ * ONCE at a stable position ABOVE the editor's resizable panel group so a layout+ * change cannot remount it — live shells, scrollback, transcripts, and tabs+ * survive. The sessions render into the host div via a portal whose target never+ * changes; the host div is appended into whichever {@link container} is active.*- * The tab strip + panels dispatch by `kind`: reorder / activate / rename / close- * are strip-uniform, their behavior kind-specific. Terminals are host-owned (PTY- * lifecycle); threads mirror the server-authoritative thread store (the host owns- * only the dock/tab model — order, active, visibility — never thread lifecycle).+ * One component serves all three surfaces (see {@link SessionSurface}) because+ * the tab model is identical: reorder / activate / rename / close are uniform,+ * only their per-kind behavior differs. Terminals are host-owned (PTY lifecycle);+ * threads mirror the server-authoritative thread store (the host owns only the+ * tab model — order, active, visibility — never thread lifecycle).+ *+ * ── Launcher resolution ─────────────────────────────────────────────────────+ * Every host resolves its New button through `resolveLauncherSelection`, and the+ * pick sticks: the primary repeats whatever you last chose from the dropdown. The+ * two panels differ only in which families they can offer — the agents panel gets+ * in-app agents, the terminal ones get the CLIs plus a bare shell — because the+ * `terminalAvailable` / `threadsAvailable` inputs are SURFACE-scoped, so a host+ * can never resolve to something it cannot launch.+ *+ * The two GLOBAL-scoped resolutions are the exception. `askAiSelection` (a+ * passage) and `preferredSessionSelection` (⇧⌘J) ask "what is the user's+ * preferred AI" across both families, so both docked hosts compute the SAME+ * answer and each claims only the kinds it owns ({@link claimsSessionKind}).+ * Scoping either by surface instead would make the terminal dock resolve a CLI+ * for a user whose preferred AI is an in-app agent — a session silently landing+ * in the wrong panel. That is why {@link SessionsHostProps.terminalCapable} is+ * read here even on the agents panel.*/-export function TerminalSessionsHost({+export function SessionsHost({bridge,- variant = 'dock',+ terminalCapable = false,+ surface,visible,onVisibleChange,launch = null,@@ -277,17 +326,22 @@ export function TerminalSessionsHost({container,isShowing,onRequestEditorFocus,- dockPosition,- onToggleDock,- onHasSessionsChange,-}: TerminalSessionsHostProps) {+}: SessionsHostProps) {const { t } = useLingui();- // Terminal affordances need a bridge that actually exposes the `terminal`- // surface (a session-only bridge, some E2E hosts, has none). Thread hosting is- // the dock variant only (the standalone terminal window is shells-only).- const terminalAvailable = bridge?.terminal != null;- const hostThreads = variant === 'dock';+ const isWindow = surface === 'terminal-window';+ const hostThreads = surface === 'agents-panel';+ const hostTerminals = !hostThreads;+ // Terminal affordances additionally need a bridge that actually exposes the+ // `terminal` surface (a session-only bridge, some E2E hosts, has none).+ const terminalAvailable = hostTerminals && terminalCapable && bridge?.terminal != null;+ // Which edge this panel occupies — the strip points its collapse chevron by it.+ const edge: SessionPanelEdge = hostThreads ? 'right' : 'bottom';+ // Which per-window record this panel's tab order persists under. The two+ // panels persist independently; the standalone window has nothing to restore+ // into, so it does not persist at all.+ const persistSurface: DockSurface = hostThreads ? 'agents' : 'terminal';+ const persistsOrder = !isWindow;// The single stable host div for the session subtree. Created once via a// useState lazy initializer (never a render-time ref write — React Compiler@@ -300,7 +354,8 @@ export function TerminalSessionsHost({});// Append the stable host div into the active container. A constant portal target- // plus DOM relocation means no remount on a dock move. useLayoutEffect runs+ // plus DOM relocation means no remount when the container re-attaches (a+ // view-kind change re-runs EditorArea's tree). useLayoutEffect runs// before the focus passive effects below, so the host is attached before a// focus-on-reveal.useLayoutEffect(() => {@@ -312,7 +367,7 @@ export function TerminalSessionsHost({// reload, so the host rehydrates them on mount instead of starting fresh. When// it can, the synchronous terminal seed below stands down. Web + session-only// bridges keep the synchronous cold-start (no terminals to rehydrate).- const canRehydrate = typeof bridge?.terminal?.list === 'function';+ const canRehydrate = hostTerminals && typeof bridge?.terminal?.list === 'function';// Seed the first terminal synchronously only on a terminal surface with no// rehydrate capability — web + session-only bridges never seed a terminal.@@ -326,9 +381,12 @@ export function TerminalSessionsHost({// has no reload to restore, and its terminal persist goes through the bridge, not// localStorage — so a stale localStorage arrangement never yanks a fresh seed.const [webReloadOrder] = useState<DockSessionOrder | null>(() => {- if (canRehydrate || !hostThreads || coldSeedTerminal) return null;- // Only the web dock persists to localStorage; skip for the window variant.- return typeof bridge?.terminal?.getDockState === 'function' ? null : readWebDockSessionOrder();+ if (canRehydrate || !persistsOrder || coldSeedTerminal) return null;+ // Only the web backend is readable synchronously; a desktop host reads main's+ // per-window record from the async restore effect below.+ return typeof bridge?.terminal?.getDockState === 'function'+ ? null+ : readWebDockSessionOrder(persistSurface);});const reloadOrderRef = useRef<readonly string[]>(webReloadOrder?.order ?? []);// Active key still awaiting a matching session (reload restore). Cleared once@@ -364,13 +422,13 @@ export function TerminalSessionsHost({coldSeedTerminal && launch ? launch.nonce : null,);const lastHandledThreadNonceRef = useRef<number | null>(null);- const prevVisibleRef = useRef(variant === 'window' ? false : visible);+ const prevVisibleRef = useRef(isWindow ? false : visible);const ptyIdBySessionRef = useRef(new Map<string, string>());const stripLaunchNonceRef = useRef(0);// Live agent-thread tabs (server-authoritative). Always subscribed (the hook is// cheap + the store is empty until a URL is bound), reconciled into thread- // descriptors only in the dock variant.+ // descriptors only on the agents panel.const openThreadTabs = useOpenAgentThreadTabs();const archivedThreads = useArchivedAgentThreads();// WS status for the agent-thread channel — drives a "reconnecting" banner shown@@ -406,13 +464,13 @@ export function TerminalSessionsHost({/** Persist the current unified dock order + active key (reload-durable). Reads* the post-commit refs so it is correct when called from a ptyId callback. */function persistDockOrderNow() {- if (!hostThreads) return; // the window variant IS the surface — nothing to restore into+ if (!persistsOrder) return; // the standalone window IS the surface — nothing to restore intoconst ptyMap = ptyIdBySessionRef.current;const order = sessionsRef.current.map((session) => computePersistKey(session, ptyMap)).filter((key): key is string => key != null);const active = sessionsRef.current.find((s) => s.id === activeSessionIdRef.current);- writeDockSessionOrder(bridge, {+ writeDockSessionOrder(bridge, persistSurface, {order,activeKey: active != null ? computePersistKey(active, ptyMap) : null,});@@ -461,19 +519,20 @@ export function TerminalSessionsHost({setActiveSessionId(id);}- // Sticky pick mirror (raw id from the shared Ask-AI store) so the New split- // button's primary reflects the last pick across agents/CLIs/bare and updates- // reactively when the user switches it from the dropdown.- const [stickyAgentId, setStickyAgentId] = useState<string | null>(() => loadStickyAgent());- const [preferBareTerminal, setPreferBareTerminal] = useState(() =>- getInitialPreferBareTerminal(),- );-- // The shared, enablement-aware selection — the SAME `resolveLauncherSelection`- // the Ask + Create composers use, so a disabled agent / CLI is never what the- // dock primary launches (the old `resolveNewSessionChoice` forced a Claude CLI- // fallback that ignored the toggles). The dock offers no Desktop rows and falls- // back to a bare terminal, so it only ever yields agent / cli / terminal.+ // Sticky pick, read from the SHARED stores rather than a mount-time snapshot.+ // Both session hosts partition Ask-AI and ⇧⌘J work by comparing the kind each+ // one resolves, which is only sound while they read the same inputs. Local+ // `useState` copies diverged the moment a New-dropdown pick mutated one host,+ // and from then on both claimed — ⇧⌘J opened two sessions and a passage landed+ // in both panels. Subscribing keeps the invariant true by construction.+ const stickyAgentId = useStickyAgent();+ const preferBareTerminal = usePreferBareTerminal();++ // This panel's New button — the same enablement-aware resolver the Ask + Create+ // composers use, so a disabled agent / CLI is never what the primary launches.+ // SURFACE-scoped, unlike `askAiSelection` below: `terminalAvailable` is false on+ // the agents panel and `threadsAvailable` false on the terminal ones, so a host+ // can only ever resolve to a family it can actually launch.const selection = resolveLauncherSelection({sticky: stickyAgentId,effectiveThreadAgent: effectiveDefaultAgent,@@ -486,14 +545,22 @@ export function TerminalSessionsHost({preferBareTerminal,bareTerminalFallback: true,});+ // A CLI counts only as an explicit remembered pick. `resolveLauncherSelection`+ // also falls back to the first enabled CLI when nothing is picked — right for a+ // composer, wrong here: the terminal dock IS the terminal, so a TUI is something+ // you choose, never what a fresh + hands you. Both CLI-less outcomes therefore+ // collapse to a plain shell.+ const pickedCli = parseStickyCliId(stickyAgentId);const newSessionChoice: NewSessionChoice =selection.kind === 'thread'? { kind: 'agent', agent: selection.agent }: selection.kind === 'cli'- ? { kind: 'cli', cli: selection.cli }+ ? selection.cli === pickedCli+ ? { kind: 'cli', cli: selection.cli }+ : { kind: 'terminal' }: selection.kind === 'terminal'? { kind: 'terminal' }- : // 'none' (thread-only surface, nothing enabled) → primary opens Settings.+ : // 'none' (nothing enabled to launch here) → primary opens Settings.{ kind: 'agent', agent: null };// Tab-strip New-chat primary: open a promptless terminal session running `cli`.@@ -502,7 +569,8 @@ export function TerminalSessionsHost({openSession({ prompt: null, cli, nonce: stripLaunchNonceRef.current });}- // Primary click: launch the current sticky pick across all three families.+ // Primary click: launch this panel's current sticky pick — a bare shell, a CLI,+ // or an in-app agent (Configure agents when nothing is enabled to launch).function launchSelectedNewTab() {if (newSessionChoice.kind === 'terminal') openSession(null);else if (newSessionChoice.kind === 'cli') openNewChatSession(newSessionChoice.cli);@@ -516,22 +584,14 @@ export function TerminalSessionsHost({else openAgentSettings();}- // Seed the dock when it opens empty (⌘J / edge reveal with nothing latched) by- // repeating the choice shown on the New-session primary button — EXCEPT the- // neutral `choose` (no default agent). A passive reveal must NOT auto-open the- // agent catalog: revealing an empty dock just shows it empty; starting an- // in-app agent stays an explicit New-button click.+ // Seed an empty terminal dock on reveal by repeating the New primary's pick —+ // a bare shell or the picked CLI. The agents panel stays empty until the user+ // explicitly starts an agent: a passive reveal must not auto-open a thread or+ // the catalog. A terminal host with nothing enabled likewise just shows empty.function seedOnReveal() {+ if (!hostTerminals) return;if (newSessionChoice.kind === 'terminal') openSession(null);else if (newSessionChoice.kind === 'cli') openNewChatSession(newSessionChoice.cli);- else if (newSessionChoice.kind === 'agent' && newSessionChoice.agent != null)- launchAgentThread(- { source: newSessionChoice.agent.source, id: newSessionChoice.agent.id },- null,- null,- null,- );- // `choose` → reveal the empty dock without auto-opening the catalog.}/**@@ -541,6 +601,13 @@ export function TerminalSessionsHost({* pick was "Terminal" still gets their preferred agent for Ask AI, and when* nothing is enabled this yields `none` (→ Configure agents) rather than* silently opening a shell.+ *+ * GLOBAL capabilities, not this surface's: threads are server-hosted so they+ * are always launchable, and terminal availability is the caller's whole-app+ * fact. Both docked hosts therefore resolve the same preferred AI and+ * {@link claimsSessionKind} decides which one answers. The standalone terminal+ * window is the exception — it has no sibling host in its window, so it+ * resolves threads away and answers everything itself.*/const askAiSelection = resolveLauncherSelection({sticky: stickyAgentId,@@ -548,18 +615,59 @@ export function TerminalSessionsHost({enabledClis: enabledTerminalClis(enabledOverrides, installedClis ?? {}),enabledDesktopTargets: [],installedClis: installedClis ?? {},- terminalAvailable,- threadsAvailable: hostThreads,+ terminalAvailable: terminalCapable,+ threadsAvailable: !isWindow,desktopSelectable: false,preferBareTerminal: false,bareTerminalFallback: false,});+ /**+ * Where a promptless ⇧⌘J new session belongs. Globally scoped like+ * {@link askAiSelection}, but with the bare-terminal knobs ON: ⇧⌘J carries no+ * passage, so "Terminal" is a legitimate answer and a user whose last pick was+ * a bare shell must get one rather than having it resolved away to an agent.+ */+ const preferredSessionSelection = resolveLauncherSelection({+ sticky: stickyAgentId,+ effectiveThreadAgent: effectiveDefaultAgent,+ enabledClis: enabledTerminalClis(enabledOverrides, installedClis ?? {}),+ enabledDesktopTargets: [],+ installedClis: installedClis ?? {},+ terminalAvailable: terminalCapable,+ threadsAvailable: !isWindow,+ desktopSelectable: false,+ preferBareTerminal,+ bareTerminalFallback: true,+ });++ /**+ * Whether THIS surface owns a session of `kind`. The two docked panels+ * PARTITION the space, so an Ask-AI passage or a ⇧⌘J new session lands in+ * exactly one.+ *+ * The agents panel takes `thread`, and `none` too: `none`'s destination is+ * Configure agents, and the agents panel is the one that mounts on every host+ * (the terminal dock is absent wherever no shell can spawn), so routing the+ * fallback there is what keeps it reachable. The terminal dock takes the+ * COMPLEMENT rather than an enumerated list — written as a partition so a new+ * `LauncherSelection` member lands somewhere instead of being dropped by both.+ * That is also what lets the bare-terminal-aware ⇧⌘J resolution share this:+ * its extra `terminal` kind falls to the terminal dock without a special case.+ */+ function claimsSessionKind(kind: LauncherSelection['kind']): boolean {+ if (isWindow) return true; // no sibling host in that window — it answers everything+ const agentsPanelKind = kind === 'thread' || kind === 'none';+ return hostThreads ? agentsPanelKind : kind in TERMINAL_DOCK_KINDS;+ }+/*** Route an "Ask AI" passage (selection bubble, code block, Problems panel, the- * ⌘J/⇧⌘J selection sends) to the user's preferred AI. This is the single place- * the which-AI decision is made, so every surface honors the preferred agent- * rather than a per-surface default.+ * ⌘J/⇧⌘J selection sends) to the user's preferred AI. Both docked hosts+ * subscribe and both resolve the same `askAiSelection`; `claimsSessionKind` makes+ * exactly one of them act, and the winner reveals its own panel. That is what+ * keeps "preferred AI decides" true across two independent panels rather than+ * "whichever panel the user last touched".** Reuse first, unless the caller asked for a fresh session (⇧⌘J): a live thread* takes the passage as a staged composer draft; a live CLI takes it as a@@ -652,6 +760,11 @@ export function TerminalSessionsHost({}function dispatchAskAi({ text, newTab, submit }: ActiveTerminalInputDetail) {+ // Not this panel's kind — the sibling host answers. Returning here (rather+ // than falling through) is what stops a passage double-landing.+ if (!claimsSessionKind(askAiSelection.kind)) return;+ // The passage is landing here, so this panel must be on screen for it.+ if (!visible) onVisibleChange(true);const activeId = activeSessionIdRef.current;const active = sessionsRef.current.find((s) => s.id === activeId);if (!newTab && active != null) {@@ -700,17 +813,13 @@ export function TerminalSessionsHost({// Dropdown CLI pick: clear the bare-terminal preference, persist `cli`, open it.function pickNewChatCli(cli: TerminalCli) {- setPreferBareTerminal(false);writePreferBareTerminal(false);- const id = terminalCliId(cli);- setStickyAgentId(id);- saveStickyAgent(id);+ saveStickyAgent(terminalCliId(cli));openNewChatSession(cli);}// Dropdown "Terminal" pick: persist the bare-shell preference, open a bare shell.function pickNewChatTerminal() {- setPreferBareTerminal(true);writePreferBareTerminal(true);openSession(null);}@@ -720,11 +829,8 @@ export function TerminalSessionsHost({// a thread. Mirrors the catalog pick's "the agent you chose last is your agent".function pickNewChatAgent(agent: RegisteredAgent) {registerAgent(agent);- setPreferBareTerminal(false);writePreferBareTerminal(false);- const id = threadAgentId(agent);- setStickyAgentId(id);- saveStickyAgent(id);+ saveStickyAgent(threadAgentId(agent));launchAgentThread({ source: agent.source, id: agent.id }, null, null, null);}@@ -796,9 +902,11 @@ export function TerminalSessionsHost({if (next.every((session, index) => session === prev[index])) return prev;return next;});- // Persist the terminal-only display order to main (ptyIds in visual order) so a- // reorder survives a renderer reload — keeps `list()` self-consistent — and the- // unified cross-kind order for the mixed strip.+ // Persist the terminal display order to main (ptyIds in visual order), which+ // keeps `list()` self-consistent with what the strip shows. This covers+ // terminals ONLY — each panel is single-kind now, and the order a panel+ // restores after a reload comes from the separate `writeDockSessionOrder`+ // effect below, not from here.const orderedPtyIds = newOrderIds.map((id) => ptyIdBySessionRef.current.get(id)).filter((ptyId): ptyId is string => ptyId != null);@@ -819,11 +927,22 @@ export function TerminalSessionsHost({reorderSessions(ids);return { label: sessionLabel(current[from]), position: to + 1, total: current.length };}+ // ⇧⌘J: a new session with the preferred AI. Both docked hosts subscribe, so the+ // GLOBAL resolution picks the OWNER and the winner then launches its own primary+ // and reveals itself. The claim is family-level, not exact: a global `cli` with+ // no CLI actually picked hands the terminal dock a plain shell. That is the+ // intended split of labor — global decides WHICH panel, the panel decides what.+ function launchPreferredSession() {+ if (!claimsSessionKind(preferredSessionSelection.kind)) return;+ if (!visible) onVisibleChange(true);+ launchSelectedNewTab();+ }+const moveActiveSessionRef = useRef(moveActiveSession);const openSessionRef = useRef(openSession);const seedOnRevealRef = useRef(seedOnReveal);const dispatchAskAiRef = useRef(dispatchAskAi);- const launchSelectedNewTabRef = useRef(launchSelectedNewTab);+ const launchPreferredSessionRef = useRef(launchPreferredSession);// Close a tab — kind-dispatched. A terminal is removed from the list (its panel// unmounts, killing the PTY); a thread is archived server-side (discarded if it@@ -859,7 +978,7 @@ export function TerminalSessionsHost({openSessionRef.current = openSession;seedOnRevealRef.current = seedOnReveal;dispatchAskAiRef.current = dispatchAskAi;- launchSelectedNewTabRef.current = launchSelectedNewTab;+ launchPreferredSessionRef.current = launchPreferredSession;moveActiveSessionRef.current = moveActiveSession;activeSessionIdRef.current = activeSessionId;sessionsRef.current = sessions;@@ -881,19 +1000,19 @@ export function TerminalSessionsHost({// changes (reorder, add, remove, activate). Reads the ptyId map by ref; the// computation uses only listed deps + the module-pure `computePersistKey`.useEffect(() => {- if (!hostThreads) return;+ if (!persistsOrder) 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, {+ writeDockSessionOrder(bridge, persistSurface, {order,activeKey: active != null ? computePersistKey(active, ptyMap) : null,});- }, [sessions, activeSessionId, hostThreads, bridge]);+ }, [sessions, activeSessionId, persistsOrder, persistSurface, bridge]);- // ── Thread reconciliation (dock variant) ────────────────────────────────+ // ── Thread reconciliation (agents panel) ────────────────────────────────// Mirror the server-authoritative open-thread list into thread descriptors: add// one per newly-open thread, drop one when its thread leaves the open set. The// host owns only order/active; the thread store owns thread lifecycle. Restored@@ -1022,7 +1141,7 @@ export function TerminalSessionsHost({}}, [visible, launch, threadLaunch, sessions.length, rehydrationSettled, hostThreads]);- // "Start an agent" launch intent (dock variant): resolve the agent (concrete /+ // "Start an agent" launch intent (agents panel): resolve the agent (concrete /// default-registered) and start a thread. Each new nonce opens its own thread// tab; the store reconcile + auto-reveal bring it to front + reveal. When no// agent resolves (nothing enabled yet), open Configure agents so the user can@@ -1050,6 +1169,7 @@ export function TerminalSessionsHost({// survivor and read the persisted unified order + active key, so restored tabs// land in place and the active tab is restored across kinds.useEffect(() => {+ if (!hostTerminals) return;if (typeof bridge?.terminal?.list !== 'function') return;if (rehydratedRef.current) return;rehydratedRef.current = true;@@ -1057,7 +1177,7 @@ export function TerminalSessionsHost({void (async () => {// Read the persisted unified order first so terminal survivors are placed by// it (and threads, arriving async, land at their persisted slots too).- const persisted = await readDockSessionOrder(bridge).catch(() => null);+ const persisted = await readDockSessionOrder(bridge, persistSurface).catch(() => null);if (!cancelled && persisted != null) {reloadOrderRef.current = persisted.order;pendingActiveKeyRef.current = persisted.activeKey;@@ -1116,13 +1236,38 @@ export function TerminalSessionsHost({// rehydration on the second mount (see the original terminal host rationale).rehydratedRef.current = false;};- }, [bridge]);+ }, [bridge, hostTerminals, persistSurface]);++ // Reload restore for a surface with no PTYs to rehydrate (the agents panel, and+ // any host on web). There is no `list()` pass to hang the read off, so read the+ // persisted order directly; sessions arriving async then land at their slots.+ // The web backend was already read synchronously into the mount seed above.+ useEffect(() => {+ 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;+ // Never override a key the user's own activation already cleared. Tested+ // through a local rather than in place: `??=` (and the equivalent+ // self-assignment) is un-lowerable by the React Compiler, while an+ // `if (x === null) x = …` on the ref itself trips oxlint's+ // logical-assignment rule. Reading first satisfies both.+ const activationTookOver = pendingActiveKeyRef.current !== null;+ if (!activationTookOver) pendingActiveKeyRef.current = persisted.activeKey;+ });+ return () => {+ cancelled = true;+ };+ }, [bridge, canRehydrate, persistsOrder, persistSurface]);- // Web reload: no bridge to rehydrate, but a persisted active key may still be- // pending — bound its wait the same way so a stale key never blocks activation.+ // Bound the reload-active wait on those same surfaces, so a restored active key+ // whose session never materializes stops blocking live activation. Armed+ // unconditionally (not gated on a key being pending yet) because the restore+ // above resolves async — the key may not exist when this effect first runs.useEffect(() => {if (canRehydrate) return;- if (pendingActiveKeyRef.current == null) return;const timer = window.setTimeout(() => {pendingActiveKeyRef.current = null;}, 9_000);@@ -1138,29 +1283,33 @@ export function TerminalSessionsHost({return subscribeToActiveTerminalInput((detail) => dispatchAskAiRef.current(detail));}, [terminalAvailable, hostThreads]);- // ⇧⌘J with no selection: open a new session with the preferred AI — the same- // resolution the New split-button primary uses, so it is never hardcoded to a CLI.+ // ⇧⌘J with no selection: open a new session with the preferred AI. Arbitrated+ // like an Ask-AI passage — the GLOBAL resolution decides which panel owns the+ // new session, then that panel opens it with its own surface-scoped primary+ // (which resolves to the same thing, since the kinds now agree) and reveals+ // itself. Without the claim check both panels would each open a tab.useEffect(() => {- return subscribeToPreferredSessionRequests(() => launchSelectedNewTabRef.current());+ return subscribeToPreferredSessionRequests(() => launchPreferredSessionRef.current());}, []);- // Terminal application-menu actions act on the tab collection.+ // Terminal application-menu actions act on the tab collection — terminal+ // surfaces only, so "Kill Terminal" can never close an agent conversation.useEffect(() => {+ if (!hostTerminals) return;return subscribeLocalMenuAction((action) => {if (action === 'new-terminal') {if (terminalAvailable) openSessionRef.current(null);} else if (action === 'kill-terminal') closeActiveRef.current();- else if (action === 'close-active-tab-or-window' && variant === 'window')- closeActiveRef.current();+ else if (action === 'close-active-tab-or-window' && isWindow) closeActiveRef.current();});- }, [variant, terminalAvailable]);+ }, [isWindow, hostTerminals, terminalAvailable]);// ⌘1–⌘9 jump straight to the Nth tab (capture phase, focus-scoped in the dock).useEffect(() => {function onKeyDown(event: KeyboardEvent) {if (!event.metaKey || event.ctrlKey || event.altKey || event.shiftKey) return;if (!/^[1-9]$/.test(event.key)) return;- if (!chordTargetsHost(hostEl, variant)) return;+ if (!chordTargetsHost(hostEl, isWindow)) return;// `chordTargetsHost` short-circuits to true in the dedicated terminal// window, so focus alone does not gate this there.if (isOverlayLayerOpen()) return;@@ -1173,7 +1322,7 @@ export function TerminalSessionsHost({}window.addEventListener('keydown', onKeyDown, { capture: true });return () => window.removeEventListener('keydown', onKeyDown, { capture: true });- }, [hostEl, variant]);+ }, [hostEl, isWindow]);// ⌘⇧← / ⌘⇧→ move the ACTIVE tab one slot (capture phase + focus-gate).useEffect(() => {@@ -1181,7 +1330,7 @@ export function TerminalSessionsHost({if (!event.metaKey || !event.shiftKey || event.ctrlKey || event.altKey) return;const direction = event.key === 'ArrowLeft' ? -1 : event.key === 'ArrowRight' ? 1 : 0;if (direction === 0) return;- if (!chordTargetsHost(hostEl, variant)) return;+ if (!chordTargetsHost(hostEl, isWindow)) return;if (isOverlayLayerOpen()) return;if (dragActiveRef.current) return;const target = event.target as HTMLElement | null;@@ -1208,32 +1357,27 @@ export function TerminalSessionsHost({announceTimerRef.current = null;}};- }, [hostEl, variant, t]);+ }, [hostEl, isWindow, t]);// Reflect terminal liveness to main so the Terminal menu's "Kill Terminal"// enables only while at least one TERMINAL session is live.useEffect(() => {+ if (!hostTerminals) return;const terminalLive = sessions.some((s) => s.kind === 'terminal');// Mirror into the renderer store so the Cmd+K palette can gate "Kill// terminal" on a live session (the bridge push below is main-only).setViewMenuState({ terminalLive });bridge?.editor.notifyViewMenuStateChanged({ terminalLive });- }, [bridge, sessions]);-- useEffect(() => {- onHasSessionsChange?.(sessions.length > 0);- }, [onHasSessionsChange, sessions.length]);+ }, [bridge, sessions, hostTerminals]);- // Return focus out of the hidden dock so a keyboard user is never stranded.- // Only acts when focus is actually inside the dock.+ // Return focus out of the hidden panel so a keyboard user is never stranded.+ // Only acts when focus is actually inside the host.//- // Gate on `visible`, not just `isShowing`: a dock move (bottom ↔ right) keeps the- // dock `visible` but transiently drops `isShowing` to false for one commit- // while the destination container's callback ref attaches (`activeTerminalContainer`- // is null until then). Without the `visible` guard, clicking the dock-toggle —- // which lives inside this portaled host, so focus is inside it — would satisfy the- // focus-inside check and yank focus to the editor mid-move. A genuine hide (⌘J,- // collapse, close-last) always sets `visible` false, so focus-return still fires.+ // Gate on `visible`, not just `isShowing`: `isShowing` also dips for a commit+ // whenever the container's callback ref re-attaches, and a focus yank on that+ // edge would steal the caret out of a panel that never actually closed. A+ // genuine hide (the toggle, collapse, close-last) always sets `visible` false,+ // so focus-return still fires.useLayoutEffect(() => {if (isShowing || visible) return;if (!focusInsideHost(hostEl)) return;@@ -1280,19 +1424,18 @@ export function TerminalSessionsHost({);// The conversation-history menu rides in the strip's trailing controls, just- // left of the dock-toggle/collapse buttons — shown only with archived history to- // return to.+ // left of the collapse button — shown only with archived history to return to.const trailingControls =hostThreads && archivedThreads.length > 0 ? (<ThreadHistoryMenu archived={archivedThreads} onOpenThread={openArchivedThread} />) : null;// Render the strip (with the + split button + a starting/empty body) whenever- // there are sessions, or the dock is visible in the dock variant — so a visible- // dock always shows immediate feedback while a session spins up, and an entry- // point when idle-empty. The standalone terminal window seeds on mount, so it- // shows the strip only once it has a tab (no empty flash).- const showStrip = sessions.length > 0 || (visible && hostThreads);+ // there are sessions, or a docked panel is visible — so an open panel always+ // shows immediate feedback while a session spins up, and an entry point when+ // idle-empty. The standalone terminal window seeds on mount, so it shows the+ // strip only once it has a tab (no empty flash).+ const showStrip = sessions.length > 0 || (visible && !isWindow);const sessionViews = showStrip ? (<TerminalTabStrip@@ -1315,16 +1458,15 @@ export function TerminalSessionsHost({onDragActiveChange={(active) => {dragActiveRef.current = active;}}- dockPosition={dockPosition}- onToggleDock={onToggleDock}- onCollapse={variant === 'window' ? undefined : () => onVisibleChange(false)}- draggable={variant === 'window'}+ edge={edge}+ onCollapse={isWindow ? undefined : () => onVisibleChange(false)}+ draggable={isWindow}className="h-full">{sessions.length === 0 ? (- // A terminal surface auto-seeds on reveal, so an empty dock is only ever a- // sub-frame transient there — render nothing (the + button suffices) so no- // "no sessions" text flashes. On a thread-only surface an empty dock is a+ // A terminal surface auto-seeds on reveal, so an empty panel is only ever+ // a sub-frame transient there — render nothing (the + button suffices) so+ // no "no sessions" text flashes. On the agents panel an empty state is a// real resting state: offer the reopen-a-past-conversation chooser when// there is history, else the entry-point guidance.terminalAvailable ? null : hostThreads && archivedThreads.length > 0 ? (@@ -1342,7 +1484,7 @@ export function TerminalSessionsHost({{...(session.kind === 'terminal' ? { 'data-terminal-session': session.id } : {})}className={cn('m-0 flex min-h-0 flex-1 flex-col overflow-hidden data-[state=inactive]:hidden',- variant === 'window' && 'px-[22px] pb-[22px]',+ isWindow && 'px-[22px] pb-[22px]',)}>{session.kind === 'terminal' ? (diff --git a/packages/app/src/components/TerminalDock.dom.test.tsx b/packages/app/src/components/TerminalDock.dom.test.tsxindex eea595a3f..bcf1749d9 100644--- a/packages/app/src/components/TerminalDock.dom.test.tsx+++ b/packages/app/src/components/TerminalDock.dom.test.tsx@@ -26,9 +26,9 @@ import {__resetLocalMenuActionBusForTests,emitLocalMenuAction,} from '@/lib/local-menu-action-bus';-import type { TerminalDockPosition } from '@/lib/terminal-dock-store';import { writePreferBareTerminal } from '@/lib/terminal-new-tab-store';import { saveStickyAgent, terminalCliId } from '@/lib/unified-agent-store';+import { requestPreferredSession } from './handoff/preferred-session-events';import { requestActiveTerminalInput } from './handoff/terminal-input-events';import { subscribeToTerminalLaunchRequests } from './handoff/terminal-launch-events';@@ -170,7 +170,7 @@ vi.doMock('@/lib/terminal-height-store', () => ({}));const { TerminalDock, MAX_STRANDED_REPORTS } = await import('./TerminalDock');-const { TerminalSessionsHost } = await import('./TerminalSessionsHost');+const { SessionsHost } = await import('./SessionsHost');// After the vi.doMock block (a static import would load the real xterm).const { STAGE_PASTE_SETTLE_MS } = await import('./TerminalPanel');@@ -202,7 +202,7 @@ function makeBridge() {kill,input,viewMenuPushes,- // TerminalSessionsHost now listens on the renderer-local menu-action bus+ // SessionsHost now listens on the renderer-local menu-action bus// (a real menu click reaches it via main → the bus forwarder), so the test// drives it with emitLocalMenuAction.dispatchMenuAction(action: OkMenuAction) {@@ -213,11 +213,10 @@ function makeBridge() {// Mini-harness mirroring how EditorArea wires the two pieces: the TerminalDock// shell exposes the bottom mount + editor-region elements, and the once-mounted-// TerminalSessionsHost portals the live sessions into that container. `isShowing`-// is gated on the container so focus never targets a detached host (the same-// invariant EditorArea enforces). Session behavior is bottom-dock only —-// right-dock placement is covered by EditorArea + the live-Electron smoke; the-// `dock` knob here exercises only the shell's handle gating across positions.+// SessionsHost portals the live sessions into that container. `isShowing` is+// gated on the container so focus never targets a detached host (the same+// invariant EditorArea enforces). This is the TERMINAL surface's suite; the+// agents panel has its own (SessionsHost.agents.dom.test.tsx).// Structural mirror of TerminalLaunchIntent (EditorPane) so tests can express// promptless / staged launches without casts.type TestLaunch = {@@ -232,8 +231,6 @@ function DockHarness({l,onVisibleChange,bridge,- onReveal,- dock = 'bottom',// biome-ignore lint/suspicious/noExplicitAny: test harness props}: any) {const [bottomContainer, setBottomContainer] = useState<HTMLDivElement | null>(null);@@ -243,43 +240,31 @@ function DockHarness({<TerminalDockvisible={v}onVisibleChange={onVisibleChange}- dockPosition={dock}onBottomContainer={setBottomContainer}onEditorRegion={setEditorRegionEl}- onReveal={onReveal}- // Mirrors EditorArea's predicate (a terminal surface shows the reveal tab- // whenever hidden). The dock's terminal bridge is always present here.- showRevealTab={!v && onReveal != null}><div data-testid="editor-child" /></TerminalDock>- <TerminalSessionsHost+ <SessionsHost+ surface="terminal-dock"bridge={bridge}+ terminalCapablevisible={v}onVisibleChange={onVisibleChange}launch={l ?? null}container={bottomContainer}isShowing={v && bottomContainer != null}onRequestEditorFocus={() => editorRegionEl?.focus()}- dockPosition={dock}- onToggleDock={() => {}}/></TooltipProvider>);}-function renderDock(visible: boolean, launch?: TestLaunch | null, onReveal?: () => void) {+function renderDock(visible: boolean, launch?: TestLaunch | null) {const onVisibleChange = vi.fn((_v: boolean) => {});const { bridge, create, kill, input, viewMenuPushes, dispatchMenuAction } = makeBridge();- const ui = (v: boolean, l?: TestLaunch | null, dock?: TerminalDockPosition) => (- <DockHarness- v={v}- l={l ?? null}- onVisibleChange={onVisibleChange}- bridge={bridge}- onReveal={onReveal}- dock={dock ?? 'bottom'}- />+ const ui = (v: boolean, l?: TestLaunch | null) => (+ <DockHarness v={v} l={l ?? null} onVisibleChange={onVisibleChange} bridge={bridge} />);const utils = render(ui(visible, launch));return {@@ -290,8 +275,7 @@ function renderDock(visible: boolean, launch?: TestLaunch | null, onReveal?: ()input,viewMenuPushes,dispatchMenuAction,- rerender: (v: boolean, l?: TestLaunch | null, dock?: TerminalDockPosition) =>- utils.rerender(ui(v, l, dock)),+ rerender: (v: boolean, l?: TestLaunch | null) => utils.rerender(ui(v, l)),};}@@ -324,12 +308,9 @@ function editorRegion(): HTMLElement {return region;}-// Adds a plain-shell tab via the New-chat split button's "Terminal" option — the-// path that replaced the standalone "New terminal tab" button. Opens a bare shell-// (no CLI launch), the same session the old button created.+// Adds a plain-shell tab via the terminal panel's New button.async function addTerminalTab(user: ReturnType<typeof userEvent.setup>) {- await user.click(screen.getByRole('button', { name: 'Choose what a new session starts' }));- await user.click(await screen.findByRole('menuitem', { name: 'Terminal' }));+ await user.click(screen.getByRole('button', { name: 'New terminal' }));}describe('TerminalDock multi-session', () => {@@ -348,13 +329,11 @@ describe('TerminalDock multi-session', () => {__resetLocalMenuActionBusForTests();});- test('tab strip exposes the dock-toggle + collapse buttons and no drag grip', () => {+ test('tab strip exposes the collapse button, and no way to move the dock', () => {renderDock(true);- // The dock-toggle button is the dock-move affordance now (dragging removed).- // The harness is bottom-docked, so the toggle offers "move to the right".- expect(screen.getByRole('button', { name: 'Dock sessions on the right' })).not.toBeNull();- expect(screen.getByRole('button', { name: 'Collapse session dock' })).not.toBeNull();- // The old drag grip is gone.+ expect(screen.getByRole('button', { name: 'Collapse panel' })).not.toBeNull();+ // The terminal owns the bottom edge outright: no dock-toggle, no drag grip.+ expect(screen.queryByRole('button', { name: /Dock sessions/ })).toBeNull();expect(screen.queryByRole('button', { name: 'Drag to dock the terminal' })).toBeNull();});@@ -390,6 +369,53 @@ describe('TerminalDock multi-session', () => {expect(screen.getByTestId('terminal-session').getAttribute('data-cli')).toBe('cursor');});+ test('opening an empty dock launches a bare shell when Terminal is the pick', () => {+ writePreferBareTerminal(true);+ const view = renderDock(false);++ act(() => view.rerender(true));++ expect(screen.getByTestId('terminal-session').getAttribute('data-cli')).toBe('none');+ });++ // A CLI is opt-in here. `resolveLauncherSelection` would hand back the first+ // enabled CLI with nothing picked (the right default for a composer), so the+ // dock gates on an explicit pick — otherwise a user who never chose a TUI gets+ // dropped into one. No sticky is set: `localStorage` is cleared per test.+ test('opening an empty dock with NO pick launches a bare shell, not the first enabled CLI', () => {+ const view = renderDock(false);++ act(() => view.rerender(true));++ expect(screen.getByTestId('terminal-session').getAttribute('data-cli')).toBe('none');+ });++ test('a preferred-session shortcut launches the preferred CLI', () => {+ writePreferBareTerminal(false);+ saveStickyAgent(terminalCliId('cursor'));+ renderDock(true);++ act(() => requestPreferredSession());++ const sessions = screen.getAllByTestId('terminal-session');+ expect(sessions).toHaveLength(2);+ expect(sessions[1].getAttribute('data-cli')).toBe('cursor');+ });++ // The bare-shell pick is the case that forces ⇧⌘J to resolve on its own inputs+ // rather than reusing the Ask-AI resolution, which discards it: a passage needs+ // an AI, but a promptless new session may legitimately be a plain shell.+ test('a preferred-session shortcut honors a bare-shell pick', () => {+ writePreferBareTerminal(true);+ renderDock(true);++ act(() => requestPreferredSession());++ const sessions = screen.getAllByTestId('terminal-session');+ expect(sessions).toHaveLength(2);+ expect(sessions[1].getAttribute('data-cli')).toBe('none');+ });+test('the new-terminal control adds a session, activates it, and spawns its PTY', async () => {const user = userEvent.setup();const view = renderDock(true);@@ -1147,7 +1173,7 @@ describe('TerminalDock multi-session', () => {renderDock(true);await addTerminalTab(user);- const tablist = screen.getByRole('tablist', { name: 'Sessions' });+ const tablist = screen.getByRole('tablist', { name: 'Terminal sessions' });const tabs = within(tablist).getAllByRole('tab');expect(tabs).toHaveLength(2);// Each tab's aria-controls resolves to a rendered panel (no dangling ref).@@ -1181,39 +1207,22 @@ describe('TerminalDock multi-session', () => {expect(document.activeElement).toBe(session);});- test('shows the bottom-edge "Open session dock" tab only while hidden, inside the editor column', () => {- const onReveal = vi.fn(() => {});- const view = renderDock(false, null, onReveal);-- // Hidden → the reveal tab is present, and lives inside the editor region (not- // the doc panel), since a bottom-docked terminal slides up from there.- const reveal = screen.getByRole('button', { name: 'Open session dock' });- expect(editorRegion().contains(reveal)).toBe(true);+ // The terminal deliberately has NO edge affordance: it is a ⌘J surface, and a+ // permanent tab over the editor footer's bottom-right competed with the Ask AI+ // composer for that corner. The agents panel is the one panel that keeps a tab+ // (asserted in EditorArea's suite, which owns that placement).+ test('renders no edge reveal tab, hidden or visible', () => {+ const view = renderDock(false);+ expect(screen.queryByRole('button', { name: 'Open terminal' })).toBeNull();+ expect(editorRegion().querySelector('[data-terminal-reveal]')).toBeNull();- // Visible → the reveal tab is gone (the tab strip's collapse control is the- // hide affordance while open).act(() => view.rerender(true));- expect(screen.queryByRole('button', { name: 'Open session dock' })).toBeNull();- });-- test('clicking the reveal tab requests a reveal', async () => {- const user = userEvent.setup();- const onReveal = vi.fn(() => {});- renderDock(false, null, onReveal);-- await user.click(screen.getByRole('button', { name: 'Open session dock' }));-- expect(onReveal).toHaveBeenCalledTimes(1);- });-- test('renders no reveal tab when no reveal handler is wired (web host)', () => {- renderDock(false);- expect(screen.queryByRole('button', { name: 'Open session dock' })).toBeNull();+ expect(screen.queryByRole('button', { name: 'Open terminal' })).toBeNull();});test('disables the resize handle while hidden so there is no drag-to-open', () => {const view = renderDock(false);- // Hidden: dragging up to open is gone (the reveal tab is the single way in).+ // Hidden: dragging up to open is gone (⌘J is the way back in).expect(screen.getByTestId('terminal-resize-handle').getAttribute('data-disabled')).toBe('true');// Open: the handle is live again — resize + drag-all-the-way-down-to-collapse.@@ -1222,98 +1231,10 @@ describe('TerminalDock multi-session', () => {'false',);});-- test('hides the grabber while right-docked and restores it on return to bottom', () => {- // Right-docked, terminal visible: `visible` stays true but the bottom panel is- // collapsed and empty — the handle must not render its grabber nor accept a- // drag (which would pull up an empty panel).- const view = renderDock(true);- act(() => view.rerender(true, null, 'right'));- const handle = () => screen.getByTestId('terminal-resize-handle');- expect(handle().getAttribute('data-disabled')).toBe('true');- expect(handle().getAttribute('data-with-handle')).toBe('false');-- // Dock back to bottom: the grabber returns and the handle drags again.- act(() => view.rerender(true, null, 'bottom'));- expect(handle().getAttribute('data-disabled')).toBe('false');- expect(handle().getAttribute('data-with-handle')).toBe('true');- });-});--// Regression: the focus-return effect must distinguish a genuine hide (⌘J /-// collapse / close-last → `visible` false) from a dock move, where `visible` stays-// true but `isShowing` transiently dips to false for one commit while the-// destination container's callback ref attaches. The dock-toggle button lives-// inside the portaled host, so a move starts with focus inside the host — without-// the `visible` guard, the transient dip would yank focus to the editor mid-move.-describe('TerminalSessionsHost focus-return gating across a dock move', () => {- afterEach(() => cleanup());-- function FocusHarness({- bridge,- isShowing,- visible,- onEditorFocus,- }: {- // biome-ignore lint/suspicious/noExplicitAny: test harness bridge stub- bridge: any;- isShowing: boolean;- visible: boolean;- onEditorFocus: () => void;- }) {- const [container, setContainer] = useState<HTMLDivElement | null>(null);- return (- <TooltipProvider>- <div ref={setContainer} data-testid="term-host-container" />- <TerminalSessionsHost- bridge={bridge}- visible={visible}- onVisibleChange={() => {}}- launch={null}- container={container}- isShowing={isShowing}- onRequestEditorFocus={onEditorFocus}- dockPosition="right"- onToggleDock={() => {}}- />- </TooltipProvider>- );- }-- test('a dock move keeps focus (visible stays true); a genuine hide returns focus to the editor', () => {- const onEditorFocus = vi.fn(() => {});- const { bridge } = makeBridge();- const ui = (isShowing: boolean, visible: boolean) => (- <FocusHarness- bridge={bridge}- isShowing={isShowing}- visible={visible}- onEditorFocus={onEditorFocus}- />- );- const { rerender } = render(ui(true, true));-- // One session is seeded (visible at mount); put focus inside the portaled host.- const sink = document.querySelector<HTMLElement>(- '[data-terminal-session] .xterm-helper-textarea',- );- act(() => sink?.focus());- expect(onEditorFocus).not.toHaveBeenCalled();-- // Dock-move transient: isShowing dips to false while visible stays true. Focus- // must NOT be yanked to the editor.- act(() => rerender(ui(false, true)));- expect(onEditorFocus).not.toHaveBeenCalled();-- // Genuine hide: visible flips false → focus returns to the editor.- act(() => rerender(ui(false, false)));- expect(onEditorFocus).toHaveBeenCalled();- });});// The behavior-preservation contract for the terminal session model-// (TerminalSessionsHost, shared by the dock and the standalone terminal-// window): these five behaviors (close-last collapse, seed-on-reveal,+// (SessionsHost, shared by the dock and the standalone terminal window): these five behaviors (close-last collapse, seed-on-reveal,// single-tab-per-launch-nonce, Cmd+number tab switch, close-active-neighbor// focus) are the ones most easily broken when the dock's container wiring and// the shared session core drift out of lockstep. Kept as a discrete, minimal@@ -1484,7 +1405,6 @@ describe('TerminalDock hidden-dock invariant', () => {event: 'ok-terminal-dock-stranded-while-hidden',panelPx: 588,panelPct: 42.5,- dockPosition: 'bottom',visible: false,});// Viewport geometry is the half that distinguishes a height clamped for thediff --git a/packages/app/src/components/TerminalDock.reload-survival.dom.test.tsx b/packages/app/src/components/TerminalDock.reload-survival.dom.test.tsxindex 644110833..ea5575990 100644--- a/packages/app/src/components/TerminalDock.reload-survival.dom.test.tsx+++ b/packages/app/src/components/TerminalDock.reload-survival.dom.test.tsx@@ -99,11 +99,11 @@ vi.doMock('@/lib/terminal-height-store', () => ({}));const { TerminalDock } = await import('./TerminalDock');-const { TerminalSessionsHost } = await import('./TerminalSessionsHost');+const { SessionsHost } = await import('./SessionsHost');// Mirror EditorArea's wiring: the TerminalDock shell exposes the bottom mount, and-// the once-mounted TerminalSessionsHost (which now owns the session collection +-// reload rehydration) portals the live sessions into it. The rehydration the+// the once-mounted SessionsHost (which owns the session collection + reload+// rehydration) portals the live sessions into it. The rehydration the// renderer half is responsible for lives in the host, so reload-survival is// asserted through this pair, not TerminalDock alone.function ReloadHarness({@@ -121,14 +121,15 @@ function ReloadHarness({<TerminalDockvisible={visible}onVisibleChange={() => {}}- dockPosition="bottom"onBottomContainer={setBottomContainer}onEditorRegion={() => {}}><div data-testid="editor-child" /></TerminalDock>- <TerminalSessionsHost+ <SessionsHost+ surface="terminal-dock"bridge={bridge}+ terminalCapablevisible={visible}onVisibleChange={() => {}}// biome-ignore lint/suspicious/noExplicitAny: test launch shape@@ -136,8 +137,6 @@ function ReloadHarness({container={bottomContainer}isShowing={visible && bottomContainer != null}onRequestEditorFocus={() => {}}- dockPosition="bottom"- onToggleDock={() => {}}/></TooltipProvider>);@@ -238,7 +237,7 @@ describe('issue #351 — the terminal dock rehydrates surviving sessions after a// Tabs come back in main's returned (reordered) order with the custom names// restored; the un-named survivor falls back to its RESTORED sticky ordinal// (Terminal 1), not a positional renumber to Terminal 2.- const tablist = screen.getByRole('tablist', { name: 'Sessions' });+ const tablist = screen.getByRole('tablist', { name: 'Terminal sessions' });const tabs = within(tablist).getAllByRole('tab');expect(tabs.map((tab) => tab.textContent)).toEqual(['deploy', 'Terminal 1', 'logs']);});diff --git a/packages/app/src/components/TerminalDock.tsx b/packages/app/src/components/TerminalDock.tsxindex 29352744a..afd6824df 100644--- a/packages/app/src/components/TerminalDock.tsx+++ b/packages/app/src/components/TerminalDock.tsx@@ -2,14 +2,12 @@ import { useTheme } from 'next-themes';import { type ReactNode, useEffect, useRef, useState } from 'react';import { usePanelRef } from 'react-resizable-panels';import { ResizableHandle, ResizablePanel, ResizablePanelGroup } from '@/components/ui/resizable';-import type { TerminalDockPosition } from '@/lib/terminal-dock-store';import {clampTerminalHeight,getInitialTerminalHeight,writeTerminalHeight,} from '@/lib/terminal-height-store';import { cn } from '@/lib/utils';-import { TerminalRevealTab } from './TerminalRevealTab';import { useLiveXtermTheme } from './use-live-xterm-theme';const TERMINAL_PANEL_ID = 'terminal-dock-panel';@@ -26,23 +24,14 @@ interface TerminalDockProps {/** The editor chrome (header + area) the terminal docks beneath. */readonly children: ReactNode;/**- * Controlled visibility. The bottom panel opens when the terminal is bottom-- * docked AND visible; drag-collapsing it reports back through {@link onVisibleChange}.+ * Controlled visibility. Drag-collapsing the bottom panel reports back through+ * {@link onVisibleChange}.*/readonly visible: boolean;readonly onVisibleChange: (visible: boolean) => void;- /**- * Where the terminal is docked. `'bottom'` opens this component's bottom panel;- * `'right'` keeps it collapsed (the terminal lives in the right region — the- * live session host portals into that container instead, mounted above this- * component so a dock change never remounts it).- */- readonly dockPosition?: TerminalDockPosition;/*** Callback ref reporting the bottom-dock mount element up to EditorArea, which- * passes it to the session host as a portal target. The host div lands here when- * the terminal is bottom-docked; when right-docked the host attaches to the- * right column's container instead and this bottom panel stays collapsed + empty.+ * passes it to the terminal session host as a portal target.*/readonly onBottomContainer: (el: HTMLDivElement | null) => void;/**@@ -50,19 +39,6 @@ interface TerminalDockProps {* the session host to return focus to the editor when the terminal hides.*/readonly onEditorRegion: (el: HTMLDivElement | null) => void;- /**- * Reveal the sessions dock, launching the user's preferred New-session choice- * if none is open. Wired to the edge "Open session dock" tab this shell renders at- * the bottom of the editor region when {@link showRevealTab} is set. The- * right-dock reveal tab is owned by EditorArea instead (different container).- */- readonly onReveal?: () => void;- /**- * Whether to render the bottom edge reveal tab. EditorArea owns the predicate- * (dock-hidden with a reason to reveal: a terminal surface, or latched tabs to- * return to on the web host), so this shell just renders it when told.- */- readonly showRevealTab?: boolean;}/**@@ -70,33 +46,21 @@ interface TerminalDockProps {* editor on top and a collapsible bottom panel beneath. It owns the bottom panel's* height (persist + drag) and collapse, and exposes the bottom mount + editor* region elements. It deliberately owns NO session state — the live terminal lives- * in {@link TerminalSessionsHost}, mounted above the panel group, and portals into- * the bottom mount this component renders. That separation is what lets the- * terminal move docks (and the editor re-render) without re-spawning the PTY.+ * in {@link SessionsHost}, mounted above the panel group, and portals into+ * the bottom mount this component renders. That separation is what lets the editor+ * re-render (and the view kind change) without re-spawning the PTY.*/export function TerminalDock({children,visible,onVisibleChange,- dockPosition = 'bottom',onBottomContainer,onEditorRegion,- onReveal,- showRevealTab = false,}: TerminalDockProps) {const { resolvedTheme } = useTheme();const panelRef = usePanelRef();const [isCollapsed, setIsCollapsed] = useState(!visible);const xtermBackground = useLiveXtermTheme(resolvedTheme).background;- // A right-docked terminal keeps `visible` true while this panel sits collapsed- // and empty — the handle must gate on this, not `visible`, or the grabber- // lingers and drags up an empty panel.- const bottomOpen = visible && dockPosition === 'bottom';- // The edge "Show sessions" tab belongs to the bottom dock only — it hugs the- // bottom of the editor column, where a bottom-docked dock slides up from.- // EditorArea owns the predicate (dock hidden + a reason to reveal).- const showBottomRevealTab = showRevealTab && dockPosition === 'bottom' && onReveal != null;-// Snapshot the persisted height once at mount; the ref carries the running value// during user drag.const [initialHeightPx] = useState(() => getInitialTerminalHeight());@@ -129,7 +93,6 @@ export function TerminalDock({event: 'ok-terminal-dock-stranded-while-hidden',panelPx: Math.round(panelPx),panelPct: Number.isFinite(panelPct) ? Math.round(panelPct * 10) / 10 : null,- dockPosition,visible,// The height this shell would reopen at. Reading it against `innerHeight`// is what distinguishes a value clamped for the current viewport from one@@ -158,13 +121,12 @@ export function TerminalDock({);// Drive the panel from the controlled prop: restore the persisted height when- // bottom-docked and visible, collapse otherwise (hidden, or right-docked where- // the terminal lives in the right region).+ // visible, collapse when hidden.useEffect(() => {const panel = panelRef.current;if (panel == null) return;try {- if (bottomOpen) {+ if (visible) {panel.resize(`${heightPxRef.current}px`);} else {panel.collapse();@@ -173,10 +135,10 @@ export function TerminalDock({// The imperative panel handles throw once their group has unregistered// (same reason EditorArea's assertRightRailLayout wraps its calls). A throw// means the panel never resized, so no onResize fires and the invariant- // guard cannot see it: recovery is the next `bottomOpen` transition+ // guard cannot see it: recovery is the next `visible` transition// re-running this effect, or any later change to the panel's own box.}- }, [bottomOpen, panelRef]);+ }, [visible, panelRef]);// The persisted height is viewport-relative: `readTerminalHeight` caps it at// 50vh, but only at read time, and this shell snapshots it once at mount. A@@ -190,7 +152,7 @@ export function TerminalDock({const next = clampTerminalHeight(heightPxRef.current);if (next === heightPxRef.current) return;heightPxRef.current = next;- if (!bottomOpen) return;+ if (!visible) return;try {panelRef.current?.resize(`${next}px`);} catch {@@ -199,7 +161,7 @@ export function TerminalDock({};window.addEventListener('resize', reclampToViewport);return () => window.removeEventListener('resize', reclampToViewport);- }, [bottomOpen, panelRef]);+ }, [visible, panelRef]);return (<ResizablePanelGroup@@ -209,36 +171,26 @@ export function TerminalDock({><ResizablePanel minSize="5%" className="flex min-h-0 flex-col">{/* tabIndex -1 makes this a programmatic focus target for focus-return on- collapse without adding it to the tab order. `relative` anchors the- bottom-dock reveal tab to the bottom of the editor column. */}+ collapse without adding it to the tab order. */}<divref={onEditorRegion}tabIndex={-1}className="relative flex h-full min-h-0 flex-col outline-none">{children}- {showBottomRevealTab && onReveal ? (- <TerminalRevealTab- dockPosition="bottom"- onReveal={onReveal}- className="right-3 bottom-0"- />- ) : null}</div></ResizablePanel>- {/* The handle drags only while the bottom panel is open: you can resize it,- and drag all the way down to collapse (hide). Otherwise it is disabled —- when bottom-docked-and-hidden the reveal tab rendered above is the single- way back in, and when right-docked the ways in live outside this file- (EditorArea's reveal tab; the tab strip's dock-toggle) — so there is no- drag-up-to-open (which would be a second, redundant way in). Gating on+ {/* The handle drags only while the panel is open: you can resize it, and+ drag all the way down to collapse (hide). While hidden it is disabled —+ the terminal has no edge tab, so ⌘J (or the View menu) is the way back+ in and drag-up-to-open would be a hidden second entry point. Gating oncontrolled props (not `isCollapsed`) means an in-progress drag-to-collapsecompletes before the handle disables on the next commit. */}<ResizableHandle- withHandle={bottomOpen}- disabled={!bottomOpen}+ withHandle={visible}+ disabled={!visible}onPointerDown={() => {- if (!bottomOpen) return;+ if (!visible) return;setIsDragging(true);isDraggingRef.current = true;const handleUp = () => {@@ -258,7 +210,7 @@ export function TerminalDock({// the terminal — no app-background seam between the strip and canvas.style={{ backgroundColor: xtermBackground }}panelRef={panelRef}- defaultSize={bottomOpen ? `${initialHeightPx}px` : 0}+ defaultSize={visible ? `${initialHeightPx}px` : 0}minSize="120px"// The terminal can be dragged tall — up to 95% of the dock — leaving the// editor a 5% sliver (its panel `minSize`). Pair the two: the terminal's max@@ -270,9 +222,9 @@ export function TerminalDock({const collapsed = size.asPercentage === 0;setIsCollapsed(collapsed);// Invariant: the bottom panel occupies ZERO height whenever the dock is- // not open (hidden, or right-docked). The `bottomOpen` effect asserts- // that only on a TRANSITION, so any path leaving the panel expanded- // without flipping `bottomOpen` — a library re-layout, or a collapse+ // hidden. The `visible` effect asserts that only on a TRANSITION, so+ // any path leaving the panel expanded without flipping `visible` — a+ // library re-layout, or a collapse// issued while the group was unmeasurable and therefore discarded —// strands the editor behind an empty band with no dock chrome and// nothing left to re-assert it. This is the panel's own resize signal,@@ -284,7 +236,7 @@ export function TerminalDock({// `asPercentage` NaN, which compares false against 0 and would read as// "expanded", firing this guard spuriously on a panel that has no size// at all.- if (!bottomOpen && size.inPixels > 0 && !isDraggingRef.current) {+ if (!visible && size.inPixels > 0 && !isDraggingRef.current) {reportStrandedDock(size.inPixels, size.asPercentage);try {panelRef.current?.collapse();@@ -315,7 +267,7 @@ export function TerminalDock({'transition-[flex-grow] duration-150 ease-out motion-reduce:transition-none motion-reduce:duration-0',)}>- {/* Mount point for the session host's stable host div when bottom-docked. */}+ {/* Mount point for the terminal host's stable host div. */}<div ref={onBottomContainer} className="flex min-h-0 flex-1 flex-col overflow-hidden" /></ResizablePanel></ResizablePanelGroup>diff --git a/packages/app/src/components/TerminalNewChatButton.tsx b/packages/app/src/components/TerminalNewChatButton.tsxindex c7871a4a0..71d8848a9 100644--- a/packages/app/src/components/TerminalNewChatButton.tsx+++ b/packages/app/src/components/TerminalNewChatButton.tsx@@ -106,6 +106,7 @@ export function TerminalNewChatButton({});const maxThreads = catalog.data?.maxThreads ?? 8;const atCap = liveThreadCount >= maxThreads;+ const hasMenu = showAgents || showClis;// The `t` template macro is scope-bound, so the label is computed inline here// rather than in a helper that receives `t` as an argument.@@ -128,10 +129,15 @@ export function TerminalNewChatButton({size="xs"aria-label={primaryLabel}data-testid="terminal-new-chat"- className="cursor-pointer gap-0.5 rounded-r-none px-1.5 text-muted-foreground hover:text-foreground"+ className={cn(+ 'cursor-pointer gap-0.5 px-1.5 text-muted-foreground hover:text-foreground',+ hasMenu && 'rounded-r-none',+ )}onClick={onLaunchSelected}>- <NewSessionPrimaryIcon selected={selected} className="size-3.5" />+ {selected.kind === 'terminal' ? null : (+ <NewSessionPrimaryIcon selected={selected} className="size-3.5" />+ )}<PlusIcon aria-hidden="true" className="size-3" /></Button></TooltipTrigger>@@ -140,18 +146,20 @@ export function TerminalNewChatButton({</TooltipContent></Tooltip><DropdownMenu open={menuOpen} onOpenChange={setMenuOpen}>- <DropdownMenuTrigger asChild>- <Button- type="button"- variant="ghost"- size="icon-xs"- aria-label={t`Choose what a new session starts`}- data-testid="terminal-new-chat-menu"- className="cursor-pointer rounded-l-none text-muted-foreground hover:text-foreground"- >- <ChevronDownIcon aria-hidden="true" className="size-3" />- </Button>- </DropdownMenuTrigger>+ {hasMenu ? (+ <DropdownMenuTrigger asChild>+ <Button+ type="button"+ variant="ghost"+ size="icon-xs"+ aria-label={t`Choose what a new session starts`}+ data-testid="terminal-new-chat-menu"+ className="cursor-pointer rounded-l-none text-muted-foreground hover:text-foreground"+ >+ <ChevronDownIcon aria-hidden="true" className="size-3" />+ </Button>+ </DropdownMenuTrigger>+ ) : null}<DropdownMenuContent align="start" className="max-h-80 min-w-[200px]">{/* Same section structure as the Ask-AI menus — an "In this app" groupover the agent rows, a "Terminal" group over the CLIs, and adiff --git a/packages/app/src/components/TerminalRevealTab.dom.test.tsx b/packages/app/src/components/TerminalRevealTab.dom.test.tsxindex aae0d1eda..a8b308b0c 100644--- a/packages/app/src/components/TerminalRevealTab.dom.test.tsx+++ b/packages/app/src/components/TerminalRevealTab.dom.test.tsx@@ -4,13 +4,16 @@ import { afterEach, describe, expect, test, vi } from 'vitest';import { TooltipProvider } from '@/components/ui/tooltip';import { TerminalRevealTab } from './TerminalRevealTab';-function renderTab(dockPosition: 'bottom' | 'right') {+/** The two panels' labels, so a rename in the component fails one place here. */+const LABEL = { bottom: 'Open terminal', right: 'Open agents panel' } as const;++function renderTab(edge: 'bottom' | 'right') {const onReveal = vi.fn(() => {});render(// The app mounts a root TooltipProvider (main.tsx); supply one here so the// reveal tab's tooltip has its context in isolation.<TooltipProvider>- <TerminalRevealTab dockPosition={dockPosition} onReveal={onReveal} />+ <TerminalRevealTab edge={edge} onReveal={onReveal} /></TooltipProvider>,);return { onReveal };@@ -19,29 +22,36 @@ function renderTab(dockPosition: 'bottom' | 'right') {describe('TerminalRevealTab', () => {afterEach(() => cleanup());- test('exposes an "Open session dock" control and fires onReveal on click', async () => {+ test('names the panel it reopens and fires onReveal on click', async () => {const user = userEvent.setup();const { onReveal } = renderTab('right');- await user.click(screen.getByRole('button', { name: 'Open session dock' }));+ await user.click(screen.getByRole('button', { name: LABEL.right }));expect(onReveal).toHaveBeenCalledTimes(1);});+ test('labels each edge for its own panel, so the two are never confusable', () => {+ renderTab('right');+ expect(screen.getByRole('button', { name: LABEL.right })).toBeTruthy();+ expect(screen.queryByRole('button', { name: LABEL.bottom })).toBeNull();+ cleanup();++ renderTab('bottom');+ expect(screen.getByRole('button', { name: LABEL.bottom })).toBeTruthy();+ expect(screen.queryByRole('button', { name: LABEL.right })).toBeNull();+ });+test('marks which edge it hugs so it sits where the collapse control was', () => {renderTab('right');expect(- screen- .getByRole('button', { name: 'Open session dock' })- .getAttribute('data-terminal-reveal'),+ screen.getByRole('button', { name: LABEL.right }).getAttribute('data-terminal-reveal'),).toBe('right');cleanup();renderTab('bottom');expect(- screen- .getByRole('button', { name: 'Open session dock' })- .getAttribute('data-terminal-reveal'),+ screen.getByRole('button', { name: LABEL.bottom }).getAttribute('data-terminal-reveal'),).toBe('bottom');});@@ -49,9 +59,9 @@ describe('TerminalRevealTab', () => {const user = userEvent.setup();renderTab('bottom');- await user.hover(screen.getByRole('button', { name: 'Open session dock' }));+ await user.hover(screen.getByRole('button', { name: LABEL.bottom }));const tooltip = await screen.findByRole('tooltip');- expect(tooltip.textContent).toContain('Open session dock');+ expect(tooltip.textContent).toContain(LABEL.bottom);});});diff --git a/packages/app/src/components/TerminalRevealTab.tsx b/packages/app/src/components/TerminalRevealTab.tsxindex 83c954da4..9271781d6 100644--- a/packages/app/src/components/TerminalRevealTab.tsx+++ b/packages/app/src/components/TerminalRevealTab.tsx@@ -2,41 +2,44 @@ 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 type { TerminalDockPosition } from '@/lib/terminal-dock-store';import { cn } from '@/lib/utils';+import type { SessionPanelEdge } from './TerminalTabStrip';interface TerminalRevealTabProps {- /** Where the terminal was docked — decides the chevron direction, the edge the- * tab is flush against, and the tooltip side so it sits right where the- * collapse control was. */- readonly dockPosition: TerminalDockPosition;- /** Reveal the sessions dock (and launch the preferred session if none is open). */+ /** Which edge the hidden panel lives on — decides the chevron direction, the+ * edge the tab is flush against, and the tooltip side so it sits right where+ * the collapse control was. */+ readonly edge: SessionPanelEdge;+ /** Reveal the panel (and launch the preferred session if none is open). */readonly onReveal: () => void;/** Absolute-placement offsets from the call site (which edge/corner it pins to).- * The caller owns placement because the two dock positions attach to different+ * The caller owns placement because the two panels attach to different* containers — the right column edge vs. the bottom of the editor column. */readonly className?: string;}/**- * Persistent "Open session dock" affordance shown only while the sessions dock is hidden.- * The header chat toggle is one icon among many and reads ambiguously; this tab- * hugs the same edge the terminal lives on so a user who collapsed or closed the- * terminal has an obvious, in-place way to bring it back — right where the+ * Persistent "reopen this panel" affordance shown only while a session panel is+ * hidden. The header chat toggle is one icon among many and reads ambiguously;+ * this tab hugs the same edge the panel lives on so a user who collapsed or+ * closed it has an obvious, in-place way to bring it back — right where the* collapse control was.** The chevron is the inverse of the tab strip's collapse control (which points- * the way the panel slides shut): a right-docked terminal reveals with a- * left-pointing chevron on the right edge, a bottom-docked one with an up-pointing- * chevron on the bottom edge. Placement differs by dock — the right-dock tab pins- * to the far-right column edge (EditorArea), the bottom-dock tab to the bottom of- * the editor column (TerminalDock), since that is where each terminal actually- * lives — so the caller passes the offset `className`.+ * the way the panel slides shut): the right-edge agents panel reveals with a+ * left-pointing chevron, a bottom-edge panel with an up-pointing one. The caller+ * passes the offset `className` because placement follows the panel's own+ * container, not this component's.+ *+ * The AGENTS PANEL is the only consumer: the terminal is a ⌘J surface with no+ * edge tab. `edge` stays parameterized (and both directions stay tested) because+ * the geometry is the component's whole job — hardcoding `right` would bury a+ * layout decision that belongs to the caller.*/-export function TerminalRevealTab({ dockPosition, onReveal, className }: TerminalRevealTabProps) {+export function TerminalRevealTab({ edge, onReveal, className }: TerminalRevealTabProps) {const { t } = useLingui();- const rightDocked = dockPosition === 'right';- const label = t`Open session dock`;+ const rightEdge = edge === 'right';+ const label = rightEdge ? t`Open agents panel` : t`Open terminal`;return (<Tooltip><TooltipTrigger asChild>@@ -45,24 +48,24 @@ export function TerminalRevealTab({ dockPosition, onReveal, className }: Terminavariant="outline"size="icon-sm"aria-label={label}- data-terminal-reveal={dockPosition}+ data-terminal-reveal={edge}onClick={onReveal}className={cn('absolute z-20 shrink-0 bg-background text-muted-foreground shadow-sm hover:text-foreground',// Flush to the edge: drop the border + rounding on the side that meets// the window so the tab reads as attached to that edge.- rightDocked ? 'rounded-r-none border-r-0' : 'rounded-b-none border-b-0',+ rightEdge ? 'rounded-r-none border-r-0' : 'rounded-b-none border-b-0',className,)}>- {rightDocked ? (+ {rightEdge ? (<ChevronLeftIcon aria-hidden="true" />) : (<ChevronUpIcon aria-hidden="true" />)}</Button></TooltipTrigger>- <TooltipContent side={rightDocked ? 'left' : 'top'} sideOffset={8}>+ <TooltipContent side={rightEdge ? 'left' : 'top'} sideOffset={8}>{label}</TooltipContent></Tooltip>diff --git a/packages/app/src/components/TerminalTabStrip.dom.test.tsx b/packages/app/src/components/TerminalTabStrip.dom.test.tsxindex 0a98690bf..3eaea1a04 100644--- a/packages/app/src/components/TerminalTabStrip.dom.test.tsx+++ b/packages/app/src/components/TerminalTabStrip.dom.test.tsx@@ -23,7 +23,7 @@ function stubNewButton(onClick: () => void) {function renderStrip(props?: {sessions?: readonly TerminalTabDescriptor[];activeSessionId?: string;- dockPosition?: 'bottom' | 'right';+ edge?: 'bottom' | 'right';draggable?: boolean;/** Omit the rename handler to assert the affordance is inert without it. */renameDisabled?: boolean;@@ -35,13 +35,12 @@ function renderStrip(props?: {const onNewButtonClick = vi.fn(() => {});const onClose = vi.fn((_id: string) => {});const onRename = vi.fn((_id: string, _label: string) => {});- const onToggleDock = vi.fn(() => {});const onCollapse = vi.fn(() => {});const view = render(// The app mounts a root TooltipProvider (main.tsx); the strip's control// tooltips need that context, so the isolated render supplies its own.// `draggable` mirrors the standalone terminal window's prop shape (same- // chrome, no dock/collapse controls); the default mirrors the dock.+ // chrome, no collapse control); the default mirrors a docked panel.<TooltipProvider><TerminalTabStripsessions={props?.sessions ?? SESSIONS}@@ -58,8 +57,7 @@ function renderStrip(props?: {}onClose={onClose}onRename={props?.renameDisabled ? undefined : onRename}- dockPosition={props?.draggable ? undefined : (props?.dockPosition ?? 'bottom')}- onToggleDock={props?.draggable ? undefined : onToggleDock}+ edge={props?.draggable ? undefined : (props?.edge ?? 'bottom')}onCollapse={props?.draggable ? undefined : onCollapse}draggable={props?.draggable}/>@@ -71,7 +69,6 @@ function renderStrip(props?: {onNewButtonClick,onClose,onRename,- onToggleDock,onCollapse,rerender: view.rerender,};@@ -82,11 +79,25 @@ describe('TerminalTabStrip', () => {test('renders one tab per session inside a labeled tablist', () => {renderStrip();- const tablist = screen.getByRole('tablist', { name: 'Sessions' });+ const tablist = screen.getByRole('tablist', { name: 'Terminal sessions' });const tabs = within(tablist).getAllByRole('tab');expect(tabs.map((tab) => tab.textContent)).toEqual(['Terminal 1', 'Terminal 2', 'Terminal 3']);});+ // Both panels can be open at once, so a shared "Sessions" name would leave a+ // screen-reader user with two indistinguishable tablists (WCAG 1.3.1). The+ // names must differ by edge, not merely exist.+ test('names the tablist for its own panel so two open panels are distinguishable', () => {+ renderStrip({ edge: 'right' });+ expect(screen.getByRole('tablist', { name: 'Agent sessions' })).toBeTruthy();+ expect(screen.queryByRole('tablist', { name: 'Terminal sessions' })).toBeNull();++ cleanup();+ renderStrip({ edge: 'bottom' });+ expect(screen.getByRole('tablist', { name: 'Terminal sessions' })).toBeTruthy();+ expect(screen.queryByRole('tablist', { name: 'Agent sessions' })).toBeNull();+ });+test('hovering a tab surfaces the full (untruncated) title in a tooltip', async () => {const user = userEvent.setup();// A process-set OSC title long enough to hard-clip at the tab's max width;@@ -124,7 +135,7 @@ describe('TerminalTabStrip', () => {renderStrip({ activeSessionId: 's3' });expect(scrolled.some((element) => element.getAttribute('data-tab-id') === 's3')).toBe(true);expect(- within(screen.getByRole('tablist', { name: 'Sessions' }))+ within(screen.getByRole('tablist', { name: 'Terminal sessions' })).getAllByRole('tab').map((tab) => tab.textContent),).toEqual(['Terminal 1', 'Terminal 2', 'Terminal 3']);@@ -192,33 +203,29 @@ describe('TerminalTabStrip', () => {expect(onSelect).not.toHaveBeenCalled();});- test('the New button hugs the last tab, preceding the trailing dock-toggle / collapse controls', () => {+ test('the New button hugs the last tab, preceding the trailing collapse control', () => {renderStrip();const newButton = screen.getByRole('button', { name: 'New session' });- const dockToggle = screen.getByRole('button', { name: 'Dock sessions on the right' });- const collapse = screen.getByRole('button', { name: 'Collapse session dock' });+ const collapse = screen.getByRole('button', { name: 'Collapse panel' });// The New button sits immediately right of the tablist; the spacer pushes the- // trailing group (dock-toggle … collapse) to the far right.- expect(- newButton.compareDocumentPosition(dockToggle) & Node.DOCUMENT_POSITION_FOLLOWING,- ).toBeTruthy();+ // trailing group to the far right.expect(- dockToggle.compareDocumentPosition(collapse) & Node.DOCUMENT_POSITION_FOLLOWING,+ newButton.compareDocumentPosition(collapse) & Node.DOCUMENT_POSITION_FOLLOWING,).toBeTruthy();});- test('trailing controls render at the far right, immediately left of the dock-toggle', () => {+ test('trailing controls render at the far right, immediately left of the collapse control', () => {renderStrip({ withTrailing: true });const trailing = screen.getByRole('button', { name: 'Restore sessions' });const newButton = screen.getByRole('button', { name: 'New session' });- const dockToggle = screen.getByRole('button', { name: 'Dock sessions on the right' });+ const collapse = screen.getByRole('button', { name: 'Collapse panel' });// The New button hugs the tabs on the left; the trailing control sits in the- // far-right cluster, before the dock-toggle.+ // far-right cluster, before the collapse control.expect(newButton.compareDocumentPosition(trailing) & Node.DOCUMENT_POSITION_FOLLOWING,).toBeTruthy();expect(- trailing.compareDocumentPosition(dockToggle) & Node.DOCUMENT_POSITION_FOLLOWING,+ trailing.compareDocumentPosition(collapse) & Node.DOCUMENT_POSITION_FOLLOWING,).toBeTruthy();});@@ -234,29 +241,21 @@ describe('TerminalTabStrip', () => {expect(onNewButtonClick).not.toHaveBeenCalled();});- test('the dock-toggle reports onToggleDock and labels the resulting position', async () => {- const user = userEvent.setup();- // Bottom-docked → the toggle moves it to the right.- const bottom = renderStrip({ dockPosition: 'bottom' });- const toRight = screen.getByRole('button', { name: 'Dock sessions on the right' });- await user.click(toRight);- expect(bottom.onToggleDock).toHaveBeenCalledTimes(1);- expect(screen.queryByRole('button', { name: 'Dock sessions at the bottom' })).toBeNull();+ // Each panel owns one edge now, so the strip offers no way to move it — a+ // leftover dock-toggle would be a control with nothing to do.+ test('offers no dock-position control on either edge', () => {+ renderStrip({ edge: 'bottom' });+ expect(screen.queryByRole('button', { name: /Dock sessions/ })).toBeNull();cleanup();-- // Right-docked → the toggle moves it to the bottom (label flips).- const right = renderStrip({ dockPosition: 'right' });- const toBottom = screen.getByRole('button', { name: 'Dock sessions at the bottom' });- await user.click(toBottom);- expect(right.onToggleDock).toHaveBeenCalledTimes(1);- expect(screen.queryByRole('button', { name: 'Dock sessions on the right' })).toBeNull();+ renderStrip({ edge: 'right' });+ expect(screen.queryByRole('button', { name: /Dock sessions/ })).toBeNull();});test('the collapse control reports onCollapse and never onClose / new-button', async () => {const user = userEvent.setup();const { onCollapse, onClose, onNewButtonClick } = renderStrip();- await user.click(screen.getByRole('button', { name: 'Collapse session dock' }));+ await user.click(screen.getByRole('button', { name: 'Collapse panel' }));expect(onCollapse).toHaveBeenCalledTimes(1);expect(onClose).not.toHaveBeenCalled();@@ -270,8 +269,7 @@ describe('TerminalTabStrip', () => {test('every strip-owned icon-only control exposes an accessible name', () => {renderStrip();- expect(screen.getByRole('button', { name: 'Dock sessions on the right' })).toBeDefined();- expect(screen.getByRole('button', { name: 'Collapse session dock' })).toBeDefined();+ expect(screen.getByRole('button', { name: 'Collapse panel' })).toBeDefined();for (const label of ['Terminal 1', 'Terminal 2', 'Terminal 3']) {expect(screen.getByRole('button', { name: `Close ${label}` })).toBeDefined();}@@ -283,10 +281,9 @@ describe('TerminalTabStrip', () => {test('window mode marks the bar as the draggable macOS title region; dock mode does not', () => {renderStrip({ draggable: true });expect(document.querySelector('[data-electron-drag]')).not.toBeNull();- // The window has no dock-toggle/collapse — window management is the OS- // title bar's job — but keeps the New button (feature parity).- expect(screen.queryByRole('button', { name: /Dock sessions/ })).toBeNull();- expect(screen.queryByRole('button', { name: 'Collapse session dock' })).toBeNull();+ // The window has no collapse control — window management is the OS title+ // bar's job — but keeps the New button (feature parity).+ expect(screen.queryByRole('button', { name: 'Collapse panel' })).toBeNull();expect(screen.getByRole('button', { name: 'New session' })).toBeDefined();cleanup();renderStrip();@@ -451,8 +448,7 @@ describe('TerminalTabStrip', () => {newButton={stubNewButton(() => {})}onClose={() => {}}onRename={() => {}}- dockPosition="bottom"- onToggleDock={() => {}}+ edge="bottom"onCollapse={() => {}}/></TooltipProvider>,@@ -482,7 +478,7 @@ describe('TerminalTabStrip', () => {expect(document.querySelectorAll('[data-terminal-tab-sortable]')).toHaveLength(3);// The dnd-kit wrapper is not focusable and adds no role — the Radix tablist// still sees exactly three tabs.- const tablist = screen.getByRole('tablist', { name: 'Sessions' });+ const tablist = screen.getByRole('tablist', { name: 'Terminal sessions' });expect(within(tablist).getAllByRole('tab')).toHaveLength(3);expect(within(tablist).queryAllByRole('button', { name: /^Terminal/ })).toHaveLength(0);});diff --git a/packages/app/src/components/TerminalTabStrip.tsx b/packages/app/src/components/TerminalTabStrip.tsxindex 11320312d..bccd6eb6a 100644--- a/packages/app/src/components/TerminalTabStrip.tsx+++ b/packages/app/src/components/TerminalTabStrip.tsx@@ -6,19 +6,12 @@ import {useSortable,} from '@dnd-kit/sortable';import { Trans, useLingui } from '@lingui/react/macro';-import {- ChevronDownIcon,- ChevronRightIcon,- PanelBottomIcon,- PanelRightIcon,- XIcon,-} from 'lucide-react';+import { ChevronDownIcon, ChevronRightIcon, XIcon } from 'lucide-react';import { type ReactNode, useEffect, useRef, useState } from 'react';import { Button } from '@/components/ui/button';import { InputGroup, InputGroupInput } from '@/components/ui/input-group';import { Tabs, TabsList, TabsTrigger } from '@/components/ui/tabs';import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip';-import type { TerminalDockPosition } from '@/lib/terminal-dock-store';import { cn } from '@/lib/utils';import {createTabReorderModifier,@@ -94,6 +87,11 @@ export interface TerminalTabDescriptor {readonly icon?: ReactNode;}+/** Which edge of the editor a session panel occupies. The terminal dock owns the+ * bottom, the agents panel owns the right; the strip only needs it to point the+ * collapse chevron the way the panel slides shut. */+export type SessionPanelEdge = 'bottom' | 'right';+interface TerminalTabStripProps {/** Sessions in tab order. */readonly sessions: readonly TerminalTabDescriptor[];@@ -113,7 +111,7 @@ interface TerminalTabStripProps {* container so the fade mask never clips it. */readonly newButton?: ReactNode;/** Host-provided trailing control(s), rendered at the far right immediately- * before the dock-toggle/collapse buttons (e.g. the conversation-history menu). */+ * before the collapse button (e.g. the conversation-history menu). */readonly trailingControls?: ReactNode;/** Fires with the session id when the user closes a tab. */readonly onClose: (id: string) => void;@@ -135,14 +133,11 @@ interface TerminalTabStripProps {* the ⌘⇧←/→ keyboard-reorder chord while a drag is in flight.*/readonly onDragActiveChange?: (active: boolean) => void;- /** Where the terminal is currently docked — drives the dock-toggle + collapse- * button icons/labels. Absent on the standalone terminal window (nothing to- * dock or collapse — the window is the terminal). */- readonly dockPosition?: TerminalDockPosition;- /** Fires when the user flips the dock between bottom and right. The toggle- * button renders only when provided. */- readonly onToggleDock?: () => void;- /** Fires when the user collapses (hides) the terminal — sessions stay alive.+ /** Which edge this panel occupies — drives the collapse chevron's direction.+ * Absent on the standalone terminal window (nothing to collapse — the window+ * is the terminal). */+ readonly edge?: SessionPanelEdge;+ /** Fires when the user collapses (hides) the panel — sessions stay alive.* The collapse button renders only when provided. */readonly onCollapse?: () => void;/**@@ -167,9 +162,9 @@ interface TerminalTabStripProps {}/**- * Controlled tab widget for the terminal's concurrent sessions. Holds no+ * Controlled tab widget for one session panel's concurrent sessions. Holds no* state of its own: the consumer owns the session list and active id and reacts- * to the callbacks below (tab select/activate, new-chat launch/pick, close, dock,+ * to the callbacks below (tab select/activate, new-chat launch/pick, close,* collapse).** Each tab pairs a Radix tab trigger (the roving-focus, arrow-navigable target)@@ -204,15 +199,14 @@ export function TerminalTabStrip({onRename,onReorder,onDragActiveChange,- dockPosition,- onToggleDock,+ edge,onCollapse,children,className,draggable,}: TerminalTabStripProps) {const { t } = useLingui();- const rightDocked = dockPosition === 'right';+ const rightEdge = edge === 'right';// Inline rename is transient presentation state owned here; the host owns the// durable custom label and receives the commit via onRename. Mirrors the@@ -356,7 +350,11 @@ export function TerminalTabStrip({<TabsListref={tabListRef}variant="line"- aria-label={t`Sessions`}+ // Named per panel, not a shared "Sessions": both panels can be open at+ // once, and two identically-named tablists give a screen-reader user no+ // way to tell them apart (WCAG 1.3.1). The standalone terminal window+ // has no edge and is a terminal, so it falls to the terminal name.+ aria-label={rightEdge ? t`Agent sessions` : t`Terminal sessions`}// Remap a vertical wheel to horizontal scroll so the main scroll wheel// moves the tabs sideways, matching the editor tab strip (which native// overflow-x alone doesn't do for a plain vertical wheel).@@ -527,43 +525,12 @@ export function TerminalTabStrip({{/* Spacer pushes the trailing controls to the far right. */}<div className="flex-1" />{/* Host-provided trailing controls (e.g. conversation history), just left- of the dock-toggle/collapse buttons. */}+ of the collapse button. */}{trailingControls != null ? (<div className={cn('shrink-0', draggable && '[-webkit-app-region:no-drag]')}>{trailingControls}</div>) : null}- {onToggleDock != null ? (- <Tooltip>- <TooltipTrigger asChild>- <Button- type="button"- variant="ghost"- size="icon-xs"- // Label names the resulting position, not the current one, so the- // action reads as "move it there" to a screen-reader user.- aria-label={- rightDocked ? t`Dock sessions at the bottom` : t`Dock sessions on the right`- }- className="shrink-0 cursor-pointer text-muted-foreground hover:text-foreground"- onClick={onToggleDock}- >- {rightDocked ? (- <PanelBottomIcon aria-hidden="true" />- ) : (- <PanelRightIcon aria-hidden="true" />- )}- </Button>- </TooltipTrigger>- <TooltipContent side="bottom" sideOffset={8}>- {rightDocked ? (- <Trans>Dock sessions at the bottom</Trans>- ) : (- <Trans>Dock sessions on the right</Trans>- )}- </TooltipContent>- </Tooltip>- ) : null}{onCollapse != null ? (<Tooltip><TooltipTrigger asChild>@@ -571,13 +538,13 @@ export function TerminalTabStrip({type="button"variant="ghost"size="icon-xs"- aria-label={t`Collapse session dock`}+ aria-label={t`Collapse panel`}className="shrink-0 cursor-pointer text-muted-foreground hover:text-foreground"onClick={onCollapse}>- {/* Chevron points the way the panel slides shut: down for the bottom- dock, right for the right column. */}- {rightDocked ? (+ {/* Chevron points the way the panel slides shut: down for the+ bottom dock, right for the right column. */}+ {rightEdge ? (<ChevronRightIcon aria-hidden="true" />) : (<ChevronDownIcon aria-hidden="true" />@@ -585,7 +552,7 @@ export function TerminalTabStrip({</Button></TooltipTrigger><TooltipContent side="bottom" sideOffset={8}>- <Trans>Collapse session dock</Trans>+ <Trans>Collapse panel</Trans></TooltipContent></Tooltip>) : null}diff --git a/packages/app/src/components/TerminalWindowApp.dom.test.tsx b/packages/app/src/components/TerminalWindowApp.dom.test.tsxindex 0df54675d..2c9affc03 100644--- a/packages/app/src/components/TerminalWindowApp.dom.test.tsx+++ b/packages/app/src/components/TerminalWindowApp.dom.test.tsx@@ -321,7 +321,7 @@ describe('selectDesktopRootApp routing', () => {const { bridge } = makeBridge();render(<TooltipProvider>{selectDesktopRootApp(bridge)}</TooltipProvider>);expect(- await screen.findByRole('tablist', { name: 'Sessions' }, { timeout: 5000 }),+ await screen.findByRole('tablist', { name: 'Terminal sessions' }, { timeout: 5000 }),).toBeTruthy();expect(screen.getAllByTestId('terminal-session')).toHaveLength(1);});diff --git a/packages/app/src/components/TerminalWindowApp.tsx b/packages/app/src/components/TerminalWindowApp.tsxindex 7beff2c4e..21e28bb41 100644--- a/packages/app/src/components/TerminalWindowApp.tsx+++ b/packages/app/src/components/TerminalWindowApp.tsx@@ -3,7 +3,7 @@ import { useState } from 'react';import { useInstalledClis } from '@/hooks/use-installed-clis';import { ConfigProvider } from '@/lib/config-provider';import type { OkDesktopBridge } from '@/lib/desktop-bridge-types';-import { TerminalSessionsHost } from './TerminalSessionsHost';+import { SessionsHost } from './SessionsHost';import { useLiveXtermTheme } from './use-live-xterm-theme';interface TerminalWindowAppProps {@@ -13,13 +13,13 @@ interface TerminalWindowAppProps {/*** Full-window multi-session terminal — the renderer for a `--ok-mode=terminal`- * window. Mounts the SAME {@link TerminalSessionsHost} the docked terminal uses- * (window variant), so the window is purely a placement: new-chat split button,- * OSC tab titles, menu actions, ⌘1–9, liveness reporting, and reload- * rehydration are the dock's, by construction. The window-shaped differences- * live in the host's `variant: 'window'`: closing the last tab closes the- * window instead of collapsing a panel, the tab row doubles as the macOS title- * bar, there are no dock/collapse controls, and ⌘1–9 needs no focus-scope gate.+ * window. Mounts the SAME {@link SessionsHost} the docked terminal uses, so the+ * window is purely a placement: new-chat split button, OSC tab titles, menu+ * actions, ⌘1–9, liveness reporting, and reload rehydration are the dock's, by+ * construction. The window-shaped differences live in the host's+ * `surface: 'terminal-window'`: closing the last tab closes the window instead+ * of collapsing a panel, the tab row doubles as the macOS title bar, there is no+ * collapse control, and ⌘1–9 needs no focus-scope gate.** Establishes its own {@link ConfigProvider} — the terminal-consent hooks under* TerminalGate (`useTerminalConsentState` / `useTerminalEnabledWriter`) read@@ -58,14 +58,16 @@ function TerminalWindowBody({ bridge }: TerminalWindowAppProps) {className="flex h-screen min-h-0 flex-col"style={{ backgroundColor: xtermTheme.background }}/>- <TerminalSessionsHost+ <SessionsHostbridge={bridge}- variant="window"+ surface="terminal-window"+ // The window only exists because a PTY host does, so capability is a given.+ terminalCapable// The window is its own always-on terminal surface: visibility never// toggles, and the host's close-last "hide" report means the surface is// done — close the window (the dock collapses a panel instead).visible- onVisibleChange={(nextVisible) => {+ onVisibleChange={(nextVisible: boolean) => {if (!nextVisible) window.close();}}installedClis={installedClis}diff --git a/packages/app/src/components/ask-ai-composer-events.ts b/packages/app/src/components/ask-ai-composer-events.tsindex 454b2d378..0bf4f1be6 100644--- a/packages/app/src/components/ask-ai-composer-events.ts+++ b/packages/app/src/components/ask-ai-composer-events.ts@@ -1,6 +1,6 @@/*** Window-scoped pub/sub that asks the docked "Ask AI" composer to open and take- * focus — the same open+focus path the ⌘L shortcut runs. Both the ⌘L handler+ * focus — the same open+focus path the ⇧⌘L shortcut runs. Both the ⇧⌘L handler* and the editor's "Ask AI" selection affordance (the WYSIWYG bubble menu) fire* this so the expand/reopen + focus logic lives in exactly one place* (`BottomComposer`'s subscriber), never duplicated at the call sites.diff --git a/packages/app/src/components/bottom-composer-gate.test.ts b/packages/app/src/components/bottom-composer-gate.test.tsindex ad0b123a7..c9e67a892 100644--- a/packages/app/src/components/bottom-composer-gate.test.ts+++ b/packages/app/src/components/bottom-composer-gate.test.ts@@ -7,11 +7,12 @@ import {/*** The composer is doc-scoped and shows in both the desktop app and a user's own- * browser. Pin presence/absence across each of the three gate inputs: from a- * passing baseline, flipping any single input must hide the composer.+ * browser. Pin presence/absence across each gate input: from a passing baseline,+ * flipping any single input must hide the composer.*/const PASSING: BottomComposerGateInputs = {terminalVisible: false,+ agentsVisible: false,isEmbedded: false,activeDocName: 'notes',};@@ -21,7 +22,7 @@ describe('shouldShowBottomComposer', () => {// gate, so `PASSING` covers both hosts. The regression guard is the ABSENCE// of a `isDesktop: false` hide-case below — re-introducing a desktop gate// would have to add one back.- test('renders when not embedded, terminal closed, and a doc is open', () => {+ test('renders when not embedded, both panels closed, and a doc is open', () => {expect(shouldShowBottomComposer(PASSING)).toBe(true);});@@ -30,6 +31,13 @@ describe('shouldShowBottomComposer', () => {expect(shouldShowBottomComposer({ ...PASSING, terminalVisible: true })).toBe(false);});+ // The agents panel does not overlap the composer (it is a right-side column),+ // so this hide is about redundancy, not real estate: the open panel is+ // already a prompt surface for the same request.+ test('hidden when the agents panel is open', () => {+ expect(shouldShowBottomComposer({ ...PASSING, agentsVisible: true })).toBe(false);+ });+test('hidden when the host is embedded', () => {expect(shouldShowBottomComposer({ ...PASSING, isEmbedded: true })).toBe(false);});@@ -43,6 +51,7 @@ describe('shouldShowBottomComposer', () => {expect(shouldShowBottomComposer({terminalVisible: true,+ agentsVisible: true,isEmbedded: true,activeDocName: null,}),@@ -52,10 +61,10 @@ describe('shouldShowBottomComposer', () => {describe('shouldShowFolderComposer', () => {// Folder scope has no open doc, so the predicate drops the activeDocName clause- // and gates only on embedded / terminal.- const PASSING_FOLDER = { terminalVisible: false, isEmbedded: false };+ // and gates only on embedded / the two session panels.+ const PASSING_FOLDER = { terminalVisible: false, agentsVisible: false, isEmbedded: false };- test('renders when not embedded and terminal closed (no doc required)', () => {+ test('renders when not embedded and both panels closed (no doc required)', () => {expect(shouldShowFolderComposer(PASSING_FOLDER)).toBe(true);});@@ -63,6 +72,10 @@ describe('shouldShowFolderComposer', () => {expect(shouldShowFolderComposer({ ...PASSING_FOLDER, terminalVisible: true })).toBe(false);});+ test('hidden when the agents panel is open', () => {+ expect(shouldShowFolderComposer({ ...PASSING_FOLDER, agentsVisible: true })).toBe(false);+ });+test('hidden when the host is embedded', () => {expect(shouldShowFolderComposer({ ...PASSING_FOLDER, isEmbedded: true })).toBe(false);});diff --git a/packages/app/src/components/bottom-composer-gate.ts b/packages/app/src/components/bottom-composer-gate.tsindex 4c400c665..45edf94dd 100644--- a/packages/app/src/components/bottom-composer-gate.ts+++ b/packages/app/src/components/bottom-composer-gate.ts@@ -3,9 +3,12 @@** The composer is a doc-scoped affordance shown in both the desktop app and a* user's own browser. It shows only when every gate input clears:- * 1. The docked terminal is closed (`!terminalVisible`). The open terminal- * owns the bottom of the editor column and is its own AI entry point, so- * the composer would contend with it for the same real estate.+ * 1. Neither session panel is open (`!terminalVisible && !agentsVisible`). Each+ * is already an AI entry point with its own prompt surface, so a third one+ * floating over the editor is a redundant place to type the same request.+ * The terminal additionally contends for the composer's real estate — it+ * owns the bottom of the same column — but redundancy alone is the reason+ * the agents panel suppresses it too, despite sitting off to the right.* 2. The host is not an embedded AI webview (`!isEmbedded`). When OK's preview* is embedded inside a desktop agent (Claude Code / Codex / Cursor), that* agent IS the AI surface, so a second dispatch affordance would be@@ -28,6 +31,8 @@export interface BottomComposerGateInputs {/** Whether the docked terminal is currently visible. */terminalVisible: boolean;+ /** Whether the right-side agents panel is currently visible. */+ agentsVisible: boolean;/** Whether the app runs inside an embedded AI-editor webview. */isEmbedded: boolean;/** The active document name, or null when no doc is open. */@@ -35,20 +40,25 @@ export interface BottomComposerGateInputs {}export function shouldShowBottomComposer(inputs: BottomComposerGateInputs): boolean {- return !inputs.terminalVisible && !inputs.isEmbedded && inputs.activeDocName !== null;+ return (+ !inputs.terminalVisible &&+ !inputs.agentsVisible &&+ !inputs.isEmbedded &&+ inputs.activeDocName !== null+ );}/*** Visibility predicate for the FOLDER-view bottom composer. The folder overview* renders its own composer docked below the folder list, scoped to the folder* (the folder is the top-row context chip + dispatch lead). It clears the same- * embedded / terminal gates as the doc composer (gates 1-2) MINUS the+ * embedded / session-panel gates as the doc composer (gates 1-2) MINUS the* doc-open requirement — folder scope has no open doc. The host already knows it- * is in a folder view, so the `activeDocName` clause has no analogue here; this- * is intentionally a 2-input predicate.+ * is in a folder view, so the `activeDocName` clause has no analogue here; the+ * missing input is intentional, not an oversight.*/export function shouldShowFolderComposer(inputs: Omit<BottomComposerGateInputs, 'activeDocName'>,): boolean {- return !inputs.terminalVisible && !inputs.isEmbedded;+ return !inputs.terminalVisible && !inputs.agentsVisible && !inputs.isEmbedded;}diff --git a/packages/app/src/components/command-palette-commands.ts b/packages/app/src/components/command-palette-commands.tsindex 7bd65e6b9..7d58e88a1 100644--- a/packages/app/src/components/command-palette-commands.ts+++ b/packages/app/src/components/command-palette-commands.ts@@ -205,6 +205,8 @@ const PALETTE_COMMAND_LABELS = {docPanelHide: msg`Hide document panel`,terminalShow: msg`Show Terminal`,terminalHide: msg`Hide Terminal`,+ agentPanelShow: msg`Show Agents`,+ agentPanelHide: msg`Hide Agents`,showHiddenFiles: msg`Show hidden files`,showOkFolders: msg`Show .ok folders`,showOnlyMarkdownFiles: msg`Show only markdown files`,@@ -257,6 +259,7 @@ const COMMAND_ICONS: Record<string, ComponentType<{ className?: string }>> = {'toggle-sidebar': PanelLeft,'toggle-doc-panel': PanelRight,'toggle-terminal': SquareTerminal,+ 'toggle-agent-panel': MessageSquare,'toggle-show-hidden-files': Eye,'toggle-show-ok-folders': Folder,'toggle-show-only-markdown-files': FileText,diff --git a/packages/app/src/components/desktop-root-app.tsx b/packages/app/src/components/desktop-root-app.tsxindex a960758f7..555316c90 100644--- a/packages/app/src/components/desktop-root-app.tsx+++ b/packages/app/src/components/desktop-root-app.tsx@@ -3,7 +3,7 @@ import { App } from '@/App';import { NavigatorApp } from '@/components/NavigatorApp';import type { OkDesktopBridge } from '@/lib/desktop-bridge-types';-// Lazy-loaded: the terminal window statically imports TerminalSessionsHost+// Lazy-loaded: the terminal window statically imports SessionsHost// (and through it the ACP thread-client chain), which must stay out of the// entry chunk — editor windows and the web distribution never render it.const TerminalWindowApp = lazy(() =>diff --git a/packages/app/src/components/editor-area-sticky-repin.test.ts b/packages/app/src/components/editor-area-sticky-repin.test.tsindex 99ccc0632..3f2589e2e 100644--- a/packages/app/src/components/editor-area-sticky-repin.test.ts+++ b/packages/app/src/components/editor-area-sticky-repin.test.ts@@ -16,15 +16,15 @@ describe('computeStickyRepinLayout', () => {test('pins two pixel panels; the residual (editor) absorbs the delta (editor | doc | terminal)', () => {const next = computeStickyRepinLayout({- currentLayout: { editor: 40, 'doc-panel': 25, 'terminal-column': 35 },+ currentLayout: { editor: 40, 'doc-panel': 25, 'agents-column': 35 },containerPx: 1000,- pinnedPx: { 'doc-panel': 300, 'terminal-column': 400 },+ pinnedPx: { 'doc-panel': 300, 'agents-column': 400 },residualId: 'editor',});expect(next['doc-panel']).toBeCloseTo(30, 6);- expect(next['terminal-column']).toBeCloseTo(40, 6);+ expect(next['agents-column']).toBeCloseTo(40, 6);expect(next.editor).toBeCloseTo(30, 6);- expect(next.editor + next['doc-panel'] + next['terminal-column']).toBeCloseTo(100, 6);+ expect(next.editor + next['doc-panel'] + next['agents-column']).toBeCloseTo(100, 6);});test('holds a collapsed doc panel at 0% and pins the terminal; editor absorbs (the VM scenario)', () => {@@ -32,12 +32,12 @@ describe('computeStickyRepinLayout', () => {// the container. Only the terminal is pinned (the collapsed doc is left as-is);// the editor must absorb the freed width, not the terminal.const next = computeStickyRepinLayout({- currentLayout: { editor: 20, 'doc-panel': 0, 'terminal-column': 80 },+ currentLayout: { editor: 20, 'doc-panel': 0, 'agents-column': 80 },containerPx: 1000,- pinnedPx: { 'terminal-column': 400 },+ pinnedPx: { 'agents-column': 400 },residualId: 'editor',});- expect(next['terminal-column']).toBeCloseTo(40, 6);+ expect(next['agents-column']).toBeCloseTo(40, 6);expect(next['doc-panel']).toBe(0);expect(next.editor).toBeCloseTo(60, 6);});@@ -47,13 +47,13 @@ describe('computeStickyRepinLayout', () => {// residual — its share must pass through untouched while the residual// absorbs only what the pins leave.const next = computeStickyRepinLayout({- currentLayout: { editor: 30, 'doc-panel': 20, 'agent-panel': 15, 'terminal-column': 35 },+ currentLayout: { editor: 30, 'doc-panel': 20, 'agent-panel': 15, 'agents-column': 35 },containerPx: 1000,- pinnedPx: { 'doc-panel': 250, 'terminal-column': 350 },+ pinnedPx: { 'doc-panel': 250, 'agents-column': 350 },residualId: 'editor',});expect(next['doc-panel']).toBeCloseTo(25, 6);- expect(next['terminal-column']).toBeCloseTo(35, 6);+ expect(next['agents-column']).toBeCloseTo(35, 6);expect(next['agent-panel']).toBeCloseTo(15, 6);expect(next.editor).toBeCloseTo(25, 6);});@@ -84,7 +84,7 @@ describe('computeStickyRepinLayout', () => {});test('is a no-op when the residual panel id is absent from the layout', () => {- const input = { 'doc-panel': 40, 'terminal-column': 60 };+ const input = { 'doc-panel': 40, 'agents-column': 60 };expect(computeStickyRepinLayout({currentLayout: input,@@ -96,12 +96,12 @@ describe('computeStickyRepinLayout', () => {});test('is a no-op when the pins cannot fit (residual would be negative)', () => {- const input = { editor: 50, 'doc-panel': 25, 'terminal-column': 25 };+ const input = { editor: 50, 'doc-panel': 25, 'agents-column': 25 };expect(computeStickyRepinLayout({currentLayout: input,containerPx: 1000,- pinnedPx: { 'doc-panel': 600, 'terminal-column': 600 },+ pinnedPx: { 'doc-panel': 600, 'agents-column': 600 },residualId: 'editor',}),).toBe(input);@@ -111,10 +111,10 @@ describe('computeStickyRepinLayout', () => {const next = computeStickyRepinLayout({currentLayout: { editor: 70, 'doc-panel': 30 },containerPx: 1000,- pinnedPx: { 'doc-panel': 300, 'terminal-column': 400 },+ pinnedPx: { 'doc-panel': 300, 'agents-column': 400 },residualId: 'editor',});- expect('terminal-column' in next).toBe(false);+ expect('agents-column' in next).toBe(false);expect(next['doc-panel']).toBeCloseTo(30, 6);expect(next.editor).toBeCloseTo(70, 6);});diff --git a/packages/app/src/components/editor-area-sticky-repin.ts b/packages/app/src/components/editor-area-sticky-repin.tsindex 2a9a014b5..822c5bed9 100644--- a/packages/app/src/components/editor-area-sticky-repin.ts+++ b/packages/app/src/components/editor-area-sticky-repin.ts@@ -17,7 +17,7 @@ interface StickyRepinParams {* react-resizable-panels stores each panel as a percentage of the group, and* its per-panel imperative APIs (`resize`/`collapse`/`expand`) rebalance* against the panel's flex NEIGHBOR. In the EDITOR | doc-panel |- * terminal-column order that neighbor is never the editor, so any per-panel+ * agents-column order that neighbor is never the editor, so any per-panel* correction moves a boundary between the two right-side panels: a container* widening grows the terminal instead of the editor, a doc-panel collapse* dumps its width into the terminal, and re-pinning one panel knocks thediff --git a/packages/app/src/components/empty-state/CreatePromptComposer.tsx b/packages/app/src/components/empty-state/CreatePromptComposer.tsxindex 27263a68a..5481d60be 100644--- a/packages/app/src/components/empty-state/CreatePromptComposer.tsx+++ b/packages/app/src/components/empty-state/CreatePromptComposer.tsx@@ -393,7 +393,7 @@ export function CreatePromptComposer({ scenario, className }: CreatePromptComposreturn (<div className={cn('flex w-full flex-col gap-3', className)}>- {/* biome-ignore lint/a11y/noStaticElementInteractions: pointer clicks only delegate focus to the composer's editable; keyboard users focus it directly (Tab / ⌘L). */}+ {/* biome-ignore lint/a11y/noStaticElementInteractions: pointer clicks only delegate focus to the composer's editable; keyboard users focus it directly (Tab / ⌥⌘L). */}<div// Click anywhere in the card's whitespace (the padding around the input,// the footer row beside the Create button) focuses the field — thediff --git a/packages/app/src/components/focus-composer-on-card-pointer.ts b/packages/app/src/components/focus-composer-on-card-pointer.tsindex bc71e3f37..53c0a6a1f 100644--- a/packages/app/src/components/focus-composer-on-card-pointer.ts+++ b/packages/app/src/components/focus-composer-on-card-pointer.ts@@ -13,7 +13,7 @@** a11y: this is a pointer-only progressive enhancement. The card keeps passive* semantics (no `role`/`tabindex`) — the real control is the inner textbox,- * which keyboard + AT users already reach via Tab and the ⌘L shortcut — so it+ * which keyboard + AT users already reach via Tab and the ⇧⌘L shortcut — so it* adds no interactive markup to announce and no tab-order change.*/diff --git a/packages/app/src/components/handoff/preferred-session-events.ts b/packages/app/src/components/handoff/preferred-session-events.tsindex c5b95b7ae..6fbb8e0b7 100644--- a/packages/app/src/components/handoff/preferred-session-events.ts+++ b/packages/app/src/components/handoff/preferred-session-events.ts@@ -3,10 +3,14 @@* promptless sibling of `terminal-input-events`.** ⇧⌘J with no selection fires this. It carries no payload on purpose: which AI- * opens is `TerminalSessionsHost`'s call (the same `resolveLauncherSelection` its- * New split-button primary uses), not the caller's. Resolving in the caller is- * what made ⇧⌘J always open a Claude CLI — the pane could only see the CLI slice- * of the preference.+ * opens is `SessionsHost`'s call (the same `resolveLauncherSelection` its New+ * split-button primary uses), not the caller's. Resolving in the caller is what+ * made ⇧⌘J always open a Claude CLI — the pane could only see the CLI slice of+ * the preference.+ *+ * Both docked hosts subscribe. They resolve the preferred AI from the same+ * global inputs and each claims only the kinds it owns, so exactly one panel+ * opens a session and reveals itself.** Distinct from the Terminal menu's `new-terminal` action, which is explicitly a* bare shell and stays that way.diff --git a/packages/app/src/components/handoff/terminal-input-events.ts b/packages/app/src/components/handoff/terminal-input-events.tsindex e21228490..f1500a7c4 100644--- a/packages/app/src/components/handoff/terminal-input-events.ts+++ b/packages/app/src/components/handoff/terminal-input-events.ts@@ -1,16 +1,16 @@/**- * Window-scoped pub/sub carrying a raw text paste to the sessions dock's- * preferred AI. The editor's "Ask AI" affordances (selection bubble, code block,- * Problems panel) and the ⌘J / ⇧⌘J selection sends fire this so a passage lands- * wherever the user's preferred AI actually is.+ * Window-scoped pub/sub carrying a raw text paste to the user's preferred AI.+ * The editor's "Ask AI" affordances (selection bubble, code block, Problems+ * panel) and the ⌘J / ⇧⌘J selection sends fire this so a passage lands wherever+ * that AI actually is.** Mirrors the `terminal-launch-events` idiom, but the payload is verbatim text —- * never a `<bin> '<prompt>'` command and never a `cli` discriminant. The host- * (`TerminalSessionsHost`) owns both the PTY state AND the preferred-AI- * resolution, so it alone decides reuse-vs-launch and which family to launch- * into: a live session → write into it; nothing open → launch whatever- * `resolveLauncherSelection` names. Senders deliberately carry no agent opinion,- * so the host's preferred-AI resolution is the single source of that decision.+ * never a `<bin> '<prompt>'` command and never a `cli` discriminant. Both docked+ * `SessionsHost` instances subscribe; each owns its own session state and both+ * resolve the preferred AI from the same global inputs, so they agree on the+ * answer and only the panel that owns the resolved kind acts (reusing a live+ * session or launching, then revealing itself). Senders deliberately carry no+ * agent opinion, so that resolution is the single source of the decision.** `newTab` distinguishes ⇧⌘J ("always a fresh session") from ⌘J ("continue where* I am when that makes sense"). It is a request, not a guarantee — the host stilldiff --git a/packages/app/src/editor/extensions/CodeBlockView.tsx b/packages/app/src/editor/extensions/CodeBlockView.tsxindex c8a308fd9..4246bf28e 100644--- a/packages/app/src/editor/extensions/CodeBlockView.tsx+++ b/packages/app/src/editor/extensions/CodeBlockView.tsx@@ -637,7 +637,7 @@ export function CodeBlockView({ node, updateAttributes, editor, getPos, selected// (the code-block-fidelity extension's `fenceLength` outlasts// any inner backtick run). `composeSelectionPrompt` then// decides inline vs locus against the encoded-URL budget; the- // dispatch routes through `TerminalSessionsHost` which pastes+ // dispatch routes through `SessionsHost` which pastes// to a live PTY or launches a fresh Claude tab.const docName = getEditorDocName(editor);const pos = typeof getPos === 'function' ? getPos() : undefined;diff --git a/packages/app/src/lib/agents-panel-width-store.test.ts b/packages/app/src/lib/agents-panel-width-store.test.tsnew file mode 100644index 000000000..361ff330d--- /dev/null+++ b/packages/app/src/lib/agents-panel-width-store.test.ts@@ -0,0 +1,132 @@+import { afterEach, describe, expect, test } from 'vitest';+import {+ AGENTS_PANEL_WIDTH_KEY,+ DEFAULT_AGENTS_PANEL_WIDTH,+ getInitialAgentsPanelWidth,+ MIN_AGENTS_PANEL_WIDTH,+ readAgentsPanelWidth,+ type WidthStorage,+ writeAgentsPanelWidth,+} from './agents-panel-width-store.ts';++function memoryStorage(initial: Record<string, string> = {}): WidthStorage {+ const data = new Map(Object.entries(initial));+ return {+ getItem(key) {+ return data.get(key) ?? null;+ },+ setItem(key, value) {+ data.set(key, value);+ },+ };+}++describe('readAgentsPanelWidth', () => {+ test('absent key returns default', () => {+ expect(readAgentsPanelWidth(memoryStorage())).toBe(DEFAULT_AGENTS_PANEL_WIDTH);+ });++ test('valid stored width is returned', () => {+ const s = memoryStorage({ [AGENTS_PANEL_WIDTH_KEY]: '640' });+ expect(readAgentsPanelWidth(s)).toBe(640);+ });++ test('width below floor is clamped to MIN', () => {+ const s = memoryStorage({ [AGENTS_PANEL_WIDTH_KEY]: '200' });+ expect(readAgentsPanelWidth(s)).toBe(MIN_AGENTS_PANEL_WIDTH);+ });++ test('wide stored width is preserved (no pixel ceiling — layout constraints bound it)', () => {+ const s = memoryStorage({ [AGENTS_PANEL_WIDTH_KEY]: '9999' });+ expect(readAgentsPanelWidth(s)).toBe(9999);+ });++ test('non-numeric value falls back to default', () => {+ const s = memoryStorage({ [AGENTS_PANEL_WIDTH_KEY]: 'not a number' });+ expect(readAgentsPanelWidth(s)).toBe(DEFAULT_AGENTS_PANEL_WIDTH);+ });++ test('empty string falls back to default', () => {+ const s = memoryStorage({ [AGENTS_PANEL_WIDTH_KEY]: '' });+ expect(readAgentsPanelWidth(s)).toBe(DEFAULT_AGENTS_PANEL_WIDTH);+ });++ test('floating-point string is truncated by parseInt', () => {+ const s = memoryStorage({ [AGENTS_PANEL_WIDTH_KEY]: '640.6' });+ expect(readAgentsPanelWidth(s)).toBe(640);+ });+});++describe('writeAgentsPanelWidth', () => {+ test('writes a clamped integer to storage', () => {+ const s = memoryStorage();+ writeAgentsPanelWidth(640, s);+ expect(s.getItem(AGENTS_PANEL_WIDTH_KEY)).toBe('640');+ });++ test('clamps to MIN on write below floor', () => {+ const s = memoryStorage();+ writeAgentsPanelWidth(100, s);+ expect(s.getItem(AGENTS_PANEL_WIDTH_KEY)).toBe(String(MIN_AGENTS_PANEL_WIDTH));+ });++ test('wide width is written unclamped (no pixel ceiling — layout constraints bound it)', () => {+ const s = memoryStorage();+ writeAgentsPanelWidth(9999, s);+ expect(s.getItem(AGENTS_PANEL_WIDTH_KEY)).toBe('9999');+ });++ test('rounds floating-point input before write', () => {+ const s = memoryStorage();+ writeAgentsPanelWidth(640.7, s);+ expect(s.getItem(AGENTS_PANEL_WIDTH_KEY)).toBe('641');+ });++ test('quota-exceeded throw is swallowed (in-memory only)', () => {+ const throwing: WidthStorage = {+ getItem() {+ return null;+ },+ setItem() {+ throw new Error('QuotaExceededError');+ },+ };+ expect(() => writeAgentsPanelWidth(640, throwing)).not.toThrow();+ });+});++// The migration contract is the KEY VALUE, not the constant name: this column+// used to hold the right-docked terminal, so reusing `ok-terminal-width-v1` is+// what carries a user's sized width over to the agents panel. Every other test+// references the constant, which would survive a value rename silently — and the+// terminal/agents naming mismatch makes that rename a natural impulse.+test('the storage key keeps its legacy terminal-width value (migration contract)', () => {+ expect(AGENTS_PANEL_WIDTH_KEY).toBe('ok-terminal-width-v1');+});++// The synchronous-init contract has to survive a storage-restricted host: on+// file://, Safari private mode, and sandboxed iframes `localStorage` is a getter+// that THROWS on access, so `typeof localStorage` alone is not a safe probe. Both+// guards were untested — a gap inherited from the store this one replaced.+describe('getInitialAgentsPanelWidth on a storage-restricted host', () => {+ const original = Object.getOwnPropertyDescriptor(globalThis, 'localStorage');+ afterEach(() => {+ if (original) Object.defineProperty(globalThis, 'localStorage', original);+ else Reflect.deleteProperty(globalThis as object, 'localStorage');+ });++ test('falls back to the default when the localStorage getter throws', () => {+ Object.defineProperty(globalThis, 'localStorage', {+ configurable: true,+ get() {+ throw new Error('SecurityError: access denied');+ },+ });+ expect(getInitialAgentsPanelWidth()).toBe(DEFAULT_AGENTS_PANEL_WIDTH);+ });++ test('falls back to the default when localStorage is absent', () => {+ Reflect.deleteProperty(globalThis as object, 'localStorage');+ expect(getInitialAgentsPanelWidth()).toBe(DEFAULT_AGENTS_PANEL_WIDTH);+ });+});diff --git a/packages/app/src/lib/agents-panel-width-store.ts b/packages/app/src/lib/agents-panel-width-store.tsnew file mode 100644index 000000000..deca956d4--- /dev/null+++ b/packages/app/src/lib/agents-panel-width-store.ts@@ -0,0 +1,63 @@+// Persisted width of the right agents panel, per machine.+//+// The storage key still says "terminal" because this column used to hold the+// terminal when the dock was right-docked. Keeping the legacy key is the+// migration: a user who had sized that column keeps their width when the+// terminal moves to the bottom and the agents panel takes the column over.+export const AGENTS_PANEL_WIDTH_KEY = 'ok-terminal-width-v1';++// The agents panel wants more horizontal room than the doc panel: a transcript+// with code blocks and diffs reads badly in a narrow column. The default leans+// wide for that reason; the min keeps it above the point where the composer and+// message chrome start wrapping onto themselves. There is deliberately no pixel+// ceiling: the column may grow to near-full width, bounded at apply time by the+// layout's own constraints (the editor keeps a minimum sliver), so a wide+// persisted value must survive a reload rather than snap back.+export const DEFAULT_AGENTS_PANEL_WIDTH = 480;+export const MIN_AGENTS_PANEL_WIDTH = 320;++export interface WidthStorage {+ getItem(key: string): string | null;+ setItem(key: string, value: string): void;+}++function clamp(px: number): number {+ if (!Number.isFinite(px)) return DEFAULT_AGENTS_PANEL_WIDTH;+ if (px < MIN_AGENTS_PANEL_WIDTH) return MIN_AGENTS_PANEL_WIDTH;+ return Math.round(px);+}++export function readAgentsPanelWidth(storage?: WidthStorage): number {+ try {+ const s = storage ?? localStorage;+ const raw = s.getItem(AGENTS_PANEL_WIDTH_KEY);+ if (raw == null) return DEFAULT_AGENTS_PANEL_WIDTH;+ const parsed = Number.parseInt(raw, 10);+ if (!Number.isFinite(parsed)) return DEFAULT_AGENTS_PANEL_WIDTH;+ return clamp(parsed);+ } catch {+ return DEFAULT_AGENTS_PANEL_WIDTH;+ }+}++export function writeAgentsPanelWidth(px: number, storage?: WidthStorage): void {+ try {+ const s = storage ?? localStorage;+ s.setItem(AGENTS_PANEL_WIDTH_KEY, String(clamp(px)));+ } catch {+ // quota exceeded — in-memory state holds for the session (mirrors sidebar-pin-store)+ }+}++export function getInitialAgentsPanelWidth(): number {+ // `typeof localStorage` is not safe when localStorage is a property getter that+ // throws on access (file:// protocol, Safari private mode SecurityError,+ // sandboxed iframes). Wrap the whole dispatch so the synchronous-init contract+ // survives any storage-restricted host.+ try {+ if (typeof localStorage === 'undefined') return DEFAULT_AGENTS_PANEL_WIDTH;+ return readAgentsPanelWidth();+ } catch {+ return DEFAULT_AGENTS_PANEL_WIDTH;+ }+}diff --git a/packages/app/src/lib/command-menu-parity.test.ts b/packages/app/src/lib/command-menu-parity.test.tsindex c803c6bf8..f585164f0 100644--- a/packages/app/src/lib/command-menu-parity.test.ts+++ b/packages/app/src/lib/command-menu-parity.test.ts@@ -104,6 +104,8 @@ const PALETTE_COMMAND_LABELS = new Set<string>(['Hide document panel','Show Terminal','Hide Terminal',+ 'Show Agents',+ 'Hide Agents','Show hidden files','Show .ok folders','Show only markdown files',@@ -181,6 +183,8 @@ function makeFullDeps(): MenuDeps {onKillTerminal: noop,onNewTerminalWindow: noop,terminalLive: true,+ agentPanelVisible: true,+ onToggleAgentPanel: noop,canExpandAll: true,canCollapseAll: true,onExpandAll: noop,@@ -357,6 +361,7 @@ describe('command-menu parity ratchet', () => {{ menuLabel: 'Hide sidebar', shortcutId: 'toggle-files-sidebar' },{ menuLabel: 'Hide document panel', shortcutId: 'toggle-document-panel' },{ menuLabel: 'Hide Terminal', shortcutId: 'toggle-terminal-panel' },+ { menuLabel: 'Hide Agents', shortcutId: 'toggle-agent-panel' },];// Canonical token set — order-insensitive; treats Cmd/Ctrl as MOD and@@ -418,7 +423,7 @@ describe('command-menu parity ratchet', () => {'components/FileSidebar.tsx','components/EditorArea.tsx','components/EditorPane.tsx',- 'components/TerminalSessionsHost.tsx',+ 'components/SessionsHost.tsx','components/ProjectSwitcher.tsx','components/CreateProjectMenuTrigger.tsx','components/ReportBugMenuTrigger.tsx',diff --git a/packages/app/src/lib/desktop-bridge-types.ts b/packages/app/src/lib/desktop-bridge-types.tsindex a8d3fed16..f895fb662 100644--- a/packages/app/src/lib/desktop-bridge-types.ts+++ b/packages/app/src/lib/desktop-bridge-types.ts@@ -242,6 +242,10 @@ export type OkMenuAction =| 'collapse-all-tree'| 'toggle-doc-panel'| 'toggle-terminal'+ // Right agents-panel visibility (⌘L / Ctrl+L). The ACP twin of+ // `toggle-terminal`, and deliberately NOT desktop-gated: agent threads are+ // server-hosted, so the panel works on the web host and where pty does not.+ | 'toggle-agent-panel'// Terminal application menu. `new-terminal` opens a new terminal tab// (revealing the dock if hidden; never hides, unlike the toggle).// `kill-terminal` closes the active tab, killing that session's PTY.@@ -744,6 +748,7 @@ export interface OkEditorViewMenuStateSnapshot {readonly docPanelVisible?: boolean;readonly terminalVisible?: boolean;readonly terminalLive?: boolean;+ readonly agentPanelVisible?: boolean;readonly canViewInSource?: boolean;}@@ -1555,10 +1560,19 @@ export interface OkDesktopBridge {* survives a renderer reload. Fire-and-forget.*/setOrder(orderedPtyIds: readonly string[]): void;- /** Per-window sessions-dock state (visibility + unified tab order + active key). Canonical JSDoc in `bridge-contract.ts`; mirrored verbatim (drift-tested). */- getDockState(): Promise<{ visible: boolean; order?: string[]; activeKey?: string | null }>;- /** Persist the unified sessions-dock order + active key per window. Canonical JSDoc in `bridge-contract.ts`; mirrored verbatim (drift-tested). */- setDockState(state: { order: string[]; activeKey: string | null }): void;+ /** Per-window panel state (per-surface visibility + tab order + active key). Canonical JSDoc in `bridge-contract.ts`; mirrored verbatim (drift-tested). */+ getDockState(): Promise<{+ terminalVisible: boolean;+ agentPanelVisible: boolean;+ terminal?: { order: string[]; activeKey: string | null };+ agents?: { order: string[]; activeKey: string | null };+ }>;+ /** Persist one panel's tab order + active key per window. Canonical JSDoc in `bridge-contract.ts`; mirrored verbatim (drift-tested). */+ setDockState(state: {+ surface: 'terminal' | 'agents';+ order: string[];+ activeKey: string | null;+ }): void;onData(cb: (msg: OkPtyData) => void): OkUnsubscribe;onExit(cb: (msg: OkPtyExit) => void): OkUnsubscribe;claudePreflight(): Promise<ClaudeReadiness>;diff --git a/packages/app/src/lib/dock-session-persistence.test.ts b/packages/app/src/lib/dock-session-persistence.test.tsnew file mode 100644index 000000000..aa9008d37--- /dev/null+++ b/packages/app/src/lib/dock-session-persistence.test.ts@@ -0,0 +1,181 @@+/**+ * The terminal dock and the agents panel persist their tab order independently.+ * Before the split they shared one record, so with two panels live each write+ * would drop the other's keys (each host only ever lists its own kind) and+ * clobber the shared `activeKey`. These tests pin the partition on both+ * backends, since the failure is silent — you only see it after a reload, as a+ * panel that came back empty.+ */++import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest';+import type { OkDesktopBridge } from '@/lib/desktop-bridge-types';+import {+ readDockSessionOrder,+ readWebDockSessionOrder,+ writeDockSessionOrder,+} from './dock-session-persistence';++/** A desktop bridge exposing just the two dock-state methods, backed by a+ * per-surface store the way main's windowId-keyed maps are. */+function makeDesktopBridge(+ initial: Partial<{+ terminal: { order: string[]; activeKey: string | null };+ agents: { order: string[]; activeKey: string | null };+ }> = {},+) {+ const store = { ...initial };+ const setDockState = vi.fn(+ (state: { surface: 'terminal' | 'agents'; order: string[]; activeKey: string | null }) => {+ store[state.surface] = { order: state.order, activeKey: state.activeKey };+ },+ );+ const bridge = {+ terminal: {+ getDockState: async () => ({+ terminalVisible: false,+ agentPanelVisible: false,+ terminal: store.terminal,+ agents: store.agents,+ }),+ setDockState,+ },+ } as unknown as OkDesktopBridge;+ return { bridge, store, setDockState };+}++/** In-memory stand-in for `window.localStorage`. These tests run in the node+ * environment (no DOM), and the module reads `window.localStorage` directly —+ * its `typeof window === 'undefined'` guard is what makes stubbing a bare+ * `window` sufficient. */+function makeLocalStorage() {+ const data = new Map<string, string>();+ return {+ getItem: (key: string) => data.get(key) ?? null,+ setItem: (key: string, value: string) => {+ data.set(key, value);+ },+ };+}+let localStorageStub: ReturnType<typeof makeLocalStorage>;++beforeEach(() => {+ localStorageStub = makeLocalStorage();+ vi.stubGlobal('window', { localStorage: localStorageStub });+});++afterEach(() => {+ vi.unstubAllGlobals();+});++describe('web backend (localStorage)', () => {+ test('each surface owns its own key, so neither read sees the other', () => {+ writeDockSessionOrder(null, 'terminal', { order: ['pty-1', 'pty-2'], activeKey: 'pty-2' });+ writeDockSessionOrder(null, 'agents', { order: ['thread-a'], activeKey: 'thread-a' });++ expect(readWebDockSessionOrder('terminal')).toEqual({+ order: ['pty-1', 'pty-2'],+ activeKey: 'pty-2',+ });+ expect(readWebDockSessionOrder('agents')).toEqual({+ order: ['thread-a'],+ activeKey: 'thread-a',+ });+ });++ test("one panel's write cannot erase the other's order", () => {+ writeDockSessionOrder(null, 'terminal', { order: ['pty-1'], activeKey: 'pty-1' });+ // The agents host lists only threadIds. Under one shared record this write+ // dropped pty-1 and moved the active tab; the terminal came back empty.+ writeDockSessionOrder(null, 'agents', { order: ['thread-a'], activeKey: 'thread-a' });++ expect(readWebDockSessionOrder('terminal')).toEqual({ order: ['pty-1'], activeKey: 'pty-1' });+ });++ test('an unwritten surface reads null so the caller cold-starts', () => {+ writeDockSessionOrder(null, 'terminal', { order: ['pty-1'], activeKey: 'pty-1' });+ expect(readWebDockSessionOrder('agents')).toBeNull();+ });++ test('a corrupt record reads null rather than throwing into the mount seed', () => {+ localStorageStub.setItem('ok-dock-session-order-v1', 'not json');+ expect(readWebDockSessionOrder('terminal')).toBeNull();+ });++ test('non-string keys are dropped rather than restored as junk tabs', () => {+ localStorageStub.setItem(+ 'ok-agent-session-order-v1',+ JSON.stringify({ order: ['thread-a', 7, null], activeKey: 42 }),+ );+ expect(readWebDockSessionOrder('agents')).toEqual({ order: ['thread-a'], activeKey: null });+ });+});++describe('desktop backend (bridge)', () => {+ test('reads the sub-record for the asked-for surface only', async () => {+ const { bridge } = makeDesktopBridge({+ terminal: { order: ['pty-1'], activeKey: 'pty-1' },+ agents: { order: ['thread-a', 'thread-b'], activeKey: 'thread-b' },+ });++ await expect(readDockSessionOrder(bridge, 'terminal')).resolves.toEqual({+ order: ['pty-1'],+ activeKey: 'pty-1',+ });+ await expect(readDockSessionOrder(bridge, 'agents')).resolves.toEqual({+ order: ['thread-a', 'thread-b'],+ activeKey: 'thread-b',+ });+ });++ test('writes carry the surface, so main files them apart', () => {+ const { bridge, setDockState, store } = makeDesktopBridge();++ writeDockSessionOrder(bridge, 'agents', { order: ['thread-a'], activeKey: 'thread-a' });+ writeDockSessionOrder(bridge, 'terminal', { order: ['pty-1'], activeKey: null });++ expect(setDockState).toHaveBeenNthCalledWith(1, {+ surface: 'agents',+ order: ['thread-a'],+ activeKey: 'thread-a',+ });+ expect(store.agents).toEqual({ order: ['thread-a'], activeKey: 'thread-a' });+ expect(store.terminal).toEqual({ order: ['pty-1'], activeKey: null });+ });++ 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();+ });++ 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();+ });++ test('a bridge with no dock-state methods falls back to the web backend', async () => {+ // A session-only desktop bridge (some E2E hosts) has no `terminal` surface at+ // all; duck-typing on the method — not on a host flag — is what keeps that+ // from throwing on mount.+ const sessionOnly = { editor: {} } as unknown as OkDesktopBridge;+ 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',+ });+ });+});diff --git a/packages/app/src/lib/dock-session-persistence.ts b/packages/app/src/lib/dock-session-persistence.tsindex f71bb5740..f30fad221 100644--- a/packages/app/src/lib/dock-session-persistence.ts+++ b/packages/app/src/lib/dock-session-persistence.ts@@ -1,16 +1,19 @@/**- * Reload-durable dock order for the unified sessions dock: the interleaved list- * of session keys (terminal ptyIds + thread threadIds, in tab order) plus the- * active key. This is the ONE net-new persistence the unified dock needs — the- * cross-kind order and active tab a renderer reload must restore. Everything else- * already survives: terminal PTYs + their labels/ordinals in main, thread liveness- * on the server, dock visibility in main, dock position in localStorage.+ * Reload-durable tab order for each session panel: the list of session keys in+ * tab order plus the active key. This is the ONE net-new persistence the panels+ * need — the order and active tab a renderer reload must restore. Everything+ * else already survives: terminal PTYs + their labels/ordinals in main, thread+ * liveness on the server, panel visibility in main.+ *+ * Recorded PER SURFACE. The terminal dock and the agents panel are independent+ * surfaces that persist on their own edges, so a single shared record would let+ * each panel's write erase the other's keys and clobber a shared active tab.** Two backends behind one interface:- * - desktop: per-window main-process dock state (survives a renderer reload, is+ * - desktop: per-window main-process state (survives a renderer reload, is* per-window so multi-window order never bleeds) via the terminal bridge;* - web: best-effort localStorage (per-origin; multi-tab bleed is unsolved for- * both docks today and out of scope), since there is no main process.+ * both panels today and out of scope), since there is no main process.** Keys are reload-STABLE identities, not the host's ephemeral client ids: a* terminal's ptyId (what `list()`/`adopt()` speak) and a thread's threadId (what@@ -19,82 +22,104 @@import type { OkDesktopBridge } from '@/lib/desktop-bridge-types';+/** Which panel a persisted order belongs to. */+export type DockSurface = 'terminal' | 'agents';+export interface DockSessionOrder {- /** Session keys (ptyIds + threadIds) in tab order. */+ /** Session keys (ptyIds for `terminal`, threadIds for `agents`) in tab order. */readonly order: readonly string[];/** The active session's key, or null when nothing is active. */readonly activeKey: string | null;}-/** localStorage key for the web backend — a UI-pref store like the other dock- * prefs (position, height, width), never a `config.yml` field. */-const WEB_STORAGE_KEY = 'ok-dock-session-order-v1';+/** localStorage keys for the web backend — UI-pref stores like the other panel+ * prefs (height, width), never a `config.yml` field. */+const WEB_STORAGE_KEYS: Record<DockSurface, string> = {+ terminal: 'ok-dock-session-order-v1',+ agents: 'ok-agent-session-order-v1',+};++/** Normalize a persisted record, dropping non-string keys. */+function coerceOrder(raw: { order?: unknown; activeKey?: unknown }): DockSessionOrder {+ 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 };+}/**- * Synchronous localStorage read of the web dock order (the mount seed reads it- * before the async {@link readDockSessionOrder} would resolve). Returns `null`- * when nothing is stored or storage is unavailable.+ * Synchronous localStorage read of one panel's web order (the mount seed reads+ * it before the async {@link readDockSessionOrder} would resolve). Returns+ * `null` when nothing is stored or storage is unavailable.*/-export function readWebDockSessionOrder(): DockSessionOrder | null {+export function readWebDockSessionOrder(surface: DockSurface): DockSessionOrder | null {if (typeof window === 'undefined') return null;try {- const raw = window.localStorage.getItem(WEB_STORAGE_KEY);+ const raw = window.localStorage.getItem(WEB_STORAGE_KEYS[surface]);if (raw === null) return null;- const parsed = JSON.parse(raw) as { order?: unknown; activeKey?: unknown };- const order = Array.isArray(parsed.order)- ? parsed.order.filter((k): k is string => typeof k === 'string')- : [];- const activeKey = typeof parsed.activeKey === 'string' ? parsed.activeKey : null;- return { order, activeKey };+ return coerceOrder(JSON.parse(raw) as { order?: unknown; activeKey?: unknown });} catch {return null;}}-/** Persist the web dock order to localStorage (best-effort). */-function writeWeb(state: DockSessionOrder): void {+/** Persist one panel's web order to localStorage (best-effort). */+function writeWeb(surface: DockSurface, state: DockSessionOrder): void {if (typeof window === 'undefined') return;try {- window.localStorage.setItem(WEB_STORAGE_KEY, JSON.stringify(state));+ window.localStorage.setItem(WEB_STORAGE_KEYS[surface], JSON.stringify(state));} catch {// Quota / privacy mode — best-effort, the in-memory order still serves the session.}}/**- * Read the persisted dock order for this window/origin, or `null` when none is- * retained (fresh launch, or a read failure — the caller cold-starts). Desktop- * reads main's per-window dock state; web reads localStorage synchronously+ * Read one panel's persisted order for this window/origin, or `null` when none+ * is retained (fresh launch, or a read failure — the caller cold-starts).+ * Desktop reads main's per-window state; web reads localStorage synchronously* (wrapped in a promise for one call shape).*/export function readDockSessionOrder(bridge: OkDesktopBridge | null | undefined,+ surface: DockSurface,): Promise<DockSessionOrder | null> {if (typeof bridge?.terminal?.getDockState === 'function') {return bridge.terminal.getDockState().then((state) => {- const order = Array.isArray(state.order)- ? state.order.filter((k): k is string => typeof k === 'string')- : [];- const activeKey = typeof state.activeKey === 'string' ? state.activeKey : null;+ const record = state[surface];+ if (record == null) return null;+ const { order, activeKey } = coerceOrder(record);// No retained order at all (fresh launch) reads as null so the caller// cold-starts rather than seeding an empty arrangement.return order.length === 0 && activeKey === null ? null : { order, activeKey };})- .catch(() => null);+ .catch((err) => {+ // Cold-starting is the right fallback, but silence makes the three+ // failure modes (handler missing, main crashed, serialization) look+ // identical to "nothing was retained" — leaving a user report of "my+ // panel comes back empty" with nothing to grep for.+ console.warn('[dock-session-persistence] getDockState failed; cold-starting:', err);+ return null;+ });}- return Promise.resolve(readWebDockSessionOrder());+ return Promise.resolve(readWebDockSessionOrder(surface));}-/** Persist the dock order for this window/origin. Fire-and-forget on both backends. */+/** Persist one panel's order for this window/origin. Fire-and-forget on both backends. */export function writeDockSessionOrder(bridge: OkDesktopBridge | null | undefined,+ surface: DockSurface,state: DockSessionOrder,): void {if (typeof bridge?.terminal?.setDockState === 'function') {- bridge.terminal.setDockState({ order: [...state.order], activeKey: state.activeKey });+ bridge.terminal.setDockState({+ surface,+ order: [...state.order],+ activeKey: state.activeKey,+ });return;}- writeWeb(state);+ writeWeb(surface, state);}diff --git a/packages/app/src/lib/keyboard-shortcuts.test.ts b/packages/app/src/lib/keyboard-shortcuts.test.tsindex 20fd4d7fd..1ac627618 100644--- a/packages/app/src/lib/keyboard-shortcuts.test.ts+++ b/packages/app/src/lib/keyboard-shortcuts.test.ts@@ -245,23 +245,23 @@ describe('keyboard shortcut registry', () => {).toBe(false);});- test('formats the open-ask-ai shortcut as Cmd/Ctrl + L', () => {- expect(formatShortcut('open-ask-ai', 'mac')).toBe('⌘ L');- expect(formatShortcut('open-ask-ai', 'windowsLinux')).toBe('Ctrl L');+ test('formats the toggle-agent-panel shortcut as Cmd/Ctrl + L', () => {+ expect(formatShortcut('toggle-agent-panel', 'mac')).toBe('⌘ L');+ expect(formatShortcut('toggle-agent-panel', 'windowsLinux')).toBe('Ctrl L');});- test('matches the open-ask-ai shortcut on Cmd+L / Ctrl+L and excludes extra modifiers', () => {+ test('matches toggle-agent-panel on Cmd+L / Ctrl+L and excludes extra modifiers', () => {expect(matchesKeyboardShortcut({ metaKey: true, ctrlKey: false, altKey: false, key: 'l' },- 'open-ask-ai',+ 'toggle-agent-panel','mac',),).toBe(true);expect(matchesKeyboardShortcut({ metaKey: false, ctrlKey: true, altKey: false, key: 'l' },- 'open-ask-ai',+ 'toggle-agent-panel','windowsLinux',),).toBe(true);@@ -269,7 +269,7 @@ describe('keyboard shortcut registry', () => {expect(matchesKeyboardShortcut({ metaKey: false, ctrlKey: true, altKey: false, key: 'l' },- 'open-ask-ai',+ 'toggle-agent-panel','mac',),).toBe(false);@@ -277,20 +277,69 @@ describe('keyboard shortcut registry', () => {expect(matchesKeyboardShortcut({ metaKey: true, ctrlKey: false, altKey: false, shiftKey: true, key: 'l' },- 'open-ask-ai',+ 'toggle-agent-panel','mac',),).toBe(false);+ // ⌥⌘L belongs to open-ask-ai, so the bare-⌘L toggle must reject alt.expect(matchesKeyboardShortcut({ metaKey: true, ctrlKey: false, altKey: true, key: 'l' },- 'open-ask-ai',+ 'toggle-agent-panel','mac',),).toBe(false);expect(matchesKeyboardShortcut({ metaKey: false, ctrlKey: false, altKey: false, key: 'l' },+ 'toggle-agent-panel',+ 'mac',+ ),+ ).toBe(false);+ });++ test('formats the open-ask-ai shortcut as Shift+Cmd / Ctrl+Shift + L', () => {+ expect(formatShortcut('open-ask-ai', 'mac')).toBe('⇧⌘ L');+ expect(formatShortcut('open-ask-ai', 'windowsLinux')).toBe('Ctrl Shift L');+ });++ // Shift rather than Alt: Ctrl+Alt+L is KDE Plasma's Lock Session alternate,+ // grabbed by kglobalaccel before any renderer listener sees it.+ test('open-ask-ai requires Shift, keeping bare Cmd+L for the agents panel', () => {+ expect(+ matchesKeyboardShortcut(+ { metaKey: true, ctrlKey: false, shiftKey: true, key: 'L', code: 'KeyL' },+ 'open-ask-ai',+ 'mac',+ ),+ ).toBe(true);+ expect(+ matchesKeyboardShortcut(+ { metaKey: false, ctrlKey: true, shiftKey: true, key: 'L', code: 'KeyL' },+ 'open-ask-ai',+ 'windowsLinux',+ ),+ ).toBe(true);+ // Bare ⌘L is the agents-panel toggle, never this.+ expect(+ matchesKeyboardShortcut(+ { metaKey: true, ctrlKey: false, shiftKey: false, key: 'l', code: 'KeyL' },+ 'open-ask-ai',+ 'mac',+ ),+ ).toBe(false);+ // Shift alone (no Cmd/Ctrl) is not a chord.+ expect(+ matchesKeyboardShortcut(+ { metaKey: false, ctrlKey: false, shiftKey: true, key: 'L', code: 'KeyL' },+ 'open-ask-ai',+ 'mac',+ ),+ ).toBe(false);+ // The old ⌥⌘L must NOT still fire — it would lock the screen on KDE.+ expect(+ matchesKeyboardShortcut(+ { metaKey: true, ctrlKey: false, altKey: true, shiftKey: false, key: '¬', code: 'KeyL' },'open-ask-ai','mac',),diff --git a/packages/app/src/lib/keyboard-shortcuts.ts b/packages/app/src/lib/keyboard-shortcuts.tsindex 3fabe3bbf..44bc8820a 100644--- a/packages/app/src/lib/keyboard-shortcuts.ts+++ b/packages/app/src/lib/keyboard-shortcuts.ts@@ -206,11 +206,15 @@ const KEYBOARD_SHORTCUT_DEFINITIONS = [],},{- id: 'open-ask-ai',+ // The right-panel twin of ⌘J. Not desktop-scoped: agent threads are+ // server-hosted, so the panel is there on the web host too, which is why+ // this carries a `match` (the renderer owns the keydown where no native+ // menu accelerator claims it).+ id: 'toggle-agent-panel',category: 'general',- title: msg`Ask AI`,- description: msg`Open and focus the bottom Ask AI prompt composer.`,- scope: msg`OK Desktop`,+ title: msg`Show or hide agents`,+ description: msg`Toggle the right agents panel, where agent conversations live.`,+ scope: msg`Global`,bindings: [{mac: '⌘ L',@@ -219,6 +223,27 @@ const KEYBOARD_SHORTCUT_DEFINITIONS = [},],},+ {+ // Rehomed off ⌘L when the agents panel claimed it. Same L family (both are+ // "talk to an AI"), one modifier deeper for the lighter-weight surface.+ // SHIFT, not ALT: Ctrl+Alt+L is KDE Plasma's built-in alternate for Lock+ // Session, grabbed by kglobalaccel at the shell level, so this renderer-only+ // listener would never see it and the screen would lock instead. Ctrl+Shift+L+ // is unclaimed by both KDE and GNOME defaults, and matches the chord Cursor+ // uses to send a selection to chat.+ id: 'open-ask-ai',+ category: 'general',+ title: msg`Ask AI`,+ description: msg`Open and focus the bottom Ask AI prompt composer.`,+ scope: msg`Global`,+ bindings: [+ {+ mac: '⇧⌘ L',+ windowsLinux: 'Ctrl Shift L',+ match: { code: 'KeyL', anyMod: true, shiftKey: true, allowExtraModifiers: true },+ },+ ],+ },{// Sibling of ⌘J: opens a fresh session with the preferred AI. With text// selected, that selection is staged into the new session. The shift matcherdiff --git a/packages/app/src/lib/ok-menu-actions.ts b/packages/app/src/lib/ok-menu-actions.tsindex 801e2af61..af9e09d19 100644--- a/packages/app/src/lib/ok-menu-actions.ts+++ b/packages/app/src/lib/ok-menu-actions.ts@@ -41,6 +41,7 @@ export const OK_MENU_ACTIONS = ['collapse-all-tree','toggle-doc-panel','toggle-terminal',+ 'toggle-agent-panel','new-terminal','kill-terminal','new-worktree',diff --git a/packages/app/src/lib/terminal-dock-store.test.ts b/packages/app/src/lib/terminal-dock-store.test.tsdeleted file mode 100644index a2f4eeff1..000000000--- a/packages/app/src/lib/terminal-dock-store.test.ts+++ /dev/null@@ -1,59 +0,0 @@-import { describe, expect, test } from 'vitest';-import {- DEFAULT_TERMINAL_DOCK,- type DockStorage,- readTerminalDock,- TERMINAL_DOCK_KEY,- writeTerminalDock,-} from './terminal-dock-store';--function memoryStorage(initial?: string): DockStorage & { value: string | null } {- return {- value: initial ?? null,- getItem(key) {- return key === TERMINAL_DOCK_KEY ? this.value : null;- },- setItem(key, value) {- if (key === TERMINAL_DOCK_KEY) this.value = value;- },- };-}--describe('terminal-dock-store', () => {- test('defaults to right when nothing is stored', () => {- expect(readTerminalDock(memoryStorage())).toBe('right');- expect(DEFAULT_TERMINAL_DOCK).toBe('right');- });-- test('round-trips a bottom dock position', () => {- const s = memoryStorage();- writeTerminalDock('bottom', s);- expect(s.value).toBe('bottom');- expect(readTerminalDock(s)).toBe('bottom');- });-- test('round-trips a right dock position', () => {- const s = memoryStorage('bottom');- writeTerminalDock('right', s);- expect(readTerminalDock(s)).toBe('right');- });-- test('coerces an unknown/corrupted stored value to the right default', () => {- expect(readTerminalDock(memoryStorage('sideways'))).toBe('right');- expect(readTerminalDock(memoryStorage(''))).toBe('right');- });-- test('falls back to the default when storage throws', () => {- const throwing: DockStorage = {- getItem() {- throw new Error('SecurityError');- },- setItem() {- throw new Error('SecurityError');- },- };- expect(readTerminalDock(throwing)).toBe('right');- // Must not throw out to the caller — the write swallows quota/security errors.- expect(() => writeTerminalDock('bottom', throwing)).not.toThrow();- });-});diff --git a/packages/app/src/lib/terminal-dock-store.ts b/packages/app/src/lib/terminal-dock-store.tsdeleted file mode 100644index 8cb8f03f3..000000000--- a/packages/app/src/lib/terminal-dock-store.ts+++ /dev/null@@ -1,55 +0,0 @@-// Persisted terminal dock position (bottom vs right), per machine. Mirrors the-// shape of `terminal-height-store` / `doc-panel-width-store`: a tiny localStorage-// store with a synchronous-init contract that survives storage-restricted hosts-// (file://, Safari private mode, sandboxed iframes). NOT a per-doc sidecar — dock-// position is a UI preference, so it lives in localStorage, not `.ok/` (no-sidecars-// STOP rule).--export const TERMINAL_DOCK_KEY = 'ok-terminal-dock-v1';--export type TerminalDockPosition = 'bottom' | 'right';--export const DEFAULT_TERMINAL_DOCK: TerminalDockPosition = 'right';--export interface DockStorage {- getItem(key: string): string | null;- setItem(key: string, value: string): void;-}--// Right is the default, so any value that is not the literal 'bottom' coerces to-// 'right' — a corrupted, empty, or future-unknown stored value (and the unset-// case) all land on the default. Bottom must be stored explicitly, so a user who-// picks it keeps it across sessions.-function coerce(raw: string | null): TerminalDockPosition {- return raw === 'bottom' ? 'bottom' : 'right';-}--export function readTerminalDock(storage?: DockStorage): TerminalDockPosition {- try {- const s = storage ?? localStorage;- return coerce(s.getItem(TERMINAL_DOCK_KEY));- } catch {- return DEFAULT_TERMINAL_DOCK;- }-}--export function writeTerminalDock(position: TerminalDockPosition, storage?: DockStorage): void {- try {- const s = storage ?? localStorage;- s.setItem(TERMINAL_DOCK_KEY, position);- } catch {- // quota exceeded — in-memory state holds for the session (mirrors terminal-height-store)- }-}--export function getInitialTerminalDock(): TerminalDockPosition {- // `typeof localStorage` is unsafe when localStorage is a property getter that- // throws on access; wrap the whole dispatch so the synchronous-init contract- // survives any storage-restricted host (matches getInitialTerminalHeight).- try {- if (typeof localStorage === 'undefined') return DEFAULT_TERMINAL_DOCK;- return readTerminalDock();- } catch {- return DEFAULT_TERMINAL_DOCK;- }-}diff --git a/packages/app/src/lib/terminal-new-tab-store.test.ts b/packages/app/src/lib/terminal-new-tab-store.test.tsindex 23b4b1922..d4c68cd85 100644--- a/packages/app/src/lib/terminal-new-tab-store.test.ts+++ b/packages/app/src/lib/terminal-new-tab-store.test.ts@@ -1,6 +1,7 @@import { describe, expect, test } from 'vitest';import {readPreferBareTerminal,+ subscribePreferBareTerminal,TERMINAL_NEW_TAB_BARE_KEY,writePreferBareTerminal,} from './terminal-new-tab-store';@@ -44,3 +45,37 @@ describe('terminal-new-tab-store', () => {expect(readPreferBareTerminal(s)).toBe(false);});});++// The two session hosts partition Ask-AI / ⇧⌘J work by comparing the kind each+// one resolves, which only holds while they read the same inputs. Before this+// store published, each host held a mount-time snapshot: one New-dropdown pick+// diverged them, both claimed, and ⇧⌘J opened two sessions. Subscribers standing+// in for the two hosts here.+describe('cross-surface publication', () => {+ test('a write notifies every subscriber, and each re-reads the new value', () => {+ // One shared backing store, two readers — exactly the two hosts' situation.+ const shared = fakeStorage();+ const seenA: boolean[] = [];+ const seenB: boolean[] = [];+ const stopA = subscribePreferBareTerminal(() => seenA.push(readPreferBareTerminal(shared)));+ const stopB = subscribePreferBareTerminal(() => seenB.push(readPreferBareTerminal(shared)));++ writePreferBareTerminal(true, shared);+ writePreferBareTerminal(false, shared);++ stopA();+ stopB();+ expect(seenA).toEqual([true, false]);+ // Both surfaces observe the SAME sequence — the invariant the partition needs.+ expect(seenB).toEqual(seenA);+ });++ test('an unsubscribed surface stops being notified', () => {+ const shared = fakeStorage();+ const seen: boolean[] = [];+ const stop = subscribePreferBareTerminal(() => seen.push(readPreferBareTerminal(shared)));+ stop();+ writePreferBareTerminal(true, shared);+ expect(seen).toEqual([]);+ });+});diff --git a/packages/app/src/lib/terminal-new-tab-store.ts b/packages/app/src/lib/terminal-new-tab-store.tsindex 09403185a..582e498dd 100644--- a/packages/app/src/lib/terminal-new-tab-store.ts+++ b/packages/app/src/lib/terminal-new-tab-store.ts@@ -1,3 +1,5 @@+import { useSyncExternalStore } from 'react';+// Persisted "the New-chat split button's last pick was a bare Terminal" flag,// per machine. Terminal-only: the shared Ask-AI sticky store (unified-agent-store)// only understands CLI / app-target picks, so a "Terminal" (bare shell) choice@@ -32,9 +34,56 @@ export function writePreferBareTerminal(bare: boolean, storage?: NewTabStorage):} catch {// quota / restricted host — the in-memory selection holds for the session.}+ // Publish so the sibling host re-reads; without this the two diverge and both+ // claim the same Ask-AI passage.+ for (const listener of listeners) listener();+}++// Module-scope state + listeners so every mounted surface observes the SAME+// value. Both session hosts partition Ask-AI / preferred-session work by+// comparing the kind each one resolves; a per-instance `useState` snapshot let+// one host's pick diverge from the other's, so both claimed and the passage+// landed twice. Mirrors `lib/acp/enabled-agents.ts`, which this file's consumers+// already read that way.+const listeners = new Set<() => void>();++// Reads storage on every call rather than memoizing. The value is a primitive, so+// React's Object.is comparison makes an unchanged read a no-op re-render — and a+// module-scope cache would survive `localStorage.clear()`, leaking one test's pick+// into the next (and any external clear into the live session).+function currentPreferBareTerminal(): boolean {+ return getInitialPreferBareTerminal();+}++/** Notify subscribers to re-read (cross-tab `storage` events). */+function reloadPreferBareTerminalFromStorage(): void {+ for (const listener of listeners) listener();+}++if (typeof window !== 'undefined' && typeof window.addEventListener === 'function') {+ window.addEventListener('storage', (event) => {+ if (event.key === TERMINAL_NEW_TAB_BARE_KEY || event.key === null) {+ reloadPreferBareTerminalFromStorage();+ }+ });+}++/** Subscribe to pick changes. Exported so a test can stand in for a second host. */+export function subscribePreferBareTerminal(listener: () => void): () => void {+ listeners.add(listener);+ return () => listeners.delete(listener);+}++/** Reactive read — every subscriber re-renders when any surface writes. */+export function usePreferBareTerminal(): boolean {+ return useSyncExternalStore(+ subscribePreferBareTerminal,+ currentPreferBareTerminal,+ currentPreferBareTerminal,+ );}-export function getInitialPreferBareTerminal(): boolean {+function getInitialPreferBareTerminal(): boolean {// Guard the whole dispatch (not just `typeof`) so a getter that throws on// access still yields the default — matches getInitialTerminalDock.try {diff --git a/packages/app/src/lib/terminal-width-store.test.ts b/packages/app/src/lib/terminal-width-store.test.tsdeleted file mode 100644index fedea51c1..000000000--- a/packages/app/src/lib/terminal-width-store.test.ts+++ /dev/null@@ -1,95 +0,0 @@-import { describe, expect, test } from 'vitest';-import {- DEFAULT_TERMINAL_WIDTH,- MIN_TERMINAL_WIDTH,- readTerminalWidth,- TERMINAL_WIDTH_KEY,- type TerminalWidthStorage,- writeTerminalWidth,-} from './terminal-width-store.ts';--function memoryStorage(initial: Record<string, string> = {}): TerminalWidthStorage {- const data = new Map(Object.entries(initial));- return {- getItem(key) {- return data.get(key) ?? null;- },- setItem(key, value) {- data.set(key, value);- },- };-}--describe('readTerminalWidth', () => {- test('absent key returns default', () => {- expect(readTerminalWidth(memoryStorage())).toBe(DEFAULT_TERMINAL_WIDTH);- });-- test('valid stored width is returned', () => {- const s = memoryStorage({ [TERMINAL_WIDTH_KEY]: '640' });- expect(readTerminalWidth(s)).toBe(640);- });-- test('width below floor is clamped to MIN', () => {- const s = memoryStorage({ [TERMINAL_WIDTH_KEY]: '200' });- expect(readTerminalWidth(s)).toBe(MIN_TERMINAL_WIDTH);- });-- test('wide stored width is preserved (no pixel ceiling — layout constraints bound it)', () => {- const s = memoryStorage({ [TERMINAL_WIDTH_KEY]: '9999' });- expect(readTerminalWidth(s)).toBe(9999);- });-- test('non-numeric value falls back to default', () => {- const s = memoryStorage({ [TERMINAL_WIDTH_KEY]: 'not a number' });- expect(readTerminalWidth(s)).toBe(DEFAULT_TERMINAL_WIDTH);- });-- test('empty string falls back to default', () => {- const s = memoryStorage({ [TERMINAL_WIDTH_KEY]: '' });- expect(readTerminalWidth(s)).toBe(DEFAULT_TERMINAL_WIDTH);- });-- test('floating-point string is truncated by parseInt', () => {- const s = memoryStorage({ [TERMINAL_WIDTH_KEY]: '640.6' });- expect(readTerminalWidth(s)).toBe(640);- });-});--describe('writeTerminalWidth', () => {- test('writes a clamped integer to storage', () => {- const s = memoryStorage();- writeTerminalWidth(640, s);- expect(s.getItem(TERMINAL_WIDTH_KEY)).toBe('640');- });-- test('clamps to MIN on write below floor', () => {- const s = memoryStorage();- writeTerminalWidth(100, s);- expect(s.getItem(TERMINAL_WIDTH_KEY)).toBe(String(MIN_TERMINAL_WIDTH));- });-- test('wide width is written unclamped (no pixel ceiling — layout constraints bound it)', () => {- const s = memoryStorage();- writeTerminalWidth(9999, s);- expect(s.getItem(TERMINAL_WIDTH_KEY)).toBe('9999');- });-- test('rounds floating-point input before write', () => {- const s = memoryStorage();- writeTerminalWidth(640.7, s);- expect(s.getItem(TERMINAL_WIDTH_KEY)).toBe('641');- });-- test('quota-exceeded throw is swallowed (in-memory only)', () => {- const throwing: TerminalWidthStorage = {- getItem() {- return null;- },- setItem() {- throw new Error('QuotaExceededError');- },- };- expect(() => writeTerminalWidth(640, throwing)).not.toThrow();- });-});diff --git a/packages/app/src/lib/terminal-width-store.ts b/packages/app/src/lib/terminal-width-store.tsdeleted file mode 100644index 595cc275e..000000000--- a/packages/app/src/lib/terminal-width-store.ts+++ /dev/null@@ -1,57 +0,0 @@-export const TERMINAL_WIDTH_KEY = 'ok-terminal-width-v1';--// The terminal column wants more horizontal room than the doc panel: a usable-// shell needs roughly 80 columns, and tools like `claude` reflow poorly below-// ~92 columns / ~650px. The default leans wide for that reason; the min keeps it-// above the point where most CLIs become unusable. There is deliberately no-// pixel ceiling: the column may grow to near-full width, bounded at apply time-// by the layout's own constraints (the editor keeps a minimum sliver), so a-// wide persisted value must survive a reload rather than snap back.-export const DEFAULT_TERMINAL_WIDTH = 480;-export const MIN_TERMINAL_WIDTH = 320;--export interface TerminalWidthStorage {- getItem(key: string): string | null;- setItem(key: string, value: string): void;-}--function clamp(px: number): number {- if (!Number.isFinite(px)) return DEFAULT_TERMINAL_WIDTH;- if (px < MIN_TERMINAL_WIDTH) return MIN_TERMINAL_WIDTH;- return Math.round(px);-}--export function readTerminalWidth(storage?: TerminalWidthStorage): number {- try {- const s = storage ?? localStorage;- const raw = s.getItem(TERMINAL_WIDTH_KEY);- if (raw == null) return DEFAULT_TERMINAL_WIDTH;- const parsed = Number.parseInt(raw, 10);- if (!Number.isFinite(parsed)) return DEFAULT_TERMINAL_WIDTH;- return clamp(parsed);- } catch {- return DEFAULT_TERMINAL_WIDTH;- }-}--export function writeTerminalWidth(px: number, storage?: TerminalWidthStorage): void {- try {- const s = storage ?? localStorage;- s.setItem(TERMINAL_WIDTH_KEY, String(clamp(px)));- } catch {- // quota exceeded — in-memory state holds for the session (mirrors sidebar-pin-store)- }-}--export function getInitialTerminalWidth(): number {- // `typeof localStorage` is not safe when localStorage is a property getter that- // throws on access (file:// protocol, Safari private mode SecurityError,- // sandboxed iframes). Wrap the whole dispatch so the synchronous-init contract- // survives any storage-restricted host.- try {- if (typeof localStorage === 'undefined') return DEFAULT_TERMINAL_WIDTH;- return readTerminalWidth();- } catch {- return DEFAULT_TERMINAL_WIDTH;- }-}diff --git a/packages/app/src/lib/unified-agent-store.ts b/packages/app/src/lib/unified-agent-store.tsindex 523a90a24..9b50e582d 100644--- a/packages/app/src/lib/unified-agent-store.ts+++ b/packages/app/src/lib/unified-agent-store.ts@@ -1,3 +1,4 @@+import { useSyncExternalStore } from 'react';/*** ONE sticky-agent store shared by every "Ask AI" composer placement (the bottom* docked field and the create/empty-screen hero). It carries the docked-terminal@@ -188,12 +189,51 @@ export function loadStickyAgent(storage?: StickyAgentStorage): string | null {* errors — the in-memory selection still holds for the session. */export function saveStickyAgent(id: HandoffTarget | string, storage?: StickyAgentStorage): void {const resolved = getStorage(storage);- if (!resolved) return;- try {- resolved.setItem(UNIFIED_AGENT_KEY, id);- } catch (err) {- console.warn('[ask-ai] Failed to persist default agent:', err);+ if (resolved) {+ try {+ resolved.setItem(UNIFIED_AGENT_KEY, id);+ } catch (err) {+ console.warn('[ask-ai] Failed to persist default agent:', err);+ }}+ // Publish so sibling surfaces re-read; without this they resolve a different+ // AI than the one the user just chose.+ for (const listener of stickyListeners) listener();+}++// Module-scope state + listeners so every mounted surface observes the SAME pick.+// The two session hosts partition Ask-AI / preferred-session work by comparing+// the kind each resolves; per-instance `useState` snapshots let one host's pick+// diverge, so both claimed and a passage landed twice. Mirrors the shape+// `lib/acp/enabled-agents.ts` already uses.+const stickyListeners = new Set<() => void>();++// Reads storage on every call rather than memoizing — see the note in+// terminal-new-tab-store: the value is a primitive, so an unchanged read costs+// nothing, and a cache would survive `localStorage.clear()` and leak.+function currentStickyAgent(): string | null {+ return loadStickyAgent();+}++/** Notify subscribers to re-read (cross-tab `storage` events). */+function reloadStickyAgentFromStorage(): void {+ for (const listener of stickyListeners) listener();+}++if (typeof window !== 'undefined' && typeof window.addEventListener === 'function') {+ window.addEventListener('storage', (event) => {+ if (event.key === UNIFIED_AGENT_KEY || event.key === null) reloadStickyAgentFromStorage();+ });+}++function subscribeStickyAgent(listener: () => void): () => void {+ stickyListeners.add(listener);+ return () => stickyListeners.delete(listener);+}++/** Reactive read — every subscriber re-renders when any surface writes. */+export function useStickyAgent(): string | null {+ return useSyncExternalStore(subscribeStickyAgent, currentStickyAgent, currentStickyAgent);}/**diff --git a/packages/app/src/locales/en/messages.json b/packages/app/src/locales/en/messages.jsonindex 5dc94a198..9f2ec38b9 100644--- a/packages/app/src/locales/en/messages.json+++ b/packages/app/src/locales/en/messages.json@@ -125,6 +125,7 @@"1GhYxC": ["of ", ["totalPages"]],"1HBhDS": ["Checking out files"],"1LtA5r": ["Symlinks the skill to ", ["path"]],+ "1MGRQl": ["Terminal sessions"],"1OKzC_": ["Your report couldn't be sent. Try again or email it instead."],"1QfxQT": ["Dismiss"],"1RluQD": ["Show replace"],@@ -136,6 +137,7 @@"Switching to <0>local-only</0> will refuse until they're untracked via<1> git rm --cached</1>."],"1ZpfyB": ["Open with AI ", ["displayName"], ", ", ["hint"]],+ "1__I_U": ["Agent sessions"],"1a6ICf": ["Following the agent's edits"],"1bDVu5": ["Workspace Command Palette"],"1d1F11": ["Select all files and folders"],@@ -190,7 +192,6 @@["FULLSCREEN_HUB_LIMIT"]," results."],- "2ojpo0": ["Dock sessions on the right"],"2pR7ad": ["Embeddings API key"],"2q_Q7x": ["Visibility"],"2rLM8r": ["Couldn't start the agent thread — please try again."],@@ -254,6 +255,7 @@"3wiBAs": ["Where should it live?"],"3y6XTb": ["Semantic search"],"3zyg_A": ["Ignore patterns"],+ "4-Phgi": ["Show or hide agents"],"438Fca": ["Cloned successfully, but could not open the project."],"43qzxu": ["DevOps"],"44DSl0": [@@ -276,13 +278,13 @@"4TzU0n": ["Initialize"],"4_5_n5": [["failed"], " of ", ["0"], " comments could not be removed from the queue."],"4buZWd": ["Inherited from ", ["path"]],- "4cEClj": ["Sessions"],"4c_a6S": ["Nothing set yet."],"4eO-iB": ["Discard this comment"],"4g19V6": ["Failed to update property"],"4h3e0H": ["Couldn't update skills sharing — ", ["detail"], "."],"4hJhzz": ["Table"],"4ieVh2": ["Pick “Custom” above to use this palette."],+ "4ivBhl": ["Toggle the right agents panel, where agent conversations live."],"4jDd0j": ["Anyone can see"],"4m-xuX": ["Auto-fix — nothing to fix"],"4mDIcg": ["Pick the skills to install. Each one lands as an editable skill you own."],@@ -561,6 +563,7 @@"8wu9lr": ["Queued"],"8ycqHY": ["Add the queued comments to this message"],"92rbk2": ["Mirror loading <0>", ["mirrorRef"], "</0>"],+ "93LBnX": ["Hide Agents"],"96G6Re": ["New folder"],"96pApd": ["Read-only file in the ", ["name"], " skill"],"96w9hU": ["Something went wrong opening this file (HTTP ", ["status"], ")."],@@ -778,7 +781,6 @@"CmeH9S": ["Add property to ", ["keyName"]],"CnOGgs": ["Sync mode"],"CoHvYd": ["Moved ", ["0"], " to position ", ["1"], " of ", ["2"]],- "CooKEf": ["Dock sessions at the bottom"],"Cu6GXQ": ["The source folder itself does not move."],"CvsD6Y": ["via ", ["viaTags"]],"CwOXMT": ["Value for ", ["keyName"]],@@ -1945,6 +1947,7 @@"X0ttSN": ["No tags match \"", ["tagListQuery"], "\"."],"X2zUS5": ["Delete this comment"],"X3MMeA": ["None of these problems have an automatic fix."],+ "X7ShnN": ["Open agents panel"],"X7u0xR": [["0"], " templates available"],"X8kjQX": ["Re-authenticate with GitHub"],"X9VpsP": ["Loading folder contents"],@@ -2228,6 +2231,7 @@"b2ezG_": ["Kept both — \"", ["0"], "\" is its own skill now"],"b3Thhd": ["Upload failed"],"b4AQFK": ["Open activity panel for ", ["tooltipName"], ", editing ", ["realCurrentDoc"]],+ "b4V4nU": ["Show Agents"],"b4VvP-": ["Existing branch <0>",["trimmed"],@@ -2437,6 +2441,7 @@"ePK91l": ["Edit"],"eQkgKV": ["Installed"],"eQxm13": ["Failed to update attachment location — ", ["detail"]],+ "eRSPr9": ["Open terminal"],"eTL5y9": ["Show selection preview"],"eTsJYJ": ["description"],"eUFXS1": ["Sort skills"],@@ -3077,6 +3082,7 @@"o2yoFu": ["Reveal in Finder, No workspace"],"o49mDZ": ["Loading timeline history"],"o4dcAf": ["Reveal in File Explorer, ", ["hint"]],+ "o5jB-D": ["Collapse panel"],"o9CrsQ": ["research-note"],"o9fPtM": ["Auto-update from source"],"oAFVKX": ["Failed to update the project sync default — ", ["detail"]],@@ -3135,7 +3141,6 @@["0"]," — something outside OK changed it since. The state shown is what's on disk now; your next Symlink/Unlink wins."],- "p8TjFD": ["Collapse session dock"],"p98xmP": ["Applies to"],"p9sdCy": ["New ignore pattern"],"pAgkuZ": ["Reopening \"", ["docName"], "\" with a fresh local collaboration cache."],@@ -3515,7 +3520,6 @@"</0> to copy the link below, or open OK in the desktop app."],"vjW-SM": ["Saved into your global skills folder (e.g. <0>~/.agents/skills</0>)."],- "vja0Dg": ["Open session dock"],"vjwsDi": [["count",diff --git a/packages/app/src/locales/en/messages.po b/packages/app/src/locales/en/messages.poindex 14eca36a2..564f414a9 100644--- a/packages/app/src/locales/en/messages.po+++ b/packages/app/src/locales/en/messages.po@@ -1210,7 +1210,7 @@ msgstr "Advanced"msgid "Advanced settings"msgstr "Advanced settings"-#: src/components/TerminalSessionsHost.tsx+#: src/components/SessionsHost.tsx#: src/presence/PresenceBar.tsxmsgid "Agent"msgstr "Agent"@@ -1227,6 +1227,10 @@ msgstr "Agent configuration file"msgid "Agent mode"msgstr "Agent mode"+#: src/components/TerminalTabStrip.tsx+msgid "Agent sessions"+msgstr "Agent sessions"+#: src/components/acp/ThreadView.tsxmsgid "Agent settings"msgstr "Agent settings"@@ -2276,8 +2280,8 @@ msgid "Collapse graph"msgstr "Collapse graph"#: src/components/TerminalTabStrip.tsx-msgid "Collapse session dock"-msgstr "Collapse session dock"+msgid "Collapse panel"+msgstr "Collapse panel"#: src/editor/slash-command/component-items.tsxmsgid "Collapsible section with a clickable summary."@@ -3759,14 +3763,6 @@ msgstr "Do you want to permanently delete instead?"msgid "Doc mention suggestions"msgstr "Doc mention suggestions"-#: src/components/TerminalTabStrip.tsx-msgid "Dock sessions at the bottom"-msgstr "Dock sessions at the bottom"--#: src/components/TerminalTabStrip.tsx-msgid "Dock sessions on the right"-msgstr "Dock sessions on the right"-#: src/components/ExploreSkills.tsx#: src/components/HelpPopover.tsxmsgid "Docs"@@ -5254,6 +5250,10 @@ msgstr "Hide"msgid "Hide advanced"msgstr "Hide advanced"+#: src/components/command-palette-commands.ts+msgid "Hide Agents"+msgstr "Hide Agents"+#: src/components/AppMenubar.tsx#: src/components/command-palette-commands.tsmsgid "Hide document panel"@@ -6487,7 +6487,7 @@ msgstr "Moved \"{0}\" to {1}"#. placeholder {0}: moved.label#. placeholder {1}: moved.position#. placeholder {2}: moved.total-#: src/components/TerminalSessionsHost.tsx+#: src/components/SessionsHost.tsxmsgid "Moved {0} to position {1} of {2}"msgstr "Moved {0} to position {1} of {2}"@@ -7330,6 +7330,10 @@ msgstr "Open activity panel for {tooltipName}"msgid "Open activity panel for {tooltipName}, editing {realCurrentDoc}"msgstr "Open activity panel for {tooltipName}, editing {realCurrentDoc}"+#: src/components/TerminalRevealTab.tsx+msgid "Open agents panel"+msgstr "Open agents panel"+#: src/lib/keyboard-shortcuts.tsmsgid "Open an existing project folder from disk."msgstr "Open an existing project folder from disk."@@ -7461,10 +7465,6 @@ msgstr "Open project menu"msgid "Open recent project"msgstr "Open recent project"-#: src/components/TerminalRevealTab.tsx-msgid "Open session dock"-msgstr "Open session dock"-#: src/components/settings/plugin-enabled-notice.tsmsgid "Open settings"msgstr "Open settings"@@ -7486,6 +7486,10 @@ msgstr "Open source lint panel"msgid "Open source: {mirrorSrc}"msgstr "Open source: {mirrorSrc}"+#: src/components/TerminalRevealTab.tsx+msgid "Open terminal"+msgstr "Open terminal"+#: src/components/ShareBranchSwitchDialog.tsxmsgid "Open that worktree instead"msgstr "Open that worktree instead"@@ -8315,7 +8319,7 @@ msgstr "Reconnected"msgid "Reconnecting after server restart"msgstr "Reconnecting after server restart"-#: src/components/TerminalSessionsHost.tsx+#: src/components/SessionsHost.tsxmsgid "Reconnecting to the agent service…"msgstr "Reconnecting to the agent service…"@@ -9399,10 +9403,6 @@ msgstr "Session ended"msgid "Session ended — undo unavailable"msgstr "Session ended — undo unavailable"-#: src/components/TerminalTabStrip.tsx-msgid "Sessions"-msgstr "Sessions"-#: src/components/AuthModal.tsxmsgid "Set git identity"msgstr "Set git identity"@@ -9564,6 +9564,10 @@ msgstr "Show a preview card when you hover an external link in the editor. Thismsgid "Show advanced"msgstr "Show advanced"+#: src/components/command-palette-commands.ts+msgid "Show Agents"+msgstr "Show Agents"+#: src/components/MermaidFileViewer.tsxmsgid "Show diagram"msgstr "Show diagram"@@ -9620,6 +9624,10 @@ msgstr "Show less"msgid "Show only markdown files"msgstr "Show only markdown files"+#: src/lib/keyboard-shortcuts.ts+msgid "Show or hide agents"+msgstr "Show or hide agents"+#: src/lib/keyboard-shortcuts.tsmsgid "Show or hide document panel"msgstr "Show or hide document panel"@@ -9919,7 +9927,7 @@ msgstr "Start a new chat"msgid "Start a new OpenKnowledge project."msgstr "Start a new OpenKnowledge project."-#: src/components/TerminalSessionsHost.tsx+#: src/components/SessionsHost.tsxmsgid "Start a session with the + button, or launch an agent from a page."msgstr "Start a session with the + button, or launch an agent from a page."@@ -10386,7 +10394,7 @@ msgid "Terminal"msgstr "Terminal"#. placeholder {0}: session.ordinal-#: src/components/TerminalSessionsHost.tsx+#: src/components/SessionsHost.tsxmsgid "Terminal {0}"msgstr "Terminal {0}"@@ -10402,6 +10410,10 @@ msgstr "Terminal disabled"msgid "Terminal failed to load"msgstr "Terminal failed to load"+#: src/components/TerminalTabStrip.tsx+msgid "Terminal sessions"+msgstr "Terminal sessions"+#: src/components/TerminalGate.tsxmsgid "Terminal settings not loaded yet — try again in a moment."msgstr "Terminal settings not loaded yet — try again in a moment."@@ -10556,7 +10568,7 @@ msgstr "The menu label agents pick this template by (required)."msgid "The model id your endpoint serves. Its vector size is detected automatically — clear the field to go back to {DEFAULT_EMBEDDINGS_MODEL}."msgstr "The model id your endpoint serves. Its vector size is detected automatically — clear the field to go back to {DEFAULT_EMBEDDINGS_MODEL}."-#: src/components/TerminalSessionsHost.tsx+#: src/components/SessionsHost.tsxmsgid "the open agent"msgstr "the open agent"@@ -11056,6 +11068,10 @@ msgstr "Toggle the bottom terminal panel. With text selected, stage it for yourmsgid "Toggle the left file sidebar."msgstr "Toggle the left file sidebar."+#: src/lib/keyboard-shortcuts.ts+msgid "Toggle the right agents panel, where agent conversations live."+msgstr "Toggle the right agents panel, where agent conversations live."+#: src/lib/keyboard-shortcuts.tsmsgid "Toggle the right document panel."msgstr "Toggle the right document panel."diff --git a/packages/app/src/locales/pseudo/messages.json b/packages/app/src/locales/pseudo/messages.jsonindex 337953fc6..c3633aac7 100644--- a/packages/app/src/locales/pseudo/messages.json+++ b/packages/app/src/locales/pseudo/messages.json@@ -125,6 +125,7 @@"1GhYxC": ["ōƒ ", ["totalPages"]],"1HBhDS": ["Ćĥēćķĩńĝ ōũţ ƒĩĺēś"],"1LtA5r": ["Śŷḿĺĩńķś ţĥē śķĩĺĺ ţō ", ["path"]],+ "1MGRQl": ["Ţēŕḿĩńàĺ śēśśĩōńś"],"1OKzC_": ["Ŷōũŕ ŕēƥōŕţ ćōũĺďń'ţ ƀē śēńţ. Ţŕŷ àĝàĩń ōŕ ēḿàĩĺ ĩţ ĩńśţēàď."],"1QfxQT": ["Ďĩśḿĩśś"],"1RluQD": ["Śĥōŵ ŕēƥĺàćē"],@@ -136,6 +137,7 @@"Śŵĩţćĥĩńĝ ţō <0>ĺōćàĺ-ōńĺŷ</0> ŵĩĺĺ ŕēƒũśē ũńţĩĺ ţĥēŷ'ŕē ũńţŕàćķēď vĩà<1> ĝĩţ ŕḿ --ćàćĥēď</1>."],"1ZpfyB": ["Ōƥēń ŵĩţĥ ÀĨ ", ["displayName"], ", ", ["hint"]],+ "1__I_U": ["Àĝēńţ śēśśĩōńś"],"1a6ICf": ["Ƒōĺĺōŵĩńĝ ţĥē àĝēńţ'ś ēďĩţś"],"1bDVu5": ["Ŵōŕķśƥàćē Ćōḿḿàńď Ƥàĺēţţē"],"1d1F11": ["Śēĺēćţ àĺĺ ƒĩĺēś àńď ƒōĺďēŕś"],@@ -190,7 +192,6 @@["FULLSCREEN_HUB_LIMIT"]," ŕēśũĺţś."],- "2ojpo0": ["Ďōćķ śēśśĩōńś ōń ţĥē ŕĩĝĥţ"],"2pR7ad": ["Ēḿƀēďďĩńĝś ÀƤĨ ķēŷ"],"2q_Q7x": ["Vĩśĩƀĩĺĩţŷ"],"2rLM8r": ["Ćōũĺďń'ţ śţàŕţ ţĥē àĝēńţ ţĥŕēàď — ƥĺēàśē ţŕŷ àĝàĩń."],@@ -254,6 +255,7 @@"3wiBAs": ["Ŵĥēŕē śĥōũĺď ĩţ ĺĩvē?"],"3y6XTb": ["Śēḿàńţĩć śēàŕćĥ"],"3zyg_A": ["Ĩĝńōŕē ƥàţţēŕńś"],+ "4-Phgi": ["Śĥōŵ ōŕ ĥĩďē àĝēńţś"],"438Fca": ["Ćĺōńēď śũććēśśƒũĺĺŷ, ƀũţ ćōũĺď ńōţ ōƥēń ţĥē ƥŕōĴēćţ."],"43qzxu": ["ĎēvŌƥś"],"44DSl0": [@@ -276,13 +278,13 @@"4TzU0n": ["Ĩńĩţĩàĺĩźē"],"4_5_n5": [["failed"], " ōƒ ", ["0"], " ćōḿḿēńţś ćōũĺď ńōţ ƀē ŕēḿōvēď ƒŕōḿ ţĥē ǫũēũē."],"4buZWd": ["Ĩńĥēŕĩţēď ƒŕōḿ ", ["path"]],- "4cEClj": ["Śēśśĩōńś"],"4c_a6S": ["Ńōţĥĩńĝ śēţ ŷēţ."],"4eO-iB": ["Ďĩśćàŕď ţĥĩś ćōḿḿēńţ"],"4g19V6": ["Ƒàĩĺēď ţō ũƥďàţē ƥŕōƥēŕţŷ"],"4h3e0H": ["Ćōũĺďń'ţ ũƥďàţē śķĩĺĺś śĥàŕĩńĝ — ", ["detail"], "."],"4hJhzz": ["Ţàƀĺē"],"4ieVh2": ["Ƥĩćķ “Ćũśţōḿ” àƀōvē ţō ũśē ţĥĩś ƥàĺēţţē."],+ "4ivBhl": ["Ţōĝĝĺē ţĥē ŕĩĝĥţ àĝēńţś ƥàńēĺ, ŵĥēŕē àĝēńţ ćōńvēŕśàţĩōńś ĺĩvē."],"4jDd0j": ["Àńŷōńē ćàń śēē"],"4m-xuX": ["Àũţō-ƒĩx — ńōţĥĩńĝ ţō ƒĩx"],"4mDIcg": ["Ƥĩćķ ţĥē śķĩĺĺś ţō ĩńśţàĺĺ. Ēàćĥ ōńē ĺàńďś àś àń ēďĩţàƀĺē śķĩĺĺ ŷōũ ōŵń."],@@ -561,6 +563,7 @@"8wu9lr": ["Ǫũēũēď"],"8ycqHY": ["Àďď ţĥē ǫũēũēď ćōḿḿēńţś ţō ţĥĩś ḿēśśàĝē"],"92rbk2": ["Ḿĩŕŕōŕ ĺōàďĩńĝ <0>", ["mirrorRef"], "</0>"],+ "93LBnX": ["Ĥĩďē Àĝēńţś"],"96G6Re": ["Ńēŵ ƒōĺďēŕ"],"96pApd": ["Ŕēàď-ōńĺŷ ƒĩĺē ĩń ţĥē ", ["name"], " śķĩĺĺ"],"96w9hU": ["Śōḿēţĥĩńĝ ŵēńţ ŵŕōńĝ ōƥēńĩńĝ ţĥĩś ƒĩĺē (ĤŢŢƤ ", ["status"], ")."],@@ -778,7 +781,6 @@"CmeH9S": ["Àďď ƥŕōƥēŕţŷ ţō ", ["keyName"]],"CnOGgs": ["Śŷńć ḿōďē"],"CoHvYd": ["Ḿōvēď ", ["0"], " ţō ƥōśĩţĩōń ", ["1"], " ōƒ ", ["2"]],- "CooKEf": ["Ďōćķ śēśśĩōńś àţ ţĥē ƀōţţōḿ"],"Cu6GXQ": ["Ţĥē śōũŕćē ƒōĺďēŕ ĩţśēĺƒ ďōēś ńōţ ḿōvē."],"CvsD6Y": ["vĩà ", ["viaTags"]],"CwOXMT": ["Vàĺũē ƒōŕ ", ["keyName"]],@@ -1945,6 +1947,7 @@"X0ttSN": ["Ńō ţàĝś ḿàţćĥ \"", ["tagListQuery"], "\"."],"X2zUS5": ["Ďēĺēţē ţĥĩś ćōḿḿēńţ"],"X3MMeA": ["Ńōńē ōƒ ţĥēśē ƥŕōƀĺēḿś ĥàvē àń àũţōḿàţĩć ƒĩx."],+ "X7ShnN": ["Ōƥēń àĝēńţś ƥàńēĺ"],"X7u0xR": [["0"], " ţēḿƥĺàţēś àvàĩĺàƀĺē"],"X8kjQX": ["Ŕē-àũţĥēńţĩćàţē ŵĩţĥ ĜĩţĤũƀ"],"X9VpsP": ["Ĺōàďĩńĝ ƒōĺďēŕ ćōńţēńţś"],@@ -2228,6 +2231,7 @@"b2ezG_": ["Ķēƥţ ƀōţĥ — \"", ["0"], "\" ĩś ĩţś ōŵń śķĩĺĺ ńōŵ"],"b3Thhd": ["Ũƥĺōàď ƒàĩĺēď"],"b4AQFK": ["Ōƥēń àćţĩvĩţŷ ƥàńēĺ ƒōŕ ", ["tooltipName"], ", ēďĩţĩńĝ ", ["realCurrentDoc"]],+ "b4V4nU": ["Śĥōŵ Àĝēńţś"],"b4VvP-": ["Ēxĩśţĩńĝ ƀŕàńćĥ <0>",["trimmed"],@@ -2437,6 +2441,7 @@"ePK91l": ["Ēďĩţ"],"eQkgKV": ["Ĩńśţàĺĺēď"],"eQxm13": ["Ƒàĩĺēď ţō ũƥďàţē àţţàćĥḿēńţ ĺōćàţĩōń — ", ["detail"]],+ "eRSPr9": ["Ōƥēń ţēŕḿĩńàĺ"],"eTL5y9": ["Śĥōŵ śēĺēćţĩōń ƥŕēvĩēŵ"],"eTsJYJ": ["ďēśćŕĩƥţĩōń"],"eUFXS1": ["Śōŕţ śķĩĺĺś"],@@ -3077,6 +3082,7 @@"o2yoFu": ["Ŕēvēàĺ ĩń Ƒĩńďēŕ, Ńō ŵōŕķśƥàćē"],"o49mDZ": ["Ĺōàďĩńĝ ţĩḿēĺĩńē ĥĩśţōŕŷ"],"o4dcAf": ["Ŕēvēàĺ ĩń Ƒĩĺē Ēxƥĺōŕēŕ, ", ["hint"]],+ "o5jB-D": ["Ćōĺĺàƥśē ƥàńēĺ"],"o9CrsQ": ["ŕēśēàŕćĥ-ńōţē"],"o9fPtM": ["Àũţō-ũƥďàţē ƒŕōḿ śōũŕćē"],"oAFVKX": ["Ƒàĩĺēď ţō ũƥďàţē ţĥē ƥŕōĴēćţ śŷńć ďēƒàũĺţ — ", ["detail"]],@@ -3135,7 +3141,6 @@["0"]," — śōḿēţĥĩńĝ ōũţśĩďē ŌĶ ćĥàńĝēď ĩţ śĩńćē. Ţĥē śţàţē śĥōŵń ĩś ŵĥàţ'ś ōń ďĩśķ ńōŵ; ŷōũŕ ńēxţ Śŷḿĺĩńķ/Ũńĺĩńķ ŵĩńś."],- "p8TjFD": ["Ćōĺĺàƥśē śēśśĩōń ďōćķ"],"p98xmP": ["Àƥƥĺĩēś ţō"],"p9sdCy": ["Ńēŵ ĩĝńōŕē ƥàţţēŕń"],"pAgkuZ": ["Ŕēōƥēńĩńĝ \"", ["docName"], "\" ŵĩţĥ à ƒŕēśĥ ĺōćàĺ ćōĺĺàƀōŕàţĩōń ćàćĥē."],@@ -3515,7 +3520,6 @@"</0> ţō ćōƥŷ ţĥē ĺĩńķ ƀēĺōŵ, ōŕ ōƥēń ŌĶ ĩń ţĥē ďēśķţōƥ àƥƥ."],"vjW-SM": ["Śàvēď ĩńţō ŷōũŕ ĝĺōƀàĺ śķĩĺĺś ƒōĺďēŕ (ē.ĝ. <0>~/.àĝēńţś/śķĩĺĺś</0>)."],- "vja0Dg": ["Ōƥēń śēśśĩōń ďōćķ"],"vjwsDi": [["count",diff --git a/packages/app/src/locales/pseudo/messages.po b/packages/app/src/locales/pseudo/messages.poindex e33c4e52e..c79227032 100644--- a/packages/app/src/locales/pseudo/messages.po+++ b/packages/app/src/locales/pseudo/messages.po@@ -1206,7 +1206,7 @@ msgstr ""msgid "Advanced settings"msgstr ""-#: src/components/TerminalSessionsHost.tsx+#: src/components/SessionsHost.tsx#: src/presence/PresenceBar.tsxmsgid "Agent"msgstr ""@@ -1223,6 +1223,10 @@ msgstr ""msgid "Agent mode"msgstr ""+#: src/components/TerminalTabStrip.tsx+msgid "Agent sessions"+msgstr ""+#: src/components/acp/ThreadView.tsxmsgid "Agent settings"msgstr ""@@ -2272,7 +2276,7 @@ msgid "Collapse graph"msgstr ""#: src/components/TerminalTabStrip.tsx-msgid "Collapse session dock"+msgid "Collapse panel"msgstr ""#: src/editor/slash-command/component-items.tsx@@ -3755,14 +3759,6 @@ msgstr ""msgid "Doc mention suggestions"msgstr ""-#: src/components/TerminalTabStrip.tsx-msgid "Dock sessions at the bottom"-msgstr ""--#: src/components/TerminalTabStrip.tsx-msgid "Dock sessions on the right"-msgstr ""-#: src/components/ExploreSkills.tsx#: src/components/HelpPopover.tsxmsgid "Docs"@@ -5250,6 +5246,10 @@ msgstr ""msgid "Hide advanced"msgstr ""+#: src/components/command-palette-commands.ts+msgid "Hide Agents"+msgstr ""+#: src/components/AppMenubar.tsx#: src/components/command-palette-commands.tsmsgid "Hide document panel"@@ -6483,7 +6483,7 @@ msgstr ""#. placeholder {0}: moved.label#. placeholder {1}: moved.position#. placeholder {2}: moved.total-#: src/components/TerminalSessionsHost.tsx+#: src/components/SessionsHost.tsxmsgid "Moved {0} to position {1} of {2}"msgstr ""@@ -7326,6 +7326,10 @@ msgstr ""msgid "Open activity panel for {tooltipName}, editing {realCurrentDoc}"msgstr ""+#: src/components/TerminalRevealTab.tsx+msgid "Open agents panel"+msgstr ""+#: src/lib/keyboard-shortcuts.tsmsgid "Open an existing project folder from disk."msgstr ""@@ -7457,10 +7461,6 @@ msgstr ""msgid "Open recent project"msgstr ""-#: src/components/TerminalRevealTab.tsx-msgid "Open session dock"-msgstr ""-#: src/components/settings/plugin-enabled-notice.tsmsgid "Open settings"msgstr ""@@ -7482,6 +7482,10 @@ msgstr ""msgid "Open source: {mirrorSrc}"msgstr ""+#: src/components/TerminalRevealTab.tsx+msgid "Open terminal"+msgstr ""+#: src/components/ShareBranchSwitchDialog.tsxmsgid "Open that worktree instead"msgstr ""@@ -8311,7 +8315,7 @@ msgstr ""msgid "Reconnecting after server restart"msgstr ""-#: src/components/TerminalSessionsHost.tsx+#: src/components/SessionsHost.tsxmsgid "Reconnecting to the agent service…"msgstr ""@@ -9395,10 +9399,6 @@ msgstr ""msgid "Session ended — undo unavailable"msgstr ""-#: src/components/TerminalTabStrip.tsx-msgid "Sessions"-msgstr ""-#: src/components/AuthModal.tsxmsgid "Set git identity"msgstr ""@@ -9560,6 +9560,10 @@ msgstr ""msgid "Show advanced"msgstr ""+#: src/components/command-palette-commands.ts+msgid "Show Agents"+msgstr ""+#: src/components/MermaidFileViewer.tsxmsgid "Show diagram"msgstr ""@@ -9616,6 +9620,10 @@ msgstr ""msgid "Show only markdown files"msgstr ""+#: src/lib/keyboard-shortcuts.ts+msgid "Show or hide agents"+msgstr ""+#: src/lib/keyboard-shortcuts.tsmsgid "Show or hide document panel"msgstr ""@@ -9915,7 +9923,7 @@ msgstr ""msgid "Start a new OpenKnowledge project."msgstr ""-#: src/components/TerminalSessionsHost.tsx+#: src/components/SessionsHost.tsxmsgid "Start a session with the + button, or launch an agent from a page."msgstr ""@@ -10382,7 +10390,7 @@ msgid "Terminal"msgstr ""#. placeholder {0}: session.ordinal-#: src/components/TerminalSessionsHost.tsx+#: src/components/SessionsHost.tsxmsgid "Terminal {0}"msgstr ""@@ -10398,6 +10406,10 @@ msgstr ""msgid "Terminal failed to load"msgstr ""+#: src/components/TerminalTabStrip.tsx+msgid "Terminal sessions"+msgstr ""+#: src/components/TerminalGate.tsxmsgid "Terminal settings not loaded yet — try again in a moment."msgstr ""@@ -10552,7 +10564,7 @@ msgstr ""msgid "The model id your endpoint serves. Its vector size is detected automatically — clear the field to go back to {DEFAULT_EMBEDDINGS_MODEL}."msgstr ""-#: src/components/TerminalSessionsHost.tsx+#: src/components/SessionsHost.tsxmsgid "the open agent"msgstr ""@@ -11052,6 +11064,10 @@ msgstr ""msgid "Toggle the left file sidebar."msgstr ""+#: src/lib/keyboard-shortcuts.ts+msgid "Toggle the right agents panel, where agent conversations live."+msgstr ""+#: src/lib/keyboard-shortcuts.tsmsgid "Toggle the right document panel."msgstr ""diff --git a/packages/app/tests/stress/fixtures/handoff-mocks.ts b/packages/app/tests/stress/fixtures/handoff-mocks.tsindex d5eb5955c..7e398e834 100644--- a/packages/app/tests/stress/fixtures/handoff-mocks.ts+++ b/packages/app/tests/stress/fixtures/handoff-mocks.ts@@ -611,7 +611,7 @@ export async function installHandoffMocks(page: Page, cfg: HandoffMockConfig): Padopt: async () => ({ ok: true as const, replay: '' }),setMeta: () => {},setOrder: () => {},- getDockState: async () => ({ visible: false, order: [], activeKey: null }),+ getDockState: async () => ({ terminalVisible: false, agentPanelVisible: false }),setDockState: () => {},onData: () => () => {},onExit: () => () => {},diff --git a/packages/core/src/commands/command-identity.ts b/packages/core/src/commands/command-identity.tsindex 1861e618c..9212acb34 100644--- a/packages/core/src/commands/command-identity.ts+++ b/packages/core/src/commands/command-identity.ts@@ -168,7 +168,11 @@ export interface CommandStateToggle {readonly showKey: MenuLabelKey;readonly hideKey: MenuLabelKey;/** View-menu-state field driving the label. */- readonly stateField: 'sidebarVisible' | 'docPanelVisible' | 'terminalVisible';+ readonly stateField:+ | 'sidebarVisible'+ | 'docPanelVisible'+ | 'terminalVisible'+ | 'agentPanelVisible';/** Menu default when the state is unknown (sidebar/doc-panel start visible → "Hide"). */readonly defaultVisible: boolean;}@@ -585,6 +589,25 @@ export const COMMAND_IDENTITIES: readonly CommandIdentity[] = [palette: { group: 'view', visibility: 'search-only' },menu: [{ section: 'view-panels', order: 2, accelerator: 'CmdOrCtrl+J' }],},+ {+ // The agents panel is the ACP twin of the terminal dock, but it is NOT+ // desktop-gated: agent threads are server-hosted, so the panel works on the+ // web host and on Windows/Linux where node-pty is unavailable.+ id: 'toggle-agent-panel',+ menuActionId: 'toggle-agent-panel',+ labelKey: 'agentPanelShow',+ keywords: ['agent', 'agents', 'chat', 'ai', 'ask', 'panel', 'toggle'],+ shortcutId: 'toggle-agent-panel',+ stateToggle: {+ showKey: 'agentPanelShow',+ hideKey: 'agentPanelHide',+ stateField: 'agentPanelVisible',+ defaultVisible: false,+ },+ availability: {},+ palette: { group: 'view', visibility: 'search-only' },+ menu: [{ section: 'view-panels', order: 3, accelerator: 'CmdOrCtrl+L' }],+ },{id: 'toggle-show-hidden-files',menuActionId: 'toggle-show-hidden-files',diff --git a/packages/core/src/constants/menu-labels.ts b/packages/core/src/constants/menu-labels.tsindex ccab82961..75ebcffe4 100644--- a/packages/core/src/constants/menu-labels.ts+++ b/packages/core/src/constants/menu-labels.ts@@ -100,6 +100,8 @@ export const MENU_LABELS = {forward: 'Forward',terminalShow: 'Show Terminal',terminalHide: 'Hide Terminal',+ agentPanelShow: 'Show Agents',+ agentPanelHide: 'Hide Agents',// Palette form for the install command, whose native-menu leaf renders a// different literal via the placement's `menuLabelText` ("…(desktop app)"// lowercase), so only this palette string participates in the shared-labeldiff --git a/packages/core/src/desktop-bridge.ts b/packages/core/src/desktop-bridge.tsindex aac13e17a..33fe1459e 100644--- a/packages/core/src/desktop-bridge.ts+++ b/packages/core/src/desktop-bridge.ts@@ -102,6 +102,10 @@ type OkMenuAction =| 'collapse-all-tree'| 'toggle-doc-panel'| 'toggle-terminal'+ // Right agents-panel visibility (⌘L / Ctrl+L). The ACP twin of+ // `toggle-terminal`, and deliberately NOT desktop-gated: agent threads are+ // server-hosted, so the panel works on the web host and where pty does not.+ | 'toggle-agent-panel'// Terminal application menu. `new-terminal` opens a new terminal tab// (revealing the dock if hidden; never hides, unlike the toggle).// `kill-terminal` closes the active tab, killing that session's PTY.@@ -811,6 +815,7 @@ interface OkEditorViewMenuStateSnapshot {readonly docPanelVisible?: boolean;readonly terminalVisible?: boolean;readonly terminalLive?: boolean;+ readonly agentPanelVisible?: boolean;readonly canViewInSource?: boolean;}@@ -1774,10 +1779,19 @@ export interface OkDesktopBridge {* survives a renderer reload. Fire-and-forget.*/setOrder(orderedPtyIds: readonly string[]): void;- /** Per-window sessions-dock state (visibility + unified tab order + active key). Canonical JSDoc in `bridge-contract.ts`; mirrored verbatim (drift-tested). */- getDockState(): Promise<{ visible: boolean; order?: string[]; activeKey?: string | null }>;- /** Persist the unified sessions-dock order + active key per window. Canonical JSDoc in `bridge-contract.ts`; mirrored verbatim (drift-tested). */- setDockState(state: { order: string[]; activeKey: string | null }): void;+ /** Per-window panel state (per-surface visibility + tab order + active key). Canonical JSDoc in `bridge-contract.ts`; mirrored verbatim (drift-tested). */+ getDockState(): Promise<{+ terminalVisible: boolean;+ agentPanelVisible: boolean;+ terminal?: { order: string[]; activeKey: string | null };+ agents?: { order: string[]; activeKey: string | null };+ }>;+ /** Persist one panel's tab order + active key per window. Canonical JSDoc in `bridge-contract.ts`; mirrored verbatim (drift-tested). */+ setDockState(state: {+ surface: 'terminal' | 'agents';+ order: string[];+ activeKey: string | null;+ }): void;onData(cb: (msg: OkPtyData) => void): OkUnsubscribe;onExit(cb: (msg: OkPtyExit) => void): OkUnsubscribe;claudePreflight(): Promise<ClaudeReadiness>;diff --git a/packages/desktop/src/main/index.ts b/packages/desktop/src/main/index.tsindex db51db231..b266db93f 100644--- a/packages/desktop/src/main/index.ts+++ b/packages/desktop/src/main/index.ts@@ -879,13 +879,24 @@ let terminalReaper: TerminalReaper | null = null;*/const dockVisibleForWindow = new Map<number, boolean>();/**- * Per-window unified sessions-dock order + active key, recorded from the- * renderer's `ok:terminal:set-dock-state` push so a reloaded renderer restores the- * interleaved cross-kind tab arrangement (terminal ptyIds + thread threadIds) and- * the active tab. Same windowId-keyed lifetime as {@link dockVisibleForWindow} —- * cleared on window-close and app-quit.+ * Per-window agents-panel visibility, the ACP twin of {@link dockVisibleForWindow}.+ * Separate map rather than a field on one record because the two panels are+ * independent surfaces whose renderer pushes arrive on their own edges.*/-const dockOrderForWindow = new Map<number, { order: string[]; activeKey: string | null }>();+const agentPanelVisibleForWindow = new Map<number, boolean>();+/**+ * Per-window tab order + active key for each panel, recorded from the renderer's+ * `ok:terminal:set-dock-state` push so a reloaded renderer restores each panel's+ * arrangement. Keyed by surface because the terminal dock and agents panel write+ * independently — one shared record would let each write erase the other's keys+ * and clobber the shared active tab. Same windowId-keyed lifetime as+ * {@link dockVisibleForWindow} — cleared on window-close and app-quit.+ */+type DockOrderRecord = { order: string[]; activeKey: string | null };+const dockOrderForWindow = new Map<+ number,+ Partial<Record<'terminal' | 'agents', DockOrderRecord>>+>();/*** Singleton show-gate registry — coordinates window.show() against the* dual-signal contract (`ready-to-show` + `ok:theme:applied`). Module-level@@ -1293,6 +1304,7 @@ function ensureWindowManager() {if (terminalReaper)wireWindowTerminalReap(win, terminalReaper, (windowId) => {dockVisibleForWindow.delete(windowId);+ agentPanelVisibleForWindow.delete(windowId);dockOrderForWindow.delete(windowId);});return win as unknown as BrowserWindowLike;@@ -2702,6 +2714,8 @@ async function runApplicationMenuRefresh(): Promise<void> {// is not bundled on win/linux, so strip every terminal handler there —// the menu items render disabled instead of surfacing a spawn failure.// Overrides the three handlers `buildViewMenuStateDeps` just spread in.+ // `onToggleAgentPanel` is deliberately absent from the strip list: agent+ // threads are server-hosted, so the agents panel works everywhere pty does not....(process.platform === 'darwin'? { onNewTerminalWindow: () => openTerminalWindow() }: {@@ -4229,18 +4243,33 @@ function registerIpcHandlers() {handle('ok:terminal:dock-state', async (event) => {const win = BrowserWindow.fromWebContents(event.sender);- if (!win) return { visible: false, order: [], activeKey: null };- const dockOrder = dockOrderForWindow.get(win.id);+ if (!win) return { terminalVisible: false, agentPanelVisible: false };+ const orders = dockOrderForWindow.get(win.id);return {- visible: dockVisibleForWindow.get(win.id) ?? false,- order: dockOrder?.order ?? [],- activeKey: dockOrder?.activeKey ?? null,+ terminalVisible: dockVisibleForWindow.get(win.id) ?? false,+ agentPanelVisible: agentPanelVisibleForWindow.get(win.id) ?? false,+ terminal: orders?.terminal,+ agents: orders?.agents,};});handle('ok:terminal:set-dock-state', async (event, req) => {+ // Same untrusted-discriminant problem as cli-preflight above: `req.surface`+ // is a compile-time union that `createHandler` casts without runtime+ // enforcement, and here it indexes straight into the per-window order map.+ // An out-of-registry value would store a phantom key that `getDockState`+ // never reads back, so the panel silently cold-starts with the wrong order.+ if (req.surface !== 'terminal' && req.surface !== 'agents') {+ getLogger('terminal').warn({ surface: req.surface }, 'set-dock-state: unknown surface');+ return undefined;+ }const win = BrowserWindow.fromWebContents(event.sender);- if (win) dockOrderForWindow.set(win.id, { order: req.order, activeKey: req.activeKey });+ if (win) {+ dockOrderForWindow.set(win.id, {+ ...dockOrderForWindow.get(win.id),+ [req.surface]: { order: req.order, activeKey: req.activeKey },+ });+ }return undefined;});@@ -4607,12 +4636,17 @@ function registerIpcHandlers() {// next `refreshApplicationMenu` rebuild reads the latest snapshot.// Last-write-wins across windows matches the singleton menu model.editorViewMenuState = mergeViewMenuState(editorViewMenuState, state);- // The menu snapshot is a singleton, but dock visibility must recover- // per-window after a reload — record it keyed by the sender window so the- // reloaded renderer reads back its own dock state, not another window's.- if (state.terminalVisible !== undefined) {+ // The menu snapshot is a singleton, but panel visibility must recover+ // per-window after a reload — record each panel keyed by the sender window+ // so the reloaded renderer reads back its own state, not another window's.+ if (state.terminalVisible !== undefined || state.agentPanelVisible !== undefined) {const win = BrowserWindow.fromWebContents(event.sender);- if (win) dockVisibleForWindow.set(win.id, state.terminalVisible);+ if (win) {+ if (state.terminalVisible !== undefined)+ dockVisibleForWindow.set(win.id, state.terminalVisible);+ if (state.agentPanelVisible !== undefined)+ agentPanelVisibleForWindow.set(win.id, state.agentPanelVisible);+ }}refreshApplicationMenu();return undefined;@@ -7067,6 +7101,7 @@ function bootPrimaryInstance(): void {// outlives the app. Idempotent (clears the map; a second pass no-ops).terminalReaper?.killAll();dockVisibleForWindow.clear();+ agentPanelVisibleForWindow.clear();dockOrderForWindow.clear();autoUpdaterHandle?.destroy();autoUpdaterHandle = null;diff --git a/packages/desktop/src/main/menu.ts b/packages/desktop/src/main/menu.tsindex 052fb6a12..4b8b8ca78 100644--- a/packages/desktop/src/main/menu.ts+++ b/packages/desktop/src/main/menu.ts@@ -300,6 +300,15 @@ export interface MenuDeps {*/terminalVisible?: boolean;onToggleTerminal?(): void;+ /**+ * Right agents-panel visibility — drives the View → Show/Hide Agents label.+ * Starts hidden like the terminal, so `undefined`/`false` reads as "Show+ * Agents". Independent of `terminalVisible`: the two panels own different+ * edges and open/close on their own. Unlike the terminal handlers, this one+ * stays wired off-mac — agent threads are server-hosted, not pty-backed.+ */+ agentPanelVisible?: boolean;+ onToggleAgentPanel?(): void;/*** Top-level Terminal menu actions. `onNewTerminal` opens a new terminal tab* (revealing the dock if hidden; it never hides an already-open terminal,@@ -512,6 +521,10 @@ const MENU_BINDINGS: Record<string, MenuCommandBinding> = {click: (d) => () => d.onToggleTerminal?.(),enabled: (d) => d.onToggleTerminal !== undefined,},+ 'toggle-agent-panel': {+ click: (d) => () => d.onToggleAgentPanel?.(),+ enabled: (d) => d.onToggleAgentPanel !== undefined,+ },'toggle-show-hidden-files': {click: (d) => () => d.onToggleShowHiddenFiles?.(),enabled: (d) => d.onToggleShowHiddenFiles !== undefined,diff --git a/packages/desktop/src/main/view-menu-state.test.ts b/packages/desktop/src/main/view-menu-state.test.tsindex 756a06270..75767148d 100644--- a/packages/desktop/src/main/view-menu-state.test.ts+++ b/packages/desktop/src/main/view-menu-state.test.ts@@ -113,6 +113,32 @@ describe('mergeViewMenuState — multi-publisher non-clobbering contract', () =>expect(afterToggleHide.terminalLive).toBe(true);expect(afterToggleHide.terminalVisible).toBe(false);});++ test('agents-panel push composes with every terminal publisher without clobbering', () => {+ // The agents panel is the fourth runtime publisher. It shares EditorPane's+ // visibility edge but is a wholly independent panel, so its push must leave+ // terminalVisible / terminalLive alone — and a later terminal push must+ // leave agentPanelVisible alone. Both panels open at once is the normal case.+ const afterEditorPane = mergeViewMenuState(initial, { terminalVisible: true });+ const afterTerminalDock = mergeViewMenuState(afterEditorPane, { terminalLive: true });+ const afterAgentsPanel = mergeViewMenuState(afterTerminalDock, { agentPanelVisible: true });++ expect(afterAgentsPanel.agentPanelVisible).toBe(true);+ expect(afterAgentsPanel.terminalVisible).toBe(true);+ expect(afterAgentsPanel.terminalLive).toBe(true);+ expect(afterAgentsPanel.sidebarVisible).toBe(true);++ // Hiding the terminal leaves the agents panel open.+ const afterHideTerminal = mergeViewMenuState(afterAgentsPanel, { terminalVisible: false });+ expect(afterHideTerminal.agentPanelVisible).toBe(true);+ expect(afterHideTerminal.terminalVisible).toBe(false);++ // …and hiding the agents panel leaves the terminal's own state alone.+ const afterHideAgents = mergeViewMenuState(afterAgentsPanel, { agentPanelVisible: false });+ expect(afterHideAgents.agentPanelVisible).toBe(false);+ expect(afterHideAgents.terminalVisible).toBe(true);+ expect(afterHideAgents.terminalLive).toBe(true);+ });});describe('createDefaultEditorViewMenuState — pre-first-push menu state', () => {@@ -130,6 +156,7 @@ describe('createDefaultEditorViewMenuState — pre-first-push menu state', () =>docPanelVisible: true,terminalVisible: false,terminalLive: false,+ agentPanelVisible: false,// Restrictive by design: this one gates a context-menu row, and a row// offered before the renderer says the jump is live would do nothing.canViewInSource: false,@@ -151,6 +178,7 @@ describe('buildViewMenuStateDeps — snapshot → menu-deps wiring', () => {docPanelVisible: false,terminalVisible: true,terminalLive: true,+ agentPanelVisible: true,} as const;test('maps every snapshot field onto its menu dep', () => {@@ -165,6 +193,7 @@ describe('buildViewMenuStateDeps — snapshot → menu-deps wiring', () => {expect(deps.docPanelVisible).toBe(false);expect(deps.terminalVisible).toBe(true);expect(deps.terminalLive).toBe(true);+ expect(deps.agentPanelVisible).toBe(true);});test('each toggle / tree / terminal handler dispatches its menu-action ID', () => {@@ -180,6 +209,7 @@ describe('buildViewMenuStateDeps — snapshot → menu-deps wiring', () => {deps.onToggleSidebar?.();deps.onToggleDocPanel?.();deps.onToggleTerminal?.();+ deps.onToggleAgentPanel?.();deps.onNewTerminal?.();deps.onKillTerminal?.();deps.onExpandAll?.();@@ -193,6 +223,7 @@ describe('buildViewMenuStateDeps — snapshot → menu-deps wiring', () => {'toggle-sidebar','toggle-doc-panel','toggle-terminal',+ 'toggle-agent-panel','new-terminal','kill-terminal','expand-all-tree',diff --git a/packages/desktop/src/main/view-menu-state.ts b/packages/desktop/src/main/view-menu-state.tsindex b00f847f2..a69399460 100644--- a/packages/desktop/src/main/view-menu-state.ts+++ b/packages/desktop/src/main/view-menu-state.ts@@ -16,7 +16,7 @@ export function mergeViewMenuState(* folders + Show only markdown files off, Show skills section on, both* Expand/Collapse rendered (no smart-hide), sidebar + doc panel assumed* visible (the common wide-window startup), terminal hidden with no live- * session.+ * session, agents panel hidden.** `canViewInSource` is the one field that defaults to the RESTRICTIVE value* rather than the likely one: it gates a context-menu row, and a row offered@@ -35,6 +35,7 @@ export function createDefaultEditorViewMenuState(): EditorViewMenuStateSnapshotdocPanelVisible: true,terminalVisible: false,terminalLive: false,+ agentPanelVisible: false,canViewInSource: false,};}@@ -58,6 +59,7 @@ type ViewMenuStateDeps = Pick<| 'docPanelVisible'| 'terminalVisible'| 'terminalLive'+ | 'agentPanelVisible'| 'onToggleShowHiddenFiles'| 'onToggleShowOkFolders'| 'onToggleShowOnlyMarkdownFiles'@@ -65,6 +67,7 @@ type ViewMenuStateDeps = Pick<| 'onToggleSidebar'| 'onToggleDocPanel'| 'onToggleTerminal'+ | 'onToggleAgentPanel'| 'onNewTerminal'| 'onKillTerminal'| 'onExpandAll'@@ -93,6 +96,7 @@ export function buildViewMenuStateDeps(docPanelVisible: state.docPanelVisible,terminalVisible: state.terminalVisible,terminalLive: state.terminalLive,+ agentPanelVisible: state.agentPanelVisible,onToggleShowHiddenFiles: () => sendMenuAction('toggle-show-hidden-files'),onToggleShowOkFolders: () => sendMenuAction('toggle-show-ok-folders'),onToggleShowOnlyMarkdownFiles: () => sendMenuAction('toggle-show-only-markdown-files'),@@ -100,6 +104,7 @@ export function buildViewMenuStateDeps(onToggleSidebar: () => sendMenuAction('toggle-sidebar'),onToggleDocPanel: () => sendMenuAction('toggle-doc-panel'),onToggleTerminal: () => sendMenuAction('toggle-terminal'),+ onToggleAgentPanel: () => sendMenuAction('toggle-agent-panel'),onNewTerminal: () => sendMenuAction('new-terminal'),onKillTerminal: () => sendMenuAction('kill-terminal'),onExpandAll: () => sendMenuAction('expand-all-tree'),diff --git a/packages/desktop/src/preload/index.ts b/packages/desktop/src/preload/index.tsindex 8095a3495..a26332186 100644--- a/packages/desktop/src/preload/index.ts+++ b/packages/desktop/src/preload/index.ts@@ -795,6 +795,7 @@ const bridge: OkDesktopBridge = {getDockState: () => invoke('ok:terminal:dock-state'),setDockState: (state) => {invoke('ok:terminal:set-dock-state', {+ surface: state.surface,order: [...state.order],activeKey: state.activeKey,}).catch(() => {});diff --git a/packages/desktop/src/shared/bridge-contract.ts b/packages/desktop/src/shared/bridge-contract.tsindex fead46606..b296b8644 100644--- a/packages/desktop/src/shared/bridge-contract.ts+++ b/packages/desktop/src/shared/bridge-contract.ts@@ -235,6 +235,10 @@ export type OkMenuAction =| 'toggle-doc-panel'// Docked terminal-panel visibility (⌘J / Ctrl+J).| 'toggle-terminal'+ // Right agents-panel visibility (⌘L / Ctrl+L). The ACP twin of+ // `toggle-terminal`, and deliberately NOT desktop-gated: agent threads are+ // server-hosted, so the panel works on the web host and where pty does not.+ | 'toggle-agent-panel'// Terminal application menu. `new-terminal` opens a new terminal tab// (revealing the dock if hidden; never hides, unlike the toggle).// `kill-terminal` closes the active tab, killing that session's PTY.@@ -851,6 +855,10 @@ export interface OkEditorViewMenuStateSnapshot {// terminal reads `terminalLive: true, terminalVisible: false`. Drives the// Terminal menu's "Kill Terminal" enablement.readonly terminalLive?: boolean;+ // Right agents-panel visibility. Independent of `terminalVisible` — the two+ // panels own different edges and are open or closed on their own. Optional ++ // defaults hidden, like the terminal.+ readonly agentPanelVisible?: boolean;// Whether the editor context menu's "View in Source" jump would do anything:// it reads the visual editor's caret for the active document, so it is inert// in source mode and with no document open. Optional + defaults false, so the@@ -2101,19 +2109,31 @@ export interface OkDesktopBridge {*/setOrder(orderedPtyIds: readonly string[]): void;/**- * Per-window sessions-dock state retained in main, read once on reload so the- * dock re-expands (`visible`) and restores its interleaved cross-kind tab order- * (`order` = terminal ptyIds + thread threadIds) + active tab (`activeKey`) when- * it was open before the reload. `order`/`activeKey` are optional for version- * skew (an older main returns just `visible`).+ * Per-window panel state retained in main, read once on reload so each panel+ * re-expands and restores its own tab order + active tab. The terminal dock and+ * the agents panel are independent surfaces, so their orders are recorded+ * separately: a single shared record would let each panel's write erase the+ * other's keys and clobber the shared active tab. `terminal.order` holds ptyIds,+ * `agents.order` holds threadIds. Both records are optional (absent until that+ * panel first persists).*/- getDockState(): Promise<{ visible: boolean; order?: string[]; activeKey?: string | null }>;+ getDockState(): Promise<{+ terminalVisible: boolean;+ agentPanelVisible: boolean;+ terminal?: { order: string[]; activeKey: string | null };+ agents?: { order: string[]; activeKey: string | null };+ }>;/**- * Persist the unified sessions-dock order + active key in main (per window) so a- * renderer reload restores the interleaved cross-kind arrangement. `order` holds- * reload-stable keys (ptyIds + threadIds) in tab order. Fire-and-forget.+ * Persist one panel's tab order + active key in main (per window) so a renderer+ * reload restores that panel's arrangement. `surface` names which panel is+ * writing; `order` holds its reload-stable keys (ptyIds for `terminal`,+ * threadIds for `agents`) in tab order. Fire-and-forget.*/- setDockState(state: { order: string[]; activeKey: string | null }): void;+ setDockState(state: {+ surface: 'terminal' | 'agents';+ order: string[];+ activeKey: string | null;+ }): void;onData(cb: (msg: OkPtyData) => void): OkUnsubscribe;onExit(cb: (msg: OkPtyExit) => void): OkUnsubscribe;/**diff --git a/packages/desktop/src/shared/ipc-channels.ts b/packages/desktop/src/shared/ipc-channels.tsindex c0854beed..354434bde 100644--- a/packages/desktop/src/shared/ipc-channels.ts+++ b/packages/desktop/src/shared/ipc-channels.ts@@ -667,6 +667,7 @@ export interface EditorViewMenuStateSnapshot {readonly docPanelVisible?: boolean;readonly terminalVisible?: boolean;readonly terminalLive?: boolean;+ readonly agentPanelVisible?: boolean;readonly canViewInSource?: boolean;}@@ -1719,26 +1720,31 @@ export interface RequestChannels {result: Record<TerminalCli, boolean>;};/**- * Per-window sessions-dock state, read once on reload to restore the dock.- * `visible` is recorded from the renderer's view-menu push; `order` (the unified- * cross-kind tab order — terminal ptyIds + thread threadIds) and `activeKey` are- * recorded from `ok:terminal:set-dock-state`. All windowId-keyed, gone after- * window-close / app-quit (so a fresh launch with no surviving sessions restores- * nothing). `order`/`activeKey` are optional so an older renderer that only reads- * `visible` keeps working.+ * Per-window panel state, read once on reload to restore both panels. The two+ * `*Visible` flags are recorded from the renderer's view-menu push; the per-surface+ * `order` + `activeKey` records come from `ok:terminal:set-dock-state`. The terminal+ * dock and agents panel are independent surfaces, so their orders are kept apart —+ * one shared record would let each panel's write erase the other's keys. All+ * windowId-keyed, gone after window-close / app-quit (so a fresh launch with no+ * surviving sessions restores nothing).*/'ok:terminal:dock-state': {args: [];- result: { visible: boolean; order?: string[]; activeKey?: string | null };+ result: {+ terminalVisible: boolean;+ agentPanelVisible: boolean;+ terminal?: { order: string[]; activeKey: string | null };+ agents?: { order: string[]; activeKey: string | null };+ };};/**- * Persist the unified sessions-dock order + active key in main (per window) so a- * renderer reload restores the interleaved cross-kind tab arrangement + active- * tab. `order` holds reload-stable keys (terminal ptyIds + thread threadIds) in- * tab order. Fire-and-forget, the sibling of `ok:pty:set-order` for the mixed dock.+ * Persist one panel's tab order + active key in main (per window) so a renderer+ * reload restores that panel's arrangement + active tab. `surface` names the writer;+ * `order` holds its reload-stable keys (ptyIds for `terminal`, threadIds for+ * `agents`) in tab order. Fire-and-forget, the sibling of `ok:pty:set-order`.*/'ok:terminal:set-dock-state': {- args: [req: { order: string[]; activeKey: string | null }];+ args: [req: { surface: 'terminal' | 'agents'; order: string[]; activeKey: string | null }];result: undefined;};}diff --git a/packages/desktop/tests/integration/m1-smoke.test.ts b/packages/desktop/tests/integration/m1-smoke.test.tsindex 1df853107..d0a8026be 100644--- a/packages/desktop/tests/integration/m1-smoke.test.ts+++ b/packages/desktop/tests/integration/m1-smoke.test.ts@@ -598,8 +598,8 @@ describe('M1 smoke', () => {expect(desktopMembers.size).toBeGreaterThan(0);expect(coreMembers.size).toBeGreaterThan(0);expect(appMembers.size).toBeGreaterThan(0);- // 26 baseline + 2 worktree + 2 Help + 3 sidebar + 2 navigation actions.- expect(desktopMembers.size).toBe(35);+ // 26 baseline + 2 worktree + 2 Help + 3 sidebar + 2 navigation + 1 agents panel.+ expect(desktopMembers.size).toBe(36);expect(desktopMembers).toEqual(coreMembers);expect(desktopMembers).toEqual(appMembers);// Pin the visibility toggles explicitly: a bare count check wouldn'tdiff --git a/packages/desktop/tests/main/menu.test.ts b/packages/desktop/tests/main/menu.test.tsindex d22f1d62f..25768449e 100644--- a/packages/desktop/tests/main/menu.test.ts+++ b/packages/desktop/tests/main/menu.test.ts@@ -1270,6 +1270,75 @@ describe('buildMenuTemplate — View → Show/Hide Terminal', () => {});});+describe('buildMenuTemplate — View → Show/Hide Agents', () => {+ // The ACP twin of the Terminal toggle: same single-row Show/Hide pattern, same+ // hidden-by-default inversion, ⌘L instead of ⌘J. It sits after Terminal in the+ // View panel cluster so the two panel toggles read as a pair.++ test('renders "Show Agents" when agentPanelVisible is unset or false', () => {+ const unset = buildMenuTemplate(makeDeps({ onToggleAgentPanel: vi.fn(() => {}) }));+ expect(findByLabel(unset, 'Show Agents')).toBeDefined();+ expect(findByLabel(unset, 'Hide Agents')).toBeUndefined();++ const hidden = buildMenuTemplate(+ makeDeps({ onToggleAgentPanel: vi.fn(() => {}), agentPanelVisible: false }),+ );+ expect(findByLabel(hidden, 'Show Agents')).toBeDefined();+ });++ test('renders "Hide Agents" when agentPanelVisible is true', () => {+ const visible = buildMenuTemplate(+ makeDeps({ onToggleAgentPanel: vi.fn(() => {}), agentPanelVisible: true }),+ );+ expect(findByLabel(visible, 'Hide Agents')).toBeDefined();+ expect(findByLabel(visible, 'Show Agents')).toBeUndefined();+ });++ test('Agents binds CmdOrCtrl+L (the terminal keeps ⌘J)', () => {+ const template = buildMenuTemplate(+ makeDeps({ onToggleAgentPanel: vi.fn(() => {}), onToggleTerminal: vi.fn(() => {}) }),+ );+ expect(findByLabel(template, 'Show Agents')?.accelerator).toBe('CmdOrCtrl+L');+ expect(findByLabel(template, 'Show Terminal')?.accelerator).toBe('CmdOrCtrl+J');+ });++ test('Agents click dispatches deps.onToggleAgentPanel', () => {+ const onToggleAgentPanel = vi.fn(() => {});+ const template = buildMenuTemplate(makeDeps({ onToggleAgentPanel }));+ (findByLabel(template, 'Show Agents')?.click as (() => void) | undefined)?.();+ expect(onToggleAgentPanel).toHaveBeenCalledTimes(1);+ });++ test('Agents DISABLED when the toggle handler is missing', () => {+ expect(findByLabel(buildMenuTemplate(makeDeps()), 'Show Agents')?.enabled).toBe(false);+ });++ // The panel is server-hosted, not pty-backed, so its toggle must survive the+ // off-mac strip that darkens every terminal handler (index.ts's darwin gate).+ // A regression that folded it into that branch would kill agents on win/linux.+ test('Agents stays wired when every terminal handler is stripped (off-mac shape)', () => {+ const template = buildMenuTemplate(+ makeDeps({+ onToggleAgentPanel: vi.fn(() => {}),+ onToggleTerminal: undefined,+ onNewTerminal: undefined,+ onKillTerminal: undefined,+ }),+ );+ expect(findByLabel(template, 'Show Agents')?.enabled).toBe(true);+ expect(findByLabel(template, 'Show Terminal')?.enabled).toBe(false);+ });++ test('Agents follows the Terminal toggle in the View panel cluster', () => {+ const template = buildMenuTemplate(+ makeDeps({ onToggleTerminal: vi.fn(() => {}), onToggleAgentPanel: vi.fn(() => {}) }),+ );+ const sub = findByLabel(template, 'View')?.submenu as MenuItemConstructorOptions[] | undefined;+ const labels = sub?.map((i) => i.label ?? `[role:${i.role ?? 'sep'}]`) ?? [];+ expect(labels.indexOf('Show Agents')).toBeGreaterThan(labels.indexOf('Show Terminal'));+ });+});+describe('buildMenuTemplate — top-level Terminal menu (New / Kill)', () => {// VS Code-style top-level Terminal menu, placed between View and Window. The// View → Show/Hide Terminal toggle is kept too (⌘J muscle memory); this menudiff --git a/packages/desktop/tests/smoke/terminal-dock.e2e.ts b/packages/desktop/tests/smoke/terminal-dock.e2e.tsindex b4bcbd0e3..600e7ea93 100644--- a/packages/desktop/tests/smoke/terminal-dock.e2e.ts+++ b/packages/desktop/tests/smoke/terminal-dock.e2e.ts@@ -254,13 +254,9 @@ async function waitForStatus(page: Page, status: string, timeoutMs = 20_000): Pr});}-/** Ensure the terminal is bottom-docked. The default dock is the right column, so- * the bottom-panel assertions (`#terminal-dock-panel`) first flip it down via the- * tab strip's dock-toggle button (which reads "Dock terminal to the bottom" while- * right-docked). A no-op if it is already bottom-docked. */+/** Wait for the bottom terminal panel. The terminal owns the bottom edge outright+ * now — there is no dock position to flip — so this only settles the panel. */async function ensureBottomDock(page: Page): Promise<void> {- const toBottom = page.getByRole('button', { name: 'Dock terminal to the bottom' });- if (await toBottom.count()) await toBottom.click();await expect(page.locator('#terminal-dock-panel')).toBeVisible({ timeout: 10_000 });}@@ -483,10 +479,10 @@ test.describe('Docked terminal — live Electron', () => {.toContain(`AFTER_COLS=${before}`);});- // Dock controls — the click toggle replaced the drag grip. This asserts the UI- // shape (dock-toggle + collapse present, no grip) in the live build. The default- // dock is the right column, so the toggle offers "Dock terminal to the bottom".- test('terminal tab strip exposes dock-toggle + collapse buttons and no drag grip', async ({+ // Dock controls in the live build: collapse is the only chrome. The terminal+ // owns the bottom edge, so there is no dock-toggle (and the older drag grip+ // stays gone).+ test('terminal tab strip exposes the collapse button and no way to move the dock', async ({captureStderrFor,}) => {const s = seed('dock-controls', { consent: true });@@ -496,21 +492,19 @@ test.describe('Docked terminal — live Electron', () => {const page = await findEditorWindow(app);await openTerminal(app, page);await waitForStatus(page, 'running', 25_000);- await expect(page.getByRole('button', { name: /Dock terminal to the/ })).toBeVisible({+ await expect(page.getByRole('button', { name: 'Collapse panel' })).toBeVisible({timeout: 10_000,});- await expect(page.getByRole('button', { name: 'Collapse terminal' })).toBeVisible();+ await expect(page.getByRole('button', { name: /Dock terminal to the/ })).toHaveCount(0);await expect(page.getByRole('button', { name: 'Drag to dock the terminal' })).toHaveCount(0);});- // Movable dock via the dock-toggle button — the default is the right column;- // clicking "Dock terminal to the bottom" re-docks it under the editor- // (#terminal-dock-panel), and clicking "Dock terminal to the right" moves it back- // to its own column (#terminal-column).- test('movable dock — the dock-toggle button moves the terminal between bottom and right', async ({+ // The terminal is bottom-only now, and the agents panel owns the right column.+ // A live-build guard that the two never share an edge.+ test('the terminal lives in the bottom panel, never in the right column', async ({captureStderrFor,}) => {- const s = seed('dock-move', { consent: true });+ const s = seed('dock-edges', { consent: true });track(s.tmpHome, s.projectDir);const app = await launchApp(s, { restrictPath: true });captureStderrFor(app, { cleanupDirs: [s.tmpHome, s.projectDir] });@@ -518,58 +512,11 @@ test.describe('Docked terminal — live Electron', () => {await openTerminal(app, page);await waitForStatus(page, 'running', 25_000);- // Default dock is the right column.- await expect(page.locator('#terminal-column section[aria-label="Terminal"]')).toBeVisible({- timeout: 10_000,- });-- // Toggle → bottom dock.- await page.getByRole('button', { name: 'Dock terminal to the bottom' }).click();await expect(page.locator('#terminal-dock-panel section[aria-label="Terminal"]')).toBeVisible({timeout: 10_000,});-- // Toggle → back to the right column.- await page.getByRole('button', { name: 'Dock terminal to the right' }).click();- await expect(page.locator('#terminal-column section[aria-label="Terminal"]')).toBeVisible({- timeout: 10_000,- });- });-- // Re-docking re-parents the SAME live terminal so the shell session + scrollback- // survive the move — the session host owns one stable host div that relocates- // across docks rather than remounting. Proven by element identity: the tagged- // xterm node is the same one before and after the toggle.- test('movable dock — preserves the same live terminal session across moves', async ({- captureStderrFor,- }) => {- const s = seed('dock-parity', { consent: true });- track(s.tmpHome, s.projectDir);- const app = await launchApp(s, { restrictPath: true });- captureStderrFor(app, { cleanupDirs: [s.tmpHome, s.projectDir] });- const page = await findEditorWindow(app);- await openTerminal(app, page);- await waitForStatus(page, 'running', 25_000);-- const xterm = page.locator('section[aria-label="Terminal"] .xterm');- await xterm.evaluate((el) => {- (el as HTMLElement).dataset.parityTag = 'OK_PARITY_TAG';- });- // Re-dock to the bottom; the SAME tagged node must reappear under the bottom- // panel (relocated, not re-spawned).- await page.getByRole('button', { name: 'Dock terminal to the bottom' }).click();- await expect- .poll(- () =>- page.evaluate(- () =>- document- .querySelector<HTMLElement>('.xterm[data-parity-tag="OK_PARITY_TAG"]')- ?.closest('#terminal-dock-panel') != null,- ),- { timeout: 10_000 },- )- .toBe(true);+ // The right column is the agents panel's; no terminal ever renders there.+ await expect(page.locator('#agents-column section[aria-label="Terminal"]')).toHaveCount(0);});// Panel is a labeled region; xterm screen-reader mode + contrast set.diff --git a/packages/desktop/tests/smoke/terminal-links.e2e.ts b/packages/desktop/tests/smoke/terminal-links.e2e.tsindex 7e07bb940..3dc68f92c 100644--- a/packages/desktop/tests/smoke/terminal-links.e2e.ts+++ b/packages/desktop/tests/smoke/terminal-links.e2e.ts@@ -127,12 +127,10 @@ async function openRunningTerminal(app: ElectronApplication, page: Page): Promis});expect(label).toBeTruthy();await expect(page.locator('section[aria-label="Terminal"]')).toBeVisible({ timeout: 15_000 });- // Bottom-dock (default is the right column) so the terminal is wide enough for- // a printed URL to render on one row — the link-click assertions need it.- const toBottom = page.getByRole('button', { name: 'Dock terminal to the bottom' });- if (await toBottom.count()) await toBottom.click();- // The status container isn't "visible" to Playwright while right-docked; assert- // the attribute value instead (matches the terminal-dock smoke).+ // The terminal is bottom-docked outright now, so it is already wide enough for+ // a printed URL to render on one row — which the link-click assertions need.+ // Assert the status attribute rather than visibility (matches the terminal-dock+ // smoke), since the container can be off-viewport mid-spawn.await expect(page.locator('[data-terminal-status]')).toHaveAttribute('data-terminal-status','running',