@makefinks/daemon 0.8.0 → 0.9.1

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)}`;
 		}

package/src/components/tool-layouts/layouts/url-tools.ts

@@ -1,5 +1,7 @@
-import type { ToolLayoutConfig, ToolHeader } from "../types";
+import { COLORS } from "../../../ui/constants";
 import { registerToolLayout } from "../registry";
+import type { ToolBody } from "../types";
+import type { ToolHeader, ToolLayoutConfig } from "../types";
 
 type UnknownRecord = Record<string, unknown>;
 
@@ -7,42 +9,77 @@ function isRecord(value: unknown): value is UnknownRecord {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
-interface FetchUrlsInput {
+interface FetchUrlsRequestInput {
 	url: string;
 	lineOffset?: number;
 	lineLimit?: number;
-	highlightQuery?: string;
 }
 
-function extractFetchUrlsInput(input: unknown): FetchUrlsInput | null {
+type FetchUrlsResultItem = {
+	success?: unknown;
+	url?: unknown;
+	text?: unknown;
+	lineOffset?: unknown;
+	lineLimit?: unknown;
+	remainingLines?: unknown;
+	error?: unknown;
+	title?: unknown;
+};
+
+function extractFetchUrlsRequests(input: unknown): FetchUrlsRequestInput[] | null {
+	if (!isRecord(input)) return null;
+	if (!("requests" in input) || !Array.isArray(input.requests)) return null;
+
+	const requests: FetchUrlsRequestInput[] = [];
+	for (const item of input.requests) {
+		if (!isRecord(item)) continue;
+		if (!("url" in item) || typeof item.url !== "string") continue;
+		const lineOffset =
+			"lineOffset" in item && typeof item.lineOffset === "number" ? item.lineOffset : undefined;
+		const lineLimit = "lineLimit" in item && typeof item.lineLimit === "number" ? item.lineLimit : undefined;
+		requests.push({ url: item.url, lineOffset, lineLimit });
+	}
+
+	return requests.length > 0 ? requests : null;
+}
+
+function extractRenderUrlInput(input: unknown): FetchUrlsRequestInput | null {
+	if (!input) return null;
 	if (!isRecord(input)) return null;
 	if (!("url" in input) || typeof input.url !== "string") return null;
 
 	const lineOffset =
 		"lineOffset" in input && typeof input.lineOffset === "number" ? input.lineOffset : undefined;
 	const lineLimit = "lineLimit" in input && typeof input.lineLimit === "number" ? input.lineLimit : undefined;
-	const highlightQuery =
-		"highlightQuery" in input && typeof input.highlightQuery === "string" ? input.highlightQuery : undefined;
-	return { url: input.url, lineOffset, lineLimit, highlightQuery };
+	return { url: input.url, lineOffset, lineLimit };
 }
 
-function mergeFetchUrlsDefaults(input: FetchUrlsInput | null, result?: unknown): FetchUrlsInput | null {
-	if (!input) return null;
-	if (!result || typeof result !== "object") return input;
+function extractFetchUrlsResults(result?: unknown): FetchUrlsResultItem[] | null {
+	if (!result || typeof result !== "object") return null;
+	const record = result as Record<string, unknown>;
+	const container = extractToolDataContainer(record);
+	if (!isRecord(container)) return null;
+
+	if (Array.isArray(container.results)) {
+		return container.results.filter((item): item is FetchUrlsResultItem => isRecord(item));
+	}
 
-	const resultRecord = result as Record<string, unknown>;
+	return null;
+}
+
+function mergeFetchUrlsDefaults(
+	input: FetchUrlsRequestInput,
+	result?: FetchUrlsResultItem | null
+): FetchUrlsRequestInput {
+	if (!result) return input;
 	const lineOffset =
-		input.lineOffset ?? (typeof resultRecord.lineOffset === "number" ? resultRecord.lineOffset : undefined);
-	const lineLimit =
-		input.lineLimit ?? (typeof resultRecord.lineLimit === "number" ? resultRecord.lineLimit : undefined);
+		input.lineOffset ?? (typeof result.lineOffset === "number" ? result.lineOffset : undefined);
+	const lineLimit = input.lineLimit ?? (typeof result.lineLimit === "number" ? result.lineLimit : undefined);
 
 	return { ...input, lineOffset, lineLimit };
 }
 
-function formatFetchUrlsHeader(input: FetchUrlsInput): string {
-	if (input.highlightQuery) {
-		return `highlight: "${input.highlightQuery}"`;
-	}
+function formatFetchUrlsHeader(input: FetchUrlsRequestInput): string {
 	const parts: string[] = [];
 	if (input.lineOffset !== undefined) {
 		parts.push(`lineOffset=${input.lineOffset}`);
@@ -57,6 +94,10 @@ function normalizeWhitespace(text: string): string {
 	return text.replace(/\r\n/g, "\n").replace(/\t/g, "  ");
 }
 
+function escapeXmlAttribute(value: string): string {
+	return value.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+}
+
 type ExaLikeItem = {
 	title?: unknown;
 	url?: unknown;
@@ -64,6 +105,9 @@ type ExaLikeItem = {
 	lineOffset?: unknown;
 	lineLimit?: unknown;
 	remainingLines?: unknown;
+	totalLines?: unknown;
+	error?: unknown;
+	success?: unknown;
 };
 
 function formatExaItemLabel(item: ExaLikeItem): string {
@@ -78,76 +122,69 @@ function extractToolDataContainer(result: UnknownRecord): unknown {
 }
 
 function formatFetchUrlsResult(result: unknown): string[] | null {
+	if (typeof result === "string") {
+		const lines = result.split("\n");
+		const MAX_LINES = 8;
+		if (lines.length <= MAX_LINES) return lines;
+		return [...lines.slice(0, MAX_LINES - 1), "  ..."];
+	}
 	if (!isRecord(result)) return null;
 	if (result.success === false && typeof result.error === "string") {
 		return [`error: ${result.error}`];
 	}
 	if (result.success !== true) return null;
 
-	if (Array.isArray(result.highlights)) {
-		return formatHighlightsResult(result);
-	}
+	const items = extractFetchUrlsResults(result);
+	if (!items) return null;
 
-	const data = extractToolDataContainer(result);
-	const candidate = isRecord(data) ? (data as ExaLikeItem) : {};
-	const label = formatExaItemLabel(candidate);
-	const url = typeof candidate.url === "string" ? candidate.url : "";
-	const title = typeof candidate.title === "string" ? candidate.title : "";
-	const lineOffset = typeof candidate.lineOffset === "number" ? candidate.lineOffset : undefined;
-	const lineLimit = typeof candidate.lineLimit === "number" ? candidate.lineLimit : undefined;
-	const remainingLines =
-		typeof candidate.remainingLines === "number" || candidate.remainingLines === null
-			? candidate.remainingLines
-			: undefined;
-	const rangeParts: string[] = [];
-	if (lineOffset !== undefined) rangeParts.push(`lineOffset=${lineOffset}`);
-	if (lineLimit !== undefined) rangeParts.push(`lineLimit=${lineLimit}`);
-	if (remainingLines !== undefined) {
-		rangeParts.push(remainingLines === null ? "remainingLines=unknown" : `remainingLines=${remainingLines}`);
-	}
-	const remainingSuffix = rangeParts.length > 0 ? ` (${rangeParts.join(", ")})` : "";
-
-	const headerBase = url && title ? `${label} — ${url}` : label;
-	const header = `${headerBase}${remainingSuffix}`;
-
-	const text = typeof candidate.text === "string" ? candidate.text : "";
-	if (!text.trim()) return [header];
-
-	const MAX_LINES = 4;
+	const lines: string[] = ["<fetchUrls>"];
+	const MAX_LINES = 2;
 	const MAX_CHARS = 160;
-	const snippet = normalizeWhitespace(text)
-		.replace(/\n{3,}/g, "\n\n")
-		.trim()
-		.split("\n")
-		.slice(0, MAX_LINES)
-		.map((l) => (l.length > MAX_CHARS ? `${l.slice(0, MAX_CHARS - 1)}…` : l));
-
-	return [header, ...snippet];
-}
+	const maxItems = 3;
+
+	for (const item of items.slice(0, maxItems)) {
+		const candidate = item as ExaLikeItem;
+		const url = typeof candidate.url === "string" ? candidate.url : "";
+		if (!url) continue;
+
+		const attributes: string[] = [`href="${escapeXmlAttribute(url)}"`];
+		if (typeof candidate.lineOffset === "number") attributes.push(`lineOffset="${candidate.lineOffset}"`);
+		if (typeof candidate.lineLimit === "number") attributes.push(`lineLimit="${candidate.lineLimit}"`);
+		if (typeof candidate.totalLines === "number") attributes.push(`totalLines="${candidate.totalLines}"`);
+		if (typeof candidate.remainingLines === "number") {
+			attributes.push(`remainingLines="${candidate.remainingLines}"`);
+		} else if (candidate.remainingLines === null) {
+			attributes.push(`remainingLines="unknown"`);
+		}
 
-function formatHighlightsResult(result: UnknownRecord): string[] {
-	const highlights = result.highlights as unknown[];
-	const highlightQuery = typeof result.highlightQuery === "string" ? result.highlightQuery : "";
-	const count = highlights.length;
+		if (candidate.success === false && typeof candidate.error === "string") {
+			attributes.push(`error="${escapeXmlAttribute(candidate.error)}"`);
+			lines.push(`  <url ${attributes.join(" ")} />`);
+			continue;
+		}
 
-	const lines: string[] = [`${count} highlight${count !== 1 ? "s" : ""} for "${highlightQuery}"`];
+		const text = typeof candidate.text === "string" ? candidate.text : "";
+		if (!text.trim()) {
+			lines.push(`  <url ${attributes.join(" ")} />`);
+			continue;
+		}
 
-	const MAX_HIGHLIGHTS = 3;
-	const MAX_CHARS = 120;
+		const snippetLines = normalizeWhitespace(text)
+			.replace(/\n{3,}/g, "\n\n")
+			.trim()
+			.split("\n")
+			.slice(0, MAX_LINES)
+			.map((l) => (l.length > MAX_CHARS ? `${l.slice(0, MAX_CHARS - 1)}…` : l));
 
-	highlights.slice(0, MAX_HIGHLIGHTS).forEach((h, idx) => {
-		if (typeof h === "string") {
-			const clean = h.replace(/\n+/g, " ").trim();
-			const truncated = clean.length > MAX_CHARS ? `${clean.slice(0, MAX_CHARS - 1)}…` : clean;
-			lines.push(`  ${idx + 1}. "${truncated}"`);
+		lines.push(`  <url ${attributes.join(" ")}>`);
+		for (const line of snippetLines) {
+			lines.push(`    ${escapeXmlAttribute(line)}`);
 		}
-	});
-
-	if (highlights.length > MAX_HIGHLIGHTS) {
-		lines.push(`  ...and ${highlights.length - MAX_HIGHLIGHTS} more`);
+		lines.push("  </url>");
 	}
 
-	return lines;
+	lines.push("</fetchUrls>");
+	return lines.length > 2 ? lines : null;
 }
 
 function formatRenderUrlResult(result: unknown): string[] | null {
@@ -188,15 +225,38 @@ export const fetchUrlsLayout: ToolLayoutConfig = {
 	abbreviation: "fetch",
 
 	getHeader: (input, result): ToolHeader | null => {
-		const urlInput = mergeFetchUrlsDefaults(extractFetchUrlsInput(input), result);
-		if (!urlInput) return null;
-		const headerSuffix = formatFetchUrlsHeader(urlInput);
+		const requests = extractFetchUrlsRequests(input);
+		if (!requests) return null;
+		const items = extractFetchUrlsResults(result);
+		const firstResult = items?.[0] ?? null;
+		const first = mergeFetchUrlsDefaults(requests[0] as FetchUrlsRequestInput, firstResult);
+		if (requests.length === 1) {
+			const headerSuffix = formatFetchUrlsHeader(first);
+			return {
+				primary: first.url,
+				secondary: headerSuffix || undefined,
+			};
+		}
+
 		return {
-			primary: urlInput.url,
-			secondary: headerSuffix || undefined,
+			primary: `${requests.length} urls`,
 		};
 	},
 
+	getBody: (input, result): ToolBody | null => {
+		const requests = extractFetchUrlsRequests(input);
+		if (!requests) return null;
+		if (requests.length === 1) return null;
+		const items = extractFetchUrlsResults(result) ?? [];
+		const lines = requests.map((request, index) => {
+			const merged = mergeFetchUrlsDefaults(request, items[index] ?? null);
+			const suffix = formatFetchUrlsHeader(merged);
+			const text = suffix ? `${merged.url} ${suffix}` : merged.url;
+			return { text, color: COLORS.REASONING_DIM };
+		});
+		return { lines };
+	},
+
 	formatResult: formatFetchUrlsResult,
 };
 
@@ -204,11 +264,15 @@ export const renderUrlLayout: ToolLayoutConfig = {
 	abbreviation: "render",
 
 	getHeader: (input, result): ToolHeader | null => {
-		const urlInput = mergeFetchUrlsDefaults(extractFetchUrlsInput(input), result);
+		const urlInput = extractRenderUrlInput(input);
 		if (!urlInput) return null;
-		const headerSuffix = formatFetchUrlsHeader(urlInput);
+		const merged = mergeFetchUrlsDefaults(
+			urlInput,
+			isRecord(result) ? (result as FetchUrlsResultItem) : null
+		);
+		const headerSuffix = formatFetchUrlsHeader(merged);
 		return {
-			primary: urlInput.url,
+			primary: merged.url,
 			secondary: headerSuffix || undefined,
 		};
 	},

package/src/hooks/keyboard-handlers.ts

@@ -355,42 +355,33 @@ 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;
-				const currentIndex = speeds.indexOf(currentSpeed);
-				const nextIndex = (currentIndex + 1) % speeds.length;
-				const nextSpeed = speeds[nextIndex] ?? 1.0;
-				ctx.manager.speechSpeed = nextSpeed;
-				ctx.setSpeechSpeed(nextSpeed);
-				ctx.persistPreferences({ speechSpeed: nextSpeed });
-				key.preventDefault();
-				return true;
-			}
-			settingIdx++;
+		if (ctx.selectedIdx === settingIdx) {
+			const next = !ctx.manager.memoryEnabled;
+			ctx.manager.memoryEnabled = next;
+			ctx.setMemoryEnabled(next);
+			ctx.persistPreferences({ memoryEnabled: next });
+			key.preventDefault();
+			return true;
 		}
-		if (ctx.interactionMode !== "voice") {
-			if (ctx.selectedIdx === settingIdx) {
-				const next = !ctx.manager.memoryEnabled;
-				ctx.manager.memoryEnabled = next;
-				ctx.setMemoryEnabled(next);
-				ctx.persistPreferences({ memoryEnabled: next });
+		settingIdx++;
+
+		if (ctx.selectedIdx === settingIdx) {
+			if (ctx.interactionMode !== "voice") {
 				key.preventDefault();
 				return true;
 			}
-			settingIdx++;
+			const speeds: SpeechSpeed[] = [1.0, 1.25, 1.5, 1.75, 2.0];
+			const currentSpeed = ctx.manager.speechSpeed;
+			const currentIndex = speeds.indexOf(currentSpeed);
+			const nextIndex = (currentIndex + 1) % speeds.length;
+			const nextSpeed = speeds[nextIndex] ?? 1.0;
+			ctx.manager.speechSpeed = nextSpeed;
+			ctx.setSpeechSpeed(nextSpeed);
+			ctx.persistPreferences({ speechSpeed: nextSpeed });
+			key.preventDefault();
+			return true;
 		}
+		settingIdx++;
 
 		if (ctx.selectedIdx === settingIdx) {
 			const next = !ctx.showFullReasoning;

package/src/types/index.ts

@@ -447,7 +447,6 @@ export interface UrlMenuItem {
 	url: string;
 	groundedCount: number;
 	readPercent?: number;
-	highlightsCount?: number;
 	status: "ok" | "error";
 	error?: string;
 	lastSeenIndex: number;