@dexto/agent-management 1.6.14 → 1.6.16

package/dist/tool-factories/agent-spawner/runtime.cjs

@@ -41,6 +41,8 @@ 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");
+var import_project_registry = require("../../project-registry.js");
+var import_execution_context = require("../../utils/execution-context.js");
 const REASONING_VARIANT_FALLBACK_ORDER = [
   "disabled",
   "none",
@@ -58,6 +60,7 @@ class AgentSpawnerRuntime {
   parentAgent;
   config;
   logger;
+  workspaceRootHint;
   selectLowestReasoningVariant(provider, model, preferredVariant) {
     const profile = (0, import_core.getReasoningProfile)(provider, model);
     if (!profile.capable || profile.supportedVariants.length === 0) {
@@ -124,6 +127,148 @@ class AgentSpawnerRuntime {
       type: "custom"
     };
   }
+  isWorkspaceEntryAvailableToCurrentParent(entry) {
+    if (!entry.parentAgentId) {
+      return true;
+    }
+    return entry.parentAgentId === this.parentAgent.config.agentId;
+  }
+  setWorkspaceRootHint(workspaceRootHint) {
+    const trimmed = workspaceRootHint?.trim();
+    this.workspaceRootHint = trimmed ? trimmed : void 0;
+  }
+  async getProjectRootCandidates() {
+    const candidates = /* @__PURE__ */ new Set();
+    const seedPaths = [];
+    if (this.workspaceRootHint) {
+      seedPaths.push(this.workspaceRootHint);
+    }
+    try {
+      const workspace = await this.parentAgent.getWorkspace();
+      if (workspace?.path) {
+        seedPaths.push(workspace.path);
+      }
+    } catch (error) {
+      this.logger.warn(
+        `Failed to read parent workspace while resolving workspace agents: ${error instanceof Error ? error.message : String(error)}`
+      );
+    }
+    seedPaths.push(process.cwd());
+    for (const seedPath of seedPaths) {
+      candidates.add(seedPath);
+      const detectedProjectRoot = (0, import_execution_context.findDextoProjectRoot)(seedPath);
+      if (detectedProjectRoot) {
+        candidates.add(detectedProjectRoot);
+      }
+    }
+    return Array.from(candidates);
+  }
+  async getWorkspaceAvailableAgentsResult() {
+    for (const projectRoot of await this.getProjectRootCandidates()) {
+      try {
+        const loaded = await (0, import_project_registry.loadProjectRegistry)(projectRoot);
+        if (!loaded) {
+          continue;
+        }
+        return {
+          registryFound: true,
+          allowGlobalAgents: loaded.registry.allowGlobalAgents,
+          agents: Object.fromEntries(
+            loaded.registry.agents.filter(
+              (entry) => entry.id !== this.parentAgent.config.agentId && this.isWorkspaceEntryAvailableToCurrentParent(entry)
+            ).map((entry) => [
+              entry.id,
+              {
+                id: entry.id,
+                name: entry.name,
+                description: entry.description,
+                author: entry.author ?? "workspace",
+                tags: entry.tags ?? [],
+                source: entry.configPath,
+                type: "custom"
+              }
+            ])
+          )
+        };
+      } catch (error) {
+        this.logger.warn(
+          `Failed to load workspace registry agents from ${projectRoot}: ${error instanceof Error ? error.message : String(error)}`
+        );
+      }
+    }
+    return { agents: {}, registryFound: false, allowGlobalAgents: false };
+  }
+  async resolveWorkspaceRegistryAgentConfig(agentId) {
+    let registryFound = false;
+    let allowGlobalAgents = false;
+    for (const projectRoot of await this.getProjectRootCandidates()) {
+      try {
+        const loaded = await (0, import_project_registry.loadProjectRegistry)(projectRoot);
+        if (!loaded) {
+          continue;
+        }
+        registryFound = true;
+        allowGlobalAgents = loaded.registry.allowGlobalAgents;
+        const entry = loaded.registry.agents.find((candidate) => candidate.id === agentId);
+        if (!entry) {
+          continue;
+        }
+        if (entry.id === this.parentAgent.config.agentId) {
+          return {
+            configPath: null,
+            blocked: true,
+            blockedReason: `Workspace agent '${agentId}' cannot spawn itself.`,
+            registryFound: true,
+            allowGlobalAgents
+          };
+        }
+        if (!this.isWorkspaceEntryAvailableToCurrentParent(entry)) {
+          return {
+            configPath: null,
+            blocked: true,
+            blockedReason: `Workspace agent '${agentId}' is linked to a different parent and is not available to '${this.parentAgent.config.agentId ?? this.parentId}'.`,
+            registryFound: true,
+            allowGlobalAgents
+          };
+        }
+        try {
+          const configPath = await (0, import_project_registry.resolveProjectRegistryAgentPath)(projectRoot, agentId);
+          if (configPath) {
+            return {
+              configPath,
+              blocked: false,
+              registryFound: true,
+              allowGlobalAgents
+            };
+          }
+          return {
+            configPath: null,
+            blocked: true,
+            blockedReason: `Workspace agent '${agentId}' is declared in ${loaded.registryPath} but its config path could not be resolved.`,
+            registryFound: true,
+            allowGlobalAgents
+          };
+        } catch (error) {
+          const blockedReason = error instanceof Error ? error.message : `Workspace agent '${agentId}' could not be resolved from ${loaded.registryPath}.`;
+          this.logger.warn(
+            `Failed to resolve workspace registry agent '${agentId}' from ${projectRoot}: ${blockedReason}`
+          );
+          return {
+            configPath: null,
+            blocked: true,
+            blockedReason,
+            registryFound: true,
+            allowGlobalAgents
+          };
+        }
+      } catch (error) {
+        this.logger.warn(
+          `Failed to resolve workspace registry agent '${agentId}' from ${projectRoot}: ${error instanceof Error ? error.message : String(error)}`
+        );
+      }
+    }
+    return { configPath: null, blocked: false, registryFound, allowGlobalAgents };
+  }
   constructor(parentAgent, config, logger) {
     this.parentAgent = parentAgent;
     this.config = config;
@@ -608,21 +753,31 @@ class AgentSpawnerRuntime {
     })();
     if (agentId) {
       let configPath = null;
+      const workspaceRegistryResolution = await this.resolveWorkspaceRegistryAgentConfig(agentId);
+      configPath = workspaceRegistryResolution.configPath;
+      const canUseGlobalAgents = !workspaceRegistryResolution.registryFound || workspaceRegistryResolution.allowGlobalAgents;
+      if (workspaceRegistryResolution.blocked) {
+        throw new Error(
+          workspaceRegistryResolution.blockedReason ?? `Workspace agent '${agentId}' is linked to a different parent and is not available to '${this.parentAgent.config.agentId ?? this.parentId}'.`
+        );
+      }
       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);
+        if (!configPath && !workspaceRegistryResolution.blocked && canUseGlobalAgents) {
+          const registry = (0, import_registry.getAgentRegistry)();
+          if (!registry.hasAgent(agentId)) {
+            this.logger.warn(
+              `Agent '${agentId}' not found in installed 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) {
+      if (!configPath && !workspaceRegistryResolution.blocked && canUseGlobalAgents) {
         configPath = this.resolveBundledAgentConfig(agentId);
       }
       if (configPath) {
@@ -677,29 +832,36 @@ class AgentSpawnerRuntime {
    * Get information about available agents for tool description.
    * Returns agent metadata from registry, filtered by allowedAgents if configured.
    */
-  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));
+  async getAvailableAgents() {
+    const workspaceAgents = await this.getWorkspaceAvailableAgentsResult();
+    const canUseGlobalAgents = !workspaceAgents.registryFound || workspaceAgents.allowGlobalAgents;
+    let scopedAgents = { ...workspaceAgents.agents };
+    if (canUseGlobalAgents) {
+      try {
+        const registry = (0, import_registry.getAgentRegistry)();
+        scopedAgents = {
+          ...registry.getAvailableAgents(),
+          ...workspaceAgents.agents
+        };
+      } catch (error) {
+        this.logger.warn(
+          `Failed to load agent registry for spawn_agent description: ${error instanceof Error ? error.message : String(error)}`
+        );
       }
-      return [];
     }
-    if (this.config.allowedAgents && this.config.allowedAgents.length > 0) {
-      const result = [];
-      for (const id of this.config.allowedAgents) {
-        const agent = allAgents[id];
-        result.push(agent ?? this.createFallbackRegistryEntry(id));
+    if (!this.config.allowedAgents || this.config.allowedAgents.length === 0) {
+      return Object.values(scopedAgents);
+    }
+    const result = [];
+    for (const id of this.config.allowedAgents) {
+      const agent = scopedAgents[id];
+      if (agent) {
+        result.push(agent);
+      } else if (canUseGlobalAgents) {
+        result.push(this.createFallbackRegistryEntry(id));
       }
-      return result;
     }
-    return Object.values(allAgents);
+    return result;
   }
   /**
    * Clean up all sub-agents (called when parent stops)

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

@@ -20,10 +20,16 @@ export declare class AgentSpawnerRuntime implements TaskForker {
     private parentAgent;
     private config;
     private logger;
+    private workspaceRootHint;
     private selectLowestReasoningVariant;
     private applySubAgentLlmPolicy;
     private resolveBundledAgentConfig;
     private createFallbackRegistryEntry;
+    private isWorkspaceEntryAvailableToCurrentParent;
+    setWorkspaceRootHint(workspaceRootHint?: string): void;
+    private getProjectRootCandidates;
+    private getWorkspaceAvailableAgentsResult;
+    private resolveWorkspaceRegistryAgentConfig;
     constructor(parentAgent: DextoAgent, config: AgentSpawnerConfig, logger: Logger);
     /**
      * Get count of sub-agents belonging to this parent
@@ -113,7 +119,7 @@ export declare class AgentSpawnerRuntime implements TaskForker {
      * Get information about available agents for tool description.
      * Returns agent metadata from registry, filtered by allowedAgents if configured.
      */
-    getAvailableAgents(): AgentRegistryEntry[];
+    getAvailableAgents(): Promise<AgentRegistryEntry[]>;
     /**
      * Clean up all sub-agents (called when parent stops)
      */

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

@@ -1 +1 @@
-{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../src/tool-factories/agent-spawner/runtime.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAIH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAWlE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAIlE,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAenD,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,4BAA4B;IAuBpC,OAAO,CAAC,sBAAsB;IA8B9B,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;IA+G7B;;OAEG;YACW,oBAAoB;IA2BlC,OAAO,CAAC,sBAAsB;IAuB9B;;OAEG;IACH,OAAO,CAAC,UAAU;IAsBlB;;OAEG;YACW,oBAAoB;IA4RlC;;;;;;;OAOG;YACW,mBAAmB;IAmKjC;;;OAGG;IACH,kBAAkB,IAAI,kBAAkB,EAAE;IA6B1C;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAIjC"}
+{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../src/tool-factories/agent-spawner/runtime.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAIH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAWlE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAIlE,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAiBnD,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;IACvB,OAAO,CAAC,iBAAiB,CAAqB;IAE9C,OAAO,CAAC,4BAA4B;IAuBpC,OAAO,CAAC,sBAAsB;IA8B9B,OAAO,CAAC,yBAAyB;IAyBjC,OAAO,CAAC,2BAA2B;IAYnC,OAAO,CAAC,wCAAwC;IAUhD,oBAAoB,CAAC,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI;YAKxC,wBAAwB;YAgCxB,iCAAiC;YA8CjC,mCAAmC;gBAyFrC,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;IA+G7B;;OAEG;YACW,oBAAoB;IA2BlC,OAAO,CAAC,sBAAsB;IAuB9B;;OAEG;IACH,OAAO,CAAC,UAAU;IAsBlB;;OAEG;YACW,oBAAoB;IA4RlC;;;;;;;OAOG;YACW,mBAAmB;IAkLjC;;;OAGG;IACG,kBAAkB,IAAI,OAAO,CAAC,kBAAkB,EAAE,CAAC;IAqCzD;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAIjC"}

package/dist/tool-factories/agent-spawner/runtime.js

@@ -13,6 +13,8 @@ import { deriveDisplayName } from "../../registry/types.js";
 import { getDextoPath, resolveBundledScript } from "../../utils/path.js";
 import * as path from "path";
 import { resolveSubAgentLLM } from "./llm-resolution.js";
+import { loadProjectRegistry, resolveProjectRegistryAgentPath } from "../../project-registry.js";
+import { findDextoProjectRoot } from "../../utils/execution-context.js";
 const REASONING_VARIANT_FALLBACK_ORDER = [
   "disabled",
   "none",
@@ -30,6 +32,7 @@ class AgentSpawnerRuntime {
   parentAgent;
   config;
   logger;
+  workspaceRootHint;
   selectLowestReasoningVariant(provider, model, preferredVariant) {
     const profile = getReasoningProfile(provider, model);
     if (!profile.capable || profile.supportedVariants.length === 0) {
@@ -96,6 +99,148 @@ class AgentSpawnerRuntime {
       type: "custom"
     };
   }
+  isWorkspaceEntryAvailableToCurrentParent(entry) {
+    if (!entry.parentAgentId) {
+      return true;
+    }
+    return entry.parentAgentId === this.parentAgent.config.agentId;
+  }
+  setWorkspaceRootHint(workspaceRootHint) {
+    const trimmed = workspaceRootHint?.trim();
+    this.workspaceRootHint = trimmed ? trimmed : void 0;
+  }
+  async getProjectRootCandidates() {
+    const candidates = /* @__PURE__ */ new Set();
+    const seedPaths = [];
+    if (this.workspaceRootHint) {
+      seedPaths.push(this.workspaceRootHint);
+    }
+    try {
+      const workspace = await this.parentAgent.getWorkspace();
+      if (workspace?.path) {
+        seedPaths.push(workspace.path);
+      }
+    } catch (error) {
+      this.logger.warn(
+        `Failed to read parent workspace while resolving workspace agents: ${error instanceof Error ? error.message : String(error)}`
+      );
+    }
+    seedPaths.push(process.cwd());
+    for (const seedPath of seedPaths) {
+      candidates.add(seedPath);
+      const detectedProjectRoot = findDextoProjectRoot(seedPath);
+      if (detectedProjectRoot) {
+        candidates.add(detectedProjectRoot);
+      }
+    }
+    return Array.from(candidates);
+  }
+  async getWorkspaceAvailableAgentsResult() {
+    for (const projectRoot of await this.getProjectRootCandidates()) {
+      try {
+        const loaded = await loadProjectRegistry(projectRoot);
+        if (!loaded) {
+          continue;
+        }
+        return {
+          registryFound: true,
+          allowGlobalAgents: loaded.registry.allowGlobalAgents,
+          agents: Object.fromEntries(
+            loaded.registry.agents.filter(
+              (entry) => entry.id !== this.parentAgent.config.agentId && this.isWorkspaceEntryAvailableToCurrentParent(entry)
+            ).map((entry) => [
+              entry.id,
+              {
+                id: entry.id,
+                name: entry.name,
+                description: entry.description,
+                author: entry.author ?? "workspace",
+                tags: entry.tags ?? [],
+                source: entry.configPath,
+                type: "custom"
+              }
+            ])
+          )
+        };
+      } catch (error) {
+        this.logger.warn(
+          `Failed to load workspace registry agents from ${projectRoot}: ${error instanceof Error ? error.message : String(error)}`
+        );
+      }
+    }
+    return { agents: {}, registryFound: false, allowGlobalAgents: false };
+  }
+  async resolveWorkspaceRegistryAgentConfig(agentId) {
+    let registryFound = false;
+    let allowGlobalAgents = false;
+    for (const projectRoot of await this.getProjectRootCandidates()) {
+      try {
+        const loaded = await loadProjectRegistry(projectRoot);
+        if (!loaded) {
+          continue;
+        }
+        registryFound = true;
+        allowGlobalAgents = loaded.registry.allowGlobalAgents;
+        const entry = loaded.registry.agents.find((candidate) => candidate.id === agentId);
+        if (!entry) {
+          continue;
+        }
+        if (entry.id === this.parentAgent.config.agentId) {
+          return {
+            configPath: null,
+            blocked: true,
+            blockedReason: `Workspace agent '${agentId}' cannot spawn itself.`,
+            registryFound: true,
+            allowGlobalAgents
+          };
+        }
+        if (!this.isWorkspaceEntryAvailableToCurrentParent(entry)) {
+          return {
+            configPath: null,
+            blocked: true,
+            blockedReason: `Workspace agent '${agentId}' is linked to a different parent and is not available to '${this.parentAgent.config.agentId ?? this.parentId}'.`,
+            registryFound: true,
+            allowGlobalAgents
+          };
+        }
+        try {
+          const configPath = await resolveProjectRegistryAgentPath(projectRoot, agentId);
+          if (configPath) {
+            return {
+              configPath,
+              blocked: false,
+              registryFound: true,
+              allowGlobalAgents
+            };
+          }
+          return {
+            configPath: null,
+            blocked: true,
+            blockedReason: `Workspace agent '${agentId}' is declared in ${loaded.registryPath} but its config path could not be resolved.`,
+            registryFound: true,
+            allowGlobalAgents
+          };
+        } catch (error) {
+          const blockedReason = error instanceof Error ? error.message : `Workspace agent '${agentId}' could not be resolved from ${loaded.registryPath}.`;
+          this.logger.warn(
+            `Failed to resolve workspace registry agent '${agentId}' from ${projectRoot}: ${blockedReason}`
+          );
+          return {
+            configPath: null,
+            blocked: true,
+            blockedReason,
+            registryFound: true,
+            allowGlobalAgents
+          };
+        }
+      } catch (error) {
+        this.logger.warn(
+          `Failed to resolve workspace registry agent '${agentId}' from ${projectRoot}: ${error instanceof Error ? error.message : String(error)}`
+        );
+      }
+    }
+    return { configPath: null, blocked: false, registryFound, allowGlobalAgents };
+  }
   constructor(parentAgent, config, logger) {
     this.parentAgent = parentAgent;
     this.config = config;
@@ -580,21 +725,31 @@ class AgentSpawnerRuntime {
     })();
     if (agentId) {
       let configPath = null;
+      const workspaceRegistryResolution = await this.resolveWorkspaceRegistryAgentConfig(agentId);
+      configPath = workspaceRegistryResolution.configPath;
+      const canUseGlobalAgents = !workspaceRegistryResolution.registryFound || workspaceRegistryResolution.allowGlobalAgents;
+      if (workspaceRegistryResolution.blocked) {
+        throw new Error(
+          workspaceRegistryResolution.blockedReason ?? `Workspace agent '${agentId}' is linked to a different parent and is not available to '${this.parentAgent.config.agentId ?? this.parentId}'.`
+        );
+      }
       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);
+        if (!configPath && !workspaceRegistryResolution.blocked && canUseGlobalAgents) {
+          const registry = getAgentRegistry();
+          if (!registry.hasAgent(agentId)) {
+            this.logger.warn(
+              `Agent '${agentId}' not found in installed 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) {
+      if (!configPath && !workspaceRegistryResolution.blocked && canUseGlobalAgents) {
         configPath = this.resolveBundledAgentConfig(agentId);
       }
       if (configPath) {
@@ -649,29 +804,36 @@ class AgentSpawnerRuntime {
    * Get information about available agents for tool description.
    * Returns agent metadata from registry, filtered by allowedAgents if configured.
    */
-  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));
+  async getAvailableAgents() {
+    const workspaceAgents = await this.getWorkspaceAvailableAgentsResult();
+    const canUseGlobalAgents = !workspaceAgents.registryFound || workspaceAgents.allowGlobalAgents;
+    let scopedAgents = { ...workspaceAgents.agents };
+    if (canUseGlobalAgents) {
+      try {
+        const registry = getAgentRegistry();
+        scopedAgents = {
+          ...registry.getAvailableAgents(),
+          ...workspaceAgents.agents
+        };
+      } catch (error) {
+        this.logger.warn(
+          `Failed to load agent registry for spawn_agent description: ${error instanceof Error ? error.message : String(error)}`
+        );
       }
-      return [];
     }
-    if (this.config.allowedAgents && this.config.allowedAgents.length > 0) {
-      const result = [];
-      for (const id of this.config.allowedAgents) {
-        const agent = allAgents[id];
-        result.push(agent ?? this.createFallbackRegistryEntry(id));
+    if (!this.config.allowedAgents || this.config.allowedAgents.length === 0) {
+      return Object.values(scopedAgents);
+    }
+    const result = [];
+    for (const id of this.config.allowedAgents) {
+      const agent = scopedAgents[id];
+      if (agent) {
+        result.push(agent);
+      } else if (canUseGlobalAgents) {
+        result.push(this.createFallbackRegistryEntry(id));
       }
-      return result;
     }
-    return Object.values(allAgents);
+    return result;
   }
   /**
    * Clean up all sub-agents (called when parent stops)

package/dist/tool-factories/agent-spawner/schemas.cjs

@@ -43,8 +43,9 @@ const AgentSpawnerConfigSchema = import_zod.z.object({
   /** Whether spawning is enabled (default: true) */
   allowSpawning: import_zod.z.boolean().default(true).describe("Whether agent spawning is enabled"),
   /**
-   * List of agent IDs from the registry that this parent can spawn.
-   * If not provided, any registry agent can be spawned.
+   * List of agent IDs that this parent can spawn from the current inventory.
+   * The current inventory is workspace agents by default, plus global agents
+   * only when the workspace registry opts into them.
    *
    * Example:
    * ```yaml
@@ -53,7 +54,9 @@ const AgentSpawnerConfigSchema = import_zod.z.object({
    *     allowedAgents: ["explore-agent", "research-agent"]
    * ```
    */
-  allowedAgents: import_zod.z.array(import_zod.z.string().min(1)).optional().describe("Agent IDs from registry that can be spawned (omit to allow all)"),
+  allowedAgents: import_zod.z.array(import_zod.z.string().min(1)).optional().describe(
+    "Agent IDs from the resolved inventory that can be spawned (omit to allow all in-scope agents)"
+  ),
   /**
    * Agent IDs that should have their tools auto-approved.
    * Use for agents with only read-only/safe tools (e.g., explore-agent).

package/dist/tool-factories/agent-spawner/schemas.d.ts

@@ -22,8 +22,9 @@ export declare const AgentSpawnerConfigSchema: z.ZodObject<{
     /** Whether spawning is enabled (default: true) */
     allowSpawning: z.ZodDefault<z.ZodBoolean>;
     /**
-     * List of agent IDs from the registry that this parent can spawn.
-     * If not provided, any registry agent can be spawned.
+     * List of agent IDs that this parent can spawn from the current inventory.
+     * The current inventory is workspace agents by default, plus global agents
+     * only when the workspace registry opts into them.
      *
      * Example:
      * ```yaml

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

@@ -1 +1 @@
-{"version":3,"file":"schemas.d.ts","sourceRoot":"","sources":["../../../src/tool-factories/agent-spawner/schemas.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAMxB,eAAO,MAAM,gCAAgC,MAAM,CAAC;AACpD,eAAO,MAAM,mCAAmC,EAAE,gBAA6B,CAAC;AAEhF;;GAEG;AACH,eAAO,MAAM,wBAAwB;IAE7B,yCAAyC;;IAGzC,uEAAuE;;IAQvE,qFAAqF;;;;IA4BrF,kDAAkD;;IAGlD;;;;;;;;;;OAUG;;IAMH;;;;;;;;;;;OAWG;;;;;;;;;;;;;;;;;;;;EAOuD,CAAC;AAEnE,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAM3E;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB;IAE1B,gDAAgD;;IAGhD,8CAA8C;;IAM9C,qFAAqF;;;;;;;;;;EAGhF,CAAC;AAEd,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,qBAAqB,CAAC,CAAC"}
+{"version":3,"file":"schemas.d.ts","sourceRoot":"","sources":["../../../src/tool-factories/agent-spawner/schemas.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAMxB,eAAO,MAAM,gCAAgC,MAAM,CAAC;AACpD,eAAO,MAAM,mCAAmC,EAAE,gBAA6B,CAAC;AAEhF;;GAEG;AACH,eAAO,MAAM,wBAAwB;IAE7B,yCAAyC;;IAGzC,uEAAuE;;IAQvE,qFAAqF;;;;IA4BrF,kDAAkD;;IAGlD;;;;;;;;;;;OAWG;;IAQH;;;;;;;;;;;OAWG;;;;;;;;;;;;;;;;;;;;EAOuD,CAAC;AAEnE,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAM3E;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB;IAE1B,gDAAgD;;IAGhD,8CAA8C;;IAM9C,qFAAqF;;;;;;;;;;EAGhF,CAAC;AAEd,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,qBAAqB,CAAC,CAAC"}

package/dist/tool-factories/agent-spawner/schemas.js

@@ -17,8 +17,9 @@ const AgentSpawnerConfigSchema = z.object({
   /** Whether spawning is enabled (default: true) */
   allowSpawning: z.boolean().default(true).describe("Whether agent spawning is enabled"),
   /**
-   * List of agent IDs from the registry that this parent can spawn.
-   * If not provided, any registry agent can be spawned.
+   * List of agent IDs that this parent can spawn from the current inventory.
+   * The current inventory is workspace agents by default, plus global agents
+   * only when the workspace registry opts into them.
    *
    * Example:
    * ```yaml
@@ -27,7 +28,9 @@ const AgentSpawnerConfigSchema = z.object({
    *     allowedAgents: ["explore-agent", "research-agent"]
    * ```
    */
-  allowedAgents: z.array(z.string().min(1)).optional().describe("Agent IDs from registry that can be spawned (omit to allow all)"),
+  allowedAgents: z.array(z.string().min(1)).optional().describe(
+    "Agent IDs from the resolved inventory that can be spawned (omit to allow all in-scope agents)"
+  ),
   /**
    * Agent IDs that should have their tools auto-approved.
    * Use for agents with only read-only/safe tools (e.g., explore-agent).

package/dist/tool-factories/agent-spawner/spawn-agent-tool.cjs

@@ -23,8 +23,8 @@ __export(spawn_agent_tool_exports, {
 module.exports = __toCommonJS(spawn_agent_tool_exports);
 var import_core = require("@dexto/core");
 var import_schemas = require("./schemas.js");
-function buildDescription(service) {
-  const availableAgents = service.getAvailableAgents();
+async function buildDescription(service) {
+  const availableAgents = await service.getAvailableAgents();
   if (availableAgents.length === 0) {
     return `Spawn a sub-agent to handle a specific task. The sub-agent executes the task and returns the result.
 
@@ -59,7 +59,8 @@ function createSpawnAgentTool(service) {
   return {
     id: "spawn_agent",
     aliases: ["task"],
-    description: buildDescription(service),
+    description: "Spawn a sub-agent to handle a task and return its result.",
+    getDescription: () => buildDescription(service),
     presentation: {
       describeHeader: (input) => {
         const agentLabel = input.agentId ? input.agentId.replace(/-agent$/, "") : null;

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

@@ -1 +1 @@
-{"version":3,"file":"spawn-agent-tool.d.ts","sourceRoot":"","sources":["../../../src/tool-factories/agent-spawner/spawn-agent-tool.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,IAAI,EAAwB,MAAM,aAAa,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AA4CxD,wBAAgB,oBAAoB,CAChC,OAAO,EAAE,mBAAmB,GAC7B,IAAI,CAAC,OAAO,qBAAqB,CAAC,CAuDpC"}
+{"version":3,"file":"spawn-agent-tool.d.ts","sourceRoot":"","sources":["../../../src/tool-factories/agent-spawner/spawn-agent-tool.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,IAAI,EAAwB,MAAM,aAAa,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AA4CxD,wBAAgB,oBAAoB,CAChC,OAAO,EAAE,mBAAmB,GAC7B,IAAI,CAAC,OAAO,qBAAqB,CAAC,CAwDpC"}