@dexto/core 1.2.6 → 1.4.0

package/dist/tools/internal-tools/implementations/glob-files-tool.cjs

@@ -39,6 +39,18 @@ function createGlobFilesTool(fileSystemService) {
         maxResults: max_results,
         includeMetadata: true
       });
+      const _display = {
+        type: "search",
+        pattern,
+        matches: result.files.map((file) => ({
+          file: file.path,
+          line: 0,
+          // No line number for glob
+          content: file.path
+        })),
+        totalMatches: result.totalFound,
+        truncated: result.truncated
+      };
       return {
         files: result.files.map((file) => ({
           path: file.path,
@@ -46,7 +58,8 @@ function createGlobFilesTool(fileSystemService) {
           modified: file.modified.toISOString()
         })),
         total_found: result.totalFound,
-        truncated: result.truncated
+        truncated: result.truncated,
+        _display
       };
     }
   };

package/dist/tools/internal-tools/implementations/glob-files-tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"glob-files-tool.d.ts","sourceRoot":"","sources":["../../../../src/tools/internal-tools/implementations/glob-files-tool.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,YAAY,EAAwB,MAAM,gBAAgB,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAuBjE;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,YAAY,CA4BtF"}
+{"version":3,"file":"glob-files-tool.d.ts","sourceRoot":"","sources":["../../../../src/tools/internal-tools/implementations/glob-files-tool.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,YAAY,EAAwB,MAAM,gBAAgB,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAwBjE;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,YAAY,CA0CtF"}

package/dist/tools/internal-tools/implementations/glob-files-tool.js

@@ -1,4 +1,4 @@
-import "../../../chunk-C6A6W6XS.js";
+import "../../../chunk-PTJYTZNU.js";
 import { z } from "zod";
 const GlobFilesInputSchema = z.object({
   pattern: z.string().describe('Glob pattern to match files (e.g., "**/*.ts", "src/**/*.js")'),
@@ -17,6 +17,18 @@ function createGlobFilesTool(fileSystemService) {
         maxResults: max_results,
         includeMetadata: true
       });
+      const _display = {
+        type: "search",
+        pattern,
+        matches: result.files.map((file) => ({
+          file: file.path,
+          line: 0,
+          // No line number for glob
+          content: file.path
+        })),
+        totalMatches: result.totalFound,
+        truncated: result.truncated
+      };
       return {
         files: result.files.map((file) => ({
           path: file.path,
@@ -24,7 +36,8 @@ function createGlobFilesTool(fileSystemService) {
           modified: file.modified.toISOString()
         })),
         total_found: result.totalFound,
-        truncated: result.truncated
+        truncated: result.truncated,
+        _display
       };
     }
   };

package/dist/tools/internal-tools/implementations/grep-content-tool.cjs

@@ -46,6 +46,20 @@ function createGrepContentTool(fileSystemService) {
         caseInsensitive: case_insensitive,
         maxResults: max_results
       });
+      const _display = {
+        type: "search",
+        pattern,
+        matches: result.matches.map((match) => ({
+          file: match.file,
+          line: match.lineNumber,
+          content: match.line,
+          ...match.context && {
+            context: [...match.context.before, ...match.context.after]
+          }
+        })),
+        totalMatches: result.totalMatches,
+        truncated: result.truncated
+      };
       return {
         matches: result.matches.map((match) => ({
           file: match.file,
@@ -60,7 +74,8 @@ function createGrepContentTool(fileSystemService) {
         })),
         total_matches: result.totalMatches,
         files_searched: result.filesSearched,
-        truncated: result.truncated
+        truncated: result.truncated,
+        _display
       };
     }
   };

