@dexto/agent-config 1.6.0 → 1.6.2

package/dist/index.cjs

@@ -31,6 +31,7 @@ __export(index_exports, {
   createAgentConfigSchema: () => import_agent_config.createAgentConfigSchema,
   loadImage: () => import_load_image.loadImage,
   resolveServicesFromConfig: () => import_resolve_services_from_config.resolveServicesFromConfig,
+  resolveToolsFromEntries: () => import_resolve_services_from_config2.resolveToolsFromEntries,
   setImageImporter: () => import_load_image.setImageImporter,
   toDextoAgentOptions: () => import_to_dexto_agent_options.toDextoAgentOptions
 });
@@ -41,6 +42,7 @@ var import_compaction = require("./schemas/compaction.js");
 var import_apply_image_defaults = require("./resolver/apply-image-defaults.js");
 var import_load_image = require("./resolver/load-image.js");
 var import_resolve_services_from_config = require("./resolver/resolve-services-from-config.js");
+var import_resolve_services_from_config2 = require("./resolver/resolve-services-from-config.js");
 var import_to_dexto_agent_options = require("./resolver/to-dexto-agent-options.js");
 var import_clean_null_values = require("./utils/clean-null-values.js");
 // Annotate the CommonJS export names for ESM import in node:
@@ -58,6 +60,7 @@ var import_clean_null_values = require("./utils/clean-null-values.js");
   createAgentConfigSchema,
   loadImage,
   resolveServicesFromConfig,
+  resolveToolsFromEntries,
   setImageImporter,
   toDextoAgentOptions
 });

package/dist/index.d.ts

@@ -9,6 +9,7 @@ export { applyImageDefaults } from './resolver/apply-image-defaults.js';
 export { loadImage, setImageImporter } from './resolver/load-image.js';
 export type { ImageImporter } from './resolver/load-image.js';
 export { resolveServicesFromConfig } from './resolver/resolve-services-from-config.js';
+export { resolveToolsFromEntries } from './resolver/resolve-services-from-config.js';
 export { toDextoAgentOptions } from './resolver/to-dexto-agent-options.js';
 export type { ResolvedServices } from './resolver/types.js';
 export { cleanNullValues } from './utils/clean-null-values.js';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACR,gBAAgB,EAChB,YAAY,EACZ,iBAAiB,EACjB,eAAe,EACf,UAAU,EACV,aAAa,EACb,aAAa,EACb,WAAW,EACX,WAAW,GACd,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACH,iBAAiB,EACjB,uBAAuB,EACvB,sBAAsB,GACzB,MAAM,2BAA2B,CAAC;AAEnC,YAAY,EACR,WAAW,EACX,oBAAoB,EACpB,gBAAgB,GACnB,MAAM,2BAA2B,CAAC;AAEnC,YAAY,EAAE,WAAW,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAE9F,OAAO,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAE/E,OAAO,EACH,sBAAsB,EACtB,yBAAyB,EACzB,sCAAsC,EACtC,0BAA0B,GAC7B,MAAM,yBAAyB,CAAC;AAEjC,YAAY,EACR,gBAAgB,EAChB,yBAAyB,EACzB,gCAAgC,EAChC,oBAAoB,GACvB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACvE,YAAY,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,yBAAyB,EAAE,MAAM,4CAA4C,CAAC;AACvF,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAE3E,YAAY,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACR,gBAAgB,EAChB,YAAY,EACZ,iBAAiB,EACjB,eAAe,EACf,UAAU,EACV,aAAa,EACb,aAAa,EACb,WAAW,EACX,WAAW,GACd,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACH,iBAAiB,EACjB,uBAAuB,EACvB,sBAAsB,GACzB,MAAM,2BAA2B,CAAC;AAEnC,YAAY,EACR,WAAW,EACX,oBAAoB,EACpB,gBAAgB,GACnB,MAAM,2BAA2B,CAAC;AAEnC,YAAY,EAAE,WAAW,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAE9F,OAAO,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAE/E,OAAO,EACH,sBAAsB,EACtB,yBAAyB,EACzB,sCAAsC,EACtC,0BAA0B,GAC7B,MAAM,yBAAyB,CAAC;AAEjC,YAAY,EACR,gBAAgB,EAChB,yBAAyB,EACzB,gCAAgC,EAChC,oBAAoB,GACvB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACvE,YAAY,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,yBAAyB,EAAE,MAAM,4CAA4C,CAAC;AACvF,OAAO,EAAE,uBAAuB,EAAE,MAAM,4CAA4C,CAAC;AACrF,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAE3E,YAAY,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC"}

