@wrongstack/core 0.250.0 → 0.256.0

package/dist/types/index.d.ts

@@ -1,34 +1,34 @@
-export { A as AgentError, k as Capabilities, u as ConfigError, g as ContentBlock, C as Context, v as ContextInit, E as ERROR_CODES, w as ErrorCode, x as ErrorSeverity, y as ErrorSubsystem, F as FileSnapshot, z as FsError, I as ImageBlock, J as JSONSchema, M as Message, B as MessageRole, f as Permission, D as PluginError, P as Provider, e as ProviderError, G as ProviderErrorBody, R as Request, b as Response, p as ResumedSession, K as RiskTier, o as RunOptions, N as SddError, q as SessionData, O as SessionError, S as SessionEvent, h as SessionMetadata, i as SessionStore, r as SessionSummary, a as SessionWriter, W as StopReason, X as StreamEvent, Y as StreamHangError, n as TextBlock, Z as ThinkingBlock, s as TodoItem, T as Tool, _ as ToolCallContext, $ as ToolError, a0 as ToolFinalEvent, j as ToolProgressEvent, m as ToolResultBlock, a1 as ToolStreamEvent, l as ToolUseBlock, U as Usage, a2 as WrongStackError, a3 as asBlocks, a4 as asText, a6 as isAgentError, a7 as isConfigError, a8 as isFsError, a9 as isImageBlock, aa as isPluginError, ab as isSddError, ac as isSessionError, ad as isTextBlock, ae as isThinkingBlock, af as isToolError, ag as isToolResultBlock, ah as isToolUseBlock, ai as isWrongStackError, aj as toWrongStackError } from '../context-CLz3z_E8.js';
-export { P as ProviderRunner, R as RunProviderOptions } from '../provider-runner-D0HgUqwV.js';
-export { A as AutonomyConfig, n as CONTEXT_WINDOW_MODES, h as Config, j as ConfigLoader, i as ConfigStore, o as ContextConfig, C as ContextWindowAggressiveOn, p as ContextWindowConfigLike, q as ContextWindowMode, r as ContextWindowModeId, g as ContextWindowPolicy, s as ContextWindowThresholds, t as CustomModelDefinition, D as DEFAULT_CONTEXT_WINDOW_MODE_ID, F as FeaturesConfig, f as HookEntry, H as HookEvent, l as HookInput, e as HookMatcher, m as HookOutcome, I as InProcessHook, u as IndexingConfig, L as LaunchConfig, v as LogConfig, c as MCPServerConfig, d as ModelMatrixEntry, w as ModelsDevModel, a as ModelsDevPayload, x as ModelsDevProvider, M as ModelsRegistry, y as PluginConfig, z as ProviderApiKey, P as ProviderConfig, b as ResolvedModel, R as ResolvedProvider, B as SessionLoggingConfig, S as ShellHook, E as SyncCategory, k as SyncConfig, T as ToolsConfig, W as WireFamily, G as formatContextWindowModeList, J as getContextWindowMode, K as isContextWindowModeId, N as listContextWindowModes, O as resolveContextWindowPolicy } from '../config-eSsrto5d.js';
-export { a as CompactReport, C as Compactor } from '../compactor-BRfg3QPd.js';
-export { a as PermissionDecision, P as PermissionPolicy, T as TrustPolicy } from '../permission-DbWPbuoA.js';
+export { A as AgentError, k as Capabilities, u as ConfigError, g as ContentBlock, C as Context, v as ContextInit, E as ERROR_CODES, w as ErrorCode, x as ErrorSeverity, y as ErrorSubsystem, F as FileSnapshot, z as FsError, I as ImageBlock, J as JSONSchema, M as Message, B as MessageRole, f as Permission, D as PluginError, P as Provider, e as ProviderError, G as ProviderErrorBody, R as Request, b as Response, p as ResumedSession, K as RiskTier, o as RunOptions, N as SddError, q as SessionData, O as SessionError, S as SessionEvent, h as SessionMetadata, i as SessionStore, r as SessionSummary, a as SessionWriter, W as StopReason, X as StreamEvent, Y as StreamHangError, n as TextBlock, Z as ThinkingBlock, s as TodoItem, T as Tool, _ as ToolCallContext, $ as ToolError, a0 as ToolFinalEvent, j as ToolProgressEvent, m as ToolResultBlock, a1 as ToolStreamEvent, l as ToolUseBlock, U as Usage, a2 as WrongStackError, a3 as asBlocks, a4 as asText, a6 as isAgentError, a7 as isConfigError, a8 as isFsError, a9 as isImageBlock, aa as isPluginError, ab as isSddError, ac as isSessionError, ad as isTextBlock, ae as isThinkingBlock, af as isToolError, ag as isToolResultBlock, ah as isToolUseBlock, ai as isWrongStackError, aj as toWrongStackError } from '../context-CGdgA0q6.js';
+export { P as ProviderRunner, R as RunProviderOptions } from '../provider-runner-hM7EXlLI.js';
+export { A as AutonomyConfig, n as CONTEXT_WINDOW_MODES, h as Config, j as ConfigLoader, i as ConfigStore, o as ContextConfig, C as ContextWindowAggressiveOn, p as ContextWindowConfigLike, q as ContextWindowMode, r as ContextWindowModeId, g as ContextWindowPolicy, s as ContextWindowThresholds, t as CustomModelDefinition, D as DEFAULT_CONTEXT_WINDOW_MODE_ID, F as FeaturesConfig, f as HookEntry, H as HookEvent, l as HookInput, e as HookMatcher, m as HookOutcome, I as InProcessHook, u as IndexingConfig, L as LaunchConfig, v as LogConfig, c as MCPServerConfig, d as ModelMatrixEntry, w as ModelsDevModel, a as ModelsDevPayload, x as ModelsDevProvider, M as ModelsRegistry, y as PluginConfig, z as ProviderApiKey, P as ProviderConfig, b as ResolvedModel, R as ResolvedProvider, B as SessionLoggingConfig, S as ShellHook, E as SyncCategory, k as SyncConfig, T as ToolsConfig, W as WireFamily, G as formatContextWindowModeList, J as getContextWindowMode, K as isContextWindowModeId, N as listContextWindowModes, O as resolveContextWindowPolicy } from '../config-DuAu23zm.js';
+export { a as CompactReport, C as Compactor } from '../compactor-C5sT4U7I.js';
+export { a as PermissionDecision, P as PermissionPolicy, T as TrustPolicy } from '../permission-CwBBpCoF.js';
 export { C as CheckpointInfo, R as RewindResult, a as RewindResultExtended, S as SessionRewinder } from '../session-rewinder-C9HnMkhP.js';
