@ebowwa/coder 0.7.65 → 0.7.66

package/dist/index.js

@@ -5126,11 +5126,69 @@ async function executeStreamAttempt(request, headers, apiEndpoint, signal, model
                     firstToken = false;
                   }
                 }
+                if (choice?.delta?.tool_calls && Array.isArray(choice.delta.tool_calls)) {
+                  for (const toolCallDelta of choice.delta.tool_calls) {
+                    const index = toolCallDelta.index ?? 0;
+                    const toolCallId = toolCallDelta.id;
+                    if (toolCallId) {
+                      if (currentToolUseBlock) {
+                        try {
+                          currentToolUseBlock.input = JSON.parse(toolUseInput);
+                        } catch {
+                          currentToolUseBlock.input = {};
+                        }
+                        currentContent.push(currentToolUseBlock);
+                        callbacks.onToolUse?.({
+                          id: currentToolUseBlock.id,
+                          name: currentToolUseBlock.name,
+                          input: currentToolUseBlock.input
+                        });
+                      }
+                      currentToolUseBlock = {
+                        type: "tool_use",
+                        id: toolCallId,
+                        name: toolCallDelta.function?.name || "",
+                        input: {}
+                      };
+                      toolUseInput = "";
+                      if (firstToken) {
+                        ttft = Date.now() - startTime;
+                        firstToken = false;
+                      }
+                    }
+                    if (toolCallDelta.function?.arguments && currentToolUseBlock) {
+                      toolUseInput += toolCallDelta.function.arguments;
+                    }
+                  }
+                }
                 if (choice?.finish_reason) {
                   if (currentTextBlock) {
                     currentContent.push(currentTextBlock);
                     currentTextBlock = null;
                   }
+                  if (currentToolUseBlock) {
+                    try {
+                      currentToolUseBlock.input = JSON.parse(toolUseInput);
+                    } catch {
+                      currentToolUseBlock.input = {};
+                    }
+                    currentContent.push(currentToolUseBlock);
+                    callbacks.onToolUse?.({
+                      id: currentToolUseBlock.id,
+                      name: currentToolUseBlock.name,
+                      input: currentToolUseBlock.input
+                    });
+                    currentToolUseBlock = null;
+                    toolUseInput = "";
+                  }
+                  let stopReason = "end_turn";
+                  if (choice.finish_reason === "tool_calls" || choice.finish_reason === "function_call") {
+                    stopReason = "tool_use";
+                  } else if (choice.finish_reason === "length") {
+                    stopReason = "max_tokens";
+                  } else if (choice.finish_reason === "stop") {
+                    stopReason = "end_turn";
+                  }
                   if (!message) {
                     message = {
                       id: `msg-${Date.now()}`,
@@ -5138,12 +5196,12 @@ async function executeStreamAttempt(request, headers, apiEndpoint, signal, model
                       role: "assistant",
                       content: currentContent,
                       model,
-                      stop_reason: choice.finish_reason === "stop" ? "end_turn" : choice.finish_reason === "length" ? "max_tokens" : "end_turn",
+                      stop_reason: stopReason,
                       stop_sequence: null,
                       usage: { input_tokens: 0, output_tokens: 0 }
                     };
                   } else {
-                    message.stop_reason = choice.finish_reason === "stop" ? "end_turn" : choice.finish_reason === "length" ? "max_tokens" : "end_turn";
+                    message.stop_reason = stopReason;
                   }
                 }
               }
