mirror of
https://github.com/Ark0N/Codeman.git
synced 2026-10-08 08:29:42 +02:00
fix(session): answer Claude Code 2.1.252's reversed folder-trust dialog
Every claude session in a directory claude had not seen before died about six
seconds after it started (`Pane is dead (status 1)`), before the agent drew a
composer. Reproduced on a fresh case and measured.
Claude Code 2.1.252 rewrote the dialog. It used to be
❯ 1. Yes, I trust this folder
2. No, exit
and is now unnumbered, reversed, and highlights the option that quits:
❯ No, exit
Yes, I trust this folder
Detection still worked (the confirm affordance carries the match once the
numbered option text is gone), so the failure was entirely in the answer: the
auto-accept pressed Enter on the highlighted default, which is now exit.
trustDialogNextKey() reads the ❯ marker off the rendered pane and returns ONE
keystroke at a time: an arrow while the cursor is on the wrong option, Enter
only once the screen shows it on the trust option, and null for a frame that
does not say. Both layouts are handled, and which way the trust option lies is
read from the frame rather than assumed, so a further reordering costs a
repaint instead of a session. The last marked option wins, because the
direct-PTY fallback reads an append-only buffer where an older frame must not
out-vote the freshest one.
Two things only a live pane showed:
- The scan ran solely from the PTY onData handler. The arrow that moves the
cursor is the last output the pane produces, so the first fix parked every
session with the cursor sitting on the right option and no Enter ever sent.
It now schedules its own follow-up read (_trustDialogTimer, cleared in
_clearAllTimers()), offset past the scan throttle so the chain cannot break
on a boundary.
- The keystroke cap goes 3 -> 6, since answering is no longer one press.
The bundled codeman skill had the same blind \r as its bounded fallback, so
preamble 1.21.0 replaces it with _trust_key/_accept_trust: read
terminal?full=1, steer onto the trust option, re-read, then confirm. Those
keystrokes go out under their own clientId, because input sequence numbers are
monotonic per client and spending prompt numbers on dialog keys would make the
next send-and-wait look like a stale duplicate and vanish while reporting
success. The readiness recipes in docs/extending-codeman.md,
docs/api-reference.md and the skill's own reference carry the corrected answer,
plus a symptom-table entry for a worker whose pane is dead seconds after spawn.
Verified live on an isolated instance (own data dir and tmux socket): fresh
case -> arrow at 5 s -> Enter at 7 s -> composer, with hasTrustDialogAccepted
recorded. With the server-side auto-accept disabled in a throwaway copy, the
skill's fallback cleared a genuinely parked dialog in 1.1 s and spawn_worker
took a brand-new case to a live composer in 7.2 s; spawn_workers + sendwait +
last_text then ran end to end.
This commit is contained in:
@@ -69,9 +69,14 @@ SEQ=1 # $CID is the fixed literal from the preamble; never rebuild
|
||||
# plus a two-marker screen match in session-trust-dialog.ts), not the output stream.
|
||||
# It still misses two ways, and both leave the dialog up until someone answers it:
|
||||
# it only scans in the first 90 s after the pane started (TRUST_DIALOG_WINDOW_MS),
|
||||
# and it gives up after 3 Enter presses (TRUST_DIALOG_MAX_ATTEMPTS). So: composer
|
||||
# marker first, dialog only as the bounded fallback (a blind Enter up front would
|
||||
# land in an already-ready composer).
|
||||
# and it gives up after 6 keystrokes (TRUST_DIALOG_MAX_ATTEMPTS). So: composer
|
||||
# marker first, dialog only as the bounded fallback.
|
||||
# ⚠️ The dialog is NOT answered with Enter. Since claude-cli 2.1.252 the options
|
||||
# lost their numbers, swapped places, and the highlighted one is `No, exit`, so a
|
||||
# blind \r quits the CLI and the pane is dead seconds after the spawn (measured).
|
||||
# _accept_trust (§0 preamble) reads the ❯ marker off the rendered pane, arrows onto
|
||||
# `Yes, I trust this folder`, re-reads to confirm the move landed, and only then
|
||||
# presses Enter.
|
||||
# Stage 1 is SHORT on purpose: an already-trusted case matches in <1 s, while a
|
||||
# virgin case can never pass it (the dialog is up) and always pays it in full,
|
||||
# the long budget belongs to stage 3, after the dialog is answered.
|
||||
@@ -92,13 +97,8 @@ done
|
||||
R=$("${CURL[@]}" -G "$API/api/v1/sessions/$SID/wait-output" \
|
||||
--data-urlencode 'match=shift+tab' --data-urlencode 'from=buffer' --data-urlencode 'timeout=5000')
|
||||
if ! jq -e '.data.wait.matched' <<<"$R" >/dev/null; then
|
||||
T=$("${CURL[@]}" -G "$API/api/v1/sessions/$SID/wait-output" \
|
||||
--data-urlencode 'match=trust' --data-urlencode 'from=buffer' --data-urlencode 'timeout=2000')
|
||||
if jq -e '.data.wait.matched' <<<"$T" >/dev/null; then
|
||||
"${CURL[@]}" -X POST "$API/api/v1/sessions/$SID/input" -H 'Content-Type: application/json' \
|
||||
-d '{"input":"\r","useMux":true,"clientId":"'"$CID"'","seq":'$SEQ'}' >/dev/null
|
||||
SEQ=$((SEQ+1))
|
||||
fi
|
||||
_accept_trust "$SID" # reads the marker and steers; never a blind \r. Own clientId,
|
||||
# so it spends none of $SEQ's numbers.
|
||||
R=$("${CURL[@]}" -G "$API/api/v1/sessions/$SID/wait-output" \
|
||||
--data-urlencode 'match=shift+tab' --data-urlencode 'from=buffer' --data-urlencode 'timeout=45000')
|
||||
fi
|
||||
@@ -106,8 +106,8 @@ if ! jq -e '.data.wait.matched' <<<"$R" >/dev/null; then
|
||||
# stage 4, mode-agnostic and bounded: answering a trivial prompt IS readiness.
|
||||
# COSTS THE WORKER ONE BILLED TURN, so it only runs when the fast marker missed.
|
||||
# Split token (the typed line echoes into the stream) and unique per call. Must stay
|
||||
# AFTER the dialog fallback: free text plus \r into a trust dialog still up answers
|
||||
# it blind, the same footgun as an up-front Enter.
|
||||
# AFTER the dialog fallback: the select widget swallows the text and the \r answers
|
||||
# whatever is highlighted, which on a live dialog is `No, exit`.
|
||||
TOK="${RANDOM}_$$"
|
||||
"${CURL[@]}" -X POST "$API/api/v1/sessions/$SID/input" -H 'Content-Type: application/json' \
|
||||
-d '{"input":"reply with the word READY immediately followed by _'"$TOK"' and nothing else\r","useMux":true,"clientId":"'"$CID"'","seq":'$SEQ'}' >/dev/null
|
||||
@@ -527,9 +527,10 @@ done
|
||||
circuit breaker, which exists to stop a worker that crashes on every start from being
|
||||
restarted in a loop; clearing it unasked re-arms that loop.
|
||||
- Then run **Flow 1's readiness stages 1-3** on each SID. A path claude has never been
|
||||
run in shows the trust dialog, and typing your task into a dialog answers it blind and
|
||||
loses the task. Stages 1-3 cost no turn; stage 4, if it fires, costs that worker one
|
||||
billed turn.
|
||||
run in shows the trust dialog, and typing your task into it does not just lose the
|
||||
task: the select widget swallows the text and the trailing `\r` answers the
|
||||
highlighted option, which since claude-cli 2.1.252 is `No, exit`. Stages 1-3 cost no
|
||||
turn; stage 4, if it fires, costs that worker one billed turn.
|
||||
|
||||
### 4. Hand out the tasks: markers, not send-and-wait
|
||||
|
||||
|
||||
Reference in New Issue
Block a user