@dexto/core 1.6.17 → 1.6.19

package/dist/llm/services/factory.d.ts

@@ -7,6 +7,7 @@ import type { ConversationHistoryProvider } from '../../session/history/types.js
 import type { SystemPromptManager } from '../../systemPrompt/manager.js';
 import type { Logger } from '../../logger/v2/types.js';
 import { type CodexRateLimitSnapshot } from '../providers/codex-app-server.js';
+import type { CompactionStrategy } from '../../context/compaction/types.js';
 /**
  * Context for model creation, including session info for usage tracking.
  */
@@ -15,9 +16,16 @@ export interface DextoProviderContext {
     sessionId?: string;
     /** Client source for usage attribution (cli, web, sdk) */
     clientSource?: 'cli' | 'web' | 'sdk';
+    /** Working directory for providers that need an explicit workspace root. */
+    cwd?: string;
     /** Optional callback for ChatGPT Login rate-limit status updates from Codex. */
     onCodexRateLimitStatus?: (snapshot: CodexRateLimitSnapshot) => void;
 }
+export interface CreateLLMServiceOptions {
+    usageScopeId?: string | undefined;
+    compactionStrategy?: CompactionStrategy | null | undefined;
+    cwd?: string | undefined;
+}
 /**
  * Create a Vercel AI SDK LanguageModel from config.
  *
@@ -41,9 +49,8 @@ export declare function createVercelModel(llmConfig: ValidatedLLMConfig, context
  * @param sessionId Session ID
  * @param resourceManager Resource manager for blob storage and resource access
  * @param logger Logger instance for dependency injection
- * @param compactionStrategy Optional compaction strategy for context management
- * @param compactionConfig Optional compaction configuration for thresholds
+ * @param options Session-scoped runtime options
  * @returns VercelLLMService instance
  */
-export declare function createLLMService(config: ValidatedLLMConfig, toolManager: ToolManager, systemPromptManager: SystemPromptManager, historyProvider: ConversationHistoryProvider, sessionEventBus: SessionEventBus, sessionId: string, resourceManager: import('../../resources/index.js').ResourceManager, logger: Logger, compactionStrategy?: import('../../context/compaction/types.js').CompactionStrategy | null): VercelLLMService;
+export declare function createLLMService(config: ValidatedLLMConfig, toolManager: ToolManager, systemPromptManager: SystemPromptManager, historyProvider: ConversationHistoryProvider, sessionEventBus: SessionEventBus, sessionId: string, resourceManager: import('../../resources/index.js').ResourceManager, logger: Logger, options?: CreateLLMServiceOptions): VercelLLMService;
 //# sourceMappingURL=factory.d.ts.map

package/dist/llm/services/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../src/llm/services/factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAYnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,IAAI,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAGxD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAC;AAClF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAGvD,OAAO,EAEH,KAAK,sBAAsB,EAC9B,MAAM,kCAAkC,CAAC;AAyB1C;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACjC,oCAAoC;IACpC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,0DAA0D;IAC1D,YAAY,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,KAAK,CAAC;IACrC,gFAAgF;IAChF,sBAAsB,CAAC,EAAE,CAAC,QAAQ,EAAE,sBAAsB,KAAK,IAAI,CAAC;CACvE;AAED;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAC7B,SAAS,EAAE,kBAAkB,EAC7B,OAAO,CAAC,EAAE,oBAAoB,GAC/B,aAAa,CAwOf;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,gBAAgB,CAC5B,MAAM,EAAE,kBAAkB,EAC1B,WAAW,EAAE,WAAW,EACxB,mBAAmB,EAAE,mBAAmB,EACxC,eAAe,EAAE,2BAA2B,EAC5C,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,OAAO,0BAA0B,EAAE,eAAe,EACnE,MAAM,EAAE,MAAM,EACd,kBAAkB,CAAC,EAAE,OAAO,mCAAmC,EAAE,kBAAkB,GAAG,IAAI,GAC3F,gBAAgB,CAwBlB"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../src/llm/services/factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAYnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,IAAI,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAGxD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAC;AAClF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAGvD,OAAO,EAEH,KAAK,sBAAsB,EAC9B,MAAM,kCAAkC,CAAC;AAQ1C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAmB5E;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACjC,oCAAoC;IACpC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,0DAA0D;IAC1D,YAAY,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,KAAK,CAAC;IACrC,4EAA4E;IAC5E,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,gFAAgF;IAChF,sBAAsB,CAAC,EAAE,CAAC,QAAQ,EAAE,sBAAsB,KAAK,IAAI,CAAC;CACvE;AAED,MAAM,WAAW,uBAAuB;IACpC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,kBAAkB,CAAC,EAAE,kBAAkB,GAAG,IAAI,GAAG,SAAS,CAAC;IAC3D,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC5B;AAUD;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAC7B,SAAS,EAAE,kBAAkB,EAC7B,OAAO,CAAC,EAAE,oBAAoB,GAC/B,aAAa,CAyOf;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,gBAAgB,CAC5B,MAAM,EAAE,kBAAkB,EAC1B,WAAW,EAAE,WAAW,EACxB,mBAAmB,EAAE,mBAAmB,EACxC,eAAe,EAAE,2BAA2B,EAC5C,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,OAAO,0BAA0B,EAAE,eAAe,EACnE,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,uBAA4B,GACtC,gBAAgB,CA4BlB"}

