@blockrun/franklin 3.8.31 → 3.8.32

package/dist/session/search.js

@@ -11,9 +11,9 @@ import { listSessions, getSessionFilePath } from './storage.js';
 function tokenize(text) {
     return text
         .toLowerCase()
-        .replace(/[^\w\s]/g, ' ')
-        .split(/\s+/)
-        .filter(t => t.length > 1);
+        .replace(/[^\p{L}\p{N}_\s]/gu, ' ')
+        .split(/\s+/u)
+        .filter(t => t.length > 1 || /[^\x00-\x7F]/.test(t));
 }
 function parseQuery(query) {
     const phrases = [];

package/dist/session/storage.js

@@ -158,10 +158,7 @@ export function loadSessionHistory(sessionId) {
         return [];
     }
 }
-/**
- * List all saved sessions, newest first.
- */
-export function listSessions() {
+function readSessionMetas(includeGhosts = false) {
     const sessionsDir = getSessionsDir();
     try {
         const files = fs.readdirSync(sessionsDir)
@@ -174,14 +171,19 @@ export function listSessions() {
             }
             catch { /* skip corrupted */ }
         }
-        // Filter out ghost sessions (0 messages)
-        const filtered = metas.filter(m => m.messageCount > 0);
-        return filtered.sort((a, b) => b.updatedAt - a.updatedAt);
+        const visible = includeGhosts ? metas : metas.filter(m => m.messageCount > 0);
+        return visible.sort((a, b) => b.updatedAt - a.updatedAt);
     }
     catch {
         return [];
     }
 }
