@zhongqian97-code/ecode 0.5.5 → 0.5.7

package/dist/index.js

@@ -116,6 +116,7 @@ import { Box as Box6, useInput as useInput2, useStdout, useStdin } from "ink";
 // src/providers/openai.ts
 import OpenAI from "openai";
 function createOpenAIProvider(profile) {
+  const THINK_END = "</think>";
   const openai = new OpenAI({
     baseURL: profile.baseUrl,
     apiKey: profile.apiKey
@@ -151,6 +152,17 @@ function createOpenAIProvider(profile) {
           let thinkPhase = "pre";
           let scanningForClose = false;
           let closeSearchBuffer = "";
+          let visibleTextTail = "";
+          function rememberVisibleText(text) {
+            if (!text) return;
+            visibleTextTail = (visibleTextTail + text).slice(-256);
+          }
+          function hasNearbyVisibleOpenThink(maxDistance = 4) {
+            const openIdx = visibleTextTail.lastIndexOf("<think>");
+            const closeIdx = visibleTextTail.lastIndexOf(THINK_END);
+            if (openIdx === -1 || openIdx < closeIdx) return false;
+            return visibleTextTail.length - (openIdx + "<think>".length) <= maxDistance;
+          }
           function processContent(raw) {
             if (!raw) return { text: "", thinking: "" };
             if (thinkPhase === "post") return { text: raw, thinking: "" };
@@ -163,11 +175,11 @@ function createOpenAIProvider(profile) {
                 return { text: raw, thinking: "" };
               }
             }
-            const endIdx = raw.indexOf("</think>");
+            const endIdx = raw.indexOf(THINK_END);
             if (endIdx === -1) return { text: "", thinking: raw };
             const thinking = raw.slice(0, endIdx);
             thinkPhase = "post";
-            return { text: raw.slice(endIdx + 8), thinking };
+            return { text: raw.slice(endIdx + THINK_END.length), thinking };
           }
           const requestParams = {
             model: profile.model,
@@ -234,9 +246,12 @@ function createOpenAIProvider(profile) {
               rawToProcess = "";
             } else if (scanningForClose) {
               closeSearchBuffer += delta.content ?? "";
-              const closeIdx = closeSearchBuffer.indexOf("</think>");
+              const closeIdx = closeSearchBuffer.indexOf(THINK_END);
               if (closeIdx !== -1) {
-                rawToProcess = closeSearchBuffer.slice(closeIdx + 8);
+                const openIdx = closeSearchBuffer.lastIndexOf("<think>", closeIdx);
+                const hasNearbyLiteralPair = openIdx !== -1 && closeIdx - (openIdx + "<think>".length) <= 8;
+                const afterClose = closeSearchBuffer.slice(closeIdx + THINK_END.length);
+                rawToProcess = hasNearbyLiteralPair ? closeSearchBuffer : afterClose.length > 0 ? afterClose : closeSearchBuffer.slice(0, closeIdx);
                 scanningForClose = false;
                 closeSearchBuffer = "";
                 thinkPhase = "post";
@@ -251,7 +266,11 @@ function createOpenAIProvider(profile) {
             } else {
               rawToProcess = delta.content ?? "";
             }
+            if (thinkPhase === "post" && rawToProcess.endsWith(THINK_END) && !rawToProcess.includes("<think>") && !hasNearbyVisibleOpenThink()) {
+              rawToProcess = rawToProcess.slice(0, -THINK_END.length);
+            }
             const { text: filteredText, thinking: thinkContent } = processContent(rawToProcess);
+            rememberVisibleText(filteredText);
             if (thinkContent) {
               reasoningAccumulator += thinkContent;
             }
@@ -2115,12 +2134,13 @@ function confirmSelection(inputText, selectedPath) {
 
 // src/ui/mouseInput.ts
 var SGR_MOUSE_RE = /^\x1b\[<(\d+);\d+;\d+[Mm]/;
-function isMouseEvent(data) {
+function mouseEventLength(data) {
   const s = typeof data === "string" ? data : data.toString("binary");
-  if (!s) return false;
-  if (SGR_MOUSE_RE.test(s)) return true;
-  if (s.length >= 6 && s.charCodeAt(0) === 27 && s[1] === "[" && s[2] === "M") return true;
-  return false;
+  if (!s) return 0;
+  const sgrMatch = SGR_MOUSE_RE.exec(s);
+  if (sgrMatch) return sgrMatch[0].length;
+  if (s.length >= 6 && s.charCodeAt(0) === 27 && s[1] === "[" && s[2] === "M") return 6;
+  return 0;
 }
 function parseMouseScroll(data) {
   const s = typeof data === "string" ? data : data.toString("binary");
@@ -2965,8 +2985,11 @@ function App({ config: config2, version: version2, autoMode: autoMode2 = false,
       if (event === "readable") {
         const chunk = stdin.read();
         if (chunk !== null) {
-          if (isMouseEvent(chunk)) {
-            const scrollEvent = parseMouseScroll(chunk);
+          const s = typeof chunk === "string" ? chunk : chunk.toString("binary");
+          const mouseLen = mouseEventLength(s);
+          if (mouseLen > 0) {
+            const mouseStr = s.slice(0, mouseLen);
+            const scrollEvent = parseMouseScroll(mouseStr);
             if (scrollEvent) {
               if (scrollEvent.direction === "up") {
                 setScrollOffset((prev) => Math.min(prev + 3, Math.max(0, totalLinesRef.current - 1)));
@@ -2974,9 +2997,15 @@ function App({ config: config2, version: version2, autoMode: autoMode2 = false,
                 setScrollOffset((prev) => Math.max(0, prev - 3));
               }
             }
-            return false;
+            const remainder = s.slice(mouseLen);
+            if (remainder.length > 0) {
+              stdin.unshift(
+                typeof chunk === "string" ? remainder : Buffer.from(remainder, "binary")
+              );
+            }
+          } else {
+            stdin.unshift(chunk);
           }
-          stdin.unshift(chunk);
         }
       }
       return origEmit.apply(stdin, [event, ...args]);
@@ -3539,7 +3568,7 @@ var SkillRegistry = class {
 };
 
 // src/pipe.ts
-var PIPE_SYSTEM_PROMPT = "You are a helpful assistant running in headless pipe mode. You have access to read-only file tools (read, glob, grep). Answer concisely and accurately.";
+var PIPE_SYSTEM_PROMPT = "You are a helpful assistant running in headless pipe mode. You have access to read-only file tools (read, glob, grep). Answer concisely and accurately. Follow the user's requested language, format, and length exactly. Do not reveal chain-of-thought or emit raw <think> / </think> tags in the final answer; if you must refer to them, describe them in plain language instead.";
 var PIPE_TOOLS = [READ_TOOL, GLOB_TOOL, GREP_TOOL];
 function emit(out, event) {
   out.write(JSON.stringify(event) + "\n");
@@ -3559,20 +3588,21 @@ async function executeToolCall(name, args) {
   }
   return `Unknown tool: ${name}`;
 }
-async function runPipe(prompt, llm, out = process.stdout) {
+async function runPipe(prompt, llm, out = process.stdout, systemPrompt) {
   const messages = [
-    { role: "system", content: PIPE_SYSTEM_PROMPT },
+    { role: "system", content: systemPrompt ?? PIPE_SYSTEM_PROMPT },
     { role: "user", content: prompt }
   ];
   while (true) {
     let assistantText = "";
+    const pendingTextChunks = [];
     let lastUsage;
     let lastReasoning;
     let lastReasoningDetails;
     const toolCalls = [];
     for await (const chunk of llm.stream(messages, PIPE_TOOLS)) {
       if (chunk.text) {
-        emit(out, { type: "chunk", text: chunk.text });
+        pendingTextChunks.push(chunk.text);
         assistantText += chunk.text;
       }
       if (chunk.reasoning) {
@@ -3604,6 +3634,9 @@ async function runPipe(prompt, llm, out = process.stdout) {
         messages.push({ role: "tool", tool_call_id: tc.id, content });
       }
     } else {
+      for (const text of pendingTextChunks) {
+        emit(out, { type: "chunk", text });
+      }
       const doneEvent = lastUsage ? { type: "done", usage: lastUsage } : { type: "done" };
       emit(out, doneEvent);
       break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhongqian97-code/ecode",
-  "version": "0.5.5",
+  "version": "0.5.7",
   "description": "A minimal Claude Code clone with REPL interface and bash tool calling",
   "type": "module",
   "author": "zhongqian97-code",