thrust-cli 1.0.15 → 1.0.16

package/frontend/index.html

@@ -22,7 +22,7 @@
             --mcp: #06B6D4;
         }
 
-        body { background-color: var(--bg-main); color: var(--text-main); font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif; margin: 0; padding: 0; }
+        body { background-color: var(--bg-main); color: var(--text-main); font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif; margin: 0; padding: 0; overflow-x: hidden; }
 
         .navbar { background-color: rgba(15, 15, 22, 0.8); backdrop-filter: blur(10px); border-bottom: 1px solid var(--border-color); padding: 1rem 2rem; display: flex; justify-content: space-between; align-items: center; position: sticky; top: 0; z-index: 100; }
         .nav-logo { font-size: 1.25rem; font-weight: 900; color: var(--primary); font-style: italic; letter-spacing: -0.5px; display: flex; align-items: center; gap: 8px;}
@@ -78,16 +78,25 @@
         .directive-text strong { color: var(--text-main); font-weight: 600; }
 
         .checklist-container { background-color: var(--bg-panel); border-top: 1px solid var(--border-color); padding: 1.5rem; }
-        .task-item { display: flex; align-items: flex-start; gap: 12px; padding: 10px 0; border-bottom: 1px solid var(--border-color); }
-        .task-item:last-child { border-bottom: none; padding-bottom: 0; }
+        
+        .task-item-wrapper { padding: 12px 0; border-bottom: 1px solid var(--border-color); }
+        .task-item-wrapper:last-child { border-bottom: none; padding-bottom: 0; }
+        .task-item { display: flex; align-items: flex-start; gap: 12px; }
         .task-checkbox { margin-top: 4px; width: 16px; height: 16px; cursor: pointer; accent-color: var(--primary); }
         .task-text { font-size: 0.95rem; color: var(--text-main); transition: color 0.3s; }
         .task-done { text-decoration: line-through; color: var(--text-muted); }
 
+        /* AI QUICK COMMENTS UI */
+        .quick-comments { display: flex; gap: 8px; flex-wrap: wrap; }
+        .quick-badge { background: rgba(255,255,255,0.05); border: 1px solid var(--border-color); color: var(--text-muted); font-size: 0.75rem; padding: 4px 10px; border-radius: 12px; cursor: pointer; transition: all 0.2s; font-family: inherit; font-weight: 500; }
+        .quick-badge:hover { background: rgba(139, 92, 246, 0.1); border-color: var(--primary); color: var(--primary); }
+        .task-input { flex: 1; background: var(--bg-hover); border: 1px solid var(--border-color); color: white; padding: 6px 12px; border-radius: 6px; font-size: 0.85rem; outline: none; }
+        .task-input:focus { border-color: var(--primary); }
+
         .input-group { margin-bottom: 1.5rem; display: flex; gap: 10px; flex-direction: column; }
         .input-group label { font-size: 0.85rem; font-weight: bold; color: var(--text-muted); text-transform: uppercase; letter-spacing: 1px; }
-        input[type="text"], input[type="url"] { flex-grow: 1; background-color: var(--bg-hover); color: var(--text-main); border: 1px solid var(--border-color); padding: 0.8rem; border-radius: 6px; font-size: 1rem; box-sizing: border-box; }
-        input[type="text"]:focus, input[type="url"]:focus { outline: none; border-color: var(--primary); }
+        input[type="text"], input[type="url"], input[type="password"] { flex-grow: 1; background-color: var(--bg-hover); color: var(--text-main); border: 1px solid var(--border-color); padding: 0.8rem; border-radius: 6px; font-size: 1rem; box-sizing: border-box; }
+        input[type="text"]:focus, input[type="url"]:focus, input[type="password"]:focus { outline: none; border-color: var(--primary); }
 
         .projects-grid { display: grid; grid-template-columns: repeat(auto-fill, minmax(240px, 1fr)); gap: 1rem; margin-bottom: 1.5rem; }
         .project-card { background-color: var(--bg-hover); border: 1px solid var(--border-color); border-radius: 12px; padding: 1rem; cursor: pointer; transition: all 0.2s; display: flex; flex-direction: column; }
