thrust-cli 1.0.12 → 1.0.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thrust-cli",
-  "version": "1.0.12",
+  "version": "1.0.14",
   "description": "The local agent for Thrust AI Director",
   "type": "module",
   "homepage": "https://thrust.web.app",

package/utils/daemon.js

@@ -20,8 +20,8 @@ const API_URL = GATEWAY_URL.replace('ws://', 'http://').replace('wss://', 'https
 const AUTH_PROXY_URL = "https://everydaycats-thrust-auth-server.hf.space";
 
 // --- DEBOUNCE & POLLING TIMERS ---
-const INACTIVITY_DELAY_MS = 15 * 1000; // 30 * 1000; // lets make it 15 seconds instead 
-const MCP_POLL_INTERVAL_MS = 18 * 1000; // 0.3 * 60 * 1000; // Poll external tools every 0.3 mins (18 seconds) 
+const INACTIVITY_DELAY_MS = 15 * 1000; // Wait for 15 seconds of silence before syncing
+const MCP_POLL_INTERVAL_MS = 18 * 1000; // Poll external tools every 18 seconds
 
 let currentWatcher = null;
 let inactivityTimer = null;
@@ -59,6 +59,18 @@ function isBinaryData(buffer) {
     return false;
 }
 
+// --- CENTRAL DEBOUNCER ---
+// Called by local file changes AND MCP events. It resets the 15s timer.
+function triggerDebouncedSync() {
+    const activeProject = getActiveProject();
+    if (!activeProject || !activeProject.path) return;
+
+    if (inactivityTimer) clearTimeout(inactivityTimer);
+    inactivityTimer = setTimeout(() => {
+        syncContext(activeProject.path);
+    }, INACTIVITY_DELAY_MS);
+}
+
 export async function startDaemon(preferredPort) {
     const actualPort = await findAvailablePort(preferredPort);
     const app = express();
@@ -67,7 +79,7 @@ export async function startDaemon(preferredPort) {
         const origin = req.header('Origin');
         const allowedWebApps = ['https://thrust.web.app', 'http://localhost:3000'];
         if (req.path.startsWith('/api/mcp')) {
-            callback(null, { origin: true }); 
+            callback(null, { origin: true });
         } else if (req.path === '/api/auth/callback') {
             if (!origin || allowedWebApps.includes(origin) || origin === `http://localhost:${actualPort}`) {
                 callback(null, { origin: true, credentials: true });
@@ -102,7 +114,7 @@ export async function startDaemon(preferredPort) {
                 headers: { 'Authorization': `Bearer ${token}` }
             });
             const data = await response.json();
-            
+
             res.json({
                 projectId,
                 projectPath: config.leads[projectId].path,
@@ -114,30 +126,26 @@ export async function startDaemon(preferredPort) {
         }
     });
 
-    app.post('/api/mcp/timeline', async (req, res) => {
+    app.post('/api/mcp/timeline', (req, res) => {
         const { source, action_type, description, requires_code_sync } = req.body;
-        
+
         if (!source || !description) {
             return res.status(400).json({ error: "Malformed MCP payload." });
         }
 
         broadcastLocalLog('mcp', `🔗 [${source} Pushed Event] ${action_type}: ${description}`);
 
+        // Add to buffer and reset the 15-second countdown
         fileActivityBuffer += `\n[${new Date().toLocaleTimeString()}] [MCP EXT EVENT] Source: ${source} | Action: ${action_type} | Desc: ${description} | Needs Code Sync: ${requires_code_sync ? 'Yes' : 'No'}\n`;
+        triggerDebouncedSync();
 
-        const activeProject = getActiveProject();
-        if (activeProject && activeProject.path) {
-            if (inactivityTimer) clearTimeout(inactivityTimer);
-            await syncContext(activeProject.path);
-        }
-
-        res.json({ success: true, message: "Timeline event ingested and sync triggered." });
+        res.json({ success: true, message: "Timeline event ingested to buffer." });
     });
 
     // ==========================================
     // MCP CLIENT CONFIGURATION (FEED-IN PULL)
     // ==========================================
-    
+
     app.get('/api/mcp/servers', (req, res) => {
         res.json(getConfig().mcpServers || []);
     });
@@ -145,13 +153,12 @@ export async function startDaemon(preferredPort) {
     app.post('/api/mcp/servers', (req, res) => {
         const { name, url } = req.body;
         if (!name || !url) return res.status(400).json({ error: "Missing name or url" });
-        
+
         const config = getConfig();
         if (!config.mcpServers) config.mcpServers = [];
         config.mcpServers.push({ name, url, type: 'http' });
         saveConfig(config);
-        
-        // Trigger an immediate poll when a new service is added
+
         pollExternalMCPServers();
         res.json({ success: true });
     });
@@ -170,23 +177,20 @@ export async function startDaemon(preferredPort) {
     // EXTERNAL MCP DIRECT QUERY (AI OR MANUAL)
     // ==========================================
     app.post('/api/mcp/query', async (req, res) => {
+        const { serverName, toolName, targetArg } = req.body;
+        const config = getConfig();
 
-  const { serverName, toolName, targetArg } = req.body;
-  const config = getConfig();
-        
-        // Find the requested server by name (e.g., "Unity")
         const server = config.mcpServers?.find(s => s.name.toLowerCase() === serverName.toLowerCase());
-        
+
         if (!server) return res.status(404).json({ error: `MCP Server '${serverName}' not found.` });
 
         try {
-            // Build the JSON-RPC Payload
             const payload = {
                 jsonrpc: "2.0",
                 method: "tools/call",
-                params: { 
-                    name: toolName, 
-                    arguments: targetArg ? { target: targetArg } : {} 
+                params: {
+                    name: toolName,
+                    arguments: targetArg ? { target: targetArg } : {}
                 },
                 id: Date.now()
             };
@@ -198,15 +202,15 @@ export async function startDaemon(preferredPort) {
             });
 
             if (!response.ok) throw new Error("Server responded with error");
-            
+
             const data = await response.json();
             const resultText = data.result?.content?.[0]?.text || "No data returned.";
-            
-            // Log it locally so the user sees the system thinking
+
             broadcastLocalLog('mcp', `⚡ Queried ${serverName} for ${toolName}.`);
-            
-            // Inject this data directly into the activity buffer so the AI sees it on the next sync
+
+            // Add the query result to the buffer and reset the 15-second countdown
             fileActivityBuffer += `\n[${new Date().toLocaleTimeString()}] [MCP DIRECT QUERY RESULT] Source: ${serverName} | Tool: ${toolName} | Target: ${targetArg || 'none'} \nResult:\n${resultText}\n`;
+            triggerDebouncedSync();
 
             res.json({ success: true, data: resultText });
 
@@ -284,6 +288,7 @@ export async function startDaemon(preferredPort) {
             if (!response.ok) throw new Error(data.error);
 
             if (config.leads[projectId]?.path) {
+                // Instantly sync when a task is manually completed to update cloud state fast
                 if (inactivityTimer) clearTimeout(inactivityTimer);
                 syncContext(config.leads[projectId].path);
             }
@@ -370,10 +375,10 @@ export async function startDaemon(preferredPort) {
         saveConfig(config);
 
         await startWatching(folderPath);
-        
-        if (inactivityTimer) clearTimeout(inactivityTimer);
-        syncContext(folderPath);
-        
+
+        // Initial sync on link
+        triggerDebouncedSync();
+
         res.json({ success: true });
     });
 
@@ -452,7 +457,6 @@ async function pollExternalMCPServers() {
 
     for (const server of config.mcpServers) {
         try {
-            // Send standard MCP JSON-RPC payload asking for recent activity
             const res = await fetch(server.url, {
                 method: 'POST',
                 headers: { 'Content-Type': 'application/json' },
@@ -466,11 +470,9 @@ async function pollExternalMCPServers() {
 
             if (res.ok) {
                 const data = await res.json();
-                
-                // Parse standard MCP response { result: { content: [{ text: "..." }] } }
                 if (data.result && data.result.content && data.result.content.length > 0) {
                     const updateText = data.result.content[0].text;
-                    
+
                     if (updateText && updateText.trim() !== "" && updateText.trim() !== "No new activity") {
                         fileActivityBuffer += `\n[${new Date().toLocaleTimeString()}] [MCP POLL] Source: ${server.name} | Update: ${updateText}\n`;
                         broadcastLocalLog('mcp', `🔗 Pulled new data from ${server.name}`);
@@ -479,16 +481,12 @@ async function pollExternalMCPServers() {
                 }
             }
         } catch (e) {
-            broadcastLocalLog('error', `⚠️ Failed to poll MCP: ${server.name}`);
+            // Silently fail to avoid spamming the logs if Unity is temporarily closed
         }
     }
 
     if (hasNewData) {
-        const activeProject = getActiveProject();
-        if (activeProject && activeProject.path) {
-            if (inactivityTimer) clearTimeout(inactivityTimer);
-            await syncContext(activeProject.path);
-        }
+        triggerDebouncedSync();
     }
 }
 
@@ -505,7 +503,12 @@ async function startWatching(projectPath) {
         mcpPollTimer = setInterval(pollExternalMCPServers, MCP_POLL_INTERVAL_MS);
 
         currentWatcher = chokidar.watch(projectPath, {
-            ignored: [/(^|[\/\\])\../, '**/node_modules/**', '**/dist/**', '**/build/**'],
+            ignored: [
+                /(^|[\/\\])\../, 
+                '**/node_modules/**', '**/dist/**', '**/build/**',
+                // Ignore noisy Unity cache & build folders to prevent infinite debounce loops
+                '**/Library/**', '**/Temp/**', '**/Logs/**', '**/obj/**', '**/ProjectSettings/**'
+            ],
             persistent: true,
             ignoreInitial: true
         });
@@ -515,10 +518,7 @@ async function startWatching(projectPath) {
             fileActivityBuffer += `[${new Date().toLocaleTimeString()}] ${event.toUpperCase()}: ${relativePath}\n`;
             broadcastLocalLog('watch', `[${event.toUpperCase()}] ${relativePath}`);
 
-            if (inactivityTimer) clearTimeout(inactivityTimer);
-            inactivityTimer = setTimeout(() => {
-                syncContext(projectPath);
-            }, INACTIVITY_DELAY_MS);
+            triggerDebouncedSync();
         });
     } catch (err) {}
 }
@@ -564,66 +564,77 @@ function connectWebSocket() {
 }
 
 async function syncContext(projectPath) {
-    if (!globalWs || globalWs.readyState !== WebSocket.OPEN) return;
+    if (!globalWs || globalWs.readyState !== WebSocket.OPEN) {
+        broadcastLocalLog('error', `⚠️ Cannot sync: Not connected to Cloud.`);
+        return;
+    }
 
-    const git = simpleGit(projectPath);
-    const isRepo = await git.checkIsRepo().catch(() => false);
-    if (!isRepo) return;
+    broadcastLocalLog('system', `⏳ 15s silence reached. Preparing sync...`);
+
+    let diff = "";
+    let newFilesData = "";
+    let imagesData = [];
 
     try {
-        const status = await git.status();
-        const diff = await git.diff();
-
-        if (!fileActivityBuffer.trim() && !diff) return;
-
-        let newFilesData = "";
-        let imagesData = [];
-
-        const binaryExts =[
-            '.png', '.jpg', '.jpeg', '.webp', '.gif', '.svg', '.ico',
-            '.pdf', '.zip', '.tar', '.gz', '.mp4', '.mp3', '.wav',
-            '.exe', '.dll', '.so', '.dylib',
-            '.doc', '.docx', '.xls', '.xlsx', '.ppt', '.pptx', '.bin'
-        ];
-
-        for (const file of status.not_added) {
-            const ext = path.extname(file).toLowerCase();
-            const fullPath = path.join(projectPath, file);
-            if (!fs.existsSync(fullPath)) continue;
-
-            const stat = fs.statSync(fullPath);
-            if (stat.isDirectory() || stat.size > 5 * 1024 * 1024) continue;
-
-            const fileData = fs.readFileSync(fullPath);
-            const isBinary = binaryExts.includes(ext) || isBinaryData(fileData);
-
-            if (isBinary) {
-                const base64 = fileData.toString('base64');
-                const mime = ['.png','.jpg','.jpeg','.webp','.gif'].includes(ext)
-                    ? `image/${ext.replace('.','')}`
-                    : 'application/octet-stream';
-                imagesData.push(`data:${mime};base64,${base64}`);
-            } else {
-                const content = fileData.toString('utf8');
-                newFilesData += `\n--- NEW FILE: ${file} (Scraped at ${new Date().toLocaleTimeString()}) ---\n${content.substring(0, 10000)}\n`;
+        const git = simpleGit(projectPath);
+        const isRepo = await git.checkIsRepo().catch(() => false);
+
+        if (isRepo) {
+            const status = await git.status();
+            diff = await git.diff();
+
+            const binaryExts =[
+                '.png', '.jpg', '.jpeg', '.webp', '.gif', '.svg', '.ico',
+                '.pdf', '.zip', '.tar', '.gz', '.mp4', '.mp3', '.wav',
+                '.exe', '.dll', '.so', '.dylib',
+                '.doc', '.docx', '.xls', '.xlsx', '.ppt', '.pptx', '.bin'
+            ];
+
+            for (const file of status.not_added) {
+                const ext = path.extname(file).toLowerCase();
+                const fullPath = path.join(projectPath, file);
+                if (!fs.existsSync(fullPath)) continue;
+
+                const stat = fs.statSync(fullPath);
+                if (stat.isDirectory() || stat.size > 5 * 1024 * 1024) continue;
+
+                const fileData = fs.readFileSync(fullPath);
+                const isBinary = binaryExts.includes(ext) || isBinaryData(fileData);
+
+                if (isBinary) {
+                    const base64 = fileData.toString('base64');
+                    const mime = ['.png','.jpg','.jpeg','.webp','.gif'].includes(ext)
+                        ? `image/${ext.replace('.','')}`
+                        : 'application/octet-stream';
+                    imagesData.push(`data:${mime};base64,${base64}`);
+                } else {
+                    const content = fileData.toString('utf8');
+                    newFilesData += `\n--- NEW FILE: ${file} (Scraped at ${new Date().toLocaleTimeString()}) ---\n${content.substring(0, 10000)}\n`;
+                }
             }
+        } else {
+            broadcastLocalLog('system', `ℹ️ Folder is not a Git repo. Syncing MCP/Activity logs only.`);
         }
+    } catch (e) {
+        console.error("Git/Sync processing error:", e);
+    }
 
-        globalWs.send(JSON.stringify({
-            type: "context_sync",
-            projectId: getActiveProject().id,
-            data: {
-                buffer: fileActivityBuffer,
-                diffs: diff,
-                new_files: newFilesData,
-                images: imagesData
-            }
-        }));
+    if (!fileActivityBuffer.trim() && !diff && !newFilesData) {
+        broadcastLocalLog('system', `ℹ️ Buffer empty. Nothing to sync.`);
+        return;
+    }
 
-        broadcastLocalLog('sync', `✅ Context Batch synced to AI.`);
-        fileActivityBuffer = ""; 
+    globalWs.send(JSON.stringify({
+        type: "context_sync",
+        projectId: getActiveProject().id,
+        data: {
+            buffer: fileActivityBuffer,
+            diffs: diff,
+            new_files: newFilesData,
+            images: imagesData
+        }
+    }));
 
-    } catch (e) {
-        console.error("Sync error:", e);
-    }
+    broadcastLocalLog('sync', `✅ Context Batch synced to AI.`);
+    fileActivityBuffer = ""; 
 }