@nghyane/arcane 0.1.13 → 0.1.15

package/src/config/settings-schema.ts

@@ -262,15 +262,6 @@ export const SETTINGS_SCHEMA = {
 			description: "Rewrite tool call arguments to normalized format in session history",
 		},
 	},
-	repeatToolDescriptions: {
-		type: "boolean",
-		default: false,
-		ui: {
-			tab: "agent",
-			label: "Repeat tool descriptions",
-			description: "Render full tool descriptions in the system prompt instead of a tool name list",
-		},
-	},
 	readLineNumbers: {
 		type: "boolean",
 		default: false,
@@ -397,6 +388,29 @@ export const SETTINGS_SCHEMA = {
 	},
 	"retry.baseDelayMs": { type: "number", default: 2000 },
 
+	// ─────────────────────────────────────────────────────────────────────────
+	// Verification loop settings
+	// ─────────────────────────────────────────────────────────────────────────
+	"verification.autoCheck": {
+		type: "boolean",
+		default: true,
+		ui: {
+			tab: "agent",
+			label: "Auto-verify changes",
+			description: "Automatically remind agent to verify changes before completing",
+		},
+	},
+	"verification.maxReminders": {
+		type: "number",
+		default: 2,
+		ui: {
+			tab: "agent",
+			label: "Verification max reminders",
+			description: "Maximum verification reminders before giving up",
+			submenu: true,
+		},
+	},
+
 	// ─────────────────────────────────────────────────────────────────────────
 	// Todo completion settings
 	// ─────────────────────────────────────────────────────────────────────────
@@ -469,6 +483,15 @@ export const SETTINGS_SCHEMA = {
 		default: true,
 		ui: { tab: "tools", label: "Enable Fetch", description: "Enable the fetch tool for URL fetching" },
 	},
+	"github.enabled": {
+		type: "boolean",
+		default: true,
+		ui: {
+			tab: "tools",
+			label: "Enable GitHub",
+			description: "Enable the GitHub API tool for repository exploration",
+		},
+	},
 	"librarian.enabled": {
 		type: "boolean",
 		default: true,
@@ -488,15 +511,6 @@ export const SETTINGS_SCHEMA = {
 		default: true,
 		ui: { tab: "tools", label: "Enable LSP", description: "Enable the lsp tool for language server protocol" },
 	},
-	"calc.enabled": {
-		type: "boolean",
-		default: false,
-		ui: {
-			tab: "tools",
-			label: "Enable Calculator",
-			description: "Enable the calculator tool for basic calculations",
-		},
-	},
 	"browser.enabled": {
 		type: "boolean",
 		default: true,
@@ -515,47 +529,10 @@ export const SETTINGS_SCHEMA = {
 			description: "Launch browser in headless mode (disable to show browser UI)",
 		},
 	},
-	"tools.intentTracing": {
-		type: "boolean",
-		default: true,
-		ui: {
-			tab: "tools",
-			label: "Intent tracing",
-			description: "Ask the agent to describe the intent of each tool call before executing it",
-		},
-	},
 
 	// ─────────────────────────────────────────────────────────────────────────
 	// Task tool settings
 	// ─────────────────────────────────────────────────────────────────────────
-	"task.isolation.enabled": {
-		type: "boolean",
-		default: false,
-		ui: {
-			tab: "tools",
-			label: "Task isolation",
-			description: "Run subagents in isolated git worktrees",
-			submenu: true,
-		},
-	},
-	"task.maxConcurrency": {
-		type: "number",
-		default: 32,
-		ui: {
-			tab: "tools",
-			label: "Task max concurrency",
-			description: "Concurrent limit for subagents",
-			submenu: true,
-		},
-	},
-	"task.disabledAgents": {
-		type: "array",
-		default: [] as string[],
-	},
-	"task.agentModelOverrides": {
-		type: "record",
-		default: {} as Record<string, string>,
-	},
 
 	// ─────────────────────────────────────────────────────────────────────────
 	// Startup settings
@@ -737,19 +714,6 @@ export const SETTINGS_SCHEMA = {
 		ui: { tab: "services", label: "Exa websets", description: "Webset management and enrichment tools" },
 	},
 
-	// ─────────────────────────────────────────────────────────────────────────
-	// Code Mode settings
-	// ─────────────────────────────────────────────────────────────────────────
-	"codemode.enabled": {
-		type: "boolean",
-		default: true,
-		ui: {
-			tab: "agent",
-			label: "Code Mode",
-			description: "Replace tool-calling with code generation (LLM writes JS to orchestrate tools)",
-		},
-	},
-
 	// Bash interceptor settings
 	// ─────────────────────────────────────────────────────────────────────────
 	"bash.virtualTerminal": {
@@ -963,16 +927,6 @@ export const SETTINGS_SCHEMA = {
 		},
 	},
 
-	// ─────────────────────────────────────────────────────────────────────────
-	// Commit settings (no UI - advanced)
-	// ─────────────────────────────────────────────────────────────────────────
-	"commit.mapReduceEnabled": { type: "boolean", default: true },
-	"commit.mapReduceMinFiles": { type: "number", default: 4 },
-	"commit.mapReduceMaxFileTokens": { type: "number", default: 50000 },
-	"commit.mapReduceTimeoutMs": { type: "number", default: 120000 },
-	"commit.mapReduceMaxConcurrency": { type: "number", default: 5 },
-	"commit.changelogMaxDiffChars": { type: "number", default: 120000 },
-
 	// ─────────────────────────────────────────────────────────────────────────
 	// Thinking budgets (no UI - advanced)
 	// ─────────────────────────────────────────────────────────────────────────
@@ -1148,15 +1102,6 @@ export interface SkillsSettings {
 	includeSkills?: string[];
 }
 
-export interface CommitSettings {
-	mapReduceEnabled: boolean;
-	mapReduceMinFiles: number;
-	mapReduceMaxFileTokens: number;
-	mapReduceTimeoutMs: number;
-	mapReduceMaxConcurrency: number;
-	changelogMaxDiffChars: number;
-}
-
 export interface TtsrSettings {
 	enabled: boolean;
 	contextMode: "discard" | "keep";
@@ -1214,7 +1159,6 @@ export interface GroupTypeMap {
 	memories: MemoriesSettings;
 	branchSummary: BranchSummarySettings;
 	skills: SkillsSettings;
-	commit: CommitSettings;
 	ttsr: TtsrSettings;
 	exa: ExaSettings;
 	statusLine: StatusLineSettings;

package/src/config/settings.ts

@@ -19,9 +19,9 @@ import { YAML } from "bun";
 import { type Settings as SettingsCapabilityItem, settingsCapability } from "../capability/settings";
 import type { ModelRole } from "../config/model-registry";
 import { loadCapability } from "../discovery";
-import { isLightTheme, setAutoThemeMapping, setColorBlindMode, setSymbolPreset } from "../modes/theme/theme";
 import { type EditMode, normalizeEditMode } from "../patch";
 import { AgentStorage } from "../session/agent-storage";
+import { isLightTheme, setAutoThemeMapping, setColorBlindMode, setSymbolPreset } from "../theme/theme";
 import { withFileLock } from "./file-lock";
 import {
 	type BashInterceptorRule,
@@ -37,7 +37,6 @@ import {
 export type {
 	BashInterceptorRule,
 	BranchSummarySettings,
-	CommitSettings,
 	CompactionSettings,
 	ContextPromotionSettings,
 	ExaSettings,
@@ -654,14 +653,14 @@ const SETTING_HOOKS: Partial<Record<SettingPath, SettingHook<any>>> = {
 	},
 	symbolPreset: value => {
 		if (typeof value === "string" && (value === "unicode" || value === "nerd" || value === "ascii")) {
-			setSymbolPreset(value).catch(err => {
+			setSymbolPreset(value).catch((err: unknown) => {
 				logger.warn("Settings: symbolPreset hook failed", { preset: value, error: String(err) });
 			});
 		}
 	},
 	colorBlindMode: value => {
 		if (typeof value === "boolean") {
-			setColorBlindMode(value).catch(err => {
+			setColorBlindMode(value).catch((err: unknown) => {
 				logger.warn("Settings: colorBlindMode hook failed", { enabled: value, error: String(err) });
 			});
 		}

package/src/debug/index.ts

@@ -9,8 +9,8 @@ import { getWorkProfile } from "@nghyane/arcane-natives";
 import { Container, Loader, type SelectItem, SelectList, Spacer, Text } from "@nghyane/arcane-tui";
 import { getSessionsDir } from "@nghyane/arcane-utils/dirs";
 import { DynamicBorder } from "../modes/components/dynamic-border";
-import { getSelectListTheme, getSymbolTheme, theme } from "../modes/theme/theme";
 import type { InteractiveModeContext } from "../modes/types";
+import { getSelectListTheme, getSymbolTheme, theme } from "../theme/theme";
 import { openPath } from "../utils/open";
 import { DebugLogViewerComponent } from "./log-viewer";
 import { generateHeapSnapshotData, type ProfilerSession, startCpuProfile } from "./profiler";

package/src/debug/log-formatting.ts

@@ -1,5 +1,5 @@
 import { sanitizeText } from "@nghyane/arcane-natives";
-import { replaceTabs, truncateToWidth } from "../tools/render-utils";
+import { replaceTabs, truncateToWidth } from "../ui/render-utils";
 
 export function formatDebugLogLine(line: string, maxWidth: number): string {
 	const sanitized = sanitizeText(line);

package/src/debug/log-viewer.ts

@@ -1,7 +1,7 @@
 import { copyToClipboard, sanitizeText } from "@nghyane/arcane-natives";
 import { type Component, matchesKey, padding, truncateToWidth, visibleWidth } from "@nghyane/arcane-tui";
-import { theme } from "../modes/theme/theme";
-import { replaceTabs } from "../tools/render-utils";
+import { theme } from "../theme/theme";
+import { replaceTabs } from "../ui/render-utils";
 import {
 	formatDebugLogExpandedLines,
 	formatDebugLogLine,

package/src/discovery/helpers.ts

@@ -10,6 +10,7 @@ import { readFile } from "../capability/fs";
 import { parseRuleConditionAndScope, type Rule, type RuleFrontmatter } from "../capability/rule";
 import type { Skill, SkillFrontmatter } from "../capability/skill";
 import type { LoadContext, LoadResult, SourceMeta } from "../capability/types";
+import type { AgentKind } from "../task/types";
 import { parseFrontmatter } from "../utils/frontmatter";
 import type { IgnoreMatcher } from "../utils/ignore-files";
 
@@ -215,9 +216,17 @@ export function parseModelList(value: unknown): string[] | undefined {
 export interface ParsedAgentFields {
 	name: string;
 	description: string;
-	tools?: string[];
+	tools: string[];
 	model?: string[];
 	thinkingLevel?: ThinkingLevel;
+	kind?: AgentKind;
+}
+
+const VALID_AGENT_KINDS: readonly string[] = ["local", "remote", "hybrid", "reasoning"];
+
+function parseAgentKind(value: unknown): AgentKind | undefined {
+	if (typeof value === "string" && VALID_AGENT_KINDS.includes(value)) return value as AgentKind;
+	return undefined;
 }
 
 /**
@@ -232,12 +241,13 @@ export function parseAgentFields(frontmatter: Record<string, unknown>): ParsedAg
 		return null;
 	}
 
-	const tools = parseArrayOrCSV(frontmatter.tools);
+	const tools = parseArrayOrCSV(frontmatter.tools) ?? [];
 
 	const model = parseModelList(frontmatter.model);
 	const thinkingLevel = parseThinkingLevel(frontmatter);
+	const kind = parseAgentKind(frontmatter.kind);
 
-	return { name, description, tools, model, thinkingLevel };
+	return { name, description, tools, model, thinkingLevel, kind };
 }
 
 async function globIf(

package/src/exa/index.ts

@@ -1,12 +1,7 @@
 /**
  * Exa MCP Tools
  *
- * 22 tools for Exa's MCP servers:
- * - 4 search tools (search, deep, code, crawl)
- * - 1 LinkedIn search tool
- * - 1 company research tool
- * - 2 researcher tools (start, poll)
- * - 14 websets tools (CRUD, items, search, enrichment, monitor)
+ * Provides Exa tools filtered by user settings.
  */
 import type { ExaSettings } from "../config/settings";
 import type { CustomTool } from "../extensibility/custom-tools/types";
@@ -17,15 +12,6 @@ import { searchTools } from "./search";
 import type { ExaRenderDetails } from "./types";
 import { websetsTools } from "./websets";
 
-/** All Exa tools (22 total) - static export for backward compatibility */
-export const exaTools: CustomTool<any, ExaRenderDetails>[] = [
-	...searchTools,
-	linkedinTool,
-	companyTool,
-	...researcherTools,
-	...websetsTools,
-];
-
 /** Get Exa tools filtered by settings */
 export function getExaTools(settings: Required<ExaSettings>): CustomTool<any, ExaRenderDetails>[] {
 	if (!settings.enabled) return [];
@@ -40,23 +26,3 @@ export function getExaTools(settings: Required<ExaSettings>): CustomTool<any, Ex
 
 	return tools;
 }
-
-export { companyTool } from "./company";
-export { linkedinTool } from "./linkedin";
-export {
-	callExaTool,
-	callWebsetsTool,
-	createMCPToolFromServer,
-	fetchMCPToolSchema,
-	findApiKey,
-	formatSearchResults,
-	isSearchResponse,
-	MCPWrappedTool,
-} from "./mcp-client";
-export { renderExaCall, renderExaResult } from "./render";
-export { researcherTools } from "./researcher";
-// Re-export individual modules for selective importing
-export { searchTools } from "./search";
-// Re-export types and utilities
-export type { ExaRenderDetails, ExaSearchResponse, ExaSearchResult, MCPToolWrapperConfig } from "./types";
-export { websetsTools } from "./websets";

package/src/exa/render.ts

@@ -5,41 +5,13 @@
  */
 import type { Component } from "@nghyane/arcane-tui";
 import { Text } from "@nghyane/arcane-tui";
-import { logger } from "@nghyane/arcane-utils";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
-import type { Theme } from "../modes/theme/theme";
-import {
-	formatCount,
-	formatExpandHint,
-	formatMoreItems,
-	formatStatusIcon,
-	getDomain,
-	getPreviewLines,
-	PREVIEW_LIMITS,
-	TRUNCATE_LENGTHS,
-	truncateToWidth,
-} from "../tools/render-utils";
+import type { Theme } from "../theme/theme";
+import { renderStatusLine } from "../tui";
+import { formatCount, formatMoreItems, getDomain, truncateToWidth } from "../ui/render-utils";
 import type { ExaRenderDetails } from "./types";
 
-const COLLAPSED_PREVIEW_LINES = PREVIEW_LIMITS.COLLAPSED_LINES;
-const COLLAPSED_PREVIEW_LINE_LEN = TRUNCATE_LENGTHS.LONG;
-const EXPANDED_TEXT_LINES = 5;
-const EXPANDED_TEXT_LINE_LEN = 90;
-const MAX_TITLE_LEN = TRUNCATE_LENGTHS.TITLE;
-const MAX_HIGHLIGHT_LEN = TRUNCATE_LENGTHS.CONTENT;
-
-function renderErrorMessage(message: string, theme: Theme): Text {
-	const clean = message.replace(/^Error:\s*/, "").trim();
-	return new Text(
-		`${formatStatusIcon("error", theme)} ${theme.fg("error", `Error: ${clean || "Unknown error"}`)}`,
-		0,
-		0,
-	);
-}
-
-function renderEmptyMessage(message: string, theme: Theme): Text {
-	return new Text(`${formatStatusIcon("warning", theme)} ${theme.fg("muted", message)}`, 0, 0);
-}
+const MAX_COLLAPSED_RESULTS = 5;
 
 /** Render Exa result with tree-based layout */
 export function renderExaResult(
@@ -47,183 +19,51 @@ export function renderExaResult(
 	options: RenderResultOptions,
 	uiTheme: Theme,
 ): Component {
-	const { expanded } = options;
 	const details = result.details;
-
-	if (details?.error) {
-		logger.error("Exa render error", { error: details.error, toolName: details.toolName });
-		return renderErrorMessage(details.error, uiTheme);
-	}
-
 	const response = details?.response;
-	if (!response) {
-		if (details?.raw) {
-			const rawText = typeof details.raw === "string" ? details.raw : JSON.stringify(details.raw, null, 2);
-			const rawLines = rawText.split("\n").filter(l => l.trim());
-			const maxLines = expanded ? rawLines.length : Math.min(rawLines.length, COLLAPSED_PREVIEW_LINES);
-			const displayLines = rawLines.slice(0, maxLines);
-			const remaining = rawLines.length - maxLines;
-			const expandHint = formatExpandHint(uiTheme, expanded, remaining > 0);
-
-			let text = `${formatStatusIcon("info", uiTheme)} ${uiTheme.fg("dim", "Raw response")}${expandHint}`;
-
-			for (let i = 0; i < displayLines.length; i++) {
-				const isLast = i === displayLines.length - 1 && remaining === 0;
-				const branch = isLast ? uiTheme.tree.last : uiTheme.tree.branch;
-				text += `\n ${uiTheme.fg("dim", branch)} ${uiTheme.fg(
-					"toolOutput",
-					truncateToWidth(displayLines[i], COLLAPSED_PREVIEW_LINE_LEN),
-				)}`;
-			}
-
-			if (remaining > 0) {
-				text += `\n ${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.fg(
-					"muted",
-					formatMoreItems(remaining, "line"),
-				)}`;
-			}
-
-			return new Text(text, 0, 0);
-		}
-		return renderEmptyMessage("No response data", uiTheme);
-	}
-
-	const results = response.results ?? [];
+	const results = response?.results ?? [];
 	const resultCount = results.length;
-	const cost = response.costDollars?.total;
-	const time = response.searchTime;
-
-	const icon = formatStatusIcon(resultCount > 0 ? "success" : "warning", uiTheme);
 
-	const metaParts = [formatCount("result", resultCount)];
-	if (cost !== undefined) metaParts.push(`cost:$${cost.toFixed(4)}`);
-	if (time !== undefined) metaParts.push(`time:${time.toFixed(2)}s`);
-	const summaryText = metaParts.join(uiTheme.sep.dot);
+	const icon = details?.error ? "error" : resultCount > 0 ? "success" : "warning";
 
-	let hasMorePreview = false;
-	if (!expanded && resultCount > 0) {
-		const previewText = results[0].text ?? results[0].title ?? "";
-		const totalLines = previewText.split("\n").filter(l => l.trim()).length;
-		hasMorePreview = totalLines > COLLAPSED_PREVIEW_LINES || resultCount > 1;
-	}
-	const expandHint = formatExpandHint(uiTheme, expanded, hasMorePreview);
-
-	let text = `${icon} ${uiTheme.fg("dim", summaryText)}${expandHint}`;
-
-	if (!expanded) {
-		if (resultCount === 0) {
-			text += `\n ${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.fg("muted", "No results")}`;
-			return new Text(text, 0, 0);
-		}
-
-		const first = results[0];
-		const previewText = first.text ?? first.title ?? "";
-		const previewLines = previewText
-			? getPreviewLines(previewText, COLLAPSED_PREVIEW_LINES, COLLAPSED_PREVIEW_LINE_LEN)
-			: [];
-		const safePreviewLines = previewLines.length > 0 ? previewLines : ["No preview text"];
-		const totalLines = previewText.split("\n").filter(l => l.trim()).length;
-		const remainingLines = Math.max(0, totalLines - previewLines.length);
-		const extraItems: string[] = [];
-		if (remainingLines > 0) {
-			extraItems.push(formatMoreItems(remainingLines, "line"));
-		}
-		if (resultCount > 1) {
-			extraItems.push(formatMoreItems(resultCount - 1, "result"));
-		}
-
-		for (let i = 0; i < safePreviewLines.length; i++) {
-			const isLast = i === safePreviewLines.length - 1 && extraItems.length === 0;
-			const branch = isLast ? uiTheme.tree.last : uiTheme.tree.branch;
-			const line = safePreviewLines[i];
-			const color = line === "No preview text" ? "muted" : "toolOutput";
-			text += `\n ${uiTheme.fg("dim", branch)} ${uiTheme.fg(color, line)}`;
-		}
+	const header = renderStatusLine(
+		{
+			icon,
+			title: "Exa Search",
+			meta: [formatCount("result", resultCount)],
+		},
+		uiTheme,
+	);
 
-		for (let i = 0; i < extraItems.length; i++) {
-			const isLast = i === extraItems.length - 1;
-			const branch = isLast ? uiTheme.tree.last : uiTheme.tree.branch;
-			text += `\n ${uiTheme.fg("dim", branch)} ${uiTheme.fg("muted", extraItems[i])}`;
-		}
+	let text = header;
 
+	if (details?.error) {
+		const clean = details.error.replace(/^Error:\s*/, "").trim();
+		text += `\n ${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.fg("error", clean || "Unknown error")}`;
 		return new Text(text, 0, 0);
 	}
 
-	if (resultCount === 0) {
+	if (!response || resultCount === 0) {
 		text += `\n ${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.fg("muted", "No results")}`;
 		return new Text(text, 0, 0);
 	}
 
-	for (let i = 0; i < results.length; i++) {
+	const { expanded } = options;
+	const maxItems = expanded ? results.length : Math.min(results.length, MAX_COLLAPSED_RESULTS);
+	const remaining = results.length - maxItems;
+
+	for (let i = 0; i < maxItems; i++) {
 		const res = results[i];
-		const isLast = i === results.length - 1;
+		const isLast = i === maxItems - 1 && remaining === 0;
 		const branch = isLast ? uiTheme.tree.last : uiTheme.tree.branch;
-		const cont = isLast ? " " : uiTheme.tree.vertical;
-
-		const title = truncateToWidth(res.title ?? "Untitled", MAX_TITLE_LEN);
+		const title = truncateToWidth(res.title ?? "Untitled", 70);
 		const domain = res.url ? getDomain(res.url) : "";
-		const domainPart = domain ? uiTheme.fg("dim", ` (${domain})`) : "";
-
+		const domainPart = domain ? ` ${uiTheme.fg("dim", `(${domain})`)}` : "";
 		text += `\n ${uiTheme.fg("dim", branch)} ${uiTheme.fg("accent", title)}${domainPart}`;
+	}
 
-		if (res.url) {
-			text += `\n ${uiTheme.fg("dim", cont)} ${uiTheme.fg("dim", uiTheme.tree.hook)} ${uiTheme.fg(
-				"mdLinkUrl",
-				res.url,
-			)}`;
-		}
-
-		if (res.author) {
-			text += `\n ${uiTheme.fg("dim", cont)} ${uiTheme.fg("dim", uiTheme.tree.hook)} ${uiTheme.fg(
-				"muted",
-				`Author: ${res.author}`,
-			)}`;
-		}
-
-		if (res.publishedDate) {
-			text += `\n ${uiTheme.fg("dim", cont)} ${uiTheme.fg("dim", uiTheme.tree.hook)} ${uiTheme.fg(
-				"muted",
-				`Published: ${res.publishedDate}`,
-			)}`;
-		}
-
-		if (res.text) {
-			const textLines = res.text.split("\n").filter(l => l.trim());
-			const displayLines = textLines.slice(0, EXPANDED_TEXT_LINES);
-			for (const line of displayLines) {
-				text += `\n ${uiTheme.fg("dim", cont)} ${uiTheme.fg("dim", uiTheme.tree.hook)} ${uiTheme.fg(
-					"toolOutput",
-					truncateToWidth(line.trim(), EXPANDED_TEXT_LINE_LEN),
-				)}`;
-			}
-			if (textLines.length > EXPANDED_TEXT_LINES) {
-				text += `\n ${uiTheme.fg("dim", cont)} ${uiTheme.fg("dim", uiTheme.tree.hook)} ${uiTheme.fg(
-					"muted",
-					formatMoreItems(textLines.length - EXPANDED_TEXT_LINES, "line"),
-				)}`;
-			}
-		}
-
-		if (res.highlights?.length) {
-			text += `\n ${uiTheme.fg("dim", cont)} ${uiTheme.fg("dim", uiTheme.tree.hook)} ${uiTheme.fg(
-				"accent",
-				"Highlights",
-			)}`;
-			const maxHighlights = Math.min(res.highlights.length, 3);
-			for (let j = 0; j < maxHighlights; j++) {
-				const h = res.highlights[j];
-				text += `\n ${uiTheme.fg("dim", cont)} ${uiTheme.fg("dim", uiTheme.tree.hook)} ${uiTheme.fg(
-					"muted",
-					`${uiTheme.format.dash} ${truncateToWidth(h, MAX_HIGHLIGHT_LEN)}`,
-				)}`;
-			}
-			if (res.highlights.length > maxHighlights) {
-				text += `\n ${uiTheme.fg("dim", cont)} ${uiTheme.fg("dim", uiTheme.tree.hook)} ${uiTheme.fg(
-					"muted",
-					formatMoreItems(res.highlights.length - maxHighlights, "highlight"),
-				)}`;
-			}
-		}
+	if (remaining > 0) {
+		text += `\n ${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.fg("muted", formatMoreItems(remaining, "result"))}`;
 	}
 
 	return new Text(text, 0, 0);

package/src/export/html/index.ts

@@ -2,8 +2,8 @@ import * as path from "node:path";
 import type { AgentState } from "@nghyane/arcane-agent";
 import { isEnoent } from "@nghyane/arcane-utils";
 import { APP_NAME } from "@nghyane/arcane-utils/dirs";
-import { getResolvedThemeColors, getThemeExportColors } from "../../modes/theme/theme";
 import { type SessionEntry, type SessionHeader, SessionManager } from "../../session/session-manager";
+import { getResolvedThemeColors, getThemeExportColors } from "../../theme/theme";
 // Pre-generated template (created by scripts/generate-template.ts at publish time)
 import { TEMPLATE } from "./template.generated";
 

package/src/extensibility/custom-tools/loader.ts

@@ -15,7 +15,7 @@ import type { ExecOptions } from "../../exec/exec";
 import { execCommand } from "../../exec/exec";
 import type { HookUIContext } from "../../extensibility/hooks/types";
 import { getAllPluginToolPaths } from "../../extensibility/plugins/loader";
-import { theme } from "../../modes/theme/theme";
+import { theme } from "../../theme/theme";
 import type { CustomToolAPI, CustomToolFactory, LoadedCustomTool, ToolLoadError } from "./types";
 
 /**

package/src/extensibility/custom-tools/types.ts

@@ -12,9 +12,9 @@ import type { Rule } from "../../capability/rule";
 import type { ModelRegistry } from "../../config/model-registry";
 import type { ExecOptions, ExecResult } from "../../exec/exec";
 import type { HookUIContext } from "../../extensibility/hooks/types";
-import type { Theme } from "../../modes/theme/theme";
 import type { CompactionResult } from "../../session/compaction";
 import type { ReadonlySessionManager } from "../../session/session-manager";
+import type { Theme } from "../../theme/theme";
 import type { TodoItem } from "../../tools/todo-write";
 
 /** Alias for clarity */
@@ -114,6 +114,10 @@ export interface RenderResultOptions {
 	isPartial: boolean;
 	/** Current spinner frame index for animated elements (0-9, only provided during partial results) */
 	spinnerFrame?: number;
+	/** Tool display label (used by default renderer) */
+	label?: string;
+	/** Extra rendering context from ToolExecutionComponent (bash output, edit diff, etc.) */
+	renderContext?: Record<string, unknown>;
 }
 
 export type CustomToolResult<TDetails = any> = AgentToolResult<TDetails>;

package/src/extensibility/custom-tools/wrapper.ts

@@ -3,7 +3,7 @@
  */
 import type { AgentTool, AgentToolUpdateCallback } from "@nghyane/arcane-agent";
 import type { Static, TSchema } from "@sinclair/typebox";
-import type { Theme } from "../../modes/theme/theme";
+import type { Theme } from "../../theme/theme";
 import { applyToolProxy } from "../tool-proxy";
 import type { CustomTool, CustomToolContext } from "./types";
 

package/src/extensibility/extensions/runner.ts

@@ -6,8 +6,8 @@ import type { ImageContent, Model } from "@nghyane/arcane-ai";
 import type { KeyId } from "@nghyane/arcane-tui";
 import { logger } from "@nghyane/arcane-utils";
 import type { ModelRegistry } from "../../config/model-registry";
-import { type Theme, theme } from "../../modes/theme/theme";
 import type { SessionManager } from "../../session/session-manager";
+import { type Theme, theme } from "../../theme/theme";
 import type {
 	BeforeAgentStartEvent,
 	BeforeAgentStartEventResult,