What problem does it solve? Merging upstream changes into a self-maintained git submodule fork (vendor/claude-agent-acp) is error-prone: semantic regressions can hide behind zero-conflict rebases, lock files break npm ci, and custom features like the AskUserQuestion extMethod can be silently overwritten. This Skill encodes a proven, repeatable workflow for merging upstream agentclientprotocol/claude-agent-acp commits while preserving all custom fork behavior. ## Core Features & Use Cases - Guided rebase workflow: Read-only investigation with git ls-remote/gh api, rebase of custom commits onto upstream HEAD, per-file conflict resolution playbooks, and fixup/autosquash history cleanup. - Semantic regression safety nets: Mandatory typecheck and test gates plus a case library (references/cases.md) documenting 11 real merge incidents such as interface replacement, resume-path performance regressions, and lock file corruption. - End-to-end release integration: Rebuilds fork artifacts, runs the main repo's pnpm agent:build and pnpm check, and commits the updated submodule pointer on a dedicated branch. - Use Case: When a new upstream release of claude-agent-acp ships, invoke this Skill to rebase the fork's custom commits, resolve conflicts using documented patterns, verify with typecheck/tests, and push the updated submodule pointer. ## Quick Start Ask the agent to update claude-agent-acp by merging the latest upstream changes and rebuilding the agent artifacts.
