erosolar-cli 1.7.282 → 1.7.284

package/dist/subagents/agentConfig.js

@@ -0,0 +1,89 @@
+let inlineAgentConfig = null;
+/**
+  * Set inline agent config (from CLI flag or env). Values are normalized eagerly.
+  */
+export function setInlineAgentConfig(config) {
+    inlineAgentConfig = config ? normalizeConfig(config) : null;
+}
+/**
+ * Retrieve the current inline agent configuration.
+ */
+export function getInlineAgentConfig() {
+    return inlineAgentConfig;
+}
+/**
+ * Parse a JSON string into inline agent config, throwing a descriptive error on failure.
+ */
+export function parseInlineAgentConfig(json) {
+    try {
+        const parsed = JSON.parse(json);
+        if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+            throw new Error('Inline agents must be an object keyed by agent name.');
+        }
+        return normalizeConfig(parsed);
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : 'Unknown error parsing inline agents';
+        throw new Error(`Invalid inline agent config: ${message}`);
+    }
+}
+/**
+ * Load inline agent config from environment variables.
+ * Supports EROSOLAR_AGENTS as a JSON string.
+ */
+export function loadInlineAgentConfigFromEnv(env = process.env) {
+    const raw = env['EROSOLAR_AGENTS']?.trim();
+    if (!raw) {
+        return null;
+    }
+    try {
+        return parseInlineAgentConfig(raw);
+    }
+    catch (error) {
+        console.warn('[agent-config] Failed to parse EROSOLAR_AGENTS:', error);
+        return null;
+    }
+}
+function normalizeConfig(config) {
+    const normalized = {};
+    for (const [key, value] of Object.entries(config)) {
+        if (!key.trim()) {
+            continue;
+        }
+        const agentName = key.trim();
+        if (!value || typeof value !== 'object') {
+            continue;
+        }
+        const record = value;
+        const description = typeof record['description'] === 'string' ? record['description'].trim() : undefined;
+        const prompt = typeof record['prompt'] === 'string' ? record['prompt'].trim() : undefined;
+        const model = typeof record['model'] === 'string' ? record['model'].trim() : undefined;
+        const permissionMode = typeof record['permissionMode'] === 'string' ? record['permissionMode'].trim() : undefined;
+        const tools = normalizeStringList(record['tools']);
+        const skills = normalizeStringList(record['skills']);
+        normalized[agentName] = {
+            description,
+            prompt,
+            model,
+            permissionMode,
+            tools,
+            skills,
+        };
+    }
+    return normalized;
+}
+function normalizeStringList(value) {
+    if (typeof value === 'string') {
+        const trimmed = value.trim();
+        return trimmed ? [trimmed] : undefined;
+    }
+    if (Array.isArray(value)) {
+        const entries = value
+            .filter((entry) => typeof entry === 'string')
+            .map((entry) => entry.trim())
+            .filter(Boolean);
+        return entries.length ? entries : undefined;
+    }
+    return undefined;
+}
+//# sourceMappingURL=agentConfig.js.map

package/dist/subagents/agentConfig.js.map

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

package/dist/subagents/agentRegistry.d.ts

