@wrongstack/core 0.109.1 → 0.141.0

package/dist/types/index.d.ts

@@ -1,35 +1,34 @@
-export { A as AgentError, k as Capabilities, u as ConfigError, g as ContentBlock, 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, q as SessionData, N as SessionError, S as SessionEvent, h as SessionMetadata, i as SessionStore, r as SessionSummary, a as SessionWriter, V as StopReason, W as StreamEvent, l as TextBlock, X as ThinkingBlock, T as Tool, Y as ToolCallContext, Z as ToolError, _ as ToolFinalEvent, j as ToolProgressEvent, n as ToolResultBlock, $ as ToolStreamEvent, m as ToolUseBlock, U as Usage, a0 as WrongStackError, a1 as asBlocks, a2 as asText, a4 as isAgentError, a5 as isConfigError, a6 as isFsError, a7 as isImageBlock, a8 as isPluginError, a9 as isSessionError, aa as isTextBlock, ab as isThinkingBlock, ac as isToolError, ad as isToolResultBlock, ae as isToolUseBlock, af as isWrongStackError, ag as toWrongStackError } from '../context-CNRYfhUv.js';
-export { P as ProviderRunner, R as RunProviderOptions } from '../provider-runner-BUunikwY.js';
-export { A as AutonomyConfig, k as CONTEXT_WINDOW_MODES, d as Config, f as ConfigLoader, e as ConfigStore, l as ContextConfig, C as ContextWindowAggressiveOn, m as ContextWindowConfigLike, n as ContextWindowMode, o as ContextWindowModeId, c as ContextWindowPolicy, p as ContextWindowThresholds, q as CustomModelDefinition, D as DEFAULT_CONTEXT_WINDOW_MODE_ID, F as FeaturesConfig, b as HookEntry, H as HookEvent, i as HookInput, a as HookMatcher, j as HookOutcome, I as InProcessHook, r as IndexingConfig, L as LaunchConfig, s as LogConfig, M as MCPServerConfig, h as ModelMatrixEntry, P as PluginConfig, t as ProviderApiKey, u as ProviderConfig, v as SessionLoggingConfig, S as ShellHook, w as SyncCategory, g as SyncConfig, T as ToolsConfig, x as formatContextWindowModeList, y as getContextWindowMode, z as isContextWindowModeId, B as listContextWindowModes, E as resolveContextWindowPolicy } from '../config-BSU-6vah.js';
-export { a as CompactReport, C as Compactor } from '../compactor-DXLxLcmU.js';
-export { a as PermissionDecision, P as PermissionPolicy, T as TrustPolicy } from '../permission-BDv7z0mk.js';
+export { A as AgentError, k as Capabilities, u as ConfigError, g as ContentBlock, 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, q as SessionData, N as SessionError, S as SessionEvent, h as SessionMetadata, i as SessionStore, r as SessionSummary, a as SessionWriter, V as StopReason, W as StreamEvent, X as StreamHangError, l as TextBlock, Y as ThinkingBlock, T as Tool, Z as ToolCallContext, _ as ToolError, $ as ToolFinalEvent, j as ToolProgressEvent, n as ToolResultBlock, a0 as ToolStreamEvent, m as ToolUseBlock, U as Usage, a1 as WrongStackError, a2 as asBlocks, a3 as asText, a5 as isAgentError, a6 as isConfigError, a7 as isFsError, a8 as isImageBlock, a9 as isPluginError, aa as isSessionError, ab as isTextBlock, ac as isThinkingBlock, ad as isToolError, ae as isToolResultBlock, af as isToolUseBlock, ag as isWrongStackError, ah as toWrongStackError } from '../context-C7G_MtLV.js';
+export { P as ProviderRunner, R as RunProviderOptions } from '../provider-runner-BNpuIyOL.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, x as PluginConfig, y as ProviderApiKey, P as ProviderConfig, z as SessionLoggingConfig, S as ShellHook, B as SyncCategory, k as SyncConfig, T as ToolsConfig, E as formatContextWindowModeList, G as getContextWindowMode, J as isContextWindowModeId, K as listContextWindowModes, N as resolveContextWindowPolicy } from '../config-BaVThgnT.js';
+export { a as CompactReport, C as Compactor } from '../compactor-BueGt7LG.js';
+export { a as PermissionDecision, P as PermissionPolicy, T as TrustPolicy } from '../permission-B7nKnEvQ.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-DDz1Ek4V.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-BAtCxdaw.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, m as migratePlaintextSecrets, r as rewriteConfigEncrypted } from '../secret-vault-DrOhc2i5.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-BTcC_T5v.js';
 export { D as DefaultLogger, a as DefaultLoggerOptions } from '../logger-B9J5puGM.js';
