@nghyane/arcane 0.1.13 → 0.1.15

package/src/modes/controllers/selector-controller.ts

@@ -7,6 +7,8 @@ import { MODEL_ROLES } from "../../config/model-registry";
 import { settings } from "../../config/settings";
 import { DebugSelectorComponent } from "../../debug";
 import { disableProvider, enableProvider } from "../../discovery";
+import type { InteractiveModeContext } from "../../modes/types";
+import { SessionManager } from "../../session/session-manager";
 import {
 	getAvailableThemes,
 	getSymbolTheme,
@@ -15,11 +17,8 @@ import {
 	setSymbolPreset,
 	setTheme,
 	theme,
-} from "../../modes/theme/theme";
-import type { InteractiveModeContext } from "../../modes/types";
-import { SessionManager } from "../../session/session-manager";
+} from "../../theme/theme";
 import { setPreferredImageProvider, setPreferredSearchProvider } from "../../tools";
-import { AgentDashboard } from "../components/agent-dashboard";
 import { AssistantMessageComponent } from "../components/assistant-message";
 import { ExtensionDashboard } from "../components/extensions";
 import { HistorySearchComponent } from "../components/history-search";
@@ -160,28 +159,6 @@ export class SelectorController {
 	}
 
 	/**
-	 * Show the Agent Control Center dashboard.
-	 */
-	async showAgentsDashboard(): Promise<void> {
-		const activeModel = this.ctx.session.model;
-		const activeModelPattern = activeModel ? `${activeModel.provider}/${activeModel.id}` : undefined;
-		const defaultModelPattern = this.ctx.settings.getModelRole("default");
-		const dashboard = await AgentDashboard.create(getProjectDir(), this.ctx.settings, this.ctx.ui.terminal.rows, {
-			modelRegistry: this.ctx.session.modelRegistry,
-			activeModelPattern,
-			defaultModelPattern,
-		});
-		this.showSelector(done => {
-			dashboard.onClose = () => {
-				done();
-				this.ctx.ui.requestRender();
-			};
-			dashboard.onRequestRender = () => {
-				this.ctx.ui.requestRender();
-			};
-			return { component: dashboard, focus: dashboard };
-		});
-	}
 
 	/**
 	 * Handle setting changes from the settings selector.

package/src/modes/controllers/ssh-command-controller.ts

@@ -8,8 +8,8 @@ import { getProjectDir, getSSHConfigPath } from "@nghyane/arcane-utils/dirs";
 import { type SSHHost, sshCapability } from "../../capability/ssh";
 import { loadCapability } from "../../discovery";
 import { addSSHHost, readSSHConfigFile, removeSSHHost, type SSHHostConfig } from "../../ssh/config-writer";
+import { theme } from "../../theme/theme";
 import { DynamicBorder } from "../components/dynamic-border";
-import { theme } from "../theme/theme";
 import type { InteractiveModeContext } from "../types";
 
 function parseCommandArgs(argsString: string): string[] {

package/src/modes/interactive-mode.ts

@@ -28,6 +28,9 @@ import { HistoryStorage } from "../session/history-storage";
 import type { SessionContext, SessionManager } from "../session/session-manager";
 import { getRecentSessions } from "../session/session-manager";
 import { STTController, type SttState } from "../stt";
+import { setMermaidRenderCallback } from "../theme/mermaid-cache";
+import type { Theme } from "../theme/theme";
+import { getEditorTheme, getMarkdownTheme, onThemeChange, theme } from "../theme/theme";
 import { time } from "../utils/timings";
 import { setTerminalTitle } from "../utils/title-generator";
 import type { AssistantMessageComponent } from "./components/assistant-message";
@@ -48,9 +51,6 @@ import { InputController } from "./controllers/input-controller";
 import { MCPCommandController } from "./controllers/mcp-command-controller";
 import { SelectorController } from "./controllers/selector-controller";
 import { SSHCommandController } from "./controllers/ssh-command-controller";
-import { setMermaidRenderCallback } from "./theme/mermaid-cache";
-import type { Theme } from "./theme/theme";
-import { getEditorTheme, getMarkdownTheme, onThemeChange, theme } from "./theme/theme";
 import type { CompactionQueuedMessage, InteractiveModeContext, TodoItem } from "./types";
 import { UiHelpers } from "./utils/ui-helpers";
 
@@ -849,10 +849,6 @@ export class InteractiveMode implements InteractiveModeContext {
 		void this.#selectorController.showExtensionsDashboard();
 	}
 
-	showAgentsDashboard(): void {
-		void this.#selectorController.showAgentsDashboard();
-	}
-
 	showModelSelector(options?: { temporaryOnly?: boolean }): void {
 		this.#selectorController.showModelSelector(options);
 	}

package/src/modes/print-mode.ts

@@ -180,12 +180,12 @@ export async function runPrintMode(session: AgentSession, options: PrintModeOpti
 
 	// Ensure stdout is fully flushed before returning
 	// This prevents race conditions where the process exits before all output is written
-	await new Promise<void>((resolve, reject) => {
-		process.stdout.write("", err => {
-			if (err) reject(err);
-			else resolve();
-		});
+	const { promise, resolve, reject } = Promise.withResolvers<void>();
+	process.stdout.write("", err => {
+		if (err) reject(err);
+		else resolve();
 	});
+	await promise;
 
 	await session.dispose();
 }

package/src/modes/rpc/rpc-mode.ts

@@ -12,8 +12,8 @@
  */
 import { readJsonl, Snowflake } from "@nghyane/arcane-utils";
 import type { ExtensionUIContext, ExtensionUIDialogOptions } from "../../extensibility/extensions";