package/dist/tools/internal-tools/implementations/grep-content-tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grep-content-tool.d.ts","sourceRoot":"","sources":["../../../../src/tools/internal-tools/implementations/grep-content-tool.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,YAAY,EAAwB,MAAM,gBAAgB,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAuCjE;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,YAAY,CAsCxF"}
+{"version":3,"file":"grep-content-tool.d.ts","sourceRoot":"","sources":["../../../../src/tools/internal-tools/implementations/grep-content-tool.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,YAAY,EAAwB,MAAM,gBAAgB,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAwCjE;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,YAAY,CAuDxF"}

package/dist/tools/internal-tools/implementations/grep-content-tool.js

@@ -1,4 +1,4 @@
-import "../../../chunk-C6A6W6XS.js";
+import "../../../chunk-PTJYTZNU.js";
 import { z } from "zod";
 const GrepContentInputSchema = z.object({
   pattern: z.string().describe("Regular expression pattern to search for"),
@@ -24,6 +24,20 @@ function createGrepContentTool(fileSystemService) {
         caseInsensitive: case_insensitive,
         maxResults: max_results
       });
+      const _display = {
+        type: "search",
+        pattern,
+        matches: result.matches.map((match) => ({
+          file: match.file,
+          line: match.lineNumber,
+          content: match.line,
+          ...match.context && {
+            context: [...match.context.before, ...match.context.after]
+          }
+        })),
+        totalMatches: result.totalMatches,
+        truncated: result.truncated
+      };
       return {
         matches: result.matches.map((match) => ({
           file: match.file,
@@ -38,7 +52,8 @@ function createGrepContentTool(fileSystemService) {
         })),
         total_matches: result.totalMatches,
         files_searched: result.filesSearched,
-        truncated: result.truncated
+        truncated: result.truncated,
+        _display
       };
     }
   };

package/dist/tools/internal-tools/implementations/kill-process-tool.js

@@ -1,4 +1,4 @@
-import "../../../chunk-C6A6W6XS.js";
+import "../../../chunk-PTJYTZNU.js";
 import { z } from "zod";
 const KillProcessInputSchema = z.object({
   process_id: z.string().describe("Process ID of the background process to terminate")

package/dist/tools/internal-tools/implementations/read-file-tool.cjs

@@ -38,13 +38,21 @@ function createReadFileTool(fileSystemService) {
         limit,
         offset
       });
+      const _display = {
+        type: "file",
+        path: file_path,
+        operation: "read",
+        size: result.size,
+        lineCount: result.lines
+      };
       return {
         content: result.content,
         lines: result.lines,
         encoding: result.encoding,
         truncated: result.truncated,
         size: result.size,
-        ...result.mimeType && { mimeType: result.mimeType }
+        ...result.mimeType && { mimeType: result.mimeType },
+        _display
       };
     }
   };

package/dist/tools/internal-tools/implementations/read-file-tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"read-file-tool.d.ts","sourceRoot":"","sources":["../../../../src/tools/internal-tools/implementations/read-file-tool.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,YAAY,EAAwB,MAAM,gBAAgB,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAsBjE;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,YAAY,CA0BrF"}
+{"version":3,"file":"read-file-tool.d.ts","sourceRoot":"","sources":["../../../../src/tools/internal-tools/implementations/read-file-tool.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,YAAY,EAAwB,MAAM,gBAAgB,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAuBjE;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,YAAY,CAoCrF"}

package/dist/tools/internal-tools/implementations/read-file-tool.js

@@ -1,4 +1,4 @@
-import "../../../chunk-C6A6W6XS.js";
+import "../../../chunk-PTJYTZNU.js";
 import { z } from "zod";
 const ReadFileInputSchema = z.object({
   file_path: z.string().describe("Absolute path to the file to read"),
@@ -16,13 +16,21 @@ function createReadFileTool(fileSystemService) {
         limit,
         offset
       });
+      const _display = {
+        type: "file",
+        path: file_path,
+        operation: "read",
+        size: result.size,
+        lineCount: result.lines
+      };
       return {
         content: result.content,
         lines: result.lines,
         encoding: result.encoding,
         truncated: result.truncated,
         size: result.size,
-        ...result.mimeType && { mimeType: result.mimeType }
+        ...result.mimeType && { mimeType: result.mimeType },
+        _display
       };
     }
   };

package/dist/tools/internal-tools/implementations/search-history-tool.js

