fullcourtdefense-cli 1.7.6 → 1.7.9

package/dist/commands/installAll.js

@@ -61,7 +61,10 @@ async function installAllCommand(args, config) {
         const discoverArgs = {
             surface: 'all',
             upload: 'true',
-            apiKey: creds.apiKey,
+            // Do not forward the saved org API key by default. `discover` treats a
+            // present apiKey as an explicit opt-in to the CICD API-key path, while
+            // the zero-paste customer flow should upload via the enrolled Shield key.
+            apiKey: args.apiKey,
             apiUrl: creds.apiUrl,
             userEmail: args.developerName,
         };

package/dist/commands/local-scan.js

@@ -43,6 +43,7 @@ const child_process_1 = require("child_process");
 const yaml_1 = require("yaml");
 const output_1 = require("../output");
 const config_1 = require("../config");
+const discoverPaths_1 = require("./discoverPaths");
 const DEFAULT_ATTACKS = [
     {
         id: 'local_prompt_injection_1',
@@ -954,6 +955,128 @@ function currentShieldConfig(args) {
         apiUrl: (args.apiUrl || args.configApiUrl || config.apiUrl || process.env.FULLCOURTDEFENSE_API_URL || DEFAULT_API_URL).replace(/\/$/, ''),
     };
 }
+function parseTomlString(value) {
+    const trimmed = value.trim();
+    if (!trimmed)
+        return undefined;
+    try {
+        return JSON.parse(trimmed);
+    }
+    catch {
+        return trimmed.replace(/^"|"$/g, '').replace(/^'|'$/g, '');
+    }
+}
+function parseTomlStringArray(value) {
+    const trimmed = value.trim();
+    if (!trimmed)
+        return [];
+    try {
+        const parsed = JSON.parse(trimmed);
+        return Array.isArray(parsed) ? parsed.map(String) : [];
+    }
+    catch {
+        return trimmed.replace(/^\[|\]$/g, '').split(',').map(part => parseTomlString(part) || '').filter(Boolean);
+    }
+}
+function parseCodexMcpServers(raw) {
+    const servers = {};
+    let currentName = '';
+    for (const line of raw.split(/\r?\n/)) {
+        const section = line.match(/^\s*\[mcp_servers\.([^\]]+)\]\s*$/);
+        if (section) {
+            currentName = section[1].replace(/^"|"$/g, '');
+            servers[currentName] = servers[currentName] || {};
+            continue;
+        }
+        if (!currentName)
+            continue;
+        const trimmed = line.trim();
+        if (!trimmed || trimmed.startsWith('#'))
+            continue;
+        const eq = trimmed.indexOf('=');
+        if (eq < 0)
+            continue;
+        const key = trimmed.slice(0, eq).trim();
+        const value = trimmed.slice(eq + 1).trim();
+        if (key === 'command')
+            servers[currentName].command = parseTomlString(value);
+        else if (key === 'args')
+            servers[currentName].args = parseTomlStringArray(value);
+        else if (key === 'url' || key === 'serverUrl')
+            servers[currentName][key] = parseTomlString(value);
+    }
+    return servers;
+}
+function extractMcpServerMap(parsed) {
+    if (!parsed || typeof parsed !== 'object')
+        return {};
+    if (parsed.mcpServers && typeof parsed.mcpServers === 'object')
+        return parsed.mcpServers;
+    if (parsed.servers && typeof parsed.servers === 'object')
+        return parsed.servers;
+    if (parsed.mcp?.servers && typeof parsed.mcp.servers === 'object')
+        return parsed.mcp.servers;
+    if (parsed['mcp.servers'] && typeof parsed['mcp.servers'] === 'object')
+        return parsed['mcp.servers'];
+    return {};
+}
+function gatewayArgValue(args, flag) {
+    const index = args.indexOf(flag);
+    return index >= 0 ? args[index + 1] : undefined;
+}
+function localMcpServerOptions() {
+    const out = [];
+    const seen = new Set();
+    for (const target of (0, discoverPaths_1.discoverScanTargets)(process.cwd())) {
+        if (!fs.existsSync(target.path))
+            continue;
+        let raw = '';
+        try {
+            raw = fs.readFileSync(target.path, 'utf8');
+        }
+        catch {
+            continue;
+        }
+        let parsed;
+        try {
+            parsed = JSON.parse(raw);
+        }
+        catch {
+            parsed = /\.toml$/i.test(target.path) || /codex/i.test(target.source)
+                ? { mcpServers: parseCodexMcpServers(raw) }
+                : null;
+        }
+        const maps = [{ servers: extractMcpServerMap(parsed) }];
+        if (/claude code/i.test(target.source) && parsed?.projects && typeof parsed.projects === 'object') {
+            for (const [projectPath, projectConfig] of Object.entries(parsed.projects)) {
+                maps.push({ label: path.basename(projectPath), servers: extractMcpServerMap(projectConfig) });
+            }
+        }
+        for (const item of maps) {
+            for (const [name, cfg] of Object.entries(item.servers)) {
+                const command = typeof cfg?.command === 'string' ? cfg.command : '';
+                const args = Array.isArray(cfg?.args) ? cfg.args.map(String) : [];
+                if (!command)
+                    continue;
+                const protectedServer = args.includes('mcp-gateway') || `${command} ${args.join(' ')}`.toLowerCase().includes('mcp-gateway');
+                const id = `${target.path}::${item.label || ''}::${name}`;
+                if (seen.has(id))
+                    continue;
+                seen.add(id);
+                out.push({
+                    id,
+                    name: item.label ? `${name} (${item.label})` : name,
+                    source: target.source,
+                    command,
+                    args,
+                    protected: protectedServer,
+                    agentName: protectedServer ? gatewayArgValue(args, '--agent-name') : undefined,
+                });
+            }
+        }
+    }
+    return out.sort((a, b) => Number(b.protected) - Number(a.protected) || a.name.localeCompare(b.name));
+}
 function compactScanHtml(args) {
     const auth = currentShieldConfig(args);
     const isConfigured = Boolean(auth.shieldId && auth.shieldKey);
@@ -1011,6 +1134,13 @@ function compactScanHtml(args) {
     .resultMetric span { font-size: 16px; font-weight: 800; color: #0f172a; }
     .resultMeta { margin-top: 10px; color: #334155; font-size: 12px; line-height: 1.5; }
     .resultMeta a { color: #1d4ed8; }
+    .mcpBanner { margin-top: 10px; border-radius: 14px; padding: 12px; font-size: 13px; line-height: 1.45; }
+    .mcpBanner.ok { border: 1px solid #bbf7d0; background: #f0fdf4; color: #166534; }
+    .mcpBanner.blocked { border: 1px solid #fecaca; background: #fef2f2; color: #991b1b; }
+    .mcpCards { display: grid; grid-template-columns: repeat(3, minmax(0, 1fr)); gap: 10px; margin-top: 10px; }
+    .mcpCard { border: 1px solid #e2e8f0; background: white; border-radius: 12px; padding: 10px; }
+    .mcpCard b { display: block; color: #64748b; font-size: 11px; text-transform: uppercase; letter-spacing: .05em; margin-bottom: 4px; }
+    .mcpCard span { color: #0f172a; font-size: 13px; font-weight: 750; overflow-wrap: anywhere; }
     .localTable { width: 100%; border-collapse: collapse; margin-top: 10px; font-size: 12px; overflow: hidden; border-radius: 12px; }
     .localTable th, .localTable td { border-bottom: 1px solid #e2e8f0; padding: 8px; text-align: left; vertical-align: top; }
     .localTable th { color: #475569; background: #f8fafc; font-size: 11px; text-transform: uppercase; letter-spacing: .05em; }
@@ -1071,6 +1201,10 @@ function compactScanHtml(args) {
       </div>
       <div id="runner-fields">
         <div class="note">Run one MCP tool call from this machine. Use a protected proxy/gateway command or local MCP URL. Results stay local in this browser page.</div>
+        <label>Saved/protected MCP server</label>
+        <select id="runnerServer">
+          <option value="">Manual connection...</option>
+        </select>
         <div class="two">
           <div>
             <label>Protected MCP HTTP/SSE URL</label>
@@ -1081,6 +1215,16 @@ function compactScanHtml(args) {
             <input id="runnerTool" placeholder="lookup_customer" />
           </div>
         </div>
+        <div class="two">
+          <div>
+            <label>Operation/action override</label>
+            <input id="runnerOperation" placeholder="optional, e.g. read / write / delete / payment:write" />
+          </div>
+          <div>
+            <label>Why use this?</label>
+            <input value="Use when one tool supports multiple actions" readonly />
+          </div>
+        </div>
         <div class="two">
           <div><label>Or stdio command</label><input id="runnerMcpCommand" placeholder="fullcourtdefense" /></div>
           <div><label>Command args</label><input id="runnerMcpArgs" placeholder='mcp-gateway --mcp-command node --mcp-args "[&quot;./server.js&quot;]"' /></div>
@@ -1242,6 +1386,7 @@ Full uses the full web attack corpus bundled with the CLI.</pre>
     byId('runnerMcpCommand').value = qs.get('mcpCommand') || 'fullcourtdefense';
     byId('runnerMcpArgs').value = qs.get('mcpArgs') || '';
     byId('runnerTool').value = qs.get('mcpTool') || '';
+    byId('runnerOperation').value = qs.get('operation') || '';
     const payload = () => ({
       target, mode: byId('mode').value, format: byId('format').value,
       endpoint: byId('endpoint').value, inputField: byId('inputField').value, outputField: byId('outputField').value,
@@ -1253,8 +1398,30 @@ Full uses the full web attack corpus bundled with the CLI.</pre>
       mcpCommand: byId('runnerMcpCommand').value,
       mcpArgs: byId('runnerMcpArgs').value,
       toolName: byId('runnerTool').value,
+      operation: byId('runnerOperation').value,
       toolArgs: byId('runnerToolArgs').value
     });
+    async function loadMcpServers() {
+      try {
+        const res = await fetch('/mcp/servers');
+        const data = await res.json();
+        const select = byId('runnerServer');
+        const options = data.servers || [];
+        select.innerHTML = '<option value="">Manual connection...</option>' + options.map((server, index) =>
+          '<option value="' + index + '">' + htmlEscape((server.protected ? 'Protected: ' : 'Direct: ') + server.name + ' - ' + server.source + (server.agentName ? ' - ' + server.agentName : '')) + '</option>'
+        ).join('');
+        select.onchange = () => {
+          const server = options[Number(select.value)];
+          if (!server) return;
+          byId('runnerMcpUrl').value = '';
+          byId('runnerMcpCommand').value = server.command || '';
+          byId('runnerMcpArgs').value = Array.isArray(server.args) ? server.args.map(part => /\\s/.test(part) ? JSON.stringify(part) : part).join(' ') : '';
+          setConsole('Loaded saved MCP server: ' + server.name + '\\n' + (server.protected ? 'This entry is already routed through FullCourtDefense gateway.' : 'Direct MCP entry. Wrap it with protect-all for policy enforcement.'), 'Server loaded');
+        };
+      } catch {
+        // Local server picker is convenience only; manual fields still work.
+      }
+    }
     const renderCommand = p => {
       const parts = ['fullcourtdefense scan --local --type', p.target, '--mode', p.mode, '--format', p.format, '--no-open'];
       if (p.target === 'endpoint') parts.push('--endpoint', JSON.stringify(p.endpoint), '--method POST --request-format custom --input-field', p.inputField || 'message', '--output-field', p.outputField || 'response');
@@ -1327,6 +1494,7 @@ Full uses the full web attack corpus bundled with the CLI.</pre>
       byId('runnerMcpCommand').value = 'fullcourtdefense';
       byId('runnerMcpArgs').value = '';
       byId('runnerTool').value = '';
+      byId('runnerOperation').value = '';
       byId('runnerToolArgs').value = '{\\n  "customerId": "cus_123"\\n}';
       byId('mcpResultCard').classList.add('hidden');
       byId('mcpResultJson').value = '';
@@ -1392,6 +1560,7 @@ Full uses the full web attack corpus bundled with the CLI.</pre>
       return data.ok;
     };
     byId('checkBackend').onclick = checkBackend;
+    loadMcpServers();
     checkBackend().catch(() => {});
     function mcpRows(value) {
       if (Array.isArray(value)) return value;
@@ -1411,19 +1580,68 @@ Full uses the full web attack corpus bundled with the CLI.</pre>
       if (value && Array.isArray(value.results)) return value.results;
       return null;
     }
+    function mcpText(value) {
+      if (value == null) return '';
+      if (typeof value === 'string') return value;
+      if (typeof value === 'number' || typeof value === 'boolean') return String(value);
+      const content = value.content;
+      if (Array.isArray(content)) {
+        return content
+          .map(item => item && typeof item.text === 'string' ? item.text : '')
+          .filter(Boolean)
+          .join('\\n');
+      }
+      return '';
+    }
+    function mcpObject(value) {
+      if (!value || typeof value !== 'object' || Array.isArray(value)) return null;
+      const contentText = mcpText(value);
+      if (contentText) {
+        try {
+          const parsed = JSON.parse(contentText);
+          if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) return parsed;
+        } catch {}
+      }
+      if (value.data && typeof value.data === 'object' && !Array.isArray(value.data)) return value.data;
+      if (value.result && typeof value.result === 'object' && !Array.isArray(value.result)) return value.result;
+      return value;
+    }
+    function cellValue(value) {
+      if (value == null) return '';
+      if (typeof value === 'object') return JSON.stringify(value);
+      return String(value);
+    }
+    function renderObjectCards(obj) {
+      const preferred = ['id', 'customerId', 'name', 'title', 'status', 'plan', 'email', 'decision', 'matchedPolicy', 'reason', 'ok'];
+      const keys = Array.from(new Set([...preferred.filter(k => Object.prototype.hasOwnProperty.call(obj, k)), ...Object.keys(obj)])).slice(0, 12);
+      return '<div class="mcpCards">' + keys.map(k => '<div class="mcpCard"><b>' + htmlEscape(k) + '</b><span>' + htmlEscape(cellValue(obj[k])) + '</span></div>').join('') + '</div>';
+    }
+    function renderMcpTable(rows) {
+      const preferred = ['id', 'customerId', 'name', 'title', 'status', 'plan', 'email', 'createdAt', 'updatedAt'];
+      const keys = Array.from(new Set([...preferred.filter(k => rows.some(row => row && Object.prototype.hasOwnProperty.call(row, k))), ...rows.flatMap(row => Object.keys(row || {}))])).slice(0, 10);
+      return '<table class="localTable"><thead><tr>' + keys.map(k => '<th>' + htmlEscape(k) + '</th>').join('') + '</tr></thead><tbody>' +
+        rows.slice(0, 50).map(row => '<tr>' + keys.map(k => '<td>' + htmlEscape(cellValue(row[k])) + '</td>').join('') + '</tr>').join('') +
+        '</tbody></table>' +
+        (rows.length > 50 ? '<div class="resultMeta">Showing first 50 rows. Full result is in raw JSON below.</div>' : '');
+    }
     function renderMcpResult(data) {
       byId('mcpResultCard').classList.remove('hidden');
-      byId('mcpResultStatus').textContent = data.success ? 'ALLOW / RESULT' : 'ERROR / BLOCK';
+      byId('mcpResultStatus').textContent = data.blocked ? 'BLOCKED' : data.success ? 'ALLOW / RESULT' : 'ERROR';
       byId('mcpResultStatus').className = data.success ? 'statusTag pass' : 'statusTag fail';
       byId('mcpResultJson').value = JSON.stringify(data, null, 2);
       const rows = data.success ? mcpRows(data.result) : null;
       if (rows && rows.length && rows.every(row => row && typeof row === 'object' && !Array.isArray(row))) {
-        const keys = Array.from(new Set(rows.flatMap(row => Object.keys(row)))).slice(0, 8);
-        byId('mcpResultTable').innerHTML = '<table class="localTable"><thead><tr>' + keys.map(k => '<th>' + htmlEscape(k) + '</th>').join('') + '</tr></thead><tbody>' +
-          rows.slice(0, 25).map(row => '<tr>' + keys.map(k => '<td>' + htmlEscape(typeof row[k] === 'object' ? JSON.stringify(row[k]) : String(row[k] ?? '')) + '</td>').join('') + '</tr>').join('') +
-          '</tbody></table>';
+        byId('mcpResultTable').innerHTML = '<div class="mcpBanner ok"><b>Allowed.</b> Tool returned ' + rows.length + ' row(s).</div>' + renderMcpTable(rows);
+      } else if (data.success) {
+        const obj = mcpObject(data.result);
+        const text = mcpText(data.result);
+        byId('mcpResultTable').innerHTML = '<div class="mcpBanner ok"><b>Allowed.</b> Tool call completed through the configured MCP server/proxy.</div>' +
+          (obj ? renderObjectCards(obj) : '<div class="resultMeta">' + htmlEscape(text || 'Result is shown as raw JSON below.') + '</div>');
       } else {
-        byId('mcpResultTable').innerHTML = '<div class="resultMeta">' + (data.success ? 'Result is shown as copyable JSON below.' : htmlEscape(data.error || 'MCP call failed.')) + '</div>';
+        const blockedCopy = data.blocked
+          ? 'Blocked because a FullCourtDefense policy or local safety rule is defined for this tool/action.'
+          : 'The MCP call failed before a successful tool result was returned.';
+        byId('mcpResultTable').innerHTML = '<div class="mcpBanner blocked"><b>' + (data.blocked ? 'Blocked by policy.' : 'MCP error.') + '</b> ' + htmlEscape(blockedCopy) + '<br/><span>' + htmlEscape(data.reason || data.error || 'No reason returned.') + '</span></div>';
       }
     }
     byId('copyMcpResult').onclick = async () => {
@@ -1585,11 +1803,40 @@ function createMcpClient(options) {
         return new HttpMcpClient(options);
     return new StdioMcpClient(options.command || '', options.args || []);
 }
+function parseMcpErrorResult(result) {
+    if (!result || typeof result !== 'object' || !result.isError)
+        return null;
+    const content = result.content;
+    const text = Array.isArray(content)
+        ? content.map(item => item && typeof item === 'object' && typeof item.text === 'string' ? item.text : '').filter(Boolean).join('\n')
+        : '';
+    if (text) {
+        try {
+            const parsed = JSON.parse(text);
+            if (parsed && typeof parsed === 'object') {
+                return {
+                    blocked: parsed.blocked === true || /policy|blocked|approval/i.test(text),
+                    reason: typeof parsed.reason === 'string' ? parsed.reason : text,
+                    details: parsed,
+                };
+            }
+        }
+        catch {
+            // plain-text MCP error
+        }
+    }
+    return {
+        blocked: /policy|blocked|approval|not allowed|denied/i.test(text),
+        reason: text || 'The MCP server returned an error result.',
+        details: result,
+    };
+}
 async function runMcpToolFromBrowser(body) {
     const rawUrl = typeof body.mcpUrl === 'string' ? body.mcpUrl.trim() : '';
     const rawCommand = typeof body.mcpCommand === 'string' ? body.mcpCommand.trim() : '';
     const rawArgs = typeof body.mcpArgs === 'string' ? body.mcpArgs.trim() : '';
     const toolName = typeof body.toolName === 'string' ? body.toolName.trim() : '';
+    const operation = typeof body.operation === 'string' && body.operation.trim() ? body.operation.trim() : undefined;
     if (!toolName)
         throw new Error('Tool name is required.');
     if (!rawUrl && !rawCommand)
@@ -1611,11 +1858,27 @@ async function runMcpToolFromBrowser(body) {
     const startedAt = Date.now();
     try {
         await client.initialize();
-        const result = await client.callTool(toolName, toolArgs);
+        const result = await client.callTool(toolName, toolArgs, operation);
+        const errorResult = parseMcpErrorResult(result);
+        if (errorResult) {
+            return {
+                success: false,
+                blocked: errorResult.blocked,
+                toolName,
+                transport,
+                operation,
+                destination: rawUrl || `${rawCommand} ${options.args?.join(' ') || ''}`.trim(),
+                elapsedMs: Date.now() - startedAt,
+                reason: errorResult.reason,
+                result,
+                details: errorResult.details,
+            };
+        }
         return {
             success: true,
             toolName,
             transport,
+            operation,
             destination: rawUrl || `${rawCommand} ${options.args?.join(' ') || ''}`.trim(),
             elapsedMs: Date.now() - startedAt,
             result,
@@ -1624,10 +1887,13 @@ async function runMcpToolFromBrowser(body) {
     catch (error) {
         return {
             success: false,
+            blocked: /policy|blocked|approval|not allowed|denied/i.test(error instanceof Error ? error.message : String(error)),
             toolName,
             transport,
+            operation,
             destination: rawUrl || `${rawCommand} ${options.args?.join(' ') || ''}`.trim(),
             elapsedMs: Date.now() - startedAt,
+            reason: error instanceof Error ? error.message : String(error),
             error: error instanceof Error ? error.message : String(error),
         };
     }
@@ -1654,6 +1920,11 @@ function startCompactWebServer(args) {
                 }));
                 return;
             }
+            if (req.method === 'GET' && url.pathname === '/mcp/servers') {
+                res.writeHead(200, { 'content-type': 'application/json; charset=utf-8' });
+                res.end(JSON.stringify({ servers: localMcpServerOptions() }));
+                return;
+            }
             if (req.method === 'POST' && url.pathname === '/auth/save') {
                 const body = await readRequestBody(req);
                 const shieldId = typeof body.shieldId === 'string' ? body.shieldId.trim() : '';
@@ -1912,8 +2183,8 @@ class StdioMcpClient {
         });
         this.notify('notifications/initialized', {});
     }
-    async callTool(name, args) {
-        return this.request('tools/call', { name, arguments: args });
+    async callTool(name, args, operation) {
+        return this.request('tools/call', { name, arguments: args, ...(operation ? { operation } : {}) });
     }
     async listTools() {
         const result = await this.request('tools/list', {});
@@ -2050,8 +2321,8 @@ class HttpMcpClient {
         });
         await this.notify('notifications/initialized', {});
     }
-    async callTool(name, args) {
-        return this.request('tools/call', { name, arguments: args });
+    async callTool(name, args, operation) {
+        return this.request('tools/call', { name, arguments: args, ...(operation ? { operation } : {}) });
     }
     async listTools() {
         const result = await this.request('tools/list', {});
@@ -2144,8 +2415,8 @@ class SseMcpClient {
         });
         await this.notify('notifications/initialized', {});
     }
-    async callTool(name, args) {
-        return this.request('tools/call', { name, arguments: args });
+    async callTool(name, args, operation) {
+        return this.request('tools/call', { name, arguments: args, ...(operation ? { operation } : {}) });
     }
     async listTools() {
         const result = await this.request('tools/list', {});

package/dist/commands/mcpGateway.js

@@ -588,12 +588,12 @@ class McpGatewayServer {
             throw new Error('Missing MCP tool name.');
         const toolArgs = params.arguments && typeof params.arguments === 'object' ? params.arguments : {};
         let approvalActionId;
-        let operation;
+        let operation = typeof params.operation === 'string' && params.operation.trim() ? params.operation.trim() : undefined;
         try {
             const localBlock = (0, deterministicGuard_1.scanDeterministicToolCall)(toolName, toolArgs);
             if (localBlock)
                 throw new Error(`${localBlock.reason} (${localBlock.ruleId}: ${localBlock.evidence})`);
-            const preflight = await this.api.checkToolCall({ toolName, toolArgs });
+            const preflight = await this.api.checkToolCall({ toolName, operation, toolArgs });
             operation = preflight.operation;
             if (!preflight.allowed) {
                 if (preflight.decision === 'approval' && this.gatewayConfig.approvalMode === 'wait') {

package/dist/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.7.6"
+  "version": "1.7.9"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fullcourtdefense-cli",
-  "version": "1.7.6",
+  "version": "1.7.9",
   "description": "Full Court Defense CLI — security scanning for AI agents from your terminal",
   "main": "dist/index.js",
   "bin": {