@rallycry/conveyor-agent 10.7.4 → 10.7.5

package/dist/{chunk-WJWMLZKR.js → chunk-CWTQXS34.js}

@@ -4403,9 +4403,9 @@ function extractSpawn(mod) {
 }
 async function loadPtySpawn() {
   const mod = await import("node-pty");
-  const spawn3 = extractSpawn(mod);
-  if (!spawn3) throw new Error("node-pty: spawn export not found");
-  return spawn3;
+  const spawn2 = extractSpawn(mod);
+  if (!spawn2) throw new Error("node-pty: spawn export not found");
+  return spawn2;
 }
 function inheritedEnv(socketPath) {
   const env = {};
@@ -4907,8 +4907,8 @@ var PtySession = class {
       // server doesn't load).
       ...this.mcpConfigPath ? { mcpConfigPath: this.mcpConfigPath } : {}
     });
-    const spawn3 = await loadPtySpawn();
-    const pty = spawn3(spec.file, spec.args, {
+    const spawn2 = await loadPtySpawn();
+    const pty = spawn2(spec.file, spec.args, {
       name: "xterm-color",
       cols: this.cols,
       rows: this.rows,
@@ -9604,10 +9604,21 @@ function readAgentVersion() {
   return null;
 }
 
+// src/execution/usage-sampler.ts
+import { existsSync as existsSync3 } from "fs";
+
 // src/usage/parse-usage.ts
+var ESC = "\\u001b";
+var ANSI_CSI2 = 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_CSI2, "").replace(ANSI_OSC, "").replace(BAR_GLYPHS, " ").replace(/\r/g, "");
+}
 function parseUsageGauges(stdout) {
-  const session = stdout.match(/Current session:\s*(\d+(?:\.\d+)?)%\s*used/i);
-  const weekly = [...stdout.matchAll(/Current week[^:\n]*:\s*(\d+(?:\.\d+)?)%\s*used/gi)];
+  const text = normalizeUsageText(stdout);
+  const session = text.match(/Current session[^%\n]*?(\d+(?:\.\d+)?)\s*%(?:\s*used)?/i);
+  const weekly = [...text.matchAll(/Current week[^%\n]*?(\d+(?:\.\d+)?)\s*%(?:\s*used)?/gi)];
   return {
     sessionUsage: session ? Number(session[1]) / 100 : null,
     weeklyUsage: weekly.length ? Math.max(...weekly.map((m) => Number(m[1]))) / 100 : null
@@ -9615,54 +9626,116 @@ function parseUsageGauges(stdout) {
 }
 
 // src/usage/run-probe.ts
-import { spawn } from "child_process";
-var PROBE_TIMEOUT_MS = 15e3;
+var PROBE_TIMEOUT_MS = 3e4;
+var FIRST_SEND_MS = 5e3;
+var RESEND_INTERVAL_MS = 4e3;
+var MAX_SENDS = 5;
+var RENDER_SETTLE_MS = 900;
 function buildProbeEnv(env = process.env) {
-  const { CLAUDE_CODE_OAUTH_TOKEN: _oauth, ANTHROPIC_API_KEY: _apiKey, ...rest } = env;
-  return rest;
-}
-function runUsageProbe(binary = resolveClaudeBinary(), args = ["-p", "/usage"]) {
+  const clean = {};
+  for (const [key, value] of Object.entries(env)) {
+    if (typeof value === "string") clean[key] = value;
+  }
+  delete clean.CLAUDE_CODE_OAUTH_TOKEN;
+  delete clean.ANTHROPIC_API_KEY;
+  return clean;
+}
+function panelRendering(buf) {
+  return /Current session/i.test(buf) && /%/.test(buf);
+}
+var UsageProbeRun = class {
+  constructor(resolve, timing) {
+    this.resolve = resolve;
+    this.timing = timing;
+  }
+  resolve;
+  timing;
+  buf = "";
+  settled = false;
+  sends = 0;
+  child = null;
+  hardTimer = null;
+  resendTimer = null;
+  settleTimer = null;
+  start(child, timeoutMs) {
+    this.child = child;
+    child.onData((data) => this.onData(data));
+    child.onExit(() => this.finishBestEffort());
+    this.hardTimer = setTimeout(() => this.finishBestEffort(), timeoutMs);
+    this.hardTimer.unref?.();
+    const first = setTimeout(() => this.trySend(), this.timing.firstSendMs);
+    first.unref?.();
+    this.resendTimer = setInterval(() => this.trySend(), this.timing.resendIntervalMs);
+    this.resendTimer.unref?.();
+  }
+  trySend() {
+    if (this.settled || this.sends >= MAX_SENDS) return;
+    this.sends += 1;
+    try {
+      this.child?.write("/usage\r");
+    } catch {
+    }
+  }
+  onData(chunk) {
+    this.buf += chunk;
+    if (this.settleTimer || !panelRendering(this.buf)) return;
+    this.settleTimer = setTimeout(() => this.finish(this.buf), this.timing.settleMs);
+  }
+  finishBestEffort() {
+    this.finish(panelRendering(this.buf) ? this.buf : "");
+  }
+  finish(out) {
+    if (this.settled) return;
+    this.settled = true;
+    if (this.hardTimer) clearTimeout(this.hardTimer);
+    if (this.resendTimer) clearInterval(this.resendTimer);
+    if (this.settleTimer) clearTimeout(this.settleTimer);
+    try {
+      this.child?.kill();
+    } catch {
+    }
+    this.resolve(out);
+  }
+};
+async function runUsageProbe(deps = {}) {
+  let spawn2 = deps.spawn;
+  if (!spawn2) {
+    try {
+      spawn2 = await loadPtySpawn();
+    } catch {
+      return "";
+    }
+  }
+  const binary = deps.binary ?? resolveClaudeBinary();
+  const cwd = deps.cwd ?? process.cwd();
+  const timeoutMs = deps.timeoutMs ?? PROBE_TIMEOUT_MS;
+  const timing = {
+    firstSendMs: deps.firstSendMs ?? FIRST_SEND_MS,
+    resendIntervalMs: deps.resendIntervalMs ?? RESEND_INTERVAL_MS,
+    settleMs: deps.settleMs ?? RENDER_SETTLE_MS
+  };
   return new Promise((resolve) => {
-    let stdout = "";
-    let settled = false;
-    const finish = (out) => {
-      if (settled) return;
-      settled = true;
-      resolve(out);
-    };
     let child;
     try {
-      child = spawn(binary, args, { stdio: ["ignore", "pipe", "ignore"], env: buildProbeEnv() });
+      child = spawn2(binary, [], {
+        name: "xterm-256color",
+        cols: 120,
+        rows: 45,
+        cwd,
+        env: buildProbeEnv()
+      });
     } catch {
-      finish("");
+      resolve("");
       return;
     }
-    const timer = setTimeout(() => {
-      try {
-        child.kill("SIGKILL");
-      } catch {
-      }
-      finish("");
-    }, PROBE_TIMEOUT_MS);
-    timer.unref?.();
-    child.stdout?.on("data", (d) => {
-      stdout += d.toString();
-    });
-    child.on("error", () => {
-      clearTimeout(timer);
-      finish("");
-    });
-    child.on("close", (code) => {
-      clearTimeout(timer);
-      finish(code === 0 ? stdout : "");
-    });
+    new UsageProbeRun(resolve, timing).start(child, timeoutMs);
   });
 }
 
 // src/execution/usage-sampler.ts
 var logger4 = createServiceLogger("usage-sampler");
-async function sampleKeyUsage(token, probe = runUsageProbe) {
-  if (!token) return [];
+async function sampleKeyUsage(token, probe = () => runUsageProbe(), hasSubscriptionCredentials = () => existsSync3(claudeCredentialsPath())) {
+  if (!token && !hasSubscriptionCredentials()) return [];
   try {
     const stdout = await probe();
     const { sessionUsage, weeklyUsage } = parseUsageGauges(stdout);
@@ -11003,7 +11076,7 @@ function loadConveyorConfig() {
 }
 
 // src/setup/commands.ts
-import { spawn as spawn2, execSync } from "child_process";
+import { spawn, execSync } from "child_process";
 var PROCESS_TERMINATION_GRACE_MS = 5e3;
 function abortError2() {
   const error = new Error("Operation aborted");
@@ -11044,7 +11117,7 @@ function terminateProcessGroup(child, graceMs = PROCESS_TERMINATION_GRACE_MS) {
 function runSetupCommand(cmd, cwd, onOutput, signal) {
   if (signal?.aborted) return Promise.reject(abortError2());
   return new Promise((resolve, reject) => {
-    const child = spawn2("sh", ["-c", cmd], {
+    const child = spawn("sh", ["-c", cmd], {
       cwd,
       stdio: ["ignore", "pipe", "pipe"],
       detached: true,
@@ -11100,7 +11173,7 @@ function runAuthTokenCommand(cmd, userEmail, cwd) {
   }
 }
 function runStartCommand(cmd, cwd, onOutput) {
-  const child = spawn2("sh", ["-c", cmd], {
+  const child = spawn("sh", ["-c", cmd], {
     cwd,
     stdio: ["ignore", "pipe", "pipe"],
     detached: true,
@@ -11174,4 +11247,4 @@ export {
   runStartCommand,
   unshallowRepo
 };
-//# sourceMappingURL=chunk-WJWMLZKR.js.map
+//# sourceMappingURL=chunk-CWTQXS34.js.map