@tablation/crew 0.126.11 → 0.127.0

package/dist/cli.js

@@ -10821,7 +10821,8 @@ var SandboxRunner = class {
     }
     const create2 = ["sandbox", "create", "--name", name, "--detach"];
     if (policyFile) create2.push("--policy", policyFile);
-    if (cfg.image) create2.push("--from", cfg.image);
+    const image = cfg.image ?? plan.sandboxImage;
+    if (image) create2.push("--from", image);
     if (cfg.cacheVolume) {
       create2.push("--driver-config-json", JSON.stringify({
         docker: { mounts: [{ type: "volume", source: cfg.cacheVolume, target: cfg.mirrorDir, read_only: true }] }
@@ -11041,6 +11042,15 @@ function sandboxLspPluginFor(route2, repo) {
     return void 0;
   }
 }
+function sandboxImageOf(route2, repo, stateDir) {
+  let declares = false;
+  try {
+    const dir = reposOf(route2).find((r) => r.name === repo)?.dir ?? route2.dir;
+    declares = Boolean(loadRepoConfig(dir)?.sandbox);
+  } catch {
+  }
+  return sandboxImageForRun(readSandboxState(stateDir), repo, declares) ?? void 0;
+}
 var AgentSpawnError = class extends AgentError {
 };
 var WorkspaceAuthRefused = class extends AgentSpawnError {
@@ -11181,6 +11191,7 @@ function planAgentRun(o) {
   const code = codeBridgeFor(o, adapter.harness);
   const sandboxLsp = o.ship.runner === "sandbox" && adapter.harness === "claude" ? sandboxLspPluginFor(o.route, o.repo) : void 0;
   const sandboxOrigin = o.ship.runner === "sandbox" ? sandboxOriginFor(o.route, o.repo) : void 0;
+  const sandboxImage = o.ship.runner === "sandbox" ? sandboxImageOf(o.route, o.repo, o.stateDir) : void 0;
   const sandboxFiles = [...code?.files ?? [], ...sandboxLsp?.files ?? []];
   const invocation = adapter.invocation(toolchain, {
     code,
@@ -11234,6 +11245,7 @@ function planAgentRun(o) {
       runner: "sandbox",
       ...o.ship.sandbox ? { sandboxConfig: o.ship.sandbox } : {},
       ...sandboxOrigin ? { sandboxOrigin } : {},
+      ...sandboxImage ? { sandboxImage } : {},
       sandboxPolicy: sandboxPolicyInputFor(o.route, toolchain, { harnessBin: invocation.bin, repo: o.repo, sandbox: o.ship.sandbox }),
       ...sandboxFiles.length ? { sandboxFiles } : {}
     } : {},
@@ -13104,6 +13116,8 @@ function planSandbox(repo, decl, warm = {}, bridge) {
   const layer = repoLayer(repo, decl, crew, warm);
   return { repo, tag: layer.tag, claude: SANDBOX_CLAUDE_VERSION, layers: [base, crew, layer] };
 }
+var SHIP_SANDBOX_KEY = "@ship";
+var shipSandboxRef = () => ({ name: SHIP_SANDBOX_KEY, decl: { packages: [], setup: [] } });
 var sandboxStatePath = (stateDir) => join32(stateDir, "sandbox-images.json");
 function readSandboxState(stateDir) {
   try {
@@ -13123,6 +13137,9 @@ function writeSandboxState(stateDir, state) {
 function sandboxImageFor(state, repo) {
   return state[repo]?.tags[0]?.tag ?? null;
 }
+function sandboxImageForRun(state, repo, declares) {
+  return (declares && repo ? sandboxImageFor(state, repo) : null) ?? sandboxImageFor(state, SHIP_SANDBOX_KEY);
+}
 function sandboxImageStatus(state, plan) {
   const s = state[plan.repo];
   const current = s?.tags[0];
@@ -13595,7 +13612,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 +17480,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 +18167,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 +18185,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 +18197,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 +18209,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 +18622,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 +18634,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 +18652,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 +18723,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 +25432,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 +25457,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,
@@ -25894,6 +25941,7 @@ ${changed2.map((c) => `  - ${c}
     }
     return [...out.values()];
   }
+  const withShipSandbox = (declared) => cfg.ship.runner === "sandbox" ? [shipSandboxRef(), ...declared] : declared;
   async function resolveOneRepo(c, t) {
     {
       const id = repoIdForName(c, t.name);
@@ -27162,7 +27210,7 @@ ${cu.tail.trimEnd()}
         onPass: (result) => {
           if (!sandboxBuilding) {
             sandboxBuilding = true;
-            void sandboxReposOf(cfg.routes.filter((r) => r.enabled)).then((repos) => repos.length ? sandboxBuildTick(repos, sandboxTickDeps(emit, route2)) : null).catch((err3) => emit.warn(`sandbox image build tick failed: ${err3 instanceof Error ? err3.message : String(err3)}`)).finally(() => {
+            void sandboxReposOf(cfg.routes.filter((r) => r.enabled)).then(withShipSandbox).then((repos) => repos.length ? sandboxBuildTick(repos, sandboxTickDeps(emit, route2)) : null).catch((err3) => emit.warn(`sandbox image build tick failed: ${err3 instanceof Error ? err3.message : String(err3)}`)).finally(() => {
               sandboxBuilding = false;
             });
           }
@@ -27967,7 +28015,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 } : {},
@@ -28696,7 +28744,7 @@ Signed in as ${result.identity.email} \u2014 minted an API key in workspace "${r
             }
             throw e;
           }
-          const declared = await sandboxReposOf(routesS);
+          const declared = withShipSandbox(await sandboxReposOf(routesS));
           if (subS === "images") {
             const stateS = readSandboxState(cfg.ship.stateDir);
             const rows = declared.map((r) => {
@@ -28723,8 +28771,8 @@ Signed in as ${result.identity.email} \u2014 minted an API key in workspace "${r
           const only = positional[2];
           const targets = only ? declared.filter((r) => r.name === only) : declared;
           if (targets.length === 0) {
-            process.stderr.write(only ? `crew: no repository "${only}" declares a sandbox: section
-` : "crew: no repository declares a sandbox: section in its .crew.yaml\n");
+            process.stderr.write(only ? `crew: no repository "${only}" declares a sandbox: section (${SHIP_SANDBOX_KEY} is the ship's crew layer, built only on a ship.runner: sandbox ship)
+` : "crew: this ship is not a sandbox ship and no repository declares a sandbox: section in its .crew.yaml\n");
             process.exit(2);
           }
           const emitS = new Emitter({ route: routesS[0].route, eventFile: eventFileFor(cfg.ship.stateDir), rotateBytes: cfg.ship.eventsRotateBytes, logFile: cfg.ship.logFile, console: (l) => process.stderr.write(`${l}
@@ -30823,7 +30871,7 @@ ${foreign.join("\n")}
         }
       }
       {
-        const declaredS = await sandboxReposOf(cfg.routes.filter((r) => r.enabled));
+        const declaredS = withShipSandbox(await sandboxReposOf(cfg.routes.filter((r) => r.enabled)));
         const stateS = readSandboxState(cfg.ship.stateDir);
         for (const r of declaredS) {
           const st = sandboxImageStatus(stateS, planSandbox(r.name, r.decl, r.warm, r.bridge));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tablation/crew",
-  "version": "0.126.11",
+  "version": "0.127.0",
   "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",