-export { D as DefaultPathResolver, a as DefaultTokenCounter } from '../path-resolver-DDJiMAtX.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-Dfv4Y82E.js';
-import { I as IterationStage, f as ParallelIterationStage } from '../parallel-eternal-engine-B2CbsKpc.js';
-export { C as CompactorOptions, g as DEFAULT_RECOVERY_STRATEGIES, D as DefaultErrorHandler, a as DefaultRetryPolicy, H as HybridCompactor, R as RecoveryStrategy, T as ToolExecutor, h as buildRecoveryStrategies } from '../parallel-eternal-engine-B2CbsKpc.js';
+export { D as DefaultPathResolver, a as DefaultTokenCounter } from '../path-resolver-DRjQBkoO.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-Cp_3GIS2.js';
+import { I as IterationStage, f as ParallelIterationStage } from '../parallel-eternal-engine-Dj2SYzha.js';
+export { C as CompactorOptions, g as DEFAULT_RECOVERY_STRATEGIES, D as DefaultErrorHandler, a as DefaultRetryPolicy, H as HybridCompactor, R as RecoveryStrategy, T as ToolExecutor, h as buildRecoveryStrategies } from '../parallel-eternal-engine-Dj2SYzha.js';
 export { b as SkillEntry, S as SkillLoader, a as SkillManifest } from '../skill-Bj6Ezqb8.js';
-export { B as BuildContext, b as ModelCapabilities, a as Renderer, S as SystemPromptBuilder } from '../pipeline-BqiA_UMr.js';
+export { B as BuildContext, b as ModelCapabilities, a as Renderer, S as SystemPromptBuilder } from '../pipeline-BG7UgbDc.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-DukQLUcS.js';
-export { D as DefaultModelsRegistry, a as DefaultModelsRegistryOptions, c as classifyFamily } from '../models-registry-DU64QxQa.js';
-export { D as DEFAULT_MODES, a as Mode, b as ModeConfig, c as ModeManifest, M as ModeStore } from '../mode-ARA3HrkY.js';
-export { I as InMemoryAgentBridge, a as InMemoryBridgeTransport, c as createMessage } from '../agent-bridge-mOxbpFcg.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-1GeQE_L0.js';
+export { D as DefaultModelsRegistry, a as DefaultModelsRegistryOptions, c as classifyFamily } from '../models-registry-D90K9UnM.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-r9y6gdn4.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-DIKEcfgC.js';
+export { S as SystemPromptContributor } from '../index-CPweVoFM.js';
 import '../logger-B63L5bTg.js';
-import '../retry-policy-BcmuT_V0.js';
-import '../models-registry-B6_KfS65.js';
+import '../retry-policy-rutAfVeR.js';
 import '../secret-vault-DoISxaKO.js';
 import '../path-resolver-CPRj4bFY.js';
 import '../goal-store-CV9Yz2X_.js';
-import '../multi-agent-coordinator-51LvnXkD.js';
+import '../multi-agent-coordinator-QWEzJDlm.js';
 import 'node:events';
 
 /** Union of serial and parallel autonomy engine stage types (from EternalAutonomyEngine / ParallelEternalEngine). */

