@zhongqian97-code/ecode 0.5.2 → 0.5.4

package/dist/index.js

@@ -148,33 +148,30 @@ function createOpenAIProvider(profile) {
     stream(messages, tools, signal) {
       return {
         [Symbol.asyncIterator]: async function* () {
-          let inThinkBlock = false;
-          function stripThinkTags(raw) {
-            let text = "";
-            let thinking = "";
-            let i = 0;
-            while (i < raw.length) {
-              if (!inThinkBlock) {
-                const start = raw.indexOf("<think>", i);
-                if (start === -1) {
-                  text += raw.slice(i);
-                  break;
-                }
-                text += raw.slice(i, start);
-                inThinkBlock = true;
-                i = start + 7;
+          let thinkPhase = "pre";
+          let afterReasoningDetails = false;
+          function processContent(raw) {
+            if (!raw) return { text: "", thinking: "" };
+            if (afterReasoningDetails) {
+              afterReasoningDetails = false;
+              thinkPhase = "post";
+              return { text: raw.startsWith("</think>") ? raw.slice(8) : raw, thinking: "" };
+            }
+            if (thinkPhase === "post") return { text: raw, thinking: "" };
+            if (thinkPhase === "pre") {
+              if (raw.startsWith("<think>")) {
+                thinkPhase = "in";
+                raw = raw.slice(7);
               } else {
-                const end = raw.indexOf("</think>", i);
-                if (end === -1) {
-                  thinking += raw.slice(i);
-                  break;
-                }
-                thinking += raw.slice(i, end);
-                inThinkBlock = false;
-                i = end + 8;
+                thinkPhase = "post";
+                return { text: raw, thinking: "" };
               }
             }
-            return { text, thinking };
+            const endIdx = raw.indexOf("</think>");
+            if (endIdx === -1) return { text: "", thinking: raw };
+            const thinking = raw.slice(0, endIdx);
+            thinkPhase = "post";
+            return { text: raw.slice(endIdx + 8), thinking };
           }
           const requestParams = {
             model: profile.model,
@@ -200,6 +197,7 @@ function createOpenAIProvider(profile) {
               reasoningAccumulator += delta.reasoning_content;
             }
             if (delta.reasoning_details && delta.reasoning_details.length > 0) {
+              afterReasoningDetails = true;
               for (const rd of delta.reasoning_details) {
                 const id = rd.id ?? "";
                 const text = rd.text ?? "";
@@ -235,8 +233,8 @@ function createOpenAIProvider(profile) {
               }
             }
             const isLast = choice.finish_reason != null;
-            const raw = delta.content ?? "";
-            const { text: filteredText, thinking: thinkContent } = stripThinkTags(raw);
+            const raw = delta.reasoning_details && delta.reasoning_details.length > 0 ? "" : delta.content ?? "";
+            const { text: filteredText, thinking: thinkContent } = processContent(raw);
             if (thinkContent) {
               reasoningAccumulator += thinkContent;
             }
@@ -3524,18 +3522,64 @@ var SkillRegistry = class {
 };
 
 // src/pipe.ts
+var PIPE_TOOLS = [READ_TOOL, GLOB_TOOL, GREP_TOOL];
 function emit(out, event) {
   out.write(JSON.stringify(event) + "\n");
 }
+async function executeToolCall(name, args) {
+  if (name === "read") {
+    const parsed = JSON.parse(args);
+    return readFile2(parsed);
+  }
+  if (name === "glob") {
+    const parsed = JSON.parse(args);
+    return globFiles(parsed);
+  }
+  if (name === "grep") {
+    const parsed = JSON.parse(args);
+    return grepFiles(parsed);
+  }
+  return `Unknown tool: ${name}`;
+}
 async function runPipe(prompt, llm, out = process.stdout) {
   const messages = [{ role: "user", content: prompt }];
-  for await (const chunk of llm.stream(messages)) {
-    if (chunk.text) {
-      emit(out, { type: "chunk", text: chunk.text });
+  while (true) {
+    let assistantText = "";
+    let lastUsage;
+    const toolCalls = [];
+    for await (const chunk of llm.stream(messages, PIPE_TOOLS)) {
+      if (chunk.text) {
+        emit(out, { type: "chunk", text: chunk.text });
+        assistantText += chunk.text;
+      }
+      if (chunk.reasoning) {
+        emit(out, { type: "reasoning", text: chunk.reasoning });
+      }
+      if (chunk.done) {
+        if (chunk.toolCalls) toolCalls.push(...chunk.toolCalls);
+        if (chunk.usage) lastUsage = chunk.usage;
+      }
     }
-    if (chunk.done) {
-      const doneEvent = chunk.usage ? { type: "done", usage: chunk.usage } : { type: "done" };
+    if (toolCalls.length > 0) {
+      messages.push({
+        role: "assistant",
+        content: assistantText || null,
+        tool_calls: toolCalls.map((tc) => ({
+          id: tc.id,
+          type: "function",
+          function: { name: tc.name, arguments: tc.arguments }
+        }))
+      });
+      for (const tc of toolCalls) {
+        emit(out, { type: "tool_call", id: tc.id, name: tc.name, arguments: tc.arguments });
+        const content = await executeToolCall(tc.name, tc.arguments);
+        emit(out, { type: "tool_result", toolCallId: tc.id, name: tc.name, content });
+        messages.push({ role: "tool", tool_call_id: tc.id, content });
+      }
+    } else {
+      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.2",
+  "version": "0.5.4",
   "description": "A minimal Claude Code clone with REPL interface and bash tool calling",
   "type": "module",
   "author": "zhongqian97-code",