@mafdet/cli 0.4.9 → 0.4.11

package/CHANGELOG.md

@@ -6,6 +6,66 @@ The version is the contract for the JSON output shapes and the exit codes.
 Being 0.x, semver still permits a break in a minor bump; the intent is not to
 use that latitude, and the promise becomes binding at 1.0.0.
 
+## 0.4.11 - 2026-08-12
+
+A seventh audit round, fixed at the root rather than sink by sink - which is
+what the first round asked for and what six rounds of patching individual
+strings failed to do.
+
+**One boundary for human-readable output.** Interactive agent failures,
+model-controlled tool names and results, the command-line approval preview,
+TUI tool cards, account tables and model retirement text all go through it
+now. Previously each was a separate string that someone had to remember. The
+approval preview mattered most: a control sequence there can redraw the diff
+between what you are shown and what you are agreeing to.
+
+**One definition of a price.** `isMicroUsd` is shared by the agent's cost
+ceiling, chat estimates, `models show` and the TUI picker. A catalogue serving
+`abc` used to crash `models show` and the model picker outright, and in chat it
+threw _after_ the request had been paid for, losing the answer and the saved
+session with it. Invalid prices now read as unknown, and `"0"` is still a
+price.
+
+**Remote JSON is validated where it arrives.** Catalogue, wallet, usage and
+subscription responses are checked at the HTTP boundary instead of being
+trusted because TypeScript describes them. Malformed token counts are ignored
+rather than entering totals or BigInt arithmetic.
+
+Machine output is unchanged throughout: `--json`, `--plain` and redirected
+streams still carry exactly what the server sent.
+
+## 0.4.10 - 2026-08-12
+
+A sixth audit round, and the finding that matters most is about how the last
+one was tested.
+
+**Four previously missed error paths now share one function.** 0.4.9 said every
+human-readable error used it, which was still too broad: the interactive Agent
+and other human-output paths were found separately and are fixed under
+Unreleased. The four 0.4.10 paths were: `embed` and `speech` handled a surface
+mismatch themselves, `mafdet agent` printed the upstream's message directly,
+and the request id - which comes from a response header - was concatenated
+outside the sanitiser inside the very function meant to be the boundary. All
+four carried remote text to a terminal.
+
+The test that was supposed to cover this called the sanitiser directly, so it
+passed while every caller bypassed it. That is the same mistake as the one in
+0.4.7, one release later. The new tests go in at `embedCommand`,
+`speechCommand` and `agentCommand` - the commands a user actually runs - and
+each was checked to fail when its fix is removed.
+
+**A cost ceiling refuses an unusable price before sending anything.** The
+pre-flight check asked only whether the price fields were present, so `abc`,
+`-1`, `1.5` and `" 2"` passed it and the run spent one request before the
+post-response check refused the result. Both checks now share one definition,
+which also fixes the opposite error: a price of `"0"` is a price, and a truthy
+test was rejecting free models.
+
+**An invalid token count no longer reaches the totals.** It had stopped
+affecting cost, but a negative or fractional figure was still added to the
+token summary and fed into the context estimate - producing negative totals
+and steering a decision about what to send next.
+
 ## 0.4.9 - 2026-08-12
 
 A fifth audit round: two billing and terminal-safety fixes, and two smaller
@@ -21,6 +81,9 @@ present and valid; anything else is reported as unpriced, stops a run that
 asked for a ceiling, and keeps the answer that was generated.
 
 **Errors and diagnostics can no longer carry terminal control sequences.**
+⚠️ Not true as written: `doctor` and the shared reporter were fixed, but
+`embed`, `speech`, the agent's summary and the request id still bypassed it.
+Fixed in 0.4.10.
 `mafdet doctor` interpolated a model's `apiSurface` straight into its table,
 and a surface-mismatch error did the same into stderr. Rather than cleaning
 those two strings, the cleaning now happens at the two boundaries every

package/README.md

@@ -3,7 +3,7 @@
 The official Mafdet AI command line: model calls, account queries, and a
 permissioned local agent.
 
-> **0.4.9.** 中文版见 [README.zh-CN.md](./README.zh-CN.md). The CLI never
+> **0.4.11.** 中文版见 [README.zh-CN.md](./README.zh-CN.md). The CLI never
 > advertises a command it cannot serve, so `mafdet help` always lists exactly
 > what works.
 >
@@ -23,8 +23,8 @@ Or build it from this repository:
 
 ```bash
 pnpm --filter @mafdet/cli build
-cd packages/cli && npm pack          # -> mafdet-cli-0.4.9.tgz
-npm install -g ./mafdet-cli-0.4.9.tgz
+cd packages/cli && npm pack          # -> mafdet-cli-0.4.11.tgz
+npm install -g ./mafdet-cli-0.4.11.tgz
 ```
 
 ## The interactive session

package/README.zh-CN.md

@@ -2,7 +2,7 @@
 
 Mafdet AI 官方命令行：模型调用、账户查询，以及一个受权限约束的本地 Agent。
 
-> **0.4.9。** 英文版见 [README.md](./README.md)。
+> **0.4.11。** 英文版见 [README.md](./README.md)。
 
 ## 环境要求
 

package/dist/agent/approvals.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"approvals.d.ts","sourceRoot":"","sources":["../../src/agent/approvals.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,eAAe;IAC9B,yDAAyD;IACzD,OAAO,EAAE,MAAM,CAAC;IAChB,8DAA8D;IAC9D,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,QAAQ;IACvB,OAAO,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CACrD;AAED;;;;GAIG;AACH,eAAO,MAAM,OAAO,EAAE,QAIrB,CAAC;AAEF,uEAAuE;AACvE,eAAO,MAAM,UAAU,EAAE,QAIxB,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,EAAE,EAAE;IACtC,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;CAChC,GAAG,QAAQ,CAgBX;AAED,MAAM,MAAM,YAAY,GAAG,WAAW,GAAG,SAAS,GAAG,WAAW,CAAC;AAEjE;;;;GAIG;AACH,wBAAgB,WAAW,CACzB,IAAI,EAAE,YAAY,EAClB,EAAE,EAAE;IAAE,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAA;CAAE,EACtC,aAAa,GAAE,OAAsC,GACpD,QAAQ,CAIV"}
+{"version":3,"file":"approvals.d.ts","sourceRoot":"","sources":["../../src/agent/approvals.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,eAAe;IAC9B,yDAAyD;IACzD,OAAO,EAAE,MAAM,CAAC;IAChB,8DAA8D;IAC9D,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,QAAQ;IACvB,OAAO,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CACrD;AAED;;;;GAIG;AACH,eAAO,MAAM,OAAO,EAAE,QAIrB,CAAC;AAEF,uEAAuE;AACvE,eAAO,MAAM,UAAU,EAAE,QAIxB,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,EAAE,EAAE;IACtC,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;CAChC,GAAG,QAAQ,CAwBX;AAED,MAAM,MAAM,YAAY,GAAG,WAAW,GAAG,SAAS,GAAG,WAAW,CAAC;AAEjE;;;;GAIG;AACH,wBAAgB,WAAW,CACzB,IAAI,EAAE,YAAY,EAClB,EAAE,EAAE;IAAE,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAA;CAAE,EACtC,aAAa,GAAE,OAAsC,GACpD,QAAQ,CAIV"}

package/dist/agent/approvals.js

@@ -1,4 +1,5 @@
 import { createInterface } from "node:readline/promises";
+import { safeForTerminal } from "../output/terminal-safe.js";
 /**
  * `read-only`, and every non-interactive run that has not been given explicit
  * permission. Plan §8.1: a CI job must not acquire write access by accident,
@@ -24,7 +25,13 @@ export const approveAll = {
 export function interactiveApprover(io) {
     return {
         async approve(request) {
-            io.stderr(`\n${request.summary}\n${request.preview}\n`);
+            // Always sanitised, unlike every other stderr write, and the exception
+            // is deliberate: this prompt only exists when a person is about to
+            // answer it, and the answer decides whether a file is written. A control
+            // sequence here could clear the screen or redraw the diff between what
+            // is shown and what is asked. There is no redirected-output case to
+            // preserve bytes for - a redirected run cannot answer the prompt.
+            io.stderr(safeForTerminal(`\n${request.summary}\n${request.preview}\n`, true));
             const rl = createInterface({
                 input: io.input ?? process.stdin,
                 output: io.output ?? process.stderr,

package/dist/agent/loop.d.ts

@@ -167,5 +167,18 @@ interface ToolCall {
 export declare function runAgent(options: AgentOptions): Promise<AgentReport>;
 /** Retry-After when the server gave one; otherwise exponential with jitter. */
 export declare function backoffMs(retryAfterSeconds: number | undefined, attempt: number, random?: () => number): number;
+/**
+ * W-1 · Can this model be priced at all, before anything is sent?
+ *
+ * Exported and shared with the pre-flight check, because the two used to
+ * disagree: the check asked only whether the fields were truthy, so `abc`,
+ * `-1`, `1.5` and `" 2"` all passed it and the run spent one request before
+ * `canPrice` refused the result. A ceiling that cannot cover the first request
+ * is not the ceiling the user asked for.
+ *
+ * Note `"0"` is a valid price and truthy checks got that wrong in the other
+ * direction - a free model would have been refused.
+ */
+export declare function hasValidPrices(model: CatalogModel | undefined): boolean;
 export {};
 //# sourceMappingURL=loop.d.ts.map

package/dist/agent/loop.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loop.d.ts","sourceRoot":"","sources":["../../src/agent/loop.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"loop.d.ts","sourceRoot":"","sources":["../../src/agent/loop.ts"],"names":[],"mappings":"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"}

