@mafdet/cli 0.4.5 → 0.4.7

package/CHANGELOG.md

@@ -6,6 +6,60 @@ 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.7 - 2026-08-12
+
+0.4.6 shipped without the fix it was published for.
+
+Its headline change was that an interactive `mafdet agent` records your
+questions and not only the model's replies. The edit that connected the
+recorder to the session loop matched nothing when it was applied, and the
+version went out with the old behaviour: typecheck passed, the whole suite
+passed, and the unit test for it passed too, because that test drives the
+session loop directly and never touches the command that was supposed to call
+it. A real interactive run found it a few minutes later.
+
+This release contains the wiring, and a test that goes through the command
+rather than around it - verified to fail when the wiring is removed. If you
+installed 0.4.6, upgrade: everything else in it was real, but that one was not.
+
+## 0.4.6 - 2026-08-12
+
+A third audit round. Two of its findings were things the previous round's
+notes recorded as fixed, and the pattern is worth naming: a partial fix logged
+as complete is not looked at again.
+
+**An interactive `mafdet agent` now records your questions.** It saved the
+model's replies, the tool runs and the usage, and none of the prompts - so
+resuming such a session could not continue a conversation that was only half
+there. The TUI wrapped its own reader to record them and the command surface
+did not; recording now happens in the session loop, where neither can forget.
+
+**`--max-cost-usd` refuses before spending, not after.** When the catalogue
+publishes no price for a model, the run used to make one billable request and
+discover the problem from the response. Whether a price exists is known before
+anything is sent.
+
+**A run nobody could price no longer reports `$0.00`.** The command summary,
+the TUI summary, `/cost` and the JSON report all showed zero for a run whose
+model had no published price; they now say how many requests the figure does
+not cover, as `sessions usage` already did.
+
+**Context compaction accounts for what cannot shrink.** The estimate assumed
+tokens fall in proportion to messages, but the system prompt and tool schemas
+are re-sent every turn - so it could decide a history had come inside the
+window when only the removable part had.
+
+**Model catalogue text is sanitised where it enters.** Terminal escape
+sequences were being stripped sink by sink, and the model picker was still
+missing after two rounds; cleaning the catalogue on arrival leaves nothing
+downstream to forget. Fixed with it: stripping a sequence no longer eats the
+text that follows it, which an 8-bit OSC terminated by BEL used to do.
+
+Also: the stream's total deadline actually bounds the wait instead of allowing
+one more idle period; compaction reports how many turns it dropped rather than
+always one; the session picker and the per-model and per-key JSON carry the
+unpriced count.
+
 ## 0.4.5 - 2026-08-12
 
 A second audit round, and the security fix in it is the important one.

package/README.md

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

package/README.zh-CN.md

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

