@mafdet/cli 0.4.2 → 0.4.4

package/dist/output/format.js

@@ -1,7 +1,5 @@
-/**
- * Rendering for query commands. Three shapes, one rule: stdout carries the
- * result and nothing else, so `mafdet ... --json | jq` is always valid.
- */
+import { ApiError } from "../api/errors.js";
+import { ExitCode } from "./exit-codes.js";
 /** `--json` and `--plain` are mutually exclusive; table is the default. */
 export function parseFormatFlags(argv) {
     const rest = [];
@@ -10,7 +8,14 @@ export function parseFormatFlags(argv) {
     for (const arg of argv) {
         if (arg === "--json" || arg === "--plain") {
             if (chosen && chosen !== arg) {
-                throw new Error(`${chosen} and ${arg} cannot be combined`);
+                // F-013 · A typed error, so the command surface turns this into a
+                // usage message and exit 2. A bare Error escaped to the top level and
+                // printed a Node stack trace at the user.
+                throw new ApiError({
+                    kind: "request",
+                    exitCode: ExitCode.Usage,
+                    message: `${chosen} and ${arg} cannot be combined`,
+                });
             }
             chosen = arg;
             format = arg === "--json" ? "json" : "plain";

package/dist/output/terminal-safe.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Make untrusted text safe to print, when and only when a terminal will read
+ * it.
+ *
+ * `isTty` is passed in rather than read from `process.stdout` so that the
+ * decision is testable and so a caller writing somewhere else cannot get the
+ * wrong answer by accident.
+ */
+export declare function safeForTerminal(text: string, isTty: boolean): string;
+/** Wrap a writer so everything through it is sanitised for a terminal. */
+export declare function terminalSafeWriter(write: (text: string) => void, isTty: boolean): (text: string) => void;
+//# sourceMappingURL=terminal-safe.d.ts.map

package/dist/output/terminal-safe.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"terminal-safe.d.ts","sourceRoot":"","sources":["../../src/output/terminal-safe.ts"],"names":[],"mappings":"AAuBA;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,CAEpE;AAED,0EAA0E;AAC1E,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,EAC7B,KAAK,EAAE,OAAO,GACb,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAGxB"}

package/dist/output/terminal-safe.js

@@ -0,0 +1,38 @@
+// F-010 · Text we did not write, on its way to a terminal.
+//
+// Control sequences were already stripped from file contents, command output,
+// tool cards and diff previews. Three sources were not covered, and they are
+// the ones a remote party controls most directly:
+//
+//   - the model's own reply, streamed straight to stdout;
+//   - a session's title, workspace and model id, rendered into tables and
+//     pickers - a transcript is a file, and files can be edited;
+//   - anything else read back out of the local store.
+//
+// An OSC sequence retitles the window, a CSI can clear the screen or move the
+// cursor to overwrite what came before, and either makes the terminal show
+// something other than what happened.
+//
+// The rule is deliberately about the *destination*, not the source: escapes
+// only do damage when something interprets them. Stripping on the way to a
+// pipe or a file would corrupt `mafdet chat > answer.txt` and any JSON a
+// script parses, for no safety gain - a byte in a file is inert until it is
+// cat'd, and at that point it is that terminal's problem, not a hole we made.
+import { stripAnsi } from "../agent/command-policy.js";
+/**
+ * Make untrusted text safe to print, when and only when a terminal will read
+ * it.
+ *
+ * `isTty` is passed in rather than read from `process.stdout` so that the
+ * decision is testable and so a caller writing somewhere else cannot get the
+ * wrong answer by accident.
+ */
+export function safeForTerminal(text, isTty) {
+    return isTty ? stripAnsi(text) : text;
+}
+/** Wrap a writer so everything through it is sanitised for a terminal. */
+export function terminalSafeWriter(write, isTty) {
+    if (!isTty)
+        return write;
+    return (text) => write(stripAnsi(text));
+}

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;AACrB,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,CA4DnE;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":"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"}

package/dist/sessions/open.js

@@ -6,12 +6,24 @@
 // 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 { join } from "node:path";
 import { acquireSessionLock, SessionLockedError, } from "./lock.js";
 import { describeBlocker, permissionsForResume, rebuildContext, resumeBlockers, } from "./resume.js";
+import { InvalidSessionIdError, resolveSessionDirectory, } from "./session-id.js";
 import { SessionWriter, readSession } from "./store.js";
 export function openForResume(input) {
-    const directory = join(input.root, input.sessionId);
+    // F-001 · Through the same boundary as the `sessions` subcommands. This is
+    // the write path: before the check, `--resume ../../../x` opened a directory
+    // outside the store and appended to it.
+    let directory;
+    try {
+        directory = resolveSessionDirectory(input.root, input.sessionId);
+    }
+    catch (error) {
+        if (error instanceof InvalidSessionIdError) {
+            return { kind: "unreadable", reason: error.message };
+        }
+        throw error;
+    }
     if (!existsSync(directory))
         return { kind: "missing" };
     let session;
@@ -24,6 +36,18 @@ export function openForResume(input) {
             reason: error instanceof Error ? error.message : String(error),
         };
     }
+    // F-016 · Continuing a conversation with a hole in it sends the model a
+    // history that is missing pieces, and it has no way to know. Reading it is
+    // fine; carrying on from it needs to be a decision, not a default.
+    if (session.corruptLines.length > 0) {
+        return {
+            kind: "unreadable",
+            reason: `${session.corruptLines.length} unreadable line(s) in this transcript ` +
+                `(line ${session.corruptLines.join(", ")}) - part of the conversation ` +
+                `is missing, so continuing it would send the model an incomplete ` +
+                `history. 'mafdet sessions show' still reads what survived.`,
+        };
+    }
     // Taken before anything is written, so two processes cannot interleave into
     // one transcript.
     let lock;

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

@@ -1 +1 @@
-{"version":3,"file":"recorder.d.ts","sourceRoot":"","sources":["../../src/sessions/recorder.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD,OAAO,EAAE,aAAa,EAAqB,MAAM,YAAY,CAAC;AAE9D,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC;IAC/B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB;;;OAGG;IACH,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,2DAA2D;IAC3D,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CAChD;AAED;;;;;GAKG;AACH,qBAAa,eAAe;IAId,OAAO,CAAC,QAAQ,CAAC,OAAO;IAHpC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,KAAK,CAAS;gBAEO,OAAO,EAAE,eAAe;IAErD,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,wEAAwE;IACxE,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAIxB,OAAO,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAoDhC,sEAAsE;IACtE,UAAU,IAAI,IAAI;IAUlB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAU7B,KAAK,IAAI,IAAI;IASb,OAAO,CAAC,KAAK;IAUb;;;;;OAKG;IACH,OAAO,CAAC,IAAI;CAOb"}
+{"version":3,"file":"recorder.d.ts","sourceRoot":"","sources":["../../src/sessions/recorder.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD,OAAO,EAAE,aAAa,EAAqB,MAAM,YAAY,CAAC;AAE9D,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC;IAC/B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB;;;OAGG;IACH,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,2DAA2D;IAC3D,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CAChD;AAED;;;;;GAKG;AACH,qBAAa,eAAe;IAId,OAAO,CAAC,QAAQ,CAAC,OAAO;IAHpC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,KAAK,CAAS;gBAEO,OAAO,EAAE,eAAe;IAErD,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,wEAAwE;IACxE,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAIxB,OAAO,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAyDhC,sEAAsE;IACtE,UAAU,IAAI,IAAI;IAUlB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAU7B,KAAK,IAAI,IAAI;IASb,OAAO,CAAC,KAAK;IAUb;;;;;OAKG;IACH,OAAO,CAAC,IAAI;CAOb"}

package/dist/sessions/recorder.js

@@ -71,7 +71,12 @@ export class SessionRecorder {
                 model_id: event.model,
                 prompt_tokens: event.promptTokens,
                 completion_tokens: event.completionTokens,
-                estimated_charge_micro_usd: event.costMicroUsd.toString(),
+                // F-012 · The loop reports 0 when the catalogue had no price for the
+                // model, which is indistinguishable from a genuinely free request.
+                // `priced` says which it was, so an unknown is recorded as unknown.
+                ...(event.priced === false
+                    ? {}
+                    : { estimated_charge_micro_usd: event.costMicroUsd.toString() }),
                 ...(this.options.apiKeyRef === undefined
                     ? {}
                     : { api_key_ref: this.options.apiKeyRef }),

package/dist/sessions/session-id.d.ts

@@ -0,0 +1,16 @@
+export declare class InvalidSessionIdError extends Error {
+}
+/**
+ * Is this a plain directory name, rather than a path?
+ *
+ * Exported for tests and for anywhere that wants to check without resolving.
+ */
+export declare function isPlainSessionId(id: string): boolean;
+/**
+ * The directory for a session id, or a refusal.
+ *
+ * @throws InvalidSessionIdError when the id is not a bare name, or when the
+ * path it produces would land outside `root`.
+ */
+export declare function resolveSessionDirectory(root: string, id: string): string;
+//# sourceMappingURL=session-id.d.ts.map

package/dist/sessions/session-id.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-id.d.ts","sourceRoot":"","sources":["../../src/sessions/session-id.ts"],"names":[],"mappings":"AA6BA,qBAAa,qBAAsB,SAAQ,KAAK;CAAG;AAOnD;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAOpD;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,CAkBxE"}

package/dist/sessions/session-id.js

@@ -0,0 +1,93 @@
+// F-001 · The one place a session id becomes a path.
+//
+// Every `sessions` subcommand and `--resume` used to do `join(root, id)` with
+// whatever the user typed. `join` resolves `..`, so an id of `../../../x`
+// pointed outside the store: `show` and `usage` read it, `--resume` appended
+// to it, and `delete --yes` unlinked its files and removed the directory.
+// That last one shipped in 0.3.0 and was a local destructive defect, not a
+// theoretical one - it was reproduced before this was written.
+//
+// The fix is one function that every caller must go through, and two
+// independent checks inside it:
+//
+//   1. Reject anything that is not a bare name. A session id is a directory
+//      name and nothing else - no separator, no `.` or `..`, no NUL, not
+//      absolute, not a Windows drive or UNC path.
+//   2. Resolve it anyway and require the result to be inside the root. The
+//      first check should already be sufficient; this one is what holds if it
+//      ever is not, and it is the check that also copes with a root reached
+//      through a symlink.
+//
+// Deliberately NOT a `^ses_[0-9a-z]{19}$` format match. That would be tighter
+// against this attack and worse overall: it breaks ids from a future
+// generator, and it turns "no session called that" - the common typo - into a
+// format error. Containment is the property that actually matters, so
+// containment is what is enforced.
+import { realpathSync } from "node:fs";
+import { isAbsolute, join, relative, resolve, sep } from "node:path";
+export class InvalidSessionIdError extends Error {
+}
+/** Separators on either platform, plus the ones a Windows path can carry. */
+const SEPARATORS = /[/\\]/;
+/** `C:` or `\\server\share`, which are absolute even where isAbsolute is not. */
+const WINDOWS_ROOTED = /^(?:[A-Za-z]:|\\\\)/;
+/**
+ * Is this a plain directory name, rather than a path?
+ *
+ * Exported for tests and for anywhere that wants to check without resolving.
+ */
+export function isPlainSessionId(id) {
+    if (id.length === 0)
+        return false;
+    if (id.includes("\0"))
+        return false;
+    if (SEPARATORS.test(id))
+        return false;
+    if (id === "." || id === "..")
+        return false;
+    if (isAbsolute(id) || WINDOWS_ROOTED.test(id))
+        return false;
+    return true;
+}
+/**
+ * The directory for a session id, or a refusal.
+ *
+ * @throws InvalidSessionIdError when the id is not a bare name, or when the
+ * path it produces would land outside `root`.
+ */
+export function resolveSessionDirectory(root, id) {
+    if (!isPlainSessionId(id)) {
+        throw new InvalidSessionIdError(`'${id}' is not a session id. Session ids are plain names like ` +
+            `ses_0msod7qr3y83x5k7t7t; run 'mafdet sessions list' to see them.`);
+    }
+    const directory = join(root, id);
+    if (!isInside(root, directory)) {
+        // Unreachable given the check above, and kept anyway: this is the check
+        // that states the actual property, and the one a future caller that
+        // bypasses `isPlainSessionId` would still hit.
+        throw new InvalidSessionIdError(`'${id}' would resolve outside the sessions directory`);
+    }
+    return directory;
+}
+/**
+ * Containment against the real path of the root, so a symlinked state
+ * directory - `XDG_STATE_HOME` pointing through one is ordinary - does not
+ * make an inside path look outside.
+ */
+function isInside(root, candidate) {
+    const realRoot = realOrSelf(root);
+    const rel = relative(realRoot, realOrSelf(candidate));
+    if (rel === "")
+        return true;
+    return !rel.startsWith(`..${sep}`) && rel !== ".." && !isAbsolute(rel);
+}
+function realOrSelf(path) {
+    try {
+        return realpathSync(resolve(path));
+    }
+    catch {
+        // Not created yet - a fresh machine has no sessions directory, and the
+        // lexical form is still the right thing to compare.
+        return resolve(path);
+    }
+}

package/dist/sessions/store.d.ts

@@ -25,7 +25,15 @@ export type SessionEvent = {
     readonly model_id: string;
     readonly prompt_tokens: number;
     readonly completion_tokens: number;
-    readonly estimated_charge_micro_usd: string;
+    /**
+     * F-012 · Integer micro-USD, or absent when we could not price it.
+     *
+     * Absent and "0" are different claims: one is "we do not know", the
+     * other is "it was free". Writing 0 for an unpriced request - a
+     * catalogue that was briefly unreachable, or a model the catalogue does
+     * not list - made an unknown look like a gift.
+     */
+    readonly estimated_charge_micro_usd?: string;
     readonly settlement_status: "pending" | "settled" | "unknown";
     /**
      * Which key paid, as an irreversible digest. Plan §20.3 requires
@@ -69,6 +77,8 @@ export interface SessionMetadata {
     prompt_tokens: number;
     completion_tokens: number;
     estimated_charge_micro_usd: string;
+    /** F-012 · How many requests the estimate above does not include. */
+    unpriced_requests?: number;
 }
 export declare class SessionStoreError extends Error {
 }
@@ -126,6 +136,16 @@ export interface ReadSession {
     readonly events: readonly StoredEvent[];
     /** Set when the last line was incomplete, which a crash mid-append leaves. */
     readonly truncatedTail: boolean;
+    /**
+     * F-016 · Line numbers, 1-based, that could not be parsed - not counting the
+     * truncated tail above, which has its own well-understood cause.
+     *
+     * A damaged line in the *middle* of a file is a different thing entirely: it
+     * means disk corruption or interleaved writes, and history is missing from
+     * the middle of the record. Skipping those in silence let `sessions show`
+     * and resume present an incomplete conversation as a complete one.
+     */
+    readonly corruptLines: readonly number[];
 }
 /**
  * Read a session back.
@@ -137,5 +157,24 @@ export interface ReadSession {
 export declare function readSession(directory: string): ReadSession;
 /** Session directories present on disk, newest first by mtime of metadata. */
 export declare function listSessionDirectories(root: string): string[];
-export declare function deleteSession(directory: string): void;
+/**
+ * F-002 · What actually happened when a session was deleted.
+ *
+ * The previous version swallowed every `unlink`/`rmdir` failure and returned
+ * nothing, so the caller printed "deleted <id>" whether or not anything went.
+ * A read-only file, a permission problem or another process holding the
+ * directory all produced a cheerful success and a session still on disk.
+ *
+ * Errors are still not thrown - a partial delete should report what is left,
+ * not abort halfway - but they are now returned, and `removed` is the truth.
+ */
+export interface DeleteResult {
+    readonly removed: boolean;
+    /** Paths that could not be removed, with the reason. */
+    readonly failures: readonly {
+        path: string;
+        reason: string;
+    }[];
+}
+export declare function deleteSession(directory: string): DeleteResult;
 //# sourceMappingURL=store.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../../src/sessions/store.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../../src/sessions/store.ts"],"names":[],"mappings":"AA8BA,eAAO,MAAM,cAAc,IAAI,CAAC;AAMhC,MAAM,MAAM,YAAY,GACpB;IAAE,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAC3D;IAAE,QAAQ,CAAC,IAAI,EAAE,mBAAmB,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAChE;IACE,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;CAC7B,GACD;IACE,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B,GACD;IACE,yEAAyE;IACzE,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAC9B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B,GACD;IACE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;IACnC;;;;;;;OAOG;IACH,QAAQ,CAAC,0BAA0B,CAAC,EAAE,MAAM,CAAC;IAC7C,QAAQ,CAAC,iBAAiB,EAAE,SAAS,GAAG,SAAS,GAAG,SAAS,CAAC;IAC9D;;;;OAIG;IACH,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;CAC/B,GACD;IACE;;;;;;;;OAQG;IACH,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC;IAC5B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,wBAAwB,EAAE,MAAM,CAAC;IAC1C,6DAA6D;IAC7D,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEN,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACjC;AAED,MAAM,WAAW,eAAe;IAC9B,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,0BAA0B,EAAE,MAAM,CAAC;IACnC,qEAAqE;IACrE,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,qBAAa,iBAAkB,SAAQ,KAAK;CAAG;AAE/C,+EAA+E;AAC/E,wBAAgB,YAAY,CAAC,GAAG,GAAE,MAAmB,GAAG,MAAM,CAS7D;AA2BD,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,IAAI,CAAC;CAC3B;AAED;;;;;GAKG;AACH,qBAAa,aAAa;IAKtB,QAAQ,CAAC,SAAS,EAAE,MAAM;IAC1B,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,QAAQ,CAAC,GAAG;IANtB,OAAO,CAAC,GAAG,CAAK;IAChB,OAAO,CAAC,MAAM,CAAS;IAEvB,OAAO;IAMP,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,WAAW,GAAG,aAAa;IA8BlD;;;;;;OAMG;IACH,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,IAAI,GAAG,aAAa;IAejE,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,IAAI,QAAQ,IAAI,QAAQ,CAAC,eAAe,CAAC,CAExC;IAED;;;;;;OAMG;IACH,MAAM,CAAC,KAAK,EAAE,YAAY,GAAG,WAAW;IAiBxC,OAAO,CAAC,KAAK;IA8Bb,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAM7B,KAAK,IAAI,IAAI;IAIb,4EAA4E;IAC5E,OAAO,CAAC,aAAa;CAiBtB;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC;IACnC,QAAQ,CAAC,MAAM,EAAE,SAAS,WAAW,EAAE,CAAC;IACxC,8EAA8E;IAC9E,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;IAChC;;;;;;;;OAQG;IACH,QAAQ,CAAC,YAAY,EAAE,SAAS,MAAM,EAAE,CAAC;CAC1C;AAED;;;;;;GAMG;AACH,wBAAgB,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,WAAW,CA4C1D;AAED,8EAA8E;AAC9E,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAW7D;AAED;;;;;;;;;;GAUG;AACH,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,wDAAwD;IACxD,QAAQ,CAAC,QAAQ,EAAE,SAAS;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAChE;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,YAAY,CAqC7D"}

package/dist/sessions/store.js

@@ -11,7 +11,7 @@
 //   - Nothing written here may carry a credential. Everything goes through
 //     `redact()` on the way to disk - the forbidden list in §20.5 covers what
 //     the CLI holds, not a password the user typed into a prompt.
-import { appendFileSync, lstatSync, mkdirSync, readFileSync, readdirSync, renameSync, rmdirSync, unlinkSync, writeFileSync, } from "node:fs";
+import { appendFileSync, existsSync, lstatSync, mkdirSync, readFileSync, readdirSync, renameSync, rmdirSync, unlinkSync, writeFileSync, } from "node:fs";
 import { join } from "node:path";
 import { redactDeep } from "../security/redact.js";
 export const SCHEMA_VERSION = 1;
@@ -150,8 +150,16 @@ export class SessionWriter {
             this.meta.prompt_tokens += event.prompt_tokens;
             this.meta.completion_tokens += event.completion_tokens;
             // Money stays integral: strings in, BigInt to add, string out.
-            this.meta.estimated_charge_micro_usd = (BigInt(this.meta.estimated_charge_micro_usd) +
-                BigInt(event.estimated_charge_micro_usd)).toString();
+            // F-012 · An unpriced request adds nothing rather than adding zero, and
+            // the count below records that the total is short - so a reader can see
+            // the difference between "free" and "we could not work it out".
+            if (event.estimated_charge_micro_usd === undefined) {
+                this.meta.unpriced_requests = (this.meta.unpriced_requests ?? 0) + 1;
+            }
+            else {
+                this.meta.estimated_charge_micro_usd = (BigInt(this.meta.estimated_charge_micro_usd) +
+                    BigInt(event.estimated_charge_micro_usd)).toString();
+            }
         }
         this.meta.updated_at = this.now().toISOString();
         this.writeMetadata();
@@ -212,23 +220,27 @@ export function readSession(directory) {
         raw = readFileSync(join(directory, "events.jsonl"), "utf8");
     }
     catch {
-        return { metadata, events: [], truncatedTail: false };
+        return { metadata, events: [], truncatedTail: false, corruptLines: [] };
     }
     const lines = raw.split("\n");
     const trailing = lines.pop();
     const truncatedTail = trailing !== undefined && trailing.length > 0;
     const events = [];
-    for (const line of lines) {
+    const corruptLines = [];
+    for (const [index, line] of lines.entries()) {
         if (line.length === 0)
             continue;
         try {
             events.push(JSON.parse(line));
         }
         catch {
-            // One unreadable line does not invalidate the rest of the transcript.
+            // One unreadable line does not invalidate the rest of the transcript,
+            // but it is reported: the reader is entitled to know the record has a
+            // hole in it before deciding to continue the conversation.
+            corruptLines.push(index + 1);
         }
     }
-    return { metadata, events, truncatedTail };
+    return { metadata, events, truncatedTail, corruptLines };
 }
 /** Session directories present on disk, newest first by mtime of metadata. */
 export function listSessionDirectories(root) {
@@ -246,27 +258,39 @@ export function listSessionDirectories(root) {
 }
 export function deleteSession(directory) {
     assertNotLink(directory);
-    for (const name of ["events.jsonl", "metadata.json"]) {
+    const failures = [];
+    const remove = (path, unlink) => {
         try {
-            unlinkSync(join(directory, name));
+            unlink(path);
         }
-        catch {
-            // Already gone.
+        catch (error) {
+            const code = error.code;
+            // Already gone is the goal, not a failure.
+            if (code === "ENOENT")
+                return;
+            failures.push({
+                path,
+                reason: error instanceof Error ? error.message : String(error),
+            });
         }
-    }
+    };
+    let entries = [];
     try {
-        // Anything else in there (a stale temp file) goes too, then the directory.
-        for (const entry of readdirSync(directory)) {
-            unlinkSync(join(directory, entry));
-        }
+        entries = readdirSync(directory);
     }
-    catch {
-        // Nothing left to remove.
-    }
-    try {
-        rmdirSync(directory);
-    }
-    catch {
-        // Leave it; listing filters on metadata anyway.
+    catch (error) {
+        const code = error.code;
+        if (code !== "ENOENT") {
+            failures.push({
+                path: directory,
+                reason: error instanceof Error ? error.message : String(error),
+            });
+        }
     }
+    for (const entry of entries)
+        remove(join(directory, entry), unlinkSync);
+    remove(directory, rmdirSync);
+    // The only claim worth making: is it actually gone?
+    const removed = !existsSync(directory);
+    return { removed, failures };
 }

package/dist/sessions/usage.d.ts

@@ -2,6 +2,12 @@ import type { StoredEvent } from "./store.js";
 export type SettlementStatus = "settled" | "pending" | "unknown";
 export interface UsageTotals {
     readonly modelRequests: number;
+    /**
+     * F-012 · Requests whose local estimate could not be computed. Counted so a
+     * caller can say the estimate is partial instead of presenting a total that
+     * quietly omits them.
+     */
+    readonly unpricedRequests: number;
     readonly promptTokens: number;
     readonly completionTokens: number;
     readonly estimatedMicroUsd: bigint;

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

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

package/dist/sessions/usage.js

@@ -14,6 +14,7 @@
 // final charge.
 const ZERO = {
     modelRequests: 0,
+    unpricedRequests: 0,
     promptTokens: 0,
     completionTokens: 0,
     estimatedMicroUsd: 0n,
@@ -42,6 +43,8 @@ function add(base, event, settledMicro) {
     const status = statusOf(event, settledMicro !== undefined);
     return {
         modelRequests: base.modelRequests + 1,
+        unpricedRequests: base.unpricedRequests +
+            (isPriced(event.estimated_charge_micro_usd) ? 0 : 1),
         promptTokens: base.promptTokens + count(event.prompt_tokens),
         completionTokens: base.completionTokens + count(event.completion_tokens),
         estimatedMicroUsd: base.estimatedMicroUsd + micro(event.estimated_charge_micro_usd),
@@ -76,6 +79,10 @@ function settlementsIn(events) {
 function count(value) {
     return typeof value === "number" && Number.isFinite(value) ? value : 0;
 }
+/** Was this request priced at all? Absent is not the same as zero. */
+function isPriced(value) {
+    return typeof value === "string" && /^-?\d+$/.test(value);
+}
 /** Money is integral end to end; a malformed figure counts as zero, not NaN. */
 function micro(value) {
     if (typeof value !== "string" || !/^-?\d+$/.test(value))
@@ -151,7 +158,11 @@ export function settledCaveat(totals) {
         parts.push(`${pending} not settled yet`);
     if (unknown > 0)
         parts.push(`${unknown} with no request id, so unknowable`);
+    if (totals.unpricedRequests > 0) {
+        parts.push(`${totals.unpricedRequests} could not be priced locally, so the estimate is short`);
+    }
     if (parts.length === 0)
         return undefined;
-    return `${parts.join(", ")}; the estimate covers all ${totals.modelRequests}`;
+    const covered = totals.modelRequests - totals.unpricedRequests;
+    return `${parts.join(", ")}; the estimate covers ${covered} of ${totals.modelRequests}`;
 }

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;AAEhE,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,CA8DzB;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,CA4EzB;AAED,wBAAgB,aAAa,CAC3B,OAAO,EAAE,cAAc,EACvB,YAAY,EAAE,oBAAoB,GACjC,MAAM,CAgBR"}

package/dist/tui/agent-surface.js

@@ -10,6 +10,7 @@ import { formatUsd } from "../output/money.js";
 import { tuiApprover } from "./approval.js";
 import { palette } from "./theme.js";
 import { renderCard, ToolCardLog } from "./tool-card.js";
+import { stripAnsi } from "../agent/command-policy.js";
 /**
  * Read one line of a goal or slash command.
  *
@@ -67,13 +68,23 @@ export async function runAgentSurface(options) {
             // when someone is deciding whether to press Ctrl+C.
             options.stdout.write(dim(`  rate limited - waiting ${Math.round(event.waitMs / 1000)}s\n`));
         }
+        if (event.type === "compacted") {
+            // Said out loud: from here the model can no longer see those results,
+            // which is the sort of thing that otherwise looks like it forgot.
+            // The saved transcript still has them - only what we send got shorter.
+            options.stdout.write(dim(`  context near the limit (${event.promptTokens} tokens) - dropped ` +
+                `${event.exchanges} earlier tool exchange(s) from what is sent\n`));
+        }
     };
     const sessionOptions = {
         ...options.session,
-        stdout: (text) => void options.stdout.write(text),
+        // F-010 · The model's reply passes through here. The TUI is a terminal by
+        // construction, so an OSC or CSI in the answer would be executed rather
+        // than shown - retitling the window or clearing what came before.
+        stdout: (text) => void options.stdout.write(stripAnsi(text)),
         // The line session sends progress to stderr so it survives redirection.
         // Here everything is on one terminal, so it goes to the same place.
-        stderr: (text) => void options.stdout.write(dim(text)),
+        stderr: (text) => void options.stdout.write(dim(stripAnsi(text))),
         approver: tuiApprover(io),
         readLine: async () => {
             // Checkpoint between goals rather than per event: the listing only needs

package/dist/tui/app.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../src/tui/app.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAaxD,OAAO,EAAwB,KAAK,SAAS,EAAE,MAAM,eAAe,CAAC;AAcrE,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE;QAAE,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IAClD,QAAQ,CAAC,MAAM,EAAE;QAAE,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IAClD,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,UAAU,GAAG;QAAE,KAAK,CAAC,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;IACzE,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC;IAC3D,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAC9B,wEAAwE;IACxE,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;CAClC;AAED,wBAAsB,MAAM,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC,CAiJnE"}
+{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../src/tui/app.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAcxD,OAAO,EAAwB,KAAK,SAAS,EAAE,MAAM,eAAe,CAAC;AAiBrE,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE;QAAE,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IAClD,QAAQ,CAAC,MAAM,EAAE;QAAE,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IAClD,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,UAAU,GAAG;QAAE,KAAK,CAAC,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;IACzE,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC;IAC3D,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAC9B,wEAAwE;IACxE,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;CAClC;AAED,wBAAsB,MAAM,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC,CAgKnE"}