@dexto/core 1.5.6 → 1.5.8

package/dist/session/session-manager.js

@@ -3,11 +3,15 @@ import { randomUUID } from "crypto";
 import { ChatSession } from "./chat-session.js";
 import { DextoLogComponent } from "../logger/v2/types.js";
 import { SessionError } from "./errors.js";
+function defaultSessionLoggerFactory(options) {
+  return options.baseLogger.createChild(DextoLogComponent.SESSION);
+}
 class SessionManager {
   constructor(services, config = {}, logger) {
     this.services = services;
     this.maxSessions = config.maxSessions ?? 100;
     this.sessionTTL = config.sessionTTL ?? 36e5;
+    this.sessionLoggerFactory = config.sessionLoggerFactory ?? defaultSessionLoggerFactory;
     this.logger = logger.createChild(DextoLogComponent.SESSION);
   }
   sessions = /* @__PURE__ */ new Map();
@@ -21,6 +25,7 @@ class SessionManager {
   // Per-session mutex for token usage updates to prevent lost updates from concurrent calls
   tokenUsageLocks = /* @__PURE__ */ new Map();
   logger;
+  sessionLoggerFactory;
   /**
    * Initialize the SessionManager with persistent storage.
    * This must be called before using any session operations.
@@ -117,10 +122,34 @@ class SessionManager {
     const existingMetadata = await this.services.storageManager.getDatabase().get(sessionKey);
     if (existingMetadata) {
       await this.updateSessionActivity(id);
+      const runtimeConfig = this.services.stateManager.getRuntimeConfig();
+      const agentId = runtimeConfig.agentCard?.name ?? runtimeConfig.agentId;
+      const sessionLogger = this.sessionLoggerFactory({
+        baseLogger: this.logger,
+        agentId,
+        sessionId: id
+      });
+      const sessionData2 = await this.services.storageManager.getDatabase().get(sessionKey);
+      if (sessionData2?.llmOverride) {
+        const { resolveApiKeyForProvider } = await import("../utils/api-key-resolver.js");
+        const apiKey = resolveApiKeyForProvider(sessionData2.llmOverride.provider);
+        if (!apiKey) {
+          this.logger.warn(
+            `Skipped LLM override restore for session ${id}: missing API key for provider ${sessionData2.llmOverride.provider}`,
+            { sessionId: id, provider: sessionData2.llmOverride.provider }
+          );
+        } else {
+          const restoredConfig = {
+            ...sessionData2.llmOverride,
+            apiKey
+          };
+          this.services.stateManager.updateLLM(restoredConfig, id);
+        }
+      }
       const session2 = new ChatSession(
         { ...this.services, sessionManager: this },
         id,
-        this.logger
+        sessionLogger
       );
       await session2.init();
       this.sessions.set(id, session2);
@@ -147,7 +176,18 @@ class SessionManager {
     }
     let session;
     try {
-      session = new ChatSession({ ...this.services, sessionManager: this }, id, this.logger);
+      const runtimeConfig = this.services.stateManager.getRuntimeConfig();
+      const agentId = runtimeConfig.agentCard?.name ?? runtimeConfig.agentId;
+      const sessionLogger = this.sessionLoggerFactory({
+        baseLogger: this.logger,
+        agentId,
+        sessionId: id
+      });
+      session = new ChatSession(
+        { ...this.services, sessionManager: this },
+        id,
+        sessionLogger
+      );
       await session.init();
       this.sessions.set(id, session);
       await this.services.storageManager.getCache().set(sessionKey, sessionData, this.sessionTTL / 1e3);
@@ -182,10 +222,33 @@ class SessionManager {
       const sessionKey = `session:${sessionId}`;
       const sessionData = await this.services.storageManager.getDatabase().get(sessionKey);
       if (sessionData) {
+        const runtimeConfig = this.services.stateManager.getRuntimeConfig();
+        const agentId = runtimeConfig.agentCard?.name ?? runtimeConfig.agentId;
+        const sessionLogger = this.sessionLoggerFactory({
+          baseLogger: this.logger,
+          agentId,
+          sessionId
+        });
+        if (sessionData.llmOverride) {
+          const { resolveApiKeyForProvider } = await import("../utils/api-key-resolver.js");
+          const apiKey = resolveApiKeyForProvider(sessionData.llmOverride.provider);
+          if (!apiKey) {
+            this.logger.warn(
+              `Skipped LLM override restore for session ${sessionId}: missing API key for provider ${sessionData.llmOverride.provider}`,
+              { sessionId, provider: sessionData.llmOverride.provider }
+            );
+          } else {
+            const restoredConfig = {
+              ...sessionData.llmOverride,
+              apiKey
+            };
+            this.services.stateManager.updateLLM(restoredConfig, sessionId);
+          }
+        }
         const session = new ChatSession(
           { ...this.services, sessionManager: this },
           sessionId,
-          this.logger
+          sessionLogger
         );
         await session.init();
         this.sessions.set(sessionId, session);
@@ -472,6 +535,14 @@ class SessionManager {
       throw SessionError.notFound(sessionId);
     }
     await session.switchLLM(newLLMConfig);
+    const sessionKey = `session:${sessionId}`;
+    const sessionData = await this.services.storageManager.getDatabase().get(sessionKey);
+    if (sessionData) {
+      const { apiKey: _apiKey, ...configWithoutApiKey } = newLLMConfig;
+      sessionData.llmOverride = configWithoutApiKey;
+      await this.services.storageManager.getDatabase().set(sessionKey, sessionData);
+      await this.services.storageManager.getCache().set(sessionKey, sessionData, this.sessionTTL / 1e3);
+    }
     this.services.agentEventBus.emit("llm:switched", {
       newConfig: newLLMConfig,
       historyRetained: true,

package/dist/session/types.d.ts

@@ -4,6 +4,7 @@ export interface QueuedMessage {
     content: ContentPart[];
     queuedAt: number;
     metadata?: Record<string, unknown>;
+    kind?: 'default' | 'background';
 }
 export interface CoalescedMessage {
     messages: QueuedMessage[];

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/session/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,MAAM,WAAW,aAAa;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACtC;AAED,MAAM,WAAW,gBAAgB;IAC7B,QAAQ,EAAE,aAAa,EAAE,CAAC;IAC1B,eAAe,EAAE,WAAW,EAAE,CAAC;IAC/B,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;CACxB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/session/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,MAAM,WAAW,aAAa;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,IAAI,CAAC,EAAE,SAAS,GAAG,YAAY,CAAC;CACnC;AAED,MAAM,WAAW,gBAAgB;IAC7B,QAAQ,EAAE,aAAa,EAAE,CAAC;IAC1B,eAAe,EAAE,WAAW,EAAE,CAAC;IAC/B,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;CACxB"}

package/dist/systemPrompt/contributors.cjs

@@ -21,6 +21,7 @@ __export(contributors_exports, {
   DynamicContributor: () => DynamicContributor,
   FileContributor: () => FileContributor,
   MemoryContributor: () => MemoryContributor,
+  SkillsContributor: () => SkillsContributor,
   StaticContributor: () => StaticContributor
 });
 module.exports = __toCommonJS(contributors_exports);
@@ -191,10 +192,51 @@ ${memoryList}`;
     }
   }
 }
+class SkillsContributor {
+  constructor(id, priority, promptManager, logger) {
+    this.id = id;
+    this.priority = priority;
+    this.promptManager = promptManager;
+    this.logger = logger;
+    this.logger.debug(`[SkillsContributor] Created "${id}"`);
+  }
+  logger;
+  async getContent(_context) {
+    try {
+      const skills = await this.promptManager.listAutoInvocablePrompts();
+      const skillEntries = Object.entries(skills);
+      if (skillEntries.length === 0) {
+        return "";
+      }
+      const skillsList = skillEntries.map(([_key, info]) => {
+        const name = info.displayName || info.name;
+        const desc = info.description ? ` - ${info.description}` : "";
+        return `- ${name}${desc}`;
+      }).join("\n");
+      const result = `## Available Skills
+
+You can invoke the following skills using the \`invoke_skill\` tool when they are relevant to the task:
+
+${skillsList}
+
+To use a skill, call invoke_skill with the skill name. The skill will provide specialized instructions for the task.`;
+      this.logger.debug(
+        `[SkillsContributor] Listed ${skillEntries.length} skills in system prompt`
+      );
+      return result;
+    } catch (error) {
+      this.logger.error(
+        `[SkillsContributor] Failed to list skills: ${error instanceof Error ? error.message : String(error)}`
+      );
+      return "";
+    }
+  }
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   DynamicContributor,
   FileContributor,
   MemoryContributor,
+  SkillsContributor,
   StaticContributor
 });

package/dist/systemPrompt/contributors.d.ts

@@ -1,6 +1,7 @@
 import { SystemPromptContributor, DynamicContributorContext } from './types.js';
 import type { IDextoLogger } from '../logger/v2/types.js';
 import type { MemoryManager } from '../memory/index.js';
+import type { PromptManager } from '../prompts/prompt-manager.js';
 export declare class StaticContributor implements SystemPromptContributor {
     id: string;
     priority: number;
@@ -58,4 +59,16 @@ export declare class MemoryContributor implements SystemPromptContributor {
     constructor(id: string, priority: number, memoryManager: MemoryManager, options: MemoryContributorOptions | undefined, logger: IDextoLogger);
     getContent(_context: DynamicContributorContext): Promise<string>;
 }
+/**
+ * SkillsContributor lists available skills that the LLM can invoke via the invoke_skill tool.
+ * This enables the LLM to know what skills are available without hardcoding them.
+ */
+export declare class SkillsContributor implements SystemPromptContributor {
+    id: string;
+    priority: number;
+    private promptManager;
+    private logger;
+    constructor(id: string, priority: number, promptManager: PromptManager, logger: IDextoLogger);
+    getContent(_context: DynamicContributorContext): Promise<string>;
+}
 //# sourceMappingURL=contributors.d.ts.map

package/dist/systemPrompt/contributors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contributors.d.ts","sourceRoot":"","sources":["../../src/systemPrompt/contributors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAGhF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAG1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAExD,qBAAa,iBAAkB,YAAW,uBAAuB;IAElD,EAAE,EAAE,MAAM;IACV,QAAQ,EAAE,MAAM;IACvB,OAAO,CAAC,OAAO;gBAFR,EAAE,EAAE,MAAM,EACV,QAAQ,EAAE,MAAM,EACf,OAAO,EAAE,MAAM;IAGrB,UAAU,CAAC,QAAQ,EAAE,yBAAyB,GAAG,OAAO,CAAC,MAAM,CAAC;CAGzE;AAED,qBAAa,kBAAmB,YAAW,uBAAuB;IAEnD,EAAE,EAAE,MAAM;IACV,QAAQ,EAAE,MAAM;IACvB,OAAO,CAAC,eAAe;gBAFhB,EAAE,EAAE,MAAM,EACV,QAAQ,EAAE,MAAM,EACf,eAAe,EAAE,CAAC,OAAO,EAAE,yBAAyB,KAAK,OAAO,CAAC,MAAM,CAAC;IAG9E,UAAU,CAAC,OAAO,EAAE,yBAAyB,GAAG,OAAO,CAAC,MAAM,CAAC;CAGxE;AAED,MAAM,WAAW,sBAAsB;IACnC,gBAAgB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACvC,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC;IAC7C,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,eAAe,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACtC,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAC/B;AAED,qBAAa,eAAgB,YAAW,uBAAuB;IAMhD,EAAE,EAAE,MAAM;IACV,QAAQ,EAAE,MAAM;IACvB,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,OAAO;IAPnB,OAAO,CAAC,KAAK,CAAkC;IAC/C,OAAO,CAAC,MAAM,CAAe;gBAGlB,EAAE,EAAE,MAAM,EACV,QAAQ,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EAAE,EACf,OAAO,EAAE,sBAAsB,YAAK,EAC5C,MAAM,EAAE,YAAY;IAMlB,UAAU,CAAC,QAAQ,EAAE,yBAAyB,GAAG,OAAO,CAAC,MAAM,CAAC;CA6FzE;AAED,MAAM,WAAW,wBAAwB;IACrC,sDAAsD;IACtD,iBAAiB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACxC,gDAAgD;IAChD,WAAW,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAClC,4CAA4C;IAC5C,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,yDAAyD;IACzD,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CACpC;AAED;;;;;GAKG;AACH,qBAAa,iBAAkB,YAAW,uBAAuB;IAIlD,EAAE,EAAE,MAAM;IACV,QAAQ,EAAE,MAAM;IACvB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,OAAO;IANnB,OAAO,CAAC,MAAM,CAAe;gBAGlB,EAAE,EAAE,MAAM,EACV,QAAQ,EAAE,MAAM,EACf,aAAa,EAAE,aAAa,EAC5B,OAAO,EAAE,wBAAwB,YAAK,EAC9C,MAAM,EAAE,YAAY;IAQlB,UAAU,CAAC,QAAQ,EAAE,yBAAyB,GAAG,OAAO,CAAC,MAAM,CAAC;CAmDzE"}
+{"version":3,"file":"contributors.d.ts","sourceRoot":"","sources":["../../src/systemPrompt/contributors.ts"],"names":[],"mappings":"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"}

package/dist/systemPrompt/contributors.js

@@ -166,9 +166,50 @@ ${memoryList}`;
     }
   }
 }
+class SkillsContributor {
+  constructor(id, priority, promptManager, logger) {
+    this.id = id;
+    this.priority = priority;
+    this.promptManager = promptManager;
+    this.logger = logger;
+    this.logger.debug(`[SkillsContributor] Created "${id}"`);
+  }
+  logger;
+  async getContent(_context) {
+    try {
+      const skills = await this.promptManager.listAutoInvocablePrompts();
+      const skillEntries = Object.entries(skills);
+      if (skillEntries.length === 0) {
+        return "";
+      }
+      const skillsList = skillEntries.map(([_key, info]) => {
+        const name = info.displayName || info.name;
+        const desc = info.description ? ` - ${info.description}` : "";
+        return `- ${name}${desc}`;
+      }).join("\n");
+      const result = `## Available Skills
+
+You can invoke the following skills using the \`invoke_skill\` tool when they are relevant to the task:
+
+${skillsList}
+
+To use a skill, call invoke_skill with the skill name. The skill will provide specialized instructions for the task.`;
+      this.logger.debug(
+        `[SkillsContributor] Listed ${skillEntries.length} skills in system prompt`
+      );
+      return result;
+    } catch (error) {
+      this.logger.error(
+        `[SkillsContributor] Failed to list skills: ${error instanceof Error ? error.message : String(error)}`
+      );
+      return "";
+    }
+  }
+}
 export {
   DynamicContributor,
   FileContributor,
   MemoryContributor,
+  SkillsContributor,
   StaticContributor
 };

