open-agents-ai 0.185.81 → 0.185.83

package/dist/index.js

@@ -66411,10 +66411,6 @@ function addAssistantMessage(session, content) {
   session.messages.push({ role: "assistant", content });
   session.lastActivity = Date.now();
 }
-function trackSessionTokens(session, tokensIn, tokensOut) {
-  session.tokensIn += tokensIn;
-  session.tokensOut += tokensOut;
-}
 function listSessions() {
   return Array.from(sessions.values()).map((s) => ({
     id: s.id,
@@ -67933,18 +67929,35 @@ async function handleRequest(req, res, ollamaUrl, verbose) {
       }
       const sessionId = chatBody.session_id;
       const model = chatBody.model || loadConfig().model;
-      const session = getSession(sessionId, model, resolve31(process.cwd()));
-      const messages = addUserMessage(session, chatBody.message);
+      const cwdPath = resolve31(process.cwd());
+      const session = getSession(sessionId, model, cwdPath);
+      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 = (historyLines ? `Previous conversation:
+${historyLines}
+
+` : "") + `${chatBody.message}
+
+Respond conversationally. Call task_complete with your final response.`;
+      const oaBin = process.argv[1] || "oa";
+      const args = [taskPrompt, "--json", "--non-interactive"];
+      if (model)
+        args.push("--model", model.replace(/^local\//, ""));
       const streamMode = chatBody.stream !== false;
-      const chatRequest = {
-        model: session.model,
-        messages,
-        stream: streamMode,
-        max_tokens: chatBody.max_tokens || 4096
+      const runEnv = {
+        ...process.env,
+        __OPEN_AGENTS_NO_AUTO_RUN: "",
+        OA_RUN_USER: req._authUser || "anonymous",
+        OA_RUN_SCOPE: req._authScope || "admin"
       };
-      const route = resolveModelEndpoint(session.model);
-      const targetUrl = route?.endpoint?.url || loadConfig().backendUrl;
+      const child = spawn21("oa", args, {
+        cwd: cwdPath,
+        env: runEnv,
+        stdio: ["ignore", "pipe", "pipe"],
+        detached: true
+      });
+      child.unref();
       if (streamMode) {
         res.writeHead(200, {
           "Content-Type": "text/event-stream",
@@ -67953,86 +67966,79 @@ async function handleRequest(req, res, ollamaUrl, verbose) {
           "X-Session-ID": session.id
         });
         let fullContent = "";
-        try {
-          const url = new URL("/api/chat", targetUrl);
-          const isHttps = url.protocol === "https:";
-          const transport = isHttps ? https : http;
-          const reqBody = JSON.stringify({
-            model: session.model.replace(/^local\//, ""),
-            messages: messages.map((m) => ({ role: m.role, content: m.content })),
-            stream: true
-          });
-          await new Promise((resolve36, reject) => {
-            const proxyReq = transport.request({
-              hostname: url.hostname,
-              port: url.port || (isHttps ? 443 : 80),
-              path: url.pathname,
-              method: "POST",
-              headers: { "Content-Type": "application/json", "Content-Length": Buffer.byteLength(reqBody) }
-            }, (proxyRes) => {
-              let buffer = "";
-              proxyRes.on("data", (chunk) => {
-                buffer += chunk.toString();
-                const lines = buffer.split("\n");
-                buffer = lines.pop() || "";
-                for (const line of lines) {
-                  if (!line.trim())
-                    continue;
-                  try {
-                    const parsed = JSON.parse(line);
-                    if (parsed.message?.content) {
-                      fullContent += parsed.message.content;
-                      const sseChunk = {
-                        id: `chatcmpl-${session.id.slice(0, 8)}`,
-                        object: "chat.completion.chunk",
-                        choices: [{ index: 0, delta: { content: parsed.message.content }, finish_reason: null }]
-                      };
-                      res.write("data: " + JSON.stringify(sseChunk) + "\n\n");
-                    }
-                    if (parsed.done) {
-                      trackSessionTokens(session, parsed.prompt_eval_count ?? 0, parsed.eval_count ?? 0);
-                      trackTokens("local", parsed.prompt_eval_count ?? 0, parsed.eval_count ?? 0);
-                      metrics.totalTokensIn += parsed.prompt_eval_count ?? 0;
-                      metrics.totalTokensOut += parsed.eval_count ?? 0;
-                      res.write("data: [DONE]\n\n");
-                    }
-                  } catch {
-                  }
-                }
-              });
-              proxyRes.on("end", resolve36);
-              proxyRes.on("error", reject);
-            });
-            proxyReq.setTimeout(12e4, () => proxyReq.destroy(new Error("Chat stream timeout")));
-            proxyReq.on("error", reject);
-            proxyReq.write(reqBody);
-            proxyReq.end();
-          });
-        } catch (e) {
-          res.write("data: " + JSON.stringify({ error: e.message }) + "\n\n");
-        }
-        addAssistantMessage(session, fullContent);
-        res.end();
+        let lastOutput = "";
+        child.stdout?.on("data", (chunk) => {
+          const text = chunk.toString();
+          for (const line of text.split("\n")) {
+            if (!line.trim())
+              continue;
+            try {
+              const evt = JSON.parse(line);
+              if (evt.type === "assistant_text" || evt.type === "text") {
+                const delta = evt.content || evt.text || "";
+                fullContent += delta;
+                res.write("data: " + JSON.stringify({
+                  id: `chatcmpl-${session.id.slice(0, 8)}`,
+                  object: "chat.completion.chunk",
+                  choices: [{ index: 0, delta: { content: delta }, finish_reason: null }]
+                }) + "\n\n");
+              } else if (evt.type === "tool_call") {
+                res.write("data: " + JSON.stringify({
+                  type: "tool_call",
+                  tool: evt.tool || evt.name,
+                  args: evt.args
+                }) + "\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;
+                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 }]
+                }) + "\n\n");
+              }
+            }
+          }
+        });
+        child.stderr?.on("data", () => {
+        });
+        child.on("close", () => {
+          addAssistantMessage(session, fullContent);
+          res.write("data: [DONE]\n\n");
+          res.end();
+        });
       } else {
-        try {
-          const result = await ollamaRequest(targetUrl, "/api/chat", "POST", JSON.stringify({
-            model: session.model.replace(/^local\//, ""),
-            messages: messages.map((m) => ({ role: m.role, content: m.content })),
-            stream: false
-          }));
-          const parsed = JSON.parse(result.body);
-          const content = parsed.message?.content ?? "";
-          addAssistantMessage(session, content);
-          trackSessionTokens(session, parsed.prompt_eval_count ?? 0, parsed.eval_count ?? 0);
-          trackTokens("local", parsed.prompt_eval_count ?? 0, parsed.eval_count ?? 0);
-          jsonResponse(res, 200, {
-            session_id: session.id,
-            message: { role: "assistant", content },
-            usage: { prompt_tokens: parsed.prompt_eval_count ?? 0, completion_tokens: parsed.eval_count ?? 0 }
-          });
-        } catch (e) {
-          jsonResponse(res, 500, { error: "Chat failed", message: e.message });
+        let output = "";
+        child.stdout?.on("data", (chunk) => {
+          output += chunk.toString();
+        });
+        child.stderr?.on("data", () => {
+        });
+        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";
+          }
         }
+        addAssistantMessage(session, content.trim());
+        jsonResponse(res, 200, {
+          session_id: session.id,
+          message: { role: "assistant", content: content.trim() }
+        });
       }
       return;
     }

package/package.json

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