@moda-ai/cli 1.55.23 → 1.55.25

package/dist/{agent-f8a1kejk.js → agent-t7dxmpdq.js}

@@ -1,8 +1,8 @@
 import {
   buildDoctorReport
-} from "./cli-z3g07t65.js";
-import"./cli-9g8vz4sv.js";
-import"./cli-s6tw1fje.js";
+} from "./cli-mebf5vtr.js";
+import"./cli-0wr3483h.js";
+import"./cli-m805msp6.js";
 import"./cli-mm48br00.js";
 import {
   HARNESS_REPORT_APPROVAL_PATH,
@@ -14,18 +14,18 @@ import {
   readHarnessSyncState,
   summarizeHarness,
   validateHarnessReport
-} from "./cli-4f6jkrnm.js";
+} from "./cli-7xc585hc.js";
 import"./cli-97fnztpy.js";
-import"./cli-2cggp8ww.js";
-import"./cli-cv3jt1ms.js";
-import"./cli-wkmdw40s.js";
+import"./cli-qvg26twp.js";
+import"./cli-dn91fb56.js";
+import"./cli-9btx12wp.js";
 import {
   CliInputError,
   resolveApiKey,
   resolveIngestUrl,
   resolveModaBaseUrl,
   resolveTenantId
-} from "./cli-t3a6eknn.js";
+} from "./cli-dve50x7p.js";
 import"./cli-0v6na3yp.js";
 
 // src/agent.ts

package/dist/{cli-9g8vz4sv.js → cli-0wr3483h.js}

@@ -8,7 +8,7 @@ import {
   saveProfileConfig,
   secretFilePathFromRef,
   writeSecretJsonFile
-} from "./cli-t3a6eknn.js";
+} from "./cli-dve50x7p.js";
 import {
   __require
 } from "./cli-0v6na3yp.js";

package/dist/{cli-4f6jkrnm.js → cli-7xc585hc.js}

