@clawchatsai/connector 0.0.42 → 0.0.44

package/package.json

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

package/server.js

@@ -334,14 +334,14 @@ function getActiveDb() {
   return getDb(getWorkspaces().active);
 }
 
-let _globalDb = null;
-function getGlobalDb() {
-  if (_globalDb) return _globalDb;
-  fs.mkdirSync(DATA_DIR, { recursive: true });
-  const dbPath = path.join(DATA_DIR, 'global.db');
-  _globalDb = new Database(dbPath);
-  _globalDb.pragma('journal_mode = WAL');
-  _globalDb.exec(`
+const _globalDbCache = new Map(); // keyed by resolved dbPath
+function getGlobalDb(dataDir = DATA_DIR) {
+  const dbPath = path.join(dataDir, 'global.db');
+  if (_globalDbCache.has(dbPath)) return _globalDbCache.get(dbPath);
+  fs.mkdirSync(dataDir, { recursive: true });
+  const db = new Database(dbPath);
+  db.pragma('journal_mode = WAL');
+  db.exec(`
     CREATE TABLE IF NOT EXISTS custom_emojis (
       name TEXT NOT NULL,
       pack TEXT NOT NULL DEFAULT 'slackmojis',
@@ -351,7 +351,8 @@ function getGlobalDb() {
       PRIMARY KEY (name, pack)
     )
   `);
-  return _globalDb;
+  _globalDbCache.set(dbPath, db);
+  return db;
 }
 
 function closeDb(workspaceName) {
@@ -363,11 +364,10 @@ function closeDb(workspaceName) {
 }
 
 function closeAllDbs() {
-  for (const [name, db] of dbCache) {
-    db.close();
-  }
+  for (const [, db] of dbCache) db.close();
   dbCache.clear();
-  if (_globalDb) { _globalDb.close(); _globalDb = null; }
+  for (const [, db] of _globalDbCache) db.close();
+  _globalDbCache.clear();
 }
 
 function _createFtsTables(db) {
@@ -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);
@@ -4417,7 +4420,7 @@ export function createApp(config = {}) {
     // Custom emoji listing (no auth)
     if (method === 'GET' && urlPath === '/api/emoji') {
       try {
-        const db = getGlobalDb();
+        const db = getGlobalDb(_DATA_DIR);
         const rows = db.prepare('SELECT name, pack, url, mime_type FROM custom_emojis ORDER BY created_at DESC').all();
         res.writeHead(200, { 'Content-Type': 'application/json', 'Cache-Control': 'public, max-age=300' });
         return res.end(JSON.stringify(rows));
@@ -4461,7 +4464,7 @@ export function createApp(config = {}) {
         if (urlLower.endsWith('.gif')) mimeType = 'image/gif';
         else if (urlLower.endsWith('.webp')) mimeType = 'image/webp';
         else if (urlLower.endsWith('.jpg') || urlLower.endsWith('.jpeg')) mimeType = 'image/jpeg';
-        const db = getGlobalDb();
+        const db = getGlobalDb(_DATA_DIR);
         db.prepare('INSERT OR REPLACE INTO custom_emojis (name, pack, url, mime_type) VALUES (?, ?, ?, ?)').run(safeName, targetPack, url, mimeType);
         res.writeHead(200, { 'Content-Type': 'application/json' });
         return res.end(JSON.stringify({ name: safeName, pack: targetPack, url, mime_type: mimeType }));
@@ -4473,7 +4476,7 @@ export function createApp(config = {}) {
       try {
         const { name, pack } = await parseBody(req);
         if (!name || !pack) { res.writeHead(400, { 'Content-Type': 'application/json' }); return res.end(JSON.stringify({ error: 'Missing name or pack' })); }
-        const db = getGlobalDb();
+        const db = getGlobalDb(_DATA_DIR);
         db.prepare('DELETE FROM custom_emojis WHERE name = ? AND pack = ?').run(name, pack);
         res.writeHead(200, { 'Content-Type': 'application/json' });
         return res.end(JSON.stringify({ ok: true }));
@@ -4544,6 +4547,9 @@ export function createApp(config = {}) {
   }
 
   // ── Browser WebSocket setup (shared logic for standalone and plugin) ────────
+  // Track which sessions have already received the ClawChats file hint (once per session)
+  const _clawchatsHintedSessions = new Set();
+
   function _setupBrowserWs(wssInstance) {
     wssInstance.on('connection', (ws) => {
       console.log('Browser client connected');
@@ -4554,6 +4560,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 +4580,17 @@ 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);
+          // Inject ClawChats file hint once per session (first message only, ~15 tokens)
+          if (msg.type === 'req' && msg.method === 'chat.send' && typeof msg.params?.message === 'string') {
+            const sk = msg.params.sessionKey;
+            if (sk && !_clawchatsHintedSessions.has(sk)) {
+              _clawchatsHintedSessions.add(sk);
+              msg.params.message += '\n[ClawChats context: MEDIA: tags are stripped by the gateway and will NOT display. To show images/files inline, use markdown syntax: ![alt](./filename.ext) for workspace files or ![alt](/abs/path.ext) for any path. Always use this instead of MEDIA:]';
+              forwardStr = JSON.stringify(msg);
+            }
+          }
+        } 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); });
@@ -4630,7 +4646,7 @@ if (isDirectRun) {
     app.gatewayClient.connect();
 
     // Initialize global DB (custom emojis, etc.)
-    getGlobalDb();
+    getGlobalDb(_DATA_DIR);
   });
 
   // Graceful shutdown