Files
orca/src/shared/agent-resume-launch-command.ts
T
Brennan Benson e77e1fe850 fix(claude): guard cold-restore resume selectors (#13868)
* fix(claude): guard cold-restore resume selectors

Persisted Claude default args or a custom command can carry their own
--resume/-r/--continue/-c selectors (a bare picker default or a stale id).
Cold restore appended the authoritative --resume <id> after them, typing a
command with competing selectors into the restored pane (#12982).

buildAgentResumeStartupPlan now routes Claude through a selector guard that
tokenizes the base with the existing startup tokenizer, strips selectors in
option position only (value-taking options keep dash-leading values), and
appends exactly one authoritative selector, inserting before Claude's own
-- terminator when present. Splicing is span-based so untouched bytes stay
verbatim, wrapper commands are left alone, and any tokenization failure
falls back to the previous append-only behavior. Launch paths, other
agents, persistence, and the wire are unchanged.

* fix(claude): harden resume selector guard against false matches

Round-1 review findings: locate the claude executable by command position
(index 0, after a wrapper --, or behind NAME=value assignments) so an
argument merely ending in /claude can never be mistaken for it; stop
matching the joined -r<id> form, which was ambiguous with dash-leading
option values and forced an unmaintainable arity table (now deleted).
Ambiguous shapes degrade to the pre-guard append-only behavior.

* fix(claude): fail resume guard open on chained shell syntax

Round-2 review findings: an unquoted operator or newline after the claude
token means the base chains other commands, and splicing across that
boundary handed the selector to the wrong command — detect it and fall
back to plain appending. Also recognize claude behind PowerShell's & call
operator, decouple the test oracle from the implementation's selector
predicate, add Windows tokenizer span tests, and rename the module after
its public API.

* fix(claude): flag bare shell operators inside the tokenizers

Round-3 review findings: the guard's operator scan compared raw source to
token value, so one quote or escape anywhere in a token hid a shell-active
operator outside the quotes and the splice crossed a live command boundary,
losing the resume entirely. Both tokenizers now flag tokens carrying an
unquoted, unescaped operator byte (or a word-leading # comment on
posix/powershell) on their spans, where quote state actually lives, and the
guard fails open on that flag. Also strengthens the redirect fail-open test
to carry a stale selector, re-tokenizes each raw span in the shell span
tests, and documents agent-resume-argv-drop as codex-only.

* fix(claude): flag expansions and clamp separator backoff

Round-4 review findings: unquoted multi-token expansions (backtick, $(, ${)
split across whitespace, so removing only the recognized selector token left
a broken construct tail — both tokenizers now raise the span flag (renamed
bareShellSyntax) for those openers, on cmd also for operators between
single quotes, which cmd does not treat as quoting. The separator backoff is
clamped to the previous token's span end so a token ending in an escaped
space can no longer donate its escape to the appended selector.

* fix(claude): treat cmd single-quoted regions as unmodelable

Round-5 review finding: cmd.exe has no single-quote syntax, so the Windows
tokenizer's grouping of a single-quoted region diverges from what cmd
parses — literal argv like 'claude ...--resume... old' was being read as a
real selector and stripped, and a literal '--' as claude's terminator. Flag
any cmd single-quoted token as bareShellSyntax so the guard fails open.

* fix(claude): flag quoted expansions and scope assignment prefixes

Round-6 review findings: the span flag was only evaluated in the unquoted
branch, so an expansion opener inside double quotes went unflagged — and
inside $(…)/backticks a nested quote re-opens a context this tokenizer
does not model, so the splice could cut mid-construct (syntax error, or a
silently mutated substitution body). Both tokenizers now flag those, and
the flag is renamed divergesFromShell to say what it means. Restrict the
NAME=value command-position prefix to posix, where that syntax exists.
Drops two branches proven dead.

* fix(claude): model shell-literal escapes and scan the whole base

Round-7 review findings: (1) the divergence scan started after the claude
token, so an expansion opened in a prefix — $(x; npx -- claude --resume s) —
had its closer spliced away, producing a base bash cannot parse; it now
covers every token including the executable, exempting only PowerShell's
leading call operator. (2) posix drops a double-quoted backslash the shell
keeps literal, and the Windows escape branch ran inside quoted regions where
cmd/PowerShell keep the escape byte literal — both now flagged, so a literal
can never be misread as a selector. (3) an unquoted line continuation hid a
selector inside a token and skipped the newline gap check.

Also removes a third provably dead branch and collapses the cut floor into
the cut itself.

* fix(claude): flag escapes the tokenizer models but the shell removes

Round-8 review findings, all one family — escapes whose token value hides
a selector the shell would see: a double-quoted line continuation (bash
deletes both bytes), posix $'…'/$"…" quoting, a windows escaped newline,
and a trailing unpaired escape. The last one was previously written off as
pre-fix-identical, but once stripping happens the dangling escape swallows
the separator and no exact --resume reaches claude at all — strictly worse
than appending, so it must fail open. Also folds the three gap predicates
into one scan.

* fix(claude): stop over-flagging a literal dollar sign

Round-9 review findings from both lanes: inside double quotes only $( and
${ open an expansion — $' and $" are literal there — and a trailing $
was flagged unconditionally because JS ''.includes('') is true. Both made
the guard fail open on modelable bases, leaving the stale selector to
compete, so #12982 went unfixed for them. Separately, cmd strips ^ before
the child re-splits on the bare whitespace, so an escaped separator hides
two real arguments and must fail open rather than drop one.

* fix(claude): fail open on cmd caret-quotes and bare PowerShell syntax

Round-10 review findings, both Windows-only (a bash oracle cannot reach
them): cmd strips a caret before a quote and the child's parser then reads
a bare quote delimiter, so the tokenizer's word boundaries stop matching
argv — one case turned a working resume into no resume at all, another let
a stale selector survive the splice. And bare (…)/{…} are live PowerShell
syntax in argument position, so splicing through them emitted unbalanced
output that PowerShell cannot parse.

* fix(claude): fail open on the PowerShell stop-parsing token

Round-11 review finding: after a bare --%, PowerShell passes the rest of
the line to the child literally, so the guard stripped a real selector and
then appended quoting that arrives as literal bytes — claude ends up with
no exact --resume at all, worse than leaving the stale one. Quoted "--%"
and cmd, where the token is ordinary, still splice.

* fix(claude): model cmd backslash-escaped quotes

Round-11 review finding: an odd run of backslashes before a quote makes it
a literal byte to the child's CommandLineToArgvW parser, not a delimiter,
so the tokenizer's word boundaries stopped matching argv. Orca manufactures
that pattern itself — quoteStartupArg wraps every token in quotes without
escaping a trailing backslash — so a pasted Windows path was enough to move
the selector into a desynced region and leave claude with no resume flag.
Also replaces a caret test case that was byte-identical before and after
its own fix, and merges two stacked comment blocks.

* fix(claude): fail open on PowerShell double-quoted escape sequences

Round-12 finding: PowerShell expands backtick escapes only inside double
quotes, so a sequence there produces a token value argv never sees — the
guard could strip "-`r" plus the argument after it. Also narrows the
stop-parsing comment: a quoted --% can engage stop-parsing before a
parameter token, where the base is already mangled either way.

* fix(claude): flag PowerShell escape sequences in bare arguments too

Round-13 finding: the previous commit gated on quote === '"', but
PowerShell's tokenizer calls Backtick() from ScanGenericToken, so it
expands these sequences in unquoted arguments as well — bare -`r really
is a control character, not -r. The guard read it as a selector and
dropped it plus the argument after it. Widening to all PowerShell
contexts measures 0 under-flag and 0 over-flag across the full printable
matrix; the backtick-escaped-space idiom still splices. Also swaps a test
case that was byte-identical with and without its own fix.

* fix(claude): drop a token-leading PowerShell backtick before whitespace

Round-14 observations, all pre-existing and measured: PowerShell drops a
token-leading backtick together with the whitespace after it, emitting no
token, so the tokenizer's extra token shifted the locator; and a backtick
before a bare CR is a line continuation too. Flagging both takes the
lane's 329k-base sweep from 87 bad to 0 with no new failures and the
must-splice list byte-unchanged. Also corrects a comment that no longer
listed every PowerShell divergence.

* docs(claude): correct the bare-CR rationale in the tokenizer comment

Round-15 verified against a real PowerShell 7.6.4 engine: a backtick
before a bare CR is not a line continuation there — pwsh keeps the CR in
the token. The flag stays because 5.1 is unverified and failing open costs
nothing, but the comment now says that rather than claiming continuation.
2026-08-11 16:16:24 -07:00

169 lines
6.6 KiB
TypeScript

import type { ResumableTuiAgent } from './agent-session-resume'
import {
quoteStartupArg,
tokenizeStartupCommand,
type AgentStartupShell
} from './tui-agent-startup-shell'
function isClaudeResumeSelector(token: string): boolean {
if (token === '--resume' || token.startsWith('--resume=')) {
return true
}
if (token === '--continue' || token.startsWith('--continue=')) {
return true
}
// Why: the joined -r<id> form is deliberately NOT matched — any `-r…` token
// is ambiguous with another option's dash-leading value (`--agent -review`),
// and no arity table can keep up with the CLI. Only exact selector shapes
// are stripped; a persisted joined form degrades to pre-guard behavior.
return token === '-r' || token.startsWith('-r=') || token === '-c' || token.startsWith('-c=')
}
function isClaudeExecutableToken(token: string): boolean {
const base = token.split(/[\\/]/).pop() ?? ''
return /^claude(\.(exe|cmd|bat|ps1))?$/i.test(base)
}
/** Accepts a claude token only in command position — index 0, right after a
* wrapper's `--`, behind PowerShell's `&` call operator, or preceded solely by
* NAME=value assignments — so an argument that merely ends in /claude (an ssh
* key, a project dir) can never be mistaken for the executable. */
function findClaudeExecutableIndex(tokens: readonly string[], shell: AgentStartupShell): number {
let commandPosition = true
for (let i = 0; i < tokens.length; i += 1) {
const token = tokens[i]
if (commandPosition) {
if (isClaudeExecutableToken(token)) {
return i
}
if (
// Why: `NAME=value cmd` is posix-only syntax; on cmd/PowerShell such a
// token is just a bogus executable name, not a prefix to skip.
(shell === 'posix' && /^[A-Za-z_][A-Za-z0-9_]*=/.test(token)) ||
(shell === 'powershell' && token === '&' && i === 0)
) {
continue
}
commandPosition = false
}
if (token === '--') {
commandPosition = true
}
}
return -1
}
/** Joins the resolved base command with the agent's resume argv. Claude goes
* through the selector guard below; other agents keep plain appending. */
export function buildAgentResumeLaunchCommand(
agent: ResumableTuiAgent,
baseCommand: string,
resumeArgv: readonly string[],
shell: AgentStartupShell
): string {
const argv = resumeArgv.slice(1)
if (agent === 'claude') {
return buildClaudeResumeLaunchCommand(baseCommand, argv, shell)
}
const resumeArgs = argv.map((arg) => quoteStartupArg(arg, shell)).join(' ')
return resumeArgs ? `${baseCommand} ${resumeArgs}` : baseCommand
}
/** Builds the Claude cold-restore launch command: strips any resume/continue
* selector the user's persisted command carries and appends exactly one
* authoritative selector, so a stale or bare selector can never compete with
* the provider session id (#12982).
*
* Fails open by design: when the base command cannot be tokenized, or no
* claude executable token can be located (wrapper commands like
* `bash -c claude`), the base is left byte-for-byte untouched and the
* selector is appended, which is the pre-guard behavior. Bytes outside
* removed selector tokens are always preserved verbatim — the base is
* spliced by source span, never re-quoted. */
export function buildClaudeResumeLaunchCommand(
baseCommand: string,
resumeArgs: readonly string[],
shell: AgentStartupShell
): string {
const quotedResume = resumeArgs.map((arg) => quoteStartupArg(arg, shell)).join(' ')
if (!quotedResume) {
return baseCommand
}
const appended = `${baseCommand} ${quotedResume}`
const tokenized = tokenizeStartupCommand(baseCommand, shell)
if (!tokenized.ok) {
return appended
}
const { tokens, spans } = tokenized
const claudeIndex = findClaudeExecutableIndex(tokens, shell)
if (claudeIndex === -1) {
return appended
}
// Why: any token the tokenizer cannot model for this shell — an operator,
// comment, expansion, or cmd single-quoted region — means the splice could
// cut live syntax or misread a literal as a selector. The whole base must
// be modelable, including the executable itself; only PowerShell's leading
// call operator is a known-safe divergent token.
for (let i = 0; i <= tokens.length; i += 1) {
const gapStart = i === 0 ? 0 : spans[i - 1].end
const gapEnd = i === tokens.length ? baseCommand.length : spans[i].start
if (!/^[ \t]*$/.test(baseCommand.slice(gapStart, gapEnd))) {
return appended
}
if (i === tokens.length) {
break
}
// Why: a bare `--%` makes PowerShell pass the rest of the line to the
// child literally, so appended quoting would arrive as literal bytes. A
// quoted `--%` can also stop parsing, but only before a parameter token,
// where the base is already mangled with or without the guard.
if (shell === 'powershell' && baseCommand.slice(spans[i].start, spans[i].end) === '--%') {
return appended
}
if (spans[i].divergesFromShell) {
const isCallOperator = shell === 'powershell' && i === 0 && tokens[i] === '&'
if (!isCallOperator) {
return appended
}
}
}
const cuts: { start: number; end: number }[] = []
let terminatorStart: number | null = null
for (let i = claudeIndex + 1; i < tokens.length; i += 1) {
const token = tokens[i]
if (token === '--') {
// Why: claude is the executable here, so `--` is claude's own
// terminator; the selector must stay in option position before it.
// Span-splice equivalent of insertBeforeTerminator in
// tui-agent-launch-command.ts, which re-quotes and cannot be reused.
terminatorStart = spans[i].start
break
}
if (!isClaudeResumeSelector(token)) {
continue
}
// Why: absorb the separator before the selector, but never cross into the
// previous token, whose span can end with an escaped-space byte.
let start = spans[i].start
while (start > spans[i - 1].end && ' \t'.includes(baseCommand[start - 1])) {
start -= 1
}
let end = spans[i].end
const next = tokens[i + 1]
if ((token === '--resume' || token === '-r') && next !== undefined && !next.startsWith('-')) {
// A stale session locator rides along with its selector.
end = spans[i + 1].end
i += 1
}
cuts.push({ start, end })
}
let result = baseCommand
if (terminatorStart !== null) {
result = `${result.slice(0, terminatorStart)}${quotedResume} ${result.slice(terminatorStart)}`
}
for (let i = cuts.length - 1; i >= 0; i -= 1) {
result = `${result.slice(0, cuts[i].start)}${result.slice(cuts[i].end)}`
}
return terminatorStart !== null ? result : `${result} ${quotedResume}`
}