thinkpool-pair 0.7.256 → 0.7.257

package/hermes-acp-bootstrap.py

@@ -145,6 +145,57 @@ def constrained_expand(toolsets_arg=None, mcp_server_names=None):
 acp_adapter.session._expand_acp_enabled_toolsets = constrained_expand
 
 import acp_adapter.server
+
+# Hermes 0.18.2 emits the real result through ``tool.completed`` immediately,
+# but its ACP callback ignores that event and waits for the next model-step
+# summary.  Parallel Read/search calls are not always present in that summary,
+# leaving clients with a ToolCallStart and no ToolCallUpdate forever.  Complete
+# from the authoritative execution callback and consume the same per-name FIFO;
+# the later step callback then sees an empty queue and cannot double-emit.  If a
+# future Hermes release handles completion itself, it consumes the queue before
+# this wrapper runs and this compatibility branch becomes a no-op.
+from collections import deque
+import acp_adapter.events
+import acp_adapter.tools
+
+_tool_progress_factory = acp_adapter.server.make_tool_progress_cb
+def completion_aware_tool_progress_factory(
+    conn, session_id, loop, tool_call_ids, tool_call_meta,
+    edit_approval_policy_getter=None,
+):
+    upstream = _tool_progress_factory(
+        conn, session_id, loop, tool_call_ids, tool_call_meta,
+        edit_approval_policy_getter=edit_approval_policy_getter,
+    )
+
+    def progress(event_type, name=None, preview=None, args=None, **kwargs):
+        upstream(event_type, name, preview, args, **kwargs)
+        if event_type != "tool.completed" or not name:
+            return
+        queue = tool_call_ids.get(name)
+        if isinstance(queue, str):
+            queue = deque([queue])
+            tool_call_ids[name] = queue
+        if not queue:
+            return
+        tool_call_id = queue.popleft()
+        meta = tool_call_meta.pop(tool_call_id, {})
+        result = kwargs.get("result")
+        update = acp_adapter.tools.build_tool_complete(
+            tool_call_id,
+            name,
+            result=str(result) if result is not None else None,
+            function_args=meta.get("args"),
+            snapshot=meta.get("snapshot"),
+        )
+        acp_adapter.events._send_update(conn, session_id, loop, update)
+        if not queue:
+            tool_call_ids.pop(name, None)
+
+    return progress
+
+acp_adapter.server.make_tool_progress_cb = completion_aware_tool_progress_factory
+
 _register = acp_adapter.server.HermesACPAgent._register_session_mcp_servers
 async def constrained_register(self, state, mcp_servers):
     if any(getattr(server, "name", None) != "thinkpool" for server in (mcp_servers or [])):

package/hermes-event-mapper.mjs

@@ -128,16 +128,17 @@ export class HermesEventMapper {
   }
 
   finishTurn({ stopReason = 'end_turn', usage = null } = {}) {
-    if (stopReason === 'cancelled') {
-      for (const [toolCallId, tool] of this.tools) {
-        this._emit({
-          kind: 'tool_result', toolUseId: toolCallId,
-          content: [{ type: 'text', text: '[cancelled]' }],
-          isError: false,
-          durationMs: tool.startedAt ? Date.now() - tool.startedAt : undefined,
-          parentToolUseId: null,
-        })
-      }
+    for (const [toolCallId, tool] of this.tools) {
+      const cancelled = stopReason === 'cancelled'
+      this._emit({
+        kind: 'tool_result', toolUseId: toolCallId,
+        content: [{ type: 'text', text: cancelled ? '[cancelled]' : 'Hermes ended the turn without reporting this tool result.' }],
+        toolInput: tool.input || undefined,
+        isError: !cancelled && stopReason !== 'end_turn',
+        missing: !cancelled,
+        durationMs: tool.startedAt ? Date.now() - tool.startedAt : undefined,
+        parentToolUseId: null,
+      })
     }
     this.tools.clear()
     const blocks = []

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thinkpool-pair",
-  "version": "0.7.256",
+  "version": "0.7.257",
   "description": "Share a local coding-agent CLI (Claude Code, Codex, Gemini, Aider, …) into a ThinkPool Code room, live.",
   "type": "module",
   "bin": {