@nghyane/arcane 0.1.13 → 0.1.15

package/src/tools/fetch.ts

@@ -6,25 +6,20 @@ import { Text } from "@nghyane/arcane-tui";
 import { ptree } from "@nghyane/arcane-utils";
 import { type Static, Type } from "@sinclair/typebox";
 import { parse as parseHtml } from "node-html-parser";
-import { renderPromptTemplate } from "../config/prompt-templates";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
-import { type Theme, theme } from "../modes/theme/theme";
-import fetchDescription from "../prompts/tools/fetch.md" with { type: "text" };
 import { DEFAULT_MAX_BYTES, truncateHead } from "../session/streaming-output";
+import { type Theme, theme } from "../theme/theme";
 import { renderStatusLine } from "../tui";
-import { CachedOutputBlock } from "../tui/output-block";
+import { formatCount } from "../ui/render-utils";
 import { ensureTool } from "../utils/tools-manager";
 import { specialHandlers } from "../web/scrapers";
 import type { RenderResult } from "../web/scrapers/types";
 import { finalizeOutput, loadPage, MAX_OUTPUT_CHARS } from "../web/scrapers/types";
 import { convertWithMarkitdown, fetchBinary } from "../web/scrapers/utils";
 import type { ToolSession } from ".";
-import { applyListLimit } from "./list-limit";
-import type { OutputMeta } from "./output-meta";
+import { type OutputMeta, toolResult } from "./output-meta";
 import { allocateOutputArtifact } from "./output-utils";
-import { formatExpandHint } from "./render-utils";
 import { ToolAbortError } from "./tool-errors";
-import { toolResult } from "./tool-result";
 
 // =============================================================================
 // Types and Constants
