@blockrun/franklin 3.6.8 → 3.6.10

package/dist/agent/commands.js

@@ -627,7 +627,7 @@ export async function handleSlashCommand(input, ctx) {
             const newModel = resolveModel(input.slice(7).trim());
             ctx.config.model = newModel;
             ctx.config.baseModel = newModel; // Update recovery target so loop doesn't reset
-            ctx.config.onModelChange?.(newModel);
+            ctx.config.onModelChange?.(newModel, 'user');
             ctx.onEvent({ kind: 'text_delta', text: `Model → **${newModel}**\n` });
         }
         emitDone(ctx);

package/dist/agent/loop.js

@@ -298,7 +298,7 @@ export async function interactiveSession(config, getUserInput, onEvent, onAbortR
         const baseModel = config.baseModel ?? config.model;
         if (config.model !== baseModel && !paymentFailedModels.has(baseModel)) {
             config.model = baseModel;
-            config.onModelChange?.(baseModel);
+            config.onModelChange?.(baseModel, 'system');
         }
         turnFailedModels = new Set(); // Fresh slate for transient failures this turn
         const abort = new AbortController();
@@ -589,7 +589,7 @@ export async function interactiveSession(config, getUserInput, onEvent, onAbortR
                     if (nextFree) {
                         const oldModel = config.model;
                         config.model = nextFree;
-                        config.onModelChange?.(nextFree);
+                        config.onModelChange?.(nextFree, 'system');
                         onEvent({ kind: 'text_delta', text: `\n*${oldModel} failed — switching to ${nextFree}*\n` });
                         continue; // Retry with next model
                     }

package/dist/agent/types.d.ts

@@ -140,8 +140,10 @@ export interface AgentConfig {
     permissionPromptFn?: (toolName: string, description: string) => Promise<'yes' | 'no' | 'always'>;
     /** Routes AskUser questions through ink UI input to avoid raw-mode stdin conflict */
     onAskUser?: (question: string, options?: string[]) => Promise<string>;
-    /** Notify UI when agent switches model (e.g. payment fallback) */
-    onModelChange?: (model: string) => void;
+    /** Notify UI when agent switches model. `reason` is 'user' for explicit /model
+     *  commands and 'system' for payment fallbacks or recovery. User-initiated
+     *  changes must also update `baseModel`. */
+    onModelChange?: (model: string, reason?: 'user' | 'system') => void;
     /** The user's intended model — updated by /model command, used for turn recovery */
     baseModel?: string;
 }

package/dist/commands/start.js

@@ -184,8 +184,13 @@ async function runWithInkUI(agentConfig, model, workDir, version, walletInfo, on
         walletAddress: walletInfo?.address,
         walletBalance: walletInfo?.balance,
         chain: walletInfo?.chain,
-        onModelChange: (newModel) => {
+        onModelChange: (newModel, reason) => {
             agentConfig.model = newModel;
+            // User-initiated switch must also update baseModel so the agent loop
+            // doesn't revert to the previous model on the next turn.
+            if (reason === 'user') {
+                agentConfig.baseModel = newModel;
+            }
         },
     });
     // Wire permission prompts through Ink UI to avoid stdin/readline conflict.
@@ -329,12 +334,14 @@ async function handleSlashCommand(cmd, config, ui) {
             const newModel = parts[1];
             if (newModel) {
                 config.model = resolveModel(newModel);
+                config.baseModel = config.model;
                 console.error(chalk.green(`  Model → ${config.model}`));
                 return null;
             }
             const picked = await pickModel(config.model);
             if (picked) {
                 config.model = picked;
+                config.baseModel = picked;
                 console.error(chalk.green(`  Model → ${config.model}`));
             }
             return null;
@@ -343,6 +350,7 @@ async function handleSlashCommand(cmd, config, ui) {
             const picked = await pickModel(config.model);
             if (picked) {
                 config.model = picked;
+                config.baseModel = picked;
                 console.error(chalk.green(`  Model → ${config.model}`));
             }
             return null;

package/dist/ui/app.d.ts

@@ -22,5 +22,5 @@ export declare function launchInkUI(opts: {
     walletBalance?: string;
     chain?: string;
     showPicker?: boolean;
-    onModelChange?: (model: string) => void;
+    onModelChange?: (model: string, reason?: 'user' | 'system') => void;
 }): InkUIHandle;

package/dist/ui/app.js

@@ -13,7 +13,7 @@ import { renderMarkdown } from './markdown.js';
 import { resolveModel, PICKER_CATEGORIES, PICKER_MODELS_FLAT, } from './model-picker.js';
 import { estimateCost } from '../pricing.js';
 import { formatTokens, shortModelName } from '../stats/format.js';
-import { mouse } from './mouse.js';
+import { mouse, forceDisableMouseTracking } from './mouse.js';
 // ─── Full-width input box ──────────────────────────────────────────────────
 function InputBox({ input, setInput, onSubmit, model, balance, sessionCost, queued, queuedCount, focused, busy, contextPct, vimMode, onVimModeChange }) {
     const { stdout } = useStdout();
@@ -219,7 +219,7 @@ function RunCodeApp({ initialModel, workDir, walletAddress, walletBalance, chain
         else if (key.return) {
             const selected = PICKER_MODELS_FLAT[pickerIdx];
             setCurrentModel(selected.id);
-            onModelChange(selected.id);
+            onModelChange(selected.id, 'user');
             showStatus(`Model → ${selected.label}`, 'success', 3000);
             setMode('input');
             setReady(true);
@@ -290,7 +290,7 @@ function RunCodeApp({ initialModel, workDir, walletAddress, walletBalance, chain
                     if (parts[1]) {
                         const resolved = resolveModel(parts[1]);
                         setCurrentModel(resolved);
-                        onModelChange(resolved);
+                        onModelChange(resolved, 'user');
                         showStatus(`Model → ${resolved}`, 'success', 3000);
                     }
                     else {
@@ -395,8 +395,14 @@ function RunCodeApp({ initialModel, workDir, walletAddress, walletBalance, chain
         turnSavingsRef.current = undefined;
         onSubmit(trimmed);
     }, [ready, currentModel, totalCost, onSubmit, onModelChange, onAbort, onExit, exit, lastPrompt, inputHistory, showStatus]);
-    // Mouse support — clicks toggle tool results, drag selects text
+    // Mouse support — OFF by default because Node stdin is shared: mouse escape
+    // sequences leak into Ink's input handler as typed text. Opt in with
+    // FRANKLIN_MOUSE=1 if you want click-to-expand-tool + drag-to-copy.
     useEffect(() => {
+        // Always disable any leftover mouse tracking from a previous session
+        forceDisableMouseTracking();
+        if (process.env.FRANKLIN_MOUSE !== '1')
+            return;
         const cleanup = mouse.enable();
         const handleClick = (event) => {
             // Ignore clicks in the input area (bottom 4 rows of the terminal)
@@ -679,7 +685,7 @@ export function launchInkUI(opts) {
                 // Agent loop hasn't called waitForInput yet — queue the input
                 pendingInput = value;
             }
-        }, onModelChange: (model) => { opts.onModelChange?.(model); }, onAbort: () => { abortCallback?.(); }, onExit: () => {
+        }, onModelChange: (model, reason) => { opts.onModelChange?.(model, reason); }, onAbort: () => { abortCallback?.(); }, onExit: () => {
             exiting = true;
             if (resolveInput) {
                 resolveInput(null);

package/dist/ui/mouse.d.ts

@@ -40,4 +40,9 @@ declare class MouseManager extends EventEmitter {
 }
 /** Singleton mouse manager. */
 export declare const mouse: MouseManager;
+/**
+ * Force-disable any leftover mouse tracking from a previous session.
+ * Safe to call unconditionally — if tracking is off, it's a no-op at the terminal level.
+ */
+export declare function forceDisableMouseTracking(): void;
 export {};

package/dist/ui/mouse.js

@@ -265,3 +265,15 @@ class MouseManager extends EventEmitter {
 }
 /** Singleton mouse manager. */
 export const mouse = new MouseManager();
+/**
+ * Force-disable any leftover mouse tracking from a previous session.
+ * Safe to call unconditionally — if tracking is off, it's a no-op at the terminal level.
+ */
+export function forceDisableMouseTracking() {
+    try {
+        process.stdout.write(DISABLE_MOUSE);
+    }
+    catch {
+        // Ignore — stdout may not be writable in some contexts
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blockrun/franklin",
-  "version": "3.6.8",
+  "version": "3.6.10",
   "description": "Franklin — The AI agent with a wallet. Spends USDC autonomously to get real work done. Pay per action, no subscriptions.",
   "type": "module",
   "exports": {