@makefinks/daemon 0.7.2 → 0.9.0

package/src/components/SettingsMenu.tsx

@@ -35,6 +35,7 @@ interface SettingsMenuProps {
 	canEnableVoiceOutput: boolean;
 	showFullReasoning: boolean;
 	showToolOutput: boolean;
+	memoryEnabled: boolean;
 	onClose: () => void;
 	toggleInteractionMode: () => void;
 	setVoiceInteractionType: (type: VoiceInteractionType) => void;
@@ -43,6 +44,7 @@ interface SettingsMenuProps {
 	setBashApprovalLevel: (level: BashApprovalLevel) => void;
 	setShowFullReasoning: (show: boolean) => void;
 	setShowToolOutput: (show: boolean) => void;
+	setMemoryEnabled: (enabled: boolean) => void;
 	persistPreferences: (updates: Partial<AppPreferences>) => void;
 }
 
@@ -56,6 +58,7 @@ export function SettingsMenu({
 	canEnableVoiceOutput,
 	showFullReasoning,
 	showToolOutput,
+	memoryEnabled,
 	onClose,
 	toggleInteractionMode,
 	setVoiceInteractionType,
@@ -64,6 +67,7 @@ export function SettingsMenu({
 	setBashApprovalLevel,
 	setShowFullReasoning,
 	setShowToolOutput,
+	setMemoryEnabled,
 	persistPreferences,
 }: SettingsMenuProps) {
 	const [selectedIdx, setSelectedIdx] = useState(0);
@@ -115,24 +119,33 @@ export function SettingsMenu({
 			description: "Require approval for bash commands (NONE / DANGEROUS / ALL)",
 			isCyclic: true,
 		},
+		{
+			id: "memory-enabled",
+			label: "Memory",
+			value: memoryEnabled ? "ON" : "OFF",
+			description: "Auto-save messages + inject relevant memories",
+			isToggle: true,
+		},
 	];
 
-	if (interactionMode === "voice") {
-		items.push(
-			{
-				id: "header-audio",
-				label: "AUDIO PARAMETERS",
-				isHeader: true,
-			},
-			{
-				id: "speech-speed",
-				label: "Speech Speed",
-				value: `${speechSpeed.toFixed(2)}x`,
-				description: "Adjust speech rate (1.0x - 2.0x)",
-				isCyclic: true,
-			}
-		);
-	}
+	const audioSettingsDisabled = interactionMode !== "voice";
+	items.push(
+		{
+			id: "header-audio",
+			label: "AUDIO PARAMETERS",
+			isHeader: true,
+		},
+		{
+			id: "speech-speed",
+			label: "Speech Speed",
+			value: audioSettingsDisabled ? "N/A" : `${speechSpeed.toFixed(2)}x`,
+			description: audioSettingsDisabled
+				? "Enable voice mode to adjust speech rate"
+				: "Adjust speech rate (1.0x - 2.0x)",
+			isCyclic: !audioSettingsDisabled,
+			disabled: audioSettingsDisabled,
+		}
+	);
 
 	items.push(
 		{
@@ -159,6 +172,7 @@ export function SettingsMenu({
 	// Filter out headers for selection logic
 	const selectableItems = items.filter((item) => !item.isHeader);
 	const selectableCount = selectableItems.length;
+	const labelWidth = Math.max(0, ...selectableItems.map((item) => item.label.length)) + 4;
 
 	useEffect(() => {
 		if (selectableCount === 0) {
@@ -181,6 +195,7 @@ export function SettingsMenu({
 			canEnableVoiceOutput,
 			showFullReasoning,
 			showToolOutput,
+			memoryEnabled,
 			setSelectedIdx,
 			toggleInteractionMode,
 			setVoiceInteractionType,
@@ -189,6 +204,7 @@ export function SettingsMenu({
 			setBashApprovalLevel,
 			setShowFullReasoning,
 			setShowToolOutput,
+			setMemoryEnabled,
 			persistPreferences,
 			onClose,
 			manager,
@@ -263,19 +279,25 @@ export function SettingsMenu({
 								paddingRight={1}
 								flexDirection="column"
 							>
-								<box>
-									<text>
-										<span fg={labelColor}>
-											{isSelected ? "▶ " : "  "}
-											{item.label}:{" "}
-										</span>
-										<span fg={valueColor}>{item.value}</span>
-										{item.isToggle && !item.disabled && <span fg={COLORS.USER_LABEL}></span>}
-										{item.isCyclic && !item.disabled && <span fg={COLORS.USER_LABEL}></span>}
-									</text>
+								<box flexDirection="row">
+									<box width={labelWidth}>
+										<text>
+											<span fg={labelColor}>
+												{isSelected ? "▶ " : "  "}
+												{item.label}:{" "}
+											</span>
+										</text>
+									</box>
+									<box>
+										<text>
+											<span fg={valueColor}>{item.value}</span>
+											{item.isToggle && !item.disabled && <span fg={COLORS.USER_LABEL}></span>}
+											{item.isCyclic && !item.disabled && <span fg={COLORS.USER_LABEL}></span>}
+										</text>
+									</box>
 								</box>
 								{item.description && (
-									<box marginLeft={4}>
+									<box marginLeft={labelWidth}>
 										<text>
 											<span fg={COLORS.REASONING_DIM}>{item.description}</span>
 										</text>

package/src/components/ToolCallView.tsx

@@ -1,7 +1,10 @@
 import { useMemo } from "react";
+import { getMcpManager } from "../ai/mcp/mcp-manager";
 import { useToolApprovalForCall } from "../hooks/use-tool-approval";
 import type { ToolCall } from "../types";
 import { COLORS } from "../ui/constants";
+import { formatToolInputLines } from "../utils/formatters";
+import { formatGenericToolOutputPreview } from "../utils/tool-output-preview";
 import { ApprovalPicker } from "./ApprovalPicker";
 import {
 	ErrorPreviewView,
@@ -37,8 +40,19 @@ function ApprovalResultBadge({ result }: { result: "approved" | "denied" }) {
 	);
 }
 
+function ToolSectionDivider({ label }: { label: string }) {
+	return (
+		<box flexDirection="column" paddingLeft={2} marginTop={1}>
+			<text>
+				<span fg={COLORS.REASONING_DIM}>{`--- ${label} ---`}</span>
+			</text>
+		</box>
+	);
+}
+
 export function ToolCallView({ call, result, showOutput = true }: ToolCallViewProps) {
 	const layout = getToolLayout(call.name) ?? defaultToolLayout;
+	const mcpMeta = useMemo(() => getMcpManager().getToolMeta(call.name), [call.name]);
 	const isAwaitingApproval = call.status === "awaiting_approval";
 	const isRunning = call.status === "running" || call.status === "streaming";
 	const isFailed = call.status === "failed";
@@ -47,17 +61,42 @@ export function ToolCallView({ call, result, showOutput = true }: ToolCallViewPr
 		call.toolCallId
 	);
 
-	const header = useMemo(() => layout.getHeader?.(call.input, result) ?? null, [call.input, result, layout]);
-
-	const body = useMemo(
-		() => layout.getBody?.(call.input, result, call) ?? null,
-		[call.input, result, call, layout]
-	);
+	const header = useMemo(() => {
+		const base = layout.getHeader?.(call.input, result) ?? null;
+		if (base) return base;
+		if (mcpMeta) {
+			return {
+				primary: mcpMeta.serverId,
+				secondary: mcpMeta.originalToolName,
+				secondaryStyle: "dim" as const,
+			};
+		}
+		return null;
+	}, [call.input, result, layout, mcpMeta]);
+
+	const body = useMemo(() => {
+		const base = layout.getBody?.(call.input, result, call) ?? null;
+		if (base) return base;
+		if (!mcpMeta) return null;
+		const lines = formatToolInputLines(call.input);
+		const normalized = lines.length > 0 ? lines : ["(no input)"];
+		return {
+			lines: normalized.map((text) => ({
+				text,
+				color: COLORS.REASONING_DIM,
+			})),
+		};
+	}, [call.input, result, call, layout, mcpMeta]);
 
 	const resultPreviewLines = useMemo(() => {
 		if (!showOutput) return null;
-		return layout.formatResult?.(result) ?? null;
-	}, [result, showOutput, layout]);
+		const formatted = layout.formatResult?.(result) ?? null;
+		if (formatted) return formatted;
+		if (mcpMeta) return formatGenericToolOutputPreview(result);
+		return null;
+	}, [result, showOutput, layout, mcpMeta]);
+
+	const hasResultPreview = Boolean(showOutput && resultPreviewLines && resultPreviewLines.length > 0);
 
 	const toolColor =
 		call.status === "completed"
@@ -65,7 +104,7 @@ export function ToolCallView({ call, result, showOutput = true }: ToolCallViewPr
 			: isAwaitingApproval
 				? COLORS.STATUS_APPROVAL
 				: COLORS.TOOLS;
-	const toolName = layout.abbreviation ?? getDefaultAbbreviation(call.name);
+	const toolName = mcpMeta ? "mcp" : (layout.abbreviation ?? getDefaultAbbreviation(call.name));
 	const borderColor = getStatusBorderColor(call.status);
 
 	const customBody = layout.renderBody ? layout.renderBody({ call, result, showOutput }) : null;
@@ -98,10 +137,10 @@ export function ToolCallView({ call, result, showOutput = true }: ToolCallViewPr
 				/>
 			)}
 
-			{showOutput && resultPreviewLines && resultPreviewLines.length > 0 && (
-				<ResultPreviewView lines={resultPreviewLines} />
-			)}
+			{hasResultPreview && <ToolSectionDivider label="OUTPUT" />}
+			{hasResultPreview && <ResultPreviewView lines={resultPreviewLines ?? []} />}
 
+			{isFailed && call.error && <ToolSectionDivider label="ERROR" />}
 			{isFailed && call.error && <ErrorPreviewView error={call.error} />}
 
 			{call.approvalResult && <ApprovalResultBadge result={call.approvalResult} />}

package/src/components/ToolsMenu.tsx

@@ -1,5 +1,6 @@
 import { useEffect, useMemo, useState } from "react";
 
+import { type McpServerStatus, getMcpManager } from "../ai/mcp/mcp-manager";
 import { invalidateDaemonToolsCache } from "../ai/tools/index";
 import { invalidateSubagentToolsCache } from "../ai/tools/subagents";
 import {
@@ -13,6 +14,7 @@ import { getDaemonManager } from "../state/daemon-state";
 import type { ToolToggleId, ToolToggles } from "../types";
 import { DEFAULT_TOOL_TOGGLES } from "../types";
 import { COLORS } from "../ui/constants";
+import { getManualConfigPath } from "../utils/config";
 
 interface ToolsMenuProps {
 	persistPreferences: (updates: Partial<{ toolToggles: ToolToggles }>) => void;
@@ -52,9 +54,21 @@ function getToolLabel(id: ToolToggleId): string {
 export function ToolsMenu({ persistPreferences, onClose }: ToolsMenuProps) {
 	const manager = getDaemonManager();
 	const [toggles, setToggles] = useState<ToolToggles>(manager.toolToggles ?? { ...DEFAULT_TOOL_TOGGLES });
+	const [mcpServers, setMcpServers] = useState<McpServerStatus[]>(() => getMcpManager().getServersSnapshot());
 
 	const [toolAvailability, setToolAvailability] = useState<Record<ToolToggleId, MenuToolItem> | null>(null);
 
+	useEffect(() => {
+		const mcp = getMcpManager();
+		const handleUpdate = () => {
+			setMcpServers(mcp.getServersSnapshot());
+		};
+		mcp.on("update", handleUpdate);
+		return () => {
+			mcp.off("update", handleUpdate);
+		};
+	}, []);
+
 	useEffect(() => {
 		let cancelled = false;
 		const loadAvailability = async () => {
@@ -134,12 +148,20 @@ export function ToolsMenu({ persistPreferences, onClose }: ToolsMenuProps) {
 	}, [items, showReasonColumn]);
 
 	const statusWidth = 8;
+	const mcpStatusWidth = 8;
 
 	function truncateText(text: string, maxLen: number): string {
 		if (text.length <= maxLen) return text;
 		return text.slice(0, Math.max(0, maxLen - 1)) + "…";
 	}
 
+	const mcpConfigPath = useMemo(() => getManualConfigPath(), []);
+
+	const mcpIdWidth = useMemo(() => {
+		const raw = mcpServers.reduce((max, server) => Math.max(max, server.id.length), 0);
+		return Math.min(Math.max(raw, 10), 28);
+	}, [mcpServers]);
+
 	return (
 		<box
 			position="absolute"
@@ -176,15 +198,13 @@ export function ToolsMenu({ persistPreferences, onClose }: ToolsMenuProps) {
 					</text>
 				</box>
 
-				{showReasonColumn && (
-					<box marginBottom={1}>
-						<text>
-							<span fg={COLORS.REASONING_DIM}>
-								{"TOOL".padEnd(labelWidth)} {"STATUS".padEnd(statusWidth)} REASON
-							</span>
-						</text>
-					</box>
-				)}
+				<box marginBottom={1}>
+					<text>
+						<span fg={COLORS.REASONING_DIM}>
+							{`  ${"TOOL".padEnd(labelWidth)} ${"STATUS".padEnd(statusWidth)}${showReasonColumn ? " REASON" : ""}`}
+						</span>
+					</text>
+				</box>
 
 				<box flexDirection="column">
 					{items.map((item, idx) => {
@@ -218,7 +238,7 @@ export function ToolsMenu({ persistPreferences, onClose }: ToolsMenuProps) {
 									<span fg={labelColor}>{labelText}</span>
 									<span fg={COLORS.REASONING_DIM}> </span>
 									<span fg={statusColor}>{statusText}</span>
-									{showReasonColumn && reasonText ? (
+									{showReasonColumn ? (
 										<>
 											<span fg={COLORS.REASONING_DIM}> </span>
 											<span fg={reasonColor}>{reasonText}</span>
@@ -229,6 +249,57 @@ export function ToolsMenu({ persistPreferences, onClose }: ToolsMenuProps) {
 						);
 					})}
 				</box>
+
+				<box flexDirection="column" marginTop={1}>
+					<box marginBottom={1}>
+						<text>
+							<span fg={COLORS.DAEMON_LABEL}>[ MCP ]</span>
+							<span fg={COLORS.REASONING_DIM}>{` ${truncateText(mcpConfigPath, 80)}`}</span>
+						</text>
+					</box>
+
+					{mcpServers.length === 0 ? (
+						<text>
+							<span fg={COLORS.REASONING_DIM}>No MCP servers configured.</span>
+						</text>
+					) : (
+						<box flexDirection="column">
+							<box marginBottom={1}>
+								<text>
+									<span fg={COLORS.REASONING_DIM}>
+										{`SERVER`.padEnd(mcpIdWidth)} {`STATUS`.padEnd(mcpStatusWidth)} TOOLS
+									</span>
+								</text>
+							</box>
+							{mcpServers.map((server) => {
+								const statusLabel = server.status.toUpperCase();
+								const statusColor =
+									server.status === "ready"
+										? COLORS.STATUS_COMPLETED
+										: server.status === "loading"
+											? COLORS.STATUS_RUNNING
+											: server.status === "error"
+												? COLORS.STATUS_FAILED
+												: COLORS.REASONING_DIM;
+								const idText = truncateText(server.id, mcpIdWidth).padEnd(mcpIdWidth);
+								const toolsText = String(server.toolCount).padStart(4);
+								const errorText = server.error ? truncateText(server.error, 60) : "";
+
+								return (
+									<box key={server.id} flexDirection="column">
+										<text>
+											<span fg={COLORS.MENU_TEXT}>{idText}</span>
+											<span fg={COLORS.REASONING_DIM}> </span>
+											<span fg={statusColor}>{statusLabel.padEnd(mcpStatusWidth)}</span>
+											<span fg={COLORS.REASONING_DIM}> {toolsText}</span>
+											{errorText ? <span fg={COLORS.REASONING_DIM}>{`  ${errorText}`}</span> : null}
+										</text>
+									</box>
+								);
+							})}
+						</box>
+					)}
+				</box>
 			</box>
 		</box>
 	);

package/src/components/UrlMenu.tsx

@@ -139,7 +139,7 @@ export function UrlMenu({ items, onClose }: UrlMenuProps) {
 						</span>
 					</text>
 					<text>
-						<span fg={COLORS.REASONING_DIM}>(G=grounded, READ=% or HL=highlights)</span>
+						<span fg={COLORS.REASONING_DIM}>(G=grounded, READ=%)</span>
 					</text>
 				</box>
 
@@ -152,12 +152,7 @@ export function UrlMenu({ items, onClose }: UrlMenuProps) {
 						sortedItems.map((item, idx) => {
 							const { origin, path } = splitUrl(item.url);
 							const grounded = item.groundedCount > 0;
-							const readLabel =
-								item.readPercent !== undefined
-									? `${item.readPercent}%`
-									: item.highlightsCount !== undefined
-										? `HL:${item.highlightsCount}`
-										: "—";
+							const readLabel = item.readPercent !== undefined ? `${item.readPercent}%` : "—";
 
 							return (
 								<box key={idx} flexDirection="row" marginBottom={0}>

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

@@ -34,6 +34,12 @@ function extractUrl(input: unknown): string | null {
 	if ("url" in input && typeof input.url === "string") {
 		return input.url;
 	}
+	if ("requests" in input && Array.isArray(input.requests)) {
+		const first = input.requests.find((item: unknown) => isRecord(item) && typeof item.url === "string");
+		if (isRecord(first) && typeof first.url === "string") {
+			return first.url;
+		}
+	}
 	return null;
 }
 
@@ -88,6 +94,16 @@ function formatStepLabel(step: { toolName: string; input?: unknown }): string {
 
 	if (step.toolName === "fetchUrls" || step.toolName === "renderUrl") {
 		const url = extractUrl(step.input);
+		if (step.toolName === "fetchUrls" && isRecord(step.input) && Array.isArray(step.input.requests)) {
+			const count = step.input.requests.filter(
+				(item: unknown) => isRecord(item) && typeof item.url === "string"
+			).length;
+			if (url) {
+				const suffix = count > 1 ? ` (+${count - 1})` : "";
+				return `${toolLabel}: ${truncateLabel(url, MAX_URL_LENGTH)}${suffix}`;
+			}
+			return toolLabel;
+		}
 		if (url) {
 			return `${toolLabel}: ${truncateLabel(url, MAX_URL_LENGTH)}`;
 		}