dexto 1.7.2 → 1.8.1

package/dist/cli/utils/template-engine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"template-engine.d.ts","sourceRoot":"","sources":["../../../src/cli/utils/template-engine.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,UAAU,eAAe;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACtB;AAED;;GAEG;AACH,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,eAAe,GAAG,MAAM,CAgC5E;AAED;;GAEG;AACH,wBAAgB,oCAAoC,CAAC,OAAO,EAAE,eAAe,GAAG,MAAM,CAsCrF;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAsC9D;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,MAAM,CAwKzC;AAED;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,MAAM,CAqN1C;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,eAAe,GAAG,MAAM,CA2DvE;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,eAAe,GAAG,MAAM,CAgFpE;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,GAAE,MAAuB,GAAG,MAAM,CAoD7E;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAiC5D;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,CAsDxE;AAED;;GAEG;AACH,wBAAgB,2BAA2B,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAwBrE;AAED;;GAEG;AACH,wBAAgB,8BAA8B,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAwB3E;AAED;;GAEG;AACH,wBAAgB,+BAA+B,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAyBxE;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,eAAe,GAAG,MAAM,CA+ClE"}
+{"version":3,"file":"template-engine.d.ts","sourceRoot":"","sources":["../../../src/cli/utils/template-engine.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,UAAU,eAAe;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACtB;AAED;;GAEG;AACH,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,eAAe,GAAG,MAAM,CA2B5E;AAED;;GAEG;AACH,wBAAgB,oCAAoC,CAAC,OAAO,EAAE,eAAe,GAAG,MAAM,CAiCrF;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAsC9D;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,MAAM,CAwKzC;AAED;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,MAAM,CAqN1C;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,eAAe,GAAG,MAAM,CA8CvE;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,eAAe,GAAG,MAAM,CA6EpE;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,GAAE,MAAuB,GAAG,MAAM,CAoD7E;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAiC5D;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,CAsDxE;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,eAAe,GAAG,MAAM,CA+ClE"}

package/dist/cli/utils/template-engine.js

@@ -15,8 +15,7 @@ export function generateIndexForCodeFirstDI(context) {
     return `// Standalone Dexto app (programmatic)
 import 'dotenv/config';
 
-import { DextoAgent, createLogger } from '@dexto/core';
-import { MemoryBlobStore, MemoryCacheStore, MemoryDatabaseStore } from '@dexto/storage';
+import { DextoAgent, InMemoryDextoStores, createLogger } from '@dexto/core';
 
 const agentId = '${context.projectName}';
 const logger = createLogger({
@@ -29,11 +28,7 @@ const agent = new DextoAgent({
     llm: { provider: '${defaultProvider}', model: '${defaultModel}' },
     systemPrompt: 'You are a helpful AI assistant.',
     logger,
-    storage: {
-        cache: new MemoryCacheStore(),
-        database: new MemoryDatabaseStore(),
-        blob: new MemoryBlobStore({}, logger),
-    },
+    stores: new InMemoryDextoStores(logger),
 });
 
 await agent.start();
@@ -51,8 +46,7 @@ export function generateWebServerIndexForCodeFirstDI(context) {
     return `// Dexto Web Server (programmatic)
 import 'dotenv/config';
 
-import { DextoAgent, createLogger } from '@dexto/core';
-import { MemoryBlobStore, MemoryCacheStore, MemoryDatabaseStore } from '@dexto/storage';
+import { DextoAgent, InMemoryDextoStores, createLogger } from '@dexto/core';
 import { startDextoServer } from '@dexto/server';
 import { resolve } from 'node:path';
 
@@ -67,11 +61,7 @@ const agent = new DextoAgent({
     llm: { provider: '${defaultProvider}', model: '${defaultModel}' },
     systemPrompt: 'You are a helpful AI assistant.',
     logger,
-    storage: {
-        cache: new MemoryCacheStore(),
-        database: new MemoryDatabaseStore(),
-        blob: new MemoryBlobStore({}, logger),
-    },
+    stores: new InMemoryDextoStores(logger),
 });
 
 const { stop } = await startDextoServer(agent, {
@@ -534,17 +524,7 @@ export function generateDextoImageFile(context) {
                 type: 'in-memory',
             },
         },`
-        : `        storage: {
-            blob: {
-                type: 'example-blob',
-            },
-            database: {
-                type: 'example-database',
-            },
-            cache: {
-                type: 'example-cache',
-            },
-        },`;
+        : '';
     return `import type { ImageDefinition } from '@dexto/image-bundler';
 
 const image = {
@@ -555,9 +535,6 @@ const image = {
 ${extendsField}
     // Factories are AUTO-DISCOVERED from convention-based folders:
     //   tools/<type>/index.ts
-    //   storage/blob/<type>/index.ts
-    //   storage/database/<type>/index.ts
-    //   storage/cache/<type>/index.ts
     //   hooks/<type>/index.ts
     //   compaction/<type>/index.ts
     //
@@ -619,9 +596,6 @@ Set \`image: '${imageName}'\` in your agent config (or pass \`--image\` in the C
 
 Add your custom factories to convention-based folders:
 - \`tools/<type>/\` - Tool factories
-- \`storage/blob/<type>/\` - Blob storage factories
-- \`storage/database/<type>/\` - Database factories
-- \`storage/cache/<type>/\` - Cache factories
 - \`hooks/<type>/\` - Hook factories
 - \`compaction/<type>/\` - Compaction factories
 
@@ -811,91 +785,6 @@ export const factory: CompactionFactory<ExampleCompactionConfig> = {
 };
 `;
 }
-/**
- * Generates an example in-memory cache factory
- */
-export function generateExampleCacheFactory(cacheType) {
-    return `import { z } from 'zod';
-import type { CacheFactory } from '@dexto/agent-config';
-import { MemoryCacheStore } from '@dexto/storage';
-
-const ConfigSchema = z
-    .object({
-        type: z.literal('${cacheType}'),
-    })
-    .strict();
-
-type ExampleCacheConfig = z.output<typeof ConfigSchema>;
-
-/**
- * Example cache factory
- *
- * Storage backends are resolved from image factories.
- * The bundler auto-discovers this module when placed in storage/cache/<type>/index.ts.
- */
-export const factory: CacheFactory<ExampleCacheConfig> = {
-    configSchema: ConfigSchema,
-    create: (_config, _logger) => new MemoryCacheStore(),
-};
-`;
-}
-/**
- * Generates an example in-memory database factory
- */
-export function generateExampleDatabaseFactory(databaseType) {
-    return `import { z } from 'zod';
-import type { DatabaseFactory } from '@dexto/agent-config';
-import { MemoryDatabaseStore } from '@dexto/storage';
-
-const ConfigSchema = z
-    .object({
-        type: z.literal('${databaseType}'),
-    })
-    .strict();
-
-type ExampleDatabaseConfig = z.output<typeof ConfigSchema>;
-
-/**
- * Example database factory
- *
- * Storage backends are resolved from image factories.
- * The bundler auto-discovers this module when placed in storage/database/<type>/index.ts.
- */
-export const factory: DatabaseFactory<ExampleDatabaseConfig> = {
-    configSchema: ConfigSchema,
-    create: (_config, _logger) => new MemoryDatabaseStore(),
-};
-`;
-}
-/**
- * Generates an example in-memory blob store factory
- */
-export function generateExampleBlobStoreFactory(blobType) {
-    return `import { z } from 'zod';
-import type { BlobStoreFactory } from '@dexto/agent-config';
-import { InMemoryBlobStoreSchema, MemoryBlobStore } from '@dexto/storage';
-
-const ConfigSchema = InMemoryBlobStoreSchema.extend({
-    type: z.literal('${blobType}'),
-}).strict();
-
-type ExampleBlobStoreConfig = z.output<typeof ConfigSchema>;
-
-/**
- * Example blob store factory
- *
- * Blob stores are resolved from image factories.
- * The bundler auto-discovers this module when placed in storage/blob/<type>/index.ts.
- */
-export const factory: BlobStoreFactory<ExampleBlobStoreConfig> = {
-    configSchema: ConfigSchema,
-    create: (config, logger) => {
-        const { type: _type, ...options } = config;
-        return new MemoryBlobStore(options, logger);
-    },
-};
-`;
-}
 /**
  * Generates README for an app project
  */

package/dist/config/cli-overrides.d.ts

@@ -19,7 +19,8 @@
  * - Merge strategy configuration for non-LLM fields
  */
 import type { AgentConfig } from '@dexto/agent-config';
-import { type LLMConfig, type LLMProvider } from '@dexto/core';
+import { type LLMProvider } from '@dexto/llm';
+import { type LLMConfig } from '@dexto/core';
 import type { GlobalPreferences } from '@dexto/agent-management';
 /**
  * CLI config override type for fields that can be overridden via CLI

package/dist/config/cli-overrides.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli-overrides.d.ts","sourceRoot":"","sources":["../../src/config/cli-overrides.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAOH,KAAK,SAAS,EACd,KAAK,WAAW,EACnB,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEjE;;;GAGG;AACH,MAAM,WAAW,kBACb,SAAQ,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,UAAU,GAAG,OAAO,GAAG,QAAQ,CAAC,CAAC;IACjE,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,8DAA8D;IAC9D,WAAW,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,MAAM,WAAW,yBAAyB;IACtC,iBAAiB,EAAE,OAAO,CAAC;IAC3B,2BAA2B,EAAE,OAAO,CAAC;IACrC,wBAAwB,EAAE,OAAO,CAAC;IAClC,yBAAyB,EAAE,OAAO,CAAC;CACtC;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAC7B,UAAU,EAAE,WAAW,EACvB,YAAY,CAAC,EAAE,kBAAkB,GAClC,WAAW,CAuCb;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,oBAAoB,CAChC,UAAU,EAAE,WAAW,EACvB,WAAW,EAAE,OAAO,CAAC,iBAAiB,CAAC,GACxC,WAAW,CAwBb;AAED,wBAAgB,uBAAuB,CACnC,UAAU,EAAE,WAAW,EACvB,OAAO,EAAE,yBAAyB,GACnC,WAAW,CAyCb;AAcD,wBAAgB,oBAAoB,CAChC,QAAQ,EAAE,WAAW,EACrB,SAAS,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAC,GAC3D,OAAO,CAgBT;AAED;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACrC,UAAU,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,aAAa,EAAE,WAAW,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,WAAW,GAAG,SAAS,CAAC;IACtC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,aAAa,EAAE,OAAO,CAAC;CAC1B;AAED;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CACnC,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,iBAAiB,GAAG,IAAI,EACrC,cAAc,EAAE,MAAM,GAAG,SAAS,GACnC,wBAAwB,CAwC1B"}
+{"version":3,"file":"cli-overrides.d.ts","sourceRoot":"","sources":["../../src/config/cli-overrides.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAKH,KAAK,WAAW,EACnB,MAAM,YAAY,CAAC;AACpB,OAAO,EAA+C,KAAK,SAAS,EAAE,MAAM,aAAa,CAAC;AAC1F,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEjE;;;GAGG;AACH,MAAM,WAAW,kBACb,SAAQ,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,UAAU,GAAG,OAAO,GAAG,QAAQ,CAAC,CAAC;IACjE,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,8DAA8D;IAC9D,WAAW,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,MAAM,WAAW,yBAAyB;IACtC,iBAAiB,EAAE,OAAO,CAAC;IAC3B,2BAA2B,EAAE,OAAO,CAAC;IACrC,wBAAwB,EAAE,OAAO,CAAC;IAClC,yBAAyB,EAAE,OAAO,CAAC;CACtC;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAC7B,UAAU,EAAE,WAAW,EACvB,YAAY,CAAC,EAAE,kBAAkB,GAClC,WAAW,CAuCb;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,oBAAoB,CAChC,UAAU,EAAE,WAAW,EACvB,WAAW,EAAE,OAAO,CAAC,iBAAiB,CAAC,GACxC,WAAW,CAwBb;AAED,wBAAgB,uBAAuB,CACnC,UAAU,EAAE,WAAW,EACvB,OAAO,EAAE,yBAAyB,GACnC,WAAW,CAyCb;AAcD,wBAAgB,oBAAoB,CAChC,QAAQ,EAAE,WAAW,EACrB,SAAS,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAC,GAC3D,OAAO,CAgBT;AAED;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACrC,UAAU,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,aAAa,EAAE,WAAW,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,WAAW,GAAG,SAAS,CAAC;IACtC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,aAAa,EAAE,OAAO,CAAC;CAC1B;AAED;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CACnC,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,iBAAiB,GAAG,IAAI,EACrC,cAAc,EAAE,MAAM,GAAG,SAAS,GACnC,wBAAwB,CAwC1B"}

package/dist/config/cli-overrides.js

@@ -18,7 +18,8 @@
  * - Agent capability requirements (requires: { vision: true, toolUse: true })
  * - Merge strategy configuration for non-LLM fields
  */
-import { EnvExpandedString, LLM_PROVIDERS, getDefaultModelForProvider, requiresApiKey, requiresBaseURL, resolveApiKeyForProvider, } from '@dexto/core';
+import { LLM_PROVIDERS, getDefaultModelForProvider, requiresApiKey, requiresBaseURL, } from '@dexto/llm';
+import { EnvExpandedString, resolveApiKeyForProvider } from '@dexto/core';
 /**
  * Applies CLI overrides to an agent configuration
  * This merges CLI arguments into the base config without validation.

package/dist/config/effective-llm.d.ts

@@ -41,7 +41,7 @@
  *
  * @module effective-llm
  */
-import type { LLMProvider } from '@dexto/core';
+import type { LLMProvider } from '@dexto/llm';
 /**
  * Source of the effective LLM configuration
  */

package/dist/config/effective-llm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"effective-llm.d.ts","sourceRoot":"","sources":["../../src/config/effective-llm.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0CG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAS/C;;GAEG;AACH,MAAM,MAAM,eAAe,GACrB,OAAO,GACP,aAAa,GACb,SAAS,CAAC;AAEhB;;GAEG;AACH,MAAM,WAAW,kBAAkB;IAC/B,+DAA+D;IAC/D,QAAQ,EAAE,WAAW,CAAC;IACtB,oDAAoD;IACpD,KAAK,EAAE,MAAM,CAAC;IACd,yEAAyE;IACzE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,oCAAoC;IACpC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,kCAAkC;IAClC,MAAM,EAAE,eAAe,CAAC;CAC3B;AAED;;GAEG;AACH,MAAM,WAAW,4BAA4B;IACzC;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;OAIG;IACH,sBAAsB,CAAC,EAAE,OAAO,CAAC;CACpC;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAsB,qBAAqB,CACvC,OAAO,GAAE,4BAAiC,GAC3C,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAsFpC;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,mBAAmB,CACrC,OAAO,GAAE,4BAAiC,GAC3C,OAAO,CAAC,OAAO,CAAC,CAGlB"}
+{"version":3,"file":"effective-llm.d.ts","sourceRoot":"","sources":["../../src/config/effective-llm.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0CG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAS9C;;GAEG;AACH,MAAM,MAAM,eAAe,GACrB,OAAO,GACP,aAAa,GACb,SAAS,CAAC;AAEhB;;GAEG;AACH,MAAM,WAAW,kBAAkB;IAC/B,+DAA+D;IAC/D,QAAQ,EAAE,WAAW,CAAC;IACtB,oDAAoD;IACpD,KAAK,EAAE,MAAM,CAAC;IACd,yEAAyE;IACzE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,oCAAoC;IACpC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,kCAAkC;IAClC,MAAM,EAAE,eAAe,CAAC;CAC3B;AAED;;GAEG;AACH,MAAM,WAAW,4BAA4B;IACzC;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;OAIG;IACH,sBAAsB,CAAC,EAAE,OAAO,CAAC;CACpC;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAsB,qBAAqB,CACvC,OAAO,GAAE,4BAAiC,GAC3C,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAsFpC;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,mBAAmB,CACrC,OAAO,GAAE,4BAAiC,GAC3C,OAAO,CAAC,OAAO,CAAC,CAGlB"}

package/dist/index-main.js

@@ -43,9 +43,10 @@ function resolveCliVersion() {
 const cliVersion = resolveCliVersion();
 // Set CLI version for Dexto Gateway usage tracking
 process.env.DEXTO_CLI_VERSION = cliVersion;
-import { logger, getProviderFromModel, getAllSupportedModels, startLlmRegistryAutoUpdate, DextoAgent, isPath, resolveApiKeyForProvider, getPrimaryApiKeyEnvVar, } from '@dexto/core';
+import { logger, startLlmRegistryAutoUpdate, DextoAgent, isPath } from '@dexto/core';
+import { getAllSupportedModels, getProviderFromModel } from '@dexto/llm';
 import { applyImageDefaults, cleanNullValues, AgentConfigSchema, loadImage, resolveServicesFromConfig, toDextoAgentOptions, } from '@dexto/agent-config';
-import { getDextoPackageRoot, resolveAgentPath, loadAgentConfig, findDextoProjectRoot, globalPreferencesExist, loadGlobalPreferences, resolveBundledScript, enrichAgentConfig, isDextoAuthEnabled, } from '@dexto/agent-management';
+import { getDextoPackageRoot, resolveAgentPath, loadAgentConfig, findDextoProjectRoot, globalPreferencesExist, loadGlobalPreferences, resolveBundledScript, enrichAgentConfig, isDextoAuthEnabled, resolveApiKeyForProvider, getPrimaryApiKeyEnvVar, } from '@dexto/agent-management';
 import { validateCliOptions, handleCliOptionsError } from './cli/utils/options.js';
 import { validateAgentConfig } from './cli/utils/config-validation.js';
 import { applyCLIOverrides, applyStartupLLMFallback, applyUserPreferences, } from './config/cli-overrides.js';
@@ -107,7 +108,7 @@ program
     .option('--no-interactive', 'Disable interactive prompts and API key setup')
     .option('--skip-setup', 'Skip global setup validation (useful for MCP mode, automation)')
     .option('-m, --model <model>', 'Specify the LLM model to use')
-    .option('--auto-approve', 'Always approve tool executions without confirmation prompts')
+    .option('--auto-approve', 'Always approve tool executions without approval prompts')
     .option('--bypass-permissions', 'Start the interactive CLI in bypass permissions mode (auto-approve approval prompts)')
     .option('--no-elicitation', 'Disable elicitation (agent cannot prompt user for input)')
     .option('-c, --continue', 'Continue most recent session (CLI mode)')
@@ -350,11 +351,12 @@ async function bootstrapAgentFromGlobalOpts(options) {
         }),
     };
     const validatedConfig = AgentConfigSchema.parse(enrichedConfig);
-    const services = await resolveServicesFromConfig(validatedConfig, image);
+    const services = await resolveServicesFromConfig(validatedConfig, image, { workspaceRoot });
     const agent = new DextoAgent(toDextoAgentOptions({
         config: validatedConfig,
         services,
         image,
+        hostContext: { workspaceRoot },
     }));
     await agent.start();
     await (await import('./utils/workspace.js')).applyWorkspaceToAgent(agent, workspaceRoot);
@@ -801,7 +803,7 @@ program
             console.error(`❌ Manual approval and elicitation are not supported in "${opts.mode}" mode.`);
             console.error(`💡 These features require interactive UI and are only supported in: ${supportedModes.join(', ')}`);
             console.error('💡 Run `dexto --auto-approve` or configure your agent to skip approvals when running non-interactively.');
-            console.error('   permissions.mode: auto-approve (or auto-deny if you want to deny certain tools)');
+            console.error('   permissions.mode: auto-approve');
             console.error('   elicitation.enabled: false');
             safeExit('main', 1, 'approval-unsupported-mode');
         }
@@ -810,7 +812,7 @@ program
     let agent;
     let derivedAgentId;
     try {
-        // Set run mode for tool confirmation provider
+        // Set run mode for tool approval provider
         process.env.DEXTO_RUN_MODE = opts.mode;
         // Apply --strict flag to all server configs
         if (opts.strict && validatedConfig.mcpServers) {
@@ -829,11 +831,14 @@ program
                 logger,
             })
             : null;
-        const services = await resolveServicesFromConfig(validatedConfig, image);
+        const services = await resolveServicesFromConfig(validatedConfig, image, {
+            workspaceRoot,
+        });
         agent = new DextoAgent(toDextoAgentOptions({
             config: validatedConfig,
             services,
             image,
+            hostContext: { workspaceRoot },
             overrides: {
                 sessionLoggerFactory,
                 mcpAuthProviderFactory,