agentgui 1.0.722 → 1.0.724

package/lib/jsonl-watcher.js

@@ -16,6 +16,7 @@ export class JsonlWatcher {
     this._timers = new Map();
     this._seqs = new Map();
     this._streaming = new Set();
+    this._sessions = new Map();
     this._watcher = null;
   }
 
@@ -42,6 +43,7 @@ export class JsonlWatcher {
       this._convMap.delete(sid);
       this._seqs.delete(sid);
       this._streaming.delete(sid);
+      this._sessions.delete(sid);
       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;
@@ -58,6 +60,7 @@ export class JsonlWatcher {
     for (const t of this._timers.values()) clearTimeout(t);
     this._tails.clear(); this._convMap.clear(); this._emitted.clear();
     this._timers.clear(); this._seqs.clear(); this._streaming.clear();
+    this._sessions.clear();
   }
 
   _scanDir(dir, depth) {
@@ -129,8 +132,19 @@ export class JsonlWatcher {
 
   _seq(sid) { const n = (this._seqs.get(sid) || 0) + 1; this._seqs.set(sid, n); return n; }
 
+  _dbSession(cid, sid) {
+    if (this._sessions.has(sid)) return this._sessions.get(sid);
+    const sess = this._q.createSession(cid);
+    this._q.updateSession(sess.id, { status: 'active' });
+    this._sessions.set(sid, sess.id);
+    return sess.id;
+  }
+
   _emit(cid, sid, block, role, extra) {
-    this._bc({ type: 'streaming_progress', sessionId: sid, conversationId: cid, block, blockRole: role, seq: this._seq(sid), timestamp: Date.now(), ...extra });
+    const dbSid = this._dbSession(cid, sid);
+    const seq = this._seq(sid);
+    try { this._q.createChunk(dbSid, cid, seq, block.type || 'unknown', block); } catch (_) {}
+    this._bc({ type: 'streaming_progress', sessionId: dbSid, conversationId: cid, block, blockRole: role, seq, timestamp: Date.now(), ...extra });
   }
 
   _emitBlocks(cid, sid, blocks, role) {
@@ -143,20 +157,28 @@ export class JsonlWatcher {
   _startStreaming(cid, sid) {
     if (this._streaming.has(sid)) return;
     this._streaming.add(sid);
-    this._bc({ type: 'streaming_start', sessionId: sid, conversationId: cid, agentId: 'cli-claude', timestamp: Date.now() });
+    const dbSid = this._dbSession(cid, sid);
+    this._q.setIsStreaming(cid, true);
+    this._bc({ type: 'streaming_start', sessionId: dbSid, conversationId: cid, agentId: 'cli-claude', timestamp: Date.now() });
   }
 
   _endStreaming(cid, sid) {
     if (!this._streaming.has(sid)) return;
     this._streaming.delete(sid);
-    this._bc({ type: 'streaming_complete', sessionId: sid, conversationId: cid, agentId: 'cli-claude', eventCount: 0, seq: this._seq(sid), timestamp: Date.now() });
+    const dbSid = this._sessions.get(sid);
+    if (dbSid) {
+      try { this._q.updateSession(dbSid, { status: 'completed', completed_at: Date.now() }); } catch (_) {}
+    }
+    this._q.setIsStreaming(cid, false);
+    this._bc({ type: 'streaming_complete', sessionId: dbSid || sid, conversationId: cid, agentId: 'cli-claude', eventCount: 0, seq: this._seq(sid), timestamp: Date.now() });
+    this._sessions.delete(sid);
   }
 
   _route(cid, sid, e) {
     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() });
+      this._bc({ type: 'streaming_error', sessionId: this._sessions.get(sid) || sid, conversationId: cid, error: 'Rate limit hit', recoverable: true, timestamp: Date.now() });
       return;
     }
 
@@ -185,7 +207,14 @@ export class JsonlWatcher {
     if (e.type === 'user' && e.message?.content) {
       if (e.isCompactSummary) { this._emit(cid, sid, { type: 'compact_summary', content: e.message.content }, 'system'); return; }
       this._startStreaming(cid, sid);
-      const blocks = Array.isArray(e.message.content) ? e.message.content : [];
+      const content = e.message.content;
+      const textParts = Array.isArray(content)
+        ? content.filter(b => b.type === 'text' && b.text && !b.text.startsWith('<task-notification>')).map(b => b.text).join('\n')
+        : (typeof content === 'string' && !content.startsWith('<task-notification>') ? content : '');
+      if (textParts) {
+        try { this._q.createMessage(cid, 'user', textParts); } catch (_) {}
+      }
+      const blocks = Array.isArray(content) ? content : [];
       for (const b of blocks) if (b.type === 'tool_result') this._emit(cid, sid, b, 'tool_result');
       return;
     }

package/package.json

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