@dexto/agent-management 1.5.7 → 1.6.0

package/dist/{tool-provider → tool-factories/agent-spawner}/llm-resolution.d.ts

@@ -5,7 +5,7 @@
  * this module determines which LLM configuration the sub-agent should use.
  *
  * Resolution priority:
- * 1. If parent's provider can serve sub-agent's model (dexto/openrouter/same provider)
+ * 1. If parent's provider can serve sub-agent's model (dexto-nova/openrouter/same provider)
  *    → Use parent's provider + sub-agent's model (transformed if needed)
  * 2. If incompatible providers
  *    → Fall back to parent's full LLM config (with warning)
@@ -40,12 +40,12 @@ export interface ResolveSubAgentLLMOptions {
  * when possible, while leveraging the parent's provider/credentials.
  *
  * @example
- * // Parent uses dexto, sub-agent wants anthropic/haiku
+ * // Parent uses dexto-nova, sub-agent wants anthropic/haiku
  * resolveSubAgentLLM({
  *   subAgentLLM: { provider: 'anthropic', model: 'claude-haiku-4-5-20251001', apiKey: '$ANTHROPIC_API_KEY' },
- *   parentLLM: { provider: 'dexto', model: 'anthropic/claude-sonnet-4', apiKey: '$DEXTO_API_KEY' }
+ *   parentLLM: { provider: 'dexto-nova', model: 'anthropic/claude-sonnet-4', apiKey: '$DEXTO_API_KEY' }
  * })
- * // Returns: { provider: 'dexto', model: 'anthropic/claude-haiku-4.5', apiKey: '$DEXTO_API_KEY' }
+ * // Returns: { provider: 'dexto-nova', model: 'anthropic/claude-haiku-4.5', apiKey: '$DEXTO_API_KEY' }
  */
 export declare function resolveSubAgentLLM(options: ResolveSubAgentLLMOptions): SubAgentLLMResolution;
 //# sourceMappingURL=llm-resolution.d.ts.map

package/dist/tool-factories/agent-spawner/llm-resolution.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"llm-resolution.d.ts","sourceRoot":"","sources":["../../../src/tool-factories/agent-spawner/llm-resolution.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAG7C;;GAEG;AACH,MAAM,WAAW,qBAAqB;IAClC,4CAA4C;IAC5C,GAAG,EAAE,SAAS,CAAC;IACf,wCAAwC;IACxC,UAAU,EACJ,mBAAmB,GACnB,eAAe,GACf,iBAAiB,CAAC;IACxB,+CAA+C;IAC/C,MAAM,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,yBAAyB;IACtC,gDAAgD;IAChD,WAAW,EAAE,SAAS,CAAC;IACvB,6EAA6E;IAC7E,SAAS,EAAE,SAAS,CAAC;IACrB,wCAAwC;IACxC,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,yBAAyB,GAAG,qBAAqB,CAmE5F"}

package/dist/{tool-provider → tool-factories/agent-spawner}/llm-resolution.js

@@ -42,7 +42,7 @@ function resolveSubAgentLLM(options) {
   return {
     llm: parentLLM,
     resolution: "parent-fallback",
-    reason: `${agentLabel} cannot use ${subAgentProvider}/${subAgentModel} with parent's ${parentProvider} provider. Falling back to parent's LLM config. Tip: Use 'dexto login' for Dexto Credits which supports all models.`
+    reason: `${agentLabel} cannot use ${subAgentProvider}/${subAgentModel} with parent's ${parentProvider} provider. Falling back to parent's LLM config. Tip: Use 'dexto login' for Dexto Nova Credits which supports all models.`
   };
 }
 export {

package/dist/{tool-provider/runtime-service.cjs → tool-factories/agent-spawner/runtime.cjs}

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -15,24 +17,66 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var runtime_service_exports = {};
-__export(runtime_service_exports, {
-  RuntimeService: () => RuntimeService
+var runtime_exports = {};
+__export(runtime_exports, {
+  AgentSpawnerRuntime: () => AgentSpawnerRuntime
 });
-module.exports = __toCommonJS(runtime_service_exports);
+module.exports = __toCommonJS(runtime_exports);
 var import_core = require("@dexto/core");
-var import_AgentRuntime = require("../runtime/AgentRuntime.js");
-var import_approval_delegation = require("../runtime/approval-delegation.js");
-var import_loader = require("../config/loader.js");
-var import_registry = require("../registry/registry.js");
+var import_AgentRuntime = require("../../runtime/AgentRuntime.js");
+var import_approval_delegation = require("../../runtime/approval-delegation.js");
+var import_loader = require("../../config/loader.js");
+var import_registry = require("../../registry/registry.js");
+var import_types = require("../../registry/types.js");
+var import_path = require("../../utils/path.js");
+var path = __toESM(require("path"), 1);
 var import_llm_resolution = require("./llm-resolution.js");
-class RuntimeService {
+class AgentSpawnerRuntime {
   runtime;
   parentId;
   parentAgent;
   config;
   logger;
+  resolveBundledAgentConfig(agentId) {
+    const baseDir = "agents";
+    const normalizedPath = path.relative(baseDir, path.join(baseDir, agentId));
+    if (normalizedPath.startsWith("..") || path.isAbsolute(normalizedPath)) {
+      return null;
+    }
+    const candidates = [
+      `agents/${agentId}/${agentId}.yml`,
+      `agents/${agentId}/${agentId}.yaml`,
+      `agents/${agentId}.yml`,
+      `agents/${agentId}.yaml`
+    ];
+    for (const candidate of candidates) {
+      try {
+        return (0, import_path.resolveBundledScript)(candidate);
+      } catch {
+      }
+    }
+    return null;
+  }
+  createFallbackRegistryEntry(agentId) {
+    return {
+      id: agentId,
+      name: (0, import_types.deriveDisplayName)(agentId),
+      description: "Agent specified in config (registry entry not found)",
+      author: "unknown",
+      tags: [],
+      source: agentId,
+      type: "custom"
+    };
+  }
   constructor(parentAgent, config, logger) {
     this.parentAgent = parentAgent;
     this.config = config;
@@ -46,7 +90,7 @@ class RuntimeService {
       logger
     });
     this.logger.debug(
-      `RuntimeService initialized for parent '${this.parentId}' (maxAgents: ${config.maxConcurrentAgents})`
+      `AgentSpawnerRuntime initialized for parent '${this.parentId}' (maxAgents: ${config.maxConcurrentAgents})`
     );
   }
   /**
@@ -120,23 +164,7 @@ class RuntimeService {
    * @param options.sessionId - Optional session ID for progress events
    */
   async fork(options) {
-    const spawnOptions = {
-      task: options.task,
-      instructions: options.instructions
-    };
-    if (options.agentId) {
-      spawnOptions.agentId = options.agentId;
-    }
-    if (options.autoApprove !== void 0) {
-      spawnOptions.autoApprove = options.autoApprove;
-    }
-    if (options.toolCallId) {
-      spawnOptions.toolCallId = options.toolCallId;
-    }
-    if (options.sessionId) {
-      spawnOptions.sessionId = options.sessionId;
-    }
-    return this.spawnAndExecute(spawnOptions);
+    return this.spawnAndExecute(options);
   }
   /**
    * Set up progress event emission for a sub-agent.
@@ -158,10 +186,8 @@ class RuntimeService {
     let toolCount = 0;
     const tokenUsage = { input: 0, output: 0, total: 0 };
     let currentTool = "";
-    const subAgentBus = subAgentHandle.agent.agentEventBus;
-    const parentBus = this.parentAgent.agentEventBus;
     const emitProgress = (tool, args) => {
-      parentBus.emit("service:event", {
+      this.parentAgent.emit("service:event", {
         service: "agent-spawner",
         event: "progress",
         toolCallId,
@@ -179,15 +205,10 @@ class RuntimeService {
     const toolCallHandler = (event) => {
       toolCount++;
       let displayToolName = event.toolName;
-      if (displayToolName.startsWith("internal--")) {
-        displayToolName = displayToolName.replace("internal--", "");
-      } else if (displayToolName.startsWith("custom--")) {
-        displayToolName = displayToolName.replace("custom--", "");
-      } else if (displayToolName.startsWith("mcp--")) {
-        const parts = displayToolName.split("--");
-        if (parts.length >= 3) {
-          displayToolName = parts.slice(2).join("--");
-        }
+      if (displayToolName.startsWith("mcp--")) {
+        const trimmed = displayToolName.substring("mcp--".length);
+        const parts = trimmed.split("--");
+        displayToolName = parts.length >= 2 ? parts.slice(1).join("--") : trimmed;
       }
       currentTool = displayToolName;
       this.logger.debug(
@@ -206,11 +227,11 @@ class RuntimeService {
         emitProgress(currentTool || "processing");
       }
     };
-    subAgentBus.on("llm:tool-call", toolCallHandler);
-    subAgentBus.on("llm:response", responseHandler);
+    subAgentHandle.agent.on("llm:tool-call", toolCallHandler);
+    subAgentHandle.agent.on("llm:response", responseHandler);
     return () => {
-      subAgentBus.off("llm:tool-call", toolCallHandler);
-      subAgentBus.off("llm:response", responseHandler);
+      subAgentHandle.agent.off("llm:tool-call", toolCallHandler);
+      subAgentHandle.agent.off("llm:response", responseHandler);
     };
   }
   /**
@@ -423,19 +444,33 @@ class RuntimeService {
    */
   async buildSubAgentConfig(options, sessionId) {
     const { agentId, inheritLlm, autoApprove } = options;
-    const parentConfig = this.parentAgent.config;
+    const parentSettings = this.parentAgent.config;
     const currentParentLLM = this.parentAgent.getCurrentLLMConfig(sessionId);
     this.logger.debug(
-      `[RuntimeService] Building sub-agent config with LLM: ${currentParentLLM.provider}/${currentParentLLM.model}` + (sessionId ? ` (sessionId: ${sessionId})` : " (no sessionId)")
+      `[AgentSpawnerRuntime] Building sub-agent config with LLM: ${currentParentLLM.provider}/${currentParentLLM.model}` + (sessionId ? ` (sessionId: ${sessionId})` : " (no sessionId)")
     );
-    const toolConfirmationMode = autoApprove ? "auto-approve" : "manual";
+    const permissionsMode = autoApprove ? "auto-approve" : "manual";
     if (agentId) {
-      const registry = (0, import_registry.getAgentRegistry)();
-      if (!registry.hasAgent(agentId)) {
-        this.logger.warn(`Agent '${agentId}' not found in registry. Using default config.`);
-      } else {
-        const configPath = await registry.resolveAgent(agentId);
-        this.logger.debug(`Loading agent config from registry: ${configPath}`);
+      let configPath = null;
+      try {
+        const registry = (0, import_registry.getAgentRegistry)();
+        if (!registry.hasAgent(agentId)) {
+          this.logger.warn(
+            `Agent '${agentId}' not found in registry. Trying bundled config paths.`
+          );
+        } else {
+          configPath = await registry.resolveAgent(agentId);
+        }
+      } catch (error) {
+        this.logger.warn(
+          `Failed to load agent registry for '${agentId}'. Trying bundled config paths. (${error instanceof Error ? error.message : String(error)})`
+        );
+      }
+      if (!configPath) {
+        configPath = this.resolveBundledAgentConfig(agentId);
+      }
+      if (configPath) {
+        this.logger.debug(`Loading agent config from registry/bundled path: ${configPath}`);
         const loadedConfig = await (0, import_loader.loadAgentConfig)(configPath, this.logger);
         let llmConfig = loadedConfig.llm;
         if (inheritLlm) {
@@ -455,9 +490,9 @@ class RuntimeService {
         return {
           ...loadedConfig,
           llm: llmConfig,
-          toolConfirmation: {
-            ...loadedConfig.toolConfirmation,
-            mode: toolConfirmationMode
+          permissions: {
+            ...loadedConfig.permissions,
+            mode: permissionsMode
           },
           // Suppress sub-agent console logs entirely using silent transport
           logger: {
@@ -466,24 +501,19 @@ class RuntimeService {
           }
         };
       }
+      this.logger.warn(
+        `Agent '${agentId}' not found in registry or bundled paths. Using default config.`
+      );
     }
     const config = {
       llm: { ...currentParentLLM },
       // Default system prompt for sub-agents
       systemPrompt: "You are a helpful sub-agent. Complete the task given to you efficiently and concisely.",
-      toolConfirmation: {
-        mode: toolConfirmationMode
+      permissions: {
+        mode: permissionsMode
       },
       // Inherit MCP servers from parent so subagent has tool access
-      mcpServers: parentConfig.mcpServers ? { ...parentConfig.mcpServers } : {},
-      // Inherit internal tools from parent, excluding tools that don't work in subagent context
-      // - ask_user: Subagents can't interact with the user directly
-      // - invoke_skill: Avoid nested skill invocations for simplicity
-      internalTools: parentConfig.internalTools ? parentConfig.internalTools.filter(
-        (tool) => tool !== "ask_user" && tool !== "invoke_skill"
-      ) : [],
-      // Inherit custom tools from parent
-      customTools: parentConfig.customTools ? [...parentConfig.customTools] : [],
+      mcpServers: parentSettings.mcpServers ? { ...parentSettings.mcpServers } : {},
       // Suppress sub-agent console logs entirely using silent transport
       logger: {
         level: "error",
@@ -497,15 +527,24 @@ class RuntimeService {
    * Returns agent metadata from registry, filtered by allowedAgents if configured.
    */
   getAvailableAgents() {
-    const registry = (0, import_registry.getAgentRegistry)();
-    const allAgents = registry.getAvailableAgents();
+    let allAgents;
+    try {
+      const registry = (0, import_registry.getAgentRegistry)();
+      allAgents = registry.getAvailableAgents();
+    } catch (error) {
+      this.logger.warn(
+        `Failed to load agent registry for spawn_agent description: ${error instanceof Error ? error.message : String(error)}`
+      );
+      if (this.config.allowedAgents && this.config.allowedAgents.length > 0) {
+        return this.config.allowedAgents.map((id) => this.createFallbackRegistryEntry(id));
+      }
+      return [];
+    }
     if (this.config.allowedAgents && this.config.allowedAgents.length > 0) {
       const result = [];
       for (const id of this.config.allowedAgents) {
         const agent = allAgents[id];
-        if (agent) {
-          result.push(agent);
-        }
+        result.push(agent ?? this.createFallbackRegistryEntry(id));
       }
       return result;
     }
@@ -515,11 +554,11 @@ class RuntimeService {
    * Clean up all sub-agents (called when parent stops)
    */
   async cleanup() {
-    this.logger.debug(`Cleaning up RuntimeService for parent '${this.parentId}'`);
+    this.logger.debug(`Cleaning up AgentSpawnerRuntime for parent '${this.parentId}'`);
     await this.runtime.stopAll({ group: this.parentId });
   }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  RuntimeService
+  AgentSpawnerRuntime
 });

package/dist/{tool-provider/runtime-service.d.ts → tool-factories/agent-spawner/runtime.d.ts}

@@ -1,5 +1,5 @@
 /**
- * RuntimeService - Bridge between tools and AgentRuntime
+ * AgentSpawnerRuntime - Bridge between tools and AgentRuntime
  *
  * Manages the relationship between a parent agent and its sub-agents,
  * providing methods that tools can call to spawn and execute tasks.
@@ -10,17 +10,19 @@
  * - Enforces per-parent agent limits
  * - Always cleans up agents after task completion (synchronous model)
  */
-import type { DextoAgent, IDextoLogger, TaskForker } from '@dexto/core';
-import type { AgentRegistryEntry } from '../registry/types.js';
+import type { DextoAgent, Logger, TaskForker } from '@dexto/core';
+import type { AgentRegistryEntry } from '../../registry/types.js';
 import type { AgentSpawnerConfig } from './schemas.js';
 import type { SpawnAgentOutput } from './types.js';
-export declare class RuntimeService implements TaskForker {
+export declare class AgentSpawnerRuntime implements TaskForker {
     private runtime;
     private parentId;
     private parentAgent;
     private config;
     private logger;
-    constructor(parentAgent: DextoAgent, config: AgentSpawnerConfig, logger: IDextoLogger);
+    private resolveBundledAgentConfig;
+    private createFallbackRegistryEntry;
+    constructor(parentAgent: DextoAgent, config: AgentSpawnerConfig, logger: Logger);
     /**
      * Get count of sub-agents belonging to this parent
      */
@@ -110,4 +112,4 @@ export declare class RuntimeService implements TaskForker {
      */
     cleanup(): Promise<void>;
 }
-//# sourceMappingURL=runtime-service.d.ts.map
+//# sourceMappingURL=runtime.d.ts.map

package/dist/tool-factories/agent-spawner/runtime.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../src/tool-factories/agent-spawner/runtime.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAGH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAMlE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAIlE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAGnD,qBAAa,mBAAoB,YAAW,UAAU;IAClD,OAAO,CAAC,OAAO,CAAe;IAC9B,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,WAAW,CAAa;IAChC,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,MAAM,CAAS;IAEvB,OAAO,CAAC,yBAAyB;IAyBjC,OAAO,CAAC,2BAA2B;gBAYvB,WAAW,EAAE,UAAU,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,EAAE,MAAM;IAuB/E;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAIxB;;OAEG;IACH,OAAO,CAAC,QAAQ;IAIhB;;;;;;;;;;;;;;OAcG;IACG,eAAe,CAAC,KAAK,EAAE;QACzB,IAAI,EAAE,MAAM,CAAC;QACb,YAAY,EAAE,MAAM,CAAC;QACrB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,SAAS,CAAC,EAAE,MAAM,CAAC;KACtB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA8C7B;;;;;;;;;;OAUG;IACG,IAAI,CAAC,OAAO,EAAE;QAChB,IAAI,EAAE,MAAM,CAAC;QACb,YAAY,EAAE,MAAM,CAAC;QACrB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,SAAS,CAAC,EAAE,MAAM,CAAC;KACtB,GAAG,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAIpE;;;;;OAKG;IACH,OAAO,CAAC,qBAAqB;IAwG7B;;OAEG;IACH,OAAO,CAAC,UAAU;IAsBlB;;OAEG;YACW,oBAAoB;IAyPlC;;;;;;;OAOG;YACW,mBAAmB;IAmHjC;;;OAGG;IACH,kBAAkB,IAAI,kBAAkB,EAAE;IA6B1C;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAIjC"}

package/dist/{tool-provider/runtime-service.js → tool-factories/agent-spawner/runtime.js}

@@ -1,15 +1,49 @@
 import { DextoRuntimeError, ErrorType } from "@dexto/core";
-import { AgentRuntime } from "../runtime/AgentRuntime.js";
-import { createDelegatingApprovalHandler } from "../runtime/approval-delegation.js";
-import { loadAgentConfig } from "../config/loader.js";
-import { getAgentRegistry } from "../registry/registry.js";
+import { AgentRuntime } from "../../runtime/AgentRuntime.js";
+import { createDelegatingApprovalHandler } from "../../runtime/approval-delegation.js";
+import { loadAgentConfig } from "../../config/loader.js";
+import { getAgentRegistry } from "../../registry/registry.js";
+import { deriveDisplayName } from "../../registry/types.js";
+import { resolveBundledScript } from "../../utils/path.js";
+import * as path from "path";
 import { resolveSubAgentLLM } from "./llm-resolution.js";
-class RuntimeService {
+class AgentSpawnerRuntime {
   runtime;
   parentId;
   parentAgent;
   config;
   logger;
+  resolveBundledAgentConfig(agentId) {
+    const baseDir = "agents";
+    const normalizedPath = path.relative(baseDir, path.join(baseDir, agentId));
+    if (normalizedPath.startsWith("..") || path.isAbsolute(normalizedPath)) {
+      return null;
+    }
+    const candidates = [
+      `agents/${agentId}/${agentId}.yml`,
+      `agents/${agentId}/${agentId}.yaml`,
+      `agents/${agentId}.yml`,
+      `agents/${agentId}.yaml`
+    ];
+    for (const candidate of candidates) {
+      try {
+        return resolveBundledScript(candidate);
+      } catch {
+      }
+    }
+    return null;
+  }
+  createFallbackRegistryEntry(agentId) {
+    return {
+      id: agentId,
+      name: deriveDisplayName(agentId),
+      description: "Agent specified in config (registry entry not found)",
+      author: "unknown",
+      tags: [],
+      source: agentId,
+      type: "custom"
+    };
+  }
   constructor(parentAgent, config, logger) {
     this.parentAgent = parentAgent;
     this.config = config;
@@ -23,7 +57,7 @@ class RuntimeService {
       logger
     });
     this.logger.debug(
-      `RuntimeService initialized for parent '${this.parentId}' (maxAgents: ${config.maxConcurrentAgents})`
+      `AgentSpawnerRuntime initialized for parent '${this.parentId}' (maxAgents: ${config.maxConcurrentAgents})`
     );
   }
   /**
@@ -97,23 +131,7 @@ class RuntimeService {
    * @param options.sessionId - Optional session ID for progress events
    */
   async fork(options) {
-    const spawnOptions = {
-      task: options.task,
-      instructions: options.instructions
-    };
-    if (options.agentId) {
-      spawnOptions.agentId = options.agentId;
-    }
-    if (options.autoApprove !== void 0) {
-      spawnOptions.autoApprove = options.autoApprove;
-    }
-    if (options.toolCallId) {
-      spawnOptions.toolCallId = options.toolCallId;
-    }
-    if (options.sessionId) {
-      spawnOptions.sessionId = options.sessionId;
-    }
-    return this.spawnAndExecute(spawnOptions);
+    return this.spawnAndExecute(options);
   }
   /**
    * Set up progress event emission for a sub-agent.
@@ -135,10 +153,8 @@ class RuntimeService {
     let toolCount = 0;
     const tokenUsage = { input: 0, output: 0, total: 0 };
     let currentTool = "";
-    const subAgentBus = subAgentHandle.agent.agentEventBus;
-    const parentBus = this.parentAgent.agentEventBus;
     const emitProgress = (tool, args) => {
-      parentBus.emit("service:event", {
+      this.parentAgent.emit("service:event", {
         service: "agent-spawner",
         event: "progress",
         toolCallId,
@@ -156,15 +172,10 @@ class RuntimeService {
     const toolCallHandler = (event) => {
       toolCount++;
       let displayToolName = event.toolName;
-      if (displayToolName.startsWith("internal--")) {
-        displayToolName = displayToolName.replace("internal--", "");
-      } else if (displayToolName.startsWith("custom--")) {
-        displayToolName = displayToolName.replace("custom--", "");
-      } else if (displayToolName.startsWith("mcp--")) {
-        const parts = displayToolName.split("--");
-        if (parts.length >= 3) {
-          displayToolName = parts.slice(2).join("--");
-        }
+      if (displayToolName.startsWith("mcp--")) {
+        const trimmed = displayToolName.substring("mcp--".length);
+        const parts = trimmed.split("--");
+        displayToolName = parts.length >= 2 ? parts.slice(1).join("--") : trimmed;
       }
       currentTool = displayToolName;
       this.logger.debug(
@@ -183,11 +194,11 @@ class RuntimeService {
         emitProgress(currentTool || "processing");
       }
     };
-    subAgentBus.on("llm:tool-call", toolCallHandler);
-    subAgentBus.on("llm:response", responseHandler);
+    subAgentHandle.agent.on("llm:tool-call", toolCallHandler);
+    subAgentHandle.agent.on("llm:response", responseHandler);
     return () => {
-      subAgentBus.off("llm:tool-call", toolCallHandler);
-      subAgentBus.off("llm:response", responseHandler);
+      subAgentHandle.agent.off("llm:tool-call", toolCallHandler);
+      subAgentHandle.agent.off("llm:response", responseHandler);
     };
   }
   /**
@@ -400,19 +411,33 @@ class RuntimeService {
    */
   async buildSubAgentConfig(options, sessionId) {
     const { agentId, inheritLlm, autoApprove } = options;
-    const parentConfig = this.parentAgent.config;
+    const parentSettings = this.parentAgent.config;
     const currentParentLLM = this.parentAgent.getCurrentLLMConfig(sessionId);
     this.logger.debug(
-      `[RuntimeService] Building sub-agent config with LLM: ${currentParentLLM.provider}/${currentParentLLM.model}` + (sessionId ? ` (sessionId: ${sessionId})` : " (no sessionId)")
+      `[AgentSpawnerRuntime] Building sub-agent config with LLM: ${currentParentLLM.provider}/${currentParentLLM.model}` + (sessionId ? ` (sessionId: ${sessionId})` : " (no sessionId)")
     );
-    const toolConfirmationMode = autoApprove ? "auto-approve" : "manual";
+    const permissionsMode = autoApprove ? "auto-approve" : "manual";
     if (agentId) {
-      const registry = getAgentRegistry();
-      if (!registry.hasAgent(agentId)) {
-        this.logger.warn(`Agent '${agentId}' not found in registry. Using default config.`);
-      } else {
-        const configPath = await registry.resolveAgent(agentId);
-        this.logger.debug(`Loading agent config from registry: ${configPath}`);
+      let configPath = null;
+      try {
+        const registry = getAgentRegistry();
+        if (!registry.hasAgent(agentId)) {
+          this.logger.warn(
+            `Agent '${agentId}' not found in registry. Trying bundled config paths.`
+          );
+        } else {
+          configPath = await registry.resolveAgent(agentId);
+        }
+      } catch (error) {
+        this.logger.warn(
+          `Failed to load agent registry for '${agentId}'. Trying bundled config paths. (${error instanceof Error ? error.message : String(error)})`
+        );
+      }
+      if (!configPath) {
+        configPath = this.resolveBundledAgentConfig(agentId);
+      }
+      if (configPath) {
+        this.logger.debug(`Loading agent config from registry/bundled path: ${configPath}`);
         const loadedConfig = await loadAgentConfig(configPath, this.logger);
         let llmConfig = loadedConfig.llm;
         if (inheritLlm) {
@@ -432,9 +457,9 @@ class RuntimeService {
         return {
           ...loadedConfig,
           llm: llmConfig,
-          toolConfirmation: {
-            ...loadedConfig.toolConfirmation,
-            mode: toolConfirmationMode
+          permissions: {
+            ...loadedConfig.permissions,
+            mode: permissionsMode
           },
           // Suppress sub-agent console logs entirely using silent transport
           logger: {
@@ -443,24 +468,19 @@ class RuntimeService {
           }
         };
       }
+      this.logger.warn(
+        `Agent '${agentId}' not found in registry or bundled paths. Using default config.`
+      );
     }
     const config = {
       llm: { ...currentParentLLM },
       // Default system prompt for sub-agents
       systemPrompt: "You are a helpful sub-agent. Complete the task given to you efficiently and concisely.",
-      toolConfirmation: {
-        mode: toolConfirmationMode
+      permissions: {
+        mode: permissionsMode
       },
       // Inherit MCP servers from parent so subagent has tool access
-      mcpServers: parentConfig.mcpServers ? { ...parentConfig.mcpServers } : {},
-      // Inherit internal tools from parent, excluding tools that don't work in subagent context
-      // - ask_user: Subagents can't interact with the user directly
-      // - invoke_skill: Avoid nested skill invocations for simplicity
-      internalTools: parentConfig.internalTools ? parentConfig.internalTools.filter(
-        (tool) => tool !== "ask_user" && tool !== "invoke_skill"
-      ) : [],
-      // Inherit custom tools from parent
-      customTools: parentConfig.customTools ? [...parentConfig.customTools] : [],
+      mcpServers: parentSettings.mcpServers ? { ...parentSettings.mcpServers } : {},
       // Suppress sub-agent console logs entirely using silent transport
       logger: {
         level: "error",
@@ -474,15 +494,24 @@ class RuntimeService {
    * Returns agent metadata from registry, filtered by allowedAgents if configured.
    */
   getAvailableAgents() {
-    const registry = getAgentRegistry();
-    const allAgents = registry.getAvailableAgents();
+    let allAgents;
+    try {
+      const registry = getAgentRegistry();
+      allAgents = registry.getAvailableAgents();
+    } catch (error) {
+      this.logger.warn(
+        `Failed to load agent registry for spawn_agent description: ${error instanceof Error ? error.message : String(error)}`
+      );
+      if (this.config.allowedAgents && this.config.allowedAgents.length > 0) {
+        return this.config.allowedAgents.map((id) => this.createFallbackRegistryEntry(id));
+      }
+      return [];
+    }
     if (this.config.allowedAgents && this.config.allowedAgents.length > 0) {
       const result = [];
       for (const id of this.config.allowedAgents) {
         const agent = allAgents[id];
-        if (agent) {
-          result.push(agent);
-        }
+        result.push(agent ?? this.createFallbackRegistryEntry(id));
       }
       return result;
     }
@@ -492,10 +521,10 @@ class RuntimeService {
    * Clean up all sub-agents (called when parent stops)
    */
   async cleanup() {
-    this.logger.debug(`Cleaning up RuntimeService for parent '${this.parentId}'`);
+    this.logger.debug(`Cleaning up AgentSpawnerRuntime for parent '${this.parentId}'`);
     await this.runtime.stopAll({ group: this.parentId });
   }
 }
 export {
-  RuntimeService
+  AgentSpawnerRuntime
 };

package/dist/{tool-provider → tool-factories/agent-spawner}/schemas.cjs

@@ -24,7 +24,7 @@ __export(schemas_exports, {
 module.exports = __toCommonJS(schemas_exports);
 var import_zod = require("zod");
 const AgentSpawnerConfigSchema = import_zod.z.object({
-  /** Type discriminator for the provider */
+  /** Type discriminator for the factory */
   type: import_zod.z.literal("agent-spawner"),
   /** Maximum concurrent sub-agents this parent can spawn (default: 5) */
   maxConcurrentAgents: import_zod.z.number().int().positive().default(5).describe("Maximum concurrent sub-agents"),
@@ -57,7 +57,7 @@ const AgentSpawnerConfigSchema = import_zod.z.object({
    * ```
    */
   autoApproveAgents: import_zod.z.array(import_zod.z.string().min(1)).optional().describe("Agent IDs that should have tools auto-approved (read-only agents)")
-}).strict().describe("Configuration for the agent spawner tool provider");
+}).strict().describe("Configuration for the agent spawner tools factory");
 const SpawnAgentInputSchema = import_zod.z.object({
   /** Short task description (shown in UI/logs) */
   task: import_zod.z.string().min(1).describe("Short task description for UI/logs"),