-export { a as AddAttachmentInput, c as Attachment, d as AttachmentKind, e as AttachmentMeta, b as AttachmentRef, A as AttachmentStore, D as DefaultSessionReader } from '../session-reader-CCOssnBS.js';
+export { a as AddAttachmentInput, c as Attachment, d as AttachmentKind, e as AttachmentMeta, b as AttachmentRef, A as AttachmentStore, D as DefaultSessionReader } from '../session-reader-CqRvaL5v.js';
 export { D as DEFAULT_AUTONOMY_CONFIG, a as DEFAULT_CONTEXT_CONFIG, b as DEFAULT_SESSION_LOGGING_CONFIG, c as DEFAULT_SESSION_PRUNE_DAYS, d as DEFAULT_TOOLS_CONFIG } from '../default-config-CXsDvOmP.js';
-export { D as DefaultSecretScrubber, a as DefaultSecretVault, S as SecretVaultOptions, d as decryptConfigSecrets, e as encryptConfigSecrets, i as isSecretField, m as migratePlaintextSecrets, r as rewriteConfigEncrypted } from '../secret-vault-CeVNiy_f.js';
+export { D as DefaultSecretScrubber, a as DefaultSecretVault, S as SecretVaultOptions, d as decryptConfigSecrets, e as encryptConfigSecrets, i as isSecretField, m as migratePlaintextSecrets, r as rewriteConfigEncrypted } from '../secret-vault-BkYkJWQs.js';
 export { D as DefaultLogger, a as DefaultLoggerOptions, L as LogFormat, n as noOpLogger } from '../logger-DmmQhf4P.js';
