@mafdet/cli 0.4.4 → 0.4.6

package/CHANGELOG.md

@@ -6,6 +6,87 @@ 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.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.
+
+**With no tool-calling model, the interactive session no longer opens.** It
+used to print a warning and then offer every chat model - so the one case with
+nothing safe to offer was the case that offered everything, and the agent then
+ran on a model whose tool calling had never been verified. `mafdet agent`
+refused the same model outright, so the two surfaces disagreed about
+admission. They no longer do.
+
+**A cost ceiling that cannot be enforced stops the run.** When the catalogue
+has no price for a model, each turn counted as zero towards `--max-cost-usd`,
+so the ceiling quietly stopped being one while the run kept spending. Asking
+for a limit we cannot apply now ends the run and says why.
+
+**Context compaction keeps going until the history fits.** It used to drop a
+single tool exchange and send regardless, which changes nothing when the
+history is several times over the window - the request then failed upstream
+and was billed for the attempt.
+
+**A stream is closed when the answer ends.** `[DONE]` means the reply is
+complete, not that the socket is; an upstream that kept the connection open
+held ours too. There is also a total deadline now, because a trickle of bytes
+defeats an idle one.
+
+**More of what reaches the terminal is sanitised**: the answer from `mafdet
+agent`, the interactive session's answer, the session picker, the resume
+notice and the remaining `sessions` columns. The stripper also handles the
+8-bit C1 forms, which do the same things without an escape character.
+
+**An unpriced request is no longer displayed as `$0.00`** in `sessions list`,
+`show` or `usage`, and the JSON carries `unpriced_requests` so a script can
+tell the difference too.
+
+Also: `sessions list` refuses stray arguments like the other subcommands;
+`mafdet agent` documents `--title`, `--no-history` and `--read-only`, shows
+the first-save notice, and closes its recorder even when the session throws;
+resuming no longer asks you to pick a model it is going to ignore, and the
+banner names the model actually in use; and the Windows command-timeout note
+now says the `taskkill` path is written but unverified, rather than describing
+the implementation it replaced.
+
 ## 0.4.4 - 2026-08-11
 
 A security fix and twenty-one other corrections, all from an external audit of

package/README.md

@@ -3,13 +3,11 @@
 The official Mafdet AI command line: model calls, account queries, and a
 permissioned local agent.
 
