@agentuity/coder-tui 2.0.11 → 2.0.12

package/src/local-init-filter.ts

@@ -0,0 +1,54 @@
+import type { AgentDefinition, HubToolDefinition, InitMessage } from './protocol.ts';
+
+const LOCAL_TUI_HIDDEN_HUB_TOOL_NAMES = new Set(['sandbox_exec']);
+
+function filterHubToolsForLocalTui(tools?: HubToolDefinition[]): HubToolDefinition[] | undefined {
+	if (!tools) return tools;
+
+	const filtered = tools.filter((tool) => !LOCAL_TUI_HIDDEN_HUB_TOOL_NAMES.has(tool.name));
+	return filtered.length === tools.length ? tools : filtered;
+}
+
+function filterAgentHubToolsForLocalTui(agents?: AgentDefinition[]): AgentDefinition[] | undefined {
+	if (!agents) return agents;
+
+	let changed = false;
+	const filteredAgents = agents.map((agent) => {
+		const filteredHubTools = filterHubToolsForLocalTui(agent.hubTools);
+		if (filteredHubTools === agent.hubTools) {
+			return agent;
+		}
+
+		changed = true;
+		return {
+			...agent,
+			hubTools: filteredHubTools && filteredHubTools.length > 0 ? filteredHubTools : undefined,
+		};
+	});
+
+	return changed ? filteredAgents : agents;
+}
+
+export function adaptInitMessageForLocalTui(
+	init: InitMessage,
+	options: {
+		isRemoteSession: boolean;
+	}
+): InitMessage {
+	if (options.isRemoteSession) {
+		return init;
+	}
+
+	const tools = filterHubToolsForLocalTui(init.tools);
+	const agents = filterAgentHubToolsForLocalTui(init.agents);
+
+	if (tools === init.tools && agents === init.agents) {
+		return init;
+	}
+
+	return {
+		...init,
+		tools,
+		agents,
+	};
+}

package/src/protocol.ts