package/dist/agent/command-policy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command-policy.d.ts","sourceRoot":"","sources":["../../src/agent/command-policy.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAeH,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,OAAO,CAAC;IACZ,2DAA2D;IAC3D,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB;;;;OAIG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;;GAIG;AACH,wBAAgB,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CA4BlD;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAC3B,OAAO,EAAE,MAAM,EACf,SAAS,GAAE,SAAS,MAAM,EAAO,GAChC,cAAc,CAwChB;AAmBD,+EAA+E;AAC/E,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAwB9C"}
+{"version":3,"file":"command-policy.d.ts","sourceRoot":"","sources":["../../src/agent/command-policy.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAeH,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,OAAO,CAAC;IACZ,2DAA2D;IAC3D,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB;;;;OAIG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;;GAIG;AACH,wBAAgB,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CA4BlD;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAC3B,OAAO,EAAE,MAAM,EACf,SAAS,GAAE,SAAS,MAAM,EAAO,GAChC,cAAc,CAwChB;AAmBD,+EAA+E;AAC/E,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CA4B9C"}

package/dist/agent/command-policy.js

@@ -119,24 +119,28 @@ function matchesAllowlist(argv, allowlist) {
 /** Terminal control sequences, stripped before any output is shown or sent. */
 export function stripAnsi(text) {
     return (text
-        // CSI: ESC [ ... final byte - colours, cursor moves, screen clears.
+        // Whole sequences first, in both their 7-bit and 8-bit forms, and only
+        // then the leftover control characters.
+        //
+        // The order is load-bearing and was wrong once: removing C0 controls
+        // before parsing the 8-bit OSC took away the BEL that terminates it, so
+        // the pattern ran to the end of the string and swallowed the ordinary
+        // text after the sequence. Failing safe, but destroying output.
+        //
+        // CSI: colours, cursor moves, screen clears.
         .replace(/\u001b\[[0-?]*[ -/]*[@-~]/g, "")
-        // OSC: ESC ] ... BEL (or ST). The payload has to go too - stripping only
-        // the introducer would leave "0;retitled" sitting in the output.
-        .replace(/\u001b\][^\u0007\u001b]*(?:\u0007|\u001b\\)?/g, "")
-        // Other single-character escapes, including OSC introducers.
+        .replace(/\u009b[0-?]*[ -/]*[@-~]/g, "")
+        // OSC: window titles and the like. The payload goes with the
+        // introducer - stripping only the introducer would leave "0;retitled"
+        // sitting in the output. Terminated by BEL or by ST in either form.
+        .replace(/\u001b\][^\u0007\u001b\u009c]*(?:\u0007|\u001b\\|\u009c)?/g, "")
+        .replace(/\u009d[^\u0007\u001b\u009c]*(?:\u0007|\u001b\\|\u009c)?/g, "")
+        // Other single-character escapes.
         .replace(/\u001b[@-Z\\-_]/g, "")
         // Remaining C0 controls. Tab, newline and carriage return survive; the
         // rest can retitle a window, move the cursor or hide what follows, and a
         // model's output is not a trusted source of terminal instructions.
         .replace(/[\u0000-\u0008\u000b\u000c\u000e-\u001f\u007f]/g, "")
-        // R-4 · The 8-bit C1 forms of the same sequences. A terminal in 8-bit
-        // mode reads U+009B as CSI and U+009D as OSC - identical instructions to
-        // the ESC forms above, with no ESC to match on. Taken as whole
-        // sequences, so the payload goes with the introducer rather than being
-        // left behind as visible text.
-        .replace(/\u009b[0-?]*[ -/]*[@-~]/g, "")
-        .replace(/\u009d[^\u0007\u009c]*(?:\u0007|\u009c)?/g, "")
-        // Any remaining C1, including NEL (U+0085) and the lone introducers.
+        // Remaining C1, including NEL (U+0085) and any lone introducer.
         .replace(/[\u0080-\u009f]/g, ""));
 }

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

@@ -47,7 +47,10 @@ export declare function pruneToolExchanges(history: ChatMessage[], keepRecent?:
  * unanswered: CLI-014's rule holds by construction. The system prompt and the
  * first user message - the goal - always stay.
  */
-export declare function dropOldestTurns(history: ChatMessage[], keepTurns: number): number;
+export declare function dropOldestTurns(history: ChatMessage[], keepTurns: number): {
+    removed: number;
+    turns: number;
+};
 export interface CompactionResult extends PruneResult {
     /** Whole turns dropped, when exchanges were not enough. */
     readonly turns: number;

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,MAAM,CAuBR;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,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,WAAW,EAAE,EACtB,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,gBAAgB,EAAE,MAAM,EACxB,UAAU,GAAE,MAA8B,GACzC,gBAAgB,CA6BlB"}
+{"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,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,WAAW,EAAE,EACtB,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,gBAAgB,EAAE,MAAM,EACxB,UAAU,GAAE,MAA8B,GACzC,gBAAgB,CAoClB"}

package/dist/agent/context-budget.js

@@ -125,10 +125,10 @@ export function dropOldestTurns(history, keepTurns) {
     // The first user message is the goal and is not a droppable turn, so there
     // have to be more than `keepTurns` turns after it before anything can go.
     if (userAt.length <= keepTurns + 1)
-        return 0;
+        return { removed: 0, turns: 0 };
     const cut = userAt[userAt.length - keepTurns];
     if (cut === undefined)
-        return 0;
+        return { removed: 0, turns: 0 };
     const kept = [];
     if (history[0]?.role === "system")
         kept.push(history[0]);
@@ -138,10 +138,13 @@ export function dropOldestTurns(history, keepTurns) {
     kept.push(...history.slice(cut));
     const removed = history.length - kept.length;
     if (removed <= 0)
-        return 0;
+        return { removed: 0, turns: 0 };
     history.length = 0;
     history.push(...kept);
-    return removed;
+    // T-7 · The count of *turns*, not of messages. Reporting a fixed 1 made the
+    // display say "dropped 1 earlier turn" after removing eight of them.
+    const turns = userAt.filter((at) => at < cut && at !== userAt[0]).length;
+    return { removed, turns };
 }
 /**
  * Shorten the history as much as can be done safely.
@@ -156,12 +159,12 @@ export function dropOldestTurns(history, keepTurns) {
  */
 export function compactForBudget(history, keepRecent = KEEP_RECENT_EXCHANGES) {
     const pruned = pruneToolExchanges(history, keepRecent);
-    const turnsRemoved = dropOldestTurns(history, keepRecent);
+    const dropped = dropOldestTurns(history, keepRecent);
     return {
-        removed: pruned.removed + turnsRemoved,
+        removed: pruned.removed + dropped.removed,
         exchanges: pruned.exchanges,
-        turns: turnsRemoved > 0 ? 1 : 0,
-        exhausted: pruned.exchanges === 0 && turnsRemoved === 0,
+        turns: dropped.turns,
+        exhausted: pruned.exchanges === 0 && dropped.removed === 0,
     };
 }
 /**
@@ -180,11 +183,17 @@ export function compactForBudget(history, keepRecent = KEEP_RECENT_EXCHANGES) {
  */
 export function compactUntilItFits(history, contextLength, lastPromptTokens, keepRecent = KEEP_RECENT_EXCHANGES) {
     const startedWith = history.length;
-    const perMessage = startedWith > 0 ? lastPromptTokens / startedWith : 0;
+    const floor = fixedOverhead(history, lastPromptTokens);
+    const perMessage = startedWith > 0 ? Math.max(0, lastPromptTokens - floor) / startedWith : 0;
     let exchanges = 0;
     let turns = 0;
     for (;;) {
-        const estimate = Math.round(perMessage * history.length);
+        // T-2 · The floor does not shrink. The system prompt and the tool schemas
+        // are re-sent every turn whatever the history looks like, so treating the
+        // whole measurement as proportional to the message count said a
+        // conversation had come inside the window when only the removable part
+        // had. Everything below the floor is not ours to drop.
+        const estimate = floor + Math.round(perMessage * history.length);
         if (!shouldCompact(contextLength, estimate)) {
             return {
                 removed: startedWith - history.length,
@@ -207,3 +216,29 @@ export function compactUntilItFits(history, contextLength, lastPromptTokens, kee
         turns += step.turns;
     }
 }
+/**
+ * T-2 · What the next request costs before any history is added.
+ *
+ * The system prompt is measurable; the tool schemas are not from here - the
+ * loop knows them but this module does not, and CLI-000B found the gateway's
+ * own reservation undercounts badly for exactly that reason. So it is
+ * approximated from the one message we can size, with a floor that keeps the
+ * estimate conservative: over-estimating the fixed part makes compaction try
+ * harder, which is the direction that fails safe.
+ */
+function fixedOverhead(history, lastPromptTokens) {
+    const system = history.find((m) => m.role === "system");
+    if (system === undefined || lastPromptTokens <= 0)
+        return 0;
+    const chars = (system.content ?? "").length;
+    // Roughly four characters per token, doubled to stand in for the tool
+    // schemas that are sent alongside it and cannot be measured here.
+    const approx = Math.round((chars / 4) * 2);
+    // Bounded by the measurement, because the fixed part cannot exceed the whole
+    // request - but NOT halved. Capping it lower was the unsafe direction: it
+    // let the loop conclude that dropping a few messages had brought a history
+    // inside a window the system prompt alone did not fit in. Over-estimating
+    // makes compaction try harder and, at worst, stop with an honest message;
+    // under-estimating sends a request that fails upstream and is billed.
+    return Math.min(approx, lastPromptTokens);
+}

package/dist/agent/loop.d.ts

@@ -36,6 +36,13 @@ export interface AgentReport {
     promptTokens: number;
     completionTokens: number;
     costMicroUsd: bigint;
+    /**
+     * T-4 · Requests the cost above does not include, because the catalogue had
+     * no price for them. Without it every live summary shows `$0.00` for a run
+     * that was not free - the session store learned to say "unknown" and the
+     * surfaces the user actually watches did not.
+     */
+    unpricedRequests: number;
     /** Set when the run ended because something failed. */
     error?: string;
 }

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

@@ -44,11 +44,22 @@ export async function runAgent(options) {
         promptTokens: 0,
         completionTokens: 0,
         costMicroUsd: 0n,
+        unpricedRequests: 0,
     };
     /** What the provider counted for the previous request; 0 until one lands. */
     let lastPromptTokens = 0;
     /** R-5 · Turns whose cost the catalogue could not tell us. */
     let unpricedTurns = 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.`);
+    }
     for (let turn = 1; turn <= limits.maxTurns; turn += 1) {
         if (options.signal?.aborted)
             return stop(report, "cancelled");
@@ -133,8 +144,10 @@ export async function runAgent(options) {
             costMicroUsd: turnCost,
             priced: canPrice(options.pricing, usage),
         });
-        if (!canPrice(options.pricing, usage))
+        if (!canPrice(options.pricing, usage)) {
             unpricedTurns += 1;
+            report.unpricedRequests += 1;
+        }
         const choice = response.choices?.[0];
         const message = choice?.message;
         const calls = message?.tool_calls ?? [];

package/dist/agent/session.d.ts

@@ -32,6 +32,16 @@ export interface SessionOptions {
      * the same events are drawn.
      */
     onEvent?: (event: AgentEvent) => void;
+    /**
+     * T-1 · The user's own words, which never appear in the agent event stream.
+     *
+     * Called from the loop rather than from each surface's `readLine`, because
+     * that is exactly how it came to be missing: the TUI wrapped its reader and
+     * `mafdet agent` did not, so a command-mode session recorded the model's
+     * replies and none of the questions - and resuming it could not continue the
+     * conversation, because half of it was not there.
+     */
+    onGoal?: (goal: string) => void;
     /** R-4 · False when stdout is a pipe or a file, which get exact bytes. */
     isTty?: boolean;
     /**
@@ -48,6 +58,8 @@ export interface SessionSummary {
     promptTokens: number;
     completionTokens: number;
     costMicroUsd: bigint;
+    /** T-4 · Requests the cost above does not include; see AgentReport. */
+    unpricedRequests: number;
 }
 /**
  * The interactive session (plan §4.4).

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,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;CACtB;AAED;;;;;;;GAOG;AACH,wBAAsB,UAAU,CAC9B,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,cAAc,CAAC,CAqGzB;AAgHD;;;;;;;;;;;;;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;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"}

package/dist/agent/session.js

@@ -1,6 +1,6 @@
 import { createInterface } from "node:readline/promises";
 import { isAgentEligible } from "../api/models.js";
-import { formatUsd } from "../output/money.js";
+import { formatUsdWithUnpriced } from "../output/money.js";
 import { renderRecord } from "../output/format.js";
 import { safeForTerminal } from "../output/terminal-safe.js";
 import { runAgent } from "./loop.js";
@@ -32,6 +32,7 @@ export async function runSession(options) {
         promptTokens: 0,
         completionTokens: 0,
         costMicroUsd: 0n,
+        unpricedRequests: 0,
     };
     let model = options.model;
     let pricing = options.pricing;
@@ -69,6 +70,7 @@ export async function runSession(options) {
                     break;
                 continue;
             }
+            options.onGoal?.(line);
             summary.goals += 1;
             const report = await runAgent({
                 client: options.client,
@@ -95,6 +97,7 @@ export async function runSession(options) {
             summary.promptTokens += report.promptTokens;
             summary.completionTokens += report.completionTokens;
             summary.costMicroUsd += report.costMicroUsd;
+            summary.unpricedRequests += report.unpricedRequests;
             // R-4 · The model's answer reaches a terminal here too. The TUI wraps
             // this writer, but `mafdet agent` without a goal does not, so the
             // sanitising belongs at the sink rather than at one of its callers.
@@ -180,7 +183,10 @@ async function handleCommand(line, context) {
                     "tokens",
                     `${context.summary.promptTokens} in / ${context.summary.completionTokens} out`,
                 ],
-                ["cost", `~${formatUsd(context.summary.costMicroUsd)}`],
+                [
+                    "cost",
+                    `~${formatUsdWithUnpriced(context.summary.costMicroUsd, context.summary.unpricedRequests)}`,
+                ],
             ]));
             return false;
         case "/compact": {

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,CAQxE;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,eAAe,CAC7B,SAAS,EAAE,SAAS,cAAc,EAAE,EACpC,OAAO,EAAE,SAAS,YAAY,EAAE,GAC/B,SAAS,CAuBX;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;;;;;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":"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,CAQxE;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,eAAe,CAC7B,SAAS,EAAE,SAAS,cAAc,EAAE,EACpC,OAAO,EAAE,SAAS,YAAY,EAAE,GAC/B,SAAS,CAuBX;AAED,8CAA8C;AAC9C,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,UAAU,GACjB,OAAO,CAAC,cAAc,EAAE,CAAC,CAQ3B;AAED,2EAA2E;AAC3E,wBAAsB,YAAY,CAChC,MAAM,EAAE,UAAU,GACjB,OAAO,CAAC,YAAY,EAAE,CAAC,CAGzB;AA0BD;;;;;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,4 @@
+import { stripAnsi } from "../agent/command-policy.js";
 /**
  * Agent admission. Every condition is something the catalogue states outright;
  * nothing is inferred from the model id, the provider or the display name —
@@ -51,12 +52,37 @@ 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 ?? [];
+    // T-5 · Same reason as `cleanModel`: these ids are printed as the "unlisted"
+    // set, so they reach a terminal without ever passing through the catalogue.
+    return (data.data ?? []).map((model) => ({
+        ...model,
+        id: typeof model.id === "string" ? stripAnsi(model.id) : model.id,
+    }));
 }
 /** 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 ?? [];
+    return (data.data ?? []).map(cleanModel);
+}
+/**
+ * T-5 · Strip terminal control sequences from catalogue text, once, here.
+ *
+ * The catalogue is remote data that ends up on a terminal in the picker, in
+ * `models list`, in `models show`, in `doctor` and in error messages. F-010
+ * was fixed sink by sink across two review rounds and the picker was still
+ * missing, which is the argument for doing it where the data enters instead:
+ * every renderer downstream, present and future, then has nothing to forget.
+ *
+ * The model id is cleaned too. It is sent back to the API, so in principle
+ * this changes what we would ask for - but an id carrying a control character
+ * is not a model id, and declining to echo one back is right either way.
+ */
+function cleanModel(model) {
+    const clean = (value) => typeof value === "string" ? stripAnsi(value) : value;
+    return Object.fromEntries(Object.entries(model).map(([key, value]) => [
+        key,
+        Array.isArray(value) ? value.map(clean) : clean(value),
+    ]));
 }
 /**
  * Check the model serves the endpoint the command needs, before spending a

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,CAyFvB"}
+{"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"}

package/dist/api/sse-parser.js

@@ -153,14 +153,23 @@ export async function readChatStream(response, events = {}, signal, limits = {})
                     message: `the stream ran for longer than ${totalMs}ms`,
                 });
             }
-            const chunk = await withIdleDeadline(reader.read(), idleMs);
+            // T-6 · Whichever runs out first. Checking the total before the read
+            // and then waiting a whole idle period overshot the total by up to one
+            // of them - with a 30 minute total and a 2 minute idle that is a
+            // rounding error, but with the total below the idle it never applied
+            // at all.
+            const remaining = totalMs - (Date.now() - startedAt);
+            const chunk = await withIdleDeadline(reader.read(), Math.max(0, Math.min(idleMs, remaining)));
             if (chunk === IDLE) {
                 limits.abort?.();
                 await reader.cancel().catch(() => { });
+                const overTotal = Date.now() - startedAt >= totalMs;
                 throw new ApiError({
                     kind: "timeout",
                     exitCode: ExitCode.Unavailable,
-                    message: `the stream sent nothing for ${idleMs}ms`,
+                    message: overTotal
+                        ? `the stream ran for longer than ${totalMs}ms`
+                        : `the stream sent nothing for ${idleMs}ms`,
                 });
             }
             const { done, value } = chunk;

package/dist/commands/agent.d.ts

@@ -8,6 +8,14 @@ export interface AgentIo extends CommandIo {
     /** Overridden in tests; production reads the TTY. */
     isInteractive?: boolean;
     approver?: import("../agent/approvals.js").Approver;
+    /**
+     * Overridden in tests; production reads lines from the terminal.
+     *
+     * Injectable because the interactive path could otherwise only be exercised
+     * under a real pty - and `script` cannot allocate one in every CI, so the
+     * wiring here went untested and a broken edit shipped past a full suite.
+     */
+    readLine?: () => Promise<string | undefined>;
 }
 export declare function agentCommand(argv: readonly string[], io: AgentIo): Promise<ExitCode>;
 /**

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;CACrD;AAED,wBAAsB,YAAY,CAChC,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,EAAE,EAAE,OAAO,GACV,OAAO,CAAC,QAAQ,CAAC,CA6HnB;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,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"}

package/dist/commands/agent.js

@@ -16,7 +16,7 @@ import { WRITE_TOOLS } from "../agent/tools/write.js";
 import { Workspace, WorkspaceError } from "../filesystem/workspace.js";
 import { ExitCode } from "../output/exit-codes.js";
 import { renderJson, renderRecord } from "../output/format.js";
-import { formatUsd } from "../output/money.js";
+import { formatUsdWithUnpriced } from "../output/money.js";
 import { buildRuntime, reportError, requireApiKey, } from "./runtime.js";
 const USAGE = `Usage:
   mafdet agent "<goal>" [--model <id>] [--allow-write] [--read-only]
@@ -99,7 +99,13 @@ export async function agentCommand(argv, io) {
                     client: runtime.dataPlane,
                     ...(recorder === undefined
                         ? {}
-                        : { onEvent: (event) => recorder.observe(event) }),
+                        : {
+                            onEvent: (event) => recorder.observe(event),
+                            // T-1 · The user's questions. Without this the transcript held
+                            // the replies and none of the prompts, so resuming it could
+                            // not continue a conversation that was only half there.
+                            onGoal: (goal) => recorder.goal(goal),
+                        }),
                     model,
                     pricing: resolved,
                     catalog,
@@ -113,6 +119,7 @@ export async function agentCommand(argv, io) {
                     stderr: io.stderr,
                     signal: io.signal,
                     isTty: isTty(io),
+                    ...(io.readLine === undefined ? {} : { readLine: io.readLine }),
                 });
             }
             finally {
@@ -127,7 +134,10 @@ export async function agentCommand(argv, io) {
                         "tokens",
                         `${summary.promptTokens} in / ${summary.completionTokens} out`,
                     ],
-                    ["cost", `~${formatUsd(summary.costMicroUsd)}`],
+                    [
+                        "cost",
+                        `~${formatUsdWithUnpriced(summary.costMicroUsd, summary.unpricedRequests)}`,
+                    ],
                 ]));
             return ExitCode.Ok;
         }
@@ -344,7 +354,10 @@ function reportEvent(event, io) {
 /** Exit codes follow §4.5: a ceiling is 7, a cancel is 6. */
 function finish(report, json, io) {
     if (json) {
-        io.stdout(renderJson({ ...report, costMicroUsd: report.costMicroUsd.toString() }));
+        io.stdout(
+        // T-4 · `unpricedRequests` rides along in the report, so a consumer can
+        // tell a genuinely free run from one nobody could price.
+        renderJson({ ...report, costMicroUsd: report.costMicroUsd.toString() }));
     }
     else {
         // R-4 · The model's answer, sanitised only when a terminal is reading it.
@@ -365,7 +378,10 @@ function finish(report, json, io) {
                     "tokens",
                     `${report.promptTokens} in / ${report.completionTokens} out`,
                 ],
-                ["cost", `~${formatUsd(report.costMicroUsd)}`],
+                [
+                    "cost",
+                    `~${formatUsdWithUnpriced(report.costMicroUsd, report.unpricedRequests)}`,
+                ],
             ]));
         if (report.error)
             io.stderr(`error: ${report.error}\n`);

package/dist/commands/sessions.js

@@ -351,11 +351,16 @@ async function usage(argv, io, root) {
                 prompt_tokens: m.promptTokens,
                 completion_tokens: m.completionTokens,
                 estimated_charge_micro_usd: m.estimatedMicroUsd.toString(),
+                // T-10 · Without this a caller cannot tell whether one model's "0"
+                // is free or unpriced, even though the top-level total says some
+                // requests were not counted.
+                unpriced_requests: m.unpricedRequests,
             })),
             by_api_key: totals.byKey.map((k) => ({
                 api_key_ref: k.apiKeyRef,
                 model_requests: k.modelRequests,
                 estimated_charge_micro_usd: k.estimatedMicroUsd.toString(),
+                unpriced_requests: k.unpricedRequests,
             })),
             ...(refreshed === undefined ? {} : { refresh: jsonRefresh(refreshed) }),
         }));