-export { D as DefaultPathResolver, a as DefaultTokenCounter } from '../path-resolver-BaP06Owy.js';
-export { p as MEMORY_TYPE_LABELS, q as MemoryClearedPayload, r as MemoryConsolidatedPayload, k as MemoryEntry, s as MemoryForgottenPayload, t as MemoryPriority, m as MemoryRelevanceContext, u as MemoryRememberedPayload, M as MemoryScope, l as MemoryStore, v as MemoryType, S as ScoredEntry } from '../brain-sCZ3lCjq.js';
-import { I as IterationStage, g as ParallelIterationStage } from '../parallel-eternal-engine-UZg1xOzE.js';
-export { C as CompactorOptions, D as DEFAULT_RECOVERY_STRATEGIES, a as DefaultErrorHandler, b as DefaultRetryPolicy, H as HybridCompactor, R as RecoveryStrategy, T as ToolExecutor, h as buildRecoveryStrategies } from '../parallel-eternal-engine-UZg1xOzE.js';
-export { b as SkillEntry, S as SkillLoader, a as SkillManifest } from '../skill-Bj6Ezqb8.js';
-export { B as BuildContext, m as ModelCapabilities, a as Renderer, S as SystemPromptBuilder } from '../pipeline-D1n-gQI-.js';
+export { D as DefaultPathResolver, a as DefaultTokenCounter } from '../path-resolver-CbkT-RMU.js';
+export { p as MEMORY_TYPE_LABELS, q as MemoryClearedPayload, r as MemoryConsolidatedPayload, k as MemoryEntry, s as MemoryForgottenPayload, t as MemoryPriority, m as MemoryRelevanceContext, u as MemoryRememberedPayload, M as MemoryScope, l as MemoryStore, v as MemoryType, S as ScoredEntry } from '../brain-TjEEwSpw.js';
+import { I as IterationStage, g as ParallelIterationStage } from '../parallel-eternal-engine-C0juOszP.js';
+export { C as CompactorOptions, D as DEFAULT_RECOVERY_STRATEGIES, a as DefaultErrorHandler, b as DefaultRetryPolicy, H as HybridCompactor, R as RecoveryStrategy, T as ToolExecutor, h as buildRecoveryStrategies } from '../parallel-eternal-engine-C0juOszP.js';
+export { b as SkillEntry, S as SkillLoader, a as SkillManifest } from '../skill-DGIXCtdv.js';
+export { B as BuildContext, q as ModelCapabilities, a as Renderer, S as SystemPromptBuilder } from '../pipeline-JG8XoudC.js';
 export { I as InputReader, P as PromptOption } from '../input-reader-E-ffP2ee.js';
