Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "drover",
"productName": "Drover",
"version": "0.1.18",
"version": "0.1.19",
"description": "A native workspace for Herdr-powered agents, terminals, worktrees, and live sessions.",
"main": ".vite/build/main.js",
"private": true,
Expand Down Expand Up @@ -79,7 +79,6 @@
"@xterm/addon-fit": "0.11.0",
"@xterm/addon-search": "0.16.0",
"@xterm/addon-web-links": "0.12.0",
"@xterm/addon-webgl": "0.19.0",
"@xterm/xterm": "6.0.0",
"class-variance-authority": "0.7.1",
"clsx": "2.1.1",
Expand Down
50 changes: 50 additions & 0 deletions src/renderer/App.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1121,6 +1121,30 @@ describe('App', () => {
expect(screen.getByTestId('terminal-w1:p1')).not.toBeVisible();
});

it('constrains the persistent terminal while switching pane views', async () => {
const user = userEvent.setup();
const terminalFirstSnapshot: SessionSnapshot = {
...snapshot,
panes: snapshot.panes.map((pane) =>
pane.pane_id === 'w1:p1' ? { ...pane, agent_has_arguments: true } : pane,
),
};
vi.mocked(window.herdr.bootstrap).mockResolvedValue({
...connected,
snapshot: terminalFirstSnapshot,
});
render(<App />);

const terminal = await screen.findByTestId('terminal-w1:p1');
const surface = terminal.parentElement;
expect(surface).toHaveClass('flex', 'min-h-0', 'min-w-0', 'flex-1', 'overflow-hidden');
expect(surface).not.toHaveClass('hidden');

await user.click(screen.getByRole('button', { name: 'Chat view' }));
expect(terminal.parentElement).toBe(surface);
expect(surface).toHaveClass('hidden', 'min-h-0', 'min-w-0', 'flex-1', 'overflow-hidden');
});

