open-agents-ai 0.185.95 → 0.185.97

package/dist/index.js

@@ -26914,6 +26914,10 @@ Take a DIFFERENT action now.`
               turn,
               timestamp: (/* @__PURE__ */ new Date()).toISOString()
             });
+            const cleanNonStream = content.replace(/<think>[\s\S]*?<\/think>/g, "").trim();
+            if (cleanNonStream) {
+              this.emit({ type: "assistant_text", content: cleanNonStream, turn, timestamp: (/* @__PURE__ */ new Date()).toISOString() });
+            }
             if (/task.?complete|all tests pass/i.test(content)) {
               completed = true;
               summary = content;
@@ -28825,6 +28829,9 @@ ${description}`
         }
         this.emit({ type: "stream_end", content, turn, timestamp: (/* @__PURE__ */ new Date()).toISOString() });
         const cleanContent = content.replace(/<think>[\s\S]*?<\/think>/g, "").trim();
+        if (cleanContent) {
+          this.emit({ type: "assistant_text", content: cleanContent, turn, timestamp: (/* @__PURE__ */ new Date()).toISOString() });
+        }
         const hadThinking = content.includes("<think>") && content.includes("</think>");
         const thinkOnlyResponse = hadThinking && !cleanContent;
         const toolCalls = toolCallAccumulators.size > 0 ? Array.from(toolCallAccumulators.values()).map((tc) => {
@@ -68060,7 +68067,7 @@ ${historyLines}
 
 Respond conversationally. Call task_complete with your final response.`;
       const oaBin = process.argv[1] || "oa";
-      const args = [taskPrompt, "--json", "--non-interactive"];
+      const args = [taskPrompt, "--json"];
       if (model)
         args.push("--model", model.replace(/^local\//, ""));
       const streamMode = chatBody.stream !== false;
@@ -68073,10 +68080,8 @@ Respond conversationally. Call task_complete with your final response.`;
       const child = spawn21("oa", args, {
         cwd: cwdPath,
         env: runEnv,
-        stdio: ["ignore", "pipe", "pipe"],
-        detached: true
+        stdio: ["ignore", "pipe", "pipe"]
       });
-      child.unref();
       if (streamMode) {
         res.writeHead(200, {
           "Content-Type": "text/event-stream",
@@ -68145,27 +68150,24 @@ Respond conversationally. Call task_complete with your final response.`;
             const allOutput = rawBuffer.trim();
             try {
               const result = JSON.parse(allOutput);
-              const summary = result.summary || "";
-              const summaryMatch = summary.match(/Tokens:\s*[\d,]+\s+([\s\S]*)/);
-              let content = summaryMatch ? summaryMatch[1].trim() : "";
-              if (content.length < 20 && result.text) {
-                const textMatch = result.text.match(/Tokens:[\s\S]*?\n\s*([\s\S]+?)$/);
-                if (textMatch)
-                  content = textMatch[1].trim();
+              let content = result.assistant_text || "";
+              if (!content) {
+                const summary = result.summary || "";
+                const summaryMatch = summary.match(/Tokens:\s*[\d,]+\s+([\s\S]*)/);
+                content = summaryMatch ? summaryMatch[1].trim() : summary;
               }
-              if (!content)
-                content = summary;
               fullContent = content;
               res.write("data: " + JSON.stringify({
                 id: `chatcmpl-${session.id.slice(0, 8)}`,
                 object: "chat.completion.chunk",
                 choices: [{ index: 0, delta: { content }, finish_reason: null }]
               }) + "\n\n");
+              const meta = result.summary || "";
               res.write("data: " + JSON.stringify({
                 type: "complete",
-                turns: summary.match(/(\d+) turns/)?.[1],
-                tokens: summary.match(/Tokens:\s*([\d,]+)/)?.[1],
-                toolCalls: parseInt(summary.match(/(\d+) tool calls/)?.[1] || "0", 10),
+                turns: meta.match(/(\d+) turns/)?.[1],
+                tokens: meta.match(/Tokens:\s*([\d,]+)/)?.[1],
+                toolCalls: parseInt(meta.match(/(\d+) tool calls/)?.[1] || "0", 10),
                 duration: result.durationMs
               }) + "\n\n");
             } catch {
@@ -68194,18 +68196,14 @@ Respond conversationally. Call task_complete with your final response.`;
         let content = "";
         try {
           const result = JSON.parse(output.trim());
-          const summary = result.summary || "";
-          const summaryMatch = summary.match(/Tokens:\s*[\d,]+\s+([\s\S]*)/);
-          if (summaryMatch && summaryMatch[1]?.trim()) {
-            content = summaryMatch[1].trim();
-          }
-          if (content.length < 20 && result.text) {
-            const textMatch = result.text.match(/Tokens:[\s\S]*?\n\s*([\s\S]+?)$/);
-            if (textMatch && textMatch[1]?.trim())
-              content = textMatch[1].trim();
-          }
-          if (!content)
-            content = summary;
+          if (result.assistant_text) {
+            content = result.assistant_text;
+          }
+          if (!content) {
+            const summary = result.summary || "";
+            const summaryMatch = summary.match(/Tokens:\s*[\d,]+\s+([\s\S]*)/);
+            content = summaryMatch ? summaryMatch[1].trim() : summary;
+          }
         } catch {
           content = output.trim().slice(0, 500);
         }
@@ -69651,6 +69649,8 @@ ${entry.fullContent}`
     emotionEngine?.appraise(event);
     switch (event.type) {
       case "tool_call":
+        if (_apiCallbacks?.onToolCall)
+          _apiCallbacks.onToolCall(event.toolName ?? "unknown", event.toolArgs);
         toolSequence.push({
           tool: event.toolName ?? "unknown",
           argKeys: Object.keys(event.toolArgs ?? {})
@@ -69859,6 +69859,11 @@ ${entry.fullContent}`
         if (sudoCallback)
           sudoCallback(event.content ?? "");
         break;
+      case "assistant_text":
+        if (_apiCallbacks?.onAssistantText && event.content) {
+          _apiCallbacks.onAssistantText(event.content, event.turn ?? 0);
+        }
+        break;
       case "complete":
         break;
     }
@@ -73292,7 +73297,7 @@ ${c2.dim("(Use /quit to exit)")}
     showPrompt();
   };
 }
-async function runWithTUI(task, config, repoPath) {
+async function runWithTUI(task, config, repoPath, callbacks) {
   const repoRoot = resolve32(repoPath ?? cwd());
   const needsSetup = isFirstRun() || !await isModelAvailable(config);
   if (needsSetup && config.backendType === "ollama") {
@@ -73332,6 +73337,7 @@ async function runWithTUI(task, config, repoPath) {
       renderInfo("The agent will retry when you submit a task. Use /endpoint to reconfigure.");
     }
   }
+  _apiCallbacks = callbacks ?? null;
   renderCompactHeader(config.model);
   renderUserMessage(task);
   setTerminalTitle(task.slice(0, 60), getVersion4());
@@ -73602,7 +73608,7 @@ Rules:
     process.exit(1);
   }
 }
-var taskManager, _shellToolRef, _replToolRef, _fullSubAgentToolRef, _activeRunnerRef, _wireSubAgentCallbacks, _autoUpdatedThisSession, SELF_IMPROVE_INTERVAL, _tasksSinceImprove;
+var taskManager, _apiCallbacks, _shellToolRef, _replToolRef, _fullSubAgentToolRef, _activeRunnerRef, _wireSubAgentCallbacks, _autoUpdatedThisSession, SELF_IMPROVE_INTERVAL, _tasksSinceImprove;
 var init_interactive = __esm({
   "packages/cli/dist/tui/interactive.js"() {
     "use strict";
@@ -73643,6 +73649,7 @@ var init_interactive = __esm({
     init_overlay_lock();
     init_neovim_mode();
     taskManager = new BackgroundTaskManager();
+    _apiCallbacks = null;
     _shellToolRef = null;
     _replToolRef = null;
     _fullSubAgentToolRef = null;
@@ -73706,8 +73713,17 @@ async function runJson(task, config, repoPath) {
   });
   process.stderr.write = (() => true);
   let result;
+  const assistantTexts = [];
+  const toolCallLog = [];
   try {
-    await runWithTUI(task, config, repoPath);
+    await runWithTUI(task, config, repoPath, {
+      onAssistantText: (text) => {
+        assistantTexts.push(text);
+      },
+      onToolCall: (tool, args) => {
+        toolCallLog.push({ tool, args });
+      }
+    });
     result = {
       status: "completed",
       summary: extractSummary(captured),
@@ -73727,6 +73743,12 @@ async function runJson(task, config, repoPath) {
   const allCaptured = captured.join("");
   const cleanText = allCaptured.replace(/\x1B\[[0-9;]*[A-Za-z]/g, "").replace(/\x1B\].*?\x07/g, "").replace(/\x1B[78]/g, "").replace(/\x1B\[\?[0-9;]*[hl]/g, "");
   result.text = cleanText;
+  if (assistantTexts.length > 0) {
+    result.assistant_text = assistantTexts.join("\n\n");
+  }
+  if (toolCallLog.length > 0) {
+    result.tool_calls = toolCallLog;
+  }
   process.stdout.write(JSON.stringify(result, null, 2) + "\n");
   if (result.exitCode !== 0)
     process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "open-agents-ai",
-  "version": "0.185.95",
+  "version": "0.185.97",
   "description": "AI coding agent powered by open-source models (Ollama/vLLM) — interactive TUI with agentic tool-calling loop",
   "type": "module",
   "main": "./dist/index.js",