fix subagents step not updating live in tool preview. Refresh

subagent tool view and include input params for certain tools in preview

Author: makefinks

src/ai/daemon-ai.ts

@@ -25,6 +25,7 @@ import type {
 import { debug, toolDebug } from "../utils/debug-logger";
 import { getOpenRouterReportedCost } from "../utils/openrouter-reported-cost";
 import { getWorkspacePath } from "../utils/workspace-manager";
+import { extractFinalAssistantText } from "./message-utils";
 import { TRANSCRIPTION_MODEL, buildOpenRouterChatSettings, getResponseModel } from "./model-config";
 import { sanitizeMessagesForInput } from "./sanitize-messages";
 import { type InteractionMode, buildDaemonSystemPrompt } from "./system-prompt";
@@ -54,40 +55,6 @@ function normalizeStreamError(error: unknown): Error {
 	return new Error(String(error));
 }
 
-/**
- * Extract the final text content from the last assistant message.
- * In multi-step agent loops, we only want to speak the final response, not intermediate text.
- */
-function extractFinalAssistantText(messages: ModelMessage[]): string {
-	// Find the last assistant message
-	for (let i = messages.length - 1; i >= 0; i--) {
-		const msg = messages[i];
-		if (msg?.role === "assistant") {
-			const content = msg.content;
-			if (Array.isArray(content)) {
-				// Find the last text part. In some models/providers, intermediate
-				// "thoughts" might be included as separate text blocks before the final answer.
-				// We prioritize the last text block in the message for the final response.
-				for (let j = content.length - 1; j >= 0; j--) {
-					const part = content[j];
-					if (
-						part &&
-						typeof part === "object" &&
-						"type" in part &&
-						part.type === "text" &&
-						"text" in part &&
-						typeof part.text === "string"
-					) {
-						return part.text;
-					}
-				}
-				// If this assistant message had no text parts, continue searching previous messages
-			}
-		}
-	}
-	return "";
-}
-
 /**
  * The DAEMON agent instance.
  * Handles the agent loop internally, allowing for multi-step tool usage.

src/ai/message-utils.ts

@@ -0,0 +1,26 @@
+import type { ModelMessage } from "ai";
+
+export function extractFinalAssistantText(messages: ModelMessage[]): string {
+	for (let i = messages.length - 1; i >= 0; i--) {
+		const msg = messages[i];
+		if (msg?.role === "assistant") {
+			const content = msg.content;
+			if (Array.isArray(content)) {
+				for (let j = content.length - 1; j >= 0; j--) {
+					const part = content[j];
+					if (
+						part &&
+						typeof part === "object" &&
+						"type" in part &&
+						part.type === "text" &&
+						"text" in part &&
+						typeof part.text === "string"
+					) {
+						return part.text;
+					}
+				}
+			}
+		}
+	}
+	return "";
+}

src/ai/tools/subagents.ts

@@ -5,12 +5,13 @@
 
 import { createOpenRouter } from "@openrouter/ai-sdk-provider";
 import { tool } from "ai";
-import { ToolLoopAgent, stepCountIs } from "ai";
+import { type ModelMessage, ToolLoopAgent, stepCountIs } from "ai";
 import type { ToolSet } from "ai";
 import { z } from "zod";
 import { getDaemonManager } from "../../state/daemon-state";
 import type { SubagentProgressEmitter } from "../../types";
 import { getOpenRouterReportedCost } from "../../utils/openrouter-reported-cost";
+import { extractFinalAssistantText } from "../message-utils";
 import { buildOpenRouterChatSettings, getSubagentModel } from "../model-config";
 import { buildToolSet } from "./tool-registry";
 
@@ -60,7 +61,7 @@ RULES:
 - The final summary needs to be self contained and needs to provide enough information to the main agent so it is clear what you have done and what the results are.
 
 Today's date: ${new Date().toISOString().split("T")[0]}
-`;
+	`;
 }
 
 // Global emitter that will be set by the daemon-ai module
@@ -109,7 +110,6 @@ Provide a concise summary for display and a very specific task description (espe
 				stopWhen: stepCountIs(MAX_SUBAGENT_STEPS),
 			});
 
-			let responseText = "";
 			let costTotal = 0;
 			let hasCost = false;
 
@@ -119,9 +119,7 @@ Provide a concise summary for display and a very specific task description (espe
 			});
 
 			for await (const part of stream.fullStream) {
-				if (part.type === "text-delta") {
-					responseText += part.text;
-				} else if (part.type === "finish-step") {
+				if (part.type === "finish-step") {
 					const reportedCost = getOpenRouterReportedCost(part.providerMetadata);
 					if (reportedCost !== undefined) {
 						costTotal += reportedCost;
@@ -145,6 +143,9 @@ Provide a concise summary for display and a very specific task description (espe
 				}
 			}
 
+			const responseMessages = await stream.response.then((response) => response.messages);
+			const finalResponse = extractFinalAssistantText(responseMessages);
+
 			const streamUsage = await stream.usage;
 			if (streamUsage) {
 				progressEmitter?.onSubagentUsage({
@@ -163,7 +164,7 @@ Provide a concise summary for display and a very specific task description (espe
 			return {
 				success: true,
 				summary,
-				response: responseText || "Task completed but no text response generated.",
+				response: finalResponse || "Task completed but no text response generated.",
 			};
 		} catch (error) {
 			const errorMessage = error instanceof Error ? error.message : String(error);

src/components/ToolCallView.tsx

@@ -1,18 +1,18 @@
 import { useMemo } from "react";
-import { COLORS } from "../ui/constants";
+import { useToolApprovalForCall } from "../hooks/use-tool-approval";
 import type { ToolCall } from "../types";
+import { COLORS } from "../ui/constants";
+import { ApprovalPicker } from "./ApprovalPicker";
 import {
-	getToolLayout,
+	ErrorPreviewView,
+	ResultPreviewView,
+	ToolBodyView,
+	ToolHeaderView,
 	defaultToolLayout,
 	getDefaultAbbreviation,
-	ToolHeaderView,
-	ToolBodyView,
-	ResultPreviewView,
-	ErrorPreviewView,
 	getStatusBorderColor,
+	getToolLayout,
 } from "./tool-layouts";
-import { ApprovalPicker } from "./ApprovalPicker";
-import { useToolApprovalForCall } from "../hooks/use-tool-approval";
 
 interface ToolCallViewProps {
 	call: ToolCall;
@@ -68,10 +68,7 @@ export function ToolCallView({ call, result, showOutput = true }: ToolCallViewPr
 	const toolName = layout.abbreviation ?? getDefaultAbbreviation(call.name);
 	const borderColor = getStatusBorderColor(call.status);
 
-	const customBody = useMemo(() => {
-		if (!layout.renderBody) return null;
-		return layout.renderBody({ call, result, showOutput });
-	}, [layout, call, result, showOutput]);
+	const customBody = layout.renderBody ? layout.renderBody({ call, result, showOutput }) : null;
 
 	return (
 		<box

src/components/tool-layouts/components.tsx

@@ -1,7 +1,7 @@
 import { TextAttributes } from "@opentui/core";
-import { COLORS } from "../../ui/constants";
-import type { ToolHeader, ToolBody, ToolBodyLine } from "./types";
 import type { ToolCallStatus } from "../../types";
+import { COLORS } from "../../ui/constants";
+import type { ToolBody, ToolBodyLine, ToolHeader } from "./types";
 
 interface ToolHeaderViewProps {
 	toolName: string;
@@ -11,11 +11,12 @@ interface ToolHeaderViewProps {
 }
 
 export function ToolHeaderView({ toolName, header, isRunning, toolColor }: ToolHeaderViewProps) {
+	const displayName = toolName.toUpperCase();
 	return (
 		<box flexDirection="row" alignItems="center" justifyContent="space-between" width="100%">
 			<text>
 				<span fg={toolColor}>{"↯ "}</span>
-				<span fg={toolColor}>{toolName}</span>
+				<span fg={toolColor}>{displayName}</span>
 				{header?.primary && <span fg={COLORS.TOOL_INPUT_TEXT}>{` ${header.primary}`}</span>}
 				{header?.secondary && (
 					<span