@@ -75,6 +75,7 @@ export type HubAction =
 export interface AgentDefinition {
 	name: string;
 	displayName?: string;
+	source?: 'builtin' | 'custom';
 	description: string;
 	systemPrompt: string;
 	model?: string;
@@ -84,6 +85,7 @@ export interface AgentDefinition {
 	readOnly?: boolean;
 	hubTools?: HubToolDefinition[];
 	capabilities?: string[];
+	strictToolSelection?: boolean;
 	status?: 'available' | 'busy' | 'offline';
 }
 
@@ -381,7 +383,7 @@ export interface SessionListItem {
 	participantCount: number;
 	tags: string[];
 	skills: SessionSkillRef[];
-	agentSlugs: string[];
+	enabledAgents: string[];
 	defaultAgent?: string;
 	bucket: SessionBucket;
 	runtimeAvailable: boolean;
@@ -530,7 +532,7 @@ export interface SessionSnapshotMetadataExtensions {
 	product?: SessionProductProjection;
 	tags: string[];
 	skills: SessionSkillRef[];
-	agentSlugs: string[];
+	enabledAgents: string[];
 	defaultAgent?: string;
 	workers?: SessionListItem[];
 }

package/src/remote-session.ts

@@ -22,6 +22,8 @@ import {
 	syncRemoteLifecycleWorkingMessage,
 	type RemoteLifecycleState,
 } from './remote-lifecycle.ts';
+import { resolveCoderOrgId } from './auth.ts';
+import { formatToolDisplay } from './agentuity-cli.ts';
 
 const DEBUG = !!process.env['AGENTUITY_DEBUG'];
 
@@ -267,9 +269,10 @@ export class RemoteSession {
 					wsHeaders['Authorization'] = `Bearer ${this.apiKey}`;
 				}
 			}
-			if (this.orgId) {
-				url.searchParams.set('orgId', this.orgId);
-				wsHeaders['x-agentuity-orgid'] = this.orgId;
+			const orgId = resolveCoderOrgId(this.orgId);
+			if (orgId) {
+				url.searchParams.set('orgId', orgId);
+				wsHeaders['x-agentuity-orgid'] = orgId;
 			}
 
 			log(`${isReconnect ? 'Reconnecting' : 'Connecting'} to ${url.toString()}`);
@@ -999,18 +1002,23 @@ export async function setupRemoteMode(
 				break;
 
 			case 'tool_execution_start': {
-				const tool = (event as { toolName?: string }).toolName ?? 'tool';
-				currentTool = tool;
+				const rawTool = (event as { toolName?: string }).toolName ?? 'tool';
+				const rawArgs = (event as { args?: string | Record<string, unknown> }).args;
+				const display = formatToolDisplay(rawTool, rawArgs);
+				currentTool = display.toolName;
 				if (extensionCtxRef?.hasUI) {
-					setNonLifecycleWorkingMessage(`Running ${tool}...`);
-					extensionCtxRef.ui.setStatus('remote_activity', `Running ${tool}...`);
+					setNonLifecycleWorkingMessage(`Running ${display.fullLabel}...`);
+					extensionCtxRef.ui.setStatus('remote_activity', `Running ${display.fullLabel}...`);
 				}
-				log(`Tool: ${tool}`);
+				log(`Tool: ${display.fullLabel}`);
 				break;
 			}
 
 			case 'tool_execution_end': {
-				const tool = (event as { toolName?: string }).toolName ?? currentTool ?? 'tool';
+				const rawTool = (event as { toolName?: string }).toolName ?? currentTool ?? 'tool';
+				const rawArgs = (event as { args?: string | Record<string, unknown> }).args;
+				const display = rawArgs ? formatToolDisplay(rawTool, rawArgs) : null;
+				const tool = display?.fullLabel ?? currentTool ?? rawTool;
 				currentTool = null;
 				if (extensionCtxRef?.hasUI) {
 					clearWorkingMessage();

package/src/renderers.ts

@@ -12,6 +12,7 @@ import type {
 	AgentToolResult,
 } from '@mariozechner/pi-coding-agent';
 import { Box, Text, Container, type Component } from '@mariozechner/pi-tui';
+import { formatToolDisplay } from './agentuity-cli.ts';
 
 // ──────────────────────────────────────────────
 // Line-safety helper — must be declared before SimpleText so
@@ -125,6 +126,32 @@ function truncate(str: string, max: number): string {
 	return str.slice(0, max - 1) + '\u2026';
 }
 
+function toSingleLinePreview(value: string): string {
+	return value.replace(/\s+/g, ' ').trim();
+}
+
+function isCommandToolName(toolName: string): boolean {
+	const normalized = toolName.trim().toLowerCase();
+	return normalized === 'bash' || normalized === 'execute_command' || normalized.includes('shell');
+}
+
+function getCommandArg(args: Record<string, unknown>): string | undefined {
+	const value = args['command'] ?? args['cmd'];
+	return typeof value === 'string' && value.trim() ? value.trim() : undefined;
+}
+
+function getCommandTimeoutLabel(args: Record<string, unknown>): string | undefined {
+	const timeout = args['timeout'];
+	if (typeof timeout === 'number' && Number.isFinite(timeout) && timeout > 0) {
+		return `${timeout}s`;
+	}
+	if (typeof timeout === 'string' && timeout.trim()) {
+		const value = timeout.trim();
+		return /s$/i.test(value) ? value : `${value}s`;
+	}
+	return undefined;
+}
+
 // ──────────────────────────────────────────────
 // Individual tool renderers
 // ──────────────────────────────────────────────
@@ -709,6 +736,37 @@ function parallelTasksRenderers(): ToolRenderers {
 	};
 }
 
+function commandToolRenderers(toolName: string): ToolRenderers {
+	return {
+		renderCall(args, theme) {
+			const display = formatToolDisplay(toolName, args);
+			const timeout = getCommandTimeoutLabel(args);
+
+			if (display.branded) {
+				let text = theme.fg('toolTitle', theme.bold(display.toolName));
+				if (display.toolArgs) {
+					text += theme.fg('accent', ` ${display.toolArgs}`);
+				}
+				if (timeout) {
+					text += theme.fg('dim', ` (timeout ${timeout})`);
+				}
+				return new SimpleText(text);
+			}
+
+			let text = theme.fg('toolTitle', theme.bold('$ '));
+			const commandPreview = getCommandArg(args);
+			text += theme.fg(
+				'accent',
+				truncate(commandPreview ? toSingleLinePreview(commandPreview) : display.toolName, 80)
+			);
+			if (timeout) {
+				text += theme.fg('dim', ` (timeout ${timeout})`);
+			}
+			return new SimpleText(text);
+		},
+	};
+}
+
 // ──────────────────────────────────────────────
 
 const RENDERERS: Record<string, () => ToolRenderers> = {
@@ -736,5 +794,7 @@ const RENDERERS: Record<string, () => ToolRenderers> = {
  */
 export function getToolRenderers(toolName: string): ToolRenderers | undefined {
 	const factory = RENDERERS[toolName];
-	return factory?.();
+	if (factory) return factory();
+	if (isCommandToolName(toolName)) return commandToolRenderers(toolName);
+	return undefined;
 }

package/src/subagent-tool-selection.ts

@@ -0,0 +1,33 @@
+import type { AgentDefinition } from './protocol.ts';
+
+const READ_ONLY_TOOL_NAMES = ['read', 'grep', 'find', 'ls'] as const;
+const CODING_TOOL_NAMES = ['read', 'bash', 'edit', 'write'] as const;
+
+function normalizeToolName(name: string): string {
+	return name.trim().toLowerCase();
+}
+
+export function selectSubAgentToolNames(agentConfig: AgentDefinition): string[] {
+	const declared = new Set(
+		(agentConfig.tools ?? [])
+			.filter((name): name is string => typeof name === 'string' && name.trim().length > 0)
+			.map(normalizeToolName)
+	);
+	const needsBash = declared.has('bash');
+	const baseToolNames =
+		agentConfig.readOnly && !needsBash ? READ_ONLY_TOOL_NAMES : CODING_TOOL_NAMES;
+	const allowLegacyFallback =
+		agentConfig.strictToolSelection !== true && agentConfig.source === 'builtin';
+
+	if (declared.size === 0) {
+		return allowLegacyFallback ? [...baseToolNames] : [];
+	}
+
+	const filtered = baseToolNames.filter((toolName) => declared.has(toolName));
+
+	if (filtered.length > 0) {
+		return filtered;
+	}
+
+	return allowLegacyFallback ? [...baseToolNames] : [];
+}