@mafdet/cli 0.4.0 → 0.4.2

package/dist/sessions/usage.js

@@ -0,0 +1,157 @@
+// CLI-025 · Adding up what a session used.
+//
+// This module does arithmetic and nothing else. In particular it never prices
+// anything: it sums the `estimated_charge_micro_usd` each request already
+// recorded, which the agent loop computed with the gateway's own arithmetic.
+// A second price implementation here would drift from the first one, and the
+// first one is the one that was reconciled against the ledger.
+//
+// The four states in §20.7 are the other half. `estimated` is what we worked
+// out locally; `settled` is what the server's ledger says; `pending` means the
+// answer exists but has not been fetched; `unknown` means we never got a
+// request id and so can never ask. They are counted separately because
+// collapsing them would let a display show an estimate as though it were the
+// final charge.
+const ZERO = {
+    modelRequests: 0,
+    promptTokens: 0,
+    completionTokens: 0,
+    estimatedMicroUsd: 0n,
+    settledMicroUsd: 0n,
+    bySettlement: { settled: 0, pending: 0, unknown: 0 },
+};
+/**
+ * A request with no id can never be reconciled, whatever it says.
+ *
+ * CLI-001 found that a cancelled or timed-out request may not return one, and
+ * calling such a request `pending` would promise an answer that will never
+ * arrive.
+ *
+ * Note what is *not* consulted: the `settlement_status` written on the usage
+ * line itself. That records what was known at the moment of the request, which
+ * is always "pending" - only a `settlement` event, appended by CLI-027 after
+ * the ledger was actually asked, can make a request settled.
+ */
+function statusOf(event, settled) {
+    if (typeof event.request_id !== "string" || event.request_id.length === 0) {
+        return "unknown";
+    }
+    return settled ? "settled" : "pending";
+}
+function add(base, event, settledMicro) {
+    const status = statusOf(event, settledMicro !== undefined);
+    return {
+        modelRequests: base.modelRequests + 1,
+        promptTokens: base.promptTokens + count(event.prompt_tokens),
+        completionTokens: base.completionTokens + count(event.completion_tokens),
+        estimatedMicroUsd: base.estimatedMicroUsd + micro(event.estimated_charge_micro_usd),
+        settledMicroUsd: status === "settled"
+            ? base.settledMicroUsd + (settledMicro ?? 0n)
+            : base.settledMicroUsd,
+        bySettlement: {
+            ...base.bySettlement,
+            [status]: base.bySettlement[status] + 1,
+        },
+    };
+}
+/**
+ * The settled amount per request id, from the `settlement` events.
+ *
+ * Read in a first pass because a settlement is appended long after the request
+ * it settles. Later wins: re-running `--refresh` after the ledger corrected a
+ * charge should show the correction, not the first answer we happened to get.
+ */
+function settlementsIn(events) {
+    const found = new Map();
+    for (const event of events) {
+        if (event.type !== "settlement")
+            continue;
+        const id = event.request_id;
+        if (typeof id !== "string" || id.length === 0)
+            continue;
+        found.set(id, micro(event.settled_charge_micro_usd));
+    }
+    return found;
+}
+function count(value) {
+    return typeof value === "number" && Number.isFinite(value) ? value : 0;
+}
+/** Money is integral end to end; a malformed figure counts as zero, not NaN. */
+function micro(value) {
+    if (typeof value !== "string" || !/^-?\d+$/.test(value))
+        return 0n;
+    return BigInt(value);
+}
+export function summariseUsage(events) {
+    let totals = ZERO;
+    const byModel = new Map();
+    const byKey = new Map();
+    const settlements = settlementsIn(events);
+    let userMessages = 0;
+    let toolRuns = 0;
+    let toolRunsRefused = 0;
+    let rateLimitHits = 0;
+    let rateLimitWaitMs = 0;
+    for (const event of events) {
+        if (event.type === "user_message") {
+            userMessages += 1;
+        }
+        else if (event.type === "tool_result") {
+            toolRuns += 1;
+            if (event.status === "refused")
+                toolRunsRefused += 1;
+        }
+        else if (event.type === "rate_limited") {
+            rateLimitHits += 1;
+            rateLimitWaitMs += count(event.wait_ms);
+        }
+        else if (event.type === "usage") {
+            const usage = event;
+            const settled = typeof usage.request_id === "string"
+                ? settlements.get(usage.request_id)
+                : undefined;
+            totals = add(totals, usage, settled);
+            const model = typeof usage.model_id === "string" ? usage.model_id : "(unknown model)";
+            byModel.set(model, add(byModel.get(model) ?? ZERO, usage, settled));
+            // Grouped only when the key is known: inventing a bucket for requests
+            // recorded before per-key attribution existed would misattribute them.
+            if (typeof usage.api_key_ref === "string" &&
+                usage.api_key_ref.length > 0) {
+                byKey.set(usage.api_key_ref, add(byKey.get(usage.api_key_ref) ?? ZERO, usage, settled));
+            }
+        }
+    }
+    return {
+        ...totals,
+        userMessages,
+        toolRuns,
+        toolRunsRefused,
+        rateLimitHits,
+        rateLimitWaitMs,
+        byModel: [...byModel.entries()]
+            .map(([modelId, t]) => ({ modelId, ...t }))
+            .sort((a, b) => b.modelRequests - a.modelRequests),
+        byKey: [...byKey.entries()]
+            .map(([apiKeyRef, t]) => ({ apiKeyRef, ...t }))
+            .sort((a, b) => b.modelRequests - a.modelRequests),
+    };
+}
+/**
+ * How to describe the settled column without overclaiming.
+ *
+ * Returns undefined when there is nothing honest to say, so a caller renders
+ * no figure rather than a zero - a zero reads as "it was free".
+ */
+export function settledCaveat(totals) {
+    const { settled, pending, unknown } = totals.bySettlement;
+    if (settled === 0 && pending === 0 && unknown === 0)
+        return undefined;
+    const parts = [];
+    if (pending > 0)
+        parts.push(`${pending} not settled yet`);
+    if (unknown > 0)
+        parts.push(`${unknown} with no request id, so unknowable`);
+    if (parts.length === 0)
+        return undefined;
+    return `${parts.join(", ")}; the estimate covers all ${totals.modelRequests}`;
+}

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

