@rallycry/conveyor-agent 10.13.50 → 10.13.52

package/dist/cli.js

@@ -5,7 +5,6 @@ import {
 } from "./chunk-6GS5ADIY.js";
 import {
   AgentConnection,
-  ClaudeTuiAdapter,
   CodespacePortVisibility,
   DEFAULT_LIFECYCLE_CONFIG,
   DEFAULT_SONNET_MODEL,
@@ -13,28 +12,26 @@ import {
   PortDiscovery,
   PtyHarness,
   SessionRunner,
-  TUI_KINDS,
-  TuiUnavailableError,
   applyBootstrapToEnv,
   awaitGitReady,
   buildProjectTools,
   buildSessionPreviewPorts,
   buildSynthesizedCredentials,
   claudeJsonPath,
-  cleanTerminalOutput,
   createServiceLogger,
   fetchBootstrap,
-  findOnPath,
   isPermissionDeniedError,
   loadConveyorConfig,
   loadForwardPorts,
   parseUsageGauges,
   resolvePlaywrightMcpServer,
   resolveSessionStart,
+  resolveTuiAdapter,
+  resolveTuiKindFromEnv,
   runUsageProbe,
   sampleKeyUsage,
   workspacePathExists
-} from "./chunk-36VMMHYD.js";
+} from "./chunk-ZTLGCN5G.js";
 import {
   reportBootMilestone
 } from "./chunk-KCB7CSWJ.js";
@@ -46,19 +43,18 @@ import {
   workbenchEnabled
 } from "./chunk-4VUQ2NPF.js";
 import {
-  buildPromptBytes,
   inheritedEnv,
   resolvePtySpawn,
   runSetupCommand,
   runStartCommand,
   sessionTempBase,
   terminateProcessGroup
-} from "./chunk-XR6H326I.js";
+} from "./chunk-UAGIXPYD.js";
 import "./chunk-JIGG755T.js";
 
 // src/cli.ts
 import { readFileSync } from "fs";
-import { join as join4, dirname as dirname3 } from "path";
+import { join as join3, dirname as dirname2 } from "path";
 import { fileURLToPath } from "url";
 
 // src/setup/sidecars.ts
