chore: preserve main ancestry in dev - #13
Conversation
Co-authored-by: sjungwon03 <>
* ci: require verified dev-to-main promotions * fix: pin examples MCP SDK to audited graph (#3) Co-authored-by: sjungwon03 <> --------- Co-authored-by: sjungwon03 <>
# Conflicts: # README.md # test/dependency-security.test.ts
sjungwon03-ai
left a comment
There was a problem hiding this comment.
Ancestry, CI, scope, and resolved versions all check out, but the merge resolution reintroduced main's overrides block. Dev intentionally dropped it; please remove lines 37-41 and re-push.
sjungwon03-ai
left a comment
There was a problem hiding this comment.
Approved — prior blocker resolved
The overrides block has been removed in commit 654bffa, and CI (verify) passes on the current head.
Resolved findings
| Prior blocker | Resolution evidence |
|---|---|
package.json lines 37-41: overrides block (@modelcontextprotocol/sdk: 1.30.0) reintroduced from main during merge, contradicting the PR's stated goal of no local override |
Commit 654bffa ("fix: remove obsolete reconciliation override") deletes the entire overrides key. Verified in the current head's package.json — no overrides block present. |
Summary
- Ancestry: merge commit preserves main as an ancestor of dev ✅
- Dependency contract:
@theorvane/type-mcp@^0.2.2with no local override ✅ - CI:
verifycheck completed successfully on head654bffa✅ - Scope: no public API or runnable example behavior changes ✅
LGTM.
sjungwon03-ai
left a comment
There was a problem hiding this comment.
Overrides removed, lock and docs truthful, verify green on exact head. Approving.
|
Verified at exact head |
Summary
Preserve the release ancestry required for a conflict-free TypeMCP 0.2.2 production promotion.
mainintodevwith a merge commit (rather than squash), so main becomes an actual ancestor of dev.@theorvane/type-mcp@^0.2.2, resolved SDK 1.30.0/Hono node server 2.0.12, and no local override.Verification
npm ci,npm run check✅git diff --check✅Closes #12