@dexto/core 1.2.6 → 1.4.0

package/dist/tools/error-codes.js

@@ -1,8 +1,9 @@
-import "../chunk-C6A6W6XS.js";
+import "../chunk-PTJYTZNU.js";
 var ToolErrorCode = /* @__PURE__ */ ((ToolErrorCode2) => {
   ToolErrorCode2["EXECUTION_DENIED"] = "tools_execution_denied";
   ToolErrorCode2["EXECUTION_TIMEOUT"] = "tools_execution_timeout";
   ToolErrorCode2["EXECUTION_FAILED"] = "tools_execution_failed";
+  ToolErrorCode2["VALIDATION_FAILED"] = "tools_validation_failed";
   ToolErrorCode2["CONFIRMATION_HANDLER_MISSING"] = "tools_confirmation_handler_missing";
   ToolErrorCode2["CONFIRMATION_TIMEOUT"] = "tools_confirmation_timeout";
   ToolErrorCode2["CONFIRMATION_CANCELLED"] = "tools_confirmation_cancelled";
@@ -10,6 +11,7 @@ var ToolErrorCode = /* @__PURE__ */ ((ToolErrorCode2) => {
   ToolErrorCode2["TOOL_INVALID_ARGS"] = "tools_invalid_args";
   ToolErrorCode2["TOOL_UNAUTHORIZED"] = "tools_unauthorized";
   ToolErrorCode2["CONFIG_INVALID"] = "tools_config_invalid";
+  ToolErrorCode2["FEATURE_DISABLED"] = "tools_feature_disabled";
   return ToolErrorCode2;
 })(ToolErrorCode || {});
 export {

package/dist/tools/errors.cjs

@@ -74,6 +74,20 @@ class ToolError {
       { toolName, timeoutMs, sessionId }
     );
   }
+  /**
+   * Tool validation failed (pre-execution check)
+   * Used when tool inputs are semantically invalid (e.g., file not found, string not in file)
+   * This should fail before approval, not after.
+   */
+  static validationFailed(toolName, reason, context) {
+    return new import_DextoRuntimeError.DextoRuntimeError(
+      import_error_codes.ToolErrorCode.VALIDATION_FAILED,
+      import_types.ErrorScope.TOOLS,
+      import_types.ErrorType.USER,
+      `Tool '${toolName}' validation failed: ${reason}`,
+      { toolName, reason, ...context }
+    );
+  }
   /**
    * Tool unauthorized access
    */
@@ -158,6 +172,22 @@ class ToolError {
       { toolName, reason }
     );
   }
+  /**
+   * Tool requires features which are currently disabled
+   */
+  static featureDisabled(toolName, missingFeatures, message) {
+    return new import_DextoRuntimeError.DextoRuntimeError(
+      import_error_codes.ToolErrorCode.FEATURE_DISABLED,
+      import_types.ErrorScope.TOOLS,
+      import_types.ErrorType.USER,
+      message,
+      { toolName, missingFeatures },
+      [
+        `Remove '${toolName}' from internalTools in your agent config`,
+        `Or enable required features: ${missingFeatures.map((f) => `${f}.enabled: true`).join(", ")}`
+      ]
+    );
+  }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/tools/errors.d.ts

@@ -33,6 +33,15 @@ export declare class ToolError {
         timeoutMs: number;
         sessionId: string | undefined;
     }>;
+    /**
+     * Tool validation failed (pre-execution check)
+     * Used when tool inputs are semantically invalid (e.g., file not found, string not in file)
+     * This should fail before approval, not after.
+     */
+    static validationFailed(toolName: string, reason: string, context?: Record<string, unknown>): DextoRuntimeError<{
+        toolName: string;
+        reason: string;
+    }>;
     /**
      * Tool unauthorized access
      */
@@ -78,5 +87,12 @@ export declare class ToolError {
         toolName: string;
         reason: string;
     }>;
+    /**
+     * Tool requires features which are currently disabled
+     */
+    static featureDisabled(toolName: string, missingFeatures: string[], message: string): DextoRuntimeError<{
+        toolName: string;
+        missingFeatures: string[];
+    }>;
 }
 //# sourceMappingURL=errors.d.ts.map

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;;OAEG;IACH,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;;;;;IAc/E;;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;;;;CAShE"}
+{"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;;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;;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;CAaxE"}