@@ -567,14 +563,14 @@ var WorkspaceCommandSupervisor = class {
 
 // src/utils/session-identity.ts
 async function checkSessionTaskIdentity(params) {
-  const { sessionId, taskId, fetchSessionTaskId, logger: logger7 } = params;
+  const { sessionId, taskId, fetchSessionTaskId, logger: logger6 } = 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);
-    logger7.warn("Could not verify session/task identity \u2014 continuing (defense-in-depth only)", {
+    logger6.warn("Could not verify session/task identity \u2014 continuing (defense-in-depth only)", {
       sessionId,
       taskId,
       error: message
@@ -582,7 +578,7 @@ async function checkSessionTaskIdentity(params) {
     return "error";
   }
   if (sessionTaskId !== taskId) {
-    logger7.warn(
+    logger6.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 }
     );
@@ -834,167 +830,6 @@ async function probeKeysUsage(keys, deps = {}) {
   return results;
 }
 
-// src/harness/pty/adapters/opencode-auth.ts
-import { promises as fs } from "fs";
-import { dirname as dirname2, join as join3 } from "path";
-import { homedir } from "os";
-var logger2 = createServiceLogger("opencode-auth");
-var OPENCODE_CODEX_PLUGIN = "opencode-openai-codex-auth@4.4.0";
-var PLUGIN_PACKAGE = "opencode-openai-codex-auth";
-function opencodeAuthPath(env) {
-  const dataHome = env.XDG_DATA_HOME ?? join3(env.HOME ?? homedir(), ".local", "share");
-  return join3(dataHome, "opencode", "auth.json");
-}
-function opencodeConfigPath(env) {
-  const configHome = env.XDG_CONFIG_HOME ?? join3(env.HOME ?? homedir(), ".config");
-  return join3(configHome, "opencode", "opencode.json");
-}
-function parseOauthSeed(b64) {
-  if (!b64) return null;
-  try {
-    const parsed = JSON.parse(Buffer.from(b64, "base64").toString("utf8"));
-    if (typeof parsed.access === "string" && typeof parsed.refresh === "string" && typeof parsed.expires === "number") {
-      return { access: parsed.access, refresh: parsed.refresh, expires: parsed.expires };
-    }
-    return null;
-  } catch {
-    return null;
-  }
-}
-function shouldSeed(existingEntry, seed) {
-  if (!existingEntry || typeof existingEntry !== "object") return true;
-  const entry = existingEntry;
-  if (entry.type !== "oauth") return true;
-  if (typeof entry.access !== "string" || typeof entry.refresh !== "string") return true;
-  if (typeof entry.expires !== "number") return true;
-  return entry.expires < seed.expires;
-}
-async function readJsonFile(path) {
-  try {
-    return JSON.parse(await fs.readFile(path, "utf8"));
-  } catch {
-    return {};
-  }
-}
-async function writeJsonFile(path, value) {
-  await fs.mkdir(dirname2(path), { recursive: true });
-  await fs.writeFile(path, `${JSON.stringify(value, null, 2)}
-`, { mode: 384 });
-}
-async function ensureAuthEntry(env, seed) {
-  const path = opencodeAuthPath(env);
-  const store = await readJsonFile(path);
-  if (!shouldSeed(store.openai, seed)) {
-    logger2.info("opencode oauth store is fresher than the seed; leaving it alone");
-    return;
-  }
-  store.openai = {
-    type: "oauth",
-    access: seed.access,
-    refresh: seed.refresh,
-    expires: seed.expires
-  };
-  await writeJsonFile(path, store);
-  logger2.info("seeded opencode oauth store entry");
-}
-async function ensurePluginConfig(env) {
-  const path = opencodeConfigPath(env);
-  const config = await readJsonFile(path);
-  const plugins = Array.isArray(config.plugin) ? config.plugin : [];
-  const isOurs = (p) => typeof p === "string" && (p === PLUGIN_PACKAGE || p.startsWith(`${PLUGIN_PACKAGE}@`));
-  const hasExactPin = plugins.includes(OPENCODE_CODEX_PLUGIN);
-  const hasStalePin = plugins.some((p) => isOurs(p) && p !== OPENCODE_CODEX_PLUGIN);
-  if (hasExactPin && !hasStalePin) return;
-  const kept = plugins.filter((p) => !isOurs(p));
-  config.plugin = [...kept, OPENCODE_CODEX_PLUGIN];
-  await writeJsonFile(path, config);
-  logger2.info("ensured opencode codex-auth plugin in config");
-}
-async function seedOpenCodeOauth(env) {
-  const seed = parseOauthSeed(env.CONVEYOR_OPENCODE_OAUTH);
-  if (!seed) return;
-  try {
-    await ensureAuthEntry(env, seed);
-    await ensurePluginConfig(env);
-  } catch (err) {
-    logger2.warn(
-      `failed to seed opencode oauth store: ${err instanceof Error ? err.message : String(err)}`
-    );
-  }
-}
-
-// src/harness/pty/adapters/opencode.ts
-var PROVIDER_KEY_ENV = {
-  openai: "OPENAI_API_KEY",
-  anthropic: "ANTHROPIC_API_KEY"
-};
-var OpenCodeTuiAdapter = class {
-  constructor(env = process.env) {
-    this.env = env;
-  }
-  env;
-  id = "opencode";
-  capabilities = {
-    resume: false,
-    structuredEvents: false,
-    prefill: false,
-    passiveTurns: false
-  };
-  resolveBinary(env = this.env) {
-    const override = env.CONVEYOR_OPENCODE_BIN;
-    const found = override ? findOnPath(override, env) : findOnPath("opencode", env);
-    if (!found) {
-      throw new TuiUnavailableError(
-        "opencode",
-        "The opencode CLI is not available in this environment. It must be baked into the pod image (see Dockerfile.base) \u2014 re-run Build Image for this project, or set CONVEYOR_OPENCODE_BIN to its absolute path."
-      );
-    }
-    return found;
-  }
-  buildSpawn(input) {
-    const env = { ...inheritedEnv() };
-    delete env.CONVEYOR_AGENT_KEY;
-    delete env.CONVEYOR_OPENCODE_OAUTH;
-    const oauthActive = Boolean(this.env.CONVEYOR_OPENCODE_OAUTH);
-    const key = this.env.CONVEYOR_AGENT_KEY;
-    const provider = this.env.CONVEYOR_AGENT_PROVIDER ?? "openai";
-    const keyEnvVar = PROVIDER_KEY_ENV[provider];
-    if (key && keyEnvVar && !oauthActive) env[keyEnvVar] = key;
-    const model = this.env.CONVEYOR_AGENT_MODEL ?? input.options.model;
-    const args = [];
-    if (model) args.push("--model", model.includes("/") ? model : `${provider}/${model}`);
-    return { file: this.resolveBinary(), args, env };
-  }
-  async prepareEnvironment() {
-    await seedOpenCodeOauth(this.env);
-  }
-  spawnFingerprint(input) {
-    return JSON.stringify(["opencode", input.model, input.cwd]);
-  }
-  encodePromptBytes(text) {
-    return buildPromptBytes(text);
-  }
-  buildExitErrors(exitCode, rawOutput) {
-    const errors = [`opencode exited (code ${exitCode}) without a result`];
-    const tail = cleanTerminalOutput(rawOutput);
-    if (tail) errors.push(`Last terminal output before exit:
-${tail}`);
-    return errors;
-  }
-};
-
-// src/harness/pty/adapters/index.ts
-function resolveTuiAdapter(kind = "claude-code") {
-  switch (kind) {
-    case "claude-code":
-      return new ClaudeTuiAdapter();
-    case "opencode":
-      return new OpenCodeTuiAdapter();
-    default:
-      throw new Error(`Unknown TUI kind: ${kind}`);
-  }
-}
-
 // src/runner/adhoc-session-runner.ts
 var ADHOC_SYSTEM_NOTE = "You are running in an ad-hoc Conveyor scratch pod \u2014 an interactive terminal on the project's repository checked out at its default branch. There is no task or plan; help the human with whatever they ask directly.";
 var HEADLESS_SYSTEM_NOTE = "You are running a HEADLESS Conveyor session on the project's repository \u2014 your instructions were auto-submitted as the first message. Work them to completion autonomously and never wait for user input; a human may attach to this terminal to watch or interject, but none is required.";
@@ -1008,11 +843,7 @@ function resolveInitialPrompt(env = process.env) {
     return null;
   }
 }
-function resolveAdhocTui(env) {
-  const raw = env.CONVEYOR_TUI ?? "claude-code";
-  if (TUI_KINDS.includes(raw)) return raw;
-  throw new Error(`Unknown TUI "${raw}" in CONVEYOR_TUI (expected: ${TUI_KINDS.join(", ")})`);
-}
+var resolveAdhocTui = resolveTuiKindFromEnv;
 function buildAdhocPtyBridge(connection, onInputActivity) {
   return {
     sendOutput: (data, dims) => connection.sendPtyOutput(data, dims),
@@ -1277,7 +1108,7 @@ var AdhocSessionRunner = class {
 import { spawn as nodeSpawn, execFile } from "child_process";
 import { promisify } from "util";
 var execFileAsync = promisify(execFile);
-var logger3 = createServiceLogger("ReviewChild");
+var logger2 = createServiceLogger("ReviewChild");
 var SPAWN_FAILURE_GRACE_MS = 15e3;
 var KILL_WAIT_MS = 5e3;
 function buildReviewChildEnv(baseEnv, data) {
@@ -1293,6 +1124,7 @@ function buildReviewChildEnv(baseEnv, data) {
   delete env.CONVEYOR_GIT_READY_MARKER;
   delete env.CONVEYOR_AGENT_MODE;
   delete env.CONVEYOR_IS_AUTO;
+  delete env.CONVEYOR_TUI;
   return env;
 }
 var ReviewChildSupervisor = class {
@@ -1308,7 +1140,7 @@ var ReviewChildSupervisor = class {
   childSessionId = null;
   /** Spawn (or replace) the review child for a `session:spawnReview` push. */
   async spawn(data) {
-    logger3.info("Spawning same-pod review child", {
+    logger2.info("Spawning same-pod review child", {
       reviewSessionId: data.sessionId,
       branch: data.branch ?? void 0,
       prNumber: data.prNumber ?? void 0
@@ -1351,7 +1183,7 @@ var ReviewChildSupervisor = class {
       process.stderr.write(`[review-child] ${chunk.toString()}`);
     });
     child.on("error", (err) => {
-      logger3.error("Review child spawn error", { error: err.message });
+      logger2.error("Review child spawn error", { error: err.message });
       if (this.child === child) {
         this.child = null;
         this.childSessionId = null;
@@ -1364,7 +1196,7 @@ var ReviewChildSupervisor = class {
         this.child = null;
         this.childSessionId = null;
       }
-      logger3.info("Review child exited", { code, signal, reviewSessionId: data.sessionId });
+      logger2.info("Review child exited", { code, signal, reviewSessionId: data.sessionId });
       const withinGrace = Date.now() - spawnedAt < SPAWN_FAILURE_GRACE_MS;
       if (wasCurrent && withinGrace && code !== null && code !== 0) {
         reportOnce(`review child exited with code ${code} within startup grace`);
@@ -1382,7 +1214,7 @@ var ReviewChildSupervisor = class {
       this.childSessionId = null;
       return;
     }
-    logger3.info("Stopping review child", { reason, reviewSessionId: this.childSessionId });
+    logger2.info("Stopping review child", { reason, reviewSessionId: this.childSessionId });
     this.child = null;
     this.childSessionId = null;
     await new Promise((resolve) => {
@@ -1424,7 +1256,7 @@ var ReviewChildSupervisor = class {
         timeout: 3e4
       });
     } catch (err) {
-      logger3.warn("Review checkout freshen skipped", {
+      logger2.warn("Review checkout freshen skipped", {
         branch,
         error: err instanceof Error ? err.message : String(err)
       });
@@ -1434,7 +1266,7 @@ var ReviewChildSupervisor = class {
 
 // src/runner/session-child.ts
 import { spawn as nodeSpawn2 } from "child_process";
-var logger4 = createServiceLogger("SessionChild");
+var logger3 = createServiceLogger("SessionChild");
 function buildSpawnedChildEnv(baseEnv, data) {
   const env = { ...baseEnv };
   env.CONVEYOR_TASK_TOKEN = data.sessionJwt;
@@ -1464,7 +1296,7 @@ var SessionChildSupervisor = class {
   }
   /** Spawn a TUI/shell child for a `session:spawnTui` push. Additive per session. */
   async spawn(data) {
-    logger4.info("Spawning same-pod session child", {
+    logger3.info("Spawning same-pod session child", {
       spawnedSessionId: data.sessionId,
       mode: data.mode
     });
@@ -1505,7 +1337,7 @@ var SessionChildSupervisor = class {
       process.stderr.write(`${prefix} ${chunk.toString()}`);
     });
     child.on("error", (err) => {
-      logger4.error("Session child spawn error", { error: err.message });
+      logger3.error("Session child spawn error", { error: err.message });
       if (this.children.get(data.sessionId) === child) {
         this.children.delete(data.sessionId);
       }
@@ -1514,7 +1346,7 @@ var SessionChildSupervisor = class {
     child.on("exit", (code, signal) => {
       const wasCurrent = this.children.get(data.sessionId) === child;
       if (wasCurrent) this.children.delete(data.sessionId);
-      logger4.info("Session child exited", {
+      logger3.info("Session child exited", {
         code,
         signal,
         spawnedSessionId: data.sessionId,
@@ -1535,7 +1367,7 @@ var SessionChildSupervisor = class {
     const child = this.children.get(sessionId);
     this.children.delete(sessionId);
     if (!child || child.exitCode !== null || child.killed) return;
-    logger4.info("Stopping session child", { reason, spawnedSessionId: sessionId });
+    logger3.info("Stopping session child", { reason, spawnedSessionId: sessionId });
     await new Promise((resolve) => {
       const timer = setTimeout(() => {
         try {
@@ -1683,7 +1515,7 @@ var ShellSessionRunner = class {
 };
 
 // src/runner/spawned-child-boot.ts
-var logger5 = createServiceLogger("SpawnedChildBoot");
+var logger4 = createServiceLogger("SpawnedChildBoot");
 function createSpawnedChildRunner(inputs) {
   if (inputs.mode === "shell") {
     return new ShellSessionRunner({
@@ -1713,7 +1545,7 @@ function createSpawnedChildRunner(inputs) {
     },
     {
       onEvent: (event) => {
-        logger5.info("Spawned TUI event", { eventType: event.type });
+        logger4.info("Spawned TUI event", { eventType: event.type });
       }
     }
   );
@@ -1726,7 +1558,7 @@ function hostsSpawnedChildren(mode) {
 
 // src/cli.ts
 if (process.argv[2] === "boot") {
-  const { runBoot } = await import("./boot-I353EAK6.js");
+  const { runBoot } = await import("./boot-6X5ZZG3B.js");
   process.exit(await runBoot(process.argv.slice(3)));
 }
 if (isLegacyEntrypointLaunch(process.env)) {
@@ -1735,13 +1567,13 @@ if (isLegacyEntrypointLaunch(process.env)) {
   process.exit(1);
 }
 if (process.argv.includes("--version")) {
-  const __dirname = dirname3(fileURLToPath(import.meta.url));
-  const pkgPath = join4(__dirname, "..", "package.json");
+  const __dirname = dirname2(fileURLToPath(import.meta.url));
+  const pkgPath = join3(__dirname, "..", "package.json");
   const pkg = JSON.parse(readFileSync(pkgPath, "utf-8"));
   process.stdout.write(pkg.version + "\n");
   process.exit(0);
 }
-var logger6 = createServiceLogger("CLI");
+var logger5 = createServiceLogger("CLI");
 var exitContext = {};
 var exitLogged = false;
 var shuttingDown = false;
@@ -1756,12 +1588,12 @@ function logAgentExit(reason, opts) {
     uptimeSec: process.uptime(),
     identity: exitContext
   });
-  logger6[exitLogLevel(reason)]("agent_exit", payload);
+  logger5[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);
-  logger6.info("Bootstrapping from codespace", {
+  logger5.info("Bootstrapping from codespace", {
     codespace: instanceName,
     apiUrl,
     apiUrlFromEnv,
@@ -1773,7 +1605,7 @@ async function bootstrapFromCodespace(apiUrl, instanceName) {
     bootstrapToken
   });
   if (!result.ok) {
-    logger6.error("Bootstrap failed after retries", {
+    logger5.error("Bootstrap failed after retries", {
       reason: result.reason,
       attempts: result.attempts,
       status: result.status,
@@ -1786,7 +1618,7 @@ async function bootstrapFromCodespace(apiUrl, instanceName) {
     process.exit(1);
   }
   applyBootstrapToEnv(result.config);
-  logger6.info("Bootstrap complete", {
+  logger5.info("Bootstrap complete", {
     taskId: result.config.taskId,
     attempts: result.attempts
   });
@@ -1799,7 +1631,7 @@ function isExpectedAbortError(error) {
 }
 function exitOnPermissionDenial(err) {
   if (!isPermissionDeniedError(err)) return false;
-  logger6.error("Not authorized for this project \u2014 parking instead of crash-looping", {
+  logger5.error("Not authorized for this project \u2014 parking instead of crash-looping", {
     error: err.message
   });
   logAgentExit("unauthorized", { exitCode: 0 });
@@ -1808,48 +1640,48 @@ function exitOnPermissionDenial(err) {
 process.on("uncaughtException", (err) => {
   if (err.code === "EPIPE") return;
   if (shuttingDown && isExpectedAbortError(err)) {
-    logger6.info("Ignored expected abort after shutdown", { error: err.message, code: err.code });
+    logger5.info("Ignored expected abort after shutdown", { error: err.message, code: err.code });
     return;
   }
   if (exitOnPermissionDenial(err)) return;
-  logger6.error("Uncaught exception", { error: err.message, code: err.code });
+  logger5.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)) {
-    logger6.info("Ignored expected abort rejection after shutdown", { error: err.message });
+    logger5.info("Ignored expected abort rejection after shutdown", { error: err.message });
     return;
   }
   if (exitOnPermissionDenial(err)) return;
-  logger6.error("Unhandled rejection", { error: err.message });
+  logger5.error("Unhandled rejection", { error: err.message });
   logAgentExit("unhandled_rejection", { exitCode: 1 });
   process.exit(1);
 });
 if (process.env.CONVEYOR_MODE === "workbench") {
-  const { startWorkbenchServer } = await import("./server-NIOBJ46G.js");
+  const { startWorkbenchServer } = await import("./server-EQUCOLNY.js");
   const { oomWatchdogOptionsFromEnv } = await import("./oom-watchdog-U7JERHA2.js");
   const { DEFAULT_WORKBENCH_PORT } = await import("./protocol-QLVS5W6O.js");
   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) {
-    logger6.error("workbench mode requires POD_BOOTSTRAP_TOKEN (or CONVEYOR_WORKBENCH_TOKEN)");
+    logger5.error("workbench mode requires POD_BOOTSTRAP_TOKEN (or CONVEYOR_WORKBENCH_TOKEN)");
     process.exit(1);
   }
-  const pkgDir = dirname3(fileURLToPath(import.meta.url));
-  const pkg = JSON.parse(readFileSync(join4(pkgDir, "..", "package.json"), "utf-8"));
+  const pkgDir = dirname2(fileURLToPath(import.meta.url));
+  const pkg = JSON.parse(readFileSync(join3(pkgDir, "..", "package.json"), "utf-8"));
   const handle = await startWorkbenchServer({
     port,
     token,
     version: pkg.version ?? "unknown",
     oomWatchdog: oomWatchdogOptionsFromEnv({
-      info: (m) => logger6.info(m),
-      warn: (m) => logger6.warn(m),
-      error: (m) => logger6.error(m)
+      info: (m) => logger5.info(m),
+      warn: (m) => logger5.warn(m),
+      error: (m) => logger5.error(m)
     })
   });
-  logger6.info(`Workbench launcher listening on 127.0.0.1:${handle.port}`);
+  logger5.info(`Workbench launcher listening on 127.0.0.1:${handle.port}`);
   process.on("SIGTERM", () => process.exit(0));
   await new Promise(() => {
   });
@@ -1859,7 +1691,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) {
-    logger6.error("Could not resolve CONVEYOR_API_URL for codespace bootstrap");
+    logger5.error("Could not resolve CONVEYOR_API_URL for codespace bootstrap");
     process.exit(1);
   }
   await bootstrapFromCodespace(conveyorApiUrl, INSTANCE_NAME);
@@ -1877,7 +1709,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") {
-  logger6.info("Starting ad-hoc agent", { projectId: projectIdentity.projectId });
+  logger5.info("Starting ad-hoc agent", { projectId: projectIdentity.projectId });
   const adhocRunner = new AdhocSessionRunner(
     {
       connection: {
@@ -1896,7 +1728,7 @@ if (!CONVEYOR_TASK_ID && projectIdentity && CONVEYOR_MODE === "adhoc") {
     },
     {
       onEvent: (event) => {
-        logger6.info("Ad-hoc runner event", { eventType: event.type });
+        logger5.info("Ad-hoc runner event", { eventType: event.type });
       }
     }
   );
@@ -1920,7 +1752,7 @@ if (!CONVEYOR_TASK_ID && projectIdentity && CONVEYOR_MODE === "adhoc") {
   process.exit(adhocError ? 1 : 0);
 }
 if (!CONVEYOR_TASK_ID && projectIdentity) {
-  logger6.info("Starting project agent", { projectId: projectIdentity.projectId });
+  logger5.info("Starting project agent", { projectId: projectIdentity.projectId });
   const projectRunner = new ProjectSessionRunner(
     {
       connection: {
@@ -1935,7 +1767,7 @@ if (!CONVEYOR_TASK_ID && projectIdentity) {
     },
     {
       onEvent: (event) => {
-        logger6.info("Project runner event", { eventType: event.type });
+        logger5.info("Project runner event", { eventType: event.type });
       }
     }
   );
@@ -1959,22 +1791,22 @@ if (!CONVEYOR_TASK_ID && projectIdentity) {
   process.exit(projectError ? 1 : 0);
 }
 if (!CONVEYOR_TASK_TOKEN || !CONVEYOR_TASK_ID) {
-  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(
+  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(
     "  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") {
-  logger6.error("Invalid CONVEYOR_MODE", {
+  logger5.error("Invalid CONVEYOR_MODE", {
     mode: CONVEYOR_MODE,
     expected: ["task", "pm", "code-review", "adhoc", "pack", "shell"]
   });
@@ -1983,7 +1815,7 @@ if (CONVEYOR_MODE !== "task" && CONVEYOR_MODE !== "pm" && CONVEYOR_MODE !== "cod
 if (CONVEYOR_MODE === "shell" || CONVEYOR_MODE === "adhoc") {
   const spawnedSessionId = process.env.CONVEYOR_SESSION_ID;
   if (!spawnedSessionId) {
-    logger6.error("Spawned child requires CONVEYOR_SESSION_ID", { mode: CONVEYOR_MODE });
+    logger5.error("Spawned child requires CONVEYOR_SESSION_ID", { mode: CONVEYOR_MODE });
     process.exit(1);
   }
   exitContext.sessionId = spawnedSessionId;
@@ -1996,7 +1828,7 @@ if (CONVEYOR_MODE === "shell" || CONVEYOR_MODE === "adhoc") {
     workspaceDir: CONVEYOR_WORKSPACE,
     projectId: process.env.CONVEYOR_PROJECT_ID ?? ""
   });
-  logger6.info("Starting spawned session child", {
+  logger5.info("Starting spawned session child", {
     mode: CONVEYOR_MODE,
     sessionId: spawnedSessionId
   });
@@ -2016,7 +1848,7 @@ if (CONVEYOR_MODE === "shell" || CONVEYOR_MODE === "adhoc") {
   });
   process.exit(childError ? 1 : 0);
 }
-logger6.info("Starting agent", { mode: CONVEYOR_MODE });
+logger5.info("Starting agent", { mode: CONVEYOR_MODE });
 var lifecycleOverrides = process.env.CLAUDESPACE_NAME ? { idleTimeoutMs: 60 * 60 * 1e3 } : { gitFlushIntervalMs: 0 };
 var runner = new SessionRunner(
   {
@@ -2036,12 +1868,12 @@ var runner = new SessionRunner(
   },
   {
     onStatusChange: (status) => {
-      logger6.info("Status changed", { status });
+      logger5.info("Status changed", { status });
     },
     onEvent: (event) => {
       const detail = event.message ?? event.content ?? event.summary ?? "";
       if (detail) {
-        logger6.info(detail, { eventType: event.type });
+        logger5.info(detail, { eventType: event.type });
       }
     }
   }
@@ -2053,7 +1885,7 @@ var workspaceCommandSupervisor = null;
 var shutdownCompletion = null;
 var shutdownAgent = (signal) => {
   shuttingDown = true;
-  logger6.info(`Received ${signal}, flushing git and stopping agent`);
+  logger5.info(`Received ${signal}, flushing git and stopping agent`);
   const commandShutdown = stopWorkspaceCommands(workspaceCommandSupervisor);
   shutdownSignal = signal;
   shutdownCompletion ??= (async () => {
@@ -2070,8 +1902,8 @@ var shutdownAgent = (signal) => {
   })();
   void shutdownCompletion;
   setTimeout(() => {
-    logger6.warn(`Forcing exit after ${signal} timeout`);
-    logger6.warn(
+    logger5.warn(`Forcing exit after ${signal} timeout`);
+    logger5.warn(
       "agent_exit",
       buildAgentExitLog({
         reason: "force_timeout",
@@ -2097,7 +1929,7 @@ workspaceCommandSupervisor = await startWorkspaceCommandsAfterConnect({
   })
 });
 if (!workspaceCommandSupervisor) {
-  logger6.info("Agent stopped before workspace commands were started");
+  logger5.info("Agent stopped before workspace commands were started");
   if (shutdownCompletion) await shutdownCompletion;
   logAgentExit(shutdownSignal ? "signal" : "clean", {
     exitCode: 0,
@@ -2114,12 +1946,12 @@ void checkSessionTaskIdentity({
     const ctx = await runner.connection.call("getTaskContext", { sessionId });
     return ctx.id;
   },
-  logger: logger6
+  logger: logger5
 });
 if (hostsSpawnedChildren(CONVEYOR_MODE)) {
   runner.connection.onSpawnReview((data) => {
     void reviewChildren.spawn(data).catch((err) => {
-      logger6.error("Review child spawn threw", {
+      logger5.error("Review child spawn threw", {
         error: err instanceof Error ? err.message : String(err)
       });
       runner.connection.reportReviewSpawnFailure(
@@ -2132,7 +1964,7 @@ if (hostsSpawnedChildren(CONVEYOR_MODE)) {
 if (hostsSpawnedChildren(CONVEYOR_MODE)) {
   runner.connection.onSpawnTui((data) => {
     void sessionChildren.spawn(data).catch((err) => {
-      logger6.error("Session child spawn threw", {
+      logger5.error("Session child spawn threw", {
         error: err instanceof Error ? err.message : String(err)
       });
       runner.connection.reportSessionSpawnFailure(
@@ -2155,7 +1987,7 @@ runner.run().then(async () => {
 }).catch(async (error) => {
   await stopWorkspaceCommands(workspaceCommandSupervisor);
   const msg = error instanceof Error ? error.message : String(error);
-  logger6.error("Agent runner failed", { error: msg });
+  logger5.error("Agent runner failed", { error: msg });
   logAgentExit("error", { exitCode: 1, finalState: runner.finalState ?? void 0 });
   process.exit(1);
 });