feat(coding-agent): edit queued messages in place and preserve the queue on interrupt

[snimu]

Replaces #633 with a ground-up redesign at roughly a third of the diff (+1,033/−89 vs +2,397/−696) and less than half the net production code.

What it does

• Alt+Up / Alt+Down browse queued steering and follow-up messages newest-first, from the draft and back to it. The selected item loads into the editor for in-place editing.
• Enter applies the edit as steering (moves follow-ups up); Alt+Enter applies it as a follow-up (moves steering down).
• Submitting an empty edit deletes the item. Esc-esc exits browse mode and restores the draft instead of arming an accidental delete.
• Ctrl+Alt+Up / Ctrl+Alt+Down reorder the selected item within its lane (modern and legacy macOS Option-as-Meta arrow encodings both supported).
• Ctrl+C / Escape during a rollout abort the turn but preserve the queue: nothing pops into the editor, queued messages stay server-owned and visible, and draining resumes on the next successful edit or fresh submit.

Design

The key observation is that main already preserves the queue across aborts: requestAbort() suspends the input pump without clearing queued actions, and _prompt() resumes it on the next submit. The only reason Ctrl+C dumped the queue into the editor was one explicit restoreQueuedMessagesToEditor({ abort: true }) call. Interrupt is now a plain abort().

Mutations are addressed by (lane, index, expectedText), verified server-side against the same projection the session-action snapshot publishes. Same-text queue items are semantically interchangeable, so this gives compare-and-swap-equivalent safety with no ids, no revisions, and no snapshot schema changes — queue state on the wire stays plain strings.

• AgentSession.mutateQueuedMessage(lane, index, expectedText, mutation) → applied | rejected | invalid with delete, move, and replace mutations. Deletes settle agentMessageId delivery/completion outcomes (a deleted promptAndWait turn rejects instead of hanging). Replaces rebuild content and primary records, honor an image tri-state (undefined preserves server images, [] clears, list replaces), reject non-editable turns (accepted agent messages, injected custom-message turns), update the wake policy on lane flips, and resume queued work.
• Client-side QueueSelection (85 lines) tracks the browse cursor and stashes the draft; on queue changes it keeps, retargets by text, or drops the selection while preserving the stashed draft.
• Daemon wire: one mutate_queued_message request behind the queue_message_mutation capability (schema 14 → 15). Older daemons report unsupported and the UI shows "Queue editing requires a newer daemon". The legacy abort_and_clear_queue wire command is untouched for compatibility.
• app.message.dequeue (restore-queue-to-editor) is superseded and migrated to app.message.navigateOlder; existing custom bindings carry over via the keybindings migration.

