@exreve/exk 1.0.49 → 1.0.51

package/dist/agentSession.js

@@ -88,20 +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';
     }
-    if (toolResult.stdout !== undefined || toolResult.stderr !== 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 (GlobOutput): {durationMs, numFiles, filenames, truncated}
+    if (typeof toolResult.numFiles === 'number' && Array.isArray(toolResult.filenames)
+        && typeof toolResult.durationMs === 'number' && toolResult.truncated !== undefined) {
+        return 'Glob';
+    }
+    // ── 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);
@@ -112,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
@@ -122,7 +165,12 @@ function lookupToolNameFromHistory(messages, toolUseId) {
         const msg = messages[i];
         if (msg.role !== 'assistant')
             continue;
-        const content = typeof msg.content === 'string' ? null : msg.content;
+        // msg.content is the SDK message object: {role: 'assistant', content: [{type: 'text',...}, {type: 'tool_use',...}]}
+        let content = typeof msg.content === 'string' ? null : msg.content;
+        // Unwrap nested content: {content: [...]} → [...]
+        if (content && !Array.isArray(content) && Array.isArray(content.content)) {
+            content = content.content;
+        }
         if (!Array.isArray(content))
             continue;
         const toolUse = content.find((c) => c.type === 'tool_use' && c.id === toolUseId);
@@ -1042,10 +1090,11 @@ export class AgentSessionManager {
                                 }
                             }
                             if (toolResult) {
+                                // History lookup is authoritative: the assistant's tool_use block names the tool.
+                                // Heuristic detection can't distinguish Bash/Grep/Glob/etc (all have {stdout,stderr}).
+                                const historyName = lookupToolNameFromHistory(session.messages, toolUseId);
                                 const detectedName = extractToolName(toolResult);
-                                const resolvedName = detectedName !== 'unknown'
-                                    ? detectedName
-                                    : (lookupToolNameFromHistory(session.messages, toolUseId) || detectedName);
+                                const resolvedName = historyName || detectedName;
                                 onOutput({
                                     type: 'tool_result',
                                     data: toolResult,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exreve/exk",
-  "version": "1.0.49",
+  "version": "1.0.51",
   "description": "exk - Control Claude CLI with voice and programmable interfaces",
   "type": "module",
   "bin": {
@@ -61,4 +61,4 @@
   "engines": {
     "node": ">=20.0.0"
   }
-}
+}