-export { O as CoordinatorEvents, C as CoordinatorStatus, D as DoneCondition, I as MCPRegistryView, L as MetricsSinkView, c as MultiAgentConfig, M as MultiAgentCoordinator, N as Plugin, P as PluginAPI, Q as PluginCapabilities, R as PluginDependency, E as PluginPipelines, _ as ProviderFactory, H as ProviderRegistryView, K as SessionWriterView, z as SlashCommand, J as SlashCommandRegistryView, e as SpawnResult, S as SubagentConfig, U as SubagentContext, V as SubagentError, W as SubagentErrorKind, X as SubagentRunContext, Y as SubagentRunOutcome, d as SubagentRunner, Z as TaskDelegation, f as TaskResult, T as TaskSpec, G as ToolRegistryView } from '../agent-subagent-runner-Dz-9kiE6.js';
-export { D as DefaultModelsRegistry, a as DefaultModelsRegistryOptions, c as classifyFamily } from '../models-registry-DpanBg8D.js';
+export { Q as CoordinatorEvents, C as CoordinatorStatus, D as DoneCondition, I as MCPRegistryView, L as MetricsSinkView, c as MultiAgentConfig, M as MultiAgentCoordinator, O as Plugin, P as PluginAPI, N as PluginCapabilities, R as PluginDependency, E as PluginPipelines, _ as ProviderFactory, H as ProviderRegistryView, K as SessionWriterView, z as SlashCommand, J as SlashCommandRegistryView, e as SpawnResult, S as SubagentConfig, U as SubagentContext, V as SubagentError, W as SubagentErrorKind, X as SubagentRunContext, Y as SubagentRunOutcome, d as SubagentRunner, Z as TaskDelegation, f as TaskResult, T as TaskSpec, G as ToolRegistryView } from '../agent-subagent-runner-US741uBH.js';
+export { D as DefaultModelsRegistry, a as DefaultModelsRegistryOptions, c as classifyFamily } from '../models-registry-ByZCdFuQ.js';
 export { D as DEFAULT_MODES, b as Mode, a as ModeConfig, c as ModeManifest, M as ModeStore } from '../mode-CZlO9iU1.js';
-export { I as InMemoryAgentBridge, a as InMemoryBridgeTransport, c as createMessage } from '../agent-bridge-4gc0vfW2.js';
+export { I as InMemoryAgentBridge, a as InMemoryBridgeTransport, c as createMessage } from '../agent-bridge-BrxWHEOm.js';
 export { D as DEFAULT_SPEC_TEMPLATE, S as SpecAnalysis, a as SpecApiEndpoint, b as SpecRequirement, c as SpecSection, d as SpecSectionType, e as SpecStatus, f as SpecTemplate, g as SpecValidationResult, h as Specification } from '../spec-TBi3Jr6T.js';
 export { C as CriticalPathResult, f as TaskAssignment, g as TaskDependency, h as TaskEdge, i as TaskFilter, d as TaskGraph, e as TaskNode, a as TaskPriority, c as TaskProgress, j as TaskSort, b as TaskStatus, T as TaskType, k as computeTaskProgress, l as findCriticalPath, t as topologicalSort } from '../task-graph-u1q9Jkyk.js';
 export { A as AggregateHealth, a as HealthCheck, b as HealthCheckResult, H as HealthRegistry, c as HealthStatus, d as MetricLabels, e as MetricSeries, M as MetricsSink, f as MetricsSnapshot, S as Span, T as Tracer } from '../observability-D-HZN_mF.js';
-export { S as SystemPromptContributor } from '../index-IehiNryU.js';
+export { S as SystemPromptContributor } from '../index-CitPrI3a.js';
 import '../logger-B63L5bTg.js';
-import '../retry-policy-BVnkbMET.js';
+import '../retry-policy-Tg7LXkoK.js';
 import '../secret-vault-BJDY28ev.js';
 import '../path-resolver-CPRj4bFY.js';
 import '../goal-store-CV9Yz2X_.js';
-import '../multi-agent-coordinator-CnbEqpv0.js';
+import '../multi-agent-coordinator-DqTUEAeC.js';
 import 'node:events';
 
 /** Union of serial and parallel autonomy engine stage types (from EternalAutonomyEngine / ParallelEternalEngine). */

package/dist/types/index.js

