erosolar-cli 1.7.345 → 1.7.346

package/dist/shell/terminalInputAdapter.js

@@ -35,14 +35,10 @@ export class TerminalInputAdapter {
         this.input.on('toggleAutoContinue', () => this.callbacks.onToggleAutoContinue?.());
     }
     /**
-     * Start capturing input. Does NOT render - caller should render after setup.
+     * Start capturing input
      */
     start() {
         this.input.enableBracketedPaste();
-        // Mouse tracking disabled by default to preserve native text selection
-        // Users can select and copy text normally with their mouse
-        // Use PageUp/PageDown, Ctrl+Home/End for scrollback navigation
-        // this.input.enableMouseTracking();
         // Set up raw mode
         if (this.inStream.isTTY) {
             this.inStream.setRawMode(true);
@@ -54,15 +50,14 @@ export class TerminalInputAdapter {
         this.setupRawDataInterception();
         // Set up keypress handling
         this.setupKeypressHandler();
-        // Note: No auto-render here - caller controls when to render
+        // Initial render
+        this.input.forceRender();
     }
     /**
      * Stop capturing input
      */
     stop() {
         this.input.disableBracketedPaste();
-        // Only disable if it was enabled
-        // this.input.disableMouseTracking();
         // Remove handlers
         if (this.rawDataHandler) {
             this.restoreRawDataInterception();
@@ -85,10 +80,11 @@ export class TerminalInputAdapter {
         this.input.setMode(streaming ? 'streaming' : 'idle');
     }
     /**
-     * Pin top rows (e.g., the launch banner) outside the scroll region.
+     * Set the row where content ends (for idle mode positioning).
+     * Input area will render starting from this row + 1.
      */
-    setPinnedHeaderLines(count) {
-        this.input.setPinnedHeaderLines(count);
+    setContentEndRow(row) {
+        this.input.setContentEndRow(row);
     }
     /**
      * Get current buffer content
@@ -111,8 +107,8 @@ export class TerminalInputAdapter {
     /**
      * Update context usage indicator (0-100, null to clear)
      */
-    setContextUsage(percentage, autoCompactThreshold) {
-        this.input.updateContextUsage(percentage, autoCompactThreshold);
+    setContextUsage(percentage) {
+        this.input.updateContextUsage(percentage);
     }
     /**
      * Surface mode toggle states (verification/auto-continue) in the control bar.
@@ -120,6 +116,13 @@ export class TerminalInputAdapter {
     setModeToggles(options) {
         this.input.setModeToggles(options);
     }
+    /**
+     * Set the model info string (e.g., "OpenAI · gpt-4")
+     * This is displayed persistently above the input area.
+     */
+    setModelInfo(info) {
+        this.input.setModelInfo(info);
+    }
     /**
      * Update the inline status message shown before the prompt (e.g., streaming heartbeat).
      */
@@ -140,24 +143,12 @@ export class TerminalInputAdapter {
     setStreamingLabel(label) {
         this.input.setStreamingLabel(label);
     }
-    /**
-     * Surface meta header information (elapsed, tokens/context) above the divider.
-     */
-    setMetaStatus(meta) {
-        this.input.setMetaStatus(meta);
-    }
     /**
      * Clear all status messages at once (convenience method).
      */
     clearAllStatus() {
         this.input.clearAllStatus();
     }
-    /**
-     * Surface model/provider context in the controls bar.
-     */
-    setModelContext(options) {
-        this.input.setModelContext(options);
-    }
     /**
      * Set the edit guard mode explicitly
      */
@@ -194,114 +185,6 @@ export class TerminalInputAdapter {
     forceRender() {
         this.input.forceRender();
     }
-    /**
-     * Stream content above the pinned chat box (Claude Code method).
-     * Automatically enables scroll region on first call.
-     */
-    streamContent(content) {
-        this.input.streamContent(content);
-    }
-    /**
-     * Enable scroll region (Claude Code method).
-     * Chat box is pinned below scroll region.
-     */
-    enableScrollRegion() {
-        this.input.enableScrollRegion();
-    }
-    /**
-     * Disable scroll region and reset to full terminal.
-     */
-    disableScrollRegion() {
-        this.input.disableScrollRegion();
-    }
-    /**
-     * @deprecated Use streamContent() instead
-     * Write content directly into the scroll region.
-     */
-    writeToScrollRegion(content) {
-        this.input.writeToScrollRegion(content);
-    }
-    /**
-     * Enter alternate screen buffer.
-     */
-    enterAlternateScreen() {
-        this.input.enterAlternateScreen();
-    }
-    /**
-     * Exit alternate screen buffer.
-     */
-    exitAlternateScreen() {
-        this.input.exitAlternateScreen();
-    }
-    /**
-     * Clear the entire terminal screen and reset content position.
-     * This removes all content including the launching command.
-     */
-    clearScreen() {
-        this.input.clearScreen();
-    }
-    /**
-     * Enter streaming scroll region mode.
-     * Call once at the start of streaming.
-     */
-    enterStreamingScrollRegion() {
-        this.input.enterStreamingScrollRegion();
-    }
-    /**
-     * Exit streaming scroll region mode.
-     * Call once at the end of streaming.
-     */
-    exitStreamingScrollRegion() {
-        this.input.exitStreamingScrollRegion();
-    }
-    /**
-     * Get scrollback buffer content for persistence.
-     */
-    getScrollbackBuffer() {
-        return this.input.getScrollbackBuffer();
-    }
-    /**
-     * Load scrollback buffer for restoration.
-     */
-    loadScrollbackBuffer(lines) {
-        this.input.loadScrollbackBuffer(lines);
-    }
-    /**
-     * Clear scrollback buffer.
-     */
-    clearScrollbackBuffer() {
-        this.input.clearScrollbackBuffer();
-    }
-    /**
-     * Check if alternate screen buffer is currently active.
-     */
-    isAlternateScreenActive() {
-        return this.input.isAlternateScreenActive();
-    }
-    /**
-     * Get a snapshot of the scrollback buffer (for display on exit).
-     */
-    getScrollbackSnapshot() {
-        return this.input.getScrollbackSnapshot();
-    }
-    /**
-     * Reset content position to top of scroll region.
-     */
-    resetContentPosition() {
-        this.input.resetContentPosition();
-    }
-    /**
-     * Set the content row explicitly (used after banner is written).
-     */
-    setContentRow(row) {
-        this.input.setContentRow(row);
-    }
-    /**
-     * Get the current content row position.
-     */
-    getContentRow() {
-        return this.input.getContentRow();
-    }
     /**
      * Handle terminal resize
      */
@@ -322,12 +205,24 @@ export class TerminalInputAdapter {
         return this.input;
     }
     /**
-     * Register with display's output interceptor for cursor positioning.
-     * This ensures streamed output goes to the scroll region during processing.
+     * Register with display's output interceptor (kept for API compatibility).
      */
     registerOutputInterceptor(display) {
         this.input.registerOutputInterceptor(display);
     }
+    /**
+     * Set banner content to be written when unified UI initializes.
+     */
+    setBannerContent(content) {
+        this.input.setBannerContent(content);
+    }
+    /**
+     * Initialize the unified UI system.
+     * Clears screen, writes banner, renders input area.
+     */
+    initializeUnifiedUI() {
+        this.input.initializeUnifiedUI();
+    }
     // ===========================================================================
     // PRIVATE
     // ===========================================================================

package/dist/shell/terminalInputAdapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"terminalInputAdapter.js","sourceRoot":"","sources":["../../src/shell/terminalInputAdapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"terminalInputAdapter.js","sourceRoot":"","sources":["../../src/shell/terminalInputAdapter.ts"],"names":[],"mappings":"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"}

package/dist/subagents/taskRunner.d.ts

@@ -1,26 +1,20 @@
 import type { CapabilityContext } from '../runtime/agentHost.js';
-import { AgentRegistry, type AgentDefinition } from './agentRegistry.js';
 type TaskModelName = 'sonnet' | 'opus' | 'haiku';
-type TaskThoroughness = 'quick' | 'medium' | 'very_thorough';
 export interface TaskInvocationOptions {
     description: string;
     prompt: string;
     subagentType: string;
     model?: TaskModelName;
     resumeId?: string;
-    thoroughness?: TaskThoroughness;
 }
 interface TaskExecutionResult {
     output: string;
 }
-export declare const BUILTIN_AGENT_DEFINITIONS: AgentDefinition[];
 export declare class TaskRunner {
     private readonly context;
-    private readonly registry;
     private readonly snapshots;
-    constructor(context: CapabilityContext, registry?: AgentRegistry);
+    constructor(context: CapabilityContext);
     runTask(options: TaskInvocationOptions): Promise<TaskExecutionResult>;
-    private buildToolRuntime;
     private resolveToolPermissions;
     private buildModelSelection;
     private composeSystemPrompt;

package/dist/subagents/taskRunner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"taskRunner.d.ts","sourceRoot":"","sources":["../../src/subagents/taskRunner.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAQjE,OAAO,EAAE,aAAa,EAAE,KAAK,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAEzE,KAAK,aAAa,GAAG,QAAQ,GAAG,MAAM,GAAG,OAAO,CAAC;AACjD,KAAK,gBAAgB,GAAG,OAAO,GAAG,QAAQ,GAAG,eAAe,CAAC;AAE7D,MAAM,WAAW,qBAAqB;IACpC,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,gBAAgB,CAAC;CACjC;AAED,UAAU,mBAAmB;IAC3B,MAAM,EAAE,MAAM,CAAC;CAChB;AAYD,eAAO,MAAM,yBAAyB,EAAE,eAAe,EAsCtD,CAAC;AAUF,qBAAa,UAAU;IACrB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAoB;IAC5C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAgB;IACzC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA2B;gBAEzC,OAAO,EAAE,iBAAiB,EAAE,QAAQ,CAAC,EAAE,aAAa;IAU1D,OAAO,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,mBAAmB,CAAC;IA2G3E,OAAO,CAAC,gBAAgB;IAkBxB,OAAO,CAAC,sBAAsB;IAS9B,OAAO,CAAC,mBAAmB;IAuB3B,OAAO,CAAC,mBAAmB;CAwD5B"}
+{"version":3,"file":"taskRunner.d.ts","sourceRoot":"","sources":["../../src/subagents/taskRunner.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAQjE,KAAK,aAAa,GAAG,QAAQ,GAAG,MAAM,GAAG,OAAO,CAAC;AAEjD,MAAM,WAAW,qBAAqB;IACpC,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,mBAAmB;IAC3B,MAAM,EAAE,MAAM,CAAC;CAChB;AA6DD,qBAAa,UAAU;IACrB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAoB;IAC5C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA2B;gBAEzC,OAAO,EAAE,iBAAiB;IAIhC,OAAO,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAyF3E,OAAO,CAAC,sBAAsB;IAS9B,OAAO,CAAC,mBAAmB;IAsB3B,OAAO,CAAC,mBAAmB;CAkB5B"}

package/dist/subagents/taskRunner.js

@@ -5,46 +5,38 @@ import { join } from 'node:path';
 import { createNodeRuntime } from '../runtime/node.js';
 import { loadToolSettings } from '../core/preferences.js';
 import { buildEnabledToolSet, evaluateToolPermissions } from '../capabilities/toolRegistry.js';
-import { AgentRegistry } from './agentRegistry.js';
-export const BUILTIN_AGENT_DEFINITIONS = [
-    {
-        name: 'general-purpose',
-        description: 'Complete research, editing, and implementation tasks end-to-end.',
-        summary: 'Autonomous agent for multi-step work.',
-        prompt: [
+const SUBAGENT_DEFINITIONS = {
+    'general-purpose': {
+        id: 'general-purpose',
+        label: 'General Purpose',
+        summary: 'complete research, editing, and implementation tasks end-to-end',
+        instructions: [
             'Own the entire task autonomously. Narrate your plan, gather context with filesystem/search tools, and make changes when necessary.',
             'Always cite the evidence, commands, and files you touched. Include TODOs or risks that need human review.',
-        ].join('\n'),
-        model: 'sonnet',
-        source: 'builtin',
+        ],
+        defaultModel: 'sonnet',
     },
-    {
-        name: 'explore',
-        description: 'Fast, read-only agent for mapping codebases and answering structural questions.',
-        summary: 'Read/search focused, no edits.',
-        prompt: [
-            'Operate in read-only mode. Do not edit files or run mutating commands.',
+    explore: {
+        id: 'explore',
+        label: 'Explore',
+        summary: 'map the codebase, answer architectural questions, and locate patterns quickly',
+        instructions: [
             'Prioritize read/search/glob tools before editing. Call out every directory or file you investigated.',
             'Return a crisp summary of what you learned plus direct file references so the parent agent can follow up.',
-        ].join('\n'),
-        tools: ['read', 'read_file', 'read_files', 'list_files', 'search_files', 'glob_search', 'grep_search', 'find_definition', 'context_snapshot'],
-        model: 'haiku',
-        source: 'builtin',
+        ],
+        defaultModel: 'haiku',
     },
-    {
-        name: 'plan',
-        description: 'Break down complex efforts into actionable steps and identify risks or dependencies.',
-        summary: 'Planning-first, read/search only.',
-        prompt: [
+    plan: {
+        id: 'plan',
+        label: 'Plan',
+        summary: 'break down complex efforts into actionable steps and identify risks or dependencies',
+        instructions: [
             'Produce a numbered plan with estimates, dependency notes, and explicit testing checkpoints.',
             'If the task mentions code changes, suggest which files/modules should be edited and why before any implementation occurs.',
-            'Do not modify files directly; focus on analysis and recommendations.',
-        ].join('\n'),
-        tools: ['read', 'read_file', 'read_files', 'list_files', 'search_files', 'glob_search', 'grep_search', 'find_definition', 'context_snapshot'],
-        model: 'sonnet',
-        source: 'builtin',
+        ],
+        defaultModel: 'sonnet',
     },
-];
+};
 const MODEL_ID_LOOKUP = {
     sonnet: { provider: 'anthropic', model: 'claude-sonnet-4-5-20250929' },
     opus: { provider: 'anthropic', model: 'claude-opus-4-20250514' },
@@ -53,24 +45,12 @@ const MODEL_ID_LOOKUP = {
 const TASK_STORE_DIR = join(homedir(), '.erosolar', 'tasks');
 export class TaskRunner {
     context;
-    registry;
     snapshots = new TaskSnapshotStore();
-    constructor(context, registry) {
+    constructor(context) {
         this.context = context;
-        this.registry =
-            registry ??
-                new AgentRegistry({
-                    workingDir: context.workingDir,
-                    builtIns: BUILTIN_AGENT_DEFINITIONS,
-                });
     }
     async runTask(options) {
-        this.registry.refresh();
-        const definition = this.registry.resolve(options.subagentType);
-        if (!definition) {
-            const available = this.registry.list().map((agent) => agent.name).join(', ');
-            throw new Error(`Subagent "${options.subagentType}" is not defined. Available agents: ${available || 'none found'}`);
-        }
+        const definition = resolveSubAgentDefinition(options.subagentType);
         const { allowedPluginIds } = this.resolveToolPermissions();
         const adapterOptions = allowedPluginIds.size
             ? {
@@ -86,14 +66,8 @@ export class TaskRunner {
         });
         try {
             const session = runtime.session;
-            const preferredModel = options.model ?? definition.model;
-            const selection = this.buildModelSelection(session.profileConfig, preferredModel);
-            const { runtime: toolRuntime, allowedTools, missingTools } = this.buildToolRuntime(session.toolRuntime, definition.tools);
-            const systemPrompt = this.composeSystemPrompt(session.profileConfig.systemPrompt, definition, options.description, {
-                thoroughness: options.thoroughness,
-                allowedTools,
-                missingTools,
-            });
+            const selection = this.buildModelSelection(session.profileConfig, options.model ?? definition.defaultModel);
+            const systemPrompt = this.composeSystemPrompt(session.profileConfig.systemPrompt, definition, options.description);
             let finalMetadata = null;
             const agent = session.createAgent({
                 provider: selection.provider,
@@ -107,7 +81,7 @@ export class TaskRunner {
                         finalMetadata = metadata;
                     }
                 },
-            }, toolRuntime);
+            });
             const resumeSnapshot = options.resumeId ? await this.snapshots.load(options.resumeId) : null;
             if (options.resumeId && !resumeSnapshot) {
                 throw new Error(`Resume id "${options.resumeId}" was not found. Call Task without resume to start a new agent.`);
@@ -124,7 +98,7 @@ export class TaskRunner {
                 id: resumeId,
                 profile: this.context.profile,
                 description: options.description,
-                subagentType: definition.name,
+                subagentType: definition.id,
                 history,
                 createdAt: resumeSnapshot?.createdAt ?? new Date().toISOString(),
                 updatedAt: new Date().toISOString(),
@@ -133,7 +107,7 @@ export class TaskRunner {
             const usageLine = formatUsage(extractUsage(finalMetadata));
             const durationLine = `Duration: ${formatDuration(durationMs)}${usageLine ? ` | ${usageLine}` : ''}`;
             const lines = [
-                `Task "${options.description}" completed by ${definition.name} agent (${selection.model})`,
+                `Task "${options.description}" completed by ${definition.label} agent (${selection.model})`,
                 `${durationLine} | Resume ID: ${resumeId}`,
             ];
             if (definition.summary) {
@@ -149,18 +123,6 @@ export class TaskRunner {
             await runtime.host.dispose();
         }
     }
-    buildToolRuntime(baseRuntime, requestedTools) {
-        if (!requestedTools?.length) {
-            return { runtime: baseRuntime, allowedTools: [], missingTools: [] };
-        }
-        const available = baseRuntime.listProviderTools();
-        const { allowedNames, missing } = resolveAllowedToolNames(requestedTools, available);
-        if (!allowedNames.size) {
-            return { runtime: baseRuntime, allowedTools: [], missingTools: missing };
-        }
-        const runtime = new RestrictedToolRuntime(baseRuntime, allowedNames);
-        return { runtime, allowedTools: Array.from(allowedNames), missingTools: missing };
-    }
     resolveToolPermissions() {
         const settings = loadToolSettings();
         const selection = buildEnabledToolSet(settings);
@@ -170,9 +132,8 @@ export class TaskRunner {
         };
     }
     buildModelSelection(profile, preferred) {
-        const normalized = preferred?.trim().toLowerCase();
-        if (normalized && normalized !== 'inherit' && MODEL_ID_LOOKUP[normalized]) {
-            const mapping = MODEL_ID_LOOKUP[normalized];
+        if (preferred && MODEL_ID_LOOKUP[preferred]) {
+            const mapping = MODEL_ID_LOOKUP[preferred];
             return {
                 provider: mapping.provider,
                 model: mapping.model,
@@ -187,46 +148,16 @@ export class TaskRunner {
             maxTokens: profile.maxTokens,
         };
     }
-    composeSystemPrompt(basePrompt, definition, description, extras) {
-        const toolLine = extras.allowedTools.length
-            ? `Allowed tools for this subagent: ${extras.allowedTools.join(', ')}.`
-            : 'This subagent inherits all tools available to the parent agent.';
-        const missingLine = extras.missingTools.length
-            ? `Requested but unavailable tools: ${extras.missingTools.join(', ')}.`
-            : null;
-        const thoroughnessLine = extras.thoroughness
-            ? `Requested exploration thoroughness: ${extras.thoroughness.replace('_', ' ')}.`
-            : null;
-        const permissionLine = definition.permissionMode
-            ? `Permission mode: ${definition.permissionMode}`
-            : null;
-        const skillsLine = definition.skills && definition.skills.length
-            ? `Auto-load skills: ${definition.skills.join(', ')}`
-            : null;
-        const agentMeta = [
-            `Subagent: ${definition.name}`,
-            `Purpose: ${definition.summary || definition.description}`,
-            toolLine,
-            missingLine,
-            permissionLine,
-            skillsLine,
-            thoroughnessLine,
-        ]
-            .filter(Boolean)
-            .join('\n');
+    composeSystemPrompt(basePrompt, definition, description) {
         const lines = [
             basePrompt.trim(),
             '',
             'You are an autonomous sub-agent launched via the Task tool. Operate independently and return a single comprehensive report to the parent agent.',
             `Task summary: ${description}`,
-            agentMeta,
+            `Agent specialization: ${definition.summary}`,
             '',
             'Execution rules:',
-            '- Use ONLY the tools listed above. Do not request tools that are unavailable.',
-            '- Keep your own context focused; do not bloat the response with unnecessary content.',
-            '- Always cite the evidence, commands, and files you touched so the parent agent can verify your work.',
-            '- If you are read-only, explicitly state any edits you avoided and the files you inspected.',
-            definition.prompt,
+            ...definition.instructions.map((line, index) => `${index + 1}. ${line}`),
             '',
             'When you finish:',
             '- Provide a concise summary with actionable next steps.',
@@ -236,82 +167,6 @@ export class TaskRunner {
         return lines.join('\n').trim();
     }
 }
-const BASELINE_ALLOWED_TOOLS = ['context_snapshot', 'capabilities_overview', 'profile_details'];
-class RestrictedToolRuntime {
-    base;
-    allowed;
-    constructor(base, allowed) {
-        this.base = base;
-        this.allowed = allowed;
-    }
-    listProviderTools() {
-        return this.base.listProviderTools().filter((tool) => this.allowed.has(tool.name));
-    }
-    async execute(call, context) {
-        if (!this.allowed.has(call.name)) {
-            const allowedList = Array.from(this.allowed).join(', ');
-            return `Tool "${call.name}" is not allowed for this agent. Allowed tools: ${allowedList || 'none'}.`;
-        }
-        return this.base.execute(call, context);
-    }
-    registerSuite(suite) {
-        this.base.registerSuite(suite);
-    }
-    unregisterSuite(id) {
-        this.base.unregisterSuite(id);
-    }
-    clearCache() {
-        this.base.clearCache();
-    }
-    getCacheStats() {
-        return this.base.getCacheStats();
-    }
-    clearToolHistory() {
-        this.base.clearToolHistory();
-    }
-    getToolHistory() {
-        return this.base.getToolHistory();
-    }
-}
-function resolveAllowedToolNames(requested, available) {
-    const normalizedAvailable = new Map();
-    for (const tool of available) {
-        normalizedAvailable.set(normalizeToolName(tool.name), tool.name);
-    }
-    const allowed = new Set();
-    const missing = [];
-    // Always allow baseline runtime metadata tools
-    for (const name of BASELINE_ALLOWED_TOOLS) {
-        const normalized = normalizeToolName(name);
-        if (normalizedAvailable.has(normalized)) {
-            allowed.add(normalizedAvailable.get(normalized));
-        }
-        else {
-            allowed.add(name);
-        }
-    }
-    for (const entry of requested) {
-        const normalized = normalizeToolName(entry);
-        if (!normalized) {
-            continue;
-        }
-        const exact = normalizedAvailable.get(normalized);
-        if (exact) {
-            allowed.add(exact);
-            continue;
-        }
-        const fuzzy = Array.from(normalizedAvailable.entries()).find(([candidate]) => candidate.includes(normalized) || normalized.includes(candidate));
-        if (fuzzy) {
-            allowed.add(fuzzy[1]);
-            continue;
-        }
-        missing.push(entry);
-    }
-    return { allowedNames: allowed, missing };
-}
-function normalizeToolName(value) {
-    return value.replace(/[^a-z0-9]/gi, '').toLowerCase();
-}
 class TaskSnapshotStore {
     async load(id) {
         try {
@@ -342,6 +197,18 @@ class TaskSnapshotStore {
         return `task_${randomUUID()}`;
     }
 }
+function resolveSubAgentDefinition(name) {
+    const normalized = name ? name.trim().toLowerCase() : '';
+    const candidate = normalized ? SUBAGENT_DEFINITIONS[normalized] : undefined;
+    if (candidate) {
+        return candidate;
+    }
+    const fallback = SUBAGENT_DEFINITIONS['general-purpose'];
+    if (!fallback) {
+        throw new Error('General-purpose subagent definition is missing.');
+    }
+    return fallback;
+}
 function sanitizeId(value) {
     return value.replace(/[^a-zA-Z0-9_-]/g, '').slice(0, 64) || 'task';
 }