@clawchatsai/connector 0.0.91 → 0.0.92

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawchatsai/connector",
-  "version": "0.0.91",
+  "version": "0.0.92",
   "type": "module",
   "description": "ClawChats OpenClaw plugin — P2P tunnel + local API bridge",
   "main": "dist/index.js",

package/server/controllers/messages.js

@@ -33,9 +33,7 @@ export class MessageController {
     const metadata = body.metadata ? JSON.stringify(body.metadata) : null;
     const existing = db.prepare('SELECT id, status, metadata FROM messages WHERE id = ?').get(body.id);
     if (existing) {
-      if (body.status && body.status !== existing.status) {
-        db.prepare('UPDATE messages SET status = ?, content = ?, metadata = ? WHERE id = ?').run(body.status, body.content, metadata || existing.metadata, body.id);
-      }
+      db.prepare('UPDATE messages SET status = ?, content = ?, metadata = ? WHERE id = ?').run(body.status || existing.status, body.content, metadata || existing.metadata, body.id);
     } else {
       db.prepare('INSERT INTO messages (id, thread_id, role, content, status, metadata, seq, timestamp, created_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)').run(body.id, params.id, body.role, body.content, body.status || 'sent', metadata, body.seq || null, body.timestamp, Date.now());
       db.prepare('UPDATE threads SET updated_at = ? WHERE id = ?').run(Date.now(), params.id);

package/server/gateway.js

@@ -121,9 +121,9 @@ export class GatewayClient {
     if (!db.prepare('SELECT id FROM threads WHERE id = ?').get(parsed.threadId)) { console.log(`Ignoring response for deleted thread: ${parsed.threadId}`); return; }
 
     let content = sanitizeAssistantContent(extractContent(message));
-    if (!content?.trim()) { console.log(`Skipping empty assistant response for thread ${parsed.threadId}`); return; }
 
-    // Attach media (MEDIA: lines from exec stdout captured by after_tool_call hook)
+    // Attach media (MEDIA: lines from exec stdout captured by after_tool_call hook).
+    // Stash is read before the empty-content guard — media-only responses (no text) must not be dropped.
     const pendingPaths = this.mediaStash?.get(sessionKey) ?? [];
     this.mediaStash?.delete(sessionKey);
     const IMAGE_EXTS = new Set(['png','jpg','jpeg','gif','webp','bmp','svg','ico','avif','tiff']);
@@ -134,9 +134,12 @@ export class GatewayClient {
       if (IMAGE_EXTS.has(ext)) imagePaths.push(p);
       else pendingAttachments.push({ path: p, name: p.split('/').pop(), type: AUDIO_EXTS.has(ext) ? 'audio' : 'file' });
     }
-    if (imagePaths.length > 0) content = content.trimEnd() + '\n\n' + imagePaths.map(p => `![image](${p})`).join('\n');
+    if (imagePaths.length > 0) content = (content?.trimEnd() || '') + '\n\n' + imagePaths.map(p => `![image](${p})`).join('\n');
     if (pendingPaths.length > 0) console.log(`[clawchats] media-attach: ${imagePaths.length} image(s), ${pendingAttachments.length} attachment(s) for ${sessionKey}`);
 
+    // Skip only if there is truly nothing to save — no text and no pending media.
+    if (!content?.trim() && pendingPaths.length === 0) { console.log(`Skipping empty assistant response for thread ${parsed.threadId}`); return; }
+
     const now = Date.now();
     const pendingMsg = db.prepare(`SELECT id, metadata FROM messages WHERE thread_id = ? AND role = 'assistant' AND json_extract(metadata, '$.pending') = 1 ORDER BY timestamp DESC LIMIT 1`).get(parsed.threadId);
     let messageId;
@@ -228,9 +231,15 @@ export class GatewayClient {
     if (stream === 'assistant') {
       const text = data?.text || '';
       if (text) {
+        const offset = log._assistantTextOffset || 0;
         let seg = log._currentAssistantSegment;
-        if (!seg || seg._sealed) { seg = { type: 'assistant', timestamp: Date.now(), text, _sealed: false }; log._currentAssistantSegment = seg; log.steps.push(seg); }
-        else seg.text = text;
+        if (!seg || seg._sealed) {
+          seg = { type: 'assistant', timestamp: Date.now(), text: text.substring(offset), _sealed: false };
+          log._currentAssistantSegment = seg;
+          log.steps.push(seg);
+        } else {
+          seg.text = text.substring(offset);
+        }
       }
       return;
     }
@@ -243,7 +252,11 @@ export class GatewayClient {
       if (!log._lastThinkingBroadcast || now - log._lastThinkingBroadcast >= 300) { log._lastThinkingBroadcast = now; this._broadcastActivityUpdate(runId, log); }
     }
     if (stream === 'tool') {
-      if (log._currentAssistantSegment && !log._currentAssistantSegment._sealed) log._currentAssistantSegment._sealed = true;
+      if (log._currentAssistantSegment && !log._currentAssistantSegment._sealed) {
+        const seg = log._currentAssistantSegment;
+        seg._sealed = true;
+        log._assistantTextOffset = (log._assistantTextOffset || 0) + seg.text.length;
+      }
       const argsMeta = data?.args ? (data.args.command || data.args.path || data.args.query || data.args.url || Object.values(data.args).find(v => typeof v === 'string') || '') : '';
       const step = { type: 'tool', timestamp: Date.now(), name: data?.name || 'unknown', phase: data?.phase || 'start', toolCallId: data?.toolCallId, meta: data?.meta || (argsMeta ? String(argsMeta) : undefined), isError: data?.isError || false };
       if (data?.phase === 'result') {
@@ -258,10 +271,19 @@ export class GatewayClient {
       this._broadcastActivityUpdate(runId, log);
     }
     if (stream === 'lifecycle' && (data?.phase === 'end' || data?.phase === 'error')) {
-      if (log._currentAssistantSegment && !log._currentAssistantSegment._sealed) log._currentAssistantSegment._sealed = true;
+      if (log._currentAssistantSegment && !log._currentAssistantSegment._sealed) {
+        const seg = log._currentAssistantSegment;
+        seg._sealed = true;
+        log._assistantTextOffset = (log._assistantTextOffset || 0) + seg.text.length;
+      }
       const idx = log.steps.findLastIndex(s => s.type === 'assistant');
       if (idx >= 0) log.steps.splice(idx, 1);
       writeActivityToDb(this.getDb, this.broadcastToBrowsers.bind(this), runId, log);
+      // Broadcast final state so browser can clean up any in-flight timers (e.g. aborted runs)
+      if (log._parsed && log._messageId) {
+        const cleanSteps = log.steps.map(s => { const c = { ...s }; delete c._sealed; return c; });
+        this.broadcastToBrowsers(JSON.stringify({ type: 'clawchats', event: 'activity-updated', workspace: log._parsed.workspace, threadId: log._parsed.threadId, messageId: log._messageId, activityLog: cleanSteps, activitySummary: generateActivitySummary(log.steps), final: true }));
+      }
       this.activityLogs.delete(runId);
     }
   }

package/server/index.js

@@ -81,7 +81,7 @@ export function createApp(config = {}) {
   const { getWorkspaces, setWorkspaces } = createWorkspaceStore(WORKSPACES_FILE);
 
   const debugLogger = new DebugLogger(DATA_DIR);
-  const mediaStash = new Map();
+  const mediaStash = config.mediaStash ?? new Map();
 
   const memoryConfig = discoverMemoryConfig(config.memoryEnv || {});
   const memoryProvider = createMemoryProvider(memoryConfig);