cascade-ai 0.12.4 → 0.12.6

package/dist/index.cjs

@@ -74,100 +74,10 @@ var jwt__default = /*#__PURE__*/_interopDefault(jwt);
 var cron__default = /*#__PURE__*/_interopDefault(cron);
 
 // Cascade AI — Multi-tier AI Orchestration System
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
-  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
-}) : x)(function(x) {
-  if (typeof require !== "undefined") return require.apply(this, arguments);
-  throw Error('Dynamic require of "' + x + '" is not supported');
-});
-var __esm = (fn, res) => function __init() {
-  return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
-};
-var __commonJS = (cb, mod) => function __require2() {
-  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  __defProp(target, "default", { value: mod, enumerable: true }) ,
-  mod
-));
-
-// node_modules/keytar/build/Release/keytar.node
-var keytar_default;
-var init_keytar = __esm({
-  "node_modules/keytar/build/Release/keytar.node"() {
-    keytar_default = "./keytar-VMICNFEJ.node";
-  }
-});
 
-// node-file:/home/runner/work/Cascade-AI/Cascade-AI/node_modules/keytar/build/Release/keytar.node
-var require_keytar = __commonJS({
-  "node-file:/home/runner/work/Cascade-AI/Cascade-AI/node_modules/keytar/build/Release/keytar.node"(exports, module) {
-    init_keytar();
-    try {
-      module.exports = __require(keytar_default);
-    } catch {
-    }
-  }
-});
-
-// node_modules/keytar/lib/keytar.js
-var require_keytar2 = __commonJS({
-  "node_modules/keytar/lib/keytar.js"(exports, module) {
-    var keytar = require_keytar();
-    function checkRequired(val, name) {
-      if (!val || val.length <= 0) {
-        throw new Error(name + " is required.");
-      }
-    }
-    module.exports = {
-      getPassword: function(service, account) {
-        checkRequired(service, "Service");
-        checkRequired(account, "Account");
-        return keytar.getPassword(service, account);
-      },
-      setPassword: function(service, account, password) {
-        checkRequired(service, "Service");
-        checkRequired(account, "Account");
-        checkRequired(password, "Password");
-        return keytar.setPassword(service, account, password);
-      },
-      deletePassword: function(service, account) {
-        checkRequired(service, "Service");
-        checkRequired(account, "Account");
-        return keytar.deletePassword(service, account);
-      },
-      findPassword: function(service) {
-        checkRequired(service, "Service");
-        return keytar.findPassword(service);
-      },
-      findCredentials: function(service) {
-        checkRequired(service, "Service");
-        return keytar.findCredentials(service);
-      }
-    };
-  }
-});
 
 // src/constants.ts
-var CASCADE_VERSION = "0.9.6";
+var CASCADE_VERSION = "0.12.6";
 var CASCADE_CONFIG_DIR = ".cascade";
 var CASCADE_MD_FILE = "CASCADE.md";
 var CASCADE_IGNORE_FILE = ".cascadeignore";
@@ -236,6 +146,30 @@ var MODELS = {
     supportsStreaming: true,
     isLocal: false
   },