package/dist/index.js

@@ -13,6 +13,7 @@ import {
 import { applyImageDefaults } from "./resolver/apply-image-defaults.js";
 import { loadImage, setImageImporter } from "./resolver/load-image.js";
 import { resolveServicesFromConfig } from "./resolver/resolve-services-from-config.js";
+import { resolveToolsFromEntries } from "./resolver/resolve-services-from-config.js";
 import { toDextoAgentOptions } from "./resolver/to-dexto-agent-options.js";
 import { cleanNullValues } from "./utils/clean-null-values.js";
 export {
@@ -29,6 +30,7 @@ export {
   createAgentConfigSchema,
   loadImage,
   resolveServicesFromConfig,
+  resolveToolsFromEntries,
   setImageImporter,
   toDextoAgentOptions
 };

package/dist/resolver/resolve-services-from-config.cjs

@@ -18,7 +18,8 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var resolve_services_from_config_exports = {};
 __export(resolve_services_from_config_exports, {
-  resolveServicesFromConfig: () => resolveServicesFromConfig
+  resolveServicesFromConfig: () => resolveServicesFromConfig,
+  resolveToolsFromEntries: () => resolveToolsFromEntries
 });
 module.exports = __toCommonJS(resolve_services_from_config_exports);
 var import_utils = require("./utils.js");
@@ -77,33 +78,11 @@ async function resolveServicesFromConfig(config, image) {
     cache: await cacheFactory.create(cacheConfig, logger)
   };
   const toolEntries = config.tools ?? image.defaults?.tools ?? [];
-  const tools = [];
-  const toolIds = /* @__PURE__ */ new Set();
-  for (const entry of toolEntries) {
-    if (entry.enabled === false) {
-      continue;
-    }
-    const factory = resolveByType({
-      kind: "tool",
-      type: entry.type,
-      factories: image.tools,
-      imageName
-    });
-    const validatedConfig = factory.configSchema.parse(stripEnabled(entry));
-    for (const tool of factory.create(validatedConfig)) {
-      if (tool.id.startsWith(MCP_TOOL_PREFIX)) {
-        throw new Error(
-          `Invalid local tool id '${tool.id}': '${MCP_TOOL_PREFIX}' prefix is reserved for MCP tools.`
-        );
-      }
-      if (toolIds.has(tool.id)) {
-        logger.warn(`Tool id conflict for '${tool.id}'. Skipping duplicate tool.`);
-        continue;
-      }
-      toolIds.add(tool.id);
-      tools.push(tool);
-    }
-  }
+  const tools = resolveToolsFromEntries({ entries: toolEntries, image, logger });
+  const toolkitLoader = async (toolkits) => {
+    const entries = toolkits.map((type) => ({ type }));
+    return resolveToolsFromEntries({ entries, image, logger });
+  };
   const hookEntries = config.hooks ?? image.defaults?.hooks ?? [];
   const hooks = [];
   for (const entry of hookEntries) {
@@ -138,9 +117,42 @@ async function resolveServicesFromConfig(config, image) {
     const parsedConfig = factory.configSchema.parse(compactionConfig);
     compaction = await factory.create(parsedConfig);
   }
-  return { logger, storage, tools, hooks, compaction };
+  return { logger, storage, tools, toolkitLoader, hooks, compaction };
+}
+function resolveToolsFromEntries(options) {
+  const { entries, image, logger } = options;
+  const imageName = image.metadata.name;
+  const tools = [];
+  const toolIds = /* @__PURE__ */ new Set();
+  for (const entry of entries) {
+    if (entry.enabled === false) {
+      continue;
+    }
+    const factory = resolveByType({
+      kind: "tool",
+      type: entry.type,
+      factories: image.tools,
+      imageName
+    });
+    const validatedConfig = factory.configSchema.parse(stripEnabled(entry));
+    for (const tool of factory.create(validatedConfig)) {
+      if (tool.id.startsWith(MCP_TOOL_PREFIX)) {
+        throw new Error(
+          `Invalid local tool id '${tool.id}': '${MCP_TOOL_PREFIX}' prefix is reserved for MCP tools.`
+        );
+      }
+      if (toolIds.has(tool.id)) {
+        logger.warn(`Tool id conflict for '${tool.id}'. Skipping duplicate tool.`);
+        continue;
+      }
+      toolIds.add(tool.id);
+      tools.push(tool);
+    }
+  }
+  return tools;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  resolveServicesFromConfig
+  resolveServicesFromConfig,
+  resolveToolsFromEntries
 });

package/dist/resolver/resolve-services-from-config.d.ts

@@ -1,5 +1,11 @@
-import type { ValidatedAgentConfig } from '../schemas/agent-config.js';
+import type { Logger, Tool } from '@dexto/core';
+import type { ToolFactoryEntry, ValidatedAgentConfig } from '../schemas/agent-config.js';
 import type { DextoImage } from '../image/types.js';
 import type { ResolvedServices } from './types.js';
 export declare function resolveServicesFromConfig(config: ValidatedAgentConfig, image: DextoImage): Promise<ResolvedServices>;
+export declare function resolveToolsFromEntries(options: {
+    entries: ToolFactoryEntry[];
+    image: DextoImage;
+    logger: Logger;
+}): Tool[];
 //# sourceMappingURL=resolve-services-from-config.d.ts.map

package/dist/resolver/resolve-services-from-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolve-services-from-config.d.ts","sourceRoot":"","sources":["../../src/resolver/resolve-services-from-config.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAmCnD,wBAAsB,yBAAyB,CAC3C,MAAM,EAAE,oBAAoB,EAC5B,KAAK,EAAE,UAAU,GAClB,OAAO,CAAC,gBAAgB,CAAC,CAqH3B"}
+{"version":3,"file":"resolve-services-from-config.d.ts","sourceRoot":"","sources":["../../src/resolver/resolve-services-from-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAQ,MAAM,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AACzF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAmCnD,wBAAsB,yBAAyB,CAC3C,MAAM,EAAE,oBAAoB,EAC5B,KAAK,EAAE,UAAU,GAClB,OAAO,CAAC,gBAAgB,CAAC,CA2F3B;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE;IAC7C,OAAO,EAAE,gBAAgB,EAAE,CAAC;IAC5B,KAAK,EAAE,UAAU,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CAClB,GAAG,IAAI,EAAE,CAoCT"}

package/dist/resolver/resolve-services-from-config.js

@@ -54,33 +54,11 @@ async function resolveServicesFromConfig(config, image) {
     cache: await cacheFactory.create(cacheConfig, logger)
   };
   const toolEntries = config.tools ?? image.defaults?.tools ?? [];
-  const tools = [];
-  const toolIds = /* @__PURE__ */ new Set();
-  for (const entry of toolEntries) {
-    if (entry.enabled === false) {
-      continue;
-    }
-    const factory = resolveByType({
-      kind: "tool",
-      type: entry.type,
-      factories: image.tools,
-      imageName
-    });
-    const validatedConfig = factory.configSchema.parse(stripEnabled(entry));
-    for (const tool of factory.create(validatedConfig)) {
-      if (tool.id.startsWith(MCP_TOOL_PREFIX)) {
-        throw new Error(
-          `Invalid local tool id '${tool.id}': '${MCP_TOOL_PREFIX}' prefix is reserved for MCP tools.`
-        );
-      }
-      if (toolIds.has(tool.id)) {
-        logger.warn(`Tool id conflict for '${tool.id}'. Skipping duplicate tool.`);
-        continue;
-      }
-      toolIds.add(tool.id);
-      tools.push(tool);
-    }
-  }
+  const tools = resolveToolsFromEntries({ entries: toolEntries, image, logger });
+  const toolkitLoader = async (toolkits) => {
+    const entries = toolkits.map((type) => ({ type }));
+    return resolveToolsFromEntries({ entries, image, logger });
+  };
   const hookEntries = config.hooks ?? image.defaults?.hooks ?? [];
   const hooks = [];
   for (const entry of hookEntries) {
@@ -115,8 +93,41 @@ async function resolveServicesFromConfig(config, image) {
     const parsedConfig = factory.configSchema.parse(compactionConfig);
     compaction = await factory.create(parsedConfig);
   }
-  return { logger, storage, tools, hooks, compaction };
+  return { logger, storage, tools, toolkitLoader, hooks, compaction };
+}
+function resolveToolsFromEntries(options) {
+  const { entries, image, logger } = options;
+  const imageName = image.metadata.name;
+  const tools = [];
+  const toolIds = /* @__PURE__ */ new Set();
+  for (const entry of entries) {
+    if (entry.enabled === false) {
+      continue;
+    }
+    const factory = resolveByType({
+      kind: "tool",
+      type: entry.type,
+      factories: image.tools,
+      imageName
+    });
+    const validatedConfig = factory.configSchema.parse(stripEnabled(entry));
+    for (const tool of factory.create(validatedConfig)) {
+      if (tool.id.startsWith(MCP_TOOL_PREFIX)) {
+        throw new Error(
+          `Invalid local tool id '${tool.id}': '${MCP_TOOL_PREFIX}' prefix is reserved for MCP tools.`
+        );
+      }
+      if (toolIds.has(tool.id)) {
+        logger.warn(`Tool id conflict for '${tool.id}'. Skipping duplicate tool.`);
+        continue;
+      }
+      toolIds.add(tool.id);
+      tools.push(tool);
+    }
+  }
+  return tools;
 }
 export {
-  resolveServicesFromConfig
+  resolveServicesFromConfig,
+  resolveToolsFromEntries
 };

package/dist/resolver/to-dexto-agent-options.cjs

@@ -40,6 +40,7 @@ function toDextoAgentOptions(options) {
     logger: services.logger,
     storage: services.storage,
     tools: services.tools,
+    toolkitLoader: services.toolkitLoader,
     hooks: services.hooks,
     compaction: services.compaction,
     ...overrides ? { overrides } : {}

package/dist/resolver/to-dexto-agent-options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"to-dexto-agent-options.d.ts","sourceRoot":"","sources":["../../src/resolver/to-dexto-agent-options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AAChF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEnD,MAAM,WAAW,wBAAwB;IACrC,MAAM,EAAE,oBAAoB,CAAC;IAC7B,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,SAAS,CAAC,EAAE,yBAAyB,GAAG,SAAS,CAAC;CACrD;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,wBAAwB,GAAG,iBAAiB,CAwBxF"}
+{"version":3,"file":"to-dexto-agent-options.d.ts","sourceRoot":"","sources":["../../src/resolver/to-dexto-agent-options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AAChF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEnD,MAAM,WAAW,wBAAwB;IACrC,MAAM,EAAE,oBAAoB,CAAC;IAC7B,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,SAAS,CAAC,EAAE,yBAAyB,GAAG,SAAS,CAAC;CACrD;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,wBAAwB,GAAG,iBAAiB,CAyBxF"}

package/dist/resolver/to-dexto-agent-options.js

@@ -17,6 +17,7 @@ function toDextoAgentOptions(options) {
     logger: services.logger,
     storage: services.storage,
     tools: services.tools,
+    toolkitLoader: services.toolkitLoader,
     hooks: services.hooks,
     compaction: services.compaction,
     ...overrides ? { overrides } : {}

package/dist/resolver/types.d.ts

@@ -4,7 +4,7 @@ import type { Database } from '@dexto/core';
 import type { Hook } from '@dexto/core';
 import type { CompactionStrategy } from '@dexto/core';
 import type { Logger } from '@dexto/core';
-import type { Tool } from '@dexto/core';
+import type { Tool, ToolkitLoader } from '@dexto/core';
 export interface ResolvedServices {
     logger: Logger;
     storage: {
@@ -13,6 +13,7 @@ export interface ResolvedServices {
         cache: Cache;
     };
     tools: Tool[];
+    toolkitLoader?: ToolkitLoader;
     hooks: Hook[];
     compaction: CompactionStrategy | null;
 }

package/dist/resolver/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/resolver/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAExC,MAAM,WAAW,gBAAgB;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE;QAAE,IAAI,EAAE,SAAS,CAAC;QAAC,QAAQ,EAAE,QAAQ,CAAC;QAAC,KAAK,EAAE,KAAK,CAAA;KAAE,CAAC;IAC/D,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,UAAU,EAAE,kBAAkB,GAAG,IAAI,CAAC;CACzC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/resolver/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEvD,MAAM,WAAW,gBAAgB;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE;QAAE,IAAI,EAAE,SAAS,CAAC;QAAC,QAAQ,EAAE,QAAQ,CAAC;QAAC,KAAK,EAAE,KAAK,CAAA;KAAE,CAAC;IAC/D,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,UAAU,EAAE,kBAAkB,GAAG,IAAI,CAAC;CACzC"}