@mafdet/cli 0.4.8 → 0.4.10

package/CHANGELOG.md

@@ -6,6 +6,69 @@ 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.10 - 2026-08-12
+
+A sixth audit round, and the finding that matters most is about how the last
+one was tested.
+
+**Every human-readable error now goes through one function.** 0.4.9 said this
+and it was not true: `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. Four paths, all
+carrying 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
+corrections.
+
+**Incomplete usage is no longer priced as though the missing half were zero.**
+A reply carrying `{}`, or only `prompt_tokens`, or only `completion_tokens`,
+was charged with the absent side counted as nothing - so a run under
+`--max-cost-usd` finished successfully having applied the ceiling to a partly
+invented figure. A fractional count did worse: it crashed with an uncaught
+error out of the pricing code. Both token counts and both prices must now be
+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
+command already funnels through - the shared error reporter and the diagnostic
+table - so the checks and messages added later are covered too. Redirected
+output and `--json` keep the bytes exactly.
+
+**The context estimate measures UTF-8 bytes**, not UTF-16 code units, and
+counts the whole request body. A Chinese conversation measured about 10%
+smaller than it is on the wire, in the one estimate that must not under-count.
+
+**Unused code is now a compile error** (`noUnusedLocals`,
+`noUnusedParameters`). A dead import survived four review rounds because
+nothing was looking for one; turning the check on found eight more.
+
 ## 0.4.8 - 2026-08-12
 
 A fourth audit round: three findings, one of which was a regression I

package/README.md

@@ -3,7 +3,7 @@
 The official Mafdet AI command line: model calls, account queries, and a
 permissioned local agent.
 
-> **0.4.8.** 中文版见 [README.zh-CN.md](./README.zh-CN.md). The CLI never
+> **0.4.10.** 中文版见 [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.8.tgz
-npm install -g ./mafdet-cli-0.4.8.tgz
+cd packages/cli && npm pack          # -> mafdet-cli-0.4.10.tgz
+npm install -g ./mafdet-cli-0.4.10.tgz
 ```
 
 ## The interactive session

package/README.zh-CN.md

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

package/dist/agent/context-budget.d.ts