@@ -33333,13 +33391,20 @@ var init_input_handler = __esm(() => {
     isShiftDown(event) {
       return event.code === "down" || event.code === "Down";
     },
+    isSpace(event) {
+      return event.code === " " || event.code === "Space";
+    },
     isPrintable(event) {
       if (event.is_special)
         return false;
       const code = event.code;
+      if (code === " " || code === "Space")
+        return true;
       return code.length === 1 && !event.ctrl;
     },
     getChar(event) {
+      if (event.code === "Space")
+        return " ";
       return event.code;
     }
   };

package/dist/interfaces/ui/terminal/cli/index.js

@@ -2238,13 +2238,20 @@ var init_input_handler = __esm(() => {
     isShiftDown(event) {
       return event.code === "down" || event.code === "Down";
     },
+    isSpace(event) {
+      return event.code === " " || event.code === "Space";
+    },
     isPrintable(event) {
       if (event.is_special)
         return false;
       const code = event.code;
+      if (code === " " || code === "Space")
+        return true;
       return code.length === 1 && !event.ctrl;
     },
     getChar(event) {
+      if (event.code === "Space")
+        return " ";
       return event.code;
     }
   };
@@ -7621,11 +7628,69 @@ async function executeStreamAttempt(request, headers, apiEndpoint, signal, model
                     firstToken = false;
                   }
                 }
+                if (choice?.delta?.tool_calls && Array.isArray(choice.delta.tool_calls)) {
+                  for (const toolCallDelta of choice.delta.tool_calls) {
+                    const index = toolCallDelta.index ?? 0;
+                    const toolCallId = toolCallDelta.id;
+                    if (toolCallId) {
+                      if (currentToolUseBlock) {
+                        try {
+                          currentToolUseBlock.input = JSON.parse(toolUseInput);
+                        } catch {
+                          currentToolUseBlock.input = {};
+                        }
+                        currentContent.push(currentToolUseBlock);
+                        callbacks.onToolUse?.({
+                          id: currentToolUseBlock.id,
+                          name: currentToolUseBlock.name,
+                          input: currentToolUseBlock.input
+                        });
+                      }
+                      currentToolUseBlock = {
+                        type: "tool_use",
+                        id: toolCallId,
+                        name: toolCallDelta.function?.name || "",
+                        input: {}
+                      };
+                      toolUseInput = "";
+                      if (firstToken) {
+                        ttft = Date.now() - startTime;
+                        firstToken = false;
+                      }
+                    }
+                    if (toolCallDelta.function?.arguments && currentToolUseBlock) {
+                      toolUseInput += toolCallDelta.function.arguments;
+                    }
+                  }
+                }
                 if (choice?.finish_reason) {
                   if (currentTextBlock) {
                     currentContent.push(currentTextBlock);
                     currentTextBlock = null;
                   }
+                  if (currentToolUseBlock) {
+                    try {
+                      currentToolUseBlock.input = JSON.parse(toolUseInput);
+                    } catch {
+                      currentToolUseBlock.input = {};
+                    }
+                    currentContent.push(currentToolUseBlock);
+                    callbacks.onToolUse?.({
+                      id: currentToolUseBlock.id,
+                      name: currentToolUseBlock.name,
+                      input: currentToolUseBlock.input
+                    });
+                    currentToolUseBlock = null;
+                    toolUseInput = "";
+                  }
+                  let stopReason = "end_turn";
+                  if (choice.finish_reason === "tool_calls" || choice.finish_reason === "function_call") {
+                    stopReason = "tool_use";
+                  } else if (choice.finish_reason === "length") {
+                    stopReason = "max_tokens";
+                  } else if (choice.finish_reason === "stop") {
+                    stopReason = "end_turn";
+                  }
                   if (!message) {
                     message = {
                       id: `msg-${Date.now()}`,
@@ -7633,12 +7698,12 @@ async function executeStreamAttempt(request, headers, apiEndpoint, signal, model
                       role: "assistant",
                       content: currentContent,
                       model,
-                      stop_reason: choice.finish_reason === "stop" ? "end_turn" : choice.finish_reason === "length" ? "max_tokens" : "end_turn",
+                      stop_reason: stopReason,
                       stop_sequence: null,
                       usage: { input_tokens: 0, output_tokens: 0 }
                     };
                   } else {
-                    message.stop_reason = choice.finish_reason === "stop" ? "end_turn" : choice.finish_reason === "length" ? "max_tokens" : "end_turn";
+                    message.stop_reason = stopReason;
                   }
                 }
               }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ebowwa/coder",
-  "version": "0.7.65",
+  "version": "0.7.66",
   "description": "AI-powered terminal coding assistant",
   "author": "ebowwa",
   "license": "MIT",

package/packages/src/core/api-client-impl.ts

@@ -442,7 +442,22 @@ async function executeStreamAttempt(
             // OpenAI/Z.AI compatible format (for GLM-5, etc.)
             default: {
               if (event.choices && Array.isArray(event.choices)) {
-                const choice = event.choices[0] as { delta?: { content?: string }; finish_reason?: string } | undefined;
+                const choice = event.choices[0] as {
+                  delta?: {
+                    content?: string;
+                    tool_calls?: Array<{
+                      id?: string;
+                      index?: number;
+                      function?: {
+                        name?: string;
+                        arguments?: string;
+                      };
+                    }>;
+                  };
+                  finish_reason?: string;
+                } | undefined;
+
+                // Handle text content
                 if (choice?.delta?.content) {
                   const text = choice.delta.content;
                   if (currentTextBlock) {
@@ -456,11 +471,87 @@ async function executeStreamAttempt(
                     firstToken = false;
                   }
                 }
+
+                // Handle tool calls (OpenAI format)
+                if (choice?.delta?.tool_calls && Array.isArray(choice.delta.tool_calls)) {
+                  for (const toolCallDelta of choice.delta.tool_calls) {
+                    const index = toolCallDelta.index ?? 0;
+                    const toolCallId = toolCallDelta.id;
+
+                    // Start a new tool call if we got an ID
+                    if (toolCallId) {
+                      // Finalize any existing tool use block at this index
+                      if (currentToolUseBlock) {
+                        try {
+                          currentToolUseBlock.input = JSON.parse(toolUseInput);
+                        } catch {
+                          currentToolUseBlock.input = {};
+                        }
+                        currentContent.push(currentToolUseBlock);
+                        callbacks.onToolUse?.({
+                          id: currentToolUseBlock.id,
+                          name: currentToolUseBlock.name,
+                          input: currentToolUseBlock.input,
+                        });
+                      }
+
+                      // Start new tool use block
+                      currentToolUseBlock = {
+                        type: "tool_use",
+                        id: toolCallId,
+                        name: toolCallDelta.function?.name || "",
+                        input: {},
+                      };
+                      toolUseInput = "";
+
+                      if (firstToken) {
+                        ttft = Date.now() - startTime;
+                        firstToken = false;
+                      }
+                    }
+
+                    // Accumulate arguments for current tool call
+                    if (toolCallDelta.function?.arguments && currentToolUseBlock) {
+                      toolUseInput += toolCallDelta.function.arguments;
+                    }
+                  }
+                }
+
+                // Handle finish reason
                 if (choice?.finish_reason) {
+                  // Finalize any pending text block
                   if (currentTextBlock) {
                     currentContent.push(currentTextBlock);
                     currentTextBlock = null;
                   }
+
+                  // Finalize any pending tool use block
+                  if (currentToolUseBlock) {
+                    try {
+                      currentToolUseBlock.input = JSON.parse(toolUseInput);
+                    } catch {
+                      currentToolUseBlock.input = {};
+                    }
+                    currentContent.push(currentToolUseBlock);
+                    callbacks.onToolUse?.({
+                      id: currentToolUseBlock.id,
+                      name: currentToolUseBlock.name,
+                      input: currentToolUseBlock.input,
+                    });
+                    currentToolUseBlock = null;
+                    toolUseInput = "";
+                  }
+
+                  // Map finish reasons
+                  let stopReason: StopReason = "end_turn";
+                  if (choice.finish_reason === "tool_calls" || choice.finish_reason === "function_call") {
+                    stopReason = "tool_use";
+                  } else if (choice.finish_reason === "length") {
+                    stopReason = "max_tokens";
+                  } else if (choice.finish_reason === "stop") {
+                    stopReason = "end_turn";
+                  }
+
                   if (!message) {
                     message = {
                       id: `msg-${Date.now()}`,
@@ -468,12 +559,12 @@ async function executeStreamAttempt(
                       role: "assistant",
                       content: currentContent,
                       model: model,
-                      stop_reason: (choice.finish_reason === "stop" ? "end_turn" : choice.finish_reason === "length" ? "max_tokens" : "end_turn") as StopReason,
+                      stop_reason: stopReason,
                       stop_sequence: null,
                       usage: { input_tokens: 0, output_tokens: 0 },
                     };
                   } else {
-                    message.stop_reason = (choice.finish_reason === "stop" ? "end_turn" : choice.finish_reason === "length" ? "max_tokens" : "end_turn") as StopReason;
+                    message.stop_reason = stopReason;
                   }
                 }
               }

package/packages/src/interfaces/ui/terminal/cli/interactive/input-handler.ts

@@ -200,16 +200,25 @@ export const KeyEvents = {
     return event.code === "down" || event.code === "Down";
   },
 
+  /** Check if event is Space key */
+  isSpace(event: NativeKeyEvent): boolean {
+    return event.code === " " || event.code === "Space";
+  },
+
   /** Check if event is a printable character */
   isPrintable(event: NativeKeyEvent): boolean {
     if (event.is_special) return false;
     const code = event.code;
+    // Space is printable (normalized to "Space" but should work in text input)
+    if (code === " " || code === "Space") return true;
     // Single character that is not a control character
     return code.length === 1 && !event.ctrl;
   },
 
   /** Get the character from the event */
   getChar(event: NativeKeyEvent): string {
+    // Handle normalized space
+    if (event.code === "Space") return " ";
     return event.code;
   },
 };