@@ -4,16 +4,16 @@ import {
 import {
   createCommandContext,
   stringOption
-} from "./cli-2cggp8ww.js";
+} from "./cli-qvg26twp.js";
 import {
   assertFlags,
   assertPositionals,
   requireTenant
-} from "./cli-cv3jt1ms.js";
+} from "./cli-dn91fb56.js";
 import {
   ApiError,
   callControlAPI
-} from "./cli-wkmdw40s.js";
+} from "./cli-9btx12wp.js";
 import {
   CliInputError,
   CliInputRequiredError,
@@ -39,7 +39,7 @@ import {
   resolveModaBaseUrl,
   resolveTenantId,
   shouldInventoryFile
-} from "./cli-t3a6eknn.js";
+} from "./cli-dve50x7p.js";
 import {
   __commonJS,
   __require,
@@ -195871,7 +195871,7 @@ async function runHarnessCommand(context) {
         throw new CliInputError("Focused remote prompt analysis is not supported yet.", "Use local --analyst=claude|codex|cursor|local-scan, or drop --concern for a full remote report.");
       }
       if (context.flags["github-actions"] === "true") {
-        const { runGithubActionsAnalyze } = await import("./harness-github-actions-cfkx9ty9.js");
+        const { runGithubActionsAnalyze } = await import("./harness-github-actions-atc5bbkj.js");
         const result = await runGithubActionsAnalyze(rootDir, {
           writeReport: (report2) => {
             const normalized = normalizeHarnessReport(report2);

package/dist/{cli-wkmdw40s.js → cli-9btx12wp.js}

@@ -3,7 +3,7 @@ import {
   recordApiRequest,
   resolveApiKey,
   resolveModaBaseUrl
-} from "./cli-t3a6eknn.js";
+} from "./cli-dve50x7p.js";
 
 // src/api-client.ts
 var REQUEST_TIMEOUT_MS = 30000;

package/dist/{cli-4yarp5s1.js → cli-9hc5bg2r.js}

@@ -5,7 +5,7 @@ import {
   resolveApiKey,
   resolveApiKeyFromActiveProfile,
   resolveModaBaseUrl
-} from "./cli-t3a6eknn.js";
+} from "./cli-dve50x7p.js";
 
 // src/api-key-auth.ts
 var PROBE_TIMEOUT_MS = 1e4;

package/dist/{cli-cv3jt1ms.js → cli-dn91fb56.js}

@@ -2,7 +2,7 @@ import {
   ApiError,
   callControlAPI,
   callDataAPI
-} from "./cli-wkmdw40s.js";
+} from "./cli-9btx12wp.js";
 import {
   CliAccessError,
   CliInputError,
@@ -11,7 +11,7 @@ import {
   resolveApiKey,
   resolveApiTenantId,
   setPlatformTenantOverride
-} from "./cli-t3a6eknn.js";
+} from "./cli-dve50x7p.js";
 
 // src/schemas.ts
 import { z } from "zod";
@@ -209,7 +209,7 @@ var FalsePositiveSchema = z.object({
   conversation_id: z.string().min(1).max(255).optional().describe("Trace ID (required for problem-detection and custom-signal)"),
   attribution_id: z.string().regex(UUID_RE, "Attribution id must be a UUID").optional().describe("Detection UUID (required for problem-detection)"),
   family: z.string().regex(/^[a-z_]{1,64}$/, "Family must be a lowercase emotion family").optional().describe("Emotion family of the quote (quote kind)"),
-  turn: z.preprocess((v) => typeof v === "string" && /^\d+$/.test(v.trim()) ? Number(v) : v, z.number().int().min(0).optional()).describe("Turn of the quote (quote kind; from moda emotions)"),
+  turn: z.preprocess((v) => typeof v === "string" && /^\d+$/.test(v.trim()) ? Number(v) : v, z.number().int().min(0).optional()).describe("Turn of the quote (quote kind; from moda detections list --family=emotion)"),
   quote: z.string().min(1).max(4000).optional().describe("The quoted user text (quote kind)"),
   tool: z.string().min(1).max(255).optional().describe("Failing tool name (tool kind)"),
   tool_use_id: z.string().min(1).max(255).optional().describe("Tool call id (tool kind; or pass --msg-index)"),
@@ -230,11 +230,11 @@ var FalsePositiveSchema = z.object({
     need(v.attribution_id, "--attribution-id is required for problem-detection");
   }
   if (v.kind === "quote") {
-    need(v.family && v.turn !== undefined && v.quote, "--family, --turn and --quote are required for quote (copy them from moda emotions)");
+    need(v.family && v.turn !== undefined && v.quote, "--family, --turn and --quote are required for quote (copy them from moda detections list --family=emotion)");
   }
   if (v.kind === "tool") {
     need(v.tool, "--tool is required for tool (the failing tool name)");
-    need(v.tool_use_id || v.msg_index !== undefined, "--tool-use-id or --msg-index is required for tool (from moda tool-failure-detail)");
+    need(v.tool_use_id || v.msg_index !== undefined, "--tool-use-id or --msg-index is required for tool (from moda detections tools)");
   }
   if (v.kind === "custom-signal") {
     need(v.conversation_id, "--conversation-id is required for custom-signal");
@@ -306,7 +306,7 @@ var TailSchema = z.object({
   full_scan: boolFlag().describe("Emotions: scan the whole window, not the top-scoring prefix (many more requests)")
 });
 var ToolFailureDetailSchema = z.object({
-  tool_name: z.string().describe("Tool name (from moda tool-failures)"),
+  tool_name: z.string().describe("Tool name (from moda detections tools)"),
   subtype: z.string().optional().describe("Only this failure subtype"),
   days_back: daysBackFlag(7),
   limit: z.number().min(1).max(20).default(5).optional().describe("Maximum examples to return"),
@@ -497,7 +497,7 @@ var MISROUTE_WORDS = /attribut|misrout|false[\s_-]?positive|wrong[\s_-]?(?:probl
 function dedicatedCommandHint(category, rawCategory) {
   if (!MISROUTE_CATEGORIES.has(category) && !(rawCategory && MISROUTE_WORDS.test(rawCategory)))
     return;
-  return "Feedback is read by the Moda team but does not change the problem. To act on it directly, use " + "`moda problem-feedback <problem_id> --action=flag_attribution --attribution-id=<uuid> --reason=TEXT` (a trace wrongly " + "attributed to a problem), `moda false-positive <kind> <target> --reason=TEXT` (a detection that should not " + "have fired), or `moda fix dismiss <fix_id> --reason=TEXT` (a fix aimed at the wrong problem).";
+  return "Feedback is read by the Moda team but does not change the problem. To act on it directly, use " + "`moda problems feedback <problem_id> --action=flag_attribution --attribution-id=<uuid> --reason=TEXT` (a trace wrongly " + "attributed to a problem), `moda review <kind> <target> --reason=TEXT` (a detection that should not " + "have fired), or `moda fix dismiss <fix_id> --reason=TEXT` (a fix aimed at the wrong problem).";
 }
 
 // src/command-flags.ts
@@ -998,9 +998,9 @@ async function runUserCommand(context) {
 }
 async function runProblemReopenCommand(context) {
   assertFlags("problem-reopen", context.flags, specFlagNames(COMMAND_FLAG_SPECS["problem-reopen"]));
-  assertPositionals("problem-reopen", context.positionals, 1, "moda problem-reopen <problem_id> [--reason=TEXT]");
+  assertPositionals("problem-reopen", context.positionals, 1, "moda problems reopen <problem_id> [--reason=TEXT]");
   const problemId = context.positionals[0];
-  const usage = "Usage: moda problem-reopen <problem_id> [--reason=TEXT]";
+  const usage = "Usage: moda problems reopen <problem_id> [--reason=TEXT]";
   if (!problemId || !UUID_RE2.test(problemId))
     throw new CliInputError("<problem_id> (UUID) is required.", usage);
   const reason = context.flags.reason;
@@ -1297,4 +1297,4 @@ function unknownSignalsSubcommandError(sub, args = []) {
   ${SIGNAL_USAGE}`);
 }
 
-export { ProblemsRemainderSchema, UUID_RE, ProblemImpactSchema, PROBLEM_FEEDBACK_ACTIONS, ProblemFeedbackSchema, ProblemLinearFileSchema, SIGNAL_LABELS, SignalLabelSchema, DETECTION_VERDICTS, DetectionReviewSchema, FALSE_POSITIVE_KINDS, FalsePositiveSchema, StepScoresSchema, AuditSchema, FEEDBACK_USAGE, isFeedbackRefFlag, buildFeedbackRequest, COMMAND_FLAG_SPECS, flagSpecFor, kebabFlag, schemaShape, specFlagKeys, specFlagNames, describeSpecFlags, closestMatches, renderFlagHelp, subcommandHelpFlags, manifestFlagFields, requireTenant, assertFlags, assertPositionals, runUsersCommand, runUserCommand, runProblemReopenCommand, runSignalsManagementCommand, SIGNALS_MANAGEMENT_SUBCOMMANDS, unknownSignalsSubcommandError };
+export { ProblemsRemainderSchema, UUID_RE, ProblemImpactSchema, PROBLEM_FEEDBACK_ACTIONS, ProblemFeedbackSchema, ProblemLinearFileSchema, SignalLabelSchema, DETECTION_VERDICTS, DetectionReviewSchema, FALSE_POSITIVE_KINDS, FalsePositiveSchema, EMOTION_FAMILIES, LAZINESS_FAMILIES, StepScoresSchema, AuditSchema, FEEDBACK_USAGE, isFeedbackRefFlag, buildFeedbackRequest, COMMAND_FLAG_SPECS, flagSpecFor, kebabFlag, schemaShape, specFlagKeys, specFlagNames, describeSpecFlags, closestMatches, renderFlagHelp, subcommandHelpFlags, manifestFlagFields, requireTenant, assertFlags, assertPositionals, runUsersCommand, runUserCommand, runProblemReopenCommand, runSignalsManagementCommand, SIGNALS_MANAGEMENT_SUBCOMMANDS, unknownSignalsSubcommandError };

package/dist/{cli-t3a6eknn.js → cli-dve50x7p.js}

@@ -972,7 +972,7 @@ function trimToolFailureConversations(response, opts) {
     const msgIndex = asNumber(asRecord(row.anchor)?.msg_index) ?? asNumber(row.msg_index);
     return {
       ...rest,
-      ...conversationId && msgIndex !== null ? { context_command: `moda context ${shellWord(contextTarget(conversationId))} --msg-index=${msgIndex} --window=${TOOL_FAILURE_CONTEXT_RADIUS}` } : {},
+      ...conversationId && msgIndex !== null ? { context_command: `moda traces get ${shellWord(contextTarget(conversationId))} --msg-index=${msgIndex} --window=${TOOL_FAILURE_CONTEXT_RADIUS}` } : {},
       ...opts.drop ? {} : { conversation: trimFailureWindow(conversation, TOOL_FAILURE_CONTEXT_RADIUS, msgIndex) },
       ..."window" in row ? { window: trimFailureWindow(window, opts.windowRadius ?? TOOL_FAILURE_CONTEXT_RADIUS, msgIndex) } : {}
     };
@@ -1019,7 +1019,7 @@ function withoutDetectionWindows(response, listKey, windowKey) {
     const msgIndex = asNumber(asRecord(row.anchor)?.msg_index) ?? frustrationAnchorIndex(row);
     return {
       ...rest,
-      ...conversationId && msgIndex !== null ? { context_command: `moda context ${shellWord(contextTarget(conversationId))} --msg-index=${msgIndex} --window=${DETECTION_CONTEXT_RADIUS}` } : {}
+      ...conversationId && msgIndex !== null ? { context_command: `moda traces get ${shellWord(contextTarget(conversationId))} --msg-index=${msgIndex} --window=${DETECTION_CONTEXT_RADIUS}` } : {}
     };
   });
   return { ...response, [listKey]: rows };
@@ -1057,7 +1057,7 @@ function compactProblemDossier(response, problemId) {
       causal_rationale: row.causal_rationale ?? null,
       door: row.door ?? null,
       replay_verified: row.replay_verified ?? null,
-      ...conversationId && msgIndex !== null ? { context_command: `moda context ${shellWord(contextTarget(conversationId))} --msg-index=${msgIndex}` } : {}
+      ...conversationId && msgIndex !== null ? { context_command: `moda traces get ${shellWord(contextTarget(conversationId))} --msg-index=${msgIndex}` } : {}
     };
   });
   const reportsBlock = asRecord(response.investigation_reports);
@@ -1095,13 +1095,13 @@ function compactProblemDossier(response, problemId) {
       reports_has_more: reportsBlock?.has_more === true,
       blocks: PROBLEM_COMPACT_OMITTED_BLOCKS.filter((key) => (key in response))
     },
-    full_command: `moda problem ${id} --full`
+    full_command: `moda problems get ${id} --full`
   };
   const nextCommands = [
-    readCommand(`moda problem ${id} --evidence --limit=20`, "Page every evidence row with its anchor (follow next_cursor)."),
-    readCommand(`moda problem ${id} --reports`, "Page investigation reports with narratives and citations."),
-    readCommand(`moda problem ${id} --traces`, "Page affected traces with their latest anchor."),
-    readCommand(`moda problem ${id} --full`, "The complete dossier, every block (large).")
+    readCommand(`moda problems get ${id} --evidence --limit=20`, "Page every evidence row with its anchor (follow next_cursor)."),
+    readCommand(`moda problems get ${id} --reports`, "Page investigation reports with narratives and citations."),
+    readCommand(`moda problems get ${id} --traces`, "Page affected traces with their latest anchor."),
+    readCommand(`moda problems get ${id} --full`, "The complete dossier, every block (large).")
   ];
   const first = topEvidence.find((row) => typeof row.context_command === "string");
   if (first?.context_command) {
@@ -1450,11 +1450,206 @@ function packSnapshot(inputs, opts) {
     skips
   };
 }
+// src/legacy-names.ts
+var LEGACY_NAMES = [
+  { legacy: "conversations", use: "moda traces list", canonical: { command: "traces", subcommand: "list" }, silent: true },
+  { legacy: "search", use: 'moda traces search "<query>"', canonical: { command: "traces", subcommand: "search" } },
+  { legacy: "context", use: "moda traces get <conversation_id>", canonical: { command: "traces", subcommand: "get" } },
+  { legacy: "world-state", use: "moda traces state <conversation_id>", canonical: { command: "traces", subcommand: "state" } },
+  { legacy: "audit", use: "moda traces spans <conversation_id|trace_id>", canonical: { command: "traces", subcommand: "spans" } },
+  { legacy: "trace", use: "moda traces spans <conversation_id|trace_id>", canonical: { command: "traces", subcommand: "spans" } },
+  { legacy: "problem", use: "moda problems get <problem_id>", canonical: { command: "problems", subcommand: "get" } },
+  { legacy: "problems remainder", use: "moda problems unexplained", canonical: { command: "problems", subcommand: "unexplained" } },
+  { legacy: "problem-impact", use: "moda problems impact", canonical: { command: "problems", subcommand: "impact" } },
+  { legacy: "problem-feedback", use: "moda problems feedback <problem_id>", canonical: { command: "problems", subcommand: "feedback" } },
+  { legacy: "problem-reopen", use: "moda problems reopen <problem_id>", canonical: { command: "problems", subcommand: "reopen" } },
+  { legacy: "problem-linear", use: "moda problems linear <problem_id>", canonical: { command: "problems", subcommand: "linear" } },
+  { legacy: "problem-linear-file", use: "moda problems link <problem_id>", canonical: { command: "problems", subcommand: "link" } },
+  { legacy: "emotions", use: "moda detections list --family=emotion[:<family>]", canonical: { command: "detections", subcommand: "list" } },
+  { legacy: "frustrations", use: "moda detections list --family=frustration", canonical: { command: "detections", subcommand: "list" } },
+  { legacy: "laziness", use: "moda detections list --family=laziness[:<family>]", canonical: { command: "detections", subcommand: "list" } },
+  { legacy: "hallucinations", use: "moda detections list --family=hallucination", canonical: { command: "detections", subcommand: "list" } },
+  { legacy: "tool-failures", use: "moda detections tools", canonical: { command: "detections", subcommand: "tools" } },
+  { legacy: "tool-failure-detail", use: "moda detections tools <tool_name>", canonical: { command: "detections", subcommand: "tools" } },
+  { legacy: "signal --detections", use: "moda detections list --family=custom_signal --signal-id=<signal_id>", canonical: { command: "detections", subcommand: "list" } },
+  { legacy: "trace-signals", use: "moda detections list --family=custom_signal --conversation-id=<conversation_id>", canonical: { command: "detections", subcommand: "list" } },
+  { legacy: "false-positive", use: "moda review <kind> <target>", canonical: { command: "review" } },
+  { legacy: "detection-review", use: "moda review problem-detection <problem_id> --verdict=<verdict>", canonical: { command: "review", subcommand: "problem-detection" } },
+  { legacy: "signal-label", use: "moda review custom-signal <signal_id> --verdict=correct|false_positive", canonical: { command: "review", subcommand: "custom-signal" } },
+  { legacy: "false-positives", use: "moda reviews list", canonical: { command: "reviews", subcommand: "list" } },
+  { legacy: "detection-reviews", use: "moda reviews list <conversation_id> --kind=problem-detection", canonical: { command: "reviews", subcommand: "list" } },
+  { legacy: "skills sync", use: "moda skills push", canonical: { command: "skills", subcommand: "push" }, note: "It uploads local SKILL.md files ('moda sync skills' downloads; that is 'moda skills pull')." },
+  { legacy: "sync skills", use: "moda skills pull", canonical: { command: "skills", subcommand: "pull" }, note: "It downloads skills, while 'moda skills sync' uploads; use 'moda skills pull' (download) or 'moda skills push' (upload)." }
+];
+var byLegacy = new Map(LEGACY_NAMES.map((entry) => [entry.legacy, entry]));
+var LEGACY_PATTERN = new RegExp(`moda (${[...LEGACY_NAMES.map((entry) => entry.legacy.replace(/ --detections$/, "")), "signal"].filter((name, index, all) => all.indexOf(name) === index).sort((left, right) => right.length - left.length).map((name) => name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("|")})(?![\\w-])`, "g");
+var WORD = /(?:'[^']*'|"(?:[^"\\]|\\.)*"|\\.|[^\s'"]|['"])+/g;
+function commandEnd(text, from, opener) {
+  let quote = "";
+  for (let index = from;index < text.length; index += 1) {
+    const char = text[index];
+    const next = text[index + 1] ?? "";
+    if (char === `
+` || char === "`")
+      return index;
+    if ((opener === '"' || opener === "'") && char === opener && !quote)
+      return index;
+    if (char === '"' || char === "'") {
+      if (!quote)
+        quote = char;
+      else if (quote === char)
+        quote = "";
+      continue;
+    }
+    if (quote)
+      continue;
+    if (opener === "(" && char === ")")
+      return index;
+    if (char === "|" || char === ";")
+      return index;
+    if ((char === "," || char === ".") && (next === " " || next === ""))
+      return index;
+    if (char === " " && (next === "(" || next === "#" || text.startsWith("moda ", index + 1) || text.startsWith("&&", index + 1)))
+      return index;
+  }
+  return text.length;
+}
+function isPlaceholder(token) {
+  return /^"?<[^>]+>"?$/.test(token);
+}
+function quotedArgumentSpans(text) {
+  const spans = [];
+  for (const match of text.matchAll(/moda (?=[a-z])/g)) {
+    const start = match.index ?? 0;
+    if (spans.some(([from, to]) => start > from && start < to))
+      continue;
+    const end = commandEnd(text, start + match[0].length, start > 0 ? text[start - 1] : "");
+    let open = -1;
+    for (let index = start;index < end; index += 1) {
+      const char = text[index];
+      if (char !== '"' && char !== "'")
+        continue;
+      if (open === -1)
+        open = index;
+      else if (text[open] === char) {
+        spans.push([open, index]);
+        open = -1;
+      }
+    }
+    if (open !== -1)
+      spans.push([open, end]);
+  }
+  return spans;
+}
+function canonicalInvocation(entry, rest) {
+  let words = [...rest];
+  const takeFlag = (pattern) => {
+    const index = words.findIndex((word2) => pattern.test(word2));
+    if (index === -1)
+      return;
+    const [word] = words.splice(index, 1);
+    return word;
+  };
+  let familySuffix = "";
+  switch (entry.legacy) {
+    case "emotions":
+    case "laziness": {
+      const family = takeFlag(/^--family=/);
+      if (family)
+        familySuffix = `:${family.slice("--family=".length)}`;
+      break;
+    }
+    case "signal --detections":
+      takeFlag(/^--detections(=true)?$/);
+      break;
+    case "false-positive":
+      words = words.map((word) => /^--undo(=true)?$/.test(word) ? "--verdict=clear" : word);
+      break;
+    case "signal-label":
+      words = words.map((word) => word.replace(/^--label=fits$/, "--verdict=correct").replace(/^--label=does_not_fit$/, "--verdict=false_positive").replace(/^--label=.*$/, "--verdict=correct|false_positive"));
+      break;
+    default:
+      break;
+  }
+  const positionals = [];
+  while (words.length > 0 && !words[0].startsWith("-"))
+    positionals.push(words.shift());
+  const out = [];
+  for (const token of entry.use.replace(/\[[^\]]*\]/g, "").split(" ")) {
+    const flag = /^(--[a-z-]+=)(.*)$/.exec(token);
+    if (isPlaceholder(token) || flag && isPlaceholder(flag[2])) {
+      const value = positionals.shift();
+      if (value !== undefined)
+        out.push(flag ? `${flag[1]}${value}` : value);
+    } else if (token.includes("|")) {} else {
+      out.push(token.startsWith("--family=") ? `${token}${familySuffix}` : token);
+    }
+  }
+  return [...out, ...positionals, ...words].join(" ");
+}
+function canonicalCommandText(text) {
+  if (!text.includes("moda "))
+    return text;
+  const quoted = quotedArgumentSpans(text);
+  let out = "";
+  let cursor = 0;
+  for (const match of text.matchAll(LEGACY_PATTERN)) {
+    const start = match.index ?? 0;
+    if (start < cursor)
+      continue;
+    if (quoted.some(([from, to]) => start > from && start < to))
+      continue;
+    const afterName = start + match[0].length;
+    const end = text[afterName] === " " ? commandEnd(text, afterName, start > 0 ? text[start - 1] : "") : afterName;
+    const rest = text.slice(afterName, end).match(WORD) ?? [];
+    const name = match[1];
+    const entry = name === "signal" ? rest.some((word) => /^--detections(=true)?$/.test(word)) ? byLegacy.get("signal --detections") : undefined : byLegacy.get(name);
+    if (!entry)
+      continue;
+    out += `${text.slice(cursor, start)}${canonicalInvocation(entry, rest)}`;
+    const trailing = /\s*$/.exec(text.slice(afterName, end))?.[0] ?? "";
+    out += trailing;
+    cursor = end;
+  }
+  return out + text.slice(cursor);
+}
+
 // src/output.ts
 import { randomUUID } from "node:crypto";
 import { lstatSync, mkdirSync as mkdirSync2, readdirSync, unlinkSync, writeFileSync as writeFileSync2 } from "node:fs";
 import { tmpdir } from "node:os";
 import { join as join2 } from "node:path";
+var SUGGESTION_KEY = /(_commands?|^hints?|^suggestions?)$/i;
+function canonicalDeep(value, rewriteStrings) {
+  if (typeof value === "string")
+    return rewriteStrings ? canonicalCommandText(value) : value;
+  if (Array.isArray(value)) {
+    let changed2 = false;
+    const next = value.map((item) => {
+      const rewritten = canonicalDeep(item, rewriteStrings);
+      if (rewritten !== item)
+        changed2 = true;
+      return rewritten;
+    });
+    return changed2 ? next : value;
+  }
+  if (value === null || typeof value !== "object")
+    return value;
+  let changed = false;
+  const entries = Object.entries(value).map(([key, entry]) => {
+    const rewritten = canonicalDeep(entry, rewriteStrings || SUGGESTION_KEY.test(key));
+    if (rewritten !== entry)
+      changed = true;
+    return [key, rewritten];
+  });
+  return changed ? Object.fromEntries(entries) : value;
+}
+function canonicalSuggestionFields(value) {
+  return canonicalDeep(value, false);
+}
+function canonicalSuggestions(value) {
+  return canonicalDeep(value, true);
+}
 var agentUpdateNotice;
 function setAgentUpdateNotice(notice) {
   agentUpdateNotice = notice;
@@ -1608,6 +1803,8 @@ function resolveOutputMode(flags, opts = {}) {
   return "human";
 }
 function createCliOutput(options) {
+  const deprecatedMeta = options.deprecation ? { deprecated: { legacy: options.deprecation.legacy, use: options.deprecation.use } } : {};
+  const deprecationWarnings = options.deprecation ? [options.deprecation.message] : [];
   const state = {
     runId: options.runId ?? randomUUID(),
     seq: 0,
@@ -1657,6 +1854,7 @@ function createCliOutput(options) {
       data,
       meta: {
         ...writeOptions.meta ?? {},
+        ...deprecatedMeta,
         run_id: state.runId,
         ...options.command === "feedback" ? {} : { tip: FEEDBACK_TIP },
         ...((update) => update ? { update } : {})(resolveAgentUpdateNotice())
@@ -1668,6 +1866,7 @@ function createCliOutput(options) {
       nextCommands: writeOptions.nextCommands,
       artifacts: writeOptions.artifacts,
       warnings: writeOptions.warnings,
+      extraWarnings: deprecationWarnings,
       errors: writeOptions.errors,
       invocation: options.invocation
     });
@@ -1706,10 +1905,10 @@ function createCliOutput(options) {
         }
         return;
       }
-      safeWriteStdout(`${JSON.stringify(redactDeep(data), null, 2)}
+      safeWriteStdout(`${JSON.stringify(canonicalSuggestionFields(redactDeep(data)), null, 2)}
 `);
       for (const warning of writeOptions.warnings ?? []) {
-        safeWriteStderr(`Warning: ${warning}
+        safeWriteStderr(`Warning: ${canonicalCommandText(warning)}
 `);
       }
     },
@@ -1718,6 +1917,7 @@ function createCliOutput(options) {
         return;
       if (options.mode !== "agent-stream")
         return;
+      event = canonicalSuggestions(event);
       if (event.event === "started") {
         startHeartbeat(options.command, state);
         emitEvent(event);
@@ -1729,8 +1929,8 @@ function createCliOutput(options) {
     writeError(error) {
       if (state.terminal)
         return;
-      const agentError = errorToAgentError(error);
-      const envelope = createAgentErrorEnvelope(options.command || "unknown", agentError, state.runId, errorWarnings(error));
+      const agentError = canonicalSuggestions(errorToAgentError(error));
+      const envelope = createAgentErrorEnvelope(options.command || "unknown", agentError, state.runId, errorWarnings(error), options.deprecation ? deprecatedMeta : undefined, deprecationWarnings);
       if (options.mode === "agent-stream") {
         ensureStarted({ bypassQuiet: true });
         if (error instanceof CliInputRequiredError) {
@@ -1796,7 +1996,7 @@ function createCliOutput(options) {
   return output;
 }
 function createAgentEnvelope(options) {
-  const safeData = redactDeep(options.data);
+  const safeData = canonicalSuggestionFields(redactDeep(options.data));
   const maxBytes = agentMaxOutputBytes();
   let fullOutput;
   let saveFailed = false;
@@ -1808,13 +2008,16 @@ function createAgentEnvelope(options) {
     return fullOutput.path;
   };
   let text = redactDeep({
-    summary: normalizeSummary(options.summary, options.command, options.status, safeData),
-    findings: options.findings ?? [],
-    evidence_refs: options.evidenceRefs ?? [],
-    recommended_actions: options.recommendedActions ?? [],
-    next_commands: normalizeNextCommands(options.nextCommands ?? []),
-    warnings: options.warnings ?? inferWarnings(safeData)
+    ...canonicalSuggestions({
+      summary: normalizeSummary(options.summary, options.command, options.status, safeData),
+      findings: options.findings ?? [],
+      evidence_refs: options.evidenceRefs ?? [],
+      recommended_actions: options.recommendedActions ?? [],
+      next_commands: normalizeNextCommands(options.nextCommands ?? [])
+    }),
+    warnings: [...canonicalSuggestions(options.warnings ?? inferWarnings(safeData)), ...options.extraWarnings ?? []]
   });
+  const errors = canonicalSuggestions(options.errors ?? []);
   let moved;
   const build = (bounded) => ({
     schema_version: AGENT_SCHEMA_VERSION,
@@ -1826,7 +2029,7 @@ function createAgentEnvelope(options) {
     findings: text.findings,
     evidence_refs: text.evidence_refs,
     recommended_actions: text.recommended_actions,
-    next_commands: [...text.next_commands, ...bounded.nextCommands ?? []],
+    next_commands: [...text.next_commands, ...canonicalSuggestions(bounded.nextCommands ?? [])],
     artifacts: [
       ...options.artifacts ?? [],
       ...bounded.fullOutputPath ? [{ kind: "full_output", path: bounded.fullOutputPath, description: "Complete command output (the same JSON --json prints); data in this envelope was bounded." }] : [],
@@ -1834,10 +2037,10 @@ function createAgentEnvelope(options) {
     ],
     warnings: [
       ...text.warnings,
-      ...bounded.warning ? [bounded.warning] : [],
+      ...bounded.warning ? [canonicalCommandText(bounded.warning)] : [],
       ...moved ? [movedTextWarning(moved)] : []
     ],
-    errors: options.errors ?? [],
+    errors,
     data: bounded.data,
     ...options.meta ? { meta: options.meta } : {},
     ...bounded.truncation || moved ? { truncation: {
@@ -1996,13 +2199,14 @@ function errorWarnings(error) {
   const warnings = error?.warnings;
   return Array.isArray(warnings) && warnings.length ? warnings.filter((w) => typeof w === "string") : undefined;
 }
-function createAgentErrorEnvelope(command, error, runId, warnings) {
+function createAgentErrorEnvelope(command, error, runId, warnings, meta, extraWarnings) {
   return createAgentEnvelope({
     command,
     status: "error",
     data: null,
     warnings: warnings ?? [],
-    meta: runId ? { run_id: runId } : undefined,
+    ...extraWarnings?.length ? { extraWarnings } : {},
+    meta: runId || meta ? { ...meta ?? {}, ...runId ? { run_id: runId } : {} } : undefined,
     summary: {
       text: error.message,
       confidence: "high"
@@ -2423,7 +2627,7 @@ function continuationCommand(invocation, overrides) {
   }
   for (const [key, value] of Object.entries(overrides))
     parts.push(`--${normalize2(key)}=${shellWord(String(value))}`);
-  return parts.join(" ");
+  return canonicalCommandText(parts.join(" "));
 }
 var PAGED_LIST_BY_COMMAND = {
   "tool-failure-detail": "examples",
@@ -2432,8 +2636,9 @@ var PAGED_LIST_BY_COMMAND = {
   "problems remainder": "groups"
 };
 function pagedListFor(invocation) {
-  const subcommand = invocation.positionals[0];
-  return (subcommand !== undefined ? PAGED_LIST_BY_COMMAND[`${invocation.command} ${subcommand}`] : undefined) ?? PAGED_LIST_BY_COMMAND[invocation.command];
+  const { command, positionals } = invocation.routedAs ?? invocation;
+  const subcommand = positionals[0];
+  return (subcommand !== undefined ? PAGED_LIST_BY_COMMAND[`${command} ${subcommand}`] : undefined) ?? PAGED_LIST_BY_COMMAND[command];
 }
 var MAX_PAGE_OFFSET = 1e4;
 function rewritePagination(list, isTopLevel, invocation) {
@@ -2647,4 +2852,4 @@ function apiKeyHeaders(key, options = {}, url) {
   return headers;
 }
 
-export { PROD_BASE_URL, DEFAULT_INGEST_URL, getModaPaths, getModaDir, isLoopbackBaseUrl, describeBaseUrlSource, loadProfileConfig, saveProfileConfig, getActiveProfile, setActiveProfile, upsertProfile, clearStoredApiKeyCredentials, secretFilePathFromRef, resolveSecretReference, resolveApiKeyFromActiveProfile, resolveTenantIdFromActiveProfile, ensureSecretFilePermissions, writeSecretJsonFile, CliInputError, attachInputDetails, CliAccessError, CliInputRequiredError, CliAuthError, CliNotFoundError, CliCancellationError, isNetworkLikeError, isApiLikeError, apiErrorStatus, VERSION, MODA_BASE_URL, loadCliConfig, saveCliConfig, resolveApiKey, embeddedTenantIdFromApiKey, resolveIngestUrl2 as resolveIngestUrl, resolveTenantId, resolveApiTenantId, resolveModaBaseUrl, validateConfig, isPlatformApiKey, setPlatformTenantOverride, apiKeyHeaders, recordApiRequest, getApiRequestCount, resetApiRequestCount, BATCH_MAX_TARGETS, BATCH_CONCURRENCY, parseBatchTarget, collectBatchTargets, mapWithConcurrency, contextTarget, asRecord, asString, asNumber, frustrationAnchorIndex, frustrationsFromEmotions, withFrustrationAnchors, shellWord, trimToolFailureConversations, withToolFailureAnchors, embeddedWindowSize, withoutDetectionWindows, compactProblemDossier, MAX_SCANNED_FILE_BYTES, DEFAULT_MAX_INVENTORY_FILES, DEFAULT_MAX_INVENTORY_TEXT_BYTES, MAX_RECORDED_SKIPS, SKIPPED_DIRS, isSkippedDir, isSkippedPathPrefix, isEvalLikePath, shouldInventoryFile, isTextFile, isSecretishPath, SECRET_KEYS, redactDeep, redactString, packSnapshot, setAgentUpdateNotice, EXIT_OK, EXIT_ERROR, EXIT_DEGRADED, EXIT_AUTH_REQUIRED, EXIT_INPUT_REQUIRED, EXIT_CANCELLED, AGENT_ERROR_CODES, wasOutputCancelled, safeWriteStdout, safeWriteStderr, explicitOutputMode, outputModeFromFlags, resolveOutputMode, createCliOutput, agentEnvelopeFits, errorToAgentError, agentMaxOutputBytes };
+export { PROD_BASE_URL, DEFAULT_INGEST_URL, getModaPaths, getModaDir, isLoopbackBaseUrl, describeBaseUrlSource, loadProfileConfig, saveProfileConfig, getActiveProfile, setActiveProfile, upsertProfile, clearStoredApiKeyCredentials, secretFilePathFromRef, resolveSecretReference, resolveApiKeyFromActiveProfile, resolveTenantIdFromActiveProfile, ensureSecretFilePermissions, writeSecretJsonFile, CliInputError, attachInputDetails, inputDetailsOf, CliAccessError, CliInputRequiredError, CliAuthError, CliNotFoundError, CliCancellationError, isNetworkLikeError, isApiLikeError, apiErrorStatus, VERSION, MODA_BASE_URL, loadCliConfig, saveCliConfig, resolveApiKey, embeddedTenantIdFromApiKey, resolveIngestUrl2 as resolveIngestUrl, resolveTenantId, resolveApiTenantId, resolveModaBaseUrl, validateConfig, isPlatformApiKey, setPlatformTenantOverride, apiKeyHeaders, recordApiRequest, getApiRequestCount, resetApiRequestCount, BATCH_MAX_TARGETS, BATCH_CONCURRENCY, parseBatchTarget, collectBatchTargets, mapWithConcurrency, contextTarget, asRecord, asString, asNumber, frustrationAnchorIndex, frustrationsFromEmotions, withFrustrationAnchors, shellWord, trimToolFailureConversations, withToolFailureAnchors, embeddedWindowSize, withoutDetectionWindows, compactProblemDossier, MAX_SCANNED_FILE_BYTES, DEFAULT_MAX_INVENTORY_FILES, DEFAULT_MAX_INVENTORY_TEXT_BYTES, MAX_RECORDED_SKIPS, SKIPPED_DIRS, isSkippedDir, isSkippedPathPrefix, isEvalLikePath, shouldInventoryFile, isTextFile, isSecretishPath, SECRET_KEYS, redactDeep, redactString, packSnapshot, LEGACY_NAMES, canonicalCommandText, setAgentUpdateNotice, EXIT_OK, EXIT_ERROR, EXIT_DEGRADED, EXIT_AUTH_REQUIRED, EXIT_INPUT_REQUIRED, EXIT_CANCELLED, AGENT_ERROR_CODES, wasOutputCancelled, safeWriteStdout, safeWriteStderr, explicitOutputMode, outputModeFromFlags, resolveOutputMode, createCliOutput, agentEnvelopeFits, errorToAgentError, agentMaxOutputBytes };