@rallycry/conveyor-agent 11.0.47 → 11.0.49

package/dist/{chunk-EKTPDG3G.js → chunk-SXZS2R52.js}

@@ -46,9 +46,32 @@ function spawnOptionsFingerprint(input) {
   if (input.effort) parts.push(input.effort);
   return JSON.stringify(parts);
 }
-var ANSI_CSI = new RegExp(`${String.fromCharCode(27)}\\[[0-9;?]*[ -/]*[@-~]`, "g");
+var ESC = String.fromCharCode(27);
+var ANSI_CSI = new RegExp(`${ESC}\\[([0-9;?]*)([ -/]*)([@-~])`, "g");
+var ANSI_OSC = new RegExp(`${ESC}\\][^\\u0007${ESC}]*(?:\\u0007|${ESC}\\\\)`, "g");
+var MAX_CURSOR_FORWARD = 300;
+function flattenTerminalText(raw) {
+  return raw.replace(ANSI_OSC, "").replace(ANSI_CSI, (_seq, params, inter, final) => {
+    if (inter || params.startsWith("?")) return "";
+    switch (final) {
+      case "C":
+        return " ".repeat(Math.min(Math.max(Number(params) || 1, 1), MAX_CURSOR_FORWARD));
+      case "G":
+        return " ";
+      case "A":
+      case "B":
+      case "E":
+      case "F":
+      case "H":
+      case "f":
+        return "\n";
+      default:
+        return "";
+    }
+  });
+}
 function cleanTerminalOutput(raw, maxChars = 1200) {
-  const noAnsi = raw.replace(ANSI_CSI, "");
+  const noAnsi = flattenTerminalText(raw);
   let out = "";
   for (const ch of noAnsi) {
     const code = ch.charCodeAt(0);
@@ -215,6 +238,7 @@ function inheritedEnv(socketPath) {
   if (env.CLAUDE_CODE_OAUTH_TOKEN) {
     delete env.ANTHROPIC_API_KEY;
   }
+  delete env.CONVEYOR_CLAUDE_OAUTH;
   if (ghHostsManagedByConveyor() && env.CONVEYOR_KEEP_GH_TOKEN_ENV !== "1") {
     delete env.GH_TOKEN;
     delete env.GITHUB_TOKEN;
@@ -272,6 +296,7 @@ export {
   resolveClaudeBinary,
   buildSpawnArgs,
   spawnOptionsFingerprint,
+  flattenTerminalText,
   cleanTerminalOutput,
   buildExitErrors,
   MAX_DIAGNOSTIC_OUTPUT,

package/dist/cli.js

@@ -7,33 +7,30 @@ import {
   WorkspaceCommandSupervisor,
   startWorkspaceCommandsAfterConnect,
   stopWorkspaceCommands
-} from "./chunk-4A6GCJGG.js";
+} from "./chunk-K35YJK2U.js";
 import {
   PtyHarness,
   SessionRunner,
   buildProjectTools,
   buildRateLimitEvents,
-  buildSynthesizedCredentials,
   buildUnmeasurableEvent,
-  claudeJsonPath,
   getEffortOverride,
   getModelOverride,
   isPermissionDeniedError,
   parseUsageGauges,
+  probeUsageIsolated,
   resolvePlaywrightMcpServer,
   resolveSessionStart,
   resolveTuiAdapter,
   resolveTuiKindFromEnv,
-  runUsageProbe,
   sampleKeyUsage,
   usesNativeUsageReporting
-} from "./chunk-7Y3IY5QQ.js";
+} from "./chunk-RNE3JAF5.js";
 import "./chunk-V5WR2F2P.js";
 import {
   inheritedEnv,
-  resolvePtySpawn,
-  sessionTempBase
-} from "./chunk-EKTPDG3G.js";
+  resolvePtySpawn
+} from "./chunk-SXZS2R52.js";
 import {
   AgentConnection,
   DEFAULT_LIFECYCLE_CONFIG,
@@ -44,7 +41,7 @@ import {
   createServiceLogger,
   loadAndAnnotateDiscoveredPorts,
   loadConveyorConfig
-} from "./chunk-KXB55NJP.js";
+} from "./chunk-O3MXZHIS.js";
 import "./chunk-VIUZS7V4.js";
 import "./chunk-W4LZ7R6Z.js";
 import "./chunk-372R6E4C.js";
@@ -55,7 +52,7 @@ import "./chunk-6Q6LQBWO.js";
 
 // src/cli.ts
 import { readFileSync } from "fs";
-import { join as join2, dirname } from "path";
+import { join, dirname } from "path";
 import { fileURLToPath } from "url";
 
 // src/utils/session-identity.ts
@@ -238,10 +235,10 @@ var ProjectSessionRunner = class {
   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;
@@ -259,8 +256,6 @@ var ProjectSessionRunner = class {
 };
 
 // src/usage/multi-key-probe.ts
-import { mkdtemp, writeFile, copyFile, rm } from "fs/promises";
-import { join } from "path";
 var logger = createServiceLogger("multi-key-probe");
 function gaugesToSamples(stdout) {
   const { sessionUsage, weeklyUsage, sessionResetsAt, weeklyResetsAt, gauges } = parseUsageGauges(stdout);
@@ -285,30 +280,9 @@ function gaugesToSamples(stdout) {
   }
   return samples;
 }
-async function isolatedProbe(token, now, cwd) {
-  let dir = null;
-  try {
-    dir = await mkdtemp(join(sessionTempBase(), "conveyor-usage-"));
-    await writeFile(join(dir, ".credentials.json"), buildSynthesizedCredentials(token, now), {
-      encoding: "utf8",
-      mode: 384
-    });
-    await copyFile(claudeJsonPath(), join(dir, ".claude.json")).catch(() => {
-    });
-    return await runUsageProbe({ cwd, 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(), deps.cwd));
+  const probeOne = deps.probeOne ?? ((token) => probeUsageIsolated(token, { now: now(), cwd: deps.cwd }));
   const results = [];
   for (const key of keys) {
     if (!key.oauthToken) continue;
@@ -582,10 +556,10 @@ var AdhocSessionRunner = class {
   async sampleAndReportOwnKey() {
     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;
@@ -1212,7 +1186,7 @@ function wireSpawnChildren(mode, connection, supervisors, logger7) {
 
 // src/cli.ts
 if (process.argv[2] === "boot") {
-  const { runBoot } = await import("./boot-ZPXDDZDF.js");
+  const { runBoot } = await import("./boot-GD5XMLPS.js");
   process.exit(await runBoot(process.argv.slice(3)));
 }
 if (isLegacyEntrypointLaunch(process.env)) {
@@ -1222,7 +1196,7 @@ if (isLegacyEntrypointLaunch(process.env)) {
 }
 if (process.argv.includes("--version")) {
   const __dirname = dirname(fileURLToPath(import.meta.url));
-  const pkgPath = join2(__dirname, "..", "package.json");
+  const pkgPath = join(__dirname, "..", "package.json");
   const pkg = JSON.parse(readFileSync(pkgPath, "utf-8"));
   process.stdout.write(pkg.version + "\n");
   process.exit(0);
@@ -1281,7 +1255,7 @@ process.on("unhandledRejection", (reason) => {
   process.exit(1);
 });
 if (process.env.CONVEYOR_MODE === "workbench") {
-  const { startWorkbenchServer } = await import("./server-GJZKUVBE.js");
+  const { startWorkbenchServer } = await import("./server-FPDS4CT5.js");
   const { oomWatchdogOptionsFromEnv } = await import("./oom-watchdog-PAC5OJJG.js");
   const { DEFAULT_WORKBENCH_PORT } = await import("./protocol-QBCYO4GI.js");
   const port = Number(process.env.CONVEYOR_WORKBENCH_PORT) || DEFAULT_WORKBENCH_PORT;
@@ -1291,7 +1265,7 @@ if (process.env.CONVEYOR_MODE === "workbench") {
     process.exit(1);
   }
   const pkgDir = dirname(fileURLToPath(import.meta.url));
-  const pkg = JSON.parse(readFileSync(join2(pkgDir, "..", "package.json"), "utf-8"));
+  const pkg = JSON.parse(readFileSync(join(pkgDir, "..", "package.json"), "utf-8"));
   const handle = await startWorkbenchServer({
     port,
     token,
@@ -1423,7 +1397,7 @@ if (!RUNNER_MODES.includes(CONVEYOR_MODE)) {
   process.exit(1);
 }
 if (CONVEYOR_MODE === "serving") {
-  const { runServingSession } = await import("./serve-boot-TPZ6CPCQ.js");
+  const { runServingSession } = await import("./serve-boot-4QBD4LW4.js");
   exitContext.runnerMode = "serving";
   exitContext.sessionId = process.env.CONVEYOR_SESSION_ID ?? exitContext.sessionId;
   const outcome = await runServingSession({

package/dist/index.js

@@ -1,9 +1,9 @@
 import {
   SessionRunner,
   unshallowRepo
-} from "./chunk-7Y3IY5QQ.js";
+} from "./chunk-RNE3JAF5.js";
 import "./chunk-V5WR2F2P.js";
-import "./chunk-EKTPDG3G.js";
+import "./chunk-SXZS2R52.js";
 import {
   AgentConnection,
   GIT_TIMEOUT_MS,
@@ -17,7 +17,7 @@ import {
   stageAndCommit,
   updateRemoteToken,
   workspacePathExists
-} from "./chunk-KXB55NJP.js";
+} from "./chunk-O3MXZHIS.js";
 import "./chunk-VIUZS7V4.js";
 import {
   runAuthTokenCommand,

package/dist/{serve-boot-TPZ6CPCQ.js → serve-boot-4QBD4LW4.js}

@@ -1,6 +1,6 @@
 import {
   WorkspaceCommandSupervisor
-} from "./chunk-4A6GCJGG.js";
+} from "./chunk-K35YJK2U.js";
 import {
   AgentConnection,
   DEFAULT_LIFECYCLE_CONFIG,
@@ -11,7 +11,7 @@ import {
   ensureOnTaskBranch,
   loadAndAnnotateDiscoveredPorts,
   loadConveyorConfig
-} from "./chunk-KXB55NJP.js";
+} from "./chunk-O3MXZHIS.js";
 import "./chunk-VIUZS7V4.js";
 import "./chunk-W4LZ7R6Z.js";
 import "./chunk-IA45XHOA.js";

package/dist/{server-GJZKUVBE.js → server-FPDS4CT5.js}

@@ -1,7 +1,7 @@
 import {
   startWorkbenchServer
-} from "./chunk-F7XHSNU7.js";
-import "./chunk-EKTPDG3G.js";
+} from "./chunk-ATYCG6MT.js";
+import "./chunk-SXZS2R52.js";
 import "./chunk-W4LZ7R6Z.js";
 import "./chunk-372R6E4C.js";
 import "./chunk-SQM2BQ7H.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rallycry/conveyor-agent",
-  "version": "11.0.47",
+  "version": "11.0.49",
   "description": "Conveyor Agent Runner v10 - PTY harness for the task chat (SDK harness for audit/project-chat). Agent-as-User architecture with BaseService patterns. Works locally too.",
   "keywords": [
     "agent",
@@ -34,7 +34,7 @@
     "test:watch": "vitest",
     "lint": "oxlint -c ../../.oxlintrc.json src",
     "lint:fix": "oxlint -c ../../.oxlintrc.json --fix src",
-    "typecheck": "tsgo --noEmit"
+    "typecheck": "bash ../../scripts/typecheck.sh"
   },
   "dependencies": {
     "@anthropic-ai/claude-agent-sdk": "^0.3.284",