@makefinks/daemon 0.7.2 → 0.8.0

package/src/ai/tools/subagents.ts

@@ -11,6 +11,7 @@ import { z } from "zod";
 import { getDaemonManager } from "../../state/daemon-state";
 import type { SubagentProgressEmitter } from "../../types";
 import { getOpenRouterReportedCost } from "../../utils/openrouter-reported-cost";
+import { getMcpManager } from "../mcp/mcp-manager";
 import { extractFinalAssistantText } from "../message-utils";
 import { buildOpenRouterChatSettings, getSubagentModel } from "../model-config";
 import { buildToolSet } from "./tool-registry";
@@ -21,25 +22,28 @@ const openrouter = createOpenRouter();
 // Maximum steps for subagent loops
 const MAX_SUBAGENT_STEPS = 30;
 
-let cachedSubagentTools: Promise<ToolSet> | null = null;
+let cachedSubagentBaseTools: Promise<ToolSet> | null = null;
 
 export function invalidateSubagentToolsCache(): void {
-	cachedSubagentTools = null;
+	cachedSubagentBaseTools = null;
 }
 
 // Subagent tools (all tools except subagent itself to prevent recursion)
 async function getSubagentTools(): Promise<ToolSet> {
-	if (cachedSubagentTools) return cachedSubagentTools;
-
-	cachedSubagentTools = (async () => {
-		const toggles = getDaemonManager().toolToggles;
-		const { tools } = await buildToolSet(toggles, {
-			omit: ["groundingManager", "subagent"],
-		});
-		return tools;
-	})();
-
-	return cachedSubagentTools;
+	if (!cachedSubagentBaseTools) {
+		cachedSubagentBaseTools = (async () => {
+			const toggles = getDaemonManager().toolToggles;
+			const { tools } = await buildToolSet(toggles, {
+				omit: ["groundingManager", "subagent"],
+			});
+			return tools;
+		})();
+	}
+
+	const baseTools = await cachedSubagentBaseTools;
+	const mcpTools = getMcpManager().getToolsSnapshot();
+	if (Object.keys(mcpTools).length === 0) return baseTools;
+	return { ...baseTools, ...mcpTools };
 }
 
 // System prompt for subagents

package/src/app/components/AppOverlays.tsx

