@blockrun/franklin 3.15.20 → 3.15.21

package/dist/proxy/fallback.js

@@ -2,19 +2,7 @@
  * Fallback chain for Franklin
  * Automatically switches to backup models when primary fails (429, 5xx, etc.)
  */
-import fs from 'node:fs';
-import os from 'node:os';
-import path from 'node:path';
-const LOG_FILE = path.join(os.homedir(), '.blockrun', 'franklin-debug.log');
-// eslint-disable-next-line no-control-regex
-const ANSI_RE = /\x1B\[[0-9;]*[A-Za-z]|\x1B\][^\x07]*\x07|\x1B[()][A-B]|\r/g;
-function appendLog(msg) {
-    try {
-        fs.mkdirSync(path.dirname(LOG_FILE), { recursive: true });
-        fs.appendFileSync(LOG_FILE, `[${new Date().toISOString()}] ${msg.replace(ANSI_RE, '')}\n`);
-    }
-    catch { /* ignore */ }
-}
+import { logger } from '../logger.js';
 export const DEFAULT_FALLBACK_CONFIG = {
     chain: [
         'deepseek/deepseek-chat', // Direct fallback — cheap & reliable
@@ -93,7 +81,7 @@ export async function fetchWithFallback(url, init, originalBody, config = DEFAUL
             if (nextModel && onFallback) {
                 const errMsg = err instanceof Error ? err.message : 'Network error';
                 onFallback(model, 0, nextModel);
-                appendLog(`[franklin] [fallback] ${model} network error: ${errMsg}`);
+                logger.warn(`[franklin] [fallback] ${model} network error: ${errMsg}`);
             }
             if (i < config.chain.length - 1) {
                 await sleep(config.retryDelayMs);

package/dist/proxy/server.js

@@ -1,7 +1,4 @@
 import http from 'node:http';
-import fs from 'node:fs';
-import path from 'node:path';
-import os from 'node:os';
 import { getOrCreateWallet, getOrCreateSolanaWallet, createPaymentPayload, createSolanaPaymentPayload, parsePaymentRequired, extractPaymentDetails, solanaKeyToBytes, SOLANA_NETWORK, } from '@blockrun/llm';
 import { recordUsage } from '../stats/tracker.js';
 import { appendAudit } from '../stats/audit.js';
@@ -12,34 +9,13 @@ import { VERSION } from '../config.js';
 // User-Agent for backend requests
 const USER_AGENT = `franklin/${VERSION}`;
 const X_FRANKLIN_VERSION = VERSION;
-const LOG_FILE = path.join(os.homedir(), '.blockrun', 'franklin-debug.log');
-// Strip ANSI escape codes so log file doesn't distort terminal on replay
-function stripAnsi(str) {
-    // eslint-disable-next-line no-control-regex
-    return str.replace(/\x1B\[[0-9;]*[A-Za-z]|\x1B\][^\x07]*\x07|\x1B[()][A-B]|\r/g, '');
-}
-function debug(options, ...args) {
-    if (!options.debug)
-        return;
-    const msg = `[${new Date().toISOString()}] ${stripAnsi(args.map(String).join(' '))}\n`;
-    try {
-        fs.mkdirSync(path.dirname(LOG_FILE), { recursive: true });
-        fs.appendFileSync(LOG_FILE, msg);
-    }
-    catch {
-        /* ignore */
-    }
-}
-function log(...args) {
-    const msg = `[franklin] ${args.map(String).join(' ')}`;
-    // Do NOT print to stdout — the terminal is owned by the parent process (stdio: inherit).
-    // Use `franklin logs` to read runtime messages.
-    try {
-        fs.mkdirSync(path.dirname(LOG_FILE), { recursive: true });
-        fs.appendFileSync(LOG_FILE, `[${new Date().toISOString()}] ${stripAnsi(msg)}\n`);
-    }
-    catch { /* ignore */ }
-}
+// Logging here goes through the unified logger introduced in 3.15.11
+// (timestamp + [LEVEL] tag, self-rotating at 10 MB, optional stderr
+// mirror in debug mode). The previous per-module debug()/log() helpers
+// duplicated the file path, ANSI strip regex (with a slightly different
+// pattern!), and timestamp format — bug fixes never propagated. They
+// were the last holdouts after the agent loop was migrated.
+import { logger, setDebugMode } from '../logger.js';
 const DEFAULT_MAX_TOKENS = 4096;
 // 180s budget for *time-to-headers* — reasoning-class models (zai/glm-*,
 // nemotron *-reasoning, deepseek-r*, gpt-5-codex, anthropic extended-thinking)
@@ -249,6 +225,10 @@ function withinRateLimit() {
     return true;
 }
 export function createProxy(options) {
+    // Wire stderr-mirroring of unified logger output to the proxy's debug
+    // flag — same pattern as interactiveSession in agent/loop. File writes
+    // happen regardless; only the live stderr mirror is gated.
+    setDebugMode(!!options.debug);
     const chain = options.chain || 'base';
     let currentModel = options.modelOverride || DEFAULT_MODEL;
     const fallbackEnabled = options.fallbackEnabled !== false; // Default true
@@ -307,19 +287,22 @@ export function createProxy(options) {
             let requestModel = currentModel || options.modelOverride || 'unknown';
             let usedFallback = false;
             try {
-                debug(options, `request: ${req.method} ${req.url} currentModel=${currentModel || 'none'}`);
+                if (options.debug)
+                    logger.debug(`[franklin] request: ${req.method} ${req.url} currentModel=${currentModel || 'none'}`);
                 if (body) {
                     try {
                         const parsed = JSON.parse(body);
                         // Intercept "use <model>" commands for in-session model switching
                         if (parsed.messages) {
                             const last = parsed.messages[parsed.messages.length - 1];
-                            debug(options, `last msg role=${last?.role} content-type=${typeof last?.content} content=${JSON.stringify(last?.content).slice(0, 200)}`);
+                            if (options.debug)
+                                logger.debug(`[franklin] last msg role=${last?.role} content-type=${typeof last?.content} content=${JSON.stringify(last?.content).slice(0, 200)}`);
                         }
                         const switchCmd = detectModelSwitch(parsed);
                         if (switchCmd) {
                             currentModel = switchCmd;
-                            debug(options, `model switched to: ${currentModel}`);
+                            if (options.debug)
+                                logger.debug(`[franklin] model switched to: ${currentModel}`);
                             const fakeResponse = {
                                 id: `msg_franklin_${Date.now()}`,
                                 type: 'message',
@@ -374,7 +357,7 @@ export function createProxy(options) {
                             const routing = routeRequest(promptText, routingProfile);
                             parsed.model = routing.model;
                             requestModel = routing.model;
-                            log(`🧠 Smart routing: ${routingProfile} → ${routing.tier} → ${routing.model} ` +
+                            logger.info(`[franklin] 🧠 Smart routing: ${routingProfile} → ${routing.tier} → ${routing.model} ` +
                                 `(${(routing.savings * 100).toFixed(0)}% savings) [${routing.signals.join(', ')}]`);
                         }
                         {
@@ -392,8 +375,8 @@ export function createProxy(options) {
                                 ? Math.max(lastOut * 2, DEFAULT_MAX_TOKENS)
                                 : DEFAULT_MAX_TOKENS;
                             parsed.max_tokens = Math.min(adaptive, modelCap);
-                            if (original !== parsed.max_tokens) {
-                                debug(options, `max_tokens: ${original || 'unset'} → ${parsed.max_tokens} (last output: ${lastOut || 'none'})`);
+                            if (original !== parsed.max_tokens && options.debug) {
+                                logger.debug(`[franklin] max_tokens: ${original || 'unset'} → ${parsed.max_tokens} (last output: ${lastOut || 'none'})`);
                             }
                         }
                         body = JSON.stringify(parsed);
@@ -430,7 +413,7 @@ export function createProxy(options) {
                             body = JSON.stringify(parsed);
                         }
                         catch { /* body not JSON, skip */ }
-                        log(`⚠️  Safety net: resolved unrouted ${virtualName} → ${requestModel}`);
+                        logger.warn(`[franklin] ⚠️  Safety net: resolved unrouted ${virtualName} → ${requestModel}`);
                     }
                 }
                 // Build request init
@@ -456,7 +439,7 @@ export function createProxy(options) {
                         solanaWallet,
                         timeoutMs: requestTimeoutMs,
                     }, (failedModel, status, nextModel) => {
-                        log(`⚠️  ${failedModel} returned ${status}, falling back to ${nextModel}`);
+                        logger.warn(`[franklin] ⚠️  ${failedModel} returned ${status}, falling back to ${nextModel}`);
                     });
                     response = result.response;
                     finalModel = result.modelUsed;
@@ -464,7 +447,7 @@ export function createProxy(options) {
                     body = result.bodyUsed;
                     usedFallback = result.fallbackUsed;
                     if (usedFallback) {
-                        log(`↺ Fallback successful: using ${finalModel}`);
+                        logger.info(`[franklin] ↺ Fallback successful: using ${finalModel}`);
                     }
                 }
                 else {
@@ -516,7 +499,7 @@ export function createProxy(options) {
                     }
                     res.writeHead(response.status, { 'Content-Type': 'application/json' });
                     res.end(errorBody);
-                    log(`⚠️  ${response.status} from backend for ${finalModel}`);
+                    logger.warn(`[franklin] ⚠️  ${response.status} from backend for ${finalModel}`);
                     return;
                 }
                 res.writeHead(response.status, responseHeaders);
@@ -531,7 +514,7 @@ export function createProxy(options) {
                     const pump = async () => {
                         while (true) {
                             if (Date.now() > streamDeadline) {
-                                log('⚠️  Stream timeout after 5 minutes');
+                                logger.warn('[franklin] ⚠️  Stream timeout after 5 minutes');
                                 try {
                                     reader.cancel();
                                 }
@@ -576,7 +559,8 @@ export function createProxy(options) {
                                             fallback: usedFallback,
                                             source: 'proxy',
                                         });
-                                        debug(options, `recorded: model=${finalModel} in=${inputTokens} out=${outputTokens} cost=$${cost.toFixed(4)} fallback=${usedFallback}`);
+                                        if (options.debug)
+                                            logger.debug(`[franklin] recorded: model=${finalModel} in=${inputTokens} out=${outputTokens} cost=$${cost.toFixed(4)} fallback=${usedFallback}`);
                                     }
                                 }
                                 res.end();
@@ -590,7 +574,7 @@ export function createProxy(options) {
                         }
                     };
                     pump().catch((err) => {
-                        log(`❌ Stream error: ${err instanceof Error ? err.message : String(err)}`);
+                        logger.error(`[franklin] ❌ Stream error: ${err instanceof Error ? err.message : String(err)}`);
                         res.end();
                     });
                 }
@@ -615,7 +599,8 @@ export function createProxy(options) {
                                 fallback: usedFallback,
                                 source: 'proxy',
                             });
-                            debug(options, `recorded: model=${finalModel} in=${inputTokens} out=${outputTokens} cost=$${cost.toFixed(4)} fallback=${usedFallback}`);
+                            if (options.debug)
+                                logger.debug(`[franklin] recorded: model=${finalModel} in=${inputTokens} out=${outputTokens} cost=$${cost.toFixed(4)} fallback=${usedFallback}`);
                         }
                     }
                     catch {
@@ -626,7 +611,7 @@ export function createProxy(options) {
             }
             catch (error) {
                 const msg = error instanceof Error ? error.message : 'Proxy error';
-                log(`❌ Error: ${msg}`);
+                logger.error(`[franklin] ❌ Error: ${msg}`);
                 res.writeHead(502, { 'Content-Type': 'application/json' });
                 res.end(JSON.stringify({
                     type: 'error',
@@ -693,7 +678,7 @@ async function fetchWithPaymentFallback(url, init, originalBody, config, payment
             if (nextModel && onFallback) {
                 onFallback(model, 0, nextModel);
             }
-            log(`[fallback] ${model} request error: ${err instanceof Error ? err.message : String(err)}`);
+            logger.warn(`[franklin] [fallback] ${model} request error: ${err instanceof Error ? err.message : String(err)}`);
             if (i < config.chain.length - 1) {
                 await sleep(config.retryDelayMs);
             }

package/package.json

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