open-agents-ai 0.187.222 → 0.187.224

package/dist/index.js

@@ -317843,6 +317843,117 @@ function appendExpandableContent(parent, fullText, opts) {
   return wrapper;
 }
 
+// WO-CHAT-RESUME-TOOLS — render a single tool_call event into a parent
+// container. Used by BOTH the live SSE handler AND the chat history
+// restore path so reloads see the same intermediate-state dropdowns
+// they saw during the original turn. The chunkLike object accepts the
+// SSE chunk shape ({type:'tool_call', tool, args}) OR the persisted
+// session message shape ({role:'tool_call', tool, args}).
+function renderToolCallEvent(parent, chunkLike) {
+  const details = document.createElement('details');
+  details.style.cssText = 'background:#1e1e22;border-left:2px solid #b2920a;margin:2px 0;font-size:0.7rem';
+  const summary = document.createElement('summary');
+  summary.style.cssText = 'padding:4px 8px;color:#b2920a;cursor:pointer';
+
+  const toolName = chunkLike.tool || 'tool';
+  let a = (chunkLike.args && typeof chunkLike.args === 'object') ? chunkLike.args : {};
+  if (typeof chunkLike.args === 'string') {
+    try { a = JSON.parse(chunkLike.args); } catch { a = { _raw: chunkLike.args }; }
+  }
+  if (toolName === 'todo_write' && typeof a.todos === 'string') {
+    try {
+      const parsed = JSON.parse(a.todos);
+      if (Array.isArray(parsed)) a = Object.assign({}, a, { todos: parsed });
+    } catch {}
+  }
+
+  let inlineSummary = '';
+  if (toolName === 'todo_write' && Array.isArray(a.todos)) {
+    const todos = a.todos;
+    let p = 0, ip = 0, c = 0, b = 0;
+    for (const t of todos) {
+      const s = (t && typeof t === 'object') ? t.status : '';
+      if (s === 'completed') c++;
+      else if (s === 'in_progress') ip++;
+      else if (s === 'blocked') b++;
+      else p++;
+    }
+    inlineSummary = ' \\u2014 ' + todos.length + ' items (' + c + '\\u25C9 ' + ip + '\\u25D0 ' + p + '\\u25CB' + (b > 0 ? ' ' + b + '\\u25CD' : '') + ')';
+  } else {
+    const previewParts = [];
+    for (const [k, v] of Object.entries(a)) {
+      let vs;
+      if (v === null || v === undefined) vs = String(v);
+      else if (typeof v === 'string') vs = v;
+      else if (typeof v === 'number' || typeof v === 'boolean') vs = String(v);
+      else { try { vs = JSON.stringify(v); } catch { vs = '[object]'; } }
+      if (vs.length > 60) vs = vs.slice(0, 57) + '\\u2026';
+      previewParts.push(k + '=' + vs);
+      if (previewParts.length >= 3) break;
+    }
+    if (previewParts.length) inlineSummary = ' \\u2014 ' + previewParts.join(', ');
+  }
+  summary.textContent = '\\u25B8 ' + toolName + inlineSummary;
+  details.appendChild(summary);
+
+  if (a && typeof a === 'object') {
+    const argsDiv = document.createElement('div');
+    argsDiv.style.cssText = 'padding:4px 8px 6px 16px;color:#888;font-size:0.65rem;border-top:1px solid #2a2a30';
+    if (toolName === 'todo_write' && Array.isArray(a.todos)) {
+      for (const t of a.todos) {
+        if (!t || typeof t !== 'object') continue;
+        const row = document.createElement('div');
+        row.style.cssText = 'padding:2px 0';
+        let mark = '\\u25CB';
+        let color = '#666';
+        if (t.status === 'completed') { mark = '\\u25C9'; color = '#4a7a4a'; }
+        else if (t.status === 'in_progress') { mark = '\\u25D0'; color = '#b2920a'; }
+        else if (t.status === 'blocked') { mark = '\\u25CD'; color = '#b25f5f'; }
+        row.innerHTML = '<span style="color:' + color + '">' + mark + '</span> <span style="color:#b0b0b0">' + escHtml(String(t.content || '').slice(0, 300)) + '</span>' + (t.blocker ? ' <span style="color:#b25f5f">(blocked: ' + escHtml(String(t.blocker).slice(0, 100)) + ')</span>' : '');
+        argsDiv.appendChild(row);
+      }
+    } else {
+      for (const [k, v] of Object.entries(a)) {
+        const row = document.createElement('div');
+        row.style.cssText = 'padding:2px 0;display:flex;gap:8px;align-items:flex-start';
+        let vs;
+        if (v === null || v === undefined) vs = String(v);
+        else if (typeof v === 'string') vs = v;
+        else if (typeof v === 'number' || typeof v === 'boolean') vs = String(v);
+        else { try { vs = JSON.stringify(v, null, 2); } catch { vs = '[object]'; } }
+
+        const keyEl = document.createElement('span');
+        keyEl.style.cssText = 'color:#b2920a;min-width:60px;flex-shrink:0';
+        keyEl.textContent = k;
+        row.appendChild(keyEl);
+
+        const valWrap = document.createElement('div');
+        valWrap.style.cssText = 'flex:1;min-width:0;color:#b0b0b0';
+        appendExpandableContent(valWrap, vs, { truncateAt: 500, baseStyle: 'color:#b0b0b0;' });
+        row.appendChild(valWrap);
+
+        argsDiv.appendChild(row);
+      }
+    }
+    details.appendChild(argsDiv);
+  }
+  parent.appendChild(details);
+  return details;
+}
+
+// WO-CHAT-RESUME-TOOLS — render a single tool_result event with the
+// show-more/hide expandable helper. Used by both live SSE and restore.
+function renderToolResultEvent(parent, chunkLike) {
+  const resultEl = document.createElement('div');
+  const errStyle = chunkLike.success === false
+    ? 'background:#2a1e1e;border-left:2px solid #b25f5f;color:#b25f5f;'
+    : 'background:#1e1e22;color:#888;';
+  resultEl.style.cssText = errStyle + 'padding:4px 8px 4px 18px;margin:0 0 2px 0;font-size:0.65rem';
+  appendExpandableContent(resultEl, chunkLike.output || '', { truncateAt: 150, baseStyle: 'color:inherit;' });
+  parent.appendChild(resultEl);
+  return resultEl;
+}
+
 async function sendMessage() {
   const text = input.value.trim();
   if (!text || streaming) return;
@@ -319835,12 +319946,54 @@ async function restoreChatSession() {
     if (!data || !data.id) return;
     chatSessionId = data.id;
     window.currentSessionId = data.id;
-    messages = (data.messages || []).map(m => ({ role: m.role, content: m.content }));
+    // Keep the in-memory messages array clean (only user/assistant) so
+    // the next inference call sees a valid conversation. Tool events
+    // are still rendered into the DOM via the dropdown helpers below.
+    const allMessages = data.messages || [];
+    messages = allMessages
+      .filter(m => m.role === 'user' || m.role === 'assistant')
+      .map(m => ({ role: m.role, content: m.content }));
     const conv = document.getElementById('conversation');
     if (conv) {
       conv.innerHTML = '';
-      for (const m of messages) {
-        addMessage(m.role, m.content);
+      // WO-CHAT-RESUME-TOOLS — replay the FULL intermediate flow on
+      // restore: user/assistant text bubbles AND tool_call/tool_result
+      // dropdowns interleaved in original order. We track the current
+      // assistant bubble's tools container so consecutive tool events
+      // attach to the same bubble (the live SSE handler does the same).
+      let currentAssistantTools = null;
+      for (const m of allMessages) {
+        if (m.role === 'user') {
+          addMessage('user', m.content);
+          currentAssistantTools = null;
+        } else if (m.role === 'assistant') {
+          const msgDiv = addMessage('assistant', m.content);
+          // Stage a tools container for any tool events that come AFTER
+          // this assistant turn (small models sometimes emit text first
+          // then tool calls — we attach those tools to the most recent
+          // assistant bubble for visual coherence).
+          currentAssistantTools = document.createElement('div');
+          currentAssistantTools.style.cssText = 'margin:4px 0;font-size:0.7rem';
+          msgDiv.appendChild(currentAssistantTools);
+        } else if (m.role === 'tool_call') {
+          // If no assistant bubble yet (tool fired before any text),
+          // create one with empty content so the dropdown has a parent.
+          if (!currentAssistantTools) {
+            const msgDiv = addMessage('assistant', '');
+            currentAssistantTools = document.createElement('div');
+            currentAssistantTools.style.cssText = 'margin:4px 0;font-size:0.7rem';
+            msgDiv.appendChild(currentAssistantTools);
+          }
+          renderToolCallEvent(currentAssistantTools, { tool: m.tool, args: m.args });
+        } else if (m.role === 'tool_result') {
+          if (!currentAssistantTools) {
+            const msgDiv = addMessage('assistant', '');
+            currentAssistantTools = document.createElement('div');
+            currentAssistantTools.style.cssText = 'margin:4px 0;font-size:0.7rem';
+            msgDiv.appendChild(currentAssistantTools);
+          }
+          renderToolResultEvent(currentAssistantTools, { output: m.output, success: m.success });
+        }
       }
     }
     try { refreshTodos(data.id); } catch {}
@@ -319884,11 +320037,31 @@ function attachInFlightPoller(sessionId, initialJob) {
       const data = await r.json();
       const job = data.in_flight;
       if (!job) {
-        messages = (data.messages || []).map(m => ({ role: m.role, content: m.content }));
+        // WO-CHAT-RESUME-TOOLS — re-run the same restore logic so the
+        // poller's terminal repaint also includes tool dropdowns.
+        const allMessages = data.messages || [];
+        messages = allMessages
+          .filter(m => m.role === 'user' || m.role === 'assistant')
+          .map(m => ({ role: m.role, content: m.content }));
         const conv2 = document.getElementById('conversation');
         if (conv2) {
           conv2.innerHTML = '';
-          for (const m of messages) addMessage(m.role, m.content);
+          let curTools = null;
+          for (const m of allMessages) {
+            if (m.role === 'user') { addMessage('user', m.content); curTools = null; }
+            else if (m.role === 'assistant') {
+              const md = addMessage('assistant', m.content);
+              curTools = document.createElement('div');
+              curTools.style.cssText = 'margin:4px 0;font-size:0.7rem';
+              md.appendChild(curTools);
+            } else if (m.role === 'tool_call') {
+              if (!curTools) { const md = addMessage('assistant', ''); curTools = document.createElement('div'); curTools.style.cssText = 'margin:4px 0;font-size:0.7rem'; md.appendChild(curTools); }
+              renderToolCallEvent(curTools, { tool: m.tool, args: m.args });
+            } else if (m.role === 'tool_result') {
+              if (!curTools) { const md = addMessage('assistant', ''); curTools = document.createElement('div'); curTools.style.cssText = 'margin:4px 0;font-size:0.7rem'; md.appendChild(curTools); }
+              renderToolResultEvent(curTools, { output: m.output, success: m.success });
+            }
+          }
         }
         stopPolling();
         return;
@@ -319903,11 +320076,30 @@ function attachInFlightPoller(sessionId, initialJob) {
         } else if (job.error) {
           placeholder.textContent = 'Error: ' + job.error;
         }
-        messages = (data.messages || []).map(m => ({ role: m.role, content: m.content }));
+        // WO-CHAT-RESUME-TOOLS — same tool-replay logic on terminal repaint
+        const allMessages = data.messages || [];
+        messages = allMessages
+          .filter(m => m.role === 'user' || m.role === 'assistant')
+          .map(m => ({ role: m.role, content: m.content }));
         const conv3 = document.getElementById('conversation');
         if (conv3) {
           conv3.innerHTML = '';
-          for (const m of messages) addMessage(m.role, m.content);
+          let curTools = null;
+          for (const m of allMessages) {
+            if (m.role === 'user') { addMessage('user', m.content); curTools = null; }
+            else if (m.role === 'assistant') {
+              const md = addMessage('assistant', m.content);
+              curTools = document.createElement('div');
+              curTools.style.cssText = 'margin:4px 0;font-size:0.7rem';
+              md.appendChild(curTools);
+            } else if (m.role === 'tool_call') {
+              if (!curTools) { const md = addMessage('assistant', ''); curTools = document.createElement('div'); curTools.style.cssText = 'margin:4px 0;font-size:0.7rem'; md.appendChild(curTools); }
+              renderToolCallEvent(curTools, { tool: m.tool, args: m.args });
+            } else if (m.role === 'tool_result') {
+              if (!curTools) { const md = addMessage('assistant', ''); curTools = document.createElement('div'); curTools.style.cssText = 'margin:4px 0;font-size:0.7rem'; md.appendChild(curTools); }
+              renderToolResultEvent(curTools, { output: m.output, success: m.success });
+            }
+          }
         }
         stopPolling();
       }
@@ -320610,13 +320802,57 @@ function addUserMessage(session, content) {
   session.messages.push({ role: "user", content });
   session.lastActivity = Date.now();
   persistSession(session);
-  return [...session.messages];
+  return session.messages.filter((m2) => m2.role === "system" || m2.role === "user" || m2.role === "assistant");
 }
 function addAssistantMessage(session, content) {
   session.messages.push({ role: "assistant", content });
   session.lastActivity = Date.now();
   persistSession(session);
 }
+function addToolCallMessage(session, tool, args) {
+  let cappedArgs = args;
+  try {
+    const json = JSON.stringify(args);
+    if (json && json.length > 4e3) {
+      if (args && typeof args === "object" && !Array.isArray(args)) {
+        const pruned = {};
+        for (const [k, v] of Object.entries(args)) {
+          if (typeof v === "string" && v.length > 1e3) {
+            pruned[k] = v.slice(0, 800) + `… [+${v.length - 800} chars truncated for storage]`;
+          } else {
+            pruned[k] = v;
+          }
+        }
+        cappedArgs = pruned;
+      } else {
+        cappedArgs = { _truncated: true, _bytes: json.length };
+      }
+    }
+  } catch {
+  }
+  session.messages.push({
+    role: "tool_call",
+    content: "",
+    tool,
+    args: cappedArgs,
+    ts: Date.now()
+  });
+  session.lastActivity = Date.now();
+  persistSession(session);
+}
+function addToolResultMessage(session, tool, output, success) {
+  const capped = output && output.length > 2048 ? output.slice(0, 2e3) + `… [+${output.length - 2e3} chars truncated for storage]` : output;
+  session.messages.push({
+    role: "tool_result",
+    content: "",
+    tool,
+    output: capped,
+    success,
+    ts: Date.now()
+  });
+  session.lastActivity = Date.now();
+  persistSession(session);
+}
 function listSessions2() {
   return Array.from(sessions.values()).map((s2) => ({
     id: s2.id,
@@ -323759,7 +323995,9 @@ async function handleRequest(req2, res, ollamaUrl, verbose) {
         try {
           const ans = await directChatBackend({
             model,
-            messages: session.messages.map((m2) => ({ role: m2.role, content: m2.content })),
+            // Filter out tool_call/tool_result messages — the upstream
+            // model only accepts standard system/user/assistant turns.
+            messages: session.messages.filter((m2) => m2.role === "system" || m2.role === "user" || m2.role === "assistant").map((m2) => ({ role: m2.role, content: m2.content })),
             stream: streamMode,
             res,
             sessionId: session.id,
@@ -323789,7 +324027,7 @@ async function handleRequest(req2, res, ollamaUrl, verbose) {
         }
         return;
       }
-      const historyLines = session.messages.filter((m2) => m2.role !== "system").slice(-10).map((m2) => m2.role === "user" ? `User: ${m2.content}` : `Assistant: ${m2.content}`).join("\n");
+      const historyLines = session.messages.filter((m2) => m2.role === "user" || m2.role === "assistant").slice(-10).map((m2) => m2.role === "user" ? `User: ${m2.content}` : `Assistant: ${m2.content}`).join("\n");
       const memCtx = await retrieveMemoryContext(
         chatBody.message,
         session.id,
@@ -323885,6 +324123,10 @@ ${historyLines}
                   tool: evt.tool,
                   args: evt.args
                 }) + "\n\n");
+                try {
+                  addToolCallMessage(session, evt.tool, evt.args);
+                } catch {
+                }
                 try {
                   const evtType = evt.tool === "sub_agent" || evt.tool === "full_sub_agent" ? "run.started" : "tool.called";
                   publishEvent(evtType, {
@@ -323895,6 +324137,17 @@ ${historyLines}
                   }, { subject: session.id });
                 } catch {
                 }
+              } else if (evt.type === "tool_result") {
+                res.write("data: " + JSON.stringify({
+                  type: "tool_result",
+                  tool: evt.tool,
+                  output: evt.output ?? evt.content ?? "",
+                  success: evt.success
+                }) + "\n\n");
+                try {
+                  addToolResultMessage(session, evt.tool, evt.output ?? evt.content ?? "", evt.success);
+                } catch {
+                }
               } else {
                 finalLines.push(line);
               }
@@ -324906,7 +325159,7 @@ function createTaskCompleteTool(modelTier) {
   const summaryDesc = modelTier === "small" || modelTier === "medium" ? "Your complete response to the user. For questions/chat: put your FULL answer here (this is what the user will see). For coding tasks: brief summary of what was accomplished." : "Brief summary of what was accomplished";
   return {
     name: "task_complete",
-    description: "Signal that the task is complete.",
+    description: "Signal that the task is complete. GUARDED: cannot fire while the active todo list (todo_write) has pending, in_progress, or blocked items. If you're truly done, first call todo_write to mark every remaining item completed. If you're not done, continue working down the list and call this only after the last item flips to completed.",
     parameters: {
       type: "object",
       properties: {
@@ -324915,6 +325168,35 @@ function createTaskCompleteTool(modelTier) {
       required: ["summary"]
     },
     async execute(args) {
+      try {
+        const sessionId = getTodoSessionId();
+        const todos = readTodos(sessionId);
+        if (todos.length > 0) {
+          const incomplete = todos.filter(
+            (t2) => t2.status === "pending" || t2.status === "in_progress" || t2.status === "blocked"
+          );
+          if (incomplete.length > 0) {
+            const incompleteList = incomplete.slice(0, 10).map((t2) => `  - [${t2.status}] ${t2.content}${t2.blocker ? ` (blocked: ${t2.blocker})` : ""}`).join("\n");
+            const more = incomplete.length > 10 ? `
+  ... +${incomplete.length - 10} more` : "";
+            return {
+              success: false,
+              output: "",
+              error: `task_complete BLOCKED — ${incomplete.length} todo item(s) still incomplete. You must either:
+  1. Continue working on the remaining items, OR
+  2. If they're actually done, call todo_write with status='completed' for each one, THEN call task_complete again.
+
+Incomplete items:
+${incompleteList}${more}`
+            };
+          }
+          try {
+            writeTodos(sessionId, []);
+          } catch {
+          }
+        }
+      } catch {
+      }
       return { success: true, output: args["summary"] || "Task completed." };
     }
   };
@@ -326215,6 +326497,13 @@ ${entry.fullContent}`
         }
         break;
       case "tool_result": {
+        if (_apiCallbacks?.onToolResult) {
+          _apiCallbacks.onToolResult(
+            event.toolName ?? "unknown",
+            String(event.content ?? ""),
+            event.success ?? false
+          );
+        }
         if (lastToolCall) {
           editHistory.logToolCall(lastToolCall.name, lastToolCall.args, event.success ?? false);
           lastToolCall = null;
@@ -330716,6 +331005,10 @@ async function runJson(task, config, repoPath) {
       onToolCall: (tool, args) => {
         toolCallLog.push({ tool, args });
         origWrite(JSON.stringify({ type: "tool_call", tool, args }) + "\n");
+      },
+      onToolResult: (tool, output, success) => {
+        const capped = output && output.length > 4e3 ? output.slice(0, 3900) + `… [+${output.length - 3900} chars]` : output;
+        origWrite(JSON.stringify({ type: "tool_result", tool, output: capped, success }) + "\n");
       }
     });
     result = {

package/package.json

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