@blockrun/franklin 3.15.49 → 3.15.51

package/dist/agent/llm.js

@@ -431,11 +431,64 @@ export class ModelClient {
             if (!response.ok) {
                 const errorBody = await response.text().catch(() => 'unknown error');
                 const message = extractApiErrorMessage(errorBody);
-                yield {
-                    kind: 'error',
-                    payload: { status: response.status, message },
-                };
-                return;
+                // Runtime tool_choice retry. The static allowlist at line ~35
+                // catches the case where the request goes directly to a model
+                // whose name contains `deepseek-reasoner` / `openai/o1` /
+                // `openai/o3`. But the gateway sometimes ALIASES a different
+                // model name to a reasoner backend — verified 2026-05-04 in a
+                // live session: a request for `deepseek/deepseek-v4-pro`
+                // returned `400 Invalid request: 400 deepseek-reasoner does not
+                // support this tool_choice`, because the gateway routed v4-pro
+                // to a deepseek-reasoner upstream. The static allowlist can't
+                // know that. Catch the error, drop tool_choice, re-fire once.
+                // No payment re-sign needed — original 402 already settled, and
+                // the gateway treats this as the same logical request.
+                const lc = message.toLowerCase();
+                const looksLikeToolChoiceReject = response.status === 400 &&
+                    lc.includes('tool_choice') &&
+                    (lc.includes('not support') || lc.includes('unsupported') || lc.includes('does not support'));
+                if (looksLikeToolChoiceReject && requestPayload['tool_choice'] !== undefined) {
+                    delete requestPayload['tool_choice'];
+                    const retryBody = JSON.stringify(requestPayload);
+                    if (this.debug) {
+                        console.error(`[franklin] tool_choice rejected by upstream; retrying without it (model=${request.model})`);
+                    }
+                    response = await withAbortableTimeout(() => fetch(endpoint, {
+                        method: 'POST',
+                        headers,
+                        body: retryBody,
+                        signal: requestController.signal,
+                    }), requestController, createModelTimeoutError('request', request.model, requestTimeoutMs), requestTimeoutMs);
+                    if (response.status === 402) {
+                        const paymentHeader = await this.signPayment(response);
+                        if (!paymentHeader) {
+                            yield { kind: 'error', payload: { message: 'Payment signing failed' } };
+                            return;
+                        }
+                        response = await withAbortableTimeout(() => fetch(endpoint, {
+                            method: 'POST',
+                            headers: { ...headers, ...paymentHeader },
+                            body: retryBody,
+                            signal: requestController.signal,
+                        }), requestController, createModelTimeoutError('request', request.model, requestTimeoutMs), requestTimeoutMs);
+                    }
+                    if (!response.ok) {
+                        const retryBodyText = await response.text().catch(() => 'unknown error');
+                        yield {
+                            kind: 'error',
+                            payload: { status: response.status, message: extractApiErrorMessage(retryBodyText) },
+                        };
+                        return;
+                    }
+                    // Successful retry — fall through to SSE parsing below.
+                }
+                else {
+                    yield {
+                        kind: 'error',
+                        payload: { status: response.status, message },
+                    };
+                    return;
+                }
             }
             // Parse SSE stream
             yield* this.parseSSEStream(response, requestController, streamTimeoutMs, request.model);

package/dist/ui/app.js

@@ -14,6 +14,7 @@ import { resolveModel, PICKER_CATEGORIES, PICKER_MODELS_FLAT, } from './model-pi
 import { estimateCost } from '../pricing.js';
 import { formatTokens, shortModelName } from '../stats/format.js';
 import { mouse, forceDisableMouseTracking } from './mouse.js';
+import { resolveAskUserAnswer } from './ask-user-answer.js';
 // ─── Full-width input box ──────────────────────────────────────────────────
 const DISABLE_AUTO_WRAP = '\x1b[?7l';
 const ENABLE_AUTO_WRAP = '\x1b[?7h';
@@ -827,7 +828,12 @@ function RunCodeApp({ initialModel, workDir, walletAddress, walletBalance, chain
                                             ? _jsxs(Text, { color: r.ctxPct >= 80 ? 'red' : r.ctxPct >= 50 ? 'yellow' : undefined, dimColor: r.ctxPct < 50, children: ["  \u00B7  ctx ", r.ctxPct, "%"] })
                                             : ''] }) }))] }, r.key));
                 } }), permissionRequest && (_jsxs(Box, { flexDirection: "column", marginTop: 1, marginLeft: 2, children: [_jsx(Text, { color: "red", bold: true, children: "\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501 \u26A0  ACTION REQUIRED  \u26A0 \u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501" }), _jsx(Text, { color: "yellow", children: "\u256D\u2500 Permission required \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500" }), _jsxs(Text, { color: "yellow", children: ["\u2502 ", _jsx(Text, { bold: true, children: permissionRequest.toolName })] }), permissionRequest.description.split('\n').map((line, i) => (_jsxs(Text, { dimColor: true, children: ["\u2502 ", line] }, i))), _jsx(Text, { color: "yellow", children: "\u2570\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500" }), _jsx(Box, { marginLeft: 2, children: _jsxs(Text, { children: [_jsx(Text, { bold: true, color: "green", children: "[y]" }), _jsx(Text, { dimColor: true, children: " yes  " }), _jsx(Text, { bold: true, color: "cyan", children: "[a]" }), _jsx(Text, { dimColor: true, children: " always  " }), _jsx(Text, { bold: true, color: "red", children: "[n]" }), _jsx(Text, { dimColor: true, children: " no" })] }) })] })), askUserRequest && (_jsxs(Box, { flexDirection: "column", marginTop: 1, marginLeft: 2, children: [_jsx(Text, { color: "magenta", bold: true, children: "\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501 \u26A0  ANSWER REQUIRED  \u26A0 \u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501" }), _jsx(Text, { color: "cyan", children: "\u256D\u2500 Question \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500" }), _jsxs(Text, { color: "cyan", children: ["\u2502 ", _jsx(Text, { bold: true, children: askUserRequest.question })] }), askUserRequest.options && askUserRequest.options.length > 0 && (askUserRequest.options.map((opt, i) => (_jsxs(Text, { dimColor: true, children: ["\u2502 ", i + 1, ". ", opt] }, i)))), _jsx(Text, { color: "cyan", children: "\u2570\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500" }), _jsxs(Box, { marginLeft: 2, children: [_jsx(Text, { bold: true, children: "answer> " }), _jsx(TextInput, { value: askUserInput, onChange: setAskUserInput, onSubmit: (val) => {
-                                    const answer = val.trim() || '(no response)';
+                                    // resolveAskUserAnswer translates "1" / "2" / ... into the
+                                    // matching label string when the dialog showed a numbered
+                                    // option list. Without it, every onAskUser caller's
+                                    // exact-label match fails for digit answers and silently
+                                    // falls through to the default branch (typically cancel).
+                                    const answer = resolveAskUserAnswer(val, askUserRequest.options);
                                     const r = askUserRequest.resolve;
                                     setAskUserRequest(null);
                                     setAskUserInput('');

package/dist/ui/ask-user-answer.d.ts

@@ -0,0 +1,24 @@
+/**
+ * Resolve a user-typed AskUser answer against the option list.
+ *
+ * The TUI renders option labels as a numbered list ("1. X", "2. Y", …),
+ * so users naturally type the digit. Every tool-side onAskUser caller
+ * (videogen.ts:113, modal.ts:371, jupiter.ts:368, zerox-base.ts:453,
+ * zerox-gasless.ts:446) does an exact-string match against the full
+ * label, so a bare "1" silently falls through to the caller's default
+ * branch — which is typically "cancel".
+ *
+ * Verified 2026-05-04 in a live session: user typed "1" twice in a
+ * VideoGen flow, both invocations returned "Video generation cancelled
+ * (No USDC was spent)" even though the wallet had $94.72 and the
+ * Content budget had $2.00 untouched.
+ *
+ * Translation rules:
+ *   - "" → "(no response)" (preserve the existing empty-input fallback)
+ *   - "<digit>" with options.length > 0 and 1 ≤ digit ≤ options.length
+ *     → the matching label string
+ *   - anything else → the trimmed input verbatim (callers that match
+ *     against label can still get a literal answer when the user types
+ *     it out, and free-form text questions still work the same way)
+ */
+export declare function resolveAskUserAnswer(raw: string, options: readonly string[] | undefined): string;

package/dist/ui/ask-user-answer.js

@@ -0,0 +1,34 @@
+/**
+ * Resolve a user-typed AskUser answer against the option list.
+ *
+ * The TUI renders option labels as a numbered list ("1. X", "2. Y", …),
+ * so users naturally type the digit. Every tool-side onAskUser caller
+ * (videogen.ts:113, modal.ts:371, jupiter.ts:368, zerox-base.ts:453,
+ * zerox-gasless.ts:446) does an exact-string match against the full
+ * label, so a bare "1" silently falls through to the caller's default
+ * branch — which is typically "cancel".
+ *
+ * Verified 2026-05-04 in a live session: user typed "1" twice in a
+ * VideoGen flow, both invocations returned "Video generation cancelled
+ * (No USDC was spent)" even though the wallet had $94.72 and the
+ * Content budget had $2.00 untouched.
+ *
+ * Translation rules:
+ *   - "" → "(no response)" (preserve the existing empty-input fallback)
+ *   - "<digit>" with options.length > 0 and 1 ≤ digit ≤ options.length
+ *     → the matching label string
+ *   - anything else → the trimmed input verbatim (callers that match
+ *     against label can still get a literal answer when the user types
+ *     it out, and free-form text questions still work the same way)
+ */
+export function resolveAskUserAnswer(raw, options) {
+    const trimmed = raw.trim();
+    if (!trimmed)
+        return '(no response)';
+    if (options && options.length > 0 && /^\d+$/.test(trimmed)) {
+        const idx = parseInt(trimmed, 10) - 1;
+        if (idx >= 0 && idx < options.length)
+            return options[idx];
+    }
+    return trimmed;
+}

package/package.json

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