@exreve/exk 1.0.47 → 1.0.49

package/dist/agentSession.js

@@ -960,25 +960,62 @@ export class AgentSessionManager {
                         }
                         else if (message.type === 'user') {
                             const msg = message;
-                            // SDK 0.2.x: tool results can appear in two places:
-                            // 1. msg.tool_use_result (top-level field, present in 0.1.x and some 0.2.x messages)
-                            // 2. msg.message.content array with type='tool_result' blocks (common in 0.2.x subagent calls)
+                            // SDK sends tool results with TWO data sources:
+                            //   message.content[0]  — {type:'tool_result', tool_use_id:'...', content: <raw text>}
+                            //   msg.tool_use_result  — structured object with {stdout,stderr} for Bash,
+                            //                          {type,file} for Read, or [{type:'text',text:'...'}] for MCP tools
+                            //
+                            // The tool_use_id lives ONLY in message.content[].tool_use_id.
+                            // 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;
-                            // Check top-level tool_use_result first
+                            // STEP 1: Always 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');
+                                if (toolResultBlock?.tool_use_id) {
+                                    toolUseId = toolResultBlock.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.
+                            // For MCP tools it's a content-block array [{type:'text', text:'...'}] — parse text.
                             if (msg.tool_use_result) {
-                                toolResult = msg.tool_use_result;
+                                const raw = msg.tool_use_result;
+                                if (Array.isArray(raw)) {
+                                    // MCP tool result: [{type:'text', text:'...'}] — extract and parse
+                                    const textParts = raw
+                                        .filter((c) => c.type === 'text')
+                                        .map((c) => c.text);
+                                    const rawContent = textParts.join('\n');
+                                    try {
+                                        toolResult = JSON.parse(rawContent);
+                                    }
+                                    catch {
+                                        toolResult = { content: rawContent, type: 'text' };
+                                    }
+                                }
+                                else if (typeof raw === 'object' && raw !== null) {
+                                    // Built-in tool result: {stdout, stderr, ...} or {type, file, ...} — use directly
+                                    toolResult = raw;
+                                }
+                                else if (typeof raw === 'string') {
+                                    try {
+                                        toolResult = JSON.parse(raw);
+                                    }
+                                    catch {
+                                        toolResult = { content: raw, type: 'text' };
+                                    }
+                                }
                             }
-                            // Check message.content for tool_result blocks (SDK 0.2.x nested calls)
+                            // STEP 3: Fallback to parsing message.content if tool_use_result wasn't available
+                            // (e.g. subagent calls where tool_use_result may be absent)
                             if (!toolResult && Array.isArray(msg.message?.content)) {
                                 const contentBlocks = msg.message.content;
                                 const toolResultBlock = contentBlocks.find((c) => c.type === 'tool_result');
                                 if (toolResultBlock) {
-                                    // Extract tool use ID from the content block
-                                    if (toolResultBlock.tool_use_id) {
-                                        toolUseId = toolResultBlock.tool_use_id;
-                                    }
-                                    // The result content can be a string or array of content blocks
                                     if (typeof toolResultBlock.content === 'string') {
                                         try {
                                             toolResult = JSON.parse(toolResultBlock.content);
@@ -988,7 +1025,6 @@ export class AgentSessionManager {
                                         }
                                     }
                                     else if (Array.isArray(toolResultBlock.content)) {
-                                        // Extract text from content blocks
                                         const textParts = toolResultBlock.content
                                             .filter((c) => c.type === 'text')
                                             .map((c) => c.text);

package/dist/githubHandlers.js

@@ -132,6 +132,9 @@ async function handleStatus(projectPath) {
             // empty
         }
         const changedFiles = parsePorcelainStatus(porcelainOutput);
+        const MAX_CHANGED_FILES = 1000;
+        const totalChangedFiles = changedFiles.length;
+        const truncated = totalChangedFiles > MAX_CHANGED_FILES ? changedFiles.slice(0, MAX_CHANGED_FILES) : changedFiles;
         return {
             success: true,
             status: {
@@ -140,9 +143,10 @@ async function handleStatus(projectPath) {
                 remote: remote || undefined,
                 ahead,
                 behind,
-                changedFiles,
+                changedFiles: truncated,
                 stashCount,
                 ghAvailable: ghOk,
+                ...(totalChangedFiles > MAX_CHANGED_FILES && { totalChangedFiles }),
             },
         };
     }

package/package.json

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