feat(acp,tui): native /compact forwarding and session branching via ACP session/fork#525
Open
CSRessel wants to merge 3 commits into
Open
feat(acp,tui): native /compact forwarding and session branching via ACP session/fork#525CSRessel wants to merge 3 commits into
CSRessel wants to merge 3 commits into
Conversation
…ssion/fork When the agent advertises a compact command, /compact now forwards it in-session (no session swap, no summary injection); the custom summarize-and-swap path remains as fallback. New /fork picker entry branches at the current point via the unstable ACP session/fork, capability-gated per agent; rewind-to-message stays local. Shared session-replacement machinery extracted into backend/session_replace.rs. Also fixes an ETXTBSY flake in script-agent connection tests.
- Transcript loader now prefers the last recorded SessionBranched id so resuming a branched transcript targets the forked session - Cancelled fallback compaction no longer captures a truncated summary or replaces the session (same EndTurn invariant as native compact) - Branch busy-error wording covers loads, not just turns - /fork picker opens with the branch entry even with no user messages
|
Bugbot is not enabled for your account, so this pull request was not reviewed. Enable Bugbot in the Cursor dashboard to get automatic reviews on future PRs. |
…scoped ignores) New RustSec advisories landed upstream and fail cargo-deny on any fresh run (main included). anyhow 1.0.100->1.0.103 fixes RUSTSEC-2026-0190; quick-xml 0.38.0->0.38.4 stays current though no in-range fix exists yet for RUSTSEC-2026-0194/0195 (trusted-input paths only: wayland-scanner build-time XML, syntect bundled themes) so those are ignored with reasons, as is RUSTSEC-2026-0189 (rmcp Streamable HTTP *server* transport; this codebase is client-only, loopback server is axum).
|
Bugbot is not enabled for your account, so this pull request was not reviewed. Enable Bugbot in the Cursor dashboard to get automatic reviews on future PRs. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
🤖 Generated with Nori
compactslash command (claude-agent-acp and codex-acp both do),/compactnow forwards the agent's own command in the current session — no session swap, no summary re-injection. The custom summarize-and-swap flow remains as the fallback for agents without native compaction. A cancelled compaction (either path) is no longer recorded as one./forkpicker forks the session at its head via the unstable ACPsession/fork(capability-gated per agent; clear error when unsupported, e.g. codex/gemini adapters today). The original session stays resumable; transcript resume follows the fork. Rewind-to-a-message stays the local summary fork until fork-at-message lands upstream (ACP PR #629). Deliberately a single/forkcommand — no/branch//rewindaliases.backend/session_replace.rs; also fixes an ETXTBSY flake in the script-agent connection tests.Known follow-ups (deliberately out of scope): gate/dim the picker's branch entry on the fork capability instead of post-selection error; pre-existing stale-transcript-id on the compact-fallback swap; evaluate
@agentclientprotocol/codex-acpas successor adapter.Test Plan
cargo testgreen;tui-pty-e2egreen; insta snapshot for the pickerShare Nori with your team: https://www.npmjs.com/package/nori-skillsets