@moda-ai/cli 1.55.14 → 1.55.16

package/dist/cli.js

@@ -1,19 +1,25 @@
 #!/usr/bin/env node
 import {
+  BATCH_CONCURRENCY,
+  BATCH_MAX_TARGETS,
   MODA_INTELLIGENCE_V1_JSON_SCHEMA,
   asNumber,
   asRecord,
   asString,
+  collectBatchTargets,
+  contextTarget,
   embeddedWindowSize,
   frustrationsFromEmotions,
+  mapWithConcurrency,
+  parseBatchTarget,
   trimToolFailureConversations,
   withFrustrationAnchors,
   withToolFailureAnchors
-} from "./cli-4qe6n8am.js";
+} from "./cli-438g4nwh.js";
 import {
   createCommandContext,
   parseBooleanFlagValue
-} from "./cli-4x9w6ey7.js";
+} from "./cli-kf3d6y8c.js";
 import {
   SIGNALS_MANAGEMENT_SUBCOMMANDS,
   assertFlags,
@@ -23,17 +29,17 @@ import {
   runUserCommand,
   runUsersCommand,
   unknownSignalsSubcommandError
-} from "./cli-k7vwt56h.js";
+} from "./cli-53mvsfgn.js";
 import {
   ApiError,
   callControlAPI,
   callDataAPI
-} from "./cli-ryd7nzke.js";
+} from "./cli-2ars875d.js";
 import {
   apiKeyHeaders,
   isPlatformApiKey,
   setPlatformTenantOverride
-} from "./cli-09rr5smg.js";
+} from "./cli-atx672xv.js";
 import {
   AGENT_ERROR_CODES,
   CliAccessError,
@@ -55,6 +61,7 @@ import {
   apiErrorStatus,
   createCliOutput,
   embeddedTenantIdFromApiKey,
+  errorToAgentError,
   getApiRequestCount,
   getModaDir,
   isApiLikeError,
@@ -70,7 +77,7 @@ import {
   setAgentUpdateNotice,
   validateConfig,
   wasOutputCancelled
-} from "./cli-kwz900s4.js";
+} from "./cli-b3cxcxgn.js";
 import {
   __require
 } from "./cli-0v6na3yp.js";
@@ -142,7 +149,8 @@ var ContextSchema = z.object({
   metadata_only: boolFlag(),
   all: boolFlag(),
   from: z.number().int().min(0).optional(),
-  max_messages: z.number().int().min(1).max(5000).optional()
+  max_messages: z.number().int().min(1).max(5000).optional(),
+  ids_from: z.string().min(1).optional()
 });
 var FrustrationsSchema = z.object({
   days_back: daysBackFlag(7),
@@ -378,7 +386,8 @@ var AuditSchema = z.object({
   include_raw: boolFlag(),
   include_bodies: boolFlag(),
   limit: z.number().min(1).max(1000).default(200).optional(),
-  cursor: z.string().min(1).max(512).optional()
+  cursor: z.string().min(1).max(512).optional(),
+  ids_from: z.string().min(1).optional()
 });
 var TIME_RANGES = ["all", "1h", "3d", "7d", "24h", "30d", "90d"];
 var SEARCH_MODES = ["keyword", "semantic", "hybrid"];
@@ -675,10 +684,14 @@ async function runReplaysCommand(context) {
 }
 
 // src/telemetry.ts
+import { spawn } from "node:child_process";
 import { randomUUID } from "node:crypto";
-var TELEMETRY_TIMEOUT_MS = 500;
+var INLINE_TELEMETRY_TIMEOUT_MS = 500;
+var DETACHED_TELEMETRY_TIMEOUT_MS = 5000;
 var INVOCATION_ID = randomUUID();
 var TELEMETRY_FLAG = "no-telemetry";
+var TELEMETRY_REQUEST_ENV = "MODA_CLI_TELEMETRY_REQUEST";
+var TELEMETRY_TRANSPORT_ENV = "MODA_CLI_TELEMETRY_TRANSPORT";
 var MAX_TELEMETRY_DURATION_MS = 86400000;
 var MAX_TELEMETRY_API_REQUEST_COUNT = 1e6;
 var SEARCH_SURFACE_BY_COMMAND = {
@@ -706,6 +719,8 @@ function buildSearchAdoptionTelemetry(input) {
   };
   if (positional && input.subcommands?.includes(positional)) {
     adoption.subcommand = positional;
+  } else if (positional === undefined && input.defaultSubcommand) {
+    adoption.subcommand = input.defaultSubcommand;
   }
   let queryText;
   if (command === "search")
@@ -733,6 +748,8 @@ function buildSearchAdoptionTelemetry(input) {
   }
   if (recorded.has_more)
     adoption.has_more = recorded.has_more;
+  if (recorded.degrade_reason)
+    adoption.degrade_reason = recorded.degrade_reason;
   const skill = input.skillVersion?.trim();
   if (skill)
     adoption.skill_version = skill.slice(0, 64);
@@ -767,6 +784,9 @@ function serializeAdoption(adoption) {
     out.zero_result = adoption.zero_result;
   if (adoption.has_more)
     out.has_more = adoption.has_more;
+  const degradeReason = sanitizeReasonCode(adoption.degrade_reason, DEGRADE_REASON_MAX);
+  if (degradeReason)
+    out.degrade_reason = degradeReason;
   if (adoption.used_msg_index !== undefined) {
     out.used_msg_index = adoption.used_msg_index ? 1 : 0;
   }
@@ -782,52 +802,152 @@ function isTelemetryDisabled(flags) {
   return flags[TELEMETRY_FLAG] === "true" || process.env.MODA_CLI_TELEMETRY === "0" || process.env.DO_NOT_TRACK === "1";
 }
 var VALIDATION_REASON_MAX = 128;
-function sanitizeValidationReason(reason) {
-  const cleaned = reason?.replace(/[^A-Za-z0-9_.:-]/g, "_").slice(0, VALIDATION_REASON_MAX);
+var DEGRADE_REASON_MAX = 64;
+function sanitizeReasonCode(reason, max) {
+  const cleaned = reason?.replace(/[^A-Za-z0-9_.:-]/g, "_").slice(0, max);
   return cleaned ? cleaned : undefined;
 }
+function sanitizeValidationReason(reason) {
+  return sanitizeReasonCode(reason, VALIDATION_REASON_MAX);
+}
 function sanitizedFlagNames(flags) {
   return Object.keys(stripTelemetryFlag(flags)).sort();
 }
-async function sendCliUsageTelemetry(input) {
-  if (!input.apiKey || isTelemetryDisabled(input.flags)) {
-    return;
+var TELEMETRY_SENDER_SCRIPT = [
+  "try {",
+  `  const raw = process.env.${TELEMETRY_REQUEST_ENV};`,
+  `  delete process.env.${TELEMETRY_REQUEST_ENV};`,
+  "  const r = raw ? JSON.parse(raw) : null;",
+  "  if (r && typeof r.url === 'string' && typeof fetch === 'function') {",
+  "    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));",
+  "  }",
+  "} catch {}"
+].join(`
+`);
+var INSPECTOR_VALUE_OPTIONS = new Set(["--inspect-port", "--debug-port", "--inspect-publish-uid"]);
+function nodeOptionTokens(nodeOptions) {
+  const tokens = [];
+  let start = -1;
+  let quoted = false;
+  for (let i = 0;i < nodeOptions.length; i += 1) {
+    const ch = nodeOptions[i];
+    if (start === -1) {
+      if (/\s/.test(ch))
+        continue;
+      start = i;
+    }
+    if (quoted && ch === "\\") {
+      i += 1;
+    } else if (ch === '"') {
+      quoted = !quoted;
+    } else if (!quoted && /\s/.test(ch)) {
+      tokens.push(nodeOptions.slice(start, i));
+      start = -1;
+    }
   }
-  const validationReason = sanitizeValidationReason(input.validationReason);
+  if (start !== -1)
+    tokens.push(nodeOptions.slice(start));
+  return tokens;
+}
+function withoutInspectorOptions(nodeOptions) {
+  const tokens = nodeOptionTokens(nodeOptions);
+  const kept = [];
+  for (let i = 0;i < tokens.length; i += 1) {
+    const name = tokens[i].split("=")[0];
+    if (!name.startsWith("--inspect") && name !== "--debug-port") {
+      kept.push(tokens[i]);
+      continue;
+    }
+    if (INSPECTOR_VALUE_OPTIONS.has(tokens[i]) && tokens[i + 1] && !tokens[i + 1].startsWith("-"))
+      i += 1;
+  }
+  return kept.join(" ");
+}
+function spawnDetachedTelemetrySender(request, spawnImpl = spawn) {
+  try {
+    const env = { ...process.env, [TELEMETRY_REQUEST_ENV]: JSON.stringify(request) };
+    if (env.NODE_OPTIONS?.includes("--inspect")) {
+      const kept = withoutInspectorOptions(env.NODE_OPTIONS);
+      if (kept)
+        env.NODE_OPTIONS = kept;
+      else
+        delete env.NODE_OPTIONS;
+    }
+    const child = spawnImpl(process.execPath, ["-e", TELEMETRY_SENDER_SCRIPT], {
+      detached: true,
+      stdio: "ignore",
+      windowsHide: true,
+      env
+    });
+    child.on("error", () => {});
+    if (child.pid === undefined)
+      return false;
+    child.unref();
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function sendInline(request) {
   const controller = new AbortController;
-  const timeout = setTimeout(() => controller.abort(), TELEMETRY_TIMEOUT_MS);
+  const timeout = setTimeout(() => controller.abort(), INLINE_TELEMETRY_TIMEOUT_MS);
   if (typeof timeout.unref === "function") {
     timeout.unref();
   }
   try {
-    await fetch(`${resolveModaBaseUrl({ profile: input.profile })}/api/v1/data/cli-usage`, {
+    await fetch(request.url, {
       method: "POST",
-      headers: {
-        ...apiKeyHeaders(input.apiKey),
-        "Content-Type": "application/json"
-      },
-      body: JSON.stringify({
-        invocation_id: INVOCATION_ID,
-        command: input.command.slice(0, 64),
-        status: input.status,
-        error_type: input.errorType,
-        ...validationReason ? { validation_reason: validationReason } : {},
-        exit_code: input.exitCode,
-        duration_ms: clampInt(input.durationMs, 0, MAX_TELEMETRY_DURATION_MS) ?? 0,
-        api_request_count: clampInt(input.apiRequestCount, 0, MAX_TELEMETRY_API_REQUEST_COUNT) ?? 0,
-        cli_version: VERSION,
-        node_version: process.versions.node,
-        platform: process.platform,
-        arch: process.arch,
-        flags_json: { names: sanitizedFlagNames(input.flags) },
-        ...serializeAdoption(input.adoption)
-      }),
+      headers: request.headers,
+      body: request.body,
       signal: controller.signal
     });
   } catch {} finally {
     clearTimeout(timeout);
   }
 }
+function buildCliUsageRequest(input) {
+  const validationReason = sanitizeValidationReason(input.validationReason);
+  return {
+    url: `${resolveModaBaseUrl({ profile: input.profile })}/api/v1/data/cli-usage`,
+    headers: {
+      ...apiKeyHeaders(input.apiKey),
+      "Content-Type": "application/json"
+    },
+    body: JSON.stringify({
+      invocation_id: INVOCATION_ID,
+      command: input.command.slice(0, 64),
+      status: input.status,
+      error_type: input.errorType,
+      ...validationReason ? { validation_reason: validationReason } : {},
+      exit_code: input.exitCode,
+      duration_ms: clampInt(input.durationMs, 0, MAX_TELEMETRY_DURATION_MS) ?? 0,
+      api_request_count: clampInt(input.apiRequestCount, 0, MAX_TELEMETRY_API_REQUEST_COUNT) ?? 0,
+      cli_version: VERSION,
+      node_version: process.versions.node,
+      platform: process.platform,
+      arch: process.arch,
+      flags_json: { names: sanitizedFlagNames(input.flags) },
+      ...serializeAdoption(input.adoption)
+    })
+  };
+}
+async function sendCliUsageTelemetry(input) {
+  try {
+    if (!input.apiKey || isTelemetryDisabled(input.flags)) {
+      return;
+    }
+    const request = buildCliUsageRequest({ ...input, apiKey: input.apiKey });
+    if (process.env[TELEMETRY_TRANSPORT_ENV] !== "inline" && spawnDetachedTelemetrySender(request)) {
+      return;
+    }
+    await sendInline(request);
+  } catch {}
+}
 
 // src/update-check.ts
 import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
@@ -2081,46 +2201,46 @@ function exitCodesForCommand(command) {
 import { fileURLToPath } from "url";
 import { realpathSync } from "fs";
 async function runPromptsCommand(...args) {
-  return (await import("./prompts-kw5kzm39.js")).runPromptsCommand(...args);
+  return (await import("./prompts-jg0stjfb.js")).runPromptsCommand(...args);
 }
 async function runSkillsCommand(...args) {
-  return (await import("./skills-sagxq9sc.js")).runSkillsCommand(...args);
+  return (await import("./skills-gjesa81c.js")).runSkillsCommand(...args);
 }
 async function runFixCommand(...args) {
-  return (await import("./fix-91sr76gw.js")).runFixCommand(...args);
+  return (await import("./fix-v8xka487.js")).runFixCommand(...args);
 }
 async function runFixesCommand(...args) {
-  return (await import("./fix-91sr76gw.js")).runFixesCommand(...args);
+  return (await import("./fix-v8xka487.js")).runFixesCommand(...args);
 }
 async function runHarnessCommand(...args) {
-  return (await import("./harness-vm0xd80p.js")).runHarnessCommand(...args);
+  return (await import("./harness-28wbzncq.js")).runHarnessCommand(...args);
 }
 async function runSyncCommand(...args) {
-  return (await import("./sync-xv04wnth.js")).runSyncCommand(...args);
+  return (await import("./sync-7ts9psky.js")).runSyncCommand(...args);
 }
 async function runRegistryCommand(...args) {
-  return (await import("./registry-mbz65bjy.js")).runRegistryCommand(...args);
+  return (await import("./registry-39xzetsc.js")).runRegistryCommand(...args);
 }
 async function runDoctorCommand(...args) {
-  return (await import("./doctor-grvx6xx0.js")).runDoctorCommand(...args);
+  return (await import("./doctor-e2xrbpmp.js")).runDoctorCommand(...args);
 }
 async function runStatusCommand(...args) {
-  return (await import("./doctor-grvx6xx0.js")).runStatusCommand(...args);
+  return (await import("./doctor-e2xrbpmp.js")).runStatusCommand(...args);
 }
 async function runAuthCommand(...args) {
-  return (await import("./profile-commands-2g5bjzj2.js")).runAuthCommand(...args);
+  return (await import("./profile-commands-f5kysjrv.js")).runAuthCommand(...args);
 }
 async function runConfigCommand(...args) {
-  return (await import("./profile-commands-2g5bjzj2.js")).runConfigCommand(...args);
+  return (await import("./profile-commands-f5kysjrv.js")).runConfigCommand(...args);
 }
 async function runProfilesCommand(...args) {
-  return (await import("./profile-commands-2g5bjzj2.js")).runProfilesCommand(...args);
+  return (await import("./profile-commands-f5kysjrv.js")).runProfilesCommand(...args);
 }
 async function runAgentCommand(...args) {
-  return (await import("./agent-y47qgmf1.js")).runAgentCommand(...args);
+  return (await import("./agent-a2xwfeeh.js")).runAgentCommand(...args);
 }
 async function runProductionCommand(...args) {
-  return (await import("./production-intelligence-mg3qp2dg.js")).runProductionCommand(...args);
+  return (await import("./production-intelligence-0wqcvvxk.js")).runProductionCommand(...args);
 }
 function parseArgs(argv) {
   const args = argv.slice(2);
@@ -2246,6 +2366,7 @@ var META_SWITCHES = new Set([
   "no-telemetry",
   "no-update-check"
 ]);
+var AGENT_VALUE_COMMANDS = new Set(["harness", "sync"]);
 var COMMAND_BOOLEAN_FLAGS = {
   context: new Set(["all", "metadata-only"])
 };
@@ -2271,7 +2392,7 @@ function parseFlag(args, index, flags, beforeCommand, bareFlags, command = "") {
     return index;
   }
   const switchName = key.replace(/_/g, "-");
-  if (META_SWITCHES.has(switchName)) {
+  if (META_SWITCHES.has(switchName) || switchName === "agent" && !AGENT_VALUE_COMMANDS.has(command)) {
     set(key, "true", true);
     return index;
   }
@@ -2376,7 +2497,9 @@ Commands:
   world-state <conversation_id>    Get a trace's world state (slots/threads/events)
   context <conversation_id>        Get windowed trace context (--metadata-only: summary + counts only)
   context <conversation_id> --all  Whole transcript in order (first 500; --from=N --max-messages=N to continue)
+  context <id>[@N] <id>[@N] ...    Batch: up to 25 traces in one call (or --ids-from=-|<file>)
   audit <conversation_id|trace_id> Raw span audit (spans, hierarchy, orphans, duplicates)
+  audit <id> <id> ...              Batch audit: up to 25 ids in one call (or --ids-from=-|<file>)
   frustrations                     Frustration detections (same data as emotions --family=frustration)
   emotions                         Multi-family emotion detections (frustration, disapproval, sadness, confusion, anxiety, trust, positive)
   hallucinations                   Grounding detections: contradicted/verified outputs with rule breakdown
@@ -2825,7 +2948,7 @@ function noWorldStateWarnings(conversationId, isMissing) {
     return;
   return {
     warnings: [
-      `No world state for trace "${conversationId}": the trace may not exist in this tenant, or its world state has not been generated yet. Check the trace exists with: moda context ${conversationId} --metadata-only`
+      `No world state for trace "${conversationId}": the trace may not exist in this tenant, or its world state has not been generated yet. Check the trace exists with: moda context ${shellArg(contextTarget(conversationId))} --metadata-only`
     ]
   };
 }
@@ -3112,7 +3235,8 @@ function recordSearchTelemetry(context, data) {
   context.recordTelemetry({
     search_mode_effective: SEARCH_MODES2.includes(effective) ? effective : undefined,
     result_count: results.length,
-    has_more: hasMore === true ? "yes" : hasMore === false ? "no" : "na"
+    has_more: hasMore === true ? "yes" : hasMore === false ? "no" : "na",
+    ...typeof record.degrade_reason === "string" && record.degrade_reason ? { degrade_reason: record.degrade_reason.slice(0, 64) } : {}
   });
 }
 function recordConversationsTelemetry(context, data) {
@@ -3550,6 +3674,7 @@ function processingDisabledWarning(data, family) {
 }
 var CONTEXT_USAGE = "Usage: moda context <conversation_id> [--msg-index=N (alias --message-index)] [--window=0-5 | --metadata-only]";
 var CONTEXT_ALL_USAGE = "Usage: moda context <conversation_id> --all [--from=N] [--max-messages=N]";
+var CONTEXT_BATCH_USAGE = `Usage: moda context <id>[@msg_index] <id>[@msg_index] ... | --ids-from=-|<file> [--window=0-5 | --metadata-only | --all [--from=N] [--max-messages=N]] (max ${BATCH_MAX_TARGETS} targets)`;
 var CONTEXT_FLAG_ALIASES = { "message-index": "msg-index" };
 var CONTEXT_MAX_WINDOW = 5;
 var EMPTY_ANCHOR_VALUES = new Set(["", "null", "undefined", "none"]);
@@ -3723,7 +3848,7 @@ async function readFullTranscript(conversationId, opts = {}) {
     if (next !== null) {
       const last = asNumber(returned[returned.length - 1]?.index) ?? next - 1;
       const nextMax = firstMissing !== null ? Math.min(pageSize, Math.max(kept * 2, 50)) : pageSize;
-      const continueWith = `moda context ${shellArg(conversationId)} --all --from=${next} --max-messages=${nextMax}`;
+      const continueWith = `moda context ${shellArg(contextTarget(conversationId))} --all --from=${next} --max-messages=${nextMax}`;
       out.push(`Trace has ${total} messages; returned messages ${start}-${last}. ` + (firstMissing !== null ? `Stopped at ${kept} of the ${messages.length} messages read to stay under the agent output byte limit (--json has no limit). ` : "") + `Continue with: ${continueWith}`);
       nextCommands.push({
         command: continueWith,
@@ -3768,6 +3893,249 @@ async function readFullTranscript(conversationId, opts = {}) {
   }
   return build(low);
 }
+async function readContextItem(command, params, inputWarnings, fits) {
+  if (params.all === true) {
+    const full = await readFullTranscript(params.conversation_id, {
+      from: params.from,
+      maxMessages: params.max_messages,
+      fits: fits ? (page) => fits(page.data, { warnings: page.warnings, nextCommands: page.nextCommands }) : undefined
+    });
+    const fullWarnings = [...inputWarnings, ...full.warnings];
+    return {
+      data: full.data,
+      options: {
+        ...fullWarnings.length > 0 ? { warnings: fullWarnings } : {},
+        ...full.nextCommands.length > 0 ? { nextCommands: full.nextCommands } : {}
+      }
+    };
+  }
+  const query2 = new URLSearchParams;
+  if (params.msg_index !== undefined)
+    query2.set("msg_index", params.msg_index.toString());
+  if (params.metadata_only === true)
+    query2.set("metadata_only", "1");
+  const window = params.window === undefined ? undefined : Math.min(params.window, CONTEXT_MAX_WINDOW);
+  if (window !== undefined)
+    query2.set("window", window.toString());
+  const queryString = query2.toString() ? `?${query2.toString()}` : "";
+  const contextPath = `/conversations/${encodeURIComponent(params.conversation_id)}/context`;
+  const data = params.metadata_only === true ? await readContextMetadataOnly(contextPath, query2) : await callDataAPI(`${contextPath}${queryString}`);
+  const ctxRecord = asRecord(data) ?? {};
+  throwIfNotFound("trace", params.conversation_id, asNumber(ctxRecord.total_messages) === 0);
+  const warnings = [...inputWarnings];
+  const nextCommands = [];
+  if (params.window !== undefined && params.window > CONTEXT_MAX_WINDOW) {
+    const center = asNumber(asRecord(ctxRecord.context)?.center_index) ?? params.msg_index ?? 0;
+    const span = Math.min(params.window * 2 + 1, CONTEXT_ALL_MAX_MESSAGES);
+    const from = Math.max(0, center - Math.floor((span - 1) / 2));
+    const wide = `moda context ${shellArg(contextTarget(params.conversation_id))} --all --from=${from} --max-messages=${span}`;
+    warnings.push(`--window=${params.window} is above the maximum of ${CONTEXT_MAX_WINDOW}, so this shows ±${CONTEXT_MAX_WINDOW} messages. For a wider slice run: ${wide}`);
+    nextCommands.push({ command: wide, purpose: `Read ±${params.window} messages around the anchor.`, mutability: "read", requires_approval: false });
+  }
+  return {
+    data,
+    options: {
+      ...warnings.length > 0 ? { warnings } : {},
+      ...nextCommands.length > 0 ? { nextCommands } : {}
+    }
+  };
+}
+var AUDIT_USAGE = "Usage: moda audit <conversation_id|trace_id> [--kind=auto|trace|conversation] [--include-raw] [--include-bodies] [--limit=N] [--cursor=<next_cursor>]";
+var AUDIT_BATCH_USAGE = `Usage: moda audit <id> <id> ... | --ids-from=-|<file> [--kind=auto|trace|conversation] [--include-raw] [--include-bodies] [--limit=N] (max ${BATCH_MAX_TARGETS} targets)`;
+async function readAuditItem(command, params, budget) {
+  const query2 = new URLSearchParams;
+  if (params.kind && params.kind !== "auto")
+    query2.set("kind", params.kind);
+  if (params.include_raw === true)
+    query2.set("include_raw", "1");
+  if (params.include_bodies === true)
+    query2.set("include_bodies", "1");
+  if (params.limit)
+    query2.set("limit", params.limit.toString());
+  if (params.cursor)
+    query2.set("cursor", params.cursor);
+  let maxBytes = budget?.maxBytes;
+  let page = auditOutput(command, params, await fetchAudit(params.id, query2, maxBytes));
+  while (budget && maxBytes !== undefined && maxBytes > AUDIT_MIN_PAGE_BYTES && !budget.fits(page.data, page.options)) {
+    maxBytes = Math.max(AUDIT_MIN_PAGE_BYTES, Math.floor(maxBytes / 2));
+    page = auditOutput(command, params, await fetchAudit(params.id, query2, maxBytes));
+  }
+  if (budget && !budget.fits(page.data, page.options)) {
+    page.options.warnings = [
+      ...page.options.warnings ?? [],
+      "This page is a single ingest row larger than the agent output budget, so some of its spans are cut from this output. Rerun this command with --json (no byte limit) or a higher MODA_AGENT_MAX_OUTPUT_BYTES to see the whole row before following next_cursor."
+    ];
+  }
+  return page;
+}
+var IDS_FROM_KEYS = ["ids-from", "ids_from"];
+function singleContextTarget(positional, flags) {
+  if (positional === undefined)
+    return [positional, flags];
+  const target = parseBatchTarget(positional, true, CONTEXT_USAGE);
+  if (target.msgIndex === undefined)
+    return [target.id, flags];
+  if (Object.keys(flags).some((key) => ["msg-index", "message-index"].includes(key.replace(/_/g, "-")))) {
+    throw new CliInputError(`${JSON.stringify(positional)} already anchors at message ${target.msgIndex}; drop --msg-index, or pass {"id": "..."} if the id itself ends in @<digits>.`, CONTEXT_USAGE, "flag_conflict");
+  }
+  return [target.id, { ...flags, "msg-index": String(target.msgIndex) }];
+}
+function isBatchRead(positionals, flags) {
+  return positionals.length > 1 || IDS_FROM_KEYS.some((key) => flags[key] !== undefined);
+}
+function splitIdsFrom(flags) {
+  let idsFrom;
+  const rest = {};
+  for (const [key, value] of Object.entries(flags)) {
+    if (IDS_FROM_KEYS.includes(key))
+      idsFrom = value;
+    else
+      rest[key] = value;
+  }
+  return { idsFrom, rest };
+}
+function auditItemByteShare(count) {
+  return Math.max(AUDIT_MIN_PAGE_BYTES, Math.floor((agentMaxOutputBytes() - AUDIT_AGENT_RESERVE_BYTES) / count));
+}
+var BATCH_ENVELOPE_RESERVE_BYTES = 4096;
+var BATCH_ENVELOPE_RESERVE_PER_TARGET_BYTES = 256;
+function contextItemByteShare(count) {
+  const reserve = BATCH_ENVELOPE_RESERVE_BYTES + BATCH_ENVELOPE_RESERVE_PER_TARGET_BYTES * count;
+  return Math.max(1, Math.floor((agentMaxOutputBytes() - reserve) / count));
+}
+function fitsShare(share) {
+  return (data, options) => Buffer.byteLength(JSON.stringify({ data, ...options }) ?? "", "utf8") <= share;
+}
+function isBatchFatal(error) {
+  const type = classifyCliError(error);
+  return type === "auth_error" || type === "access_error" || error instanceof CliInputError;
+}
+async function readBatchItem(target, read) {
+  try {
+    const item = await read();
+    return {
+      target: target.raw,
+      ok: true,
+      data: item.data,
+      ...item.options.warnings?.length ? { warnings: item.options.warnings } : {},
+      ...item.options.nextCommands?.length ? { next_commands: item.options.nextCommands } : {}
+    };
+  } catch (error) {
+    if (isBatchFatal(error))
+      throw error;
+    const agentError = errorToAgentError(error);
+    const code = classifyCliError(error) === "api_not_found" ? "not_found" : agentError.code;
+    return {
+      target: target.raw,
+      ok: false,
+      error: {
+        code,
+        message: agentError.message,
+        ...agentError.cause ? { cause: agentError.cause } : {},
+        ...agentError.suggested_commands?.length ? { suggested_commands: agentError.suggested_commands } : {}
+      }
+    };
+  }
+}
+function renderBatchFlags(flags) {
+  return Object.entries(flags).map(([key, value]) => value === "true" ? `--${key}` : `--${key}=${shellArg(value)}`);
+}
+function writeBatchResult(command, context, targets, results, batchWarnings, flags) {
+  const agentMode = context.output.mode === "agent" || context.output.mode === "agent-stream";
+  const build = (kept2) => {
+    const returned = results.slice(0, kept2);
+    const remaining = targets.slice(kept2);
+    const failed = returned.filter((result) => !result.ok);
+    const allFailed = failed.length === returned.length;
+    const warnings = [...batchWarnings];
+    if (failed.length > 0 && failed.length < returned.length) {
+      warnings.push(`${failed.length} of ${returned.length} targets failed: ` + failed.map((result) => `${result.target} (${result.error?.code ?? "error"})`).join(", ") + ".");
+    }
+    const nextCommands = [];
+    if (remaining.length > 0) {
+      const lines = remaining.map((target) => shellArg(target.raw)).join(" ");
+      const continueWith = [`printf '%s\\n' ${lines} |`, `moda ${command}`, "--ids-from=-", ...renderBatchFlags(flags)].join(" ");
+      warnings.push(`Returned ${kept2} of ${targets.length} targets to stay under the agent output byte limit (--json has no limit). Read the other ${remaining.length} with: ${continueWith}`);
+      nextCommands.push({
+        command: continueWith,
+        purpose: `Read the remaining ${remaining.length} target(s) of this batch.`,
+        mutability: "read",
+        requires_approval: false
+      });
+    }
+    return {
+      data: {
+        results: returned,
+        requested: targets.length,
+        returned: returned.length,
+        succeeded: returned.length - failed.length,
+        failed: failed.length,
+        has_more: remaining.length > 0,
+        remaining_targets: remaining.map((target) => target.raw)
+      },
+      options: {
+        summary: `Read ${returned.length - failed.length} of ${targets.length} targets` + (failed.length > 0 ? ` (${failed.length} failed)` : "") + (remaining.length > 0 ? `; ${remaining.length} left for a follow-up call` : "") + ".",
+        ...warnings.length > 0 ? { warnings } : {},
+        ...nextCommands.length > 0 ? { nextCommands } : {},
+        ...allFailed ? {
+          status: "error",
+          errors: returned.map((result) => ({
+            code: result.error?.code ?? "unknown_error",
+            message: clipText(`${result.target}: ${result.error?.message ?? "failed"}`, BATCH_ERROR_MESSAGE_CHARS),
+            blocking: false
+          }))
+        } : failed.length > 0 ? { status: "degraded" } : {}
+      }
+    };
+  };
+  let kept = results.length;
+  let page = build(kept);
+  while (agentMode && kept > 1 && !agentEnvelopeFits(command, page.data, page.options)) {
+    kept -= 1;
+    page = build(kept);
+  }
+  const failedPage = page.options.status === "error";
+  context.output.writeData(page.data, { ...page.options, ...failedPage ? { bypassQuiet: true } : {} });
+  return failedPage ? 1 : 0;
+}
+var BATCH_ERROR_MESSAGE_CHARS = 300;
+function clipText(text, max) {
+  return text.length <= max ? text : `${text.slice(0, max - 3)}...`;
+}
+async function runContextBatch(command, positionals, flags, context) {
+  const { idsFrom, rest } = splitIdsFrom(flags);
+  if (Object.keys(rest).some((key) => key.replace(/_/g, "-") === "conversation-id")) {
+    throw new CliInputError("Batch reads take ids as positionals or --ids-from, not --conversation-id; drop --conversation-id.", CONTEXT_BATCH_USAGE, "flag_conflict");
+  }
+  const targets = await collectBatchTargets(positionals, idsFrom, { anchors: true, usage: CONTEXT_BATCH_USAGE, command });
+  const { params: base, warnings: inputWarnings } = parseContextRequest(targets[0].id, rest);
+  if ((base.all === true || base.metadata_only === true) && targets.some((target) => target.msgIndex !== undefined)) {
+    throw new CliInputError(`${base.all === true ? "--all reads whole traces" : "--metadata-only reads no messages"}, so targets cannot carry an @msg_index anchor; drop the flag or the anchors.`, CONTEXT_BATCH_USAGE, "flag_conflict");
+  }
+  const agentMode = context.output.mode === "agent" || context.output.mode === "agent-stream";
+  const share = agentMode ? contextItemByteShare(targets.length) : undefined;
+  const results = await mapWithConcurrency(targets, BATCH_CONCURRENCY, (target) => readBatchItem(target, () => {
+    const params = {
+      ...base,
+      conversation_id: target.id,
+      ...target.msgIndex !== undefined ? { msg_index: target.msgIndex } : {}
+    };
+    return readContextItem(command, params, [], share !== undefined ? fitsShare(share) : undefined);
+  }));
+  return writeBatchResult(command, context, targets, results, inputWarnings, rest);
+}
+async function runAuditBatch(command, positionals, flags, context) {
+  const { idsFrom, rest } = splitIdsFrom(flags);
+  if (rest.cursor !== undefined) {
+    throw new CliInputError("--cursor continues one trace, so it cannot be used with several ids; follow each item's next_commands instead.", AUDIT_BATCH_USAGE, "flag_conflict");
+  }
+  const targets = await collectBatchTargets(positionals, idsFrom, { anchors: false, usage: AUDIT_BATCH_USAGE, command });
+  const base = parseCommandFlags(AuditSchema, flagsToArgs(rest, "id", targets[0].id), command, { positionalKey: "id" });
+  const agentMode = context.output.mode === "agent" || context.output.mode === "agent-stream";
+  const share = agentMode ? auditItemByteShare(targets.length) : undefined;
+  const results = await mapWithConcurrency(targets, BATCH_CONCURRENCY, (target) => readBatchItem(target, () => readAuditItem(command, { ...base, id: target.id }, share !== undefined ? { maxBytes: share, fits: fitsShare(share) } : undefined)));
+  return writeBatchResult(command, context, targets, results, [], rest);
+}
 async function runCommand(command, positional, flags, positionals = positional ? [positional] : [], context = createCommandContext({ command, positional, positionals, flags })) {
   assertHandParsedFlags(command, flags, positionals);
   switch (command) {
@@ -3988,81 +4356,28 @@ async function runCommand(command, positional, flags, positionals = positional ?
       break;
     }
     case "context": {
-      const { params, warnings: inputWarnings } = parseContextRequest(positional, flags);
-      if (params.all === true) {
-        const agentMode = context.output.mode === "agent" || context.output.mode === "agent-stream";
-        const full = await readFullTranscript(params.conversation_id, {
-          from: params.from,
-          maxMessages: params.max_messages,
-          fits: agentMode ? (page) => agentEnvelopeFits(command, page.data, { warnings: page.warnings, nextCommands: page.nextCommands }) : undefined
-        });
-        const fullWarnings = [...inputWarnings, ...full.warnings];
-        context.output.writeData(full.data, {
-          ...fullWarnings.length > 0 ? { warnings: fullWarnings } : {},
-          ...full.nextCommands.length > 0 ? { nextCommands: full.nextCommands } : {}
-        });
-        break;
-      }
-      const query2 = new URLSearchParams;
-      if (params.msg_index !== undefined)
-        query2.set("msg_index", params.msg_index.toString());
-      if (params.metadata_only === true)
-        query2.set("metadata_only", "1");
-      const window = params.window === undefined ? undefined : Math.min(params.window, CONTEXT_MAX_WINDOW);
-      if (window !== undefined)
-        query2.set("window", window.toString());
-      const queryString = query2.toString() ? `?${query2.toString()}` : "";
-      const contextPath = `/conversations/${encodeURIComponent(params.conversation_id)}/context`;
-      const data = params.metadata_only === true ? await readContextMetadataOnly(contextPath, query2) : await callDataAPI(`${contextPath}${queryString}`);
-      const ctxRecord = asRecord(data) ?? {};
-      throwIfNotFound("trace", params.conversation_id, asNumber(ctxRecord.total_messages) === 0);
-      const warnings = [...inputWarnings];
-      const nextCommands = [];
-      if (params.window !== undefined && params.window > CONTEXT_MAX_WINDOW) {
-        const center = asNumber(asRecord(ctxRecord.context)?.center_index) ?? params.msg_index ?? 0;
-        const span = Math.min(params.window * 2 + 1, CONTEXT_ALL_MAX_MESSAGES);
-        const from = Math.max(0, center - Math.floor((span - 1) / 2));
-        const wide = `moda context ${shellArg(params.conversation_id)} --all --from=${from} --max-messages=${span}`;
-        warnings.push(`--window=${params.window} is above the maximum of ${CONTEXT_MAX_WINDOW}, so this shows ±${CONTEXT_MAX_WINDOW} messages. For a wider slice run: ${wide}`);
-        nextCommands.push({ command: wide, purpose: `Read ±${params.window} messages around the anchor.`, mutability: "read", requires_approval: false });
-      }
-      context.output.writeData(data, {
-        ...warnings.length > 0 ? { warnings } : {},
-        ...nextCommands.length > 0 ? { nextCommands } : {}
-      });
+      if (isBatchRead(positionals, flags))
+        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 item = await readContextItem(command, params, inputWarnings, agentMode ? (data, options) => agentEnvelopeFits(command, data, options) : undefined);
+      context.output.writeData(item.data, item.options);
       break;
     }
     case "audit":
     case "trace": {
+      if (isBatchRead(positionals, flags))
+        return runAuditBatch(command, positionals, flags, context);
       if (!positional) {
-        throw new CliInputError("<conversation_id|trace_id> is required", "Usage: moda audit <conversation_id|trace_id> [--kind=auto|trace|conversation] [--include-raw] [--include-bodies] [--limit=N] [--cursor=<next_cursor>]");
+        throw new CliInputError("<conversation_id|trace_id> is required", AUDIT_USAGE);
       }
       const args = flagsToArgs(flags, "id", positional);
       const params = parseCommandFlags(AuditSchema, args, command, { positionalKey: "id" });
-      const query2 = new URLSearchParams;
-      if (params.kind && params.kind !== "auto")
-        query2.set("kind", params.kind);
-      if (params.include_raw === true)
-        query2.set("include_raw", "1");
-      if (params.include_bodies === true)
-        query2.set("include_bodies", "1");
-      if (params.limit)
-        query2.set("limit", params.limit.toString());
-      if (params.cursor)
-        query2.set("cursor", params.cursor);
       const agentMode = context.output.mode === "agent" || context.output.mode === "agent-stream";
-      let maxBytes = agentMode ? Math.max(AUDIT_MIN_PAGE_BYTES, agentMaxOutputBytes() - AUDIT_AGENT_RESERVE_BYTES) : undefined;
-      let page = auditOutput(command, params, await fetchAudit(params.id, query2, maxBytes));
-      while (maxBytes !== undefined && maxBytes > AUDIT_MIN_PAGE_BYTES && !agentEnvelopeFits(command, page.data, page.options)) {
-        maxBytes = Math.max(AUDIT_MIN_PAGE_BYTES, Math.floor(maxBytes / 2));
-        page = auditOutput(command, params, await fetchAudit(params.id, query2, maxBytes));
-      }
-      if (maxBytes !== undefined && !agentEnvelopeFits(command, page.data, page.options)) {
-        page.options.warnings = [
-          ...page.options.warnings ?? [],
-          "This page is a single ingest row larger than the agent output budget, so some of its spans are cut from this output. Rerun this command with --json (no byte limit) or a higher MODA_AGENT_MAX_OUTPUT_BYTES to see the whole row before following next_cursor."
-        ];
-      }
+      const page = await readAuditItem(command, params, agentMode ? {
+        maxBytes: Math.max(AUDIT_MIN_PAGE_BYTES, agentMaxOutputBytes() - AUDIT_AGENT_RESERVE_BYTES),
+        fits: (data, options) => agentEnvelopeFits(command, data, options)
+      } : undefined);
       context.output.writeData(page.data, page.options);
       break;
     }
@@ -4677,6 +4992,13 @@ 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) ?? [],
+    ...definition.telemetrySubcommands ?? []
+  ];
+}
 var OFFLINE_PROMPTS_SUBCOMMANDS = new Set(["init", "status", "diff", "migrate"]);
 function legacyCommand(metadata) {
   return {
@@ -4771,9 +5093,9 @@ var commandRegistry = createCommandRegistry([
     mutability: "write",
     validateConfigBeforeRun: false,
     resetApiRequestCountBeforeRun: true,
-    telemetry: "result",
+    telemetry: "result-and-error",
     handler: async (context) => {
-      const { runInit } = await import("./index-f6cydfxg.js");
+      const { runInit } = await import("./index-ccdpy9ma.js");
       if (context.outputMode === "agent-stream") {
         context.output.writeEvent({
           event: "started",
@@ -4814,7 +5136,7 @@ var commandRegistry = createCommandRegistry([
     resetApiRequestCountBeforeRun: true,
     telemetry: "result-and-error",
     handler: async (context) => {
-      const { runProvision } = await import("./provision-rm0yc08f.js");
+      const { runProvision } = await import("./provision-25bw5rd7.js");
       return runProvision(context, {
         resumeCommand: buildResumeCommand("provision", context.rawFlags)
       });
@@ -4829,7 +5151,7 @@ var commandRegistry = createCommandRegistry([
     mutability: "read",
     validateConfigBeforeRun: false,
     resetApiRequestCountBeforeRun: false,
-    telemetry: "none",
+    telemetry: "result-and-error",
     handler: async (context) => {
       const manifest = buildManifest(commandRegistry.all());
       if (context.outputMode === "human") {
@@ -4936,7 +5258,7 @@ var commandRegistry = createCommandRegistry([
     mutability: "write",
     validateConfigBeforeRun: false,
     resetApiRequestCountBeforeRun: false,
-    telemetry: "none",
+    telemetry: "result-and-error",
     handler: runAuthCommand
   },
   {
@@ -4948,7 +5270,7 @@ var commandRegistry = createCommandRegistry([
     mutability: "read",
     validateConfigBeforeRun: false,
     resetApiRequestCountBeforeRun: false,
-    telemetry: "none",
+    telemetry: "result-and-error",
     handler: runStatusCommand
   },
   {
@@ -4961,7 +5283,7 @@ var commandRegistry = createCommandRegistry([
     mutability: "read",
     validateConfigBeforeRun: false,
     resetApiRequestCountBeforeRun: false,
-    telemetry: "none",
+    telemetry: "result-and-error",
     handler: runDoctorCommand
   },
   {
@@ -4973,7 +5295,8 @@ var commandRegistry = createCommandRegistry([
     mutability: "write",
     validateConfigBeforeRun: false,
     resetApiRequestCountBeforeRun: false,
-    telemetry: "none",
+    telemetry: "result-and-error",
+    telemetrySubcommands: ["list", "use", "create", "doctor"],
     handler: runProfilesCommand
   },
   {
@@ -4985,7 +5308,8 @@ var commandRegistry = createCommandRegistry([
     mutability: "read",
     validateConfigBeforeRun: false,
     resetApiRequestCountBeforeRun: false,
-    telemetry: "none",
+    telemetry: "result-and-error",
+    telemetrySubcommands: ["show"],
     handler: runConfigCommand
   },
   {
@@ -5008,7 +5332,8 @@ var commandRegistry = createCommandRegistry([
     mutability: "write",
     validateConfigBeforeRun: false,
     resetApiRequestCountBeforeRun: false,
-    telemetry: "none",
+    telemetry: "result-and-error",
+    defaultSubcommand: "scan",
     handler: runHarnessCommand
   },
   {
@@ -5024,7 +5349,9 @@ var commandRegistry = createCommandRegistry([
     mutability: "read",
     validateConfigBeforeRun: false,
     resetApiRequestCountBeforeRun: false,
-    telemetry: "none",
+    telemetry: "result-and-error",
+    telemetrySubcommands: ["context", "next-action", "next-actions", "evidence", "investigate"],
+    defaultSubcommand: "context",
     handler: runAgentCommand
   },
   {
@@ -5040,7 +5367,9 @@ var commandRegistry = createCommandRegistry([
     mutability: "write",
     validateConfigBeforeRun: false,
     resetApiRequestCountBeforeRun: false,
-    telemetry: "none",
+    telemetry: "result-and-error",
+    telemetrySubcommands: ["harness", "prompts", "skills"],
+    defaultSubcommand: "harness",
     handler: runSyncCommand
   },
   {
@@ -5180,7 +5509,8 @@ var commandRegistry = createCommandRegistry([
     mutability: "write",
     validateConfigBeforeRun: false,
     resetApiRequestCountBeforeRun: false,
-    telemetry: "none",
+    telemetry: "result-and-error",
+    defaultSubcommand: "push",
     handler: runRegistryCommand
   },
   legacyCommand({
@@ -5270,7 +5600,9 @@ var commandRegistry = createCommandRegistry([
       "moda context <conversation_id> --msg-index=40 --window=0   # --message-index is an alias",
       "moda context <conversation_id> --metadata-only   # summary + total_messages, no messages",
       "moda context <conversation_id> --all",
-      "moda context <conversation_id> --all --from=500 --max-messages=500"
+      "moda context <conversation_id> --all --from=500 --max-messages=500",
+      "moda context <id>@12 <id2>@3 <id3> --window=2   # batch: up to 25 targets, one envelope; id@N anchors at message N",
+      "moda context --ids-from=ids.txt --window=1   # one target per line (id or id@N); --ids-from=- reads stdin"
     ],
     ...dataApiDefaults
   }),
@@ -5284,7 +5616,8 @@ var commandRegistry = createCommandRegistry([
       "moda audit <conversation_id> --include-raw",
       "moda audit <conversation_id> --include-bodies   # keep prompt/response bodies (omitted by default; long strings truncated)",
       "moda audit <conversation_id> --limit=1000   # ingest rows to read (default 200, max 1000); warns when capped",
-      "moda audit <conversation_id> --cursor=<next_cursor>   # next page of a capped audit"
+      "moda audit <conversation_id> --cursor=<next_cursor>   # next page of a capped audit",
+      "moda audit <id1> <id2> <id3>   # batch: up to 25 ids, one envelope (or --ids-from=-|<file>)"
     ],
     ...dataApiDefaults
   }),
@@ -5315,6 +5648,7 @@ var commandRegistry = createCommandRegistry([
     description: "Rank cross-signal Problems by root cause (what to fix first)",
     examples: ["moda problems", "moda problems --days-back=7 --limit=10", "moda problems remainder --family=emotion"],
     subcommands: PROBLEMS_SUBCOMMAND_HELP,
+    defaultSubcommand: "list",
     ...dataApiDefaults
   }),
   legacyCommand({
@@ -5429,6 +5763,7 @@ var commandRegistry = createCommandRegistry([
       "moda signals activate <signal_id>"
     ],
     subcommands: SIGNALS_SUBCOMMAND_HELP,
+    defaultSubcommand: "list",
     ...dataApiDefaults,
     mutability: "write"
   }),
@@ -5616,7 +5951,8 @@ var commandRegistry = createCommandRegistry([
     mutability: "write",
     validateConfigBeforeRun: (parsed) => !OFFLINE_PROMPTS_SUBCOMMANDS.has(parsed.positional ?? "status"),
     resetApiRequestCountBeforeRun: true,
-    telemetry: "result-and-error"
+    telemetry: "result-and-error",
+    defaultSubcommand: "status"
   }),
   {
     name: "skills",
@@ -5636,7 +5972,7 @@ var commandRegistry = createCommandRegistry([
     mutability: "write",
     validateConfigBeforeRun: false,
     resetApiRequestCountBeforeRun: false,
-    telemetry: "result",
+    telemetry: "result-and-error",
     handler: async (context) => ({
       exitCode: await runSkillsCommand(context)
     })
@@ -5656,9 +5992,10 @@ var commandRegistry = createCommandRegistry([
     outputModes: ["human", "json", "agent"],
     mutability: "write",
     subcommands: FIXES_SUBCOMMAND_HELP,
+    defaultSubcommand: "list",
     validateConfigBeforeRun: false,
     resetApiRequestCountBeforeRun: false,
-    telemetry: "result",
+    telemetry: "result-and-error",
     handler: async (context) => ({
       exitCode: await runFixesCommand(context)
     })
@@ -5682,7 +6019,7 @@ var commandRegistry = createCommandRegistry([
     mutability: "write",
     validateConfigBeforeRun: false,
     resetApiRequestCountBeforeRun: false,
-    telemetry: "result",
+    telemetry: "result-and-error",
     handler: async (context) => ({
       exitCode: await runFixCommand(context)
     })
@@ -5798,6 +6135,12 @@ function printAgentCliError(command, error, mode = "agent") {
   });
   output.writeError(error);
 }
+function existingFlagProfile(flags) {
+  const name = flags.profile;
+  if (!name || name === "true")
+    return;
+  return Object.hasOwn(loadProfileConfig({ env: process.env }).profiles, name) ? name : undefined;
+}
 async function dispatchParsedCommand(parsed, startedAt = Date.now()) {
   const previousProfileEnv = process.env.MODA_PROFILE;
   try {
@@ -5850,8 +6193,7 @@ async function dispatchParsedCommandInner(parsed, startedAt) {
     const telemetryOptOut = telemetryDisabled || flags["no-telemetry"] !== undefined && flags["no-telemetry"] !== "false";
     if (commandDefinition && !telemetryOptOut && commandDefinition.telemetry === "result-and-error") {
       const telemetryCommand2 = telemetryCommandName(commandDefinition);
-      const flagProfile = commandFlags.profile && commandFlags.profile !== "true" ? commandFlags.profile : undefined;
-      const telemetryProfile = flagProfile && Object.hasOwn(loadProfileConfig({ env: process.env }).profiles, flagProfile) ? flagProfile : undefined;
+      const telemetryProfile = existingFlagProfile(commandFlags);
       sendCliUsageTelemetry({
         apiKey: resolveApiKey({ profile: telemetryProfile }),
         profile: telemetryProfile,
@@ -5870,7 +6212,8 @@ async function dispatchParsedCommandInner(parsed, startedAt) {
           outputMode: mode,
           recorded: {},
           skillVersion: process.env.MODA_SKILL_VERSION,
-          subcommands: commandDefinition.subcommands?.map((subcommand) => subcommand.name)
+          subcommands: telemetrySubcommandNames(commandDefinition),
+          defaultSubcommand: commandDefinition.defaultSubcommand
         })
       });
     }
@@ -5925,15 +6268,17 @@ async function dispatchParsedCommandInner(parsed, startedAt) {
   });
   setActiveContext(context);
   const telemetryCommand = telemetryCommandName(definition);
-  const telemetrySubcommands = definition.subcommands?.map((subcommand) => subcommand.name);
+  const telemetrySubcommands = telemetrySubcommandNames(definition);
   const needsConfig = typeof definition.validateConfigBeforeRun === "function" ? definition.validateConfigBeforeRun(parsed) : definition.validateConfigBeforeRun;
   if (needsConfig) {
     try {
       validateConfig();
     } catch (error) {
       if (!telemetryDisabled && definition.telemetry === "result-and-error") {
+        const telemetryProfile = existingFlagProfile(commandFlags);
         sendCliUsageTelemetry({
-          apiKey: resolveApiKey(),
+          apiKey: resolveApiKey({ profile: telemetryProfile }),
+          profile: telemetryProfile,
           command: telemetryCommand,
           flags: commandFlags,
           status: "error",
@@ -5949,7 +6294,8 @@ async function dispatchParsedCommandInner(parsed, startedAt) {
             outputMode: context.outputMode,
             recorded: context.getTelemetryMeta(),
             skillVersion: process.env.MODA_SKILL_VERSION,
-            subcommands: telemetrySubcommands
+            subcommands: telemetrySubcommands,
+            defaultSubcommand: definition.defaultSubcommand
           })
         });
       }
@@ -5967,8 +6313,10 @@ async function dispatchParsedCommandInner(parsed, startedAt) {
   try {
     const result = await definition.handler(context);
     if (!telemetryDisabled && definition.telemetry !== "none") {
+      const telemetryProfile = existingFlagProfile(commandFlags);
       sendCliUsageTelemetry({
-        apiKey: result.apiKey ?? resolveApiKey(),
+        apiKey: result.apiKey ?? resolveApiKey({ profile: telemetryProfile }),
+        profile: telemetryProfile,
         command: telemetryCommand,
         flags: commandFlags,
         status: result.exitCode === 0 ? "success" : "error",
@@ -5982,7 +6330,8 @@ async function dispatchParsedCommandInner(parsed, startedAt) {
           outputMode: context.outputMode,
           recorded: context.getTelemetryMeta(),
           skillVersion: process.env.MODA_SKILL_VERSION,
-          subcommands: telemetrySubcommands
+          subcommands: telemetrySubcommands,
+          defaultSubcommand: definition.defaultSubcommand
         })
       });
     }
@@ -5993,8 +6342,10 @@ async function dispatchParsedCommandInner(parsed, startedAt) {
     return finishRun(context, { kind: "completed", exitCode: result.exitCode });
   } catch (error) {
     if (!telemetryDisabled && definition.telemetry === "result-and-error") {
+      const telemetryProfile = existingFlagProfile(commandFlags);
       sendCliUsageTelemetry({
-        apiKey: resolveApiKey(),
+        apiKey: resolveApiKey({ profile: telemetryProfile }),
+        profile: telemetryProfile,
         command: telemetryCommand,
         flags: commandFlags,
         status: "error",
@@ -6010,7 +6361,8 @@ async function dispatchParsedCommandInner(parsed, startedAt) {
           outputMode: context.outputMode,
           recorded: context.getTelemetryMeta(),
           skillVersion: process.env.MODA_SKILL_VERSION,
-          subcommands: telemetrySubcommands
+          subcommands: telemetrySubcommands,
+          defaultSubcommand: definition.defaultSubcommand
         })
       });
     }
@@ -6062,6 +6414,7 @@ if (isMain) {
   });
 }
 export {
+  telemetrySubcommandNames,
   telemetryCommandName,
   stripLoneSurrogates,
   searchOutcomeWarnings,
@@ -6085,6 +6438,7 @@ export {
   capProblemsBlocks,
   buildResumeCommand,
   auditCapStatus,
+  TELEMETRY_EXEMPT_COMMANDS,
   TAIL_LIMITS,
   RAW_BOOLEAN_FLAGS,
   LEGACY_WINDOW_MAX_MESSAGES,