it('opens complete pane controls and routes graphical actions to Herdr', async () => {
const user = userEvent.setup();
render(<App />);
Expand Down Expand Up @@ -1740,6 +1764,32 @@ describe('App', () => {
expect(screen.getByRole('heading', { name: 'drover' })).toBeInTheDocument();
});

it('keeps the canonical session when a background bootstrap transiently fails', async () => {
let sessionEvent:
| ((event: { event: string; data: Record<string, unknown> }) => void)
| undefined;
window.herdr.onSessionEvent = vi.fn((listener) => {
sessionEvent = listener;
return () => undefined;
});
vi.mocked(window.herdr.bootstrap).mockResolvedValueOnce(connected).mockResolvedValue({
state: 'error',
message: 'Herdr could not be reached.',
details: 'transient socket error',
});
render(<App />);
await screen.findByRole('heading', { name: 'drover' });

act(() => sessionEvent?.({ event: 'layout.updated', data: {} }));
await waitFor(() => expect(window.herdr.bootstrap).toHaveBeenCalledTimes(2), {
timeout: 2_000,
});

expect(screen.getByRole('heading', { name: 'drover' })).toBeInTheDocument();
expect(screen.queryByText('Herdr could not be reached')).not.toBeInTheDocument();
expect(screen.getByText('Engine disconnected')).toBeInTheDocument();
});

it('coalesces background refreshes while session events stream', async () => {
let sessionEvent:
| ((event: { event: string; data: Record<string, unknown> }) => void)
Expand Down
32 changes: 23 additions & 9 deletions src/renderer/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -752,7 +752,11 @@ function PersistentTerminalSurface({ pane, visible }: { pane: PaneInfo; visible:
return null;
}
return (
<div aria-hidden={visible ? undefined : true} hidden={!visible}>
<div
aria-hidden={visible ? undefined : true}
className={cn('min-h-0 min-w-0 flex-1 overflow-hidden', visible ? 'flex' : 'hidden')}
hidden={!visible}
>
<TerminalPanel
onOpenExternal={(url) => void window.herdr.openExternal(url)}
onScrollRequest={(request) =>
Expand Down Expand Up @@ -1936,13 +1940,20 @@ function AppContent() {
>([]);

const streamStateRevision = useRef(0);
const applyLatestResult = useCallback((sequence: number, next: EngineBootstrap) => {
if (sequence !== resultRequestSequence.current) {
return false;
}
setResult(next);
return true;
}, []);
const applyLatestResult = useCallback(
(sequence: number, next: EngineBootstrap, preserveConnected = false) => {
if (sequence !== resultRequestSequence.current) {
return false;
}
setResult((current) =>
preserveConnected && next.state !== 'connected' && current?.state === 'connected'
? current
: next,
);
return true;
},
[],
);

const load = useCallback(
async (quiet = false) => {
Expand All @@ -1955,7 +1966,10 @@ function AppContent() {
}
try {
const next = await window.herdr.bootstrap();
if (applyLatestResult(sequence, next) && streamStateRevision.current === streamRevision) {
if (
applyLatestResult(sequence, next, quiet) &&
streamStateRevision.current === streamRevision
) {
setConnectionState(next.state === 'connected' ? 'connected' : 'disconnected');
}
} finally {
Expand Down
33 changes: 12 additions & 21 deletions src/renderer/terminal/TerminalPanel.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,6 @@ const terminalControl = vi.hoisted(() => ({
const webLinks = vi.hoisted(() => ({
activate: undefined as ((event: MouseEvent, uri: string) => void) | undefined,
}));
const webgl = vi.hoisted(() => ({
contextLoss: undefined as (() => void) | undefined,
dispose: vi.fn(),
}));

vi.mock('@xterm/addon-webgl', () => ({
WebglAddon: class {
dispose = webgl.dispose;
onContextLoss(listener: () => void) {
webgl.contextLoss = listener;
return { dispose() {} };
}
},
}));
vi.mock('@xterm/addon-fit', () => ({
FitAddon: class {
fit() {}
Expand Down Expand Up @@ -164,8 +150,6 @@ describe('TerminalPanel', () => {
terminalControl.write.mockReset();
resizeObserver.listener = undefined;
webLinks.activate = undefined;
webgl.contextLoss = undefined;
webgl.dispose.mockReset();
terminalControl.scrollToBottom.mockReset();
window.herdr = {
terminal: {
Expand Down Expand Up @@ -201,13 +185,20 @@ describe('TerminalPanel', () => {
});
});

it('uses the WebGL renderer and falls back cleanly after context loss', () => {
it('uses xterm DOM rendering without a GPU context', () => {
render(<TerminalPanel pane={pane} />);

expect(terminalControl.loadedAddons).toHaveLength(4);
expect(webgl.contextLoss).toEqual(expect.any(Function));
webgl.contextLoss?.();
expect(webgl.dispose).toHaveBeenCalledOnce();
expect(terminalControl.loadedAddons).toHaveLength(3);
});

it('contains xterm intrinsic dimensions within the pane', () => {
render(<TerminalPanel pane={pane} />);

expect(screen.getByRole('region', { name: 'Terminal output w1:p2' }).parentElement).toHaveClass(
'min-h-0',
'min-w-0',
'overflow-hidden',
);
});

it('enables xterm screen-reader DOM only when Electron accessibility is active', async () => {
Expand Down
10 changes: 1 addition & 9 deletions src/renderer/terminal/TerminalPanel.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { FitAddon } from '@xterm/addon-fit';
import { SearchAddon } from '@xterm/addon-search';
import { WebLinksAddon } from '@xterm/addon-web-links';
import { WebglAddon } from '@xterm/addon-webgl';
import { Terminal } from '@xterm/xterm';
import {
ArrowDownToLine,
Expand Down Expand Up @@ -217,13 +216,6 @@ export function TerminalPanel({ pane, onOpenExternal, onScrollRequest }: Termina
})
.catch(() => undefined);
terminal.open(container);
try {
const webglAddon = new WebglAddon();
webglAddon.onContextLoss(() => webglAddon.dispose());
terminal.loadAddon(webglAddon);
} catch {
// xterm keeps its default renderer when WebGL2 is unavailable.
}
terminal.attachCustomKeyEventHandler((event) => {
if (
event.type === 'keydown' &&
Expand Down Expand Up @@ -367,7 +359,7 @@ export function TerminalPanel({ pane, onOpenExternal, onScrollRequest }: Termina
}, [copySelection, pane.pane_id, pasteClipboard]);

return (
<div className="relative min-h-0 flex-1 bg-[#0f0f10]">
<div className="relative min-h-0 min-w-0 flex-1 overflow-hidden bg-[#0f0f10]">
<section
aria-label={`Terminal output ${pane.pane_id}`}
className="h-full w-full p-3"
Expand Down