@@ -113,15 +122,21 @@
         .btn-watch:hover { background-color: var(--primary-hover); }
         .explorer-footer { background-color: var(--bg-panel); padding: 0.75rem 1rem; border-top: 1px solid var(--border-color); display: flex; justify-content: space-between; align-items: center; }
 
-        /* MCP LIST UI */
+        /* MCP LIST & TABS UI */
         .mcp-list { margin-bottom: 1.5rem; }
         .mcp-item { display: flex; justify-content: space-between; align-items: center; background-color: var(--bg-hover); border: 1px solid var(--border-color); padding: 0.8rem 1rem; border-radius: 8px; margin-bottom: 0.5rem; }
         .mcp-item span { font-weight: bold; color: var(--mcp); }
         .mcp-item small { color: var(--text-muted); font-family: monospace; margin-left: 10px; }
+        
+        .mcp-tabs { display: flex; gap: 8px; margin-bottom: 12px; }
+        .mcp-tab { background: transparent; border: 1px solid var(--border-color); color: var(--text-muted); padding: 8px 16px; border-radius: 8px; cursor: pointer; font-size: 0.85rem; font-weight: bold; transition: all 0.2s; }
+        .mcp-tab:hover { background: rgba(255,255,255,0.05); }
+        .mcp-tab.active { background: rgba(139, 92, 246, 0.1); color: var(--primary); border-color: var(--primary); }
+        
         .mcp-add-form { display: flex; gap: 10px; margin-bottom: 2rem; }
         .mcp-add-form input { margin: 0; }
 
-        .terminal-container { background-color: var(--bg-panel); border: 1px solid var(--border-color); border-radius: 8px; display: flex; flex-direction: column; overflow: hidden; }
+        .terminal-container { background-color: var(--bg-panel); border: 1px solid var(--border-color); border-radius: 8px; display: flex; flex-direction: column; overflow: hidden; margin-bottom: 40px; }
         .log-box { height: 200px; overflow-y: auto; padding: 1rem; font-family: monospace; font-size: 0.85rem; color: var(--text-muted); }
         .log-box p { margin: 0 0 0.5rem 0; line-height: 1.4; word-break: break-all; }
         .log-time { color: var(--primary); margin-right: 8px; flex-shrink: 0; }
@@ -131,10 +146,22 @@
         .prompt-btn:hover { background-color: var(--primary-hover); }
 
         .hidden { display: none !important; }