@@ -1,4 +1,4 @@
-import "../../../chunk-C6A6W6XS.js";
+import "../../../chunk-PTJYTZNU.js";
 import { z } from "zod";
 const SearchHistoryInputSchema = z.object({
   query: z.string().describe("The search query to find in conversation history"),

package/dist/tools/internal-tools/implementations/write-file-tool.cjs

@@ -22,30 +22,98 @@ __export(write_file_tool_exports, {
 });
 module.exports = __toCommonJS(write_file_tool_exports);
 var import_zod = require("zod");
+var import_diff = require("diff");
+var import_filesystem = require("../../../filesystem/index.js");
+var import_errors = require("../../../errors/index.js");
 const WriteFileInputSchema = import_zod.z.object({
   file_path: import_zod.z.string().describe("Absolute path where the file should be written"),
   content: import_zod.z.string().describe("Content to write to the file"),
   create_dirs: import_zod.z.boolean().optional().default(false).describe("Create parent directories if they don't exist (default: false)"),
   encoding: import_zod.z.enum(["utf-8", "ascii", "latin1", "utf16le"]).optional().default("utf-8").describe("File encoding (default: utf-8)")
 }).strict();
+function generateDiffPreview(filePath, originalContent, newContent) {
+  const unified = (0, import_diff.createPatch)(filePath, originalContent, newContent, "before", "after", {
+    context: 3
+  });
+  const additions = (unified.match(/^\+[^+]/gm) || []).length;
+  const deletions = (unified.match(/^-[^-]/gm) || []).length;
+  return {
+    type: "diff",
+    unified,
+    filename: filePath,
+    additions,
+    deletions
+  };
+}
 function createWriteFileTool(fileSystemService) {
   return {
     id: "write_file",
     description: "Write content to a file. Creates a new file or overwrites existing file. Automatically creates backup of existing files before overwriting. Use create_dirs to create parent directories. Requires approval for all write operations. Returns success status, path, bytes written, and backup path if applicable.",
     inputSchema: WriteFileInputSchema,
+    /**
+     * Generate preview for approval UI - shows diff or file creation info
+     */
+    generatePreview: async (input, _context) => {
+      const { file_path, content } = input;
+      try {
+        const originalFile = await fileSystemService.readFile(file_path);
+        const originalContent = originalFile.content;
+        return generateDiffPreview(file_path, originalContent, content);
+      } catch (error) {
+        if (error instanceof import_errors.DextoRuntimeError && error.code === import_filesystem.FileSystemErrorCode.FILE_NOT_FOUND) {
+          const lineCount = content.split("\n").length;
+          const preview = {
+            type: "file",
+            path: file_path,
+            operation: "create",
+            size: content.length,
+            lineCount,
+            content
+            // Include content for approval preview
+          };
+          return preview;
+        }
+        throw error;
+      }
+    },
     execute: async (input, _context) => {
       const { file_path, content, create_dirs, encoding } = input;
+      let originalContent = null;
+      try {
+        const originalFile = await fileSystemService.readFile(file_path);
+        originalContent = originalFile.content;
+      } catch (error) {
+        if (error instanceof import_errors.DextoRuntimeError && error.code === import_filesystem.FileSystemErrorCode.FILE_NOT_FOUND) {
+          originalContent = null;
+        } else {
+          throw error;
+        }
+      }
       const result = await fileSystemService.writeFile(file_path, content, {
         createDirs: create_dirs,
         encoding,
         backup: true
         // Always create backup for internal tools
       });
+      let _display;
+      if (originalContent === null) {
+        const lineCount = content.split("\n").length;
+        _display = {
+          type: "file",
+          path: file_path,
+          operation: "create",
+          size: result.bytesWritten,
+          lineCount
+        };
+      } else {
+        _display = generateDiffPreview(file_path, originalContent, content);
+      }
       return {
         success: result.success,
         path: result.path,
         bytes_written: result.bytesWritten,
-        ...result.backupPath && { backup_path: result.backupPath }
+        ...result.backupPath && { backup_path: result.backupPath },
+        _display
       };
     }
   };

package/dist/tools/internal-tools/implementations/write-file-tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"write-file-tool.d.ts","sourceRoot":"","sources":["../../../../src/tools/internal-tools/implementations/write-file-tool.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,YAAY,EAAwB,MAAM,gBAAgB,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAkB,MAAM,8BAA8B,CAAC;AAqBjF;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,YAAY,CAyBtF"}
+{"version":3,"file":"write-file-tool.d.ts","sourceRoot":"","sources":["../../../../src/tools/internal-tools/implementations/write-file-tool.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,YAAY,EAAwB,MAAM,gBAAgB,CAAC;AACpE,OAAO,EACH,iBAAiB,EAGpB,MAAM,8BAA8B,CAAC;AA8CtC;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,YAAY,CAoGtF"}

package/dist/tools/internal-tools/implementations/write-file-tool.js

@@ -1,29 +1,99 @@
-import "../../../chunk-C6A6W6XS.js";
+import "../../../chunk-PTJYTZNU.js";
 import { z } from "zod";
+import { createPatch } from "diff";
+import {
+  FileSystemErrorCode
+} from "../../../filesystem/index.js";
+import { DextoRuntimeError } from "../../../errors/index.js";
 const WriteFileInputSchema = z.object({
   file_path: z.string().describe("Absolute path where the file should be written"),
   content: z.string().describe("Content to write to the file"),
   create_dirs: z.boolean().optional().default(false).describe("Create parent directories if they don't exist (default: false)"),
   encoding: z.enum(["utf-8", "ascii", "latin1", "utf16le"]).optional().default("utf-8").describe("File encoding (default: utf-8)")
 }).strict();
+function generateDiffPreview(filePath, originalContent, newContent) {
+  const unified = createPatch(filePath, originalContent, newContent, "before", "after", {
+    context: 3
+  });
+  const additions = (unified.match(/^\+[^+]/gm) || []).length;
+  const deletions = (unified.match(/^-[^-]/gm) || []).length;
+  return {
+    type: "diff",
+    unified,
+    filename: filePath,
+    additions,
+    deletions
+  };
+}
 function createWriteFileTool(fileSystemService) {
   return {
     id: "write_file",
     description: "Write content to a file. Creates a new file or overwrites existing file. Automatically creates backup of existing files before overwriting. Use create_dirs to create parent directories. Requires approval for all write operations. Returns success status, path, bytes written, and backup path if applicable.",
     inputSchema: WriteFileInputSchema,
+    /**
+     * Generate preview for approval UI - shows diff or file creation info
+     */
+    generatePreview: async (input, _context) => {
+      const { file_path, content } = input;
+      try {
+        const originalFile = await fileSystemService.readFile(file_path);
+        const originalContent = originalFile.content;
+        return generateDiffPreview(file_path, originalContent, content);
+      } catch (error) {
+        if (error instanceof DextoRuntimeError && error.code === FileSystemErrorCode.FILE_NOT_FOUND) {
+          const lineCount = content.split("\n").length;
+          const preview = {
+            type: "file",
+            path: file_path,
+            operation: "create",
+            size: content.length,
+            lineCount,
+            content
+            // Include content for approval preview
+          };
+          return preview;
+        }
+        throw error;
+      }
+    },
     execute: async (input, _context) => {
       const { file_path, content, create_dirs, encoding } = input;
+      let originalContent = null;
+      try {
+        const originalFile = await fileSystemService.readFile(file_path);
+        originalContent = originalFile.content;
+      } catch (error) {
+        if (error instanceof DextoRuntimeError && error.code === FileSystemErrorCode.FILE_NOT_FOUND) {
+          originalContent = null;
+        } else {
+          throw error;
+        }
+      }
       const result = await fileSystemService.writeFile(file_path, content, {
         createDirs: create_dirs,
         encoding,
         backup: true
         // Always create backup for internal tools
       });
+      let _display;
+      if (originalContent === null) {
+        const lineCount = content.split("\n").length;
+        _display = {
+          type: "file",
+          path: file_path,
+          operation: "create",
+          size: result.bytesWritten,
+          lineCount
+        };
+      } else {
+        _display = generateDiffPreview(file_path, originalContent, content);
+      }
       return {
         success: result.success,
         path: result.path,
         bytes_written: result.bytesWritten,
-        ...result.backupPath && { backup_path: result.backupPath }
+        ...result.backupPath && { backup_path: result.backupPath },
+        _display
       };
     }
   };

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

@@ -28,12 +28,10 @@ class InternalToolsProvider {
   services;
   tools = /* @__PURE__ */ new Map();
   // ← Store original InternalTool
-  approvalManager;
   config;
   logger;
-  constructor(services, approvalManager, config = [], logger) {
+  constructor(services, config = [], logger) {
     this.services = services;
-    this.approvalManager = approvalManager;
     this.config = config;
     this.logger = logger;
     this.logger.debug("InternalToolsProvider initialized with config:", { config });
@@ -62,14 +60,13 @@ class InternalToolsProvider {
    * Register all available internal tools based on available services and configuration
    */
   registerInternalTools() {
-    const servicesWithApproval = {
-      ...this.services,
-      approvalManager: this.approvalManager
+    const featureFlags = {
+      elicitation: this.services.approvalManager?.getConfig().elicitation.enabled ?? false
     };
     for (const toolName of this.config) {
       const toolInfo = (0, import_registry.getInternalToolInfo)(toolName);
       const missingServices = toolInfo.requiredServices.filter(
-        (serviceKey) => !servicesWithApproval[serviceKey]
+        (serviceKey) => !this.services[serviceKey]
       );
       if (missingServices.length > 0) {
         this.logger.debug(
@@ -77,8 +74,18 @@ class InternalToolsProvider {
         );
         continue;
       }
+      const missingFeatures = (toolInfo.requiredFeatures ?? []).filter(
+        (feature) => !featureFlags[feature]
+      );
+      if (missingFeatures.length > 0) {
+        throw import_errors.ToolError.featureDisabled(
+          toolName,
+          missingFeatures,
+          `Tool '${toolName}' requires features which are currently disabled: ${missingFeatures.join(", ")}. Either remove '${toolName}' from internalTools, or enable: ${missingFeatures.map((f) => `${f}.enabled: true`).join(", ")}`
+        );
+      }
       try {
-        const tool = toolInfo.factory(servicesWithApproval);
+        const tool = toolInfo.factory(this.services);
         this.tools.set(toolName, tool);
         this.logger.debug(`Registered ${toolName} internal tool`);
       } catch (error) {
@@ -94,10 +101,17 @@ class InternalToolsProvider {
   hasTool(toolName) {
     return this.tools.has(toolName);
   }
+  /**
+   * Get an internal tool by name
+   * Returns undefined if tool doesn't exist
+   */
+  getTool(toolName) {
+    return this.tools.get(toolName);
+  }
   /**
    * Execute an internal tool - confirmation is handled by ToolManager
    */
-  async executeTool(toolName, args, sessionId) {
+  async executeTool(toolName, args, sessionId, abortSignal) {
     const tool = this.tools.get(toolName);
     if (!tool) {
       this.logger.error(`\u274C No internal tool found: ${toolName}`);
@@ -117,7 +131,10 @@ class InternalToolsProvider {
       );
     }
     try {
-      const context = { sessionId };
+      const context = {
+        sessionId,
+        abortSignal
+      };
       const result = await tool.execute(validationResult.data, context);
       return result;
     } catch (error) {

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

@@ -1,8 +1,7 @@
-import { ToolSet } from '../types.js';
+import { ToolSet, InternalTool } from '../types.js';
 import type { IDextoLogger } from '../../logger/v2/types.js';
 import { InternalToolsServices } from './registry.js';
 import type { InternalToolsConfig } from '../schemas.js';
-import type { ApprovalManager } from '../../approval/manager.js';
 /**
  * Provider for built-in internal tools that are part of the core system
  *
@@ -18,10 +17,9 @@ import type { ApprovalManager } from '../../approval/manager.js';
 export declare class InternalToolsProvider {
     private services;
     private tools;
-    private approvalManager;
     private config;
     private logger;
-    constructor(services: InternalToolsServices, approvalManager: ApprovalManager, config: InternalToolsConfig | undefined, logger: IDextoLogger);
+    constructor(services: InternalToolsServices, config: InternalToolsConfig | undefined, logger: IDextoLogger);
     /**
      * Initialize the internal tools provider by registering all available internal tools
      */
@@ -34,10 +32,15 @@ export declare class InternalToolsProvider {
      * Check if a tool exists
      */
     hasTool(toolName: string): boolean;
+    /**
+     * Get an internal tool by name
+     * Returns undefined if tool doesn't exist
+     */
+    getTool(toolName: string): InternalTool | undefined;
     /**
      * Execute an internal tool - confirmation is handled by ToolManager
      */
-    executeTool(toolName: string, args: Record<string, unknown>, sessionId?: string): Promise<unknown>;
+    executeTool(toolName: string, args: Record<string, unknown>, sessionId?: string, abortSignal?: AbortSignal): Promise<unknown>;
     /**
      * Get all tools in ToolSet format with on-demand JSON Schema conversion
      */

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

@@ -1 +1 @@
-{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../../../src/tools/internal-tools/provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,OAAO,EAAgB,MAAM,aAAa,CAAC;AAC1E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAG7D,OAAO,EAAE,qBAAqB,EAAuB,MAAM,eAAe,CAAC;AAC3E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;;;;GAWG;AACH,qBAAa,qBAAqB;IAC9B,OAAO,CAAC,QAAQ,CAAwB;IACxC,OAAO,CAAC,KAAK,CAAwC;IACrD,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,MAAM,CAAsB;IACpC,OAAO,CAAC,MAAM,CAAe;gBAGzB,QAAQ,EAAE,qBAAqB,EAC/B,eAAe,EAAE,eAAe,EAChC,MAAM,EAAE,mBAAmB,YAAK,EAChC,MAAM,EAAE,YAAY;IASxB;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAsBjC;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAmC7B;;OAEG;IACH,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAIlC;;OAEG;IACG,WAAW,CACb,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,SAAS,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,OAAO,CAAC;IAkCnB;;OAEG;IACH,WAAW,IAAI,OAAO;IActB;;OAEG;IACH,YAAY,IAAI,MAAM,EAAE;IAIxB;;OAEG;IACH,YAAY,IAAI,MAAM;CAGzB"}
+{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../../../src/tools/internal-tools/provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC1E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAG7D,OAAO,EAAE,qBAAqB,EAA0C,MAAM,eAAe,CAAC;AAC9F,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAEzD;;;;;;;;;;;GAWG;AACH,qBAAa,qBAAqB;IAC9B,OAAO,CAAC,QAAQ,CAAwB;IACxC,OAAO,CAAC,KAAK,CAAwC;IACrD,OAAO,CAAC,MAAM,CAAsB;IACpC,OAAO,CAAC,MAAM,CAAe;gBAGzB,QAAQ,EAAE,qBAAqB,EAC/B,MAAM,EAAE,mBAAmB,YAAK,EAChC,MAAM,EAAE,YAAY;IAQxB;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAsBjC;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAgD7B;;OAEG;IACH,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAIlC;;;OAGG;IACH,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAInD;;OAEG;IACG,WAAW,CACb,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,SAAS,CAAC,EAAE,MAAM,EAClB,WAAW,CAAC,EAAE,WAAW,GAC1B,OAAO,CAAC,OAAO,CAAC;IAqCnB;;OAEG;IACH,WAAW,IAAI,OAAO;IActB;;OAEG;IACH,YAAY,IAAI,MAAM,EAAE;IAIxB;;OAEG;IACH,YAAY,IAAI,MAAM;CAGzB"}

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

@@ -1,4 +1,4 @@
-import "../../chunk-C6A6W6XS.js";
+import "../../chunk-PTJYTZNU.js";
 import { ToolError } from "../errors.js";
 import { convertZodSchemaToJsonSchema } from "../../utils/schema.js";
 import { getInternalToolInfo } from "./registry.js";
@@ -6,12 +6,10 @@ class InternalToolsProvider {
   services;
   tools = /* @__PURE__ */ new Map();
   // ← Store original InternalTool
-  approvalManager;
   config;
   logger;
-  constructor(services, approvalManager, config = [], logger) {
+  constructor(services, config = [], logger) {
     this.services = services;
-    this.approvalManager = approvalManager;
     this.config = config;
     this.logger = logger;
     this.logger.debug("InternalToolsProvider initialized with config:", { config });
@@ -40,14 +38,13 @@ class InternalToolsProvider {
    * Register all available internal tools based on available services and configuration
    */
   registerInternalTools() {
-    const servicesWithApproval = {
-      ...this.services,
-      approvalManager: this.approvalManager
+    const featureFlags = {
+      elicitation: this.services.approvalManager?.getConfig().elicitation.enabled ?? false
     };
     for (const toolName of this.config) {
       const toolInfo = getInternalToolInfo(toolName);
       const missingServices = toolInfo.requiredServices.filter(
-        (serviceKey) => !servicesWithApproval[serviceKey]
+        (serviceKey) => !this.services[serviceKey]
       );
       if (missingServices.length > 0) {
         this.logger.debug(
@@ -55,8 +52,18 @@ class InternalToolsProvider {
         );
         continue;
       }
+      const missingFeatures = (toolInfo.requiredFeatures ?? []).filter(
+        (feature) => !featureFlags[feature]
+      );
+      if (missingFeatures.length > 0) {
+        throw ToolError.featureDisabled(
+          toolName,
+          missingFeatures,
+          `Tool '${toolName}' requires features which are currently disabled: ${missingFeatures.join(", ")}. Either remove '${toolName}' from internalTools, or enable: ${missingFeatures.map((f) => `${f}.enabled: true`).join(", ")}`
+        );
+      }
       try {
-        const tool = toolInfo.factory(servicesWithApproval);
+        const tool = toolInfo.factory(this.services);
         this.tools.set(toolName, tool);
         this.logger.debug(`Registered ${toolName} internal tool`);
       } catch (error) {
@@ -72,10 +79,17 @@ class InternalToolsProvider {
   hasTool(toolName) {
     return this.tools.has(toolName);
   }
+  /**
+   * Get an internal tool by name
+   * Returns undefined if tool doesn't exist
+   */
+  getTool(toolName) {
+    return this.tools.get(toolName);
+  }
   /**
    * Execute an internal tool - confirmation is handled by ToolManager
    */
-  async executeTool(toolName, args, sessionId) {
+  async executeTool(toolName, args, sessionId, abortSignal) {
     const tool = this.tools.get(toolName);
     if (!tool) {
       this.logger.error(`\u274C No internal tool found: ${toolName}`);
@@ -95,7 +109,10 @@ class InternalToolsProvider {
       );
     }
     try {
-      const context = { sessionId };
+      const context = {
+        sessionId,
+        abortSignal
+      };
       const result = await tool.execute(validationResult.data, context);
       return result;
     } catch (error) {

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

@@ -40,7 +40,8 @@ const INTERNAL_TOOL_REGISTRY = {
   },
   ask_user: {
     factory: (services) => (0, import_ask_user_tool.createAskUserTool)(services.approvalManager),
-    requiredServices: ["approvalManager"]
+    requiredServices: ["approvalManager"],
+    requiredFeatures: ["elicitation"]
   },
   read_file: {
     factory: (services) => (0, import_read_file_tool.createReadFileTool)(services.fileSystemService),
@@ -63,8 +64,8 @@ const INTERNAL_TOOL_REGISTRY = {
     requiredServices: ["fileSystemService"]
   },
   bash_exec: {
-    factory: (services) => (0, import_bash_exec_tool.createBashExecTool)(services.processService, services.approvalManager),
-    requiredServices: ["processService", "approvalManager"]
+    factory: (services) => (0, import_bash_exec_tool.createBashExecTool)(services.processService),
+    requiredServices: ["processService"]
   },
   bash_output: {
     factory: (services) => (0, import_bash_output_tool.createBashOutputTool)(services.processService),