@@ -981,6 +981,10 @@ var DefaultTokenCounter = class {
     const price = model ? this.priceCache.get(model) : void 0;
     if (price) {
       this.applyPrice(usage, price);
+      this.events?.emit("token.accounted", {
+        usage: this.total(),
+        cost: { input: this.costInput, output: this.costOutput, total: this.costInput + this.costOutput }
+      });
     } else if (this.registry && this.providerId && model) {
       if (this.priceCache.size >= PRICE_CACHE_MAX_SIZE) {
         const keys = [...this.priceCache.keys()];
@@ -991,6 +995,10 @@ var DefaultTokenCounter = class {
           const p = priceFromModel(m);
           this.priceCache.set(model, p);
           this.applyPrice(usage, p);
+          this.events?.emit("token.accounted", {
+            usage: this.total(),
+            cost: { input: this.costInput, output: this.costOutput, total: this.costInput + this.costOutput }
+          });
         }
       }).catch(() => {
         this.events?.emit("token.cost_estimate_unavailable", { model: model ?? "<unknown>" });
@@ -1013,6 +1021,10 @@ var DefaultTokenCounter = class {
     }
     this.priceCache.set(resolved.modelId, price);
     this.applyPrice(usage, price);
+    this.events?.emit("token.accounted", {
+      usage: this.total(),
+      cost: { input: this.costInput, output: this.costOutput, total: this.costInput + this.costOutput }
+    });
   }
   total() {
     return {
@@ -1910,9 +1922,28 @@ var PATTERNS = [
   }
 ];
 var SCRUB_CHUNK_BYTES = 64 * 1024;
+function hasCredentialAnchors(text) {
+  return text.includes("-----BEGIN") || // Private keys (most unique → cheap reject)
+  text.includes("sk-") || // Anthropic + OpenAI keys
+  text.includes("sk_") || // Stripe live/test keys
+  text.includes("ghp_") || // GitHub PAT v1
+  text.includes("github_pat_") || // GitHub PAT v2
+  text.includes("eyJ") || // JWT
+  text.includes("AKIA") || // AWS access key
+  text.includes("AIza") || // GCP service key
+  text.includes("xox") || // Slack token (xoxa/xoxb/xoxp/xoxo/xoxs)
+  text.includes("Bearer ") || // Bearer token (space suffix reduces false positives)
+  text.includes("/bot") || // Telegram bot token (URL path pattern)
+  text.includes("_KEY=") || // High-entropy env vars: API_KEY=, SECRET_KEY=, ...
+  text.includes("_TOKEN=") || // ACCESS_TOKEN=, AUTH_TOKEN=, ...
+  text.includes("_SECRET=") || // API_SECRET=, CLIENT_SECRET=, ...
+  text.includes("_PASSWORD=") || // DB_PASSWORD=, ROOT_PASSWORD=, ...
+  text.includes("mongodb://") || text.includes("mongodb+srv://") || text.includes("postgres://") || text.includes("postgresql://") || text.includes("mysql://") || text.includes("redis://");
+}
 var DefaultSecretScrubber = class {
   scrub(text) {
     if (!text) return text;
+    if (!hasCredentialAnchors(text)) return text;
     if (text.length <= SCRUB_CHUNK_BYTES) {
       return this.scrubOne(text);
     }
@@ -1930,6 +1961,7 @@ var DefaultSecretScrubber = class {
     return out.join("");
   }
   scrubOne(text) {
+    if (!hasCredentialAnchors(text)) return text;
     let out = text;
     for (const p of PATTERNS) {
       out = out.replace(p.regex, (_match, group1, group2) => {
@@ -3181,7 +3213,7 @@ var ToolExecutor = class _ToolExecutor {
       const tool = this.registry.get(use.name);
       if (!tool) {
         const result = this.unknownToolResult(use, () => this.registry.list().map((t) => t.name));
-        budget = this.decrementBudget(result, budget);
+        budget = this.budgetForString(result.content, budget);
         return { result, tool, durationMs: Date.now() - start };
       }
       const validation = validateAgainstSchema(use.input, tool.inputSchema);
@@ -3198,20 +3230,20 @@ ${errorDetails}
 Please call the tool again with arguments that match its inputSchema. You can use the "tool-help" tool with name="${tool.name}" to see the exact expected schema.`,
           is_error: true
         };
-        budget = this.decrementBudget(result, budget);
+        budget = this.budgetForString(result.content, budget);
         return { result, tool, durationMs: Date.now() - start };
       }
       const toolDangerousCaps = getDangerousCapabilities(tool);
       if (hasMalformedArguments(use.input)) {
         const result = this.malformedInputResult(use, extractMalformedRaw(use.input));
-        budget = this.decrementBudget(result, budget);
+        budget = this.budgetForString(result.content, budget);
         return { result, tool, durationMs: Date.now() - start };
       }
       if (this.opts.hookRunner?.has("PreToolUse")) {
         const pre = await this.opts.hookRunner.preToolUse(tool.name, use.input, ctx);
         if (pre.block) {
           const result = this.blockedByHookResult(use, pre.reason);
-          budget = this.decrementBudget(result, budget);
+          budget = this.budgetForString(result.content, budget);
           return { result, tool, durationMs: Date.now() - start };
         }
         if (pre.input) {
@@ -3227,7 +3259,7 @@ Validation errors:
 ${errorDetails}`,
               is_error: true
             };
-            budget = this.decrementBudget(result, budget);
+            budget = this.budgetForString(result.content, budget);
             return { result, tool, durationMs: Date.now() - start };
           }
           use = { ...use, input: pre.input };
@@ -3242,7 +3274,7 @@ ${errorDetails}`,
       }
       if (effectivePermission === "deny") {
         const result = this.deniedResult(use, decision.reason);
-        budget = this.decrementBudget(result, budget);
+        budget = this.budgetForString(result.content, budget);
         return { result, tool, durationMs: Date.now() - start };
       }
       if (effectivePermission === "confirm") {
@@ -3255,7 +3287,7 @@ ${errorDetails}`,
               content: `Tool "${tool.name}" denied by user.`,
               is_error: true
             };
-            budget = this.decrementBudget(result, budget);
+            budget = this.budgetForString(result.content, budget);
             return { result, tool, durationMs: Date.now() - start };
           }
         } else {
@@ -3279,7 +3311,8 @@ ${errorDetails}`,
         "tool.has_dangerous_capabilities": toolCapsForAudit.length > 0
       });
       try {
-        let result = await this.executeTool(tool, use, ctx, budget);
+        let { block: result, bytes } = await this.executeTool(tool, use, ctx, budget);
+        budget -= bytes;
         if (this.opts.hookRunner?.has("PostToolUse")) {
           const post = await this.opts.hookRunner.postToolUse(
             tool.name,
@@ -3288,12 +3321,13 @@ ${errorDetails}`,
             ctx
           );
           if (post.additionalContext) {
-            result = { ...result, content: `${result.content}
+            const appended = `
 
-${post.additionalContext}` };
+${post.additionalContext}`;
+            result = { ...result, content: `${result.content}${appended}` };
+            budget = Math.max(0, budget - Buffer.byteLength(appended, "utf8"));
           }
         }
-        budget = this.decrementBudget(result, budget);
         span?.setAttribute("tool.is_error", !!result.is_error);
         span?.setAttribute(
           "tool.output_bytes",
@@ -3310,7 +3344,7 @@ ${post.additionalContext}` };
           content: `Tool "${tool.name}" threw: ${scrubbed}`,
           is_error: true
         };
-        budget = this.decrementBudget(result, budget);
+        budget = this.budgetForString(result.content, budget);
         if (err instanceof Error) span?.recordError(err);
         span?.setAttribute("tool.is_error", true);
         return { result, tool, durationMs: Date.now() - start };
@@ -3330,7 +3364,7 @@ ${post.additionalContext}` };
           content: `Tool "${use.name}" execution failed: ${scrubbed}`,
           is_error: true
         };
-        budget = this.decrementBudget(result, budget);
+        budget = this.budgetForString(result.content, budget);
         return { result, tool: this.registry.get(use.name), durationMs: 0 };
       }
     };
@@ -3379,14 +3413,20 @@ ${post.additionalContext}` };
     const output = await this.runWithTimeout(tool, use.input, ctx.signal, ctx, use.id);
     const text = this.serializer.serialize(output);
     const scrubbed = this.opts.secretScrubber.scrub(text);
-    const { text: capped } = this.serializer.enforceCap(scrubbed, budget);
+    const { text: capped, newBudget } = this.serializer.enforceCap(scrubbed, budget);
     this.opts.renderer?.writeToolResult(tool.name, capped, false);
     return {
-      type: "tool_result",
-      tool_use_id: use.id,
-      name: tool.name,
-      content: capped,
-      is_error: false
+      block: {
+        type: "tool_result",
+        tool_use_id: use.id,
+        name: tool.name,
+        content: capped,
+        is_error: false
+      },
+      // `budget - newBudget` is the exact byte count enforceCap spent
+      // (capped at `budget` so a truncated output shows as `budget`
+      // consumed, matching the pre-fix `decrementBudget` semantics).
+      bytes: budget - newBudget
     };
   }
   async runWithTimeout(tool, input, parentSignal, ctx, toolUseId) {
@@ -3526,9 +3566,19 @@ ${excerpt}`;
       is_error: true
     };
   }
