@wrongstack/core 0.6.1 → 0.6.4

package/dist/extension/index.d.ts

@@ -1,9 +1,9 @@
-export { A as AfterIterationHook, p as AfterRunHook, q as AfterToolExecutionHook, s as AgentExtension, B as BeforeIterationHook, w as BeforeRunHook, x as BeforeToolExecutionHook, E as ExtensionRegistry, O as OnErrorHook, G as ProviderRunnerFn, z as ProviderRunnerWrapper } from '../index-BkKLQjea.js';
+export { A as AfterIterationHook, p as AfterRunHook, q as AfterToolExecutionHook, s as AgentExtension, B as BeforeIterationHook, w as BeforeRunHook, x as BeforeToolExecutionHook, E as ExtensionRegistry, O as OnErrorHook, G as ProviderRunnerFn, z as ProviderRunnerWrapper } from '../index-BOn9NK7D.js';
 import '../context-CDRyrkKQ.js';
 import '../logger-BMQgxvdy.js';
 import '../system-prompt-Dl2QY1_B.js';
 import '../observability-BhnVLBLS.js';
-import '../events-CzkeaVVl.js';
+import '../events-BHuIHekD.js';
 import '../secret-scrubber-CfMdAJ_l.js';
 import '../config-BGGuP_Ar.js';
 import '../models-registry-Y2xbog0E.js';

package/dist/{index-BkKLQjea.d.ts → index-BOn9NK7D.d.ts}

