@tablation/crew 0.126.12 → 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];
@@ -25924,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);
@@ -27192,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;
             });
           }
@@ -28726,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) => {
@@ -28753,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}
@@ -30853,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.12",
+  "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",