fullcourtdefense-cli 1.3.5 → 1.3.6

package/dist/api.js

@@ -19,23 +19,7 @@ class BotGuardApi {
             },
             body: body ? JSON.stringify(body) : undefined,
         });
-        const contentType = resp.headers.get('content-type') || '';
-        const raw = await resp.text();
-        let data;
-        try {
-            data = raw ? JSON.parse(raw) : {};
-        }
-        catch {
-            if (raw.trimStart().startsWith('<!DOCTYPE') || raw.trimStart().startsWith('<html')) {
-                throw new Error(`API returned HTML instead of JSON (${resp.status} ${path}). `
-                    + 'The endpoint may not be deployed yet — retry with `fullcourtdefense setup --skip-validate true` '
-                    + 'or confirm https://api.fullcourtdefense.ai is reachable.');
-            }
-            throw new Error(`Invalid API response (${resp.status} ${path}): ${raw.slice(0, 200)}`);
-        }
-        if (!contentType.includes('json') && !data?.success && !resp.ok) {
-            // Some gateways omit content-type; JSON parse already succeeded.
-        }
+        const data = await resp.json();
         if (!resp.ok || data.success === false) {
             const err = data;
             const msg = err.code ? `${err.error} (${err.code})` : (err.error || `API error (${resp.status})`);

package/dist/commands/configure.d.ts

@@ -6,7 +6,5 @@ export interface ConfigureArgs {
     shieldKey?: string;
     apiUrl?: string;
     skipValidate?: boolean;
-    /** When true, use only flags/env/config — no prompts (for scripts). */
-    nonInteractive?: boolean;
 }
-export declare function configureCommand(args: ConfigureArgs, config: BotGuardConfig): Promise<void>;
+export declare function configureCommand(args: ConfigureArgs, _config: BotGuardConfig): Promise<void>;

package/dist/commands/configure.js

@@ -43,107 +43,89 @@ async function ask(rl, question, fallback) {
     const answer = (await rl.question(`${question}${suffix}: `)).trim();
     return answer || fallback || '';
 }
-async function confirm(rl, question, defaultYes = true) {
-    const hint = defaultYes ? 'Y/n' : 'y/N';
-    const answer = (await rl.question(`${question} (${hint}): `)).trim().toLowerCase();
-    if (!answer)
-        return defaultYes;
-    return answer === 'y' || answer === 'yes';
+function looksLikeOrgId(value) {
+    return /^[A-Za-z0-9_-]{8,80}$/.test(value);
 }
-function resolveApiKey(args, config) {
-    return args.apiKey || config.apiKey || process.env.FULLCOURTDEFENSE_API_KEY || '';
+function looksLikeShieldId(value) {
+    return /^sh_[A-Za-z0-9]{12,80}$/.test(value);
 }
-function defaultsFrom(args, config) {
-    return {
-        apiUrl: args.apiUrl || config.apiUrl || 'https://api.fullcourtdefense.ai',
-        apiKey: resolveApiKey(args, config),
-        organizationId: args.organizationId || config.organizationId || '',
-        shieldId: args.shieldId || config.shieldId || '',
-        shieldKey: args.shieldKey ?? config.shieldKey ?? '',
-    };
+function looksLikeShieldKey(value) {
+    return /^shsk_[A-Za-z0-9]{24,160}$/.test(value);
 }
-function allFlagsProvided(args) {
-    return Boolean(args.apiKey && args.organizationId && args.shieldId && args.apiUrl);
+function looksLikeApiKey(value) {
+    return /^ag_[A-Za-z0-9]{24,160}$/.test(value);
 }
-function isValidationUnavailableError(error) {
-    const message = error instanceof Error ? error.message : String(error);
-    return message.includes('HTML instead of JSON') || message.includes('404');
+function validateLocalShape(input) {
+    const problems = [];
+    if (!looksLikeApiKey(input.apiKey))
+        problems.push('Organization API key must start with ag_ and look like a FullCourtDefense API key.');
+    if (!looksLikeOrgId(input.organizationId))
+        problems.push('Organization ID format is invalid.');
+    if (!looksLikeShieldId(input.shieldId))
+        problems.push('Shield ID must start with sh_ and look like sh_...');
+    if (input.shieldKey && !looksLikeShieldKey(input.shieldKey))
+        problems.push('Shield key must start with shsk_ and look like shsk_...');
+    if (problems.length > 0) {
+        throw new Error(`Setup values are not valid:\n- ${problems.join('\n- ')}\nNothing was saved.`);
+    }
 }
-async function configureCommand(args, config) {
-    const saved = defaultsFrom(args, config);
-    const useWizard = !args.nonInteractive && !allFlagsProvided(args);
-    let finalApiUrl = saved.apiUrl;
-    let finalApiKey = saved.apiKey;
-    let finalOrgId = saved.organizationId;
-    let finalShieldId = saved.shieldId;
-    let finalShieldKey = saved.shieldKey;
-    const rl = useWizard ? readline.createInterface({ input: process_1.stdin, output: process_1.stdout }) : null;
+async function configureCommand(args, _config) {
+    const rl = readline.createInterface({ input: process_1.stdin, output: process_1.stdout });
     try {
-        if (useWizard && rl) {
-            console.log('');
-            console.log('FullCourtDefense setup — enter each value one at a time.');
-            console.log('Press Enter to keep the default shown in parentheses.');
-            console.log('Find these in the app: Settings → API Keys / Organization, Shield → Integrate.\n');
-            finalApiUrl = await ask(rl, '1/5 API URL', saved.apiUrl);
-            finalApiKey = await ask(rl, '2/5 Organization API key', saved.apiKey || undefined);
-            finalOrgId = await ask(rl, '3/5 Organization ID', saved.organizationId || undefined);
-            finalShieldId = await ask(rl, '4/5 Shield ID (sh_...)', saved.shieldId || undefined);
-            finalShieldKey = await ask(rl, '5/5 Shield key (blank if not required)', saved.shieldKey || undefined);
-            console.log('');
-        }
-        if (!finalApiKey) {
-            throw new Error('Organization API key is required.');
+        const apiUrl = args.apiUrl || await ask(rl, 'FullCourtDefense API URL', 'https://api.fullcourtdefense.ai');
+        const apiKey = args.apiKey || process.env.FULLCOURTDEFENSE_API_KEY || await ask(rl, 'Organization API key (starts with ag_)');
+        if (!apiKey) {
+            throw new Error('Organization API key is required to validate your setup.');
         }
-        if (!finalOrgId) {
+        const organizationId = args.organizationId || await ask(rl, 'Organization ID');
+        if (!organizationId) {
             throw new Error('Organization ID is required.');
         }
-        if (!finalShieldId || finalShieldId === 'sh_...') {
+        const shieldId = args.shieldId || await ask(rl, 'Shield ID (starts with sh_)');
+        if (!shieldId) {
             throw new Error('Shield ID is required.');
         }
-        let skipValidate = args.skipValidate === true;
-        if (!skipValidate) {
+        const shieldKey = args.shieldKey ?? await ask(rl, 'Shield key (starts with shsk_; blank only if Shield is public)');
+        validateLocalShape({ apiKey, organizationId, shieldId, shieldKey: shieldKey || undefined });
+        if (args.skipValidate !== true) {
             console.log('Validating organization, Shield ID, and Shield key against FullCourtDefense...');
-            const api = new api_1.BotGuardApi(finalApiKey, finalApiUrl);
+            const api = new api_1.BotGuardApi(apiKey, apiUrl);
+            let validated;
             try {
-                const validated = await api.validateSetup({
-                    organizationId: finalOrgId,
-                    shieldId: finalShieldId,
-                    shieldKey: finalShieldKey || undefined,
+                validated = await api.validateSetup({
+                    organizationId,
+                    shieldId,
+                    shieldKey: shieldKey || undefined,
                 });
-                if (validated.organizationId !== finalOrgId) {
-                    throw new Error(`Organization mismatch: API key belongs to "${validated.organizationName}" (${validated.organizationId}), not "${finalOrgId}".`);
-                }
-                console.log(`Verified: ${validated.organizationName} → Shield "${validated.shieldName}" (${validated.shieldId})`);
             }
             catch (error) {
-                if (isValidationUnavailableError(error)) {
-                    console.log('Server validation is not available yet (API endpoint not deployed).');
-                    if (useWizard && rl) {
-                        skipValidate = await confirm(rl, 'Save credentials locally anyway?', true);
-                        if (!skipValidate)
-                            throw error;
-                    }
-                    else {
-                        throw new Error(`${error instanceof Error ? error.message : String(error)} `
-                            + 'Use `fullcourtdefense setup --skip-validate true` or run interactive `fullcourtdefense setup` to save without validation.');
-                    }
-                }
-                else {
-                    throw error;
-                }
+                throw new Error(`Setup values do not match FullCourtDefense. Nothing was saved.\n`
+                    + `${error instanceof Error ? error.message : String(error)}`);
+            }
+            if (validated.organizationId !== organizationId) {
+                throw new Error(`Setup values do not match. Nothing was saved.\n`
+                    + `Organization mismatch: API key belongs to "${validated.organizationName}" (${validated.organizationId}), not "${organizationId}".`);
+            }
+            if (validated.shieldId !== shieldId) {
+                throw new Error(`Setup values do not match. Nothing was saved.\n`
+                    + `Shield mismatch: API returned "${validated.shieldId}", not "${shieldId}".`);
+            }
+            if (validated.shieldKeyRequired && !shieldKey) {
+                throw new Error('Shield key is required for this Shield. Nothing was saved.');
             }
+            console.log(`Verified: ${validated.organizationName} → Shield "${validated.shieldName}" (${validated.shieldId})`);
         }
         const savedPath = (0, config_1.saveSetupConfig)({
-            apiKey: finalApiKey,
-            organizationId: finalOrgId,
-            shieldId: finalShieldId,
-            shieldKey: finalShieldKey || undefined,
-            apiUrl: finalApiUrl,
+            apiKey,
+            organizationId,
+            shieldId,
+            shieldKey: shieldKey || undefined,
+            apiUrl,
         });
         console.log(`Saved setup to ${savedPath}`);
         console.log('All other CLI commands (install, discover --upload, scan, hooks) will use these credentials automatically.');
     }
     finally {
-        rl?.close();
+        rl.close();
     }
 }

package/dist/commands/discover.js

@@ -38,6 +38,7 @@ exports.runDiscoverUpload = runDiscoverUpload;
 const crypto = __importStar(require("crypto"));
 const fs = __importStar(require("fs"));
 const os = __importStar(require("os"));
+const path = __importStar(require("path"));
 const config_1 = require("../config");
 const discoverProxy_1 = require("./discoverProxy");
 const discoverSchedule_1 = require("./discoverSchedule");
@@ -96,6 +97,93 @@ function extractServerMap(parsed) {
         return parsed['mcp.servers'];
     return {};
 }
+function parseTomlString(value) {
+    const trimmed = value.trim().replace(/,$/, '');
+    if (!trimmed)
+        return undefined;
+    if ((trimmed.startsWith('"') && trimmed.endsWith('"')) || (trimmed.startsWith("'") && trimmed.endsWith("'"))) {
+        try {
+            return trimmed.startsWith('"')
+                ? JSON.parse(trimmed)
+                : trimmed.slice(1, -1);
+        }
+        catch {
+            return trimmed.slice(1, -1);
+        }
+    }
+    return trimmed;
+}
+function parseTomlStringArray(value) {
+    const trimmed = value.trim();
+    if (!trimmed.startsWith('[') || !trimmed.endsWith(']'))
+        return undefined;
+    try {
+        const parsed = JSON.parse(trimmed);
+        if (Array.isArray(parsed))
+            return parsed.map(String);
+    }
+    catch {
+        // Codex configs may use TOML single-quoted strings; parse those below.
+    }
+    const out = [];
+    const re = /"((?:\\.|[^"\\])*)"|'([^']*)'/g;
+    let match;
+    while ((match = re.exec(trimmed))) {
+        if (match[1] !== undefined) {
+            try {
+                out.push(JSON.parse(`"${match[1]}"`));
+            }
+            catch {
+                out.push(match[1]);
+            }
+        }
+        else {
+            out.push(match[2]);
+        }
+    }
+    return out.length > 0 ? out : undefined;
+}
+function parseCodexTomlServers(raw) {
+    const servers = {};
+    let currentName;
+    for (const line of raw.split(/\r?\n/)) {
+        const trimmed = line.trim();
+        if (!trimmed || trimmed.startsWith('#'))
+            continue;
+        const section = trimmed.match(/^\[mcp_servers\.([^\]]+)\]$/);
+        if (section) {
+            const sectionName = section[1].replace(/^"|"$/g, '').replace(/^'|'$/g, '');
+            if (sectionName.includes('.')) {
+                currentName = undefined;
+                continue;
+            }
+            currentName = sectionName;
+            servers[currentName] = servers[currentName] || {};
+            continue;
+        }
+        if (trimmed.startsWith('[')) {
+            currentName = undefined;
+            continue;
+        }
+        if (!currentName)
+            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;
+}
 const RISK_RULES = [
     { test: /shell|bash|\bexec\b|command[-_]?runner|terminal|subprocess|run[-_]?admin/i, level: 'critical', tag: 'shell/exec' },
     { test: /postgres|mysql|mongo|sqlite|\bsql\b|database|\bdb\b|redis|snowflake|bigquery/i, level: 'critical', tag: 'database' },
@@ -183,7 +271,11 @@ function parseConfigFile(filePath, source) {
         parsed = JSON.parse(raw);
     }
     catch {
-        return [];
+        parsed = path.extname(filePath).toLowerCase() === '.toml' || /codex/i.test(source)
+            ? { mcpServers: parseCodexTomlServers(raw) }
+            : null;
+        if (!parsed)
+            return [];
     }
     const out = [];
     for (const [name, cfgRaw] of Object.entries(extractServerMap(parsed))) {

package/dist/commands/discoverPaths.js

@@ -141,6 +141,8 @@ function candidateConfigPaths(cwd, extra) {
         { path: path.join(cwd, '.mcp.json'), source: 'Claude Code (.mcp.json project)', clientKey: 'claude_code' },
         { path: path.join(home, '.gemini', 'settings.json'), source: 'Gemini CLI', clientKey: 'gemini_cli' },
         { path: path.join(xdg, 'gemini', 'settings.json'), source: 'Gemini CLI (xdg)', clientKey: 'gemini_cli' },
+        { path: path.join(home, '.codex', 'config.toml'), source: 'Codex', clientKey: 'codex' },
+        { path: path.join(cwd, '.codex', 'config.toml'), source: 'Codex (project)', clientKey: 'codex' },
         { path: path.join(home, '.codex', 'mcp.json'), source: 'Codex', clientKey: 'codex' },
         { path: path.join(xdg, 'codex', 'mcp.json'), source: 'Codex (xdg)', clientKey: 'codex' },
         { path: path.join(cwd, '.vscode', 'mcp.json'), source: 'VS Code (project)', clientKey: 'vscode' },
@@ -190,5 +192,9 @@ function discoverScanTargets(cwd, extra) {
     if (fs.existsSync(path.join(os.homedir(), '.cursor')) && !existing.some(item => path.resolve(item.path).toLowerCase() === cursorGlobal.toLowerCase())) {
         implicit.push({ path: cursorGlobal, source: 'Cursor (global)', clientKey: 'cursor' });
     }
+    const codexGlobal = path.join(os.homedir(), '.codex', 'config.toml');
+    if (fs.existsSync(path.join(os.homedir(), '.codex')) && !existing.some(item => path.resolve(item.path).toLowerCase() === codexGlobal.toLowerCase())) {
+        implicit.push({ path: codexGlobal, source: 'Codex', clientKey: 'codex' });
+    }
     return [...existing, ...implicit];
 }

package/dist/commands/discoverProxy.js

@@ -74,7 +74,17 @@ function extractGatewayDownstream(server) {
             downstreamArgs = JSON.parse(args[argsIdx + 1]);
         }
         catch {
-            downstreamArgs = [args[argsIdx + 1]];
+            const raw = args[argsIdx + 1].trim();
+            if (raw.startsWith('[') && raw.endsWith(']')) {
+                downstreamArgs = raw
+                    .slice(1, -1)
+                    .split(',')
+                    .map(part => part.trim().replace(/^"|"$/g, '').replace(/^'|'$/g, ''))
+                    .filter(Boolean);
+            }
+            else {
+                downstreamArgs = [args[argsIdx + 1]];
+            }
         }
     }
     const command = args[cmdIdx + 1];
@@ -230,7 +240,7 @@ function buildClientCoverage(scanned, servers, cwd) {
             client: item.source,
             clientKey,
             configPath: item.path,
-            configPresent: true,
+            configPresent: fs.existsSync(item.path),
             mcpServerCount: list.filter(s => !isFcdGatewayServer(s)).length,
             mcpGatewayInstalled,
             cursorHooksInstalled: clientKey === 'cursor' ? hooks.installed : false,

package/dist/commands/installAll.d.ts

@@ -5,7 +5,8 @@ export interface InstallAllArgs extends InstallMcpGatewayArgs {
     discover?: string;
 }
 /**
- * One-click install: MCP gateway into every supported AI client, optional Cursor hooks,
- * optional fleet upload. Use per-client commands when you only need one tool.
+ * One-click install: MCP gateway into every supported AI client, optional
+ * Cursor hooks, optional fleet upload. Hooks are opt-in because Action Policies
+ * should be the default enforcement path for MCP tools.
  */
 export declare function installAllCommand(args: InstallAllArgs, config: BotGuardConfig): Promise<void>;

package/dist/commands/installAll.js

@@ -6,8 +6,9 @@ const discover_1 = require("./discover");
 const installCursorHook_1 = require("./installCursorHook");
 const mcpGateway_1 = require("./mcpGateway");
 /**
- * One-click install: MCP gateway into every supported AI client, optional Cursor hooks,
- * optional fleet upload. Use per-client commands when you only need one tool.
+ * One-click install: MCP gateway into every supported AI client, optional
+ * Cursor hooks, optional fleet upload. Hooks are opt-in because Action Policies
+ * should be the default enforcement path for MCP tools.
  */
 async function installAllCommand(args, config) {
     const creds = (0, config_1.requireCliSetup)(config, {
@@ -22,9 +23,9 @@ async function installAllCommand(args, config) {
         clients: args.clients || 'all',
     };
     console.log('\n\x1b[1m\x1b[36mFullCourtDefense — install all AI clients\x1b[0m');
-    console.log('\x1b[2mGateway + optional Cursor hooks + optional fleet upload\x1b[0m\n');
+    console.log('\x1b[2mMCP gateway + optional fleet upload. Cursor hooks are opt-in with --hooks true.\x1b[0m\n');
     await (0, mcpGateway_1.installMcpGatewayCommand)(gatewayArgs, config);
-    if (args.hooks !== 'false') {
+    if (args.hooks === 'true') {
         console.log('\n\x1b[1mInstalling Cursor runtime hooks…\x1b[0m');
         const hookArgs = {
             shieldId: creds.shieldId,
@@ -51,5 +52,5 @@ async function installAllCommand(args, config) {
         };
         await (0, discover_1.discoverCommand)(discoverArgs, config);
     }
-    console.log('\n\x1b[32mDone.\x1b[0m Restart each AI client you use, then run \x1b[1mfullcourtdefense discover --surface all\x1b[0m to verify.');
+    console.log('\n\x1b[32mDone.\x1b[0m Restart each AI client you use, then run \x1b[1mfullcourtdefense discover --surface mcp\x1b[0m to verify gateways.');
 }

package/dist/commands/mcpGateway.d.ts

@@ -5,8 +5,6 @@ export declare const ALL_GATEWAY_CLIENTS: GatewayClient[];
 export interface McpGatewayArgs {
     mcpCommand?: string;
     mcpArgs?: string;
-    /** Working directory for the downstream MCP process (Codex config.toml cwd). */
-    mcpCwd?: string;
     agentName?: string;
     agentClient?: string;
     developerName?: string;

package/dist/commands/mcpGateway.js

@@ -52,7 +52,7 @@ const discoverPaths_1 = require("./discoverPaths");
 const discover_1 = require("./discover");
 const DEFAULT_API_URL = 'https://api.fullcourtdefense.ai';
 const MANAGED_SERVER_NAME = 'agentguard-gateway';
-const INSTALL_GATEWAY_ARGS = { omitSavedCredentials: true };
+const INSTALL_GATEWAY_ARGS = { includeShieldKey: false };
 exports.ALL_GATEWAY_CLIENTS = [
     'cursor',
     'claude-code',
@@ -87,6 +87,12 @@ function parseArgsList(value) {
             const inner = trimmed.replace(/^\[/, '').replace(/\]$/, '').trim();
             if (inner && !inner.includes(','))
                 return [inner.replace(/^"|"$/g, '')];
+            if (inner) {
+                return inner
+                    .split(',')
+                    .map(part => part.trim().replace(/^"|"$/g, '').replace(/^'|'$/g, ''))
+                    .filter(Boolean);
+            }
             throw error;
         }
     }
@@ -733,42 +739,18 @@ function removeTomlSection(content, tableName) {
     }
     return out.join('\n').replace(/\n{3,}/g, '\n\n').trim();
 }
-function writeCodexMcpServer(configPath, serverName, nodeExe, commandArgs, options = {}) {
+function writeCodexMcpServer(configPath, serverName, nodeExe, commandArgs) {
     const existing = fs.existsSync(configPath) ? fs.readFileSync(configPath, 'utf8') : '';
     const cleaned = removeTomlSection(existing, `mcp_servers.${serverName}`);
     const argsToml = commandArgs.map(arg => JSON.stringify(arg)).join(', ');
-    const blockLines = [
+    const block = [
         `[mcp_servers.${serverName}]`,
         `command = ${JSON.stringify(nodeExe)}`,
         `args = [${argsToml}]`,
-    ];
-    if (options.cwd) {
-        blockLines.push(`cwd = ${JSON.stringify(options.cwd.replace(/\//g, path.sep))}`);
-    }
-    if (options.startupTimeoutSec && options.startupTimeoutSec > 0) {
-        blockLines.push(`startup_timeout_sec = ${options.startupTimeoutSec}`);
-    }
-    const block = blockLines.join('\n');
+    ].join('\n');
     fs.mkdirSync(path.dirname(configPath), { recursive: true });
     fs.writeFileSync(configPath, `${cleaned ? `${cleaned}\n\n` : ''}${block}\n`, 'utf8');
 }
-function resolveMcpCwd(args) {
-    const explicit = args.mcpCwd || process.env.FCD_MCP_CWD;
-    if (explicit)
-        return path.resolve(explicit);
-    const pkg = path.join(process.cwd(), 'package.json');
-    if (fs.existsSync(pkg)) {
-        try {
-            const scripts = JSON.parse(fs.readFileSync(pkg, 'utf8')).scripts || {};
-            const mcpArgs = parseArgsList(args.mcpArgs || process.env.FCD_MCP_ARGS);
-            if (args.mcpCommand === 'npm' && mcpArgs[0] === 'run' && scripts[mcpArgs[1] || 'mcp']) {
-                return process.cwd();
-            }
-        }
-        catch { /* ignore */ }
-    }
-    return undefined;
-}
 function codexConfigPath(projectScope) {
     return projectScope
         ? path.join(process.cwd(), '.codex', 'config.toml')
@@ -971,7 +953,7 @@ async function installClaudeCodeMcpGatewayCommand(args, config) {
     if (!downstreamCommand)
         throw new Error('Pass --mcp-command for the real MCP server you want to protect.');
     const downstreamArgs = parseArgsList(args.mcpArgs || process.env.FCD_MCP_ARGS);
-    const includeShieldKey = scope !== 'project' || Boolean(args.shieldKey);
+    const includeShieldKey = false;
     const commandArgs = buildGatewayCommandArgs(gatewayConfig, downstreamCommand, downstreamArgs, {
         ...INSTALL_GATEWAY_ARGS,
         includeShieldKey,
@@ -1058,10 +1040,7 @@ async function installCodexMcpGatewayCommand(args, config) {
         throw new Error('Pass --mcp-command for the real MCP server you want to protect.');
     const downstreamArgs = parseArgsList(args.mcpArgs || process.env.FCD_MCP_ARGS);
     const commandArgs = buildGatewayCommandArgs(gatewayConfig, downstreamCommand, downstreamArgs, INSTALL_GATEWAY_ARGS);
-    writeCodexMcpServer(file, serverName, nodeExe, commandArgs, {
-        cwd: resolveMcpCwd(args),
-        startupTimeoutSec: 120,
-    });
+    writeCodexMcpServer(file, serverName, nodeExe, commandArgs);
     console.log(`AgentGuard MCP Gateway installed for Codex (${projectScope ? 'project' : 'global'}).`);
     console.log(`Config: ${file}`);
     console.log(`Server: ${serverName}`);

package/dist/config.js

@@ -177,7 +177,14 @@ function loadConfig(configPath) {
             }
         }
     }
-    return mergeConfig(homeConfig, projectConfig);
+    // Plain CLI usage is intentionally global: `fullcourtdefense setup` writes
+    // ~/.fullcourtdefense.yml, then `install-all` should use that same verified
+    // Shield from any repo. Project config is still supported for scan defaults
+    // and explicit `--config` workflows, but it must not silently override the
+    // user's one-time setup credentials.
+    return configPath
+        ? mergeConfig(homeConfig, projectConfig)
+        : mergeConfig(projectConfig, homeConfig);
 }
 function getDefaultConfigPath() {
     return path.resolve(process.cwd(), '.fullcourtdefense.yml');

package/dist/index.js

@@ -111,8 +111,8 @@ function printHelp() {
     doctor      First step. Checks outbound HTTPS access to FullCourtDefense.
     configure   Saves org API key, Organization ID, Shield ID, and Shield key to ~/.fullcourtdefense.yml.
                 After setup, other commands read credentials automatically — no --shield-id/--api-key needed.
-    setup       Same as configure — step-by-step wizard; validates before saving.
-    install-all One-click: MCP gateway in every AI client + Cursor hooks + optional upload.
+    setup       Same as configure — validates credentials against the server before saving.
+    install-all One-click: MCP gateway in every AI client. Cursor hooks are opt-in.
     install     Alias for install-all.
     scan        Runs the scan. Use --local for inside-organization scans.
     discover    Finds MCP servers, local secrets, agent rules/skills, and machine
@@ -154,11 +154,14 @@ function printHelp() {
        fullcourtdefense doctor
        This confirms the machine can reach https://api.fullcourtdefense.ai over HTTPS.
 
-    3. Save org + Shield credentials locally (one time, prompts one field at a time):
+    3. Save org + Shield credentials locally (one time):
        fullcourtdefense setup
+       Saves to ~/.fullcourtdefense.yml — install, discover --upload, scan, gateway, and hooks use it automatically.
 
-    4. One-click protect every AI client on this machine:
-       fullcourtdefense install-all --mcp-command npm --mcp-args "run mcp" --upload
+    4. One-click protect every AI client on this machine with MCP Action Policies:
+       fullcourtdefense install-all --mcp-command npm --mcp-args "run mcp"
+       Verify installs:
+       fullcourtdefense discover --surface mcp
        Or install one client: fullcourtdefense install-cursor-mcp-gateway ...
 
     5. Run a guided local scan:
@@ -257,6 +260,7 @@ function printHelp() {
     $ 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 --surface mcp
     $ fullcourtdefense discover --surface all --upload
     $ fullcourtdefense discover --surface secrets
     $ fullcourtdefense discover --surface agent-files
@@ -275,6 +279,7 @@ function printHelp() {
     $ fullcourtdefense install-claude-desktop-mcp-gateway --mcp-command npm --mcp-args "run mcp"
     $ fullcourtdefense mcp-gateway --mcp-command npm --mcp-args "run mcp"
     $ fullcourtdefense setup
+    $ fullcourtdefense install-all --mcp-command npm --mcp-args "run mcp"
     $ fullcourtdefense install-all --mcp-command npm --mcp-args "run mcp" --upload
     $ fullcourtdefense install-mcp-gateway --clients cursor,codex --mcp-command npm --mcp-args "run mcp"
     $ fullcourtdefense install-codex-mcp-gateway --mcp-command npm --mcp-args "run mcp"
@@ -295,7 +300,6 @@ async function main() {
         serverName: flags['server-name'],
         mcpCommand: flags['mcp-command'],
         mcpArgs: flags['mcp-args'],
-        mcpCwd: flags['mcp-cwd'],
         agentName: flags['agent-name'],
         developerName: flags['developer-name'],
         shieldId: flags['shield-id'],
@@ -315,7 +319,6 @@ async function main() {
     const buildGatewayArgs = () => ({
         mcpCommand: flags['mcp-command'],
         mcpArgs: flags['mcp-args'],
-        mcpCwd: flags['mcp-cwd'],
         agentName: flags['agent-name'],
         agentClient: flags['agent-client'],
         developerName: flags['developer-name'],
@@ -410,7 +413,6 @@ async function main() {
                 shieldKey: flags['shield-key'],
                 apiUrl: flags['api-url'],
                 skipValidate: flags['skip-validate'] === 'true',
-                nonInteractive: flags['non-interactive'] === 'true',
             };
             await (0, configure_1.configureCommand)(args, config);
             break;

package/dist/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.3.5"
+  "version": "1.3.6"
 }

package/package.json

@@ -1,42 +1,42 @@
-{
-  "name": "fullcourtdefense-cli",
-  "version": "1.3.5",
-  "description": "Full Court Defense CLI — security scanning for AI agents from your terminal",
-  "main": "dist/index.js",
-  "bin": {
-    "fullcourtdefense": "dist/index.js",
-    "fcd": "dist/index.js",
-    "botguard": "dist/index.js"
-  },
-  "files": [
-    "dist",
-    "README.md"
-  ],
-  "scripts": {
-    "build": "tsc && node scripts/copy-attack-corpus.js",
-    "prepublishOnly": "npm run build"
-  },
-  "keywords": [
-    "llm",
-    "security",
-    "guardrails",
-    "ai-safety",
-    "prompt-injection",
-    "cli",
-    "red-teaming",
-    "owasp",
-    "mcp",
-    "rag"
-  ],
-  "license": "MIT",
-  "devDependencies": {
-    "@types/node": "^25.3.0",
-    "typescript": "^5.3.0"
-  },
-  "engines": {
-    "node": ">=18.0.0"
-  },
-  "dependencies": {
-    "yaml": "^2.8.4"
-  }
-}
+{
+  "name": "fullcourtdefense-cli",
+  "version": "1.3.6",
+  "description": "Full Court Defense CLI — security scanning for AI agents from your terminal",
+  "main": "dist/index.js",
+  "bin": {
+    "fullcourtdefense": "dist/index.js",
+    "fcd": "dist/index.js",
+    "botguard": "dist/index.js"
+  },
+  "files": [
+    "dist",
+    "README.md"
+  ],
+  "scripts": {
+    "build": "tsc && node scripts/copy-attack-corpus.js",
+    "prepublishOnly": "npm run build"
+  },
+  "keywords": [
+    "llm",
+    "security",
+    "guardrails",
+    "ai-safety",
+    "prompt-injection",
+    "cli",
+    "red-teaming",
+    "owasp",
+    "mcp",
+    "rag"
+  ],
+  "license": "MIT",
+  "devDependencies": {
+    "@types/node": "^25.3.0",
+    "typescript": "^5.3.0"
+  },
+  "engines": {
+    "node": ">=18.0.0"
+  },
+  "dependencies": {
+    "yaml": "^2.8.4"
+  }
+}