@@ -1,5 +1,6 @@
 import { runSession, type SessionOptions, type SessionSummary } from "../agent/session.js";
 import { type TerminalCapabilities } from "./theme.js";
+import type { SessionRecorder } from "../sessions/recorder.js";
 import type { WidgetIo } from "./widgets.js";
 export interface AgentSurfaceOptions {
     readonly io: WidgetIo;
@@ -9,6 +10,15 @@ export interface AgentSurfaceOptions {
     };
     /** Everything runSession needs except the parts this surface supplies. */
     readonly session: Omit<SessionOptions, "stdout" | "stderr" | "readLine" | "approver" | "onEvent">;
+    /**
+     * Read fresh for every turn, so a cancelled request can be followed by a new
+     * one. Passed as a function rather than a getter on `session`: the spread
+     * below would evaluate a getter once and copy the result, quietly freezing
+     * the signal to whatever controller existed at startup.
+     */
+    readonly getSignal?: () => AbortSignal | undefined;
+    /** Present when this run is being recorded; absent for --no-history. */
+    readonly recorder?: SessionRecorder;
     /** Injected by the tests; production uses runSession. */
     readonly run?: typeof runSession;
 }

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

package/dist/tui/agent-surface.js

@@ -56,6 +56,7 @@ export async function runAgentSurface(options) {
     const cards = new ToolCardLog();
     const run = options.run ?? runSession;
     const onEvent = (event) => {
+        options.recorder?.observe(event);
         const changed = cards.apply(event);
         if (changed !== undefined) {
             options.stdout.write(renderCard(changed, capabilities));
@@ -67,16 +68,39 @@ export async function runAgentSurface(options) {
             options.stdout.write(dim(`  rate limited - waiting ${Math.round(event.waitMs / 1000)}s\n`));
         }
     };
-    const summary = await run({
+    const sessionOptions = {
         ...options.session,
         stdout: (text) => void options.stdout.write(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)),
         approver: tuiApprover(io),
-        readLine: () => promptLine(io, "> "),
+        readLine: async () => {
+            // Checkpoint between goals rather than per event: the listing only needs
+            // to be current when someone might go and look at it.
+            options.recorder?.checkpoint();
+            const line = await promptLine(io, "> ");
+            // The user's own words never appear in the agent event stream, so they
+            // are recorded here. Slash commands are control, not conversation.
+            if (line !== undefined &&
+                line.trim().length > 0 &&
+                !line.startsWith("/")) {
+                options.recorder?.goal(line);
+            }
+            return line;
+        },
         onEvent,
-    });
+    };
+    // Installed after the spread, on purpose - see getSignal above.
+    if (options.getSignal !== undefined) {
+        Object.defineProperty(sessionOptions, "signal", {
+            get: options.getSignal,
+            enumerable: true,
+            configurable: true,
+        });
+    }
+    const summary = await run(sessionOptions);
+    options.recorder?.close();
     options.stdout.write(renderSummary(summary, capabilities));
     return summary;
 }

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;AAYxD,OAAO,EAAwB,KAAK,SAAS,EAAE,MAAM,eAAe,CAAC;AAQrE,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,CAuFnE"}
+{"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"}

