diff --git a/packages/experimental/terminal-panel/src/backend.ts b/packages/experimental/terminal-panel/src/backend.ts index d259e81f9a..210daf4092 100644 --- a/packages/experimental/terminal-panel/src/backend.ts +++ b/packages/experimental/terminal-panel/src/backend.ts @@ -36,7 +36,9 @@ export async function startup(terminal: PanelTerminal, options: StartupOptions, const startedAt = now() const deadline = startedAt + options.startupTimeoutMs let revision = terminal.revision - let lastChange: number | undefined + // A screen printed before startup began counts as output; the revision alone also advances on attachment state. + const printed = terminal.read({ offset: 0, count: Number.MAX_SAFE_INTEGER, maxBytes: options.maxReadBytes }).text !== '' + let lastChange = printed ? startedAt : undefined let lastProbe = -Infinity for (;;) { signal.throwIfAborted() diff --git a/packages/experimental/terminal-panel/tests/backend.spec.ts b/packages/experimental/terminal-panel/tests/backend.spec.ts index d6b6487f70..c333914f95 100644 --- a/packages/experimental/terminal-panel/tests/backend.spec.ts +++ b/packages/experimental/terminal-panel/tests/backend.spec.ts @@ -62,6 +62,7 @@ describe('spawn', () => { it('closes the terminal when startup fails and reports a failed cleanup with the cause', async () => { const failed = backend() + failed.terminal.screen = [''] const spawning = failed.backend.spawn({ sessionId: TerminalSessionId('pty-1'), owner: agentFor(new Context(), 'session'), type: 'shell' }) const rejected = expect(spawning).rejects.toThrow('did not reach its prompt within 5000 ms') await vi.advanceTimersByTimeAsync(5000) @@ -122,6 +123,29 @@ describe('startup', () => { expect(motd).toBe('$loading nvm\n$') }) + it('counts a prompt printed before startup began as output', async () => { + const terminal = new FakeTerminal() + const ready = startup(terminal, options, new AbortController().signal) + await vi.advanceTimersByTimeAsync(300) + expect(await ready).toBe('$') + expect(terminal.inspectForeground).toHaveBeenCalledOnce() + }) + + it('waits for output on an empty screen even when attachment state advances the revision', async () => { + const terminal = new FakeTerminal() + terminal.screen = [''] + terminal.update({ cols: 120 }) + const ready = startup(terminal, options, new AbortController().signal) + let motd: string | undefined + void ready.then((value) => { motd = value }) + await vi.advanceTimersByTimeAsync(2000) + expect(motd).toBeUndefined() + expect(terminal.inspectForeground).not.toHaveBeenCalled() + terminal.output('$') + await vi.advanceTimersByTimeAsync(300) + expect(motd).toBe('$') + }) + it('accepts silence alone when the foreground cannot be observed', async () => { const terminal = new FakeTerminal() terminal.foreground = undefined