agentgui 1.0.721 → 1.0.722

package/lib/jsonl-watcher.js

@@ -12,7 +12,7 @@ export class JsonlWatcher {
     this._owned = ownedSessionIds;
     this._tails = new Map();
     this._convMap = new Map();
-    this._frags = new Map();
+    this._emitted = new Map();
     this._timers = new Map();
     this._seqs = new Map();
     this._streaming = new Set();
@@ -42,7 +42,7 @@ export class JsonlWatcher {
       this._convMap.delete(sid);
       this._seqs.delete(sid);
       this._streaming.delete(sid);
-      for (const key of [...this._frags.keys()]) if (key.startsWith(`${sid}:`)) this._frags.delete(key);
+      for (const key of [...this._emitted.keys()]) if (key.startsWith(`${sid}:`)) this._emitted.delete(key);
       for (const [fp, s] of this._tails.entries()) {
         if (!fp.includes(sid)) continue;
         if (s.fd !== null) try { fs.closeSync(s.fd); } catch (_) {}
@@ -56,7 +56,7 @@ export class JsonlWatcher {
   removeAllConversations() {
     for (const s of this._tails.values()) if (s.fd !== null) try { fs.closeSync(s.fd); } catch (_) {}
     for (const t of this._timers.values()) clearTimeout(t);
-    this._tails.clear(); this._convMap.clear(); this._frags.clear();
+    this._tails.clear(); this._convMap.clear(); this._emitted.clear();
     this._timers.clear(); this._seqs.clear(); this._streaming.clear();
   }
 
@@ -114,7 +114,8 @@ export class JsonlWatcher {
     if (this._convMap.has(sid)) return this._convMap.get(sid);
     const found = this._q.getConversations().find(c => c.claudeSessionId === sid);
     if (found) { this._convMap.set(sid, found.id); return found.id; }
-    if (e.type !== 'user' || e.isMeta) return null;
+    if (e.type === 'queue-operation' || e.type === 'last-prompt') return null;
+    if (e.type === 'user' && e.isMeta) return null;
     const cwd = e.cwd || process.cwd();
     const branch = e.gitBranch || '';
     const base = path.basename(cwd);
@@ -132,6 +133,13 @@ export class JsonlWatcher {
     this._bc({ type: 'streaming_progress', sessionId: sid, conversationId: cid, block, blockRole: role, seq: this._seq(sid), timestamp: Date.now(), ...extra });
   }
 
+  _emitBlocks(cid, sid, blocks, role) {
+    for (const b of blocks) {
+      if (!b || !b.type) continue;
+      this._emit(cid, sid, b, role);
+    }
+  }
+
   _startStreaming(cid, sid) {
     if (this._streaming.has(sid)) return;
     this._streaming.add(sid);
@@ -145,11 +153,17 @@ export class JsonlWatcher {
   }
 
   _route(cid, sid, e) {
-    if (e.type === 'queue-operation' || (e.type === 'user' && e.isMeta)) return;
+    if (e.type === 'queue-operation' || e.type === 'last-prompt' || (e.type === 'user' && e.isMeta)) return;
+
+    if (e.isApiErrorMessage && e.error === 'rate_limit') {
+      this._bc({ type: 'streaming_error', sessionId: sid, conversationId: cid, error: 'Rate limit hit', recoverable: true, timestamp: Date.now() });
+      return;
+    }
 
     if (e.type === 'system') {
       if (e.subtype === 'init') { this._startStreaming(cid, sid); return; }
       if (e.subtype === 'turn_duration' || e.subtype === 'stop_hook_summary') { this._endStreaming(cid, sid); return; }
+      this._startStreaming(cid, sid);
       this._emit(cid, sid, { type: 'system', subtype: e.subtype, model: e.model, cwd: e.cwd, tools: e.tools, preTokens: e.compactMetadata?.preTokens }, 'system');
       return;
     }
@@ -157,11 +171,14 @@ export class JsonlWatcher {
     if (e.type === 'assistant' && e.message?.content) {
       this._startStreaming(cid, sid);
       const key = `${sid}:${e.message.id}`;
-      const prevCount = this._frags.get(key)?.message?.content?.length || 0;
-      const newBlocks = e.message.content.slice(prevCount);
-      if (e.message.stop_reason === null || e.message.stop_reason === undefined) this._frags.set(key, e);
-      else this._frags.delete(key);
-      for (const b of newBlocks) this._emit(cid, sid, b, 'assistant');
+      const prev = this._emitted.get(key) || 0;
+      const content = e.message.content;
+      const newBlocks = content.slice(prev);
+      if (newBlocks.length > 0) {
+        this._emitted.set(key, content.length);
+        this._emitBlocks(cid, sid, newBlocks, 'assistant');
+      }
+      if (e.message.stop_reason) this._emitted.delete(key);
       return;
     }
 
@@ -175,14 +192,25 @@ export class JsonlWatcher {
 
     if (e.type === 'progress') {
       this._startStreaming(cid, sid);
-      const dataType = e.data?.type || e.subtype || 'progress';
-      const content = dataType === 'agent_progress' ? e.data?.message : (e.data || e.content);
-      this._emit(cid, sid, { type: dataType, agentId: e.agentId, content }, 'progress');
-      return;
-    }
-
-    if (e.isApiErrorMessage && e.error === 'rate_limit') {
-      this._bc({ type: 'streaming_error', sessionId: sid, conversationId: cid, error: 'Rate limit hit', recoverable: true, timestamp: Date.now() });
+      const d = e.data || {};
+      if (d.type === 'agent_progress') {
+        const inner = d.message?.message || d.message;
+        const content = inner?.content;
+        if (Array.isArray(content)) {
+          const role = inner.role === 'user' ? 'tool_result' : 'assistant';
+          this._emitBlocks(cid, sid, content, role);
+        }
+        return;
+      }
+      if (d.type === 'hook_progress') {
+        this._emit(cid, sid, { type: 'hook_progress', hookEvent: d.hookEvent, hookName: d.hookName }, 'system');
+        return;
+      }
+      if (d.type === 'mcp_progress') {
+        this._emit(cid, sid, { type: 'mcp_progress', status: d.status, serverName: d.serverName, toolName: d.toolName }, 'system');
+        return;
+      }
+      this._emit(cid, sid, { type: d.type || e.subtype || 'progress', content: e.content || d }, 'progress');
       return;
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentgui",
-  "version": "1.0.721",
+  "version": "1.0.722",
   "description": "Multi-agent ACP client with real-time communication",
   "type": "module",
   "main": "server.js",