@@ -2,7 +2,7 @@ import { v as Tool, B as ToolResultBlock, G as ToolUseBlock, a2 as Context, T as
 import { L as Logger } from './logger-BMQgxvdy.js';
 import { R as Renderer, B as BuildContext, C as Container, P as Pipeline, e as ReadonlyPipeline } from './system-prompt-Dl2QY1_B.js';
 import { T as Tracer } from './observability-BhnVLBLS.js';
-import { E as EventBus, a as EventName, L as Listener } from './events-CzkeaVVl.js';
+import { E as EventBus, a as EventName, L as Listener } from './events-BHuIHekD.js';
 import { a as PermissionPolicy, S as SecretScrubber } from './secret-scrubber-CfMdAJ_l.js';
 import { l as ProviderConfig, a as Config } from './config-BGGuP_Ar.js';
 import { W as WireFamily } from './models-registry-Y2xbog0E.js';

package/dist/{index-i9rPR53g.d.ts → index-CPcDqvZh.d.ts}

@@ -1,10 +1,10 @@
 import { a as DirectorStateSnapshot } from './director-state-BmYi3DGA.js';
-import { c as SubagentConfig, j as TaskResult, a as CoordinatorStatus, k as TaskSpec, M as MultiAgentConfig, i as SubagentRunner, b as MultiAgentCoordinator, S as SpawnResult, l as BridgeMessage, A as AgentBridge } from './multi-agent-MfI6dmv-.js';
+import { c as SubagentConfig, j as TaskResult, a as CoordinatorStatus, k as TaskSpec, M as MultiAgentConfig, i as SubagentRunner, b as MultiAgentCoordinator, S as SpawnResult, l as BridgeMessage, A as AgentBridge } from './multi-agent-CxSb-9dQ.js';
 import { r as SessionWriter, v as Tool, p as SessionStore } from './context-CDRyrkKQ.js';
-import { I as InMemoryAgentBridge } from './agent-bridge-DaCvA_uK.js';
-import { E as EventBus } from './events-CzkeaVVl.js';
+import { I as InMemoryAgentBridge } from './agent-bridge-eb7qnNrd.js';
+import { E as EventBus } from './events-BHuIHekD.js';
 import { EventEmitter } from 'node:events';
-import { r as Agent, u as AgentInput } from './index-BkKLQjea.js';
+import { r as Agent, u as AgentInput } from './index-BOn9NK7D.js';
 
 /**
  * Interface for a fleet coordinator. Implemented by both `Director`

package/dist/index.d.ts

@@ -1,11 +1,11 @@
 import { S as SystemPromptBuilder, M as ModelCapabilities, B as BuildContext, C as Container } from './system-prompt-Dl2QY1_B.js';
 export { a as BindOptions, D as Decorator, F as Factory, b as Middleware, c as MiddlewareHandler, N as NextFn, P as Pipeline, d as PipelineOptions, R as Renderer, T as Token } from './system-prompt-Dl2QY1_B.js';
-import { E as EventBus, a as EventName, L as Listener } from './events-CzkeaVVl.js';
-export { b as EventLogger, c as EventMap, S as ScopedEventBus } from './events-CzkeaVVl.js';
+import { E as EventBus, a as EventName, L as Listener } from './events-BHuIHekD.js';
+export { b as EventLogger, c as EventMap, S as ScopedEventBus } from './events-BHuIHekD.js';
 export { RunController, RunControllerOptions, TOKENS } from './kernel/index.js';
 import { a2 as Context, g as Provider, v as Tool, b as ContentBlock, T as TextBlock } from './context-CDRyrkKQ.js';
 export { A as AgentError, C as Capabilities, a as ConfigError, a7 as ContextInit, a6 as ConversationState, E as ErrorCode, c as ErrorSeverity, d as ErrorSubsystem, F as FileSnapshot, I as ImageBlock, J as JSONSchema, M as Message, e as MessageRole, P as Permission, f as PluginError, h as ProviderError, i as ProviderErrorBody, a8 as ReadonlyConversationState, R as Request, j as Response, k as ResumedSession, l as RiskTier, a9 as RunEnv, aa as RunOptions, S as SessionData, m as SessionError, n as SessionEvent, o as SessionMetadata, p as SessionStore, q as SessionSummary, r as SessionWriter, ab as StateChange, ac as StateChangeHandler, s as StopReason, t as StreamEvent, u as ThinkingBlock, a5 as TodoItem, a3 as TokenCounter, w as ToolCallContext, x as ToolError, y as ToolFinalEvent, z as ToolProgressEvent, B as ToolResultBlock, D as ToolStreamEvent, G as ToolUseBlock, U as Usage, W as WrongStackError, H as asBlocks, K as asText, ad as extractRunEnv, L as isAgentError, N as isConfigError, O as isImageBlock, Q as isPluginError, V as isSessionError, X as isTextBlock, Y as isThinkingBlock, Z as isToolError, _ as isToolResultBlock, $ as isToolUseBlock, a0 as isWrongStackError, a1 as toWrongStackError, ae as wrapAsState } from './context-CDRyrkKQ.js';
-export { P as ProviderRunner, R as RunProviderOptions } from './provider-runner-CZYIzeBp.js';
+export { P as ProviderRunner, R as RunProviderOptions } from './provider-runner-BFgNXpaP.js';
 import { M as MCPServerConfig, a as Config } from './config-BGGuP_Ar.js';
 export { C as CONTEXT_WINDOW_MODES, b as ConfigLoader, c as ConfigStore, d as ContextConfig, e as ContextWindowAggressiveOn, f as ContextWindowConfigLike, g as ContextWindowMode, h as ContextWindowModeId, i as ContextWindowPolicy, j as ContextWindowThresholds, D as DEFAULT_CONTEXT_WINDOW_MODE_ID, F as FeaturesConfig, L as LogConfig, P as PluginConfig, k as ProviderApiKey, l as ProviderConfig, T as ToolsConfig, m as formatContextWindowModeList, n as getContextWindowMode, o as isContextWindowModeId, p as listContextWindowModes, r as resolveContextWindowPolicy } from './config-BGGuP_Ar.js';
 export { C as CompactReport, a as Compactor } from './compactor-RIPuTtWK.js';
@@ -15,30 +15,30 @@ import { e as AttachmentStore, d as AttachmentRef, A as AddAttachmentInput } fro
 export { a as Attachment, b as AttachmentKind, c as AttachmentMeta, D as DefaultSessionReader } from './session-reader-CzfRA6Vk.js';
 export { D as DefaultSecretScrubber, a as DefaultSecretVault, S as SecretVaultOptions, d as decryptConfigSecrets, e as encryptConfigSecrets, m as migratePlaintextSecrets, r as rewriteConfigEncrypted } from './secret-scrubber-BzQR5BiL.js';
 export { D as DefaultLogger, a as DefaultLoggerOptions } from './logger-BH6AE0W9.js';
-export { D as DefaultPathResolver, a as DefaultTokenCounter } from './path-resolver-CWINz5XR.js';
+export { D as DefaultPathResolver, a as DefaultTokenCounter } from './path-resolver-CMGNadvq.js';
 import { b as MemoryStore } from './memory-CEXuo7sz.js';
 export { M as MemoryEntry, a as MemoryScope } from './memory-CEXuo7sz.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, c as buildRecoveryStrategies } from './tool-executor-40Q6shR-.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, c as buildRecoveryStrategies } from './tool-executor-FoxBjULX.js';
 import { a as SkillLoader } from './skill-CxuWrsKK.js';
 export { S as SkillEntry, b as SkillManifest } from './skill-CxuWrsKK.js';
 export { I as InputReader, P as PromptOption } from './input-reader-E-ffP2ee.js';
-import { h as SlashCommand, j as SystemPromptContributor, b as PluginAPI, e as PluginPipelines, T as ToolRegistryView, g as ProviderRegistryView, M as MCPRegistryView, i as SlashCommandRegistryView, E as ExtensionRegistry, S as SessionWriterView, a as MetricsSinkView, n as ToolRegistry, o as ProviderRegistry, P as Plugin } from './index-BkKLQjea.js';
-export { A as AfterIterationHook, p as AfterRunHook, q as AfterToolExecutionHook, r as Agent, s as AgentExtension, t as AgentInit, u as AgentInput, v as AgentPipelines, B as BeforeIterationHook, w as BeforeRunHook, x as BeforeToolExecutionHook, D as DEFAULT_MAX_ITERATIONS, O as OnErrorHook, c as PluginCapabilities, d as PluginDependency, y as ProviderFactory, z as ProviderRunnerWrapper, R as RunResult, C as ToolWrapper, U as UserInputPayload, F as createDefaultPipelines } from './index-BkKLQjea.js';
+import { h as SlashCommand, j as SystemPromptContributor, b as PluginAPI, e as PluginPipelines, T as ToolRegistryView, g as ProviderRegistryView, M as MCPRegistryView, i as SlashCommandRegistryView, E as ExtensionRegistry, S as SessionWriterView, a as MetricsSinkView, n as ToolRegistry, o as ProviderRegistry, P as Plugin } from './index-BOn9NK7D.js';
+export { A as AfterIterationHook, p as AfterRunHook, q as AfterToolExecutionHook, r as Agent, s as AgentExtension, t as AgentInit, u as AgentInput, v as AgentPipelines, B as BeforeIterationHook, w as BeforeRunHook, x as BeforeToolExecutionHook, D as DEFAULT_MAX_ITERATIONS, O as OnErrorHook, c as PluginCapabilities, d as PluginDependency, y as ProviderFactory, z as ProviderRunnerWrapper, R as RunResult, C as ToolWrapper, U as UserInputPayload, F as createDefaultPipelines } from './index-BOn9NK7D.js';
 export { D as DefaultModelsRegistry, a as DefaultModelsRegistryOptions, c as classifyFamily } from './models-registry-DqzwpBQy.js';
 import { c as ModeStore } from './mode-CV077NjV.js';
 export { D as DEFAULT_MODES, M as Mode, a as ModeConfig, b as ModeManifest } from './mode-CV077NjV.js';
-export { I as InMemoryAgentBridge, a as InMemoryBridgeTransport, c as createMessage } from './agent-bridge-DaCvA_uK.js';
-export { n as BudgetExceededError, o as BudgetKind, p as BudgetLimits, q as BudgetUsage, C as CoordinatorEvents, a as CoordinatorStatus, D as DoneCondition, M as MultiAgentConfig, b as MultiAgentCoordinator, S as SpawnResult, r as SubagentBudget, c as SubagentConfig, d as SubagentContext, e as SubagentError, f as SubagentErrorKind, g as SubagentRunContext, h as SubagentRunOutcome, i as SubagentRunner, T as TaskDelegation, j as TaskResult, k as TaskSpec } from './multi-agent-MfI6dmv-.js';
+export { I as InMemoryAgentBridge, a as InMemoryBridgeTransport, c as createMessage } from './agent-bridge-eb7qnNrd.js';
+export { n as BudgetExceededError, o as BudgetKind, p as BudgetLimits, q as BudgetUsage, C as CoordinatorEvents, a as CoordinatorStatus, D as DoneCondition, M as MultiAgentConfig, b as MultiAgentCoordinator, S as SpawnResult, r as SubagentBudget, c as SubagentConfig, d as SubagentContext, e as SubagentError, f as SubagentErrorKind, g as SubagentRunContext, h as SubagentRunOutcome, i as SubagentRunner, T as TaskDelegation, j as TaskResult, k as TaskSpec } from './multi-agent-CxSb-9dQ.js';
 export { C as CriticalPathResult, 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, T as TaskAssignment, i as TaskDependency, j as TaskEdge, k as TaskFilter, l as TaskGraph, m as TaskNode, n as TaskPriority, o as TaskProgress, p as TaskSort, q as TaskStatus, r as TaskType, s as computeTaskProgress, t as findCriticalPath, u as topologicalSort } from './task-graph-BITvWt4t.js';
 export { A as AggregateHealth, H as HealthCheck, a as HealthCheckResult, b as HealthRegistry, c as HealthStatus, M as MetricLabels, d as MetricSeries, e as MetricsSink, f as MetricsSnapshot, S as Span, T as Tracer } from './observability-BhnVLBLS.js';
 export { AtomicWriteOptions, BuildChildEnvOptions, CompileFail, CompileResult, MessageRepairReport, MessageRepairResult, NewlineStyle, RequestTokenBreakdown, SafeParseResult, ToolOutputSerializerOptions, UnifiedDiffOptions, ValidationError, ValidationResult, atomicWrite, buildChildEnv, color, compileGlob, compileUserRegex, createToolOutputSerializer, detectNewlineStyle, ensureDir, estimateRequestTokens, estimateTextTokens, estimateToolDefTokens, estimateToolInputTokens, estimateToolResultTokens, formatTodosList, matchAny, matchGlob, normalizeToLf, repairToolUseAdjacency, safeParse, safeStringify, sanitizeJsonString, stripAnsi, toStyle, unifiedDiff, validateAgainstSchema } from './utils/index.js';
 export { a as WstackPathOptions, W as WstackPaths, p as projectHash, r as resolveWstackPaths } from './wstack-paths-86YPFktR.js';
-export { A as AbandonedSession, a as AttachmentStoreOptions, C as ConfigLoaderOptions, b as ConfigMigration, c as ConfigMigrationError, d as ConfigSource, D as DEFAULT_CONFIG_MIGRATIONS, e as DefaultAttachmentStore, f as DefaultConfigLoader, g as DefaultConfigStore, h as DefaultMemoryStore, i as DefaultSessionStore, M as MemoryStoreOptions, j as MigrationContext, k as MigrationResult, P as PersistedQueueItem, l as PlanFile, m as PlanItem, n as PlanTemplate, Q as QueueStore, R as RecoveryLock, o as RecoveryLockOptions, S as SessionAnalyzer, p as SessionStoreOptions, T as TodosCheckpointFile, q as addPlanItem, r as attachPlanCheckpoint, s as attachTodosCheckpoint, t as clearPlan, u as deriveTodosFromPlanItem, v as emptyPlan, w as formatPlan, x as formatPlanTemplates, y as getPlanTemplate, z as listPlanTemplates, B as loadPlan, E as loadTodosCheckpoint, F as removePlanItem, G as runConfigMigrations, H as savePlan, I as saveTodosCheckpoint, J as setPlanItemStatus } from './plan-templates-Bne1pB4d.js';
+export { A as AbandonedSession, a as AttachmentStoreOptions, C as ConfigLoaderOptions, b as ConfigMigration, c as ConfigMigrationError, d as ConfigSource, D as DEFAULT_CONFIG_MIGRATIONS, e as DefaultAttachmentStore, f as DefaultConfigLoader, g as DefaultConfigStore, h as DefaultMemoryStore, i as DefaultSessionStore, M as MemoryStoreOptions, j as MigrationContext, k as MigrationResult, P as PersistedQueueItem, l as PlanFile, m as PlanItem, n as PlanTemplate, Q as QueueStore, R as RecoveryLock, o as RecoveryLockOptions, S as SessionAnalyzer, p as SessionStoreOptions, T as TodosCheckpointFile, q as addPlanItem, r as attachPlanCheckpoint, s as attachTodosCheckpoint, t as clearPlan, u as deriveTodosFromPlanItem, v as emptyPlan, w as formatPlan, x as formatPlanTemplates, y as getPlanTemplate, z as listPlanTemplates, B as loadPlan, E as loadTodosCheckpoint, F as removePlanItem, G as runConfigMigrations, H as savePlan, I as saveTodosCheckpoint, J as setPlanItemStatus } from './plan-templates-BJflQY2i.js';
 export { D as DirectorStateCheckpoint, a as DirectorStateSnapshot, b as DirectorSubagentState, c as DirectorTaskState, l as loadDirectorState } from './director-state-BmYi3DGA.js';
 export { AutoApprovePermissionPolicy, DefaultPermissionPolicy, PermissionPolicyOptions } from './security/index.js';
 export { AutoCompactionMiddleware, AutonomousRunner, AutonomousRunnerOptions, AutonomyPromptContributorOptions, DefaultSkillLoader, DoneCheckResult, DoneConditionChecker, EternalAutonomyEngine, EternalAutonomyOptions, EternalEngineState, IntelligentCompactor, IntelligentCompactorOptions, SelectiveCompactor, SelectiveCompactorOptions, SkillLoaderOptions, buildGoalPreamble, makeAutonomyPromptContributor } from './execution/index.js';
 export { DefaultProviderRunner } from './defaults/index.js';
-export { A as ALL_FLEET_AGENTS, a as AUDIT_LOG_AGENT, b as AgentFactory, c as AgentFactoryResult, d as AgentRunnerOptions, B as BUG_HUNTER_AGENT, C as CreateDelegateToolOptions, D as DEFAULT_DIRECTOR_PREAMBLE, e as DEFAULT_SUBAGENT_BASELINE, f as DefaultMultiAgentCoordinator, g as DelegateHost, h as Director, i as DirectorPromptParts, j as DirectorSessionFactory, k as DirectorSessionFactoryOptions, F as FLEET_ROSTER, l as FLEET_ROSTER_BUDGETS, m as FleetBus, n as FleetEvent, o as FleetHandler, p as FleetManager, q as FleetManagerOptions, r as FleetSpawnBudgetError, s as FleetUsage, t as FleetUsageAggregator, I as ICoordinator, u as IFleetManager, M as MultiAgentCoordinatorOptions, N as NULL_FLEET_BUS, R as REFACTOR_PLANNER_AGENT, S as SECURITY_SCANNER_AGENT, v as SubagentPromptParts, w as SubagentUsageSnapshot, x as applyRosterBudget, y as composeDirectorPrompt, z as composeSubagentPrompt, E as createDelegateTool, G as makeAgentSubagentRunner, H as makeDirectorSessionFactory, J as rosterSummaryFromConfigs } from './index-i9rPR53g.js';
+export { A as ALL_FLEET_AGENTS, a as AUDIT_LOG_AGENT, b as AgentFactory, c as AgentFactoryResult, d as AgentRunnerOptions, B as BUG_HUNTER_AGENT, C as CreateDelegateToolOptions, D as DEFAULT_DIRECTOR_PREAMBLE, e as DEFAULT_SUBAGENT_BASELINE, f as DefaultMultiAgentCoordinator, g as DelegateHost, h as Director, i as DirectorPromptParts, j as DirectorSessionFactory, k as DirectorSessionFactoryOptions, F as FLEET_ROSTER, l as FLEET_ROSTER_BUDGETS, m as FleetBus, n as FleetEvent, o as FleetHandler, p as FleetManager, q as FleetManagerOptions, r as FleetSpawnBudgetError, s as FleetUsage, t as FleetUsageAggregator, I as ICoordinator, u as IFleetManager, M as MultiAgentCoordinatorOptions, N as NULL_FLEET_BUS, R as REFACTOR_PLANNER_AGENT, S as SECURITY_SCANNER_AGENT, v as SubagentPromptParts, w as SubagentUsageSnapshot, x as applyRosterBudget, y as composeDirectorPrompt, z as composeSubagentPrompt, E as createDelegateTool, G as makeAgentSubagentRunner, H as makeDirectorSessionFactory, J as rosterSummaryFromConfigs } from './index-CPcDqvZh.js';
 export { DefaultModeStore, LLMSelector, LLMSelectorOptions, ModeLoaderOptions, loadProjectModes, loadUserModes } from './models/index.js';
 export { AISpecBuilder, AISpecBuilderOptions, AISpecPhase, AISpecSession, AutoExecutor, AutoExecutorOptions, BottleneckTask, CollectedAnswer, CriticalPathAnalysis, DefaultTaskStore, ExecutionSummary, GeneratedTask, SPEC_TEMPLATES, SpecDiff, SpecDrivenDev, SpecDrivenDevOptions, SpecIndexEntry, SpecParser, SpecStore, SpecStoreOptions, SpecVersion, SpecVersioning, TaskExecutionContext, TaskExecutionResult, TaskFlow, TaskFlowEventMap, TaskFlowEventName, TaskFlowExecutionContext, TaskFlowOptions, TaskFlowPhase, TaskGenerator, TaskGeneratorOptions, TaskGraphIndexEntry, TaskGraphStore, TaskGraphStoreOptions, TaskStore, TaskTracker, TaskTrackerOptions, TaskTransition, analyzeCriticalPath, createAutoExecutor, getTemplate, listTemplates, renderProgress, renderSpecAnalysis, renderTaskGraph, renderTaskList, templateToMarkdown } from './sdd/index.js';
 export { DefaultHealthRegistry, InMemoryMetricsSink, MetricsServerHandle, MetricsServerOptions, NoopMetricsSink, NoopTracer, OTelTracer, OtlpMetricsExporterHandle, OtlpMetricsExporterOptions, OtlpTraceExporterHandle, OtlpTraceExporterOptions, PROMETHEUS_CONTENT_TYPE, buildOtlpMetricsRequest, buildOtlpTracesRequest, renderPrometheus, startMetricsServer, startOtlpMetricsExporter, startOtlpTraceExporter, wireMetricsToEvents } from './observability/index.js';

package/dist/index.js

@@ -1347,7 +1347,7 @@ function round4(n) {
 }
 
 // src/utils/token-estimate.ts
-var RoughTokenEstimate = (text) => Math.max(1, Math.ceil(text.length / 4));
+var RoughTokenEstimate = (text, charsPerToken = 3.5) => Math.max(1, Math.ceil(text.length / charsPerToken));
 var ESTIMATE_CACHE = /* @__PURE__ */ new Map();
 var ESTIMATE_CACHE_MAX_SIZE = 1e4;
 function getCachedEstimate(key, compute) {
@@ -1526,7 +1526,7 @@ var HybridCompactor = class {
   eliseThreshold;
   estimator;
   constructor(opts = {}) {
-    this.preserveK = opts.preserveK ?? 10;
+    this.preserveK = opts.preserveK ?? 5;
     this.eliseThreshold = opts.eliseThreshold ?? 2e3;
     this.estimator = opts.estimator ?? estimateTextTokens;
   }
@@ -1570,6 +1570,17 @@ var HybridCompactor = class {
         preserveStart = i;
       }
     }
+    for (let i = preserveStart; i < messages.length; i++) {
+      const m = messages[i];
+      if (!m || typeof m.content === "string" || !Array.isArray(m.content)) continue;
+      const hasToolUse2 = m.content.some((b) => b.type === "tool_use");
+      if (hasToolUse2 && i + 1 < messages.length) {
+        const next = messages[i + 1];
+        if (next && next.role === "user" && typeof next.content !== "string" && Array.isArray(next.content) && next.content.some((b) => b.type === "tool_result")) {
+          preserveStart = i + 1;
+        }
+      }
+    }
     let saved = 0;
     let changed = false;
     const nextMessages = new Array(messages.length);
@@ -1591,7 +1602,7 @@ var HybridCompactor = class {
         const elided = {
           type: "tool_result",
           tool_use_id: b.tool_use_id,
-          content: `[elided: ~${tokens} tokens removed. Call the tool again if needed.]`,
+          content: `[elided: ~${tokens} tokens]`,
           is_error: b.is_error
         };
         return elided;
@@ -6496,7 +6507,28 @@ var IntelligentCompactor = class {
     try {
       summaryText = await this.callSummarizer(toSummarize, ctx);
     } catch {
-      summaryText = `[${toSummarize.length} earlier turns omitted \u2014 key decisions and file states preserved in context]`;
+      const toolNames = /* @__PURE__ */ new Set();
+      const filePaths = /* @__PURE__ */ new Set();
+      let userTurns = 0, assistantTurns = 0;
+      for (const m of toSummarize) {
+        if (m.role === "user") userTurns++;
+        else if (m.role === "assistant") {
+          assistantTurns++;
+          if (Array.isArray(m.content)) {
+            for (const b of m.content) {
+              if (b.type === "tool_use") toolNames.add(b.name ?? "unknown");
+            }
+          }
+        }
+        const text = typeof m.content === "string" ? m.content : "";
+        const matches = text.matchAll(/(?:[\w.,\-/@]+\/)*[\w.,\-/@]+\.\w+/g);
+        for (const m_ of matches) filePaths.add(m_[0]);
+      }
+      const parts = [`${toSummarize.length} turns (${userTurns} user, ${assistantTurns} assistant)`];
+      if (toolNames.size > 0) parts.push(`tools: ${[...toolNames].join(", ")}`);
+      if (filePaths.size > 0) parts.push(`files: ${[...filePaths].slice(0, 10).join(", ")}`);
+      summaryText = parts.join(" | ");
+      if (!summaryText) summaryText = `${toSummarize.length} earlier turns omitted`;
     }
     const summaryMsg = {
       role: "system",
@@ -6580,6 +6612,17 @@ var IntelligentCompactor = class {
         preserveStart = i;
       }
     }
+    for (let i = preserveStart; i < messages.length; i++) {
+      const m = messages[i];
+      if (!m || typeof m.content === "string" || !Array.isArray(m.content)) continue;
+      const hasToolUse2 = m.content.some((b) => b.type === "tool_use");
+      if (hasToolUse2 && i + 1 < messages.length) {
+        const next = messages[i + 1];
+        if (next && next.role === "user" && typeof next.content !== "string" && Array.isArray(next.content) && next.content.some((b) => b.type === "tool_result")) {
+          preserveStart = i + 1;
+        }
+      }
+    }
     let saved = 0;
     let changed = false;
     const nextMessages = new Array(messages.length);
@@ -7094,7 +7137,15 @@ var AutoCompactionMiddleware = class {
   }
   async compact(ctx, aggressive, pressure) {
     try {
-      await this.compactor.compact(ctx, { aggressive });
+      const report = await this.compactor.compact(ctx, { aggressive });
+      this.events?.emit("compaction.fired", {
+        level: pressure.level,
+        tokens: pressure.tokens,
+        load: pressure.load,
+        maxContext: this._maxContext,
+        report,
+        aggressive
+      });
     } catch (err) {
       const error = err instanceof Error ? err : new Error(String(err));
       const fatal = this.failureMode === "throw" || this.failureMode === "throw_on_hard" && pressure.level === "hard";
@@ -8161,40 +8212,12 @@ var FleetBus = class {
    * subagent teardown so the listeners don't outlive the run.
    */
   attach(subagentId, bus, taskId) {
-    const FORWARDED_TYPES = [
-      "tool.started",
-      "tool.executed",
-      "tool.progress",
-      "tool.confirm_needed",
-      "iteration.started",
-      "iteration.completed",
-      "provider.text_delta",
-      // Subagent extended-thinking output. Forwarded so the FleetPanel /
-      // /fleet log can surface "the planner is thinking…" instead of a
-      // silent gap between iteration.started and the first text_delta.
-      "provider.thinking_delta",
-      "provider.response",
-      "provider.retry",
-      "provider.error",
-      "session.started",
-      "session.ended",
-      "session.damaged",
-      "compaction.fired",
-      "compaction.failed",
-      "token.threshold",
-      // Subagent hit a soft budget limit — coordinator can extend or stop.
-      "budget.threshold_reached"
-    ];
-    const offs = [];
-    for (const t2 of FORWARDED_TYPES) {
-      offs.push(
-        bus.on(t2, (payload) => {
-          this.emit({ subagentId, taskId, ts: Date.now(), type: t2, payload });
-        })
-      );
-    }
+    const off = bus.onPattern("*", (type, payload) => {
+      if (type.startsWith("subagent.")) return;
+      this.emit({ subagentId, taskId, ts: Date.now(), type, payload });
+    });
     return () => {
-      for (const off of offs) off();
+      off();
     };
   }
   /** Subscribe to every event from one subagent. */
@@ -13385,7 +13408,7 @@ function wireMetricsToEvents(events, sink) {
     events.on("token.threshold", (e) => sink.gauge("agent.tokens.used", e.used)),
     events.on("compaction.fired", (e) => {
       sink.counter("compaction.fired.total");
-      sink.histogram("compaction.reduction_tokens", e.before - e.after);
+      sink.histogram("compaction.reduction_tokens", e.report.before - e.report.after);
     }),
     events.on(
       "mcp.server.connected",