@dv.nghiem/flowdeck 0.4.6 → 0.4.7

package/dist/index.js

@@ -1236,6 +1236,136 @@ function extractText2(parts) {
   return parts.filter((p) => p.type === "text" && typeof p.text === "string").map((p) => p.text).join(`
 `);
 }
+async function runWithStreaming(client, childId, agentName, fullPrompt, toolsConfig, directory, abort, onTitle) {
+  const sseResult = await client.event.subscribe({ query: { directory } });
+  const stream = sseResult.stream;
+  const asyncRes = await client.session.promptAsync({
+    path: { id: childId },
+    query: { directory },
+    body: {
+      agent: agentName,
+      tools: toolsConfig,
+      parts: [{ type: "text", text: fullPrompt }]
+    }
+  });
+  if (asyncRes.error) {
+    return {
+      output: "",
+      error: `promptAsync failed: ${JSON.stringify(asyncRes.error)}`
+    };
+  }
+  let streamedText = "";
+  let currentTool = "";
+  onTitle(`⏳ ${agentName} — starting…`);
+  try {
+    for await (const raw of stream) {
+      if (abort.aborted)
+        break;
+      const event = typeof raw === "object" && raw !== null ? Object.values(raw)[0] ?? raw : raw;
+      if (!event || typeof event !== "object")
+        continue;
+      const sid = event.properties?.sessionID;
+      if (sid && sid !== childId)
+        continue;
+      switch (event.type) {
+        case "session.next.step.started": {
+          const model = event.properties?.model?.id ?? "";
+          onTitle(`\uD83E\uDD14 ${agentName} — thinking${model ? ` (${model})` : ""}…`);
+          break;
+        }
+        case "session.next.text.delta": {
+          const delta = event.properties?.delta ?? "";
+          streamedText += delta;
+          const preview = streamedText.slice(-80).replace(/\n/g, " ").trim();
+          onTitle(`✍️  ${agentName} — ${preview}`);
+          break;
+        }
+        case "session.next.text.ended": {
+          const text = event.properties?.text ?? streamedText;
+          streamedText = text;
+          break;
+        }
+        case "session.next.reasoning.delta": {
+          const delta = event.properties?.delta ?? "";
+          const preview = delta.slice(0, 60).replace(/\n/g, " ").trim();
+          onTitle(`\uD83D\uDCAD ${agentName} — ${preview}`);
+          break;
+        }
+        case "session.next.tool.called": {
+          currentTool = event.properties?.tool ?? "tool";
+          onTitle(`\uD83D\uDD27 ${agentName} → ${currentTool}…`);
+          break;
+        }
+        case "session.next.tool.progress": {
+          const content = event.properties?.content ?? [];
+          const progressText = content.filter((c) => c.type === "text").map((c) => c.text).join(" ").slice(0, 80).replace(/\n/g, " ").trim();
+          if (progressText) {
+            onTitle(`\uD83D\uDD27 ${agentName} → ${currentTool}: ${progressText}`);
+          }
+          break;
+        }
+        case "session.next.tool.success": {
+          onTitle(`✅ ${agentName} → ${currentTool} done`);
+          currentTool = "";
+          break;
+        }
+        case "session.next.tool.failed": {
+          onTitle(`❌ ${agentName} → ${currentTool} failed`);
+          currentTool = "";
+          break;
+        }
+        case "session.next.retried": {
+          onTitle(`↻ ${agentName} — retrying…`);
+          break;
+        }
+        case "session.next.step.ended": {
+          const cost = event.properties?.cost ?? 0;
+          const finish = event.properties?.finish ?? "";
+          if (cost > 0) {
+            onTitle(`\uD83D\uDCCA ${agentName} — step done ($${cost.toFixed(4)}) [${finish}]`);
+          } else {
+            onTitle(`\uD83D\uDCCA ${agentName} — step done [${finish}]`);
+          }
+          break;
+        }
+        case "session.error": {
+          const msg = event.properties?.error?.message ?? JSON.stringify(event.properties?.error);
+          return { output: streamedText, error: `Session error: ${msg}` };
+        }
+        case "session.idle": {
+          onTitle(`✓ ${agentName} — complete`);
+          goto_done:
+            break goto_done;
+        }
+      }
+      if (event.type === "session.idle")
+        break;
+    }
+  } catch (err) {
+    if (!abort.aborted) {
+      onTitle(`⚠️  ${agentName} — stream closed (${err?.message ?? err})`);
+    }
+  }
+  if (streamedText) {
+    return { output: streamedText };
+  }
+  try {
+    const msgsRes = await client.session.messages({
+      path: { id: childId },
+      query: { directory }
+    });
+    const messages = msgsRes.data ?? [];
+    for (let i = messages.length - 1;i >= 0; i--) {
+      const msg = messages[i];
+      if (msg.role === "assistant") {
+        const text = extractText2(msg.parts ?? []);
+        if (text)
+          return { output: text };
+      }
+    }
+  } catch {}
+  return { output: "" };
+}
 function createDelegateTool(client) {
   return tool4({
     description: "Delegate a task to a single agent via a child session. Returns the agent's output.",
@@ -1250,14 +1380,14 @@ function createDelegateTool(client) {
       workflow_id: tool4.schema.string().optional(),
       stage: tool4.schema.string().optional()
     },
-    async execute(args, context) {
+    async execute(args, execContext) {
       const startTime = Date.now();
       const taskType = normalizeTaskType(args.task_type, args.agent);
       const retryAttempts = typeof args.retry_attempts === "number" ? args.retry_attempts : 1;
       const maxRetries = Math.max(0, Math.floor(retryAttempts));
       let agentModel = "";
       try {
-        const cfg = loadFlowDeckConfig(context.directory);
+        const cfg = loadFlowDeckConfig(execContext.directory);
         agentModel = cfg.agents?.[args.agent]?.model ?? "";
       } catch {}
       const metricsWorkflowId = args.workflow_id ?? "";
@@ -1271,16 +1401,16 @@ ${args.prompt}` : args.prompt;
       let stateVersion = 0;
       let indexVersion = 0;
       if (safe_to_cache) {
-        const index = readCodebaseIndex(context.directory);
-        const sp = statePath(context.directory);
+        const index = readCodebaseIndex(execContext.directory);
+        const sp = statePath(execContext.directory);
         const rawState = existsSync10(sp) ? readFileSync10(sp, "utf-8") : "";
         const state = rawState ? parseState(rawState) : {};
         stateVersion = typeof state.summaryVersion === "number" ? state.summaryVersion : 0;
         indexVersion = typeof index.summaryVersion === "number" ? index.summaryVersion : 0;
-        const cached = getCached(context.directory, args.agent, fullPrompt, args.context ?? "", stateVersion, indexVersion, true);
+        const cached = getCached(execContext.directory, args.agent, fullPrompt, args.context ?? "", stateVersion, indexVersion, true);
         if (cached !== null) {
           if (metricsWorkflowId) {
-            recordCacheHit(context.directory, metricsWorkflowId, metricsStage, fullPrompt, args.agent, agentModel);
+            recordCacheHit(execContext.directory, metricsWorkflowId, metricsStage, fullPrompt, args.agent, agentModel);
           }
           return JSON.stringify({
             agent: args.agent,
@@ -1295,8 +1425,8 @@ ${args.prompt}` : args.prompt;
         }
       }
       const createRes = await client.session.create({
-        body: { parentID: context.sessionID, title: `${args.agent}-delegate` },
-        query: { directory: context.directory }
+        body: { parentID: execContext.sessionID, title: `${args.agent}-delegate` },
+        query: { directory: execContext.directory }
       });
       if (createRes.error || !createRes.data?.id) {
         return JSON.stringify({
@@ -1307,84 +1437,61 @@ ${args.prompt}` : args.prompt;
         });
       }
       const childId = createRes.data.id;
-      context.abort.addEventListener("abort", () => {
+      execContext.abort.addEventListener("abort", () => {
         client.session.abort({
           path: { id: childId },
-          query: { directory: context.directory }
+          query: { directory: execContext.directory }
         }).catch(() => {});
       });
-      const fullPromptForSession = args.context ? `${args.context}
-
----
-
-${args.prompt}` : args.prompt;
-      let promptRes = null;
+      let lastOutput = "";
+      let lastError;
       let retriesUsed = 0;
       for (let attempt = 0;attempt <= maxRetries; attempt++) {
         const attemptStart = Date.now();
-        promptRes = await client.session.prompt({
-          path: { id: childId },
-          body: {
-            agent: args.agent,
-            parts: [{ type: "text", text: fullPromptForSession }],
-            tools: { question: false }
-          },
-          query: { directory: context.directory }
-        });
-        if (!shouldRetry(promptRes) || attempt === maxRetries)
+        if (attempt > 0) {
+          execContext.metadata({ title: `↻ ${args.agent} — retry ${attempt}/${maxRetries}…` });
+        }
+        const result = await runWithStreaming(client, childId, args.agent, fullPrompt, { question: false }, execContext.directory, execContext.abort, (title) => execContext.metadata({ title }));
+        lastOutput = result.output;
+        lastError = result.error;
+        const shouldRetryAttempt = !!(lastError || !lastOutput.trim());
+        if (!shouldRetryAttempt || attempt === maxRetries)
           break;
         if (metricsWorkflowId) {
-          const retryInputTokens = estimateTokens(fullPromptForSession);
+          const retryInputTokens = estimateTokens(fullPrompt);
           const retryCostUsd = agentModel ? estimateCostUSD(agentModel, retryInputTokens, 0) : undefined;
-          recordRetryCall(context.directory, metricsWorkflowId, metricsStage, fullPromptForSession, "", args.agent, Date.now() - attemptStart, agentModel, retryCostUsd);
+          recordRetryCall(execContext.directory, metricsWorkflowId, metricsStage, fullPrompt, "", args.agent, Date.now() - attemptStart, agentModel, retryCostUsd);
         }
         retriesUsed++;
       }
-      if (!promptRes || promptRes.error) {
-        const errMsg = `Prompt failed: ${promptRes?.error?.detail ?? "unknown"}`;
-        recordRun(context.directory, args.agent, "", taskType, false, Date.now() - startTime);
-        return JSON.stringify({
-          agent: args.agent,
-          session_id: childId,
-          success: false,
-          error: errMsg,
-          task_type: taskType,
-          model: "",
-          retries_used: retriesUsed,
-          duration_ms: Date.now() - startTime
-        });
-      }
-      const info = promptRes.data?.info;
-      if (info?.error) {
-        const errMsg = `Agent error: ${JSON.stringify(info.error)}`;
-        recordRun(context.directory, args.agent, "", taskType, false, Date.now() - startTime);
+      if (lastError && !lastOutput.trim()) {
+        recordRun(execContext.directory, args.agent, "", taskType, false, Date.now() - startTime);
         return JSON.stringify({
           agent: args.agent,
           session_id: childId,
           success: false,
-          error: errMsg,
+          error: lastError,
           task_type: taskType,
           model: "",
           retries_used: retriesUsed,
           duration_ms: Date.now() - startTime
         });
       }
-      const output = extractText2(promptRes.data?.parts ?? []);
-      recordRun(context.directory, args.agent, "", taskType, true, Date.now() - startTime);
+      recordRun(execContext.directory, args.agent, "", taskType, true, Date.now() - startTime);
       if (metricsWorkflowId) {
-        const inputTokens = estimateTokens(fullPromptForSession);
-        const outputTokens = estimateTokens(output);
+        const inputTokens = estimateTokens(fullPrompt);
+        const outputTokens = estimateTokens(lastOutput);
         const costUsd = agentModel ? estimateCostUSD(agentModel, inputTokens, outputTokens) : undefined;
-        recordModelCall(context.directory, metricsWorkflowId, metricsStage, fullPromptForSession, output, args.agent, Date.now() - startTime, agentModel, costUsd);
+        recordModelCall(execContext.directory, metricsWorkflowId, metricsStage, fullPrompt, lastOutput, args.agent, Date.now() - startTime, agentModel, costUsd);
       }
-      if (safe_to_cache && output) {
-        setCached(context.directory, args.agent, fullPromptForSession, args.context ?? "", stateVersion, indexVersion, output, true, args.cache_ttl_ms);
+      if (safe_to_cache && lastOutput) {
+        setCached(execContext.directory, args.agent, fullPrompt, args.context ?? "", stateVersion, indexVersion, lastOutput, true, args.cache_ttl_ms);
       }
       return JSON.stringify({
         agent: args.agent,
         session_id: childId,
         success: true,
-        output: output || "(no text output)",
+        output: lastOutput || "(no text output)",
         task_type: taskType,
         model: "",
         retries_used: retriesUsed,

package/dist/tools/delegate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"delegate.d.ts","sourceRoot":"","sources":["../../src/tools/delegate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,KAAK,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAC/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAkBtD,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,cAAc,GAAG,cAAc,CAqPzE"}
+{"version":3,"file":"delegate.d.ts","sourceRoot":"","sources":["../../src/tools/delegate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,KAAK,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAC/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAgOtD,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,cAAc,GAAG,cAAc,CA6NzE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dv.nghiem/flowdeck",
-  "version": "0.4.6",
+  "version": "0.4.7",
   "description": "FlowDeck — structured planning and execution workflows for OpenCode",
   "type": "module",
   "main": "./dist/index.js",