@rallycry/conveyor-agent 10.13.3 → 10.13.9

package/dist/cli.js

@@ -14,6 +14,8 @@ import {
   awaitGitReady,
   buildPromptBytes,
   buildSessionPreviewPorts,
+  buildSynthesizedCredentials,
+  claudeJsonPath,
   cleanTerminalOutput,
   createServiceLogger,
   defineTool,
@@ -23,19 +25,21 @@ import {
   loadConveyorConfig,
   loadForwardPorts,
   loadPtySpawn,
+  parseUsageGauges,
   resolvePlaywrightMcpServer,
   resolveSessionStart,
   runSetupCommand,
   runStartCommand,
+  runUsageProbe,
   sampleKeyUsage,
   terminateProcessGroup,
   textResult
-} from "./chunk-P4VWWR5O.js";
+} from "./chunk-PXQJ4NVO.js";
 import "./chunk-7TQO4ZF4.js";
 
 // src/cli.ts
 import { readFileSync } from "fs";
-import { join as join2, dirname as dirname3 } from "path";
+import { join as join3, dirname as dirname3 } from "path";
 import { fileURLToPath } from "url";
 
 // src/setup/sidecars.ts
@@ -207,6 +211,34 @@ async function waitForSidecars(opts = {}) {
   );
 }
 