@@ -838,8 +833,8 @@ async function renderUrl(url: string, timeout: number, raw: boolean, signal?: Ab
 
 const fetchSchema = Type.Object({
 	url: Type.String({ description: "URL to fetch" }),
-	timeout: Type.Optional(Type.Number({ description: "Timeout in seconds (default: 20)" })),
-	raw: Type.Optional(Type.Boolean({ description: "Return raw HTML without transforms" })),
+	timeout: Type.Optional(Type.Number({ description: "Timeout in seconds" })),
+	raw: Type.Optional(Type.Boolean({ description: "Return raw content without readability extraction" })),
 });
 
 export interface FetchToolDetails {
@@ -852,15 +847,13 @@ export interface FetchToolDetails {
 	meta?: OutputMeta;
 }
 
-export class FetchTool implements AgentTool<typeof fetchSchema, FetchToolDetails> {
+export class FetchTool implements AgentTool<typeof fetchSchema, FetchToolDetails, Theme> {
 	readonly name = "fetch";
 	readonly label = "Fetch";
-	readonly description: string;
+	description = "Fetch a URL and return its content";
 	readonly parameters = fetchSchema;
 
-	constructor(private readonly session: ToolSession) {
-		this.description = renderPromptTemplate(fetchDescription);
-	}
+	constructor(private readonly session: ToolSession) {}
 
 	async execute(
 		_toolCallId: string,
@@ -936,11 +929,10 @@ export class FetchTool implements AgentTool<typeof fetchSchema, FetchToolDetails
 
 		return resultBuilder.done();
 	}
-}
 
-// =============================================================================
-// TUI Rendering
-// =============================================================================
+	renderCall = renderFetchCall;
+	renderResult = renderFetchResult;
+}
 
 /** Truncate text to max length with ellipsis */
 function truncate(text: string, maxLen: number, ellipsis: string): string {
@@ -965,7 +957,7 @@ function countNonEmptyLines(text: string): number {
 }
 
 /** Render fetch call (URL preview) */
-export function renderFetchCall(
+function renderFetchCall(
 	args: { url?: string; timeout?: number; raw?: boolean },
 	_options: RenderResultOptions,
 	uiTheme: Theme = theme,
@@ -982,110 +974,28 @@ export function renderFetchCall(
 }
 
 /** Render fetch result with tree-based layout */
-export function renderFetchResult(
+function renderFetchResult(
 	result: { content: Array<{ type: string; text?: string }>; details?: FetchToolDetails },
-	options: RenderResultOptions,
+	_options: RenderResultOptions,
 	uiTheme: Theme = theme,
 ): Component {
 	const details = result.details;
-
 	if (!details) {
 		return new Text(uiTheme.fg("error", "No response data"), 0, 0);
 	}
 
 	const domain = getDomain(details.finalUrl);
-	const path = truncate(details.finalUrl.replace(/^https?:\/\/[^/]+/, ""), 50, "…");
-	const hasRedirect = details.url !== details.finalUrl;
-	const hasNotes = details.notes.length > 0;
-	const truncation = details.meta?.truncation;
-	const truncated = Boolean(details.truncated || truncation);
-
-	const header = renderStatusLine(
-		{
-			icon: truncated ? "warning" : "success",
-			title: "Fetch",
-			description: `${domain}${path ? ` ${path}` : ""}`,
-		},
-		uiTheme,
-	);
-
+	const truncated = Boolean(details.truncated || details.meta?.truncation);
 	const contentText = result.content[0]?.text ?? "";
-	const contentBody = contentText.includes("---\n\n")
-		? contentText.split("---\n\n").slice(1).join("---\n\n")
-		: contentText;
-	const lineCount = countNonEmptyLines(contentBody);
-	const charCount = contentBody.trim().length;
-	const contentLines = contentBody.split("\n").filter(l => l.trim());
-
-	const metadataLines: string[] = [
-		`${uiTheme.fg("muted", "Content-Type:")} ${details.contentType || "unknown"}`,
-		`${uiTheme.fg("muted", "Method:")} ${details.method}`,
-	];
-	if (hasRedirect) {
-		metadataLines.push(`${uiTheme.fg("muted", "Final URL:")} ${uiTheme.fg("mdLinkUrl", details.finalUrl)}`);
-	}
-	const lineLabel = `${lineCount} line${lineCount === 1 ? "" : "s"}`;
-	metadataLines.push(`${uiTheme.fg("muted", "Lines:")} ${lineLabel}`);
-	metadataLines.push(`${uiTheme.fg("muted", "Chars:")} ${charCount}`);
-	if (truncated) {
-		metadataLines.push(uiTheme.fg("warning", `${uiTheme.status.warning} Output truncated`));
-		if (truncation?.artifactId) {
-			metadataLines.push(uiTheme.fg("warning", `Full output: artifact://${truncation.artifactId}`));
-		}
-	}
-	if (hasNotes) {
-		metadataLines.push(`${uiTheme.fg("muted", "Notes:")} ${details.notes.join("; ")}`);
-	}
+	const lineCount = countNonEmptyLines(contentText);
 
-	const outputBlock = new CachedOutputBlock();
-	let lastExpanded: boolean | undefined;
-	let contentPreviewLines: string[] | undefined;
-
-	return {
-		render: (width: number) => {
-			const { expanded } = options;
-
-			if (contentPreviewLines === undefined || lastExpanded !== expanded) {
-				const previewLimit = expanded ? 12 : 3;
-				const previewList = applyListLimit(contentLines, { headLimit: previewLimit });
-				const previewLines = previewList.items.map(line => truncate(line.trimEnd(), 120, "…"));
-				const remaining = Math.max(0, contentLines.length - previewLines.length);
-				contentPreviewLines =
-					previewLines.length > 0
-						? previewLines.map(line => uiTheme.fg("dim", line))
-						: [uiTheme.fg("dim", "(no content)")];
-				if (remaining > 0) {
-					const hint = formatExpandHint(uiTheme, expanded, true);
-					contentPreviewLines.push(uiTheme.fg("muted", `… ${remaining} more lines${hint ? ` ${hint}` : ""}`));
-				}
-				lastExpanded = expanded;
-				outputBlock.invalidate();
-			}
+	const meta: string[] = [];
+	if (lineCount > 0) meta.push(formatCount("line", lineCount));
+	if (truncated) meta.push(uiTheme.fg("warning", "truncated"));
 
-			return outputBlock.render(
-				{
-					header,
-					state: truncated ? "warning" : "success",
-					sections: [
-						{ label: uiTheme.fg("toolTitle", "Metadata"), lines: metadataLines },
-						{ label: uiTheme.fg("toolTitle", "Content Preview"), lines: contentPreviewLines },
-					],
-					width,
-					applyBg: false,
-				},
-				uiTheme,
-			);
-		},
-		invalidate: () => {
-			outputBlock.invalidate();
-			contentPreviewLines = undefined;
-			lastExpanded = undefined;
-		},
-	};
+	return new Text(
+		renderStatusLine({ icon: truncated ? "warning" : "success", title: "Fetch", description: domain, meta }, uiTheme),
+		0,
+		0,
+	);
 }
-
-export const fetchToolRenderer = {
-	renderCall: renderFetchCall,
-	renderResult: renderFetchResult,
-	mergeCallAndResult: true,
-};

package/src/tools/find.ts

@@ -7,32 +7,21 @@ import { Text } from "@nghyane/arcane-tui";
 import { isEnoent, untilAborted } from "@nghyane/arcane-utils";
 import type { Static } from "@sinclair/typebox";
 import { Type } from "@sinclair/typebox";
-import { renderPromptTemplate } from "../config/prompt-templates";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
-import type { Theme } from "../modes/theme/theme";
-import findDescription from "../prompts/tools/find.md" with { type: "text" };
 import { type TruncationResult, truncateHead } from "../session/streaming-output";
-import {
-	Ellipsis,
-	Hasher,
-	type RenderCache,
-	renderFileList,
-	renderStatusLine,
-	renderTreeList,
-	truncateToWidth,
-} from "../tui";
+import type { Theme } from "../theme/theme";
+import { renderStatusLine } from "../tui";
+import { formatCount, formatEmptyMessage, formatErrorMessage } from "../ui/render-utils";
 import type { ToolSession } from ".";
 import { applyListLimit } from "./list-limit";
-import type { OutputMeta } from "./output-meta";
+import { type OutputMeta, toolResult } from "./output-meta";
 import { resolveToCwd } from "./path-utils";
-import { formatCount, formatEmptyMessage, formatErrorMessage, PREVIEW_LIMITS } from "./render-utils";
 import { ToolAbortError, ToolError, throwIfAborted } from "./tool-errors";
-import { toolResult } from "./tool-result";
 
 const findSchema = Type.Object({
-	pattern: Type.String({ description: "Glob pattern, e.g. '*.ts', 'src/**/*.json', 'lib/*.tsx'" }),
-	hidden: Type.Optional(Type.Boolean({ description: "Include hidden files and directories (default: true)" })),
-	limit: Type.Optional(Type.Number({ description: "Max results (default: 1000)" })),
+	pattern: Type.String({ description: "Glob pattern to match file paths" }),
+	hidden: Type.Optional(Type.Boolean({ description: "Include hidden files and directories" })),
+	limit: Type.Optional(Type.Number({ description: "Max number of results to return" })),
 });
 
 export type FindToolInput = Static<typeof findSchema>;
@@ -122,10 +111,10 @@ export interface FindToolOptions {
 	operations?: FindOperations;
 }
 
-export class FindTool implements AgentTool<typeof findSchema, FindToolDetails> {
+export class FindTool implements AgentTool<typeof findSchema, FindToolDetails, Theme> {
 	readonly name = "find";
 	readonly label = "Find";
-	readonly description: string;
+	description = "Find files by glob pattern";
 	readonly parameters = findSchema;
 
 	readonly #customOps?: FindOperations;
@@ -135,7 +124,6 @@ export class FindTool implements AgentTool<typeof findSchema, FindToolDetails> {
 		options?: FindToolOptions,
 	) {
 		this.#customOps = options?.operations;
-		this.description = renderPromptTemplate(findDescription);
 	}
 
 	async execute(
@@ -392,21 +380,7 @@ export class FindTool implements AgentTool<typeof findSchema, FindToolDetails> {
 			return resultBuilder.done();
 		});
 	}
-}
-
-// =============================================================================
-// TUI Renderer
-// =============================================================================
 
-interface FindRenderArgs {
-	pattern: string;
-	limit?: number;
-}
-
-const COLLAPSED_LIST_LIMIT = PREVIEW_LIMITS.COLLAPSED_ITEMS;
-
-export const findToolRenderer = {
-	inline: true,
 	renderCall(args: FindRenderArgs, _options: RenderResultOptions, uiTheme: Theme): Component {
 		const meta: string[] = [];
 		if (args.limit !== undefined) meta.push(`limit:${args.limit}`);
@@ -416,11 +390,11 @@ export const findToolRenderer = {
 			uiTheme,
 		);
 		return new Text(text, 0, 0);
-	},
+	}
 
 	renderResult(
 		result: { content: Array<{ type: string; text?: string }>; details?: FindToolDetails; isError?: boolean },
-		options: RenderResultOptions,
+		_options: RenderResultOptions,
 		uiTheme: Theme,
 		args?: FindRenderArgs,
 	): Component {
@@ -431,110 +405,52 @@ export const findToolRenderer = {
 			return new Text(formatErrorMessage(errorText, uiTheme), 0, 0);
 		}
 
-		const hasDetailedData = details?.fileCount !== undefined;
-		const textContent = result.content?.find(c => c.type === "text")?.text;
+		const fileCount = details?.fileCount ?? 0;
 
-		if (!hasDetailedData) {
-			if (
-				!textContent ||
-				textContent.includes("No files matching") ||
-				textContent.includes("No files found") ||
-				textContent.trim() === ""
-			) {
+		if (fileCount === 0) {
+			const textContent = result.content?.find(c => c.type === "text")?.text;
+			if (!textContent || textContent.includes("No files") || textContent.trim() === "") {
 				return new Text(formatEmptyMessage("No files found", uiTheme), 0, 0);
 			}
-
 			const lines = textContent.split("\n").filter(l => l.trim());
-			const header = renderStatusLine(
-				{
-					icon: "success",
-					title: "Find",
-					description: args?.pattern,
-					meta: [formatCount("file", lines.length)],
-				},
-				uiTheme,
+			return new Text(
+				renderStatusLine(
+					{
+						icon: "success",
+						title: "Find",
+						description: args?.pattern,
+						meta: [formatCount("file", lines.length)],
+					},
+					uiTheme,
+				),
+				0,
+				0,
 			);
-			let cached: RenderCache | undefined;
-			return {
-				render(width: number): string[] {
-					const { expanded } = options;
-					const key = new Hasher().bool(expanded).u32(width).digest();
-					if (cached?.key === key) return cached.lines;
-					const listLines = renderTreeList(
-						{
-							items: lines,
-							expanded,
-							maxCollapsed: COLLAPSED_LIST_LIMIT,
-							itemType: "file",
-							renderItem: line => uiTheme.fg("accent", line),
-						},
-						uiTheme,
-					);
-					const result = [header, ...listLines].map(l => truncateToWidth(l, width, Ellipsis.Omit));
-					cached = { key, lines: result };
-					return result;
-				},
-				invalidate() {
-					cached = undefined;
-				},
-			};
 		}
 
-		const fileCount = details?.fileCount ?? 0;
-		const truncation = details?.truncation ?? details?.meta?.truncation;
-		const limits = details?.meta?.limits;
-		const truncated = Boolean(details?.truncated || truncation || details?.resultLimitReached || limits?.resultLimit);
-		const files = details?.files ?? [];
-
-		if (fileCount === 0) {
-			const header = renderStatusLine(
-				{ icon: "warning", title: "Find", description: args?.pattern, meta: ["0 files"] },
-				uiTheme,
-			);
-			return new Text([header, formatEmptyMessage("No files found", uiTheme)].join("\n"), 0, 0);
-		}
+		const truncated = Boolean(
+			details?.truncated ||
+				details?.truncation ||
+				details?.meta?.truncation ||
+				details?.resultLimitReached ||
+				details?.meta?.limits?.resultLimit,
+		);
 		const meta: string[] = [formatCount("file", fileCount)];
 		if (details?.scopePath) meta.push(`in ${details.scopePath}`);
 		if (truncated) meta.push(uiTheme.fg("warning", "truncated"));
-		const header = renderStatusLine(
-			{ icon: truncated ? "warning" : "success", title: "Find", description: args?.pattern, meta },
-			uiTheme,
-		);
 
-		const truncationReasons: string[] = [];
-		if (details?.resultLimitReached) truncationReasons.push(`limit ${details.resultLimitReached} results`);
-		if (limits?.resultLimit) truncationReasons.push(`limit ${limits.resultLimit.reached} results`);
-		if (truncation) truncationReasons.push(truncation.truncatedBy === "lines" ? "line limit" : "size limit");
-		const artifactId = truncation && "artifactId" in truncation ? truncation.artifactId : undefined;
-		if (artifactId) truncationReasons.push(`full output: artifact://${artifactId}`);
-
-		const extraLines: string[] = [];
-		if (truncationReasons.length > 0) {
-			extraLines.push(uiTheme.fg("warning", `truncated: ${truncationReasons.join(", ")}`));
-		}
+		return new Text(
+			renderStatusLine(
+				{ icon: truncated ? "warning" : "success", title: "Find", description: args?.pattern, meta },
+				uiTheme,
+			),
+			0,
+			0,
+		);
+	}
+}
 
-		let cached: RenderCache | undefined;
-		return {
-			render(width: number): string[] {
-				const { expanded } = options;
-				const key = new Hasher().bool(expanded).u32(width).digest();
-				if (cached?.key === key) return cached.lines;
-				const fileLines = renderFileList(
-					{
-						files: files.map(entry => ({ path: entry, isDirectory: entry.endsWith("/") })),
-						expanded,
-						maxCollapsed: COLLAPSED_LIST_LIMIT,
-					},
-					uiTheme,
-				);
-				const result = [header, ...fileLines, ...extraLines].map(l => truncateToWidth(l, width, Ellipsis.Omit));
-				cached = { key, lines: result };
-				return result;
-			},
-			invalidate() {
-				cached = undefined;
-			},
-		};
-	},
-	mergeCallAndResult: true,
-};
+interface FindRenderArgs {
+	pattern: string;
+	limit?: number;
+}

package/src/tools/gemini-image.ts

@@ -4,9 +4,7 @@ import { getAntigravityHeaders, getEnvApiKey, StringEnum } from "@nghyane/arcane
 import { $env, ptree, readSseJson, Snowflake, untilAborted } from "@nghyane/arcane-utils";
 import { type Static, Type } from "@sinclair/typebox";
 import type { ModelRegistry } from "../config/model-registry";
-import { renderPromptTemplate } from "../config/prompt-templates";
 import type { CustomTool } from "../extensibility/custom-tools/types";
-import geminiImageDescription from "../prompts/tools/gemini-image.md" with { type: "text" };
 import { detectSupportedImageMimeTypeFromFile } from "../utils/mime";
 import { resolveReadPath } from "./path-utils";
 
@@ -115,9 +113,9 @@ const baseImageSchema = Type.Object(
 	{ additionalProperties: false },
 );
 
-export const geminiImageSchema = baseImageSchema;
-export type GeminiImageParams = Static<typeof geminiImageSchema>;
-export type GeminiResponseModality = Static<typeof responseModalitySchema>;
+const geminiImageSchema = baseImageSchema;
+type GeminiImageParams = Static<typeof geminiImageSchema>;
+type GeminiResponseModality = Static<typeof responseModalitySchema>;
 
 /**
  * Assembles a structured prompt from the provided parameters.
@@ -612,10 +610,10 @@ async function parseAntigravitySseForImage(response: Response, signal?: AbortSig
 	return { images, text: textParts, usage };
 }
 
-export const geminiImageTool: CustomTool<typeof geminiImageSchema, GeminiImageToolDetails> = {
+const geminiImageTool: CustomTool<typeof geminiImageSchema, GeminiImageToolDetails> = {
 	name: "generate_image",
 	label: "GenerateImage",
-	description: renderPromptTemplate(geminiImageDescription),
+	description: "",
 	parameters: geminiImageSchema,
 	async execute(_toolCallId, params, _onUpdate, ctx, signal) {
 		return untilAborted(signal, async () => {
@@ -897,11 +895,3 @@ export async function getGeminiImageTools(): Promise<
 	if (!apiKey) return [];
 	return [geminiImageTool];
 }
-
-export async function getGeminiImageToolsWithRegistry(
-	modelRegistry: ModelRegistry,
-): Promise<Array<CustomTool<typeof geminiImageSchema, GeminiImageToolDetails>>> {
-	const apiKey = await findImageApiKey(modelRegistry);
-	if (!apiKey) return [];
-	return [geminiImageTool];
-}