fix: /retry and /undo no longer replay an older message after compaction (#81233, salvage #81234)

[teknium1]

Summary

After context compression, /retry on Desktop (and CLI/gateway/TUI) resends an older, wrong message instead of the last thing the user actually asked — and drops the compacted context on the way. Reported live by @gashoUlemsee on X ("/retry in hermes desktop does not resend the last user message. Just picks some message and resends it").

Root cause: compaction can merge the current live ask into the same role=user row as the summary scaffold (a "composite carrier"). Since #80622, retry/undo selectors treat every summary-bearing row as scaffolding, so they skip the carrier and land on an older user row — replaying a stale prompt and truncating away the compaction summary.

Salvage of #81234 by @poisdahl (fixes #81233). Merged cleanly onto current main with authorship preserved (6 commits).

Changes

• one canonical scaffold/live-view projection (user_originated_turn_view) for both composite-carrier layouts (force-user-leading handoff and merged user carrier)
• CLI, gateway, TUI/Desktop retry + undo select user-originated turns and resend/prefill only the live ask
• durable rewinds archive the carrier + tail and re-insert one hidden pure scaffold atomically, guarded by a pre-selection transcript snapshot (fails closed on concurrent mutation)
• Desktop keeps row identity across rewinds via a bounded old→new rebind map; legacy responses retained for older clients
• unknown/media-bearing retry payloads fail before mutation instead of being flattened

Validation

Check	Result
A/B: PR test suite on merge-base main	14/17 FAIL (retry/undo pick wrong row)
A/B: same suite at head	17/17 pass
Targeted py tests (tui_gateway, hermes_state, gateway, cli, run_agent, web_server)	914 passed
Desktop TS tests (rewind, chat-messages hydration)	105 passed
ruff on changed files	clean
Attribution audit	all emails mapped

Live repro: base main fires the exact reported symptom through the real command.dispatch retry surface (the code path Desktop hits over the gateway WS); head resolves it — {"type": "send", "message": "REAL ASK"} with the summary scaffold preserved.

Infographic

[github-actions]

૮ >ﻌ< ა ci review

_{ran on 1a95d0d — Merge branch 'pr-81234' into salv/81234-retry-carrier}

⚠️ Warnings

OSV vulnerability scan · View job

7 known vulnerabilities found in pinned dependencies.

• CVE-2026-67213 in package-lock.json
• CVE-2026-67213 in website/package-lock.json
• CVE-2026-71554 in uv.lock
• CVE-2026-70608 in package-lock.json
• CVE-2026-56876 in package-lock.json
• CVE-2026-70606 in package-lock.json
• CVE-2026-71554 in uv.lock

How to fix:

Review the findings in the Security tab. Update the affected dependencies if a patched version is available.

---

debug info

CI timings

CI timings · View report · View job

Wall time 4m25s vs 3m53s (+13.7%). 9 job(s) slower, 4 faster,

• JS & TS checks / JS & TS checks: +15.0s
• OS-specific tests / macOS-only tests: +9.0s
• OSV scan / Scan lockfiles / osv-scan: -8.0s
• Python tests / e2e: -4.0s
• Python tests / Run tests: -4.0s

[alt-glitch]

This was generated by AI during triage.

Salvage of #81234 for #81233. This is the current authoritative landing vehicle for the composite-compaction retry/undo repair.