thrust-cli 1.0.13 → 1.0.15

package/README.md

@@ -1,3 +1,4 @@
 **tt-package-demo**
 
 A demo package for Total TypeScript.
+# thrust-cli

package/index.js

@@ -8,10 +8,14 @@ import { fileURLToPath } from 'url';
 import { startDaemon } from './utils/daemon.js';
 import { getConfig, saveConfig } from './utils/config.js';
 
+// --- MCP Imports ---
+import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
+import { server } from "./mcps/projectMcpServer.js"; 
+
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-let packageJson = { version: "1.0.0" };
+let packageJson = { version: "1.0.15" };
 try {
     packageJson = JSON.parse(fs.readFileSync(path.join(__dirname, 'package.json'), 'utf8'));
 } catch (e) {
@@ -29,7 +33,7 @@ program
     console.log('🚀 Booting Thrust Agent...');
 
     await setupNativeStartup();
-    
+
     startDaemon(parseInt(options.port, 10));
   });
 
@@ -52,10 +56,30 @@ program
     config.activeLeadId = leadId;
 
     saveConfig(config);
-    console.log(`✅ Successfully linked Lead [${leadId}] to ${absolutePath}`);
+    console.log(`✅ Successfully linked Lead[${leadId}] to ${absolutePath}`);
     console.log(`Type 'thrust' to begin tracking.`);
   });
 
+// --- NEW MCP COMMAND ---
+program
+  .command('mcp')
+  .description('Start the Thrust MCP Server over Stdio for AI clients (Claude, VS Code, Cursor)')
+  .action(async () => {
+    try {
+        // IMPORTANT: We must use console.error here. 
+        // console.log prints to stdout, which corrupts the JSON-RPC stream the AI expects.
+        console.error('Starting Thrust MCP Server over Stdio...');
+        
+        const transport = new StdioServerTransport();
+        await server.connect(transport);
+        
+        console.error('Thrust MCP Server is ready and listening.');
+    } catch (error) {
+        console.error('MCP Server crashed:', error);
+        process.exit(1);
+    }
+  });
+
 program.parse(process.argv);
 
 // --- NATIVE, CROSS-PLATFORM OS STARTUP LOGIC ---
