@exreve/exk 1.0.59 → 1.0.61

package/dist/cli/agentSession.js

@@ -151,7 +151,8 @@ function extractToolName(toolResult) {
         }
         catch { /* not JSON, fall through */ }
         // SDK 0.2.x: content-only results from nested tool calls (no stdout/stderr wrapper)
-        return 'Bash';
+        // Don't default to Bash — the history lookup is authoritative
+        return 'unknown';
     }
     // ── Agent/Task output: {agentId, content, status}
     if (r.agentId && Array.isArray(r.content) && r.status) {
@@ -508,6 +509,7 @@ export class AgentSessionManager {
         this.sessions.set(sessionId, {
             abortController,
             messages: [],
+            toolNameMap: new Map(),
             totalInputTokens: 0,
             totalOutputTokens: 0,
             totalCostUsd: 0,
@@ -1001,6 +1003,14 @@ export class AgentSessionManager {
                                 content: msg.message,
                                 timestamp: Date.now()
                             });
+                            // Populate toolNameMap from this assistant message's tool_use blocks
+                            if (Array.isArray(msg.message?.content)) {
+                                for (const block of msg.message.content) {
+                                    if (block.type === 'tool_use' && block.id && block.name) {
+                                        session.toolNameMap.set(block.id, block.name);
+                                    }
+                                }
+                            }
                             onOutput({
                                 type: 'assistant',
                                 data: msg.message,
@@ -1076,8 +1086,8 @@ export class AgentSessionManager {
                             // The structured result lives in tool_use_result for built-in tools.
                             // For MCP tools, tool_use_result is a content-block array we need to parse.
                             let toolResult = null;
-                            let toolUseId = msg.parent_tool_use_id;
-                            // STEP 1: Always extract tool_use_id from message.content (authoritative source)
+                            let toolUseId = null;
+                            // STEP 1: Extract tool_use_id from message.content (authoritative source)
                             if (Array.isArray(msg.message?.content)) {
                                 const contentBlocks = msg.message.content;
                                 const toolResultBlock = contentBlocks.find((c) => c.type === 'tool_result');
@@ -1085,6 +1095,11 @@ export class AgentSessionManager {
                                     toolUseId = toolResultBlock.tool_use_id;
                                 }
                             }
+                            // STEP 1b: Fallback — use parent_tool_use_id if STEP 1 didn't find it
+                            // (subagent results where the message.content may not contain tool_result block)
+                            if (!toolUseId && msg.parent_tool_use_id) {
+                                toolUseId = msg.parent_tool_use_id;
+                            }
                             // STEP 2: Use tool_use_result as the primary data source.
                             // For built-in tools (Bash, Read, Edit, Write, Glob, Grep) it's a structured
                             // object like {stdout, stderr} or {type:'text', file:{...}} — use directly.
@@ -1149,11 +1164,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 = historyName || detectedName;
+                                // Map lookup is O(1), falls back to O(n) history scan, then heuristic
+                                const mappedName = toolUseId ? session.toolNameMap.get(toolUseId) ?? null : null;
+                                const historyName = mappedName || lookupToolNameFromHistory(session.messages, toolUseId);
+                                const detectedName = historyName || extractToolName(toolResult);
+                                const resolvedName = detectedName;
                                 onOutput({
                                     type: 'tool_result',
                                     data: toolResult,
@@ -1183,7 +1198,7 @@ export class AgentSessionManager {
                             const sysMsg = message;
                             onOutput({
                                 type: 'system',
-                                data: { ...sysMsg, subtype: sysMsg.subtype },
+                                data: sysMsg,
                                 timestamp: Date.now(),
                                 metadata: {
                                     subtype: sysMsg.subtype,

package/dist/cli/sessionHandlers.js

@@ -161,19 +161,19 @@ export function registerSessionHandlers(socket, foreground, activeSessions, getS
                     });
                 },
                 onOutput: (output) => {
-                    const dataString = typeof output.data === 'string' ? output.data : JSON.stringify(output.data);
                     if (!capturedPromptId) {
                         console.error(`[CLI] Missing promptId for session ${sessionId}, cannot emit prompt:output`);
                         return;
                     }
                     if (foreground && output.type === 'stdout') {
+                        const dataString = typeof output.data === 'string' ? output.data : JSON.stringify(output.data);
                         process.stdout.write(dataString);
                     }
                     getSocket().emit('prompt:output', {
                         sessionId,
                         promptId: capturedPromptId,
                         type: output.type,
-                        data: dataString,
+                        data: output.data,
                         timestamp: output.timestamp,
                         metadata: output.metadata
                     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exreve/exk",
-  "version": "1.0.59",
+  "version": "1.0.61",
   "description": "exk - Control Claude CLI with voice and programmable interfaces",
   "type": "module",
   "bin": {