cascade-ai 0.2.12 → 0.4.0

package/dist/index.cjs

@@ -165,7 +165,7 @@ var require_keytar2 = __commonJS({
 });
 
 // src/constants.ts
-var CASCADE_VERSION = "0.2.12";
+var CASCADE_VERSION = "0.4.0";
 var CASCADE_CONFIG_DIR = ".cascade";
 var CASCADE_MD_FILE = "CASCADE.md";
 var CASCADE_IGNORE_FILE = ".cascadeignore";
@@ -903,19 +903,21 @@ var OpenAIProvider = class extends BaseProvider {
 // src/providers/azure.ts
 var AzureOpenAIProvider = class extends OpenAIProvider {
   constructor(config, model) {
-    const baseUrl = config.baseUrl ?? AZURE_BASE_URL_TEMPLATE.replace("{resource}", "YOUR_RESOURCE");
+    const rawUrl = config.baseUrl ?? AZURE_BASE_URL_TEMPLATE.replace("{resource}", "YOUR_RESOURCE");
+    const endpoint = rawUrl.replace(/\/+$/, "");
     super(
       {
         ...config,
-        baseUrl: `${baseUrl}/openai/deployments/${config.deploymentName ?? model.id}`
+        baseUrl: endpoint
+        // Kept for superclass compatibility if it reads it
       },
       model
     );
-    this.client = new OpenAI__default.default({
+    this.client = new OpenAI.AzureOpenAI({
       apiKey: config.apiKey,
-      baseURL: `${baseUrl}/openai/deployments/${config.deploymentName ?? model.id}`,
-      defaultQuery: { "api-version": config.apiVersion ?? "2024-08-01-preview" },
-      defaultHeaders: { "api-key": config.apiKey ?? "" }
+      endpoint,
+      deployment: config.deploymentName ?? model.id,
+      apiVersion: config.apiVersion ?? "2024-08-01-preview"
     });
   }
   async listModels() {
@@ -1673,7 +1675,7 @@ var CascadeRouter = class _CascadeRouter extends EventEmitter__default.default {
       if (!model) {
         throw new Error(`Configured model "${override}" for ${tier} could not be loaded. Check provider availability and exact model name.`);
       }
-      if (model.id !== override) {
+      if (model.id !== override && `${model.provider}:${model.id}` !== override) {
         throw new Error(`Configured model "${override}" for ${tier} resolved to "${model.id}". Use the exact provider model ID or prefix the provider (e.g. gemini:${override}).`);
       }
       this.tierModels.set(tier, model);
@@ -2036,7 +2038,7 @@ var BaseTier = class extends EventEmitter__default.default {
   getStatus() {
     return this.status;
   }
-  setStatus(status) {
+  setStatus(status, output) {
     this.status = status;
     const timestamp = (/* @__PURE__ */ new Date()).toISOString();
     const event = {
@@ -2045,7 +2047,8 @@ var BaseTier = class extends EventEmitter__default.default {
       parentId: this.parentId,
       label: this.label,
       status,
-      timestamp
+      timestamp,
+      output
     };
     this.emit("status", event);
     this.emit("tier:status", event);
@@ -2071,7 +2074,8 @@ var BaseTier = class extends EventEmitter__default.default {
       status: this.status,
       currentAction: update.currentAction,
       progressPct: update.progressPct,
-      timestamp
+      timestamp,
+      output: update.output
     });
   }
   buildMessage(type, to, payload) {
@@ -2451,16 +2455,17 @@ Now execute your subtask using this context where relevant.`
           return this.buildResult("ESCALATED", output, { checksRun, passed, failed }, issues, correctionAttempts);
         }
       }
-      this.setStatus("COMPLETED");
-      this.sendStatusUpdate({ progressPct: 100, currentAction: "Subtask complete", status: "IN_PROGRESS" });
+      this.setStatus("COMPLETED", output);
+      this.sendStatusUpdate({ progressPct: 100, currentAction: "Subtask complete", status: "IN_PROGRESS", output });
       this.peerBus?.publish(this.id, assignment.subtaskId, output, "COMPLETED");
       return this.buildResult("COMPLETED", output, { checksRun, passed, failed }, issues, correctionAttempts);
     } catch (err) {
       const errMsg = err instanceof Error ? err.message : String(err);
       issues.push(`Execution error: ${errMsg}`);
-      this.setStatus("FAILED");
-      this.peerBus?.publish(this.id, assignment.subtaskId, errMsg, "FAILED");
-      return this.buildResult("ESCALATED", output || errMsg, { checksRun, passed, failed }, issues, correctionAttempts);
+      const finalOutput = output || errMsg;
+      this.setStatus("FAILED", finalOutput);
+      this.peerBus?.publish(this.id, assignment.subtaskId, finalOutput, "FAILED");
+      return this.buildResult("ESCALATED", finalOutput, { checksRun, passed, failed }, issues, correctionAttempts);
     }
   }
   sendToPeer(toId, content) {
@@ -2514,6 +2519,10 @@ HIERARCHY CONTEXT: ${this.hierarchyContext}` : ""),
       await this.context.addMessage({ role: "assistant", content: result.content, toolCalls: result.toolCalls });
       if (!result.toolCalls?.length) {
         if (requiresArtifact) {
+          const artifactCheck = await this.verifyArtifacts(this.assignment);
+          if (artifactCheck.ok) {
+            return { output: result.content, toolCalls: allToolCalls };
+          }
           stalledArtifactIterations += 1;
           if (stalledArtifactIterations >= 2) {
             if (stalledArtifactIterations === 2) {
@@ -2523,15 +2532,22 @@ HIERARCHY CONTEXT: ${this.hierarchyContext}` : ""),
           }
           await this.context.addMessage({
             role: "user",
-            content: "You have not yet created and verified the required artifact. Use tools to create the file in the workspace, verify it exists, and inspect the result before concluding."
+            content: `You have not yet created and verified the required artifact. Issues: ${artifactCheck.issues.join("; ")}. Use tools to create the file in the workspace, verify it exists, and inspect the result before concluding.`
           });
           continue;
         }
         return { output: result.content, toolCalls: allToolCalls };
       }
       stalledArtifactIterations = 0;
-      if (result.finishReason === "stop" && !requiresArtifact) {
-        return { output: result.content, toolCalls: allToolCalls };
+      if (result.finishReason === "stop") {
+        if (requiresArtifact) {
+          const artifactCheck = await this.verifyArtifacts(this.assignment);
+          if (artifactCheck.ok) {
+            return { output: result.content, toolCalls: allToolCalls };
+          }
+        } else {
+          return { output: result.content, toolCalls: allToolCalls };
+        }
       }
       for (const tc of result.toolCalls) {
         allToolCalls.push(tc);
@@ -3143,8 +3159,9 @@ var T2Manager = class extends BaseTier {
       const summary = await this.aggregateResults(assignment, t3Results);
       const issues = t3Results.filter((r) => r.status !== "COMPLETED").flatMap((r) => r.issues);
       const overallStatus = this.determineStatus(t3Results);
-      this.setStatus(overallStatus === "COMPLETED" ? "COMPLETED" : "FAILED");
-      this.sendStatusUpdate({ progressPct: 100, currentAction: "Section complete", status: "IN_PROGRESS" });
+      const isOk = overallStatus === "COMPLETED" || overallStatus === "PARTIAL";
+      this.setStatus(isOk ? "COMPLETED" : "FAILED", summary);
+      this.sendStatusUpdate({ progressPct: 100, currentAction: "Section complete", status: "IN_PROGRESS", output: summary });
       const result = {
         sectionId: assignment.sectionId,
         sectionTitle: assignment.sectionTitle,
@@ -3157,7 +3174,7 @@ var T2Manager = class extends BaseTier {
       return result;
     } catch (err) {
       const errMsg = err instanceof Error ? err.message : String(err);
-      this.setStatus("FAILED");
+      this.setStatus("FAILED", errMsg);
       const failedResult = {
         sectionId: assignment.sectionId,
         sectionTitle: assignment.sectionTitle,
@@ -3719,8 +3736,8 @@ Create a CORRECTION PLAN that contains only the new sections needed to fix the i
       status: "IN_PROGRESS"
     });
     const output = await this.compileFinalOutput(userPrompt, plan, allT2Results);
-    this.setStatus("COMPLETED");
-    this.sendStatusUpdate({ progressPct: 100, currentAction: "Task complete", status: "IN_PROGRESS" });
+    this.setStatus("COMPLETED", output);
+    this.sendStatusUpdate({ progressPct: 100, currentAction: "Task complete", status: "IN_PROGRESS", output });
     return { output, t2Results: allT2Results, taskId: this.taskId, complexity: plan.complexity };
   }
   getEscalations() {
@@ -6124,10 +6141,17 @@ var Cascade = class extends EventEmitter__default.default {
       throw err;
     }
   }
+  isCasualGreeting(prompt) {
+    const casual = /^(hi|hello|hey|greetings|thanks|thank you|thx|bye|goodbye|cya)$/i.test(prompt.trim().replace(/[!?.]+$/, ""));
+    return casual;
+  }
   looksLikeSimpleArtifactTask(prompt) {
     return /create .*\.(txt|md|json|csv)\b/i.test(prompt) && !/(research|compare|thorough|pdf|report|analy[sz]e|architecture|multi-agent)/i.test(prompt);
   }
   async determineComplexity(prompt, workspacePath, conversationHistory = []) {
+    if (this.isCasualGreeting(prompt)) {
+      return "Simple";
+    }
     if (this.looksLikeSimpleArtifactTask(prompt)) {
       return "Simple";
     }
@@ -6858,8 +6882,8 @@ Original error: ${err.message}`
   upsertRuntimeNode(node) {
     this.enqueueWrite(() => {
       this.db.prepare(`
-        INSERT INTO runtime_nodes (tier_id, session_id, parent_id, role, label, status, current_action, progress_pct, updated_at, workspace_path, is_global)
-        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+        INSERT INTO runtime_nodes (tier_id, session_id, parent_id, role, label, status, current_action, progress_pct, updated_at, workspace_path, is_global, output)
+        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
         ON CONFLICT(tier_id) DO UPDATE SET
           session_id = excluded.session_id,
           parent_id = excluded.parent_id,
@@ -6870,7 +6894,8 @@ Original error: ${err.message}`
           progress_pct = excluded.progress_pct,
           updated_at = excluded.updated_at,
           workspace_path = excluded.workspace_path,
-          is_global = excluded.is_global
+          is_global = excluded.is_global,
+          output = excluded.output
       `).run(
         node.tierId,
         node.sessionId,
@@ -6882,7 +6907,8 @@ Original error: ${err.message}`
         node.progressPct ?? null,
         node.updatedAt,
         node.workspacePath ?? null,
-        node.isGlobal ? 1 : 0
+        node.isGlobal ? 1 : 0,
+        node.output ?? null
       );
     });
   }
@@ -6903,14 +6929,15 @@ Original error: ${err.message}`
       progressPct: row.progress_pct ?? void 0,
       updatedAt: row.updated_at,
       workspacePath: row.workspace_path ?? void 0,
-      isGlobal: row.is_global === 1
+      isGlobal: row.is_global === 1,
+      output: row.output ?? void 0
     }));
   }
   addRuntimeNodeLog(log) {
     this.enqueueWrite(() => {
       this.db.prepare(`
-        INSERT INTO runtime_node_logs (id, session_id, tier_id, role, label, status, current_action, progress_pct, timestamp, workspace_path, is_global)
-        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+        INSERT INTO runtime_node_logs (id, session_id, tier_id, role, label, status, current_action, progress_pct, timestamp, workspace_path, is_global, output)
+        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
       `).run(
         log.id,
         log.sessionId,
@@ -6922,7 +6949,8 @@ Original error: ${err.message}`
         log.progressPct ?? null,
         log.timestamp,
         log.workspacePath ?? null,
-        log.isGlobal ? 1 : 0
+        log.isGlobal ? 1 : 0,
+        log.output ?? null
       );
       this.db.prepare(`
         DELETE FROM runtime_node_logs
@@ -6965,7 +6993,8 @@ Original error: ${err.message}`
       progressPct: row.progress_pct ?? void 0,
       timestamp: row.timestamp,
       workspacePath: row.workspace_path ?? void 0,
-      isGlobal: row.is_global === 1
+      isGlobal: row.is_global === 1,
+      output: row.output ?? void 0
     }));
   }
   // ── Messages ──────────────────────────────────
@@ -7292,7 +7321,8 @@ Original error: ${err.message}`
         progress_pct INTEGER,
         updated_at TEXT NOT NULL,
         workspace_path TEXT,
-        is_global INTEGER NOT NULL DEFAULT 0
+        is_global INTEGER NOT NULL DEFAULT 0,
+        output TEXT
       );
 
       CREATE INDEX IF NOT EXISTS idx_runtime_nodes_session ON runtime_nodes(session_id);
@@ -7309,7 +7339,8 @@ Original error: ${err.message}`
         progress_pct INTEGER,
         timestamp TEXT NOT NULL,
         workspace_path TEXT,
-        is_global INTEGER NOT NULL DEFAULT 0
+        is_global INTEGER NOT NULL DEFAULT 0,
+        output TEXT
       );
 
       CREATE TABLE IF NOT EXISTS model_cache (
@@ -7338,6 +7369,14 @@ Original error: ${err.message}`
 
       CREATE INDEX IF NOT EXISTS idx_file_snapshots_session ON file_snapshots(session_id);
     `);
+    try {
+      this.db.exec("ALTER TABLE runtime_nodes ADD COLUMN output TEXT");
+    } catch {
+    }
+    try {
+      this.db.exec("ALTER TABLE runtime_node_logs ADD COLUMN output TEXT");
+    } catch {
+    }
   }
   // ── Deserializers ─────────────────────────────
   deserializeSession(row, messages) {
@@ -8111,8 +8150,8 @@ var DashboardServer = class {
       void (async () => {
         const cascade = new Cascade(this.config, this.workspacePath, this.store);
         cascade.on("stream:token", (e) => {
-          this.socket.broadcast("stream:token", { sessionId, token: e.text });
-          this.socket.broadcastToRoom(`session:${sessionId}`, "stream:token", { sessionId, token: e.text });
+          this.socket.broadcast("stream:token", { sessionId, tierId: e.tierId, text: e.text });
+          this.socket.broadcastToRoom(`session:${sessionId}`, "stream:token", { sessionId, tierId: e.tierId, text: e.text });
         });
         cascade.on("tier:status", (e) => {
           this.socket.broadcast("tier:status", { sessionId, ...e });