@wrongstack/core 0.87.0 → 0.89.3

package/dist/{director-state-CgIc30qi.d.ts → director-state-BfeCUbmk.d.ts}

@@ -105,4 +105,4 @@ declare class DirectorStateCheckpoint {
     private persist;
 }
 
-export { DirectorStateCheckpoint as D, type DirectorStateSnapshot as a, type DirectorSubagentState as b, type DirectorTaskState as c, loadDirectorState as l };
+export { type DirectorStateSnapshot as D, DirectorStateCheckpoint as a, type DirectorSubagentState as b, type DirectorTaskState as c, loadDirectorState as l };

package/dist/execution/index.d.ts

@@ -1,24 +1,23 @@
-export { C as CompactorOptions, a as DefaultErrorHandler, b as DefaultRetryPolicy, E as EternalAutonomyEngine, c as EternalAutonomyOptions, d as EternalEngineState, H as HybridCompactor, I as IterationStage, P as ParallelEngineState, e as ParallelEternalEngine, f as ParallelEternalOptions, g as ParallelIterationStage, T as ToolExecutor } from '../parallel-eternal-engine-D402RASp.js';
-import { m as Provider, d as Context } from '../context-ToHAp4-U.js';
-import { a as Compactor, C as CompactReport } from '../compactor-CJq7LQev.js';
-import { M as MessageSelector } from '../selector-11-fm95U.js';
-import { E as EventBus } from '../events-DnRqXaZ3.js';
-import { b as MiddlewareHandler } from '../system-prompt-C0rLCeyn.js';
-import { a as SessionEventBridge } from '../session-event-bridge-D0u-x576.js';
-import { e as ContextWindowAggressiveOn, i as ContextWindowPolicy } from '../config-_DZ7dN-T.js';
-import { A as Agent, D as DoneCondition } from '../agent-subagent-runner-2Aq0jOSj.js';
-import { R as RunResult, S as SystemPromptContributor } from '../index-N0_c4bHQ.js';
-import { a as SkillLoader, b as SkillManifest, S as SkillEntry } from '../skill-BJeF2DwY.js';
-import { a as WstackPaths } from '../wstack-paths-BQMvEllz.js';
-import '../retry-policy-DSu6O6rD.js';
-import '../models-registry-Be3osGt5.js';
+export { C as CompactorOptions, a as DefaultErrorHandler, b as DefaultRetryPolicy, E as EternalAutonomyEngine, c as EternalAutonomyOptions, d as EternalEngineState, H as HybridCompactor, I as IterationStage, P as ParallelEngineState, e as ParallelEternalEngine, f as ParallelEternalOptions, g as ParallelIterationStage, T as ToolExecutor } from '../parallel-eternal-engine-CTpcrb9O.js';
+import { P as Provider, C as Context } from '../context-CNRYfhUv.js';
+import { C as Compactor, a as CompactReport } from '../compactor-DXLxLcmU.js';
+import { M as MessageSelector } from '../selector-C7wcdqMA.js';
+import { E as EventBus } from '../brain-s9DyD_Vf.js';
+import { d as MiddlewareHandler } from '../pipeline-C1Ad9OjI.js';
+import { a as SessionEventBridge } from '../session-event-bridge-IVzs2GpE.js';
+import { k as ContextWindowAggressiveOn, o as ContextWindowPolicy } from '../config-84VaZpH6.js';
+import { g as Agent, O as DoneCondition } from '../agent-subagent-runner-C6eqID1t.js';
+import { R as RunResult, S as SystemPromptContributor } from '../index-D3Nax3YU.js';
+import { S as SkillLoader, b as SkillManifest, a as SkillEntry } from '../skill-BJxzIyyN.js';
+import { W as WstackPaths } from '../wstack-paths-_lqjzErq.js';
+import '../retry-policy-BcmuT_V0.js';
+import '../models-registry-B6_KfS65.js';
 import '../goal-store-DvWLNu52.js';
-import '../multi-agent-coordinator-DllpCVkF.js';
+import '../multi-agent-coordinator-DHNrjPaA.js';
 import 'node:events';
