@ebowwa/coder 0.7.66 → 0.7.69

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);
 }
@@ -5162,6 +5225,7 @@ async function executeStreamAttempt(request, headers, apiEndpoint, signal, model
                   }
                 }
                 if (choice?.finish_reason) {
+                  console.log(`[API] OpenAI finish_reason: ${choice.finish_reason}, content blocks: ${currentContent.length}, hasToolUse: ${!!currentToolUseBlock}`);
                   if (currentTextBlock) {
                     currentContent.push(currentTextBlock);
                     currentTextBlock = null;
@@ -5269,20 +5333,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;
@@ -5312,12 +5362,48 @@ 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);
+      const openaiTools = convertToolsToOpenAIFormat(tools);
+      request.tools = openaiTools;
+      console.log(`[API] Sending ${tools.length} tools to ${apiFormat} API:`, JSON.stringify(openaiTools).substring(0, 500));
     } else {
       request.tools = tools;
+      console.log(`[API] Sending ${tools.length} tools to ${apiFormat} API (Anthropic format)`);
     }
+  } else {
+    console.log(`[API] No tools being sent to API`);
   }
   const shouldUseExtendedThinking = (extendedThinking?.enabled ?? false) || thinking && thinking.type !== "disabled";
   if (shouldUseExtendedThinking && supportsExtendedThinking(model)) {
@@ -34289,6 +34375,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() {
@@ -34439,6 +34603,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();
     }
@@ -34747,7 +34928,8 @@ class InteractiveRunner {
       searchMode: sessionSelectMode,
       searchQuery: "",
       searchResults,
-      searchSelected: 0
+      searchSelected: 0,
+      scrollOffset: this.state.scrollOffset
     };
   }
   _getHelpText(section) {
@@ -34849,6 +35031,7 @@ var init_interactive_runner = __esm(() => {
   init_native();
   init_spinner_frames();
   init_input_handler();
+  init_scroll_handler();
   init_types4();
 });
 
@@ -34878,10 +35061,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
@@ -34930,7 +35113,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") {
@@ -34961,7 +35144,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") {
@@ -34971,7 +35154,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;
@@ -35169,7 +35352,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(() => {
@@ -35178,7 +35361,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) => {
@@ -36231,3 +36414,6 @@ export {
   AskUserQuestionTool,
   AnalyzeImageTool
 };
+
+//# debugId=4856F1AFA237337364756E2164756E21
+//# sourceMappingURL=index.js.map