@clawchatsai/connector 0.1.6 → 0.1.8

package/dist/index.js

@@ -144,7 +144,7 @@ Notes:
 - Works for images (png, jpg, gif, webp, svg, etc.), documents, markdown, code files, and more
 - Output each path once — duplicates are ignored automatically
 `;
-async function startClawChats(ctx, api, mediaStash) {
+async function startClawChats(ctx, api) {
     _stopRequested = false;
     // Bootstrap CLAWCHATS.md in the agent workspace so the agent always knows the MEDIA: protocol.
     // Written once on plugin start; never overwrites an existing file (user may have customised it).
@@ -255,7 +255,6 @@ async function startClawChats(ctx, api, mediaStash) {
             return process.env.OPENAI_API_KEY || null;
         })(),
         memoryEnv: memoryEnvFiltered,
-        mediaStash, // Shared Map populated by after_tool_call hook (captures MEDIA: paths from exec)
     });
     // 4. Connect createApp's gateway client (handles persistence + event relay)
     app.gatewayClient.connect();
@@ -1284,49 +1283,22 @@ const plugin = {
     name: 'ClawChats',
     description: 'Connects your gateway to ClawChats via WebRTC P2P',
     register(api) {
-        // Shared stash: after_tool_call hook populates this; saveAssistantMessage reads + clears it.
-        // Keyed by sessionKey → absolute paths extracted from MEDIA: lines in exec stdout.
-        const mediaStash = new Map();
         // Inject MEDIA: capability note into the system prompt via before_prompt_build.
         // Appended to system context (trusted, not user-turn) so it's always present and
         // never flagged as prompt injection. Survives compaction automatically.
+        //
+        // Path parsing lives in server/gateway.js handleAgentEvent (stable singleton) —
+        // do NOT hold state in this closure; OpenClaw may call register() multiple times
+        // during the plugin lifecycle and each call creates a fresh closure.
         api.on('before_prompt_build', (_event, _ctx) => {
             return {
                 appendSystemContext: 'ClawChats inline preview: after writing a file with the Write tool, run `echo "MEDIA:/absolute/path/to/file"` via the exec tool to display it inline in the chat UI.',
             };
         }, { name: 'clawchats-media-hint', description: 'Appends MEDIA: file preview capability note to system prompt' });
-        api.on('after_tool_call', (event, ctx) => {
-            if (event.toolName !== 'exec' && event.toolName !== 'process')
-                return;
-            // result is { content: [{ type: 'text', text: '...' }] } — extract text defensively
-            const result = event.result;
-            let text = '';
-            if (typeof result?.text === 'string') {
-                text = result.text;
-            }
-            else if (Array.isArray(result?.content)) {
-                text = result.content
-                    .filter(c => c.type === 'text' && typeof c.text === 'string')
-                    .map(c => c.text)
-                    .join('\n');
-            }
-            else if (result != null) {
-                text = String(result);
-            }
-            const paths = [...text.matchAll(/^MEDIA:\s*(\S+)/gm)].map(m => m[1].trim());
-            if (paths.length === 0)
-                return;
-            const sessionKey = ctx.sessionKey;
-            if (!sessionKey)
-                return;
-            const existing = mediaStash.get(sessionKey) ?? [];
-            mediaStash.set(sessionKey, [...new Set([...existing, ...paths])]);
-            console.log(`[clawchats] media-capture: stashed ${paths.length} path(s) for ${sessionKey}:`, paths);
-        }, { name: 'clawchats-media-capture', description: 'Captures MEDIA: paths from exec results for inline image rendering' });
         // Background service: signaling + gateway bridge + future WebRTC
         api.registerService({
             id: 'connector-service',
-            start: (ctx) => startClawChats(ctx, api, mediaStash),
+            start: (ctx) => startClawChats(ctx, api),
             stop: (ctx) => stopClawChats(ctx),
         });
         // CLI commands

package/package.json

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

package/server/gateway.js

@@ -4,14 +4,16 @@ import { loadOrCreateDeviceIdentity, buildDeviceAuth } from './bootstrap/identit
 import { parseSessionKey, extractContent, isSilentReplyExact, isSilentReplyPrefix, sanitizeAssistantContent, syncThreadUnreadCount, generateActivitySummary, writeActivityToDb } from './util/helpers.js';
 
 export class GatewayClient {
-  constructor({ getDb, getWorkspaces, dataDir, debugLogger, gatewayWsUrl, authToken, mediaStash }) {
+  constructor({ getDb, getWorkspaces, dataDir, debugLogger, gatewayWsUrl, authToken }) {
     this.getDb = getDb;
     this.getWorkspaces = getWorkspaces;
     this.dataDir = dataDir;
     this.debugLogger = debugLogger;
     this.gatewayWsUrl = gatewayWsUrl;
     this.authToken = authToken;
-    this.mediaStash = mediaStash;
+    // Per-session buffer of MEDIA: paths extracted from exec tool args (echo "MEDIA:/...").
+    // Lives on the stable singleton — safe from plugin re-registration that broke the old closure-based stash.
+    this._runMediaPaths = new Map();
 
     this.ws = null;
     this.connected = false;
@@ -22,6 +24,10 @@ export class GatewayClient {
     this.streamState = new Map();
     this.activityLogs = new Map();
     this._pendingTitleGens = new Map();
+    // Runs we've already synthesized a streaming-end{reason:'error'} for
+    // (agent lifecycle:error emitted but no chat state:error ever will). Prevents
+    // double-fires across retries and cross-path dedup with handleChatEvent.
+    this._syntheticErrorRuns = new Set();
 
     // On startup: mark any pending activity log messages from previous crashed/restarted sessions
     // as interrupted. Without this, stale pending=true rows survive gateway restarts and cause
@@ -224,10 +230,10 @@ export class GatewayClient {
     // Intermediate narration lives in activityLog steps; message.content is the clean final answer.
     let content = sanitizeAssistantContent(extractContent(message).substring(thoughtStartOffset));
 
-    // 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);
+    // Attach media (MEDIA: paths extracted from exec tool args by handleAgentEvent).
+    // Buffer is read before the empty-content guard — media-only responses (no text) must not be dropped.
+    const pendingPaths = this._runMediaPaths.get(sessionKey) ?? [];
+    this._runMediaPaths.delete(sessionKey);
     const IMAGE_EXTS = new Set(['png','jpg','jpeg','gif','webp','bmp','svg','ico','avif','tiff']);
     const AUDIO_EXTS = new Set(['mp3','wav','ogg','m4a','flac','aac','opus','wma']);
     const imagePaths = [], pendingAttachments = [];
@@ -363,6 +369,16 @@ export class GatewayClient {
         log._currentAssistantSegment._sealed = true;
       }
       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') || '') : '';
+      // Extract MEDIA: paths from exec tool's echo command at phase:start.
+      // The agent signals inline media with `echo "MEDIA:/absolute/path"` (see plugin's before_prompt_build hint).
+      // Parsing the tool args here keeps state on this stable singleton instead of the plugin's re-registered closure.
+      if (sessionKey && (data?.name === 'exec' || data?.name === 'process') && data?.phase === 'start' && typeof data?.args?.command === 'string') {
+        const paths = [...data.args.command.matchAll(/MEDIA:([^\s"'`]+)/g)].map(m => m[1]).filter(Boolean);
+        if (paths.length > 0) {
+          const existing = this._runMediaPaths.get(sessionKey) ?? [];
+          this._runMediaPaths.set(sessionKey, [...new Set([...existing, ...paths])]);
+        }
+      }
       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'));