-import '../logger-B72yyPc6.js';
-import '../observability-CoSNZdhX.js';
-import '../permission-14CChMmO.js';
-import '../secret-scrubber-3MHDDAtm.js';
+import '../logger-B63L5bTg.js';
+import '../observability-D-HZN_mF.js';
+import '../permission-BDv7z0mk.js';
 
 interface SkillLoaderOptions {
     paths: WstackPaths;

package/dist/execution/index.js

@@ -6,13 +6,15 @@ import { randomUUID, createHash, randomBytes } from 'crypto';
 import * as os from 'os';
 import { EventEmitter } from 'events';
 
-// src/utils/token-estimate.ts
-function expectDefined(value) {
+// src/utils/expect-defined.ts
+function expectDefined(value, label) {
   if (value === null || value === void 0) {
     throw new Error("Expected value to be defined");
   }
   return value;
 }
+
+// src/utils/token-estimate.ts
 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;
@@ -100,12 +102,6 @@ function estimateRequestTokensCalibrated(messages, systemPrompt, tools) {
 }
 
 // src/utils/message-invariants.ts
-function expectDefined2(value) {
-  if (value === null || value === void 0) {
-    throw new Error("Expected value to be defined");
-  }
-  return value;
-}
 function repairToolUseAdjacency(messages) {
   const removedToolUses = [];
   const removedToolResults = [];
@@ -113,7 +109,7 @@ function repairToolUseAdjacency(messages) {
   let changed = false;
   const out = [];
   for (let i = 0; i < messages.length; i++) {
-    const original = expectDefined2(messages[i]);
+    const original = expectDefined(messages[i]);
     let msg = original;
     if (hasToolUse(msg)) {
       const nextIds = toolResultIds(messages[i + 1]);
@@ -613,12 +609,6 @@ var IntelligentCompactor = class {
 };
 
 // src/models/llm-selector.ts
-function expectDefined3(value) {
-  if (value === null || value === void 0) {
-    throw new Error("Expected value to be defined");
-  }
-  return value;
-}
 var DEFAULT_SYSTEM_PROMPT = `You are a context pruning assistant. Given a conversation history and a token budget, decide which message ranges are worth keeping verbatim and which should be collapsed into summaries.
 
 Output a JSON object with this structure:
@@ -659,7 +649,7 @@ function formatMessages(messages, maxChars = 8e3) {
   const lines = [];
   let used = 0;
   for (let i = 0; i < messages.length; i++) {
-    const m = expectDefined3(messages[i]);
+    const m = expectDefined(messages[i]);
     const role = m.role.padEnd(10, " ");
     let text;
     if (typeof m.content === "string") {
@@ -724,7 +714,7 @@ IMPORTANT: Total conversation (${totalTokens} tokens) exceeds budget (${effectiv
     let tokenCount = 0;
     let startIdx = 0;
     for (let i = messages.length - 1; i >= 0; i--) {
-      const m = expectDefined3(messages[i]);
+      const m = expectDefined(messages[i]);
       const cost = typeof m.content === "string" ? Math.ceil(m.content.length / 4) : m.content.reduce(
         (acc, b) => acc + (b.type === "text" ? Math.ceil(b.text.length / 4) : Math.ceil(JSON.stringify(b).length / 4)),
         0
@@ -1457,17 +1447,12 @@ function createToolOutputSerializer(opts = {}) {
 }
 
 // src/execution/tool-executor.ts
-function expectDefined4(value) {
-  if (value === null || value === void 0) {
-    throw new Error("Expected value to be defined");
-  }
-  return value;
-}
 var ToolExecutor = class {
   constructor(registry, opts) {
     this.registry = registry;
     this.opts = opts;
     this.iterationTimeoutMs = opts.iterationTimeoutMs ?? 3e5;
+    this.maxToolTimeoutMs = opts.maxToolTimeoutMs ?? 3e5;
     this.serializer = createToolOutputSerializer({
       perIterationOutputCapBytes: opts.perIterationOutputCapBytes ?? 1e5
     });
@@ -1476,6 +1461,7 @@ var ToolExecutor = class {
   opts;
   serializer;
   iterationTimeoutMs;
+  maxToolTimeoutMs;
   /**
    * Clear the interactive confirm awaiter so the executor returns
    * `ToolConfirmPendingResult` instead of blocking on stdin. Used by
@@ -1713,7 +1699,10 @@ ${post.additionalContext}` };
       if (parentSignal.reason instanceof Error) throw parentSignal.reason;
       throw new Error(typeof parentSignal.reason === "string" ? parentSignal.reason : "aborted");
     }
-    const timeoutMs = tool.timeoutMs ?? this.iterationTimeoutMs;
+    const timeoutMs = clampTimeoutMs(
+      tool.timeoutMs ?? this.iterationTimeoutMs,
+      this.maxToolTimeoutMs
+    );
     const ctrl = new AbortController();
     const timer = setTimeout(() => ctrl.abort(new Error("tool timeout")), timeoutMs);
     const combined = AbortSignal.any([parentSignal, ctrl.signal]);
@@ -1848,6 +1837,12 @@ ${excerpt}`;
     return void 0;
   }
 };
+function clampTimeoutMs(timeoutMs, maxTimeoutMs) {
+  const fallback = 3e5;
+  const finiteTimeout = Number.isFinite(timeoutMs) && timeoutMs > 0 ? timeoutMs : fallback;
+  const finiteMax = Number.isFinite(maxTimeoutMs) && maxTimeoutMs > 0 ? maxTimeoutMs : fallback;
+  return Math.max(1, Math.min(finiteTimeout, finiteMax));
+}
 var MALFORMED_ARG_MARKERS = ["__raw", "__raw_arguments", "_raw"];
 function hasMalformedArguments(input) {
   if (!input || typeof input !== "object" || Array.isArray(input)) return false;
@@ -1858,7 +1853,7 @@ function hasMalformedArguments(input) {
 function extractMalformedRaw(input) {
   if (!hasMalformedArguments(input)) return void 0;
   const obj = input;
-  const value = obj[expectDefined4(Object.keys(obj)[0])];
+  const value = obj[expectDefined(Object.keys(obj)[0])];
   if (value === void 0 || value === null) return void 0;
   if (typeof value === "string") return value;
   try {
@@ -2756,6 +2751,7 @@ ${recentJournal}` : "No prior iterations.",
 };
 
 // src/coordination/subagent-budget.ts
+var TIMEOUT_PREEMPT_FRACTION = 0.85;
 var BudgetExceededError = class extends Error {
   kind;
   limit;
@@ -3111,15 +3107,7 @@ function makeAgentSubagentRunner(opts) {
     let budgetError = null;
     const onBudgetError = (err) => {
       if (err instanceof BudgetThresholdSignal) {
-        err.decision.then((decision) => {
-          if (decision === "stop") {
-            budgetError = new BudgetExceededError(err.kind, err.limit, err.used);
-            aborter.abort();
-          }
-        }).catch(() => {
-          budgetError = new BudgetExceededError(err.kind, err.limit, err.used);
-          aborter.abort();
-        });
+        budgetError = err;
         return;
       }
       aborter.abort();
@@ -3227,15 +3215,23 @@ function makeAgentSubagentRunner(opts) {
     }
     if (budgetError) {
       if ("decision" in budgetError) {
-        const decision = await budgetError.decision;
-        if (decision === "stop") {
+        try {
+          const decision = await budgetError.decision;
+          if (decision === "stop") {
+            budgetError = new BudgetExceededError(
+              budgetError.kind,
+              budgetError.limit,
+              budgetError.used
+            );
+          } else {
+            budgetError = null;
+          }
+        } catch {
           budgetError = new BudgetExceededError(
             budgetError.kind,
             budgetError.limit,
             budgetError.used
           );
-        } else {
-          budgetError = null;
         }
       }
       if (budgetError) throw budgetError;
@@ -6336,15 +6332,38 @@ var DefaultMultiAgentCoordinator = class _DefaultMultiAgentCoordinator extends E
     }
     const start = Date.now();
     let timer = null;
+    let preemptedForLimit = null;
     const timeoutPromise = new Promise((_, reject) => {
       const armFor = (ms) => {
         if (timer) clearTimeout(timer);
         timer = setTimeout(onTick, Math.max(0, ms));
       };
       const scheduleNext = () => {
-        const wallRemaining = initialTimeoutMs === void 0 ? Number.POSITIVE_INFINITY : (budget.limits.timeoutMs ?? initialTimeoutMs) - (Date.now() - start);
+        const wallLimit = budget.limits.timeoutMs ?? initialTimeoutMs;
+        const wallRemaining = initialTimeoutMs === void 0 ? Number.POSITIVE_INFINITY : wallLimit - (Date.now() - start);
         const idleRemaining = idleLimitMs === void 0 ? Number.POSITIVE_INFINITY : (budget.limits.idleTimeoutMs ?? idleLimitMs) - budget.idleMs();
-        armFor(Math.max(25, Math.min(wallRemaining, idleRemaining)));
+        const preemptRemaining = initialTimeoutMs === void 0 || preemptedForLimit === wallLimit ? Number.POSITIVE_INFINITY : wallLimit * TIMEOUT_PREEMPT_FRACTION - (Date.now() - start);
+        armFor(Math.max(25, Math.min(wallRemaining, idleRemaining, preemptRemaining)));
+      };
+      const negotiateTimeout = async (used, limit) => {
+        const handler = budget.onThreshold;
+        if (!handler) return "stop";
+        const result = handler({
+          kind: "timeout",
+          used,
+          limit,
+          requestDecision: () => new Promise((resolveDecision) => {
+            budget._events?.emit("budget.threshold_reached", {
+              kind: "timeout",
+              used,
+              limit,
+              timeoutMs: 6e4,
+              extend: (extra) => resolveDecision({ extend: extra }),
+              deny: () => resolveDecision("stop")
+            });
+          })
+        });
+        return typeof result === "string" ? result : await result;
       };
       const onTick = async () => {
         const elapsed = Date.now() - start;
@@ -6357,6 +6376,21 @@ var DefaultMultiAgentCoordinator = class _DefaultMultiAgentCoordinator extends E
           reject(new BudgetExceededError("timeout", idleLimit ?? 0, budget.idleMs()));
           return;
         }
+        if (wallLimit !== void 0 && !wallExceeded && budget.onThreshold && preemptedForLimit !== wallLimit && elapsed >= wallLimit * TIMEOUT_PREEMPT_FRACTION) {
+          try {
+            const decision = await negotiateTimeout(elapsed, wallLimit);
+            if (typeof decision !== "string" && decision.extend.timeoutMs !== void 0) {
+              budget.limits.timeoutMs = decision.extend.timeoutMs;
+              preemptedForLimit = null;
+            } else {
+              preemptedForLimit = wallLimit;
+            }
+          } catch {
+            preemptedForLimit = wallLimit;
+          }
+          scheduleNext();
+          return;
+        }
         if (!wallExceeded) {
           scheduleNext();
           return;
@@ -6368,28 +6402,15 @@ var DefaultMultiAgentCoordinator = class _DefaultMultiAgentCoordinator extends E
           return;
         }
         try {
-          const result = budget.onThreshold({
-            kind: "timeout",
-            used: elapsed,
-            limit,
-            requestDecision: () => new Promise((resolveDecision) => {
-              budget._events?.emit("budget.threshold_reached", {
-                kind: "timeout",
-                used: elapsed,
-                limit,
-                timeoutMs: 6e4,
-                extend: (extra) => resolveDecision({ extend: extra }),
-                deny: () => resolveDecision("stop")
-              });
-            })
-          });
-          const decision = typeof result === "string" ? result : await result;
+          const decision = await negotiateTimeout(elapsed, limit);
           if (decision === "continue" || decision === "throw" || decision === "stop") {
+            preemptedForLimit = null;
             armFor(Math.max(1e3, limit));
             return;
           }
           if (decision.extend.timeoutMs !== void 0) {
             budget.limits.timeoutMs = decision.extend.timeoutMs;
+            preemptedForLimit = null;
             scheduleNext();
             return;
           }
@@ -6520,12 +6541,6 @@ var DefaultMultiAgentCoordinator = class _DefaultMultiAgentCoordinator extends E
 };
 
 // src/execution/parallel-eternal-engine.ts
-function expectDefined5(value) {
-  if (value === null || value === void 0) {
-    throw new Error("Expected value to be defined");
-  }
-  return value;
-}
 var GOAL_COMPLETE_MARKER2 = /^\s*\[goal[_\s-]?complete\]\s*$/im;
 var ParallelEternalEngine = class {
   constructor(opts) {
@@ -6681,7 +6696,7 @@ var ParallelEternalEngine = class {
   // Fan-out
   // -------------------------------------------------------------------------
   async fanOut(goal, tasks) {
-    const coordinator = expectDefined5(this.coordinator);
+    const coordinator = expectDefined(this.coordinator);
     const slotCount = Math.min(this.slots, tasks.length);
     const routes = this.dispatchEnabled ? await Promise.all(
       tasks.slice(0, slotCount).map(
@@ -6713,7 +6728,7 @@ ${recentJournal}` : "No prior iterations.",
     const routeInfo = [];
     const spawnPromises = [];
     for (let i = 0; i < slotCount; i++) {
-      const task = expectDefined5(tasks[i]);
+      const task = expectDefined(tasks[i]);
       const route = routes[i] ?? null;
       const subagentId = `parallel-${this.iterations}-${i}`;
       const taskId = randomUUID();