+  "claude-opus-4-8": {
+    id: "claude-opus-4-8",
+    name: "Claude Opus 4.8",
+    provider: "anthropic",
+    contextWindow: 2e5,
+    isVisionCapable: true,
+    inputCostPer1kTokens: 0.015,
+    outputCostPer1kTokens: 0.075,
+    maxOutputTokens: 32e3,
+    supportsStreaming: true,
+    isLocal: false
+  },
+  "claude-sonnet-4-6": {
+    id: "claude-sonnet-4-6",
+    name: "Claude Sonnet 4.6",
+    provider: "anthropic",
+    contextWindow: 2e5,
+    isVisionCapable: true,
+    inputCostPer1kTokens: 3e-3,
+    outputCostPer1kTokens: 0.015,
+    maxOutputTokens: 16e3,
+    supportsStreaming: true,
+    isLocal: false
+  },
   // OpenAI
   "gpt-4o": {
     id: "gpt-4o",
@@ -497,6 +431,24 @@ var PROVIDER_DISPLAY_NAMES = {
   ollama: "Ollama (Local)"
 };
 
+// src/utils/cost.ts
+function resolveModelPricing(model) {
+  let input = model.inputCostPer1kTokens;
+  let output = model.outputCostPer1kTokens;
+  if (input === 0 && output === 0 && model.id && !model.isLocal) {
+    const known = Object.values(MODELS).find((m) => m.id === model.id && !m.isLocal);
+    if (known) {
+      input = known.inputCostPer1kTokens;
+      output = known.outputCostPer1kTokens;
+    }
+  }
+  return { input, output };
+}
+function calculateCost(inputTokens, outputTokens, model) {
+  const { input, output } = resolveModelPricing(model);
+  return inputTokens / 1e3 * input + outputTokens / 1e3 * output;
+}
+
 // src/providers/base.ts
 var BaseProvider = class {
   config;
@@ -512,7 +464,7 @@ var BaseProvider = class {
     return this.model.isVisionCapable;
   }
   estimateCost(inputTokens, outputTokens) {
-    return inputTokens / 1e3 * this.model.inputCostPer1kTokens + outputTokens / 1e3 * this.model.outputCostPer1kTokens;
+    return calculateCost(inputTokens, outputTokens, this.model);
   }
   makeUsage(inputTokens, outputTokens) {
     return {
@@ -1801,11 +1753,6 @@ var LocalRequestQueue = class {
   }
 };
 
-// src/utils/cost.ts
-function calculateCost(inputTokens, outputTokens, model) {
-  return inputTokens / 1e3 * model.inputCostPer1kTokens + outputTokens / 1e3 * model.outputCostPer1kTokens;
-}
-
 // src/utils/retry.ts
 var CascadeCancelledError = class extends Error {
   constructor(reason) {
@@ -3384,8 +3331,9 @@ var T3Worker = class extends BaseTier {
       const depOutputs = [];
       for (const depId of assignment.dependsOn) {
         try {
-          const dep = await this.peerBus.waitFor(depId);
+          const dep = await this.peerBus.waitFor(depId, 6e4);
           if (dep.status === "FAILED" || dep.status === "ESCALATED") {
+            this.peerBus.publish(this.id, assignment.subtaskId, `Blocked by failed dependency: ${depId}`, "FAILED");
             return this.buildResult(
               "ESCALATED",
               `Dependency ${depId} failed \u2014 cannot proceed`,
@@ -3397,6 +3345,7 @@ var T3Worker = class extends BaseTier {
           depOutputs.push(`[From ${dep.fromId} - ${dep.subtaskId}]:
 ${dep.output}`);
         } catch (err) {
+          this.peerBus.publish(this.id, assignment.subtaskId, `Dependency timeout: ${depId}`, "FAILED");
           return this.buildResult(
             "ESCALATED",
             `Dependency timeout: ${depId}`,
@@ -5095,6 +5044,16 @@ function parseFirstJsonObject(input) {
 }
 
 // src/core/tiers/t1-administrator.ts
+function sharedKeywords(a = [], b = []) {
+  const setB = new Set(b.map((k) => k.toLowerCase().trim()).filter(Boolean));
+  return [...new Set(a.map((k) => k.toLowerCase().trim()).filter(Boolean))].filter((k) => setB.has(k));
+}
+function isStrongKeywordOverlap(a = [], b = []) {
+  if (!a.length || !b.length) return false;
+  const shared = sharedKeywords(a, b);
+  const ratio = shared.length / Math.min(a.length, b.length);
+  return shared.length >= 3 && ratio >= 0.6;
+}
 var T1_SYSTEM_PROMPT = `You are T1, the Administrator in the Cascade AI orchestration system.
 
 Your responsibilities:
@@ -5519,17 +5478,27 @@ Leave dependsOn empty for sections that can run immediately in parallel.`;
         siblingKeywords.set(payload.sectionId, [...new Set(existing)]);
       }
     }
-    const overlapSections = /* @__PURE__ */ new Set();
-    for (let i = 0; i < announcements.length; i++) {
-      for (let j = i + 1; j < announcements.length; j++) {
-        const a = announcements[i].payload;
-        const b = announcements[j].payload;
-        if (!a.keywords || !b.keywords || !a.sectionId || !b.sectionId) continue;
-        const shared = a.keywords.filter((k) => b.keywords.includes(k));
-        if (shared.length > 0) {
-          overlapSections.add(a.sectionId);
-          overlapSections.add(b.sectionId);
-          this.log(`T2 overlap detected between sections: ${a.sectionId} \u2194 ${b.sectionId} (shared: ${shared.join(", ")})`);
+    const payloads = announcements.map((ann) => ann.payload).filter((p) => p?.type === "T2_PLAN_ANNOUNCEMENT" && !!p.sectionId);
+    const softOverlap = /* @__PURE__ */ new Set();
+    const orderOf = new Map(sections.map((s, i) => [s.sectionId, i]));
+    for (let i = 0; i < payloads.length; i++) {
+      for (let j = i + 1; j < payloads.length; j++) {
+        const a = payloads[i];
+        const b = payloads[j];
+        const shared = sharedKeywords(a.keywords ?? [], b.keywords ?? []);
+        if (shared.length === 0) continue;
+        softOverlap.add(a.sectionId);
+        softOverlap.add(b.sectionId);
+        if (isStrongKeywordOverlap(a.keywords ?? [], b.keywords ?? [])) {
+          const ai = orderOf.get(a.sectionId) ?? 0;
+          const bi = orderOf.get(b.sectionId) ?? 0;
+          const earlier = ai <= bi ? a.sectionId : b.sectionId;
+          const later = ai <= bi ? b.sectionId : a.sectionId;
+          const laterSection = sections.find((s) => s.sectionId === later);
+          if (laterSection && earlier !== later && !(laterSection.dependsOn ?? []).includes(earlier)) {
+            laterSection.dependsOn = [...laterSection.dependsOn || [], earlier];
+            this.log(`Strong overlap ${earlier} \u2194 ${later} (shared: ${shared.slice(0, 5).join(", ")}) \u2014 serializing ${later} after ${earlier}`);
+          }
         }
       }
     }
@@ -5541,20 +5510,10 @@ Leave dependsOn empty for sections that can run immediately in parallel.`;
         `You are T2 Manager for section: "${section.sectionTitle}".`,
         `Sibling sections being worked on in parallel: ${otherTitles.join(", ") || "none"}.`,
         myKeywords.length > 0 ? `Watch for overlap with: ${[...new Set(myKeywords)].slice(0, 10).join(", ")}.` : "",
-        overlapSections.has(section.sectionId) ? "NOTE: Potential overlap detected with a sibling section \u2014 be careful not to duplicate work." : ""
+        softOverlap.has(section.sectionId) ? "NOTE: Potential overlap detected with a sibling section \u2014 be careful not to duplicate work." : ""
       ].filter(Boolean).join(" ");
       m.setHierarchyContext(context);
     });
-    if (overlapSections.size > 0) {
-      this.log("Overlap detected \u2014 adding sequential dependencies for conflicting sections to prevent race conditions");
-      const overlapArray = Array.from(overlapSections);
-      for (let i = 1; i < overlapArray.length; i++) {
-        const section = sections.find((s) => s.sectionId === overlapArray[i]);
-        if (section) {
-          section.dependsOn = [...section.dependsOn || [], overlapArray[i - 1]];
-        }
-      }
-    }
     const t2Results = [];
     try {
       t2Results.push(...await this.runT2sWithDependencies(sections, managers, this.taskId));
@@ -9306,7 +9265,7 @@ var PBKDF2_ITERATIONS = 1e5;
 var KEYTAR_SERVICE = "cascade-ai";
 async function loadKeytar() {
   try {
-    const mod = await Promise.resolve().then(() => __toESM(require_keytar2(), 1));
+    const mod = await import('keytar');
     const candidate = mod.default ?? mod;
     if (typeof candidate.getPassword !== "function") return null;
     return candidate;