@mafdet/cli 0.4.4 → 0.4.6

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

@@ -72,6 +72,19 @@ export interface StreamLimits {
     readonly idleTimeoutMs?: number;
     /** Total bytes accepted before the stream is treated as hostile. */
     readonly maxBytes?: number;
+    /**
+     * R-3 · A ceiling on the whole stream, not just on the gaps in it.
+     *
+     * The idle deadline is the right primitive for "this hung" - a long
+     * generation is not a stalled one - but it is defeated by a trickle: a few
+     * bytes before each deadline holds the connection indefinitely. The byte cap
+     * bounds the volume and not the time, so this bounds the time.
+     *
+     * Generous on purpose. It is a backstop against a hostile upstream, not a
+     * limit on how long a model may think, and a single response that takes
+     * longer than this is not a case worth serving.
+     */
+    readonly maxTotalMs?: number;
     /**
      * Closes the underlying connection. Cancelling the reader alone stops us
      * reading; it does not reliably stop the gateway generating, and generation
@@ -81,6 +94,8 @@ export interface StreamLimits {
 }
 export declare const DEFAULT_STREAM_IDLE_MS = 120000;
 export declare const DEFAULT_STREAM_MAX_BYTES: number;
+/** Matches the agent's wall-clock ceiling (§7.4), for the same reason. */
+export declare const DEFAULT_STREAM_TOTAL_MS: number;
 /**
  * Read a streaming response to completion.
  *

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;;;;OAIG;IACH,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,IAAI,CAAC;CAC7B;AAED,eAAO,MAAM,sBAAsB,SAAU,CAAC;AAC9C,eAAO,MAAM,wBAAwB,QAAmB,CAAC;AAEzD;;;;;;;;;;;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,CA8DvB"}
+{"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

@@ -102,6 +102,8 @@ export class ChatStreamAssembler {
 }
 export const DEFAULT_STREAM_IDLE_MS = 120_000;
 export const DEFAULT_STREAM_MAX_BYTES = 32 * 1024 * 1024;
+/** Matches the agent's wall-clock ceiling (§7.4), for the same reason. */
+export const DEFAULT_STREAM_TOTAL_MS = 30 * 60_000;
 /**
  * Read a streaming response to completion.
  *
@@ -122,9 +124,13 @@ export async function readChatStream(response, events = {}, signal, limits = {})
         return assembler.result();
     const idleMs = limits.idleTimeoutMs ?? DEFAULT_STREAM_IDLE_MS;
     const maxBytes = limits.maxBytes ?? DEFAULT_STREAM_MAX_BYTES;
+    const totalMs = limits.maxTotalMs ?? DEFAULT_STREAM_TOTAL_MS;
+    const startedAt = Date.now();
     let received = 0;
     const reader = body.getReader();
     const onAbort = () => void reader.cancel();
+    /** Set when `[DONE]` ended the answer while bytes may still be coming. */
+    let finished = false;
     // Attaching a listener is not enough: a signal that aborted between the
     // request and here would never fire one, and the read below would hang
     // forever on a stream nobody is going to close.
@@ -138,14 +144,32 @@ export async function readChatStream(response, events = {}, signal, limits = {})
         for (;;) {
             if (signal?.aborted)
                 break;
-            const chunk = await withIdleDeadline(reader.read(), idleMs);
+            if (Date.now() - startedAt > totalMs) {
+                limits.abort?.();
+                await reader.cancel().catch(() => { });
+                throw new ApiError({
+                    kind: "timeout",
+                    exitCode: ExitCode.Unavailable,
+                    message: `the stream ran for longer than ${totalMs}ms`,
+                });
+            }
+            // 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;
@@ -162,8 +186,14 @@ export async function readChatStream(response, events = {}, signal, limits = {})
                 });
             }
             for (const payload of framer.push(value)) {
-                if (assembler.push(payload))
+                if (assembler.push(payload)) {
+                    // R-3 · `[DONE]` means the answer is complete, not that the socket
+                    // is. An upstream that keeps the connection open after it would
+                    // otherwise hold ours too - releasing the reader lock in the
+                    // `finally` does not close anything.
+                    finished = true;
                     return assembler.result();
+                }
             }
         }
         for (const payload of framer.end())
