feat(merge): update jules merge to Data API approach#280
Merged
Conversation
Collaborator
davideast
commented
Mar 10, 2026
davideast
commented
- Port reconciliation workflow: scan, get-contents, stage-resolution, status, push, merge, schema handlers
- Adopt fleet auth pattern (FLEET_APP_* with legacy GITHUB_APP_* fallback)
- Refactor GitHub API layer to dependency injection (Octokit as arg)
- Replace Commander.js with citty CLI (7 commands + MCP entrypoint)
- Rewrite MCP server with 7 tools using McpServer high-level API
Migrate the standalone jules-merge project into packages/merge: - Port reconciliation workflow: scan, get-contents, stage-resolution, status, push, merge, schema handlers - Adopt fleet auth pattern (FLEET_APP_* with legacy GITHUB_APP_* fallback) - Refactor GitHub API layer to dependency injection (Octokit as arg) - Replace Commander.js with citty CLI (7 commands + MCP entrypoint) - Rewrite MCP server with 7 tools using McpServer high-level API - Add 26 tests (8 auth, 18 critical-path) — all passing - Update build.ts, package.json, exports, README Breaking: Removes conflicts/ and init/ modules (replaced by reconcile/) Closes: standalone jules-merge replacement
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.