What problem does it solve? Keeping a self-maintained fork of the Codex ACP agent in sync with its upstream repository is error-prone: the real upstream (agentclientprotocol/codex-acp) is easily confused with the deprecated zed-industries repo, the submodule sits in a detached HEAD state, and rebasing custom commits onto upstream releases produces conflicts and semantic regressions that are hard to diagnose. ## Core Features & Use Cases - Guided rebase workflow: Walks through read-only investigation, upstream verification via merge-base and ahead/behind counts, backup branch creation, rebase, dependency reinstall, typecheck, tests, and force-push with lease. - Conflict playbook: Provides per-file conflict resolution strategies (package-lock.json, package.json, index.ts, CodexAcpServer.ts) plus a case library of six documented real-world merge incidents with root causes and fixes. - Fork integrity protection: Enforces the rule that custom commits (cost tracking, Claude-style skills/memory, AI session titles) must survive upstream changes, with fixup/autosquash guidance to keep history clean. - Use Case: When a new upstream codex-acp release lands, run this Skill to merge it into the fork, rebuild dist artifacts via pnpm agent:build, validate with pnpm check, and commit the updated submodule pointer on a new branch. ## Quick Start Update the codex-acp fork by merging the latest upstream changes and rebuilding the release artifacts.