-import { type Theme, theme } from "../../modes/theme/theme";
 import type { AgentSession } from "../../session/agent-session";
+import { type Theme, theme } from "../../theme/theme";
 import type {
 	RpcCommand,
 	RpcExtensionUIRequest,

package/src/modes/types.ts

@@ -9,6 +9,7 @@ import type { MCPManager } from "../mcp";
 import type { AgentSession, AgentSessionEvent } from "../session/agent-session";
 import type { HistoryStorage } from "../session/history-storage";
 import type { SessionContext, SessionManager } from "../session/session-manager";
+import type { Theme } from "../theme/theme";
 import type { AssistantMessageComponent } from "./components/assistant-message";
 import type { BashExecutionComponent } from "./components/bash-execution";
 import type { CustomEditor } from "./components/custom-editor";
@@ -18,7 +19,6 @@ import type { HookSelectorComponent } from "./components/hook-selector";
 import type { PythonExecutionComponent } from "./components/python-execution";
 import type { StatusLineComponent } from "./components/status-line";
 import type { ToolExecutionHandle } from "./components/tool-execution";
-import type { Theme } from "./theme/theme";
 
 export type CompactionQueuedMessage = {
 	text: string;
@@ -158,7 +158,6 @@ export interface InteractiveModeContext {
 	showSettingsSelector(): void;
 	showHistorySearch(): void;
 	showExtensionsDashboard(): void;
-	showAgentsDashboard(): void;
 	showModelSelector(options?: { temporaryOnly?: boolean }): void;
 	showUserMessageSelector(): void;
 	showTreeSelector(): void;

package/src/modes/utils/ui-helpers.ts

@@ -6,18 +6,19 @@ import { AssistantMessageComponent } from "../../modes/components/assistant-mess
 import { BashExecutionComponent } from "../../modes/components/bash-execution";
 import { BranchSummaryMessageComponent } from "../../modes/components/branch-summary-message";
 import { CompactionSummaryMessageComponent } from "../../modes/components/compaction-summary-message";
+import { ContextGroupComponent } from "../../modes/components/context-group";
 import { CustomMessageComponent } from "../../modes/components/custom-message";
 import { DynamicBorder } from "../../modes/components/dynamic-border";
 import { PythonExecutionComponent } from "../../modes/components/python-execution";
-import { ReadToolGroupComponent } from "../../modes/components/read-tool-group";
 import { SkillMessageComponent } from "../../modes/components/skill-message";
 import { ToolExecutionComponent } from "../../modes/components/tool-execution";
 import { UserMessageComponent } from "../../modes/components/user-message";
-import { theme } from "../../modes/theme/theme";
 import type { CompactionQueuedMessage, InteractiveModeContext } from "../../modes/types";
 import { type CustomMessage, SKILL_PROMPT_MESSAGE_TYPE, type SkillPromptDetails } from "../../session/messages";
 import type { SessionContext } from "../../session/session-manager";
 import { formatBytes } from "../../session/streaming-output";
+import { theme } from "../../theme/theme";
+import { getToolTier, isContextTool } from "../../ui/render-utils";
 
 type TextBlock = { type: "text"; text: string };
 
@@ -190,12 +191,13 @@ export class UiHelpers {
 			this.ctx.updateEditorBorderColor();
 		}
 
-		let readGroup: ReadToolGroupComponent | null = null;
+		let currentGroup: ContextGroupComponent | undefined;
+		const toolGroups = new Map<string, ContextGroupComponent>();
+
 		for (const message of sessionContext.messages) {
-			// Assistant messages need special handling for tool calls
 			if (message.role === "assistant") {
+				currentGroup = undefined;
 				this.ctx.addMessageToChat(message);
-				readGroup = null;
 				const hasErrorStop = message.stopReason === "aborted" || message.stopReason === "error";
 				const errorMessage = hasErrorStop
 					? message.stopReason === "aborted"
@@ -208,47 +210,36 @@ export class UiHelpers {
 						: message.errorMessage || "Error"
 					: null;
 
-				// Render tool call components
+				// Render tool call components with context grouping
 				for (const content of message.content) {
 					if (content.type !== "toolCall") {
 						continue;
 					}
 
-					if (content.name === "read") {
-						if (!readGroup) {
-							readGroup = new ReadToolGroupComponent();
-							readGroup.setExpanded(this.ctx.toolOutputExpanded);
-							this.ctx.chatContainer.addChild(readGroup);
-						}
-						readGroup.updateArgs(content.arguments, content.id);
-						if (hasErrorStop && errorMessage) {
-							readGroup.updateResult(
-								{ content: [{ type: "text", text: errorMessage }], isError: true },
-								false,
-								content.id,
-							);
-						} else {
-							this.ctx.pendingTools.set(content.id, readGroup);
-						}
-						continue;
-					}
-
-					readGroup = null;
+					const tier = getToolTier(content.name);
 					const tool = this.ctx.session.getToolByName(content.name);
 					const component = new ToolExecutionComponent(
 						content.name,
 						content.arguments,
-						{
-							showImages: settings.get("terminal.showImages"),
-							editFuzzyThreshold: settings.get("edit.fuzzyThreshold"),
-							editAllowFuzzy: settings.get("edit.fuzzyMatch"),
-						},
+						{ showImages: settings.get("terminal.showImages"), tier },
 						tool,
 						this.ctx.ui,
 						this.ctx.sessionManager.getCwd(),
 					);
 					component.setExpanded(this.ctx.toolOutputExpanded);
-					this.ctx.chatContainer.addChild(component);
+
+					if (isContextTool(content.name)) {
+						if (!currentGroup) {
+							currentGroup = new ContextGroupComponent();
+							currentGroup.setExpanded(this.ctx.toolOutputExpanded);
+							this.ctx.chatContainer.addChild(currentGroup);
+						}
+						currentGroup.addTool(content.name, component);
+						toolGroups.set(content.id, currentGroup);
+					} else {
+						currentGroup = undefined;
+						this.ctx.chatContainer.addChild(component);
+					}
 
 					if (hasErrorStop && errorMessage) {
 						component.updateResult(
@@ -256,6 +247,11 @@ export class UiHelpers {
 							false,
 							content.id,
 						);
+						const group = toolGroups.get(content.id);
+						if (group) {
+							group.markDone();
+							toolGroups.delete(content.id);
+						}
 					} else {
 						this.ctx.pendingTools.set(content.id, component);
 					}
@@ -266,8 +262,14 @@ export class UiHelpers {
 				if (component) {
 					component.updateResult(message, false, message.toolCallId);
 					this.ctx.pendingTools.delete(message.toolCallId);
+					const group = toolGroups.get(message.toolCallId);
+					if (group) {
+						group.markDone();
+						toolGroups.delete(message.toolCallId);
+					}
 				}
 			} else {
+				currentGroup = undefined;
 				// All other messages use standard rendering
 				this.ctx.addMessageToChat(message, options);
 			}