@shipers-dev/multi 0.41.0 → 0.43.0

package/dist/index.js

@@ -17109,7 +17109,7 @@ function setWorktreeIndexEntry(workingDir, key, issueId) {
   idx[key] = issueId;
   writeIndex(workingDir, idx);
 }
-async function ensureWorktree(workingDir, issueKey, issueId) {
+async function ensureWorktree(workingDir, issueKey, issueId, opts) {
   if (!await isGitRepo(workingDir)) {
     return { path: workingDir, branch: "", created: false };
   }
@@ -17126,8 +17126,19 @@ async function ensureWorktree(workingDir, issueKey, issueId) {
   try {
     mkdirSync3(wtDir, { recursive: true });
   } catch {}
+  let baseRef = "HEAD";
+  if (opts?.parentBranch) {
+    const localOk = await branchExists(workingDir, opts.parentBranch);
+    if (localOk) {
+      baseRef = opts.parentBranch;
+    } else {
+      const fetched = await run3(workingDir, "git", ["fetch", "origin", `${opts.parentBranch}:${opts.parentBranch}`]);
+      if (fetched.code === 0)
+        baseRef = opts.parentBranch;
+    }
+  }
   const exists4 = await branchExists(workingDir, branch);
-  const args2 = exists4 ? ["worktree", "add", wtPath, branch] : ["worktree", "add", "-b", branch, wtPath, "HEAD"];
+  const args2 = exists4 ? ["worktree", "add", wtPath, branch] : ["worktree", "add", "-b", branch, wtPath, baseRef];
   const r = await run3(workingDir, "git", args2);
   if (r.code !== 0) {
     throw new Error(`git worktree add failed: ${r.stderr || r.stdout}`);
@@ -17219,6 +17230,48 @@ async function removeWorktree(workingDir, issueKey, opts = {}) {
   removeWorktreeIndexEntry(workingDir, key);
   return result;
 }
+async function squashMergeChild(wtPath, childBranch, childKey) {
+  const result = { childKey, branch: childBranch, ok: false, empty: false, conflicts: [], message: "" };
+  await run3(wtPath, "git", ["fetch", "origin", `${childBranch}:${childBranch}`]).catch(() => null);
+  const haveLocal = await branchExists(wtPath, childBranch);
+  if (!haveLocal) {
+    result.message = `branch ${childBranch} not resolvable locally or via origin`;
+    return result;
+  }
+  const ahead = await run3(wtPath, "git", ["rev-list", "--count", `HEAD..${childBranch}`]);
+  if (ahead.code === 0 && Number((ahead.stdout || "0").trim()) === 0) {
+    result.ok = true;
+    result.empty = true;
+    result.message = `${childKey} had no commits ahead of parent — nothing to merge`;
+    return result;
+  }
+  const merge9 = await run3(wtPath, "git", ["merge", "--squash", "--no-commit", childBranch]);
+  const conflicted = await run3(wtPath, "git", ["diff", "--name-only", "--diff-filter=U"]);
+  const conflictPaths = (conflicted.stdout || "").split(`
+`).map((l) => l.trim()).filter(Boolean);
+  if (merge9.code !== 0 || conflictPaths.length > 0) {
+    result.conflicts = conflictPaths;
+    result.message = `${childKey} had ${conflictPaths.length} conflicting path(s); worktree left dirty for parent to resolve`;
+    return result;
+  }
+  const staged = await run3(wtPath, "git", ["diff", "--cached", "--name-only"]);
+  const stagedFiles = (staged.stdout || "").split(`
+`).map((l) => l.trim()).filter(Boolean);
+  if (stagedFiles.length === 0) {
+    result.ok = true;
+    result.empty = true;
+    result.message = `${childKey} produced no staged changes — nothing to commit`;
+    return result;
+  }
+  const commit = await run3(wtPath, "git", ["commit", "-m", `squash: ${childKey} (${childBranch})`]);
+  if (commit.code !== 0) {
+    result.message = `${childKey} commit failed: ${commit.stderr || commit.stdout}`;
+    return result;
+  }
+  result.ok = true;
+  result.message = `${childKey} squash-merged (${stagedFiles.length} file${stagedFiles.length === 1 ? "" : "s"})`;
+  return result;
+}
 var init_worktree = () => {};
 
 // ../../node_modules/zod/v4/core/core.js
@@ -34357,7 +34410,7 @@ async function handleRunTask(apiUrl, deviceId, task, detected, ctx) {
   let worktreeBranch = "";
   if (baseWorkingDir) {
     try {
-      const wt = await ensureWorktree(baseWorkingDir, task.key || issueId, issueId);
+      const wt = await ensureWorktree(baseWorkingDir, task.key || issueId, issueId, { parentBranch: task.parent_branch ?? undefined });
       workingDir = wt.path;
       worktreeBranch = wt.branch;
       await postStream(apiUrl, issueId, "worktree_created", { path: wt.path, branch: wt.branch, reused: !wt.created });
@@ -34372,6 +34425,44 @@ async function handleRunTask(apiUrl, deviceId, task, detected, ctx) {
       await postStream(apiUrl, issueId, "worktree_error", { message: fmtError(e) });
     }
   }
+  let mergeReportLines = [];
+  let mergeHadConflicts = false;
+  const mergeTargets = Array.isArray(task.merge_targets) ? task.merge_targets : [];
+  if (workingDir && mergeTargets.length) {
+    for (const t of mergeTargets) {
+      if (!t?.branch || !t?.child_key)
+        continue;
+      try {
+        const r = await squashMergeChild(workingDir, String(t.branch), String(t.child_key));
+        if (r.ok && r.empty) {
+          mergeReportLines.push(`- _empty_ ${t.child_key} → no changes`);
+        } else if (r.ok) {
+          mergeReportLines.push(`- ✅ ${t.child_key} squashed into ${worktreeBranch || "(parent)"}`);
+        } else if (r.conflicts.length) {
+          mergeHadConflicts = true;
+          mergeReportLines.push(`- ⚠ ${t.child_key} CONFLICT in: ${r.conflicts.join(", ")}`);
+        } else {
+          mergeReportLines.push(`- ✗ ${t.child_key} ${r.message}`);
+        }
+        await postStream(apiUrl, issueId, "child_merge", {
+          child_key: t.child_key,
+          branch: t.branch,
+          ok: r.ok,
+          empty: r.empty,
+          conflicts: r.conflicts,
+          message: r.message
+        });
+      } catch (e) {
+        mergeReportLines.push(`- ✗ ${t.child_key} merge threw: ${fmtError(e)}`);
+      }
+    }
+    if (mergeReportLines.length) {
+      const header = mergeHadConflicts ? "## ⚠ Squash-merge results — conflicts to resolve in your worktree" : "## Squash-merge results";
+      const block = [header, ...mergeReportLines, "", "---", ""].join(`
+`);
+      task.followup = block + (task.followup || "");
+    }
+  }
   log3(`▶ run_task ${task.key}: ${isFollowup ? "(follow-up) " : ""}${task.title}${workingDir ? ` [cwd: ${workingDir}${worktreeBranch ? ` @${worktreeBranch}` : ""}]` : ""}`);
   if (tenantWsId)
     await patchIssueStatus(apiUrl, tenantWsId, issueId, "in_progress");
@@ -35030,7 +35121,8 @@ async function executePlanActions(apiUrl, parentTask, actions, ctx, parseErrors
           priority: a.priority,
           assignee_type: a.assignee_type,
           assignee_id: a.assignee_id,
-          parent_id: a.parent_id || parentId
+          parent_id: a.parent_id || parentId,
+          await_children: a.await_children
         };
         const res = await apiClient.post(mutateUrl, body, { headers });
         if (!res.success) {
@@ -36197,7 +36289,8 @@ async function executeChatPlanActions(actionsIn, parseErrors, ctx) {
           priority: a.priority,
           assignee_type: a.assignee_type,
           assignee_id: a.assignee_id,
-          parent_id: a.parent_id
+          parent_id: a.parent_id,
+          await_children: a.await_children
         };
         const res = await apiClient.post(mutateUrl, body, { headers });
         if (!res.success) {
@@ -37403,7 +37496,7 @@ import { parseArgs } from "util";
 // package.json
 var package_default = {
   name: "@shipers-dev/multi",
-  version: "0.41.0",
+  version: "0.43.0",
   type: "module",
   bin: {
     "multi-agent": "./dist/index.js"
@@ -37688,8 +37781,8 @@ init_errors();
 
 class Worktree extends exports_Effect.Service()("cli/Worktree", {
   succeed: {
-    ensure: (workingDir, issueKey, issueId) => exports_Effect.tryPromise({
-      try: () => ensureWorktree(workingDir, issueKey, issueId),
+    ensure: (workingDir, issueKey, issueId, opts) => exports_Effect.tryPromise({
+      try: () => ensureWorktree(workingDir, issueKey, issueId, opts),
       catch: (cause3) => new WorktreeError({ message: `ensureWorktree failed`, cause: cause3 })
     }),
     isGitRepo: (dir) => exports_Effect.tryPromise({
@@ -38415,8 +38508,8 @@ init_errors();
 
 class Worktree2 extends exports_Effect.Service()("cli/Worktree", {
   succeed: {
-    ensure: (workingDir, issueKey, issueId) => exports_Effect.tryPromise({
-      try: () => ensureWorktree(workingDir, issueKey, issueId),
+    ensure: (workingDir, issueKey, issueId, opts) => exports_Effect.tryPromise({
+      try: () => ensureWorktree(workingDir, issueKey, issueId, opts),
       catch: (cause3) => new WorktreeError({ message: `ensureWorktree failed`, cause: cause3 })
     }),
     isGitRepo: (dir) => exports_Effect.tryPromise({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shipers-dev/multi",
-  "version": "0.41.0",
+  "version": "0.43.0",
   "type": "module",
   "bin": {
     "multi-agent": "./dist/index.js"