@@ -0,0 +1,33 @@
+import { InlineAgentConfigMap } from './agentConfig.js';
+export type AgentSource = 'builtin' | 'project' | 'user' | 'inline';
+export interface AgentDefinition {
+    name: string;
+    description: string;
+    prompt: string;
+    tools?: string[];
+    model?: string;
+    permissionMode?: string;
+    skills?: string[];
+    source: AgentSource;
+    path?: string;
+    summary?: string;
+}
+export interface AgentRegistryOptions {
+    workingDir: string;
+    inlineAgents?: InlineAgentConfigMap | null;
+    builtIns?: AgentDefinition[];
+}
+export declare class AgentRegistry {
+    private readonly workingDir;
+    private readonly inlineAgents;
+    private readonly builtIns;
+    private agents;
+    constructor(options: AgentRegistryOptions);
+    refresh(): AgentDefinition[];
+    list(): AgentDefinition[];
+    resolve(name: string): AgentDefinition | null;
+    private register;
+    private loadFromDirectory;
+    private loadInlineAgents;
+}
+//# sourceMappingURL=agentRegistry.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"agentRegistry.d.ts","sourceRoot":"","sources":["../../src/subagents/agentRegistry.ts"],"names":[],"mappings":"AAIA,OAAO,EAAwB,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAE9E,MAAM,MAAM,WAAW,GAAG,SAAS,GAAG,SAAS,GAAG,MAAM,GAAG,QAAQ,CAAC;AAEpE,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,EAAE,WAAW,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,oBAAoB;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,oBAAoB,GAAG,IAAI,CAAC;IAC3C,QAAQ,CAAC,EAAE,eAAe,EAAE,CAAC;CAC9B;AAKD,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAA8B;IAC3D,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAoB;IAC7C,OAAO,CAAC,MAAM,CAAsC;gBAExC,OAAO,EAAE,oBAAoB;IAOzC,OAAO,IAAI,eAAe,EAAE;IAwB5B,IAAI,IAAI,eAAe,EAAE;IAIzB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,GAAG,IAAI;IAK7C,OAAO,CAAC,QAAQ;IAWhB,OAAO,CAAC,iBAAiB;IAiDzB,OAAO,CAAC,gBAAgB;CAkBzB"}

package/dist/subagents/agentRegistry.js

@@ -0,0 +1,162 @@
+import { existsSync, readFileSync, readdirSync, statSync } from 'node:fs';
+import { join, basename } from 'node:path';
+import { homedir } from 'node:os';
+import { parseFrontmatter } from '../utils/frontmatter.js';
+import { getInlineAgentConfig } from './agentConfig.js';
+const PROJECT_AGENT_DIR = '.claude/agents';
+const USER_AGENT_DIR = '.claude/agents';
+export class AgentRegistry {
+    workingDir;
+    inlineAgents;
+    builtIns;
+    agents = new Map();
+    constructor(options) {
+        this.workingDir = options.workingDir;
+        this.inlineAgents = options.inlineAgents ?? getInlineAgentConfig();
+        this.builtIns = options.builtIns ?? [];
+        this.refresh();
+    }
+    refresh() {
+        this.agents.clear();
+        // Lowest priority: built-in agents
+        for (const agent of this.builtIns) {
+            this.register(agent);
+        }
+        // User-level agents (~/.claude/agents)
+        const userDir = join(homedir(), USER_AGENT_DIR);
+        this.loadFromDirectory(userDir, 'user');
+        // Inline agents (CLI/env)
+        if (this.inlineAgents) {
+            this.loadInlineAgents(this.inlineAgents);
+        }
+        // Project-level agents (.claude/agents)
+        const projectDir = join(this.workingDir, PROJECT_AGENT_DIR);
+        this.loadFromDirectory(projectDir, 'project');
+        return this.list();
+    }
+    list() {
+        return Array.from(this.agents.values()).sort((a, b) => a.name.localeCompare(b.name));
+    }
+    resolve(name) {
+        const key = normalizeName(name);
+        return this.agents.get(key) ?? null;
+    }
+    register(agent) {
+        const key = normalizeName(agent.name);
+        if (!key) {
+            return;
+        }
+        this.agents.set(key, {
+            ...agent,
+            name: key,
+        });
+    }
+    loadFromDirectory(dir, source) {
+        if (!existsSync(dir)) {
+            return;
+        }
+        let entries = [];
+        try {
+            entries = readdirSync(dir);
+        }
+        catch {
+            return;
+        }
+        for (const entry of entries) {
+            const fullPath = join(dir, entry);
+            try {
+                const stats = statSync(fullPath);
+                if (stats.isDirectory()) {
+                    this.loadFromDirectory(fullPath, source);
+                    continue;
+                }
+                if (!entry.toLowerCase().endsWith('.md')) {
+                    continue;
+                }
+                const content = readFileSync(fullPath, 'utf8');
+                const parsed = parseFrontmatter(content);
+                const name = normalizeName(parsed.attributes.name || basename(entry, '.md'));
+                if (!name) {
+                    continue;
+                }
+                const description = extractDescription(parsed);
+                const prompt = parsed.body?.trim() || '';
+                this.register({
+                    name,
+                    description,
+                    prompt,
+                    tools: normalizeStringList(parsed.attributes.tools),
+                    model: parsed.attributes.model ? String(parsed.attributes.model) : undefined,
+                    permissionMode: parsed.attributes.permissionMode ? String(parsed.attributes.permissionMode) : undefined,
+                    skills: normalizeStringList(parsed.attributes.skills),
+                    summary: parsed.attributes.summary ? String(parsed.attributes.summary) : undefined,
+                    source,
+                    path: fullPath,
+                });
+            }
+            catch (error) {
+                console.warn(`[agent-registry] Failed to load agent from ${fullPath}:`, error);
+            }
+        }
+    }
+    loadInlineAgents(definitions) {
+        for (const [name, config] of Object.entries(definitions)) {
+            const normalized = normalizeName(name);
+            if (!normalized) {
+                continue;
+            }
+            this.register({
+                name: normalized,
+                description: config.description || `Inline agent ${normalized}`,
+                prompt: config.prompt || '',
+                tools: Array.isArray(config.tools) ? config.tools : config.tools ? [config.tools] : undefined,
+                model: config.model,
+                permissionMode: config.permissionMode,
+                skills: Array.isArray(config.skills) ? config.skills : config.skills ? [config.skills] : undefined,
+                source: 'inline',
+            });
+        }
+    }
+}
+function normalizeName(value) {
+    if (typeof value !== 'string') {
+        return '';
+    }
+    const trimmed = value.trim();
+    if (!trimmed) {
+        return '';
+    }
+    return trimmed.toLowerCase().replace(/\s+/g, '-');
+}
+function normalizeStringList(value) {
+    if (!value) {
+        return undefined;
+    }
+    if (typeof value === 'string') {
+        const trimmed = value.trim();
+        if (!trimmed) {
+            return undefined;
+        }
+        return trimmed.split(',').map((entry) => entry.trim()).filter(Boolean);
+    }
+    if (Array.isArray(value)) {
+        const normalized = value
+            .filter((entry) => typeof entry === 'string')
+            .map((entry) => entry.trim())
+            .filter(Boolean);
+        return normalized.length ? normalized : undefined;
+    }
+    return undefined;
+}
+function extractDescription(parsed) {
+    const attrDescription = typeof parsed.attributes['description'] === 'string' ? parsed.attributes['description'].trim() : '';
+    if (attrDescription) {
+        return attrDescription;
+    }
+    const firstLine = parsed.body?.split('\n').find((line) => line.trim().length > 0);
+    if (firstLine) {
+        return firstLine.trim().slice(0, 200);
+    }
+    return 'Custom subagent';
+}
+//# sourceMappingURL=agentRegistry.js.map