@@ -94,7 +94,7 @@ export declare function compactForBudget(history: ChatMessage[], keepRecent?: nu
  * is not a constant across English, Chinese, code and JSON.
  *
  * What is measured here instead is the ratio between the provider's own token
- * count and the exact bytes we sent to earn it. Applied to the bytes we are
+ * count and the UTF-8 size of what we sent to earn it. Applied to the bytes we are
  * about to send - schemas included - it needs no assumption about language or
  * encoding, because both sides of the ratio came from the same request.
  *
@@ -105,10 +105,24 @@ export declare function compactForBudget(history: ChatMessage[], keepRecent?: nu
  * counted rather than assumed away.
  */
 export declare function compactUntilItFits(history: ChatMessage[], contextLength: number | undefined, lastPromptTokens: number, 
-/** Bytes of the request that produced `lastPromptTokens`. */
-lastRequestBytes: number, 
-/** Bytes of the request as it stands now, recomputed after each removal. */
+/** Size of the request that produced `lastPromptTokens`, in UTF-8 bytes. */
+lastRequestSize: number, 
+/** Size of the request as it stands now, recomputed after each removal. */
 sizeNow: () => number, keepRecent?: number): CompactionResult;
-/** The bytes a request occupies on the wire, schemas and all. */
-export declare function requestBytes(messages: readonly ChatMessage[], tools: unknown): number;
+/**
+ * V-3 · The size of a request, as UTF-8 bytes.
+ *
+ * Named `requestSize` rather than `requestBytes` for a while it was neither:
+ * `String.length` counts UTF-16 code units, so a Chinese conversation measured
+ * about 10% smaller than it is on the wire - and the estimate that uses this
+ * is precisely the one that must not under-count. `Buffer.byteLength` counts
+ * what is actually sent.
+ *
+ * ⚠️ It feeds a heuristic, not a tokenizer. The ratio it participates in is
+ * measured from a real request, which is the best available answer without a
+ * server-side token count - but it cannot prove a request fits the window.
+ */
+export declare function requestSize(messages: readonly ChatMessage[], tools: unknown, 
+/** The rest of the body, so the measurement covers what is really sent. */
+extra?: Record<string, unknown>): number;
 //# sourceMappingURL=context-budget.d.ts.map

package/dist/agent/context-budget.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context-budget.d.ts","sourceRoot":"","sources":["../../src/agent/context-budget.ts"],"names":[],"mappings":"AAsBA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAE7C;;;;;;;GAOG;AACH,eAAO,MAAM,UAAU,OAAO,CAAC;AAE/B,uEAAuE;AACvE,wBAAgB,YAAY,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,CAE1D;AAED,6EAA6E;AAC7E,eAAO,MAAM,qBAAqB,IAAI,CAAC;AAEvC;;;;;;GAMG;AACH,wBAAgB,aAAa,CAC3B,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAKT;AAED,MAAM,WAAW,WAAW;IAC1B,uCAAuC;IACvC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,uCAAuC;IACvC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC5B;AAsCD;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,WAAW,EAAE,EACtB,UAAU,GAAE,MAA8B,GACzC,WAAW,CAkBb;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,WAAW,EAAE,EACtB,SAAS,EAAE,MAAM,GAChB;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CA0BpC;AAED,MAAM,WAAW,gBAAiB,SAAQ,WAAW;IACnD,2DAA2D;IAC3D,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,2EAA2E;IAC3E,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;CAC7B;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,WAAW,EAAE,EACtB,UAAU,GAAE,MAA8B,GACzC,gBAAgB,CASlB;AAED;;;;;;;;;;;;;GAaG;AACH;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,WAAW,EAAE,EACtB,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,gBAAgB,EAAE,MAAM;AACxB,6DAA6D;AAC7D,gBAAgB,EAAE,MAAM;AACxB,4EAA4E;AAC5E,OAAO,EAAE,MAAM,MAAM,EACrB,UAAU,GAAE,MAA8B,GACzC,gBAAgB,CA8BlB;AAED,iEAAiE;AACjE,wBAAgB,YAAY,CAC1B,QAAQ,EAAE,SAAS,WAAW,EAAE,EAChC,KAAK,EAAE,OAAO,GACb,MAAM,CAQR"}
+{"version":3,"file":"context-budget.d.ts","sourceRoot":"","sources":["../../src/agent/context-budget.ts"],"names":[],"mappings":"AAsBA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAE7C;;;;;;;GAOG;AACH,eAAO,MAAM,UAAU,OAAO,CAAC;AAE/B,uEAAuE;AACvE,wBAAgB,YAAY,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,CAE1D;AAED,6EAA6E;AAC7E,eAAO,MAAM,qBAAqB,IAAI,CAAC;AAEvC;;;;;;GAMG;AACH,wBAAgB,aAAa,CAC3B,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAKT;AAED,MAAM,WAAW,WAAW;IAC1B,uCAAuC;IACvC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,uCAAuC;IACvC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC5B;AAsCD;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,WAAW,EAAE,EACtB,UAAU,GAAE,MAA8B,GACzC,WAAW,CAkBb;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,WAAW,EAAE,EACtB,SAAS,EAAE,MAAM,GAChB;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CA0BpC;AAED,MAAM,WAAW,gBAAiB,SAAQ,WAAW;IACnD,2DAA2D;IAC3D,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,2EAA2E;IAC3E,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;CAC7B;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,WAAW,EAAE,EACtB,UAAU,GAAE,MAA8B,GACzC,gBAAgB,CASlB;AAED;;;;;;;;;;;;;GAaG;AACH;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,WAAW,EAAE,EACtB,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,gBAAgB,EAAE,MAAM;AACxB,4EAA4E;AAC5E,eAAe,EAAE,MAAM;AACvB,2EAA2E;AAC3E,OAAO,EAAE,MAAM,MAAM,EACrB,UAAU,GAAE,MAA8B,GACzC,gBAAgB,CA8BlB;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,WAAW,CACzB,QAAQ,EAAE,SAAS,WAAW,EAAE,EAChC,KAAK,EAAE,OAAO;AACd,2EAA2E;AAC3E,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GAClC,MAAM,CAWR"}

package/dist/agent/context-budget.js

@@ -192,7 +192,7 @@ export function compactForBudget(history, keepRecent = KEEP_RECENT_EXCHANGES) {
  * is not a constant across English, Chinese, code and JSON.
  *
  * What is measured here instead is the ratio between the provider's own token
- * count and the exact bytes we sent to earn it. Applied to the bytes we are
+ * count and the UTF-8 size of what we sent to earn it. Applied to the bytes we are
  * about to send - schemas included - it needs no assumption about language or
  * encoding, because both sides of the ratio came from the same request.
  *
@@ -203,12 +203,12 @@ export function compactForBudget(history, keepRecent = KEEP_RECENT_EXCHANGES) {
  * counted rather than assumed away.
  */
 export function compactUntilItFits(history, contextLength, lastPromptTokens, 
-/** Bytes of the request that produced `lastPromptTokens`. */
-lastRequestBytes, 
-/** Bytes of the request as it stands now, recomputed after each removal. */
+/** Size of the request that produced `lastPromptTokens`, in UTF-8 bytes. */
+lastRequestSize, 
+/** Size of the request as it stands now, recomputed after each removal. */
 sizeNow, keepRecent = KEEP_RECENT_EXCHANGES) {
     const startedWith = history.length;
-    const tokensPerByte = lastRequestBytes > 0 ? lastPromptTokens / lastRequestBytes : 0;
+    const tokensPerByte = lastRequestSize > 0 ? lastPromptTokens / lastRequestSize : 0;
     let exchanges = 0;
     let turns = 0;
     for (;;) {
@@ -235,10 +235,24 @@ sizeNow, keepRecent = KEEP_RECENT_EXCHANGES) {
         turns += step.turns;
     }
 }
-/** The bytes a request occupies on the wire, schemas and all. */
-export function requestBytes(messages, tools) {
+/**
+ * V-3 · The size of a request, as UTF-8 bytes.
+ *
+ * Named `requestSize` rather than `requestBytes` for a while it was neither:
+ * `String.length` counts UTF-16 code units, so a Chinese conversation measured
+ * about 10% smaller than it is on the wire - and the estimate that uses this
+ * is precisely the one that must not under-count. `Buffer.byteLength` counts
+ * what is actually sent.
+ *
+ * ⚠️ It feeds a heuristic, not a tokenizer. The ratio it participates in is
+ * measured from a real request, which is the best available answer without a
+ * server-side token count - but it cannot prove a request fits the window.
+ */
+export function requestSize(messages, tools, 
+/** The rest of the body, so the measurement covers what is really sent. */
+extra = {}) {
     try {
-        return JSON.stringify({ messages, tools }).length;
+        return Buffer.byteLength(JSON.stringify({ ...extra, messages, tools }), "utf8");
     }
     catch {
         // Circular or unserialisable: fall back to something monotone in the

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,5 @@
 import { ApiError } from "../api/errors.js";
-import { compactUntilItFits, requestBytes, shouldCompact, } from "./context-budget.js";
+import { compactUntilItFits, requestSize, shouldCompact, } from "./context-budget.js";
 import { toolToJsonSchema, } from "./tools/types.js";
 /** Plan §7.4. */
 export const DEFAULT_LIMITS = {
@@ -48,17 +48,16 @@ export async function runAgent(options) {
     };
     /** What the provider counted for the previous request; 0 until one lands. */
     let lastPromptTokens = 0;
-    /** U-1 · Bytes of the request that produced `lastPromptTokens`. */
-    let lastRequestBytes = 0;
+    /** U-1 · UTF-8 size of the request that produced `lastPromptTokens`. */
+    let lastRequestSize = 0;
     // T-3 · Known before anything is sent. Waiting for the first response to
     // 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)
@@ -76,7 +75,10 @@ export async function runAgent(options) {
             // R-2 · Keep going until the estimate is inside the budget. Dropping one
             // exchange and sending anyway left a history that was still over the
             // window: the request failed upstream and was billed for the attempt.
-            const compacted = compactUntilItFits(messages, options.pricing?.contextLength, lastPromptTokens, lastRequestBytes, () => requestBytes(messages, toolSchemas));
+            const compacted = compactUntilItFits(messages, options.pricing?.contextLength, lastPromptTokens, lastRequestSize, () => requestSize(messages, toolSchemas, {
+                model: options.model,
+                tool_choice: "auto",
+            }));
             if (compacted.exhausted) {
                 // F-008 · Nothing left that can be dropped without breaking the
                 // conversation. Sending anyway means a request over the window, which
@@ -100,7 +102,10 @@ export async function runAgent(options) {
         }
         // U-1 · Measured for the request we are about to make, so the ratio the
         // next compaction uses is the provider's own count over these exact bytes.
-        const sentBytes = requestBytes(messages, toolSchemas);
+        const sentSize = requestSize(messages, toolSchemas, {
+            model: options.model,
+            tool_choice: "auto",
+        });
         let response;
         try {
             response = await requestWithRateLimitHandling(options, limits, {
@@ -119,13 +124,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;
-            lastRequestBytes = sentBytes;
+        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);
@@ -136,8 +152,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),
         });
@@ -157,9 +175,9 @@ export async function runAgent(options) {
         // had never been applied to anything.
         if (limits.maxCostMicroUsd !== undefined &&
             !canPrice(options.pricing, usage)) {
-            return stop(report, "cost_unknown", `--max-cost-usd cannot be enforced: the response for ${options.model} ` +
-                `carried no usage, so this request could not be counted towards ` +
-                `the ceiling.`);
+            return stop(report, "cost_unknown", `--max-cost-usd cannot be enforced: usage was missing or incomplete ` +
+                `in the response for ${options.model}, so this request could not be ` +
+                `counted towards the ceiling.`);
         }
         if (calls.length === 0) {
             // Keep the answer in the history so a session's next turn has context.
@@ -311,21 +329,61 @@ export function backoffMs(retryAfterSeconds, attempt, random = Math.random) {
     // Full jitter: a fleet of CLIs must not retry in lockstep.
     return Math.round(base * (0.5 + random() * 0.5));
 }
-/** F-012 · Whether `priceTurn` had everything it needed to give an answer. */
+/**
+ * V-1 · Whether this turn can be priced at all.
+ *
+ * "There is a usage object" is not the same as "there is a usage". A reply can
+ * carry `{}`, or only `prompt_tokens`, or a fractional or negative count - and
+ * each of those used to be priced as though the missing half were zero, so a
+ * run under `--max-cost-usd` finished successfully having applied the ceiling
+ * to a number that was partly invented. A fractional count did worse: it threw
+ * out of `priceTurn` as an uncaught RangeError.
+ *
+ * Both token counts and both prices have to be there and be usable. Anything
+ * short of that is unpriced, which the caller reports rather than rounds down.
+ */
+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 (isPrice(model?.inputPricePer1mMicroUsd) &&
+        isPrice(model?.outputPricePer1mMicroUsd));
+}
 function canPrice(model, usage) {
-    return (usage !== undefined &&
-        model?.inputPricePer1mMicroUsd !== undefined &&
-        model?.outputPricePer1mMicroUsd !== undefined);
+    if (usage === undefined)
+        return false;
+    if (!isTokenCount(usage.prompt_tokens))
+        return false;
+    if (!isTokenCount(usage.completion_tokens))
+        return false;
+    return hasValidPrices(model);
 }
 function priceTurn(model, usage) {
-    if (!model?.inputPricePer1mMicroUsd ||
-        !model.outputPricePer1mMicroUsd ||
-        !usage) {
+    // V-1 · One gate, shared with the caller's reporting, so a turn can never be
+    // charged for and reported as unpriced - or the reverse.
+    if (!canPrice(model, usage))
         return 0n;
-    }
-    const ceilDiv = (tokens, price) => (BigInt(Math.max(0, tokens)) * BigInt(price) + 999999n) / 1000000n;
-    return (ceilDiv(usage.prompt_tokens ?? 0, model.inputPricePer1mMicroUsd) +
-        ceilDiv(usage.completion_tokens ?? 0, model.outputPricePer1mMicroUsd));
+    const prompt = usage?.prompt_tokens ?? 0;
+    const completion = usage?.completion_tokens ?? 0;
+    const ceilDiv = (tokens, price) => (BigInt(tokens) * BigInt(price) + 999999n) / 1000000n;
+    return (ceilDiv(prompt, model?.inputPricePer1mMicroUsd ?? "0") +
+        ceilDiv(completion, model?.outputPricePer1mMicroUsd ?? "0"));
 }
 function stop(report, reason, error) {
     report.stopReason = reason;

package/dist/agent/session.js

@@ -38,7 +38,7 @@ export async function runSession(options) {
     let pricing = options.pricing;
     const source = options.readLine
         ? undefined
-        : lineSource(options.input ?? process.stdin, options.stderr);
+        : lineSource(options.input ?? process.stdin);
     const readLine = options.readLine ??
         (() => {
             options.stderr("\n> ");
@@ -253,7 +253,7 @@ export function compactHistory(history) {
  * a queue keeps them, and end-of-input only reports undefined once the queue
  * is actually empty.
  */
-function lineSource(input, write) {
+function lineSource(input) {
     const rl = createInterface({
         input,
         output: process.stderr,

package/dist/agent/tools/run-command.js

@@ -55,7 +55,7 @@ export async function executeCommand(argv, cwd, timeoutMs = COMMAND_TIMEOUT_MS)
             clearTimeout(timer);
             resolve({ code, signal, output: stripAnsi(output), timedOut });
         };
-        child.on("error", (error) => finish(null, null));
+        child.on("error", () => finish(null, null));
         child.on("close", (code, signal) => finish(code, signal));
     });
 }

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

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

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,CAuInB;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>]
@@ -383,8 +383,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/doctor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../src/commands/doctor.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAInD,OAAO,EAAgB,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAY5D,MAAM,WAAW,QAAS,SAAQ,SAAS;IACzC,yDAAyD;IACzD,MAAM,CAAC,EAAE,MAAM,OAAO,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;;;;GAKG;AACH,wBAAsB,aAAa,CACjC,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,EAAE,EAAE,QAAQ,GACX,OAAO,CAAC,QAAQ,CAAC,CAyFnB"}
+{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../src/commands/doctor.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAKnD,OAAO,EAAgB,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAY5D,MAAM,WAAW,QAAS,SAAQ,SAAS;IACzC,yDAAyD;IACzD,MAAM,CAAC,EAAE,MAAM,OAAO,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;;;;GAKG;AACH,wBAAsB,aAAa,CACjC,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,EAAE,EAAE,QAAQ,GACX,OAAO,CAAC,QAAQ,CAAC,CAyFnB"}

package/dist/commands/doctor.js

@@ -7,6 +7,7 @@ import { ConfigError } from "../config/config.js";
 import { ExitCode } from "../output/exit-codes.js";
 import { parseFormatFlags, renderJson, renderTable } from "../output/format.js";
 import { formatUsd } from "../output/money.js";
+import { safeForTerminal } from "../output/terminal-safe.js";
 import { keyFingerprint, redact } from "../security/redact.js";
 import { buildRuntime } from "./runtime.js";
 const MINIMUM_NODE_MAJOR = 20;
@@ -141,14 +142,20 @@ function describe(error) {
 function report(checks, format, io) {
     const failed = checks.filter((check) => check.status === "fail").length;
     if (format === "json") {
+        // Exact values, as everywhere else that a machine reads.
         io.stdout(renderJson({ ok: failed === 0, checks }));
     }
     else {
         const mark = { ok: "ok", warn: "warn", fail: "FAIL" };
+        // V-2 · One place every check's detail is drawn, and several of them are
+        // built from remote text - a model's apiSurface, an endpoint, an upstream
+        // error. Cleaning here covers the checks that exist and the ones added
+        // later; cleaning each check's string did not.
+        const tty = io.isTty ?? process.stdout.isTTY === true;
         io.stdout(renderTable(checks, [
             { header: "", value: (c) => mark[c.status] },
-            { header: "CHECK", value: (c) => c.name },
-            { header: "DETAIL", value: (c) => c.detail },
+            { header: "CHECK", value: (c) => safeForTerminal(c.name, tty) },
+            { header: "DETAIL", value: (c) => safeForTerminal(c.detail, tty) },
         ]));
     }
     // Warnings are survivable — a missing scope or an unverified model does not

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/runtime.d.ts

@@ -16,6 +16,12 @@ export interface CommandIo {
      * Defaults to `process.stdout.isTTY`; tests set it explicitly.
      */
     isTty?: boolean;
+    /**
+     * V-2 · Whether stderr is a terminal. Separate from `isTty` because
+     * `mafdet ... 2> log` redirects one and not the other, and the rule is about
+     * the destination rather than the command.
+     */
+    isErrTty?: boolean;
 }
 export interface Runtime {
     config: LoadedConfig;
@@ -31,5 +37,30 @@ export declare function requireApiKey(config: LoadedConfig): void;
  * Turn any failure into an exit code and a single stderr line. Nothing here
  * prints a raw upstream message: ApiError redacted it at construction.
  */
+/**
+ * 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
+ * individual messages was tried and missed two of them; a message is
+ * assembled from remote data far more often than anyone remembers.
+ *
+ * Redirected stderr keeps the bytes, the same rule as everywhere else.
+ */
 export declare function reportError(error: unknown, io: CommandIo): ExitCode;
 //# sourceMappingURL=runtime.d.ts.map

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;AAEnD,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;CACjB;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,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,SAAS,GAAG,QAAQ,CAkBnE"}
+{"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

@@ -3,6 +3,7 @@ import { loadConfig } from "../config/load.js";
 import { HttpClient } from "../api/http.js";
 import { ApiError } from "../api/errors.js";
 import { ExitCode } from "../output/exit-codes.js";
+import { safeForTerminal } from "../output/terminal-safe.js";
 export function userAgent(version) {
     // Identifiable, and carrying nothing about the user (plan §9.2).
     return `mafdet-cli/${version}`;
@@ -37,20 +38,50 @@ export function requireApiKey(config) {
  * Turn any failure into an exit code and a single stderr line. Nothing here
  * prints a raw upstream message: ApiError redacted it at construction.
  */
+/**
+ * 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
+ * individual messages was tried and missed two of them; a message is
+ * assembled from remote data far more often than anyone remembers.
+ *
+ * Redirected stderr keeps the bytes, the same rule as everywhere else.
+ */
 export function reportError(error, io) {
     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: ${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: ${error.message}\n`);
+        writeHumanError(io, `mafdet: ${error.message}\n`);
         return ExitCode.Usage;
     }
-    io.stderr(`mafdet: ${error.message}\n`);
+    writeHumanError(io, `mafdet: ${error.message}\n`);
     return ExitCode.General;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../../src/commands/sessions.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AA4BnD,OAAO,EAIL,KAAK,SAAS,EACf,MAAM,cAAc,CAAC;AAgBtB,wBAAsB,eAAe,CACnC,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,EAAE,EAAE,SAAS,GACZ,OAAO,CAAC,QAAQ,CAAC,CAUnB;AAoRD,eAAO,MAAM,eAAe,GAAI,IAAI,MAAM,KAAG,MAUX,CAAC"}
+{"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../../src/commands/sessions.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AA4BnD,OAAO,EAIL,KAAK,SAAS,EACf,MAAM,cAAc,CAAC;AAetB,wBAAsB,eAAe,CACnC,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,EAAE,EAAE,SAAS,GACZ,OAAO,CAAC,QAAQ,CAAC,CAUnB;AAoRD,eAAO,MAAM,eAAe,GAAI,IAAI,MAAM,KAAG,MAUX,CAAC"}

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/sessions/open.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"open.d.ts","sourceRoot":"","sources":["../../src/sessions/open.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAGL,KAAK,WAAW,EACjB,MAAM,WAAW,CAAC;AACnB,OAAO,EAEL,oBAAoB,EAGpB,KAAK,aAAa,EACnB,MAAM,aAAa,CAAC;AAKrB,OAAO,EAAE,aAAa,EAAe,KAAK,eAAe,EAAE,MAAM,YAAY,CAAC;AAE9E,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,0CAA0C;IAC1C,QAAQ,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,QAAQ,CAAC,YAAY,EAAE,SAAS,MAAM,EAAE,CAAC;IACzC,QAAQ,CAAC,sBAAsB,EAAE,SAAS,MAAM,EAAE,CAAC;CACpD;AAED,MAAM,MAAM,UAAU,GAClB;IAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAA;CAAE,GAC5B;IAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GACpD;IAAE,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GACxD;IACE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IACxB,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC;IACnC,QAAQ,CAAC,QAAQ,EAAE,WAAW,EAAE,CAAC;IACjC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC;IAC/B,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,0DAA0D;IAC1D,QAAQ,CAAC,QAAQ,EAAE,SAAS,aAAa,EAAE,CAAC;IAC5C,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;IACpC,QAAQ,CAAC,WAAW,EAAE,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC;CAC/D,CAAC;AAEN,wBAAgB,aAAa,CAAC,KAAK,EAAE,kBAAkB,GAAG,UAAU,CAqFnE;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAC5B,MAAM,EAAE,OAAO,CAAC,UAAU,EAAE;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAC,GAC9C,MAAM,CAyBR"}
+{"version":3,"file":"open.d.ts","sourceRoot":"","sources":["../../src/sessions/open.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAGL,KAAK,WAAW,EACjB,MAAM,WAAW,CAAC;AACnB,OAAO,EAEL,oBAAoB,EAGpB,KAAK,aAAa,EACnB,MAAM,aAAa,CAAC;AAKrB,OAAO,EAAE,aAAa,EAAe,KAAK,eAAe,EAAE,MAAM,YAAY,CAAC;AAE9E,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,0CAA0C;IAC1C,QAAQ,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,QAAQ,CAAC,YAAY,EAAE,SAAS,MAAM,EAAE,CAAC;IACzC,QAAQ,CAAC,sBAAsB,EAAE,SAAS,MAAM,EAAE,CAAC;CACpD;AAED,MAAM,MAAM,UAAU,GAClB;IAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAA;CAAE,GAC5B;IAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GACpD;IAAE,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GACxD;IACE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IACxB,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC;IACnC,QAAQ,CAAC,QAAQ,EAAE,WAAW,EAAE,CAAC;IACjC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC;IAC/B,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,0DAA0D;IAC1D,QAAQ,CAAC,QAAQ,EAAE,SAAS,aAAa,EAAE,CAAC;IAC5C,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;IACpC,QAAQ,CAAC,WAAW,EAAE,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC;CAC/D,CAAC;AAEN,wBAAgB,aAAa,CAAC,KAAK,EAAE,kBAAkB,GAAG,UAAU,CAqFnE;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAC5B,MAAM,EAAE,OAAO,CAAC,UAAU,EAAE;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAC,GAC9C,MAAM,CAyBR"}

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/agent-surface.js

@@ -53,7 +53,7 @@ export async function promptLine(io, prompt) {
 }
 export async function runAgentSurface(options) {
     const { io, capabilities } = options;
-    const { dim, bold } = palette(capabilities);
+    const { dim } = palette(capabilities);
     const cards = new ToolCardLog();
     const run = options.run ?? runSession;
     const onEvent = (event) => {

package/package.json

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