cascade-ai 0.2.11 → 0.3.0

package/dist/index.cjs

@@ -165,7 +165,7 @@ var require_keytar2 = __commonJS({
 });
 
 // src/constants.ts
-var CASCADE_VERSION = "0.2.11";
+var CASCADE_VERSION = "0.3.0";
 var CASCADE_CONFIG_DIR = ".cascade";
 var CASCADE_MD_FILE = "CASCADE.md";
 var CASCADE_IGNORE_FILE = ".cascadeignore";
@@ -547,17 +547,38 @@ var AnthropicProvider = class extends BaseProvider {
       messages,
       tools: tools?.length ? tools : void 0
     });
+    let isThinking = false;
     for await (const event of stream) {
-      if (event.type === "content_block_delta" && event.delta.type === "text_delta") {
-        const text = event.delta.text;
-        fullContent += text;
-        onChunk({ text, finishReason: null });
+      if (event.type === "content_block_delta") {
+        if (event.delta.type === "thinking_delta") {
+          if (!isThinking) {
+            isThinking = true;
+            fullContent += "<think>\n";
+            onChunk({ text: "<think>\n", finishReason: null });
+          }
+          const text = event.delta.thinking;
+          fullContent += text;
+          onChunk({ text, finishReason: null });
+        } else if (event.delta.type === "text_delta") {
+          if (isThinking) {
+            isThinking = false;
+            fullContent += "\n</think>\n\n";
+            onChunk({ text: "\n</think>\n\n", finishReason: null });
+          }
+          const text = event.delta.text;
+          fullContent += text;
+          onChunk({ text, finishReason: null });
+        }
       } else if (event.type === "message_delta" && event.usage) {
         outputTokens = event.usage.output_tokens;
       } else if (event.type === "message_start" && event.message.usage) {
         inputTokens = event.message.usage.input_tokens;
       }
     }
+    if (isThinking) {
+      fullContent += "\n</think>\n\n";
+      onChunk({ text: "\n</think>\n\n", finishReason: null });
+    }
     const finalMessage = await stream.finalMessage();
     const toolCalls = finalMessage.content.filter((b) => b.type === "tool_use").map((b) => ({
       id: b.id,
@@ -728,9 +749,25 @@ var OpenAIProvider = class extends BaseProvider {
       }
     }
     const toolCallsMap = {};
+    let isThinking = false;
     for await (const chunk of stream) {
       const delta = chunk.choices[0]?.delta;
+      const reasoningContent = delta?.reasoning_content;
+      if (reasoningContent) {
+        if (!isThinking) {
+          isThinking = true;
+          fullContent += "<think>\n";
+          onChunk({ text: "<think>\n", finishReason: null });
+        }
+        fullContent += reasoningContent;
+        onChunk({ text: reasoningContent, finishReason: null });
+      }
       if (delta?.content) {
+        if (isThinking) {
+          isThinking = false;
+          fullContent += "\n</think>\n\n";
+          onChunk({ text: "\n</think>\n\n", finishReason: null });
+        }
         fullContent += delta.content;
         onChunk({ text: delta.content, finishReason: null });
       }
@@ -753,6 +790,10 @@ var OpenAIProvider = class extends BaseProvider {
         outputTokens = chunk.usage.completion_tokens;
       }
     }
+    if (isThinking) {
+      fullContent += "\n</think>\n\n";
+      onChunk({ text: "\n</think>\n\n", finishReason: null });
+    }
     const toolCalls = Object.values(toolCallsMap).map((tc) => {
       let input = {};
       try {
@@ -1995,7 +2036,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 = {
@@ -2004,7 +2045,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);
@@ -2030,7 +2072,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) {
@@ -2410,16 +2453,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) {
@@ -3102,8 +3146,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,
@@ -3116,7 +3161,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,
@@ -3678,8 +3723,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() {
@@ -6817,8 +6862,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,
@@ -6829,7 +6874,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,
@@ -6841,7 +6887,8 @@ Original error: ${err.message}`
         node.progressPct ?? null,
         node.updatedAt,
         node.workspacePath ?? null,
-        node.isGlobal ? 1 : 0
+        node.isGlobal ? 1 : 0,
+        node.output ?? null
       );
     });
   }
@@ -6862,14 +6909,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,
@@ -6881,7 +6929,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
@@ -6924,7 +6973,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 ──────────────────────────────────
@@ -7251,7 +7301,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);
@@ -7268,7 +7319,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 (
@@ -7297,6 +7349,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) {
@@ -7429,6 +7489,7 @@ var ConfigManager = class {
     }
   }
   async injectEnvKeys() {
+    const isFirstRun = this.config.providers.length === 0;
     const envProviders = [
       { env: "ANTHROPIC_API_KEY", type: "anthropic" },
       { env: "OPENAI_API_KEY", type: "openai" },
@@ -7439,10 +7500,13 @@ var ConfigManager = class {
       const key = process.env[env];
       if (!key) continue;
       const existing = this.config.providers.find((p) => p.type === type);
-      if (!existing) this.config.providers.push({ type, apiKey: key });
-      else if (!existing.apiKey) existing.apiKey = key;
+      if (!existing && isFirstRun) {
+        this.config.providers.push({ type, apiKey: key });
+      } else if (existing && !existing.apiKey) {
+        existing.apiKey = key;
+      }
     }
-    if (!this.config.providers.find((p) => p.type === "ollama")) {
+    if (isFirstRun && !this.config.providers.find((p) => p.type === "ollama")) {
       this.config.providers.push({ type: "ollama" });
     }
   }
@@ -8066,8 +8130,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 });