@tablation/crew 0.126.11 → 0.126.12

package/dist/cli.js

@@ -13595,7 +13595,7 @@ function doctorSelftestLines(stored, toolchains) {
 // src/cli.ts
 import { resolve as resolve7, dirname as dirname34, join as join56, basename as basename16 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
-import { hostname as hostname4, homedir as homedir11 } from "os";
+import { hostname as hostname5, homedir as homedir11 } from "os";
 import { spawnSync as spawnSync11 } from "child_process";
 import { parse as parseYaml2 } from "yaml";
 
@@ -17463,7 +17463,7 @@ function flagWizardAnswers(f, env) {
 // src/release-run.ts
 import { readFileSync as readFileSync36, writeFileSync as writeFileSync31, existsSync as existsSync39, copyFileSync, mkdirSync as mkdirSync28, mkdtempSync as mkdtempSync3, rmSync as rmSync19 } from "fs";
 import { dirname as dirname24, join as join43 } from "path";
-import { tmpdir as tmpdir5 } from "os";
+import { tmpdir as tmpdir5, hostname as hostname4 } from "os";
 
 // src/release.ts
 function describeUnplaceable(unplaceable, verifiedStatus) {
@@ -18150,6 +18150,17 @@ async function confirmExternalReleased(o, closures) {
     return { ...c, confirmed, version };
   });
 }
+var mergeFailed = (r) => typeof r === "object" && ("conflict" in r || "error" in r);
+function ensureCommitterIdentity(o) {
+  if (gitOk(o.cwd, ["var", "GIT_COMMITTER_IDENT"])) return;
+  const ship = hostname4().split(".")[0] || "ship";
+  git(o.cwd, ["config", "user.name", `Crew (${ship})`]);
+  git(o.cwd, ["config", "user.email", `crew@${ship}`]);
+  o.emit.warn(`no git committer identity here \u2014 set a checkout-local one, Crew (${ship}), for the release commit`);
+}
+function isConflict(message, unmergedPaths) {
+  return unmergedPaths.length > 0 || /CONFLICT \(|Automatic merge failed|unmerged (files|paths)/i.test(message);
+}
 function mergeOne(o, c) {
   const subject = c.entries[0] ?? `${c.ticket.title ?? c.ticket.issue_id} (${c.ticket.issue_id})`;
   if (o.dryRun) {
@@ -18157,7 +18168,11 @@ function mergeOne(o, c) {
     return { applied: true };
   }
   const before = headSha(o.cwd);
+  const clearFailure = () => {
+    o.attention?.clear(`release_merge_failed:${o.scope ?? "release"}`);
+  };
   try {
+    ensureCommitterIdentity(o);
     git(o.cwd, ["merge", "--squash", c.branch]);
     if (!git(o.cwd, ["diff", "--cached", "--name-only"])) {
       git(o.cwd, ["reset", "--hard", before]);
@@ -18165,6 +18180,7 @@ function mergeOne(o, c) {
         `${c.branch} is already contained in the integration branch \u2014 nothing to apply`,
         { ticket: c.ticket.issue_id }
       );
+      clearFailure();
       return "noop";
     }
     const tip = gitOk(o.cwd, ["rev-parse", "--verify", "-q", `${c.branch}^{commit}`]);
@@ -18176,12 +18192,25 @@ ${BRANCH_TIP_TRAILER}: ${tip}` : "";
 Closes ${c.ticket.issue_id}.${trailer}`]);
     const sha = headSha(o.cwd);
     o.emit.emit(`merged ${c.branch}`, { ticket: c.ticket.issue_id });
+    clearFailure();
     return { applied: true, sha };
   } catch (e) {
     const paths = (gitOk(o.cwd, ["diff", "--name-only", "--diff-filter=U"]) ?? "").split("\n").filter(Boolean);
     gitOk(o.cwd, ["reset", "--hard", before]);
-    o.emit.error(`could not merge ${c.branch}: ${e.message}`, { ticket: c.ticket.issue_id });
-    return { conflict: { candidate: c, paths, message: e.message } };
+    const message = e.message;
+    o.emit.error(`could not merge ${c.branch}: ${message}`, { ticket: c.ticket.issue_id });
+    if (!isConflict(message, paths)) {
+      if (o.attention) {
+        void o.attention.raise({
+          kind: "release_merge_failed",
+          key: `release_merge_failed:${o.scope ?? "release"}`,
+          message: `${o.scope ?? "release"}: could not merge ${c.branch} (${c.ticket.issue_id}) \u2014 not a conflict, so the ticket stays verified and is retried: ${message.slice(0, 400)}`,
+          since: (/* @__PURE__ */ new Date()).toISOString()
+        });
+      }
+      return { error: message };
+    }
+    return { conflict: { candidate: c, paths, message } };
   }
 }
 async function bump(o, size) {
@@ -18576,7 +18605,7 @@ async function isolateAndRetry(o, name, output, merged, preMerge, decision, fres
     for (const c of applied) {
       gitOk(o.cwd, ["reset", "--hard", preMerge]);
       const m = mergeOne(o, c);
-      if (typeof m === "object" && "conflict" in m) continue;
+      if (mergeFailed(m)) continue;
       const r = await hook(o, name);
       if (r && r.code !== 0) {
         o.emit.warn(`${c.branch} fails the ${name} hook on its own`, { ticket: c.ticket.issue_id });
@@ -18588,8 +18617,8 @@ async function isolateAndRetry(o, name, output, merged, preMerge, decision, fres
       for (const [i, j] of pairs) {
         gitOk(o.cwd, ["reset", "--hard", preMerge]);
         const a = mergeOne(o, applied[i]);
-        const b = typeof a === "object" && "conflict" in a ? a : mergeOne(o, applied[j]);
-        if (typeof b === "object" && "conflict" in b) continue;
+        const b = mergeFailed(a) ? a : mergeOne(o, applied[j]);
+        if (mergeFailed(b)) continue;
         const r = await hook(o, name);
         if (r && r.code !== 0) {
           o.emit.warn(`${applied[j].branch} fails the ${name} hook together with ${applied[i].branch}`, { ticket: applied[j].ticket.issue_id });
@@ -18606,7 +18635,7 @@ async function isolateAndRetry(o, name, output, merged, preMerge, decision, fres
           let clean = true;
           for (const c of applied.slice(0, mid)) {
             const m = mergeOne(o, c);
-            if (typeof m === "object" && "conflict" in m) {
+            if (mergeFailed(m)) {
               clean = false;
               break;
             }
@@ -18677,6 +18706,7 @@ async function mergeAndRelease(o, decision, fresh, releaseBranch, isolated = fal
       conflicts.push(r.conflict);
       continue;
     }
+    if (typeof r === "object" && "error" in r) continue;
     if (typeof r === "object" && r.applied) {
       applied++;
       c.sha = r.sha;
@@ -25385,7 +25415,7 @@ if (command === "passenger-sync-daemon") {
     };
     if (command === "connect" && !flag("sign-out") && usesFlagAnswers(wizardFlags, connectIsTTY) && shouldRunWizard({ isTTY: true, crewHome: CREW_HOME })) {
       const flagged = flagWizardAnswers(wizardFlags, {
-        hostname: hostname4(),
+        hostname: hostname5(),
         platform: hostPlatform(),
         pathEnv: process.env.PATH ?? "",
         nodePath: process.execPath,
@@ -25410,7 +25440,7 @@ if (command === "passenger-sync-daemon") {
       let answers;
       try {
         answers = await runWizard(prompter, {
-          hostname: hostname4(),
+          hostname: hostname5(),
           platform: hostPlatform(),
           pathEnv: process.env.PATH ?? "",
           nodePath: process.execPath,
@@ -27967,7 +27997,7 @@ ${reconstruction.prompt}
         let result;
         try {
           result = await loginWithDeviceCode(`${baseUrl}/api`, {
-            deviceName: `crew on ${hostname4()}`,
+            deviceName: `crew on ${hostname5()}`,
             // Lets the approval page preselect the workspace this connect is for.
             // A bare `crew connect` has none and passes nothing.
             ...workspace ? { workspaceSlug: workspace } : {},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tablation/crew",
-  "version": "0.126.11",
+  "version": "0.126.12",
   "description": "A standing team of headless agents that picks work off a Tablation board, does it on a machine you control, and reports back.",
   "type": "module",
   "license": "MIT",