package/dist/subagents/agentRegistry.js.map

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

package/dist/subagents/taskRunner.d.ts

@@ -1,20 +1,26 @@
 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);
+    constructor(context: CapabilityContext, registry?: AgentRegistry);
     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,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"}
+{"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"}

package/dist/subagents/taskRunner.js

@@ -5,38 +5,46 @@ import { join } from 'node:path';
 import { createNodeRuntime } from '../runtime/node.js';
 import { loadToolSettings } from '../core/preferences.js';
 import { buildEnabledToolSet, evaluateToolPermissions } from '../capabilities/toolRegistry.js';
-const SUBAGENT_DEFINITIONS = {
-    'general-purpose': {
-        id: 'general-purpose',
-        label: 'General Purpose',
-        summary: 'complete research, editing, and implementation tasks end-to-end',
-        instructions: [
+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: [
             '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.',
-        ],
-        defaultModel: 'sonnet',
+        ].join('\n'),
+        model: 'sonnet',
+        source: 'builtin',
     },
-    explore: {
-        id: 'explore',
-        label: 'Explore',
-        summary: 'map the codebase, answer architectural questions, and locate patterns quickly',
-        instructions: [
+    {
+        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.',
             '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.',
-        ],
-        defaultModel: 'haiku',
+        ].join('\n'),
+        tools: ['read', 'read_file', 'read_files', 'list_files', 'search_files', 'glob_search', 'grep_search', 'find_definition', 'context_snapshot'],
+        model: 'haiku',
+        source: 'builtin',
     },
-    plan: {
-        id: 'plan',
-        label: 'Plan',
-        summary: 'break down complex efforts into actionable steps and identify risks or dependencies',
-        instructions: [
+    {
+        name: 'plan',
+        description: 'Break down complex efforts into actionable steps and identify risks or dependencies.',
+        summary: 'Planning-first, read/search only.',
+        prompt: [
             '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.',
-        ],
-        defaultModel: 'sonnet',
+            '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',
     },
-};
+];
 const MODEL_ID_LOOKUP = {
     sonnet: { provider: 'anthropic', model: 'claude-sonnet-4-5-20250929' },
     opus: { provider: 'anthropic', model: 'claude-opus-4-20250514' },
@@ -45,12 +53,24 @@ const MODEL_ID_LOOKUP = {
 const TASK_STORE_DIR = join(homedir(), '.erosolar', 'tasks');
 export class TaskRunner {
     context;
+    registry;
     snapshots = new TaskSnapshotStore();
-    constructor(context) {
+    constructor(context, registry) {
         this.context = context;
+        this.registry =
+            registry ??
+                new AgentRegistry({
+                    workingDir: context.workingDir,
+                    builtIns: BUILTIN_AGENT_DEFINITIONS,
+                });
     }
     async runTask(options) {
-        const definition = resolveSubAgentDefinition(options.subagentType);
+        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 { allowedPluginIds } = this.resolveToolPermissions();
         const adapterOptions = allowedPluginIds.size
             ? {
@@ -66,8 +86,14 @@ export class TaskRunner {
         });
         try {
             const session = runtime.session;
-            const selection = this.buildModelSelection(session.profileConfig, options.model ?? definition.defaultModel);
-            const systemPrompt = this.composeSystemPrompt(session.profileConfig.systemPrompt, definition, options.description);
+            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,
+            });
             let finalMetadata = null;
             const agent = session.createAgent({
                 provider: selection.provider,
@@ -81,7 +107,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.`);
@@ -98,7 +124,7 @@ export class TaskRunner {
                 id: resumeId,
                 profile: this.context.profile,
                 description: options.description,
-                subagentType: definition.id,
+                subagentType: definition.name,
                 history,
                 createdAt: resumeSnapshot?.createdAt ?? new Date().toISOString(),
                 updatedAt: new Date().toISOString(),
@@ -107,7 +133,7 @@ export class TaskRunner {
             const usageLine = formatUsage(extractUsage(finalMetadata));
             const durationLine = `Duration: ${formatDuration(durationMs)}${usageLine ? ` | ${usageLine}` : ''}`;
             const lines = [
-                `Task "${options.description}" completed by ${definition.label} agent (${selection.model})`,
+                `Task "${options.description}" completed by ${definition.name} agent (${selection.model})`,
                 `${durationLine} | Resume ID: ${resumeId}`,
             ];
             if (definition.summary) {
@@ -123,6 +149,18 @@ 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);
@@ -132,8 +170,9 @@ export class TaskRunner {
         };
     }
     buildModelSelection(profile, preferred) {
-        if (preferred && MODEL_ID_LOOKUP[preferred]) {
-            const mapping = MODEL_ID_LOOKUP[preferred];
+        const normalized = preferred?.trim().toLowerCase();
+        if (normalized && normalized !== 'inherit' && MODEL_ID_LOOKUP[normalized]) {
+            const mapping = MODEL_ID_LOOKUP[normalized];
             return {
                 provider: mapping.provider,
                 model: mapping.model,
@@ -148,16 +187,46 @@ export class TaskRunner {
             maxTokens: profile.maxTokens,
         };
     }
-    composeSystemPrompt(basePrompt, definition, description) {
+    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');
         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}`,
-            `Agent specialization: ${definition.summary}`,
+            agentMeta,
             '',
             'Execution rules:',
-            ...definition.instructions.map((line, index) => `${index + 1}. ${line}`),
+            '- 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,
             '',
             'When you finish:',
             '- Provide a concise summary with actionable next steps.',
@@ -167,6 +236,82 @@ 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 {
@@ -197,18 +342,6 @@ 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';
 }