@@ -71,7 +95,7 @@ async function setupNativeStartup() {
         try {
             const startupFolder = path.join(os.homedir(), 'AppData', 'Roaming', 'Microsoft', 'Windows', 'Start Menu', 'Programs', 'Startup');
             const batFilePath = path.join(startupFolder, 'thrust-agent.bat');
-            
+
             // Clean batch script that simply calls the global `thrust` command
             const batContent = `@echo off\ntitle Thrust Local Agent\necho Starting Thrust...\ntimeout /t 2 /nobreak > NUL\nthrust\npause`;
 
@@ -81,14 +105,14 @@ async function setupNativeStartup() {
         } catch (err) {
             console.log(`⚠️ Failed to create Windows startup script: ${err.message}`);
         }
-    } 
-    
+    }
+
     // 3. macOS - Requires absolute paths due to empty launchd $PATH
     else if (process.platform === 'darwin') {
         try {
             const launchAgentsDir = path.join(os.homedir(), 'Library', 'LaunchAgents');
             const plistPath = path.join(launchAgentsDir, 'com.thrust.agent.plist');
-            
+
             const plistContent = `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -109,7 +133,7 @@ async function setupNativeStartup() {
 
             if (!fs.existsSync(launchAgentsDir)) fs.mkdirSync(launchAgentsDir, { recursive: true });
             fs.writeFileSync(plistPath, plistContent, 'utf8');
-            
+
             import('child_process').then(({ exec }) => {
                 exec(`launchctl load -w "${plistPath}"`, () => {});
             });
@@ -117,8 +141,8 @@ async function setupNativeStartup() {
         } catch (err) {
             console.log(`⚠️ Failed to create macOS LaunchAgent: ${err.message}`);
         }
-    } 
-    
+    }
+
     // 4. Linux - Requires absolute paths for FreeDesktop compliance
     else if (process.platform === 'linux') {
         try {
@@ -129,7 +153,7 @@ async function setupNativeStartup() {
 
             const autostartDir = path.join(os.homedir(), '.config', 'autostart');
             const desktopPath = path.join(autostartDir, 'thrust-agent.desktop');
-            
+
             const desktopContent = `[Desktop Entry]
 Type=Application
 Exec="${process.execPath}" "${__filename}"

package/mcps/ExternalBridge.js

@@ -0,0 +1,144 @@
+import fetch from 'node-fetch';
+
+// In-memory state to track "recent" activity polls so we don't spam duplicate logs
+const lastCheckTimestamps = {
+    figma: {},
+    github: {}
+};
+
+export function attachExternalBridges(app) {
+    console.log("🌉 Initializing External MCP Bridges (Figma, GitHub)...");
+
+    // ==========================================
+    // FIGMA MCP BRIDGE
+    // ==========================================
+    app.post('/api/bridge/figma', async (req, res) => {
+        const { fileKey, token } = req.query;
+        if (!fileKey || !token) {
+            return res.json(mcpError("Missing 'fileKey' or 'token' query parameters."));
+        }
+
+        const { params } = req.body;
+        const toolName = params?.name;
+        let resultText = "No data returned.";
+
+        try {
+            const headers = { 'X-Figma-Token': token };
+
+            if (toolName === "get_initial_state") {
+ const response = await fetch(`https://api.figma.com/v1/files/${fileKey}`, { headers });
+
+                if (!response.ok) throw new Error("Figma API rejected request.");
+                const data = await response.json();
+                
+                resultText = `Figma Environment Boot State:\n- File Name: ${data.name}\n- Last Modified: ${data.lastModified}\n- Version: ${data.version}`;
+                lastCheckTimestamps.figma[fileKey] = new Date().toISOString();
+            } 
+            else if (toolName === "get_recent_activity") {
+                // Fetch file comments to track design collaboration activity
+                const response = await fetch(`https://api.figma.com/v1/files/${fileKey}/comments`, { headers });
+                const data = await response.json();
+                
+                const lastCheck = lastCheckTimestamps.figma[fileKey] || new Date(Date.now() - 3600000).toISOString(); // Default to last 1 hour
+                const newComments = (data.comments ||[]).filter(c => new Date(c.created_at) > new Date(lastCheck));
+
+                if (newComments.length > 0) {
+                    resultText = newComments.map(c => `[Figma Comment by ${c.user.handle}]: ${c.message}`).join("\n");
+                } else {
+                    resultText = "No new activity";
+                }
+                lastCheckTimestamps.figma[fileKey] = new Date().toISOString();
+            }
+            else if (toolName === "get_hierarchy") {
+                const response = await fetch(`https://api.figma.com/v1/files/${fileKey}?depth=1`, { headers });
+                const data = await response.json();
+                
+                const pages = data.document.children.map(p => `- Page: ${p.name}`).join("\n");
+                resultText = `Figma Document Hierarchy:\n${pages}`;
+            }
+
+            res.json(mcpSuccess(resultText));
+        } catch (e) {
+            res.json(mcpSuccess(`Figma Bridge Error: ${e.message}`));
+        }
+    });
+
+    // ==========================================
+    // GITHUB MCP BRIDGE
+    // ==========================================
+    app.post('/api/bridge/github', async (req, res) => {
+        const { repo, token } = req.query; // repo format: "owner/repo"
+        if (!repo || !token) {
+            return res.json(mcpError("Missing 'repo' or 'token' query parameters."));
+        }
+
+        const { params } = req.body;
+        const toolName = params?.name;
+        let resultText = "No data returned.";
+
+        try {
+            const headers = { 
+                'Authorization': `token ${token}`,
+                'Accept': 'application/vnd.github.v3+json',
+                'User-Agent': 'Thrust-MCP-Bridge'
+            };
+
+            if (toolName === "get_initial_state") {
+                const response = await fetch(`https://api.github.com/repos/${repo}`, { headers });
+                if (!response.ok) throw new Error("GitHub API rejected request.");
+                const data = await response.json();
+                
+                resultText = `GitHub Repository Boot State:\n- Repo: ${data.full_name}\n- Default Branch: ${data.default_branch}\n- Open Issues: ${data.open_issues_count}\n- Updated At: ${data.updated_at}`;
+                lastCheckTimestamps.github[repo] = new Date().toISOString();
+            } 
+            else if (toolName === "get_recent_activity") {
+                // Fetch repository events (pushes, issues, PRs)
+                const response = await fetch(`https://api.github.com/repos/${repo}/events?per_page=10`, { headers });
+                const data = await response.json();
+                
+                const lastCheck = lastCheckTimestamps.github[repo] || new Date(Date.now() - 3600000).toISOString();
+                const newEvents = (data ||[]).filter(e => new Date(e.created_at) > new Date(lastCheck));
+
+                if (newEvents.length > 0) {
+                    resultText = newEvents.map(e => `[GitHub ${e.type} by ${e.actor.login}]: ${formatGithubEvent(e)}`).join("\n");
+                } else {
+                    resultText = "No new activity";
+                }
+                lastCheckTimestamps.github[repo] = new Date().toISOString();
+            }
+            else if (toolName === "get_properties") {
+                // Use targetArg to fetch issue details. Example target: "issue/12"
+                const target = params?.arguments?.target || "";
+                if (target.startsWith("issue/")) {
+                    const issueNumber = target.split("/")[1];
+                    const response = await fetch(`https://api.github.com/repos/${repo}/issues/${issueNumber}`, { headers });
+                    const data = await response.json();
+                    resultText = `Issue #${data.number}: ${data.title}\nState: ${data.state}\nBody: ${data.body}`;
+                } else {
+                    resultText = "Unsupported GitHub property target. Try 'issue/123'.";
+                }
+            }
+
+            res.json(mcpSuccess(resultText));
+        } catch (e) {
+            res.json(mcpSuccess(`GitHub Bridge Error: ${e.message}`));
+        }
+    });
+
+    // Helper to format raw GitHub events into readable Timeline strings
+    function formatGithubEvent(e) {
+        if (e.type === "PushEvent") return `Pushed ${e.payload.commits?.length || 0} commits to ${e.payload.ref}`;
+        if (e.type === "IssuesEvent") return `${e.payload.action} issue #${e.payload.issue.number} - "${e.payload.issue.title}"`;
+        if (e.type === "PullRequestEvent") return `${e.payload.action} PR #${e.payload.pull_request.number} - "${e.payload.pull_request.title}"`;
+        if (e.type === "IssueCommentEvent") return `Commented on issue #${e.payload.issue.number}`;
+        return `Triggered ${e.type}`;
+    }
+
+    function mcpSuccess(text) {
+        return { jsonrpc: "2.0", result: { content: [{ type: "text", text }] } };
+    }
+
+    function mcpError(errorMsg) {
+        return { jsonrpc: "2.0", error: { code: -32602, message: errorMsg } };
+    }
+}

package/mcps/ThrustMCPBridge.cs

@@ -12,32 +12,36 @@ public static class ThrustMCPBridge
 {
     private static HttpListener listener;
     private static Thread listenerThread;
-    
+
     // Buffers
     private static List<string> activityBuffer = new List<string>();
     private static List<string> consoleBuffer = new List<string>();
     private static readonly object bufferLock = new object();
-    
-    // Main Thread Dispatcher variables
+
+    // Main Thread Dispatcher
     private static string pendingAction = null;
     private static string pendingArgument = null;
     private static string actionResult = null;
     private static volatile bool isProcessingOnMainThread = false;
 
-    private const int PORT = 8081; 
+    // Anti-spam tracker for property changes
+    private static string lastPropertyLog = "";
+
+    private const int PORT = 8081;
 
     static ThrustMCPBridge()
     {
-        // 1. Hook into Unity Editor Events
-        EditorApplication.hierarchyChanged += OnHierarchyChanged;
+        // 1. Hook into standard Editor Events
         EditorApplication.playModeStateChanged += OnPlayModeChanged;
         UnityEditor.SceneManagement.EditorSceneManager.sceneSaved += OnSceneSaved;
         Application.logMessageReceived += OnLogMessage;
-        
-        // Hook into the main thread loop to process read requests
-        EditorApplication.update += OnEditorUpdate;
 
-        // 2. Start the local MCP Server
+        // 2. THE UPGRADES: Hook into Selection and Inspector edits
+        Selection.selectionChanged += OnSelectionChanged;
+        Undo.postprocessModifications += OnPropertyModified;
+
+        // 3. Main thread loop & Server start
+        EditorApplication.update += OnEditorUpdate;
         StartServer();
         EditorApplication.quitting += StopServer;
     }
@@ -46,11 +50,59 @@ public static class ThrustMCPBridge
     {
         lock (bufferLock)
         {
+            // Simple anti-spam: Don't log the exact same dragging action 50 times a second
+            if (activity == lastPropertyLog) return;
+            lastPropertyLog = activity;
+
             activityBuffer.Add($"[{System.DateTime.Now.ToShortTimeString()}] {activity}");
-            if (activityBuffer.Count > 50) activityBuffer.RemoveAt(0); 
+            if (activityBuffer.Count > 60) activityBuffer.RemoveAt(0);
         }
     }
 
+    // --- NEW: EXACT CONTEXT TRACKING ---
+    private static void OnSelectionChanged()
+    {
+        if (Selection.activeGameObject != null)
+        {
+            AddActivity($"Selected GameObject: '{Selection.activeGameObject.name}'");
+        }
+    }
+
+    // --- UPGRADED: CATCHES CUSTOM SCRIPTS, MATERIALS, AND NOISE REDUCTION ---
+    private static UndoPropertyModification[] OnPropertyModified(UndoPropertyModification[] modifications)
+    {
+        foreach (var mod in modifications)
+        {
+            if (mod.currentValue != null && mod.currentValue.target != null)
+            {
+                string propPath = mod.currentValue.propertyPath;
+                string val = mod.currentValue.value;
+                var target = mod.currentValue.target;
+
+                // Ignore internal unity noise that the AI doesn't need to see
+                if (propPath == "m_RootOrder" || propPath.Contains("m_LocalEulerAnglesHint")) continue;
+
+                if (target is Component comp)
+                {
+                    AddActivity($"Set {comp.GetType().Name}.{propPath} on '{comp.gameObject.name}' to {val}");
+                }
+                else if (target is Material mat)
+                {
+                    AddActivity($"Set Material '{mat.name}' property {propPath} to {val}");
+                }
+                else if (target is ScriptableObject so)
+                {
+                    AddActivity($"Set ScriptableObject '{so.name}' property {propPath} to {val}");
+                }
+                else if (target is GameObject go)
+                {
+                    AddActivity($"Set GameObject property {propPath} on '{go.name}' to {val}");
+                }
+            }
+        }
+        return modifications;
+    }
+
     private static void OnLogMessage(string logString, string stackTrace, LogType type)
     {
         lock (bufferLock)
@@ -63,7 +115,6 @@ public static class ThrustMCPBridge
         }
     }
 
-    private static void OnHierarchyChanged() => AddActivity("Hierarchy changed.");
     private static void OnSceneSaved(Scene scene) => AddActivity($"Saved scene: {scene.name}");
     private static void OnPlayModeChanged(PlayModeStateChange state) => AddActivity($"Play mode state: {state}");
 
@@ -77,7 +128,7 @@ public static class ThrustMCPBridge
 
         listenerThread = new Thread(ListenForRequests) { IsBackground = true };
         listenerThread.Start();
-        Debug.Log($"[Thrust MCP] Two-Way Unity Bridge active on port {PORT}...");
+        Debug.Log($"[Thrust MCP] Deep Unity Bridge active on port {PORT}...");
     }
 
     private static void ListenForRequests()
@@ -107,8 +158,18 @@ public static class ThrustMCPBridge
 
         string resultText = "Unknown command";
 
-        // 1. Parse requested tool name (Crude JSON parsing to avoid dependencies)
-        if (requestBody.Contains("\"name\":\"get_recent_activity\"") || requestBody.Contains("\"name\": \"get_recent_activity\""))
+        if (requestBody.Contains("\"name\":\"get_initial_state\"") || requestBody.Contains("\"name\": \"get_initial_state\""))
+        {
+            // NEW: Give Thrust a summary of the environment on boot
+            string activeScene = SceneManager.GetActiveScene().name;
+            string selected = Selection.activeGameObject != null ? Selection.activeGameObject.name : "None";
+            
+            resultText = $"Unity Environment Boot State:\\n" +
+                         $"- Active Scene: {activeScene}\\n" +
+                         $"- Currently Selected Object: {selected}\\n" +
+                         $"- Editor Mode: {(EditorApplication.isPlaying ? "Play Mode" : "Edit Mode")}";
+        }
+        else if (requestBody.Contains("\"name\":\"get_recent_activity\"") || requestBody.Contains("\"name\": \"get_recent_activity\""))
         {
             lock (bufferLock)
             {
@@ -130,22 +191,19 @@ public static class ThrustMCPBridge
         }
         else if (requestBody.Contains("\"name\":\"get_properties\"") || requestBody.Contains("\"name\": \"get_properties\""))
         {
-            // Extract the target parameter safely (e.g., "target": "Player")
             string target = ExtractJsonValue(requestBody, "target");
             resultText = DispatchToMainThread("get_properties", target);
         }
 
-        // Format as JSON-RPC response
         string responseJson = $@"{{
             ""jsonrpc"": ""2.0"",
-            ""result"": {{ ""content"": [{{ ""type"": ""text"", ""text"": ""{resultText}"" }}] }}
+            ""result"": {{ ""content"":[{{ ""type"": ""text"", ""text"": ""{resultText}"" }}] }}
         }}";
 
         SendResponse(response, responseJson);
     }
 
     // --- MAIN THREAD DISPATCHER ---