@@ -396,7 +401,9 @@ async function usage(argv, io, root) {
             { header: "REQUESTS", value: (m) => `${m.modelRequests}` },
             {
                 header: "ESTIMATE",
-                value: (m) => formatUsd(m.estimatedMicroUsd.toString()),
+                value: (m) => m.unpricedRequests > 0
+                    ? `${formatUsd(m.estimatedMicroUsd.toString())} + ${m.unpricedRequests} unpriced`
+                    : formatUsd(m.estimatedMicroUsd.toString()),
             },
         ]));
     }
@@ -408,7 +415,9 @@ async function usage(argv, io, root) {
             { header: "REQUESTS", value: (k) => `${k.modelRequests}` },
             {
                 header: "ESTIMATE",
-                value: (k) => formatUsd(k.estimatedMicroUsd.toString()),
+                value: (k) => k.unpricedRequests > 0
+                    ? `${formatUsd(k.estimatedMicroUsd.toString())} + ${k.unpricedRequests} unpriced`
+                    : formatUsd(k.estimatedMicroUsd.toString()),
             },
         ]));
     }

package/dist/output/money.d.ts

@@ -13,4 +13,13 @@ export declare function parseMicroUsd(value: string | number | bigint): bigint;
 export declare function formatUsd(microUsd: string | number | bigint, options?: {
     minFractionDigits?: number;
 }): string;
