@exreve/exk 1.0.50 → 1.0.52

package/dist/agentSession.js

@@ -88,26 +88,59 @@ const CACHED_CLAUDE_PATH = (() => {
 // Promisify symlink for async use
 const symlinkAsync = promisify(fsSymlink);
 // Helper function to extract tool name from result structure
+/**
+ * Detect tool name from the shape of tool_use_result.
+ *
+ * Uses discriminating keys from the SDK's own type definitions
+ * (sdk-tools.d.ts: BashOutput, GrepOutput, GlobOutput, FileReadOutput,
+ *  FileEditOutput, FileWriteOutput, TodoWriteOutput, etc.)
+ */
 function extractToolName(toolResult) {
-    if (toolResult.name)
-        return toolResult.name;
-    if (toolResult.type === 'text' && toolResult.file)
+    if (!toolResult || typeof toolResult !== 'object')
+        return 'unknown';
+    // ── Read (FileReadOutput): {type: 'text'|'image'|'notebook'|'pdf'|'parts'|'file_unchanged', file: {...}}
+    if (toolResult.file && typeof toolResult.file === 'object'
+        && ['text', 'image', 'notebook', 'pdf', 'parts', 'file_unchanged'].includes(toolResult.type)) {
         return 'Read';
-    if (toolResult.file_path || toolResult.filePath) {
-        // Has old_string/new_string → Edit; has content/create → Write; else Read
-        if (toolResult.old_string !== undefined && toolResult.new_string !== undefined)
-            return 'Edit';
-        return (toolResult.content !== undefined || toolResult.type === 'create') ? 'Write' : 'Read';
     }
-    // Grep: {mode, numFiles, filenames, content, numLines}
-    if (toolResult.numFiles !== undefined && toolResult.filenames !== undefined && toolResult.mode !== undefined)
+    // ── Edit (FileEditOutput): {filePath, oldString, newString, structuredPatch}
+    if (toolResult.filePath && toolResult.oldString !== undefined && toolResult.newString !== undefined
+        && Array.isArray(toolResult.structuredPatch)) {
+        return 'Edit';
+    }
+    // ── Write (FileWriteOutput): {type: 'create'|'update', filePath, content, structuredPatch}
+    if (toolResult.filePath && (toolResult.type === 'create' || toolResult.type === 'update')
+        && toolResult.content !== undefined) {
+        return 'Write';
+    }
+    // ── Grep (GrepOutput): {mode, numFiles, filenames, content?, numLines?}
+    if (typeof toolResult.numFiles === 'number' && Array.isArray(toolResult.filenames)
+        && toolResult.mode !== undefined) {
         return 'Grep';
-    // Glob: {type, pattern, files}
-    if (toolResult.files !== undefined && toolResult.pattern !== undefined && !toolResult.stdout)
+    }
+    // ── Glob (GlobOutput): {durationMs, numFiles, filenames, truncated}
+    if (typeof toolResult.numFiles === 'number' && Array.isArray(toolResult.filenames)
+        && typeof toolResult.durationMs === 'number' && toolResult.truncated !== undefined) {
         return 'Glob';
-    if (toolResult.stdout !== undefined || toolResult.stderr !== undefined)
+    }
+    // ── TodoWrite (TodoWriteOutput): {oldTodos, newTodos}
+    if (Array.isArray(toolResult.oldTodos) && Array.isArray(toolResult.newTodos)) {
+        return 'TodoWrite';
+    }
+    // ── Bash (BashOutput): {stdout, stderr, interrupted, ...}
+    if (toolResult.stdout !== undefined || toolResult.stderr !== undefined) {
         return 'Bash';
-    // send_file tool: content is JSON with _type marker — detect before Bash fallback
+    }
+    // ── WebSearch (WebSearchOutput): {query, results}
+    if (typeof toolResult.query === 'string' && Array.isArray(toolResult.results)) {
+        return 'WebSearch';
+    }
+    // ── WebFetch (WebFetchOutput): {url, result, code, bytes}
+    if (typeof toolResult.url === 'string' && typeof toolResult.result === 'string'
+        && typeof toolResult.code === 'number') {
+        return 'WebFetch';
+    }
+    // ── send_file (custom MCP tool): content is JSON with _type marker
     if (toolResult.content && typeof toolResult.content === 'string' && toolResult.type === 'text') {
         try {
             const parsed = JSON.parse(toolResult.content);
@@ -118,6 +151,10 @@ function extractToolName(toolResult) {
         // SDK 0.2.x: content-only results from nested tool calls (no stdout/stderr wrapper)
         return 'Bash';
     }
+    // ── Agent/Task output: {agentId, content, status}
+    if (toolResult.agentId && Array.isArray(toolResult.content) && toolResult.status) {
+        return 'Task';
+    }
     return 'unknown';
 }
 // Look up tool name from the most recent assistant message's tool_use blocks by tool_use_id