fullcourtdefense-cli 1.1.15 → 1.1.17

package/dist/commands/mcpGateway.js

@@ -49,11 +49,19 @@ function parseArgsList(value) {
         return [];
     const trimmed = value.trim();
     if (trimmed.startsWith('[')) {
-        const parsed = JSON.parse(trimmed);
-        if (!Array.isArray(parsed) || parsed.some(item => typeof item !== 'string')) {
-            throw new Error('MCP args JSON must be an array of strings.');
+        try {
+            const parsed = JSON.parse(trimmed);
+            if (!Array.isArray(parsed) || parsed.some(item => typeof item !== 'string')) {
+                throw new Error('MCP args JSON must be an array of strings.');
+            }
+            return parsed;
+        }
+        catch (error) {
+            const inner = trimmed.replace(/^\[/, '').replace(/\]$/, '').trim();
+            if (inner && !inner.includes(','))
+                return [inner.replace(/^"|"$/g, '')];
+            throw error;
         }
-        return parsed;
     }
     return trimmed.match(/(?:[^\s"]+|"[^"]*")+/g)?.map(part => part.replace(/^"|"$/g, '')) ?? [];
 }
@@ -885,10 +893,22 @@ async function installClaudeCodeMcpGatewayCommand(args, config) {
     const includeShieldKey = scope !== 'project' || Boolean(args.shieldKey);
     const commandArgs = buildGatewayCommandArgs(gatewayConfig, downstreamCommand, downstreamArgs, { includeShieldKey });
     const claudeArgs = ['mcp', 'add', '--scope', scope, '--transport', 'stdio', serverName, '--', nodeExe, ...commandArgs];
-    const result = (0, child_process_1.spawnSync)('claude', claudeArgs, {
+    let result = (0, child_process_1.spawnSync)('claude', claudeArgs, {
         stdio: 'inherit',
         shell: process.platform === 'win32',
     });
+    if (result.status !== 0) {
+        const removeResult = (0, child_process_1.spawnSync)('claude', ['mcp', 'remove', '--scope', scope, serverName], {
+            stdio: 'ignore',
+            shell: process.platform === 'win32',
+        });
+        if (removeResult.status === 0) {
+            result = (0, child_process_1.spawnSync)('claude', claudeArgs, {
+                stdio: 'inherit',
+                shell: process.platform === 'win32',
+            });
+        }
+    }
     if (result.status === 0) {
         console.log(`AgentGuard MCP Gateway installed for Claude Code (${scope}).`);
         console.log(`Server: ${serverName}`);

package/dist/index.js

@@ -11,7 +11,7 @@ const discover_1 = require("./commands/discover");
 const hook_1 = require("./commands/hook");
 const installCursorHook_1 = require("./commands/installCursorHook");
 const mcpGateway_1 = require("./commands/mcpGateway");
-const VERSION = '1.1.15';
+const VERSION = '1.1.17';
 function parseArgs(argv) {
     const flags = {};
     let command = '';
@@ -53,173 +53,173 @@ function parseArgs(argv) {
     return { command, flags };
 }
 function printHelp() {
-    console.log(`
-  \x1b[1m\x1b[36mFullCourtDefense CLI\x1b[0m v${VERSION}
-  Security scanning for AI agents from your terminal.
-
-  \x1b[1mUsage:\x1b[0m
-    fullcourtdefense <command> [options]
-
-  \x1b[1mCommands:\x1b[0m
-    help        Show this onboarding guide and command reference.
-    doctor      First step. Checks outbound HTTPS access to FullCourtDefense.
-    configure   Saves Shield ID, Shield key, and API URL to .fullcourtdefense.yml.
-    scan        Runs the scan. Use --local for inside-organization scans.
-    discover    Finds MCP servers configured on this machine (Cursor, Claude,
-                VS Code, Windsurf) and reports their risk. Use --upload to add
-                them to your AI Inventory.
-    install-cursor-hook
-                Installs a Cursor hook so every AI prompt + agent action
-                (shell, MCP) on this machine is scanned by your Shield.
-    uninstall-cursor-hook
-                Removes the FullCourtDefense Cursor hook entries.
-    install-mcp-gateway
-                One command to install the AgentGuard MCP Gateway into detected
-                clients (Cursor, Claude Code, Claude Desktop).
-    mcp-gateway
-                Runs a local MCP gateway that checks AgentGuard runtime/action
-                policies before forwarding tool calls to a real MCP server.
-    install-cursor-mcp-gateway
-                Adds the AgentGuard MCP Gateway to Cursor's mcp.json.
-    install-claude-code-mcp-gateway
-                Adds the AgentGuard MCP Gateway to Claude Code using claude mcp add.
-    install-claude-desktop-mcp-gateway
-                Adds the AgentGuard MCP Gateway to Claude Desktop config.
-    hook        Internal: invoked by Cursor per agent event (reads stdin JSON,
-                returns an allow/deny verdict). Not run by hand.
-    credits     Shows hosted scan credits for CI/CD API-key scans.
-    init        Creates a starter .fullcourtdefense.yml config file.
-
-  \x1b[1mNew User Process:\x1b[0m
-    1. In the web app, create a Shield.
-       Copy the Shield ID and Shield key from the Shield Integrate tab.
-
-    2. Check outbound connectivity from the customer machine:
-       fullcourtdefense doctor
-       This confirms the machine can reach https://api.fullcourtdefense.ai over HTTPS.
-
-    3. Save Shield credentials locally:
-       fullcourtdefense configure
-       This creates or updates .fullcourtdefense.yml.
-
-    4. Run a guided local scan:
-       fullcourtdefense scan --local
-       The CLI asks whether to scan endpoint, mcp, or rag.
-       To open the localhost web scan UI first:
-       fullcourtdefense scan --local --open-ui
-
-    5. Review results:
-       Use --format summary for CI, --format table for terminal view,
-       --format report for evidence, --format full-report for every row,
-       or --format json for raw output.
-       With a Shield key configured, reports are saved to the web Reports page
-       and the browser opens to the saved report. Use --no-open to suppress.
-
-  \x1b[1mLocal Destinations:\x1b[0m
-    endpoint    Internal HTTP URL, for example http://agent.local/chat.
-                The CLI sends attack prompts to this endpoint and scans responses.
-
-    mcp         Either stdio command + args, or an already-running HTTP/SSE MCP URL.
-                Stdio example: node ./mcp-server.js
-                HTTP/HTTPS examples: http://mcp.internal/mcp or https://internal.company.com/mcp
-                Legacy SSE example: https://internal.company.com/sse
-                Secured HTTP MCP supports bearer, basic, and API-key auth.
-
-    rag         File/directory path or live RAG HTTP endpoint.
-                Use --rag-path for local documents, or --rag-url for a RAG service.
-
-  \x1b[1mRecommended Commands:\x1b[0m
-    fullcourtdefense doctor
-    fullcourtdefense configure
-    fullcourtdefense scan --local
-    fullcourtdefense scan --local --type mcp --mcp-command node --mcp-args ./server.js --mcp-tool all --mode full --format report
-    fullcourtdefense scan --local --type mcp --mcp-url https://internal.company.com/mcp --mcp-auth-type bearer --mcp-token TOKEN --mcp-tool all --mode full --format report
-    fullcourtdefense scan --local --type rag --rag-path ./docs --format report
-    fullcourtdefense scan --local --type rag --rag-url http://rag.internal/chat --method POST --request-format custom --input-field message --output-field answer --mode full --format report
-    fullcourtdefense scan --local --type endpoint --endpoint http://agent.local/chat --method POST --mode full --format report
-
-  \x1b[1mScan Options:\x1b[0m
-    --local                 Run scan from this machine, inside your network
-    --open-ui               Open localhost browser scan UI with all options
-    --type <type>           Local scan type: endpoint, mcp, rag
-    --api-key <key>         API key (or set FULLCOURTDEFENSE_API_KEY env var)
-    --api-url <url>         API base URL (default: https://api.fullcourtdefense.ai)
-    --endpoint <url>        Agent API endpoint to scan
-    --mcp-url <url>         Already-running HTTP MCP server URL
-    --mcp-transport <t>     MCP transport: stdio, http, or sse
-    --mcp-command <cmd>     MCP server command, for example node or npx.cmd
-    --mcp-args <args>       MCP server args/path, for example ./server.js
-    --mcp-tool <tool>       MCP tool to test, or all
-    --server-name <name>    MCP gateway server name for client installers
-    --clients <list>        Gateway install clients: auto, all, cursor,
-                            claude-code, claude-desktop
-    --developer-name <name> Runtime identity for user-scoped policies (auto-detected if omitted)
-    --agent-name <name>     Runtime agent name (auto-generated from identity + client if omitted)
-    --scope <scope>         Claude Code MCP scope: local, project, or user
-    --claude-code-scope <s> Claude Code scope for install-mcp-gateway
-    --cursor-project <bool> Cursor project config for install-mcp-gateway
-    --config-path <path>    Claude Desktop config override path
-    --mcp-auth-type <type>  HTTP MCP auth: none, bearer, basic, api-key
-    --mcp-token <token>     HTTP MCP bearer token
-    --mcp-username <user>   HTTP MCP basic username
-    --mcp-password <pass>   HTTP MCP basic password
-    --mcp-api-key-header <h> HTTP MCP API-key header name
-    --mcp-api-key <key>     HTTP MCP API key value
-    --rag-path <path>       RAG file or directory to scan
-    --rag-url <url>         Live RAG HTTP endpoint to scan
-    --shield-id <id>        Shield ID for local outbound Shield verdicts
-    --shield-key <key>      Optional Shield key for locked Shields
-    --method <GET|POST>     Local endpoint method
-    --request-format <fmt>  Local endpoint request format: custom or openai
-    --auth-type <type>      none, bearer, basic, api-key
-    --description <text>    Agent description
-    --system-prompt <text>  System prompt (text or path to file)
-    --mode <sync|async>     Hosted mode, or local mode: quick, full, targeted, deep
-    --categories <list>     Comma-separated attack categories
-    --attack-count <n>      Number of attacks to run
-    --progress <mode>       MCP progress: verbose, compact, silent (default: verbose)
-    --fail-threshold <n>    Exit code 1 if score below n (default: 0)
-    --format <fmt>          Output: table, json, summary, report, full-report (default: table)
-    --open                  Open browser scan UI and saved local scan report
-    --open-ui               Open only the browser scan UI before local execution
-    --no-open               Do not open the browser during/after local scans
-    --webhook-format <fmt>  Hosted webhook format, or legacy local request format
-    --config <path>         Path to .fullcourtdefense.yml config file
-
-  \x1b[1mExamples:\x1b[0m
-    $ fullcourtdefense scan --endpoint https://my-bot.com/chat --description "Support bot"
-    $ fullcourtdefense help
-    $ fullcourtdefense scan --local
-    $ fullcourtdefense scan --local --open-ui
-    $ fullcourtdefense scan --local --type endpoint --mode full --endpoint http://internal-agent/chat
-    $ fullcourtdefense scan --local --type mcp --mcp-command node --mcp-args ./server.js --mcp-tool all --mode full
-    $ fullcourtdefense scan --local --type mcp --mcp-url https://internal.company.com/mcp
-    $ fullcourtdefense scan --local --type mcp --mcp-url https://internal.company.com/mcp --mcp-tool all --mode full
-    $ fullcourtdefense scan --local --type mcp --mcp-transport sse --mcp-url https://internal.company.com/sse --mcp-tool all --mode full
-    $ fullcourtdefense scan --local --type mcp --mcp-command node --mcp-args ./server.js --mcp-tool all --mode full --format report
-    $ fullcourtdefense discover
-    $ fullcourtdefense discover --upload
-    $ fullcourtdefense discover --type mcp --json
-    $ fullcourtdefense install-cursor-hook --shield-id <id> --shield-key <key>
-    $ fullcourtdefense install-cursor-hook --shadow true        # monitor only
-    $ fullcourtdefense install-cursor-hook --events prompt,shell,mcp,file
-    $ fullcourtdefense install-cursor-hook --project true       # this repo only
-    $ fullcourtdefense uninstall-cursor-hook
-    $ fullcourtdefense install-mcp-gateway --clients auto --shield-id <id> --shield-key <key> --mcp-command npm --mcp-args "run mcp"
-    $ fullcourtdefense install-mcp-gateway --clients all --mcp-command node --mcp-args ./server.js
-    $ fullcourtdefense install-cursor-mcp-gateway --project true --shield-id <id> --shield-key <key> --mcp-command npm --mcp-args "run mcp"
-    $ fullcourtdefense install-claude-code-mcp-gateway --scope local --shield-id <id> --shield-key <key> --mcp-command npm --mcp-args "run mcp"
-    $ fullcourtdefense install-claude-code-mcp-gateway --scope project --shield-id <id> --mcp-command npm --mcp-args "run mcp"
-    $ fullcourtdefense install-claude-desktop-mcp-gateway --shield-id <id> --shield-key <key> --mcp-command npm --mcp-args "run mcp"
-    $ fullcourtdefense mcp-gateway --shield-id <id> --mcp-command npm --mcp-args "run mcp"
-    $ fullcourtdefense configure
-    $ fullcourtdefense doctor
-    $ fullcourtdefense scan --system-prompt ./prompts/system.md --fail-threshold 80
-    $ fullcourtdefense scan --config .fullcourtdefense.yml --format json
-    $ fullcourtdefense credits
-    $ fullcourtdefense init
-
-  \x1b[2mDocs: https://fullcourtdefense.ai/docs/cli\x1b[0m
+    console.log(`
+  \x1b[1m\x1b[36mFullCourtDefense CLI\x1b[0m v${VERSION}
+  Security scanning for AI agents from your terminal.
+
+  \x1b[1mUsage:\x1b[0m
+    fullcourtdefense <command> [options]
+
+  \x1b[1mCommands:\x1b[0m
+    help        Show this onboarding guide and command reference.
+    doctor      First step. Checks outbound HTTPS access to FullCourtDefense.
+    configure   Saves Shield ID, Shield key, and API URL to .fullcourtdefense.yml.
+    scan        Runs the scan. Use --local for inside-organization scans.
+    discover    Finds MCP servers configured on this machine (Cursor, Claude,
+                VS Code, Windsurf) and reports their risk. Use --upload to add
+                them to your AI Inventory.
+    install-cursor-hook
+                Installs a Cursor hook so every AI prompt + agent action
+                (shell, MCP) on this machine is scanned by your Shield.
+    uninstall-cursor-hook
+                Removes the FullCourtDefense Cursor hook entries.
+    install-mcp-gateway
+                One command to install the AgentGuard MCP Gateway into detected
+                clients (Cursor, Claude Code, Claude Desktop).
+    mcp-gateway
+                Runs a local MCP gateway that checks AgentGuard runtime/action
+                policies before forwarding tool calls to a real MCP server.
+    install-cursor-mcp-gateway
+                Adds the AgentGuard MCP Gateway to Cursor's mcp.json.
+    install-claude-code-mcp-gateway
+                Adds the AgentGuard MCP Gateway to Claude Code using claude mcp add.
+    install-claude-desktop-mcp-gateway
+                Adds the AgentGuard MCP Gateway to Claude Desktop config.
+    hook        Internal: invoked by Cursor per agent event (reads stdin JSON,
+                returns an allow/deny verdict). Not run by hand.
+    credits     Shows hosted scan credits for CI/CD API-key scans.
+    init        Creates a starter .fullcourtdefense.yml config file.
+
+  \x1b[1mNew User Process:\x1b[0m
+    1. In the web app, create a Shield.
+       Copy the Shield ID and Shield key from the Shield Integrate tab.
+
+    2. Check outbound connectivity from the customer machine:
+       fullcourtdefense doctor
+       This confirms the machine can reach https://api.fullcourtdefense.ai over HTTPS.
+
+    3. Save Shield credentials locally:
+       fullcourtdefense configure
+       This creates or updates .fullcourtdefense.yml.
+
+    4. Run a guided local scan:
+       fullcourtdefense scan --local
+       The CLI asks whether to scan endpoint, mcp, or rag.
+       To open the localhost web scan UI first:
+       fullcourtdefense scan --local --open-ui
+
+    5. Review results:
+       Use --format summary for CI, --format table for terminal view,
+       --format report for evidence, --format full-report for every row,
+       or --format json for raw output.
+       With a Shield key configured, reports are saved to the web Reports page
+       and the browser opens to the saved report. Use --no-open to suppress.
+
+  \x1b[1mLocal Destinations:\x1b[0m
+    endpoint    Internal HTTP URL, for example http://agent.local/chat.
+                The CLI sends attack prompts to this endpoint and scans responses.
+
+    mcp         Either stdio command + args, or an already-running HTTP/SSE MCP URL.
+                Stdio example: node ./mcp-server.js
+                HTTP/HTTPS examples: http://mcp.internal/mcp or https://internal.company.com/mcp
+                Legacy SSE example: https://internal.company.com/sse
+                Secured HTTP MCP supports bearer, basic, and API-key auth.
+
+    rag         File/directory path or live RAG HTTP endpoint.
+                Use --rag-path for local documents, or --rag-url for a RAG service.
+
+  \x1b[1mRecommended Commands:\x1b[0m
+    fullcourtdefense doctor
+    fullcourtdefense configure
+    fullcourtdefense scan --local
+    fullcourtdefense scan --local --type mcp --mcp-command node --mcp-args ./server.js --mcp-tool all --mode full --format report
+    fullcourtdefense scan --local --type mcp --mcp-url https://internal.company.com/mcp --mcp-auth-type bearer --mcp-token TOKEN --mcp-tool all --mode full --format report
+    fullcourtdefense scan --local --type rag --rag-path ./docs --format report
+    fullcourtdefense scan --local --type rag --rag-url http://rag.internal/chat --method POST --request-format custom --input-field message --output-field answer --mode full --format report
+    fullcourtdefense scan --local --type endpoint --endpoint http://agent.local/chat --method POST --mode full --format report
+
+  \x1b[1mScan Options:\x1b[0m
+    --local                 Run scan from this machine, inside your network
+    --open-ui               Open localhost browser scan UI with all options
+    --type <type>           Local scan type: endpoint, mcp, rag
+    --api-key <key>         API key (or set FULLCOURTDEFENSE_API_KEY env var)
+    --api-url <url>         API base URL (default: https://api.fullcourtdefense.ai)
+    --endpoint <url>        Agent API endpoint to scan
+    --mcp-url <url>         Already-running HTTP MCP server URL
+    --mcp-transport <t>     MCP transport: stdio, http, or sse
+    --mcp-command <cmd>     MCP server command, for example node or npx.cmd
+    --mcp-args <args>       MCP server args/path, for example ./server.js
+    --mcp-tool <tool>       MCP tool to test, or all
+    --server-name <name>    MCP gateway server name for client installers
+    --clients <list>        Gateway install clients: auto, all, cursor,
+                            claude-code, claude-desktop
+    --developer-name <name> Runtime identity for user-scoped policies (auto-detected if omitted)
+    --agent-name <name>     Runtime agent name (auto-generated from identity + client if omitted)
+    --scope <scope>         Claude Code MCP scope: local, project, or user
+    --claude-code-scope <s> Claude Code scope for install-mcp-gateway
+    --cursor-project <bool> Cursor project config for install-mcp-gateway
+    --config-path <path>    Claude Desktop config override path
+    --mcp-auth-type <type>  HTTP MCP auth: none, bearer, basic, api-key
+    --mcp-token <token>     HTTP MCP bearer token
+    --mcp-username <user>   HTTP MCP basic username
+    --mcp-password <pass>   HTTP MCP basic password
+    --mcp-api-key-header <h> HTTP MCP API-key header name
+    --mcp-api-key <key>     HTTP MCP API key value
+    --rag-path <path>       RAG file or directory to scan
+    --rag-url <url>         Live RAG HTTP endpoint to scan
+    --shield-id <id>        Shield ID for local outbound Shield verdicts
+    --shield-key <key>      Optional Shield key for locked Shields
+    --method <GET|POST>     Local endpoint method
+    --request-format <fmt>  Local endpoint request format: custom or openai
+    --auth-type <type>      none, bearer, basic, api-key
+    --description <text>    Agent description
+    --system-prompt <text>  System prompt (text or path to file)
+    --mode <sync|async>     Hosted mode, or local mode: quick, full, targeted, deep
+    --categories <list>     Comma-separated attack categories
+    --attack-count <n>      Number of attacks to run
+    --progress <mode>       MCP progress: verbose, compact, silent (default: verbose)
+    --fail-threshold <n>    Exit code 1 if score below n (default: 0)
+    --format <fmt>          Output: table, json, summary, report, full-report (default: table)
+    --open                  Open browser scan UI and saved local scan report
+    --open-ui               Open only the browser scan UI before local execution
+    --no-open               Do not open the browser during/after local scans
+    --webhook-format <fmt>  Hosted webhook format, or legacy local request format
+    --config <path>         Path to .fullcourtdefense.yml config file
+
+  \x1b[1mExamples:\x1b[0m
+    $ fullcourtdefense scan --endpoint https://my-bot.com/chat --description "Support bot"
+    $ fullcourtdefense help
+    $ fullcourtdefense scan --local
+    $ fullcourtdefense scan --local --open-ui
+    $ fullcourtdefense scan --local --type endpoint --mode full --endpoint http://internal-agent/chat
+    $ fullcourtdefense scan --local --type mcp --mcp-command node --mcp-args ./server.js --mcp-tool all --mode full
+    $ fullcourtdefense scan --local --type mcp --mcp-url https://internal.company.com/mcp
+    $ fullcourtdefense scan --local --type mcp --mcp-url https://internal.company.com/mcp --mcp-tool all --mode full
+    $ fullcourtdefense scan --local --type mcp --mcp-transport sse --mcp-url https://internal.company.com/sse --mcp-tool all --mode full
+    $ fullcourtdefense scan --local --type mcp --mcp-command node --mcp-args ./server.js --mcp-tool all --mode full --format report
+    $ fullcourtdefense discover
+    $ fullcourtdefense discover --upload
+    $ fullcourtdefense discover --type mcp --json
+    $ fullcourtdefense install-cursor-hook --shield-id <id> --shield-key <key>
+    $ fullcourtdefense install-cursor-hook --shadow true        # monitor only
+    $ fullcourtdefense install-cursor-hook --events prompt,shell,mcp,file
+    $ fullcourtdefense install-cursor-hook --project true       # this repo only
+    $ fullcourtdefense uninstall-cursor-hook
+    $ fullcourtdefense install-mcp-gateway --clients auto --shield-id <id> --shield-key <key> --mcp-command npm --mcp-args "run mcp"
+    $ fullcourtdefense install-mcp-gateway --clients all --mcp-command node --mcp-args ./server.js
+    $ fullcourtdefense install-cursor-mcp-gateway --project true --shield-id <id> --shield-key <key> --mcp-command npm --mcp-args "run mcp"
+    $ fullcourtdefense install-claude-code-mcp-gateway --scope local --shield-id <id> --shield-key <key> --mcp-command npm --mcp-args "run mcp"
+    $ fullcourtdefense install-claude-code-mcp-gateway --scope project --shield-id <id> --mcp-command npm --mcp-args "run mcp"
+    $ fullcourtdefense install-claude-desktop-mcp-gateway --shield-id <id> --shield-key <key> --mcp-command npm --mcp-args "run mcp"
+    $ fullcourtdefense mcp-gateway --shield-id <id> --mcp-command npm --mcp-args "run mcp"
+    $ fullcourtdefense configure
+    $ fullcourtdefense doctor
+    $ fullcourtdefense scan --system-prompt ./prompts/system.md --fail-threshold 80
+    $ fullcourtdefense scan --config .fullcourtdefense.yml --format json
+    $ fullcourtdefense credits
+    $ fullcourtdefense init
+
+  \x1b[2mDocs: https://fullcourtdefense.ai/docs/cli\x1b[0m
 `);
 }
 async function main() {

package/package.json

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