@rallycry/conveyor-agent 10.13.72 → 11.0.0

package/dist/cli.js

@@ -7,10 +7,11 @@ import {
   WorkspaceCommandSupervisor,
   startWorkspaceCommandsAfterConnect,
   stopWorkspaceCommands
-} from "./chunk-2L5THOWD.js";
+} from "./chunk-JQVAWRVL.js";
 import {
   DEFAULT_SONNET_MODEL,
   PtyHarness,
+  RUNNER_MODES,
   SessionRunner,
   buildProjectTools,
   buildRateLimitEvents,
@@ -18,6 +19,7 @@ import {
   buildUnmeasurableEvent,
   claudeJsonPath,
   isPermissionDeniedError,
+  parsePackExecution,
   parseUsageGauges,
   resolvePlaywrightMcpServer,
   resolveSessionStart,
@@ -25,7 +27,7 @@ import {
   resolveTuiKindFromEnv,
   runUsageProbe,
   sampleKeyUsage
-} from "./chunk-2SN32LM6.js";
+} from "./chunk-PEEGCZAR.js";
 import "./chunk-XORJ6SII.js";
 import {
   AgentConnection,
@@ -37,8 +39,8 @@ import {
   createServiceLogger,
   fetchBootstrap,
   loadConveyorConfig
-} from "./chunk-LSZ2KLJY.js";
-import "./chunk-WMMBAKPE.js";
+} from "./chunk-N4WSUTGV.js";
+import "./chunk-GL2DIQEQ.js";
 import "./chunk-IA45XHOA.js";
 import "./chunk-EXQ6AHOY.js";
 import "./chunk-KMB3BU4S.js";
@@ -57,22 +59,22 @@ import { fileURLToPath } from "url";
 
 // src/utils/session-identity.ts
 async function checkSessionTaskIdentity(params) {
-  const { sessionId, taskId, fetchSessionTaskId, logger: logger6 } = params;
+  const { sessionId, taskId, fetchSessionTaskId, logger: logger7 } = params;
   if (!sessionId || sessionId === taskId) return "skipped";
   let sessionTaskId;
   try {
     sessionTaskId = await fetchSessionTaskId(sessionId);
   } catch (err) {
-    const message = err instanceof Error ? err.message : String(err);
-    logger6.warn("Could not verify session/task identity \u2014 continuing (defense-in-depth only)", {
+    const message2 = err instanceof Error ? err.message : String(err);
+    logger7.warn("Could not verify session/task identity \u2014 continuing (defense-in-depth only)", {
       sessionId,
       taskId,
-      error: message
+      error: message2
     });
     return "error";
   }
   if (sessionTaskId !== taskId) {
-    logger6.warn(
+    logger7.warn(
       "!!! CONVEYOR_SESSION_ID is bound to a different task than CONVEYOR_TASK_ID \u2014 server-side guards should still block mutations, but this indicates a misconfiguration or replayed token.",
       { sessionId, envTaskId: taskId, sessionTaskId }
     );
@@ -188,10 +190,10 @@ var ProjectSessionRunner = class {
       await this.waitUntilStopped();
       this._finalState = "finished";
     } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      process.stderr.write(`[conveyor-agent] Project runner failed: ${message}
+      const message2 = error instanceof Error ? error.message : String(error);
+      process.stderr.write(`[conveyor-agent] Project runner failed: ${message2}
 `);
-      this.connection.sendEvent({ type: "error", message });
+      this.connection.sendEvent({ type: "error", message: message2 });
       this._finalState = "error";
     } finally {
       this.shutdown();
@@ -463,10 +465,10 @@ var AdhocSessionRunner = class {
       await this.runInteractiveTui();
       this._finalState = "finished";
     } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      process.stderr.write(`[conveyor-agent] Ad-hoc runner failed: ${message}
+      const message2 = error instanceof Error ? error.message : String(error);
+      process.stderr.write(`[conveyor-agent] Ad-hoc runner failed: ${message2}
 `);
-      this.connection.sendEvent({ type: "error", message });
+      this.connection.sendEvent({ type: "error", message: message2 });
       this._finalState = "error";
     } finally {
       await this.shutdown();
@@ -620,6 +622,10 @@ var ReviewChildSupervisor = class {
   spawnFn;
   child = null;
   childSessionId = null;
+  /** The review session this supervisor currently hosts, if any. */
+  get activeSessionId() {
+    return this.childSessionId;
+  }
   /** Spawn (or replace) the review child for a `session:spawnReview` push. */
   async spawn(data) {
     logger2.info("Spawning same-pod review child", {
@@ -653,10 +659,10 @@ var ReviewChildSupervisor = class {
     this.childSessionId = data.sessionId;
     const spawnedAt = Date.now();
     let reported = false;
-    const reportOnce = (message) => {
+    const reportOnce = (message2) => {
       if (reported) return;
       reported = true;
-      this.connection.reportReviewSpawnFailure(data.sessionId, message);
+      this.connection.reportReviewSpawnFailure(data.sessionId, message2);
     };
     child.stdout?.on("data", (chunk) => {
       process.stdout.write(`[review-child] ${chunk.toString()}`);
@@ -776,6 +782,10 @@ var SessionChildSupervisor = class {
   get size() {
     return this.children.size;
   }
+  /** Sessions this supervisor currently hosts. Drives the shutdown deferral. */
+  get activeSessionIds() {
+    return [...this.children.keys()];
+  }
   /** Spawn a TUI/shell child for a `session:spawnTui` push. Additive per session. */
   async spawn(data) {
     logger3.info("Spawning same-pod session child", {
@@ -806,10 +816,10 @@ var SessionChildSupervisor = class {
     this.children.set(data.sessionId, child);
     const spawnedAt = Date.now();
     let reported = false;
-    const reportOnce = (message) => {
+    const reportOnce = (message2) => {
       if (reported) return;
       reported = true;
-      this.connection.reportSessionSpawnFailure(data.sessionId, message);
+      this.connection.reportSessionSpawnFailure(data.sessionId, message2);
     };
     const prefix = `[${data.mode}-child]`;
     child.stdout?.on("data", (chunk) => {
@@ -936,10 +946,10 @@ var ShellSessionRunner = class {
       await this.runShell();
       this._finalState = "finished";
     } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      process.stderr.write(`[conveyor-agent] Shell runner failed: ${message}
+      const message2 = error instanceof Error ? error.message : String(error);
+      process.stderr.write(`[conveyor-agent] Shell runner failed: ${message2}
 `);
-      this.connection.sendEvent({ type: "error", message });
+      this.connection.sendEvent({ type: "error", message: message2 });
       this._finalState = "error";
     } finally {
       this.shutdown();
@@ -1033,14 +1043,158 @@ function createSpawnedChildRunner(inputs) {
   );
 }
 
+// src/runner/builder-child.ts
+import { spawn as nodeSpawn3 } from "child_process";
+var logger5 = createServiceLogger("BuilderChild");
+function buildBuilderChildEnv(baseEnv, data) {
+  const env = { ...baseEnv };
+  env.CONVEYOR_TASK_TOKEN = data.sessionJwt;
+  env.CONVEYOR_SESSION_ID = data.sessionId;
+  env.CONVEYOR_MODE = data.mode ?? "task";
+  env.CONVEYOR_WORKBENCH_TOKEN ??= baseEnv.POD_BOOTSTRAP_TOKEN;
+  delete env.POD_BOOTSTRAP_TOKEN;
+  delete env.CONVEYOR_BOOTSTRAP_TOKEN;
+  delete env.CONVEYOR_START_COMMAND;
+  delete env.CONVEYOR_GIT_READY;
+  delete env.CONVEYOR_GIT_READY_MARKER;
+  delete env.CONVEYOR_AGENT_MODE;
+  delete env.CONVEYOR_IS_AUTO;
+  return env;
+}
+var BuilderChildSupervisor = class {
+  constructor(connection, workspaceDir, spawnFn = nodeSpawn3) {
+    this.connection = connection;
+    this.workspaceDir = workspaceDir;
+    this.spawnFn = spawnFn;
+  }
+  connection;
+  workspaceDir;
+  spawnFn;
+  child = null;
+  childSessionId = null;
+  /** The build session this supervisor currently hosts, if any. */
+  get activeSessionId() {
+    return this.childSessionId;
+  }
+  /** Spawn (or replace) the builder child for a `session:spawnBuilder` push. */
+  async spawn(data) {
+    if (this.childSessionId === data.sessionId && this.child && this.child.exitCode === null) {
+      logger5.info("Builder child already running for this session; ignoring re-push", {
+        buildSessionId: data.sessionId
+      });
+      return;
+    }
+    logger5.info("Spawning same-pod builder child", {
+      buildSessionId: data.sessionId,
+      branch: data.branch ?? void 0,
+      agentName: data.agentName ?? void 0
+    });
+    await this.stopCurrent("superseded by new builder spawn");
+    const cliPath = process.argv[1];
+    if (!cliPath) {
+      this.connection.reportBuilderSpawnFailure(data.sessionId, "cannot resolve CLI entry path");
+      return;
+    }
+    let child;
+    try {
+      child = this.spawnFn(process.execPath, [cliPath], {
+        cwd: this.workspaceDir,
+        env: buildBuilderChildEnv(process.env, data),
+        stdio: ["ignore", "pipe", "pipe"]
+      });
+    } catch (err) {
+      this.connection.reportBuilderSpawnFailure(
+        data.sessionId,
+        err instanceof Error ? err.message : String(err)
+      );
+      return;
+    }
+    this.child = child;
+    this.childSessionId = data.sessionId;
+    this.watchForEarlyExit(child, data.sessionId);
+  }
+  /**
+   * A non-zero exit inside the grace window is a spawn failure, not a finished
+   * build — the child never got far enough to connect. Reporting it lets the
+   * server End the orphaned session and fall back to a cold boot instead of
+   * leaving the card parked with a Builder tab that never appears.
+   */
+  watchForEarlyExit(child, sessionId) {
+    const spawnedAt = Date.now();
+    child.on("exit", (code) => {
+      if (this.childSessionId === sessionId) {
+        this.child = null;
+        this.childSessionId = null;
+      }
+      const early = Date.now() - spawnedAt < SPAWN_FAILURE_GRACE_MS;
+      if (early && code !== 0) {
+        logger5.warn("Builder child exited inside the spawn grace window", { sessionId, code });
+        this.connection.reportBuilderSpawnFailure(sessionId, `child exited with code ${code}`);
+      }
+    });
+  }
+  /** SIGTERM the current child, escalating to SIGKILL after KILL_WAIT_MS. */
+  async stopCurrent(reason) {
+    const child = this.child;
+    if (!child || child.exitCode !== null) {
+      this.child = null;
+      this.childSessionId = null;
+      return;
+    }
+    logger5.info("Stopping builder child", { reason, buildSessionId: this.childSessionId });
+    child.kill("SIGTERM");
+    await new Promise((resolve) => {
+      const timer = setTimeout(() => {
+        if (child.exitCode === null) child.kill("SIGKILL");
+        resolve();
+      }, KILL_WAIT_MS);
+      child.once("exit", () => {
+        clearTimeout(timer);
+        resolve();
+      });
+    });
+    this.child = null;
+    this.childSessionId = null;
+  }
+};
+
 // src/runner/host-modes.ts
 function hostsSpawnedChildren(mode) {
-  return mode === "task" || mode === "pack";
+  return mode === "task" || mode === "plan" || mode === "pack";
+}
+
+// src/runner/wire-spawn-children.ts
+var message = (err) => err instanceof Error ? err.message : String(err);
+function wireSpawnChildren(mode, connection, supervisors, logger7) {
+  if (hostsSpawnedChildren(mode)) {
+    connection.onSpawnReview((data) => {
+      void supervisors.review.spawn(data).catch((err) => {
+        logger7.error("Review child spawn threw", { error: message(err) });
+        connection.reportReviewSpawnFailure(data.sessionId, message(err));
+      });
+    });
+  }
+  if (mode === "plan") {
+    connection.onSpawnBuilder((data) => {
+      void supervisors.builder.spawn(data).catch((err) => {
+        logger7.error("Builder child spawn threw", { error: message(err) });
+        connection.reportBuilderSpawnFailure(data.sessionId, message(err));
+      });
+    });
+  }
+  if (hostsSpawnedChildren(mode)) {
+    connection.onSpawnTui((data) => {
+      void supervisors.session.spawn(data).catch((err) => {
+        logger7.error("Session child spawn threw", { error: message(err) });
+        connection.reportSessionSpawnFailure(data.sessionId, message(err));
+      });
+    });
+  }
 }
 
 // src/cli.ts
 if (process.argv[2] === "boot") {
-  const { runBoot } = await import("./boot-ZNL7X5LQ.js");
+  const { runBoot } = await import("./boot-PKQ2I66D.js");
   process.exit(await runBoot(process.argv.slice(3)));
 }
 if (isLegacyEntrypointLaunch(process.env)) {
@@ -1055,7 +1209,7 @@ if (process.argv.includes("--version")) {
   process.stdout.write(pkg.version + "\n");
   process.exit(0);
 }
-var logger5 = createServiceLogger("CLI");
+var logger6 = createServiceLogger("CLI");
 var exitContext = {};
 var exitLogged = false;
 var shuttingDown = false;
@@ -1070,12 +1224,12 @@ function logAgentExit(reason, opts) {
     uptimeSec: process.uptime(),
     identity: exitContext
   });
-  logger5[exitLogLevel(reason)]("agent_exit", payload);
+  logger6[exitLogLevel(reason)]("agent_exit", payload);
 }
 async function bootstrapFromCodespace(apiUrl, instanceName) {
   const bootstrapToken = process.env.CONVEYOR_BOOTSTRAP_TOKEN;
   const apiUrlFromEnv = Boolean(process.env.CONVEYOR_API_URL);
-  logger5.info("Bootstrapping from codespace", {
+  logger6.info("Bootstrapping from codespace", {
     codespace: instanceName,
     apiUrl,
     apiUrlFromEnv,
@@ -1087,7 +1241,7 @@ async function bootstrapFromCodespace(apiUrl, instanceName) {
     bootstrapToken
   });
   if (!result.ok) {
-    logger5.error("Bootstrap failed after retries", {
+    logger6.error("Bootstrap failed after retries", {
       reason: result.reason,
       attempts: result.attempts,
       status: result.status,
@@ -1100,20 +1254,20 @@ async function bootstrapFromCodespace(apiUrl, instanceName) {
     process.exit(1);
   }
   applyBootstrapToEnv(result.config);
-  logger5.info("Bootstrap complete", {
+  logger6.info("Bootstrap complete", {
     taskId: result.config.taskId,
     attempts: result.attempts
   });
 }
 function isExpectedAbortError(error) {
-  const message = error.message || "";
-  const hasAbortMessage = /operation aborted/i.test(message) || /abort/i.test(message);
+  const message2 = error.message || "";
+  const hasAbortMessage = /operation aborted/i.test(message2) || /abort/i.test(message2);
   const hasAbortCode = !("code" in error) || error.code === void 0 || error.code === "ABORT_ERR";
   return hasAbortMessage && hasAbortCode;
 }
 function exitOnPermissionDenial(err) {
   if (!isPermissionDeniedError(err)) return false;
-  logger5.error("Not authorized for this project \u2014 parking instead of crash-looping", {
+  logger6.error("Not authorized for this project \u2014 parking instead of crash-looping", {
     error: err.message
   });
   logAgentExit("unauthorized", { exitCode: 0 });
@@ -1122,22 +1276,22 @@ function exitOnPermissionDenial(err) {
 process.on("uncaughtException", (err) => {
   if (err.code === "EPIPE") return;
   if (shuttingDown && isExpectedAbortError(err)) {
-    logger5.info("Ignored expected abort after shutdown", { error: err.message, code: err.code });
+    logger6.info("Ignored expected abort after shutdown", { error: err.message, code: err.code });
     return;
   }
   if (exitOnPermissionDenial(err)) return;
-  logger5.error("Uncaught exception", { error: err.message, code: err.code });
+  logger6.error("Uncaught exception", { error: err.message, code: err.code });
   logAgentExit("uncaught_exception", { exitCode: 1 });
   process.exit(1);
 });
 process.on("unhandledRejection", (reason) => {
   const err = reason instanceof Error ? reason : new Error(String(reason));
   if (shuttingDown && isExpectedAbortError(err)) {
-    logger5.info("Ignored expected abort rejection after shutdown", { error: err.message });
+    logger6.info("Ignored expected abort rejection after shutdown", { error: err.message });
     return;
   }
   if (exitOnPermissionDenial(err)) return;
-  logger5.error("Unhandled rejection", { error: err.message });
+  logger6.error("Unhandled rejection", { error: err.message });
   logAgentExit("unhandled_rejection", { exitCode: 1 });
   process.exit(1);
 });
@@ -1148,7 +1302,7 @@ if (process.env.CONVEYOR_MODE === "workbench") {
   const port = Number(process.env.CONVEYOR_WORKBENCH_PORT) || DEFAULT_WORKBENCH_PORT;
   const token = process.env.CONVEYOR_WORKBENCH_TOKEN ?? process.env.POD_BOOTSTRAP_TOKEN ?? "";
   if (!token) {
-    logger5.error("workbench mode requires POD_BOOTSTRAP_TOKEN (or CONVEYOR_WORKBENCH_TOKEN)");
+    logger6.error("workbench mode requires POD_BOOTSTRAP_TOKEN (or CONVEYOR_WORKBENCH_TOKEN)");
     process.exit(1);
   }
   const pkgDir = dirname(fileURLToPath(import.meta.url));
@@ -1158,12 +1312,12 @@ if (process.env.CONVEYOR_MODE === "workbench") {
     token,
     version: pkg.version ?? "unknown",
     oomWatchdog: oomWatchdogOptionsFromEnv({
-      info: (m) => logger5.info(m),
-      warn: (m) => logger5.warn(m),
-      error: (m) => logger5.error(m)
+      info: (m) => logger6.info(m),
+      warn: (m) => logger6.warn(m),
+      error: (m) => logger6.error(m)
     })
   });
-  logger5.info(`Workbench launcher listening on 127.0.0.1:${handle.port}`);
+  logger6.info(`Workbench launcher listening on 127.0.0.1:${handle.port}`);
   process.on("SIGTERM", () => process.exit(0));
   await new Promise(() => {
   });
@@ -1173,7 +1327,7 @@ var conveyorApiUrl = process.env.CONVEYOR_API_URL || DEFAULT_CONVEYOR_API_URL;
 var INSTANCE_NAME = process.env.CODESPACE_NAME || process.env.CLAUDESPACE_NAME;
 if (INSTANCE_NAME && !process.env.CONVEYOR_TASK_TOKEN) {
   if (!conveyorApiUrl) {
-    logger5.error("Could not resolve CONVEYOR_API_URL for codespace bootstrap");
+    logger6.error("Could not resolve CONVEYOR_API_URL for codespace bootstrap");
     process.exit(1);
   }
   await bootstrapFromCodespace(conveyorApiUrl, INSTANCE_NAME);
@@ -1191,7 +1345,7 @@ exitContext.runnerMode = CONVEYOR_MODE;
 exitContext.sessionId = process.env.CONVEYOR_SESSION_ID ?? CONVEYOR_TASK_ID;
 var projectIdentity = resolveProjectRunnerIdentity(process.env);
 if (!CONVEYOR_TASK_ID && projectIdentity && CONVEYOR_MODE === "adhoc") {
-  logger5.info("Starting ad-hoc agent", { projectId: projectIdentity.projectId });
+  logger6.info("Starting ad-hoc agent", { projectId: projectIdentity.projectId });
   const adhocRunner = new AdhocSessionRunner(
     {
       connection: {
@@ -1210,7 +1364,7 @@ if (!CONVEYOR_TASK_ID && projectIdentity && CONVEYOR_MODE === "adhoc") {
     },
     {
       onEvent: (event) => {
-        logger5.info("Ad-hoc runner event", { eventType: event.type });
+        logger6.info("Ad-hoc runner event", { eventType: event.type });
       }
     }
   );
@@ -1234,7 +1388,7 @@ if (!CONVEYOR_TASK_ID && projectIdentity && CONVEYOR_MODE === "adhoc") {
   process.exit(adhocError ? 1 : 0);
 }
 if (!CONVEYOR_TASK_ID && projectIdentity) {
-  logger5.info("Starting project agent", { projectId: projectIdentity.projectId });
+  logger6.info("Starting project agent", { projectId: projectIdentity.projectId });
   const projectRunner = new ProjectSessionRunner(
     {
       connection: {
@@ -1249,7 +1403,7 @@ if (!CONVEYOR_TASK_ID && projectIdentity) {
     },
     {
       onEvent: (event) => {
-        logger5.info("Project runner event", { eventType: event.type });
+        logger6.info("Project runner event", { eventType: event.type });
       }
     }
   );
@@ -1273,29 +1427,26 @@ if (!CONVEYOR_TASK_ID && projectIdentity) {
   process.exit(projectError ? 1 : 0);
 }
 if (!CONVEYOR_TASK_TOKEN || !CONVEYOR_TASK_ID) {
-  logger5.error("Missing required environment variables");
-  logger5.error("  CONVEYOR_TASK_TOKEN - JWT token for task authentication");
-  logger5.error("  CONVEYOR_TASK_ID - ID of the task to execute");
-  logger5.error("");
-  logger5.error("CONVEYOR_API_URL is provided via codespace secret or bootstrap.");
-  logger5.error("");
-  logger5.error("Optional:");
-  logger5.error("  CONVEYOR_MODE - Runner mode: 'task' (default), 'pack', or 'pm'");
-  logger5.error("  CONVEYOR_WORKSPACE - Working directory (defaults to cwd)");
-  logger5.error(
+  logger6.error("Missing required environment variables");
+  logger6.error("  CONVEYOR_TASK_TOKEN - JWT token for task authentication");
+  logger6.error("  CONVEYOR_TASK_ID - ID of the task to execute");
+  logger6.error("");
+  logger6.error("CONVEYOR_API_URL is provided via codespace secret or bootstrap.");
+  logger6.error("");
+  logger6.error("Optional:");
+  logger6.error("  CONVEYOR_MODE - Runner mode: 'task' (default), 'pack', or 'pm'");
+  logger6.error("  CONVEYOR_WORKSPACE - Working directory (defaults to cwd)");
+  logger6.error(
     "  Project pods instead require CONVEYOR_PROJECT_ID + CONVEYOR_SESSION_ID + CONVEYOR_MODE=pm"
   );
   process.exit(1);
 }
-if (CONVEYOR_MODE !== "task" && CONVEYOR_MODE !== "pm" && CONVEYOR_MODE !== "code-review" && CONVEYOR_MODE !== "adhoc" && CONVEYOR_MODE !== "pack" && CONVEYOR_MODE !== "shell" && CONVEYOR_MODE !== "serving") {
-  logger5.error("Invalid CONVEYOR_MODE", {
-    mode: CONVEYOR_MODE,
-    expected: ["task", "pm", "code-review", "adhoc", "pack", "shell", "serving"]
-  });
+if (!RUNNER_MODES.includes(CONVEYOR_MODE)) {
+  logger6.error("Invalid CONVEYOR_MODE", { mode: CONVEYOR_MODE, expected: RUNNER_MODES });
   process.exit(1);
 }
 if (CONVEYOR_MODE === "serving") {
-  const { runServingSession } = await import("./serve-boot-4N3FRXVQ.js");
+  const { runServingSession } = await import("./serve-boot-YPAUKENG.js");
   exitContext.runnerMode = "serving";
   exitContext.sessionId = process.env.CONVEYOR_SESSION_ID ?? exitContext.sessionId;
   const outcome = await runServingSession({
@@ -1315,7 +1466,7 @@ if (CONVEYOR_MODE === "serving") {
 if (CONVEYOR_MODE === "shell" || CONVEYOR_MODE === "adhoc") {
   const spawnedSessionId = process.env.CONVEYOR_SESSION_ID;
   if (!spawnedSessionId) {
-    logger5.error("Spawned child requires CONVEYOR_SESSION_ID", { mode: CONVEYOR_MODE });
+    logger6.error("Spawned child requires CONVEYOR_SESSION_ID", { mode: CONVEYOR_MODE });
     process.exit(1);
   }
   exitContext.sessionId = spawnedSessionId;
@@ -1328,7 +1479,7 @@ if (CONVEYOR_MODE === "shell" || CONVEYOR_MODE === "adhoc") {
     workspaceDir: CONVEYOR_WORKSPACE,
     projectId: process.env.CONVEYOR_PROJECT_ID ?? ""
   });
-  logger5.info("Starting spawned session child", {
+  logger6.info("Starting spawned session child", {
     mode: CONVEYOR_MODE,
     sessionId: spawnedSessionId
   });
@@ -1348,7 +1499,7 @@ if (CONVEYOR_MODE === "shell" || CONVEYOR_MODE === "adhoc") {
   });
   process.exit(childError ? 1 : 0);
 }
-logger5.info("Starting agent", { mode: CONVEYOR_MODE });
+logger6.info("Starting agent", { mode: CONVEYOR_MODE });
 var lifecycleOverrides = process.env.CLAUDESPACE_NAME ? { idleTimeoutMs: 60 * 60 * 1e3 } : { gitFlushIntervalMs: 0 };
 var runner = new SessionRunner(
   {
@@ -1361,6 +1512,10 @@ var runner = new SessionRunner(
       runnerMode: CONVEYOR_MODE
     },
     runnerMode: CONVEYOR_MODE,
+    // Only read when the mode is "pack". Parsed rather than cast so an unset or
+    // malformed value falls back to single-pod instead of selecting a third,
+    // non-existent behavior.
+    packExecution: parsePackExecution(process.env.CONVEYOR_PACK_EXECUTION),
     isAuto: CONVEYOR_IS_AUTO,
     workspaceDir: CONVEYOR_WORKSPACE,
     agentMode: CONVEYOR_AGENT_MODE,
@@ -1368,29 +1523,51 @@ var runner = new SessionRunner(
   },
   {
     onStatusChange: (status) => {
-      logger5.info("Status changed", { status });
+      logger6.info("Status changed", { status });
     },
     onEvent: (event) => {
       const detail = event.message ?? event.content ?? event.summary ?? "";
       if (detail) {
-        logger5.info(detail, { eventType: event.type });
+        logger6.info(detail, { eventType: event.type });
       }
     }
   }
 );
 var reviewChildren = new ReviewChildSupervisor(runner.connection, CONVEYOR_WORKSPACE);
 var sessionChildren = new SessionChildSupervisor(runner.connection, CONVEYOR_WORKSPACE);
+var builderChildren = new BuilderChildSupervisor(runner.connection, CONVEYOR_WORKSPACE);
+runner.setLiveChildSources([
+  {
+    kind: "builder",
+    activeSessionIds: () => {
+      const id = builderChildren.activeSessionId;
+      return id ? [id] : [];
+    }
+  },
+  {
+    kind: "review",
+    activeSessionIds: () => {
+      const id = reviewChildren.activeSessionId;
+      return id ? [id] : [];
+    }
+  },
+  { kind: "tui", activeSessionIds: () => sessionChildren.activeSessionIds }
+]);
 var shutdownSignal;
 var workspaceCommandSupervisor = null;
 var shutdownCompletion = null;
 var shutdownAgent = (signal) => {
   shuttingDown = true;
-  logger5.info(`Received ${signal}, flushing git and stopping agent`);
+  logger6.info(`Received ${signal}, flushing git and stopping agent`);
   const commandShutdown = stopWorkspaceCommands(workspaceCommandSupervisor);
   shutdownSignal = signal;
   shutdownCompletion ??= (async () => {
     try {
-      await Promise.all([reviewChildren.stopAll(), sessionChildren.stopAll()]);
+      await Promise.all([
+        reviewChildren.stopAll(),
+        sessionChildren.stopAll(),
+        builderChildren.stopCurrent("agent shutdown")
+      ]);
     } catch {
     }
     try {
@@ -1402,8 +1579,8 @@ var shutdownAgent = (signal) => {
   })();
   void shutdownCompletion;
   setTimeout(() => {
-    logger5.warn(`Forcing exit after ${signal} timeout`);
-    logger5.warn(
+    logger6.warn(`Forcing exit after ${signal} timeout`);
+    logger6.warn(
       "agent_exit",
       buildAgentExitLog({
         reason: "force_timeout",
@@ -1429,7 +1606,7 @@ workspaceCommandSupervisor = await startWorkspaceCommandsAfterConnect({
   })
 });
 if (!workspaceCommandSupervisor) {
-  logger5.info("Agent stopped before workspace commands were started");
+  logger6.info("Agent stopped before workspace commands were started");
   if (shutdownCompletion) await shutdownCompletion;
   logAgentExit(shutdownSignal ? "signal" : "clean", {
     exitCode: 0,
@@ -1449,34 +1626,14 @@ void checkSessionTaskIdentity({
     });
     return ctx.id;
   },
-  logger: logger5
+  logger: logger6
 });
-if (hostsSpawnedChildren(CONVEYOR_MODE)) {
-  runner.connection.onSpawnReview((data) => {
-    void reviewChildren.spawn(data).catch((err) => {
-      logger5.error("Review child spawn threw", {
-        error: err instanceof Error ? err.message : String(err)
-      });
-      runner.connection.reportReviewSpawnFailure(
-        data.sessionId,
-        err instanceof Error ? err.message : String(err)
-      );
-    });
-  });
-}
-if (hostsSpawnedChildren(CONVEYOR_MODE)) {
-  runner.connection.onSpawnTui((data) => {
-    void sessionChildren.spawn(data).catch((err) => {
-      logger5.error("Session child spawn threw", {
-        error: err instanceof Error ? err.message : String(err)
-      });
-      runner.connection.reportSessionSpawnFailure(
-        data.sessionId,
-        err instanceof Error ? err.message : String(err)
-      );
-    });
-  });
-}
+wireSpawnChildren(
+  CONVEYOR_MODE,
+  runner.connection,
+  { review: reviewChildren, builder: builderChildren, session: sessionChildren },
+  logger6
+);
 runner.run().then(async () => {
   await stopWorkspaceCommands(workspaceCommandSupervisor);
   const errored = runner.finalState === "error";
@@ -1490,7 +1647,7 @@ runner.run().then(async () => {
 }).catch(async (error) => {
   await stopWorkspaceCommands(workspaceCommandSupervisor);
   const msg = error instanceof Error ? error.message : String(error);
-  logger5.error("Agent runner failed", { error: msg });
+  logger6.error("Agent runner failed", { error: msg });
   logAgentExit("error", { exitCode: 1, finalState: runner.finalState ?? void 0 });
   process.exit(1);
 });