thrust-cli 1.0.15 → 1.0.17

package/utils/daemon.js

@@ -21,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;
@@ -89,10 +89,10 @@ async function fetchInitialMCPContext(server) {
             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();
             }
         }
@@ -106,7 +106,7 @@ export async function startDaemon(preferredPort) {
 
     const app = express();
 
-	   attachExternalBridges(app);
+    attachExternalBridges(app);
 
     const corsOptionsDelegate = (req, callback) => {
         const origin = req.header('Origin');
@@ -127,7 +127,7 @@ export async function startDaemon(preferredPort) {
     app.use(cors(corsOptionsDelegate));
     app.use(express.json());
 
-    const frontendPath = path.join(__dirname, '..', 'frontend');
+    const frontendPath = path.join(__dirname, '..', 'build');
 
     // ==========================================
     // MCP SERVER ENDPOINTS (FEED-IN PUSH)
@@ -138,12 +138,16 @@ export async function startDaemon(preferredPort) {
         const token = config.auth?.token;
         const projectId = config.activeLeadId;
 
+        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`, {
+            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();
@@ -151,10 +155,11 @@ export async function startDaemon(preferredPort) {
             res.json({
                 projectId,
                 projectPath: config.leads[projectId].path,
-                activeThrust: data.length > 0 ? data[0] : null
-		    //timeline
+                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." });
         }
@@ -193,7 +198,7 @@ export async function startDaemon(preferredPort) {
         saveConfig(config);
 
         pollExternalMCPServers();
-        fetchInitialMCPContext({ name, url, type: 'http' }); // Fetch state immediately upon linking
+        fetchInitialMCPContext({ name, url, type: 'http' });
         res.json({ success: true });
     });
 
@@ -299,7 +304,8 @@ export async function startDaemon(preferredPort) {
         }
     });
 
-    app.post('/api/tasks/complete', async (req, res) => {
+
+	app.post('/api/tasks/complete', async (req, res) => {
         const { taskId, taskTitle } = req.body;
         const config = getConfig();
         const token = config.auth?.token;
@@ -320,6 +326,10 @@ export async function startDaemon(preferredPort) {
             const data = await response.json();
             if (!response.ok) throw new Error(data.error);
 
+            // 👉 NEW: Force the buffer to have content so syncContext doesn't abort!
+            // This tells the AI exactly what you just checked off manually.
+            fileActivityBuffer += `\n[${new Date().toLocaleTimeString()}] [USER ACTION] Manually marked task as complete: "${taskTitle}"\n`;
+
             if (config.leads[projectId]?.path) {
                 if (inactivityTimer) clearTimeout(inactivityTimer);
                 syncContext(config.leads[projectId].path);
@@ -528,13 +538,11 @@ 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);
 
@@ -542,11 +550,37 @@ async function startWatching(projectPath) {
             ignored:[
                 /(^|[\/\\])\../,
                 '**/node_modules/**', '**/dist/**', '**/build/**',
-                // Ignore noisy Unity cache & build folders
                 '**/Library/**', '**/Temp/**', '**/Logs/**', '**/obj/**', '**/ProjectSettings/**'
             ],
             persistent: true,
-            ignoreInitial: true
+            ignoreInitial: true,
+            ignorePermissionErrors: true // NEW: Ignores restricted Android/Termux subfolders safely
+        });
+
+        // NEW: FATAL ERROR HANDLER
+        // Catches EACCES constraints before Node.js crashes and forces a UI unlink
+        currentWatcher.on('error', async (error) => {
+            const isPermissionError = error.code === 'EACCES' || error.code === 'EPERM';
+            const msg = isPermissionError 
+                ? `Permission Denied: Cannot watch folder. Access Denied by OS.`
+                : `Watcher Error: ${error.message}`;
+            
+            broadcastLocalLog('error', msg);
+
+            // Force unlink the bad folder
+            const cfg = getConfig();
+            cfg.activeLeadId = null;
+            saveConfig(cfg);
+
+            if (inactivityTimer) { clearTimeout(inactivityTimer); inactivityTimer = null; }
+            if (mcpPollTimer) { clearInterval(mcpPollTimer); mcpPollTimer = null; }
+            if (currentWatcher) {
+                await currentWatcher.close().catch(() => {});
+                currentWatcher = null;
+            }
+
+            // Signal the frontend to drop the user back to the setup wizard
+            broadcastLocalLog('force_unlink', 'Folder access denied. Project unlinked safely.');
         });
 
         currentWatcher.on('all', (event, filePath) => {
@@ -556,7 +590,9 @@ async function startWatching(projectPath) {
 
             triggerDebouncedSync();
         });
-    } catch (err) {}
+    } catch (err) {
+        broadcastLocalLog('error', `Failed to initialize watcher: ${err.message}`);
+    }
 }
 
 function connectWebSocket() {
@@ -581,12 +617,11 @@ function connectWebSocket() {
         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 {
@@ -605,7 +640,7 @@ function connectWebSocket() {
                         }
                     }
                 }
-                
+
                 if (msg.type === 'toast' || msg.type === 'response') {
                     broadcastLocalLog('ai', `🔔 [AI]: ${msg.message || msg.text}`);
                 }