@blockrun/franklin 3.15.37 → 3.15.39

package/dist/agent/loop.js

@@ -403,6 +403,12 @@ export async function interactiveSession(config, getUserInput, onEvent, onAbortR
     let turnCount = 0;
     // Resume: hydrate history from the saved JSONL transcript.
     // Sanitize to drop any orphaned tool_use / tool_result pairs from a crash.
+    // Carry over running totals from prior runs so resume preserves them — see
+    // the `let sessionInputTokens` comment below.
+    let resumedInputTokens = 0;
+    let resumedOutputTokens = 0;
+    let resumedCostUsd = 0;
+    let resumedSavedVsOpusUsd = 0;
     if (config.resumeSessionId) {
         const prior = loadSessionHistory(config.resumeSessionId);
         if (prior.length > 0) {
@@ -411,6 +417,17 @@ export async function interactiveSession(config, getUserInput, onEvent, onAbortR
             const meta = loadSessionMeta(config.resumeSessionId);
             if (meta) {
                 turnCount = meta.turnCount ?? 0;
+                // Pre-3.15.38 these fell on the floor — every resume reset the
+                // running cost/token totals to zero, then `updateSessionMeta`
+                // wrote the new (smaller) numbers back over the historical
+                // values. Verified 2026-05-04 from a real session: efd5e412
+                // had $2.65 + 200K input tokens accumulated, then a resume
+                // rewrote the meta to {costUsd: 0, inputTokens: 0, ...}
+                // before the user ran their next turn.
+                resumedInputTokens = meta.inputTokens ?? 0;
+                resumedOutputTokens = meta.outputTokens ?? 0;
+                resumedCostUsd = meta.costUsd ?? 0;
+                resumedSavedVsOpusUsd = meta.savedVsOpusUsd ?? 0;
             }
         }
     }
@@ -418,10 +435,14 @@ export async function interactiveSession(config, getUserInput, onEvent, onAbortR
     let lastSessionActivity = Date.now();
     let lastRoutedModel = ''; // last model chosen by router (for local elo)
     let lastRoutedCategory = ''; // last category detected (for local elo)
-    let sessionInputTokens = 0;
-    let sessionOutputTokens = 0;
-    let sessionCostUsd = 0;
-    let sessionSavedVsOpus = 0;
+    // Session-cumulative counters. Seeded from prior session meta on resume so
+    // `franklin insights` and the status bar show the *true* session total
+    // across every restart, not just what happened since the latest process
+    // boot.
+    let sessionInputTokens = resumedInputTokens;
+    let sessionOutputTokens = resumedOutputTokens;
+    let sessionCostUsd = resumedCostUsd;
+    let sessionSavedVsOpus = resumedSavedVsOpusUsd;
     // Per-tool call counts aggregated across every turn. Session-scope, not
     // per-turn. Counts the *name* of each tool invocation only — no inputs,
     // outputs, or paths. Fed into opt-in telemetry at session end.

package/dist/tools/bash.js

@@ -2,6 +2,7 @@
  * Bash capability — execute shell commands with timeout and output capture.
  */
 import { spawn } from 'node:child_process';
+import fs from 'node:fs';
 // ─── Smart Output Compression ─────────────────────────────────────────────
 // Learned from RTK (Rust Token Killer): strip noise before sending to LLM.
 // Applied after capture, before the 32KB cap — reduces tokens on verbose commands.
@@ -273,7 +274,19 @@ async function execute(input, ctx) {
 }
 function executeCommand(command, timeoutMs, ctx) {
     return new Promise((resolve) => {
-        const shell = process.env.SHELL || '/bin/bash';
+        // Force /bin/bash (not $SHELL) so the tool's behavior matches its name
+        // and its tool description. Pre-3.15.39 used `process.env.SHELL ||
+        // '/bin/bash'`, which on macOS defaults to zsh — and zsh has
+        // semantically different rules (NOMATCH on unmatched globs is fatal,
+        // unlike bash's literal-passthrough). Verified 2026-05-04 from a real
+        // session: agent ran `rm -f data/etl_out/shard-*.ndjson` expecting
+        // bash's "if no match, -f ignores it"; zsh fatal-erred with `no
+        // matches found`. Other zsh-vs-bash divergences (process substitution
+        // syntax, `[[` bashisms in scripts, parameter expansion edge cases)
+        // would silently bite agents that learned bash. /bin/bash exists on
+        // every Linux + macOS install we ship to. Fall back to $SHELL only if
+        // /bin/bash is somehow missing (NixOS-style stores, exotic Docker).
+        const shell = fs.existsSync('/bin/bash') ? '/bin/bash' : (process.env.SHELL || '/bin/sh');
         let child;
         try {
             child = spawn(shell, ['-c', command], {

package/package.json

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