@ebowwa/coder 0.7.65 → 0.7.68

package/dist/index.js

@@ -4876,6 +4876,69 @@ function convertToolsToOpenAIFormat(tools) {
     }
   }));
 }
+function convertMessagesToOpenAIFormat(messages) {
+  const result = [];
+  for (const msg of messages) {
+    if (msg.role === "assistant") {
+      const toolCalls = [];
+      const textParts = [];
+      for (const block of msg.content) {
+        if (block.type === "text") {
+          textParts.push(block.text);
+        } else if (block.type === "tool_use") {
+          toolCalls.push({
+            id: block.id,
+            type: "function",
+            function: {
+              name: block.name,
+              arguments: JSON.stringify(block.input)
+            }
+          });
+        } else if (block.type === "thinking" || block.type === "redacted_thinking") {}
+      }
+      const openAIMsg = {
+        role: "assistant",
+        content: textParts.join(`
+`) || null
+      };
+      if (toolCalls.length > 0) {
+        openAIMsg.tool_calls = toolCalls;
+      }
+      result.push(openAIMsg);
+    } else if (msg.role === "user") {
+      const textParts = [];
+      const toolResults = [];
+      for (const block of msg.content) {
+        if (block.type === "text") {
+          textParts.push(block.text);
+        } else if (block.type === "tool_result") {
+          const contentStr = typeof block.content === "string" ? block.content : block.content.map((c) => c.type === "text" ? c.text : JSON.stringify(c)).join(`
+`);
+          toolResults.push({
+            tool_use_id: block.tool_use_id,
+            content: contentStr,
+            is_error: block.is_error
+          });
+        }
+      }
+      if (textParts.length > 0) {
+        result.push({
+          role: "user",
+          content: textParts.join(`
+`)
+        });
+      }
+      for (const tr of toolResults) {
+        result.push({
+          role: "tool",
+          tool_call_id: tr.tool_use_id,
+          content: tr.content
+        });
+      }
+    }
+  }
+  return result;
+}
 function calculateCost2(model, usage) {
   return calculateCost(model, usage);
 }
@@ -5126,11 +5189,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 +5259,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;
                   }
                 }
               }
@@ -5211,20 +5332,6 @@ async function createMessageStream(messages, options) {
     signal
   } = options;
   const startTime = Date.now();
-  const cachedMessages = buildCachedMessages(messages, cacheConfig);
-  const cachedSystemPrompt = buildSystemPrompt(systemPrompt, cacheConfig);
-  const request = {
-    model,
-    max_tokens: maxTokens,
-    messages: cachedMessages.map((m) => ({
-      role: m.role,
-      content: m.content
-    })),
-    stream: true
-  };
-  if (cachedSystemPrompt) {
-    request.system = cachedSystemPrompt;
-  }
   const providerInfo = resolveProvider(model);
   let apiEndpoint;
   let headers;
@@ -5254,6 +5361,37 @@ async function createMessageStream(messages, options) {
       "anthropic-version": "2023-06-01"
     };
   }
+  const cachedMessages = buildCachedMessages(messages, cacheConfig);
+  const cachedSystemPrompt = buildSystemPrompt(systemPrompt, cacheConfig);
+  let requestMessages;
+  if (apiFormat === "openai") {
+    const openAIMessages = convertMessagesToOpenAIFormat(cachedMessages);
+    if (cachedSystemPrompt) {
+      const systemText = typeof cachedSystemPrompt === "string" ? cachedSystemPrompt : cachedSystemPrompt.map((b) => b.text).join(`
+
+`);
+      requestMessages = [
+        { role: "system", content: systemText },
+        ...openAIMessages
+      ];
+    } else {
+      requestMessages = openAIMessages;
+    }
+  } else {
+    requestMessages = cachedMessages.map((m) => ({
+      role: m.role,
+      content: m.content
+    }));
+  }
+  const request = {
+    model,
+    max_tokens: maxTokens,
+    messages: requestMessages,
+    stream: true
+  };
+  if (cachedSystemPrompt && apiFormat === "anthropic") {
+    request.system = cachedSystemPrompt;
+  }
   if (tools && tools.length > 0) {
     if (apiFormat === "openai") {
       request.tools = convertToolsToOpenAIFormat(tools);
@@ -33333,13 +33471,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;
     }
   };
@@ -34224,6 +34369,84 @@ var init_stream_highlighter = __esm(() => {
   };
 });
 
