@ateam-ai/mcp 0.4.75 → 0.4.76

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ateam-ai/mcp",
-  "version": "0.4.75",
+  "version": "0.4.76",
   "mcpName": "io.github.ariekogan/ateam-mcp",
   "description": "A-Team MCP Server — build, validate, and deploy multi-agent solutions from any AI environment",
   "type": "module",

package/src/tools.js

@@ -2241,6 +2241,24 @@ export const tools = [
       required: ["solution_id"],
     },
   },
+  {
+    name: "ateam_github_reconcile",
+    core: true,
+    description:
+      "JOIN a diverged dev and main. Use when ateam_github_promote returns PROMOTE_NEEDS_HUMAN or PROMOTE_PRECONDITION_FAILED — i.e. the automatic main→dev back-merge could not resolve itself.\n\n" +
+      "TRY sync_from_main FIRST; this tool calls it internally (a plain merge keeps both sides with no judgement call) and only escalates when git genuinely conflicts.\n\n" +
+      "On conflict it writes a TWO-PARENT merge commit so the histories actually join. That matters: copying one branch's tree onto the other makes the contents match while leaving NO merge base, so the very next promote conflicts again — equal content is not a reconciled history.\n\n" +
+      "Conflicting files are resolved per file, NEWEST WINS, and every decision is reported. Recency is a heuristic, not intent: read the decisions. On a real tenant main held the newer solution.json while dev held the newer widget, so a blanket choice would have reverted one of them.\n\n" +
+      "WHO NEEDS THIS: any tenant whose deploys predate the dev-routing fix carries main-only commits the platform itself wrote, and hits this on its first promote afterwards. Pass dry_run:true to see the decisions before writing anything.",
+    inputSchema: {
+      type: "object",
+      properties: {
+        solution_id: { type: "string", description: "The solution ID" },
+        dry_run: { type: "boolean", description: "Report the per-file decisions without writing the merge commit." },
+      },
+      required: ["solution_id"],
+    },
+  },
   {
     name: "ateam_github_sync_from_main",
     core: true,
@@ -5412,6 +5430,11 @@ const handlers = {
   ateam_github_promote: async ({ solution_id, label, dry_run, skip_tag }, sid) =>
     post(`/deploy/solutions/${solution_id}/promote`, { label, dry_run, skip_tag }, sid),
 
+  ateam_github_reconcile: async ({ solution_id, dry_run }, sid) => {
+    if (!solution_id) throw new Error("solution_id required");
+    return await post(`/deploy/solutions/${solution_id}/reconcile`, { dry_run: dry_run === true }, sid);
+  },
+
   ateam_github_sync_from_main: async ({ solution_id, dry_run }, sid) =>
     post(`/deploy/solutions/${solution_id}/sync-from-main`, { dry_run }, sid),