@makefinks/daemon 0.3.1 → 0.5.0

package/package.json

@@ -28,7 +28,7 @@
 	},
 	"module": "src/index.tsx",
 	"type": "module",
-	"version": "0.3.1",
+	"version": "0.5.0",
 	"bin": {
 		"daemon": "dist/cli.js"
 	},

package/src/ai/daemon-ai.ts

@@ -22,9 +22,10 @@ import type {
 	ToolApprovalResponse,
 	TranscriptionResult,
 } from "../types";
-import { debug } from "../utils/debug-logger";
+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.
@@ -239,6 +206,12 @@ export async function generateResponse(
 				} else if (part.type === "tool-result") {
 					callbacks.onToolResult?.(part.toolName, part.output, part.toolCallId);
 				} else if (part.type === "tool-error") {
+					toolDebug.error("tool-error", {
+						toolName: part.toolName,
+						toolCallId: part.toolCallId,
+						input: part.input,
+						error: part.error,
+					});
 					callbacks.onToolResult?.(part.toolName, { error: part.error, input: part.input }, part.toolCallId);
 				} else if (part.type === "tool-approval-request") {
 					const approvalRequest: ToolApprovalRequest = {

package/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 "";
+}

package/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);

package/src/app/components/ConversationPane.tsx

@@ -16,6 +16,8 @@ import { TypingInputBar } from "../../components/TypingInputBar";
 import type { ContentBlock, ConversationMessage, TokenUsage } from "../../types";
 import { DaemonState } from "../../types";
 import { COLORS, REASONING_MARKDOWN_STYLE } from "../../ui/constants";
