Skip to content

Fix ACP session recovery#1052

Merged
GCWing merged 1 commit into
GCWing:mainfrom
wgqqqqq:codex/fix-acp-session-recovery
Jun 4, 2026
Merged

Fix ACP session recovery#1052
GCWing merged 1 commit into
GCWing:mainfrom
wgqqqqq:codex/fix-acp-session-recovery

Conversation

@wgqqqqq

@wgqqqqq wgqqqqq commented Jun 3, 2026

Copy link
Copy Markdown
Collaborator

What changed

  • Keep ACP chat sessions pinned to their acp:<client> agent type so the input capsule close action cannot silently switch them back to the normal agentic path.
  • Route cancel actions for ACP sessions through cancel_acp_dialog_turn with workspace and remote identifiers.
  • Add request IDs and timeout cleanup for ACP create/restore loading indicators, and time out ACP session option restores so the UI does not leave restoring session stuck on screen.
  • Add tests for ACP session detection and fallback behavior.

Why

Closing the ACP capsule prevented the same chat from returning to ACP mode, and switching back to a long-running ACP session could leave the UI stuck on restoring session. The root cause was frontend state losing the ACP agent type and pending restore UI state lacking a robust cleanup path.

Validation

  • pnpm --dir src/web-ui run test:run src/flow_chat/utils/acpSession.test.ts src/flow_chat/utils/chatInputMode.test.ts
  • pnpm run type-check:web
  • git diff --check

@wgqqqqq wgqqqqq changed the title [codex] fix ACP session recovery Fix ACP session recovery Jun 3, 2026
@wgqqqqq wgqqqqq marked this pull request as ready for review June 3, 2026 06:57
@wgqqqqq wgqqqqq force-pushed the codex/fix-acp-session-recovery branch from f85082c to e073822 Compare June 4, 2026 08:47
@GCWing GCWing merged commit d71ca77 into GCWing:main Jun 4, 2026
4 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