@@ -63,6 +63,7 @@ function AppOverlaysImpl({ conversationHistory, currentContentBlocks }: AppOverl
 					canEnableVoiceOutput={settings.canEnableVoiceOutput}
 					showFullReasoning={settings.showFullReasoning}
 					showToolOutput={settings.showToolOutput}
+					memoryEnabled={settings.memoryEnabled}
 					onClose={() => menus.setShowSettingsMenu(false)}
 					toggleInteractionMode={settingsCallbacks.onToggleInteractionMode}
 					setVoiceInteractionType={settingsCallbacks.onSetVoiceInteractionType}
@@ -71,6 +72,7 @@ function AppOverlaysImpl({ conversationHistory, currentContentBlocks }: AppOverl
 					setBashApprovalLevel={settingsCallbacks.onSetBashApprovalLevel}
 					setShowFullReasoning={settings.setShowFullReasoning}
 					setShowToolOutput={settings.setShowToolOutput}
+					setMemoryEnabled={settings.setMemoryEnabled}
 					persistPreferences={settings.persistPreferences}
 				/>
 			)}

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,6 +119,13 @@ 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") {
@@ -181,6 +192,7 @@ export function SettingsMenu({
 			canEnableVoiceOutput,
 			showFullReasoning,
 			showToolOutput,
+			memoryEnabled,
 			setSelectedIdx,
 			toggleInteractionMode,
 			setVoiceInteractionType,
@@ -189,6 +201,7 @@ export function SettingsMenu({
 			setBashApprovalLevel,
 			setShowFullReasoning,
 			setShowToolOutput,
+			setMemoryEnabled,
 			persistPreferences,
 			onClose,
 			manager,

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/hooks/daemon-event-handlers.ts

@@ -12,6 +12,7 @@ import { saveSessionSnapshot } from "../state/session-store";
 import type {
 	ContentBlock,
 	ConversationMessage,
+	MemoryToastPreview,
 	ModelMessage,
 	SubagentStep,
 	TokenUsage,
@@ -56,6 +57,14 @@ function clearAvatarToolEffects(avatar: DaemonAvatarRenderable | null): void {
 	avatar.setTypingMode(false);
 }
 
+export function createMemorySavedHandler() {
+	return (preview: MemoryToastPreview) => {
+		const description = preview.description?.trim();
+		if (!description) return;
+		toast.success(`Memory saved (${preview.operation})`, { description });
+	};
+}
+
 function finalizePendingUserMessage(
 	prev: ConversationMessage[],
 	userText: string,

package/src/hooks/keyboard-handlers.ts

@@ -256,6 +256,7 @@ interface SettingsMenuContext {
 	canEnableVoiceOutput: boolean;
 	showFullReasoning: boolean;
 	showToolOutput: boolean;
+	memoryEnabled: boolean;
 	setSelectedIdx: (fn: (prev: number) => number) => void;
 	toggleInteractionMode: () => void;
 	setVoiceInteractionType: (type: VoiceInteractionType) => void;
@@ -264,6 +265,7 @@ interface SettingsMenuContext {
 	setBashApprovalLevel: (level: BashApprovalLevel) => void;
 	setShowFullReasoning: (show: boolean) => void;
 	setShowToolOutput: (show: boolean) => void;
+	setMemoryEnabled: (enabled: boolean) => void;
 	persistPreferences: (updates: Partial<AppPreferences>) => void;
 	onClose: () => void;
 	manager: {
@@ -272,6 +274,7 @@ interface SettingsMenuContext {
 		speechSpeed: SpeechSpeed;
 		reasoningEffort: ReasoningEffort;
 		bashApprovalLevel: BashApprovalLevel;
+		memoryEnabled: boolean;
 	};
 }
 
@@ -353,6 +356,16 @@ export function handleSettingsMenuKey(key: KeyEvent, ctx: SettingsMenuContext):
 		settingIdx++;
 
 		if (ctx.interactionMode === "voice") {
+			if (ctx.selectedIdx === settingIdx) {
+				const next = !ctx.manager.memoryEnabled;
+				ctx.manager.memoryEnabled = next;
+				ctx.setMemoryEnabled(next);
+				ctx.persistPreferences({ memoryEnabled: next });
+				key.preventDefault();
+				return true;
+			}
+			settingIdx++;
+
 			if (ctx.selectedIdx === settingIdx) {
 				const speeds: SpeechSpeed[] = [1.0, 1.25, 1.5, 1.75, 2.0];
 				const currentSpeed = ctx.manager.speechSpeed;
@@ -367,6 +380,17 @@ export function handleSettingsMenuKey(key: KeyEvent, ctx: SettingsMenuContext):
 			}
 			settingIdx++;
 		}
+		if (ctx.interactionMode !== "voice") {
+			if (ctx.selectedIdx === settingIdx) {
+				const next = !ctx.manager.memoryEnabled;
+				ctx.manager.memoryEnabled = next;
+				ctx.setMemoryEnabled(next);
+				ctx.persistPreferences({ memoryEnabled: next });
+				key.preventDefault();
+				return true;
+			}
+			settingIdx++;
+		}
 
 		if (ctx.selectedIdx === settingIdx) {
 			const next = !ctx.showFullReasoning;

package/src/hooks/use-app-context-builder.ts

@@ -70,6 +70,8 @@ export interface UseAppContextBuilderParams {
 		setShowFullReasoning: (show: boolean) => void;
 		showToolOutput: boolean;
 		setShowToolOutput: (show: boolean) => void;
+		memoryEnabled: boolean;
+		setMemoryEnabled: (enabled: boolean) => void;
 		setBashApprovalLevel: (level: BashApprovalLevel) => void;
 		persistPreferences: (updates: Partial<AppPreferences>) => void;
 	};

package/src/hooks/use-app-controller.ts

@@ -113,6 +113,8 @@ export function useAppController({
 		setShowFullReasoning,
 		showToolOutput,
 		setShowToolOutput,
+		memoryEnabled,
+		setMemoryEnabled,
 		canEnableVoiceOutput,
 	} = appSettings;
 
@@ -180,6 +182,7 @@ export function useAppController({
 		setBashApprovalLevel,
 		setShowFullReasoning,
 		setShowToolOutput,
+		setMemoryEnabled,
 		setLoadedPreferences: bootstrap.setLoadedPreferences,
 		setOnboardingActive: bootstrap.setOnboardingActive,
 		setOnboardingStep: bootstrap.setOnboardingStep,
@@ -468,6 +471,8 @@ export function useAppController({
 			setShowFullReasoning,
 			showToolOutput,
 			setShowToolOutput,
+			memoryEnabled,
+			setMemoryEnabled,
 			setBashApprovalLevel,
 			persistPreferences,
 		},

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

@@ -1,4 +1,5 @@
 import { useCallback, useEffect, useRef } from "react";
+import { startMcpManager } from "../ai/mcp/mcp-manager";
 import { setOpenRouterProviderTag, setResponseModel } from "../ai/model-config";
 import type {
 	AppPreferences,
@@ -20,6 +21,7 @@ export interface UseAppPreferencesBootstrapParams {
 		speechSpeed: SpeechSpeed;
 		reasoningEffort: ReasoningEffort;
 		bashApprovalLevel: BashApprovalLevel;
+		memoryEnabled: boolean;
 		toolToggles?: ToolToggles;
 		audioDeviceName?: string;
 		outputDeviceName?: string;
@@ -35,6 +37,7 @@ export interface UseAppPreferencesBootstrapParams {
 	setBashApprovalLevel: (level: BashApprovalLevel) => void;
 	setShowFullReasoning: (show: boolean) => void;
 	setShowToolOutput: (show: boolean) => void;
+	setMemoryEnabled: (enabled: boolean) => void;
 	setLoadedPreferences: (prefs: AppPreferences | null) => void;
 	setOnboardingActive: (active: boolean) => void;
 	setOnboardingStep: (step: OnboardingStep) => void;
@@ -61,6 +64,7 @@ export function useAppPreferencesBootstrap(
 		setBashApprovalLevel,
 		setShowFullReasoning,
 		setShowToolOutput,
+		setMemoryEnabled,
 		setLoadedPreferences,
 		setOnboardingActive,
 		setOnboardingStep,
@@ -93,6 +97,9 @@ export function useAppPreferencesBootstrap(
 				process.env.EXA_API_KEY = prefs.exaApiKey;
 			}
 
+			// Start MCP discovery in the background (non-blocking)
+			startMcpManager();
+
 			if (prefs?.modelId) {
 				setResponseModel(prefs.modelId);
 				setCurrentModelId(prefs.modelId);
@@ -154,6 +161,10 @@ export function useAppPreferencesBootstrap(
 			if (prefs?.showToolOutput !== undefined) {
 				setShowToolOutput(prefs.showToolOutput);
 			}
+			if (prefs?.memoryEnabled !== undefined) {
+				manager.memoryEnabled = prefs.memoryEnabled;
+				setMemoryEnabled(prefs.memoryEnabled);
+			}
 
 			const hasOpenRouterKey = Boolean(process.env.OPENROUTER_API_KEY);
 			const hasOpenAiKey = Boolean(process.env.OPENAI_API_KEY);

package/src/hooks/use-app-settings.ts

@@ -24,6 +24,9 @@ export interface UseAppSettingsReturn {
 	showToolOutput: boolean;
 	setShowToolOutput: React.Dispatch<React.SetStateAction<boolean>>;
 
+	memoryEnabled: boolean;
+	setMemoryEnabled: React.Dispatch<React.SetStateAction<boolean>>;
+
 	canEnableVoiceOutput: boolean;
 }
 
@@ -39,6 +42,7 @@ export function useAppSettings(): UseAppSettingsReturn {
 	);
 	const [showFullReasoning, setShowFullReasoning] = useState(true);
 	const [showToolOutput, setShowToolOutput] = useState(false);
+	const [memoryEnabled, setMemoryEnabled] = useState(manager.memoryEnabled);
 
 	const canEnableVoiceOutput = Boolean(process.env.OPENAI_API_KEY);
 
@@ -57,6 +61,8 @@ export function useAppSettings(): UseAppSettingsReturn {
 		setShowFullReasoning,
 		showToolOutput,
 		setShowToolOutput,
+		memoryEnabled,
+		setMemoryEnabled,
 		canEnableVoiceOutput,
 	};
 }

package/src/hooks/use-daemon-events.ts

@@ -20,6 +20,7 @@ import {
 	createCancelledHandler,
 	createCompleteHandler,
 	createErrorHandler,
+	createMemorySavedHandler,
 	createMicLevelHandler,
 	createReasoningTokenHandler,
 	createStateChangeHandler,
@@ -320,6 +321,7 @@ export function useDaemonEvents(params: UseDaemonEventsParams): UseDaemonEventsR
 		const handleToolResult = createToolResultHandler(refs, setters);
 		const handleComplete = createCompleteHandler(refs, setters, deps);
 		const handleCancelled = createCancelledHandler(refs, setters, deps);
+		const handleMemorySaved = createMemorySavedHandler();
 		const handleError = createErrorHandler(setters);
 
 		daemonEvents.on("stateChange", handleStateChange);
@@ -337,6 +339,7 @@ export function useDaemonEvents(params: UseDaemonEventsParams): UseDaemonEventsR
 		daemonEvents.on("subagentToolResult", handleSubagentToolResult);
 		daemonEvents.on("subagentComplete", handleSubagentComplete);
 		daemonEvents.on("stepUsage", handleStepUsage);
+		daemonEvents.on("memorySaved", handleMemorySaved);
 		daemonEvents.on("responseToken", handleToken);
 		daemonEvents.on("responseComplete", handleComplete);
 		daemonEvents.on("cancelled", handleCancelled);
@@ -364,6 +367,7 @@ export function useDaemonEvents(params: UseDaemonEventsParams): UseDaemonEventsR
 			daemonEvents.off("subagentToolResult", handleSubagentToolResult);
 			daemonEvents.off("subagentComplete", handleSubagentComplete);
 			daemonEvents.off("stepUsage", handleStepUsage);
+			daemonEvents.off("memorySaved", handleMemorySaved);
 			daemonEvents.off("responseToken", handleToken);
 			daemonEvents.off("responseComplete", handleComplete);
 			daemonEvents.off("cancelled", handleCancelled);

package/src/index.tsx

@@ -5,6 +5,7 @@
 
 import { ConsolePosition, createCliRenderer } from "@opentui/core";
 import { createRoot } from "@opentui/react";
+import { destroyMcpManager } from "./ai/mcp/mcp-manager";
 import { App } from "./app/App";
 import { destroyDaemonManager } from "./state/daemon-state";
 import { COLORS } from "./ui/constants";
@@ -38,10 +39,12 @@ renderer.keyInput.on("paste", (event) => {
 // Cleanup on exit
 process.on("exit", () => {
 	destroyDaemonManager();
+	destroyMcpManager();
 });
 
 process.on("SIGINT", () => {
 	destroyDaemonManager();
+	destroyMcpManager();
 	process.exit(0);
 });
 

package/src/state/app-context.tsx

@@ -60,6 +60,8 @@ export interface SettingsState {
 	setShowFullReasoning: (show: boolean) => void;
 	showToolOutput: boolean;
 	setShowToolOutput: (show: boolean) => void;
+	memoryEnabled: boolean;
+	setMemoryEnabled: (enabled: boolean) => void;
 	setBashApprovalLevel: (level: BashApprovalLevel) => void;
 	persistPreferences: (updates: Partial<AppPreferences>) => void;
 }

package/src/state/daemon-events.ts

@@ -1,6 +1,7 @@
 import { EventEmitter } from "node:events";
 
 import type {
+	MemoryToastPreview,
 	ModelMessage,
 	TokenUsage,
 	ToolCallStatus,
@@ -32,6 +33,7 @@ export type DaemonStateEvents = {
 	subagentComplete: (toolCallId: string, success: boolean) => void;
 	responseToken: (token: string) => void;
 	stepUsage: (usage: TokenUsage) => void;
+	memorySaved: (preview: MemoryToastPreview) => void;
 	responseComplete: (fullText: string, responseMessages: ModelMessage[], usage?: TokenUsage) => void;
 	userMessage: (text: string) => void;
 	speakingStart: () => void;