+/**
+ * List all saved sessions, newest first.
+ */
+export function listSessions() {
+    return readSessionMetas(false);
+}
 /**
  * Find the latest saved session tagged with a given channel (e.g.
  * `telegram:12345`). Used by non-CLI drivers to resume across process
@@ -198,25 +200,26 @@ export function findLatestSessionByChannel(channel) {
  * Accepts optional activeSessionId to protect from deletion.
  */
 export function pruneOldSessions(activeSessionId) {
-    const sessions = listSessions();
-    if (sessions.length <= MAX_SESSIONS)
-        return;
-    const toDelete = sessions
-        .slice(MAX_SESSIONS)
-        .filter(s => s.id !== activeSessionId); // Never delete active session
-    for (const s of toDelete) {
-        try {
-            fs.unlinkSync(sessionPath(s.id));
-        }
-        catch { /* ok */ }
-        try {
-            fs.unlinkSync(metaPath(s.id));
+    const sessions = readSessionMetas(false);
+    const allSessions = readSessionMetas(true);
+    if (sessions.length > MAX_SESSIONS) {
+        const toDelete = sessions
+            .slice(MAX_SESSIONS)
+            .filter(s => s.id !== activeSessionId); // Never delete active session
+        for (const s of toDelete) {
+            try {
+                fs.unlinkSync(sessionPath(s.id));
+            }
+            catch { /* ok */ }
+            try {
+                fs.unlinkSync(metaPath(s.id));
+            }
+            catch { /* ok */ }
         }
-        catch { /* ok */ }
     }
     // Also clean up ghost sessions (0 messages, older than 5 minutes)
     const fiveMinAgo = Date.now() - 5 * 60 * 1000;
-    for (const s of sessions) {
+    for (const s of allSessions) {
         if (s.id === activeSessionId)
             continue;
         if (s.messageCount === 0 && s.createdAt < fiveMinAgo) {

package/dist/ui/app.js

@@ -614,7 +614,16 @@ function RunCodeApp({ initialModel, workDir, walletAddress, walletBalance, chain
                         break;
                     }
                     case 'usage': {
-                        setCurrentModel(event.model);
+                        // DO NOT setCurrentModel(event.model) here. currentModel
+                        // represents the user's selection (e.g. 'blockrun/auto'),
+                        // not what the router resolved for this specific turn. The
+                        // per-turn resolved model is already captured in
+                        // turnModelRef (rendered in the turn-summary line below
+                        // each response) and in onModelChange('system') when the
+                        // loop itself decides to swap (empty-response / 402 fallback).
+                        // Overriding currentModel from every usage event made the
+                        // status bar permanently show the last resolved model and
+                        // create a false impression that auto mode was stuck.
                         setTurnTokens(prev => ({
                             input: prev.input + event.inputTokens,
                             output: prev.output + event.outputTokens,

package/dist/ui/session-picker.d.ts

@@ -3,6 +3,15 @@
  * Lists recent sessions (newest first) and returns the selected ID.
  */
 import { type SessionMeta } from '../session/storage.js';
+type SessionPickerSelection = {
+    kind: 'cancel';
+} | {
+    kind: 'selected';
+    id: string;
+} | {
+    kind: 'invalid';
+    message: string;
+};
 /**
  * Resolve a user-provided session identifier to a full session ID.
  * Supports exact match and unambiguous prefix match (minimum 8 chars).
@@ -16,6 +25,7 @@ export declare function resolveSessionIdInput(input: string): {
     error: 'not-found' | 'ambiguous';
     candidates: SessionMeta[];
 };
+export declare function resolvePickerSelection(input: string, shown: SessionMeta[], sessions: SessionMeta[]): SessionPickerSelection;
 /**
  * Find the most recent session for a given working directory.
  * Returns null if none exists.
@@ -28,3 +38,4 @@ export declare function findLatestSessionForDir(workDir: string): SessionMeta |
 export declare function pickSession(opts?: {
     workDir?: string;
 }): Promise<string | null>;
+export {};

package/dist/ui/session-picker.js

@@ -61,6 +61,33 @@ export function resolveSessionIdInput(input) {
     }
     return { ok: false, error: 'not-found', candidates: [] };
 }
+export function resolvePickerSelection(input, shown, sessions) {
+    const trimmed = input.trim();
+    if (!trimmed)
+        return { kind: 'cancel' };
+    const num = parseInt(trimmed, 10);
+    if (!isNaN(num) && num >= 1 && num <= shown.length) {
+        return { kind: 'selected', id: shown[num - 1].id };
+    }
+    const exact = sessions.find((s) => s.id === trimmed);
+    if (exact)
+        return { kind: 'selected', id: exact.id };
+    const resolved = resolveSessionIdInput(trimmed);
+    if (resolved.ok) {
+        return { kind: 'selected', id: resolved.id };
+    }
+    if (resolved.error === 'ambiguous') {
+        const preview = resolved.candidates
+            .slice(0, 3)
+            .map((candidate) => candidate.id)
+            .join(', ');
+        return {
+            kind: 'invalid',
+            message: `Ambiguous session prefix: ${trimmed}${preview ? ` (${preview}${resolved.candidates.length > 3 ? ', …' : ''})` : ''}`,
+        };
+    }
+    return { kind: 'invalid', message: `No session found matching: ${trimmed}` };
+}
 /**
  * Find the most recent session for a given working directory.
  * Returns null if none exists.
@@ -109,21 +136,23 @@ export async function pickSession(opts = {}) {
         terminal: process.stdin.isTTY ?? false,
     });
     return new Promise((resolve) => {
-        rl.question(chalk.bold('  session> '), (answer) => {
-            rl.close();
-            const trimmed = answer.trim();
-            if (!trimmed) {
-                resolve(null);
-                return;
-            }
-            const num = parseInt(trimmed, 10);
-            if (!isNaN(num) && num >= 1 && num <= shown.length) {
-                resolve(shown[num - 1].id);
-                return;
-            }
-            // Allow raw ID as well
-            const match = sessions.find(s => s.id === trimmed || s.id.startsWith(trimmed));
-            resolve(match ? match.id : null);
-        });
+        const prompt = () => {
+            rl.question(chalk.bold('  session> '), (answer) => {
+                const selection = resolvePickerSelection(answer, shown, sessions);
+                if (selection.kind === 'cancel') {
+                    rl.close();
+                    resolve(null);
+                    return;
+                }
+                if (selection.kind === 'selected') {
+                    rl.close();
+                    resolve(selection.id);
+                    return;
+                }
+                console.error(chalk.yellow(`  ${selection.message}`));
+                prompt();
+            });
+        };
+        prompt();
     });
 }

package/package.json

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