@mafdet/cli 0.4.4 → 0.4.6

package/dist/tui/agent-surface.js

@@ -6,7 +6,7 @@
 // different models, tools, approvals or costs, because there is only one
 // implementation of all four. What differs is the drawing.
 import { runSession, } from "../agent/session.js";
-import { formatUsd } from "../output/money.js";
+import { formatUsdWithUnpriced } from "../output/money.js";
 import { tuiApprover } from "./approval.js";
 import { palette } from "./theme.js";
 import { renderCard, ToolCardLog } from "./tool-card.js";
@@ -72,8 +72,17 @@ export async function runAgentSurface(options) {
             // 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.
+            // R-2 · Say what was actually dropped. A conversation with no tools in
+            // it drops turns and zero exchanges, and this used to report "0 earlier
+            // tool exchanges" - a true statement that described nothing.
+            const parts = [];
+            if (event.exchanges > 0) {
+                parts.push(`${event.exchanges} earlier tool exchange(s)`);
+            }
+            if (event.turns > 0)
+                parts.push(`${event.turns} earlier turn(s)`);
             options.stdout.write(dim(`  context near the limit (${event.promptTokens} tokens) - dropped ` +
-                `${event.exchanges} earlier tool exchange(s) from what is sent\n`));
+                `${parts.join(" and ") || "nothing"} from what is sent\n`));
         }
     };
     const sessionOptions = {
@@ -90,16 +99,13 @@ export async function runAgentSurface(options) {
             // Checkpoint between goals rather than per event: the listing only needs
             // to be current when someone might go and look at it.
             options.recorder?.checkpoint();
-            const line = await promptLine(io, "> ");
-            // The user's own words never appear in the agent event stream, so they
-            // are recorded here. Slash commands are control, not conversation.
-            if (line !== undefined &&
-                line.trim().length > 0 &&
-                !line.startsWith("/")) {
-                options.recorder?.goal(line);
-            }
-            return line;
+            return promptLine(io, "> ");
         },
+        // T-1 · Recording the goal belongs to the session loop now, so both
+        // surfaces get it from the same place instead of one remembering.
+        ...(options.recorder === undefined
+            ? {}
+            : { onGoal: (goal) => options.recorder?.goal(goal) }),
         onEvent,
     };
     // Installed after the spread, on purpose - see getSignal above.
@@ -124,7 +130,7 @@ export function renderSummary(summary, capabilities) {
         dim(`  model requests   ${summary.modelRequests}`),
         dim(`  tool runs        ${summary.toolRuns}`),
         dim(`  tokens           ${summary.promptTokens} in / ${summary.completionTokens} out`),
-        dim(`  estimated cost   ${formatUsd(summary.costMicroUsd.toString())}`),
+        dim(`  estimated cost   ${formatUsdWithUnpriced(summary.costMicroUsd, summary.unpricedRequests)}`),
         "",
     ].join("\n") + "\n");
 }

package/dist/tui/app.d.ts

@@ -1,6 +1,8 @@
 import { ExitCode } from "../output/exit-codes.js";
 import type { CommandIo } from "../commands/runtime.js";
+import { type TerminalCapabilities } from "./theme.js";
 import { type GuardHost } from "./terminal.js";