package/dist/tools/errors.cjs

@@ -51,14 +51,18 @@ class ToolError {
   }
   /**
    * Tool execution denied by user/policy
+   * @param toolName - Name of the tool that was denied
+   * @param sessionId - Optional session ID
+   * @param userMessage - Optional message from user (e.g., feedback for plan review)
    */
-  static executionDenied(toolName, sessionId) {
+  static executionDenied(toolName, sessionId, userMessage) {
+    const message = userMessage ? `Tool '${toolName}' was denied. ${userMessage}` : `Tool '${toolName}' execution was denied by the user`;
     return new import_DextoRuntimeError.DextoRuntimeError(
       import_error_codes.ToolErrorCode.EXECUTION_DENIED,
       import_types.ErrorScope.TOOLS,
       import_types.ErrorType.FORBIDDEN,
-      `Tool '${toolName}' execution was denied by the user`,
-      { toolName, sessionId }
+      message,
+      { toolName, sessionId, userMessage }
     );
   }
   /**

package/dist/tools/errors.d.ts

@@ -20,10 +20,14 @@ export declare class ToolError {
     }>;
     /**
      * Tool execution denied by user/policy
+     * @param toolName - Name of the tool that was denied
+     * @param sessionId - Optional session ID
+     * @param userMessage - Optional message from user (e.g., feedback for plan review)
      */
-    static executionDenied(toolName: string, sessionId?: string): DextoRuntimeError<{
+    static executionDenied(toolName: string, sessionId?: string, userMessage?: string): DextoRuntimeError<{
         toolName: string;
         sessionId: string | undefined;
+        userMessage: string | undefined;
     }>;
     /**
      * Directory access denied by user

package/dist/tools/errors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/tools/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAItE;;;GAGG;AACH,qBAAa,SAAS;IAClB;;OAEG;IACH,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM;;;IAUhC;;OAEG;IACH,MAAM,CAAC,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;;;;;IAU3E;;OAEG;IACH,MAAM,CAAC,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;;;;IAU3D;;;;OAIG;IACH,MAAM,CAAC,qBAAqB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;;;;IAWlE;;OAEG;IACH,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;;;;;IAc/E;;;;OAIG;IACH,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;;;;IAU3F;;;OAGG;IACH,MAAM,CAAC,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;;;;;IAelE;;OAEG;IACH,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;;;;IAUxD;;OAEG;IACH,MAAM,CAAC,0BAA0B,CAAC,QAAQ,EAAE,MAAM;;;IAUlD;;OAEG;IACH,MAAM,CAAC,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;;;;;IAUlF;;OAEG;IACH,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;;;;IAUnD;;OAEG;IACH,MAAM,CAAC,2BAA2B,CAAC,QAAQ,EAAE,MAAM;;;IAUnD;;OAEG;IACH,MAAM,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM;IAUpC;;OAEG;IACH,MAAM,CAAC,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;;;;IAU7D;;OAEG;IACH,MAAM,CAAC,eAAe,CAClB,QAAQ,EAAE,MAAM,EAChB,eAAe,EAAE,MAAM,EAAE,EACzB,OAAO,EAAE,MAAM,GAChB,iBAAiB,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,eAAe,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IAcrE;;OAEG;IACH,MAAM,CAAC,yBAAyB,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,iBAAiB;IAW3F;;OAEG;IACH,MAAM,CAAC,mCAAmC,CAAC,IAAI,EAAE,MAAM,GAAG,iBAAiB;CAU9E"}
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/tools/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAItE;;;GAGG;AACH,qBAAa,SAAS;IAClB;;OAEG;IACH,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM;;;IAUhC;;OAEG;IACH,MAAM,CAAC,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;;;;;IAU3E;;;;;OAKG;IACH,MAAM,CAAC,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM;;;;;IAajF;;;;OAIG;IACH,MAAM,CAAC,qBAAqB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;;;;IAWlE;;OAEG;IACH,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;;;;;IAc/E;;;;OAIG;IACH,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;;;;IAU3F;;;OAGG;IACH,MAAM,CAAC,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;;;;;IAelE;;OAEG;IACH,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;;;;IAUxD;;OAEG;IACH,MAAM,CAAC,0BAA0B,CAAC,QAAQ,EAAE,MAAM;;;IAUlD;;OAEG;IACH,MAAM,CAAC,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;;;;;IAUlF;;OAEG;IACH,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;;;;IAUnD;;OAEG;IACH,MAAM,CAAC,2BAA2B,CAAC,QAAQ,EAAE,MAAM;;;IAUnD;;OAEG;IACH,MAAM,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM;IAUpC;;OAEG;IACH,MAAM,CAAC,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;;;;IAU7D;;OAEG;IACH,MAAM,CAAC,eAAe,CAClB,QAAQ,EAAE,MAAM,EAChB,eAAe,EAAE,MAAM,EAAE,EACzB,OAAO,EAAE,MAAM,GAChB,iBAAiB,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,eAAe,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IAcrE;;OAEG;IACH,MAAM,CAAC,yBAAyB,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,iBAAiB;IAW3F;;OAEG;IACH,MAAM,CAAC,mCAAmC,CAAC,IAAI,EAAE,MAAM,GAAG,iBAAiB;CAU9E"}

package/dist/tools/errors.js

@@ -29,14 +29,18 @@ class ToolError {
   }
   /**
    * Tool execution denied by user/policy
+   * @param toolName - Name of the tool that was denied
+   * @param sessionId - Optional session ID
+   * @param userMessage - Optional message from user (e.g., feedback for plan review)
    */
-  static executionDenied(toolName, sessionId) {
+  static executionDenied(toolName, sessionId, userMessage) {
+    const message = userMessage ? `Tool '${toolName}' was denied. ${userMessage}` : `Tool '${toolName}' execution was denied by the user`;
     return new DextoRuntimeError(
       ToolErrorCode.EXECUTION_DENIED,
       ErrorScope.TOOLS,
       ErrorType.FORBIDDEN,
-      `Tool '${toolName}' execution was denied by the user`,
-      { toolName, sessionId }
+      message,
+      { toolName, sessionId, userMessage }
     );
   }
   /**

package/dist/tools/internal-tools/constants.cjs

@@ -26,7 +26,8 @@ const INTERNAL_TOOL_NAMES = [
   "ask_user",
   "delegate_to_url",
   "list_resources",
-  "get_resource"
+  "get_resource",
+  "invoke_skill"
 ];
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/tools/internal-tools/constants.d.ts

@@ -7,6 +7,6 @@
  * Available internal tool names
  * Must be kept in sync with INTERNAL_TOOL_REGISTRY in registry.ts
  */
-export declare const INTERNAL_TOOL_NAMES: readonly ["search_history", "ask_user", "delegate_to_url", "list_resources", "get_resource"];
+export declare const INTERNAL_TOOL_NAMES: readonly ["search_history", "ask_user", "delegate_to_url", "list_resources", "get_resource", "invoke_skill"];
 export type KnownInternalTool = (typeof INTERNAL_TOOL_NAMES)[number];
 //# sourceMappingURL=constants.d.ts.map

package/dist/tools/internal-tools/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/tools/internal-tools/constants.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH;;;GAGG;AACH,eAAO,MAAM,mBAAmB,8FAMtB,CAAC;AAEX,MAAM,MAAM,iBAAiB,GAAG,CAAC,OAAO,mBAAmB,CAAC,CAAC,MAAM,CAAC,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/tools/internal-tools/constants.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH;;;GAGG;AACH,eAAO,MAAM,mBAAmB,8GAOtB,CAAC;AAEX,MAAM,MAAM,iBAAiB,GAAG,CAAC,OAAO,mBAAmB,CAAC,CAAC,MAAM,CAAC,CAAC"}

package/dist/tools/internal-tools/constants.js

@@ -4,7 +4,8 @@ const INTERNAL_TOOL_NAMES = [
   "ask_user",
   "delegate_to_url",
   "list_resources",
-  "get_resource"
+  "get_resource",
+  "invoke_skill"
 ];
 export {
   INTERNAL_TOOL_NAMES

package/dist/tools/internal-tools/implementations/invoke-skill-tool.cjs

@@ -0,0 +1,140 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var invoke_skill_tool_exports = {};
+__export(invoke_skill_tool_exports, {
+  createInvokeSkillTool: () => createInvokeSkillTool
+});
+module.exports = __toCommonJS(invoke_skill_tool_exports);
+var import_zod = require("zod");
+var import_utils = require("../../../prompts/utils.js");
+const InvokeSkillInputSchema = import_zod.z.object({
+  skill: import_zod.z.string().min(1, "Skill name is required").describe(
+    'The name of the skill to invoke (e.g., "plugin-name:skill-name" or "skill-name")'
+  ),
+  args: import_zod.z.record(import_zod.z.string()).optional().describe("Optional arguments to pass to the skill"),
+  taskContext: import_zod.z.string().optional().describe(
+    "Context about what task this skill should accomplish. Recommended for forked skills to provide context since they run in isolation without conversation history."
+  )
+}).strict();
+function createInvokeSkillTool(services) {
+  return {
+    id: "invoke_skill",
+    description: buildToolDescription(),
+    inputSchema: InvokeSkillInputSchema,
+    execute: async (input, context) => {
+      const { skill, args, taskContext } = input;
+      const promptManager = services.promptManager;
+      if (!promptManager) {
+        return {
+          error: "PromptManager not available. This is a configuration error."
+        };
+      }
+      const autoInvocable = await promptManager.listAutoInvocablePrompts();
+      let skillKey;
+      for (const key of Object.keys(autoInvocable)) {
+        const info = autoInvocable[key];
+        if (!info) continue;
+        if (key === skill || info.displayName === skill || info.commandName === skill || info.name === skill) {
+          skillKey = key;
+          break;
+        }
+      }
+      if (!skillKey) {
+        return {
+          error: `Skill '${skill}' not found or not available for model invocation. Use a skill from the available list.`,
+          availableSkills: Object.keys(autoInvocable)
+        };
+      }
+      const promptDef = await promptManager.getPromptDefinition(skillKey);
+      const promptResult = await promptManager.getPrompt(skillKey, args);
+      const flattened = (0, import_utils.flattenPromptResult)(promptResult);
+      const content = flattened.text;
+      if (promptDef?.context === "fork") {
+        const taskForker = services.taskForker;
+        if (!taskForker) {
+          return {
+            error: `Skill '${skill}' requires fork execution (context: fork), but agent spawning is not available. Configure agent-spawner custom tool to enable forked skills.`,
+            skill: skillKey
+          };
+        }
+        let instructions;
+        if (taskContext) {
+          instructions = `## Task Context
+${taskContext}
+
+## Skill Instructions
+${content}`;
+        } else {
+          instructions = content;
+        }
+        const forkOptions = {
+          task: `Skill: ${skill}`,
+          instructions,
+          // Fork skills auto-approve by default since they run in isolation
+          autoApprove: true
+        };
+        if (promptDef.agent) {
+          forkOptions.agentId = promptDef.agent;
+        }
+        if (context?.toolCallId) {
+          forkOptions.toolCallId = context.toolCallId;
+        }
+        if (context?.sessionId) {
+          forkOptions.sessionId = context.sessionId;
+        }
+        const result = await taskForker.fork(forkOptions);
+        if (result.success) {
+          return result.response ?? "Task completed successfully.";
+        } else {
+          return `Error: ${result.error ?? "Unknown error during forked execution"}`;
+        }
+      }
+      return {
+        skill: skillKey,
+        content,
+        instructions: "Follow the instructions in the skill content above to complete the task."
+      };
+    }
+  };
+}
+function buildToolDescription() {
+  return `Invoke a skill to load and execute specialized instructions for a task. Skills are predefined prompts that guide how to handle specific scenarios.
+
+When to use:
+- When you recognize a task that matches an available skill
+- When you need specialized guidance for a complex operation
+- When the user references a skill by name
+
+Parameters:
+- skill: The name of the skill to invoke
+- args: Optional arguments to pass to the skill (e.g., for $ARGUMENTS substitution)
+- taskContext: Context about what you're trying to accomplish (important for forked skills that run in isolation)
+
+Execution modes:
+- **Inline skills**: Return instructions for you to follow in the current conversation
+- **Fork skills**: Automatically execute in an isolated subagent and return the result (no additional tool calls needed)
+
+Fork skills run in complete isolation without access to conversation history. They're useful for tasks that should run independently.
+
+Available skills are listed in your system prompt. Use the skill name exactly as shown.`;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createInvokeSkillTool
+});

package/dist/tools/internal-tools/implementations/invoke-skill-tool.d.ts

@@ -0,0 +1,24 @@
+import type { InternalTool } from '../../types.js';
+import type { InternalToolsServices } from '../registry.js';
+/**
+ * Internal tool for invoking skills/prompts during agent execution.
+ *
+ * This tool allows the LLM to load and execute skills that are registered
+ * with the PromptManager. Skills are prompts that can be auto-invoked by
+ * the model (not disabled via `disableModelInvocation`).
+ *
+ * Execution modes:
+ * - **inline** (default): Skill content is returned for the LLM to follow in the current session
+ * - **fork**: Skill is executed in an isolated subagent with no conversation history access
+ *
+ * Usage:
+ * - The LLM sees available skills in its system prompt
+ * - When a skill is relevant, the LLM calls this tool with the skill name
+ * - For inline skills: content is returned for the LLM to follow
+ * - For forked skills: execution happens in isolation and result is returned
+ *
+ * Note: Takes services object (not individual deps) to support late-binding of taskForker.
+ * The taskForker may be set after tool creation when agent-spawner custom tool is registered.
+ */
+export declare function createInvokeSkillTool(services: InternalToolsServices): InternalTool;
+//# sourceMappingURL=invoke-skill-tool.d.ts.map

package/dist/tools/internal-tools/implementations/invoke-skill-tool.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"invoke-skill-tool.d.ts","sourceRoot":"","sources":["../../../../src/tools/internal-tools/implementations/invoke-skill-tool.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAwB,MAAM,gBAAgB,CAAC;AACzE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAuB5D;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,qBAAqB,GAAG,YAAY,CAqHnF"}