+// src/setup/boot-milestone.ts
+var REPORT_TIMEOUT_MS = 5e3;
+async function reportBootMilestone(opts) {
+  const env = opts.env ?? process.env;
+  const apiUrl = env.CONVEYOR_API_URL;
+  const token = env.POD_BOOTSTRAP_TOKEN;
+  if (!apiUrl || !token) return false;
+  const fetchFn = opts.fetchFn ?? fetch;
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), opts.timeoutMs ?? REPORT_TIMEOUT_MS);
+  try {
+    const res = await fetchFn(`${apiUrl.replace(/\/$/, "")}/api/v3/pods/boot-milestone`, {
+      method: "POST",
+      headers: {
+        "content-type": "application/json",
+        authorization: `Bearer ${token}`
+      },
+      body: JSON.stringify({ key: opts.key }),
+      signal: controller.signal
+    });
+    return res.ok;
+  } catch {
+    return false;
+  } finally {
+    clearTimeout(timer);
+  }
+}
+
 // src/setup/workspace-command-supervisor.ts
 var defaultWriteOutput = (stream, data) => {
   (stream === "stderr" ? process.stderr : process.stdout).write(data);
@@ -236,6 +268,7 @@ var WorkspaceCommandSupervisor = class {
   loadForwardPortsFn;
   writeOutput;
   terminateStartCommand;
+  reportBootMilestoneFn;
   startCommandChild = null;
   liveStartCommandChildren = /* @__PURE__ */ new Set();
   startCommandTerminations = /* @__PURE__ */ new WeakMap();
@@ -263,6 +296,9 @@ var WorkspaceCommandSupervisor = class {
     this.loadForwardPortsFn = options.loadForwardPorts ?? loadForwardPorts;
     this.writeOutput = options.writeOutput ?? defaultWriteOutput;
     this.terminateStartCommand = options.terminateStartCommand ?? terminateProcessGroup;
+    this.reportBootMilestoneFn = options.reportBootMilestone ?? ((key) => {
+      void reportBootMilestone({ key, env: this.env });
+    });
   }
   start() {
     if (this.started || this.stopped) return;
@@ -308,6 +344,7 @@ var WorkspaceCommandSupervisor = class {
       });
       return;
     }
+    if (gitState === "ready") this.reportBootMilestoneFn("git_ready");
     await this.waitForSidecarsFn({
       onLog: (message) => this.forwardSetupOutput("stdout", `[sidecars] ${message}
 `),
@@ -315,8 +352,10 @@ var WorkspaceCommandSupervisor = class {
       signal: this.abortController.signal
     });
     if (this.stopped) return;
+    this.reportBootMilestoneFn("sidecars_ready");
     await this.runConfiguredSetup();
     if (this.stopped) return;
+    this.reportBootMilestoneFn("setup_complete");
     const startCommandRunning = this.config?.startCommand ? await this.ensureStartCommandLaunched(this.config.startCommand) : false;
     if (this.stopped) return;
     const forwardPorts = await this.loadForwardPortsFn(this.workspaceDir);
@@ -469,14 +508,14 @@ var WorkspaceCommandSupervisor = class {
 
 // 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)", {
+    logger7.warn("Could not verify session/task identity \u2014 continuing (defense-in-depth only)", {
       sessionId,
       taskId,
       error: message
@@ -484,7 +523,7 @@ async function checkSessionTaskIdentity(params) {
     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 }
     );
@@ -666,20 +705,91 @@ var ProjectSessionRunner = class {
   }
 };
 
+// src/usage/multi-key-probe.ts
+import { mkdtemp, writeFile as writeFile2, copyFile, rm } from "fs/promises";
+import { tmpdir } from "os";
+import { join } from "path";
+var logger = createServiceLogger("multi-key-probe");
+function gaugesToSamples(stdout) {
+  const { sessionUsage, weeklyUsage, sessionResetsAt, weeklyResetsAt, gauges } = parseUsageGauges(stdout);
+  const samples = [];
+  if (sessionUsage !== null) {
+    samples.push({
+      rateLimitType: "five_hour",
+      utilization: sessionUsage,
+      status: "allowed",
+      resetsAt: sessionResetsAt,
+      gauges
+    });
+  }
+  if (weeklyUsage !== null) {
+    samples.push({
+      rateLimitType: "seven_day",
+      utilization: weeklyUsage,
+      status: "allowed",
+      resetsAt: weeklyResetsAt,
+      gauges
+    });
+  }
+  return samples;
+}
+async function isolatedProbe(token, now) {
+  let dir = null;
+  try {
+    dir = await mkdtemp(join(tmpdir(), "conveyor-usage-"));
+    await writeFile2(join(dir, ".credentials.json"), buildSynthesizedCredentials(token, now), {
+      encoding: "utf8",
+      mode: 384
+    });
+    await copyFile(claudeJsonPath(), join(dir, ".claude.json")).catch(() => {
+    });
+    return await runUsageProbe({ env: { ...process.env, CLAUDE_CONFIG_DIR: dir } });
+  } catch (error) {
+    logger.info("isolated usage probe failed", {
+      error: error instanceof Error ? error.message : String(error)
+    });
+    return "";
+  } finally {
+    if (dir) await rm(dir, { recursive: true, force: true }).catch(() => {
+    });
+  }
+}
+async function probeKeysUsage(keys, deps = {}) {
+  const now = deps.now ?? Date.now;
+  const probeOne = deps.probeOne ?? ((token) => isolatedProbe(token, now()));
+  const results = [];
+  for (const key of keys) {
+    if (!key.oauthToken) continue;
+    try {
+      const stdout = await probeOne(key.oauthToken);
+      const samples = gaugesToSamples(stdout);
+      if (samples.length > 0) {
+        results.push({ codingAgentKeyId: key.codingAgentKeyId, samples });
+      }
+    } catch (error) {
+      logger.info("usage probe for key failed", {
+        codingAgentKeyId: key.codingAgentKeyId,
+        error: error instanceof Error ? error.message : String(error)
+      });
+    }
+  }
+  return results;
+}
+
 // src/harness/pty/adapters/opencode-auth.ts
 import { promises as fs } from "fs";
-import { dirname as dirname2, join } from "path";
+import { dirname as dirname2, join as join2 } from "path";
 import { homedir } from "os";
-var logger = createServiceLogger("opencode-auth");
+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 ?? join(env.HOME ?? homedir(), ".local", "share");
-  return join(dataHome, "opencode", "auth.json");
+  const dataHome = env.XDG_DATA_HOME ?? join2(env.HOME ?? homedir(), ".local", "share");
+  return join2(dataHome, "opencode", "auth.json");
 }
 function opencodeConfigPath(env) {
-  const configHome = env.XDG_CONFIG_HOME ?? join(env.HOME ?? homedir(), ".config");
-  return join(configHome, "opencode", "opencode.json");
+  const configHome = env.XDG_CONFIG_HOME ?? join2(env.HOME ?? homedir(), ".config");
+  return join2(configHome, "opencode", "opencode.json");
 }
 function parseOauthSeed(b64) {
   if (!b64) return null;
@@ -717,7 +827,7 @@ async function ensureAuthEntry(env, seed) {
   const path = opencodeAuthPath(env);
   const store = await readJsonFile(path);
   if (!shouldSeed(store.openai, seed)) {
-    logger.info("opencode oauth store is fresher than the seed; leaving it alone");
+    logger2.info("opencode oauth store is fresher than the seed; leaving it alone");
     return;
   }
   store.openai = {
@@ -727,7 +837,7 @@ async function ensureAuthEntry(env, seed) {
     expires: seed.expires
   };
   await writeJsonFile(path, store);
-  logger.info("seeded opencode oauth store entry");
+  logger2.info("seeded opencode oauth store entry");
 }
 async function ensurePluginConfig(env) {
   const path = opencodeConfigPath(env);
@@ -740,7 +850,7 @@ async function ensurePluginConfig(env) {
   const kept = plugins.filter((p) => !isOurs(p));
   config.plugin = [...kept, OPENCODE_CODEX_PLUGIN];
   await writeJsonFile(path, config);
-  logger.info("ensured opencode codex-auth plugin in config");
+  logger2.info("ensured opencode codex-auth plugin in config");
 }
 async function seedOpenCodeOauth(env) {
   const seed = parseOauthSeed(env.CONVEYOR_OPENCODE_OAUTH);
@@ -749,7 +859,7 @@ async function seedOpenCodeOauth(env) {
     await ensureAuthEntry(env, seed);
     await ensurePluginConfig(env);
   } catch (err) {
-    logger.warn(
+    logger2.warn(
       `failed to seed opencode oauth store: ${err instanceof Error ? err.message : String(err)}`
     );
   }
@@ -1182,7 +1292,7 @@ var AdhocSessionRunner = class {
         }),
         onGitFlush: () => {
         },
-        onUsageSample: () => void this.sampleAndReportKeyUsage()
+        onUsageSample: () => void this.sampleAndReportAllKeys()
       }
     );
   }
@@ -1202,6 +1312,7 @@ var AdhocSessionRunner = class {
         projectId: this.config.projectId
       });
       this.connection.onStop(() => this.requestStop());
+      this.connection.onProbeUsage(() => void this.sampleAndReportAllKeys());
       this.lifecycle.startHeartbeat();
       this.lifecycle.startTokenRefresh();
       this.lifecycle.startUsageSample();
@@ -1289,7 +1400,44 @@ var AdhocSessionRunner = class {
       resolve();
     }
   }
-  async sampleAndReportKeyUsage() {
+  /**
+   * Multi-key usage refresh: ask the server for every subscription key the
+   * OWNER has, probe each one's `/usage` from THIS pod (isolated per key), and
+   * report each key's gauges tagged with its explicit `codingAgentKeyId`. Falls
+   * back to the single-key self-sample when the owner has no probeable keys
+   * (e.g. API-key-only, or all decrypts failed). Best-effort — never throws.
+   */
+  async sampleAndReportAllKeys() {
+    if (this.stopped) return;
+    let keys = [];
+    try {
+      const res = await this.connection.call("listKeysToProbe", {
+        sessionId: this.config.connection.sessionId
+      });
+      keys = res?.keys ?? [];
+    } catch {
+    }
+    if (keys.length === 0) {
+      await this.sampleAndReportOwnKey();
+      return;
+    }
+    const probed = await probeKeysUsage(keys);
+    for (const { codingAgentKeyId, samples } of probed) {
+      for (const sample of samples) {
+        this.connection.sendEvent({
+          type: "rate_limit_update",
+          rateLimitType: sample.rateLimitType,
+          utilization: sample.utilization,
+          status: sample.status,
+          resetsAt: sample.resetsAt ?? void 0,
+          gauges: sample.gauges,
+          codingAgentKeyId
+        });
+      }
+    }
+  }
+  /** Single-key fallback: sample only the key this pod booted under. */
+  async sampleAndReportOwnKey() {
     if (this.stopped) return;
     const samples = await sampleKeyUsage(process.env.CLAUDE_CODE_OAUTH_TOKEN);
     for (const sample of samples) {
@@ -1317,7 +1465,7 @@ var AdhocSessionRunner = class {
 import { spawn as nodeSpawn, execFile } from "child_process";
 import { promisify } from "util";
 var execFileAsync = promisify(execFile);
-var logger2 = createServiceLogger("ReviewChild");
+var logger3 = createServiceLogger("ReviewChild");
 var SPAWN_FAILURE_GRACE_MS = 15e3;
 var KILL_WAIT_MS = 5e3;
 function buildReviewChildEnv(baseEnv, data) {
@@ -1346,7 +1494,7 @@ var ReviewChildSupervisor = class {
   childSessionId = null;
   /** Spawn (or replace) the review child for a `session:spawnReview` push. */
   async spawn(data) {
-    logger2.info("Spawning same-pod review child", {
+    logger3.info("Spawning same-pod review child", {
       reviewSessionId: data.sessionId,
       branch: data.branch ?? void 0,
       prNumber: data.prNumber ?? void 0
@@ -1389,7 +1537,7 @@ var ReviewChildSupervisor = class {
       process.stderr.write(`[review-child] ${chunk.toString()}`);
     });
     child.on("error", (err) => {
-      logger2.error("Review child spawn error", { error: err.message });
+      logger3.error("Review child spawn error", { error: err.message });
       if (this.child === child) {
         this.child = null;
         this.childSessionId = null;
@@ -1402,7 +1550,7 @@ var ReviewChildSupervisor = class {
         this.child = null;
         this.childSessionId = null;
       }
-      logger2.info("Review child exited", { code, signal, reviewSessionId: data.sessionId });
+      logger3.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`);
@@ -1420,7 +1568,7 @@ var ReviewChildSupervisor = class {
       this.childSessionId = null;
       return;
     }
-    logger2.info("Stopping review child", { reason, reviewSessionId: this.childSessionId });
+    logger3.info("Stopping review child", { reason, reviewSessionId: this.childSessionId });
     this.child = null;
     this.childSessionId = null;
     await new Promise((resolve) => {
@@ -1462,7 +1610,7 @@ var ReviewChildSupervisor = class {
         timeout: 3e4
       });
     } catch (err) {
-      logger2.warn("Review checkout freshen skipped", {
+      logger3.warn("Review checkout freshen skipped", {
         branch,
         error: err instanceof Error ? err.message : String(err)
       });
@@ -1472,7 +1620,7 @@ var ReviewChildSupervisor = class {
 
 // src/runner/session-child.ts
 import { spawn as nodeSpawn2 } from "child_process";
-var logger3 = createServiceLogger("SessionChild");
+var logger4 = createServiceLogger("SessionChild");
 function buildSpawnedChildEnv(baseEnv, data) {
   const env = { ...baseEnv };
   env.CONVEYOR_TASK_TOKEN = data.sessionJwt;
@@ -1503,7 +1651,7 @@ var SessionChildSupervisor = class {
   }
   /** Spawn a TUI/shell child for a `session:spawnTui` push. Additive per session. */
   async spawn(data) {
-    logger3.info("Spawning same-pod session child", {
+    logger4.info("Spawning same-pod session child", {
       spawnedSessionId: data.sessionId,
       mode: data.mode
     });
@@ -1544,7 +1692,7 @@ var SessionChildSupervisor = class {
       process.stderr.write(`${prefix} ${chunk.toString()}`);
     });
     child.on("error", (err) => {
-      logger3.error("Session child spawn error", { error: err.message });
+      logger4.error("Session child spawn error", { error: err.message });
       if (this.children.get(data.sessionId) === child) {
         this.children.delete(data.sessionId);
       }
@@ -1553,7 +1701,7 @@ var SessionChildSupervisor = class {
     child.on("exit", (code, signal) => {
       const wasCurrent = this.children.get(data.sessionId) === child;
       if (wasCurrent) this.children.delete(data.sessionId);
-      logger3.info("Session child exited", {
+      logger4.info("Session child exited", {
         code,
         signal,
         spawnedSessionId: data.sessionId,
@@ -1574,7 +1722,7 @@ var SessionChildSupervisor = class {
     const child = this.children.get(sessionId);
     this.children.delete(sessionId);
     if (!child || child.exitCode !== null || child.killed) return;
-    logger3.info("Stopping session child", { reason, spawnedSessionId: sessionId });
+    logger4.info("Stopping session child", { reason, spawnedSessionId: sessionId });
     await new Promise((resolve) => {
       const timer = setTimeout(() => {
         try {
@@ -1722,7 +1870,7 @@ var ShellSessionRunner = class {
 };
 
 // src/runner/spawned-child-boot.ts
-var logger4 = createServiceLogger("SpawnedChildBoot");
+var logger5 = createServiceLogger("SpawnedChildBoot");
 function createSpawnedChildRunner(inputs) {
   if (inputs.mode === "shell") {
     return new ShellSessionRunner({
@@ -1752,7 +1900,7 @@ function createSpawnedChildRunner(inputs) {
     },
     {
       onEvent: (event) => {
-        logger4.info("Spawned TUI event", { eventType: event.type });
+        logger5.info("Spawned TUI event", { eventType: event.type });
       }
     }
   );
@@ -1761,12 +1909,12 @@ function createSpawnedChildRunner(inputs) {
 // src/cli.ts
 if (process.argv.includes("--version")) {
   const __dirname = dirname3(fileURLToPath(import.meta.url));
-  const pkgPath = join2(__dirname, "..", "package.json");
+  const pkgPath = join3(__dirname, "..", "package.json");
   const pkg = JSON.parse(readFileSync(pkgPath, "utf-8"));
   process.stdout.write(pkg.version + "\n");
   process.exit(0);
 }
-var logger5 = createServiceLogger("CLI");
+var logger6 = createServiceLogger("CLI");
 var exitContext = {};
 var exitLogged = false;
 function logAgentExit(reason, opts) {
@@ -1780,12 +1928,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,
@@ -1797,7 +1945,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,
@@ -1810,7 +1958,7 @@ 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
   });
@@ -1824,20 +1972,20 @@ function isExpectedAbortError(error) {
 process.on("uncaughtException", (err) => {
   if (err.code === "EPIPE") return;
   if (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;
   }
-  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 (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;
   }
-  logger5.error("Unhandled rejection", { error: err.message });
+  logger6.error("Unhandled rejection", { error: err.message });
   logAgentExit("unhandled_rejection", { exitCode: 1 });
   process.exit(1);
 });
@@ -1846,7 +1994,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);
@@ -1864,7 +2012,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: {
@@ -1883,7 +2031,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 });
       }
     }
   );
@@ -1901,7 +2049,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: {
@@ -1916,7 +2064,7 @@ if (!CONVEYOR_TASK_ID && projectIdentity) {
     },
     {
       onEvent: (event) => {
-        logger5.info("Project runner event", { eventType: event.type });
+        logger6.info("Project runner event", { eventType: event.type });
       }
     }
   );
@@ -1934,22 +2082,22 @@ 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") {
-  logger5.error("Invalid CONVEYOR_MODE", {
+  logger6.error("Invalid CONVEYOR_MODE", {
     mode: CONVEYOR_MODE,
     expected: ["task", "pm", "code-review", "adhoc", "pack", "shell"]
   });
@@ -1958,7 +2106,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) {
-    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;
@@ -1971,7 +2119,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
   });
@@ -1985,7 +2133,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(
   {
@@ -2005,12 +2153,12 @@ 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 });
       }
     }
   }
@@ -2021,7 +2169,7 @@ var shutdownSignal;
 var workspaceCommandSupervisor = null;
 var shutdownCompletion = null;
 var shutdownAgent = (signal) => {
-  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 () => {
@@ -2038,8 +2186,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",
@@ -2065,7 +2213,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,
@@ -2081,12 +2229,12 @@ void checkSessionTaskIdentity({
     const ctx = await runner.connection.call("getTaskContext", { sessionId });
     return ctx.id;
   },
-  logger: logger5
+  logger: logger6
 });
 if (CONVEYOR_MODE === "task") {
   runner.connection.onSpawnReview((data) => {
     void reviewChildren.spawn(data).catch((err) => {
-      logger5.error("Review child spawn threw", {
+      logger6.error("Review child spawn threw", {
         error: err instanceof Error ? err.message : String(err)
       });
       runner.connection.reportReviewSpawnFailure(
@@ -2099,7 +2247,7 @@ if (CONVEYOR_MODE === "task") {
 if (CONVEYOR_MODE === "task" || CONVEYOR_MODE === "pack") {
   runner.connection.onSpawnTui((data) => {
     void sessionChildren.spawn(data).catch((err) => {
-      logger5.error("Session child spawn threw", {
+      logger6.error("Session child spawn threw", {
         error: err instanceof Error ? err.message : String(err)
       });
       runner.connection.reportSessionSpawnFailure(
@@ -2122,7 +2270,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);
 });