Skip to content

chore(release): reconcile main history for Petstore MCP release - #30

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

chore(release): reconcile main history for Petstore MCP release#30
sjungwon03 merged 2 commits into
devfrom
chore/29-reconcile-main-history

Conversation

@sjungwon03

Copy link
Copy Markdown
Member

Summary

Closes #29.

Create a two-parent history reconciliation required before releasing the reviewed Petstore MCP HTTP agent rewrite.

  • Candidate: a77eddb4d1e40450232b45224d9026ed7096acc9
  • First parent / current dev: 4e00e86013e78a44d8dd4ce8ee1a0ef608968388
  • Second parent / current main: 3ef010f2207009731d9763d7e04c9019dfb70197

The merge resolves all add/add historical conflicts in favor of current dev, so it introduces zero file delta versus current dev. It preserves the reviewed Petstore MCP runtime/client/TypeChain agent rewrite and its CI fixture commands, while making main a direct ancestor after merging.

Verification

  • Confirmed exactly the two expected parents.
  • Confirmed zero staged diff versus origin/dev before committing.
  • npm ci
  • npm run check — 6 test files / 10 tests and production audit 0 vulnerabilities.
  • npm run example:petstore:mcp:fixture
  • npm run example:petstore:mcp-agent:fixture
  • git diff --check origin/dev...HEAD

* 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

* feat: add read-only Swagger Petstore agent examples (#16)

* docs(planning): add Swagger Petstore agent plan

* feat: add read-only Swagger Petstore client

* feat: wrap read-only Petstore API in TypeMCP

* feat: add TypeChain Petstore agent workflow

* feat: add live Swagger Petstore demonstrations

* feat: add real TypeChain Petstore agent factory (#22)

* docs(planning): define real Petstore agent delivery

* feat: add real TypeChain Petstore agent factory

* docs: explain application-owned Petstore agent runtime

---------

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.

Independent release-history reconciliation review — APPROVE

Formal independent review at exact head a77eddb4d1e40450232b45224d9026ed7096acc9.

Verified (GitHub metadata/diff/source only — no local execution):

  1. Two-parent merge structure — candidate a77eddb has exactly two parents: first 4e00e86 (current dev), second 3ef010f (current main). Matches the expected reconciliation topology.
  2. Zero file delta vs dev — PR reports 0 changed files, +0/−0. compare dev...a77eddb → 0 files, ahead_by 2 / behind_by 0. The merge resolves historical add/add conflicts entirely in favor of current dev, introducing no content change.
  3. Reviewed rewrite preserved, no stale overrides — tree at head retains the real TypeMCP HTTP loopback runtime (petstore-mcp-runtime.ts, node:http on ephemeral 127.0.0.1, /mcp route, fetch bridge), the official MCP SDK client (petstore-mcp-client.ts, StreamableHTTPClientTransport), and the TypeChain @Agent facade (typechain-petstore-mcp-agent.ts, buildAgent). package.json scripts are clean fixture/live entries; no obsolete override or stub files remain in the tree.
  4. Exact-head CI + threadsverify check-run is success at a77eddb. Zero review threads (zero unresolved). Dev ruleset gates (1 approval, verify check, thread resolution) are satisfied by this review.

This is a clean, minimal history reconciliation that makes main a direct ancestor without altering any reviewed dev content. Cleared for promotion ahead of the Petstore MCP agent release.

@sjungwon03
sjungwon03 merged commit 517af2a into dev Jul 29, 2026
1 check passed
@sjungwon03
sjungwon03 deleted the chore/29-reconcile-main-history branch July 29, 2026 06:06
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 before Petstore MCP agent release promotion

2 participants