@wrongstack/core 0.87.0 → 0.89.3

package/dist/sdd/index.js

@@ -17,7 +17,8 @@ var __export = (target, all) => {
 var atomic_write_exports = {};
 __export(atomic_write_exports, {
   atomicWrite: () => atomicWrite,
-  ensureDir: () => ensureDir
+  ensureDir: () => ensureDir,
+  withFileLock: () => withFileLock
 });
 async function atomicWrite(targetPath, content, opts = {}) {
   const dir = path.dirname(targetPath);
@@ -60,6 +61,49 @@ async function atomicWrite(targetPath, content, opts = {}) {
 async function ensureDir(dir) {
   await fs.mkdir(dir, { recursive: true });
 }
+async function withFileLock(targetPath, fn, opts = {}) {
+  const dir = path.dirname(targetPath);
+  await fs.mkdir(dir, { recursive: true });
+  const lockPath = path.join(dir, `.${path.basename(targetPath)}.lock`);
+  const timeoutMs = opts.timeoutMs ?? 5e3;
+  const staleMs = opts.staleMs ?? 3e4;
+  const started = Date.now();
+  let handle;
+  for (; ; ) {
+    try {
+      handle = await fs.open(lockPath, "wx");
+      await handle.writeFile(`${process.pid}:${Date.now()}`);
+      break;
+    } catch (err) {
+      if (err.code !== "EEXIST") throw err;
+      try {
+        const stat2 = await fs.stat(lockPath);
+        if (Date.now() - stat2.mtimeMs > staleMs) {
+          await fs.unlink(lockPath);
+          continue;
+        }
+      } catch {
+        continue;
+      }
+      if (Date.now() - started >= timeoutMs) {
+        throw new Error(`Timed out waiting for file lock: ${targetPath}`);
+      }
+      await new Promise((resolve) => setTimeout(resolve, 25));
+    }
+  }
+  try {
+    return await fn();
+  } finally {
+    try {
+      await handle?.close();
+    } catch {
+    }
+    try {
+      await fs.unlink(lockPath);
+    } catch {
+    }
+  }
+}
 async function renameWithRetry(from, to) {
   if (process.platform !== "win32") {
     await fs.rename(from, to);
@@ -1199,13 +1243,15 @@ var TaskGraphStore = class {
   }
 };
 
-// src/sdd/spec-builder.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/sdd/spec-builder.ts
 function buildQuestioningPrompt(session, min, max) {
   const answered = session.answers.length;
   const remaining = Math.max(0, min - answered);
@@ -1993,12 +2039,6 @@ function truncate(str, maxLen) {
 }
 
 // src/sdd/critical-path.ts
-function expectDefined2(value) {
-  if (value === null || value === void 0) {
-    throw new Error("Expected value to be defined");
-  }
-  return value;
-}
 function analyzeCriticalPath(graph) {
   const nodes = Array.from(graph.nodes.values());
   const topoOrder = topologicalSort(graph);
@@ -2074,7 +2114,7 @@ function getTransitiveBlocked(_graph, taskId, blocksMap) {
   const visited = /* @__PURE__ */ new Set();
   const queue = [taskId];
   while (queue.length > 0) {
-    const current = expectDefined2(queue.shift());
+    const current = expectDefined(queue.shift());
     const blocked = blocksMap.get(current);
     if (!blocked) continue;
     for (const id of blocked) {
@@ -2120,7 +2160,7 @@ function computeCriticalPath(graph, _topoOrder, blockedByMap) {
     if (!changed) break;
   }
   let maxDist = 0;
-  let maxId = expectDefined2(allIds[0]);
+  let maxId = expectDefined(allIds[0]);
   for (const id of allIds) {
     const d = dist.get(id) ?? 0;
     if (d > maxDist) {
@@ -2591,6 +2631,7 @@ var SddTaskDecomposer = class {
 };
 
 // src/coordination/subagent-budget.ts
+var TIMEOUT_PREEMPT_FRACTION = 0.85;
 var BudgetExceededError = class extends Error {
   kind;
   limit;
@@ -2946,15 +2987,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();
@@ -3062,15 +3095,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;
@@ -6110,15 +6151,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;
@@ -6131,6 +6195,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;
@@ -6142,28 +6221,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;
           }
@@ -6294,12 +6360,6 @@ var DefaultMultiAgentCoordinator = class _DefaultMultiAgentCoordinator extends E
 };
 
 // src/sdd/sdd-parallel-run.ts
-function expectDefined3(value) {
-  if (value === null || value === void 0) {
-    throw new Error("Expected value to be defined");
-  }
-  return value;
-}
 var SddParallelRun = class {
   constructor(opts) {
     this.opts = opts;
@@ -6448,8 +6508,8 @@ var SddParallelRun = class {
     const successCount = results.filter((r) => r.status === "success").length;
     const failCount = results.length - successCount;
     for (let i = 0; i < results.length; i++) {
-      const result = expectDefined3(results[i]);
-      const taskId = expectDefined3(taskIds[i]);
+      const result = expectDefined(results[i]);
+      const taskId = expectDefined(taskIds[i]);
       if (result.status === "success") {
         this.opts.tracker.updateNodeStatus(taskId, "completed");
       } else {