Brooklyn Nicholson
dd5ead1007
interruptTurn only flushed the in-flight streaming chunk (bufRef) to the transcript before calling idle(), which wiped segmentMessages and pendingSegmentTools. Every tool call and commentary line the agent had already emitted in the current turn disappeared the moment the user cancelled, even though that output is exactly what they want to keep when they hit Ctrl+C (quote from the blitz feedback: "everything was fine up until the point where you wanted to push to main"). Append each flushed segment message to the transcript first, then render the in-flight partial with the `*[interrupted]*` marker and its pendingSegmentTools. Sys-level "interrupted" note still fires when there is nothing to preserve.
79 lines
2.1 KiB
TypeScript
79 lines
2.1 KiB
TypeScript
import {
|
|
detectVSCodeLikeTerminal,
|
|
type FileOps,
|
|
isRemoteShellSession,
|
|
shouldPromptForTerminalSetup
|
|
} from './terminalSetup.js'
|
|
|
|
export type MacTerminalHint = {
|
|
key: string
|
|
message: string
|
|
tone: 'info' | 'warn'
|
|
}
|
|
|
|
export type MacTerminalContext = {
|
|
isAppleTerminal: boolean
|
|
isRemote: boolean
|
|
isTmux: boolean
|
|
vscodeLike: null | 'cursor' | 'vscode' | 'windsurf'
|
|
}
|
|
|
|
export function detectMacTerminalContext(env: NodeJS.ProcessEnv = process.env): MacTerminalContext {
|
|
const termProgram = env['TERM_PROGRAM'] ?? ''
|
|
|
|
return {
|
|
isAppleTerminal: termProgram === 'Apple_Terminal' || !!env['TERM_SESSION_ID'],
|
|
isRemote: isRemoteShellSession(env),
|
|
isTmux: !!env['TMUX'],
|
|
vscodeLike: detectVSCodeLikeTerminal(env)
|
|
}
|
|
}
|
|
|
|
export async function terminalParityHints(
|
|
env: NodeJS.ProcessEnv = process.env,
|
|
options?: { fileOps?: Partial<FileOps>; homeDir?: string }
|
|
): Promise<MacTerminalHint[]> {
|
|
const ctx = detectMacTerminalContext(env)
|
|
const hints: MacTerminalHint[] = []
|
|
|
|
if (
|
|
ctx.vscodeLike &&
|
|
(await shouldPromptForTerminalSetup({ env, fileOps: options?.fileOps, homeDir: options?.homeDir }))
|
|
) {
|
|
hints.push({
|
|
key: 'ide-setup',
|
|
tone: 'info',
|
|
message: `Detected ${ctx.vscodeLike} terminal · run /terminal-setup for best Cmd+Enter / undo parity`
|
|
})
|
|
}
|
|
|
|
if (ctx.isAppleTerminal) {
|
|
hints.push({
|
|
key: 'apple-terminal',
|
|
tone: 'warn',
|
|
message:
|
|
'Apple Terminal detected · use /paste for image-only clipboard fallback, and try Ctrl+A / Ctrl+E / Ctrl+U if Cmd+←/→/⌫ gets rewritten'
|
|
})
|
|
}
|
|
|
|
if (ctx.isTmux) {
|
|
hints.push({
|
|
key: 'tmux',
|
|
tone: 'warn',
|
|
message:
|
|
'tmux detected · clipboard copy/paste uses passthrough when available; allow-passthrough improves OSC52 reliability'
|
|
})
|
|
}
|
|
|
|
if (ctx.isRemote) {
|
|
hints.push({
|
|
key: 'remote',
|
|
tone: 'warn',
|
|
message:
|
|
'SSH session detected · text clipboard can bridge via OSC52, but image clipboard and local screenshot paths still depend on the machine running Hermes'
|
|
})
|
|
}
|
|
|
|
return hints
|
|
}
|