@clawchatsai/connector 0.1.8 → 0.1.10

package/package.json

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

package/server/gateway.js

@@ -11,9 +11,13 @@ export class GatewayClient {
     this.debugLogger = debugLogger;
     this.gatewayWsUrl = gatewayWsUrl;
     this.authToken = authToken;
-    // Per-session buffer of MEDIA: paths extracted from exec tool args (echo "MEDIA:/...").
+    // Per-session buffer of attachment paths captured during a run. Drained by saveAssistantMessage.
+    // Sources: (1) MEDIA: paths from exec tool's echo args, (2) Write/Edit tool args.path.
     // Lives on the stable singleton — safe from plugin re-registration that broke the old closure-based stash.
     this._runMediaPaths = new Map();
+    // Per-toolCallId staging for Write/Edit: path captured at phase:start, promoted to _runMediaPaths
+    // at phase:result if the call succeeded. Keyed by toolCallId; value: { sessionKey, path }.
+    this._runWriteBuffers = new Map();
 
     this.ws = null;
     this.connected = false;
@@ -292,7 +296,7 @@ export class GatewayClient {
     if (!db.prepare('SELECT id FROM threads WHERE id = ?').get(parsed.threadId)) return;
     const now = Date.now();
     try {
-      db.prepare('INSERT INTO messages (id, thread_id, role, content, status, metadata, timestamp, created_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?)').run(`gw-error-${parsed.threadId}-${now}`, parsed.threadId, 'system', `[error] ${gwErrorMessage || message?.error || message?.content || 'Unknown error'}`, 'sent', '{"transient":true}', now, now);
+      db.prepare('INSERT INTO messages (id, thread_id, role, content, status, metadata, timestamp, created_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?)').run(`gw-error-${parsed.threadId}-${now}`, parsed.threadId, 'system', `[error] ${message?.error || message?.content || 'Unknown error'}`, 'sent', '{"transient":true}', now, now);
       // Clear stale pending flag so browsers reloading the chat don't re-derive "thinking..." state.
       db.prepare("UPDATE messages SET metadata = json_remove(metadata, '$.pending') WHERE thread_id = ? AND role = 'assistant' AND json_extract(metadata, '$.pending') = 1").run(parsed.threadId);
     } catch (e) { console.error('Failed to save error marker:', e.message); }
@@ -379,6 +383,31 @@ export class GatewayClient {
           this._runMediaPaths.set(sessionKey, [...new Set([...existing, ...paths])]);
         }
       }
+      // Capture Write/Edit tool paths. The split pane (and existing attachment chip render) handles
+      // any text-ish or PDF file, so allow that broad set; image/audio extensions also flow through
+      // — saveAssistantMessage routes them by ext (image → markdown, audio → audio chip).
+      // Buffer at phase:start when args.path is present; promote to _runMediaPaths at phase:result
+      // only if the call succeeded — failed writes shouldn't surface a chip for a file that may not exist.
+      const VIEWABLE_EXTS = new Set([
+        'pdf','md','mdx','rst','txt','log',
+        'csv','tsv','json','xml','yaml','yml','toml','ini','env','conf',
+        'js','jsx','mjs','cjs','ts','tsx','py','rb','go','rs','java','c','cpp','h','hpp','cs','php',
+        'html','htm','css','scss','sass','less','sh','bash','zsh','sql','pl','lua','r','swift','kt','dart',
+        'png','jpg','jpeg','gif','webp','bmp','svg','ico','avif','tiff',
+        'mp3','wav','ogg','m4a','flac','aac','opus','wma'
+      ]);
+      if (sessionKey && data?.toolCallId && /^(write|edit|multiedit|notebookedit)$/i.test(data?.name || '') && data?.phase === 'start' && typeof data?.args?.path === 'string' && data.args.path.length > 0) {
+        const ext = (data.args.path.split('.').pop() || '').toLowerCase();
+        if (VIEWABLE_EXTS.has(ext)) this._runWriteBuffers.set(data.toolCallId, { sessionKey, path: data.args.path });
+      }
+      if (data?.toolCallId && data?.phase === 'result' && this._runWriteBuffers.has(data.toolCallId)) {
+        const buf = this._runWriteBuffers.get(data.toolCallId);
+        this._runWriteBuffers.delete(data.toolCallId);
+        if (!data.isError && buf.sessionKey === sessionKey) {
+          const existing = this._runMediaPaths.get(buf.sessionKey) ?? [];
+          this._runMediaPaths.set(buf.sessionKey, [...new Set([...existing, buf.path])]);
+        }
+      }
       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') {
         const existing = log.steps.findLast(s => s.toolCallId === data.toolCallId && (s.phase === 'start' || s.phase === 'running'));
@@ -428,6 +457,11 @@ export class GatewayClient {
         this._syntheticErrorRuns.add(runId);
         const parsed = parseSessionKey(sessionKey);
         if (parsed) {
+          // Mirror the state:'error' path — writeActivityToDb just set metadata.pending=true,
+          // and without this the flag survives: loadHistory re-derives has_pending on reconnect,
+          // "thinking…" sticks, and sendMessage's isStreaming() guard queues future sends into
+          // _pendingSend forever.
+          this.saveErrorMarker(sessionKey, { error: data?.error || 'Agent failed before reply' });
           this.broadcastToBrowsers(JSON.stringify({
             type: 'clawchats',
             event: 'streaming-end',