+/**
+ * T-4 · A cost that may be incomplete, described rather than rounded to zero.
+ *
+ * Four surfaces render a running total - the command summary, the TUI summary,
+ * `/cost` and the JSON report - and each one showed `$0.00` for a run whose
+ * model the catalogue could not price. The session store had already learned
+ * to say "unknown"; the places the user actually watches had not.
+ */
+export declare function formatUsdWithUnpriced(microUsd: bigint | string, unpricedRequests: number): string;
 //# sourceMappingURL=money.d.ts.map

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"}
+{"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"}

package/dist/output/money.js

@@ -33,3 +33,17 @@ export function formatUsd(microUsd, options = {}) {
         digits = fraction.slice(0, minDigits);
     return `${negative ? "-" : ""}$${whole}.${digits}`;
 }
+/**
+ * T-4 · A cost that may be incomplete, described rather than rounded to zero.
+ *
+ * Four surfaces render a running total - the command summary, the TUI summary,
+ * `/cost` and the JSON report - and each one showed `$0.00` for a run whose
+ * model the catalogue could not price. The session store had already learned
+ * to say "unknown"; the places the user actually watches had not.
+ */
+export function formatUsdWithUnpriced(microUsd, unpricedRequests) {
+    const shown = formatUsd(typeof microUsd === "bigint" ? microUsd : microUsd);
+    if (unpricedRequests <= 0)
+        return shown;
+    return `${shown} + ${unpricedRequests} unpriced`;
+}