@@ -171,6 +201,12 @@ export async function readChatStream(response, events = {}, signal, limits = {})
     }
     finally {
         signal?.removeEventListener("abort", onAbort);
+        if (finished) {
+            // Cancel first, then release: cancelling closes the body, and the abort
+            // reaches the fetch itself, which is what actually frees the socket.
+            void reader.cancel().catch(() => { });
+            limits.abort?.();
+        }
         reader.releaseLock();
     }
     return assembler.result();

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

@@ -1 +1 @@
-{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../src/commands/agent.ts"],"names":[],"mappings":"AAKA,OAAO,EAAe,KAAK,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAYvE,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAGnD,OAAO,EAIL,KAAK,SAAS,EACf,MAAM,cAAc,CAAC;AAatB,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,CAsHnB;AAyJD;;;;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;CACrD;AAED,wBAAsB,YAAY,CAChC,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,EAAE,EAAE,OAAO,GACV,OAAO,CAAC,QAAQ,CAAC,CAgInB;AAoLD;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,YAAY,EAAE,kBAAkB,EAAE,OAAO,0JAI3E"}

package/dist/commands/agent.js

@@ -1,10 +1,13 @@
 import { fetchAccessibleModels, fetchCatalog, intersectModels, } from "../api/models.js";
+import { existsSync, writeFileSync } from "node:fs";
+import { join } from "node:path";
 import { approverFor } from "../agent/approvals.js";
 import { runAgent } from "../agent/loop.js";
 import { runSession } from "../agent/session.js";
+import { safeForTerminal } from "../output/terminal-safe.js";
 import { sessionsDir } from "../config/paths.js";
 import { keyDigest } from "../security/redact.js";
-import { decideRecording } from "../sessions/policy.js";
+import { decideRecording, firstSaveNotice, NOTICE_FILE, } from "../sessions/policy.js";
 import { SessionRecorder } from "../sessions/recorder.js";
 import { SessionWriter } from "../sessions/store.js";
 import { READ_ONLY_TOOLS } from "../agent/tools/read-only.js";
@@ -13,17 +16,23 @@ 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]
+  mafdet agent "<goal>" [--model <id>] [--allow-write] [--read-only]
                         [--allow-command "<prefix>"]... [--max-turns <n>]
                         [--max-cost-usd <n>] [--json]
+  mafdet agent          Interactive session (needs a terminal)
+                        [--title <text>] [--no-history]
 
 Read-only by default. With --allow-write the agent may edit and create files,
-and every change is shown as a diff and confirmed before it is written. There
-is no flag that approves everything in advance, and a non-interactive run
-cannot write at all.
+and every change is shown as a diff and confirmed before it is written.
+--read-only cancels an earlier --allow-write. There is no flag that approves
+everything in advance, and a non-interactive run cannot write at all.
+
+An interactive session is saved on this computer; --no-history records
+nothing and --title names it in 'mafdet sessions list'. To continue a saved
+conversation, use 'mafdet --resume <id>'.
 `;
 export const READ_ONLY_PROMPT = `You are the Mafdet CLI agent working inside a user's workspace.
 
