Skip to content

chore: preserve main ancestry in dev - #13

Merged
sjungwon03 merged 4 commits into
devfrom
chore/12-preserve-main-ancestry
Jul 29, 2026
Merged

chore: preserve main ancestry in dev#13
sjungwon03 merged 4 commits into
devfrom
chore/12-preserve-main-ancestry

Conversation

@sjungwon03

Copy link
Copy Markdown
Member

Summary

Preserve the release ancestry required for a conflict-free TypeMCP 0.2.2 production promotion.

  • Merge current main into dev with a merge commit (rather than squash), so main becomes an actual ancestor of dev.
  • Retain the newer reviewed dev dependency contract: @theorvane/type-mcp@^0.2.2, resolved SDK 1.30.0/Hono node server 2.0.12, and no local override.
  • No public API or runnable example behavior changes.

Verification

  • npm ci, npm run check
  • all four runnable examples ✅
  • production audit: 0 vulnerabilities ✅
  • git diff --check

Closes #12

* 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 sjungwon03 added the release Dev-to-main release promotion label Jul 29, 2026
@sjungwon03 sjungwon03 self-assigned this Jul 29, 2026
@sjungwon03
sjungwon03 requested a review from sjungwon03-ai July 29, 2026 00:25

@sjungwon03-ai sjungwon03-ai left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Comment thread package.json Outdated

@sjungwon03-ai sjungwon03-ai left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.2 with no local override ✅
  • CI: verify check completed successfully on head 654bffa
  • Scope: no public API or runnable example behavior changes ✅

LGTM.

@sjungwon03-ai sjungwon03-ai left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overrides removed, lock and docs truthful, verify green on exact head. Approving.

@sjungwon03-ai

Copy link
Copy Markdown
Member

Verified at exact head 654bffa: no overrides in package.json or lockfile; TypeMCP ^0.2.2 → lock 0.2.2 / SDK 1.30.0 / Hono node-server 2.0.12; README and test both state no local override; merge commit 04c1139 preserves main 59cff945 as ancestor; verify check green on this SHA. Prior REQUEST_CHANGES finding (obsolete overrides block) resolved by 654bffa. Approving.

@sjungwon03
sjungwon03 merged commit 84c0a86 into dev Jul 29, 2026
1 check passed
@sjungwon03
sjungwon03 deleted the chore/12-preserve-main-ancestry branch July 29, 2026 00:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

release Dev-to-main release promotion review:approved

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Preserve main ancestry in dev before TypeMCP 0.2.2 release promotion

2 participants