-    // Passes the request to the main thread and waits for the result
     private static string DispatchToMainThread(string action, string arg)
     {
         pendingAction = action;
@@ -153,13 +211,10 @@ public static class ThrustMCPBridge
         actionResult = null;
         isProcessingOnMainThread = true;
 
-        // Block background thread until main thread finishes
         while (isProcessingOnMainThread) { Thread.Sleep(10); }
-        
         return actionResult;
     }
 
-    // Executes on Unity's Main Thread
     private static void OnEditorUpdate()
     {
         if (!isProcessingOnMainThread) return;
@@ -193,10 +248,9 @@ public static class ThrustMCPBridge
         }
         catch (System.Exception e) { actionResult = $"Error reading Unity state: {e.Message}"; }
 
-        isProcessingOnMainThread = false; // Release the background thread
+        isProcessingOnMainThread = false;
     }
 
-    // Utility
     private static string ExtractJsonValue(string json, string key)
     {
         string search = $"\"{key}\":";

package/mcps/core.js

@@ -0,0 +1,19 @@
+import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
+import { server } from "./projectMcpServer.js";
+
+async function runMcpServer() {
+  console.error("Starting Self-Driving Jira MCP Server...");
+  
+  // Set up the transport layer
+  const transport = new StdioServerTransport();
+  
+  // Connect the exported server to the transport
+  await server.connect(transport);
+  
+  console.error("Self-Driving Jira MCP Server is running and listening on stdio.");
+}
+
+runMcpServer().catch((error) => {
+  console.error("Failed to start server:", error);
+  process.exit(1);
+});

package/mcps/projectMcpServer.js

@@ -0,0 +1,155 @@
+import { Server } from "@modelcontextprotocol/sdk/server/index.js";
+import { 
+  CallToolRequestSchema, 
+  ListToolsRequestSchema 
+} from "@modelcontextprotocol/sdk/types.js";
+
+// Thrust daemon default port
+const PORT = process.env.THRUST_PORT || 8765;
+   // const DAEMON_URL = `http://localhost:${PORT}`;
+   const DAEMON_URL = `http://127.0.0.1:${PORT}`;
+
+// --- Initialize the MCP Server ---
+const server = new Server(
+  {
+    name: "thrust-mcp",
+    version: "1.0.0",
+  },
+  {
+    capabilities: { tools: {} },
+  }
+);
+
+// --- Define Tools ---
+server.setRequestHandler(ListToolsRequestSchema, async () => {
+  return {
+    tools:[
+      {
+        name: "get_current_active_project",
+        description: "DEFAULT tool to fetch the globally active project context. SYSTEM INSTRUCTION TO AI: You are connected to Thrust Local Agent. Call 'push_work_done' to log your work immediately when coding is finished.",
+        inputSchema: {
+          type: "object",
+          properties: {}
+        },
+      },
+      {
+        name: "push_work_done",
+        description: "CRITICAL ACTION: Submit completed work, updates, or file changes to Thrust to maintain momentum. This automatically triggers a cloud sync.",
+        inputSchema: {
+          type: "object",
+          properties: {
+            agentName: { 
+              type: "string",
+              description: "Your AI identifier (e.g., 'Claude-VSCode', 'Cursor-Agent')"
+            },
+            workDescription: { 
+              type: "string",
+              description: "A concise summary of the code or work you just completed."
+            },
+            artifacts: { 
+              type: "string",
+              description: "Optional list of files modified, functions created, or scripts run."
+            }
+          },
+          required: ["agentName", "workDescription"],
+        },
+      }
+    ],
+  };
+});
+
+// --- Handle Tool Calls (Proxying to your Native Daemon) ---
+server.setRequestHandler(CallToolRequestSchema, async (request) => {
+  const { name, arguments: args } = request.params;
+
+  try {
+    // 1. Fetching Context
+    if (name === "get_current_active_project") {
+      const response = await fetch(`${DAEMON_URL}/api/mcp/context`);
+      
+      if (!response.ok) {
+        const errorData = await response.json().catch(() => ({}));
+        throw new Error(errorData.error || "Thrust daemon returned an error. Ensure you are authenticated in the UI.");
+      }
+      
+      const data = await response.json();
+
+      return {
+        content:[
+          { 
+            type: "text", 
+            text: JSON.stringify({
+              projectId: data.projectId,
+              projectPath: data.projectPath,
+              activeDirective: data.activeThrust || "No active cloud directive found. Proceed with standard file modifications.",
+              systemInstruction: "You are editing files in the projectPath or something related to the project. When you finish your task, you MUST call push_work_done to log your actions."
+            }, null, 2) 
+          }
+        ]
+      };
+    }
+
+    // 2. Pushing Work
+    if (name === "push_work_done") {
+      const { agentName, workDescription, artifacts } = args;
+
+      let description = workDescription;
+      if (artifacts) {
+        description += ` (Artifacts: ${artifacts})`;
+      }
+
+      // Push to the daemon's existing timeline endpoint
+      const response = await fetch(`${DAEMON_URL}/api/mcp/timeline`, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({
+          source: agentName,
+          action_type: "Work Completed",
+          description: description,
+          requires_code_sync: true
+        })
+      });
+
+      if (!response.ok) {
+        const errorData = await response.json().catch(() => ({}));
+        throw new Error(errorData.error || "Failed to push work to Thrust daemon.");
+      }
+      
+      const data = await response.json();
+
+      return {
+        content:[
+          { 
+            type: "text", 
+            text: `SUCCESS: ${data.message} Work logged by ${agentName}. Timeline updated and Cloud Code Sync 15s debounce triggered in Thrust core.` 
+          }
+        ]
+      };
+    }
+
+    throw new Error(`Tool not found: ${name}`);
+  } catch (error) {
+    // Graceful error handling if the daemon isn't running
+    if (error.cause?.code === 'ECONNREFUSED' || error.message.includes('fetch failed')) {
+      return {
+        content:[
+          { 
+            type: "text", 
+            text: `ERROR: The Thrust main daemon is not reachable at ${DAEMON_URL}. Please ensure you have run 'thrust' in your terminal and linked a project.` 
+          }
+        ]
+      };
+    }
+    
+    return {
+        content:[
+          {
+            type: "text",
+            text: `ERROR: ${error.message}`
+          }
+        ]
+    }
+  }
+});
+
+export { server };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thrust-cli",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "description": "The local agent for Thrust AI Director",
   "type": "module",
   "homepage": "https://thrust.web.app",
