@dexto/agent-management 1.2.6 → 1.4.0

package/dist/resolver.cjs

@@ -39,6 +39,9 @@ var import_execution_context = require("./utils/execution-context.js");
 var import_core = require("@dexto/core");
 var import_loader = require("./preferences/loader.js");
 var import_config = require("./config/index.js");
+var import_errors = require("./registry/errors.js");
+var import_AgentManager = require("./AgentManager.js");
+var import_installation = require("./installation.js");
 async function resolveAgentPath(nameOrPath, autoInstall = true, injectPreferences = true) {
   if (nameOrPath && (0, import_path2.isPath)(nameOrPath)) {
     const resolved = import_path.default.resolve(nameOrPath);
@@ -53,12 +56,47 @@ async function resolveAgentPath(nameOrPath, autoInstall = true, injectPreference
     }
   }
   if (nameOrPath) {
-    const { getAgentRegistry } = await import("./registry/registry.js");
-    const registry = getAgentRegistry();
-    return await registry.resolveAgent(nameOrPath, autoInstall, injectPreferences);
+    return await resolveAgentByName(nameOrPath, autoInstall, injectPreferences);
   }
   return await resolveDefaultAgentByContext(autoInstall, injectPreferences);
 }
+async function resolveAgentByName(agentId, autoInstall, injectPreferences) {
+  const agentsDir = (0, import_path2.getDextoGlobalPath)("agents");
+  const installedRegistryPath = import_path.default.join(agentsDir, "registry.json");
+  try {
+    const manager = new import_AgentManager.AgentManager(installedRegistryPath);
+    await manager.loadRegistry();
+    if (manager.hasAgent(agentId)) {
+      const agentPath = await getAgentConfigPath(agentId);
+      return agentPath;
+    }
+  } catch (error) {
+    import_core.logger.debug(`Agent '${agentId}' not found in installed registry: ${error}`);
+  }
+  if (autoInstall) {
+    try {
+      import_core.logger.info(`Auto-installing agent '${agentId}' from bundled registry`);
+      const configPath = await (0, import_installation.installBundledAgent)(agentId, { injectPreferences });
+      return configPath;
+    } catch (error) {
+      import_core.logger.debug(`Failed to auto-install agent '${agentId}': ${error}`);
+      throw import_errors.RegistryError.agentNotFound(agentId, []);
+    }
+  }
+  throw import_errors.RegistryError.agentNotInstalledAutoInstallDisabled(agentId, []);
+}
+async function getAgentConfigPath(agentId) {
+  const agentsDir = (0, import_path2.getDextoGlobalPath)("agents");
+  const installedRegistryPath = import_path.default.join(agentsDir, "registry.json");
+  const registryContent = await import_fs.promises.readFile(installedRegistryPath, "utf-8");
+  const registry = JSON.parse(registryContent);
+  const agentEntry = registry.agents.find((a) => a.id === agentId);
+  if (!agentEntry) {
+    const available = registry.agents.map((a) => a.id);
+    throw import_errors.RegistryError.agentNotFound(agentId, available);
+  }
+  return import_path.default.resolve(import_path.default.dirname(installedRegistryPath), agentEntry.configPath);
+}
 async function resolveDefaultAgentByContext(autoInstall = true, injectPreferences = true) {
   const executionContext = (0, import_execution_context.getExecutionContext)();
   switch (executionContext) {
@@ -95,13 +133,7 @@ async function resolveDefaultAgentForDextoSource(autoInstall = true, injectPrefe
       if (preferences.setup.completed) {
         import_core.logger.debug("Using user preferences in dexto-source context");
         const preferredAgentName = preferences.defaults.defaultAgent;
-        const { getAgentRegistry } = await import("./registry/registry.js");
-        const registry = getAgentRegistry();
-        return await registry.resolveAgent(
-          preferredAgentName,
-          autoInstall,
-          injectPreferences
-        );
+        return await resolveAgentByName(preferredAgentName, autoInstall, injectPreferences);
       }
     } catch (error) {
       import_core.logger.warn(`Failed to load preferences, falling back to repo config: ${error}`);
@@ -142,9 +174,7 @@ async function resolveDefaultAgentForDextoProject(autoInstall = true, injectPref
     throw import_config.ConfigError.setupIncomplete();
   }
   const preferredAgentName = preferences.defaults.defaultAgent;
-  const { getAgentRegistry } = await import("./registry/registry.js");
-  const registry = getAgentRegistry();
-  return await registry.resolveAgent(preferredAgentName, autoInstall, injectPreferences);
+  return await resolveAgentByName(preferredAgentName, autoInstall, injectPreferences);
 }
 async function resolveDefaultAgentForGlobalCLI(autoInstall = true, injectPreferences = true) {
   import_core.logger.debug("Resolving default agent for global CLI context");
@@ -156,24 +186,33 @@ async function resolveDefaultAgentForGlobalCLI(autoInstall = true, injectPrefere
     throw import_config.ConfigError.setupIncomplete();
   }
   const preferredAgentName = preferences.defaults.defaultAgent;
-  const { getAgentRegistry } = await import("./registry/registry.js");
-  const registry = getAgentRegistry();
-  return await registry.resolveAgent(preferredAgentName, autoInstall, injectPreferences);
+  return await resolveAgentByName(preferredAgentName, autoInstall, injectPreferences);
 }
 async function updateDefaultAgentPreference(agentName) {
-  const { getAgentRegistry } = await import("./registry/registry.js");
-  const { RegistryError } = await import("./registry/errors.js");
-  const { isPath: isPath2 } = await import("@dexto/core");
-  const registry = getAgentRegistry();
-  if (isPath2(agentName) || !registry.hasAgent(agentName)) {
-    const available = Object.keys(registry.getAvailableAgents());
-    throw RegistryError.agentNotFound(agentName, available);
-  }
-  const { updateGlobalPreferences } = await import("./preferences/loader.js");
-  await updateGlobalPreferences({
-    defaults: { defaultAgent: agentName }
-  });
-  import_core.logger.info(`Updated default agent preference to: ${agentName}`);
+  const agentsDir = (0, import_path2.getDextoGlobalPath)("agents");
+  const installedRegistryPath = import_path.default.join(agentsDir, "registry.json");
+  const bundledRegistryPath = (0, import_path2.resolveBundledScript)("agents/agent-registry.json");
+  const registriesToCheck = [
+    { path: installedRegistryPath, name: "installed" },
+    { path: bundledRegistryPath, name: "bundled" }
+  ];
+  for (const registry of registriesToCheck) {
+    try {
+      const manager = new import_AgentManager.AgentManager(registry.path);
+      await manager.loadRegistry();
+      if (manager.hasAgent(agentName)) {
+        const { updateGlobalPreferences } = await import("./preferences/loader.js");
+        await updateGlobalPreferences({
+          defaults: { defaultAgent: agentName }
+        });
+        import_core.logger.info(`Updated default agent preference to: ${agentName}`);
+        return;
+      }
+    } catch (error) {
+      import_core.logger.debug(`Agent '${agentName}' not found in ${registry.name} registry: ${error}`);
+    }
+  }
+  throw import_errors.RegistryError.agentNotFound(agentName, []);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/resolver.d.ts

@@ -1,14 +1,17 @@
 /**
- * Resolve agent path with preference integration
+ * Resolve agent path with automatic installation if needed
  * @param nameOrPath Optional agent name or explicit path
- * @param autoInstall Whether to automatically install missing agents from registry (default: true)
+ * @param autoInstall Whether to automatically install missing agents from bundled registry (default: true)
  * @param injectPreferences Whether to inject preferences during auto-installation (default: true)
  * @returns Resolved absolute path to agent config
- * @throws DextoRuntimeError for any resolution failures
+ * @throws {ConfigError} For path/config issues (file not found, unknown context, setup incomplete)
+ * @throws {RegistryError} For agent lookup failures (agent not found, not installed)
  */
 export declare function resolveAgentPath(nameOrPath?: string, autoInstall?: boolean, injectPreferences?: boolean): Promise<string>;
 /**
  * Update default agent preference
+ * @param agentName The agent name to set as the new default
+ * @throws {RegistryError} If the agent is not found in installed or bundled registry
  */
 export declare function updateDefaultAgentPreference(agentName: string): Promise<void>;
 //# sourceMappingURL=resolver.d.ts.map

package/dist/resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolver.d.ts","sourceRoot":"","sources":["../src/resolver.ts"],"names":[],"mappings":"AAcA;;;;;;;GAOG;AACH,wBAAsB,gBAAgB,CAClC,UAAU,CAAC,EAAE,MAAM,EACnB,WAAW,GAAE,OAAc,EAC3B,iBAAiB,GAAE,OAAc,GAClC,OAAO,CAAC,MAAM,CAAC,CAyBjB;AAoKD;;GAEG;AACH,wBAAsB,4BAA4B,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAoBnF"}
+{"version":3,"file":"resolver.d.ts","sourceRoot":"","sources":["../src/resolver.ts"],"names":[],"mappings":"AAoCA;;;;;;;;GAQG;AACH,wBAAsB,gBAAgB,CAClC,UAAU,CAAC,EAAE,MAAM,EACnB,WAAW,GAAE,OAAc,EAC3B,iBAAiB,GAAE,OAAc,GAClC,OAAO,CAAC,MAAM,CAAC,CAuBjB;AAiND;;;;GAIG;AACH,wBAAsB,4BAA4B,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA+BnF"}

package/dist/resolver.js

@@ -1,6 +1,6 @@
 import { promises as fs } from "fs";
 import path from "path";
-import { isPath } from "./utils/path.js";
+import { isPath, getDextoGlobalPath, resolveBundledScript } from "./utils/path.js";
 import {
   getExecutionContext,
   findDextoSourceRoot,
@@ -9,6 +9,9 @@ import {
 import { logger } from "@dexto/core";
 import { loadGlobalPreferences, globalPreferencesExist } from "./preferences/loader.js";
 import { ConfigError } from "./config/index.js";
+import { RegistryError } from "./registry/errors.js";
+import { AgentManager } from "./AgentManager.js";
+import { installBundledAgent } from "./installation.js";
 async function resolveAgentPath(nameOrPath, autoInstall = true, injectPreferences = true) {
   if (nameOrPath && isPath(nameOrPath)) {
     const resolved = path.resolve(nameOrPath);
@@ -23,12 +26,47 @@ async function resolveAgentPath(nameOrPath, autoInstall = true, injectPreference
     }
   }
   if (nameOrPath) {
-    const { getAgentRegistry } = await import("./registry/registry.js");
-    const registry = getAgentRegistry();
-    return await registry.resolveAgent(nameOrPath, autoInstall, injectPreferences);
+    return await resolveAgentByName(nameOrPath, autoInstall, injectPreferences);
   }
   return await resolveDefaultAgentByContext(autoInstall, injectPreferences);
 }
+async function resolveAgentByName(agentId, autoInstall, injectPreferences) {
+  const agentsDir = getDextoGlobalPath("agents");
+  const installedRegistryPath = path.join(agentsDir, "registry.json");
+  try {
+    const manager = new AgentManager(installedRegistryPath);
+    await manager.loadRegistry();
+    if (manager.hasAgent(agentId)) {
+      const agentPath = await getAgentConfigPath(agentId);
+      return agentPath;
+    }
+  } catch (error) {
+    logger.debug(`Agent '${agentId}' not found in installed registry: ${error}`);
+  }
+  if (autoInstall) {
+    try {
+      logger.info(`Auto-installing agent '${agentId}' from bundled registry`);
+      const configPath = await installBundledAgent(agentId, { injectPreferences });
+      return configPath;
+    } catch (error) {
+      logger.debug(`Failed to auto-install agent '${agentId}': ${error}`);
+      throw RegistryError.agentNotFound(agentId, []);
+    }
+  }
+  throw RegistryError.agentNotInstalledAutoInstallDisabled(agentId, []);
+}
+async function getAgentConfigPath(agentId) {
+  const agentsDir = getDextoGlobalPath("agents");
+  const installedRegistryPath = path.join(agentsDir, "registry.json");
+  const registryContent = await fs.readFile(installedRegistryPath, "utf-8");
+  const registry = JSON.parse(registryContent);
+  const agentEntry = registry.agents.find((a) => a.id === agentId);
+  if (!agentEntry) {
+    const available = registry.agents.map((a) => a.id);
+    throw RegistryError.agentNotFound(agentId, available);
+  }
+  return path.resolve(path.dirname(installedRegistryPath), agentEntry.configPath);
+}
 async function resolveDefaultAgentByContext(autoInstall = true, injectPreferences = true) {
   const executionContext = getExecutionContext();
   switch (executionContext) {
@@ -65,13 +103,7 @@ async function resolveDefaultAgentForDextoSource(autoInstall = true, injectPrefe
       if (preferences.setup.completed) {
         logger.debug("Using user preferences in dexto-source context");
         const preferredAgentName = preferences.defaults.defaultAgent;
-        const { getAgentRegistry } = await import("./registry/registry.js");
-        const registry = getAgentRegistry();
-        return await registry.resolveAgent(
-          preferredAgentName,
-          autoInstall,
-          injectPreferences
-        );
+        return await resolveAgentByName(preferredAgentName, autoInstall, injectPreferences);
       }
     } catch (error) {
       logger.warn(`Failed to load preferences, falling back to repo config: ${error}`);
@@ -112,9 +144,7 @@ async function resolveDefaultAgentForDextoProject(autoInstall = true, injectPref
     throw ConfigError.setupIncomplete();
   }
   const preferredAgentName = preferences.defaults.defaultAgent;
-  const { getAgentRegistry } = await import("./registry/registry.js");
-  const registry = getAgentRegistry();
-  return await registry.resolveAgent(preferredAgentName, autoInstall, injectPreferences);
+  return await resolveAgentByName(preferredAgentName, autoInstall, injectPreferences);
 }
 async function resolveDefaultAgentForGlobalCLI(autoInstall = true, injectPreferences = true) {
   logger.debug("Resolving default agent for global CLI context");
@@ -126,24 +156,33 @@ async function resolveDefaultAgentForGlobalCLI(autoInstall = true, injectPrefere
     throw ConfigError.setupIncomplete();
   }
   const preferredAgentName = preferences.defaults.defaultAgent;
-  const { getAgentRegistry } = await import("./registry/registry.js");
-  const registry = getAgentRegistry();
-  return await registry.resolveAgent(preferredAgentName, autoInstall, injectPreferences);
+  return await resolveAgentByName(preferredAgentName, autoInstall, injectPreferences);
 }
 async function updateDefaultAgentPreference(agentName) {
-  const { getAgentRegistry } = await import("./registry/registry.js");
-  const { RegistryError } = await import("./registry/errors.js");
-  const { isPath: isPath2 } = await import("@dexto/core");
-  const registry = getAgentRegistry();
-  if (isPath2(agentName) || !registry.hasAgent(agentName)) {
-    const available = Object.keys(registry.getAvailableAgents());
-    throw RegistryError.agentNotFound(agentName, available);
-  }
-  const { updateGlobalPreferences } = await import("./preferences/loader.js");
-  await updateGlobalPreferences({
-    defaults: { defaultAgent: agentName }
-  });
-  logger.info(`Updated default agent preference to: ${agentName}`);
+  const agentsDir = getDextoGlobalPath("agents");
+  const installedRegistryPath = path.join(agentsDir, "registry.json");
+  const bundledRegistryPath = resolveBundledScript("agents/agent-registry.json");
+  const registriesToCheck = [
+    { path: installedRegistryPath, name: "installed" },
+    { path: bundledRegistryPath, name: "bundled" }
+  ];
+  for (const registry of registriesToCheck) {
+    try {
+      const manager = new AgentManager(registry.path);
+      await manager.loadRegistry();
+      if (manager.hasAgent(agentName)) {
+        const { updateGlobalPreferences } = await import("./preferences/loader.js");
+        await updateGlobalPreferences({
+          defaults: { defaultAgent: agentName }
+        });
+        logger.info(`Updated default agent preference to: ${agentName}`);
+        return;
+      }
+    } catch (error) {
+      logger.debug(`Agent '${agentName}' not found in ${registry.name} registry: ${error}`);
+    }
+  }
+  throw RegistryError.agentNotFound(agentName, []);
 }
 export {
   resolveAgentPath,

package/dist/writer.cjs

@@ -70,9 +70,13 @@ async function writeLLMPreferences(configPath, preferences, overrides) {
       error instanceof Error ? error.message : String(error)
     );
   }
-  let config;
+  let doc;
   try {
-    config = (0, import_yaml.parse)(fileContent);
+    doc = (0, import_yaml.parseDocument)(fileContent);
+    if (doc.errors && doc.errors.length > 0) {
+      throw new Error(doc.errors.map((e) => e.message).join("; "));
+    }
+    const config = doc.toJS();
     import_core.logger.debug(`Successfully parsed YAML config`, {
       hasLlmSection: Boolean(config.llm),
       existingProvider: config.llm?.provider,
@@ -94,17 +98,15 @@ async function writeLLMPreferences(configPath, preferences, overrides) {
     hasApiKey: Boolean(apiKey),
     source: overrides ? "CLI overrides + preferences" : "preferences only"
   });
-  config.llm = {
-    ...config.llm,
-    // Preserve temperature, router, maxTokens, etc.
-    provider,
-    // Write user preference
-    model,
-    // Write user preference
-    apiKey
-    // Write user preference
-  };
-  await writeConfigFile(configPath, config);
+  let llmNode = doc.get("llm");
+  if (!llmNode || typeof llmNode !== "object") {
+    doc.set("llm", { provider, model, apiKey });
+  } else {
+    doc.setIn(["llm", "provider"], provider);
+    doc.setIn(["llm", "model"], model);
+    doc.setIn(["llm", "apiKey"], apiKey);
+  }
+  await import_fs.promises.writeFile(configPath, doc.toString(), "utf-8");
   import_core.logger.info(`\u2713 Applied preferences to: ${path.basename(configPath)} (${provider}/${model})`);
 }
 async function writePreferencesToAgent(installedPath, preferences, overrides) {

package/dist/writer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"writer.d.ts","sourceRoot":"","sources":["../src/writer.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAIlE,MAAM,WAAW,YAAY;IACzB,QAAQ,CAAC,EAAE,WAAW,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;;;;;;;;GASG;AACH,wBAAsB,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAqB5F;AAED;;;;;;GAMG;AACH,wBAAsB,mBAAmB,CACrC,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,iBAAiB,EAC9B,SAAS,CAAC,EAAE,YAAY,GACzB,OAAO,CAAC,IAAI,CAAC,CAiEf;AAED;;;;;GAKG;AACH,wBAAsB,uBAAuB,CACzC,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,iBAAiB,EAC9B,SAAS,CAAC,EAAE,YAAY,GACzB,OAAO,CAAC,IAAI,CAAC,CAyBf"}
+{"version":3,"file":"writer.d.ts","sourceRoot":"","sources":["../src/writer.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAIlE,MAAM,WAAW,YAAY;IACzB,QAAQ,CAAC,EAAE,WAAW,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;;;;;;;;GASG;AACH,wBAAsB,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAqB5F;AAED;;;;;;GAMG;AACH,wBAAsB,mBAAmB,CACrC,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,iBAAiB,EAC9B,SAAS,CAAC,EAAE,YAAY,GACzB,OAAO,CAAC,IAAI,CAAC,CAwEf;AAED;;;;;GAKG;AACH,wBAAsB,uBAAuB,CACzC,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,iBAAiB,EAC9B,SAAS,CAAC,EAAE,YAAY,GACzB,OAAO,CAAC,IAAI,CAAC,CAyBf"}

package/dist/writer.js

@@ -1,5 +1,5 @@
 import { promises as fs } from "fs";
-import { parse as parseYaml, stringify as stringifyYaml } from "yaml";
+import { parseDocument, stringify as stringifyYaml } from "yaml";
 import * as path from "path";
 import { logger } from "@dexto/core";
 import { ConfigError } from "./config/index.js";
@@ -35,9 +35,13 @@ async function writeLLMPreferences(configPath, preferences, overrides) {
       error instanceof Error ? error.message : String(error)
     );
   }
-  let config;
+  let doc;
   try {
-    config = parseYaml(fileContent);
+    doc = parseDocument(fileContent);
+    if (doc.errors && doc.errors.length > 0) {
+      throw new Error(doc.errors.map((e) => e.message).join("; "));
+    }
+    const config = doc.toJS();
     logger.debug(`Successfully parsed YAML config`, {
       hasLlmSection: Boolean(config.llm),
       existingProvider: config.llm?.provider,
@@ -59,17 +63,15 @@ async function writeLLMPreferences(configPath, preferences, overrides) {
     hasApiKey: Boolean(apiKey),
     source: overrides ? "CLI overrides + preferences" : "preferences only"
   });
-  config.llm = {
-    ...config.llm,
-    // Preserve temperature, router, maxTokens, etc.
-    provider,
-    // Write user preference
-    model,
-    // Write user preference
-    apiKey
-    // Write user preference
-  };
-  await writeConfigFile(configPath, config);
+  let llmNode = doc.get("llm");
+  if (!llmNode || typeof llmNode !== "object") {
+    doc.set("llm", { provider, model, apiKey });
+  } else {
+    doc.setIn(["llm", "provider"], provider);
+    doc.setIn(["llm", "model"], model);
+    doc.setIn(["llm", "apiKey"], apiKey);
+  }
+  await fs.writeFile(configPath, doc.toString(), "utf-8");
   logger.info(`\u2713 Applied preferences to: ${path.basename(configPath)} (${provider}/${model})`);
 }
 async function writePreferencesToAgent(installedPath, preferences, overrides) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dexto/agent-management",
-  "version": "1.2.6",
+  "version": "1.4.0",
   "private": false,
   "type": "module",
   "main": "./dist/index.js",
@@ -16,7 +16,7 @@
   "dependencies": {
     "yaml": "^2.7.1",
     "zod": "^3.25.0",
-    "@dexto/core": "1.2.6"
+    "@dexto/core": "1.4.0"
   },
   "devDependencies": {
     "@types/node": "^22.13.5"