Not in this PR (dropped from the #633 approach)

Stable action ids, queue revisions/CAS plumbing, snapshot items[]/revision fields, client pause/resume state machinery (pause flags, generations, single-flight resume, interrupt-and-recall, ownership sentinels, checkpoint/reconcile), and image tri-state UI plumbing — all unnecessary under the queue-preserving interrupt semantics above.

Tests

• agent-session-queue-mutation.test.ts: projection addressing, stale-address rejection, delete settlement, boundary moves, lane flips (both directions, wake policy), image tri-state incl. content/record rebuild, session-command validation, injected-turn rejection, and abort → edit → resume.
• queue-selection.test.ts: browse order, boundary noops, sync keep/retarget/drop, draft stash survival across external drops.
• interactive-queue-edit.test.ts: enter/alt+enter lane targets, empty-submit delete, edit restoration when a mutation is rejected after Enter cleared the editor, unsupported-daemon status, interrupt preserving the queue.
• Updated interactive-mode-ctrl-c suite to the new interrupt contract; daemon protocol/round-trip coverage; keybinding migration; tui key-encoding tests.

npm run check green; 660 coding-agent tests across 17 suites green; 740 tui tests green.

---

Note

Medium Risk
Touches session queue delivery, abort/interrupt UX, and daemon protocol revision 15; mistakes could drop or mis-order prompts or strand suspended work, though extensive tests cover mutations and race cases.

Overview
Queued messages can be browsed and edited in place instead of dumping the whole queue into the editor. Alt+Up / Alt+Down walk steering and follow-up items (newest-first) while stashing the draft; Enter / Alt+Enter apply edits as steering or follow-up, and an empty submit deletes the selected item. Ctrl+Alt+Up / Down reorder within a lane (with TUI support for legacy Option-as-Meta arrow encodings).

Server-side mutateQueuedMessage (lane, index, expectedText, delete/move/replace) backs this via mutate_queued_message on the daemon (schema 15, queue_message_mutation capability). The interactive UI uses QueueSelection and serialized optimistic updates.

Ctrl+C during streaming now calls abort() only—the queue stays server-owned and visible; draining resumes on the next submit or queue edit. app.message.dequeue is migrated to app.message.navigateOlder.

^{Reviewed by Cursor Bugbot for commit eb16eac. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Add in-place queue message editing and preserve the queue on interrupt

• Replaces the bulk dequeue-to-editor restore flow with in-place browsing and editing: Alt+Up/Down navigates queued messages, Enter/Alt+Enter applies edits as steering or follow-up, and an empty submit deletes the item.
• Adds QueueSelection (queue-selection.ts) to track cursor position, stash/restore the editor draft, and reconcile selection when the server queue changes.
• Adds AgentSession.mutateQueuedMessage (agent-session.ts) supporting delete, move (in-lane swap), replace (text/images), and lane flip (steering↔follow-up) with optimistic concurrency checks.
• Propagates mutateQueuedMessage through the daemon protocol (schema revision 15, new queue_message_mutation capability) and both DaemonAgentConnection and InProcessAgentConnection.
• Replaces the app.message.dequeue keybinding with four commands: navigateOlder, navigateNewer, moveEarlier, moveLater; existing user configs are migrated automatically.
• Ctrl+C now aborts streaming and leaves queued messages server-side instead of restoring them into the editor.
• Risk: queue mutations are serialized client-side but optimistic local patches may diverge briefly if a concurrent server event arrives between the request and its response.

^{Macroscope summarized eb16eac.}

[snimu]

Both fixed in bb8ffe2:

• Stale selection across session switches (High): resetCurrentSessionRenderState now resets queueSelection alongside connectionQueue. The stashed draft is discarded rather than restored — every editor draft is cleared by the same reset, so restoring a previous session's draft would be wrong too. Regression test drives a browse, resets render state, and asserts the next Enter is a fresh prompt.
• Stale mirror after replace/delete (Medium): applied replace and delete mutations now update connectionQueue optimistically, exactly like the move path already did (same guard: only when the lane still holds expectedText at the index; the later queue event resyncs to the same state). Lane-changing replaces move the item to the end of the target lane, matching the daemon's moveQueued(..., length) semantics. Tests cover in-lane replace, delete, and cross-lane replace.

[snimu]

Fixed in b082b76. The race is real: in-process connections emit session_action_update before the mutateQueuedMessage await resumes, and with duplicate-text items sync retargets the selection so the text guard alone passes and the patch double-applies.

Queue events always assign a fresh connectionQueue object (refreshConnectionQueue, the event handler, and the render-state reset all replace the object; nothing else mutates it), so both optimistic patch sites now also require this.connectionQueue === queueBefore — the object captured before the request. If any event landed meanwhile, the mirror is authoritative and the patch is skipped. Regression test reproduces the exact scenario (event-before-response with two same-text items, delete must not double-apply).

Same commit also trims review-fix bloat from the previous round: the session-switch coverage now extends the existing render-state reset tests instead of a duplicated 40-line harness, and the defensive ?. on queueSelection in the reset path is gone.

[cursor]

Cursor Bugbot has reviewed your changes and found 1 potential issue.

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

^{Reviewed by Cursor Bugbot for commit 3bdb038. Configure here.}