@makefinks/daemon 0.1.4 → 0.2.0

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

@@ -24,6 +24,15 @@ import { REASONING_COLORS, STATE_COLORS } from "../types/theme";
 import { REASONING_ANIMATION } from "../ui/constants";
 import { debug } from "../utils/debug-logger";
 import { hasVisibleText } from "../utils/formatters";
+import {
+	INTERRUPTED_TOOL_RESULT,
+	buildInterruptedContentBlocks,
+	buildInterruptedModelMessages,
+	normalizeInterruptedToolBlockResult,
+	normalizeInterruptedToolResultOutput,
+} from "./daemon-event-handlers/interrupted-turn";
+
+export { buildInterruptedModelMessages };
 
 function getToolCategory(toolName: string): ToolCategory | "fast" | undefined {
 	if (toolName === "subagent") return "subagent";
@@ -39,30 +48,6 @@ function getToolCategory(toolName: string): ToolCategory | "fast" | undefined {
 	return undefined;
 }
 
-const INTERRUPTED_TOOL_RESULT = "Tool execution interrupted by user";
-
-function normalizeInterruptedToolBlockResult(result: unknown): unknown {
-	if (result !== undefined) return result;
-	return { success: false, error: INTERRUPTED_TOOL_RESULT };
-}
-
-function normalizeInterruptedToolResultOutput(result: unknown): ToolResultOutput {
-	if (result === undefined) {
-		return { type: "error-text", value: INTERRUPTED_TOOL_RESULT };
-	}
-
-	if (typeof result === "string") {
-		return { type: "text", value: result };
-	}
-
-	try {
-		JSON.stringify(result);
-		return { type: "json", value: result as ToolResultOutput["value"] };
-	} catch {
-		return { type: "text", value: String(result) };
-	}
-}
-
 function clearAvatarToolEffects(avatar: DaemonAvatarRenderable | null): void {
 	if (!avatar) return;
 	avatar.triggerToolComplete();
@@ -71,133 +56,6 @@ function clearAvatarToolEffects(avatar: DaemonAvatarRenderable | null): void {
 	avatar.setTypingMode(false);
 }
 
-function buildInterruptedContentBlocks(contentBlocks: ContentBlock[]): ContentBlock[] {
-	return contentBlocks.map((block) => {
-		if (block.type !== "tool") return { ...block };
-
-		const call = { ...block.call };
-		if (call.status === "running") {
-			call.status = "failed";
-			call.error = INTERRUPTED_TOOL_RESULT;
-		}
-		if (call.subagentSteps) {
-			call.subagentSteps = call.subagentSteps.map((step) =>
-				step.status === "running" ? { ...step, status: "failed" } : step
-			);
-		}
-
-		return {
-			...block,
-			call,
-			result: normalizeInterruptedToolBlockResult(block.result),
-		};
-	});
-}
-
-export function buildInterruptedModelMessages(contentBlocks: ContentBlock[]): ModelMessage[] {
-	const messages: ModelMessage[] = [];
-
-	type AssistantPart =
-		| { type: "text"; text: string }
-		| { type: "reasoning"; text: string }
-		| { type: "tool-call"; toolCallId: string; toolName: string; input: unknown };
-
-	type ToolResultPart = {
-		type: "tool-result";
-		toolCallId: string;
-		toolName: string;
-		output: ToolResultOutput;
-	};
-
-	let assistantParts: AssistantPart[] = [];
-	let toolResults: ToolResultPart[] = [];
-
-	for (const block of contentBlocks) {
-		if (block.type === "reasoning" && block.content) {
-			// Tool results must be emitted before new assistant reasoning.
-			if (toolResults.length > 0) {
-				messages.push({
-					role: "tool",
-					content: [...toolResults],
-				} as unknown as ModelMessage);
-				toolResults = [];
-			}
-
-			assistantParts.push({ type: "reasoning", text: block.content });
-			continue;
-		}
-
-		if (block.type === "text" && block.content) {
-			// Tool results must be emitted before new assistant text.
-			if (toolResults.length > 0) {
-				messages.push({
-					role: "tool",
-					content: [...toolResults],
-				} as unknown as ModelMessage);
-				toolResults = [];
-			}
-
-			assistantParts.push({ type: "text", text: block.content });
-			continue;
-		}
-
-		if (block.type === "tool") {
-			// Tool results must be emitted before a new tool call.
-			if (toolResults.length > 0) {
-				messages.push({
-					role: "tool",
-					content: [...toolResults],
-				} as unknown as ModelMessage);
-				toolResults = [];
-			}
-
-			const toolCallId = block.call.toolCallId;
-			if (!toolCallId) {
-				continue;
-			}
-
-			assistantParts.push({
-				type: "tool-call",
-				toolCallId,
-				toolName: block.call.name,
-				input: block.call.input ?? {},
-			});
-
-			// Tool calls must be emitted before their tool results.
-			if (assistantParts.length > 0) {
-				messages.push({
-					role: "assistant",
-					content: [...assistantParts],
-				} as unknown as ModelMessage);
-				assistantParts = [];
-			}
-
-			toolResults.push({
-				type: "tool-result",
-				toolCallId,
-				toolName: block.call.name,
-				output: normalizeInterruptedToolResultOutput(block.result),
-			});
-		}
-	}
-
-	if (assistantParts.length > 0) {
-		messages.push({
-			role: "assistant",
-			content: [...assistantParts],
-		} as unknown as ModelMessage);
-	}
-
-	if (toolResults.length > 0) {
-		messages.push({
-			role: "tool",
-			content: [...toolResults],
-		} as unknown as ModelMessage);
-	}
-
-	return messages;
-}
-
 function finalizePendingUserMessage(
 	prev: ConversationMessage[],
 	userText: string,
@@ -725,6 +583,8 @@ function mergeTokenUsage(prev: TokenUsage, usage: TokenUsage, isSubagent: boolea
 		subagentTotalTokens: prev.subagentTotalTokens,
 		subagentPromptTokens: prev.subagentPromptTokens,
 		subagentCompletionTokens: prev.subagentCompletionTokens,
+		latestTurnPromptTokens: usage.promptTokens,
+		latestTurnCompletionTokens: usage.completionTokens,
 	};
 }
 

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

@@ -39,6 +39,8 @@ export interface UseAppContextBuilderParams {
 		setShowHotkeysPane: React.Dispatch<React.SetStateAction<boolean>>;
 		showGroundingMenu: boolean;
 		setShowGroundingMenu: React.Dispatch<React.SetStateAction<boolean>>;
+		showUrlMenu: boolean;
+		setShowUrlMenu: React.Dispatch<React.SetStateAction<boolean>>;
 	};
 
 	device: {

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

@@ -21,6 +21,9 @@ export interface UseAppMenusReturn {
 
 	showGroundingMenu: boolean;
 	setShowGroundingMenu: React.Dispatch<React.SetStateAction<boolean>>;
+
+	showUrlMenu: boolean;
+	setShowUrlMenu: React.Dispatch<React.SetStateAction<boolean>>;
 }
 
 export function useAppMenus(): UseAppMenusReturn {
@@ -31,6 +34,7 @@ export function useAppMenus(): UseAppMenusReturn {
 	const [showSessionMenu, setShowSessionMenu] = useState(false);
 	const [showHotkeysPane, setShowHotkeysPane] = useState(false);
 	const [showGroundingMenu, setShowGroundingMenu] = useState(false);
+	const [showUrlMenu, setShowUrlMenu] = useState(false);
 
 	return {
 		showDeviceMenu,
@@ -47,5 +51,7 @@ export function useAppMenus(): UseAppMenusReturn {
 		setShowHotkeysPane,
 		showGroundingMenu,
 		setShowGroundingMenu,
+		showUrlMenu,
+		setShowUrlMenu,
 	};
 }

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

@@ -1,15 +1,11 @@
-/**
- * Hook for handling keyboard input across all application states.
- */
-
-import { useCallback } from "react";
+import { toast } from "@opentui-ui/toast/react";
 import type { KeyEvent } from "@opentui/core";
+import type { ScrollBoxRenderable } from "@opentui/core";
 import { useKeyboard } from "@opentui/react";
-import { toast } from "@opentui-ui/toast/react";
-import { COLORS } from "../ui/constants";
+import { useCallback } from "react";
 import { getDaemonManager } from "../state/daemon-state";
-import { DaemonState, type AppPreferences } from "../types";
-import type { ScrollBoxRenderable } from "@opentui/core";
+import { type AppPreferences, DaemonState } from "../types";
+import { COLORS } from "../ui/constants";
 export interface KeyboardHandlerState {
 	isOverlayOpen: boolean;
 	escPendingCancel: boolean;
@@ -27,6 +23,7 @@ export interface KeyboardHandlerActions {
 	setShowSessionMenu: (show: boolean) => void;
 	setShowHotkeysPane: (show: boolean) => void;
 	setShowGroundingMenu: (show: boolean) => void;
+	setShowUrlMenu: (show: boolean) => void;
 	setTypingInput: (input: string | ((prev: string) => string)) => void;
 	setCurrentTranscription: (text: string) => void;
 	setCurrentResponse: (text: string) => void;
@@ -46,6 +43,17 @@ export function useDaemonKeyboard(state: KeyboardHandlerState, actions: Keyboard
 	const manager = getDaemonManager();
 	const { isOverlayOpen, escPendingCancel, hasInteracted, hasGrounding } = state;
 
+	const closeAllMenus = useCallback(() => {
+		actions.setShowDeviceMenu(false);
+		actions.setShowSettingsMenu(false);
+		actions.setShowModelMenu(false);
+		actions.setShowProviderMenu(false);
+		actions.setShowSessionMenu(false);
+		actions.setShowHotkeysPane(false);
+		actions.setShowGroundingMenu(false);
+		actions.setShowUrlMenu(false);
+	}, [actions]);
+
 	const handleKeyPress = useCallback(
 		(key: KeyEvent) => {
 			const currentState = manager.state;
@@ -97,12 +105,7 @@ export function useDaemonKeyboard(state: KeyboardHandlerState, actions: Keyboard
 				currentState === DaemonState.IDLE &&
 				!hasInteracted
 			) {
-				actions.setShowModelMenu(false);
-				actions.setShowProviderMenu(false);
-				actions.setShowSessionMenu(false);
-				actions.setShowSettingsMenu(false);
-				actions.setShowGroundingMenu(false);
-				actions.setShowHotkeysPane(false);
+				closeAllMenus();
 				actions.setShowDeviceMenu(true);
 				key.preventDefault();
 				return;
@@ -114,12 +117,7 @@ export function useDaemonKeyboard(state: KeyboardHandlerState, actions: Keyboard
 				key.eventType === "press" &&
 				(currentState === DaemonState.IDLE || currentState === DaemonState.SPEAKING)
 			) {
-				actions.setShowDeviceMenu(false);
-				actions.setShowSettingsMenu(false);
-				actions.setShowModelMenu(false);
-				actions.setShowProviderMenu(false);
-				actions.setShowGroundingMenu(false);
-				actions.setShowHotkeysPane(false);
+				closeAllMenus();
 				actions.setShowSessionMenu(true);
 				key.preventDefault();
 				return;
@@ -133,12 +131,7 @@ export function useDaemonKeyboard(state: KeyboardHandlerState, actions: Keyboard
 					currentState === DaemonState.SPEAKING ||
 					currentState === DaemonState.RESPONDING)
 			) {
-				actions.setShowDeviceMenu(false);
-				actions.setShowModelMenu(false);
-				actions.setShowProviderMenu(false);
-				actions.setShowSessionMenu(false);
-				actions.setShowGroundingMenu(false);
-				actions.setShowHotkeysPane(false);
+				closeAllMenus();
 				actions.setShowSettingsMenu(true);
 				key.preventDefault();
 				return;
@@ -152,12 +145,7 @@ export function useDaemonKeyboard(state: KeyboardHandlerState, actions: Keyboard
 					currentState === DaemonState.SPEAKING ||
 					currentState === DaemonState.RESPONDING)
 			) {
-				actions.setShowDeviceMenu(false);
-				actions.setShowSettingsMenu(false);
-				actions.setShowProviderMenu(false);
-				actions.setShowSessionMenu(false);
-				actions.setShowGroundingMenu(false);
-				actions.setShowHotkeysPane(false);
+				closeAllMenus();
 				actions.setShowModelMenu(true);
 				key.preventDefault();
 				return;
@@ -169,12 +157,7 @@ export function useDaemonKeyboard(state: KeyboardHandlerState, actions: Keyboard
 				key.eventType === "press" &&
 				(currentState === DaemonState.IDLE || currentState === DaemonState.SPEAKING)
 			) {
-				actions.setShowDeviceMenu(false);
-				actions.setShowSettingsMenu(false);
-				actions.setShowModelMenu(false);
-				actions.setShowSessionMenu(false);
-				actions.setShowGroundingMenu(false);
-				actions.setShowHotkeysPane(false);
+				closeAllMenus();
 				actions.setShowProviderMenu(true);
 				key.preventDefault();
 				return;
@@ -187,17 +170,25 @@ export function useDaemonKeyboard(state: KeyboardHandlerState, actions: Keyboard
 				(currentState === DaemonState.IDLE || currentState === DaemonState.SPEAKING) &&
 				hasGrounding
 			) {
-				actions.setShowDeviceMenu(false);
-				actions.setShowSettingsMenu(false);
-				actions.setShowModelMenu(false);
-				actions.setShowProviderMenu(false);
-				actions.setShowSessionMenu(false);
-				actions.setShowHotkeysPane(false);
+				closeAllMenus();
 				actions.setShowGroundingMenu(true);
 				key.preventDefault();
 				return;
 			}
 
+			// 'U' key to open URL menu (in IDLE or SPEAKING state when hasInteracted)
+			if (
+				(key.sequence === "u" || key.sequence === "U") &&
+				key.eventType === "press" &&
+				(currentState === DaemonState.IDLE || currentState === DaemonState.SPEAKING) &&
+				hasInteracted
+			) {
+				closeAllMenus();
+				actions.setShowUrlMenu(true);
+				key.preventDefault();
+				return;
+			}
+
 			// 'N' key to start a new session (in IDLE or SPEAKING state)
 			if (
 				(key.sequence === "n" || key.sequence === "N") &&
@@ -267,12 +258,7 @@ export function useDaemonKeyboard(state: KeyboardHandlerState, actions: Keyboard
 
 			// '?' key to show hotkeys pane
 			if (key.sequence === "?" && key.eventType === "press" && currentState !== DaemonState.TYPING) {
-				actions.setShowDeviceMenu(false);
-				actions.setShowSettingsMenu(false);
-				actions.setShowModelMenu(false);
-				actions.setShowProviderMenu(false);
-				actions.setShowSessionMenu(false);
-				actions.setShowGroundingMenu(false);
+				closeAllMenus();
 				actions.setShowHotkeysPane(true);
 				key.preventDefault();
 				return;

package/src/hooks/use-grounding-menu-controller.ts

@@ -0,0 +1,51 @@
+import { useCallback, useEffect, useMemo, useState } from "react";
+import type { GroundingMap } from "../types";
+import { openUrlInBrowser } from "../utils/preferences";
+import { buildTextFragmentUrl } from "../utils/text-fragment";
+
+export function useGroundingMenuController(params: {
+	sessionId: string | null;
+	latestGroundingMap: GroundingMap | null;
+}) {
+	const { sessionId, latestGroundingMap } = params;
+	const [selectedIndex, setSelectedIndex] = useState(0);
+
+	useEffect(() => {
+		setSelectedIndex(0);
+	}, [sessionId]);
+
+	const initialIndex = useMemo(() => {
+		if (!latestGroundingMap) return 0;
+		return Math.min(selectedIndex, Math.max(0, latestGroundingMap.items.length - 1));
+	}, [latestGroundingMap, selectedIndex]);
+
+	const openGroundingSource = useCallback(
+		(idx: number) => {
+			if (!latestGroundingMap) return;
+			const item = latestGroundingMap.items[idx];
+			if (!item) return;
+			const { source } = item;
+			const url = source.textFragment
+				? buildTextFragmentUrl(source.url, { fragmentText: source.textFragment })
+				: source.url;
+			openUrlInBrowser(url);
+		},
+		[latestGroundingMap]
+	);
+
+	const handleSelect = useCallback(
+		(index: number) => {
+			setSelectedIndex(index);
+			openGroundingSource(index);
+		},
+		[openGroundingSource]
+	);
+
+	return {
+		groundingInitialIndex: initialIndex,
+		groundingSelectedIndex: selectedIndex,
+		setGroundingSelectedIndex: setSelectedIndex,
+		onGroundingSelect: handleSelect,
+		onGroundingIndexChange: setSelectedIndex,
+	};
+}

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

@@ -0,0 +1,78 @@
+import { useCallback, useMemo } from "react";
+
+export interface OverlayControllerState {
+	showDeviceMenu: boolean;
+	showSettingsMenu: boolean;
+	showModelMenu: boolean;
+	showProviderMenu: boolean;
+	showSessionMenu: boolean;
+	showHotkeysPane: boolean;
+	showGroundingMenu: boolean;
+	showUrlMenu: boolean;
+	onboardingActive: boolean;
+}
+
+export interface OverlayControllerActions {
+	setShowDeviceMenu: (show: boolean) => void;
+	setShowSettingsMenu: (show: boolean) => void;
+	setShowModelMenu: (show: boolean) => void;
+	setShowProviderMenu: (show: boolean) => void;
+	setShowSessionMenu: (show: boolean) => void;
+	setShowHotkeysPane: (show: boolean) => void;
+	setShowGroundingMenu: (show: boolean) => void;
+	setShowUrlMenu: (show: boolean) => void;
+}
+
+export function useOverlayController(state: OverlayControllerState, actions: OverlayControllerActions) {
+	const {
+		showDeviceMenu,
+		showSettingsMenu,
+		showModelMenu,
+		showProviderMenu,
+		showSessionMenu,
+		showHotkeysPane,
+		showGroundingMenu,
+		showUrlMenu,
+		onboardingActive,
+	} = state;
+
+	const isOverlayOpen = useMemo(() => {
+		return (
+			showDeviceMenu ||
+			showSettingsMenu ||
+			showModelMenu ||
+			showProviderMenu ||
+			showSessionMenu ||
+			showHotkeysPane ||
+			showGroundingMenu ||
+			showUrlMenu ||
+			onboardingActive
+		);
+	}, [
+		showDeviceMenu,
+		showSettingsMenu,
+		showModelMenu,
+		showProviderMenu,
+		showSessionMenu,
+		showHotkeysPane,
+		showGroundingMenu,
+		showUrlMenu,
+		onboardingActive,
+	]);
+
+	const closeAllOverlays = useCallback(() => {
+		actions.setShowDeviceMenu(false);
+		actions.setShowSettingsMenu(false);
+		actions.setShowModelMenu(false);
+		actions.setShowProviderMenu(false);
+		actions.setShowSessionMenu(false);
+		actions.setShowHotkeysPane(false);
+		actions.setShowGroundingMenu(false);
+		actions.setShowUrlMenu(false);
+	}, [actions]);
+
+	return {
+		isOverlayOpen,
+		closeAllOverlays,
+	};
+}

package/src/hooks/use-url-menu-items.ts

@@ -0,0 +1,19 @@
+import { useMemo } from "react";
+import type { ContentBlock, ConversationMessage, GroundingMap, UrlMenuItem } from "../types";
+import { deriveUrlMenuItems } from "../utils/derive-url-menu-items";
+
+export function useUrlMenuItems(params: {
+	conversationHistory: ConversationMessage[];
+	currentContentBlocks: ContentBlock[];
+	latestGroundingMap: GroundingMap | null;
+}): UrlMenuItem[] {
+	const { conversationHistory, currentContentBlocks, latestGroundingMap } = params;
+
+	return useMemo(() => {
+		return deriveUrlMenuItems({
+			conversationHistory,
+			currentContentBlocks,
+			latestGroundingMap,
+		});
+	}, [conversationHistory, currentContentBlocks, latestGroundingMap]);
+}

package/src/state/app-context.tsx

@@ -29,6 +29,8 @@ export interface MenuState {
 	setShowHotkeysPane: React.Dispatch<React.SetStateAction<boolean>>;
 	showGroundingMenu: boolean;
 	setShowGroundingMenu: React.Dispatch<React.SetStateAction<boolean>>;
+	showUrlMenu: boolean;
+	setShowUrlMenu: React.Dispatch<React.SetStateAction<boolean>>;
 }
 
 export interface DeviceState {

package/src/state/session-store.ts

@@ -131,6 +131,10 @@ function parseSessionUsage(raw: string): TokenUsage {
 			subagentPromptTokens: typeof parsed.subagentPromptTokens === "number" ? parsed.subagentPromptTokens : 0,
 			subagentCompletionTokens:
 				typeof parsed.subagentCompletionTokens === "number" ? parsed.subagentCompletionTokens : 0,
+			latestTurnPromptTokens:
+				typeof parsed.latestTurnPromptTokens === "number" ? parsed.latestTurnPromptTokens : undefined,
+			latestTurnCompletionTokens:
+				typeof parsed.latestTurnCompletionTokens === "number" ? parsed.latestTurnCompletionTokens : undefined,
 		};
 	} catch {
 		return { ...DEFAULT_SESSION_USAGE };

package/src/types/index.ts

@@ -42,6 +42,10 @@ export interface TokenUsage {
 	subagentTotalTokens?: number;
 	subagentPromptTokens?: number;
 	subagentCompletionTokens?: number;
+	/** Latest turn's prompt tokens (for context window % calculation) */
+	latestTurnPromptTokens?: number;
+	/** Latest turn's completion tokens (for context window % calculation) */
+	latestTurnCompletionTokens?: number;
 }
 
 /**
@@ -403,3 +407,13 @@ export interface GroundingMap {
 	createdAt: string;
 	items: GroundedStatement[];
 }
+
+export interface UrlMenuItem {
+	url: string;
+	groundedCount: number;
+	readPercent?: number;
+	highlightsCount?: number;
+	status: "ok" | "error";
+	error?: string;
+	lastSeenIndex: number;
+}