+import { type WidgetIo } from "./widgets.js";
 export interface TuiOptions {
     readonly version: string;
     readonly workspace: string;
@@ -22,4 +24,16 @@ export interface TuiOptions {
     readonly argv: readonly string[];
 }
 export declare function runTui(options: TuiOptions): Promise<ExitCode>;
+interface ChooseOptions {
+    readonly io: WidgetIo;
+    readonly commandIo: CommandIo;
+    readonly apiKey: string;
+    readonly capabilities: TerminalCapabilities;
+    readonly stdout: {
+        write(text: string): unknown;
+    };
+}
+/** The model the whole precedence chain settles on: flag > env > project > user. */
+export declare function resolvedDefaultModel(options: ChooseOptions): string | undefined;
+export {};
 //# sourceMappingURL=app.d.ts.map

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;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"}
+{"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,EAGL,KAAK,oBAAoB,EAC1B,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAwB,KAAK,SAAS,EAAE,MAAM,eAAe,CAAC;AAerE,OAAO,EAAU,KAAK,QAAQ,EAAE,MAAM,cAAc,CAAC;AAErD,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,CAgLnE;AAED,UAAU,aAAa;IACrB,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC;IACtB,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,YAAY,EAAE,oBAAoB,CAAC;IAC5C,QAAQ,CAAC,MAAM,EAAE;QAAE,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;CACnD;AAsBD,oFAAoF;AACpF,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,aAAa,GACrB,MAAM,GAAG,SAAS,CAYpB"}

package/dist/tui/app.js

@@ -7,7 +7,7 @@
 import { existsSync } from "node:fs";
 import { ExitCode } from "../output/exit-codes.js";
 import { loadConfig } from "../config/load.js";
-import { loadCatalogue, saveDefaultModel } from "./adapters/models.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";
@@ -110,18 +110,21 @@ export async function runTui(options) {
             options.stdout.write("commands that work without an interactive session.\n");
             return ExitCode.Cancelled;
         }
-        const chosen = await chooseModel({
+        const chooseOptions = {
             io,
             commandIo: options.commandIo,
             apiKey: auth.apiKey,
             capabilities,
             stdout: options.stdout,
-        });
-        if (chosen === undefined)
+        };
+        const catalogue = await loadModels(chooseOptions);
+        if (catalogue === 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.
+        // R-9 · The session comes first. Resuming runs on the model the session
+        // recorded, so asking for one before knowing whether we are resuming made
+        // the user choose - and possibly save as their default - a model the run
+        // then ignored, after printing it in the banner as though it were in use.
         const sessionOptions = parseSessionOptions(options.argv);
         let resumeId = sessionOptions.resumeId;
         if (resumeId === undefined && !sessionOptions.noHistory) {
@@ -131,6 +134,17 @@ export async function runTui(options) {
             if (choice.kind === "resume")
                 resumeId = choice.sessionId;
         }
+        // Only a new conversation needs a model chosen for it.
+        const chosen = resumeId === undefined
+            ? await chooseModel(chooseOptions, catalogue)
+            : {
+                model: catalogue.agentReady[0] ?? catalogue.chat[0],
+                catalogue: catalogue.chat,
+                agentCapable: catalogue.agentReady.map((m) => m.modelId),
+            };
+        if (chosen === undefined || chosen.model === undefined) {
+            return ExitCode.Cancelled;
+        }
         return await startAgent({
             io,
             capabilities,
@@ -160,7 +174,7 @@ export async function runTui(options) {
     }
 }
 /** The model the whole precedence chain settles on: flag > env > project > user. */
-function resolvedDefaultModel(options) {
+export function resolvedDefaultModel(options) {
     try {
         return loadConfig({
             env: options.commandIo.env,
@@ -174,7 +188,15 @@ function resolvedDefaultModel(options) {
         return options.commandIo.env?.MAFDET_MODEL;
     }
 }
-async function chooseModel(options) {
+/**
+ * R-9 · Load and vet the catalogue, without choosing anything yet.
+ *
+ * Split from the picker because resuming does not need a choice: the session
+ * runs on the model it recorded. Asking for one first made the user pick - and
+ * possibly "remember" - a model that the run then ignored, and printed it in
+ * the banner as though it were in use.
+ */
+async function loadModels(options) {
     const { dim, bold } = palette(options.capabilities);
     options.stdout.write(dim("  loading the model catalogue...\n"));
     let catalogue;
@@ -202,13 +224,25 @@ async function chooseModel(options) {
         return undefined;
     }
     if (catalogue.agentReady.length === 0) {
+        // R-1 · Refuse, rather than warn and open the gate wider.
+        //
+        // This printed a notice and then offered *every* chat model, because
+        // `agentOnly` was `agentReady.length > 0` - so the one case with nothing
+        // safe to offer was the case that offered everything. The whole of this
+        // surface is an agent session, and `mafdet agent` already refuses an
+        // unverified model outright; the two must not disagree about admission.
         options.stdout.write(noAgentModelsNotice(catalogue.chat.length, options.capabilities));
+        return undefined;
     }
+    return catalogue;
+}
+async function chooseModel(options, catalogue) {
+    const { dim } = palette(options.capabilities);
     const picked = await pickModel(options.io, {
         models: catalogue.chat,
-        // Fail closed: offer only agent-capable models when any exist, so a
-        // model the agent cannot drive never becomes the session's default.
-        agentOnly: catalogue.agentReady.length > 0,
+        // Fail closed: only agent-capable models are ever offered here. The
+        // empty case is refused in loadModels, so this is never a way in.
+        agentOnly: true,
         // F-005 · The resolved model, not just the environment variable. After
         // "Remember X as your default?" wrote X to the user config, the next
         // launch still highlighted whatever MAFDET_MODEL said - usually nothing -

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

@@ -1 +1 @@
-{"version":3,"file":"picker.d.ts","sourceRoot":"","sources":["../../src/tui/picker.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEtD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAW,KAAK,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAChE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAW7C,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,IAAI,EAAE,QAAQ,GAAG,WAAW,CAAC;IACtC,QAAQ,CAAC,KAAK,CAAC,EAAE,aAAa,CAAC;CAChC;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,MAAM,EAAE,SAAS,aAAa,EAAE,CAAC;IAC1C,8CAA8C;IAC9C,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAC5B,iDAAiD;IACjD,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,wBAAsB,SAAS,CAC7B,EAAE,EAAE,QAAQ,EACZ,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,UAAU,CAAC,CAiHrB;AA6BD;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,oBAAoB,GACjC,MAAM,CAYR;AAED,iEAAiE;AACjE,YAAY,EAAE,GAAG,EAAE,CAAC"}
+{"version":3,"file":"picker.d.ts","sourceRoot":"","sources":["../../src/tui/picker.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEtD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAW,KAAK,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAChE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAW7C,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,IAAI,EAAE,QAAQ,GAAG,WAAW,CAAC;IACtC,QAAQ,CAAC,KAAK,CAAC,EAAE,aAAa,CAAC;CAChC;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,MAAM,EAAE,SAAS,aAAa,EAAE,CAAC;IAC1C,8CAA8C;IAC9C,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAC5B,iDAAiD;IACjD,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,wBAAsB,SAAS,CAC7B,EAAE,EAAE,QAAQ,EACZ,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,UAAU,CAAC,CAiHrB;AA6BD;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,oBAAoB,GACjC,MAAM,CAaR;AAED,iEAAiE;AACjE,YAAY,EAAE,GAAG,EAAE,CAAC"}

package/dist/tui/picker.js

@@ -138,7 +138,8 @@ export function noAgentModelsNotice(chatCount, capabilities) {
     return ([
         "",
         bold("  No model on this key has verified tool calling."),
-        dim(`  ${chatCount} chat model(s) are available, so chat still works.`),
+        dim("  The agent needs one, so there is no session to open."),
+        dim(`  ${chatCount} chat model(s) still work: try 'mafdet chat'.`),
         dim("  Run 'mafdet models list --agent' to see which models qualify,"),
         dim("  or check the key's model permissions in the console."),
         "",

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

@@ -10,6 +10,11 @@ export type SessionChoice = {
     readonly kind: "cancelled";
 };
 export declare function recentSessions(root: string): readonly IndexEntry[];
+/**
+ * R-4 · Every string here came off disk, and this list is drawn on a terminal
+ * by definition. A title carrying an OSC sequence would retitle the window of
+ * anyone who merely opened the picker - before choosing anything.
+ */
 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

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

package/dist/tui/session-centre.js

@@ -3,6 +3,7 @@
 // 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 { stripAnsi } from "../agent/command-policy.js";
 import { formatUsd } from "../output/money.js";
 import { loadIndex } from "../sessions/index-file.js";
 import { palette } from "./theme.js";
@@ -19,12 +20,21 @@ export function recentSessions(root) {
         return [];
     }
 }
+/**
+ * R-4 · Every string here came off disk, and this list is drawn on a terminal
+ * by definition. A title carrying an OSC sequence would retitle the window of
+ * anyone who merely opened the picker - before choosing anything.
+ */
 export function describeSession(entry, capabilities) {
     const parts = [
-        entry.model_id,
-        workspaceName(entry.workspace),
+        stripAnsi(entry.model_id),
+        stripAnsi(workspaceName(entry.workspace)),
         `${entry.model_requests} request(s)`,
-        `~${formatUsd(entry.estimated_charge_micro_usd)}`,
+        // T-8 · `sessions list/show/usage` learned to say "unknown"; this list
+        // did not, so the same session read as free in the picker.
+        entry.unpriced_requests
+            ? `~${formatUsd(entry.estimated_charge_micro_usd)} + ${entry.unpriced_requests} unpriced`
+            : `~${formatUsd(entry.estimated_charge_micro_usd)}`,
     ];
     return palette(capabilities).dim(parts.join(" - "));
 }
@@ -42,7 +52,7 @@ export async function chooseSession(io, root) {
             { value: "", label: "New conversation" },
             ...recent.map((entry) => ({
                 value: entry.session_id,
-                label: entry.title,
+                label: stripAnsi(entry.title),
                 detail: stripStyles(describeSession(entry, io.capabilities)),
             })),
         ],

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

@@ -73,5 +73,33 @@ export interface StartAgentOptions {
      */
     readonly getSignal?: () => AbortSignal | undefined;
 }
+export interface RunContextInput {
+    /** The metadata of a resumed session, or undefined for a new one. */
+    readonly resumed?: {
+        readonly workspace: string;
+        readonly model_id: string;
+    };
+    readonly currentWorkspace: string;
+    readonly currentModel: ResolvedModel;
+    readonly catalogue: readonly ResolvedModel[];
+}
+/**
+ * F-003 · Where a run happens and which model it uses.
+ *
+ * A resumed session runs where it was recorded, on the model it was recorded
+ * with. It used to run in the current directory on the model picked moments
+ * earlier - so continuing project A's conversation from project B pointed the
+ * agent at B's files, and with `--allow-write` that meant editing the wrong
+ * repository.
+ *
+ * Falls back to the current model only when the catalogue has no entry for the
+ * recorded one. That cannot happen on a run that got this far - an uncallable
+ * model is a blocker and blockers now stop the run - but the fallback keeps
+ * this total rather than throwing on a case the type system allows.
+ */
+export declare function effectiveRunContext(input: RunContextInput): {
+    workspace: string;
+    model: ResolvedModel;
+};
 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,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,2DAA2D;AAC3D,eAAO,MAAM,SAAS,iHAQZ,CAAC;AASX,qBAAa,gBAAiB,SAAQ,KAAK;CAAG;AAE9C;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CAgB/D;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,cAAc,CAiB3E;AAED;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,gBAAgB,CAgB1E;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;;;;;;;;OAQG;IACH,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,aAAa,EAAE,CAAC;IAC9C,QAAQ,CAAC,kBAAkB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAChD,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,CA8JnB"}
+{"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;AAgBnD,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,2DAA2D;AAC3D,eAAO,MAAM,SAAS,iHAQZ,CAAC;AASX,qBAAa,gBAAiB,SAAQ,KAAK;CAAG;AAE9C;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CAgB/D;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,cAAc,CAiB3E;AAED;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,gBAAgB,CAgB1E;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;;;;;;;;OAQG;IACH,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,aAAa,EAAE,CAAC;IAC9C,QAAQ,CAAC,kBAAkB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAChD,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,MAAM,WAAW,eAAe;IAC9B,qEAAqE;IACrE,QAAQ,CAAC,OAAO,CAAC,EAAE;QAAE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;IAC7E,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,YAAY,EAAE,aAAa,CAAC;IACrC,QAAQ,CAAC,SAAS,EAAE,SAAS,aAAa,EAAE,CAAC;CAC9C;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,eAAe,GAAG;IAC3D,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,aAAa,CAAC;CACtB,CAUA;AAED,wBAAsB,UAAU,CAC9B,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,QAAQ,CAAC,CAgKnB"}

package/dist/tui/start-agent.js

@@ -15,6 +15,7 @@ import { keyDigest } from "../security/redact.js";
 import { SessionRecorder } from "../sessions/recorder.js";
 import { SessionWriter } from "../sessions/store.js";
 import { NOTICE_FILE, decideRecording, firstSaveNotice, } from "../sessions/policy.js";
+import { stripAnsi } from "../agent/command-policy.js";
 import { describeResume, openForResume } from "../sessions/open.js";
 import { describeBlocker } from "../sessions/resume.js";
 import { runAgentSurface } from "./agent-surface.js";
@@ -118,6 +119,30 @@ export function parsePermissions(argv) {
     }
     return { allowWrite, allowedCommands };
 }
+/**
+ * F-003 · Where a run happens and which model it uses.
+ *
+ * A resumed session runs where it was recorded, on the model it was recorded
+ * with. It used to run in the current directory on the model picked moments
+ * earlier - so continuing project A's conversation from project B pointed the
+ * agent at B's files, and with `--allow-write` that meant editing the wrong
+ * repository.
+ *
+ * Falls back to the current model only when the catalogue has no entry for the
+ * recorded one. That cannot happen on a run that got this far - an uncallable
+ * model is a blocker and blockers now stop the run - but the fallback keeps
+ * this total rather than throwing on a case the type system allows.
+ */
+export function effectiveRunContext(input) {
+    if (input.resumed === undefined) {
+        return { workspace: input.currentWorkspace, model: input.currentModel };
+    }
+    return {
+        workspace: input.resumed.workspace,
+        model: input.catalogue.find((m) => m.modelId === input.resumed?.model_id) ??
+            input.currentModel,
+    };
+}
 export async function startAgent(options) {
     const { dim, bold } = palette(options.capabilities);
     // The TUI is interactive by construction, so `--allow-write` can be honoured
@@ -128,11 +153,6 @@ export async function startAgent(options) {
         ...options.commandIo,
         env: { ...options.commandIo.env, MAFDET_API_KEY: options.apiKey },
     });
-    options.stdout.write(dim(`\n  ${options.model.modelId} - ${mode}` +
-        (hasCommands
-            ? ` - commands: ${options.permissions.allowedCommands.join(", ")}`
-            : "") +
-        "\n  type a goal, or /help for the session commands\n\n"));
     const opened = options.session?.resumeId
         ? openForResume({
             root: sessionsDir(options.commandIo.env ?? process.env),
@@ -174,10 +194,12 @@ export async function startAgent(options) {
     // was recorded with. Continuing project A's conversation against project B's
     // files is how an agent with write access edits the wrong repository - and
     // it used to be the default, because the workspace came from the cwd.
-    const effectiveWorkspace = opened === undefined ? options.workspace : opened.metadata.workspace;
-    const effectiveModel = opened === undefined
-        ? options.model
-        : ((options.catalogue ?? []).find((m) => m.modelId === opened.metadata.model_id) ?? options.model);
+    const { workspace: effectiveWorkspace, model: effectiveModel } = effectiveRunContext({
+        resumed: opened?.metadata,
+        currentWorkspace: options.workspace,
+        currentModel: options.model,
+        catalogue: options.catalogue ?? [],
+    });
     let workspace;
     try {
         workspace = Workspace.open(effectiveWorkspace);
@@ -194,6 +216,14 @@ export async function startAgent(options) {
     if (opened !== undefined && effectiveWorkspace !== options.workspace) {
         options.stdout.write(dim(`  continuing in ${effectiveWorkspace}, where it was recorded\n`));
     }
+    // R-9 · Printed here, not before the session was resolved: on a resume the
+    // model in use is the one the session recorded, and announcing the model
+    // picked beforehand named something that was never going to be used.
+    options.stdout.write(dim(`\n  ${stripAnsi(effectiveModel.modelId)} - ${mode}` +
+        (hasCommands
+            ? ` - commands: ${options.permissions.allowedCommands.join(", ")}`
+            : "") +
+        "\n  type a goal, or /help for the session commands\n\n"));
     const recorder = opened !== undefined
         ? new SessionRecorder({
             writer: opened.writer,

package/package.json

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