+// packages/src/interfaces/ui/terminal/cli/interactive/scroll-handler.ts
+function handleScrollEvent(event, currentOffset, totalMessages, config = {}) {
+  const { pageScrollAmount, lineScrollAmount } = { ...DEFAULT_SCROLL_CONFIG, ...config };
+  const maxScroll = Math.max(0, Math.max(totalMessages - 1, 10));
+  if (process.env.CODER_DEBUG_SCROLL === "1") {
+    console.error("[ScrollHandler] Event:", {
+      code: event.code,
+      shift: event.shift,
+      ctrl: event.ctrl,
+      alt: event.alt,
+      is_special: event.is_special
+    });
+  }
+  if (KeyEvents.isPageUp(event)) {
+    if (process.env.CODER_DEBUG_SCROLL === "1") {
+      console.error("[ScrollHandler] PageUp detected, scrolling up");
+    }
+    return { handled: true, newOffset: Math.min(currentOffset + pageScrollAmount, maxScroll) };
+  }
+  if (KeyEvents.isPageDown(event)) {
+    if (process.env.CODER_DEBUG_SCROLL === "1") {
+      console.error("[ScrollHandler] PageDown detected, scrolling down");
+    }
+    return { handled: true, newOffset: Math.max(0, currentOffset - pageScrollAmount) };
+  }
+  if (KeyEvents.isHome(event)) {
+    if (process.env.CODER_DEBUG_SCROLL === "1") {
+      console.error("[ScrollHandler] Home detected, resetting to bottom");
+    }
+    return { handled: true, newOffset: 0 };
+  }
+  if (KeyEvents.isUp(event) && event.alt) {
+    if (process.env.CODER_DEBUG_SCROLL === "1") {
+      console.error("[ScrollHandler] Alt+Up detected, scrolling up");
+    }
+    return { handled: true, newOffset: Math.min(currentOffset + lineScrollAmount, maxScroll) };
+  }
+  if (KeyEvents.isDown(event) && event.alt) {
+    if (process.env.CODER_DEBUG_SCROLL === "1") {
+      console.error("[ScrollHandler] Alt+Down detected, scrolling down");
+    }
+    return { handled: true, newOffset: Math.max(0, currentOffset - lineScrollAmount) };
+  }
+  if (KeyEvents.isUp(event) && event.ctrl) {
+    if (process.env.CODER_DEBUG_SCROLL === "1") {
+      console.error("[ScrollHandler] Ctrl+Up detected, scrolling up");
+    }
+    return { handled: true, newOffset: Math.min(currentOffset + lineScrollAmount, maxScroll) };
+  }
+  if (KeyEvents.isDown(event) && event.ctrl) {
+    if (process.env.CODER_DEBUG_SCROLL === "1") {
+      console.error("[ScrollHandler] Ctrl+Down detected, scrolling down");
+    }
+    return { handled: true, newOffset: Math.max(0, currentOffset - lineScrollAmount) };
+  }
+  if (KeyEvents.isUp(event) && event.shift) {
+    if (process.env.CODER_DEBUG_SCROLL === "1") {
+      console.error("[ScrollHandler] Shift+Up detected, scrolling up");
+    }
+    return { handled: true, newOffset: Math.min(currentOffset + lineScrollAmount, maxScroll) };
+  }
+  if (KeyEvents.isDown(event) && event.shift) {
+    if (process.env.CODER_DEBUG_SCROLL === "1") {
+      console.error("[ScrollHandler] Shift+Down detected, scrolling down");
+    }
+    return { handled: true, newOffset: Math.max(0, currentOffset - lineScrollAmount) };
+  }
+  return { handled: false, newOffset: currentOffset };
+}
+var DEFAULT_SCROLL_CONFIG;
+var init_scroll_handler = __esm(() => {
+  init_input_handler();
+  DEFAULT_SCROLL_CONFIG = {
+    pageScrollAmount: 3,
+    lineScrollAmount: 1
+  };
+});
+
 // packages/src/interfaces/ui/terminal/cli/interactive/interactive-runner.ts
 import process10 from "process";
 function createInitialState() {
@@ -34374,6 +34597,23 @@ class InteractiveRunner {
       this.state = { ...this.state, inputValue: "", cursorPos: 0 };
       return true;
     }
+    if (process10.env.CODER_DEBUG_SCROLL === "1") {
+      console.error("[InteractiveRunner] Key event:", {
+        code: event.code,
+        shift: event.shift,
+        ctrl: event.ctrl,
+        alt: event.alt,
+        is_special: event.is_special
+      });
+    }
+    const scrollResult = handleScrollEvent(event, this.state.scrollOffset, this.messageStore.messages.length);
+    if (process10.env.CODER_DEBUG_SCROLL === "1") {
+      console.error("[InteractiveRunner] Scroll result:", scrollResult);
+    }
+    if (scrollResult.handled) {
+      this.state = { ...this.state, scrollOffset: scrollResult.newOffset };
+      return true;
+    }
     if (KeyEvents.isUp(event)) {
       return this._handleHistoryUp();
     }
@@ -34671,18 +34911,19 @@ class InteractiveRunner {
     })) : [];
     return {
       messages: renderMessages,
-      inputValue,
-      cursorPos,
-      statusText,
-      isLoading,
-      streamingText,
+      input_value: inputValue,
+      cursor_pos: cursorPos,
+      status_text: statusText,
+      is_loading: isLoading,
+      streaming_text: streamingText,
       model: this.props.model,
-      showHelp: helpMode,
-      helpText,
-      searchMode: sessionSelectMode,
-      searchQuery: "",
-      searchResults,
-      searchSelected: 0
+      show_help: helpMode,
+      help_text: helpText,
+      search_mode: sessionSelectMode,
+      search_query: "",
+      search_results: searchResults,
+      search_selected: 0,
+      scroll_offset: this.state.scrollOffset
     };
   }
   _getHelpText(section) {
@@ -34784,6 +35025,7 @@ var init_interactive_runner = __esm(() => {
   init_native();
   init_spinner_frames();
   init_input_handler();
+  init_scroll_handler();
   init_types4();
 });
 
@@ -34813,10 +35055,10 @@ init_cognitive_security();
 init_source();
 import process9 from "process";
 
-// ../../node_modules/.bun/cli-cursor@5.0.0/node_modules/cli-cursor/index.js
+// ../../node_modules/.bun/ora@8.2.0/node_modules/ora/node_modules/cli-cursor/index.js
 import process5 from "process";
 
-// ../../node_modules/.bun/restore-cursor@5.1.0/node_modules/restore-cursor/index.js
+// ../../node_modules/.bun/ora@8.2.0/node_modules/ora/node_modules/cli-cursor/node_modules/restore-cursor/index.js
 import process4 from "process";
 
 // ../../node_modules/.bun/mimic-function@5.0.1/node_modules/mimic-function/index.js
@@ -34865,7 +35107,7 @@ function mimicFunction(to, from, { ignoreNonConfigurable = false } = {}) {
   return to;
 }
 
-// ../../node_modules/.bun/onetime@7.0.0/node_modules/onetime/index.js
+// ../../node_modules/.bun/ora@8.2.0/node_modules/ora/node_modules/cli-cursor/node_modules/restore-cursor/node_modules/onetime/index.js
 var calledFunctions = new WeakMap;
 var onetime = (function_, options = {}) => {
   if (typeof function_ !== "function") {
@@ -34896,7 +35138,7 @@ onetime.callCount = (function_) => {
 };
 var onetime_default = onetime;
 
-// ../../node_modules/.bun/signal-exit@4.1.0/node_modules/signal-exit/dist/mjs/signals.js
+// ../../node_modules/.bun/ora@8.2.0/node_modules/ora/node_modules/cli-cursor/node_modules/restore-cursor/node_modules/signal-exit/dist/mjs/signals.js
 var signals = [];
 signals.push("SIGHUP", "SIGINT", "SIGTERM");
 if (process.platform !== "win32") {
@@ -34906,7 +35148,7 @@ if (process.platform === "linux") {
   signals.push("SIGIO", "SIGPOLL", "SIGPWR", "SIGSTKFLT");
 }
 
-// ../../node_modules/.bun/signal-exit@4.1.0/node_modules/signal-exit/dist/mjs/index.js
+// ../../node_modules/.bun/ora@8.2.0/node_modules/ora/node_modules/cli-cursor/node_modules/restore-cursor/node_modules/signal-exit/dist/mjs/index.js
 var processOk = (process3) => !!process3 && typeof process3 === "object" && typeof process3.removeListener === "function" && typeof process3.emit === "function" && typeof process3.reallyExit === "function" && typeof process3.listeners === "function" && typeof process3.kill === "function" && typeof process3.pid === "number" && typeof process3.on === "function";
 var kExitEmitter = Symbol.for("signal-exit emitter");
 var global = globalThis;
@@ -35104,7 +35346,7 @@ var {
   unload
 } = signalExitWrap(processOk(process3) ? new SignalExit(process3) : new SignalExitFallback);
 
-// ../../node_modules/.bun/restore-cursor@5.1.0/node_modules/restore-cursor/index.js
+// ../../node_modules/.bun/ora@8.2.0/node_modules/ora/node_modules/cli-cursor/node_modules/restore-cursor/index.js
 var terminal = process4.stderr.isTTY ? process4.stderr : process4.stdout.isTTY ? process4.stdout : undefined;
 var restoreCursor = terminal ? onetime_default(() => {
   onExit(() => {
@@ -35113,7 +35355,7 @@ var restoreCursor = terminal ? onetime_default(() => {
 }) : () => {};
 var restore_cursor_default = restoreCursor;
 
-// ../../node_modules/.bun/cli-cursor@5.0.0/node_modules/cli-cursor/index.js
+// ../../node_modules/.bun/ora@8.2.0/node_modules/ora/node_modules/cli-cursor/index.js
 var isHidden = false;
 var cliCursor = {};
 cliCursor.show = (writableStream = process5.stderr) => {
@@ -36166,3 +36408,6 @@ export {
   AskUserQuestionTool,
   AnalyzeImageTool
 };
+
+//# debugId=0DF7A0DEA7CF8E8D64756E2164756E21
+//# sourceMappingURL=index.js.map