@@ -402,6 +418,29 @@ export class GatewayClient {
       log.finalSteps = cleanSteps;
       log.finalSummary = generateActivitySummary(log.steps);
       // Note: activityLogs entry is kept until _popActivityLogForSession cleans it up
+      //
+      // Fallback: if the gateway never emitted any chat.* events for this session
+      // (e.g. pre-reply provider error on a non-webchat surface where the chat
+      // broadcast is gated off upstream), handleChatEvent won't fire a
+      // streaming-end and the UI stays locked on "thinking…" forever. Synthesize
+      // one here so the frontend's existing error path (`reason: 'error'`) runs.
+      if (data?.phase === 'error' && !this.streamState.has(sessionKey) && !this._syntheticErrorRuns.has(runId)) {
+        this._syntheticErrorRuns.add(runId);
+        const parsed = parseSessionKey(sessionKey);
+        if (parsed) {
+          this.broadcastToBrowsers(JSON.stringify({
+            type: 'clawchats',
+            event: 'streaming-end',
+            threadId: parsed.threadId,
+            workspace: parsed.workspace,
+            reason: 'error',
+            errorMessage: data?.error || 'Agent failed before reply',
+          }));
+        }
+        // Bound the set — auto-evict after the retry window so long-lived
+        // processes don't leak. 5 min is far longer than any retry chain.
+        setTimeout(() => this._syntheticErrorRuns.delete(runId), 5 * 60 * 1000);
+      }
     }
   }
 

package/server/index.js

@@ -83,7 +83,6 @@ export function createApp(config = {}) {
   const { getWorkspaces, setWorkspaces } = createWorkspaceStore(WORKSPACES_FILE);
 
   const debugLogger = new DebugLogger(DATA_DIR);
-  const mediaStash = config.mediaStash ?? new Map();
 
   const memoryConfig = discoverMemoryConfig(config.memoryEnv || {});
   const memoryProvider = createMemoryProvider(memoryConfig);
@@ -91,7 +90,7 @@ export function createApp(config = {}) {
   const MEMORY_FILES_DIR = path.join(memoryConfig.workspaceDir, 'memory');
 
   // Instantiate the gateway client with all dependencies injected
-  const gatewayClient = new GatewayClient({ getDb, getWorkspaces, dataDir: DATA_DIR, debugLogger, gatewayWsUrl: gatewayUrl, authToken: gatewayToken, mediaStash });
+  const gatewayClient = new GatewayClient({ getDb, getWorkspaces, dataDir: DATA_DIR, debugLogger, gatewayWsUrl: gatewayUrl, authToken: gatewayToken });
   const broadcast = msg => gatewayClient.broadcastToBrowsers(msg);
 
   // Instantiate controllers