package/dist/tui/app.js

@@ -9,13 +9,16 @@ import { ExitCode } from "../output/exit-codes.js";
 import { loadCatalogue, saveDefaultModel } from "./adapters/models.js";
 import { renderBanner } from "./banner.js";
 import { keyboard } from "./input.js";
+import { FORCED_EXIT_NOTICE, InterruptTracker } from "./interrupt.js";
 import { runOnboarding } from "./onboarding.js";
 import { noAgentModelsNotice, pickModel } from "./picker.js";
 import { palette, detectCapabilities, } from "./theme.js";
 import { followResize } from "./resize.js";
 import { installTerminalGuard } from "./terminal.js";
 import { inspectWorkspace, renderWorkspaceSummary, } from "./workspace-summary.js";
-import { parsePermissions, startAgent } from "./start-agent.js";
+import { parsePermissions, parseSessionOptions, startAgent, } from "./start-agent.js";
+import { sessionsDir } from "../config/paths.js";
+import { chooseSession } from "./session-centre.js";
 import { select } from "./widgets.js";
 export async function runTui(options) {
     // Live, not a snapshot: a window resized mid-session must not keep laying
@@ -35,10 +38,46 @@ export async function runTui(options) {
             options.stderr.write(`mafdet: ${message}\n`);
         },
     });