+
+        /* TOAST NOTIFICATIONS */
+        #toast-container { position: fixed; bottom: 24px; right: 24px; z-index: 9999; display: flex; flex-direction: column; gap: 12px; }
+        .toast { padding: 14px 20px; border-radius: 10px; color: white; font-weight: 500; font-size: 0.95rem; box-shadow: 0 10px 30px rgba(0,0,0,0.5); transform: translateX(120%); transition: transform 0.3s cubic-bezier(0.175, 0.885, 0.32, 1.275); display: flex; align-items: center; gap: 12px; min-width: 250px; max-width: 350px; word-break: break-word; }
+        .toast.show { transform: translateX(0); }
+        .toast-info { background: var(--primary); border: 1px solid var(--primary-hover); }
+        .toast-success { background: var(--success); border: 1px solid #059669; }
+        .toast-error { background: var(--danger); border: 1px solid #DC2626; }
+        .toast-ai { background: #1A1A24; border: 1px solid var(--primary); }
     </style>
 </head>
 <body>
 
+    <!-- TOAST NOTIFICATION MOUNT -->
+    <div id="toast-container"></div>
+
     <nav class="navbar">
         <div class="nav-logo">⚡ THRUST</div>
         <div class="profile-wrapper" id="profile-wrapper">
@@ -227,12 +254,17 @@
 
             <!-- EXTERNAL MCP INTEGRATIONS -->
             <h2>3. External Integrations (MCP Clients)</h2>
-            <p style="font-size: 0.85rem; color: var(--text-muted); margin-bottom: 1rem;">Connect external tools (Figma, Unity, Cursor) by providing their local HTTP MCP URL. The Agent will poll them automatically.</p>
+            <p style="font-size: 0.85rem; color: var(--text-muted); margin-bottom: 1rem;">Connect external tools like Figma, GitHub, or local MCPs. The Agent will poll them to maintain context momentum.</p>
             <div id="mcp-list" class="mcp-list"></div>
-            <form class="mcp-add-form" onsubmit="addMCPServer(event)">
-                <input type="text" id="mcp-name" placeholder="Tool Name (e.g., Unity)" required style="flex: 1;">
-                <input type="url" id="mcp-url" placeholder="http://localhost:8081/mcp" required style="flex: 2;">
-                <button type="submit" class="btn-primary" style="width: auto;">+ Link Tool</button>
+            
+            <div class="mcp-tabs">
+                <button type="button" class="mcp-tab active" onclick="setMcpTab('local', this)">Standard MCP</button>
+                <button type="button" class="mcp-tab" onclick="setMcpTab('figma', this)">Figma Bridge</button>
+                <button type="button" class="mcp-tab" onclick="setMcpTab('github', this)">GitHub Bridge</button>
+            </div>
+            
+            <form class="mcp-add-form" onsubmit="addMCPServer(event)" id="mcp-form">
+                <!-- Rendered Dynamically -->
             </form>
         </div>
 
@@ -252,6 +284,48 @@
         let currentFolderName = "";
         let localWs = null;
         let currentPage = 1;
+        let currentMcpType = 'local';
+
+        // --- AUDIO ENGINE ---
+        function playNotificationSound() {
+            try {
+                const ctx = new (window.AudioContext || window.webkitAudioContext)();
+                const osc = ctx.createOscillator();
+                const gain = ctx.createGain();
+                osc.connect(gain);
+                gain.connect(ctx.destination);
+                osc.type = 'sine';
+                osc.frequency.setValueAtTime(880, ctx.currentTime); 
+                osc.frequency.exponentialRampToValueAtTime(1760, ctx.currentTime + 0.1); 
+                gain.gain.setValueAtTime(0.05, ctx.currentTime);
+                gain.gain.exponentialRampToValueAtTime(0.001, ctx.currentTime + 0.3);
+                osc.start();
+                osc.stop(ctx.currentTime + 0.3);
+            } catch (e) {} // Failsafe for auto-play policy blocks
+        }
+
+        // --- TOAST UI ---
+        function showToast(message, type = "info") {
+            playNotificationSound();
+            const container = document.getElementById('toast-container');
+            const toast = document.createElement('div');
+            toast.className = `toast toast-${type}`;
+            
+            let icon = "💡";
+            if(type === 'success') icon = "✅";
+            if(type === 'error') icon = "❌";
+            if(type === 'ai') icon = "🤖";
+            
+            toast.innerHTML = `<span style="font-size: 1.2rem;">${icon}</span> <span>${message}</span>`;
+            container.appendChild(toast);
+            
+            setTimeout(() => toast.classList.add('show'), 10);
+            
+            setTimeout(() => {
+                toast.classList.remove('show');
+                setTimeout(() => toast.remove(), 300);
+            }, 5000);
+        }
 
         function addLog(message, color = "var(--text-muted)") {
             const p = document.createElement('p');
@@ -289,34 +363,57 @@
             } catch(e) {}
         }
 
-        async function completeTask(taskId, taskTitle, checkboxElem) {
+        // --- UPDATED COMPLETION LOGIC FOR QUICK REPLIES ---
+        async function completeTask(taskId, taskTitle, checkboxElem, comment = null) {
+            if (!checkboxElem) checkboxElem = document.getElementById(`cb-${taskId}`);
             checkboxElem.disabled = true;
+            checkboxElem.checked = true;
+            
             const textSpan = checkboxElem.nextElementSibling;
-            textSpan.classList.add('task-done');
+            if(textSpan) textSpan.classList.add('task-done');
+
+            // Hide the quick comment UI once completed
+            const qcContainer = document.getElementById(`qc-${taskId}`);
+            if (qcContainer) qcContainer.style.display = 'none';
+
+            // Extract comment from the input box if a badge wasn't explicitly clicked
+            let finalComment = comment;
+            if (finalComment === null || finalComment === undefined) {
+                const inputElem = document.getElementById(`input-${taskId}`);
+                if (inputElem && inputElem.value.trim() !== '') {
+                    finalComment = inputElem.value.trim();
+                }
+            }
+
+            // Append comment for the AI timeline if it exists
+            const finalTitle = finalComment ? `${taskTitle} (Response: ${finalComment})` : taskTitle;
 
             try {
                 const res = await fetch('/api/tasks/complete', {
                     method: 'POST',
                     headers: { 'Content-Type': 'application/json' },
-                    body: JSON.stringify({ taskId, taskTitle })
+                    body: JSON.stringify({ taskId, taskTitle: finalTitle })
                 });
 
                 if (res.ok) {
-                    addLog(`✅ Task marked complete: ${taskTitle}`, 'var(--success)');
+                    addLog(`✅ Task marked complete: ${finalTitle}`, 'var(--success)');
                 } else {
                     throw new Error("API Failed");
                 }
             } catch(e) {
                 checkboxElem.disabled = false;
-                textSpan.classList.remove('task-done');
+                checkboxElem.checked = false;
+                if(textSpan) textSpan.classList.remove('task-done');
+                if (qcContainer) qcContainer.style.display = 'block';
                 addLog(`❌ Failed to sync task completion.`, 'var(--danger)');
+                showToast("Failed to sync task", "error");
             }
         }
 
         function requestNewThrust() {
             const overridePrompt = `[SYSTEM OVERRIDE]: The user has requested the next Thrust. Evaluate the current Timeline, PRD, and recent Git diffs. Check if the previous Thrust tasks are completed. Generate a new <thrust_create> with the next 1-4 immediate steps to keep momentum going.`;
 
-            if (localWs && localWs.readyState === 1) { 
+            if (localWs && localWs.readyState === 1) {
                 localWs.send(JSON.stringify({ type: 'frontend_prompt', payload: overridePrompt }));
                 addLog(`⚡ Override triggered. Waking up AI Director...`, 'var(--warning)');
             } else {
@@ -366,16 +463,46 @@
 
                     const tasksBox = document.getElementById('dir-tasks');
                     tasksBox.innerHTML = '';
+
                     if (thrust.thrust_tasks && thrust.thrust_tasks.length > 0) {
                         thrust.thrust_tasks.forEach(task => {
-                            const isDone = task.is_completed;
+                            const isDone = task.is_completed || task.status === 'done';
                             const safeTitle = task.title.replace(/'/g, "\\'").replace(/"/g, '&quot;');
 
+                            let commentsHtml = '';
+                            if (!isDone) {
+                                // NEW: Dynamically parse the options/placeholder generated by the AI
+                                const hasOptions = task.options && task.options.length > 0;
+                                const placeholder = task.placeholder || "Add a note or comment...";
+
+                                if (hasOptions) {
+                                    let badgesHtml = task.options.map(qc => {
+                                        const safeQc = qc.replace(/'/g, "\\'");
+                                        return `<button type="button" class="quick-badge" onclick="document.getElementById('input-${task.id}').value = '${safeQc}'">${qc}</button>`;
+                                    }).join('');
+
+                                    commentsHtml = `
+                                        <div id="qc-${task.id}" style="margin-top: 8px; margin-left: 28px;">
+                                            <div class="quick-comments" style="margin-bottom: 8px;">
+                                                ${badgesHtml}
+                                            </div>
+                                            <div style="display: flex; gap: 8px; align-items: center;">
+                                                <input type="text" id="input-${task.id}" placeholder="${placeholder}" class="task-input">
+                                                <button class="btn-small btn-watch" onclick="completeTask('${task.id}', '${safeTitle}', document.getElementById('cb-${task.id}'), document.getElementById('input-${task.id}').value)">Complete</button>
+                                            </div>
+                                        </div>
+                                    `;
+                                }
+                            }
+
                             tasksBox.innerHTML += `
-                                <div class="task-item">
-                                    <input type="checkbox" class="task-checkbox"
-                                        ${isDone ? 'checked disabled' : `onchange="completeTask('${task.id}', '${safeTitle}', this)"`}>
-                                    <span class="task-text ${isDone ? 'task-done' : ''}">${task.title}</span>
+                                <div class="task-item-wrapper">
+                                    <div class="task-item">
+                                        <input type="checkbox" id="cb-${task.id}" class="task-checkbox"
+                                            ${isDone ? 'checked disabled' : `onchange="completeTask('${task.id}', '${safeTitle}', this)"`}>
+                                        <span class="task-text ${isDone ? 'task-done' : ''}">${task.title}</span>
+                                    </div>
+                                    ${commentsHtml}
                                 </div>
                             `;
                         });
@@ -437,14 +564,41 @@
             document.getElementById('current-path').scrollIntoView({ behavior: 'smooth', block: 'center' });
         }
 
-        /* MCP CLIENT MANAGEMENT */
+        /* DYNAMIC MCP CLIENT MANAGEMENT */
+        function setMcpTab(type, btn) {
+            document.querySelectorAll('.mcp-tab').forEach(b => b.classList.remove('active'));
+            btn.classList.add('active');
+            currentMcpType = type;
+            const form = document.getElementById('mcp-form');
+            
+            if (type === 'local') {
+                form.innerHTML = `
+                    <input type="text" id="mcp-name" placeholder="Tool Name (e.g., Unity, Cursor)" required style="flex: 1;">
+                    <input type="url" id="mcp-url" placeholder="http://localhost:8081/mcp" required style="flex: 2;">
+                    <button type="submit" class="btn-primary" style="width: auto;">+ Link Tool</button>
+                `;
+            } else if (type === 'figma') {
+                form.innerHTML = `
+                    <input type="text" id="mcp-file" placeholder="Figma File Key" required style="flex: 1;">
+                    <input type="password" id="mcp-token" placeholder="Figma Access Token" required style="flex: 2;">
+                    <button type="submit" class="btn-primary" style="width: auto;">+ Link Figma</button>
+                `;
+            } else if (type === 'github') {
+                form.innerHTML = `
+                    <input type="text" id="mcp-repo" placeholder="Repo (owner/repo)" required style="flex: 1;">
+                    <input type="password" id="mcp-token" placeholder="GitHub PAT Token" required style="flex: 2;">
+                    <button type="submit" class="btn-primary" style="width: auto;">+ Link GitHub</button>
+                `;
+            }
+        }
+
         async function fetchMCPServers() {
             try {
                 const res = await fetch('/api/mcp/servers');
                 const servers = await res.json();
                 const list = document.getElementById('mcp-list');
                 list.innerHTML = '';
-                
+
                 if (servers.length === 0) {
                     list.innerHTML = `<div style="color: var(--text-muted); font-size: 0.85rem;">No external integrations linked.</div>`;
                     return;
@@ -453,7 +607,7 @@
                 servers.forEach((s, index) => {
                     list.innerHTML += `
                         <div class="mcp-item">
-                            <div><span>🔗 ${s.name}</span> <small>${s.url}</small></div>
+                            <div><span>🔗 ${s.name}</span> <small>${s.url.substring(0, 40)}${s.url.length > 40 ? '...' : ''}</small></div>
                             <button class="btn-outline-danger" onclick="removeMCPServer(${index})">Remove</button>
                         </div>
                     `;
@@ -463,9 +617,25 @@
 
         async function addMCPServer(e) {
             e.preventDefault();
-            const name = document.getElementById('mcp-name').value;
-            const url = document.getElementById('mcp-url').value;
-            
+            let name = "";
+            let url = "";
+            const hostBase = `${window.location.protocol}//${window.location.host}`;
+
+            if (currentMcpType === 'local') {
+                name = document.getElementById('mcp-name').value;
+                url = document.getElementById('mcp-url').value;
+            } else if (currentMcpType === 'figma') {
+                const fileKey = document.getElementById('mcp-file').value;
+                const token = document.getElementById('mcp-token').value;
+                name = "Figma";
+                url = `${hostBase}/api/bridge/figma?fileKey=${encodeURIComponent(fileKey)}&token=${encodeURIComponent(token)}`;
+            } else if (currentMcpType === 'github') {
+                const repo = document.getElementById('mcp-repo').value;
+                const token = document.getElementById('mcp-token').value;
+                name = "GitHub";
+                url = `${hostBase}/api/bridge/github?repo=${encodeURIComponent(repo)}&token=${encodeURIComponent(token)}`;
+            }
+
             try {
                 const res = await fetch('/api/mcp/servers', {
                     method: 'POST',
@@ -473,18 +643,28 @@
                     body: JSON.stringify({ name, url })
                 });
                 if (res.ok) {
-                    document.getElementById('mcp-name').value = '';
-                    document.getElementById('mcp-url').value = '';
+                    // Reset inputs
+                    if(document.getElementById('mcp-name')) document.getElementById('mcp-name').value = '';
+                    if(document.getElementById('mcp-url')) document.getElementById('mcp-url').value = '';
+                    if(document.getElementById('mcp-file')) document.getElementById('mcp-file').value = '';
+                    if(document.getElementById('mcp-repo')) document.getElementById('mcp-repo').value = '';
+                    if(document.getElementById('mcp-token')) document.getElementById('mcp-token').value = '';
+
                     fetchMCPServers();
                     addLog(`🔗 Linked External MCP: ${name}`, 'var(--mcp)');
+                    showToast(`Successfully linked ${name} bridge!`, 'success');
                 }
-            } catch (err) { addLog('❌ Failed to link MCP.', 'var(--danger)'); }
+            } catch (err) { 
+                addLog('❌ Failed to link MCP.', 'var(--danger)'); 
+                showToast('Failed to link integration.', 'error');
+            }
         }
 
         async function removeMCPServer(index) {
             try {
                 await fetch(`/api/mcp/servers/${index}`, { method: 'DELETE' });
                 fetchMCPServers();
+                showToast("Integration removed", "info");
             } catch (err) {}
         }
 
@@ -495,13 +675,24 @@
 
             localWs.onmessage = (event) => {
                 const data = JSON.parse(event.data);
+                
                 if (data.type === 'success' && data.message.includes('Authentication Successful')) fetchStatus();
                 else if (data.type === 'watch') addLog(`👀 ${data.message}`, 'var(--success)');
                 else if (data.type === 'sync') addLog(data.message, 'var(--sync)');
-                else if (data.type === 'ai') addLog(data.message, 'var(--warning)');
                 else if (data.type === 'mcp') addLog(`${data.message}`, 'var(--mcp)');
-                else if (data.type === 'success') addLog(data.message, 'var(--success)');
-                else if (data.type === 'error') addLog(`❌ ${data.message}`, 'var(--danger)');
+                else if (data.type === 'success') {
+                    addLog(data.message, 'var(--success)');
+                }
+                else if (data.type === 'error') {
+                    addLog(`❌ ${data.message}`, 'var(--danger)');
+                    showToast(data.message, 'error');
+                }
+                else if (data.type === 'ai') {
+                    addLog(data.message, 'var(--warning)');
+                    // Clean AI Prefix for the Toast
+                    let cleanMsg = data.message.replace('🔔 [AI]: ', '');
+                    showToast(cleanMsg, 'ai');
+                }
                 else if (data.type === 'reload') {
                     addLog('🔄 AI updated Directive. Fetching...', 'var(--primary)');
                     fetchDirective();
@@ -538,7 +729,7 @@
 
                     fetchCloudProjects();
                     fetchDirective();
-                    fetchMCPServers(); // Load the MCP client list
+                    fetchMCPServers(); 
                 } else {
                     document.getElementById('unauth-view').classList.remove('hidden');
                     document.getElementById('auth-view').classList.add('hidden');
@@ -612,7 +803,10 @@
 
             try {
                 const res = await fetch('/api/link', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ leadId, folderPath: absolutePath }) });
-                if ((await res.json()).success) fetchStatus();
+                if ((await res.json()).success) {
+                    fetchStatus();
+                    showToast(`Started watching ${folderName}`, "success");
+                }
             } catch (e) {}
         }
 
@@ -620,6 +814,7 @@
             fetchStatus();
             loadDirectory();
             connectLocalWebSocket();
+            setMcpTab('local', document.querySelector('.mcp-tab.active'));
         });
     </script>
 </body>

package/mcps/projectMcpServer.js

@@ -1,13 +1,12 @@
 import { Server } from "@modelcontextprotocol/sdk/server/index.js";
-import { 
-  CallToolRequestSchema, 
-  ListToolsRequestSchema 
+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}`;
+const DAEMON_URL = `http://127.0.0.1:${PORT}`;
 
 // --- Initialize the MCP Server ---
 const server = new Server(
@@ -26,10 +25,14 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
     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.",
+        description: "DEFAULT tool to fetch the globally active project context. You can optionally filter what data you want to ingest. 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: {}
+          properties: {
+            includePrd: { type: "boolean", description: "Include the Project Requirements Document (Default: true)" },
+            includeThrust: { type: "boolean", description: "Include the currently active Thrust and tasks (Default: true)" },
+            includeTimeline: { type: "boolean", description: "Include the last 20 timeline events (Default: true)" }
+          }
         },
       },
       {
@@ -38,15 +41,15 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
         inputSchema: {
           type: "object",
           properties: {
-            agentName: { 
+            agentName: {
               type: "string",
               description: "Your AI identifier (e.g., 'Claude-VSCode', 'Cursor-Agent')"
             },
-            workDescription: { 
+            workDescription: {
               type: "string",
               description: "A concise summary of the code or work you just completed."
             },
-            artifacts: { 
+            artifacts: {
               type: "string",
               description: "Optional list of files modified, functions created, or scripts run."
             }
@@ -65,25 +68,32 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
   try {
     // 1. Fetching Context
     if (name === "get_current_active_project") {
-      const response = await fetch(`${DAEMON_URL}/api/mcp/context`);
-      
+      // Default all to true if not specified
+      const includePrd = args.includePrd !== false;
+      const includeThrust = args.includeThrust !== false;
+      const includeTimeline = args.includeTimeline !== false;
+
+      const response = await fetch(`${DAEMON_URL}/api/mcp/context?prd=${includePrd}&thrust=${includeThrust}&timeline=${includeTimeline}`);
+
       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", 
+          {
+            type: "text",
             text: JSON.stringify({
               projectId: data.projectId,
               projectPath: data.projectPath,
+              prd: data.prd || "Not requested.",
               activeDirective: data.activeThrust || "No active cloud directive found. Proceed with standard file modifications.",
+              timeline: data.timeline || "Not requested.",
               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) 
+            }, null, 2)
           }
         ]
       };
@@ -114,14 +124,14 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
         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.` 
+          {
+            type: "text",
+            text: `SUCCESS: ${data.message} Work logged by ${agentName}. Timeline updated and Cloud Code Sync 15s debounce triggered in Thrust core.`
           }
         ]
       };
@@ -133,14 +143,14 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
     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.` 
+          {
+            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:[
           {

package/package.json

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

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');
@@ -138,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();
@@ -151,10 +157,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 +200,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 });
     });
 
@@ -581,12 +588,12 @@ 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 +612,7 @@ function connectWebSocket() {
                         }
                     }
                 }
-                
+
                 if (msg.type === 'toast' || msg.type === 'response') {
                     broadcastLocalLog('ai', `🔔 [AI]: ${msg.message || msg.text}`);
                 }