@rallycry/conveyor-agent 11.0.47 → 11.0.49

package/dist/{chunk-7Y3IY5QQ.js → chunk-RNE3JAF5.js}

@@ -12,6 +12,7 @@ import {
   buildSpawnArgs,
   cleanTerminalOutput,
   ensureSessionTarget,
+  flattenTerminalText,
   inheritedEnv,
   killPtyWithEscalation,
   needsRawReadyGate,
@@ -30,7 +31,7 @@ import {
   spawnOptionsFingerprint,
   transcriptSize,
   turnOptionsFrom
-} from "./chunk-EKTPDG3G.js";
+} from "./chunk-SXZS2R52.js";
 import {
   AGENT_STATUS_REASON_USER_QUESTION,
   AgentConnection,
@@ -95,9 +96,10 @@ import {
   runQueryGrafanaLogs,
   stageAndCommit,
   statWorkspacePath,
+  subProjectScopePaths,
   updateRemoteToken,
   verifyGitCredential
-} from "./chunk-KXB55NJP.js";
+} from "./chunk-O3MXZHIS.js";
 import {
   reportBootMilestone
 } from "./chunk-VIUZS7V4.js";
@@ -859,6 +861,7 @@ function redact(input) {
 
 // src/harness/pty/jsonl-tailer.ts
 import { open } from "fs/promises";
+import { StringDecoder } from "string_decoder";
 
 // src/harness/pty/record-mapper.ts
 function isRecord(value) {
@@ -994,7 +997,9 @@ function mapTranscriptRecord(raw) {
 }
 
 // src/harness/pty/jsonl-tailer.ts
-var POLL_INTERVAL_MS = 25;
+var ACTIVE_POLL_INTERVAL_MS = 100;
+var IDLE_POLL_INTERVAL_MS = 1e3;
+var logger = createServiceLogger("JsonlTailer");
 var JsonlTailer = class {
   constructor(path, onEvent, onRawRecord, mapRecord2 = mapTranscriptRecord) {
     this.path = path;
@@ -1008,35 +1013,59 @@ var JsonlTailer = class {
   mapRecord;
   offset = 0;
   buffer = "";
+  decoder = new StringDecoder("utf8");
   timer = null;
-  chain = Promise.resolve();
+  chain = Promise.resolve(false);
+  started = false;
+  pollIntervalMs = ACTIVE_POLL_INTERVAL_MS;
+  readErrorLogged = false;
   _closed = false;
   /**
    * Begin tailing. Pass `fromOffset` to skip bytes already present when the
    * tail starts (used on resume so the prior session's records aren't replayed).
    */
   start(fromOffset = 0) {
-    if (this.timer) return;
+    if (this.started || this._closed) return;
+    this.started = true;
     this.offset = fromOffset;
-    this.timer = setInterval(() => {
-      if (this._closed) return;
-      void this.enqueueRead();
-    }, POLL_INTERVAL_MS);
+    this.scheduleRead();
   }
   close() {
     this._closed = true;
     if (this.timer) {
-      clearInterval(this.timer);
+      clearTimeout(this.timer);
       this.timer = null;
     }
   }
   /** Read any remaining bytes and flush a trailing line without a newline. */
   async flush() {
-    await this.enqueueRead();
-    if (this.buffer.length > 0) {
-      this.emitLine(this.buffer);
-      this.buffer = "";
-    }
+    const flushed = this.chain.then(async () => {
+      await this.readOnce();
+      this.buffer += this.decoder.end();
+      if (this.buffer.length > 0) {
+        this.emitLine(this.buffer);
+        this.buffer = "";
+      }
+      return false;
+    });
+    this.chain = flushed;
+    await flushed;
+  }
+  scheduleRead() {
+    if (this._closed) return;
+    this.timer = setTimeout(() => {
+      this.timer = null;
+      void this.enqueueRead().then(
+        (changed) => {
+          this.pollIntervalMs = changed ? ACTIVE_POLL_INTERVAL_MS : Math.min(this.pollIntervalMs * 2, IDLE_POLL_INTERVAL_MS);
+          this.scheduleRead();
+        },
+        (error) => {
+          logger.error("Transcript polling failed", { error: String(error) });
+          this.close();
+        }
+      );
+    }, this.pollIntervalMs);
   }
   enqueueRead() {
     this.chain = this.chain.then(() => this.readOnce());
@@ -1044,19 +1073,42 @@ var JsonlTailer = class {
   }
   async readOnce() {
     let handle = null;
+    let chunk = null;
     try {
       handle = await open(this.path, "r");
       const stats = await handle.stat();
-      if (stats.size <= this.offset) return;
+      if (stats.size <= this.offset) {
+        this.readErrorLogged = false;
+        return false;
+      }
       const length = stats.size - this.offset;
       const buf = Buffer.alloc(length);
-      await handle.read(buf, 0, length, this.offset);
-      this.offset = stats.size;
-      this.consume(buf.toString("utf8"));
-    } catch {
+      let readBytes = 0;
+      while (readBytes < length) {
+        const { bytesRead } = await handle.read(
+          buf,
+          readBytes,
+          length - readBytes,
+          this.offset + readBytes
+        );
+        if (bytesRead === 0) break;
+        readBytes += bytesRead;
+      }
+      chunk = buf.subarray(0, readBytes);
+      this.readErrorLogged = false;
+    } catch (error) {
+      if (!this.readErrorLogged) {
+        logger.warn("Transcript read failed; retrying", { error: String(error) });
+        this.readErrorLogged = true;
+      }
+      return false;
     } finally {
       if (handle) await handle.close();
     }
+    if (!chunk || chunk.length === 0) return false;
+    this.offset += chunk.length;
+    this.consume(this.decoder.write(chunk));
+    return true;
   }
   consume(chunk) {
     this.buffer += chunk;
@@ -2550,12 +2602,11 @@ function conveyorCredentialsMarkerPath() {
 function tokenFingerprint(accessToken) {
   return createHash("sha256").update(accessToken).digest("hex");
 }
-function buildCredentialsMarker(accessToken, now, previousHash, refreshToken, codingAgentKeyId) {
+function buildCredentialsMarker(accessToken, now, previousHash, codingAgentKeyId) {
   const accessTokenSha256 = tokenFingerprint(accessToken);
   return JSON.stringify({
     accessTokenSha256,
     ...previousHash && previousHash !== accessTokenSha256 ? { previousAccessTokenSha256: previousHash } : {},
-    ...refreshToken ? { refreshTokenSha256: tokenFingerprint(refreshToken) } : {},
     ...codingAgentKeyId ? { codingAgentKeyId } : {},
     writtenAt: now
   });
@@ -2636,9 +2687,6 @@ function parseClaudeOauthEnv(blob) {
     const scopes = Array.isArray(record.scopes) ? record.scopes.filter((scope) => typeof scope === "string" && scope !== "") : [];
     return {
       access: record.access,
-      refresh: typeof record.refresh === "string" && record.refresh ? record.refresh : void 0,
-      expires: typeof record.expires === "number" ? record.expires : void 0,
-      refreshExpires: typeof record.refreshExpires === "number" ? record.refreshExpires : void 0,
       scopes: scopes.length > 0 ? scopes : void 0,
       rateLimitTier: typeof record.rateLimitTier === "string" ? record.rateLimitTier : void 0
     };
@@ -2664,13 +2712,10 @@ function parseClaudeAiOauth(raw) {
   }
 }
 function buildCredentialsFile(material, now) {
-  const refresh = material.refresh;
   return JSON.stringify({
     claudeAiOauth: {
       accessToken: material.access,
-      ...refresh ? { refreshToken: refresh } : {},
-      expiresAt: refresh && material.expires ? material.expires : now + SYNTH_TOKEN_TTL_MS,
-      ...material.refreshExpires ? { refreshTokenExpiresAt: material.refreshExpires } : {},
+      expiresAt: now + SYNTH_TOKEN_TTL_MS,
       scopes: material.scopes?.length ? material.scopes : LEGACY_SCOPES,
       ...material.rateLimitTier ? { rateLimitTier: material.rateLimitTier } : {},
       subscriptionType: "max"
@@ -2686,19 +2731,13 @@ function isConveyorOwnedCredentials(existing, markerHashes) {
   if (typeof existing.accessToken !== "string") return false;
   return markerHashes.includes(tokenFingerprint(existing.accessToken));
 }
-function hasStableRefreshOwnership(existing, markerRaw) {
-  return typeof existing.refreshToken === "string" && parseCredentialsRefreshMarker(markerRaw) === tokenFingerprint(existing.refreshToken);
-}
 function isCurrentCredential(existing, material, now) {
-  if (material.refresh) return existing.accessToken === material.access;
+  if (typeof existing.refreshToken === "string" && existing.refreshToken !== "") return false;
   return existing.accessToken === material.access && typeof existing.expiresAt === "number" && existing.expiresAt > now + REFRESH_SKEW_MS;
 }
-function needsMarkerUpgrade(input, material) {
+function needsMarkerUpgrade(input) {
   if (!input.codingAgentKeyId) return false;
-  if (parseCredentialsMarkerKeyId(input.markerRaw ?? null) !== input.codingAgentKeyId) return true;
-  return Boolean(
-    material.refresh && parseCredentialsRefreshMarker(input.markerRaw ?? null) !== tokenFingerprint(material.refresh)
-  );
+  return parseCredentialsMarkerKeyId(input.markerRaw ?? null) !== input.codingAgentKeyId;
 }
 function ownsExistingCredential(existing, markerRaw, markerHashes) {
   if (isConveyorOwnedCredentials(existing, markerHashes)) return true;
@@ -2706,11 +2745,6 @@ function ownsExistingCredential(existing, markerRaw, markerHashes) {
   const refreshToken = typeof existing.refreshToken === "string" ? existing.refreshToken : null;
   return credentialMarkerMatches(markerRaw, accessToken, refreshToken);
 }
-function cliRefreshedSameKey(input, material, existing, markerRaw) {
-  if (!material.refresh || !input.codingAgentKeyId) return false;
-  if (parseCredentialsMarkerKeyId(markerRaw) !== input.codingAgentKeyId) return false;
-  return hasStableRefreshOwnership(existing, markerRaw) && existing.accessToken !== material.access;
-}
 function planCredentialsWrite(input) {
   if (!input.isCloud) return { action: "skip", reason: "not-cloud" };
   const material = parseClaudeOauthEnv(input.oauthBlob) ?? (input.token ? { access: input.token } : null);
@@ -2722,7 +2756,6 @@ function planCredentialsWrite(input) {
     material.access,
     input.now,
     markerHashes[0] ?? null,
-    material.refresh,
     input.codingAgentKeyId
   );
   const existing = parseClaudeAiOauth(input.existingRaw);
@@ -2730,13 +2763,10 @@ function planCredentialsWrite(input) {
   if (!ownsExistingCredential(existing, markerRaw, markerHashes)) {
     return { action: "skip", reason: "foreign-credentials" };
   }
-  if (cliRefreshedSameKey(input, material, existing, markerRaw)) {
-    return { action: "skip", reason: "current" };
-  }
   if (!isCurrentCredential(existing, material, input.now)) {
     return { action: "write", contents, marker };
   }
-  return needsMarkerUpgrade(input, material) ? { action: "mark", marker } : { action: "skip", reason: "current" };
+  return needsMarkerUpgrade(input) ? { action: "mark", marker } : { action: "skip", reason: "current" };
 }
 
 // src/harness/pty/credentials.ts
@@ -4319,6 +4349,9 @@ function isMountDisconnectError(err) {
   const lower = message.toLowerCase();
   return MOUNT_DISCONNECT_MESSAGES.some((needle) => lower.includes(needle));
 }
+function isRequiredHomeDisconnect(err) {
+  return process.env.CONVEYOR_USER_HOME_REQUIRED === "1" && isMountDisconnectError(err);
+}
 function podLocalConfigHome() {
   return join9(homedir3(), ".claude-local");
 }
@@ -4367,6 +4400,7 @@ async function ensureUsableClaudeConfigHome(cwd, log) {
     return { configHome, fellBack: false };
   } catch (err) {
     if (!isMountDisconnectError(err)) throw err;
+    if (isRequiredHomeDisconnect(err)) throw err;
     const fallback = podLocalConfigHome();
     log?.warn(
       "shared ~/.claude mount is unreachable; falling back to a pod-local config home. Session history will not persist across pods until the mount recovers.",
@@ -4577,7 +4611,7 @@ var PtyHarness = class _PtyHarness {
   async parkedHomeDied(options) {
     if (!this.ownsClaudeConfigHome) return false;
     try {
-      const { fellBack } = await ensureUsableClaudeConfigHome(options.cwd, _PtyHarness.log);
+      const { fellBack } = await this.ensureConfigHome(options);
       if (!fellBack) return false;
       _PtyHarness.log.warn(
         "shared ~/.claude mount died while the CLI was parked \u2014 respawning on the pod-local config home instead of reusing a process bound to the dead mount"
@@ -4587,7 +4621,15 @@ var PtyHarness = class _PtyHarness {
       _PtyHarness.log.warn("parked-session config-home probe failed", {
         error: err instanceof Error ? err.message : String(err)
       });
-      return false;
+      return isRequiredHomeDisconnect(err);
+    }
+  }
+  async ensureConfigHome(options) {
+    try {
+      return await ensureUsableClaudeConfigHome(options.cwd, _PtyHarness.log);
+    } catch (err) {
+      if (isRequiredHomeDisconnect(err)) this.escalateToPodRecycle(true);
+      throw err;
     }
   }
   /**
@@ -4599,7 +4641,7 @@ var PtyHarness = class _PtyHarness {
     const session = new PtySession(prompt, options, want, this.bridge, this.adapter);
     onAllocated?.(session);
     if (this.ownsClaudeConfigHome) {
-      await ensureUsableClaudeConfigHome(options.cwd, _PtyHarness.log);
+      await this.ensureConfigHome(options);
     }
     await this.adapter.prepareEnvironment({ cwd: options.cwd });
     if (this.ownsClaudeConfigHome) {
@@ -4671,15 +4713,13 @@ var PtyHarness = class _PtyHarness {
    *
    * Fire-and-forget: the escalation must not gate ending the failed turn.
    */
-  escalateToPodRecycle() {
+  escalateToPodRecycle(confirmedRequiredMountFailure = false) {
     if (this.recycleRequested || !this.bridge?.requestPodRecycle) return;
-    if (!isConfigHomeFallbackActive()) return;
+    if (!confirmedRequiredMountFailure && !isConfigHomeFallbackActive()) return;
     this.recycleRequested = true;
-    _PtyHarness.log.error(
-      "Prompt delivery failed with the shared ~/.claude mount dead \u2014 requesting a pod recycle"
-    );
+    _PtyHarness.log.error("Shared ~/.claude mount is unavailable \u2014 requesting a pod recycle");
     this.bridge.requestPodRecycle(
-      "The shared ~/.claude mount died and the Claude CLI will not accept a prompt on this pod. Only a new pod remounts it."
+      "The shared ~/.claude mount died and the Claude CLI cannot safely continue on this pod. Only a new pod remounts it."
     );
   }
   /**
@@ -4846,7 +4886,7 @@ function findOnPath(binary, env = process.env) {
 import { promises as fs } from "fs";
 import { dirname as dirname2, join as join11 } from "path";
 import { homedir as homedir4 } 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) {
@@ -4893,7 +4933,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 = {
@@ -4903,7 +4943,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);
@@ -4916,7 +4956,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);
@@ -4925,7 +4965,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)}`
     );
   }
@@ -5538,14 +5578,14 @@ function resolveTuiAdapter(kind = "claude-code") {
 
 // src/harness/pty/stream-server.ts
 import net from "net";
-var logger2 = createServiceLogger("PtyStreamServer");
+var logger3 = createServiceLogger("PtyStreamServer");
 var RING_MAX_CHARS = 256 * 1024;
 var PtyStreamServer = class {
   constructor(options) {
     this.options = options;
     this.server = net.createServer((socket) => this.handleConnection(socket));
     this.server.on("error", (err) => {
-      logger2.warn(`PTY stream server error: ${err.message}`);
+      logger3.warn(`PTY stream server error: ${err.message}`);
     });
   }
   options;
@@ -5586,7 +5626,7 @@ var PtyStreamServer = class {
         return port;
       }
     }
-    logger2.warn(`PTY stream server could not bind any port in ${base}..${base + attempts - 1}`);
+    logger3.warn(`PTY stream server could not bind any port in ${base}..${base + attempts - 1}`);
     return null;
   }
   tryListen(port) {
@@ -5707,7 +5747,7 @@ var PtyStreamServer = class {
 };
 
 // src/harness/pty/direct-stream.ts
-var logger3 = createServiceLogger("PtyDirectStream");
+var logger4 = createServiceLogger("PtyDirectStream");
 var RELAY_COALESCE_MS = 2e3;
 var RELAY_MAX_BUFFER_CHARS = 48 * 1024;
 var DirectStreamController = class {
@@ -5759,7 +5799,7 @@ var DirectStreamController = class {
     });
     void created.listen().then((port) => this.onListening(created, port)).catch((err) => {
       this.starting = false;
-      logger3.warn(
+      logger4.warn(
         `PTY stream server failed to start: ${err instanceof Error ? err.message : String(err)}`
       );
     });
@@ -5772,7 +5812,7 @@ var DirectStreamController = class {
     }
     this.server = created;
     this.reporter.reportPtyStream(port);
-    logger3.info(`PTY stream server listening on ${port} (session ${this.reporter.sessionId})`);
+    logger4.info(`PTY stream server listening on ${port} (session ${this.reporter.sessionId})`);
   }
   /** Push the min box across both transports to the pty. */
   applyDims() {
@@ -7110,14 +7150,16 @@ ${context.projectDescription}` : "";
     parts.push(`
 ## Project: ${context.projectName}${descLine}`);
   }
-  if (context.subProject?.rootPath) {
+  const scopePaths = context.subProject ? subProjectScopePaths(context.subProject) : [];
+  if (context.subProject && scopePaths.length > 0) {
+    const folders = scopePaths.map((path) => `\`${path}\``).join(", ");
     parts.push(
       `
 ## Sub-project scope: ${context.subProject.name}`,
-      `This task belongs to the "${context.subProject.name}" sub-project, which owns \`${context.subProject.rootPath}\`.`,
+      `This task belongs to the "${context.subProject.name}" sub-project, which allows changes under ${folders}.`,
       `- Read and reference the whole repository freely.`,
-      `- Substantive code changes belong under \`${context.subProject.rootPath}\`. Trivial wiring elsewhere (exports, route registration) is fine when required.`,
-      `- If the work genuinely requires substantive changes outside that folder, do NOT make them here \u2014 create a task on the parent project board (as part of a pack with this one) describing the needed change.`
+      `- Substantive code changes belong under ${folders}. Trivial wiring elsewhere (exports, route registration) is fine when required.`,
+      `- If the work genuinely requires substantive changes outside those folders, do NOT make them here \u2014 create a task on the parent project board (as part of a pack with this one) describing the needed change.`
     );
   }
   if (context.description) {
@@ -7498,9 +7540,9 @@ var searchFilterFields = {
       desc: "Only return cards with no assignee (mutually exclusive with assigneeId)"
     })
   ),
-  limit: f.optional(f.number({ desc: "Max results to return (default 20)" }))
+  limit: f.optional(f.number({ desc: "Max results to return (default 20, at most 200)" }))
 };
-var searchResultNote = "Every result lists the tags it carries, so you can see why it matched. Results are relevance-ordered: highest priority first then newest; suggestions-only queries rank by upvote score. Returns summaries \u2014 plan omitted, description truncated; use get_task for full details.";
+var searchResultNote = "Every result lists the tags it carries, so you can see why it matched. Searches every status, Complete and Cancelled included, unless statusFilters narrows it. Returns at most 200 results. Results are relevance-ordered: highest priority first then newest; suggestions-only queries rank by upvote score. Returns summaries \u2014 plan omitted, description truncated; use get_task for full details.";
 var searchTasksContract = defineToolContract({
   name: "search_tasks",
   agent: {
@@ -12437,7 +12479,7 @@ function resolvePlaywrightMcpServer(env = process.env) {
 }
 
 // src/execution/event-handlers.ts
-var logger4 = createServiceLogger("event-handlers");
+var logger5 = createServiceLogger("event-handlers");
 function safeVoid(promise, context) {
   if (promise && typeof promise.catch === "function") {
     promise.catch((err) => {
@@ -12639,7 +12681,7 @@ async function emitResultEvent(event, host, context, startTime, lastAssistantUsa
 }
 function handleRateLimitEvent(event, host) {
   const { rate_limit_info } = event;
-  logger4.info("Rate limit event received", { rate_limit_info });
+  logger5.info("Rate limit event received", { rate_limit_info });
   const status = rate_limit_info.status;
   const resetsAt = epochSecondsToISO(rate_limit_info.resetsAt);
   const utilization = rate_limit_info.utilization ?? (status === "rejected" ? 1 : void 0);
@@ -13418,7 +13460,7 @@ function buildCanUseTool(host) {
 }
 
 // src/execution/query-executor.ts
-var logger5 = createServiceLogger("QueryExecutor");
+var logger6 = createServiceLogger("QueryExecutor");
 var IMAGE_ERROR_PATTERN2 = /Could not process image/i;
 var RETRY_DELAYS_MS = [6e4, 12e4, 18e4, 3e5];
 function buildHooks(host) {
@@ -13503,7 +13545,7 @@ function resolveSessionStart(lineageKey, cwd, tui = process.env.CONVEYOR_TUI) {
     repairTornSessionFile(path);
     if (isResumableTranscript(path)) return { resume: sessionUuid };
     rotateSessionFile(cwd, sessionUuid);
-    logger5.warn("Rotated a transcript with no conversation aside before resume", { path });
+    logger6.warn("Rotated a transcript with no conversation aside before resume", { path });
   }
   markSpawnedTranscript(cwd, sessionUuid);
   return { sessionId: sessionUuid };
@@ -13562,7 +13604,7 @@ function repairTornSessionFile(path) {
     }
     if (keepEnd === content.length) return false;
     truncateSync(path, Buffer.byteLength(content.slice(0, keepEnd), "utf8"));
-    logger5.warn("Repaired torn transcript before resume", {
+    logger6.warn("Repaired torn transcript before resume", {
       path,
       trimmedBytes: content.length - keepEnd
     });
@@ -13649,7 +13691,7 @@ function buildQueryOptions(host, context) {
     disallowedTools: buildDisallowedTools(settings, mode, host.hasExitedPlanMode),
     enableFileCheckpointing: settings.enableFileCheckpointing,
     stderr: (data) => {
-      logger5.warn("Claude Code stderr", { data: data.trimEnd() });
+      logger6.warn("Claude Code stderr", { data: data.trimEnd() });
     }
   };
 }
@@ -14055,7 +14097,7 @@ function rotateSessionFile(cwd, sessionUuid) {
     renameSync2(path, `${path.replace(/\.jsonl$/, "")}.aborted-${Date.now()}.jsonl`);
     return true;
   } catch (error) {
-    logger5.warn("Could not rotate an aborted transcript aside", {
+    logger6.warn("Could not rotate an aborted transcript aside", {
       path,
       error: error instanceof Error ? error.message : String(error)
     });
@@ -14119,7 +14161,7 @@ async function handleAuthError(context, host, options) {
 async function handleStaleSession(context, host, options) {
   context.claudeSessionId = null;
   host.connection.storeSessionId("");
-  logger5.warn("Resume target had no resumable conversation; rotating it aside and starting fresh", {
+  logger6.warn("Resume target had no resumable conversation; rotating it aside and starting fresh", {
     taskId: context.taskId,
     runnerMode: host.config.mode,
     agentMode: host.agentMode
@@ -14309,7 +14351,7 @@ async function runWithRetry(initialQuery, context, host, options) {
 }
 
 // src/runner/query-bridge.ts
-var logger6 = createServiceLogger("QueryBridge");
+var logger7 = createServiceLogger("QueryBridge");
 function resolveHarnessKind() {
   if (process.env.CONVEYOR_FORCE_SDK_CARDS === "1") return "sdk";
   return "pty";
@@ -14439,7 +14481,7 @@ var QueryBridge = class {
       this.freshPrewarmedInitial = warmed;
       return warmed;
     } catch (err) {
-      logger6.warn("TUI prewarm failed; continuing with normal startup", {
+      logger7.warn("TUI prewarm failed; continuing with normal startup", {
         error: err instanceof Error ? err.message : String(err)
       });
       return false;
@@ -14524,9 +14566,9 @@ var QueryBridge = class {
       const msg = err instanceof Error ? err.message : String(err);
       const isAbort = this._stopped || /abort/i.test(msg);
       if (isAbort) {
-        logger6.info("Query stopped by user", { error: msg });
+        logger7.info("Query stopped by user", { error: msg });
       } else {
-        logger6.error("Query execution failed", { error: msg });
+        logger7.error("Query execution failed", { error: msg });
         this.connection.sendEvent({ type: "error", message: msg });
       }
     } finally {
@@ -14552,9 +14594,9 @@ var QueryBridge = class {
       const msg = err instanceof Error ? err.message : String(err);
       const isAbort = this._stopped || /abort/i.test(msg);
       if (isAbort) {
-        logger6.info("Passive turn stopped", { error: msg });
+        logger7.info("Passive turn stopped", { error: msg });
       } else {
-        logger6.error("Passive turn failed", { error: msg });
+        logger7.error("Passive turn failed", { error: msg });
         this.connection.sendEvent({ type: "error", message: msg });
       }
     } finally {
@@ -14678,127 +14720,12 @@ var QueryBridge = class {
 // src/execution/usage-sampler.ts
 import { existsSync as existsSync2 } from "fs";
 
-// src/usage/reset-parse.ts
-var MONTHS = ["jan", "feb", "mar", "apr", "may", "jun", "jul", "aug", "sep", "oct", "nov", "dec"];
-function tzOffsetMs(utcMs, tz) {
-  const dtf = new Intl.DateTimeFormat("en-US", {
-    timeZone: tz,
-    hour12: false,
-    year: "numeric",
-    month: "2-digit",
-    day: "2-digit",
-    hour: "2-digit",
-    minute: "2-digit",
-    second: "2-digit"
-  });
-  const map = {};
-  for (const part of dtf.formatToParts(new Date(utcMs))) {
-    if (part.type !== "literal") map[part.type] = part.value;
-  }
-  const hour = map.hour === "24" ? 0 : Number(map.hour);
-  const asUtc = Date.UTC(
-    Number(map.year),
-    Number(map.month) - 1,
-    Number(map.day),
-    hour,
-    Number(map.minute),
-    Number(map.second)
-  );
-  return asUtc - utcMs;
-}
-function zonedWallClockToUtc(y, mo, d, h, mi, tz) {
-  if (tz === "UTC" || tz === "Etc/UTC") return Date.UTC(y, mo, d, h, mi);
-  const naiveUtc = Date.UTC(y, mo, d, h, mi);
-  const firstGuess = naiveUtc - tzOffsetMs(naiveUtc, tz);
-  return naiveUtc - tzOffsetMs(firstGuess, tz);
-}
-function localTimeZone() {
-  try {
-    return Intl.DateTimeFormat().resolvedOptions().timeZone || "UTC";
-  } catch {
-    return "UTC";
-  }
-}
-function parseResetInstant(rowText, now, defaultTz = localTimeZone()) {
-  const m = /resets\s+(?:by\s+)?(?:([a-z]{3})\s+(\d{1,2})(?:,|\s+at)?\s+)?(\d{1,2})(?::(\d{2}))?\s*(am|pm)(?:\s*\(([^)]+)\))?/i.exec(
-    rowText
-  );
-  if (!m) return null;
-  const [, monStr, dayStr, hourStr, minStr, meridiem, tzRaw] = m;
-  const tz = tzRaw ? tzRaw.trim() : defaultTz;
-  let hour = Number(hourStr) % 12;
-  if (/pm/i.test(meridiem)) hour += 12;
-  const minute = minStr ? Number(minStr) : 0;
-  const nowDate = new Date(now);
-  try {
-    if (monStr && dayStr) {
-      const month = MONTHS.indexOf(monStr.toLowerCase());
-      if (month < 0) return null;
-      const day = Number(dayStr);
-      let utc2 = zonedWallClockToUtc(nowDate.getUTCFullYear(), month, day, hour, minute, tz);
-      if (utc2 < now - 24 * 60 * 60 * 1e3) {
-        utc2 = zonedWallClockToUtc(nowDate.getUTCFullYear() + 1, month, day, hour, minute, tz);
-      }
-      return new Date(utc2).toISOString();
-    }
-    let utc = zonedWallClockToUtc(
-      nowDate.getUTCFullYear(),
-      nowDate.getUTCMonth(),
-      nowDate.getUTCDate(),
-      hour,
-      minute,
-      tz
-    );
-    if (utc <= now) {
-      utc = zonedWallClockToUtc(
-        nowDate.getUTCFullYear(),
-        nowDate.getUTCMonth(),
-        nowDate.getUTCDate() + 1,
-        hour,
-        minute,
-        tz
-      );
-    }
-    return new Date(utc).toISOString();
-  } catch {
-    return null;
-  }
-}
-
-// src/usage/parse-usage.ts
-var ESC = "\\u001b";
-var ANSI_CSI = new RegExp(`${ESC}\\[[0-9;?]*[ -/]*[@-~]`, "g");
-var ANSI_OSC = new RegExp(`${ESC}\\][^\\u0007${ESC}]*(?:\\u0007|${ESC}\\\\)`, "g");
-var BAR_GLYPHS = /[─-▟]/g;
-function normalizeUsageText(stdout) {
-  return stdout.replace(ANSI_CSI, "").replace(ANSI_OSC, "").replace(BAR_GLYPHS, " ").replace(/\r/g, "");
-}
-function parseUsageGauges(stdout, now = Date.now(), defaultTz) {
-  const text = normalizeUsageText(stdout);
-  const rows = [
-    ...text.matchAll(
-      /Current (session|week)\s*(\([^)\n]*\))?[^%\n]*?(\d+(?:\.\d+)?)\s*%(?:\s*used)?([^\n]*?)(?=Current\s+(?:session|week)\b|\n|$)/gi
-    )
-  ];
-  const gauges = rows.map((m) => ({
-    label: `Current ${m[1].toLowerCase()}${m[2] ? ` ${m[2]}` : ""}`,
-    utilization: Number(m[3]) / 100,
-    resetsAt: parseResetInstant(m[4] ?? "", now, defaultTz)
-  }));
-  const session = gauges.find((g) => g.label.startsWith("Current session"));
-  const weekly = gauges.filter((g) => g.label.startsWith("Current week"));
-  const weeklyResets = weekly.map((g) => g.resetsAt).filter((r) => r !== null);
-  return {
-    sessionUsage: session ? session.utilization : null,
-    weeklyUsage: weekly.length ? Math.max(...weekly.map((g) => g.utilization)) : null,
-    sessionResetsAt: session?.resetsAt ?? null,
-    // Soonest weekly reset (all weekly rows share one instant in practice).
-    weeklyResetsAt: weeklyResets.length ? new Date(Math.min(...weeklyResets.map((r) => new Date(r).getTime()))).toISOString() : null,
-    gauges
-  };
-}
+// src/usage/isolated-probe.ts
+import { mkdtemp as mkdtemp3, writeFile as writeFile10, copyFile, rm as rm5 } from "fs/promises";
+import { join as join21 } from "path";
 
 // src/usage/run-probe.ts
+var logger8 = createServiceLogger("usage-probe");
 var PROBE_TIMEOUT_MS = 3e4;
 var FIRST_SEND_MS = 5e3;
 var RESEND_INTERVAL_MS = 4e3;
@@ -14815,7 +14742,8 @@ function buildProbeEnv(env = process.env) {
   return clean;
 }
 function panelRendering(buf) {
-  return /Current session/i.test(buf) && /%/.test(buf);
+  const text = flattenTerminalText(buf);
+  return /Current\s*session/i.test(text) && /%/.test(text);
 }
 var UsageProbeRun = class {
   constructor(resolve, timing) {
@@ -14839,7 +14767,7 @@ var UsageProbeRun = class {
       this.childExited = true;
       this.finishBestEffort();
     });
-    this.hardTimer = setTimeout(() => this.finishBestEffort(), timeoutMs);
+    this.hardTimer = setTimeout(() => this.finishOnTimeout(), timeoutMs);
     this.hardTimer.unref?.();
     const first = setTimeout(() => this.trySend(), this.timing.firstSendMs);
     first.unref?.();
@@ -14859,6 +14787,15 @@ var UsageProbeRun = class {
     if (this.settleTimer || !panelRendering(this.buf)) return;
     this.settleTimer = setTimeout(() => this.finish(this.buf), this.timing.settleMs);
   }
+  finishOnTimeout() {
+    if (!this.settled && !panelRendering(this.buf)) {
+      logger8.info("usage probe timed out before the panel rendered", {
+        bufferLength: this.buf.length,
+        sends: this.sends
+      });
+    }
+    this.finishBestEffort();
+  }
   finishBestEffort() {
     this.finish(panelRendering(this.buf) ? this.buf : cleanTerminalOutput(this.buf, 500));
   }
@@ -14914,62 +14851,210 @@ async function runUsageProbe(deps = {}) {
   });
 }
 
+// src/usage/isolated-probe.ts
+var logger9 = createServiceLogger("isolated-probe");
+async function probeUsageIsolated(token, opts = {}) {
+  let dir = null;
+  try {
+    dir = await mkdtemp3(join21(sessionTempBase(), "conveyor-usage-"));
+    const credentials = buildSynthesizedCredentials(token, opts.now ?? Date.now());
+    await writeFile10(join21(dir, ".credentials.json"), credentials, {
+      encoding: "utf8",
+      mode: 384
+    });
+    await copyFile(claudeJsonPath(), join21(dir, ".claude.json")).catch(() => {
+    });
+    return await runUsageProbe({ cwd: opts.cwd, env: { ...process.env, CLAUDE_CONFIG_DIR: dir } });
+  } catch (error) {
+    logger9.info("isolated usage probe failed", {
+      error: error instanceof Error ? error.message : String(error)
+    });
+    return "";
+  } finally {
+    if (dir) await rm5(dir, { recursive: true, force: true }).catch(() => {
+    });
+  }
+}
+
+// src/usage/reset-parse.ts
+var MONTHS = ["jan", "feb", "mar", "apr", "may", "jun", "jul", "aug", "sep", "oct", "nov", "dec"];
+function tzOffsetMs(utcMs, tz) {
+  const dtf = new Intl.DateTimeFormat("en-US", {
+    timeZone: tz,
+    hour12: false,
+    year: "numeric",
+    month: "2-digit",
+    day: "2-digit",
+    hour: "2-digit",
+    minute: "2-digit",
+    second: "2-digit"
+  });
+  const map = {};
+  for (const part of dtf.formatToParts(new Date(utcMs))) {
+    if (part.type !== "literal") map[part.type] = part.value;
+  }
+  const hour = map.hour === "24" ? 0 : Number(map.hour);
+  const asUtc = Date.UTC(
+    Number(map.year),
+    Number(map.month) - 1,
+    Number(map.day),
+    hour,
+    Number(map.minute),
+    Number(map.second)
+  );
+  return asUtc - utcMs;
+}
+function zonedWallClockToUtc(y, mo, d, h, mi, tz) {
+  if (tz === "UTC" || tz === "Etc/UTC") return Date.UTC(y, mo, d, h, mi);
+  const naiveUtc = Date.UTC(y, mo, d, h, mi);
+  const firstGuess = naiveUtc - tzOffsetMs(naiveUtc, tz);
+  return naiveUtc - tzOffsetMs(firstGuess, tz);
+}
+function localTimeZone() {
+  try {
+    return Intl.DateTimeFormat().resolvedOptions().timeZone || "UTC";
+  } catch {
+    return "UTC";
+  }
+}
+function parseResetInstant(rowText, now, defaultTz = localTimeZone()) {
+  const m = /resets\s*(?:by\s*)?(?:([a-z]{3})\s*(\d{1,2})(?:,|\s*at)?\s*)?(\d{1,2})(?::(\d{2}))?\s*(am|pm)(?:\s*\(([^)]+)\))?/i.exec(
+    rowText
+  );
+  if (!m) return null;
+  const [, monStr, dayStr, hourStr, minStr, meridiem, tzRaw] = m;
+  const tz = tzRaw ? tzRaw.trim() : defaultTz;
+  let hour = Number(hourStr) % 12;
+  if (/pm/i.test(meridiem)) hour += 12;
+  const minute = minStr ? Number(minStr) : 0;
+  const nowDate = new Date(now);
+  try {
+    if (monStr && dayStr) {
+      const month = MONTHS.indexOf(monStr.toLowerCase());
+      if (month < 0) return null;
+      const day = Number(dayStr);
+      let utc2 = zonedWallClockToUtc(nowDate.getUTCFullYear(), month, day, hour, minute, tz);
+      if (utc2 < now - 24 * 60 * 60 * 1e3) {
+        utc2 = zonedWallClockToUtc(nowDate.getUTCFullYear() + 1, month, day, hour, minute, tz);
+      }
+      return new Date(utc2).toISOString();
+    }
+    let utc = zonedWallClockToUtc(
+      nowDate.getUTCFullYear(),
+      nowDate.getUTCMonth(),
+      nowDate.getUTCDate(),
+      hour,
+      minute,
+      tz
+    );
+    if (utc <= now) {
+      utc = zonedWallClockToUtc(
+        nowDate.getUTCFullYear(),
+        nowDate.getUTCMonth(),
+        nowDate.getUTCDate() + 1,
+        hour,
+        minute,
+        tz
+      );
+    }
+    return new Date(utc).toISOString();
+  } catch {
+    return null;
+  }
+}
+
+// src/usage/parse-usage.ts
+var BAR_GLYPHS = /[─-▟]/g;
+function normalizeUsageText(stdout) {
+  return flattenTerminalText(stdout).replace(BAR_GLYPHS, " ").replace(/[\r\n]+/g, " ");
+}
+function parseUsageGauges(stdout, now = Date.now(), defaultTz) {
+  const text = normalizeUsageText(stdout);
+  const rows = [
+    ...text.matchAll(
+      /Current\s*(session|week)\s*(\([^)\n]*\))?[^%\n]*?(\d+(?:\.\d+)?)\s*%(?:\s*used)?([^\n]*?)(?=Current\s*(?:session|week)|\n|$)/gi
+    )
+  ];
+  const gauges = rows.map((m) => ({
+    label: `Current ${m[1].toLowerCase()}${m[2] ? ` ${m[2]}` : ""}`,
+    utilization: Number(m[3]) / 100,
+    resetsAt: parseResetInstant(m[4] ?? "", now, defaultTz)
+  }));
+  const session = gauges.find((g) => g.label.startsWith("Current session"));
+  const weekly = gauges.filter((g) => g.label.startsWith("Current week"));
+  const weeklyResets = weekly.map((g) => g.resetsAt).filter((r) => r !== null);
+  return {
+    sessionUsage: session ? session.utilization : null,
+    weeklyUsage: weekly.length ? Math.max(...weekly.map((g) => g.utilization)) : null,
+    sessionResetsAt: session?.resetsAt ?? null,
+    // Soonest weekly reset (all weekly rows share one instant in practice).
+    weeklyResetsAt: weeklyResets.length ? new Date(Math.min(...weeklyResets.map((r) => new Date(r).getTime()))).toISOString() : null,
+    gauges
+  };
+}
+
 // src/execution/usage-sampler.ts
-var logger7 = createServiceLogger("usage-sampler");
+var logger10 = createServiceLogger("usage-sampler");
 var NO_SAMPLES = { samples: [], unmeasurable: null };
 function usesNativeUsageReporting(env = process.env) {
   return env.CONVEYOR_TUI === "codex";
 }
-function isAttributable(identity, sessionToken) {
+function isAttributable(identity) {
   if (!identity) return { ok: true };
   if (identity.hasRefreshToken && !identity.isConveyorOwned) {
     return { ok: false, reason: "manual-login-credentials" };
   }
-  if (!(identity.hasRefreshToken && identity.isConveyorOwned) && sessionToken && identity.accessToken && identity.accessToken !== sessionToken) {
-    return { ok: false, reason: "credentials-token-mismatch" };
-  }
   return { ok: true };
 }
-async function sampleKeyUsage(token, probe = () => runUsageProbe(), hasSubscriptionCredentials = () => existsSync2(claudeCredentialsPath()), readIdentity = readCredentialsIdentity) {
-  if (!token && !hasSubscriptionCredentials()) return NO_SAMPLES;
+function samplesFromPanel(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
+    });
+  }
+  if (samples.length === 0) {
+    logger10.info("usage sample produced no gauges", {
+      stdoutLength: stdout.length,
+      stdoutHead: stdout.slice(0, 200).replaceAll("\n", " ")
+    });
+  }
+  return samples;
+}
+async function sampleKeyUsage(opts = {}) {
+  const { token, cwd } = opts;
+  const hasCredentialsFile = opts.hasCredentialsFile ?? (() => existsSync2(claudeCredentialsPath()));
+  if (!token && !hasCredentialsFile()) return NO_SAMPLES;
   try {
-    const attributable = isAttributable(await readIdentity(), token);
+    if (token) {
+      const probeToken = opts.probeToken ?? ((own) => probeUsageIsolated(own, { cwd }));
+      return { samples: samplesFromPanel(await probeToken(token)), unmeasurable: null };
+    }
+    const attributable = isAttributable(await (opts.readIdentity ?? readCredentialsIdentity)());
     if (!attributable.ok) {
-      logger7.info("usage sample skipped \u2014 credentials not attributable to this session's key", {
+      logger10.info("usage sample skipped \u2014 credentials not attributable to this session's key", {
         reason: attributable.reason
       });
       return { samples: [], unmeasurable: { reason: attributable.reason ?? "unattributable" } };
     }
-    const stdout = await probe();
-    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
-      });
-    }
-    if (samples.length === 0) {
-      logger7.info("usage sample produced no gauges", {
-        stdoutLength: stdout.length,
-        stdoutHead: stdout.slice(0, 200).replaceAll("\n", " ")
-      });
-    }
-    return { samples, unmeasurable: null };
+    const probeFile = opts.probeCredentialsFile ?? (() => runUsageProbe({ cwd }));
+    return { samples: samplesFromPanel(await probeFile()), unmeasurable: null };
   } catch (error) {
-    logger7.info("usage sample failed", {
+    logger10.info("usage sample failed", {
       error: error instanceof Error ? error.message : String(error)
     });
     return NO_SAMPLES;
@@ -16338,10 +16423,10 @@ var SessionRunner = class _SessionRunner {
   async sampleAndReportKeyUsage() {
     if (this.stopped || usesNativeUsageReporting()) return;
     const codingAgentKeyId = process.env.CONVEYOR_CODING_AGENT_KEY_ID;
-    const { samples, unmeasurable } = await sampleKeyUsage(
-      process.env.CLAUDE_CODE_OAUTH_TOKEN,
-      () => runUsageProbe({ cwd: this.config.workspaceDir })
-    );
+    const { samples, unmeasurable } = await sampleKeyUsage({
+      token: process.env.CLAUDE_CODE_OAUTH_TOKEN,
+      cwd: this.config.workspaceDir
+    });
     if (unmeasurable) {
       this.connection.sendEvent(buildUnmeasurableEvent(unmeasurable.reason, codingAgentKeyId));
       return;
@@ -16868,8 +16953,6 @@ function unshallowRepo(workspaceDir) {
 
 export {
   isPermissionDeniedError,
-  buildSynthesizedCredentials,
-  claudeJsonPath,
   PtyHarness,
   resolveTuiKindFromEnv,
   resolveTuiAdapter,
@@ -16878,8 +16961,8 @@ export {
   buildProjectTools,
   resolvePlaywrightMcpServer,
   resolveSessionStart,
+  probeUsageIsolated,
   parseUsageGauges,
-  runUsageProbe,
   usesNativeUsageReporting,
   sampleKeyUsage,
   buildRateLimitEvents,