@tablation/crew 0.125.0 → 0.126.1

package/dist/cli.js

@@ -588,7 +588,7 @@ function startSerena(d, s) {
       const dest = join5(p.home, "language_servers");
       if (!d.exists(dest)) d.link(s.languageServers, dest);
     }
-    const mainCache = join5(p.mainProject, "cache");
+    const mainCache = s.seedCache ?? join5(p.mainProject, "cache");
     const cache = join5(p.project, "cache");
     if (!d.exists(cache) && d.exists(mainCache)) d.copyDir(mainCache, cache);
     try {
@@ -11001,10 +11001,14 @@ function codeBridgeFor(o, harness) {
   const number = /(\d+)$/.exec(o.ticket)?.[1];
   if (!number) return void 0;
   let intel;
+  let seed;
   try {
     const repos = reposOf(o.route);
     const target = repos.find((r) => r.name === o.repo) ?? (repos.length === 1 ? repos[0] : void 0);
     intel = target ? loadRepoConfig(target.dir)?.hooks?.intel : void 0;
+    const origin = target && o.ship.runner === "sandbox" && intelFlavor(intel) === "serena" ? originUrlOf(target.dir, "origin") : null;
+    const remote = origin ? parseRemote(origin) : null;
+    if (remote) seed = `${o.ship.sandbox?.mirrorDir ?? "/cache"}/${intelRelDir(remote)}/cache`;
   } catch {
   }
   if (!wantsCodeBridge(intel)) return void 0;
@@ -11020,7 +11024,8 @@ function codeBridgeFor(o, harness) {
     "--state-dir",
     dirname13(SANDBOX_INTEL_DIR),
     "--ticket",
-    number
+    number,
+    ...seed ? ["--seed-cache", seed] : []
   ] : [...process.execArgv, process.argv[1] ?? "crew", "intel", "bridge", o.route.route, number, "--state-dir", o.stateDir];
   const bridge = { command: sandbox ? "node" : process.execPath, args };
   if (harness === "gemini") {
@@ -12345,6 +12350,9 @@ function mirrorRelPath(r) {
 function depsRelDir(r) {
   return `cache/deps/${r.host}/${r.path}`;
 }
+function intelRelDir(r) {
+  return `intel/${r.host}/${r.path}`;
+}
 var q = (s) => `'${s.replace(/'/g, `'\\''`)}'`;
 function cloneScript(o) {
   const mirror = `${o.mirrorDir}/${mirrorRelPath(o.repo)}`;
@@ -12395,6 +12403,30 @@ find . -name node_modules -type d -prune | while read -r p; do
 done
 rm -rf "$droot/$h"; mv "$droot/$h.tmp" "$droot/$h"
 `;
+var INTEL_SCRIPT = `
+set -e
+m=${VOLUME_ROOT}/"$1"; iroot=${VOLUME_ROOT}/"$2"; config="$3"; ls="\${CREW_SERENA_LANGUAGE_SERVERS:-}"
+export GIT_TERMINAL_PROMPT=0
+git config --global --add safe.directory '*'
+tip=$(git -C "$m" rev-parse --verify --quiet "HEAD^{commit}") || { echo "the mirror has no default branch" >&2; exit 3; }
+[ "$(cat "$iroot/indexed-commit" 2>/dev/null)" = "$tip" ] && { echo "unchanged $tip"; exit 0; }
+w=$(mktemp -d); trap 'rm -rf "$w"' EXIT
+git clone --quiet --shared "$m" "$w/src"
+git -C "$w/src" checkout --quiet "$tip"
+mkdir -p "$w/home" "$w/project"
+printf '%s' "$config" | sed "s#@PROJECT@#$w/project#" > "$w/home/serena_config.yml"
+git -C "$w/src" show "$tip:.serena/project.yml" > "$w/project/project.yml" 2>/dev/null || : > "$w/project/project.yml"
+if grep -q '^read_only' "$w/project/project.yml"; then sed -i 's/^read_only.*/read_only: true/' "$w/project/project.yml"; else echo 'read_only: true' >> "$w/project/project.yml"; fi
+[ -n "$ls" ] && [ -d "$ls" ] && ln -s "$ls" "$w/home/language_servers"
+SERENA_HOME="$w/home" serena project index "$w/src"
+cd "$w/project"; mkdir -p cache
+mkdir -p "$(dirname "$iroot")"; rm -rf "$iroot.tmp"; mkdir -p "$iroot.tmp"
+cp -R -P cache "$iroot.tmp/"
+printf '%s
+' "$tip" > "$iroot.tmp/indexed-commit"
+rm -rf "$iroot"; mv "$iroot.tmp" "$iroot"
+echo "updated $tip"
+`;
 var MATERIALIZE_SCRIPT = `
 set -e
 export GIT_TERMINAL_PROMPT=0
@@ -12473,6 +12505,14 @@ var SandboxCache = class {
           continue;
         }
       }
+      if (r.intelImage) {
+        try {
+          await this.helper(r.intelImage, INTEL_SCRIPT, [mirrorRelPath(r), intelRelDir(r), serenaConfigYaml("@PROJECT@")]);
+        } catch (e) {
+          out.push({ repo: r, ok: false, detail: `intel index: ${describe(e)}` });
+          continue;
+        }
+      }
       out.push({ repo: r, ok: true });
     }
     return out;
@@ -12498,13 +12538,13 @@ var SandboxCache = class {
     } catch {
       return [];
     }
-    const script = `cd ${VOLUME_ROOT}/mirrors 2>/dev/null || exit 0; find . -name '*.git' -type d -prune | while read -r d; do printf '%s\\t%s\\n' "\${d#./}" "$(cat "$d/crew-last-refresh" 2>/dev/null)"; done`;
+    const script = `cd ${VOLUME_ROOT}/mirrors 2>/dev/null || exit 0; find . -name '*.git' -type d -prune | while read -r d; do r="\${d#./}"; i=${VOLUME_ROOT}/intel/"\${r%.git}"; printf '%s\\t%s\\t%s\\t%s\\n' "$r" "$(cat "$d/crew-last-refresh" 2>/dev/null)" "$(cat "$i/indexed-commit" 2>/dev/null)" "$(stat -c %y "$i/indexed-commit" 2>/dev/null | cut -c1-19)"; done`;
     const { stdout } = await this.helper(this.s.helperImage, script, []);
     const rows = [];
     for (const line of stdout.split("\n").filter(Boolean)) {
-      const [rel, when] = line.split("	");
+      const [rel, when, commit, indexedAt] = line.split("	");
       const m = /^([^/]+)\/(.+)\.git$/.exec(rel ?? "");
-      if (m) rows.push({ repo: { host: m[1], path: m[2] }, lastRefresh: when?.trim() || null });
+      if (m) rows.push({ repo: { host: m[1], path: m[2] }, lastRefresh: when?.trim() || null, ...commit?.trim() ? { intel: { commit: commit.trim(), indexedAt: indexedAt?.trim() || null } } : {} });
     }
     return rows;
   }
@@ -12513,7 +12553,7 @@ var SandboxCache = class {
     const have = new Set(keep.map((r) => `${r.host}/${r.path}`));
     const drop = (await this.list()).map((m) => m.repo).filter((r) => !have.has(`${r.host}/${r.path}`));
     for (const r of drop) {
-      await this.helper(this.s.helperImage, `rm -rf ${VOLUME_ROOT}/${q(mirrorRelPath(r))} ${VOLUME_ROOT}/${q(depsRelDir(r))}`, []);
+      await this.helper(this.s.helperImage, `rm -rf ${VOLUME_ROOT}/${q(mirrorRelPath(r))} ${VOLUME_ROOT}/${q(depsRelDir(r))} ${VOLUME_ROOT}/${q(intelRelDir(r))}`, []);
     }
     return drop;
   }
@@ -12955,6 +12995,9 @@ function writeSandboxState(stateDir, state) {
 `);
   renameSync3(`${file}.tmp`, file);
 }
+function sandboxImageFor(state, repo) {
+  return state[repo]?.tags[0]?.tag ?? null;
+}
 function sandboxImageStatus(state, plan) {
   const s = state[plan.repo];
   const current = s?.tags[0];
@@ -18450,6 +18493,20 @@ async function mergeAndRelease(o, decision, fresh, releaseBranch, isolated = fal
     }
     merged.push(c);
   }
+  if (applied > 0 && !o.dryRun && !o.mergeOnly && o.reloadRepo) {
+    const changed2 = gitOk(o.cwd, ["diff", "--name-only", preMerge, "HEAD", "--", ...REPO_CONFIG_FILENAMES]);
+    if (changed2) {
+      try {
+        const next = o.reloadRepo(o.cwd);
+        if (next) {
+          o = { ...o, repo: next };
+          o.emit.emit(`${changed2.split("\n")[0]} changed in this release \u2014 continuing under the merged contract`);
+        }
+      } catch (e) {
+        o.emit.warn(`could not re-read the merged repo config: ${e.message}; releasing under the earlier one`);
+      }
+    }
+  }
   if (o.mergeOnly) {
     o.emit.emit(`merge only: ${merged.length} branch(es) merged, not releasing`);
     return { merged, conflicts, unbuildable, deployed: false, stopped: "merge only", decision };
@@ -18474,7 +18531,8 @@ async function mergeAndRelease(o, decision, fresh, releaseBranch, isolated = fal
     o.emit.emit("nothing to release");
     return { merged, conflicts, unbuildable, deployed: false, stopped: "nothing to release", decision };
   }
-  if (merged.length === 0 && decision.unseeded && !o.force) {
+  const waiting = decision.merges.some((c) => c.skipReason === "already-merged" && c.mergedSha);
+  if (merged.length === 0 && decision.unseeded && !waiting && !o.force) {
     o.emit.emit(
       `nothing merged, and ${o.repo.branch.base} carries no release tag to compare against \u2014 nothing to release`
     );
@@ -25018,6 +25076,7 @@ if (command === "passenger-sync-daemon") {
     return { action: out.action, unsafe, detail: unsafe ? describeUnsafeBase(out, remote, base) : out.detail };
   }, sandboxCacheRepos = function(c, ship) {
     const out = [];
+    let images;
     for (const t of reposOf(c)) {
       const origin = originUrlOf(t.dir, "origin");
       const repo = origin ? parseRemote(origin) : null;
@@ -25027,7 +25086,12 @@ if (command === "passenger-sync-daemon") {
         token = readForgeToken(ship.forges, repo.host, ship.stateDir);
       } catch {
       }
-      out.push({ ...repo, dir: t.dir, token, username: forgeFor(ship.forges, repo.host)?.entry.username });
+      let intelImage = null;
+      try {
+        if (intelFlavor(loadRepoConfig(t.dir)?.hooks.intel) === "serena") intelImage = sandboxImageFor(images ??= readSandboxState(ship.stateDir), t.name);
+      } catch {
+      }
+      out.push({ ...repo, dir: t.dir, token, username: forgeFor(ship.forges, repo.host)?.entry.username, intelImage });
     }
     return out;
   }, buildSandboxCachePass = function(c, ship, state2, emit2) {
@@ -25779,6 +25843,13 @@ ${changed2.map((c) => `  - ${c}
       const outcome = await runRelease({
         cwd: target.dir,
         repo,
+        reloadRepo: (dir) => resolveRepoConfig(loadRepoConfig(dir), {
+          hooks: { ...c.hooks, ...o?.hooks },
+          labels: { ...c.labels, ...o?.labels },
+          release: mergeRouteRelease(c.release, o?.release),
+          branch: { ...c.branch, ...o?.branch },
+          worktrees: { prefix: shipWorktreePrefixFor(c), nameOverride: o?.worktreeName }
+        }, dir),
         contract: tracker.contract,
         tickets,
         blockerInfo,
@@ -25823,7 +25894,12 @@ ${changed2.map((c) => `  - ${c}
           tracker.contract,
           outcome.stampFrom ?? outcome.decision.lastReleased,
           outcome.decision.head,
-          new Map(outcome.merged.map((m) => [m.ticket.issue_id, m.sha]))
+          new Map([
+            // Squashed onto an untagged base by an earlier cycle: no release range
+            // names it, so the first release carries it out here (CREW-2925).
+            ...outcome.decision.merges.filter((m) => m.skipReason === "already-merged" && m.mergedSha).map((m) => [m.ticket.issue_id, m.mergedSha]),
+            ...outcome.merged.map((m) => [m.ticket.issue_id, m.sha])
+          ])
         );
         if (plan.length) await applyStamp(tracker, plan, outcome.version, tracker.contract, remit, dryRun, target.dir);
       } else if (outcome.stopped) {
@@ -28368,8 +28444,10 @@ Signed in as ${result.identity.email} \u2014 minted an API key in workspace "${r
 `);
               if (mirrors.length === 0) process.stdout.write(`volume ${settings.volume}: no mirrors yet
 `);
-              for (const m of mirrors) process.stdout.write(`${m.repo.host}/${m.repo.path}  last refresh ${m.lastRefresh ?? "never"}
+              for (const m of mirrors) {
+                process.stdout.write(`${m.repo.host}/${m.repo.path}  last refresh ${m.lastRefresh ?? "never"}${m.intel ? `  intel ${m.intel.commit.slice(0, 12)} (${m.intel.indexedAt ?? "age unknown"})` : ""}
 `);
+              }
             }
           } catch (e) {
             process.stderr.write(`crew sandbox cache: ${e instanceof Error ? e.message : String(e)}

package/dist/sandbox-intel-bridge.cjs

@@ -24529,7 +24529,7 @@ function startSerena(d, s) {
       const dest = (0, import_node_path4.join)(p.home, "language_servers");
       if (!d.exists(dest)) d.link(s.languageServers, dest);
     }
-    const mainCache = (0, import_node_path4.join)(p.mainProject, "cache");
+    const mainCache = s.seedCache ?? (0, import_node_path4.join)(p.mainProject, "cache");
     const cache = (0, import_node_path4.join)(p.project, "cache");
     if (!d.exists(cache) && d.exists(mainCache)) d.copyDir(mainCache, cache);
     try {
@@ -25113,12 +25113,13 @@ function parseSandboxBridgeArgs(argv) {
   const attachFile = get("--attach-file");
   const start = get("--start");
   const clone2 = get("--clone");
-  if (!attachFile || !start || !clone2) throw new Error("usage: intel-bridge --attach-file FILE --start FLAVOR|COMMAND --clone DIR [--state-dir DIR] [--ticket N] [--startup-seconds S]");
+  if (!attachFile || !start || !clone2) throw new Error("usage: intel-bridge --attach-file FILE --start FLAVOR|COMMAND --clone DIR [--state-dir DIR] [--seed-cache DIR] [--ticket N] [--startup-seconds S]");
   return {
     attachFile,
     start,
     clone: clone2,
     stateDir: get("--state-dir") ?? "/sandbox/.crew",
+    ...get("--seed-cache") ? { seedCache: get("--seed-cache") } : {},
     ticket: Number(get("--ticket")) || 0,
     startupSeconds: Number(get("--startup-seconds")) || 90
   };
@@ -25151,6 +25152,7 @@ function sandboxStarter(a, run = runScript) {
             worktree: a.clone,
             mainCheckout: a.clone,
             noMainIndex: true,
+            seedCache: a.seedCache,
             languageServers: process.env.CREW_SERENA_LANGUAGE_SERVERS
           });
         }

package/package.json

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