-    const keys = keyboard(options.stdin);
+    // Two-stage Ctrl+C (plan 19.7). In raw mode Ctrl+C arrives as a byte rather
+    // than a signal, and during a model request nothing is reading keys - so
+    // without this it did nothing at all until the request finished by itself.
+    const interrupts = new InterruptTracker();
+    let inFlight;
+    const { dim } = palette(capabilities);
+    const onInterrupt = () => {
+        const outcome = interrupts.press();
+        if (outcome.action === "cancel-operation") {
+            options.stdout.write(dim("\n  cancelling...\n"));
+            // Abort what is running, then hand the session a fresh controller so it
+            // returns to the prompt instead of ending.
+            inFlight?.abort();
+            inFlight = new AbortController();
+            return true;
+        }
+        if (outcome.action === "force-exit") {
+            options.stdout.write(`\n  ${FORCED_EXIT_NOTICE}\n`);
+            guard.restore();
+            options.host.exit(130);
+            return true;
+        }
+        // Idle: leave it to whatever is reading, which already treats Ctrl+C as
+        // "cancel this prompt" and ends the session.
+        return false;
+    };
+    const keys = keyboard(options.stdin, { onInterrupt });
     const io = {
         write: (text) => void options.stdout.write(text),
-        nextKeys: () => keys.nextKeys(),
+        // Waiting for input is exactly what "idle" means, so the tracker learns it
+        // here rather than by being told from inside the session.
+        nextKeys: async () => {
+            interrupts.finish();
+            try {
+                return await keys.nextKeys();
+            }
+            finally {
+                interrupts.begin();
+            }
+        },
         capabilities,
     };
     try {
@@ -67,6 +106,17 @@ export async function runTui(options) {
         if (chosen === undefined)
             return ExitCode.Cancelled;
         options.stdout.write(renderWorkspaceSummary(inspectWorkspace(options.workspace, existsSync), capabilities));
+        // Offered only when there is something to resume, and only when the user
+        // did not already say what they wanted on the command line.
+        const sessionOptions = parseSessionOptions(options.argv);
+        let resumeId = sessionOptions.resumeId;
+        if (resumeId === undefined && !sessionOptions.noHistory) {
+            const choice = await chooseSession(io, sessionsDir(options.commandIo.env ?? process.env));
+            if (choice.kind === "cancelled")
+                return ExitCode.Cancelled;
+            if (choice.kind === "resume")
+                resumeId = choice.sessionId;
+        }
         return await startAgent({
             io,
             capabilities,
@@ -76,6 +126,14 @@ export async function runTui(options) {
             model: chosen,
             workspace: options.workspace,
             permissions: parsePermissions(options.argv),
+            session: {
+                ...sessionOptions,
+                ...(resumeId === undefined ? {} : { resumeId }),
+            },
+            getSignal: () => {
+                inFlight ??= new AbortController();
+                return inFlight.signal;
+            },
         });
     }
     finally {

package/dist/tui/input.d.ts

@@ -13,5 +13,17 @@ export interface RawStdin {
     off?(event: string, listener: (chunk: string) => void): unknown;
     readonly isTTY?: boolean;
 }
-export declare function keyboard(stdin: RawStdin): KeySource;
+export interface KeyboardOptions {
+    /**
+     * Called the moment an interrupt key is decoded, whether or not anyone is
+     * waiting for input. Return true to consume it, so a Ctrl+C that cancelled a
+     * request is not also delivered to the prompt as "quit".
+     *
+     * Without this the byte simply queued: in raw mode Ctrl+C is not a signal,
+     * and during a model request nothing is calling nextKeys(), so pressing it
+     * did nothing at all until the request finished on its own.
+     */
+    readonly onInterrupt?: () => boolean;
+}
+export declare function keyboard(stdin: RawStdin, options?: KeyboardOptions): KeySource;
 //# sourceMappingURL=input.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"input.d.ts","sourceRoot":"","sources":["../../src/tui/input.ts"],"names":[],"mappings":"AAQA,OAAO,EAAc,KAAK,GAAG,EAAE,MAAM,WAAW,CAAC;AAEjD,MAAM,WAAW,SAAS;IACxB,QAAQ,IAAI,OAAO,CAAC,SAAS,GAAG,EAAE,GAAG,SAAS,CAAC,CAAC;IAChD,4DAA4D;IAC5D,KAAK,IAAI,IAAI,CAAC;CACf;AAED,MAAM,WAAW,QAAQ;IACvB,UAAU,CAAC,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC;IACpC,MAAM,CAAC,IAAI,OAAO,CAAC;IACnB,KAAK,CAAC,IAAI,OAAO,CAAC;IAClB,WAAW,CAAC,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;IACxC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC;IAC9D,GAAG,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC;IAChE,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,QAAQ,GAAG,SAAS,CA8CnD"}
+{"version":3,"file":"input.d.ts","sourceRoot":"","sources":["../../src/tui/input.ts"],"names":[],"mappings":"AAQA,OAAO,EAAc,KAAK,GAAG,EAAE,MAAM,WAAW,CAAC;AAEjD,MAAM,WAAW,SAAS;IACxB,QAAQ,IAAI,OAAO,CAAC,SAAS,GAAG,EAAE,GAAG,SAAS,CAAC,CAAC;IAChD,4DAA4D;IAC5D,KAAK,IAAI,IAAI,CAAC;CACf;AAED,MAAM,WAAW,QAAQ;IACvB,UAAU,CAAC,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC;IACpC,MAAM,CAAC,IAAI,OAAO,CAAC;IACnB,KAAK,CAAC,IAAI,OAAO,CAAC;IAClB,WAAW,CAAC,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;IACxC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC;IAC9D,GAAG,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC;IAChE,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,eAAe;IAC9B;;;;;;;;OAQG;IACH,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,OAAO,CAAC;CACtC;AAED,wBAAgB,QAAQ,CACtB,KAAK,EAAE,QAAQ,EACf,OAAO,GAAE,eAAoB,GAC5B,SAAS,CAsDX"}

package/dist/tui/input.js

@@ -6,7 +6,7 @@
 // that arrives is decoded and kept, and a widget asking for input drains the
 // queue before it waits.
 import { decodeKeys } from "./keys.js";
-export function keyboard(stdin) {
+export function keyboard(stdin, options = {}) {
     const pending = [];
     let waiting;
     let ended = false;
@@ -21,7 +21,14 @@ export function keyboard(stdin) {
             pending.push([...keys]);
     };
     const onData = (chunk) => {
-        const keys = decodeKeys(chunk);
+        let keys = decodeKeys(chunk);
+        if (options.onInterrupt !== undefined &&
+            keys.some((k) => k.kind === "interrupt")) {
+            // Handled out of band; only drop the key if the handler took it.
+            const consumed = options.onInterrupt();
+            if (consumed)
+                keys = keys.filter((k) => k.kind !== "interrupt");
+        }
         if (keys.length > 0)
             deliver(keys);
     };

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

@@ -1 +1 @@
-{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../src/tui/route.ts"],"names":[],"mappings":"AAOA,0EAA0E;AAC1E,MAAM,MAAM,UAAU,GAClB,qBAAqB,GACrB,aAAa,GACb,eAAe,GACf,gBAAgB,GAChB,WAAW,GACX,IAAI,CAAC;AAET,MAAM,MAAM,aAAa;AACvB,gDAAgD;AAC9C;IAAE,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAA;CAAE;AAC1B,4EAA4E;GAC1E;IAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAA;CAAE;AAC9B,yEAAyE;GACvE;IAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,cAAc,EAAE,UAAU,CAAA;CAAE,CAAC;AAEpE,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;IAC9B,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC;CAC5D;AAyBD,wBAAgB,WAAW,CAAC,KAAK,EAAE,gBAAgB,GAAG,aAAa,CAoBlE;AAED,yEAAyE;AACzE,wBAAgB,cAAc,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,CAezD"}
+{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../src/tui/route.ts"],"names":[],"mappings":"AAOA,0EAA0E;AAC1E,MAAM,MAAM,UAAU,GAClB,qBAAqB,GACrB,aAAa,GACb,eAAe,GACf,gBAAgB,GAChB,WAAW,GACX,IAAI,CAAC;AAET,MAAM,MAAM,aAAa;AACvB,gDAAgD;AAC9C;IAAE,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAA;CAAE;AAC1B,4EAA4E;GAC1E;IAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAA;CAAE;AAC9B,yEAAyE;GACvE;IAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,cAAc,EAAE,UAAU,CAAA;CAAE,CAAC;AAEpE,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;IAC9B,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC;CAC5D;AA0CD,wBAAgB,WAAW,CAAC,KAAK,EAAE,gBAAgB,GAAG,aAAa,CAoBlE;AAED,yEAAyE;AACzE,wBAAgB,cAAc,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,CAezD"}

package/dist/tui/route.js

@@ -9,9 +9,26 @@
  * `mafdet` so that `mafdet --json` can never be answered with a drawing.
  */
 const MACHINE_FLAGS = new Set(["--json", "--quiet", "-q"]);
-/** Treated as a command rather than a bare invocation. */
+/** Flags whose next argument is a value, not a command. */
+const FLAGS_TAKING_A_VALUE = new Set([
+    "--title",
+    "--allow-command",
+    "--resume",
+]);
 function hasCommand(argv) {
-    return argv.some((arg) => !arg.startsWith("-"));
+    for (let i = 0; i < argv.length; i += 1) {
+        const arg = argv[i];
+        if (arg.startsWith("-")) {
+            // `mafdet --title "Fix login"` is still a bare invocation: the value
+            // belongs to the flag, and reading it as a command would send the user
+            // to "unknown command 'Fix login'".
+            if (FLAGS_TAKING_A_VALUE.has(arg))
+                i += 1;
+            continue;
+        }
+        return true;
+    }
+    return false;
 }
 /**
  * CI systems attach a pipe often enough that the TTY checks usually catch them,

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

@@ -0,0 +1,15 @@
+import { type IndexEntry } from "../sessions/index-file.js";
+import { type TerminalCapabilities } from "./theme.js";
+import { type WidgetIo } from "./widgets.js";
+export type SessionChoice = {
+    readonly kind: "new";
+} | {
+    readonly kind: "resume";
+    readonly sessionId: string;
+} | {
+    readonly kind: "cancelled";
+};
+export declare function recentSessions(root: string): readonly IndexEntry[];
+export declare function describeSession(entry: IndexEntry, capabilities: TerminalCapabilities): string;
+export declare function chooseSession(io: WidgetIo, root: string): Promise<SessionChoice>;
+//# sourceMappingURL=session-centre.d.ts.map

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

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

package/dist/tui/session-centre.js

@@ -0,0 +1,59 @@
+// CLI-024 · New conversation, or one of the recent ones.
+//
+// Offered only when there is something to resume: a menu whose only entry is
+// "New conversation" is a keystroke charged for nothing. Everything here reads
+// the local index and sends no request, so browsing costs nothing (plan 20.2).
+import { formatUsd } from "../output/money.js";
+import { loadIndex } from "../sessions/index-file.js";
+import { palette } from "./theme.js";
+import { select } from "./widgets.js";
+/** How many recent conversations to offer before it stops being a list. */
+const RECENT_LIMIT = 8;
+export function recentSessions(root) {
+    try {
+        return loadIndex(root).sessions.slice(0, RECENT_LIMIT);
+    }
+    catch {
+        // A store we cannot read is a store with nothing to offer, not a failure
+        // that should stop someone starting a new conversation.
+        return [];
+    }
+}
+export function describeSession(entry, capabilities) {
+    const parts = [
+        entry.model_id,
+        workspaceName(entry.workspace),
+        `${entry.model_requests} request(s)`,
+        `~${formatUsd(entry.estimated_charge_micro_usd)}`,
+    ];
+    return palette(capabilities).dim(parts.join(" - "));
+}
+function workspaceName(workspace) {
+    const name = workspace.split(/[\\/]/).filter(Boolean).at(-1);
+    return name === undefined || name.length === 0 ? workspace : name;
+}
+export async function chooseSession(io, root) {
+    const recent = recentSessions(root);
+    if (recent.length === 0)
+        return { kind: "new" };
+    const answer = await select(io, {
+        title: "What would you like to do?",
+        items: [
+            { value: "", label: "New conversation" },
+            ...recent.map((entry) => ({
+                value: entry.session_id,
+                label: entry.title,
+                detail: stripStyles(describeSession(entry, io.capabilities)),
+            })),
+        ],
+    });
+    if (answer.kind === "cancelled")
+        return { kind: "cancelled" };
+    return answer.value === ""
+        ? { kind: "new" }
+        : { kind: "resume", sessionId: answer.value };
+}
+/** The select widget dims details itself; doubling it up reads as a bug. */
+function stripStyles(text) {
+    return text.replace(new RegExp(`${String.fromCharCode(27)}\\[[0-9;]*m`, "g"), "");
+}

package/dist/tui/start-agent.d.ts

@@ -3,6 +3,12 @@ import { type CommandIo } from "../commands/runtime.js";
 import { ExitCode } from "../output/exit-codes.js";
 import { type TerminalCapabilities } from "./theme.js";
 import type { WidgetIo } from "./widgets.js";
+export interface SessionOptions {
+    readonly noHistory: boolean;
+    readonly title?: string;
+    /** Continue this session rather than starting a new one. */
+    readonly resumeId?: string;
+}
 export interface AgentPermissions {
     readonly allowWrite: boolean;
     readonly allowedCommands: readonly string[];
@@ -13,6 +19,8 @@ export interface AgentPermissions {
  * The same spellings the agent command uses, so there is one grammar for
  * granting these and no second one to keep in step.
  */
+/** `--no-history` and `--title`, read off the bare invocation. */
+export declare function parseSessionOptions(argv: readonly string[]): SessionOptions;
 export declare function parsePermissions(argv: readonly string[]): AgentPermissions;
 export interface StartAgentOptions {
     readonly io: WidgetIo;
@@ -25,7 +33,14 @@ export interface StartAgentOptions {
     readonly model: ResolvedModel;
     readonly workspace: string;
     readonly permissions: AgentPermissions;
-    readonly signal?: AbortSignal;
+    readonly session?: SessionOptions;
+    /**
+     * Read fresh for every goal. A cancel aborts the request in flight and then
+     * swaps in a new controller, so the session survives Ctrl+C instead of
+     * ending on it - runSession re-reads `signal` each turn, which is what makes
+     * that possible.
+     */
+    readonly getSignal?: () => AbortSignal | undefined;
 }
 export declare function startAgent(options: StartAgentOptions): Promise<ExitCode>;
 //# sourceMappingURL=start-agent.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"start-agent.d.ts","sourceRoot":"","sources":["../../src/tui/start-agent.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAgB,KAAK,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEtE,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAEnD,OAAO,EAAW,KAAK,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAChE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAE7C,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,eAAe,EAAE,SAAS,MAAM,EAAE,CAAC;CAC7C;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,gBAAgB,CAe1E;AAED,MAAM,WAAW,iBAAiB;IAChC,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,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC;IAC9B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,WAAW,EAAE,gBAAgB,CAAC;IACvC,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC;CAC/B;AAED,wBAAsB,UAAU,CAC9B,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,QAAQ,CAAC,CAwDnB"}
+{"version":3,"file":"start-agent.d.ts","sourceRoot":"","sources":["../../src/tui/start-agent.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAgB,KAAK,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEtE,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAcnD,OAAO,EAAW,KAAK,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAChE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAE7C,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,4DAA4D;IAC5D,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,eAAe,EAAE,SAAS,MAAM,EAAE,CAAC;CAC7C;AAED;;;;;GAKG;AACH,kEAAkE;AAClE,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,cAAc,CAqB3E;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,gBAAgB,CAe1E;AAED,MAAM,WAAW,iBAAiB;IAChC,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,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC;IAC9B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,WAAW,EAAE,gBAAgB,CAAC;IACvC,QAAQ,CAAC,OAAO,CAAC,EAAE,cAAc,CAAC;IAClC;;;;;OAKG;IACH,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,WAAW,GAAG,SAAS,CAAC;CACpD;AAED,wBAAsB,UAAU,CAC9B,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,QAAQ,CAAC,CAkGnB"}