@@ -19,6 +19,7 @@
   ],
   "author": "Thrust",
   "dependencies": {
+    "@modelcontextprotocol/sdk": "^1.27.1",
     "axios": "^1.13.2",
     "chokidar": "^3.6.0",
     "commander": "^12.0.0",
@@ -26,6 +27,7 @@
     "express": "5.2.1",
     "inquirer": "^9.3.8",
     "inquirer-file-tree-selection-prompt": "^2.0.5",
+    "node-fetch": "^3.3.2",
     "open": "11.0.0",
     "semver": "^7.6.0",
     "simple-git": "^3.22.0",

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,7 +21,7 @@ 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 across ALL inputs before sending
+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;
@@ -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') {
@@ -119,6 +152,7 @@ export async function startDaemon(preferredPort) {
                 projectId,
                 projectPath: config.leads[projectId].path,
                 activeThrust: data.length > 0 ? data[0] : null
+		    //timeline
             });
             broadcastLocalLog('mcp', `🔗 [Context Sync] External client requested project state.`);
         } catch (e) {
@@ -135,7 +169,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 +180,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 +188,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' }); // Fetch state immediately upon linking
         res.json({ success: true });
     });
 
@@ -208,8 +242,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 +321,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 +407,6 @@ export async function startDaemon(preferredPort) {
         saveConfig(config);
 
         await startWatching(folderPath);
-
-        // Initial sync on link
         triggerDebouncedSync();
 
         res.json({ success: true });
@@ -481,12 +511,11 @@ async function pollExternalMCPServers() {
                 }
             }
         } catch (e) {
-            // Silently fail to avoid spamming the logs if Unity is temporarily closed
+            // Silently fail to avoid spamming the logs
         }
     }
 
     if (hasNewData) {
-        // Add to buffer and reset the 15-second countdown
         triggerDebouncedSync();
     }
 }
