cascade-ai 0.3.0 → 0.4.0

package/dist/cli.js

@@ -1,5 +1,5 @@
 import Anthropic from '@anthropic-ai/sdk';
-import OpenAI from 'openai';
+import OpenAI, { AzureOpenAI } from 'openai';
 import { GoogleGenAI, HarmBlockThreshold, HarmCategory } from '@google/genai';
 import axios2 from 'axios';
 import { render, useApp, useStdout, useInput, Box, Text } from 'ink';
@@ -83,7 +83,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var CASCADE_VERSION, CASCADE_CONFIG_FILE, CASCADE_DB_FILE, CASCADE_DASHBOARD_SECRET_FILE, GLOBAL_CONFIG_DIR, GLOBAL_DB_FILE, GLOBAL_KEYSTORE_FILE, GLOBAL_RUNTIME_DB_FILE, DEFAULT_DASHBOARD_PORT, DEFAULT_CONTEXT_LIMIT, DEFAULT_AUTO_SUMMARIZE_AT, MODELS, T1_MODEL_PRIORITY, T2_MODEL_PRIORITY, T3_MODEL_PRIORITY, VISION_MODEL_PRIORITY, COMPLEXITY_T2_COUNT, THEME_NAMES, DEFAULT_THEME, OLLAMA_BASE_URL, LM_STUDIO_BASE_URL, AZURE_BASE_URL_TEMPLATE, TOOL_NAMES, DEFAULT_APPROVAL_REQUIRED;
 var init_constants = __esm({
   "src/constants.ts"() {
-    CASCADE_VERSION = "0.3.0";
+    CASCADE_VERSION = "0.4.0";
     CASCADE_CONFIG_FILE = ".cascade/config.json";
     CASCADE_DB_FILE = ".cascade/memory.db";
     CASCADE_DASHBOARD_SECRET_FILE = ".cascade/dashboard-secret";
@@ -902,19 +902,21 @@ var init_azure = __esm({
     init_openai();
     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({
+        this.client = new 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() {
@@ -3248,7 +3250,7 @@ var CascadeRouter = class _CascadeRouter extends EventEmitter {
       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);
@@ -4080,6 +4082,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) {
@@ -4089,15 +4095,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);
@@ -7568,10 +7581,17 @@ var Cascade = class extends EventEmitter {
       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";
     }
@@ -8878,7 +8898,7 @@ function Repl({ config, workspacePath, themeName, initialPrompt, identityName })
     if (sel.kind === "auto") {
       delete config.models[tierKey];
     } else {
-      config.models[tierKey] = sel.modelId;
+      config.models[tierKey] = `${sel.provider}:${sel.modelId}`;
     }
     try {
       const router = cascadeRef.current?.getRouter();
@@ -9436,9 +9456,15 @@ Use /identity <name|id> to switch.`;
   let agentTreeHeight = 0;
   if (state.agentTree && hasActiveOrFailed2(state.agentTree)) {
     agentTreeHeight = 1;
-    const childrenCount = state.agentTree.children?.length ?? 0;
-    agentTreeHeight += Math.min(childrenCount, 6);
-    if (childrenCount > 6) agentTreeHeight += 1;
+    const visibleT2s = state.agentTree.children?.slice(0, 6) ?? [];
+    agentTreeHeight += visibleT2s.length;
+    for (const t2 of visibleT2s) {
+      const t3Count = (t2.children ?? []).filter((c) => c.role === "T3").length;
+      agentTreeHeight += t3Count;
+    }
+    if ((state.agentTree.children?.length ?? 0) > 6) {
+      agentTreeHeight += 1;
+    }
   }
   let timelineHeight = 0;
   if (state.showDetails && treeNodesRef.current.size > 0) {
@@ -9627,6 +9653,13 @@ async function validateConfiguredModels(config) {
   return problems.length ? `Model warnings: ${problems.join(", ")}` : null;
 }
 function inferProviderFromModelId(id, providers) {
+  if (id.includes(":")) {
+    const prefix = id.split(":")[0].toLowerCase();
+    const validProviders = ["anthropic", "openai", "gemini", "azure", "openai-compatible", "ollama"];
+    if (validProviders.includes(prefix)) {
+      return prefix;
+    }
+  }
   const lower = id.toLowerCase();
   if (lower.includes("gpt")) return "openai";
   if (lower.includes("claude")) return "anthropic";