package/dist/agent/loop.js

@@ -1,5 +1,6 @@
 import { ApiError } from "../api/errors.js";
 import { compactUntilItFits, requestSize, shouldCompact, } from "./context-budget.js";
+import { isMicroUsd } from "../output/money.js";
 import { toolToJsonSchema, } from "./tools/types.js";
 /** Plan §7.4. */
 export const DEFAULT_LIMITS = {
@@ -54,11 +55,10 @@ export async function runAgent(options) {
     // discover it meant a run with an explicit ceiling still made one billable
     // request that could never be counted against it.
     if (limits.maxCostMicroUsd !== undefined &&
-        (!options.pricing?.inputPricePer1mMicroUsd ||
-            !options.pricing.outputPricePer1mMicroUsd)) {
-        return stop(report, "cost_unknown", `--max-cost-usd cannot be enforced: the catalogue publishes no price for ` +
-            `${options.model}, so nothing can be counted towards the ceiling. ` +
-            `Re-run without the limit to continue anyway.`);
+        !hasValidPrices(options.pricing)) {
+        return stop(report, "cost_unknown", `--max-cost-usd cannot be enforced: the catalogue publishes no usable ` +
+            `price for ${options.model}, so nothing can be counted towards the ` +
+            `ceiling. Re-run without the limit to continue anyway.`);
     }
     for (let turn = 1; turn <= limits.maxTurns; turn += 1) {
         if (options.signal?.aborted)
@@ -125,13 +125,24 @@ export async function runAgent(options) {
             }
             return stop(report, "error", error instanceof Error ? error.message : String(error));
         }
+        // W-3 · Only counts that survive validation reach the totals or the
+        // context state. A negative or fractional figure used to be added to the
+        // report and fed into the compaction ratio - it no longer priced anything,
+        // but it still produced negative token totals and steered a decision about
+        // what to send next.
         const usage = response.usage;
-        if (usage?.prompt_tokens !== undefined) {
-            lastPromptTokens = usage.prompt_tokens;
+        const promptTokens = isTokenCount(usage?.prompt_tokens)
+            ? usage.prompt_tokens
+            : undefined;
+        const completionTokens = isTokenCount(usage?.completion_tokens)
+            ? usage.completion_tokens
+            : undefined;
+        if (promptTokens !== undefined) {
+            lastPromptTokens = promptTokens;
             lastRequestSize = sentSize;
         }
-        report.promptTokens += usage?.prompt_tokens ?? 0;
-        report.completionTokens += usage?.completion_tokens ?? 0;
+        report.promptTokens += promptTokens ?? 0;
+        report.completionTokens += completionTokens ?? 0;
         // Cost comes from returned usage, never from the reservation: CLI-000B
         // showed the reserve cannot see the tool schema and under-counts badly.
         const turnCost = priceTurn(options.pricing, usage);
@@ -142,8 +153,10 @@ export async function runAgent(options) {
             ...(response.requestId === undefined
                 ? {}
                 : { requestId: response.requestId }),
-            promptTokens: usage?.prompt_tokens ?? 0,
-            completionTokens: usage?.completion_tokens ?? 0,
+            // W-3 · The validated values, so nothing downstream - the recorder, the
+            // session store, a JSON consumer - has to re-derive what was usable.
+            promptTokens: promptTokens ?? 0,
+            completionTokens: completionTokens ?? 0,
             costMicroUsd: turnCost,
             priced: canPrice(options.pricing, usage),
         });
@@ -333,9 +346,21 @@ export function backoffMs(retryAfterSeconds, attempt, random = Math.random) {
 function isTokenCount(value) {
     return typeof value === "number" && Number.isSafeInteger(value) && value >= 0;
 }
-/** Integer micro-USD, non-negative. Anything else is not a price. */
-function isPrice(value) {
-    return typeof value === "string" && /^\d+$/.test(value);
+/**
+ * W-1 · Can this model be priced at all, before anything is sent?
+ *
+ * Exported and shared with the pre-flight check, because the two used to
+ * disagree: the check asked only whether the fields were truthy, so `abc`,
+ * `-1`, `1.5` and `" 2"` all passed it and the run spent one request before
+ * `canPrice` refused the result. A ceiling that cannot cover the first request
+ * is not the ceiling the user asked for.
+ *
+ * Note `"0"` is a valid price and truthy checks got that wrong in the other
+ * direction - a free model would have been refused.
+ */
+export function hasValidPrices(model) {
+    return (isMicroUsd(model?.inputPricePer1mMicroUsd) &&
+        isMicroUsd(model?.outputPricePer1mMicroUsd));
 }
 function canPrice(model, usage) {
     if (usage === undefined)
@@ -344,8 +369,7 @@ function canPrice(model, usage) {
         return false;
     if (!isTokenCount(usage.completion_tokens))
         return false;
-    return (isPrice(model?.inputPricePer1mMicroUsd) &&
-        isPrice(model?.outputPricePer1mMicroUsd));
+    return hasValidPrices(model);
 }
 function priceTurn(model, usage) {
     // V-1 · One gate, shared with the caller's reporting, so a turn can never be

package/dist/agent/session.d.ts

@@ -44,6 +44,8 @@ export interface SessionOptions {
     onGoal?: (goal: string) => void;
     /** R-4 · False when stdout is a pipe or a file, which get exact bytes. */
     isTty?: boolean;
+    /** Whether stderr is a terminal; independent from stdout. */
+    isErrTty?: boolean;
     /**
      * A conversation to continue, rebuilt from a saved session (CLI-024).
      * Appended to in place, exactly as the fresh array would be.

package/dist/agent/session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/agent/session.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAIrD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE/C,OAAO,EAAY,KAAK,UAAU,EAAE,KAAK,WAAW,EAAE,MAAM,WAAW,CAAC;AACxE,OAAO,KAAK,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAapE,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,UAAU,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,oEAAoE;IACpE,OAAO,EAAE,SAAS,YAAY,EAAE,CAAC;IACjC,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,cAAc,EAAE,CAAC;IACxB,WAAW,EAAE,WAAW,CAAC;IACzB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,EAAE,SAAS,MAAM,EAAE,CAAC;IACnC,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;IAC9B;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC7C,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI,CAAC;IACtC;;;;;;;;OAQG;IACH,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAChC,0EAA0E;IAC1E,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;;OAGG;IACH,OAAO,CAAC,EAAE,WAAW,EAAE,CAAC;CACzB;AAED,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,uEAAuE;IACvE,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED;;;;;;;GAOG;AACH,wBAAsB,UAAU,CAC9B,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,cAAc,CAAC,CAwGzB;AAsHD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,WAAW,EAAE,GAAG,MAAM,CA2B7D"}
+{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/agent/session.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAIrD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAK/C,OAAO,EAAY,KAAK,UAAU,EAAE,KAAK,WAAW,EAAE,MAAM,WAAW,CAAC;AACxE,OAAO,KAAK,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAapE,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,UAAU,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,oEAAoE;IACpE,OAAO,EAAE,SAAS,YAAY,EAAE,CAAC;IACjC,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,cAAc,EAAE,CAAC;IACxB,WAAW,EAAE,WAAW,CAAC;IACzB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,EAAE,SAAS,MAAM,EAAE,CAAC;IACnC,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;IAC9B;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC7C,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI,CAAC;IACtC;;;;;;;;OAQG;IACH,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAChC,0EAA0E;IAC1E,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,6DAA6D;IAC7D,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;OAGG;IACH,OAAO,CAAC,EAAE,WAAW,EAAE,CAAC;CACzB;AAED,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,uEAAuE;IACvE,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED;;;;;;;GAOG;AACH,wBAAsB,UAAU,CAC9B,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,cAAc,CAAC,CAqHzB;AAsHD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,WAAW,EAAE,GAAG,MAAM,CA2B7D"}

package/dist/agent/session.js

@@ -2,7 +2,7 @@ import { createInterface } from "node:readline/promises";
 import { isAgentEligible } from "../api/models.js";
 import { formatUsdWithUnpriced } from "../output/money.js";
 import { renderRecord } from "../output/format.js";
-import { safeForTerminal } from "../output/terminal-safe.js";
+import { safeForTerminal, terminalSafeWriter, } from "../output/terminal-safe.js";
 import { runAgent } from "./loop.js";
 const HELP = `Session commands:
   /model [id]     Show or switch the model
@@ -23,6 +23,18 @@ Anything else is sent to the model as the next goal.
  * rather than the last question.
  */
 export async function runSession(options) {
+    // Interactive session stderr is a human surface. Wrap it once so new slash
+    // commands and progress messages cannot accidentally bypass the boundary.
+    // Preserve a dynamic signal getter: the TUI swaps its AbortController after
+    // cancelling one request so the session can return to the prompt.
+    const signalDescriptor = Object.getOwnPropertyDescriptor(options, "signal");
+    options = {
+        ...options,
+        stderr: terminalSafeWriter(options.stderr, options.isErrTty ?? true),
+    };
+    if (signalDescriptor?.get !== undefined) {
+        Object.defineProperty(options, "signal", signalDescriptor);
+    }
     const history = options.history ?? [];
     const summary = {
         goals: 0,
@@ -105,7 +117,7 @@ export async function runSession(options) {
                 options.stdout(`${safeForTerminal(report.finalText, options.isTty ?? true)}\n`);
             }
             if (report.stopReason !== "completed") {
-                options.stderr(`[${report.stopReason}${report.error ? `: ${report.error}` : ""}]\n`);
+                humanError(options, `[${report.stopReason}${report.error ? `: ${report.error}` : ""}]\n`);
             }
             if (report.stopReason === "cancelled" && options.signal?.aborted)
                 break;
@@ -296,12 +308,15 @@ function lineSource(input) {
 function reportEvent(event, options) {
     if (event.type === "tool") {
         const first = event.detail.split("\n")[0].slice(0, 100);
-        options.stderr(`  ${event.ok ? "-" : "!"} ${event.name}: ${first}\n`);
+        humanError(options, `  ${event.ok ? "-" : "!"} ${event.name}: ${first}\n`);
     }
     else if (event.type === "declined") {
-        options.stderr(`  declined: ${event.summary}\n`);
+        humanError(options, `  declined: ${event.summary}\n`);
     }
     else if (event.type === "rate_limited") {
         options.stderr(`  rate limited, waiting ${event.waitMs}ms (attempt ${event.attempt})\n`);
     }
 }
+function humanError(options, text) {
+    options.stderr(safeForTerminal(text, options.isErrTty ?? true));
+}

package/dist/api/account.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"account.d.ts","sourceRoot":"","sources":["../../src/api/account.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAE5C;;;GAGG;AAEH,MAAM,WAAW,MAAM;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,UAAU,CAAC,EAAE;QACX,mBAAmB,EAAE,MAAM,CAAC;QAC5B,cAAc,EAAE,MAAM,CAAC;QACvB,mBAAmB,EAAE,MAAM,CAAC;QAC5B,aAAa,EAAE,MAAM,CAAC;QACtB,KAAK,EAAE,MAAM,CAAC;KACf,CAAC;CACH;AAyBD,wBAAsB,WAAW,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAKrE;AAED,wBAAsB,UAAU,CAC9B,MAAM,EAAE,UAAU,EAClB,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,YAAY,CAAC,CAMvB;AAED,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,UAAU,GACjB,OAAO,CAAC,YAAY,CAAC,CAKvB;AAED;;;;;;GAMG;AACH,MAAM,WAAW,gBAAgB;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,yBAAyB,EAAE,MAAM,CAAC;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACpB;AAOD,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,MAAM,EAAE,SAAS,gBAAgB,EAAE,CAAC;IAC7C,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB;;;;;;OAMG;IACH,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;CAC7B;AAED,gFAAgF;AAChF,eAAO,MAAM,qBAAqB,KAAK,CAAC;AAExC;;;;;;GAMG;AACH,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,UAAU,EAClB,OAAO,GAAE;IACP,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,WAAW,CAAC;CACjB,GACL,OAAO,CAAC,iBAAiB,CAAC,CAgC5B"}
+{"version":3,"file":"account.d.ts","sourceRoot":"","sources":["../../src/api/account.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AA6C5C;;;GAGG;AAEH,MAAM,WAAW,MAAM;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,UAAU,CAAC,EAAE;QACX,mBAAmB,EAAE,MAAM,CAAC;QAC5B,cAAc,EAAE,MAAM,CAAC;QACvB,mBAAmB,EAAE,MAAM,CAAC;QAC5B,aAAa,EAAE,MAAM,CAAC;QACtB,KAAK,EAAE,MAAM,CAAC;KACf,CAAC;CACH;AAyBD,wBAAsB,WAAW,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAKrE;AAED,wBAAsB,UAAU,CAC9B,MAAM,EAAE,UAAU,EAClB,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,YAAY,CAAC,CAMvB;AAED,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,UAAU,GACjB,OAAO,CAAC,YAAY,CAAC,CAKvB;AAED;;;;;;GAMG;AACH,MAAM,WAAW,gBAAgB;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,yBAAyB,EAAE,MAAM,CAAC;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACpB;AAOD,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,MAAM,EAAE,SAAS,gBAAgB,EAAE,CAAC;IAC7C,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB;;;;;;OAMG;IACH,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;CAC7B;AAED,gFAAgF;AAChF,eAAO,MAAM,qBAAqB,KAAK,CAAC;AAExC;;;;;;GAMG;AACH,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,UAAU,EAClB,OAAO,GAAE;IACP,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,WAAW,CAAC;CACjB,GACL,OAAO,CAAC,iBAAiB,CAAC,CAgC5B"}

package/dist/api/account.js

@@ -1,4 +1,47 @@
 import { ApiError } from "./errors.js";
+import { z } from "zod";
+import { parseApiData } from "./validate.js";
+const integralMoney = z.string().regex(/^-?\d+$/);
+const count = z.number().safe().int().nonnegative();
+const walletSchema = z
+    .object({
+    balance_micro_usd: integralMoney,
+    bonus_micro_usd: integralMoney,
+    frozen_micro_usd: integralMoney,
+    available_micro_usd: integralMoney,
+    currency_anchor: z.string(),
+})
+    .passthrough();
+const usageSummarySchema = z
+    .object({
+    days: count,
+    from: z.string(),
+    to: z.string(),
+    count,
+    input_tokens: count,
+    output_tokens: count,
+    total_tokens: count,
+    charge_micro_usd: integralMoney,
+})
+    .passthrough();
+const subscriptionSchema = z
+    .object({
+    status: z.string(),
+    plan_slug: z.string().optional(),
+    plan_name: z.string().optional(),
+    current_period_end: z.string().optional(),
+    playground: z
+        .object({
+        allowance_micro_usd: integralMoney,
+        used_micro_usd: integralMoney,
+        remaining_micro_usd: integralMoney,
+        usage_percent: z.number().finite(),
+        state: z.string(),
+    })
+        .passthrough()
+        .optional(),
+})
+    .passthrough();
 /**
  * The account plane answers 401 with its own error shape when the key lacks
  * `account:read`. That is a scope problem, not a bad key, and saying so saves
@@ -22,20 +65,20 @@ export async function fetchWallet(client) {
     const { data } = await client
         .getJson("/keyinfo/wallet")
         .catch(explainScope);
-    return data;
+    return parseApiData(walletSchema, data, "wallet API");
 }
 export async function fetchUsage(client, days) {
     const query = days === undefined ? "" : `?days=${days}`;
     const { data } = await client
         .getJson(`/keyinfo/usage-summary${query}`)
         .catch(explainScope);
-    return data;
+    return parseApiData(usageSummarySchema, data, "usage API");
 }
 export async function fetchSubscription(client) {
     const { data } = await client
         .getJson("/keyinfo/subscription")
         .catch(explainScope);
-    return data;
+    return parseApiData(subscriptionSchema, data, "subscription API");
 }
 /** Hard stop on paging, so a busy key cannot turn one command into hundreds. */
 export const MAX_USAGE_EVENT_PAGES = 20;

package/dist/api/models.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../src/api/models.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAE5C,iFAAiF;AACjF,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,0CAA0C;AAC1C,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,oBAAoB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACtC;AAED,MAAM,WAAW,aAAc,SAAQ,YAAY;IACjD,aAAa,EAAE,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,SAAS;IACxB,mDAAmD;IACnD,SAAS,EAAE,aAAa,EAAE,CAAC;IAC3B,sFAAsF;IACtF,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,gDAAgD;IAChD,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,YAAY,GAAG,SAAS,GAAG,OAAO,CAUxE;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,eAAe,CAC7B,SAAS,EAAE,SAAS,cAAc,EAAE,EACpC,OAAO,EAAE,SAAS,YAAY,EAAE,GAC/B,SAAS,CA4BX;AAED,8CAA8C;AAC9C,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,UAAU,GACjB,OAAO,CAAC,cAAc,EAAE,CAAC,CAG3B;AAED,2EAA2E;AAC3E,wBAAsB,YAAY,CAChC,MAAM,EAAE,UAAU,GACjB,OAAO,CAAC,YAAY,EAAE,CAAC,CAGzB;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,eAAe,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAGnD;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAC3B,OAAO,EAAE,SAAS,YAAY,EAAE,EAChC,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,GACf,YAAY,GAAG,SAAS,CAY1B;AAED,qBAAa,oBAAqB,SAAQ,KAAK;IAE3C,QAAQ,CAAC,OAAO,EAAE,MAAM;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM;IACvB,QAAQ,CAAC,QAAQ,EAAE,MAAM;gBAFhB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM;CAO5B"}
+{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../src/api/models.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AA6B5C,iFAAiF;AACjF,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,0CAA0C;AAC1C,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,oBAAoB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACtC;AAED,MAAM,WAAW,aAAc,SAAQ,YAAY;IACjD,aAAa,EAAE,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,SAAS;IACxB,mDAAmD;IACnD,SAAS,EAAE,aAAa,EAAE,CAAC;IAC3B,sFAAsF;IACtF,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,gDAAgD;IAChD,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,YAAY,GAAG,SAAS,GAAG,OAAO,CAUxE;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,eAAe,CAC7B,SAAS,EAAE,SAAS,cAAc,EAAE,EACpC,OAAO,EAAE,SAAS,YAAY,EAAE,GAC/B,SAAS,CA4BX;AAED,8CAA8C;AAC9C,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,UAAU,GACjB,OAAO,CAAC,cAAc,EAAE,CAAC,CAK3B;AAED,2EAA2E;AAC3E,wBAAsB,YAAY,CAChC,MAAM,EAAE,UAAU,GACjB,OAAO,CAAC,YAAY,EAAE,CAAC,CAKzB;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,eAAe,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAGnD;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAC3B,OAAO,EAAE,SAAS,YAAY,EAAE,EAChC,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,GACf,YAAY,GAAG,SAAS,CAY1B;AAED,qBAAa,oBAAqB,SAAQ,KAAK;IAE3C,QAAQ,CAAC,OAAO,EAAE,MAAM;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM;IACvB,QAAQ,CAAC,QAAQ,EAAE,MAAM;gBAFhB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM;CAO5B"}

package/dist/api/models.js

@@ -1,3 +1,29 @@
+import { z } from "zod";
+import { parseApiData } from "./validate.js";
+const dataPlaneModelsSchema = z
+    .object({
+    data: z.array(z.object({ id: z.string() }).passthrough()).optional(),
+})
+    .passthrough();
+const catalogModelSchema = z
+    .object({
+    modelId: z.string(),
+    displayName: z.string().optional(),
+    provider: z.string().optional(),
+    capabilities: z.array(z.string()).optional(),
+    apiSurface: z.string().optional(),
+    contextLength: z.number().safe().int().nonnegative().optional(),
+    inputPricePer1mMicroUsd: z.string().optional(),
+    outputPricePer1mMicroUsd: z.string().optional(),
+    accessTier: z.string().optional(),
+    deprecated: z.boolean().optional(),
+    retires_at: z.string().nullable().optional(),
+    replacement_model_id: z.string().nullable().optional(),
+})
+    .passthrough();
+const catalogSchema = z
+    .object({ data: z.array(catalogModelSchema).optional() })
+    .passthrough();
 /**
  * Agent admission. Every condition is something the catalogue states outright;
  * nothing is inferred from the model id, the provider or the display name —
@@ -59,13 +85,13 @@ export function intersectModels(dataPlane, catalog) {
 }
 /** GET /v1/models — the key's access list. */
 export async function fetchAccessibleModels(client) {
-    const { data } = await client.getJson("/models");
-    return data.data ?? [];
+    const response = await client.getJson("/models");
+    return (parseApiData(dataPlaneModelsSchema, response.data, "model API").data ?? []);
 }
 /** GET /models on the business API — public catalogue, no key required. */
 export async function fetchCatalog(client) {
-    const { data } = await client.getJson("/models");
-    return data.data ?? [];
+    const response = await client.getJson("/models");
+    return (parseApiData(catalogSchema, response.data, "model catalogue").data ?? []);
 }
 /**
  * U-3 · Is this a usable model identifier?

package/dist/api/sse-parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sse-parser.d.ts","sourceRoot":"","sources":["../../src/api/sse-parser.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,6DAA6D;IAC7D,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,WAAW;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,YAAY;IAC3B,oCAAoC;IACpC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CAClC;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,gBAAgB,EAAE,CAAC;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,IAAI,EAAE,OAAO,CAAC;CACf;AAWD,+EAA+E;AAC/E,qBAAa,SAAS;IACpB,OAAO,CAAC,MAAM,CAAM;IACpB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAqB;IAE7C,IAAI,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAMjC,kDAAkD;IAClD,GAAG,IAAI,MAAM,EAAE;IASf,OAAO,CAAC,KAAK;CAYd;AAED,8DAA8D;AAC9D,qBAAa,mBAAmB;IAOlB,OAAO,CAAC,QAAQ,CAAC,MAAM;IANnC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAuC;IAC7D,OAAO,CAAC,IAAI,CAAM;IAClB,OAAO,CAAC,YAAY,CAAC,CAAS;IAC9B,OAAO,CAAC,KAAK,CAAC,CAAc;IAC5B,OAAO,CAAC,IAAI,CAAS;gBAEQ,MAAM,GAAE,YAAiB;IAEtD,4DAA4D;IAC5D,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAgD9B,MAAM,IAAI,YAAY;CASvB;AAED,kEAAkE;AAClE,MAAM,WAAW,YAAY;IAC3B;;;;OAIG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC,oEAAoE;IACpE,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B;;;;;;;;;;;OAWG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B;;;;OAIG;IACH,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,IAAI,CAAC;CAC7B;AAED,eAAO,MAAM,sBAAsB,SAAU,CAAC;AAC9C,eAAO,MAAM,wBAAwB,QAAmB,CAAC;AACzD,0EAA0E;AAC1E,eAAO,MAAM,uBAAuB,QAAc,CAAC;AAEnD;;;;;;;;;;;GAWG;AACH,wBAAsB,cAAc,CAClC,QAAQ,EAAE,QAAQ,EAClB,MAAM,GAAE,YAAiB,EACzB,MAAM,CAAC,EAAE,WAAW,EACpB,MAAM,GAAE,YAAiB,GACxB,OAAO,CAAC,YAAY,CAAC,CAqGvB"}
+{"version":3,"file":"sse-parser.d.ts","sourceRoot":"","sources":["../../src/api/sse-parser.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,6DAA6D;IAC7D,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,WAAW;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,YAAY;IAC3B,oCAAoC;IACpC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CAClC;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,gBAAgB,EAAE,CAAC;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,IAAI,EAAE,OAAO,CAAC;CACf;AAWD,+EAA+E;AAC/E,qBAAa,SAAS;IACpB,OAAO,CAAC,MAAM,CAAM;IACpB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAqB;IAE7C,IAAI,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAMjC,kDAAkD;IAClD,GAAG,IAAI,MAAM,EAAE;IASf,OAAO,CAAC,KAAK;CAYd;AAED,8DAA8D;AAC9D,qBAAa,mBAAmB;IAOlB,OAAO,CAAC,QAAQ,CAAC,MAAM;IANnC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAuC;IAC7D,OAAO,CAAC,IAAI,CAAM;IAClB,OAAO,CAAC,YAAY,CAAC,CAAS;IAC9B,OAAO,CAAC,KAAK,CAAC,CAAc;IAC5B,OAAO,CAAC,IAAI,CAAS;gBAEQ,MAAM,GAAE,YAAiB;IAEtD,4DAA4D;IAC5D,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAgD9B,MAAM,IAAI,YAAY;CASvB;AAaD,kEAAkE;AAClE,MAAM,WAAW,YAAY;IAC3B;;;;OAIG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC,oEAAoE;IACpE,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B;;;;;;;;;;;OAWG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B;;;;OAIG;IACH,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,IAAI,CAAC;CAC7B;AAED,eAAO,MAAM,sBAAsB,SAAU,CAAC;AAC9C,eAAO,MAAM,wBAAwB,QAAmB,CAAC;AACzD,0EAA0E;AAC1E,eAAO,MAAM,uBAAuB,QAAc,CAAC;AAEnD;;;;;;;;;;;GAWG;AACH,wBAAsB,cAAc,CAClC,QAAQ,EAAE,QAAQ,EAClB,MAAM,GAAE,YAAiB,EACzB,MAAM,CAAC,EAAE,WAAW,EACpB,MAAM,GAAE,YAAiB,GACxB,OAAO,CAAC,YAAY,CAAC,CAqGvB"}

package/dist/api/sse-parser.js

@@ -61,7 +61,7 @@ export class ChatStreamAssembler {
         }
         // Read usage wherever it appears — it rides a frame that still has a
         // (empty-delta) choice on this gateway.
-        if (chunk.usage)
+        if (isStreamUsage(chunk.usage))
             this.usage = chunk.usage;
         const choice = chunk.choices?.[0];
         if (!choice)
@@ -100,6 +100,14 @@ export class ChatStreamAssembler {
         };
     }
 }
+function isStreamUsage(value) {
+    if (value === null || typeof value !== "object")
+        return false;
+    const usage = value;
+    return ["prompt_tokens", "completion_tokens", "total_tokens"].every((key) => typeof usage[key] === "number" &&
+        Number.isSafeInteger(usage[key]) &&
+        usage[key] >= 0);
+}
 export const DEFAULT_STREAM_IDLE_MS = 120_000;
 export const DEFAULT_STREAM_MAX_BYTES = 32 * 1024 * 1024;
 /** Matches the agent's wall-clock ceiling (§7.4), for the same reason. */

package/dist/api/validate.d.ts

@@ -0,0 +1,4 @@
+import type { z } from "zod";
+/** Validate untrusted JSON at the HTTP boundary and expose a stable CLI error. */
+export declare function parseApiData<T>(schema: z.ZodType<T>, value: unknown, label: string): T;
+//# sourceMappingURL=validate.d.ts.map

package/dist/api/validate.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../src/api/validate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAK7B,kFAAkF;AAClF,wBAAgB,YAAY,CAAC,CAAC,EAC5B,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EACpB,KAAK,EAAE,OAAO,EACd,KAAK,EAAE,MAAM,GACZ,CAAC,CAUH"}

package/dist/api/validate.js

@@ -0,0 +1,15 @@
+import { ExitCode } from "../output/exit-codes.js";
+import { ApiError } from "./errors.js";
+/** Validate untrusted JSON at the HTTP boundary and expose a stable CLI error. */
+export function parseApiData(schema, value, label) {
+    const parsed = schema.safeParse(value);
+    if (parsed.success)
+        return parsed.data;
+    const issue = parsed.error.issues[0];
+    const path = issue?.path.length ? ` at ${issue.path.join(".")}` : "";
+    throw new ApiError({
+        kind: "server",
+        exitCode: ExitCode.Unavailable,
+        message: `${label} returned an invalid response${path}`,
+    });
+}

package/dist/commands/account.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"account.d.ts","sourceRoot":"","sources":["../../src/commands/account.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAOnD,OAAO,EAIL,KAAK,SAAS,EACf,MAAM,cAAc,CAAC;AAUtB,wBAAsB,cAAc,CAClC,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,EAAE,EAAE,SAAS,GACZ,OAAO,CAAC,QAAQ,CAAC,CAmGnB"}
+{"version":3,"file":"account.d.ts","sourceRoot":"","sources":["../../src/commands/account.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAQnD,OAAO,EAIL,KAAK,SAAS,EACf,MAAM,cAAc,CAAC;AAUtB,wBAAsB,cAAc,CAClC,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,EAAE,EAAE,SAAS,GACZ,OAAO,CAAC,QAAQ,CAAC,CA8GnB"}

package/dist/commands/account.js

@@ -2,6 +2,7 @@ import { fetchSubscription, fetchUsage, fetchWallet } from "../api/account.js";
 import { ExitCode } from "../output/exit-codes.js";
 import { parseFormatFlags, renderJson, renderRecord, } from "../output/format.js";
 import { formatUsd } from "../output/money.js";
+import { safeForTerminal } from "../output/terminal-safe.js";
 import { buildRuntime, reportError, requireApiKey, } from "./runtime.js";
 const USAGE = `Usage:
   mafdet account balance [--json]
@@ -30,12 +31,12 @@ export async function accountCommand(argv, io) {
                 io.stdout(renderJson(wallet));
                 return ExitCode.Ok;
             }
-            io.stdout(renderRecord([
+            io.stdout(safeForTerminal(renderRecord([
                 ["balance", formatUsd(wallet.balance_micro_usd)],
                 ["bonus", formatUsd(wallet.bonus_micro_usd)],
                 ["frozen", formatUsd(wallet.frozen_micro_usd)],
                 ["available", formatUsd(wallet.available_micro_usd)],
-            ]));
+            ]), io.isTty ?? process.stdout.isTTY === true));
             return ExitCode.Ok;
         }
         if (subcommand === "usage") {
@@ -57,7 +58,7 @@ export async function accountCommand(argv, io) {
                 io.stdout(renderJson(usage));
                 return ExitCode.Ok;
             }
-            io.stdout(renderRecord([
+            io.stdout(safeForTerminal(renderRecord([
                 ["window", `${usage.days} day(s), ${usage.from} -> ${usage.to}`],
                 // Throttled attempts land in the ledger with a zero charge
                 // (CLI-001), so the count and the money answer different questions.
@@ -68,7 +69,7 @@ export async function accountCommand(argv, io) {
                 ["input tokens", String(usage.input_tokens)],
                 ["output tokens", String(usage.output_tokens)],
                 ["charged", formatUsd(usage.charge_micro_usd)],
-            ]));
+            ]), io.isTty ?? process.stdout.isTTY === true));
             return ExitCode.Ok;
         }
         if (args.length > 0)
@@ -90,7 +91,7 @@ export async function accountCommand(argv, io) {
                 `${formatUsd(pg.used_micro_usd)} (${pg.usage_percent}%)`,
             ], ["playground left", formatUsd(pg.remaining_micro_usd)]);
         }
-        io.stdout(renderRecord(rows));
+        io.stdout(safeForTerminal(renderRecord(rows), io.isTty ?? process.stdout.isTTY === true));
         return ExitCode.Ok;
     }
     catch (error) {

package/dist/commands/agent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../src/commands/agent.ts"],"names":[],"mappings":"AAQA,OAAO,EAAe,KAAK,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAiBvE,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAGnD,OAAO,EAIL,KAAK,SAAS,EACf,MAAM,cAAc,CAAC;AAmBtB,eAAO,MAAM,gBAAgB,0XAK+C,CAAC;AAE7E,eAAO,MAAM,YAAY,mgBAOmB,CAAC;AAE7C,MAAM,WAAW,OAAQ,SAAQ,SAAS;IACxC,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,qDAAqD;IACrD,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,EAAE,OAAO,uBAAuB,EAAE,QAAQ,CAAC;IACpD;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;CAC9C;AAED,wBAAsB,YAAY,CAChC,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,EAAE,EAAE,OAAO,GACV,OAAO,CAAC,QAAQ,CAAC,CAuInB;AAoLD;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,YAAY,EAAE,kBAAkB,EAAE,OAAO,0JAI3E"}
+{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../src/commands/agent.ts"],"names":[],"mappings":"AAQA,OAAO,EAAe,KAAK,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAiBvE,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAGnD,OAAO,EAKL,KAAK,SAAS,EACf,MAAM,cAAc,CAAC;AAmBtB,eAAO,MAAM,gBAAgB,0XAK+C,CAAC;AAE7E,eAAO,MAAM,YAAY,mgBAOmB,CAAC;AAE7C,MAAM,WAAW,OAAQ,SAAQ,SAAS;IACxC,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,qDAAqD;IACrD,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,EAAE,OAAO,uBAAuB,EAAE,QAAQ,CAAC;IACpD;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;CAC9C;AAED,wBAAsB,YAAY,CAChC,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,EAAE,EAAE,OAAO,GACV,OAAO,CAAC,QAAQ,CAAC,CA2InB;AAoLD;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,YAAY,EAAE,kBAAkB,EAAE,OAAO,0JAI3E"}

package/dist/commands/agent.js

@@ -17,7 +17,7 @@ import { Workspace, WorkspaceError } from "../filesystem/workspace.js";
 import { ExitCode } from "../output/exit-codes.js";
 import { renderJson, renderRecord } from "../output/format.js";
 import { formatUsdWithUnpriced } from "../output/money.js";
-import { buildRuntime, reportError, requireApiKey, } from "./runtime.js";
+import { buildRuntime, reportError, writeHumanError, requireApiKey, } from "./runtime.js";
 const USAGE = `Usage:
   mafdet agent "<goal>" [--model <id>] [--allow-write] [--read-only]
                         [--allow-command "<prefix>"]... [--max-turns <n>]
@@ -82,7 +82,7 @@ export async function agentCommand(argv, io) {
         if (parsed.allowWrite && !interactive) {
             io.stderr("note: --allow-write needs an interactive terminal to confirm changes; running read-only\n");
         }
-        io.stderr(`workspace: ${workspace.root}\nmodel: ${model} (${mode})\n`);
+        writeHumanError(io, `workspace: ${workspace.root}\nmodel: ${model} (${mode})\n`);
         if (parsed.goal.length === 0) {
             if (!interactive) {
                 io.stderr(`mafdet agent: no goal\n${USAGE}`);
@@ -119,6 +119,7 @@ export async function agentCommand(argv, io) {
                     stderr: io.stderr,
                     signal: io.signal,
                     isTty: isTty(io),
+                    isErrTty: io.isErrTty ?? process.stderr.isTTY === true,
                     ...(io.readLine === undefined ? {} : { readLine: io.readLine }),
                 });
             }
@@ -345,7 +346,7 @@ function reportEvent(event, io) {
         io.stderr(`\n[turn ${event.turn}]\n`);
     else if (event.type === "tool") {
         const first = event.detail.split("\n")[0].slice(0, 100);
-        io.stderr(`  ${event.ok ? "-" : "!"} ${event.name}: ${first}\n`);
+        writeHumanError(io, `  ${event.ok ? "-" : "!"} ${event.name}: ${first}\n`);
     }
     else if (event.type === "rate_limited") {
         io.stderr(`  rate limited, waiting ${event.waitMs}ms (attempt ${event.attempt})\n`);
@@ -383,8 +384,9 @@ function finish(report, json, io) {
                     `~${formatUsdWithUnpriced(report.costMicroUsd, report.unpricedRequests)}`,
                 ],
             ]));
+        // W-2 · `report.error` is the upstream's message, verbatim.
         if (report.error)
-            io.stderr(`error: ${report.error}\n`);
+            writeHumanError(io, `error: ${report.error}\n`);
     }
     switch (report.stopReason) {
         case "completed":

package/dist/commands/chat.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chat.d.ts","sourceRoot":"","sources":["../../src/commands/chat.ts"],"names":[],"mappings":"AAEA,OAAO,EAAgB,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACnE,OAAO,EAAkB,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAWxE,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAEnD,OAAO,EAIL,KAAK,SAAS,EACf,MAAM,cAAc,CAAC;AAatB,MAAM,WAAW,MAAO,SAAQ,SAAS;IACvC,qDAAqD;IACrD,SAAS,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAClC,gDAAgD;IAChD,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAcD,wBAAsB,WAAW,CAC/B,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,EAAE,EAAE,MAAM,GACT,OAAO,CAAC,QAAQ,CAAC,CA8BnB;AA8SD,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,YAAY,GAAG,SAAS,EAC/B,KAAK,EAAE,WAAW,GACjB,MAAM,GAAG,SAAS,CASpB"}
+{"version":3,"file":"chat.d.ts","sourceRoot":"","sources":["../../src/commands/chat.ts"],"names":[],"mappings":"AAEA,OAAO,EAAgB,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACnE,OAAO,EAAkB,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAWxE,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAEnD,OAAO,EAIL,KAAK,SAAS,EACf,MAAM,cAAc,CAAC;AAatB,MAAM,WAAW,MAAO,SAAQ,SAAS;IACvC,qDAAqD;IACrD,SAAS,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAClC,gDAAgD;IAChD,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAcD,wBAAsB,WAAW,CAC/B,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,EAAE,EAAE,MAAM,GACT,OAAO,CAAC,QAAQ,CAAC,CA8BnB;AAgTD,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,YAAY,GAAG,SAAS,EAC/B,KAAK,EAAE,WAAW,GACjB,MAAM,GAAG,SAAS,CAYpB"}

package/dist/commands/chat.js

@@ -9,7 +9,7 @@ import { upsertIndexEntry } from "../sessions/index-file.js";
 import { decideRecording } from "../sessions/policy.js";
 import { SessionWriter } from "../sessions/store.js";
 import { ExitCode } from "../output/exit-codes.js";
-import { formatUsd } from "../output/money.js";
+import { formatUsd, isMicroUsd } from "../output/money.js";
 import { buildRuntime, reportError, requireApiKey, } from "./runtime.js";
 const USAGE = `Usage:
   mafdet chat [prompt] [--model <id>] [--system <file>] [--input <file>]
@@ -276,11 +276,13 @@ async function streamChat(runtime, body, args, io) {
 }
 async function completeChat(runtime, body, args, io) {
     const { data, requestId } = await runtime.dataPlane.postJson("/chat/completions", body, { signal: io.signal });
-    const answer = data.choices?.[0]?.message?.content ?? "";
+    const rawAnswer = data.choices?.[0]?.message?.content;
+    const answer = typeof rawAnswer === "string" ? rawAnswer : "";
+    const usage = validUsage(data.usage);
     io.stdout(`${safeForTerminal(answer, isTty(io))}\n`);
     const model = await priceModel(runtime, args.model, !args.quiet || args.save);
-    summarise(args, data.usage, io, model);
-    saveChat(args, io, answer, data.usage, requestId, model);
+    summarise(args, usage, io, model);
+    saveChat(args, io, answer, usage, requestId, model);
     return ExitCode.Ok;
 }
 /**
@@ -300,9 +302,32 @@ function summarise(args, usage, io, model, options = {}) {
     io.stderr(`${prefix}${usage.prompt_tokens} in / ${usage.completion_tokens} out tokens${cost}\n`);
 }
 export function estimateChargeMicroUsd(model, usage) {
-    if (!model?.inputPricePer1mMicroUsd || !model.outputPricePer1mMicroUsd)
+    if (!isMicroUsd(model?.inputPricePer1mMicroUsd) ||
+        !isMicroUsd(model.outputPricePer1mMicroUsd))
         return undefined;
     const ceilDiv = (tokens, pricePer1m) => (BigInt(tokens) * BigInt(pricePer1m) + 999999n) / 1000000n;
     return (ceilDiv(usage.prompt_tokens, model.inputPricePer1mMicroUsd) +
         ceilDiv(usage.completion_tokens, model.outputPricePer1mMicroUsd));
 }
+function validUsage(value) {
+    if (value === null || typeof value !== "object")
+        return undefined;
+    const usage = value;
+    const count = (field) => {
+        const candidate = usage[field];
+        return typeof candidate === "number" &&
+            Number.isSafeInteger(candidate) &&
+            candidate >= 0
+            ? candidate
+            : undefined;
+    };
+    const prompt = count("prompt_tokens");
+    const completion = count("completion_tokens");
+    if (prompt === undefined || completion === undefined)
+        return undefined;
+    return {
+        prompt_tokens: prompt,
+        completion_tokens: completion,
+        total_tokens: count("total_tokens") ?? prompt + completion,
+    };
+}

package/dist/commands/embed.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"embed.d.ts","sourceRoot":"","sources":["../../src/commands/embed.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAEnD,OAAO,EAIL,KAAK,SAAS,EACf,MAAM,cAAc,CAAC;AAQtB,MAAM,WAAW,OAAQ,SAAQ,SAAS;IACxC,SAAS,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;CACnC;AAED,wBAAsB,YAAY,CAChC,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,EAAE,EAAE,OAAO,GACV,OAAO,CAAC,QAAQ,CAAC,CA8DnB"}
+{"version":3,"file":"embed.d.ts","sourceRoot":"","sources":["../../src/commands/embed.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAEnD,OAAO,EAKL,KAAK,SAAS,EACf,MAAM,cAAc,CAAC;AAQtB,MAAM,WAAW,OAAQ,SAAQ,SAAS;IACxC,SAAS,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;CACnC;AAED,wBAAsB,YAAY,CAChC,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,EAAE,EAAE,OAAO,GACV,OAAO,CAAC,QAAQ,CAAC,CA8DnB"}

package/dist/commands/embed.js

@@ -3,7 +3,7 @@ import { ApiError } from "../api/errors.js";
 import { assertSurface, fetchCatalog, SurfaceMismatchError, } from "../api/models.js";
 import { ExitCode } from "../output/exit-codes.js";
 import { writeOutputFile } from "../output/write-file.js";
-import { buildRuntime, reportError, requireApiKey, } from "./runtime.js";
+import { buildRuntime, reportError, writeHumanError, requireApiKey, } from "./runtime.js";
 const USAGE = `Usage:
   mafdet embed [text | <file>] --model <id> [--output <file>] [--force]
 
@@ -62,7 +62,7 @@ export async function embedCommand(argv, io) {
     }
     catch (error) {
         if (error instanceof SurfaceMismatchError) {
-            io.stderr(`mafdet embed: ${error.message}\n`);
+            writeHumanError(io, `mafdet embed: ${error.message}\n`);
             return ExitCode.Usage;
         }
         return reportError(error, io);

package/dist/commands/models.js

@@ -1,7 +1,7 @@
 import { fetchAccessibleModels, fetchCatalog, intersectModels, } from "../api/models.js";
 import { ExitCode } from "../output/exit-codes.js";
 import { parseFormatFlags, renderJson, renderPlain, renderRecord, renderTable, } from "../output/format.js";
-import { formatUsd } from "../output/money.js";
+import { formatUsd, isMicroUsd } from "../output/money.js";
 import { safeForTerminal } from "../output/terminal-safe.js";
 import { buildRuntime, reportError, requireApiKey, } from "./runtime.js";
 const USAGE = `Usage:
@@ -151,20 +151,20 @@ function showModel(sets, args, format, io) {
         ["agent eligible", model.agentEligible ? "yes" : "no"],
         [
             "input / 1M",
-            model.inputPricePer1mMicroUsd
+            isMicroUsd(model.inputPricePer1mMicroUsd)
                 ? formatUsd(model.inputPricePer1mMicroUsd)
                 : "-",
         ],
         [
             "output / 1M",
-            model.outputPricePer1mMicroUsd
+            isMicroUsd(model.outputPricePer1mMicroUsd)
                 ? formatUsd(model.outputPricePer1mMicroUsd)
                 : "-",
         ],
         [
             "deprecated",
             model.deprecated
-                ? `yes${model.retires_at ? ` (retires ${model.retires_at})` : ""}`
+                ? clean(`yes${model.retires_at ? ` (retires ${model.retires_at})` : ""}`)
                 : "no",
         ],
     ]));

package/dist/commands/runtime.d.ts

@@ -38,7 +38,22 @@ export declare function requireApiKey(config: LoadedConfig): void;
  * prints a raw upstream message: ApiError redacted it at construction.
  */
 /**
- * V-2 · The one place errors reach a person.
+ * W-2 · The one function every human-readable stderr write goes through.
+ *
+ * `reportError` was described as that and was not: `embed` and `speech`
+ * handled SurfaceMismatchError themselves, the agent's summary printed
+ * `report.error` directly, and even inside `reportError` the request id was
+ * concatenated outside the sanitiser. Three real command paths and one field,
+ * all carrying remote text to a terminal.
+ *
+ * The test that was supposed to cover this called `reportError` directly -
+ * the callee - and so passed while every caller bypassed it. That mistake has
+ * now been made twice; the way out is a function that is easier to use than
+ * `io.stderr` is, so there is nothing to remember.
+ */
+export declare function writeHumanError(io: CommandIo, text: string): void;
+/**
+ * V-2 · The one place *thrown* errors reach a person.
  *
  * Every command funnels through here, so this is where untrusted text in an
  * error message stops being able to drive the terminal. Patching the

package/dist/commands/runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../src/commands/runtime.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,KAAK,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAGnD,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,uDAAuD;IACvD,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;OAIG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,OAAO;IACtB,MAAM,EAAE,YAAY,CAAC;IACrB,sCAAsC;IACtC,SAAS,EAAE,UAAU,CAAC;IACtB,yCAAyC;IACzC,YAAY,EAAE,UAAU,CAAC;CAC1B;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAGjD;AAED,wBAAgB,YAAY,CAAC,EAAE,EAAE,SAAS,GAAG,OAAO,CAgBnD;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI,CASxD;AAED;;;GAGG;AACH;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,SAAS,GAAG,QAAQ,CAqBnE"}
+{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../src/commands/runtime.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,KAAK,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAGnD,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,uDAAuD;IACvD,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;OAIG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,OAAO;IACtB,MAAM,EAAE,YAAY,CAAC;IACrB,sCAAsC;IACtC,SAAS,EAAE,UAAU,CAAC;IACtB,yCAAyC;IACzC,YAAY,EAAE,UAAU,CAAC;CAC1B;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAGjD;AAED,wBAAgB,YAAY,CAAC,EAAE,EAAE,SAAS,GAAG,OAAO,CAgBnD;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI,CASxD;AAED;;;GAGG;AACH;;;;;;;;;;;;;GAaG;AACH,wBAAgB,eAAe,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAIjE;AAED;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,SAAS,GAAG,QAAQ,CAqBnE"}

package/dist/commands/runtime.js

@@ -39,7 +39,24 @@ export function requireApiKey(config) {
  * prints a raw upstream message: ApiError redacted it at construction.
  */
 /**
- * V-2 · The one place errors reach a person.
+ * W-2 · The one function every human-readable stderr write goes through.
+ *
+ * `reportError` was described as that and was not: `embed` and `speech`
+ * handled SurfaceMismatchError themselves, the agent's summary printed
+ * `report.error` directly, and even inside `reportError` the request id was
+ * concatenated outside the sanitiser. Three real command paths and one field,
+ * all carrying remote text to a terminal.
+ *
+ * The test that was supposed to cover this called `reportError` directly -
+ * the callee - and so passed while every caller bypassed it. That mistake has
+ * now been made twice; the way out is a function that is easier to use than
+ * `io.stderr` is, so there is nothing to remember.
+ */
+export function writeHumanError(io, text) {
+    io.stderr(safeForTerminal(text, io.isErrTty ?? process.stderr.isTTY === true));
+}
+/**
+ * V-2 · The one place *thrown* errors reach a person.
  *
  * Every command funnels through here, so this is where untrusted text in an
  * error message stops being able to drive the terminal. Patching the
@@ -49,20 +66,22 @@ export function requireApiKey(config) {
  * Redirected stderr keeps the bytes, the same rule as everywhere else.
  */
 export function reportError(error, io) {
-    const safe = (text) => safeForTerminal(text, io.isErrTty ?? process.stderr.isTTY === true);
     if (error instanceof ApiError) {
+        // W-2 · The request id comes from a response header
+        // (`x-litellm-call-id`), so it is remote text too - it used to be
+        // concatenated outside the sanitiser.
         const id = error.requestId ? ` (request ${error.requestId})` : "";
-        io.stderr(`mafdet: ${safe(error.message)}${id}\n`);
+        writeHumanError(io, `mafdet: ${error.message}${id}\n`);
         if (error.kind === "rate_limited" &&
             error.retryAfterSeconds !== undefined) {
-            io.stderr(`mafdet: retry after ${error.retryAfterSeconds}s\n`);
+            writeHumanError(io, `mafdet: retry after ${error.retryAfterSeconds}s\n`);
         }
         return error.exitCode;
     }
     if (error instanceof ConfigError) {
-        io.stderr(`mafdet: ${safe(error.message)}\n`);
+        writeHumanError(io, `mafdet: ${error.message}\n`);
         return ExitCode.Usage;
     }
-    io.stderr(`mafdet: ${safe(error.message)}\n`);
+    writeHumanError(io, `mafdet: ${error.message}\n`);
     return ExitCode.General;
 }

package/dist/commands/speech.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"speech.d.ts","sourceRoot":"","sources":["../../src/commands/speech.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAEnD,OAAO,EAIL,KAAK,SAAS,EACf,MAAM,cAAc,CAAC;AAStB,MAAM,WAAW,QAAS,SAAQ,SAAS;IACzC,SAAS,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;CACnC;AAED,wBAAsB,aAAa,CACjC,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,EAAE,EAAE,QAAQ,GACX,OAAO,CAAC,QAAQ,CAAC,CAyEnB"}
+{"version":3,"file":"speech.d.ts","sourceRoot":"","sources":["../../src/commands/speech.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAEnD,OAAO,EAKL,KAAK,SAAS,EACf,MAAM,cAAc,CAAC;AAStB,MAAM,WAAW,QAAS,SAAQ,SAAS;IACzC,SAAS,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;CACnC;AAED,wBAAsB,aAAa,CACjC,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,EAAE,EAAE,QAAQ,GACX,OAAO,CAAC,QAAQ,CAAC,CAyEnB"}

package/dist/commands/speech.js

@@ -3,7 +3,7 @@ import { ApiError } from "../api/errors.js";
 import { assertSurface, fetchCatalog, SurfaceMismatchError, } from "../api/models.js";
 import { ExitCode } from "../output/exit-codes.js";
 import { writeOutputFile } from "../output/write-file.js";
-import { buildRuntime, reportError, requireApiKey, } from "./runtime.js";
+import { buildRuntime, reportError, writeHumanError, requireApiKey, } from "./runtime.js";
 const USAGE = `Usage:
   mafdet speech [text | <file>] --model <id> --output <file> [--voice <name>] [--force]
 
@@ -69,7 +69,7 @@ export async function speechCommand(argv, io) {
     }
     catch (error) {
         if (error instanceof SurfaceMismatchError) {
-            io.stderr(`mafdet speech: ${error.message}\n`);
+            writeHumanError(io, `mafdet speech: ${error.message}\n`);
             return ExitCode.Usage;
         }
         // The gateway requires a voice for TTS and says so with a code; turn that

package/dist/output/money.d.ts

@@ -5,6 +5,8 @@
  * reason: a float round-trip can turn a balance into a number that does not
  * match the invoice. Everything here is BigInt in, string out.
  */
+/** A non-negative integral micro-USD value as spoken by Mafdet APIs. */
+export declare function isMicroUsd(value: unknown): value is string;
 export declare function parseMicroUsd(value: string | number | bigint): bigint;
 /**
  * Render micro-USD as dollars. `minimumFractionDigits` keeps small amounts

package/dist/output/money.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"money.d.ts","sourceRoot":"","sources":["../../src/output/money.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAOrE;AAED;;;GAGG;AACH,wBAAgB,SAAS,CACvB,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAClC,OAAO,GAAE;IAAE,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAAO,GAC3C,MAAM,CAeR;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,MAAM,GAAG,MAAM,EACzB,gBAAgB,EAAE,MAAM,GACvB,MAAM,CAIR"}
+{"version":3,"file":"money.d.ts","sourceRoot":"","sources":["../../src/output/money.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,wEAAwE;AACxE,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAE1D;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAOrE;AAED;;;GAGG;AACH,wBAAgB,SAAS,CACvB,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAClC,OAAO,GAAE;IAAE,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAAO,GAC3C,MAAM,CAeR;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,MAAM,GAAG,MAAM,EACzB,gBAAgB,EAAE,MAAM,GACvB,MAAM,CAIR"}

package/dist/output/money.js

@@ -6,6 +6,10 @@
  * match the invoice. Everything here is BigInt in, string out.
  */
 const MICROS_PER_USD = 1000000n;
+/** A non-negative integral micro-USD value as spoken by Mafdet APIs. */
+export function isMicroUsd(value) {
+    return typeof value === "string" && /^\d+$/.test(value);
+}
 export function parseMicroUsd(value) {
     if (typeof value === "bigint")
         return value;

package/dist/sessions/usage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"usage.d.ts","sourceRoot":"","sources":["../../src/sessions/usage.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,MAAM,MAAM,gBAAgB,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,CAAC;AAEjE,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B;;;;OAIG;IACH,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;IACnC,gEAAgE;IAChE,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,YAAY,EAAE,QAAQ,CAAC,MAAM,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC,CAAC;CACnE;AAED,MAAM,WAAW,cAAe,SAAQ,WAAW;IACjD,8EAA8E;IAC9E,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,yEAAyE;IACzE,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC,WAAW,GAAG;QAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,EAAE,CAAC;IAC1E,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,WAAW,GAAG;QAAE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,EAAE,CAAC;CAC3E;AAoGD,wBAAgB,cAAc,CAAC,MAAM,EAAE,SAAS,WAAW,EAAE,GAAG,cAAc,CA6D7E;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,WAAW,GAAG,MAAM,GAAG,SAAS,CAcrE"}
+{"version":3,"file":"usage.d.ts","sourceRoot":"","sources":["../../src/sessions/usage.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,MAAM,MAAM,gBAAgB,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,CAAC;AAEjE,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B;;;;OAIG;IACH,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;IACnC,gEAAgE;IAChE,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,YAAY,EAAE,QAAQ,CAAC,MAAM,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC,CAAC;CACnE;AAED,MAAM,WAAW,cAAe,SAAQ,WAAW;IACjD,8EAA8E;IAC9E,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,yEAAyE;IACzE,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC,WAAW,GAAG;QAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,EAAE,CAAC;IAC1E,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,WAAW,GAAG;QAAE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,EAAE,CAAC;CAC3E;AA6GD,wBAAgB,cAAc,CAAC,MAAM,EAAE,SAAS,WAAW,EAAE,GAAG,cAAc,CA6D7E;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,WAAW,GAAG,MAAM,GAAG,SAAS,CAcrE"}

package/dist/sessions/usage.js

@@ -76,8 +76,17 @@ function settlementsIn(events) {
     }
     return found;
 }
+/**
+ * W-3 · A token count is a non-negative whole number, or it is not a count.
+ *
+ * `Number.isFinite` accepted -5 and 1.5, so a transcript written by an older
+ * build - or by a gateway having a bad day - could produce a negative or
+ * fractional total in `sessions usage`.
+ */
 function count(value) {
-    return typeof value === "number" && Number.isFinite(value) ? value : 0;
+    return typeof value === "number" && Number.isSafeInteger(value) && value >= 0
+        ? value
+        : 0;
 }
 /** Was this request priced at all? Absent is not the same as zero. */
 function isPriced(value) {

package/dist/tui/adapters/models.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../../src/tui/adapters/models.ts"],"names":[],"mappings":"AAiBA,OAAO,EAIL,KAAK,SAAS,EACd,KAAK,aAAa,EACnB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAgB,KAAK,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAKzE;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,QAAQ,CAAC;AAEzC,MAAM,WAAW,cAAe,SAAQ,SAAS;IAC/C,uEAAuE;IACvE,QAAQ,CAAC,IAAI,EAAE,SAAS,aAAa,EAAE,CAAC;IACxC,wDAAwD;IACxD,QAAQ,CAAC,UAAU,EAAE,SAAS,aAAa,EAAE,CAAC;CAC/C;AAED,wBAAsB,aAAa,CAAC,OAAO,EAAE;IAC3C,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,EAAE,SAAS,CAAC;CACxB,GAAG,OAAO,CAAC,cAAc,CAAC,CAoB1B;AAED,8EAA8E;AAC9E,wBAAgB,aAAa,CAAC,KAAK,EAAE,aAAa,GAAG,MAAM,CAoB1D;AASD;;;;GAIG;AACH,wBAAgB,YAAY,CAC1B,MAAM,EAAE,SAAS,aAAa,EAAE,EAChC,KAAK,EAAE,MAAM,GACZ,SAAS,aAAa,EAAE,CAgB1B;AAED,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,qEAAqE;IACrE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE;IACxC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IAChC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;CAC9B,GAAG,UAAU,CA8Cb"}
+{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../../src/tui/adapters/models.ts"],"names":[],"mappings":"AAiBA,OAAO,EAIL,KAAK,SAAS,EACd,KAAK,aAAa,EACnB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAgB,KAAK,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAMzE;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,QAAQ,CAAC;AAEzC,MAAM,WAAW,cAAe,SAAQ,SAAS;IAC/C,uEAAuE;IACvE,QAAQ,CAAC,IAAI,EAAE,SAAS,aAAa,EAAE,CAAC;IACxC,wDAAwD;IACxD,QAAQ,CAAC,UAAU,EAAE,SAAS,aAAa,EAAE,CAAC;CAC/C;AAED,wBAAsB,aAAa,CAAC,OAAO,EAAE;IAC3C,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,EAAE,SAAS,CAAC;CACxB,GAAG,OAAO,CAAC,cAAc,CAAC,CAoB1B;AAED,8EAA8E;AAC9E,wBAAgB,aAAa,CAAC,KAAK,EAAE,aAAa,GAAG,MAAM,CAoB1D;AASD;;;;GAIG;AACH,wBAAgB,YAAY,CAC1B,MAAM,EAAE,SAAS,aAAa,EAAE,EAChC,KAAK,EAAE,MAAM,GACZ,SAAS,aAAa,EAAE,CAgB1B;AAED,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,qEAAqE;IACrE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE;IACxC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IAChC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;CAC9B,GAAG,UAAU,CA8Cb"}

package/dist/tui/adapters/models.js

@@ -13,6 +13,7 @@ import { buildRuntime } from "../../commands/runtime.js";
 import { parseUserConfig } from "../../config/config.js";
 import { userConfigPath } from "../../config/paths.js";
 import { formatUsd } from "../../output/money.js";
+import { isMicroUsd } from "../../output/money.js";
 /**
  * The catalogue does not publish a per-route RPM - checked against the live
  * `/models` response, which has 31 models and no rate field at all. Plan §19.5
@@ -62,7 +63,7 @@ export function describeModel(model) {
 function priceSummary(model) {
     const input = model.inputPricePer1mMicroUsd;
     const output = model.outputPricePer1mMicroUsd;
-    if (input === undefined || output === undefined)
+    if (!isMicroUsd(input) || !isMicroUsd(output))
         return undefined;
     return `${formatUsd(input)}/${formatUsd(output)} per 1M`;
 }

package/dist/tui/tool-card.js

@@ -122,11 +122,11 @@ function firstLine(text) {
 export function renderCard(card, capabilities) {
     const { dim, bold, accent } = palette(capabilities);
     const glyph = GLYPHS[card.state];
-    const head = `  ${glyph}  ${bold(card.name)} ${dim(card.arguments)}`;
+    const head = `  ${glyph}  ${bold(stripAnsi(card.name))} ${dim(card.arguments)}`;
     if (card.detail === undefined || card.detail.length === 0)
         return `${head}\n`;
     const detail = card.state === "failed" || card.state === "refused"
-        ? accent(card.detail)
-        : dim(card.detail);
+        ? accent(firstLine(card.detail))
+        : dim(firstLine(card.detail));
     return `${head}\n        ${detail}\n`;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mafdet/cli",
-  "version": "0.4.9",
+  "version": "0.4.11",
   "description": "Mafdet AI command line — model calls, account queries, and a permissioned local agent.",
   "type": "module",
   "license": "MIT",