@@ -82,25 +91,33 @@ export async function agentCommand(argv, io) {
             // F-007 · `decideRecording` already called this surface "interactive",
             // so the policy claimed these runs were saved while nothing saved them.
             const recorder = openRecorder(parsed, io, model, workspace.root, mode);
-            const summary = await runSession({
-                client: runtime.dataPlane,
-                ...(recorder === undefined
-                    ? {}
-                    : { onEvent: (event) => recorder.observe(event) }),
-                model,
-                pricing: resolved,
-                catalog,
-                systemPrompt: mode === "read-only" ? READ_ONLY_PROMPT : WRITE_PROMPT,
-                tools: buildToolset(mode, parsed.allowedCommands.length > 0),
-                toolContext: { workspace, allowedCommands: parsed.allowedCommands },
-                approver: io.approver ?? approverFor(mode, io, interactive),
-                mode,
-                allowedCommands: parsed.allowedCommands,
-                stdout: io.stdout,
-                stderr: io.stderr,
-                signal: io.signal,
-            });
-            recorder?.close();
+            // R-8 · In a finally: `close()` is what writes the final index entry, so
+            // a session that threw left the listing without it.
+            let summary;
+            try {
+                summary = await runSession({
+                    client: runtime.dataPlane,
+                    ...(recorder === undefined
+                        ? {}
+                        : { onEvent: (event) => recorder.observe(event) }),
+                    model,
+                    pricing: resolved,
+                    catalog,
+                    systemPrompt: mode === "read-only" ? READ_ONLY_PROMPT : WRITE_PROMPT,
+                    tools: buildToolset(mode, parsed.allowedCommands.length > 0),
+                    toolContext: { workspace, allowedCommands: parsed.allowedCommands },
+                    approver: io.approver ?? approverFor(mode, io, interactive),
+                    mode,
+                    allowedCommands: parsed.allowedCommands,
+                    stdout: io.stdout,
+                    stderr: io.stderr,
+                    signal: io.signal,
+                    isTty: isTty(io),
+                });
+            }
+            finally {
+                recorder?.close();
+            }
             io.stderr("\n" +
                 renderRecord([
                     ["goals", `${summary.goals}`],
@@ -110,7 +127,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;
         }
@@ -149,6 +169,29 @@ export async function agentCommand(argv, io) {
  * writes nothing at all, and a store that cannot be opened costs the
  * transcript rather than the session.
  */
+/**
+ * R-8 · The first-save notice, once per machine.
+ *
+ * The marker file is shared with the TUI on purpose: the notice is about this
+ * computer, not about which command happened to write first.
+ */
+function showNoticeOnce(root, io) {
+    const marker = join(root, NOTICE_FILE);
+    try {
+        if (existsSync(marker))
+            return;
+        io.stderr(firstSaveNotice(root));
+        writeFileSync(marker, `${new Date().toISOString()}\n`, { mode: 0o600 });
+    }
+    catch {
+        // Telling the user is best effort; failing to record that we told them
+        // must not stop the session.
+    }
+}
+/** Whether a terminal is on the other end of stdout. Injectable for tests. */
+function isTty(io) {
+    return io.isTty ?? process.stdout.isTTY === true;
+}
 function openRecorder(parsed, io, modelId, workspaceRoot, mode) {
     const decision = decideRecording({
         surface: "interactive",
@@ -169,6 +212,10 @@ function openRecorder(parsed, io, modelId, workspaceRoot, mode) {
             workspace: workspaceRoot,
             mode,
         });
+        // R-8 · Said once per machine, on whichever surface records first. The
+        // TUI showed it and this one did not, so a `mafdet agent` user could have
+        // a transcript on disk without ever being told.
+        showNoticeOnce(root, io);
         return new SessionRecorder({
             writer,
             root,
@@ -300,11 +347,16 @@ 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 {
-        if (report.finalText)
-            io.stdout(`${report.finalText}\n`);
+        // R-4 · The model's answer, sanitised only when a terminal is reading it.
+        if (report.finalText) {
+            io.stdout(`${safeForTerminal(report.finalText, isTty(io))}\n`);
+        }
         io.stderr("\n" +
             renderRecord([
                 ["status", report.stopReason],
@@ -319,7 +371,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`);
@@ -334,6 +389,9 @@ function finish(report, json, io) {
         case "max_cost":
         // F-008 · A ceiling too: the window ran out, and the report says which.
         case "context_limit":
+        // R-5 · Asked for a ceiling we cannot enforce; stopped rather than spend
+        // past it. A limit, so it belongs with the other limits.
+        case "cost_unknown":
             // Stopped short on purpose; the report says so rather than pretending.
             return ExitCode.LimitReached;
         case "rate_limited":

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;AA8PD,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;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"}

package/dist/commands/sessions.js

@@ -63,7 +63,13 @@ async function run(argv, io) {
     return ExitCode.Usage;
 }
 function list(argv, io, root) {
-    const { format } = parseFormatFlags(argv);
+    const { format, rest } = parseFormatFlags(argv);
+    // R-7 · `list` was the one subcommand that threw its leftovers away, so
+    // `sessions list --dry-run` exited 0 and listed everything.
+    if (rest.length > 0) {
+        io.stderr(`mafdet sessions list: unexpected argument '${rest[0]}'\n${USAGE}`);
+        return ExitCode.Usage;
+    }
     const { sessions } = loadIndex(root);
     if (format === "json") {
         io.stdout(renderJson({
@@ -89,7 +95,12 @@ function list(argv, io, root) {
         { header: "REQUESTS", value: (s) => `${s.model_requests}` },
         {
             header: "EST. COST",
-            value: (s) => formatUsd(s.estimated_charge_micro_usd),
+            // R-6 · An unpriced session is not a free one. `$0.00` in the main
+            // column is the claim that matters; a note on stderr cannot correct
+            // a number the user has already read.
+            value: (s) => s.unpriced_requests
+                ? "unknown"
+                : formatUsd(s.estimated_charge_micro_usd),
         },
         { header: "UPDATED", value: (s) => s.updated_at },
     ]));
@@ -135,12 +146,20 @@ function show(argv, io, root) {
         ["model", safe(m.model_id, io)],
         ["workspace", safe(m.workspace, io)],
         ["mode", safe(m.mode, io)],
-        ["created", m.created_at],
-        ["updated", m.updated_at],
+        // R-4 · Timestamps come off disk like everything else here; a file that
+        // has been edited can carry a sequence in any field, not only the
+        // free-text ones.
+        ["created", safe(m.created_at, io)],
+        ["updated", safe(m.updated_at, io)],
         ["messages", `${m.message_count}`],
         ["model requests", `${m.model_requests}`],
         ["tokens", `${m.prompt_tokens} in / ${m.completion_tokens} out`],
-        ["estimated cost", formatUsd(m.estimated_charge_micro_usd)],
+        [
+            "estimated cost",
+            m.unpriced_requests
+                ? `${formatUsd(m.estimated_charge_micro_usd)} + ${m.unpriced_requests} unpriced`
+                : formatUsd(m.estimated_charge_micro_usd),
+        ],
     ]));
     if (session.truncatedTail) {
         // Worth saying plainly: the user should know a crash cost them the tail.
@@ -322,6 +341,8 @@ async function usage(argv, io, root) {
             completion_tokens: totals.completionTokens,
             // Strings, so no parser turns a charge into a float.
             estimated_charge_micro_usd: totals.estimatedMicroUsd.toString(),
+            // R-6 · Without this a consumer reads the total above as complete.
+            unpriced_requests: totals.unpricedRequests,
             settled_charge_micro_usd: totals.settledMicroUsd.toString(),
             by_settlement: totals.bySettlement,
             by_model: totals.byModel.map((m) => ({
@@ -330,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) }),
         }));
@@ -348,7 +374,12 @@ async function usage(argv, io, root) {
             `${totals.toolRuns}${totals.toolRunsRefused > 0 ? ` (${totals.toolRunsRefused} refused)` : ""}`,
         ],
         ["tokens", `${totals.promptTokens} in / ${totals.completionTokens} out`],
-        ["local estimate", formatUsd(totals.estimatedMicroUsd.toString())],
+        [
+            "local estimate",
+            totals.unpricedRequests > 0
+                ? `${formatUsd(totals.estimatedMicroUsd.toString())} + ${totals.unpricedRequests} unpriced`
+                : formatUsd(totals.estimatedMicroUsd.toString()),
+        ],
     ];
     if (totals.bySettlement.settled > 0) {
         rows.push([
@@ -366,11 +397,13 @@ async function usage(argv, io, root) {
     if (totals.byModel.length > 1) {
         io.stdout("\nBy model\n");
         io.stdout(renderTable(totals.byModel, [
-            { header: "MODEL", value: (m) => m.modelId },
+            { header: "MODEL", value: (m) => safe(m.modelId, io) },
             { 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()),
             },
         ]));
     }
@@ -378,11 +411,13 @@ async function usage(argv, io, root) {
         // Split per key so two accounts' spending is never presented as one.
         io.stdout("\nBy API key\n");
         io.stdout(renderTable(totals.byKey, [
-            { header: "KEY", value: (k) => k.apiKeyRef },
+            { header: "KEY", value: (k) => safe(k.apiKeyRef, io) },
             { 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/sessions/index-file.d.ts

@@ -7,6 +7,8 @@ export interface IndexEntry {
     readonly workspace: string;
     readonly model_requests: number;
     readonly estimated_charge_micro_usd: string;
+    /** R-6 · Requests the estimate above does not include; see F-012. */
+    readonly unpriced_requests?: number;
 }
 export interface SessionIndex {
     readonly schema_version: number;

package/dist/sessions/index-file.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index-file.d.ts","sourceRoot":"","sources":["../../src/sessions/index-file.ts"],"names":[],"mappings":"AAqBA,OAAO,EAIL,KAAK,eAAe,EACrB,MAAM,YAAY,CAAC;AAKpB,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,0BAA0B,EAAE,MAAM,CAAC;CAC7C;AAED,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,QAAQ,EAAE,SAAS,UAAU,EAAE,CAAC;CAC1C;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE9C;AAmBD;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,CAoBvD;AAED,oEAAoE;AACpE,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,GAAG,IAAI,CAiBlE;AAED;;;;;;GAMG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,CAapD;AAwBD,yEAAyE;AACzE,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,eAAe,GACxB,YAAY,CAUd;AAED,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,MAAM,GAChB,YAAY,CAed;AAED,8EAA8E;AAC9E,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAkBnD"}
+{"version":3,"file":"index-file.d.ts","sourceRoot":"","sources":["../../src/sessions/index-file.ts"],"names":[],"mappings":"AAqBA,OAAO,EAIL,KAAK,eAAe,EACrB,MAAM,YAAY,CAAC;AAKpB,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,0BAA0B,EAAE,MAAM,CAAC;IAC5C,qEAAqE;IACrE,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC;CACrC;AAED,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,QAAQ,EAAE,SAAS,UAAU,EAAE,CAAC;CAC1C;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE9C;AAsBD;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,CAoBvD;AAED,oEAAoE;AACpE,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,GAAG,IAAI,CAiBlE;AAED;;;;;;GAMG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,CAapD;AAwBD,yEAAyE;AACzE,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,eAAe,GACxB,YAAY,CAUd;AAED,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,MAAM,GAChB,YAAY,CAed;AAED,8EAA8E;AAC9E,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAkBnD"}

package/dist/sessions/index-file.js

@@ -25,6 +25,9 @@ function entryOf(metadata) {
         workspace: metadata.workspace,
         model_requests: metadata.model_requests,
         estimated_charge_micro_usd: metadata.estimated_charge_micro_usd,
+        ...(metadata.unpriced_requests
+            ? { unpriced_requests: metadata.unpriced_requests }
+            : {}),
     };
 }
 /** Newest first, which is the order a session list wants. */

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

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

package/dist/sessions/open.js

@@ -6,6 +6,7 @@
 // and the checks are all re-derived from the key in use *now*, never from
 // what the session was recorded with.
 import { existsSync } from "node:fs";
+import { stripAnsi } from "../agent/command-policy.js";
 import { acquireSessionLock, SessionLockedError, } from "./lock.js";
 import { describeBlocker, permissionsForResume, rebuildContext, resumeBlockers, } from "./resume.js";
 import { InvalidSessionIdError, resolveSessionDirectory, } from "./session-id.js";
@@ -102,8 +103,9 @@ export function openForResume(input) {
  * know that will be surprised by the bill rather than by the feature.
  */
 export function describeResume(result) {
+    // R-4 · Title and model come off disk and this is drawn on a terminal.
     const lines = [
-        `resuming "${result.metadata.title}" (${result.metadata.model_id})`,
+        `resuming "${stripAnsi(result.metadata.title)}" (${stripAnsi(result.metadata.model_id)})`,
     ];
     if (result.toolRunsSummarised > 0) {
         lines.push(`  ${result.toolRunsSummarised} earlier tool run(s) are summarised, not repeated`);

package/dist/sessions/resume.d.ts

@@ -50,6 +50,7 @@ export interface ResumeCheckInput {
  * with a key that could call a model says nothing about whether this key can.
  */
 export declare function resumeBlockers(input: ResumeCheckInput): readonly ResumeBlocker[];
+/** R-4 · The values quoted here are recorded ones, and this is shown on a terminal. */
 export declare function describeBlocker(blocker: ResumeBlocker): string;
 /**
  * What a resumed run starts with, stated so the caller cannot forget.

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

@@ -1 +1 @@
-{"version":3,"file":"resume.d.ts","sourceRoot":"","sources":["../../src/sessions/resume.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,MAAM,EAAE,SAAS,WAAW,EAAE,CAAC;IACxC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,6EAA6E;IAC7E,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;CAC/B;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,QAAQ,EAAE,WAAW,EAAE,CAAC;IACjC,4EAA4E;IAC5E,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,wEAAwE;IACxE,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;CACrC;AAID;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,YAAY,GAAG,cAAc,CAwClE;AAED,MAAM,MAAM,aAAa,GACrB;IAAE,QAAQ,CAAC,IAAI,EAAE,mBAAmB,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAChE;IAAE,QAAQ,CAAC,IAAI,EAAE,yBAAyB,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GACtE;IAAE,QAAQ,CAAC,IAAI,EAAE,mBAAmB,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC;AAEvE,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,6CAA6C;IAC7C,QAAQ,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,8CAA8C;IAC9C,QAAQ,CAAC,YAAY,EAAE,SAAS,MAAM,EAAE,CAAC;IACzC,QAAQ,CAAC,eAAe,EAAE,OAAO,CAAC;IAClC,4EAA4E;IAC5E,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;CAC5B;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAC5B,KAAK,EAAE,gBAAgB,GACtB,SAAS,aAAa,EAAE,CAa1B;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,aAAa,GAAG,MAAM,CAS9D;AAED;;;;;;GAMG;AACH,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,eAAe,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5C,QAAQ,CAAC,cAAc,EAAE,KAAK,CAAC;CAChC;AAED,wBAAgB,oBAAoB,CAClC,eAAe,EAAE,SAAS,MAAM,EAAE,GACjC,kBAAkB,CAQpB"}
+{"version":3,"file":"resume.d.ts","sourceRoot":"","sources":["../../src/sessions/resume.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,MAAM,EAAE,SAAS,WAAW,EAAE,CAAC;IACxC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,6EAA6E;IAC7E,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;CAC/B;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,QAAQ,EAAE,WAAW,EAAE,CAAC;IACjC,4EAA4E;IAC5E,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,wEAAwE;IACxE,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;CACrC;AAID;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,YAAY,GAAG,cAAc,CAwClE;AAED,MAAM,MAAM,aAAa,GACrB;IAAE,QAAQ,CAAC,IAAI,EAAE,mBAAmB,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAChE;IAAE,QAAQ,CAAC,IAAI,EAAE,yBAAyB,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GACtE;IAAE,QAAQ,CAAC,IAAI,EAAE,mBAAmB,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC;AAEvE,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,6CAA6C;IAC7C,QAAQ,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,8CAA8C;IAC9C,QAAQ,CAAC,YAAY,EAAE,SAAS,MAAM,EAAE,CAAC;IACzC,QAAQ,CAAC,eAAe,EAAE,OAAO,CAAC;IAClC,4EAA4E;IAC5E,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;CAC5B;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAC5B,KAAK,EAAE,gBAAgB,GACtB,SAAS,aAAa,EAAE,CAa1B;AAED,uFAAuF;AACvF,wBAAgB,eAAe,CAAC,OAAO,EAAE,aAAa,GAAG,MAAM,CAS9D;AAED;;;;;;GAMG;AACH,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,eAAe,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5C,QAAQ,CAAC,cAAc,EAAE,KAAK,CAAC;CAChC;AAED,wBAAgB,oBAAoB,CAClC,eAAe,EAAE,SAAS,MAAM,EAAE,GACjC,kBAAkB,CAQpB"}

package/dist/sessions/resume.js

@@ -9,6 +9,7 @@
 // what was said. A replayed `tool_calls` block would invite the model to
 // continue a plan the user approved yesterday, in a workspace that has since
 // changed, with permissions this run may not have.
+import { stripAnsi } from "../agent/command-policy.js";
 const DEFAULT_MAX_MESSAGES = 40;
 /**
  * Rebuild the messages to send, from what was stored.
@@ -79,14 +80,15 @@ export function resumeBlockers(input) {
     }
     return blockers;
 }
+/** R-4 · The values quoted here are recorded ones, and this is shown on a terminal. */
 export function describeBlocker(blocker) {
     switch (blocker.kind) {
         case "model-unavailable":
-            return `${blocker.modelId} is not callable with the key you are using now - choose another model to continue`;
+            return `${stripAnsi(blocker.modelId)} is not callable with the key you are using now - choose another model to continue`;
         case "model-not-agent-capable":
-            return `${blocker.modelId} has no verified tool calling now, so the agent cannot drive it - choose another model`;
+            return `${stripAnsi(blocker.modelId)} has no verified tool calling now, so the agent cannot drive it - choose another model`;
         case "workspace-missing":
-            return `${blocker.workspace} no longer exists - you can read this conversation, or continue it in another directory`;
+            return `${stripAnsi(blocker.workspace)} no longer exists - you can read this conversation, or continue it in another directory`;
     }
 }
 export function permissionsForResume(declaredThisRun) {

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,CA4EzB;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"}