package/dist/tui/agent-surface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent-surface.d.ts","sourceRoot":"","sources":["../../src/tui/agent-surface.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,UAAU,EACV,KAAK,cAAc,EACnB,KAAK,cAAc,EACpB,MAAM,qBAAqB,CAAC;AAI7B,OAAO,EAAW,KAAK,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAGhE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAE7C,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC;IACtB,QAAQ,CAAC,YAAY,EAAE,oBAAoB,CAAC;IAC5C,QAAQ,CAAC,MAAM,EAAE;QAAE,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IAClD,0EAA0E;IAC1E,QAAQ,CAAC,OAAO,EAAE,IAAI,CACpB,cAAc,EACd,QAAQ,GAAG,QAAQ,GAAG,UAAU,GAAG,UAAU,GAAG,SAAS,CAC1D,CAAC;IACF;;;;;OAKG;IACH,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,WAAW,GAAG,SAAS,CAAC;IACnD,wEAAwE;IACxE,QAAQ,CAAC,QAAQ,CAAC,EAAE,eAAe,CAAC;IACpC,yDAAyD;IACzD,QAAQ,CAAC,GAAG,CAAC,EAAE,OAAO,UAAU,CAAC;CAClC;AAED;;;;;;GAMG;AACH,wBAAsB,UAAU,CAC9B,EAAE,EAAE,QAAQ,EACZ,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CA+B7B;AAED,wBAAsB,eAAe,CACnC,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,cAAc,CAAC,CAoFzB;AAED,wBAAgB,aAAa,CAC3B,OAAO,EAAE,cAAc,EACvB,YAAY,EAAE,oBAAoB,GACjC,MAAM,CAgBR"}
+{"version":3,"file":"agent-surface.d.ts","sourceRoot":"","sources":["../../src/tui/agent-surface.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,UAAU,EACV,KAAK,cAAc,EACnB,KAAK,cAAc,EACpB,MAAM,qBAAqB,CAAC;AAI7B,OAAO,EAAW,KAAK,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAGhE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAE7C,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC;IACtB,QAAQ,CAAC,YAAY,EAAE,oBAAoB,CAAC;IAC5C,QAAQ,CAAC,MAAM,EAAE;QAAE,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IAClD,0EAA0E;IAC1E,QAAQ,CAAC,OAAO,EAAE,IAAI,CACpB,cAAc,EACd,QAAQ,GAAG,QAAQ,GAAG,UAAU,GAAG,UAAU,GAAG,SAAS,CAC1D,CAAC;IACF;;;;;OAKG;IACH,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,WAAW,GAAG,SAAS,CAAC;IACnD,wEAAwE;IACxE,QAAQ,CAAC,QAAQ,CAAC,EAAE,eAAe,CAAC;IACpC,yDAAyD;IACzD,QAAQ,CAAC,GAAG,CAAC,EAAE,OAAO,UAAU,CAAC;CAClC;AAED;;;;;;GAMG;AACH,wBAAsB,UAAU,CAC9B,EAAE,EAAE,QAAQ,EACZ,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CA+B7B;AAED,wBAAsB,eAAe,CACnC,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,cAAc,CAAC,CA+EzB;AAED,wBAAgB,aAAa,CAC3B,OAAO,EAAE,cAAc,EACvB,YAAY,EAAE,oBAAoB,GACjC,MAAM,CAqBR"}

package/dist/tui/agent-surface.js

@@ -6,7 +6,7 @@
 // different models, tools, approvals or costs, because there is only one
 // implementation of all four. What differs is the drawing.
 import { runSession, } from "../agent/session.js";
-import { formatUsd } from "../output/money.js";
+import { formatUsdWithUnpriced } from "../output/money.js";
 import { tuiApprover } from "./approval.js";
 import { palette } from "./theme.js";
 import { renderCard, ToolCardLog } from "./tool-card.js";
@@ -99,16 +99,13 @@ export async function runAgentSurface(options) {
             // Checkpoint between goals rather than per event: the listing only needs
             // to be current when someone might go and look at it.
             options.recorder?.checkpoint();
-            const line = await promptLine(io, "> ");
-            // The user's own words never appear in the agent event stream, so they
-            // are recorded here. Slash commands are control, not conversation.
-            if (line !== undefined &&
-                line.trim().length > 0 &&
-                !line.startsWith("/")) {
-                options.recorder?.goal(line);
-            }
-            return line;
+            return promptLine(io, "> ");
         },
+        // T-1 · Recording the goal belongs to the session loop now, so both
+        // surfaces get it from the same place instead of one remembering.
+        ...(options.recorder === undefined
+            ? {}
+            : { onGoal: (goal) => options.recorder?.goal(goal) }),
         onEvent,
     };
     // Installed after the spread, on purpose - see getSignal above.
