@moda-ai/cli 1.55.27 → 1.55.29

package/dist/cli.js

@@ -17,7 +17,7 @@ import {
   withFrustrationAnchors,
   withToolFailureAnchors,
   withoutDetectionWindows
-} from "./cli-vdkwkkp5.js";
+} from "./cli-fwpqghgc.js";
 import {
   createCommandContext,
   envOptOutSet,
@@ -25,7 +25,7 @@ import {
   optOutFlagSet,
   parseBooleanFlagValue,
   withoutFlag
-} from "./cli-v8q7sd7g.js";
+} from "./cli-dr6x0zv7.js";
 import {
   AuditSchema,
   COMMAND_FLAG_SPECS,
@@ -67,20 +67,14 @@ import {
   unknownSignalsSubcommandError,
   usageLine,
   writeDryRun
-} from "./cli-wzds257x.js";
+} from "./cli-n2hng3gv.js";
 import {
   ApiError,
   callControlAPI,
   callDataAPI
-} from "./cli-pg5qfmqc.js";
+} from "./cli-e23g9ywa.js";
 import {
   AGENT_ERROR_CODES,
-  CliAccessError,
-  CliAuthError,
-  CliCancellationError,
-  CliInputError,
-  CliInputRequiredError,
-  CliNotFoundError,
   EXIT_AUTH_REQUIRED,
   EXIT_CANCELLED,
   EXIT_DEGRADED,
@@ -92,18 +86,14 @@ import {
   VERSION,
   agentEnvelopeFits,
   agentMaxOutputBytes,
-  apiErrorStatus,
   apiKeyHeaders,
-  attachInputDetails,
   canonicalCommandText,
   createCliOutput,
   embeddedTenantIdFromApiKey,
   errorToAgentError,
+  getActiveProfile,
   getApiRequestCount,
   getModaDir,
-  inputDetailsOf,
-  isApiLikeError,
-  isNetworkLikeError,
   isPlatformApiKey,
   loadProfileConfig,
   resetApiRequestCount,
@@ -119,13 +109,27 @@ import {
   shellArg,
   validateConfig,
   wasOutputCancelled
-} from "./cli-r5pp7qny.js";
+} from "./cli-99p2jh28.js";
+import {
+  CliAccessError,
+  CliAuthError,
+  CliCancellationError,
+  CliInputError,
+  CliInputRequiredError,
+  CliNotFoundError,
+  apiErrorStatus,
+  attachInputDetails,
+  inputDetailsOf,
+  isApiLikeError,
+  isNetworkLikeError
+} from "./cli-k4tqwah4.js";
+import"./cli-ns5fcnkz.js";
 import {
   __require
 } from "./cli-0v6na3yp.js";
 
 // src/cli.ts
-import { randomUUID as randomUUID2 } from "node:crypto";
+import { randomUUID as randomUUID3 } from "node:crypto";
 import { z } from "zod";
 
 // src/replays.ts
@@ -384,10 +388,223 @@ function spawnDetachedNode(script, options = {}, spawnImpl = spawn) {
 }
 
 // src/telemetry.ts
-import { randomUUID } from "node:crypto";
+import { randomUUID as randomUUID2 } from "node:crypto";
+
+// src/telemetry-spool.ts
+import { createHash, randomUUID } from "node:crypto";
+import {
+  closeSync,
+  constants as fsConstants,
+  fchmodSync,
+  mkdirSync,
+  openSync,
+  readFileSync,
+  renameSync,
+  rmSync,
+  statSync,
+  unlinkSync,
+  writeSync
+} from "node:fs";
+import { join } from "node:path";
+var SPOOL_MAX_BYTES = 256 * 1024;
+var FLUSH_MIN_EVENTS = 20;
+var FLUSH_MAX_AGE_MS = 30000;
+var SPOOL_MAX_EVENT_AGE_MS = 7 * 24 * 60 * 60 * 1000;
+var FLUSH_LOCK_STALE_MS = 30000;
+var MAX_BATCH_EVENTS = 50;
+var SPOOL_LOCK_STALE_MS = 2000;
+var SPOOL_LOCK_WAIT_MS = 200;
+var SPOOL_FILE = "usage-spool.jsonl";
+var LOCK_FILE = "flush.lock";
+var SPOOL_LOCK_FILE = "spool.lock";
+var O_NOFOLLOW = fsConstants.O_NOFOLLOW ?? 0;
+function telemetrySpoolDir() {
+  return join(getModaDir(), "telemetry");
+}
+function keyFingerprint(apiKey) {
+  return createHash("sha256").update(`moda-cli-usage-spool\x00${apiKey}`).digest("hex").slice(0, 16);
+}
+function ensureDir(dir) {
+  mkdirSync(dir, { recursive: true, mode: 448 });
+}
+function appendLines(path, text) {
+  const fd = openSync(path, fsConstants.O_WRONLY | fsConstants.O_APPEND | fsConstants.O_CREAT | O_NOFOLLOW, 384);
+  try {
+    try {
+      fchmodSync(fd, 384);
+    } catch {}
+    writeSync(fd, text);
+  } finally {
+    closeSync(fd);
+  }
+}
+function sleepSync(ms) {
+  Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
+}
+function createLockFile(path, staleMs, now) {
+  for (let attempt = 0;attempt < 2; attempt += 1) {
+    try {
+      const fd = openSync(path, fsConstants.O_WRONLY | fsConstants.O_CREAT | fsConstants.O_EXCL | O_NOFOLLOW, 384);
+      try {
+        writeSync(fd, String(process.pid));
+      } finally {
+        closeSync(fd);
+      }
+      return true;
+    } catch (error) {
+      if (error.code !== "EEXIST")
+        return false;
+      try {
+        if (now - statSync(path).mtimeMs < staleMs)
+          return false;
+        unlinkSync(path);
+      } catch {}
+    }
+  }
+  return false;
+}
+function withSpoolLock(dir, fn) {
+  const path = join(dir, SPOOL_LOCK_FILE);
+  const deadline = Date.now() + SPOOL_LOCK_WAIT_MS;
+  while (!createLockFile(path, SPOOL_LOCK_STALE_MS, Date.now())) {
+    if (Date.now() >= deadline)
+      throw new Error("telemetry spool is locked");
+    sleepSync(5);
+  }
+  try {
+    return fn();
+  } finally {
+    try {
+      unlinkSync(path);
+    } catch {}
+  }
+}
+function fileSize(path) {
+  try {
+    return statSync(path).size;
+  } catch {
+    return 0;
+  }
+}
+function parseEntries(text) {
+  const entries = [];
+  for (const line of text.split(`
+`)) {
+    if (!line)
+      continue;
+    try {
+      const entry = JSON.parse(line);
+      if (entry && entry.v === 1 && typeof entry.url === "string" && typeof entry.profile === "string" && typeof entry.key === "string" && typeof entry.t === "number" && entry.event && typeof entry.event === "object") {
+        entries.push(entry);
+      }
+    } catch {}
+  }
+  return entries;
+}
+function sameGroup(a, b) {
+  return a.url === b.url && a.profile === b.profile && a.key === b.key;
+}
+function appendSpoolEntry(entry, dir = telemetrySpoolDir()) {
+  ensureDir(dir);
+  const path = join(dir, SPOOL_FILE);
+  const line = `${JSON.stringify(entry)}
+`;
+  return withSpoolLock(dir, () => {
+    if (fileSize(path) + Buffer.byteLength(line) > SPOOL_MAX_BYTES)
+      return false;
+    appendLines(path, line);
+    return true;
+  });
+}
+function readSpool(dir = telemetrySpoolDir()) {
+  try {
+    return parseEntries(readFileSync(join(dir, SPOOL_FILE), "utf8"));
+  } catch {
+    return [];
+  }
+}
+function discardSpool(dir = telemetrySpoolDir()) {
+  try {
+    rmSync(join(dir, SPOOL_FILE), { force: true });
+  } catch {}
+}
+function flushDue(entries, group, now) {
+  let count = 0;
+  for (const entry of entries) {
+    if (!sameGroup(entry, group))
+      continue;
+    count += 1;
+    if (count >= FLUSH_MIN_EVENTS || now - entry.t >= FLUSH_MAX_AGE_MS)
+      return true;
+  }
+  return false;
+}
+function acquireFlushLock(dir = telemetrySpoolDir(), now = Date.now()) {
+  ensureDir(dir);
+  const path = join(dir, LOCK_FILE);
+  return createLockFile(path, FLUSH_LOCK_STALE_MS, now) ? path : undefined;
+}
+function releaseFlushLock(path) {
+  if (!path)
+    return;
+  try {
+    unlinkSync(path);
+  } catch {}
+}
+function claimSpoolGroup(group, dir = telemetrySpoolDir(), now = Date.now(), limit = Number.POSITIVE_INFINITY) {
+  try {
+    return withSpoolLock(dir, () => claimLocked(group, dir, now, limit));
+  } catch {
+    return [];
+  }
+}
+function claimLocked(group, dir, now, limit) {
+  const path = join(dir, SPOOL_FILE);
+  const claim = join(dir, `${SPOOL_FILE}.${process.pid}.${randomUUID()}.claim`);
+  try {
+    renameSync(path, claim);
+  } catch {
+    return [];
+  }
+  let entries = [];
+  try {
+    entries = parseEntries(readFileSync(claim, "utf8"));
+  } catch {} finally {
+    rmSync(claim, { force: true });
+  }
+  const mine = [];
+  const others = [];
+  for (const entry of entries) {
+    const age = now - entry.t;
+    if (age > SPOOL_MAX_EVENT_AGE_MS || age < -FLUSH_LOCK_STALE_MS)
+      continue;
+    (sameGroup(entry, group) && mine.length < limit ? mine : others).push(entry);
+  }
+  if (others.length > 0) {
+    try {
+      const text = others.map((entry) => `${JSON.stringify(entry)}
+`).join("");
+      if (fileSize(path) + Buffer.byteLength(text) <= SPOOL_MAX_BYTES)
+        appendLines(path, text);
+    } catch {}
+  }
+  return mine;
+}
+function batchBodies(entries, now = Date.now()) {
+  const bodies = [];
+  for (let start = 0;start < entries.length; start += MAX_BATCH_EVENTS) {
+    const events = entries.slice(start, start + MAX_BATCH_EVENTS).map((entry) => ({ ...entry.event, age_ms: Math.min(SPOOL_MAX_EVENT_AGE_MS, Math.max(0, Math.round(now - entry.t))) }));
+    bodies.push(JSON.stringify(events));
+  }
+  return bodies;
+}
+
+// src/telemetry.ts
 var INLINE_TELEMETRY_TIMEOUT_MS = 500;
 var DETACHED_TELEMETRY_TIMEOUT_MS = 5000;
-var INVOCATION_ID = randomUUID();
+var DETACHED_TELEMETRY_HARD_STOP_MS = 20000;
+var MAX_FLUSH_BATCHES = Math.floor(DETACHED_TELEMETRY_HARD_STOP_MS / (2 * DETACHED_TELEMETRY_TIMEOUT_MS));
+var INVOCATION_ID = randomUUID2();
 var TELEMETRY_FLAG = "no-telemetry";
 var TELEMETRY_TRANSPORT_ENV = "MODA_CLI_TELEMETRY_TRANSPORT";
 var MAX_TELEMETRY_DURATION_MS = 86400000;
@@ -557,48 +774,103 @@ function safeCode(value) {
 var TELEMETRY_SENDER_SCRIPT = [
   "try {",
   "  let raw = '';",
-  `  const quit = setTimeout(() => process.exit(0), ${DETACHED_TELEMETRY_TIMEOUT_MS + 1000});`,
-  "  const done = () => clearTimeout(quit);",
+  "  let lock;",
+  "  const release = () => { if (typeof lock === 'string') { try { require('node:fs').unlinkSync(lock); } catch {} lock = undefined; } };",
+  `  const quit = setTimeout(() => { release(); process.exit(0); }, ${DETACHED_TELEMETRY_HARD_STOP_MS});`,
+  "  const done = () => { release(); clearTimeout(quit); };",
+  "  const post = (r, body) => new Promise((resolve) => {",
+  "    try {",
+  "      const u = new URL(r.url);",
+  "      const lib = require(u.protocol === 'https:' ? 'node:https' : 'node:http');",
+  "      const headers = Object.assign({}, r.headers, { 'Content-Length': Buffer.byteLength(body) });",
+  `      const req = lib.request(u, { method: 'POST', headers, agent: false, timeout: ${DETACHED_TELEMETRY_TIMEOUT_MS} }, (res) => {`,
+  "        res.on('error', () => resolve(0));",
+  "        res.on('end', () => resolve(res.statusCode || 0));",
+  "        res.resume();",
+  "      });",
+  "      req.on('timeout', () => req.destroy());",
+  "      req.on('error', () => resolve(0));",
+  "      req.end(body);",
+  "    } catch { resolve(0); }",
+  "  });",
+  "  const run = async (requests) => {",
+  "    for (const r of requests) {",
+  "      if (!r || typeof r.url !== 'string' || typeof r.body !== 'string' || !r.headers || typeof r.headers !== 'object') continue;",
+  "      const status = await post(r, r.body);",
+  "      if (status !== 400 || r.body[0] !== '[') continue;",
+  "      let events = [];",
+  "      try { events = JSON.parse(r.body); } catch {}",
+  "      await Promise.all((Array.isArray(events) ? events : []).map((event) => post(r, JSON.stringify(event))));",
+  "    }",
+  "  };",
   "  process.stdin.setEncoding('utf8');",
   "  process.stdin.on('error', () => {});",
   "  process.stdin.on('data', (chunk) => { raw += chunk; });",
   "  process.stdin.on('end', () => {",
-  "    try {",
-  "      const r = raw ? JSON.parse(raw) : null;",
-  "      raw = '';",
-  "      if (!r || typeof r.url !== 'string' || typeof fetch !== 'function') return done();",
-  "      const c = new AbortController();",
-  `      const t = setTimeout(() => c.abort(), ${DETACHED_TELEMETRY_TIMEOUT_MS});`,
-  "      fetch(r.url, { method: 'POST', headers: r.headers, body: r.body, signal: c.signal })",
-  "        .then((res) => (res.body && res.body.cancel ? res.body.cancel() : undefined))",
-  "        .catch(() => {})",
-  "        .finally(() => { clearTimeout(t); done(); });",
-  "    } catch { done(); }",
+  "    let job = null;",
+  "    try { job = raw ? JSON.parse(raw) : null; } catch {}",
+  "    raw = '';",
+  "    if (job && typeof job.lock === 'string') lock = job.lock;",
+  "    const requests = job && Array.isArray(job.requests) ? job.requests : [];",
+  "    run(requests).catch(() => {}).finally(done);",
   "  });",
   "} catch {}"
 ].join(`
 `);
-function spawnDetachedTelemetrySender(request, spawnImpl = spawn2) {
-  return spawnDetachedNode(TELEMETRY_SENDER_SCRIPT, { stdin: JSON.stringify(request), dropEnv: ["MODA_API_KEY"] }, spawnImpl);
+function spawnDetachedTelemetrySender(job, spawnImpl = spawn2) {
+  return spawnDetachedNode(TELEMETRY_SENDER_SCRIPT, { stdin: JSON.stringify(job), dropEnv: ["MODA_API_KEY"] }, spawnImpl);
+}
+async function sendTelemetryJobInline(job) {
+  try {
+    for (const pending of job.requests)
+      await sendInline(pending);
+  } finally {
+    releaseFlushLock(job.lock);
+  }
 }
 async function sendInline(request) {
+  const status = await postInline(request);
+  if (status !== 400 || !request.body.startsWith("["))
+    return;
+  let events = [];
+  try {
+    events = JSON.parse(request.body);
+  } catch {}
+  if (!Array.isArray(events))
+    return;
+  await Promise.all(events.map((event) => postInline({ ...request, body: JSON.stringify(event) })));
+}
+async function postInline(request) {
   const controller = new AbortController;
   const timeout = setTimeout(() => controller.abort(), INLINE_TELEMETRY_TIMEOUT_MS);
   if (typeof timeout.unref === "function") {
     timeout.unref();
   }
   try {
-    await fetch(request.url, {
+    const response = await fetch(request.url, {
       method: "POST",
       headers: request.headers,
       body: request.body,
       signal: controller.signal
     });
-  } catch {} finally {
+    return response.status;
+  } catch {
+    return 0;
+  } finally {
     clearTimeout(timeout);
   }
 }
-function buildCliUsageRequest(input) {
+function usageRequest(baseUrl, apiKey, body) {
+  return {
+    url: `${baseUrl}/api/v1/data/cli-usage`,
+    headers: {
+      ...apiKeyHeaders(apiKey),
+      "Content-Type": "application/json"
+    },
+    body
+  };
+}
+function buildCliUsageEvent(input) {
   const baseUrl = resolveModaBaseUrlStrict(input.profile ? { profile: input.profile } : {});
   if (!baseUrl)
     return;
@@ -610,12 +882,8 @@ function buildCliUsageRequest(input) {
       delete adoption[key];
   }
   return {
-    url: `${baseUrl}/api/v1/data/cli-usage`,
-    headers: {
-      ...apiKeyHeaders(input.apiKey),
-      "Content-Type": "application/json"
-    },
-    body: JSON.stringify({
+    baseUrl,
+    event: {
       invocation_id: INVOCATION_ID,
       command: safeCode(input.command.slice(0, 64)) ?? "unknown",
       status: input.status,
@@ -634,27 +902,79 @@ function buildCliUsageRequest(input) {
         ...((alias) => alias ? { legacy_alias: alias } : {})(safeCode(sanitizeReasonCode(input.legacyAlias?.replace(/ /g, ":"), 64)))
       },
       ...adoption
-    })
+    }
   };
 }
+function telemetryProfileName(profile) {
+  try {
+    return getActiveProfile(profile ? { profile } : {}).name;
+  } catch {
+    return "";
+  }
+}
+function queueCliUsageEvent(request, group, event, now) {
+  const dir = telemetrySpoolDir();
+  const entry = { v: 1, ...group, t: now, event };
+  let unspooled = [];
+  try {
+    if (!appendSpoolEntry(entry, dir))
+      unspooled = [entry];
+  } catch {
+    return { requests: [request] };
+  }
+  const due = unspooled.length > 0 || envOptOutSet(process.env.CI) || flushDue(readSpool(dir), group, now);
+  if (!due)
+    return;
+  const lock = acquireFlushLock(dir, now);
+  if (!lock)
+    return unspooled.length > 0 ? { requests: [request] } : undefined;
+  const limit = MAX_FLUSH_BATCHES * MAX_BATCH_EVENTS - unspooled.length;
+  const entries = [...claimSpoolGroup(group, dir, now, limit), ...unspooled];
+  if (entries.length === 0) {
+    releaseFlushLock(lock);
+    return;
+  }
+  return {
+    requests: batchBodies(entries, now).map((body) => ({ url: request.url, headers: request.headers, body })),
+    lock
+  };
+}
+function discardSpoolOnEnvOptOut() {
+  if (!isTelemetryDisabled({}))
+    return false;
+  discardSpool();
+  return true;
+}
 async function sendCliUsageTelemetry(input) {
   try {
+    if (discardSpoolOnEnvOptOut())
+      return;
     if (!input.apiKey || isTelemetryDisabled(input.flags)) {
       return;
     }
-    const request = buildCliUsageRequest({ ...input, apiKey: input.apiKey });
-    if (!request)
+    const built = buildCliUsageEvent(input);
+    if (!built)
       return;
-    if (process.env[TELEMETRY_TRANSPORT_ENV] !== "inline" && spawnDetachedTelemetrySender(request)) {
+    const request = usageRequest(built.baseUrl, input.apiKey, JSON.stringify(built.event));
+    if (process.env[TELEMETRY_TRANSPORT_ENV] === "inline") {
+      await sendInline(request);
       return;
     }
-    await sendInline(request);
+    const group = {
+      url: built.baseUrl,
+      profile: telemetryProfileName(input.profile),
+      key: keyFingerprint(input.apiKey)
+    };
+    const job = queueCliUsageEvent(request, group, built.event, Date.now());
+    if (!job || spawnDetachedTelemetrySender(job))
+      return;
+    await sendTelemetryJobInline(job);
   } catch {}
 }
 
 // src/update-check.ts
-import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { join } from "node:path";
+import { mkdirSync as mkdirSync2, readFileSync as readFileSync2, writeFileSync } from "node:fs";
+import { join as join2 } from "node:path";
 var UPDATE_CHECK_FLAG = "no-update-check";
 var CHECK_INTERVAL_MS = 24 * 60 * 60 * 1000;
 var REGISTRY_TIMEOUT_MS = 1500;
@@ -667,11 +987,11 @@ function isUpdateCheckDisabled(flags, env = process.env) {
   return optOutFlagSet(flags, UPDATE_CHECK_FLAG) || envSwitchedOff(env.MODA_CLI_UPDATE_CHECK) || envOptOutSet(env.DO_NOT_TRACK) || envOptOutSet(env.CI);
 }
 function cachePath(options = {}) {
-  return join(getModaDir(options), "update-check.json");
+  return join2(getModaDir(options), "update-check.json");
 }
 function readCache(options = {}) {
   try {
-    const parsed = JSON.parse(readFileSync(cachePath(options), "utf8"));
+    const parsed = JSON.parse(readFileSync2(cachePath(options), "utf8"));
     if (parsed && typeof parsed === "object" && typeof parsed.checked_at === "number" && typeof parsed.latest === "string") {
       return parsed;
     }
@@ -680,7 +1000,7 @@ function readCache(options = {}) {
 }
 function writeCache(cache, options = {}) {
   try {
-    mkdirSync(getModaDir(options), { recursive: true });
+    mkdirSync2(getModaDir(options), { recursive: true });
     writeFileSync(cachePath(options), `${JSON.stringify(cache, null, 2)}
 `, "utf8");
   } catch {}
@@ -2639,46 +2959,46 @@ function leafManifestFields(leaf, commands) {
 import { fileURLToPath } from "url";
 import { realpathSync } from "fs";
 async function runPromptsCommand(...args) {
-  return (await import("./prompts-17wyrst6.js")).runPromptsCommand(...args);
+  return (await import("./prompts-6y9wfq5z.js")).runPromptsCommand(...args);
 }
 async function runSkillsCommand(...args) {
-  return (await import("./skills-ccdbqghj.js")).runSkillsCommand(...args);
+  return (await import("./skills-j8865009.js")).runSkillsCommand(...args);
 }
 async function runFixCommand(...args) {
-  return (await import("./fix-75s9s0d6.js")).runFixCommand(...args);
+  return (await import("./fix-w5z02wt4.js")).runFixCommand(...args);
 }
 async function runFixesCommand(...args) {
-  return (await import("./fix-75s9s0d6.js")).runFixesCommand(...args);
+  return (await import("./fix-w5z02wt4.js")).runFixesCommand(...args);
 }
 async function runHarnessCommand(...args) {
-  return (await import("./harness-a7tb9a23.js")).runHarnessCommand(...args);
+  return (await import("./harness-7azmzytc.js")).runHarnessCommand(...args);
 }
 async function runSyncCommand(...args) {
-  return (await import("./sync-hkxce5zh.js")).runSyncCommand(...args);
+  return (await import("./sync-ew7yvy0e.js")).runSyncCommand(...args);
 }
 async function runRegistryCommand(...args) {
-  return (await import("./registry-fpzhjznj.js")).runRegistryCommand(...args);
+  return (await import("./registry-96aze5wp.js")).runRegistryCommand(...args);
 }
 async function runDoctorCommand(...args) {
-  return (await import("./doctor-wmre3mr7.js")).runDoctorCommand(...args);
+  return (await import("./doctor-k3ta6h2y.js")).runDoctorCommand(...args);
 }
 async function runStatusCommand(...args) {
-  return (await import("./doctor-wmre3mr7.js")).runStatusCommand(...args);
+  return (await import("./doctor-k3ta6h2y.js")).runStatusCommand(...args);
 }
 async function runAuthCommand(...args) {
-  return (await import("./profile-commands-49yn02yg.js")).runAuthCommand(...args);
+  return (await import("./profile-commands-h8evz9x0.js")).runAuthCommand(...args);
 }
 async function runConfigCommand(...args) {
-  return (await import("./profile-commands-49yn02yg.js")).runConfigCommand(...args);
+  return (await import("./profile-commands-h8evz9x0.js")).runConfigCommand(...args);
 }
 async function runProfilesCommand(...args) {
-  return (await import("./profile-commands-49yn02yg.js")).runProfilesCommand(...args);
+  return (await import("./profile-commands-h8evz9x0.js")).runProfilesCommand(...args);
 }
 async function runAgentCommand(...args) {
-  return (await import("./agent-vp9prdma.js")).runAgentCommand(...args);
+  return (await import("./agent-0w9rtdsw.js")).runAgentCommand(...args);
 }
 async function runProductionCommand(...args) {
-  return (await import("./production-intelligence-7nqddd4f.js")).runProductionCommand(...args);
+  return (await import("./production-intelligence-wvsgjxth.js")).runProductionCommand(...args);
 }
 function parseArgs(argv) {
   const args = argv.slice(2);
@@ -3376,23 +3696,21 @@ function noWorldStateWarnings(conversationId, isMissing) {
 }
 var AUDIT_DEFAULT_LIMIT = 200;
 var AUDIT_MAX_LIMIT = 1000;
-function auditCapStatus(data, limit) {
+function auditCapStatus(data) {
   const record = asRecord(data);
   if (!record)
     return null;
   const summary = asRecord(record.summary) ?? {};
   const rows = (asNumber(summary.ingest_rows) ?? (Array.isArray(record.ingest) ? record.ingest.length : 0)) + (asNumber(record.parse_errors) ?? 0);
   const spans = asNumber(summary.total_spans) ?? (Array.isArray(record.spans) ? record.spans.length : 0);
-  const hasMore = record.has_more === true || summary.has_more === true;
+  const rowsCapped = record.has_more === true || summary.has_more === true;
   const spansCapped = summary.truncated === true || record.truncated === true;
-  const serverSaid = typeof record.has_more === "boolean" || typeof summary.has_more === "boolean";
-  const rowsCapped = hasMore || !serverSaid && rows >= limit;
   if (!rowsCapped && !spansCapped)
     return null;
   const reason = typeof summary.truncated_reason === "string" ? summary.truncated_reason : null;
   const cursorValue = summary.next_cursor ?? record.next_cursor;
   const nextCursor = typeof cursorValue === "string" && cursorValue ? cursorValue : null;
-  return { rowsCapped, spansCapped, hasMoreKnown: hasMore, rows, spans, reason, nextCursor };
+  return { rowsCapped, spansCapped, rows, spans, reason, nextCursor };
 }
 var AUDIT_AGENT_RESERVE_BYTES = 16384;
 function auditMaxBytes(budgetBytes) {
@@ -3463,7 +3781,7 @@ function auditOutput(command, params, data, keep) {
       }
     };
   }
-  const capped = auditCapStatus(data, limit);
+  const capped = auditCapStatus(data);
   if (!capped || !record) {
     return {
       data: record ? { ...record, truncated: false, has_more: false, next_cursor: null } : data,
@@ -3488,7 +3806,7 @@ function auditOutput(command, params, data, keep) {
     warnings.push(`Spans were capped: the page reached the server's per-page span cap after ${capped.rows} ingest row(s), so this trace has more spans than the ${shownText}. Continue with the next_cursor page. Orphan/duplicate analysis covers this page only.`);
   } else if (capped.rowsCapped) {
     const bigger = Math.min(AUDIT_MAX_LIMIT, limit * 5);
-    warnings.push(`Spans were capped: read ${capped.rows} ingest row(s), the --limit=${limit} maximum, so this trace ${capped.hasMoreKnown ? "has" : "may have"} more spans than the ${shownText}. ` + (capped.nextCursor ? "Page on with the next_cursor command, or " : "") + (limit < AUDIT_MAX_LIMIT ? `${capped.nextCursor ? "rerun" : "Rerun"} with --limit=${bigger} (max ${AUDIT_MAX_LIMIT}), or ${perTrace}.` : capped.nextCursor ? `${perTrace}.` : `${perTrace[0].toUpperCase()}${perTrace.slice(1)}.`));
+    warnings.push(`Spans were capped: read ${capped.rows} ingest row(s), the --limit=${limit} maximum, so this trace has more spans than the ${shownText}. ` + (capped.nextCursor ? "Page on with the next_cursor command, or " : "") + (limit < AUDIT_MAX_LIMIT ? `${capped.nextCursor ? "rerun" : "Rerun"} with --limit=${bigger} (max ${AUDIT_MAX_LIMIT}), or ${perTrace}.` : capped.nextCursor ? `${perTrace}.` : `${perTrace[0].toUpperCase()}${perTrace.slice(1)}.`));
     if (limit < AUDIT_MAX_LIMIT && !params.cursor && !sliced) {
       nextCommands.push({ command: auditFlags([`--limit=${bigger}`]), purpose: "Read more ingest rows of this trace.", mutability: "read", requires_approval: false });
     }
@@ -4257,8 +4575,18 @@ var CONTEXT_BUDGET_BYTES_PER_FIRST_PAGE_MESSAGE = 480;
 function jsonByteLength(value) {
   return Buffer.byteLength(JSON.stringify(value) ?? "", "utf8");
 }
-var LEGACY_WINDOW_MAX_MESSAGES = 100;
-var CONTEXT_MESSAGE_TRUNCATE_CHARS = 500;
+function largestFittingCount(max, fits) {
+  let low = 1;
+  let high = Math.max(1, max);
+  while (low < high) {
+    const mid = Math.ceil((low + high) / 2);
+    if (fits(mid))
+      low = mid;
+    else
+      high = mid - 1;
+  }
+  return low;
+}
 var LONE_SURROGATE = /[\ud800-\udbff](?![\udc00-\udfff])|(?<![\ud800-\udbff])[\udc00-\udfff]/g;
 function stripLoneSurrogates(value) {
   if (typeof value === "string")
@@ -4270,13 +4598,6 @@ function stripLoneSurrogates(value) {
   }
   return value;
 }
-function isUnknownRangeParamsError(error) {
-  const e = error;
-  if (e?.statusCode !== 400)
-    return false;
-  const text = `${typeof e.responseBody === "string" ? e.responseBody : ""} ${typeof e.message === "string" ? e.message : ""}`;
-  return /property (from|count) should not exist/i.test(text);
-}
 function pageMessages(page) {
   const messages = asRecord(page.context)?.messages ?? page.messages;
   return (Array.isArray(messages) ? messages : []).map((m) => asRecord(m) ?? {});
@@ -4286,13 +4607,11 @@ async function readFullTranscript(conversationId, opts = {}) {
   const start = opts.from ?? 0;
   const requested = opts.maxMessages ?? FULL_TRANSCRIPT_DEFAULT_MAX_MESSAGES;
   const path = `/conversations/${encodeURIComponent(conversationId)}/context`;
-  const warnings = [];
   const messages = [];
   let total = 0;
   let summary = null;
   let ordering;
   let nextFrom = null;
-  let legacy = false;
   let cursor = start;
   let readBytes = 0;
   const byteBudget = opts.fits ? opts.maxBytes : undefined;
@@ -4303,22 +4622,13 @@ async function readFullTranscript(conversationId, opts = {}) {
       const estimate = average > 0 ? Math.ceil(Math.max(0, byteBudget - readBytes) / average) + 1 : Math.max(1, Math.floor(byteBudget / CONTEXT_BUDGET_BYTES_PER_FIRST_PAGE_MESSAGE));
       count = Math.max(1, Math.min(count, estimate));
     }
-    let page;
-    try {
-      page = asRecord(await callDataAPI(`${path}?from=${cursor}&count=${count}`)) ?? {};
-    } catch (error) {
-      if (cursor === start && isUnknownRangeParamsError(error)) {
-        legacy = true;
-        break;
-      }
-      throw error;
-    }
+    const page = asRecord(await callDataAPI(`${path}?from=${cursor}&count=${count}`)) ?? {};
     if (cursor === start) {
       total = asNumber(page.total_messages) ?? 0;
-      summary = page.summary ?? null;
-      ordering = asRecord(page.ordering) ?? undefined;
+      summary = stripLoneSurrogates(page.summary ?? null);
+      ordering = stripLoneSurrogates(asRecord(page.ordering) ?? undefined);
     }
-    const batch = pageMessages(page);
+    const batch = stripLoneSurrogates(pageMessages(page));
     messages.push(...batch);
     if (byteBudget !== undefined)
       readBytes += batch.reduce((sum, message) => sum + jsonByteLength(message) + 1, 0);
@@ -4330,46 +4640,13 @@ async function readFullTranscript(conversationId, opts = {}) {
       break;
     cursor = nextFrom;
   }
-  if (legacy) {
-    const limit = Math.min(requested, LEGACY_WINDOW_MAX_MESSAGES);
-    const window = 5;
-    const span = window * 2 + 1;
-    const byIndex = new Map;
-    for (let center = start + window;; center += span) {
-      const page = asRecord(await callDataAPI(`${path}?msg_index=${center}&window=${window}`)) ?? {};
-      if (center === start + window) {
-        total = asNumber(page.total_messages) ?? 0;
-        summary = page.summary ?? null;
-      }
-      for (const message of pageMessages(page)) {
-        const index = asNumber(message.index);
-        if (index !== null && index !== undefined && index >= start && index < start + limit)
-          byIndex.set(index, message);
-      }
-      if (center + window + 1 >= Math.min(total, start + limit))
-        break;
-    }
-    messages.push(...[...byIndex.entries()].sort(([a], [b]) => a - b).map(([, message]) => message));
-    const end = start + messages.length;
-    nextFrom = end < total && messages.length > 0 ? end : null;
-    warnings.push(`This Moda server has no range reads for context (older backend), so --all fell back to windowed paging and stopped at ${LEGACY_WINDOW_MAX_MESSAGES} messages to keep it cheap.`);
-  }
   throwIfNotFound("trace", conversationId, total === 0);
-  const pageSize = legacy ? LEGACY_WINDOW_MAX_MESSAGES : requested;
+  const pageSize = requested;
   const tied = asNumber(ordering?.tied_timestamp_messages) ?? 0;
   const synthetic = asNumber(ordering?.synthetic_timestamp_messages) ?? 0;
-  const atCap = (value) => {
-    const text = typeof value === "string" ? value : value === undefined || value === null ? "" : JSON.stringify(value);
-    return text.length >= CONTEXT_MESSAGE_TRUNCATE_CHARS;
-  };
-  const isTruncated = (record) => {
-    const toolCalls = Array.isArray(record.tool_calls) ? record.tool_calls : [];
-    const toolResults = Array.isArray(record.tool_results) ? record.tool_results : [];
-    return atCap(record.content) || toolCalls.some((call) => atCap(asRecord(call)?.input)) || toolResults.some((result) => atCap(asRecord(result)?.content));
-  };
   const build = (kept) => {
     const returned = messages.slice(0, kept);
-    const out = [...warnings];
+    const out = [];
     if (total > 0 && start >= total) {
       out.push(`--from=${start} is past the end of this trace (${total} messages, indexes 0-${total - 1}).`);
     }
@@ -4391,12 +4668,9 @@ async function readFullTranscript(conversationId, opts = {}) {
     if (tied > 0 || synthetic > 0) {
       out.push(`Message order may not be chronological: ${tied} of ${total} messages share a timestamp with another message (ordered by id, not time)${synthetic > 0 ? ` and ${synthetic} carry a synthetic pre-2022 timestamp` : ""}.`);
     }
-    if (legacy && returned.some(isTruncated)) {
-      out.push(`This Moda server is older and truncates message text, tool-call inputs and tool results longer than ${CONTEXT_MESSAGE_TRUNCATE_CHARS} characters. For full content (prompts, tool arguments/results) use \`moda traces spans <conversation_id> --include-bodies\` (or \`--include-raw\` for the verbatim events).`);
-    }
     return {
-      data: stripLoneSurrogates({
-        conversation_id: conversationId,
+      data: {
+        conversation_id: stripLoneSurrogates(conversationId),
         total_messages: total,
         from: start,
         returned: returned.length,
@@ -4405,7 +4679,7 @@ async function readFullTranscript(conversationId, opts = {}) {
         summary,
         ...ordering ? { ordering } : {},
         messages: returned
-      }),
+      },
       warnings: out,
       nextCommands
     };
@@ -4413,18 +4687,10 @@ async function readFullTranscript(conversationId, opts = {}) {
   const full = build(messages.length);
   if (!opts.fits || messages.length <= 1 || opts.fits(full))
     return full;
-  let low = 1;
-  let high = messages.length - 1;
-  while (low < high) {
-    const mid = Math.ceil((low + high) / 2);
-    if (opts.fits(build(mid)))
-      low = mid;
-    else
-      high = mid - 1;
-  }
-  return build(low);
+  const fits = opts.fits;
+  return build(largestFittingCount(messages.length - 1, (kept) => fits(build(kept))));
 }
-async function readContextItem(command, params, inputWarnings, budget) {
+async function readContextItem(params, inputWarnings, budget) {
   const fits = budget?.fits;
   if (params.all === true) {
     const full = await readFullTranscript(params.conversation_id, {
@@ -4533,17 +4799,10 @@ function trimContextWindow(conversationId, record, requestedAnchor, fits) {
     };
     return { data, warnings, nextCommands };
   };
-  let low = 1;
-  let high = order.length;
-  while (low < high) {
-    const mid = Math.ceil((low + high) / 2);
-    const page = build(mid);
-    if (fits(page.data, page.warnings, page.nextCommands))
-      low = mid;
-    else
-      high = mid - 1;
-  }
-  return build(low);
+  return build(largestFittingCount(order.length, (kept) => {
+    const page = build(kept);
+    return fits(page.data, page.warnings, page.nextCommands);
+  }));
 }
 var AUDIT_USAGE = "Usage: moda traces spans <conversation_id|trace_id> [--kind=auto|trace|conversation] [--include-raw] [--include-bodies] [--limit=N] [--cursor=<next_cursor>]";
 var AUDIT_BATCH_USAGE = `Usage: moda traces spans <id> <id> ... | --ids-from=-|<file> [--kind=auto|trace|conversation] [--include-raw] [--include-bodies] [--limit=N] (max ${BATCH_MAX_TARGETS} targets)`;
@@ -4569,16 +4828,10 @@ async function readAuditItem(command, params, budget) {
   const available = (Array.isArray(spans) ? spans.length : 0) - (params.span_offset ?? 0);
   if (available <= 0)
     return whole;
-  let low = 1;
-  let high = available;
-  while (low < high) {
-    const mid = Math.ceil((low + high) / 2);
-    const page2 = auditOutput(command, params, raw, mid);
-    if (budget.fits(page2.data, page2.options))
-      low = mid;
-    else
-      high = mid - 1;
-  }
+  const low = largestFittingCount(available, (keep) => {
+    const page2 = auditOutput(command, params, raw, keep);
+    return budget.fits(page2.data, page2.options);
+  });
   const page = auditOutput(command, params, raw, low);
   if (low === 1 && !budget.fits(page.data, page.options)) {
     page.options.warnings = [
@@ -4661,7 +4914,7 @@ async function readBatchTargets(targets, agentMode, read) {
   });
 }
 function fitsShare(share) {
-  return (data, options) => Buffer.byteLength(JSON.stringify({ data, ...options }) ?? "", "utf8") <= share;
+  return (data, options) => jsonByteLength({ data, ...options }) <= share;
 }
 function isBatchFatal(error) {
   const type = classifyCliError(error);
@@ -4776,7 +5029,7 @@ async function runContextBatch(command, positionals, flags, context) {
       conversation_id: target.id,
       ...target.msgIndex !== undefined ? { msg_index: target.msgIndex } : {}
     };
-    return withAnchorHint(target, () => readContextItem(command, params, [], budget));
+    return withAnchorHint(target, () => readContextItem(params, [], budget));
   });
   return writeBatchResult(command, context, targets, results, inputWarnings, rest);
 }
@@ -4983,16 +5236,7 @@ async function runCommand(command, positional, flags, positionals = positional ?
             return agentEnvelopeFits(command, page2.data, page2.options);
           };
           if (agentMode && kept > 1 && !fitsAgent(kept)) {
-            let low = 1;
-            let high = kept - 1;
-            while (low < high) {
-              const mid = Math.ceil((low + high) / 2);
-              if (fitsAgent(mid))
-                low = mid;
-              else
-                high = mid - 1;
-            }
-            kept = low;
+            kept = largestFittingCount(kept - 1, fitsAgent);
           }
           const page = write(kept);
           recordSearchTelemetry(context, page.data);
@@ -5054,7 +5298,7 @@ async function runCommand(command, positional, flags, positionals = positional ?
         return runContextBatch(command, positionals, flags, context);
       const { params, warnings: inputWarnings } = parseContextRequest(...singleContextTarget(positional, flags));
       const agentMode = context.output.mode === "agent" || context.output.mode === "agent-stream";
-      const read = () => readContextItem(command, params, inputWarnings, agentMode ? { fits: (data, options) => agentEnvelopeFits(command, data, options), maxBytes: agentMaxOutputBytes() } : undefined);
+      const read = () => readContextItem(params, inputWarnings, agentMode ? { fits: (data, options) => agentEnvelopeFits(command, data, options), maxBytes: agentMaxOutputBytes() } : undefined);
       const item = positional === undefined ? await read() : await withAnchorHint(parseBatchTarget(positional, true, CONTEXT_USAGE), read);
       context.output.writeData(item.data, item.options);
       break;
@@ -5518,7 +5762,7 @@ async function runCommand(command, positional, flags, positionals = positional ?
       }
       const data = await callDataAPI(reviewPath, {
         method: "POST",
-        body: JSON.stringify({ ...reviewBody, request_nonce: randomUUID2() }),
+        body: JSON.stringify({ ...reviewBody, request_nonce: randomUUID3() }),
         headers: { "Content-Type": "application/json" }
       });
       context.output.writeData(data);
@@ -5611,7 +5855,7 @@ async function runCommand(command, positional, flags, positionals = positional ?
         });
         break;
       }
-      const sentBody = request.body && request.nonce ? { ...request.body, request_nonce: randomUUID2() } : request.body;
+      const sentBody = request.body && request.nonce ? { ...request.body, request_nonce: randomUUID3() } : request.body;
       const data = await callDataAPI(request.path, {
         method: request.method,
         ...sentBody ? { body: JSON.stringify(sentBody), headers: { "Content-Type": "application/json" } } : {}
@@ -5767,7 +6011,6 @@ async function runCommand(command, positional, flags, positionals = positional ?
 function telemetryCommandName(definition) {
   return definition.telemetryCommand ?? definition.name;
 }
-var TELEMETRY_EXEMPT_COMMANDS = {};
 function telemetrySubcommandNames(definition) {
   return [
     ...definition.subcommands?.map((subcommand) => subcommand.name) ?? [],
@@ -5900,7 +6143,7 @@ var commandRegistry = createCommandRegistry([
     resetApiRequestCountBeforeRun: true,
     telemetry: "result-and-error",
     handler: async (context) => {
-      const { runInit } = await import("./index-91bpc8g8.js");
+      const { runInit } = await import("./index-d1z50dsq.js");
       if (context.outputMode === "agent-stream") {
         context.output.writeEvent({
           event: "started",
@@ -5950,7 +6193,7 @@ var commandRegistry = createCommandRegistry([
     resetApiRequestCountBeforeRun: true,
     telemetry: "result-and-error",
     handler: async (context) => {
-      const { runProvision } = await import("./provision-bc3h68e1.js");
+      const { runProvision } = await import("./provision-y5bdbh4y.js");
       return runProvision(context, {
         resumeCommand: buildResumeCommand("provision", context.rawFlags)
       });
@@ -7174,6 +7417,8 @@ async function dispatchParsedCommandInner(typedParsed, startedAt) {
   const switchError = normalizeBooleanFlags(flags);
   const typedFlags = stripUpdateCheckFlag(stripTelemetryFlag(flags));
   const telemetryDisabled = isTelemetryDisabled(flags);
+  if (telemetryDisabled)
+    discardSpoolOnEnvOptOut();
   const updateCheckDisabled = isUpdateCheckDisabled(flags);
   if (command === "--version" || command === "-V" || flags.version === "true") {
     console.log(`moda-cli ${VERSION}`);
@@ -7479,7 +7724,6 @@ export {
   trimContextWindow,
   telemetrySubcommandNames,
   telemetryCommandName,
-  stripLoneSurrogates,
   searchOutcomeWarnings,
   searchDegradeWarning,
   searchCoverageWarnings,
@@ -7490,6 +7734,7 @@ export {
   parseCommandFlags,
   parseArgs,
   normalizeBooleanFlags,
+  largestFittingCount,
   initFlagsForContext,
   globalFlagHelpLines,
   flagsToArgs,
@@ -7506,10 +7751,8 @@ export {
   canonicalFlagKey,
   buildResumeCommand,
   auditCapStatus,
-  TELEMETRY_EXEMPT_COMMANDS,
   TAIL_LIMITS,
   RAW_BOOLEAN_FLAGS,
-  LEGACY_WINDOW_MAX_MESSAGES,
   FULL_TRANSCRIPT_DEFAULT_MAX_MESSAGES,
   CliInputError,
   CONTEXT_MAX_WINDOW,