-> **0.4.4.** 中文版见 [README.zh-CN.md](./README.zh-CN.md). The CLI never
+> **0.4.6.** 中文版见 [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.
 >
-> macOS and Windows are not yet verified. On Windows the command timeout
-> relies on POSIX process groups, so only the direct child is terminated and a
-> grandchild can survive.
+> macOS and Windows are not yet verified. On Windows the command timeout uses `taskkill /T`, which is written but has never been run on a real Windows machine - so whether every grandchild process is reached there is unverified rather than fixed.
 
 ## Requirements
 
@@ -25,8 +23,8 @@ Or build it from this repository:
 
 ```bash
 pnpm --filter @mafdet/cli build
-cd packages/cli && npm pack          # -> mafdet-cli-0.4.4.tgz
-npm install -g ./mafdet-cli-0.4.4.tgz
+cd packages/cli && npm pack          # -> mafdet-cli-0.4.6.tgz
+npm install -g ./mafdet-cli-0.4.6.tgz
 ```
 
 ## The interactive session

package/README.zh-CN.md

@@ -2,7 +2,7 @@
 
 Mafdet AI 官方命令行：模型调用、账户查询，以及一个受权限约束的本地 Agent。
 
-> **0.4.4。** 英文版见 [README.md](./README.md)。
+> **0.4.6。** 英文版见 [README.md](./README.md)。
 
 ## 环境要求
 
@@ -55,8 +55,9 @@ mafdet doctor
 的默认状态，中文系统为 cp936）也不会变成乱码。管道传入 prompt 也可以，但 PowerShell
 默认按 UTF-16 走管道——建议直接把 prompt 作为参数，或用 `--input <文件>`。
 
-⚠️ **macOS 与 Windows 尚未验收**。Windows 上有一个已知差异：命令超时终止依赖 POSIX 的
-进程组语义，Windows 只会终止直接子进程，孙子进程可能存活。
+⚠️ **macOS 与 Windows 尚未验收**。Windows 上的命令超时终止已改用 `taskkill /T`，
+但**从未在真 Windows 上执行过**——它是否真的能杀到每一个孙子进程，属于**未验证**，
+不是「已修复」。
 
 ## 命令
 

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,CAe9C"}
+{"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,15 +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, ""));
+        .replace(/[\u0000-\u0008\u000b\u000c\u000e-\u001f\u007f]/g, "")
+        // 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;
@@ -66,4 +69,19 @@ export interface CompactionResult extends PruneResult {
  * upstream and be billed for the attempt.
  */
 export declare function compactForBudget(history: ChatMessage[], keepRecent?: number): CompactionResult;
+/**
+ * R-2 · Shorten until it fits, or until nothing more can go.
+ *
+ * `compactForBudget` used to return the moment it dropped a single tool
+ * exchange, and the caller then sent the request regardless. One exchange out
+ * of a history three times over the window changes nothing, so the request
+ * still failed upstream - and was billed for the attempt.
+ *
+ * `estimate` maps the current history back to a token count. There is no
+ * tokenizer here (see the note at the top of this file), so it is derived from
+ * the last measurement: tokens per message, applied to what is left. Rough, but
+ * it is the only honest figure available and it is monotone in the right
+ * direction, which is what a loop needs.
+ */
+export declare function compactUntilItFits(history: ChatMessage[], contextLength: number | undefined, lastPromptTokens: number, keepRecent?: number): CompactionResult;
 //# 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,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,CAYlB"}
+{"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,14 +159,86 @@ export function dropOldestTurns(history, keepTurns) {
  */
 export function compactForBudget(history, keepRecent = KEEP_RECENT_EXCHANGES) {
     const pruned = pruneToolExchanges(history, keepRecent);
-    if (pruned.exchanges > 0) {
-        return { ...pruned, turns: 0, exhausted: false };
-    }
-    const turnsRemoved = dropOldestTurns(history, keepRecent);
+    const dropped = dropOldestTurns(history, keepRecent);
     return {
-        removed: turnsRemoved,
-        exchanges: 0,
-        turns: turnsRemoved > 0 ? 1 : 0,
-        exhausted: turnsRemoved === 0,
+        removed: pruned.removed + dropped.removed,
+        exchanges: pruned.exchanges,
+        turns: dropped.turns,
+        exhausted: pruned.exchanges === 0 && dropped.removed === 0,
     };
 }
+/**
+ * R-2 · Shorten until it fits, or until nothing more can go.
+ *
+ * `compactForBudget` used to return the moment it dropped a single tool
+ * exchange, and the caller then sent the request regardless. One exchange out
+ * of a history three times over the window changes nothing, so the request
+ * still failed upstream - and was billed for the attempt.
+ *
+ * `estimate` maps the current history back to a token count. There is no
+ * tokenizer here (see the note at the top of this file), so it is derived from
+ * the last measurement: tokens per message, applied to what is left. Rough, but
+ * it is the only honest figure available and it is monotone in the right
+ * direction, which is what a loop needs.
+ */
+export function compactUntilItFits(history, contextLength, lastPromptTokens, keepRecent = KEEP_RECENT_EXCHANGES) {
+    const startedWith = history.length;
+    const floor = fixedOverhead(history, lastPromptTokens);
+    const perMessage = startedWith > 0 ? Math.max(0, lastPromptTokens - floor) / startedWith : 0;
+    let exchanges = 0;
+    let turns = 0;
+    for (;;) {
+        // 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,
+                exchanges,
+                turns,
+                exhausted: false,
+            };
+        }
+        const step = compactForBudget(history, keepRecent);
+        if (step.exhausted) {
+            return {
+                removed: startedWith - history.length,
+                exchanges,
+                turns,
+                // Still over budget with nothing left that is safe to drop.
+                exhausted: true,
+            };
+        }
+        exchanges += step.exchanges;
+        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

@@ -14,7 +14,13 @@ export declare const DEFAULT_LIMITS: {
 export type AgentLimits = typeof DEFAULT_LIMITS;
 export type StopReason = "completed" | "max_turns" | "timeout" | "max_cost" | "cancelled" | "rate_limited"
 /** F-008 · Over the model's window with nothing left that is safe to drop. */
- | "context_limit" | "error";
+ | "context_limit"
+/**
+ * R-5 · A cost ceiling was asked for and cannot be honoured, because the
+ * catalogue has no price for this model. Distinct from `max_cost`, which
+ * means the ceiling was reached.
+ */
+ | "cost_unknown" | "error";
 export interface AgentReport {
     stopReason: StopReason;
     /** The model's last text answer, if it produced one. */
@@ -30,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;
 }
@@ -122,6 +135,8 @@ export type AgentEvent = {
  | {
     type: "compacted";
     exchanges: number;
+    /** Whole conversation turns dropped, when exchanges were not enough. */
+    turns: number;
     messages: number;
     promptTokens: number;
 };

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 { compactForBudget, shouldCompact } from "./context-budget.js";
+import { compactUntilItFits, shouldCompact } from "./context-budget.js";
 import { toolToJsonSchema, } from "./tools/types.js";
 /** Plan §7.4. */
 export const DEFAULT_LIMITS = {
@@ -44,9 +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");
@@ -56,11 +69,23 @@ export async function runAgent(options) {
             report.costMicroUsd >= limits.maxCostMicroUsd) {
             return stop(report, "max_cost");
         }
+        // R-5 · An unpriceable turn counted as 0 towards the ceiling, so
+        // `--max-cost-usd` silently stopped being a ceiling at all and the run
+        // continued spending real money. A limit that cannot be enforced has to
+        // stop the run, not be quietly abandoned.
+        if (limits.maxCostMicroUsd !== undefined && unpricedTurns > 0) {
+            return stop(report, "cost_unknown", `--max-cost-usd cannot be enforced: the catalogue has no price for ` +
+                `${options.model}, so ${unpricedTurns} request(s) could not be counted ` +
+                `towards the ceiling. Re-run without the limit to continue anyway.`);
+        }
         report.turns = turn;
         options.onEvent?.({ type: "turn", turn });
         // §7.4 · Shorten before asking, using what the provider counted last time.
         if (shouldCompact(options.pricing?.contextLength, lastPromptTokens)) {
-            const compacted = compactForBudget(messages);
+            // 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);
             if (compacted.exhausted) {
                 // F-008 · Nothing left that can be dropped without breaking the
                 // conversation. Sending anyway means a request over the window, which
@@ -72,6 +97,9 @@ export async function runAgent(options) {
             options.onEvent?.({
                 type: "compacted",
                 exchanges: compacted.exchanges,
+                // R-2 · Reported separately: a pure conversation drops turns and no
+                // exchanges, and the display said "dropped 0 earlier tool exchanges".
+                turns: compacted.turns,
                 messages: compacted.removed,
                 promptTokens: lastPromptTokens,
             });
@@ -116,6 +144,10 @@ export async function runAgent(options) {
             costMicroUsd: turnCost,
             priced: 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,18 @@ 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;
     /**
      * A conversation to continue, rebuilt from a saved session (CLI-024).
      * Appended to in place, exactly as the fresh array would be.
@@ -46,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;AAC/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;;;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,CA8FzB;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,7 +1,8 @@
 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";
 const HELP = `Session commands:
   /model [id]     Show or switch the model
@@ -31,6 +32,7 @@ export async function runSession(options) {
         promptTokens: 0,
         completionTokens: 0,
         costMicroUsd: 0n,
+        unpricedRequests: 0,
     };
     let model = options.model;
     let pricing = options.pricing;
@@ -68,6 +70,7 @@ export async function runSession(options) {
                     break;
                 continue;
             }
+            options.onGoal?.(line);
             summary.goals += 1;
             const report = await runAgent({
                 client: options.client,
@@ -94,8 +97,13 @@ export async function runSession(options) {
             summary.promptTokens += report.promptTokens;
             summary.completionTokens += report.completionTokens;
             summary.costMicroUsd += report.costMicroUsd;
-            if (report.finalText)
-                options.stdout(`${report.finalText}\n`);
+            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.
+            if (report.finalText) {
+                options.stdout(`${safeForTerminal(report.finalText, options.isTty ?? true)}\n`);
+            }
             if (report.stopReason !== "completed") {
                 options.stderr(`[${report.stopReason}${report.error ? `: ${report.error}` : ""}]\n`);
             }
@@ -175,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