@@ -133,7 +130,7 @@ export function renderSummary(summary, capabilities) {
         dim(`  model requests   ${summary.modelRequests}`),
         dim(`  tool runs        ${summary.toolRuns}`),
         dim(`  tokens           ${summary.promptTokens} in / ${summary.completionTokens} out`),
-        dim(`  estimated cost   ${formatUsd(summary.costMicroUsd.toString())}`),
+        dim(`  estimated cost   ${formatUsdWithUnpriced(summary.costMicroUsd, summary.unpricedRequests)}`),
         "",
     ].join("\n") + "\n");
 }

package/dist/tui/session-centre.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-centre.d.ts","sourceRoot":"","sources":["../../src/tui/session-centre.ts"],"names":[],"mappings":"AAQA,OAAO,EAAa,KAAK,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,EAAW,KAAK,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAChE,OAAO,EAAU,KAAK,QAAQ,EAAE,MAAM,cAAc,CAAC;AAKrD,MAAM,MAAM,aAAa,GACrB;IAAE,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAA;CAAE,GACxB;IAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GACvD;IAAE,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAA;CAAE,CAAC;AAEnC,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,UAAU,EAAE,CAQlE;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAC7B,KAAK,EAAE,UAAU,EACjB,YAAY,EAAE,oBAAoB,GACjC,MAAM,CAQR;AAOD,wBAAsB,aAAa,CACjC,EAAE,EAAE,QAAQ,EACZ,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,aAAa,CAAC,CAoBxB"}
+{"version":3,"file":"session-centre.d.ts","sourceRoot":"","sources":["../../src/tui/session-centre.ts"],"names":[],"mappings":"AAQA,OAAO,EAAa,KAAK,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,EAAW,KAAK,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAChE,OAAO,EAAU,KAAK,QAAQ,EAAE,MAAM,cAAc,CAAC;AAKrD,MAAM,MAAM,aAAa,GACrB;IAAE,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAA;CAAE,GACxB;IAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GACvD;IAAE,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAA;CAAE,CAAC;AAEnC,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,UAAU,EAAE,CAQlE;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAC7B,KAAK,EAAE,UAAU,EACjB,YAAY,EAAE,oBAAoB,GACjC,MAAM,CAYR;AAOD,wBAAsB,aAAa,CACjC,EAAE,EAAE,QAAQ,EACZ,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,aAAa,CAAC,CAoBxB"}

package/dist/tui/session-centre.js

@@ -30,7 +30,11 @@ export function describeSession(entry, capabilities) {
         stripAnsi(entry.model_id),
         stripAnsi(workspaceName(entry.workspace)),
         `${entry.model_requests} request(s)`,
-        `~${formatUsd(entry.estimated_charge_micro_usd)}`,
+        // T-8 · `sessions list/show/usage` learned to say "unknown"; this list
+        // did not, so the same session read as free in the picker.
+        entry.unpriced_requests
+            ? `~${formatUsd(entry.estimated_charge_micro_usd)} + ${entry.unpriced_requests} unpriced`
+            : `~${formatUsd(entry.estimated_charge_micro_usd)}`,
     ];
     return palette(capabilities).dim(parts.join(" - "));
 }

package/package.json

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