package/dist/llm/services/factory.js

@@ -19,6 +19,7 @@ import {
   createCodexLanguageModel
 } from "../providers/codex-app-server.js";
 import { isCodexBaseURL } from "../providers/codex-base-url.js";
+import { findDextoProjectRoot } from "../../utils/execution-context.js";
 import {
   ANTHROPIC_BETA_HEADER,
   ANTHROPIC_INTERLEAVED_THINKING_BETA
@@ -34,6 +35,12 @@ const DEXTO_GATEWAY_HEADERS = {
   CLIENT_SOURCE: "X-Dexto-Source",
   CLIENT_VERSION: "X-Dexto-Version"
 };
+function resolveProviderWorkingDirectory(explicitCwd) {
+  if (explicitCwd && explicitCwd.trim().length > 0) {
+    return explicitCwd;
+  }
+  return findDextoProjectRoot(process.cwd()) ?? process.cwd();
+}
 function createVercelModel(llmConfig, context) {
   const { provider, model, baseURL } = llmConfig;
   const apiKey = llmConfig.apiKey || resolveApiKeyForProvider(provider);
@@ -54,6 +61,7 @@ function createVercelModel(llmConfig, context) {
         return createCodexLanguageModel({
           modelId: model,
           baseURL: compatibleBaseURL,
+          cwd: resolveProviderWorkingDirectory(context?.cwd),
           ...context?.onCodexRateLimitStatus ? { onRateLimitStatus: context.onCodexRateLimitStatus } : {}
         });
       }
@@ -193,9 +201,11 @@ function createVercelModel(llmConfig, context) {
       throw LLMError.unsupportedProvider(provider);
   }
 }
-function createLLMService(config, toolManager, systemPromptManager, historyProvider, sessionEventBus, sessionId, resourceManager, logger, compactionStrategy) {
+function createLLMService(config, toolManager, systemPromptManager, historyProvider, sessionEventBus, sessionId, resourceManager, logger, options = {}) {
+  const { usageScopeId, compactionStrategy } = options;
   const model = createVercelModel(config, {
     sessionId,
+    ...options.cwd !== void 0 ? { cwd: options.cwd } : {},
     onCodexRateLimitStatus: (snapshot) => {
       sessionEventBus.emit("llm:rate-limit-status", {
         provider: config.provider,
@@ -214,6 +224,7 @@ function createLLMService(config, toolManager, systemPromptManager, historyProvi
     sessionId,
     resourceManager,
     logger,
+    usageScopeId,
     compactionStrategy
   );
 }

package/dist/llm/services/vercel.cjs

@@ -93,13 +93,14 @@ class VercelLLMService {
   messageQueue;
   compactionStrategy;
   modelLimits;
+  usageScopeId;
   /**
    * Helper to extract model ID from LanguageModel union type (string | LanguageModelV2)
    */
   getModelId() {
     return typeof this.model === "string" ? this.model : this.model.modelId;
   }
-  constructor(toolManager, model, systemPromptManager, historyProvider, sessionEventBus, config, sessionId, resourceManager, logger, compactionStrategy) {
+  constructor(toolManager, model, systemPromptManager, historyProvider, sessionEventBus, config, sessionId, resourceManager, logger, usageScopeId, compactionStrategy) {
     this.logger = logger.createChild(import_types2.DextoLogComponent.LLM);
     this.model = model;
     this.config = config;
@@ -107,6 +108,7 @@ class VercelLLMService {
     this.sessionEventBus = sessionEventBus;
     this.sessionId = sessionId;
     this.resourceManager = resourceManager;
+    this.usageScopeId = usageScopeId;
     this.compactionStrategy = compactionStrategy ?? null;
     this.messageQueue = new import_message_queue.MessageQueueService(this.sessionEventBus, this.logger);
     const formatter = new import_vercel.VercelMessageFormatter(this.logger);
@@ -150,6 +152,7 @@ class VercelLLMService {
         maxOutputTokens: this.config.maxOutputTokens,
         temperature: this.config.temperature,
         baseURL: this.config.baseURL,
+        usageScopeId: this.usageScopeId,
         // Provider-specific options
         reasoning: this.config.reasoning
       },

package/dist/llm/services/vercel.d.ts

@@ -37,11 +37,12 @@ export declare class VercelLLMService {
     private messageQueue;
     private compactionStrategy;
     private modelLimits?;
+    private readonly usageScopeId;
     /**
      * Helper to extract model ID from LanguageModel union type (string | LanguageModelV2)
      */
     private getModelId;
-    constructor(toolManager: ToolManager, model: LanguageModel, systemPromptManager: SystemPromptManager, historyProvider: ConversationHistoryProvider, sessionEventBus: SessionEventBus, config: ValidatedLLMConfig, sessionId: string, resourceManager: ResourceManager, logger: Logger, compactionStrategy?: import('../../context/compaction/types.js').CompactionStrategy | null);
+    constructor(toolManager: ToolManager, model: LanguageModel, systemPromptManager: SystemPromptManager, historyProvider: ConversationHistoryProvider, sessionEventBus: SessionEventBus, config: ValidatedLLMConfig, sessionId: string, resourceManager: ResourceManager, logger: Logger, usageScopeId?: string, compactionStrategy?: import('../../context/compaction/types.js').CompactionStrategy | null);
     getAllTools(): Promise<ToolSet>;
     getEnabledTools(): Promise<ToolSet>;
     /**

package/dist/llm/services/vercel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vercel.d.ts","sourceRoot":"","sources":["../../../src/llm/services/vercel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAqB,MAAM,IAAI,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAI1D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAC;AAClF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAEzE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAIxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAGhE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEzD;;;;;;;;;;;;;GAaG;AACH,qBAIa,gBAAgB;IACzB,OAAO,CAAC,KAAK,CAAgB;IAC7B,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,cAAc,CAA+B;IACrD,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,YAAY,CAAsB;IAC1C,OAAO,CAAC,kBAAkB,CAEf;IACX,OAAO,CAAC,WAAW,CAAC,CAAc;IAElC;;OAEG;IACH,OAAO,CAAC,UAAU;gBAKd,WAAW,EAAE,WAAW,EACxB,KAAK,EAAE,aAAa,EACpB,mBAAmB,EAAE,mBAAmB,EACxC,eAAe,EAAE,2BAA2B,EAC5C,eAAe,EAAE,eAAe,EAChC,MAAM,EAAE,kBAAkB,EAC1B,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,eAAe,EAChC,MAAM,EAAE,MAAM,EACd,kBAAkB,CAAC,EAAE,OAAO,mCAAmC,EAAE,kBAAkB,GAAG,IAAI;IAuC9F,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAI/B,eAAe,IAAI,OAAO,CAAC,OAAO,CAAC;IAMnC;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAyB1B;;OAEG;IACH,OAAc,YAAY,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IAE7C;;;;;;;OAOG;IACG,MAAM,CACR,OAAO,EAAE,YAAY,EACrB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GACnC,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IA0D5B;;;OAGG;IACH,SAAS,IAAI,gBAAgB;IA+B7B;;OAEG;IACH,iBAAiB,IAAI,cAAc,CAAC,OAAO,CAAC;IAI5C;;OAEG;IACH,eAAe,IAAI,mBAAmB;IAItC;;OAEG;IACH,qBAAqB,IAAI,OAAO,mCAAmC,EAAE,kBAAkB,GAAG,IAAI;IAI9F,gBAAgB,IAAI,aAAa;CAGpC"}
+{"version":3,"file":"vercel.d.ts","sourceRoot":"","sources":["../../../src/llm/services/vercel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAqB,MAAM,IAAI,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAI1D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAC;AAClF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAEzE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAIxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAGhE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEzD;;;;;;;;;;;;;GAaG;AACH,qBAIa,gBAAgB;IACzB,OAAO,CAAC,KAAK,CAAgB;IAC7B,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,cAAc,CAA+B;IACrD,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,YAAY,CAAsB;IAC1C,OAAO,CAAC,kBAAkB,CAEf;IACX,OAAO,CAAC,WAAW,CAAC,CAAc;IAClC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAqB;IAElD;;OAEG;IACH,OAAO,CAAC,UAAU;gBAKd,WAAW,EAAE,WAAW,EACxB,KAAK,EAAE,aAAa,EACpB,mBAAmB,EAAE,mBAAmB,EACxC,eAAe,EAAE,2BAA2B,EAC5C,eAAe,EAAE,eAAe,EAChC,MAAM,EAAE,kBAAkB,EAC1B,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,eAAe,EAChC,MAAM,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,MAAM,EACrB,kBAAkB,CAAC,EAAE,OAAO,mCAAmC,EAAE,kBAAkB,GAAG,IAAI;IAwC9F,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAI/B,eAAe,IAAI,OAAO,CAAC,OAAO,CAAC;IAMnC;;OAEG;IACH,OAAO,CAAC,kBAAkB;IA0B1B;;OAEG;IACH,OAAc,YAAY,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IAE7C;;;;;;;OAOG;IACG,MAAM,CACR,OAAO,EAAE,YAAY,EACrB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GACnC,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IA0D5B;;;OAGG;IACH,SAAS,IAAI,gBAAgB;IA+B7B;;OAEG;IACH,iBAAiB,IAAI,cAAc,CAAC,OAAO,CAAC;IAI5C;;OAEG;IACH,eAAe,IAAI,mBAAmB;IAItC;;OAEG;IACH,qBAAqB,IAAI,OAAO,mCAAmC,EAAE,kBAAkB,GAAG,IAAI;IAI9F,gBAAgB,IAAI,aAAa;CAGpC"}

package/dist/llm/services/vercel.js

@@ -30,13 +30,14 @@ class VercelLLMService {
   messageQueue;
   compactionStrategy;
   modelLimits;
+  usageScopeId;
   /**
    * Helper to extract model ID from LanguageModel union type (string | LanguageModelV2)
    */
   getModelId() {
     return typeof this.model === "string" ? this.model : this.model.modelId;
   }
-  constructor(toolManager, model, systemPromptManager, historyProvider, sessionEventBus, config, sessionId, resourceManager, logger, compactionStrategy) {
+  constructor(toolManager, model, systemPromptManager, historyProvider, sessionEventBus, config, sessionId, resourceManager, logger, usageScopeId, compactionStrategy) {
     this.logger = logger.createChild(DextoLogComponent.LLM);
     this.model = model;
     this.config = config;
@@ -44,6 +45,7 @@ class VercelLLMService {
     this.sessionEventBus = sessionEventBus;
     this.sessionId = sessionId;
     this.resourceManager = resourceManager;
+    this.usageScopeId = usageScopeId;
     this.compactionStrategy = compactionStrategy ?? null;
     this.messageQueue = new MessageQueueService(this.sessionEventBus, this.logger);
     const formatter = new VercelMessageFormatter(this.logger);
@@ -87,6 +89,7 @@ class VercelLLMService {
         maxOutputTokens: this.config.maxOutputTokens,
         temperature: this.config.temperature,
         baseURL: this.config.baseURL,
+        usageScopeId: this.usageScopeId,
         // Provider-specific options
         reasoning: this.config.reasoning
       },

package/dist/llm/usage-scope.cjs

@@ -18,21 +18,12 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var usage_scope_exports = {};
 __export(usage_scope_exports, {
-  DEXTO_USAGE_SCOPE_ID_ENV: () => DEXTO_USAGE_SCOPE_ID_ENV,
-  getConfiguredUsageScopeId: () => getConfiguredUsageScopeId
+  UsageScopeIdSchema: () => UsageScopeIdSchema
 });
 module.exports = __toCommonJS(usage_scope_exports);
-const DEXTO_USAGE_SCOPE_ID_ENV = "DEXTO_USAGE_SCOPE_ID";
-function getConfiguredUsageScopeId() {
-  const value = process.env[DEXTO_USAGE_SCOPE_ID_ENV];
-  if (!value) {
-    return void 0;
-  }
-  const trimmedValue = value.trim();
-  return trimmedValue.length > 0 ? trimmedValue : void 0;
-}
+var import_zod = require("zod");
+const UsageScopeIdSchema = import_zod.z.string().trim().min(1);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  DEXTO_USAGE_SCOPE_ID_ENV,
-  getConfiguredUsageScopeId
+  UsageScopeIdSchema
 });

package/dist/llm/usage-scope.d.ts

@@ -1,3 +1,4 @@
-export declare const DEXTO_USAGE_SCOPE_ID_ENV = "DEXTO_USAGE_SCOPE_ID";
-export declare function getConfiguredUsageScopeId(): string | undefined;
+import { z } from 'zod';
+export declare const UsageScopeIdSchema: z.ZodString;
+export type UsageScopeId = z.output<typeof UsageScopeIdSchema>;
 //# sourceMappingURL=usage-scope.d.ts.map

package/dist/llm/usage-scope.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"usage-scope.d.ts","sourceRoot":"","sources":["../../src/llm/usage-scope.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,wBAAwB,yBAAyB,CAAC;AAE/D,wBAAgB,yBAAyB,IAAI,MAAM,GAAG,SAAS,CAQ9D"}
+{"version":3,"file":"usage-scope.d.ts","sourceRoot":"","sources":["../../src/llm/usage-scope.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,kBAAkB,aAA2B,CAAC;AAE3D,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,kBAAkB,CAAC,CAAC"}

package/dist/llm/usage-scope.js

@@ -1,14 +1,6 @@
 import "../chunk-PTJYTZNU.js";
-const DEXTO_USAGE_SCOPE_ID_ENV = "DEXTO_USAGE_SCOPE_ID";
-function getConfiguredUsageScopeId() {
-  const value = process.env[DEXTO_USAGE_SCOPE_ID_ENV];
-  if (!value) {
-    return void 0;
-  }
-  const trimmedValue = value.trim();
-  return trimmedValue.length > 0 ? trimmedValue : void 0;
-}
+import { z } from "zod";
+const UsageScopeIdSchema = z.string().trim().min(1);
 export {
-  DEXTO_USAGE_SCOPE_ID_ENV,
-  getConfiguredUsageScopeId
+  UsageScopeIdSchema
 };

package/dist/mcp/bundled-config.cjs

@@ -0,0 +1,206 @@
+"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)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  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 bundled_config_exports = {};
+__export(bundled_config_exports, {
+  loadBundledMcpConfigFromDirectory: () => loadBundledMcpConfigFromDirectory
+});
+module.exports = __toCommonJS(bundled_config_exports);
+var import_fs = require("fs");
+var path = __toESM(require("path"), 1);
+var import_schemas = require("./schemas.js");
+function normalizeServerEntries(servers, inferTransportType) {
+  const normalized = {};
+  for (const [serverName, serverConfig] of Object.entries(servers)) {
+    if (typeof serverConfig !== "object" || serverConfig === null || Array.isArray(serverConfig)) {
+      continue;
+    }
+    const config = serverConfig;
+    if ("type" in config || !inferTransportType) {
+      normalized[serverName] = config;
+    } else if ("command" in config) {
+      normalized[serverName] = {
+        type: "stdio",
+        ...config
+      };
+    } else if ("url" in config) {
+      const url = String(config.url || "");
+      normalized[serverName] = {
+        type: url.includes("/sse") ? "sse" : "http",
+        ...config
+      };
+    } else {
+      normalized[serverName] = config;
+    }
+  }
+  return normalized;
+}
+function normalizeParsedMcpServers(parsed, ownerName, sourceLabel, warnings) {
+  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+    warnings.push(`[${ownerName}] Invalid ${sourceLabel}: expected an object`);
+    return void 0;
+  }
+  const parsedRecord = parsed;
+  const candidate = parsedRecord.mcpServers;
+  if (candidate !== void 0) {
+    if (!candidate || typeof candidate !== "object" || Array.isArray(candidate)) {
+      warnings.push(`[${ownerName}] Invalid ${sourceLabel}: mcpServers must be an object`);
+      return void 0;
+    }
+    return normalizeServerEntries(candidate, true);
+  }
+  if (Object.values(parsedRecord).some(
+    (value) => typeof value === "object" && value !== null && !Array.isArray(value) && ("type" in value || "command" in value || "url" in value)
+  )) {
+    return normalizeServerEntries(parsedRecord, true);
+  }
+  warnings.push(`[${ownerName}] Invalid ${sourceLabel}: no MCP servers found`);
+  return void 0;
+}
+function resolveSkillRelativeValue(bundleDirectory, value) {
+  if (value.length === 0 || path.isAbsolute(value)) {
+    return value;
+  }
+  const candidate = path.resolve(bundleDirectory, value);
+  return (0, import_fs.existsSync)(candidate) ? candidate : value;
+}
+function resolveServerRelativePaths(bundleDirectory, serverConfig) {
+  if (serverConfig.type !== "stdio") {
+    return serverConfig;
+  }
+  const resolvedConfig = { ...serverConfig };
+  if (typeof resolvedConfig.command === "string") {
+    resolvedConfig.command = resolveSkillRelativeValue(bundleDirectory, resolvedConfig.command);
+  }
+  if (Array.isArray(resolvedConfig.args)) {
+    resolvedConfig.args = resolvedConfig.args.map(
+      (arg) => typeof arg === "string" ? resolveSkillRelativeValue(bundleDirectory, arg) : arg
+    );
+  }
+  return resolvedConfig;
+}
+function validateBundledMcpServers(bundleDirectory, parsedServers, ownerName, sourceLabel, warnings) {
+  const resolvedServers = Object.fromEntries(
+    Object.entries(parsedServers).map(([serverName, serverConfig]) => {
+      if (typeof serverConfig !== "object" || serverConfig === null || Array.isArray(serverConfig)) {
+        return [serverName, serverConfig];
+      }
+      return [
+        serverName,
+        resolveServerRelativePaths(
+          bundleDirectory,
+          serverConfig
+        )
+      ];
+    })
+  );
+  const result = import_schemas.ServersConfigSchema.safeParse(resolvedServers);
+  if (!result.success) {
+    const issues = result.error.issues.map((issue) => issue.message).join(", ");
+    warnings.push(`[${ownerName}] Invalid ${sourceLabel}: ${issues}`);
+    return void 0;
+  }
+  return result.data;
+}
+function mergeBundledMcpServers(current, incoming) {
+  if (!incoming) {
+    return current;
+  }
+  if (!current) {
+    return incoming;
+  }
+  return {
+    ...current,
+    ...incoming
+  };
+}
+function loadBundledMcpConfigFile(filePath, bundleDirectory, ownerName, sourceLabel, warnings) {
+  if (!(0, import_fs.existsSync)(filePath)) {
+    return void 0;
+  }
+  try {
+    const content = (0, import_fs.readFileSync)(filePath, "utf-8");
+    const parsed = JSON.parse(content);
+    const parsedServers = normalizeParsedMcpServers(parsed, ownerName, sourceLabel, warnings);
+    if (!parsedServers) {
+      return void 0;
+    }
+    return validateBundledMcpServers(
+      bundleDirectory,
+      parsedServers,
+      ownerName,
+      sourceLabel,
+      warnings
+    );
+  } catch (error) {
+    if (error instanceof SyntaxError) {
+      warnings.push(`[${ownerName}] Failed to parse ${sourceLabel}: invalid JSON`);
+    } else {
+      warnings.push(`[${ownerName}] Failed to load ${sourceLabel}: ${String(error)}`);
+    }
+    return void 0;
+  }
+}
+function loadBundledMcpConfigFromDirectory(bundleDirectory, ownerName, options = {}) {
+  const warnings = [];
+  let mcpServers = loadBundledMcpConfigFile(
+    path.join(bundleDirectory, ".mcp.json"),
+    bundleDirectory,
+    ownerName,
+    ".mcp.json",
+    warnings
+  );
+  if (options.scanNestedMcps) {
+    const mcpsDirectory = path.join(bundleDirectory, "mcps");
+    if ((0, import_fs.existsSync)(mcpsDirectory)) {
+      try {
+        const entries = (0, import_fs.readdirSync)(mcpsDirectory, { withFileTypes: true }).filter((entry) => entry.isFile() && entry.name.endsWith(".json")).sort((left, right) => left.name.localeCompare(right.name));
+        for (const entry of entries) {
+          const nestedServers = loadBundledMcpConfigFile(
+            path.join(mcpsDirectory, entry.name),
+            bundleDirectory,
+            ownerName,
+            `mcps/${entry.name}`,
+            warnings
+          );
+          mcpServers = mergeBundledMcpServers(mcpServers, nestedServers);
+        }
+      } catch (error) {
+        warnings.push(`[${ownerName}] Failed to read mcps/: ${String(error)}`);
+      }
+    }
+  }
+  return {
+    ...mcpServers ? { mcpServers } : {},
+    warnings
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  loadBundledMcpConfigFromDirectory
+});

package/dist/mcp/bundled-config.d.ts

@@ -0,0 +1,10 @@
+import { type ValidatedServersConfig } from './schemas.js';
+export interface LoadBundledMcpConfigOptions {
+    scanNestedMcps?: boolean | undefined;
+}
+export interface LoadBundledMcpConfigResult {
+    mcpServers?: ValidatedServersConfig | undefined;
+    warnings: string[];
+}
+export declare function loadBundledMcpConfigFromDirectory(bundleDirectory: string, ownerName: string, options?: LoadBundledMcpConfigOptions): LoadBundledMcpConfigResult;
+//# sourceMappingURL=bundled-config.d.ts.map

package/dist/mcp/bundled-config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"bundled-config.d.ts","sourceRoot":"","sources":["../../src/mcp/bundled-config.ts"],"names":[],"mappings":"AAEA,OAAO,EAAuB,KAAK,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAEhF,MAAM,WAAW,2BAA2B;IACxC,cAAc,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CACxC;AAED,MAAM,WAAW,0BAA0B;IACvC,UAAU,CAAC,EAAE,sBAAsB,GAAG,SAAS,CAAC;IAChD,QAAQ,EAAE,MAAM,EAAE,CAAC;CACtB;AAwMD,wBAAgB,iCAAiC,CAC7C,eAAe,EAAE,MAAM,EACvB,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE,2BAAgC,GAC1C,0BAA0B,CAsC5B"}

package/dist/mcp/bundled-config.js

@@ -0,0 +1,173 @@
+import "../chunk-PTJYTZNU.js";
+import { existsSync, readFileSync, readdirSync } from "fs";
+import * as path from "path";
+import { ServersConfigSchema } from "./schemas.js";
+function normalizeServerEntries(servers, inferTransportType) {
+  const normalized = {};
+  for (const [serverName, serverConfig] of Object.entries(servers)) {
+    if (typeof serverConfig !== "object" || serverConfig === null || Array.isArray(serverConfig)) {
+      continue;
+    }
+    const config = serverConfig;
+    if ("type" in config || !inferTransportType) {
+      normalized[serverName] = config;
+    } else if ("command" in config) {
+      normalized[serverName] = {
+        type: "stdio",
+        ...config
+      };
+    } else if ("url" in config) {
+      const url = String(config.url || "");
+      normalized[serverName] = {
+        type: url.includes("/sse") ? "sse" : "http",
+        ...config
+      };
+    } else {
+      normalized[serverName] = config;
+    }
+  }
+  return normalized;
+}
+function normalizeParsedMcpServers(parsed, ownerName, sourceLabel, warnings) {
+  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+    warnings.push(`[${ownerName}] Invalid ${sourceLabel}: expected an object`);
+    return void 0;
+  }
+  const parsedRecord = parsed;
+  const candidate = parsedRecord.mcpServers;
+  if (candidate !== void 0) {
+    if (!candidate || typeof candidate !== "object" || Array.isArray(candidate)) {
+      warnings.push(`[${ownerName}] Invalid ${sourceLabel}: mcpServers must be an object`);
+      return void 0;
+    }
+    return normalizeServerEntries(candidate, true);
+  }
+  if (Object.values(parsedRecord).some(
+    (value) => typeof value === "object" && value !== null && !Array.isArray(value) && ("type" in value || "command" in value || "url" in value)
+  )) {
+    return normalizeServerEntries(parsedRecord, true);
+  }
+  warnings.push(`[${ownerName}] Invalid ${sourceLabel}: no MCP servers found`);
+  return void 0;
+}
+function resolveSkillRelativeValue(bundleDirectory, value) {
+  if (value.length === 0 || path.isAbsolute(value)) {
+    return value;
+  }
+  const candidate = path.resolve(bundleDirectory, value);
+  return existsSync(candidate) ? candidate : value;
+}
+function resolveServerRelativePaths(bundleDirectory, serverConfig) {
+  if (serverConfig.type !== "stdio") {
+    return serverConfig;
+  }
+  const resolvedConfig = { ...serverConfig };
+  if (typeof resolvedConfig.command === "string") {
+    resolvedConfig.command = resolveSkillRelativeValue(bundleDirectory, resolvedConfig.command);
+  }
+  if (Array.isArray(resolvedConfig.args)) {
+    resolvedConfig.args = resolvedConfig.args.map(
+      (arg) => typeof arg === "string" ? resolveSkillRelativeValue(bundleDirectory, arg) : arg
+    );
+  }
+  return resolvedConfig;
+}
+function validateBundledMcpServers(bundleDirectory, parsedServers, ownerName, sourceLabel, warnings) {
+  const resolvedServers = Object.fromEntries(
+    Object.entries(parsedServers).map(([serverName, serverConfig]) => {
+      if (typeof serverConfig !== "object" || serverConfig === null || Array.isArray(serverConfig)) {
+        return [serverName, serverConfig];
+      }
+      return [
+        serverName,
+        resolveServerRelativePaths(
+          bundleDirectory,
+          serverConfig
+        )
+      ];
+    })
+  );
+  const result = ServersConfigSchema.safeParse(resolvedServers);
+  if (!result.success) {
+    const issues = result.error.issues.map((issue) => issue.message).join(", ");
+    warnings.push(`[${ownerName}] Invalid ${sourceLabel}: ${issues}`);
+    return void 0;
+  }
+  return result.data;
+}
+function mergeBundledMcpServers(current, incoming) {
+  if (!incoming) {
+    return current;
+  }
+  if (!current) {
+    return incoming;
+  }
+  return {
+    ...current,
+    ...incoming
+  };
+}
+function loadBundledMcpConfigFile(filePath, bundleDirectory, ownerName, sourceLabel, warnings) {
+  if (!existsSync(filePath)) {
+    return void 0;
+  }
+  try {
+    const content = readFileSync(filePath, "utf-8");
+    const parsed = JSON.parse(content);
+    const parsedServers = normalizeParsedMcpServers(parsed, ownerName, sourceLabel, warnings);
+    if (!parsedServers) {
+      return void 0;
+    }
+    return validateBundledMcpServers(
+      bundleDirectory,
+      parsedServers,
+      ownerName,
+      sourceLabel,
+      warnings
+    );
+  } catch (error) {
+    if (error instanceof SyntaxError) {
+      warnings.push(`[${ownerName}] Failed to parse ${sourceLabel}: invalid JSON`);
+    } else {
+      warnings.push(`[${ownerName}] Failed to load ${sourceLabel}: ${String(error)}`);
+    }
+    return void 0;
+  }
+}
+function loadBundledMcpConfigFromDirectory(bundleDirectory, ownerName, options = {}) {
+  const warnings = [];
+  let mcpServers = loadBundledMcpConfigFile(
+    path.join(bundleDirectory, ".mcp.json"),
+    bundleDirectory,
+    ownerName,
+    ".mcp.json",
+    warnings
+  );
+  if (options.scanNestedMcps) {
+    const mcpsDirectory = path.join(bundleDirectory, "mcps");
+    if (existsSync(mcpsDirectory)) {
+      try {
+        const entries = readdirSync(mcpsDirectory, { withFileTypes: true }).filter((entry) => entry.isFile() && entry.name.endsWith(".json")).sort((left, right) => left.name.localeCompare(right.name));
+        for (const entry of entries) {
+          const nestedServers = loadBundledMcpConfigFile(
+            path.join(mcpsDirectory, entry.name),
+            bundleDirectory,
+            ownerName,
+            `mcps/${entry.name}`,
+            warnings
+          );
+          mcpServers = mergeBundledMcpServers(mcpServers, nestedServers);
+        }
+      } catch (error) {
+        warnings.push(`[${ownerName}] Failed to read mcps/: ${String(error)}`);
+      }
+    }
+  }
+  return {
+    ...mcpServers ? { mcpServers } : {},
+    warnings
+  };
+}
+export {
+  loadBundledMcpConfigFromDirectory
+};