package/dist/tools/errors.js

@@ -1,4 +1,4 @@
-import "../chunk-C6A6W6XS.js";
+import "../chunk-PTJYTZNU.js";
 import { DextoRuntimeError } from "../errors/DextoRuntimeError.js";
 import { ErrorScope, ErrorType } from "../errors/types.js";
 import { ToolErrorCode } from "./error-codes.js";
@@ -52,6 +52,20 @@ class ToolError {
       { toolName, timeoutMs, sessionId }
     );
   }
+  /**
+   * Tool validation failed (pre-execution check)
+   * Used when tool inputs are semantically invalid (e.g., file not found, string not in file)
+   * This should fail before approval, not after.
+   */
+  static validationFailed(toolName, reason, context) {
+    return new DextoRuntimeError(
+      ToolErrorCode.VALIDATION_FAILED,
+      ErrorScope.TOOLS,
+      ErrorType.USER,
+      `Tool '${toolName}' validation failed: ${reason}`,
+      { toolName, reason, ...context }
+    );
+  }
   /**
    * Tool unauthorized access
    */
@@ -136,6 +150,22 @@ class ToolError {
       { toolName, reason }
     );
   }
+  /**
+   * Tool requires features which are currently disabled
+   */
+  static featureDisabled(toolName, missingFeatures, message) {
+    return new DextoRuntimeError(
+      ToolErrorCode.FEATURE_DISABLED,
+      ErrorScope.TOOLS,
+      ErrorType.USER,
+      message,
+      { toolName, missingFeatures },
+      [
+        `Remove '${toolName}' from internalTools in your agent config`,
+        `Or enable required features: ${missingFeatures.map((f) => `${f}.enabled: true`).join(", ")}`
+      ]
+    );
+  }
 }
 export {
   ToolError

package/dist/tools/index.cjs

@@ -23,6 +23,7 @@ __export(tools_exports, {
 });
 module.exports = __toCommonJS(tools_exports);
 __reExport(tools_exports, require("./types.js"), module.exports);
+__reExport(tools_exports, require("./display-types.js"), module.exports);
 __reExport(tools_exports, require("./internal-tools/index.js"), module.exports);
 __reExport(tools_exports, require("./schemas.js"), module.exports);
 var import_tool_manager = require("./tool-manager.js");
@@ -30,6 +31,7 @@ var import_tool_manager = require("./tool-manager.js");
 0 && (module.exports = {
   ToolManager,
   ...require("./types.js"),
+  ...require("./display-types.js"),
   ...require("./internal-tools/index.js"),
   ...require("./schemas.js")
 });

package/dist/tools/index.d.ts

@@ -5,6 +5,7 @@
  * MCP servers and internal tools.
  */
 export * from './types.js';
+export * from './display-types.js';
 export * from './internal-tools/index.js';
 export * from './schemas.js';
 export { ToolManager, type InternalToolsOptions } from './tool-manager.js';

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,cAAc,YAAY,CAAC;AAG3B,cAAc,2BAA2B,CAAC;AAG1C,cAAc,cAAc,CAAC;AAG7B,OAAO,EAAE,WAAW,EAAE,KAAK,oBAAoB,EAAE,MAAM,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,cAAc,YAAY,CAAC;AAG3B,cAAc,oBAAoB,CAAC;AAGnC,cAAc,2BAA2B,CAAC;AAG1C,cAAc,cAAc,CAAC;AAG7B,OAAO,EAAE,WAAW,EAAE,KAAK,oBAAoB,EAAE,MAAM,mBAAmB,CAAC"}

package/dist/tools/index.js

@@ -1,5 +1,6 @@
-import "../chunk-C6A6W6XS.js";
+import "../chunk-PTJYTZNU.js";
 export * from "./types.js";
+export * from "./display-types.js";
 export * from "./internal-tools/index.js";
 export * from "./schemas.js";
 import { ToolManager } from "./tool-manager.js";

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

@@ -1,4 +1,4 @@
-import "../../chunk-C6A6W6XS.js";
+import "../../chunk-PTJYTZNU.js";
 const INTERNAL_TOOL_NAMES = [
   "search_history",
   "ask_user",

package/dist/tools/internal-tools/implementations/ask-user-tool.cjs

@@ -29,7 +29,7 @@ const AskUserInputSchema = import_zod.z.object({
     properties: import_zod.z.record(import_zod.z.unknown()),
     required: import_zod.z.array(import_zod.z.string()).optional()
   }).passthrough().describe(
-    'JSON Schema defining the form structure. Must be an object with "type": "object" and "properties" defining form fields. Use "enum" arrays for dropdowns, "boolean" for yes/no, "number"/"integer" for numeric inputs, "string" for text. Include "required" array for mandatory fields.'
+    'JSON Schema defining form fields. Use descriptive property names as labels (e.g., "favorite_team", "World Cup winner country") - NOT generic names like "q1". Use "enum" for dropdowns, "boolean" for yes/no, "number" for numeric inputs, "string" for text. Include "required" array for mandatory fields.'
   )
 }).strict();
 function createAskUserTool(approvalManager) {

package/dist/tools/internal-tools/implementations/ask-user-tool.js

@@ -1,4 +1,4 @@
-import "../../../chunk-C6A6W6XS.js";
+import "../../../chunk-PTJYTZNU.js";
 import { z } from "zod";
 const AskUserInputSchema = z.object({
   question: z.string().describe("The question or prompt to display to the user"),
@@ -7,7 +7,7 @@ const AskUserInputSchema = z.object({
     properties: z.record(z.unknown()),
     required: z.array(z.string()).optional()
   }).passthrough().describe(
-    'JSON Schema defining the form structure. Must be an object with "type": "object" and "properties" defining form fields. Use "enum" arrays for dropdowns, "boolean" for yes/no, "number"/"integer" for numeric inputs, "string" for text. Include "required" array for mandatory fields.'
+    'JSON Schema defining form fields. Use descriptive property names as labels (e.g., "favorite_team", "World Cup winner country") - NOT generic names like "q1". Use "enum" for dropdowns, "boolean" for yes/no, "number" for numeric inputs, "string" for text. Include "required" array for mandatory fields.'
   )
 }).strict();
 function createAskUserTool(approvalManager) {

package/dist/tools/internal-tools/implementations/bash-exec-tool.cjs

@@ -33,7 +33,6 @@ __export(bash_exec_tool_exports, {
 module.exports = __toCommonJS(bash_exec_tool_exports);
 var path = __toESM(require("node:path"), 1);
 var import_zod = require("zod");
-var import_types2 = require("../../../approval/types.js");
 var import_errors = require("../../../process/errors.js");
 const BashExecInputSchema = import_zod.z.object({
   command: import_zod.z.string().describe("Shell command to execute"),
@@ -44,11 +43,27 @@ const BashExecInputSchema = import_zod.z.object({
   run_in_background: import_zod.z.boolean().optional().default(false).describe("Execute command in background (default: false)"),
   cwd: import_zod.z.string().optional().describe("Working directory for command execution (optional)")
 }).strict();
-function createBashExecTool(processService, approvalManager) {
+function createBashExecTool(processService) {
   return {
     id: "bash_exec",
-    description: "Execute a shell command with 2-minute default timeout. Returns stdout, stderr, exit code, and duration. For long-running commands (servers, watchers, npm run dev), MUST use run_in_background=true (use bash_output to retrieve results later). Commands ending with & are blocked - use run_in_background instead. Requires approval for all commands. Dangerous commands (rm, git push, etc.) require additional per-command approval. Always quote file paths with spaces. Security: dangerous commands are blocked, injection attempts are detected.",
+    description: "Execute a shell command with 2-minute default timeout. Returns stdout, stderr, exit code, and duration. For long-running commands (servers, watchers, npm run dev), MUST use run_in_background=true (use bash_output to retrieve results later). Commands ending with & are blocked - use run_in_background instead. Requires approval (with pattern-based session memory). Always quote file paths with spaces. Security: dangerous commands are blocked, injection attempts are detected.",
     inputSchema: BashExecInputSchema,
+    /**
+     * Generate preview for approval UI - shows the command to be executed
+     */
+    generatePreview: async (input, _context) => {
+      const { command, run_in_background } = input;
+      const preview = {
+        type: "shell",
+        command,
+        exitCode: 0,
+        // Placeholder - not executed yet
+        duration: 0,
+        // Placeholder - not executed yet
+        ...run_in_background !== void 0 && { isBackground: run_in_background }
+      };
+      return preview;
+    },
     execute: async (input, context) => {
       const { command, description, timeout, run_in_background, cwd } = input;
       let validatedCwd = cwd;
@@ -70,31 +85,40 @@ function createBashExecTool(processService, approvalManager) {
         timeout,
         runInBackground: run_in_background,
         cwd: validatedCwd,
-        // Provide approval function for dangerous commands
-        approvalFunction: async (normalizedCommand) => {
-          const metadata = {
-            toolName: "bash_exec",
-            command: normalizedCommand,
-            originalCommand: command
-          };
-          if (context?.sessionId) {
-            metadata.sessionId = context.sessionId;
-          }
-          const response = await approvalManager.requestCommandConfirmation(metadata);
-          return response.status === import_types2.ApprovalStatus.APPROVED;
-        }
+        // Pass abort signal for cancellation support
+        abortSignal: context?.abortSignal
       });
       if ("stdout" in result) {
+        const _display = {
+          type: "shell",
+          command,
+          exitCode: result.exitCode,
+          duration: result.duration,
+          isBackground: false,
+          stdout: result.stdout,
+          stderr: result.stderr
+        };
         return {
           stdout: result.stdout,
           stderr: result.stderr,
           exit_code: result.exitCode,
-          duration: result.duration
+          duration: result.duration,
+          _display
         };
       } else {
+        const _display = {
+          type: "shell",
+          command,
+          exitCode: 0,
+          // Background process hasn't exited yet
+          duration: 0,
+          // Still running
+          isBackground: true
+        };
         return {
           process_id: result.processId,
-          message: `Command started in background with ID: ${result.processId}. Use bash_output to retrieve output.`
+          message: `Command started in background with ID: ${result.processId}. Use bash_output to retrieve output.`,
+          _display
         };
       }
     }

package/dist/tools/internal-tools/implementations/bash-exec-tool.d.ts

@@ -1,13 +1,13 @@
 /**
  * Bash Execute Tool
  *
- * Internal tool for executing shell commands (requires approval)
+ * Internal tool for executing shell commands.
+ * Approval is handled at the ToolManager level with pattern-based approval.
  */
 import { InternalTool } from '../../types.js';
 import { ProcessService } from '../../../process/index.js';
-import type { ApprovalManager } from '../../../approval/manager.js';
 /**
  * Create the bash_exec internal tool
  */
-export declare function createBashExecTool(processService: ProcessService, approvalManager: ApprovalManager): InternalTool;
+export declare function createBashExecTool(processService: ProcessService): InternalTool;
 //# sourceMappingURL=bash-exec-tool.d.ts.map

package/dist/tools/internal-tools/implementations/bash-exec-tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bash-exec-tool.d.ts","sourceRoot":"","sources":["../../../../src/tools/internal-tools/implementations/bash-exec-tool.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,YAAY,EAAwB,MAAM,gBAAgB,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAgCpE;;GAEG;AACH,wBAAgB,kBAAkB,CAC9B,cAAc,EAAE,cAAc,EAC9B,eAAe,EAAE,eAAe,GACjC,YAAY,CAoFd"}
+{"version":3,"file":"bash-exec-tool.d.ts","sourceRoot":"","sources":["../../../../src/tools/internal-tools/implementations/bash-exec-tool.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,EAAE,YAAY,EAAwB,MAAM,gBAAgB,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAgC3D;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,cAAc,EAAE,cAAc,GAAG,YAAY,CAuG/E"}

package/dist/tools/internal-tools/implementations/bash-exec-tool.js

@@ -1,7 +1,6 @@
-import "../../../chunk-C6A6W6XS.js";
+import "../../../chunk-PTJYTZNU.js";
 import * as path from "node:path";
 import { z } from "zod";
-import { ApprovalStatus } from "../../../approval/types.js";
 import { ProcessError } from "../../../process/errors.js";
 const BashExecInputSchema = z.object({
   command: z.string().describe("Shell command to execute"),
@@ -12,11 +11,27 @@ const BashExecInputSchema = z.object({
   run_in_background: z.boolean().optional().default(false).describe("Execute command in background (default: false)"),
   cwd: z.string().optional().describe("Working directory for command execution (optional)")
 }).strict();
-function createBashExecTool(processService, approvalManager) {
+function createBashExecTool(processService) {
   return {
     id: "bash_exec",
-    description: "Execute a shell command with 2-minute default timeout. Returns stdout, stderr, exit code, and duration. For long-running commands (servers, watchers, npm run dev), MUST use run_in_background=true (use bash_output to retrieve results later). Commands ending with & are blocked - use run_in_background instead. Requires approval for all commands. Dangerous commands (rm, git push, etc.) require additional per-command approval. Always quote file paths with spaces. Security: dangerous commands are blocked, injection attempts are detected.",
+    description: "Execute a shell command with 2-minute default timeout. Returns stdout, stderr, exit code, and duration. For long-running commands (servers, watchers, npm run dev), MUST use run_in_background=true (use bash_output to retrieve results later). Commands ending with & are blocked - use run_in_background instead. Requires approval (with pattern-based session memory). Always quote file paths with spaces. Security: dangerous commands are blocked, injection attempts are detected.",
     inputSchema: BashExecInputSchema,
+    /**
+     * Generate preview for approval UI - shows the command to be executed
+     */
+    generatePreview: async (input, _context) => {
+      const { command, run_in_background } = input;
+      const preview = {
+        type: "shell",
+        command,
+        exitCode: 0,
+        // Placeholder - not executed yet
+        duration: 0,
+        // Placeholder - not executed yet
+        ...run_in_background !== void 0 && { isBackground: run_in_background }
+      };
+      return preview;
+    },
     execute: async (input, context) => {
       const { command, description, timeout, run_in_background, cwd } = input;
       let validatedCwd = cwd;
@@ -38,31 +53,40 @@ function createBashExecTool(processService, approvalManager) {
         timeout,
         runInBackground: run_in_background,
         cwd: validatedCwd,
-        // Provide approval function for dangerous commands
-        approvalFunction: async (normalizedCommand) => {
-          const metadata = {
-            toolName: "bash_exec",
-            command: normalizedCommand,
-            originalCommand: command
-          };
-          if (context?.sessionId) {
-            metadata.sessionId = context.sessionId;
-          }
-          const response = await approvalManager.requestCommandConfirmation(metadata);
-          return response.status === ApprovalStatus.APPROVED;
-        }
+        // Pass abort signal for cancellation support
+        abortSignal: context?.abortSignal
       });
       if ("stdout" in result) {
+        const _display = {
+          type: "shell",
+          command,
+          exitCode: result.exitCode,
+          duration: result.duration,
+          isBackground: false,
+          stdout: result.stdout,
+          stderr: result.stderr
+        };
         return {
           stdout: result.stdout,
           stderr: result.stderr,
           exit_code: result.exitCode,
-          duration: result.duration
+          duration: result.duration,
+          _display
         };
       } else {
+        const _display = {
+          type: "shell",
+          command,
+          exitCode: 0,
+          // Background process hasn't exited yet
+          duration: 0,
+          // Still running
+          isBackground: true
+        };
         return {
           process_id: result.processId,
-          message: `Command started in background with ID: ${result.processId}. Use bash_output to retrieve output.`
+          message: `Command started in background with ID: ${result.processId}. Use bash_output to retrieve output.`,
+          _display
         };
       }
     }

package/dist/tools/internal-tools/implementations/bash-output-tool.js

@@ -1,4 +1,4 @@
-import "../../../chunk-C6A6W6XS.js";
+import "../../../chunk-PTJYTZNU.js";
 import { z } from "zod";
 const BashOutputInputSchema = z.object({
   process_id: z.string().describe("Process ID from bash_exec (when run_in_background=true)")

package/dist/tools/internal-tools/implementations/delegate-to-url-tool.js

@@ -1,4 +1,4 @@
-import "../../../chunk-C6A6W6XS.js";
+import "../../../chunk-PTJYTZNU.js";
 import { z } from "zod";
 import { DextoRuntimeError, ErrorScope, ErrorType } from "../../../errors/index.js";
 const DelegateToUrlInputSchema = z.object({

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

@@ -22,19 +22,80 @@ __export(edit_file_tool_exports, {
 });
 module.exports = __toCommonJS(edit_file_tool_exports);
 var import_zod = require("zod");
+var import_diff = require("diff");
+var import_errors = require("../../errors.js");
+var import_error_codes = require("../../error-codes.js");
+var import_errors2 = require("../../../errors/index.js");
 const EditFileInputSchema = import_zod.z.object({
   file_path: import_zod.z.string().describe("Absolute path to the file to edit"),
   old_string: import_zod.z.string().describe("Text to replace (must be unique unless replace_all is true)"),
   new_string: import_zod.z.string().describe("Replacement text"),
   replace_all: import_zod.z.boolean().optional().default(false).describe("Replace all occurrences (default: false, requires unique match)")
 }).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 createEditFileTool(fileSystemService) {
   return {
     id: "edit_file",
     description: "Edit a file by replacing text. By default, old_string must be unique in the file (will error if found multiple times). Set replace_all=true to replace all occurrences. Automatically creates backup before editing. Requires approval. Returns success status, path, number of changes made, and backup path.",
     inputSchema: EditFileInputSchema,
+    /**
+     * Generate preview for approval UI - shows diff without modifying file
+     * Throws ToolError.validationFailed() for validation errors (file not found, string not found)
+     */
+    generatePreview: async (input, _context) => {
+      const { file_path, old_string, new_string, replace_all } = input;
+      try {
+        const originalFile = await fileSystemService.readFile(file_path);
+        const originalContent = originalFile.content;
+        if (!replace_all) {
+          const occurrences = originalContent.split(old_string).length - 1;
+          if (occurrences > 1) {
+            throw import_errors.ToolError.validationFailed(
+              "edit_file",
+              `String found ${occurrences} times in file. Set replace_all=true to replace all, or provide more context to make old_string unique.`,
+              { file_path, occurrences }
+            );
+          }
+        }
+        const newContent = replace_all ? originalContent.split(old_string).join(new_string) : originalContent.replace(old_string, new_string);
+        if (originalContent === newContent) {
+          throw import_errors.ToolError.validationFailed(
+            "edit_file",
+            `String not found in file: "${old_string.slice(0, 50)}${old_string.length > 50 ? "..." : ""}"`,
+            { file_path, old_string_preview: old_string.slice(0, 100) }
+          );
+        }
+        return generateDiffPreview(file_path, originalContent, newContent);
+      } catch (error) {
+        if (error instanceof import_errors2.DextoRuntimeError && error.code === import_error_codes.ToolErrorCode.VALIDATION_FAILED) {
+          throw error;
+        }
+        if (error instanceof import_errors2.DextoRuntimeError) {
+          throw import_errors.ToolError.validationFailed("edit_file", error.message, {
+            file_path,
+            originalErrorCode: error.code
+          });
+        }
+        return null;
+      }
+    },
     execute: async (input, _context) => {
       const { file_path, old_string, new_string, replace_all } = input;
+      const originalFile = await fileSystemService.readFile(file_path);
+      const originalContent = originalFile.content;
       const result = await fileSystemService.editFile(
         file_path,
         {
@@ -47,11 +108,15 @@ function createEditFileTool(fileSystemService) {
           // Always create backup for internal tools
         }
       );
+      const newFile = await fileSystemService.readFile(file_path);
+      const newContent = newFile.content;
+      const _display = generateDiffPreview(file_path, originalContent, newContent);
       return {
         success: result.success,
         path: result.path,
         changes_count: result.changesCount,
-        ...result.backupPath && { backup_path: result.backupPath }
+        ...result.backupPath && { backup_path: result.backupPath },
+        _display
       };
     }
   };

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

@@ -1 +1 @@
-{"version":3,"file":"edit-file-tool.d.ts","sourceRoot":"","sources":["../../../../src/tools/internal-tools/implementations/edit-file-tool.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,YAAY,EAAwB,MAAM,gBAAgB,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAmBjE;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,YAAY,CA+BrF"}
+{"version":3,"file":"edit-file-tool.d.ts","sourceRoot":"","sources":["../../../../src/tools/internal-tools/implementations/edit-file-tool.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,YAAY,EAAwB,MAAM,gBAAgB,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AA8CjE;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,YAAY,CAuGrF"}

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

@@ -1,18 +1,79 @@
-import "../../../chunk-C6A6W6XS.js";
+import "../../../chunk-PTJYTZNU.js";
 import { z } from "zod";
+import { createPatch } from "diff";
+import { ToolError } from "../../errors.js";
+import { ToolErrorCode } from "../../error-codes.js";
+import { DextoRuntimeError } from "../../../errors/index.js";
 const EditFileInputSchema = z.object({
   file_path: z.string().describe("Absolute path to the file to edit"),
   old_string: z.string().describe("Text to replace (must be unique unless replace_all is true)"),
   new_string: z.string().describe("Replacement text"),
   replace_all: z.boolean().optional().default(false).describe("Replace all occurrences (default: false, requires unique match)")
 }).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 createEditFileTool(fileSystemService) {
   return {
     id: "edit_file",
     description: "Edit a file by replacing text. By default, old_string must be unique in the file (will error if found multiple times). Set replace_all=true to replace all occurrences. Automatically creates backup before editing. Requires approval. Returns success status, path, number of changes made, and backup path.",
     inputSchema: EditFileInputSchema,
+    /**
+     * Generate preview for approval UI - shows diff without modifying file
+     * Throws ToolError.validationFailed() for validation errors (file not found, string not found)
+     */
+    generatePreview: async (input, _context) => {
+      const { file_path, old_string, new_string, replace_all } = input;
+      try {
+        const originalFile = await fileSystemService.readFile(file_path);
+        const originalContent = originalFile.content;
+        if (!replace_all) {
+          const occurrences = originalContent.split(old_string).length - 1;
+          if (occurrences > 1) {
+            throw ToolError.validationFailed(
+              "edit_file",
+              `String found ${occurrences} times in file. Set replace_all=true to replace all, or provide more context to make old_string unique.`,
+              { file_path, occurrences }
+            );
+          }
+        }
+        const newContent = replace_all ? originalContent.split(old_string).join(new_string) : originalContent.replace(old_string, new_string);
+        if (originalContent === newContent) {
+          throw ToolError.validationFailed(
+            "edit_file",
+            `String not found in file: "${old_string.slice(0, 50)}${old_string.length > 50 ? "..." : ""}"`,
+            { file_path, old_string_preview: old_string.slice(0, 100) }
+          );
+        }
+        return generateDiffPreview(file_path, originalContent, newContent);
+      } catch (error) {
+        if (error instanceof DextoRuntimeError && error.code === ToolErrorCode.VALIDATION_FAILED) {
+          throw error;
+        }
+        if (error instanceof DextoRuntimeError) {
+          throw ToolError.validationFailed("edit_file", error.message, {
+            file_path,
+            originalErrorCode: error.code
+          });
+        }
+        return null;
+      }
+    },
     execute: async (input, _context) => {
       const { file_path, old_string, new_string, replace_all } = input;
+      const originalFile = await fileSystemService.readFile(file_path);
+      const originalContent = originalFile.content;
       const result = await fileSystemService.editFile(
         file_path,
         {
@@ -25,11 +86,15 @@ function createEditFileTool(fileSystemService) {
           // Always create backup for internal tools
         }
       );
+      const newFile = await fileSystemService.readFile(file_path);
+      const newContent = newFile.content;
+      const _display = generateDiffPreview(file_path, originalContent, newContent);
       return {
         success: result.success,
         path: result.path,
         changes_count: result.changesCount,
-        ...result.backupPath && { backup_path: result.backupPath }
+        ...result.backupPath && { backup_path: result.backupPath },
+        _display
       };
     }
   };