@clawchatsai/connector 0.0.43 → 0.0.45

package/package.json

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

package/server.js

@@ -1437,7 +1437,10 @@ function handleServeFile(req, res, query) {
   if (!filePath) return sendError(res, 400, 'Missing path parameter');
 
   // Resolve to prevent traversal attacks
-  const resolved = path.resolve(filePath);
+  // Relative paths (./filename) resolve against the workspace directory
+  const resolved = (filePath.startsWith('./') || filePath.startsWith('../'))
+    ? path.resolve(MEMORY_CONFIG.workspaceDir, filePath)
+    : path.resolve(filePath);
 
   // Security: only serve files from allowed directories
   const allowed = ALLOWED_FILE_DIRS.some(dir => resolved.startsWith(dir + '/') || resolved === dir);
@@ -3966,6 +3969,7 @@ export function createApp(config = {}) {
       this._externalBroadcastTargets = [];
       this.streamState = new Map();
       this.activityLogs = new Map();
+      this._pendingMediaUrls = new Map(); // sessionKey → string[] of MEDIA: paths captured during streaming
       setInterval(() => {
         const cutoff = Date.now() - 10 * 60 * 1000;
         for (const [runId, log] of this.activityLogs) {
@@ -4062,6 +4066,42 @@ export function createApp(config = {}) {
       if (!content || !content.trim()) { console.log(`Skipping empty assistant response for thread ${parsed.threadId}`); return; }
       const now = Date.now();
 
+      // Check if the final assembled message content contains MEDIA: lines
+      console.log('[ClawChats] saveAssistantMessage hasMedia:', content.includes('MEDIA:'), 'msgKeys:', Object.keys(message||{}), 'msgMediaUrls:', JSON.stringify(message?.mediaUrls), 'msgMediaUrl:', message?.mediaUrl);
+
+      // Extract MEDIA: paths from the final complete message content (if gateway preserves them here)
+      let attachments = null;
+      const mediaMatches = [...content.matchAll(/^MEDIA:\s*(\S+)/gm)].map(m => m[1].trim()).filter(p => /\.\w{1,10}$/.test(p));
+      if (mediaMatches.length > 0) {
+        console.log('[ClawChats] MEDIA paths from final content:', JSON.stringify(mediaMatches));
+        attachments = mediaMatches.map(filePath => {
+          const name = path.basename(filePath);
+          const ext = (name.split('.').pop() || '').toLowerCase();
+          const type = ['jpg','jpeg','png','gif','webp','svg','bmp','ico'].includes(ext) ? 'image'
+            : ['mp3','wav','ogg','aac','m4a','flac','opus'].includes(ext) ? 'audio'
+            : ['mp4','webm','mov','avi','mkv'].includes(ext) ? 'video' : 'file';
+          return { path: filePath, name, type };
+        });
+      }
+
+      // Fallback: use MEDIA: paths captured from delta stream
+      if (!attachments) {
+        const paths = this._pendingMediaUrls.get(sessionKey);
+        this._pendingMediaUrls.delete(sessionKey);
+        if (paths?.length) {
+          attachments = paths.map(filePath => {
+            const name = path.basename(filePath);
+            const ext = (name.split('.').pop() || '').toLowerCase();
+            const type = ['jpg','jpeg','png','gif','webp','svg','bmp','ico'].includes(ext) ? 'image'
+              : ['mp3','wav','ogg','aac','m4a','flac','opus'].includes(ext) ? 'audio'
+              : ['mp4','webm','mov','avi','mkv'].includes(ext) ? 'video' : 'file';
+            return { path: filePath, name, type };
+          });
+        }
+      } else {
+        this._pendingMediaUrls.delete(sessionKey); // clean up either way
+      }
+
       // Check for pending activity message
       const pendingMsg = db.prepare(`
         SELECT id, metadata FROM messages
@@ -4081,13 +4121,15 @@ export function createApp(config = {}) {
           if (lastAssistantIdx >= 0) metadata.activityLog.splice(lastAssistantIdx, 1);
           metadata.activitySummary = this.generateActivitySummary(metadata.activityLog);
         }
+        if (attachments) metadata.attachments = attachments;
         db.prepare('UPDATE messages SET content = ?, metadata = ?, timestamp = ? WHERE id = ?')
           .run(content, JSON.stringify(metadata), now, pendingMsg.id);
         messageId = pendingMsg.id;
       } else {
         // No pending activity — normal INSERT (simple responses, no tools)
         messageId = seq != null ? `gw-${parsed.threadId}-${seq}` : `gw-${parsed.threadId}-${now}`;
-        db.prepare(`INSERT INTO messages (id, thread_id, role, content, status, timestamp, created_at) VALUES (?, ?, 'assistant', ?, 'sent', ?, ?) ON CONFLICT(id) DO UPDATE SET content = excluded.content, timestamp = excluded.timestamp`).run(messageId, parsed.threadId, content, now, now);
+        const metaStr = attachments ? JSON.stringify({ attachments }) : null;
+        db.prepare(`INSERT INTO messages (id, thread_id, role, content, status, metadata, timestamp, created_at) VALUES (?, ?, 'assistant', ?, 'sent', ?, ?, ?) ON CONFLICT(id) DO UPDATE SET content = excluded.content, metadata = COALESCE(excluded.metadata, metadata), timestamp = excluded.timestamp`).run(messageId, parsed.threadId, content, metaStr, now, now);
       }
 
       try {
@@ -4129,6 +4171,8 @@ export function createApp(config = {}) {
       } catch (e) { console.error(`Failed to save error marker:`, e.message); }
     }
 
+    // _scanRecentWorkspaceFiles removed — MEDIA: paths captured from delta stream instead
+
     generateThreadTitle(db, threadId, workspace, skipHeuristic = false) {
       const thread = db.prepare('SELECT title FROM threads WHERE id = ?').get(threadId);
       if (!thread) return;
@@ -4179,7 +4223,25 @@ export function createApp(config = {}) {
       if (!this.activityLogs.has(runId)) this.activityLogs.set(runId, { sessionKey, steps: [], startTime: Date.now() });
       const log = this.activityLogs.get(runId);
       if (stream === 'assistant') {
+        // Check data.mediaUrls — gateway populates this via splitMediaFromOutput on each streaming event.
+        // Partial path events (e.g. ["/"]) fail the extension filter; complete-path events pass.
+        const incomingUrls = Array.isArray(data?.mediaUrls) ? data.mediaUrls : (data?.mediaUrl ? [data.mediaUrl] : []);
+        for (const p of incomingUrls) {
+          if (typeof p === 'string' && /\.\w{1,10}$/.test(p)) {
+            if (!log._seenMediaPaths) log._seenMediaPaths = new Set();
+            if (!log._seenMediaPaths.has(p)) {
+              log._seenMediaPaths.add(p);
+              if (!this._pendingMediaUrls.has(sessionKey)) this._pendingMediaUrls.set(sessionKey, []);
+              this._pendingMediaUrls.get(sessionKey).push(p);
+              console.log('[ClawChats] MEDIA path captured from mediaUrls:', p);
+            }
+          }
+        }
+        if (incomingUrls.length > 0) console.log('[ClawChats] mediaUrls on event:', JSON.stringify(incomingUrls));
         const text = data?.text || '';
+        const delta = data?.delta || '';
+        // Log if a MEDIA: directive appears in text or delta (must look like an actual path, not just the word)
+        if (/MEDIA:\s*[./~a-zA-Z]/.test(text.slice(-80)) || /MEDIA:\s*[./~a-zA-Z]/.test(delta)) console.log('[ClawChats] MEDIA in stream! text tail:', JSON.stringify(text.slice(-80)), 'delta:', JSON.stringify(delta));
         if (text) {
           let currentSegment = log._currentAssistantSegment;
           if (!currentSegment || currentSegment._sealed) {
@@ -4206,6 +4268,7 @@ export function createApp(config = {}) {
         if (log._currentAssistantSegment && !log._currentAssistantSegment._sealed) { log._currentAssistantSegment._sealed = true; }
         const step = { type: 'tool', timestamp: Date.now(), name: data?.name || 'unknown', phase: data?.phase || 'start', toolCallId: data?.toolCallId, meta: data?.meta, isError: data?.isError || false };
         if (data?.phase === 'result') {
+          if (data?.name === 'exec') console.log('[ClawChats] exec tool result meta:', JSON.stringify(data?.meta));
           const existing = log.steps.findLast(s => s.toolCallId === data.toolCallId && (s.phase === 'start' || s.phase === 'running'));
           if (existing) { existing.phase = 'done'; existing.resultMeta = data?.meta; existing.isError = data?.isError || false; existing.durationMs = Date.now() - existing.timestamp; }
           else { step.phase = 'done'; log.steps.push(step); }
@@ -4218,6 +4281,7 @@ export function createApp(config = {}) {
       }
       if (stream === 'lifecycle') {
         if (data?.phase === 'end' || data?.phase === 'error') {
+          // MEDIA: paths already captured during delta streaming — nothing to do here
           if (log._currentAssistantSegment && !log._currentAssistantSegment._sealed) log._currentAssistantSegment._sealed = true;
           const lastAssistantIdx = log.steps.findLastIndex(s => s.type === 'assistant');
           if (lastAssistantIdx >= 0) log.steps.splice(lastAssistantIdx, 1);
@@ -4544,7 +4608,7 @@ export function createApp(config = {}) {
   }
 
   // ── Browser WebSocket setup (shared logic for standalone and plugin) ────────
-  function _setupBrowserWs(wssInstance) {
+    function _setupBrowserWs(wssInstance) {
     wssInstance.on('connection', (ws) => {
       console.log('Browser client connected');
       _gatewayClient.addBrowserClient(ws);
@@ -4554,6 +4618,7 @@ export function createApp(config = {}) {
       ws.on('message', (data) => {
         const msgStr = data.toString();
         _debugLogger.logFrame('BR→SRV', msgStr);
+        let forwardStr = msgStr;
         try {
           const msg = JSON.parse(msgStr);
           if (msg.type === 'req' && msg.method === 'connect') {
@@ -4573,8 +4638,9 @@ export function createApp(config = {}) {
             if (msg.action === 'debug-start') { const result = _debugLogger.start(msg.ts, ws); if (result.error === 'already-active') ws.send(JSON.stringify({ type: 'clawchats', event: 'debug-error', error: 'Recording already active in another tab', sessionId: result.sessionId })); else ws.send(JSON.stringify({ type: 'clawchats', event: 'debug-started', sessionId: result.sessionId })); return; }
             if (msg.action === 'debug-dump') { const { sessionId, files } = _debugLogger.saveDump(msg); ws.send(JSON.stringify({ type: 'clawchats', event: 'debug-saved', sessionId, files })); return; }
           }
-        } catch { /* Not JSON or not a ClawChats message, forward to gateway */ }
-        _gatewayClient.sendToGateway(msgStr);
+          // (no hint injection — mediaUrls are captured from agent events directly)
+        } catch { /* Not JSON or not a ClawChats message, forward as-is */ }
+        _gatewayClient.sendToGateway(forwardStr);
       });
 
       ws.on('close', () => { console.log('Browser client disconnected'); _debugLogger.handleClientDisconnect(ws); _gatewayClient.removeBrowserClient(ws); });