Skip to content

chore(release): reconcile main history into dev - #18

Merged
sjungwon03 merged 2 commits into
devfrom
chore/17-reconcile-main-history
Jul 29, 2026
Merged

chore(release): reconcile main history into dev#18
sjungwon03 merged 2 commits into
devfrom
chore/17-reconcile-main-history

Conversation

@sjungwon03

Copy link
Copy Markdown
Member

Summary

Closes #17.

Create an ancestry-preserving reconciliation before the Swagger Petstore release promotion:

  • Current dev parent: 69f9ee84376fba11c42f7e16755c71804fb1e564 (reviewed Petstore feature merge)
  • Current main parent: 3d07fa84dd671c8136719756274aab320d87570f
  • Candidate two-parent merge: 4cff958ede3e26236c2491e5de5132cd6e9f0f0e

The merge has no content delta from dev; it retains the reviewed Petstore implementation and restores main as a real ancestor of dev. This is required because the release-promotion workflow accepts dev as the only promotion source.

Verification

  • Confirmed merge parents directly from Git.
  • Confirmed no staged content difference from dev and no overrides reintroduction.
  • npm ci
  • npm run check — 8 test files / 12 tests and production audit reports 0 vulnerabilities.
  • npm run example:petstore:typemcp:fixture
  • npm run example:petstore:agent:fixture
  • git diff --check origin/dev...HEAD

Scope

No Petstore API, TypeMCP tool, TypeChain workflow, dependency, or documentation behavior changes.

* ci: require verified dev-to-main promotions

* fix: pin examples MCP SDK to audited graph (#3)

Co-authored-by: sjungwon03 <>

* fix(deps): adopt TypeMCP 0.2.2 remediation (#7)

* chore: reconcile main release history into dev (#11)

* release: publish verified TypeChain and TypeMCP examples (#1)

Co-authored-by: sjungwon03 <>

* release: promote audited MCP SDK graph to production (#5)

* ci: require verified dev-to-main promotions

* fix: pin examples MCP SDK to audited graph (#3)

Co-authored-by: sjungwon03 <>

---------

Co-authored-by: sjungwon03 <>

* fix: retain published TypeMCP dependency contract

* fix: remove obsolete reconciliation override

---------

Co-authored-by: sjungwon03 <>
@sjungwon03 sjungwon03 added the release Dev-to-main release promotion label Jul 29, 2026
@sjungwon03 sjungwon03 self-assigned this Jul 29, 2026

@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.

Formal independent review at exact HEAD 4cff958. Verified: true two-parent merge (parents 69f9ee8 dev + 3d07fa8 main); zero file changes from dev — no Swagger Petstore or dependency-graph mutation; current main becomes a direct ancestor after merge, enabling the dev-to-main release-promotion flow; exact-head verify check green (run 30415932215, head_sha-bound); zero open review threads. This is a history reconciliation with no product or dependency delta. APPROVE.

@sjungwon03
sjungwon03 merged commit bc99ace into dev Jul 29, 2026
1 check passed
@sjungwon03
sjungwon03 deleted the chore/17-reconcile-main-history branch July 29, 2026 02:10
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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Reconcile main history into dev before Swagger Petstore release promotion

2 participants