@blockrun/franklin 3.15.34 → 3.15.36

package/dist/agent/llm.js

@@ -8,6 +8,21 @@ import { USER_AGENT } from '../config.js';
 import { routeRequest, parseRoutingProfile } from '../router/index.js';
 import { ThinkTagStripper } from './think-tag-stripper.js';
 import { isNemotronProseModel, stripNemotronProse } from './nemotron-prose-stripper.js';
+// Reasoning-tier models the gateway routes to that reject `tool_choice`
+// outright. Pattern: OpenAI o1/o3 family + DeepSeek's reasoner variant.
+// Add new entries as their 400 errors appear in real sessions; this is
+// a known-bad allowlist, not a guess. Wildcard substring match keeps it
+// resilient to model-revision suffixes (`o1-mini`, `o3-2026-04`, etc.).
+const MODELS_WITHOUT_TOOL_CHOICE_SUBSTR = [
+    'deepseek-reasoner',
+    'openai/o1',
+    'openai/o3',
+];
+function modelDoesNotSupportToolChoice(model) {
+    if (!model)
+        return false;
+    return MODELS_WITHOUT_TOOL_CHOICE_SUBSTR.some(s => model.includes(s));
+}
 function parseTimeoutEnv(name) {
     const raw = process.env[name];
     const parsed = raw ? Number.parseInt(raw, 10) : NaN;
@@ -309,6 +324,17 @@ export class ModelClient {
             (!Array.isArray(requestPayload['tools']) || requestPayload['tools'].length === 0)) {
             delete requestPayload['tool_choice'];
         }
+        // Models that don't support `tool_choice` (reasoning-only families).
+        // Verified 2026-05-04 from a real session: grounding-retry forced
+        // tool_choice on a request that ended up on deepseek-reasoner, which
+        // returned `400 Invalid request: deepseek-reasoner does not support
+        // this tool_choice`. Same shape applies to OpenAI o1 / o3 and
+        // similar restricted reasoning models. Strip silently — the agent
+        // loop's grounding-retry contract already tolerates the field
+        // disappearing (it'll re-evaluate next turn).
+        if (requestPayload['tool_choice'] !== undefined && modelDoesNotSupportToolChoice(request.model)) {
+            delete requestPayload['tool_choice'];
+        }
         // ── GLM-specific optimizations ───────────────────────────────────────────
         // GLM models work best with temperature=0.8 per official zai spec.
         // Enable thinking mode only for explicit reasoning variants (-thinking-).

package/dist/agent/loop.js

@@ -431,6 +431,11 @@ export async function interactiveSession(config, getUserInput, onEvent, onAbortR
         updateSessionMeta(sessionId, {
             model: config.model,
             workDir,
+            // Pin the session's chain so `franklin --resume` can restore it
+            // even after `franklin <chain>` shortcuts mutate the persisted
+            // default. updateSessionMeta treats this field as sticky once
+            // recorded — see storage.ts.
+            chain: config.chain,
             turnCount,
             messageCount: history.length,
             inputTokens: sessionInputTokens,

package/dist/commands/start.js

@@ -46,7 +46,28 @@ export async function startCommand(options) {
         const { findLatestSessionForDir } = await import('../ui/session-picker.js');
         continueResolvedId = findLatestSessionForDir(process.cwd())?.id;
     }
-    const chain = loadChain();
+    // Sessions are wallet-bound: the conversation, audit trail, and tool
+    // results live on whichever chain the session was started on. If
+    // we're resuming, prefer the session's recorded chain over the
+    // persisted default — `franklin solana` / `franklin base` shortcuts
+    // mutate that default, and a debug invocation between restarts
+    // shouldn't be able to silently move the user to a different wallet.
+    // Only sessions created in 3.15.35+ have the field; older sessions
+    // fall back to the persisted default (matches pre-3.15.35 behavior).
+    let chain = loadChain();
+    const resumeIdEarly = (typeof options.resume === 'string' && options.resume !== 'picker') ? options.resume
+        : continueResolvedId;
+    if (resumeIdEarly) {
+        const { loadSessionMeta } = await import('../session/storage.js');
+        const sessMeta = loadSessionMeta(resumeIdEarly);
+        if (sessMeta?.chain && sessMeta.chain !== chain) {
+            console.log(chalk.dim(`  Restoring session's chain: ${sessMeta.chain} (default was ${chain}; session is wallet-bound to ${sessMeta.chain})`));
+            chain = sessMeta.chain;
+        }
+        else if (sessMeta?.chain) {
+            chain = sessMeta.chain;
+        }
+    }
     const apiUrl = API_URLS[chain];
     const config = loadConfig();
     // Resolve model. Priority: explicit --model > resumed session's model > user

package/dist/session/storage.d.ts

@@ -13,6 +13,18 @@ export interface SessionMeta {
     updatedAt: number;
     turnCount: number;
     messageCount: number;
+    /**
+     * Chain (`base` | `solana`) the session was started on. Captured at
+     * session creation so `franklin --resume` can restore the same chain
+     * even if the user later changed their default via
+     * `franklin solana` / `franklin base`. Verified 2026-05-04: a debug
+     * invocation flipped `~/.blockrun/.chain` to `solana`; the next
+     * `--resume` silently moved the user from their funded Base wallet
+     * to an underfunded Solana wallet. Sessions are wallet-bound by
+     * conversation context — switching chains mid-resume is a bug.
+     * Optional for back-compat with pre-3.15.35 sessions.
+     */
+    chain?: 'base' | 'solana';
     inputTokens?: number;
     outputTokens?: number;
     costUsd?: number;

package/dist/session/storage.js

@@ -113,6 +113,12 @@ export function updateSessionMeta(sessionId, meta) {
             ...(meta.channel !== undefined || existing?.channel !== undefined
                 ? { channel: meta.channel ?? existing?.channel }
                 : {}),
+            // Chain (base / solana) is sticky once set. We never let a later
+            // update overwrite an existing value with undefined — that would
+            // silently drop the bind-to-original-chain guarantee.
+            ...(meta.chain !== undefined || existing?.chain !== undefined
+                ? { chain: existing?.chain ?? meta.chain }
+                : {}),
             ...(meta.toolCallCounts !== undefined || existing?.toolCallCounts !== undefined
                 ? { toolCallCounts: meta.toolCallCounts ?? existing?.toolCallCounts }
                 : {}),

package/package.json

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