thrust-cli 1.0.14 → 1.0.16

package/utils/daemon.js

@@ -11,6 +11,7 @@ import cors from 'cors';
 import { exec } from 'child_process';
 import { fileURLToPath } from 'url';
 import { getActiveProject, getConfig, saveConfig } from './config.js';
+import { attachExternalBridges } from '../mcps/ExternalBridge.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -20,8 +21,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; // Wait for 15 seconds of silence before syncing
-const MCP_POLL_INTERVAL_MS = 18 * 1000; // Poll external tools every 18 seconds
+const INACTIVITY_DELAY_MS = 15 * 1000; 
+const MCP_POLL_INTERVAL_MS = 18 * 1000; 
 
 let currentWatcher = null;
 let inactivityTimer = null;
@@ -60,7 +61,6 @@ function isBinaryData(buffer) {
 }
 
 // --- 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;
@@ -71,13 +71,46 @@ function triggerDebouncedSync() {
     }, INACTIVITY_DELAY_MS);
 }
 
+// --- EXTERNAL MCP INITIALIZATION (ON BOOT / ON CONNECT) ---
+async function fetchInitialMCPContext(server) {
+    try {
+        const res = await fetch(server.url, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({
+                jsonrpc: "2.0",
+                method: "tools/call",
+                params: { name: "get_initial_state", arguments: {} },
+                id: Date.now()
+            })
+        });
+
+        if (res.ok) {
+            const data = await res.json();
+            if (data.result && data.result.content && data.result.content.length > 0) {
+                const stateText = data.result.content[0].text;
+
+                fileActivityBuffer += `\n[${new Date().toLocaleTimeString()}][MCP BOOT STATE] Source: ${server.name} | Current Context:\n${stateText}\n`;
+                broadcastLocalLog('mcp', `📥 Fetched initial project state from ${server.name}`);
+
+                triggerDebouncedSync();
+            }
+        }
+    } catch (e) {
+        broadcastLocalLog('error', `⚠️ Failed to fetch initial state from ${server.name}. Is it running?`);
+    }
+}
+
 export async function startDaemon(preferredPort) {
     const actualPort = await findAvailablePort(preferredPort);
+
     const app = express();
 
+    attachExternalBridges(app);
+
     const corsOptionsDelegate = (req, callback) => {
         const origin = req.header('Origin');
-        const allowedWebApps = ['https://thrust.web.app', 'http://localhost:3000'];
+        const allowedWebApps =['https://thrust.web.app', 'http://localhost:3000'];
         if (req.path.startsWith('/api/mcp')) {
             callback(null, { origin: true });
         } else if (req.path === '/api/auth/callback') {
@@ -105,12 +138,18 @@ export async function startDaemon(preferredPort) {
         const token = config.auth?.token;
         const projectId = config.activeLeadId;
 
+        // Extract optional parameters, default to true
+        const prd = req.query.prd || 'true';
+        const thrust = req.query.thrust || 'true';
+        const timeline = req.query.timeline || 'true';
+
         if (!token || !projectId) {
             return res.status(401).json({ error: "Thrust agent not linked or authenticated." });
         }
 
         try {
-            const response = await fetch(`${API_URL}/api/projects/${projectId}/thrusts/active`, {
+            // Forward parameters to new combined gateway endpoint
+            const response = await fetch(`${API_URL}/api/projects/${projectId}/mcp-context?prd=${prd}&thrust=${thrust}&timeline=${timeline}`, {
                 headers: { 'Authorization': `Bearer ${token}` }
             });
             const data = await response.json();
@@ -118,9 +157,11 @@ export async function startDaemon(preferredPort) {
             res.json({
                 projectId,
                 projectPath: config.leads[projectId].path,
-                activeThrust: data.length > 0 ? data[0] : null
+                prd: data.prd,
+                activeThrust: data.thrust,
+                timeline: data.timeline
             });
-            broadcastLocalLog('mcp', `🔗 [Context Sync] External client requested project state.`);
+            broadcastLocalLog('mcp', `🔗 [Context Sync] AI Client requested project state.`);
         } catch (e) {
             res.status(502).json({ error: "Failed to fetch context." });
         }
@@ -135,7 +176,6 @@ export async function startDaemon(preferredPort) {
 
         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();
 
@@ -147,7 +187,7 @@ export async function startDaemon(preferredPort) {
     // ==========================================
 
     app.get('/api/mcp/servers', (req, res) => {
-        res.json(getConfig().mcpServers || []);
+        res.json(getConfig().mcpServers ||[]);
     });
 
     app.post('/api/mcp/servers', (req, res) => {
@@ -155,11 +195,12 @@ export async function startDaemon(preferredPort) {
         if (!name || !url) return res.status(400).json({ error: "Missing name or url" });
 
         const config = getConfig();
-        if (!config.mcpServers) config.mcpServers = [];
+        if (!config.mcpServers) config.mcpServers =[];
         config.mcpServers.push({ name, url, type: 'http' });
         saveConfig(config);
 
         pollExternalMCPServers();
+        fetchInitialMCPContext({ name, url, type: 'http' }); 
         res.json({ success: true });
     });
 
@@ -208,8 +249,7 @@ export async function startDaemon(preferredPort) {
 
             broadcastLocalLog('mcp', `⚡ Queried ${serverName} for ${toolName}.`);
 
-            // 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`;
+            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 });
@@ -288,7 +328,6 @@ 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);
             }
@@ -375,8 +414,6 @@ export async function startDaemon(preferredPort) {
         saveConfig(config);
 
         await startWatching(folderPath);
-
-        // Initial sync on link
         triggerDebouncedSync();
 
         res.json({ success: true });
@@ -481,7 +518,7 @@ async function pollExternalMCPServers() {
                 }
             }
         } catch (e) {
-            // Silently fail to avoid spamming the logs if Unity is temporarily closed
+            // Silently fail to avoid spamming the logs
         }
     }
 
@@ -498,15 +535,21 @@ async function startWatching(projectPath) {
 
         fileActivityBuffer = "";
 
+        // Fetch initial MCP states immediately upon watching a project
+        const config = getConfig();
+        if (config.mcpServers && config.mcpServers.length > 0) {
+            config.mcpServers.forEach(server => fetchInitialMCPContext(server));
+        }
+
         // Start the active polling loop for external services
         if (mcpPollTimer) clearInterval(mcpPollTimer);
         mcpPollTimer = setInterval(pollExternalMCPServers, MCP_POLL_INTERVAL_MS);
 
         currentWatcher = chokidar.watch(projectPath, {
-            ignored: [
-                /(^|[\/\\])\../, 
+            ignored:[
+                /(^|[\/\\])\../,
                 '**/node_modules/**', '**/dist/**', '**/build/**',
-                // Ignore noisy Unity cache & build folders to prevent infinite debounce loops
+                // Ignore noisy Unity cache & build folders
                 '**/Library/**', '**/Temp/**', '**/Logs/**', '**/obj/**', '**/ProjectSettings/**'
             ],
             persistent: true,
@@ -542,9 +585,34 @@ function connectWebSocket() {
             wsRetryLogged = false;
         });
 
-        globalWs.on('message', (data) => {
+        globalWs.on('message', async (data) => {
             try {
                 const msg = JSON.parse(data.toString());
+
+                // NEW: Handle dynamic MCP Queries pushed from the AI Director
+                if (msg.type === 'mcp_query' && msg.payload) {
+                    const { serverName, toolName, targetArg } = msg.payload;
+                    const targetServer = getConfig().mcpServers?.find(s => s.name.toLowerCase() === serverName.toLowerCase());
+
+                    if (targetServer) {
+                        broadcastLocalLog('mcp', `🤖 AI requested data from ${serverName} (${toolName})...`);
+                        try {
+                            const response = await fetch(targetServer.url, {
+                                method: 'POST', headers: { 'Content-Type': 'application/json' },
+                                body: JSON.stringify({ jsonrpc: "2.0", method: "tools/call", params: { name: toolName, arguments: targetArg ? { target: targetArg } : {} }, id: Date.now() })
+                            });
+                            if (response.ok) {
+                                const responseData = await response.json();
+                                const resultText = responseData.result?.content?.[0]?.text || "No data returned.";
+                                fileActivityBuffer += `\n[${new Date().toLocaleTimeString()}] [MCP AI QUERY RESULT] Source: ${serverName} | Tool: ${toolName} | Target: ${targetArg || 'none'} \nResult:\n${resultText}\n`;
+                                triggerDebouncedSync();
+                            }
+                        } catch (e) {
+                            broadcastLocalLog('error', `⚠️ AI failed to query MCP server: ${serverName}`);
+                        }
+                    }
+                }
+
                 if (msg.type === 'toast' || msg.type === 'response') {
                     broadcastLocalLog('ai', `🔔 [AI]: ${msg.message || msg.text}`);
                 }
@@ -573,7 +641,7 @@ async function syncContext(projectPath) {
 
     let diff = "";
     let newFilesData = "";
-    let imagesData = [];
+    let imagesData =[];
 
     try {
         const git = simpleGit(projectPath);
@@ -636,5 +704,5 @@ async function syncContext(projectPath) {
     }));
 
     broadcastLocalLog('sync', `✅ Context Batch synced to AI.`);
-    fileActivityBuffer = ""; 
+    fileActivityBuffer = "";
 }