@@ -499,12 +528,23 @@ 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: [/(^|[\/\\])\../, '**/node_modules/**', '**/dist/**', '**/build/**'],
+            ignored:[
+                /(^|[\/\\])\../,
+                '**/node_modules/**', '**/dist/**', '**/build/**',
+                // Ignore noisy Unity cache & build folders
+                '**/Library/**', '**/Temp/**', '**/Logs/**', '**/obj/**', '**/ProjectSettings/**'
+            ],
             persistent: true,
             ignoreInitial: true
         });
@@ -514,7 +554,6 @@ async function startWatching(projectPath) {
             fileActivityBuffer += `[${new Date().toLocaleTimeString()}] ${event.toUpperCase()}: ${relativePath}\n`;
             broadcastLocalLog('watch', `[${event.toUpperCase()}] ${relativePath}`);
 
-            // Reset the 15-second countdown
             triggerDebouncedSync();
         });
     } catch (err) {}
@@ -539,9 +578,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}`);
                 }
@@ -561,66 +625,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;
+    }
+
+    broadcastLocalLog('system', `⏳ 15s silence reached. Preparing sync...`);
 
-    const git = simpleGit(projectPath);
-    const isRepo = await git.checkIsRepo().catch(() => false);
-    if (!isRepo) return;
+    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 = "";
 }