@carrierllc/mcp 0.13.30 → 0.13.31

package/dist/cli.js

@@ -2,6 +2,7 @@
 import {
   CARRIER_BRAND,
   CARRIER_VERSION,
+  OCS_LIST_KEYS,
   OCS_MAX_USAGE_WINDOW_DAYS,
   TARGET_IDS,
   billingScreen,
@@ -13,6 +14,7 @@ import {
   deriveAccentDark,
   deriveAccentLight,
   deriveAccentPaletteSubs,
+  extractSubscriberStatus,
   fleetScreen,
   formatProbes,
   generateStorefrontLogo,
@@ -36,12 +38,13 @@ import {
   slug,
   storefrontClerkUrls,
   storefrontScreen,
+  subscriberIccid,
   subscribersScreen,
   usageScreen,
   verifyStorefront,
   walletScreen,
   which
-} from "./chunk-ZJY7H2QW.js";
+} from "./chunk-EHJEAI4V.js";
 import {
   copyTree,
   exists,
@@ -552,14 +555,14 @@ async function claudeResolvedConfig(server) {
   }
   const json = await privateJson(file);
   if (!json) return null;
-  const object = (value) => !!value && typeof value === "object" && !Array.isArray(value);
+  const object2 = (value) => !!value && typeof value === "object" && !Array.isArray(value);
   const readOptional = async (path) => {
     try {
       await lstat(path);
       const text3 = await privateText(path, false);
       if (text3 === null) return null;
       const value = JSON.parse(text3);
-      return object(value) ? value : null;
+      return object2(value) ? value : null;
     } catch (e) {
       return e.code === "ENOENT" ? void 0 : null;
     }
@@ -600,15 +603,15 @@ async function claudeResolvedConfig(server) {
     if (settings === null || settings && policyFields.some((k) => Object.hasOwn(settings, k))) return null;
   }
   const projects = json.projects;
-  if (projects !== void 0 && !object(projects)) return null;
-  const local = object(projects) ? projects[workspace] : void 0;
-  if (local !== void 0 && !object(local)) return null;
+  if (projects !== void 0 && !object2(projects)) return null;
+  const local = object2(projects) ? projects[workspace] : void 0;
+  if (local !== void 0 && !object2(local)) return null;
   const userServers = json.mcpServers;
-  const localServers = object(local) ? local.mcpServers : void 0;
-  if (userServers !== void 0 && !object(userServers) || localServers !== void 0 && !object(localServers)) return null;
-  let config = object(userServers) ? userServers[server] : void 0;
+  const localServers = object2(local) ? local.mcpServers : void 0;
+  if (userServers !== void 0 && !object2(userServers) || localServers !== void 0 && !object2(localServers)) return null;
+  let config = object2(userServers) ? userServers[server] : void 0;
   let scope = "user", selectedFile = file;
-  const hasLocal = object(localServers) && Object.hasOwn(localServers, server);
+  const hasLocal = object2(localServers) && Object.hasOwn(localServers, server);
   let project, projectFile;
   const dirs = [];
   for (let dir = cwd; ; ) {
@@ -621,7 +624,7 @@ async function claudeResolvedConfig(server) {
     const path = join6(dir, ".mcp.json"), value = await readOptional(path);
     if (value === null) return null;
     if (!value) continue;
-    if (!object(value.mcpServers)) return null;
+    if (!object2(value.mcpServers)) return null;
     if (Object.hasOwn(value.mcpServers, server)) {
       project = value.mcpServers[server];
       projectFile = path;
@@ -629,7 +632,7 @@ async function claudeResolvedConfig(server) {
   }
   if (projectFile && !hasLocal) {
     const settings = await readOptional(join6(configDir, "settings.json"));
-    if (settings === null || !object(local) || local.hasTrustDialogAccepted !== true) return null;
+    if (settings === null || !object2(local) || local.hasTrustDialogAccepted !== true) return null;
     const disabled = settings?.disabledMcpjsonServers;
     const enabled = settings?.enabledMcpjsonServers;
     if (disabled !== void 0 && (!Array.isArray(disabled) || disabled.some((v) => typeof v !== "string"))) return null;
@@ -648,8 +651,8 @@ async function claudeResolvedConfig(server) {
     config = localServers[server];
     scope = "local";
   }
-  if (!object(config) || config.url !== MCP_URL || config.command || config.type !== void 0 && config.type !== "http" && config.type !== "sse") return null;
-  if (config.headers !== void 0 && !object(config.headers)) return null;
+  if (!object2(config) || config.url !== MCP_URL || config.command || config.type !== void 0 && config.type !== "http" && config.type !== "sse") return null;
+  if (config.headers !== void 0 && !object2(config.headers)) return null;
   for (const [key, value] of Object.entries(config.headers ?? {})) {
     if (typeof value !== "string" || /authorization|api[-_]?key|token|cookie/i.test(key) || /\$\{|[\r\n\0]/.test(value)) return null;
   }
@@ -877,7 +880,7 @@ async function startCallbackServer() {
     res.end(page("You're signed in", "Close this tab and return to your terminal."));
     resolveCode?.(code);
   });
-  let bound = false;
+  let bound2 = false;
   let lastErr;
   for (const port2 of CALLBACK_PORTS) {
     try {
@@ -888,13 +891,13 @@ async function startCallbackServer() {
           resolve5();
         });
       });
-      bound = true;
+      bound2 = true;
       break;
     } catch (e) {
       lastErr = e;
     }
   }
-  if (!bound) {
+  if (!bound2) {
     throw new Error(
       `Could not bind a local callback port (tried ${CALLBACK_PORTS.filter(Boolean).join(", ")}): ${lastErr instanceof Error ? lastErr.message : String(lastErr)}`
     );
@@ -1153,6 +1156,288 @@ function withNextStep(errorMsg, next) {
   return [errorMsg, "", "What to do next:", ...next.map((s) => `  \u2192 ${s}`)].join("\n");
 }
 
+// src/cli/lib/ask-answer.ts
+var MAX_CHARS = 3800;
+var MAX_ROWS = 10;
+var RAW_HINT = 'Use carrier ask "your question" --json for the complete raw result (may contain sensitive data).';
+function object(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value) ? value : void 0;
+}
+function measured(value) {
+  return typeof value === "number" && Number.isFinite(value) && value >= 0;
+}
+function bound(text3, prose = false) {
+  text3 = sanitizeAskText(text3);
+  if (text3.length <= MAX_CHARS) return text3;
+  const notice = `Answer shortened; complete rows or sentences omitted. ${RAW_HINT}`;
+  const budget = MAX_CHARS - notice.length - 1;
+  const units = prose ? text3.match(/[^\n]+?(?:[.!?](?=\s|$)|(?=\n|$))/g) ?? [] : text3.split("\n");
+  const kept = [];
+  let size = 0;
+  for (const unit of units) {
+    const clean = unit.trim();
+    if (size + clean.length + 1 > budget) break;
+    kept.push(clean);
+    size += clean.length + 1;
+  }
+  return [...kept, notice].join("\n");
+}
+function safeFacet(key, value) {
+  if (key === "recurring") return value === "true" || value === "false";
+  if (key === "status") return ["active", "inactive", "inventory", "manually suspended", "end of life", "free", "expired", "terminated"].includes(value.toLowerCase());
+  return false;
+}
+function unsupportedJudgement(intent) {
+  return /\b(predict\w*|most likely|least likely|likelihood|probability|forecast\w*|voorspel\w*|waarschijnlijk)\b/i.test(intent) || /\b(who|which|what|wie|welke)\b.*\b(best|worst|beste|slechtste)\b(?=\s*(?:[?!.]|$))/i.test(intent) || /\b(who|which|what|wie|welke)\s+(?:(?:is|are|has|the|subscriber|package|action)\s+)*(best|worst|beste|slechtste)\b/i.test(intent) || /\b(?:recommend\w*|advise)\b/i.test(intent) || /^\s*should\b/i.test(intent) || /\b(will|going to)\b.*\b(cancel|churn|leave|fail)\b/i.test(intent);
+}
+function subscriberLine(value) {
+  const row = object(value);
+  if (!row) return void 0;
+  const status = extractSubscriberStatus(row);
+  const sim = object(row.sim);
+  const id = typeof row.subscriberId === "string" || typeof row.subscriberId === "number" ? row.subscriberId : "(identifier not reported)";
+  return `Subscriber ${inline(id)}. Subscriber status: ${inline(status || "not reported")}. SIM inventory status: ${typeof sim?.status === "string" ? inline(sim.status) : "not reported"}.`;
+}
+function subscriberStatusAnswer(rows2, summary, intent) {
+  const identities = [...intent.matchAll(/\b(subscriberId|subscriber\s+id|subscriber|ICCID)(?:\s*[:=]\s*|\s+)(?:"([^"\r\n]+)"|'([^'\r\n]+)'|([^\s"'?!,;]+))/gi)].map((m) => {
+    if (m[4]) m[4] = m[4].replace(/[.:)]+$/, "");
+    return m;
+  }).filter((m) => !/^(?:status|statuses|current|is|are|the|list|count|in|for|of|from|their|my|our|all|each|every|now|today|currently|and|or)$/i.test(m[4] ?? ""));
+  if (identities.length) {
+    const tail = intent.slice((identities[0].index ?? 0) + identities[0][0].length);
+    const extraIdentity = /\b(?:and|or)\b/i.test(tail) && !/^\s*[.:)]*\s+and\s+(?:(?:its|their|the)\s+)?(?:ICCID|subscriberId|subscriber\s+id|(?:current\s+)?status)\s*[.?!]*$/i.test(tail);
+    if (identities.length !== 1 || /\b(named|with|whose|and|or)\b/i.test(identities[0][4] ?? "") || extraIdentity) {
+      return "Carrier cannot identify a single subscriber from this unclear request. Specify one exact subscriberId or ICCID; no subscriber was selected.";
+    }
+    const match = identities[0];
+    const id = match[2] ?? match[3] ?? match[4];
+    if (!rows2) return "Subscriber row details were not returned; Carrier cannot determine the requested current status.";
+    const selected = rows2.filter((value) => {
+      const row = object(value);
+      if (!row) return false;
+      return match[1].toLowerCase() === "iccid" ? subscriberIccid(row) === id : (typeof row.subscriberId === "string" || typeof row.subscriberId === "number" && Number.isFinite(row.subscriberId)) && String(row.subscriberId) === id;
+    });
+    if (!selected.length) return "The requested identifier is not present in the returned rows. This does not establish fleet-wide absence.";
+    if (selected.length !== 1) return "Carrier cannot select a single subscriber: that identifier is ambiguous in the returned rows.";
+    return bound(`Current status from the returned row:
+${subscriberLine(selected[0])}`);
+  }
+  const fieldList = /^\s*(?:list|show)\b/i.test(intent) && /\b(?:all|each|every)\s+subscribers\b/i.test(intent);
+  if (!fieldList && /\b(subscriberId|subscriber\s+id|ICCID)\b|\b(?:of|for)\s+(?:the\s+)?subscriber\b/i.test(intent)) return "Carrier cannot identify a single subscriber from this unclear request. Specify one exact subscriberId or ICCID; no subscriber was selected.";
+  if (!rows2) return "Subscriber row details were not returned; current statuses are unavailable.";
+  const lines = ["Current subscriber statuses from the returned rows only:"];
+  if (/\b(how many|count|number|total|hoeveel)\b/i.test(intent)) {
+    lines.push(`Carrier reports ${summary.total} subscribers in this result.`);
+    if (rows2.length < summary.total) lines.push(`Only ${rows2.length} of the reported ${summary.total} rows are present in the response; the remaining details are unavailable.`);
+  }
+  if (rows2.length === 0) lines.push("No subscriber rows were returned; no current statuses can be determined.");
+  for (const row of rows2.slice(0, MAX_ROWS)) {
+    const line = subscriberLine(row);
+    if (line) lines.push(line);
+    else lines.push("A returned row has an unsupported shape; its current status is unavailable.");
+  }
+  if (rows2.length < summary.total || summary.moreAvailable === true) lines.push("Current statuses for remaining rows are unavailable; these returned statuses are not a fleet-wide status breakdown.");
+  if (rows2.length > MAX_ROWS) lines.push(`Showing ${MAX_ROWS} of ${rows2.length} returned rows. ${RAW_HINT}`);
+  return bound(lines.join("\n"));
+}
+function formatAskAnswer(text3, tool, structured, intent = "") {
+  const countOnly = /\b(how many|count|number of|hoeveel|aantal)\b/i.test(intent) && !/\b(status|list|details?|which|their|lijst)\b/i.test(intent);
+  if (unsupportedJudgement(intent) && !INTELLIGENCE_TOOLS.has(tool)) return `Carrier cannot determine or predict that judgement from this tool result. No such conclusion is supported by the returned records. ${RAW_HINT}`;
+  let value = structured;
+  try {
+    const parsed = JSON.parse(text3);
+    if (structured === void 0) value = parsed;
+  } catch {
+    if (text3.trim() && !/^[\[{]/.test(text3.trim())) return bound(text3, true);
+    if (structured === void 0) return `The tool result could not be read as complete JSON. ${RAW_HINT}`;
+  }
+  const fallback = object(value);
+  if (structured === void 0 && Array.isArray(fallback?.content) && fallback.content.length === 0) {
+    return "No result data was returned.";
+  }
+  const body = object(value);
+  if (tool === "get_subscriber" && /\b(status|statuses)\b/i.test(intent)) {
+    const row = object(body?.subscriber) ?? object(object(body?.data)?.subscriber) ?? object(body?.data) ?? body;
+    if (row && (Object.hasOwn(row, "subscriberId") || Object.hasOwn(row, "status") || Object.hasOwn(row, "sim"))) {
+      return subscriberStatusAnswer([row], { total: 1 }, intent);
+    }
+  }
+  const summary = object(body?.summary);
+  if (measured(summary?.total)) {
+    const data = object(body?.data) ?? body;
+    const collections = [["subscriberList", "subscribers"], ["template", "package templates"], ["prepaidPackageTemplate", "package templates"], ["reseller", "resellers"], ...OCS_LIST_KEYS.packages.map((key) => [key, "packages"]), ["zone", "zones"]];
+    const found = collections.find(([key]) => Array.isArray(data?.[key]));
+    const noun = found?.[1] ?? (tool === "list_subscribers" ? "subscribers" : tool === "list_package_templates" ? "package templates" : tool === "list_subscriber_packages" ? "packages" : "items");
+    const rows2 = found ? data?.[found[0]] : void 0;
+    if (noun === "subscribers" && !countOnly && /\b(status|statuses)\b/i.test(intent)) return subscriberStatusAnswer(rows2, summary, intent);
+    const lines = [`Carrier reports ${summary.total} ${noun} in this result.`];
+    for (const [key, count] of Object.entries(object(summary.nested) ?? {})) {
+      if (key === "accounts" && measured(count)) lines.push(`${count} accounts reported inside the result.`);
+    }
+    if (summary.moreAvailable === true) lines.push("More results are available; this is not a complete fleet total.");
+    if (measured(summary.upstreamTotal)) lines.push(`Upstream reports ${summary.upstreamTotal} matches before paging.`);
+    for (const [key, value2] of Object.entries(object(summary.breakdown) ?? {})) {
+      const counts = object(object(value2)?.counts);
+      const entries = Object.entries(counts ?? {}).filter(([name, n]) => measured(n) && safeFacet(key, name));
+      if (entries.length) lines.push(`${label(key)} (server-reported): ${entries.map(([k, n]) => `${k}: ${n}`).join(", ")}.`);
+    }
+    if (rows2) {
+      if (rows2.length < summary.total) lines.push(`Only ${rows2.length} of the reported ${summary.total} rows are present in the response; the remaining details are unavailable.`);
+      if (countOnly) return bound(lines.join("\n"));
+      if (noun === "subscribers") {
+        for (const value2 of rows2.slice(0, MAX_ROWS)) {
+          const line = subscriberLine(value2);
+          if (line) lines.push(line);
+        }
+      } else if (found?.[0] === "reseller") {
+        const accounts = projectResellerAccounts(rows2);
+        lines.push(...facts(accounts.length ? accounts : rows2));
+      } else if (found?.[0] === "template" || found?.[0] === "prepaidPackageTemplate") {
+        lines.push(...facts(projectPackageTemplates(rows2) ?? rows2));
+      } else lines.push(...facts(rows2));
+      if (rows2.length > MAX_ROWS && noun === "subscribers") lines.push(`Showing ${MAX_ROWS} of ${rows2.length} returned rows. ${RAW_HINT}`);
+    } else lines.push("Row details were not returned.");
+    return bound(lines.join("\n"));
+  }
+  if (value === null) return "No result data was returned.";
+  if (typeof value !== "object") return bound(`Carrier returned: ${String(value)}`);
+  if (tool === "fleet_health_app" && body) {
+    return bound(["Carrier returned these fleet facts:", ...recordFacts(body, FLEET_FIELDS, false)].join("\n"));
+  }
+  return bound(["Carrier returned these facts (not an inferred answer):", ...facts(value)].join("\n"));
+}
+var UNSUPPORTED = `Carrier cannot safely interpret unsupported result fields or shapes. ${RAW_HINT}`;
+var INTELLIGENCE_TOOLS = /* @__PURE__ */ new Set(["optimize_package", "churn_risk", "fleet_health", "fleet_health_app"]);
+var FLEET_FIELDS = {
+  utilization: "number",
+  totalActive: "number",
+  totalSuspended: "number",
+  totalInventory: "number",
+  totalOther: "number",
+  totalAccounts: "number",
+  lowBalanceCount: "number"
+};
+var FIELD_TYPES = {
+  name: "string",
+  description: "string",
+  detail: "string",
+  currency: "string",
+  status: "string",
+  balance: "money",
+  amount: "money",
+  price: "money",
+  dataLimit: "number",
+  dataUsed: "number",
+  expirationDate: "string",
+  startDate: "string",
+  endDate: "string",
+  useddatabyte: "number",
+  pckdatabyte: "number",
+  tsexpirationutc: "string",
+  recurring: "boolean",
+  active: "boolean",
+  enabled: "boolean",
+  id: "scalar",
+  accountId: "scalar",
+  resellerId: "scalar",
+  templateId: "scalar",
+  packageId: "scalar",
+  zoneId: "scalar",
+  subscriberId: "scalar",
+  // Live listPrepaidPackageTemplate rows use these wire names, not templateId.
+  prepaidpackagetemplateid: "scalar",
+  prepaidpackagetemplatename: "string",
+  resellerid: "scalar",
+  locationzoneid: "scalar",
+  // listResellerAccount account rows. packageOnly is a boolean on the live shape.
+  packageOnly: "boolean"
+};
+function inline(value) {
+  return sanitizeAskText(String(value)).replace(/[\r\n\t]+/g, " ");
+}
+function sanitizeAskText(text3) {
+  return text3.replace(/(?:\x1b\]|\x9d)[\s\S]*?(?:\x07|\x1b\\|\x9c|$)/g, "").replace(/(?:\x1b[P^_X]|[\x90\x98\x9e\x9f])[\s\S]*?(?:\x1b\\|\x9c|$)/g, "").replace(/(?:\x1b\[|\x9b)[0-?]*[ -/]*[@-~]/g, "").replace(/\x1b[ -/]*[@-~]/g, "").replace(/[\x00-\x08\x0b-\x1f\x7f-\x9f]/g, "");
+}
+function label(key) {
+  const words = key.replace(/([a-z])([A-Z])/g, "$1 $2").replace(/[_-]/g, " ");
+  return words.charAt(0).toUpperCase() + words.slice(1);
+}
+function recordFacts(record2, fields = FIELD_TYPES, warnUnknown = true) {
+  const lines = [];
+  let unsupported = false;
+  for (const [key, value] of Object.entries(record2)) {
+    const expected = Object.hasOwn(fields, key) ? fields[key] : void 0;
+    const valid = expected === "scalar" ? typeof value === "string" || typeof value === "number" && Number.isFinite(value) : expected === "money" ? typeof value === "number" && Number.isFinite(value) || typeof value === "string" && /^[+-]?\d+(?:\.\d+)?$/.test(value) && Number.isFinite(Number(value)) : typeof value === expected && (expected !== "number" || Number.isFinite(value));
+    if (!expected || !valid) {
+      if (warnUnknown || expected) unsupported = true;
+      continue;
+    }
+    lines.push(`${label(key)}: ${typeof value === "boolean" ? String(value) : inline(value)}`);
+  }
+  if (unsupported) lines.push(UNSUPPORTED);
+  return lines.length ? lines : ["No result fields were returned."];
+}
+var TEMPLATE_WIRE_FIELDS = ["prepaidpackagetemplateid", "prepaidpackagetemplatename", "resellerid", "locationzoneid"];
+var ACCOUNT_WIRE_FIELDS = ["id", "name", "balance", "packageOnly"];
+function projectResellerAccounts(rows2) {
+  const accounts = [];
+  for (const row of rows2) {
+    const reseller = object(row);
+    if (!reseller || !Array.isArray(reseller.account)) continue;
+    for (const item of reseller.account) {
+      const account = object(item);
+      if (!account) continue;
+      const projected = {};
+      if (typeof reseller.id === "number" && Number.isFinite(reseller.id)) projected.resellerId = reseller.id;
+      for (const key of ACCOUNT_WIRE_FIELDS) {
+        if (Object.hasOwn(account, key)) projected[key] = account[key];
+      }
+      accounts.push(projected);
+    }
+  }
+  return accounts;
+}
+function projectPackageTemplates(rows2) {
+  const projected = [];
+  for (const row of rows2) {
+    const record2 = object(row);
+    if (!record2) return void 0;
+    const wire = Object.hasOwn(record2, "prepaidpackagetemplateid") || Object.hasOwn(record2, "prepaidpackagetemplatename");
+    if (!wire) return void 0;
+    const next = {};
+    for (const key of TEMPLATE_WIRE_FIELDS) {
+      if (Object.hasOwn(record2, key)) next[key] = record2[key];
+    }
+    projected.push(next);
+  }
+  return projected;
+}
+function facts(value) {
+  if (Array.isArray(value)) {
+    if (!value.length) return ["No items were returned."];
+    const lines2 = value.slice(0, MAX_ROWS).flatMap((row, i) => {
+      const record3 = object(row);
+      return record3 ? [`Item ${i + 1}: ${recordFacts(record3).join("; ")}`] : [UNSUPPORTED];
+    });
+    if (value.length > MAX_ROWS) lines2.push(`Showing ${MAX_ROWS} of ${value.length} returned rows. ${RAW_HINT}`);
+    return lines2;
+  }
+  const record2 = object(value);
+  if (!record2) return [UNSUPPORTED];
+  const outer = Object.fromEntries(Object.entries(record2).filter(([key]) => !["account", "result", "data"].includes(key)));
+  const lines = Object.keys(outer).length ? recordFacts(outer) : [];
+  for (const key of ["account", "result", "data"]) {
+    if (!Object.hasOwn(record2, key)) continue;
+    const inner = object(record2[key]);
+    if (inner) lines.push(`${label(key)}:`, ...recordFacts(inner));
+    else if (key === "account" && Array.isArray(record2[key])) {
+      const accounts = record2[key];
+      lines.push(...facts(accounts));
+    } else lines.push(UNSUPPORTED);
+  }
+  return lines.length ? lines : ["No result fields were returned."];
+}
+
 // src/cli/lib/ask.ts
 var DEFAULT_ERROR_HINTS = [
   "Re-check the arguments: carrier <domain> <command> --help",
@@ -1342,11 +1627,24 @@ function parseRouting(text3) {
     return void 0;
   }
 }
-async function carrierAsk(intent) {
+function readableAskError(result) {
+  try {
+    const body = JSON.parse(result.text);
+    const message = body.error ?? body.message;
+    if (typeof message === "string") return { ...result, text: message };
+  } catch {
+  }
+  return result;
+}
+async function carrierAsk(intent, opts = {}) {
+  const result = await routeAsk(intent, opts);
+  return opts.json ? result : { ...result, text: sanitizeAskText(result.text) };
+}
+async function routeAsk(intent, opts) {
   const routed = await callMcpTool("carrier_ask", { intent }, { errorHints: ASK_ERROR_HINTS });
   if (!routed.ok) return routed;
   const routing = parseRouting(routed.text);
-  if (!routing) return routed;
+  if (!routing) return opts.json ? routed : { ...routed, text: formatAskAnswer(routed.text, "carrier_ask", routed.structured, intent) };
   if (!routing.resolved_tool) {
     const candidates = (routing.candidates ?? []).map((c) => c.tool ? `Candidate: ${c.tool}${c.reason ? ` \u2014 ${c.reason}` : ""}` : void 0).filter((s) => Boolean(s));
     return {
@@ -1372,13 +1670,16 @@ async function carrierAsk(intent) {
     return {
       ok: false,
       text: withNextStep(`"${intent}" resolves to ${tool}, which changes live service or billing.`, [
-        `Params: ${JSON.stringify(args)}`,
+        `Params: ${JSON.stringify(args, (_k, v) => typeof v === "string" ? sanitizeAskText(v) : v)}`,
         "Run the matching discrete command so every flag is explicit and reviewable",
         "carrier --help lists every domain"
       ])
     };
   }
-  return callMcpTool(tool, args, { errorHints: ASK_ERROR_HINTS });
+  const result = await callMcpTool(tool, args, { errorHints: ASK_ERROR_HINTS });
+  if (opts.json) return result;
+  if (!result.ok) return readableAskError(result);
+  return { ...result, text: formatAskAnswer(result.text, tool, result.structured, intent) };
 }
 
 // src/cli/lib/rest.ts
@@ -1568,9 +1869,9 @@ var NAME_TO_CODE = /* @__PURE__ */ new Map();
 for (let first = 65; first <= 90; first += 1) {
   for (let second = 65; second <= 90; second += 1) {
     const code = String.fromCharCode(first, second);
-    const label = regionLabel(code);
-    if (!label) continue;
-    const key = label.toLowerCase();
+    const label2 = regionLabel(code);
+    if (!label2) continue;
+    const key = label2.toLowerCase();
     const current = NAME_TO_CODE.get(key);
     if (!current || PREFERRED.has(code)) NAME_TO_CODE.set(key, code);
   }
@@ -1702,9 +2003,9 @@ function logoMime(bytes) {
 function regionLabel(code) {
   if (!/^[A-Z]{2}$/.test(code)) return void 0;
   try {
-    const label = regionNames.of(code);
-    if (!label || label.toUpperCase() === code) return void 0;
-    return label;
+    const label2 = regionNames.of(code);
+    if (!label2 || label2.toUpperCase() === code) return void 0;
+    return label2;
   } catch {
     return void 0;
   }
@@ -1825,9 +2126,9 @@ function storefrontPlanBody(input) {
 function isStorefrontPlanError(value) {
   return value !== null && "error" in value;
 }
-function parseWholeNumber(value, label) {
+function parseWholeNumber(value, label2) {
   if (value === void 0) return { ok: true, value: void 0 };
-  if (!/^\d+$/.test(value)) return { ok: false, message: `${label} must be a whole number.` };
+  if (!/^\d+$/.test(value)) return { ok: false, message: `${label2} must be a whole number.` };
   return { ok: true, value: Number(value) };
 }
 function overlay(base, input, fields) {
@@ -2738,12 +3039,12 @@ async function showHomeStatus() {
   printStatus(st);
   return st;
 }
-async function openAndReport(url, label) {
+async function openAndReport(url, label2) {
   const r = await openUrl(url);
   if (r.ok) p.log.success(r.hint);
   else {
     p.log.warn(r.hint);
-    p.note(url, label);
+    p.note(url, label2);
   }
 }
 async function runHome(opts) {
@@ -2848,7 +3149,7 @@ async function runHome(opts) {
         spin.start("Asking Carrier MCP\u2026");
         const result = await carrierAsk(String(intent).trim());
         spin.stop(result.ok ? "Answer" : "Could not complete ask");
-        if (result.ok) p.note(result.text.slice(0, 4e3), "carrier ask");
+        if (result.ok) p.note(result.text, "carrier ask");
         else p.log.error(result.text);
         break;
       }
@@ -5736,7 +6037,7 @@ function formatJsonOutput(text3) {
   }
 }
 async function runCapability(domain, cmd, opts) {
-  const label = `${domain.name} ${cmd.name}`;
+  const label2 = `${domain.name} ${cmd.name}`;
   const quiet = opts.json === true;
   const { args, errors, notes } = buildToolArgs(cmd, opts);
   if (cmd.write && opts.commit === true) delete args.dry_run;
@@ -5744,9 +6045,9 @@ async function runCapability(domain, cmd, opts) {
     errors.push(`${capabilityTarget(cmd)} has no preview mode. Pass --confirm to run it for real.`);
   }
   if (errors.length) {
-    const message = withNextStep(`Cannot run \`carrier ${label}\`.`, [
+    const message = withNextStep(`Cannot run \`carrier ${label2}\`.`, [
       ...errors,
-      `See every flag: carrier ${label} --help`
+      `See every flag: carrier ${label2} --help`
     ]);
     if (quiet) console.error(message);
     else p2.log.error(message);
@@ -5762,7 +6063,7 @@ async function runCapability(domain, cmd, opts) {
     ].join("\n");
     if (quiet) process.stdout.write(`${formatJsonOutput(preview)}
 `);
-    else p2.note(preview, `carrier ${label}`);
+    else p2.note(preview, `carrier ${label2}`);
     return;
   }
   const dryRun = cmd.write === true && args.dry_run === true;
@@ -5773,7 +6074,7 @@ async function runCapability(domain, cmd, opts) {
   }
   const target = capabilityTarget(cmd);
   const errorHints = [
-    `Check the arguments: carrier ${label} --help`,
+    `Check the arguments: carrier ${label2} --help`,
     'Or describe the task in words: carrier ask "\u2026"'
   ];
   const s = quiet ? null : p2.spinner();
@@ -6587,8 +6888,8 @@ program.command("examples").description("Print natural-language fleet prompts fo
 });
 program.command("ask").description(
   'Natural-language fallback for whatever the domain commands miss: carrier ask "show fleet health" (needs CARRIER_API_KEY or OCS token).'
-).argument("<intent...>", "Natural-language intent").action(async (parts) => {
-  header();
+).argument("<intent...>", "Natural-language intent").option("--json", "Print the complete raw tool result (may contain sensitive data)").action(async (parts, opts) => {
+  if (!opts.json) header();
   const intent = parts.join(" ").trim();
   if (!intent) {
     fail("Missing intent.", [
@@ -6598,12 +6899,27 @@ program.command("ask").description(
     process.exitCode = 1;
     return;
   }
-  const s = p3.spinner();
-  s.start("Asking Carrier MCP\u2026");
-  const result = await carrierAsk(intent);
-  s.stop(result.ok ? "Done" : "Failed");
+  const s = opts.json ? void 0 : p3.spinner();
+  s?.start("Asking Carrier MCP\u2026");
+  const result = await carrierAsk(intent, opts);
+  s?.stop(result.ok ? "Done" : "Failed");
+  if (opts.json) {
+    if (result.ok) {
+      let raw = result.text;
+      try {
+        JSON.parse(raw);
+      } catch {
+        raw = JSON.stringify(raw);
+      }
+      process.stdout.write(raw + "\n");
+    } else {
+      process.stderr.write(result.text + "\n");
+      process.exitCode = 1;
+    }
+    return;
+  }
   if (result.ok) {
-    p3.note(result.text.slice(0, 6e3), "Answer");
+    p3.note(result.text, "Answer");
     p3.outro("");
   } else {
     p3.log.error(result.text);