-  decrementBudget(result, budget) {
-    const contentBytes = typeof result.content === "string" ? Buffer.byteLength(result.content, "utf8") : Buffer.byteLength(JSON.stringify(result.content), "utf8");
-    return Math.max(0, budget - contentBytes);
+  /**
+   * Subtract a string-content result's UTF-8 byte length from the
+   * iteration output budget. Used for synthesized results (unknown tool,
+   * validation error, blocked, threw) where the content is a small
+   * string built in the executor. The success path no longer goes
+   * through here — `executeTool` carries the exact byte count it spent
+   * in its return value, derived from `enforceCap`'s `newBudget`.
+   *
+   * Floors the result at 0 to match the pre-fix `decrementBudget`
+   * semantics (over-budget spends don't underflow the running total).
+   */
+  budgetForString(content, budget) {
+    return Math.max(0, budget - Buffer.byteLength(content, "utf8"));
   }
   /**
    * Compute the suggestedPattern string for a tool+input pair.
@@ -3634,10 +3684,19 @@ var ConversationState = class {
     this.emit({ kind: "message_appended", message });
   }
   replaceMessages(messages) {
+    let hasToolBlock = false;
     for (const m of messages) {
       if (m._estTokens === void 0) {
         m._estTokens = computeMessageTokens(m);
       }
+      if (!hasToolBlock && Array.isArray(m.content)) {
+        for (const b of m.content) {
+          if (b.type === "tool_use" || b.type === "tool_result") {
+            hasToolBlock = true;
+            break;
+          }
+        }
+      }
     }
     const arr = this.ctx.messages;
     if (messages.length < arr.length) {
@@ -3646,9 +3705,7 @@ var ConversationState = class {
     for (let i = 0; i < messages.length; i++) {
       arr[i] = messages[i];
     }
-    if (messages.some(
-      (m) => Array.isArray(m.content) && m.content.some((b) => b.type === "tool_use" || b.type === "tool_result")
-    )) {
+    if (hasToolBlock) {
       this.ctx.toolAdjacencyDirty = true;
     }
     this.emit({ kind: "messages_replaced", messages: [...messages] });
@@ -3724,6 +3781,19 @@ var Context = class {
    * on iterations where no tool content was added (pure text responses).
    */
   toolAdjacencyDirty = false;
+  /**
+   * H1: pre-computed total-request token estimate from the most recent
+   * `estimateRequestTokens()` call in the agent loop's pre-flight step.
+   * The middleware that decides when to compact, the `emitContextPct`
+   * helper that drives the live context-fill bar, and the pre-flight
+   * itself all need this number; previously each one walked the same
+   * messages/system/tools arrays independently. Stashing it here lets
+   * the three call sites share a single compute per iteration.
+   *
+   * The value is the **uncalibrated** total. Callers that want the
+   * calibrated number apply the per-(provider,model) ratio themselves.
+   */
+  lastRequestTokens = void 0;
   constructor(init) {
     this.systemPrompt = init.systemPrompt;
     this.provider = init.provider;