Skip to content

feat: support ACP session forks - #435

Merged
nikita-ashihmin merged 6 commits into
agentclientprotocol:mainfrom
nikita-ashihmin:nikita.ashikhmin/session-fork
Aug 28, 2026
Merged

feat: support ACP session forks#435
nikita-ashihmin merged 6 commits into
agentclientprotocol:mainfrom
nikita-ashihmin:nikita.ashikhmin/session-fork

Conversation

@nikita-ashihmin

@nikita-ashihmin nikita-ashihmin commented Aug 27, 2026

Copy link
Copy Markdown
Collaborator

Summary

  • advertise the standard ACP session/fork capability
  • map ACP forks to Codex app-server thread/fork
  • preserve the source working directory and additional workspace roots
  • support exact AIR fork points from _meta.jetbrains.air.fork
  • resolve the ACP item ID through thread/read and pass its containing turn as lastTurnId
  • register the fork as an independent ACP session

Tests

  • npm run typecheck
  • CodexAcpClient.test.ts — 100 passed after the checkpoint change
  • npm test — 458 passed, 28 skipped before the focused checkpoint change

@nikita-ashihmin nikita-ashihmin changed the title Add ACP session fork support feat: support ACP session forks Aug 27, 2026
Resolve the exact item id first. Fall back to the ACP source id for compatibility with older AIR builds.
Codex can rebuild item ids when it restores a session. Match the persisted message fingerprint and occurrence before the thread fork.
Do not send updates for a fork before the client loads it.
Release the Codex app-server writer after thread/fork.
This lets AIR load the fork through ACP without a terminal fallback.
@nikita-ashihmin
nikita-ashihmin force-pushed the nikita.ashikhmin/session-fork branch from 367e557 to 155c158 Compare August 28, 2026 08:45
@nikita-ashihmin
nikita-ashihmin merged commit 69ca755 into agentclientprotocol:main Aug 28, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants