fullcourtdefense-cli 1.3.2 → 1.3.4

package/dist/api.js

@@ -19,7 +19,23 @@ class BotGuardApi {
             },
             body: body ? JSON.stringify(body) : undefined,
         });
-        const data = await resp.json();
+        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.
+        }
         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,5 +6,7 @@ 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>;

package/dist/commands/configure.js

@@ -43,50 +43,107 @@ 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 resolveApiKey(args, config) {
     return args.apiKey || config.apiKey || process.env.FULLCOURTDEFENSE_API_KEY || '';
 }
+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 allFlagsProvided(args) {
+    return Boolean(args.apiKey && args.organizationId && args.shieldId && args.apiUrl);
+}
+function isValidationUnavailableError(error) {
+    const message = error instanceof Error ? error.message : String(error);
+    return message.includes('HTML instead of JSON') || message.includes('404');
+}
 async function configureCommand(args, config) {
-    const rl = readline.createInterface({ input: process_1.stdin, output: process_1.stdout });
+    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;
     try {
-        const apiUrl = args.apiUrl || await ask(rl, 'FullCourtDefense API URL', config.apiUrl || 'https://api.fullcourtdefense.ai');
-        const apiKey = resolveApiKey(args, config) || await ask(rl, 'Organization API key (from Settings → API Keys)', '');
-        if (!apiKey) {
-            throw new Error('Organization API key is required to validate your setup.');
+        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 organizationId = args.organizationId || await ask(rl, 'Organization ID (from Settings → Organization)', config.organizationId || '');
-        if (!organizationId) {
+        if (!finalOrgId) {
             throw new Error('Organization ID is required.');
         }
-        const shieldId = args.shieldId || await ask(rl, 'Shield ID', config.shieldId || 'sh_...');
-        if (!shieldId || shieldId === 'sh_...') {
+        if (!finalShieldId || finalShieldId === 'sh_...') {
             throw new Error('Shield ID is required.');
         }
-        const shieldKey = args.shieldKey ?? await ask(rl, 'Shield key if locked, blank if not required', config.shieldKey || '');
-        if (args.skipValidate !== true) {
+        let skipValidate = args.skipValidate === true;
+        if (!skipValidate) {
             console.log('Validating organization, Shield ID, and Shield key against FullCourtDefense...');
-            const api = new api_1.BotGuardApi(apiKey, apiUrl);
-            const validated = await api.validateSetup({
-                organizationId,
-                shieldId,
-                shieldKey: shieldKey || undefined,
-            });
-            if (validated.organizationId !== organizationId) {
-                throw new Error(`Organization mismatch: API key belongs to "${validated.organizationName}" (${validated.organizationId}), not "${organizationId}".`);
+            const api = new api_1.BotGuardApi(finalApiKey, finalApiUrl);
+            try {
+                const validated = await api.validateSetup({
+                    organizationId: finalOrgId,
+                    shieldId: finalShieldId,
+                    shieldKey: finalShieldKey || 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;
+                }
             }
-            console.log(`Verified: ${validated.organizationName} → Shield "${validated.shieldName}" (${validated.shieldId})`);
         }
         const savedPath = (0, config_1.saveSetupConfig)({
-            apiKey,
-            organizationId,
-            shieldId,
-            shieldKey: shieldKey || undefined,
-            apiUrl,
+            apiKey: finalApiKey,
+            organizationId: finalOrgId,
+            shieldId: finalShieldId,
+            shieldKey: finalShieldKey || undefined,
+            apiUrl: finalApiUrl,
         });
         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/index.js

@@ -111,7 +111,7 @@ 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 — validates credentials against the server before saving.
+    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.
     install     Alias for install-all.
     scan        Runs the scan. Use --local for inside-organization scans.
@@ -154,9 +154,8 @@ function printHelp() {
        fullcourtdefense doctor
        This confirms the machine can reach https://api.fullcourtdefense.ai over HTTPS.
 
-    3. Save org + Shield credentials locally (one time):
+    3. Save org + Shield credentials locally (one time, prompts one field at a time):
        fullcourtdefense setup
-       Saves to ~/.fullcourtdefense.yml — install, discover --upload, scan, 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
@@ -409,6 +408,7 @@ 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.2"
+  "version": "1.3.4"
 }

package/package.json

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