+import { renderReasoningTicker } from "../../ui/reasoning-ticker";
+import { formatElapsedTime } from "../../utils/formatters";
 import type { ModelMetadata } from "../../utils/model-metadata";
 
 export interface ConversationDisplayState {
@@ -175,6 +177,8 @@ function ConversationPaneImpl(props: ConversationPaneProps) {
 	const isReasoning =
 		daemonState === DaemonState.RESPONDING &&
 		(!conversation.currentResponse || !!reasoningDisplay || !!reasoningQueue);
+	const fullReasoningDurationLabel =
+		responseElapsedMs > 0 ? ` · ${formatElapsedTime(responseElapsedMs, { style: "detailed" })}` : "";
 
 	return (
 		<>
@@ -408,6 +412,7 @@ function ConversationPaneImpl(props: ConversationPaneProps) {
 									>
 										<text>
 											<span fg={COLORS.REASONING}>{"REASONING"}</span>
+											<span fg={COLORS.REASONING_DIM}>{fullReasoningDurationLabel}</span>
 										</text>
 										<code
 											content={fullReasoning}
@@ -418,12 +423,7 @@ function ConversationPaneImpl(props: ConversationPaneProps) {
 										/>
 									</box>
 								) : reasoningDisplay ? (
-									<text>
-										<span fg={COLORS.REASONING_DIM}>
-											{"⟡ "}
-											{reasoningDisplay}
-										</span>
-									</text>
+									renderReasoningTicker(reasoningDisplay)
 								) : null}
 							</box>
 						)}

package/src/components/ContentBlockView.tsx

@@ -41,6 +41,10 @@ export function ContentBlockView({
 
 		// Show full reasoning if enabled
 		if (showFullReasoning) {
+			const durationLabel =
+				block.durationMs !== undefined
+					? ` · ${formatElapsedTime(block.durationMs, { style: "detailed" })}`
+					: "";
 			return (
 				<box
 					flexDirection="column"
@@ -51,6 +55,7 @@ export function ContentBlockView({
 				>
 					<text>
 						<span fg={COLORS.REASONING}>{"REASONING"}</span>
+						<span fg={COLORS.REASONING_DIM}>{durationLabel}</span>
 					</text>
 					<code
 						content={cleanedContent}
@@ -74,7 +79,7 @@ export function ContentBlockView({
 		return (
 			<text>
 				<span fg={COLORS.REASONING_DIM}>
-					{"// REASONING"}
+					{"REASONING"}
 					{durationLabel}
 				</span>
 			</text>

package/src/components/ModelMenu.tsx

@@ -1,8 +1,8 @@
 import type { ScrollBoxRenderable, TextareaRenderable } from "@opentui/core";
 import { useKeyboard } from "@opentui/react";
 import { useEffect, useMemo, useRef, useState } from "react";
-import type { ModelOption } from "../types";
 import { useMenuKeyboard } from "../hooks/use-menu-keyboard";
+import type { ModelOption } from "../types";
 import { COLORS } from "../ui/constants";
 import { formatContextWindowK, formatPrice } from "../utils/formatters";
 
@@ -58,15 +58,26 @@ export function ModelMenu({
 
 	const curatedIdSet = useMemo(() => new Set(sortedCurated.map((model) => model.id)), [sortedCurated]);
 
+	const savedModel = useMemo(() => {
+		if (!currentModelId) return null;
+		if (curatedIdSet.has(currentModelId)) return null;
+		const match = allModels.find((model) => model.id === currentModelId);
+		return match ?? { id: currentModelId, name: currentModelId };
+	}, [allModels, curatedIdSet, currentModelId]);
+
+	const savedModels = useMemo(() => (savedModel ? [savedModel] : []), [savedModel]);
+
 	const allModelsWithFallback = useMemo(() => {
 		if (!currentModelId) return allModels;
 		if (curatedIdSet.has(currentModelId)) return allModels;
-		if (allModels.some((model) => model.id === currentModelId)) return allModels;
+		if (savedModel) return allModels;
 		return [...allModels, { id: currentModelId, name: currentModelId }];
-	}, [allModels, curatedIdSet, currentModelId]);
+	}, [allModels, curatedIdSet, currentModelId, savedModel]);
 
 	const filteredAllModels = useMemo(() => {
-		const filtered = allModelsWithFallback.filter((model) => !curatedIdSet.has(model.id));
+		const filtered = allModelsWithFallback.filter(
+			(model) => !curatedIdSet.has(model.id) && model.id !== savedModel?.id
+		);
 		const query = searchQuery.trim().toLowerCase();
 		if (query.length < MIN_ALL_MODEL_QUERY_LENGTH) {
 			return [];
@@ -78,28 +89,44 @@ export function ModelMenu({
 			: filtered;
 
 		return matching.sort((a, b) => a.name.localeCompare(b.name));
-	}, [allModelsWithFallback, curatedIdSet, searchQuery]);
+	}, [allModelsWithFallback, curatedIdSet, savedModel?.id, searchQuery]);
 
-	const totalItems = sortedCurated.length + filteredAllModels.length;
+	const totalItems = sortedCurated.length + savedModels.length + filteredAllModels.length;
 
 	const initialIndex = useMemo(() => {
 		if (totalItems === 0) return 0;
 		const curatedIdx = sortedCurated.findIndex((model) => model.id === currentModelId);
 		if (curatedIdx >= 0) return curatedIdx;
+		const savedIdx = savedModels.findIndex((model) => model.id === currentModelId);
+		if (savedIdx >= 0) return sortedCurated.length + savedIdx;
 		const allIdx = filteredAllModels.findIndex((model) => model.id === currentModelId);
-		if (allIdx >= 0) return sortedCurated.length + allIdx;
+		if (allIdx >= 0) return sortedCurated.length + savedModels.length + allIdx;
 		return 0;
-	}, [sortedCurated, filteredAllModels, currentModelId, totalItems]);
+	}, [sortedCurated, savedModels, filteredAllModels, currentModelId, totalItems]);
 
 	const { selectedIndex } = useMenuKeyboard({
 		itemCount: totalItems,
 		initialIndex,
 		onClose,
 		onSelect: (selectedIdx) => {
-			const isCurated = selectedIdx < sortedCurated.length;
-			const model = isCurated
-				? sortedCurated[selectedIdx]
-				: filteredAllModels[selectedIdx - sortedCurated.length];
+			if (selectedIdx < sortedCurated.length) {
+				const model = sortedCurated[selectedIdx];
+				if (model) {
+					onSelect(model);
+				}
+				return;
+			}
+
+			const afterCurated = selectedIdx - sortedCurated.length;
+			if (afterCurated < savedModels.length) {
+				const model = savedModels[afterCurated];
+				if (model) {
+					onSelect(model);
+				}
+				return;
+			}
+
+			const model = filteredAllModels[afterCurated - savedModels.length];
 			if (model) {
 				onSelect(model);
 			}
@@ -124,7 +151,7 @@ export function ModelMenu({
 		}
 	});
 
-	const allSelectedIndex = selectedIndex - sortedCurated.length;
+	const allSelectedIndex = selectedIndex - sortedCurated.length - savedModels.length;
 	const isAllSectionSelected = allSelectedIndex >= 0;
 
 	const scrollRef = useRef<ScrollBoxRenderable | null>(null);
@@ -345,6 +372,25 @@ export function ModelMenu({
 					</>
 				)}
 
+				{savedModels.length > 0 ? (
+					<>
+						<box marginBottom={1} marginTop={1}>
+							<text>
+								<span fg={COLORS.DAEMON_LABEL}>[ SAVED ]</span>
+							</text>
+						</box>
+						<box flexDirection="column">
+							{savedModels.map((model, idx) =>
+								renderModelRow(
+									model,
+									sortedCurated.length + idx === selectedIndex,
+									model.id === currentModelId
+								)
+							)}
+						</box>
+					</>
+				) : null}
+
 				<box marginBottom={1} marginTop={1}>
 					<text>
 						<span fg={COLORS.DAEMON_LABEL}>[ ALL MODELS ]</span>

package/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

package/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

package/src/components/tool-layouts/layouts/subagent.tsx

@@ -1,7 +1,8 @@
-import type { ToolLayoutConfig, ToolHeader, ToolLayoutRenderProps } from "../types";
 import type { ToolCallStatus } from "../../../types";
+import { COLORS, REASONING_MARKDOWN_STYLE } from "../../../ui/constants";
+import { formatMarkdownTables } from "../../../utils/markdown-tables";
 import { registerToolLayout } from "../registry";
-import { COLORS } from "../../../ui/constants";
+import type { ToolHeader, ToolLayoutConfig, ToolLayoutRenderProps } from "../types";
 
 type UnknownRecord = Record<string, unknown>;
 
@@ -28,20 +29,91 @@ function extractSearchQuery(input: unknown): string | null {
 	return null;
 }
 
+function extractUrl(input: unknown): string | null {
+	if (!isRecord(input)) return null;
+	if ("url" in input && typeof input.url === "string") {
+		return input.url;
+	}
+	return null;
+}
+
+function extractPath(input: unknown): string | null {
+	if (!isRecord(input)) return null;
+	if ("path" in input && typeof input.path === "string") {
+		return input.path;
+	}
+	return null;
+}
+
+function extractCommand(input: unknown): string | null {
+	if (!isRecord(input)) return null;
+	if ("command" in input && typeof input.command === "string") {
+		return input.command;
+	}
+	return null;
+}
+
+function truncateLabel(text: string, maxLength: number): string {
+	if (text.length <= maxLength) return text;
+	if (maxLength <= 3) return text.slice(0, maxLength);
+	return `${text.slice(0, maxLength - 3)}...`;
+}
+
 function abbreviateToolName(name: string): string {
 	const abbreviations: Record<string, string> = {
 		webSearch: "search",
 		fetchUrls: "fetch",
 		renderUrl: "render",
-		getSystemInfo: "sys",
 		runBash: "bash",
 		todoManager: "todo",
 		readFile: "read",
-		groundingManager: "grounding",
 	};
 	return abbreviations[name] ?? name.slice(0, 8);
 }
 
+function formatStepLabel(step: { toolName: string; input?: unknown }): string {
+	const toolLabel = abbreviateToolName(step.toolName);
+	const MAX_URL_LENGTH = 56;
+	const MAX_PATH_LENGTH = 56;
+	const MAX_COMMAND_LENGTH = 72;
+	const MAX_QUERY_LENGTH = 56;
+
+	if (step.toolName === "webSearch") {
+		const query = extractSearchQuery(step.input);
+		if (query) {
+			return `${toolLabel}: "${truncateLabel(query, MAX_QUERY_LENGTH)}"`;
+		}
+		return toolLabel;
+	}
+
+	if (step.toolName === "fetchUrls" || step.toolName === "renderUrl") {
+		const url = extractUrl(step.input);
+		if (url) {
+			return `${toolLabel}: ${truncateLabel(url, MAX_URL_LENGTH)}`;
+		}
+		return toolLabel;
+	}
+
+	if (step.toolName === "readFile") {
+		const path = extractPath(step.input);
+		if (path) {
+			return `${toolLabel}: ${truncateLabel(path, MAX_PATH_LENGTH)}`;
+		}
+		return toolLabel;
+	}
+
+	if (step.toolName === "runBash") {
+		const command = extractCommand(step.input);
+		if (command) {
+			const cleanCommand = command.replace(/\s+/g, " ").trim();
+			return `${toolLabel}: ${truncateLabel(cleanCommand, MAX_COMMAND_LENGTH)}`;
+		}
+		return toolLabel;
+	}
+
+	return toolLabel;
+}
+
 function getStepStatusIcon(status: ToolCallStatus): string {
 	switch (status) {
 		case "running":
@@ -68,22 +140,50 @@ function getStepStatusColor(status: ToolCallStatus): string {
 	}
 }
 
-function SubagentBody({ call }: ToolLayoutRenderProps) {
-	if (!call.subagentSteps || call.subagentSteps.length === 0) {
+function formatSubagentResponse(result: unknown): string | null {
+	if (!isRecord(result)) return null;
+	if (typeof result.response !== "string") return null;
+	const raw = result.response.trim();
+	if (!raw) return null;
+
+	const MAX_LINES = 6;
+	const MAX_CHARS = 160;
+	const lines = raw
+		.replace(/\r\n/g, "\n")
+		.split("\n")
+		.map((line) => line.trimEnd())
+		.filter((line) => line.length > 0);
+	if (lines.length === 0) return null;
+
+	const trimmed = lines.slice(0, MAX_LINES).map((line) => truncateLabel(line, MAX_CHARS));
+	if (lines.length > MAX_LINES && trimmed.length > 0) {
+		const lastIndex = trimmed.length - 1;
+		const lastLine = trimmed[lastIndex] ?? "";
+		trimmed[lastIndex] = lastLine.endsWith("...") ? lastLine : `${lastLine}...`;
+	}
+
+	return trimmed.join("\n");
+}
+
+function SubagentBody({ call, result }: ToolLayoutRenderProps) {
+	const steps = call.subagentSteps ?? [];
+	const responseText = formatSubagentResponse(result);
+	if (steps.length === 0 && !responseText) {
 		return null;
 	}
 
+	const maxWidth =
+		typeof process !== "undefined" && process.stdout?.columns ? process.stdout.columns : undefined;
+	const renderedResponse = responseText ? formatMarkdownTables(responseText, { maxWidth }) : "";
+
 	return (
 		<box flexDirection="column" paddingLeft={2} marginTop={0}>
-			{call.subagentSteps.map((step, idx) => {
-				const toolLabel = abbreviateToolName(step.toolName);
-				let stepLabel = toolLabel;
-				if (step.toolName === "webSearch") {
-					const query = extractSearchQuery(step.input);
-					if (query) {
-						stepLabel = `${toolLabel}: "${query}"`;
-					}
-				}
+			{steps.map((step, idx) => {
+				const stepLabel = formatStepLabel(step);
+				const inputLabel = stepLabel.slice(stepLabel.indexOf(":") + 1).trim();
+				const toolLabel = stepLabel.includes(":")
+					? stepLabel.slice(0, stepLabel.indexOf(":") + 1)
+					: stepLabel;
 
 				return (
 					<box key={`${step.toolName}-${idx}`} flexDirection="row" alignItems="center">
@@ -95,11 +195,35 @@ function SubagentBody({ call }: ToolLayoutRenderProps) {
 							</text>
 						)}
 						<text marginLeft={1}>
-							<span fg={COLORS.TOOL_INPUT_TEXT}>{stepLabel}</span>
+							<span fg={COLORS.TOOL_INPUT_TEXT}>{toolLabel}</span>
+							{stepLabel.includes(":") && <span fg={COLORS.REASONING_DIM}>{` ${inputLabel}`}</span>}
 						</text>
 					</box>
 				);
 			})}
+			{responseText && (
+				<box flexDirection="column" marginTop={steps.length > 0 ? 1 : 0}>
+					<text>
+						<span fg={COLORS.REASONING_DIM}>{"response"}</span>
+					</text>
+					<box
+						borderStyle="single"
+						borderColor={COLORS.TOOL_INPUT_BORDER}
+						paddingLeft={1}
+						paddingRight={1}
+						paddingTop={0}
+						paddingBottom={0}
+					>
+						<code
+							content={renderedResponse}
+							filetype="markdown"
+							syntaxStyle={REASONING_MARKDOWN_STYLE}
+							conceal={true}
+							drawUnstyledText={false}
+						/>
+					</box>
+				</box>
+			)}
 		</box>
 	);
 }

package/src/hooks/daemon-event-handlers.ts

@@ -22,7 +22,7 @@ import type {
 import { DaemonState } from "../types";
 import { REASONING_COLORS, STATE_COLORS } from "../types/theme";
 import { REASONING_ANIMATION } from "../ui/constants";
-import { debug } from "../utils/debug-logger";
+import { debug, messageDebug } from "../utils/debug-logger";
 import { hasVisibleText } from "../utils/formatters";
 import {
 	INTERRUPTED_TOOL_RESULT,
@@ -736,7 +736,7 @@ export function createCancelledHandler(
 		const hasBlocks = refs.contentBlocksRef.current.length > 0;
 		const contentBlocks = hasBlocks ? buildInterruptedContentBlocks(refs.contentBlocksRef.current) : [];
 
-		debug.info("agent-turn-incomplete", {
+		messageDebug.info("agent-turn-incomplete", {
 			userText,
 			contentBlocks,
 		});
@@ -753,7 +753,7 @@ export function createCancelledHandler(
 					}
 				: null;
 
-			debug.info("agent-turn-incomplete-messages", {
+			messageDebug.info("agent-turn-incomplete-messages", {
 				responseMessages,
 			});
 

package/src/hooks/use-app-preferences-bootstrap.ts

@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useRef } from "react";
-import { AVAILABLE_MODELS, setOpenRouterProviderTag, setResponseModel } from "../ai/model-config";
+import { setOpenRouterProviderTag, setResponseModel } from "../ai/model-config";
 import type {
 	AppPreferences,
 	BashApprovalLevel,
@@ -94,11 +94,8 @@ export function useAppPreferencesBootstrap(
 			}
 
 			if (prefs?.modelId) {
-				const modelIdx = AVAILABLE_MODELS.findIndex((m) => m.id === prefs.modelId);
-				if (modelIdx >= 0) {
-					setResponseModel(prefs.modelId);
-					setCurrentModelId(prefs.modelId);
-				}
+				setResponseModel(prefs.modelId);
+				setCurrentModelId(prefs.modelId);
 			}
 
 			if (prefs?.openRouterProviderTag) {

package/src/hooks/use-reasoning-animation.ts

@@ -59,14 +59,14 @@ export function useReasoningAnimation(): UseReasoningAnimationReturn {
 
 				const terminalWidth =
 					typeof process !== "undefined" && process.stdout?.columns ? process.stdout.columns : undefined;
-				const maxWidth = terminalWidth ? Math.max(20, terminalWidth - 12) : REASONING_ANIMATION.LINE_WIDTH;
+				const maxWidth = terminalWidth ? Math.max(20, terminalWidth - 14) : REASONING_ANIMATION.LINE_WIDTH;
 				const lineWidth = Math.min(REASONING_ANIMATION.LINE_WIDTH, maxWidth);
 
-				// Add to display, keeping it at max width by trimming from the left
+				// Add to display, restart when reaching the line width
 				setReasoningDisplay((display: string) => {
 					const newDisplay = display + movedChars;
-					if (newDisplay.length > lineWidth) {
-						return newDisplay.slice(-lineWidth);
+					if (newDisplay.length >= lineWidth) {
+						return movedChars;
 					}
 					return newDisplay;
 				});

package/src/state/daemon-state.ts

@@ -16,7 +16,7 @@ import type {
 } from "../types";
 import { DEFAULT_TOOL_TOGGLES } from "../types";
 import { DaemonState } from "../types";
-import { debug } from "../utils/debug-logger";
+import { debug, messageDebug } from "../utils/debug-logger";
 import { SpeechController } from "../voice/tts/speech-controller";
 import { VoiceInputController } from "../voice/voice-input-controller";
 import { type DaemonStateEvents, daemonEvents } from "./daemon-events";
@@ -272,7 +272,7 @@ class DaemonStateManager {
 		this.setState(DaemonState.RESPONDING);
 		this._response = "";
 		const turnId = ++this._turnId;
-		debug.info("agent-turn-start", {
+		messageDebug.info("agent-turn-start", {
 			turnId,
 			text,
 			mode: this._interactionMode,
@@ -319,7 +319,7 @@ class DaemonStateManager {
 				return;
 			}
 
-			debug.info("agent-turn-complete", {
+			messageDebug.info("agent-turn-complete", {
 				turnId,
 				fullText: result.fullText,
 				finalText: result.finalText,

package/src/ui/reasoning-ticker.tsx

@@ -1,3 +1,4 @@
+import { TextAttributes } from "@opentui/core";
 import { COLORS, REASONING_ANIMATION } from "./constants";
 
 export function renderReasoningTicker(reasoningDisplay: string) {
@@ -27,9 +28,12 @@ export function renderReasoningTicker(reasoningDisplay: string) {
 
 	return (
 		<text>
-			<span fg={REASONING_ANIMATION.PREFIX_COLOR}>{"// "}</span>
+			<span fg={COLORS.REASONING_DIM} attributes={TextAttributes.BOLD}>
+				{"REASONING"}
+			</span>
+			<span fg={REASONING_ANIMATION.PREFIX_COLOR}>{" | "}</span>
 			{segments.map((segment, index) => (
-				<span fg={segment.color} key={`reasoning-seg-${index}`}>
+				<span fg={segment.color} key={`reasoning-seg-${index}`} attributes={TextAttributes.ITALIC}>
 					{segment.text}
 				</span>
 			))}

package/src/utils/debug-logger.ts

@@ -6,19 +6,24 @@
  *   import { debug } from "../utils/debug-logger";
  *   debug.log("message", someObject);
  *
- * Then run `tail -f debug.log` in a separate terminal.
+ * Then run `tail -f ~/.config/daemon/logs/debug.log` in a separate terminal.
+ * Tool-specific logging uses `~/.config/daemon/logs/tools.log`.
+ * Message logging uses `~/.config/daemon/logs/messages.log`.
  */
 
 import fs from "node:fs";
 import path from "node:path";
 import { getAppConfigDir } from "./preferences";
 
-const LOG_FILE = path.join(getAppConfigDir(), "debug.log");
+const LOG_DIR = path.join(getAppConfigDir(), "logs");
+const LOG_FILE = path.join(LOG_DIR, "debug.log");
+const TOOLS_LOG_FILE = path.join(LOG_DIR, "tools.log");
+const MESSAGES_LOG_FILE = path.join(LOG_DIR, "messages.log");
 const ENABLED = process.env.DEBUG_LOG === "1" || process.env.DEBUG_LOG === "true";
 
-function ensureLogDir(): void {
+function ensureLogDir(logDir: string): void {
 	try {
-		fs.mkdirSync(getAppConfigDir(), { recursive: true });
+		fs.mkdirSync(logDir, { recursive: true });
 	} catch {
 		// Silently fail if we can't create the directory
 	}
@@ -35,7 +40,7 @@ function formatValue(value: unknown): string {
 	}
 }
 
-function writeLog(level: string, args: unknown[]): void {
+function writeLog(logFile: string, level: string, args: unknown[]): void {
 	if (!ENABLED) return;
 
 	const timestamp = new Date().toISOString();
@@ -43,27 +48,33 @@ function writeLog(level: string, args: unknown[]): void {
 	const line = `[${timestamp}] [${level}] ${formatted}\n`;
 
 	try {
-		ensureLogDir();
-		fs.appendFileSync(LOG_FILE, line);
+		ensureLogDir(LOG_DIR);
+		fs.appendFileSync(logFile, line);
 	} catch {
 		// Silently fail if we can't write
 	}
 }
 
-export const debug = {
-	log: (...args: unknown[]) => writeLog("LOG", args),
-	info: (...args: unknown[]) => writeLog("INFO", args),
-	warn: (...args: unknown[]) => writeLog("WARN", args),
-	error: (...args: unknown[]) => writeLog("ERROR", args),
+function createDebugLogger(logFile: string) {
+	return {
+		log: (...args: unknown[]) => writeLog(logFile, "LOG", args),
+		info: (...args: unknown[]) => writeLog(logFile, "INFO", args),
+		warn: (...args: unknown[]) => writeLog(logFile, "WARN", args),
+		error: (...args: unknown[]) => writeLog(logFile, "ERROR", args),
 
-	/** Clear the log file */
-	clear: () => {
-		if (!ENABLED) return;
-		try {
-			ensureLogDir();
-			fs.writeFileSync(LOG_FILE, "");
-		} catch {
-			// Silently fail
-		}
-	},
-};
+		/** Clear the log file */
+		clear: () => {
+			if (!ENABLED) return;
+			try {
+				ensureLogDir(LOG_DIR);
+				fs.writeFileSync(logFile, "");
+			} catch {
+				// Silently fail
+			}
+		},
+	};
+}
+
+export const debug = createDebugLogger(LOG_FILE);
+export const toolDebug = createDebugLogger(TOOLS_LOG_FILE);
+export const messageDebug = createDebugLogger(MESSAGES_LOG_FILE);