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
48 changes: 47 additions & 1 deletion src/components/TerminalView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ import {
} from '@/components/terminal/terminal-write-queue'
import { nanoid } from 'nanoid'
import { cn } from '@/lib/utils'
import { Terminal } from '@xterm/xterm'
import { Terminal, type ILogger } from '@xterm/xterm'
import { Loader2 } from 'lucide-react'
import { ConfirmModal } from '@/components/ui/confirm-modal'
import type { PaneContent, PaneContentInput, PaneRefreshRequest, TerminalPaneContent } from '@/store/paneTypes'
Expand Down Expand Up @@ -175,6 +175,51 @@ const TERMINAL_OUTPUT_BATCH_BARRIER_REASONS = new Set([
'geometry',
])

function isXtermGroundDelParserNoise(message: string | Error, args: unknown[]): boolean {
if (typeof message !== 'string' || message.trim() !== 'Parsing error:') return false
const state = args[0]
return !!state
&& typeof state === 'object'
&& (state as { code?: unknown }).code === 0x7f
&& (state as { currentState?: unknown }).currentState === 0
}

function forwardXtermLog(
method: keyof ILogger,
message: string | Error,
args: unknown[],
): void {
const prefixedMessage = `xterm.js: ${String(message)}`
switch (method) {
case 'trace':
console.trace(prefixedMessage, ...args)
break
case 'debug':
console.debug(prefixedMessage, ...args)
break
case 'info':
console.info(prefixedMessage, ...args)
break
case 'warn':
console.warn(prefixedMessage, ...args)
break
case 'error':
console.error(prefixedMessage, ...args)
break
}
}

const xtermLogger: ILogger = {
trace: (message, ...args) => forwardXtermLog('trace', message, args),
debug: (message, ...args) => forwardXtermLog('debug', message, args),
info: (message, ...args) => forwardXtermLog('info', message, args),
warn: (message, ...args) => forwardXtermLog('warn', message, args),
error: (message, ...args) => {
if (isXtermGroundDelParserNoise(message, args)) return
forwardXtermLog('error', message, args)
},
}

function viewportHydrateReplayOptions(content?: TerminalPaneContent | null): { maxReplayBytes: number } | undefined {
return content?.mode === 'opencode'
? undefined
Expand Down Expand Up @@ -1682,6 +1727,7 @@ function TerminalView({ tabId, paneId, paneContent, hidden }: TerminalViewProps)
fontSize: settings.terminal.fontSize,
fontFamily: resolveTerminalFontFamily(settings.terminal.fontFamily),
lineHeight: settings.terminal.lineHeight,
logger: xtermLogger,
scrollback: settings.terminal.scrollback,
theme: resolvedTheme,
minimumContrastRatio: resolveMinimumContrastRatio(resolvedTheme),
Expand Down
38 changes: 38 additions & 0 deletions test/unit/client/components/TerminalView.search.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -354,4 +354,42 @@ describe('TerminalView search', () => {
expect.objectContaining({ allowProposedApi: true }),
)
})

it('suppresses xterm DEL parser noise while forwarding other errors', async () => {
const { store, tabId, paneId, paneContent } = createTestStore()

render(
<Provider store={store}>
<TerminalView tabId={tabId} paneId={paneId} paneContent={paneContent} />
</Provider>,
)

await waitFor(() => {
expect(capturedTerminalOptions).not.toBeNull()
})

const logger = capturedTerminalOptions?.logger as {
error?: (message: string, ...args: unknown[]) => void
} | undefined
expect(logger?.error).toBeTypeOf('function')

const consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
try {
logger!.error!('Parsing error: ', { code: 127, currentState: 0 })
logger!.error!('Parsing error: ', { code: 127, currentState: 4 })
logger!.error!('Something else', { code: 127, currentState: 0 })

expect(consoleErrorSpy).toHaveBeenCalledTimes(2)
expect(consoleErrorSpy).toHaveBeenNthCalledWith(1, 'xterm.js: Parsing error: ', {
code: 127,
currentState: 4,
})
expect(consoleErrorSpy).toHaveBeenNthCalledWith(2, 'xterm.js: Something else', {
code: 127,
currentState: 0,
})
} finally {
consoleErrorSpy.mockRestore()
}
})
})
Loading