@ateam-ai/mcp 0.4.30 → 0.4.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ateam-ai/mcp",
-  "version": "0.4.30",
+  "version": "0.4.32",
   "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

@@ -3160,6 +3160,7 @@ const handlers = {
     const phases = [];
     let isNewSkill = false;
     let _connectorToolPush = null;
+    let writeBranch = "dev"; // github/patch default; overwritten by the actual response branch
     const _diff = { arrays_merged: [], arrays_replaced: [], scalars_changed: [], sections_replaced: [] };
 
     // Two backing stores, chosen EXPLICITLY by `source` (never inferred):
@@ -3416,12 +3417,17 @@ const handlers = {
           phases.push({ phase: "local_write", status: "done" });
         }
       } else {
-        await post(`/deploy/solutions/${solution_id}/github/patch`, {
+        // github/patch writes to `dev` by default (agents don't edit prod
+        // directly). Capture the ACTUAL branch it committed to — do NOT assume
+        // 'main'; mislabeling it strands the change off `main` until an explicit
+        // ateam_github_promote (was: the result hardcoded branch:"main").
+        const ghResp = await post(`/deploy/solutions/${solution_id}/github/patch`, {
           path: filePath,
           content: JSON.stringify(patched, null, 2),
           message,
         }, sid, { timeoutMs: 30_000 });
-        phases.push({ phase: "github_write", status: "done" });
+        writeBranch = ghResp?.branch || writeBranch;
+        phases.push({ phase: "github_write", status: "done", branch: writeBranch });
       }
     } catch (err) {
       const store = isLocal ? "Builder store (local)" : "GitHub";
@@ -3472,12 +3478,18 @@ const handlers = {
     // the redeploy with ateam_redeploy(solution_id, skill_id).
     let redeployResult;
     try {
-      if (target === "skill" && skill_id) {
-        redeployResult = await post(`/deploy/solutions/${solution_id}/skills/${skill_id}/redeploy`, {}, sid, { timeoutMs: 180_000 });
-      } else {
-        redeployResult = await post(`/deploy/solutions/${solution_id}/redeploy`, {}, sid, { timeoutMs: 180_000 });
-      }
-      phases.push({ phase: "redeploy", status: "done" });
+      const rdEndpoint = (target === "skill" && skill_id)
+        ? `/deploy/solutions/${solution_id}/skills/${skill_id}/redeploy`
+        : `/deploy/solutions/${solution_id}/redeploy`;
+      // Async-first, same as ateam_redeploy: a bulk (solution) redeploy of a
+      // many-skill solution takes >100s and 524s on the sync path — the patch
+      // then LOOKED like it failed / never reached Core. Kick async + poll;
+      // fall back to sync for older backends.
+      const kicked = await post(rdEndpoint, { async: true }, sid, { timeoutMs: 30_000 });
+      redeployResult = (kicked?.async && kicked.job_id)
+        ? await pollDeployJob(kicked.job_id, sid, { label: skill_id ? `redeploy-skill ${skill_id}` : "redeploy-bulk", maxMs: 15 * 60_000, intervalMs: 2000 })
+        : kicked;
+      phases.push({ phase: "redeploy", status: redeployResult?.ok === false ? "error" : "done" });
     } catch (err) {
       // Partial success: patch is saved to GitHub, only redeploy failed.
       // Return ok:true so the agent doesn't think the patch was lost.
@@ -3520,7 +3532,12 @@ const handlers = {
       ok: true,
       solution_id,
       source: isLocal ? "local" : "github",
-      ...(isLocal ? {} : { branch: 'main' }),
+      ...(isLocal ? {} : {
+        branch: writeBranch,
+        // Be explicit: a github write lands on `dev`, not prod. The change is
+        // NOT on `main` until an explicit ateam_github_promote(dev→main).
+        ...(writeBranch !== "main" && { _branch_note: `Committed to "${writeBranch}" (not main). Run ateam_github_promote(solution_id) to ship dev→main; otherwise a future build_and_run(main) won't include this.` }),
+      }),
       phases,
       // The full patched definition can be 10s of KB and pushes the rest of the
       // result (redeploy status, widget_health) past the ~50KB output ceiling,