open-agents-ai 0.185.82 → 0.185.84

package/dist/index.js

@@ -65740,9 +65740,19 @@ async function sendMessage() {
 
   const msgDiv = addMessage('assistant', '');
   let fullContent = '';
+  let chatTools = []; // tool calls collected during streaming
+  let metaInfo = null; // completion metadata
+
+  // Tool calls container \u2014 shown live during streaming
+  const toolsContainer = document.createElement('div');
+  toolsContainer.style.cssText = 'margin:4px 0;font-size:0.7rem';
+  msgDiv.appendChild(toolsContainer);
+
+  // Content container
+  const contentDiv = document.createElement('div');
+  msgDiv.appendChild(contentDiv);
 
   try {
-    // Use stateful /v1/chat endpoint (maintains OA identity + context)
     const body = {
       session_id: chatSessionId,
       model: modelSelect.value,
@@ -65757,7 +65767,6 @@ async function sendMessage() {
       body: JSON.stringify(body),
     });
 
-    // Capture session ID from response header
     const sid = response.headers.get('x-session-id');
     if (sid) chatSessionId = sid;
 
@@ -65779,10 +65788,38 @@ async function sendMessage() {
         if (data === '[DONE]') continue;
         try {
           const chunk = JSON.parse(data);
+
+          // Tool call event \u2014 show live
+          if (chunk.type === 'tool_call') {
+            chatTools.push(chunk);
+            const toolEl = document.createElement('div');
+            toolEl.style.cssText = 'background:#1e1e22;border-left:2px solid #b2920a;padding:4px 8px;margin:2px 0;color:#888';
+            toolEl.textContent = '\\u25B8 ' + (chunk.tool || 'tool') + (chunk.args ? ': ' + JSON.stringify(chunk.args).slice(0,80) : '');
+            toolsContainer.appendChild(toolEl);
+            conv.scrollTop = conv.scrollHeight;
+            continue;
+          }
+
+          // Tool result
+          if (chunk.type === 'tool_result') {
+            const resultEl = document.createElement('div');
+            resultEl.style.cssText = 'background:#1e1e22;padding:2px 8px 2px 18px;margin:0 0 2px 0;color:#555;font-size:0.65rem;max-height:60px;overflow:hidden';
+            resultEl.textContent = (chunk.output || '').slice(0, 150);
+            toolsContainer.appendChild(resultEl);
+            continue;
+          }
+
+          // Completion metadata
+          if (chunk.type === 'complete') {
+            metaInfo = chunk;
+            continue;
+          }
+
+          // Content delta
           const delta = chunk.choices?.[0]?.delta?.content || '';
           if (delta) {
             fullContent += delta;
-            msgDiv.innerHTML = renderMarkdown(fullContent);
+            contentDiv.innerHTML = renderMarkdown(fullContent);
             conv.scrollTop = conv.scrollHeight;
           }
         } catch {}
@@ -65790,9 +65827,23 @@ async function sendMessage() {
     }
 
     messages.push({ role: 'assistant', content: fullContent });
-    updateTokenCounter(fullContent.split(/\\s+/).length * 1.3 | 0); // rough token estimate
-    // Re-render with copy button
-    msgDiv.innerHTML = renderMarkdown(fullContent);
+    updateTokenCounter(fullContent.split(/\\s+/).length * 1.3 | 0);
+
+    // Final render: content + collapsible tools
+    contentDiv.innerHTML = renderMarkdown(fullContent);
+
+    // Collapse tool calls into a dropdown after streaming completes
+    if (chatTools.length > 0) {
+      const details = document.createElement('details');
+      details.style.cssText = 'margin:4px 0;font-size:0.65rem;color:#555';
+      const summary = document.createElement('summary');
+      summary.style.cssText = 'cursor:pointer;color:#b2920a;font-size:0.65rem';
+      summary.textContent = chatTools.length + ' tool call' + (chatTools.length > 1 ? 's' : '') + (metaInfo?.tokens ? ' | ' + metaInfo.tokens + ' tokens' : '') + (metaInfo?.duration ? ' | ' + (metaInfo.duration/1000).toFixed(1) + 's' : '');
+      details.appendChild(summary);
+      // Move live tool elements into the details
+      while (toolsContainer.firstChild) details.appendChild(toolsContainer.firstChild);
+      toolsContainer.appendChild(details);
+    }
     const actions = document.createElement('div');
     actions.className = 'msg-actions';
     const copyBtn = document.createElement('button');
@@ -67934,20 +67985,12 @@ async function handleRequest(req, res, ollamaUrl, verbose) {
       addUserMessage(session, chatBody.message);
       compactSession(session);
       const historyLines = session.messages.filter((m) => m.role !== "system").slice(-10).map((m) => m.role === "user" ? `User: ${m.content}` : `Assistant: ${m.content}`).join("\n");
-      const taskPrompt = `You are in a conversational chat session. Respond naturally and helpfully.
-Use your tools (web_search, web_fetch, file_read, shell, memory_read, etc.) when the user's request requires real data.
-If the user asks about current events, news, or real-time data \u2014 use web_search to find it.
-If the user asks about files or code \u2014 use file_read.
-If the user asks you to run something \u2014 use shell.
-NEVER say "I don't have browsing capabilities" \u2014 you DO have web_search and web_fetch.
-NEVER say "I'm just an AI" \u2014 you are Open Agent with full tool access.
-
-` + (historyLines ? `Previous conversation:
+      const taskPrompt = (historyLines ? `Previous conversation:
 ${historyLines}
 
-` : "") + `User's latest message: ${chatBody.message}
+` : "") + `${chatBody.message}
 
-Respond conversationally. Call task_complete with your response when done.`;
+Respond conversationally. Call task_complete with your final response.`;
       const oaBin = process.argv[1] || "oa";
       const args = [taskPrompt, "--json", "--non-interactive"];
       if (model)
@@ -67975,14 +68018,27 @@ Respond conversationally. Call task_complete with your response when done.`;
         });
         let fullContent = "";
         let lastOutput = "";
+        let toolCalls = [];
+        let rawBuffer = "";
         child.stdout?.on("data", (chunk) => {
-          const text = chunk.toString();
-          for (const line of text.split("\n")) {
+          rawBuffer += chunk.toString();
+          const lines = rawBuffer.split("\n");
+          rawBuffer = lines.pop() || "";
+          for (const line of lines) {
             if (!line.trim())
               continue;
             try {
               const evt = JSON.parse(line);
-              if (evt.type === "assistant_text" || evt.type === "text") {
+              if (evt.type === "tool_call" || evt.tool) {
+                const toolInfo = { tool: evt.tool || evt.name || "unknown", args: evt.args };
+                toolCalls.push(toolInfo);
+                res.write("data: " + JSON.stringify({ type: "tool_call", ...toolInfo }) + "\n\n");
+              } else if (evt.type === "tool_result") {
+                const lastTool = toolCalls[toolCalls.length - 1];
+                if (lastTool)
+                  lastTool.result = (evt.output || evt.result || "").slice(0, 500);
+                res.write("data: " + JSON.stringify({ type: "tool_result", output: (evt.output || evt.result || "").slice(0, 200) }) + "\n\n");
+              } else if (evt.type === "assistant_text" || evt.type === "text") {
                 const delta = evt.content || evt.text || "";
                 fullContent += delta;
                 res.write("data: " + JSON.stringify({
@@ -67990,33 +68046,59 @@ Respond conversationally. Call task_complete with your response when done.`;
                   object: "chat.completion.chunk",
                   choices: [{ index: 0, delta: { content: delta }, finish_reason: null }]
                 }) + "\n\n");
-              } else if (evt.type === "tool_call") {
+              } else if (evt.status === "completed" || evt.type === "task_complete") {
+                const summary = evt.summary || evt.content || "";
+                const contentMatch = summary.match(/Tokens:\s*[\d,]+\s+(.*)/s);
+                const cleanContent = contentMatch ? contentMatch[1].trim() : summary;
+                if (cleanContent && cleanContent.length > 5) {
+                  fullContent = cleanContent;
+                  res.write("data: " + JSON.stringify({
+                    id: `chatcmpl-${session.id.slice(0, 8)}`,
+                    object: "chat.completion.chunk",
+                    choices: [{ index: 0, delta: { content: cleanContent }, finish_reason: null }]
+                  }) + "\n\n");
+                }
                 res.write("data: " + JSON.stringify({
-                  type: "tool_call",
-                  tool: evt.tool || evt.name,
-                  args: evt.args
+                  type: "complete",
+                  turns: evt.turns || summary.match(/(\d+) turns/)?.[1],
+                  toolCalls: toolCalls.length,
+                  tokens: evt.tokens || summary.match(/Tokens:\s*([\d,]+)/)?.[1],
+                  duration: evt.durationMs || evt.duration
                 }) + "\n\n");
-              } else if (evt.type === "task_complete") {
-                const summary = evt.summary || evt.content || "";
-                if (summary && !fullContent.includes(summary))
-                  fullContent += summary;
               }
-              lastOutput = line;
             } catch {
-              if (line.trim() && !line.startsWith("{")) {
-                fullContent += line;
+            }
+          }
+        });
+        child.stderr?.on("data", () => {
+        });
+        child.on("close", () => {
+          if (!fullContent && rawBuffer.trim()) {
+            try {
+              const result = JSON.parse(rawBuffer.trim());
+              const summary = result.summary || "";
+              const match = summary.match(/Tokens:\s*[\d,]+\s+([\s\S]*)/);
+              const cleanContent = match ? match[1].trim() : summary;
+              if (cleanContent) {
+                fullContent = cleanContent;
                 res.write("data: " + JSON.stringify({
                   id: `chatcmpl-${session.id.slice(0, 8)}`,
                   object: "chat.completion.chunk",
-                  choices: [{ index: 0, delta: { content: line }, finish_reason: null }]
+                  choices: [{ index: 0, delta: { content: cleanContent }, finish_reason: null }]
+                }) + "\n\n");
+                const turns = summary.match(/(\d+) turns/)?.[1];
+                const tokens = summary.match(/Tokens:\s*([\d,]+)/)?.[1];
+                res.write("data: " + JSON.stringify({
+                  type: "complete",
+                  turns,
+                  tokens,
+                  duration: result.durationMs,
+                  toolCalls: parseInt(summary.match(/(\d+) tool calls/)?.[1] || "0", 10)
                 }) + "\n\n");
               }
+            } catch {
             }
           }
-        });
-        child.stderr?.on("data", () => {
-        });
-        child.on("close", () => {
           addAssistantMessage(session, fullContent);
           res.write("data: [DONE]\n\n");
           res.end();
@@ -68030,16 +68112,24 @@ Respond conversationally. Call task_complete with your response when done.`;
         });
         await new Promise((resolve36) => child.on("close", resolve36));
         let content = "";
-        for (const line of output.split("\n")) {
-          try {
-            const evt = JSON.parse(line);
-            if (evt.type === "assistant_text" || evt.type === "text")
-              content += evt.content || evt.text || "";
-            else if (evt.type === "task_complete")
-              content += evt.summary || evt.content || "";
-          } catch {
-            if (line.trim() && !line.startsWith("{"))
-              content += line + "\n";
+        try {
+          const result = JSON.parse(output.trim());
+          const summary = result.summary || "";
+          const match = summary.match(/Tokens:\s*[\d,]+\s+([\s\S]*)/);
+          content = match ? match[1].trim() : summary;
+        } catch {
+          for (const line of output.split("\n")) {
+            if (!line.trim())
+              continue;
+            try {
+              const evt = JSON.parse(line);
+              if (evt.status === "completed") {
+                const summary = evt.summary || "";
+                const match = summary.match(/Tokens:\s*[\d,]+\s+([\s\S]*)/);
+                content = match ? match[1].trim() : summary;
+              }
+            } catch {
+            }
           }
         }
         addAssistantMessage(session, content.trim());

package/package.json

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