whale-code 6.5.0 → 6.5.2

package/bin/swagmanager-mcp.js

@@ -12,6 +12,7 @@
  *   whale mcp list|add|remove    Manage MCP servers
  *   whale doctor                 Run diagnostics
  *   whale config [key] [value]   View/set configuration
+ *   whale update                  Update to latest version
  *   whale help                   Show this help
  *   (non-TTY stdin)              MCP stdio server for Claude Code / Cursor
  */
@@ -169,6 +170,24 @@ if (flags.version) {
   process.exit(0);
 }
 
+// ── Background update check (non-blocking, TTY only) ──
+const PACKAGE_NAME = "whale-code";
+async function checkForUpdate() {
+  try {
+    const { execSync } = await import("child_process");
+    const latest = execSync(`npm view ${PACKAGE_NAME} version 2>/dev/null`, { encoding: "utf-8", timeout: 5000 }).trim();
+    if (latest && latest !== PKG_VERSION) {
+      const d = "\x1b[2m", r = "\x1b[0m", c = "\x1b[36m", B = "\x1b[1m";
+      console.log(`\n${d}  Update available: ${r}${c}v${PKG_VERSION}${r}${d} → ${r}${c}${B}v${latest}${r}`);
+      console.log(`${d}  Run ${r}${B}whale update${r}${d} or ${r}${B}npm i -g ${PACKAGE_NAME}@latest${r}\n`);
+    }
+  } catch { /* silent — network or npm not available */ }
+}
+if (process.stdin.isTTY && !flags.print && !flags.version && !flags.help) {
+  // Fire and forget — don't block startup
+  checkForUpdate();
+}
+
 // ── Help ──
 if (flags.help && !subcommand) {
   showHelp();
@@ -312,6 +331,31 @@ switch (command) {
     break;
   }
 
+  case "update":
+  case "upgrade": {
+    const { execSync } = await import("child_process");
+    const d = "\x1b[2m", r = "\x1b[0m", c = "\x1b[36m", g = "\x1b[32m", B = "\x1b[1m";
+
+    console.log(`${d}  Checking for updates...${r}`);
+    try {
+      const latest = execSync(`npm view ${PACKAGE_NAME} version 2>/dev/null`, { encoding: "utf-8", timeout: 10000 }).trim();
+      if (latest === PKG_VERSION) {
+        console.log(`${g}  ✓${r} whale-code v${PKG_VERSION} is already up to date`);
+        process.exit(0);
+      }
+      console.log(`${d}  Updating ${r}v${PKG_VERSION}${d} → ${r}${B}v${latest}${r}`);
+      console.log();
+      execSync(`npm install -g ${PACKAGE_NAME}@latest`, { stdio: "inherit" });
+      console.log();
+      console.log(`${g}  ✓${r} Updated to whale-code v${latest}`);
+    } catch (err) {
+      console.error(`  ✗ Update failed: ${err.message}`);
+      console.error(`    Try: sudo npm install -g ${PACKAGE_NAME}@latest`);
+      process.exit(1);
+    }
+    break;
+  }
+
   case "agent": {
     // Forward remaining args to local-agent CLI
     // Rebuild process.argv so the agent sees: [node, script, subcommand, ...flags]

package/dist/cli/services/agent-loop.js

@@ -26,7 +26,7 @@ import { captureError, addBreadcrumb } from "./error-logger.js";
 import { setGlobalEmitter, clearGlobalEmitter, } from "./agent-events.js";
 import { mcpClientManager } from "./mcp-client.js";
 import { loadHooks, runBeforeToolHook, runAfterToolHook, runSessionHook } from "./hooks.js";
-import { LoopDetector, COMPACTION_TRIGGER_TOKENS, COMPACTION_TOTAL_BUDGET, getCompactionConfig } from "../../shared/agent-core.js";
+import { LoopDetector, COMPACTION_TRIGGER_TOKENS, COMPACTION_TOTAL_BUDGET, getCompactionConfig, DEFAULT_SESSION_COST_BUDGET_USD, emitCostWarningIfNeeded } from "../../shared/agent-core.js";
 import { parseSSEStream, processStreamWithCallbacks, collectStreamResult } from "../../shared/sse-parser.js";
 import { callServerProxy, callTranscribe, buildAPIRequest, buildSystemBlocks, prepareWithCaching, trimGeminiContext, trimOpenAIContext, requestProviderCompaction } from "../../shared/api-client.js";
 import { getProvider, MODELS } from "../../shared/constants.js";
@@ -308,6 +308,7 @@ export async function runAgentLoop(opts) {
     let sessionCostUsd = 0;
     let compactionCount = 0;
     const costWarningsEmitted = new Set();
+    const effectiveBudget = opts.maxBudgetUsd ?? DEFAULT_SESSION_COST_BUDGET_USD;
     const activeModel = getModel();
     // Tool executor — routes to interactive, local, server, or MCP tools.
     // Wraps execution with before/after hooks when hooks are loaded.
@@ -384,16 +385,16 @@ export async function runAgentLoop(opts) {
                 callbacks.onError("Cancelled", messages);
                 return;
             }
-            // Budget enforcement
-            if (opts.maxBudgetUsd && sessionCostUsd >= opts.maxBudgetUsd) {
-                logSpan({ action: "chat.budget_exceeded", durationMs: Date.now() - sessionStart, context: turnCtx, storeId: storeId || undefined, severity: "warn", details: { session_cost_usd: sessionCostUsd, max_budget_usd: opts.maxBudgetUsd, iteration } });
-                callbacks.onError(`Budget exceeded: $${sessionCostUsd.toFixed(4)} >= $${opts.maxBudgetUsd}`, messages);
+            // Budget enforcement — always enforced (defaults to DEFAULT_SESSION_COST_BUDGET_USD)
+            if (sessionCostUsd >= effectiveBudget) {
+                logSpan({ action: "chat.budget_exceeded", durationMs: Date.now() - sessionStart, context: turnCtx, storeId: storeId || undefined, severity: "warn", details: { session_cost_usd: sessionCostUsd, max_budget_usd: effectiveBudget, iteration } });
+                callbacks.onError(`Budget exceeded: $${sessionCostUsd.toFixed(4)} >= $${effectiveBudget}`, messages);
                 return;
             }
             const apiStart = Date.now();
             const apiSpanId = generateSpanId();
             const apiRowId = crypto.randomUUID(); // UUID for this span's row — children reference via parent_id
-            const costContext = `Session cost: $${sessionCostUsd.toFixed(2)}${opts.maxBudgetUsd ? ` | Budget remaining: $${(opts.maxBudgetUsd - sessionCostUsd).toFixed(2)}` : ""}`;
+            const costContext = `Session cost: $${sessionCostUsd.toFixed(2)} | Budget remaining: $${(effectiveBudget - sessionCostUsd).toFixed(2)}`;
             // Build API request config
             const currentModel = getModel();
             const apiConfig = buildAPIRequest({
@@ -516,20 +517,12 @@ export async function runAgentLoop(opts) {
             totalThinking += result.thinkingTokens;
             sessionCostUsd += estimateCostUsd(result.usage.inputTokens, result.usage.outputTokens, currentModel, result.thinkingTokens, result.usage.cacheReadTokens, result.usage.cacheCreationTokens);
             // Graduated cost warnings
-            if (opts.maxBudgetUsd) {
-                for (const pct of [25, 50, 75]) {
-                    if (!costWarningsEmitted.has(pct) && sessionCostUsd >= opts.maxBudgetUsd * (pct / 100)) {
-                        costWarningsEmitted.add(pct);
-                        const warnMsg = `\n[Cost warning: ${pct}% of budget used ($${sessionCostUsd.toFixed(2)}/$${opts.maxBudgetUsd.toFixed(2)}). ${pct >= 75 ? "Wrap up soon." : ""}]`;
-                        if (emitter) {
-                            emitter.emitText(warnMsg);
-                        }
-                        else {
-                            callbacks.onText(warnMsg);
-                        }
-                    }
-                }
+            emitCostWarningIfNeeded(sessionCostUsd, effectiveBudget, costWarningsEmitted, (text) => { if (emitter) {
+                emitter.emitText(text);
             }
+            else {
+                callbacks.onText(text);
+            } });
             // Server-side context management notification
             if (result.contextManagementApplied) {
                 callbacks.onAutoCompact?.(messages.length, messages.length, 0);

package/dist/cli/services/subagent.js

@@ -11,7 +11,7 @@ import { readFileSync, existsSync, writeFileSync, mkdirSync, appendFileSync } fr
 import { join } from "path";
 import { homedir, tmpdir } from "os";
 import { LOCAL_TOOL_DEFINITIONS, } from "./local-tools.js";
-import { LoopDetector, estimateCostUsd } from "../../shared/agent-core.js";
+import { LoopDetector, estimateCostUsd, demoteSubagentModel } from "../../shared/agent-core.js";
 import { MODEL_MAP } from "../../shared/constants.js";
 import { loadServerToolDefinitions, } from "./server-tools.js";
 import { logSpan, generateSpanId, generateTraceId } from "./telemetry.js";
@@ -283,20 +283,9 @@ function emitSubagentProgress(agentType, agentId, message, turn, toolName) {
 export async function runSubagent(options) {
     const { prompt, subagent_type, model, resume, max_turns, name, parentContext, parentTraceContext } = options;
     const agentId = resume || generateAgentId();
-    // Sub-agents default to Haiku for cost control, with model demotion:
-    // - explore/research: always Haiku regardless of request
-    // - general-purpose/plan: allow Sonnet max, demote Opus to Sonnet
-    const demoteModel = (m) => {
-        const isLightType = subagent_type === "explore" || subagent_type === "research";
-        if (isLightType)
-            return MODEL_MAP["haiku"];
-        if (!m)
-            return MODEL_MAP["haiku"];
-        if (m === "opus")
-            return MODEL_MAP["sonnet"];
-        return MODEL_MAP[m] || MODEL_MAP["haiku"];
-    };
-    const modelId = demoteModel(model);
+    // Sub-agents default to Haiku for cost control — uses shared demotion logic
+    const demotedAlias = demoteSubagentModel(model, subagent_type);
+    const modelId = MODEL_MAP[demotedAlias] || MODEL_MAP["haiku"];
     const cwd = process.cwd();
     const systemPrompt = buildAgentPrompt(subagent_type, cwd);
     const startTime = Date.now();
@@ -646,8 +635,8 @@ Each agent completes autonomously and returns results.`,
             },
             model: {
                 type: "string",
-                enum: ["sonnet", "opus", "haiku"],
-                description: "Optional model override. If not specified, inherits from parent. Prefer haiku for quick, straightforward tasks to minimize cost and latency.",
+                enum: ["sonnet", "haiku"],
+                description: "Optional model. haiku (default) for fast tasks, sonnet for complex reasoning.",
             },
             resume: {
                 type: "string",

package/dist/cli/services/tools/file-ops.js

@@ -16,22 +16,33 @@ export function resolvePath(p) {
     return p;
 }
 const READ_CACHE_MAX = 100;
+const MAX_ENTRY_SIZE = 100_000; // 100KB — skip caching larger files
+const MAX_CACHE_BYTES = 10_000_000; // 10MB total budget
+let totalCacheBytes = 0;
 const readCache = new Map();
 /** Clear the session-level read cache. Call on session reset. */
 export function clearReadCache() {
     readCache.clear();
+    totalCacheBytes = 0;
 }
 /** Invalidate a specific path from the cache (call on write/edit). */
 function invalidateCache(path) {
-    readCache.delete(path);
+    const existing = readCache.get(path);
+    if (existing) {
+        totalCacheBytes -= existing.content.length;
+        readCache.delete(path);
+    }
 }
-/** LRU eviction: remove oldest entry when cache is full. */
+/** LRU eviction: remove oldest entries when cache exceeds count or byte budget. */
 function evictIfNeeded() {
-    if (readCache.size >= READ_CACHE_MAX) {
-        // Map insertion order = LRU order; delete the first (oldest) entry
+    while (readCache.size >= READ_CACHE_MAX || totalCacheBytes > MAX_CACHE_BYTES) {
         const oldest = readCache.keys().next().value;
-        if (oldest)
-            readCache.delete(oldest);
+        if (!oldest)
+            break;
+        const entry = readCache.get(oldest);
+        if (entry)
+            totalCacheBytes -= entry.content.length;
+        readCache.delete(oldest);
     }
 }
 // ============================================================================
@@ -151,14 +162,17 @@ export async function readFile(input) {
     }
     const content = readFileSync(path, "utf-8");
     const lines = content.split("\n");
-    // Cache the read
-    try {
-        const stat = statSync(path);
-        evictIfNeeded();
-        readCache.set(path, { content, mtimeMs: stat.mtimeMs, size: stat.size });
-    }
-    catch {
-        // stat failed — skip caching
+    // Cache the read — skip caching files larger than MAX_ENTRY_SIZE
+    if (content.length <= MAX_ENTRY_SIZE) {
+        try {
+            const stat = statSync(path);
+            evictIfNeeded();
+            readCache.set(path, { content, mtimeMs: stat.mtimeMs, size: stat.size });
+            totalCacheBytes += content.length;
+        }
+        catch {
+            // stat failed — skip caching
+        }
     }
     return formatTextFileResult(lines, input, content);
 }

package/dist/server/lib/compaction-service.js

@@ -3,6 +3,7 @@
 // Used for non-Anthropic providers (OpenAI, Gemini) that lack native
 // server-side compaction. Calls Haiku to produce a transparent summary
 // using the same instructions as compact_20260112.
+import { djb2Hash } from "../../shared/agent-core.js";
 const COMPACTION_MODEL = "claude-haiku-4-5-20251001";
 const COMPACTION_MAX_TOKENS = 4096;
 const COMPACTION_TIMEOUT_MS = 30_000;
@@ -63,7 +64,7 @@ export function preCompact(messages) {
             const rc = typeof block.content === "string" ? block.content : JSON.stringify(block.content);
             if (rc.length < 200)
                 continue; // Skip small results — not worth deduping
-            const hashKey = `${rc.length}:${rc.slice(0, 200)}`;
+            const hashKey = djb2Hash(rc);
             const existing = contentHashes.get(hashKey);
             if (existing) {
                 existing.count++;
@@ -84,7 +85,7 @@ export function preCompact(messages) {
             const rc = typeof block.content === "string" ? block.content : JSON.stringify(block.content);
             if (rc.length < 200)
                 return block;
-            const hashKey = `${rc.length}:${rc.slice(0, 200)}`;
+            const hashKey = djb2Hash(rc);
             const entry = contentHashes.get(hashKey);
             if (entry && entry.count >= 2 && i !== entry.firstIdx) {
                 bytesRemoved += rc.length - 50;

package/dist/server/lib/server-agent-loop.js

@@ -8,7 +8,7 @@
  * Consolidates: streaming, prompt caching, context management betas, compaction,
  * loop detection, parallel tool execution, subagent delegation, retry, cost tracking.
  */
-import { LoopDetector, getContextManagement, getMaxOutputTokens, getThinkingConfig, addPromptCaching, estimateCostUsd, isRetryableError, sanitizeError, routeModel, resolveToolChoice, COMPACTION_TRIGGER_TOKENS, COMPACTION_TOTAL_BUDGET, DEFAULT_SESSION_COST_BUDGET_USD, } from "../../shared/agent-core.js";
+import { LoopDetector, getContextManagement, getMaxOutputTokens, getThinkingConfig, addPromptCaching, estimateCostUsd, isRetryableError, sanitizeError, routeModel, resolveToolChoice, emitCostWarningIfNeeded, demoteSubagentModel, COMPACTION_TRIGGER_TOKENS, COMPACTION_TOTAL_BUDGET, DEFAULT_SESSION_COST_BUDGET_USD, } from "../../shared/agent-core.js";
 import { processStreamWithCallbacks } from "../../shared/sse-parser.js";
 import { MODELS } from "../../shared/constants.js";
 import { dispatchTools, buildAssistantContent } from "../../shared/tool-dispatch.js";
@@ -50,7 +50,10 @@ function mapToolChoiceForAnthropic(tc) {
 // UNIFIED AGENT LOOP
 // ============================================================================
 export async function runServerAgentLoop(opts) {
-    const { anthropic, model, systemPrompt, messages, tools: inputTools, maxTurns, temperature, enableDelegation = true, enablePromptCaching = true, enableStreaming = true, maxConcurrentTools = DEFAULT_MAX_CONCURRENT_TOOLS, maxCostUsd = DEFAULT_SESSION_COST_BUDGET_USD, onText, onToolStart, onCitation, documents, clientDisconnected = { value: false }, startedAt = Date.now(), maxDurationMs = 15 * 60 * 1000, } = opts;
+    const { anthropic, model, systemPrompt, messages, tools: inputTools, maxTurns, temperature, enableDelegation = true, enablePromptCaching = true, enableStreaming = true, maxConcurrentTools = DEFAULT_MAX_CONCURRENT_TOOLS, maxCostUsd: maxCostUsdOpt, onText, onToolStart, onCitation, documents, clientDisconnected = { value: false }, startedAt = Date.now(), maxDurationMs = 15 * 60 * 1000, } = opts;
+    // Resolve cost budget: explicit opt > env var > default
+    const envBudget = parseFloat(process.env.WHALE_COST_BUDGET_USD || "");
+    const maxCostUsd = maxCostUsdOpt ?? (isFinite(envBudget) ? envBudget : DEFAULT_SESSION_COST_BUDGET_USD);
     // Auto-inject delegate_task for all models (subagents always use Claude Haiku/Sonnet)
     // activeTools is mutable — discover_tools adds to it during the session
     const activeTools = [...inputTools];
@@ -262,14 +265,7 @@ export async function runServerAgentLoop(opts) {
             // Update cost (include cache tokens for accurate pricing)
             sessionCostUsd = estimateCostUsd(totalIn, totalOut, model, 0, cacheReadTokens, cacheCreationTokens);
             // Graduated cost warnings — give the LLM visibility into spend
-            if (isFinite(maxCostUsd)) {
-                for (const pct of [25, 50, 75]) {
-                    if (!costWarningsEmitted.has(pct) && sessionCostUsd >= maxCostUsd * (pct / 100)) {
-                        costWarningsEmitted.add(pct);
-                        onText?.(`\n[Cost warning: ${pct}% of budget used ($${sessionCostUsd.toFixed(2)}/$${maxCostUsd.toFixed(2)}). ${pct >= 75 ? "Wrap up soon." : ""}]`);
-                    }
-                }
-            }
+            emitCostWarningIfNeeded(sessionCostUsd, maxCostUsd, costWarningsEmitted, onText);
             // Record per-turn metrics for observability
             const turnToolNames = toolUseBlocks.map(b => b.name);
             turnMetrics.push({
@@ -349,14 +345,7 @@ export async function runServerAgentLoop(opts) {
             totalOut += subagentTokens.output;
             sessionCostUsd = estimateCostUsd(totalIn, totalOut, model, 0, cacheReadTokens, cacheCreationTokens) + subagentTokens.costUsd;
             // Cost warnings after subagent aggregation (subagents can be expensive)
-            if (isFinite(maxCostUsd)) {
-                for (const pct of [25, 50, 75]) {
-                    if (!costWarningsEmitted.has(pct) && sessionCostUsd >= maxCostUsd * (pct / 100)) {
-                        costWarningsEmitted.add(pct);
-                        onText?.(`\n[Cost warning: ${pct}% of budget used ($${sessionCostUsd.toFixed(2)}/$${maxCostUsd.toFixed(2)}). ${pct >= 75 ? "Wrap up soon." : ""}]`);
-                    }
-                }
-            }
+            emitCostWarningIfNeeded(sessionCostUsd, maxCostUsd, costWarningsEmitted, onText);
             const assistantContent = buildAssistantContent({ text: currentText, toolUseBlocks, compactionContent });
             messages.push({ role: "assistant", content: assistantContent });
             messages.push({ role: "user", content: toolResults });
@@ -453,14 +442,7 @@ export async function runServerAgentLoop(opts) {
             }
             sessionCostUsd = estimateCostUsd(totalIn, totalOut, model, 0, cacheReadTokens, cacheCreationTokens);
             // Graduated cost warnings (non-streaming path)
-            if (isFinite(maxCostUsd)) {
-                for (const pct of [25, 50, 75]) {
-                    if (!costWarningsEmitted.has(pct) && sessionCostUsd >= maxCostUsd * (pct / 100)) {
-                        costWarningsEmitted.add(pct);
-                        onText?.(`\n[Cost warning: ${pct}% of budget used ($${sessionCostUsd.toFixed(2)}/$${maxCostUsd.toFixed(2)}). ${pct >= 75 ? "Wrap up soon." : ""}]`);
-                    }
-                }
-            }
+            emitCostWarningIfNeeded(sessionCostUsd, maxCostUsd, costWarningsEmitted, onText);
             // Record per-turn metrics (non-streaming)
             const nsTurnToolNames = toolUseBlocks.map(b => b.name);
             turnMetrics.push({
@@ -525,14 +507,7 @@ export async function runServerAgentLoop(opts) {
             totalOut += nonStreamSubTokens.output;
             sessionCostUsd = estimateCostUsd(totalIn, totalOut, model, 0, cacheReadTokens, cacheCreationTokens) + nonStreamSubTokens.costUsd;
             // Cost warnings after subagent aggregation (non-streaming)
-            if (isFinite(maxCostUsd)) {
-                for (const pct of [25, 50, 75]) {
-                    if (!costWarningsEmitted.has(pct) && sessionCostUsd >= maxCostUsd * (pct / 100)) {
-                        costWarningsEmitted.add(pct);
-                        onText?.(`\n[Cost warning: ${pct}% of budget used ($${sessionCostUsd.toFixed(2)}/$${maxCostUsd.toFixed(2)}). ${pct >= 75 ? "Wrap up soon." : ""}]`);
-                    }
-                }
-            }
+            emitCostWarningIfNeeded(sessionCostUsd, maxCostUsd, costWarningsEmitted, onText);
             const assistantContent = buildAssistantContent({ text: currentText, toolUseBlocks });
             messages.push({ role: "assistant", content: assistantContent });
             messages.push({ role: "user", content: toolResults });
@@ -572,9 +547,7 @@ function makeToolExecutor(opts, tools, allToolNames, subagentTokens, discoveredT
         // Subagent delegation — demote models to control cost (sub-agents should never run Opus)
         if (name === "delegate_task") {
             const subPrompt = String(input.prompt || "");
-            const subModelInput = String(input.model || "haiku");
-            const subModel = (subModelInput === "opus" ? "sonnet" :
-                subModelInput === "sonnet" ? "haiku" : "haiku");
+            const subModel = demoteSubagentModel(input.model ? String(input.model) : undefined);
             const subMaxTurns = Math.min(Math.max(1, Number(input.max_turns) || 6), 12);
             const subTools = tools.filter((t) => t.name !== "delegate_task");
             const subId = `sub-${Date.now().toString(36)}`;

package/dist/server/lib/server-subagent.js

@@ -26,8 +26,8 @@ export const DELEGATE_TASK_TOOL_DEF = {
             },
             model: {
                 type: "string",
-                enum: ["haiku", "sonnet", "opus"],
-                description: "haiku (fast/$1) for simple lookups. sonnet ($3) for multi-step chains. opus ($5) for complex reasoning. Default: haiku.",
+                enum: ["haiku", "sonnet"],
+                description: "haiku (fast/$1) for simple lookups. sonnet ($3) for multi-step chains. Default: haiku.",
             },
             max_turns: {
                 type: "number",

package/dist/shared/agent-core.d.ts

@@ -88,6 +88,8 @@ export declare function addPromptCaching(tools: Array<Record<string, unknown>>,
     tools: Array<Record<string, unknown>>;
     messages: Array<Record<string, unknown>>;
 };
+/** djb2 string hash — fast, deterministic, no dependencies */
+export declare function djb2Hash(str: string): string;
 export declare class LoopDetector {
     private history;
     private consecutiveErrors;
@@ -110,6 +112,11 @@ export declare class LoopDetector {
      *  are tracked per-action so e.g. voice/speak failing won't block voice/music_compose. */
     private errorKey;
     recordCall(name: string, input: Record<string, unknown>): LoopCheckResult;
+    /**
+     * Track file read frequency — call when the tool is known to be a file read.
+     * Blocks re-reading the same path more than FILE_READ_LIMIT times per session.
+     */
+    trackRead(path: string): LoopCheckResult;
     recordResult(name: string, success: boolean, input?: Record<string, unknown>): void;
     endTurn(): BailCheckResult;
     resetTurn(): void;
@@ -139,6 +146,11 @@ export declare const MODEL_PRICING: Record<string, {
     outputPer1M: number;
     thinkingPer1M?: number;
 }>;
+/**
+ * Emit graduated cost warnings at 25%, 50%, 75% thresholds.
+ * Single source of truth — replaces copy-pasted blocks in server + CLI.
+ */
+export declare function emitCostWarningIfNeeded(sessionCostUsd: number, maxCostUsd: number, costWarningsEmitted: Set<number>, onText?: (text: string) => void): void;
 export declare function estimateCostUsd(inputTokens: number, outputTokens: number, model: string, thinkingTokens?: number, cacheReadTokens?: number, cacheCreationTokens?: number): number;
 /**
  * Route to cheaper model when the task is simple enough.
@@ -157,4 +169,12 @@ export declare function truncateToolResult(content: string, maxChars: number): s
 export declare function getMaxToolResultChars(contextConfig?: {
     max_tool_result_chars?: number;
 } | null): number;
+/**
+ * Demote subagent model requests — single source of truth for server + CLI.
+ * - explore/research: always haiku
+ * - opus: demoted to sonnet
+ * - sonnet: kept for plan, demoted to haiku for others
+ * - default/undefined: haiku
+ */
+export declare function demoteSubagentModel(requested: string | undefined, agentType?: string): "haiku" | "sonnet";
 export declare function sanitizeError(err: unknown): string;

package/dist/shared/agent-core.js

@@ -195,7 +195,7 @@ export function addPromptCaching(tools, messages) {
 // LOOP DETECTION
 // ============================================================================
 /** djb2 string hash — fast, deterministic, no dependencies */
-function djb2Hash(str) {
+export function djb2Hash(str) {
     let hash = 5381;
     for (let i = 0; i < str.length; i++) {
         hash = ((hash << 5) + hash + str.charCodeAt(i)) & 0xffffffff;
@@ -230,18 +230,6 @@ export class LoopDetector {
     recordCall(name, input) {
         const inputHash = djb2Hash(JSON.stringify({ name, ...input }));
         const eKey = this.errorKey(name, input);
-        // File read frequency tracking — block re-reading the same file >3 times per session
-        if (name === "read_file" && typeof input.path === "string") {
-            const filePath = input.path;
-            const readCount = (this.fileReadCounts.get(filePath) || 0) + 1;
-            this.fileReadCounts.set(filePath, readCount);
-            if (readCount > LoopDetector.FILE_READ_LIMIT) {
-                return {
-                    blocked: true,
-                    reason: `File "${filePath}" already read ${readCount - 1} times this session. Use the content from a previous read instead of re-reading.`,
-                };
-            }
-        }
         if (this.failedStrategies.has(inputHash)) {
             return {
                 blocked: true,
@@ -282,6 +270,21 @@ export class LoopDetector {
         }
         return { blocked: false };
     }
+    /**
+     * Track file read frequency — call when the tool is known to be a file read.
+     * Blocks re-reading the same path more than FILE_READ_LIMIT times per session.
+     */
+    trackRead(path) {
+        const readCount = (this.fileReadCounts.get(path) || 0) + 1;
+        this.fileReadCounts.set(path, readCount);
+        if (readCount > LoopDetector.FILE_READ_LIMIT) {
+            return {
+                blocked: true,
+                reason: `File "${path}" already read ${readCount - 1} times this session. Use the content from a previous read instead of re-reading.`,
+            };
+        }
+        return { blocked: false };
+    }
     recordResult(name, success, input) {
         const eKey = this.errorKey(name, input);
         if (success) {
@@ -445,6 +448,20 @@ export const MODEL_PRICING = {
     "o3-mini": { inputPer1M: 1.10, outputPer1M: 4.40, thinkingPer1M: 4.40 },
     "o4-mini": { inputPer1M: 1.10, outputPer1M: 4.40, thinkingPer1M: 4.40 },
 };
+/**
+ * Emit graduated cost warnings at 25%, 50%, 75% thresholds.
+ * Single source of truth — replaces copy-pasted blocks in server + CLI.
+ */
+export function emitCostWarningIfNeeded(sessionCostUsd, maxCostUsd, costWarningsEmitted, onText) {
+    if (!isFinite(maxCostUsd) || !onText)
+        return;
+    for (const pct of [25, 50, 75]) {
+        if (!costWarningsEmitted.has(pct) && sessionCostUsd >= maxCostUsd * (pct / 100)) {
+            costWarningsEmitted.add(pct);
+            onText(`\n[Cost warning: ${pct}% of budget used ($${sessionCostUsd.toFixed(2)}/$${maxCostUsd.toFixed(2)}).${pct >= 75 ? " Wrap up soon." : ""}]`);
+        }
+    }
+}
 export function estimateCostUsd(inputTokens, outputTokens, model, thinkingTokens = 0, cacheReadTokens = 0, cacheCreationTokens = 0) {
     // Exact match first, then find a pricing key that is a prefix of the model ID
     const pricing = MODEL_PRICING[model]
@@ -547,6 +564,24 @@ export function getMaxToolResultChars(contextConfig) {
 // ============================================================================
 // UTILITY — sanitize errors (strip API keys, passwords)
 // ============================================================================
+/**
+ * Demote subagent model requests — single source of truth for server + CLI.
+ * - explore/research: always haiku
+ * - opus: demoted to sonnet
+ * - sonnet: kept for plan, demoted to haiku for others
+ * - default/undefined: haiku
+ */
+export function demoteSubagentModel(requested, agentType) {
+    if (agentType === "explore" || agentType === "research")
+        return "haiku";
+    if (!requested)
+        return "haiku";
+    if (requested === "opus")
+        return "sonnet";
+    if (requested === "sonnet")
+        return agentType === "plan" ? "sonnet" : "haiku";
+    return "haiku";
+}
 export function sanitizeError(err) {
     const msg = String(err);
     return msg

package/dist/shared/tool-dispatch.js

@@ -45,6 +45,20 @@ export async function dispatchTools(toolCalls, executor, opts) {
             });
             return;
         }
+        // File read frequency tracking — tool-dispatch knows about read_file,
+        // LoopDetector.trackRead() stays tool-name-agnostic.
+        if (tu.name === "read_file" && typeof tu.input.path === "string") {
+            const readCheck = loopDetector.trackRead(tu.input.path);
+            if (readCheck.blocked) {
+                onResult?.(tu.name, false, readCheck.reason, 0);
+                resultMap.set(tu.id, {
+                    type: "tool_result",
+                    tool_use_id: tu.id,
+                    content: JSON.stringify({ error: readCheck.reason }),
+                });
+                return;
+            }
+        }
         onStart?.(tu.name, tu.input);
         const toolStart = Date.now();
         let result;

package/dist/updater.js

@@ -15,7 +15,7 @@ import https from "https";
 // ============================================================================
 // CONFIG
 // ============================================================================
-const PACKAGE_NAME = "swagmanager-mcp";
+const PACKAGE_NAME = "whale-code";
 const CHECK_INTERVAL_MS = 4 * 60 * 60 * 1000; // 4 hours
 const REGISTRY_URL = `https://registry.npmjs.org/${PACKAGE_NAME}/latest`;
 // ============================================================================

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "whale-code",
-  "version": "6.5.0",
+  "version": "6.5.2",
   "description": "whale code — local-first AI agent CLI for inventory, orders, and analytics powered by MCP",
   "type": "module",
   "main": "dist/index.js",