@tablation/crew 0.127.2 → 0.127.4

package/dist/cli.js

@@ -6215,7 +6215,8 @@ async function raiseShipAttention(o, item) {
   const previous = store.previous();
   const next = upsert(previous, item);
   store.persist(next);
-  if (transitions(previous, next).length === 0) return false;
+  const changed2 = item.kind === "sandbox_cache" && previous.some((i) => i.key === item.key && i.message !== item.message);
+  if (transitions(previous, next).length === 0 && !changed2) return false;
   announce(o.emit, item);
   if (o.route && o.ship) {
     await notify(o.route, o.ship, { level: "warn", headline: item.message }, o.emit);
@@ -12704,7 +12705,7 @@ var SandboxCache = class {
       try {
         await this.helper(this.s.helperImage, REFRESH_SCRIPT, [mirrorRelPath(r), forgeDescriptorFor(r.host).httpsUrl(r.host, r.path)], env);
       } catch (e) {
-        out.push({ repo: r, ok: false, detail: describe(e) });
+        out.push({ repo: r, ok: false, detail: r.token ? describe(e) : `no readable forge token for ${r.host} (see \`crew forge list\`); ${describe(e)}` });
         continue;
       }
       if (this.s.depsCommand && this.s.depsImage) {
@@ -12808,6 +12809,10 @@ function cacheSettingsOf(cfg) {
   };
 }
 var sandboxCacheKey = (volume, r) => `sandbox_cache:${volume}:${r.host}/${r.path}`;
+function unmirroredRepos(served, mirrors) {
+  const have = new Set(mirrors.map((m) => `${m.repo.host}/${m.repo.path}`));
+  return served.map((r) => `${r.host}/${r.path}`).filter((k, i, a) => !have.has(k) && a.indexOf(k) === i);
+}
 var CACHE_REFRESH_INTERVAL_MS = 6e4;
 function makeCachePass(o) {
   const now = o.now ?? Date.now;
@@ -12830,7 +12835,7 @@ function makeCachePass(o) {
     for (const out of all) {
       const key = sandboxCacheKey(o.volume, out.repo);
       if (out.ok) o.ok(key);
-      else await o.fail(key, `sandbox cache: ${out.repo.host}/${out.repo.path} did not refresh (${out.detail}); runs use the previous mirror. Resumes automatically when a later pass refreshes it`);
+      else await o.fail(key, `sandbox cache: ${out.repo.host}/${out.repo.path} did not refresh (${out.detail}); runs use the previous mirror. Resumes automatically when a later pass refreshes it`, new Date(now()).toISOString());
     }
     return all;
   };
@@ -13129,12 +13134,14 @@ function baseLayer() {
   ].join("\n");
   return { name: "base", tag: `crew-sandbox-base:${hash({ SANDBOX_BASE_IMAGE, SANDBOX_OPENSHELL_VERSION })}`, dockerfile, files: {} };
 }
+var APT_HTTPS_COMMAND = "sed -i -E 's#http://([a-z0-9.-]*\\.)?ubuntu\\.com#https://\\1ubuntu.com#g' /etc/apt/sources.list.d/ubuntu.sources 2>/dev/null || true";
 function crewLayer(base, intel, bridge) {
   const files = { "credential-helper": CREDENTIAL_HELPER, "mcp.json": MCP_CONFIG, ...bridge ? { "intel-bridge": bridge } : {} };
   const env = Object.entries(CREW_ENV).map(([k, v]) => `${k}=${v}`).join(" ");
   const dockerfile = [
     `FROM ${base.tag}`,
     "USER root",
+    run2(APT_HTTPS_COMMAND),
     run2(`apt-get update && apt-get install -y --no-install-recommends ca-certificates curl git${intel ? " python3 python3-venv nodejs" : ""} && rm -rf /var/lib/apt/lists/*`),
     `COPY credential-helper ${CREW_PREFIX}/bin/credential-helper`,
     `COPY mcp.json ${CREW_PREFIX}/mcp/mcp.json`,
@@ -13183,6 +13190,7 @@ function repoLayer(repo, decl, crew, warm) {
     lines2.push(`FROM ${crew.tag}`, "USER root");
   }
   if (decl.packages.length > 0) {
+    lines2.push(run2(APT_HTTPS_COMMAND));
     lines2.push(run2(`apt-get update && apt-get install -y --no-install-recommends ${decl.packages.join(" ")} && rm -rf /var/lib/apt/lists/*`));
   }
   lines2.push(
@@ -19336,6 +19344,7 @@ function runForge(a, io) {
     const tok = sourceFromArgs(a);
     if (typeof tok === "string") return fail2(tok);
     const doc = parseDocument4(io.readFile(io.configFile));
+    doc.setIn(["ship", "forges", host, "username"], forgeDescriptorFor(host).credentialUsername);
     doc.setIn(["ship", "forges", host, "token"], tok);
     io.writeFile(io.configFile, doc.toString());
     io.forges = { ...io.forges ?? {}, [host]: { username: forgeDescriptorFor(host).credentialUsername, token: tok } };
@@ -25540,7 +25549,7 @@ if (command === "passenger-sync-daemon") {
         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 });
+      out.push({ ...repo, dir: t.dir, token, username: forgeFor(ship.forges, repo.host)?.entry.username || forgeDescriptorFor(repo.host).credentialUsername, intelImage });
     }
     return out;
   }, buildSandboxCachePass = function(c, ship, state2, emit2) {
@@ -25551,7 +25560,7 @@ if (command === "passenger-sync-daemon") {
       volume: settings.volume,
       repos: () => sandboxCacheRepos(c, ship),
       lock: (dir) => acquireCheckoutLock(dir),
-      fail: (key, message) => raiseShipAttention({ state: state2, emit: emit2, route: c, ship }, { kind: "sandbox_cache", key, message, since: (/* @__PURE__ */ new Date()).toISOString() }).then(() => void 0),
+      fail: (key, message, failedAt) => raiseShipAttention({ state: state2, emit: emit2, route: c, ship }, { kind: "sandbox_cache", key, message, since: failedAt, lastFailedAt: failedAt }).then(() => void 0),
       ok: (key) => clearShipAttention(state2, key)
     });
     return async () => {
@@ -28963,8 +28972,13 @@ Signed in as ${result.identity.email} \u2014 minted an API key in workspace "${r
             }
             const dropped = flag("prune") ? await cache.prune(served) : [];
             const mirrors = await cache.list();
+            const open = openShipAttention(new State(cfg.ship.stateDir));
+            const failures = served.flatMap((r) => {
+              const item = open.find((i) => i.kind === "sandbox_cache" && i.key === sandboxCacheKey(settings.volume, r));
+              return item ? [{ repo: `${r.host}/${r.path}`, lastFailedAt: item.lastFailedAt ?? item.since, message: item.message }] : [];
+            });
             if (flag("json")) {
-              process.stdout.write(`${JSON.stringify({ volume: settings.volume, mirrors, dropped }, null, 2)}
+              process.stdout.write(`${JSON.stringify({ volume: settings.volume, mirrors, failures, dropped }, null, 2)}
 `);
             } else {
               for (const d of dropped) process.stdout.write(`dropped ${d.host}/${d.path}
@@ -28975,6 +28989,8 @@ Signed in as ${result.identity.email} \u2014 minted an API key in workspace "${r
                 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"})` : ""}
 `);
               }
+              for (const f of failures) process.stdout.write(`${f.repo}  REFRESH FAILING (last failed ${f.lastFailedAt}): ${f.message}
+`);
             }
           } catch (e) {
             process.stderr.write(`crew sandbox cache: ${e instanceof Error ? e.message : String(e)}
@@ -30524,6 +30540,14 @@ watermark:  ${state.watermark()}
           for (const message of managedRuntimeWarnings(shipKind, cfg.ship)) problems.push({ severity: "attention", kind: "managed_runtime_default", message });
           for (const message of managedGitIdentityWarnings(shipKind, readGlobalGitIdentity())) problems.push({ severity: "attention", kind: "managed_git_identity", message });
         }
+        const cacheSettings = cfg.ship.runner === "sandbox" ? cacheSettingsOf(cfg.ship.sandbox) : null;
+        if (cacheSettings && !flag("offline")) {
+          try {
+            const missing = unmirroredRepos(sandboxCacheRepos(route2, cfg.ship), await new SandboxCache(cacheSettings).list());
+            for (const r of missing) problems.push({ severity: "attention", kind: "sandbox_cache_unmirrored", route: route2.route, message: `${r} has no mirror in the cache volume ${cacheSettings.volume}, so sandboxed runs cannot clone it`, remedy: "see `crew sandbox cache` for the last refresh failure" });
+          } catch {
+          }
+        }
         for (const t of rejectedTunnels(cfg.ship.stateDir)) {
           problems.push({ severity: "attention", kind: TUNNEL_REJECTED_KEY, message: tunnelRejectedMessage(t.workspaceId, t.quickExits), remedy: "rotate the slug with `crew rotate-passenger-url`" });
         }

package/package.json

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