package/dist/types/index.js

@@ -291,6 +291,39 @@ function describeStatus(status, type) {
 function truncate(s, n) {
   return s.length <= n ? s : `${s.slice(0, n - 1)}\u2026`;
 }
+var StreamHangError = class extends ProviderError {
+  /** Name of the provider that hung, e.g. "zai", "anthropic". */
+  hungProviderId;
+  /** Model that was being called when the hang occurred. */
+  hungModel;
+  /** How long (ms) we waited for the next chunk before declaring a hang. */
+  hangTimeoutMs;
+  /** How many bytes were received before the hang. */
+  bytesReceived;
+  /** Elapsed time (ms) from the start of the stream until the hang. */
+  elapsedMs;
+  constructor(opts) {
+    super(
+      `Stream hang: ${opts.providerId}/${opts.model} \u2014 no data for ${opts.hangTimeoutMs}ms after ${opts.bytesReceived} bytes (${opts.elapsedMs}ms elapsed)`,
+      599,
+      true,
+      // always retryable
+      opts.providerId,
+      {
+        body: {
+          message: `Stream stalled after ${opts.elapsedMs}ms, ${opts.bytesReceived} bytes received`
+        },
+        cause: opts.cause
+      }
+    );
+    this.name = "StreamHangError";
+    this.hungProviderId = opts.providerId;
+    this.hungModel = opts.model;
+    this.hangTimeoutMs = opts.hangTimeoutMs;
+    this.bytesReceived = opts.bytesReceived;
+    this.elapsedMs = opts.elapsedMs;
+  }
+};
 function providerStatusToCode(status, type) {
   if (status === 0) return ERROR_CODES.PROVIDER_NETWORK_ERROR;
   if (type === "rate_limit_error" || status === 429) return ERROR_CODES.PROVIDER_RATE_LIMITED;
@@ -912,6 +945,16 @@ function expectDefined(value, label) {
 
 // src/utils/token-estimate.ts
 var RoughTokenEstimate = (text, charsPerToken = 3.5) => Math.max(1, Math.ceil(text.length / charsPerToken));
+var CALIBRATION_GLOBAL_KEY = "__global__";
+var _cals = /* @__PURE__ */ new Map();
+function calState(key) {
+  let state = _cals.get(key);
+  if (!state) {
+    state = { ratio: 1, count: 0, prevEst: 0 };
+    _cals.set(key, state);
+  }
+  return state;
+}
 var ESTIMATE_CACHE = /* @__PURE__ */ new Map();
 var ESTIMATE_CACHE_MAX_SIZE = 1e4;
 function getCachedEstimate(key, compute) {
@@ -943,10 +986,25 @@ function estimateToolResultTokens(content) {
 function estimateTextTokens(text) {
   return RoughTokenEstimate(text);
 }
+function estimateMessageTokens(messages) {
+  let total = 0;
+  for (const m of messages) {
+    if (typeof m.content === "string") {
+      total += estimateTextTokens(m.content);
+    } else {
+      for (const b of m.content) {
+        if (b.type === "text") total += estimateTextTokens(b.text);
+        else if (b.type === "tool_use") total += estimateToolInputTokens(b.input);
+        else if (b.type === "tool_result") total += estimateToolResultTokens(b.content);
+      }
+    }
+  }
+  return total;
+}
 function estimateToolDefTokens(tool) {
   return RoughTokenEstimate(tool.name) + RoughTokenEstimate(tool.description ?? "") + RoughTokenEstimate(JSON.stringify(tool.inputSchema));
 }
-function estimateRequestTokens(messages, systemPrompt, tools) {
+function estimateRequestTokens(messages, systemPrompt, tools, calibrationKey = CALIBRATION_GLOBAL_KEY) {
   let messagesTokens = 0;
   if (typeof messages === "string") {
     messagesTokens = RoughTokenEstimate(messages);
@@ -985,6 +1043,7 @@ function estimateRequestTokens(messages, systemPrompt, tools) {
     toolsTokens += estimateToolDefTokens(t);
   }
   const total = messagesTokens + systemTokens + toolsTokens;
+  calState(calibrationKey).prevEst = total;
   return {
     messages: messagesTokens,
     systemPrompt: systemTokens,
@@ -1085,34 +1144,121 @@ function isEmptyMessage(msg) {
   return msg.content.length === 0;
 }
 
+// src/execution/compaction-core.ts
+var estimateMessages = estimateMessageTokens;
+function hasTextContent(m) {
+  if (typeof m.content === "string") return m.content.trim().length > 0;
+  return m.content.some((b) => b.type === "text" && b.text.trim().length > 0);
+}
+function findPreserveStart(messages, preserveK) {
+  let pairCount = 0;
+  let preserveStart = messages.length;
+  for (let i = messages.length - 1; i >= 0 && pairCount < preserveK; i--) {
+    const m = messages[i];
+    if (!m) continue;
+    if (m.role === "user" || m.role === "assistant") {
+      pairCount++;
+      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;
+      }
+    }
+  }
+  return preserveStart;
+}
+function eliseOldToolResults(messages, opts) {
+  const preserveStart = findPreserveStart(messages, opts.preserveK);
+  let saved = 0;
+  let changed = false;
+  const next = new Array(messages.length);
+  for (let i = 0; i < messages.length; i++) {
+    const msg = messages[i];
+    if (i >= preserveStart || !msg || !Array.isArray(msg.content)) {
+      next[i] = msg;
+      continue;
+    }
+    const original = msg.content;
+    const newContent = original.map((b) => {
+      if (b.type !== "tool_result") return b;
+      const tokens = estimateToolResultTokens(b.content);
+      if (tokens < opts.eliseThreshold) return b;
+      saved += tokens;
+      const elided = {
+        type: "tool_result",
+        tool_use_id: b.tool_use_id,
+        content: `[elided: ~${tokens} tokens]`,
+        is_error: b.is_error
+      };
+      return elided;
+    });
+    if (newContent.every((b, idx) => b === original[idx])) {
+      next[i] = msg;
+    } else {
+      next[i] = { ...msg, content: newContent };
+      changed = true;
+    }
+  }
+  return { messages: changed ? next : messages, saved, changed };
+}
+function buildLosslessDigest(messages) {
+  const lines = [];
+  for (const m of messages) {
+    let text;
+    let omitted = 0;
+    if (typeof m.content === "string") {
+      text = m.content;
+    } else {
+      const parts = [];
+      for (const b of m.content) {
+        if (isTextBlock(b)) parts.push(b.text);
+        else if (b.type === "tool_use" || b.type === "tool_result") omitted++;
+      }
+      text = parts.join(" ");
+    }
+    if (text.trim().length === 0 && omitted === 0) continue;
+    const marker = omitted > 0 ? ` [${omitted} tool call(s) omitted \u2014 see session log]` : "";
+    lines.push(`[${m.role}]: ${text}${marker}`);
+  }
+  return lines.join("\n");
+}
+
 // src/execution/compactor.ts
 var HybridCompactor = class {
   preserveK;
   eliseThreshold;
-  estimator;
   constructor(opts = {}) {
     this.preserveK = opts.preserveK ?? 5;
     this.eliseThreshold = opts.eliseThreshold ?? 2e3;
-    this.estimator = opts.estimator ?? estimateTextTokens;
   }
   async compact(ctx, opts = {}) {
-    const beforeTokens = this.estimateMessages(ctx.messages);
+    const beforeTokens = estimateMessages(ctx.messages);
     const beforeFull = this.estimateFullRequest(ctx);
     const reductions = [];
     const policy = readContextWindowPolicy(ctx);
     const preserveK = policy?.preserveK ?? this.preserveK;
     const eliseThreshold = policy?.eliseThreshold ?? this.eliseThreshold;
-    const phase1Saved = this.eliseOldToolResults(ctx, preserveK, eliseThreshold);
-    if (phase1Saved > 0) reductions.push({ phase: "elision", saved: phase1Saved });
+    const elide = eliseOldToolResults(ctx.messages, { preserveK, eliseThreshold });
+    if (elide.changed) ctx.state.replaceMessages(elide.messages);
+    if (elide.saved > 0) reductions.push({ phase: "elision", saved: elide.saved });
+    let collapsedDigest;
     if (opts.aggressive) {
-      const phase2Saved = this.collapseAncientTurns(ctx, preserveK);
-      if (phase2Saved > 0) reductions.push({ phase: "summary", saved: phase2Saved });
+      const phase2 = this.collapseAncientTurns(ctx, preserveK);
+      if (phase2.saved > 0) reductions.push({ phase: "summary", saved: phase2.saved });
+      collapsedDigest = phase2.digest;
     }
     const repaired = repairToolUseAdjacency(ctx.messages);
     if (repaired.report.changed) {
       ctx.state.replaceMessages(repaired.messages);
     }
-    const afterTokens = this.estimateMessages(ctx.messages);
+    const afterTokens = estimateMessages(ctx.messages);
     const afterFull = this.estimateFullRequest(ctx);
     return {
       before: beforeTokens,
@@ -1120,6 +1266,7 @@ var HybridCompactor = class {
       fullRequestTokensBefore: beforeFull,
       fullRequestTokensAfter: afterFull,
       reductions,
+      collapsedDigest,
       repaired: repaired.report.changed ? {
         removedToolUses: repaired.report.removedToolUses,
         removedToolResults: repaired.report.removedToolResults,
@@ -1132,72 +1279,23 @@ var HybridCompactor = class {
    * This is the accurate figure for context-window pressure monitoring.
    */
   estimateFullRequest(ctx) {
-    const breakdown = estimateRequestTokens(ctx.messages, ctx.systemPrompt, ctx.tools ?? []);
-    return breakdown.total;
-  }
-  eliseOldToolResults(ctx, preserveK = this.preserveK, eliseThreshold = this.eliseThreshold) {
-    const messages = ctx.messages;
-    let pairCount = 0;
-    let preserveStart = messages.length;
-    for (let i = messages.length - 1; i >= 0 && pairCount < preserveK; i--) {
-      const m = messages[i];
-      if (!m) continue;
-      if (m.role === "user" || m.role === "assistant") {
-        pairCount++;
-        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);
-    for (let i = 0; i < messages.length; i++) {
-      const msg = messages[i];
-      if (i >= preserveStart) {
-        nextMessages[i] = msg;
-        continue;
-      }
-      if (!msg || !Array.isArray(msg.content)) {
-        nextMessages[i] = msg;
-        continue;
-      }
-      const newContent = msg.content.map((b) => {
-        if (b.type !== "tool_result") return b;
-        const tokens = estimateToolResultTokens(b.content);
-        if (tokens < eliseThreshold) return b;
-        saved += tokens;
-        const elided = {
-          type: "tool_result",
-          tool_use_id: b.tool_use_id,
-          content: `[elided: ~${tokens} tokens]`,
-          is_error: b.is_error
-        };
-        return elided;
-      });
-      if (newContent.length === msg.content.length && newContent.every((b, idx) => b === msg.content[idx])) {
-        nextMessages[i] = msg;
-      } else {
-        nextMessages[i] = { ...msg, content: newContent };
-        changed = true;
-      }
-    }
-    if (changed) ctx.state.replaceMessages(nextMessages);
-    return saved;
+    return estimateRequestTokens(ctx.messages, ctx.systemPrompt, ctx.tools ?? []).total;
   }
+  /**
+   * Lossless rule-based collapse of ancient turns into a single digest message.
+   *
+   * Preserves ALL textual content of the collapsed range — user instructions,
+   * assistant decisions/conclusions, and any prior digests (chained forward so
+   * the digest stays lossless across repeated compactions). Only `tool_use` /
+   * `tool_result` protocol blocks are dropped and replaced with a count marker;
+   * their full payload already lives in the session log. No sub-LLM call.
+   *
+   * Returns the token savings and the digest text (for audit logging).
+   */
   collapseAncientTurns(ctx, preserveK = this.preserveK) {
     const messages = ctx.messages;
     const cutTarget = Math.max(0, messages.length - preserveK * 2);
-    if (cutTarget <= 0) return 0;
+    if (cutTarget <= 0) return { saved: 0 };
     let boundary = -1;
     for (let i = cutTarget; i < messages.length; i++) {
       const m = messages[i];
@@ -1207,34 +1305,20 @@ var HybridCompactor = class {
         break;
       }
     }
-    if (boundary <= 0) return 0;
+    if (boundary <= 0) return { saved: 0 };
     const removed = messages.slice(0, boundary);
-    const removedTokens = this.estimateMessages(removed);
-    const summary = [
-      {
-        role: "user",
-        content: `[previous_session_summary: ${removed.length} earlier turns compacted. Todo state preserved in context.]`
-      },
-      { role: "assistant", content: "Continuing from compacted context." }
-    ];
+    const removedTokens = estimateMessages(removed);
+    const digest = buildLosslessDigest(removed) || `${removed.length} earlier turns (no textual content; tool I/O omitted \u2014 see session log)`;
+    const summaryMsg = {
+      role: "system",
+      content: `[prior_turns_digest: ${digest}]`
+    };
     const tail = ctx.messages.slice(boundary);
-    ctx.state.replaceMessages([...summary, ...tail]);
-    return Math.max(0, removedTokens - this.estimateMessages(summary));
-  }
-  estimateMessages(messages) {
-    let total = 0;
-    for (const m of messages) {
-      if (typeof m.content === "string") {
-        total += this.estimator(m.content);
-      } else {
-        for (const b of m.content) {
-          if (b.type === "text") total += this.estimator(b.text);
-          else if (b.type === "tool_use") total += estimateToolInputTokens(b.input);
-          else if (b.type === "tool_result") total += estimateToolResultTokens(b.content);
-        }
-      }
-    }
-    return total;
+    ctx.state.replaceMessages([summaryMsg, ...tail]);
+    return {
+      saved: Math.max(0, removedTokens - estimateMessages([summaryMsg])),
+      digest
+    };
   }
 };
 function readContextWindowPolicy(ctx) {
@@ -1246,10 +1330,6 @@ function readContextWindowPolicy(ctx) {
   }
   return candidate;
 }
-function hasTextContent(m) {
-  if (typeof m.content === "string") return m.content.trim().length > 0;
-  return m.content.some((b) => b.type === "text" && b.text.trim().length > 0);
-}
 var PROJECT_MARKERS = [
   ".git",
   "package.json",
@@ -1456,6 +1536,7 @@ var DefaultRetryPolicy = class {
     if (err instanceof ProviderError) {
       if (err.status === 429) return 5;
       if (err.status === 529) return 3;
+      if (err.status === 599) return 5;
       if (err.status >= 500) return 3;
       return 0;
     }
@@ -2493,6 +2574,8 @@ function topologicalSort(graph) {
 var ToolCapabilities = {
   /** Can execute arbitrary commands in the user's shell (the `bash` tool). */
   SHELL_ARBITRARY: "shell.arbitrary",
+  /** Can execute a restricted set of commands (the `exec` tool). */
+  SHELL_RESTRICTED: "shell.restricted",
   /** Can write / modify / delete files inside the project. */
   FS_WRITE: "fs.write",
   /** Can write files outside the current project root (very high risk). */
@@ -2508,6 +2591,7 @@ var ToolCapabilities = {
 };
 var DANGEROUS_FOR_SUBAGENTS = [
   ToolCapabilities.SHELL_ARBITRARY,
+  ToolCapabilities.SHELL_RESTRICTED,
   ToolCapabilities.FS_WRITE,
   ToolCapabilities.FS_WRITE_OUTSIDE_PROJECT,
   ToolCapabilities.MCP_PROXY,
@@ -3397,6 +3481,6 @@ function renderPlainText(meta, events) {
   return lines.join("\n");
 }
 
-export { AgentError, CONTEXT_WINDOW_MODES, ConfigError, DEFAULT_AUTONOMY_CONFIG, DEFAULT_CONTEXT_CONFIG, DEFAULT_CONTEXT_WINDOW_MODE_ID, DEFAULT_MODES, DEFAULT_RECOVERY_STRATEGIES, DEFAULT_SESSION_LOGGING_CONFIG, DEFAULT_SESSION_PRUNE_DAYS, DEFAULT_SPEC_TEMPLATE, DEFAULT_TOOLS_CONFIG, DefaultErrorHandler, DefaultLogger, DefaultModelsRegistry, DefaultPathResolver, DefaultRetryPolicy, DefaultSecretScrubber, DefaultSecretVault, DefaultSessionReader, DefaultTokenCounter, ERROR_CODES, FsError, HybridCompactor, InMemoryAgentBridge, InMemoryBridgeTransport, MEMORY_TYPE_LABELS, PluginError, ProviderError, SessionError, ToolError, ToolExecutor, WrongStackError, asBlocks, asText, buildRecoveryStrategies, classifyFamily, computeTaskProgress, createMessage, decryptConfigSecrets, encryptConfigSecrets, findCriticalPath, formatContextWindowModeList, getContextWindowMode, isAgentError, isConfigError, isContextWindowModeId, isFsError, isImageBlock, isPluginError, isSessionError, isTextBlock, isThinkingBlock, isToolError, isToolResultBlock, isToolUseBlock, isWrongStackError, listContextWindowModes, migratePlaintextSecrets, resolveContextWindowPolicy, rewriteConfigEncrypted, toWrongStackError, topologicalSort };
+export { AgentError, CONTEXT_WINDOW_MODES, ConfigError, DEFAULT_AUTONOMY_CONFIG, DEFAULT_CONTEXT_CONFIG, DEFAULT_CONTEXT_WINDOW_MODE_ID, DEFAULT_MODES, DEFAULT_RECOVERY_STRATEGIES, DEFAULT_SESSION_LOGGING_CONFIG, DEFAULT_SESSION_PRUNE_DAYS, DEFAULT_SPEC_TEMPLATE, DEFAULT_TOOLS_CONFIG, DefaultErrorHandler, DefaultLogger, DefaultModelsRegistry, DefaultPathResolver, DefaultRetryPolicy, DefaultSecretScrubber, DefaultSecretVault, DefaultSessionReader, DefaultTokenCounter, ERROR_CODES, FsError, HybridCompactor, InMemoryAgentBridge, InMemoryBridgeTransport, MEMORY_TYPE_LABELS, PluginError, ProviderError, SessionError, StreamHangError, ToolError, ToolExecutor, WrongStackError, asBlocks, asText, buildRecoveryStrategies, classifyFamily, computeTaskProgress, createMessage, decryptConfigSecrets, encryptConfigSecrets, findCriticalPath, formatContextWindowModeList, getContextWindowMode, isAgentError, isConfigError, isContextWindowModeId, isFsError, isImageBlock, isPluginError, isSecretField, isSessionError, isTextBlock, isThinkingBlock, isToolError, isToolResultBlock, isToolUseBlock, isWrongStackError, listContextWindowModes, migratePlaintextSecrets, resolveContextWindowPolicy, rewriteConfigEncrypted, toWrongStackError, topologicalSort };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map