cascade-ai 0.2.12 → 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.2.12";
+    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() {
@@ -1875,8 +1877,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,
@@ -1887,7 +1889,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,
@@ -1899,7 +1902,8 @@ Original error: ${err.message}`
         node.progressPct ?? null,
         node.updatedAt,
         node.workspacePath ?? null,
-        node.isGlobal ? 1 : 0
+        node.isGlobal ? 1 : 0,
+        node.output ?? null
       );
     });
   }
@@ -1920,14 +1924,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,
@@ -1939,7 +1944,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
@@ -1982,7 +1988,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 ──────────────────────────────────
@@ -2309,7 +2316,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);
@@ -2326,7 +2334,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 (
@@ -2355,6 +2364,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) {
@@ -3233,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);
@@ -3583,7 +3600,7 @@ var BaseTier = class extends EventEmitter {
   getStatus() {
     return this.status;
   }
-  setStatus(status) {
+  setStatus(status, output) {
     this.status = status;
     const timestamp = (/* @__PURE__ */ new Date()).toISOString();
     const event = {
@@ -3592,7 +3609,8 @@ var BaseTier = class extends EventEmitter {
       parentId: this.parentId,
       label: this.label,
       status,
-      timestamp
+      timestamp,
+      output
     };
     this.emit("status", event);
     this.emit("tier:status", event);
@@ -3618,7 +3636,8 @@ var BaseTier = class extends EventEmitter {
       status: this.status,
       currentAction: update.currentAction,
       progressPct: update.progressPct,
-      timestamp
+      timestamp,
+      output: update.output
     });
   }
   buildMessage(type, to, payload) {
@@ -3999,16 +4018,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) {
@@ -4062,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) {
@@ -4071,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);
@@ -4691,8 +4722,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,
@@ -4705,7 +4737,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,
@@ -5270,8 +5302,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() {
@@ -7549,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";
     }
@@ -8228,35 +8267,69 @@ function AgentTree({ root, theme }) {
 }
 function T2Row({ node, theme, isLast }) {
   const connector = isLast ? "\u2514\u2500 " : "\u251C\u2500 ";
-  const t3Active = countByRoleAndStatus(node, "T3", "ACTIVE");
-  const t3Total = countByRole(node, "T3");
-  const workerSuffix = t3Total > 0 ? `  T3\xD7${t3Total}` : "";
+  const t3Nodes = (node.children ?? []).filter((c) => c.role === "T3");
+  const t3ActiveCount = t3Nodes.filter((c) => c.status === "ACTIVE").length;
   const label = stripRolePrefix(node.label, node.role);
   const action = node.currentAction ? `  ${node.currentAction.slice(0, 38)}` : "";
+  return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsxs(Box, { children: [
+      /* @__PURE__ */ jsxs(Text, { color: theme.colors.muted, children: [
+        "  ",
+        connector
+      ] }),
+      /* @__PURE__ */ jsx(Text, { color: theme.colors.t2Color, bold: true, children: "[T2]" }),
+      /* @__PURE__ */ jsxs(Text, { color: theme.colors.foreground, children: [
+        " ",
+        label
+      ] }),
+      node.status === "ACTIVE" && /* @__PURE__ */ jsxs(Fragment, { children: [
+        action ? /* @__PURE__ */ jsx(Text, { color: theme.colors.muted, children: action }) : null,
+        /* @__PURE__ */ jsx(Text, { children: " " }),
+        /* @__PURE__ */ jsx(Spinner, { type: "dots" }),
+        t3ActiveCount > 0 ? /* @__PURE__ */ jsxs(Text, { color: theme.colors.muted, children: [
+          " (",
+          t3ActiveCount,
+          " running)"
+        ] }) : null
+      ] }),
+      node.status === "COMPLETED" && /* @__PURE__ */ jsx(Text, { color: theme.colors.success, children: " \u2714" }),
+      node.status === "FAILED" && /* @__PURE__ */ jsx(Text, { color: theme.colors.error, children: " \u2718" }),
+      node.status === "ESCALATED" && /* @__PURE__ */ jsx(Text, { color: theme.colors.warning, children: " \u25B2" })
+    ] }),
+    t3Nodes.map((t3, idx) => /* @__PURE__ */ jsx(
+      T3Row,
+      {
+        node: t3,
+        theme,
+        isLast: idx === t3Nodes.length - 1,
+        parentIsLast: isLast
+      },
+      t3.id
+    ))
+  ] });
+}
+function T3Row({ node, theme, isLast, parentIsLast }) {
+  const indent = parentIsLast ? "      " : "  \u2502   ";
+  const connector = isLast ? "\u2514\u2500 " : "\u251C\u2500 ";
+  const label = stripRolePrefix(node.label, node.role);
+  const action = node.currentAction ? ` ${node.currentAction.slice(0, 42)}` : "";
   return /* @__PURE__ */ jsxs(Box, { children: [
     /* @__PURE__ */ jsxs(Text, { color: theme.colors.muted, children: [
-      "  ",
+      indent,
       connector
     ] }),
-    /* @__PURE__ */ jsx(Text, { color: theme.colors.t2Color, bold: true, children: "[T2]" }),
-    /* @__PURE__ */ jsxs(Text, { color: theme.colors.foreground, children: [
+    /* @__PURE__ */ jsx(Text, { color: theme.colors.t3Color, children: "[T3]" }),
+    /* @__PURE__ */ jsxs(Text, { color: theme.colors.muted, children: [
       " ",
       label
     ] }),
-    workerSuffix ? /* @__PURE__ */ jsx(Text, { color: theme.colors.muted, children: workerSuffix }) : null,
     node.status === "ACTIVE" && /* @__PURE__ */ jsxs(Fragment, { children: [
       action ? /* @__PURE__ */ jsx(Text, { color: theme.colors.muted, children: action }) : null,
       /* @__PURE__ */ jsx(Text, { children: " " }),
-      /* @__PURE__ */ jsx(Spinner, { type: "dots" }),
-      t3Active > 0 ? /* @__PURE__ */ jsxs(Text, { color: theme.colors.muted, children: [
-        " (",
-        t3Active,
-        " running)"
-      ] }) : null
+      /* @__PURE__ */ jsx(Spinner, { type: "dots" })
     ] }),
     node.status === "COMPLETED" && /* @__PURE__ */ jsx(Text, { color: theme.colors.success, children: " \u2714" }),
-    node.status === "FAILED" && /* @__PURE__ */ jsx(Text, { color: theme.colors.error, children: " \u2718" }),
-    node.status === "ESCALATED" && /* @__PURE__ */ jsx(Text, { color: theme.colors.warning, children: " \u25B2" })
+    node.status === "FAILED" && /* @__PURE__ */ jsx(Text, { color: theme.colors.error, children: " \u2718" })
   ] });
 }
 function hasActiveOrFailed(node) {
@@ -8825,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();
@@ -8868,7 +8941,7 @@ function Repl({ config, workspacePath, themeName, initialPrompt, identityName })
     treeNodesRef.current.set(event.tierId, node);
     const store = storeRef.current;
     if (store) {
-      const runtimeNode = { tierId: node.id, sessionId: sessionIdRef.current, parentId: node.parentId, role: node.role, label: node.label, status: node.status, currentAction: node.currentAction, progressPct: node.progressPct, updatedAt: (/* @__PURE__ */ new Date()).toISOString(), workspacePath, isGlobal: false };
+      const runtimeNode = { tierId: node.id, sessionId: sessionIdRef.current, parentId: node.parentId, role: node.role, label: node.label, status: node.status, currentAction: node.currentAction, progressPct: node.progressPct, updatedAt: (/* @__PURE__ */ new Date()).toISOString(), workspacePath, isGlobal: false, output: event.output };
       store.upsertRuntimeNode(runtimeNode);
       globalStoreRef.current?.upsertRuntimeNode({ ...runtimeNode, isGlobal: true });
     }
@@ -8879,7 +8952,6 @@ function Repl({ config, workspacePath, themeName, initialPrompt, identityName })
   useEffect(() => {
     const originalWarn = console.warn;
     const originalLog = console.log;
-    process.stdout.write("\x1Bc");
     console.warn = (...args) => {
       const msg = args.join(" ");
       if (msg.includes("non-text parts") || msg.includes("functionCall")) return;
@@ -9384,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) {
@@ -9575,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";
@@ -10989,8 +11074,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 });
@@ -11426,6 +11511,9 @@ async function startRepl(options) {
     await cm.load();
     config = cm.getConfig();
   }
+  if (process.stdout.isTTY) {
+    process.stdout.write("\x1B[2J\x1B[H");
+  }
   const { waitUntilExit } = render(
     React5.createElement(Repl, {
       config,