postgresai 0.14.0-beta.4 → 0.14.0-beta.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postgresai",
-  "version": "0.14.0-beta.4",
+  "version": "0.14.0-beta.6",
   "description": "postgres_ai CLI",
   "license": "Apache-2.0",
   "private": false,
@@ -26,12 +26,14 @@
   },
   "scripts": {
     "embed-metrics": "bun run scripts/embed-metrics.ts",
-    "build": "bun run embed-metrics && bun build ./bin/postgres-ai.ts --outdir ./dist/bin --target node && node -e \"const fs=require('fs');const f='./dist/bin/postgres-ai.js';fs.writeFileSync(f,fs.readFileSync(f,'utf8').replace('#!/usr/bin/env bun','#!/usr/bin/env node'))\"",
+    "build": "bun run embed-metrics && bun build ./bin/postgres-ai.ts --outdir ./dist/bin --target node && node -e \"const fs=require('fs');const f='./dist/bin/postgres-ai.js';fs.writeFileSync(f,fs.readFileSync(f,'utf8').replace('#!/usr/bin/env bun','#!/usr/bin/env node'))\" && cp -r ./sql ./dist/sql",
     "prepublishOnly": "npm run build",
     "start": "bun ./bin/postgres-ai.ts --help",
     "start:node": "node ./dist/bin/postgres-ai.js --help",
     "dev": "bun run embed-metrics && bun --watch ./bin/postgres-ai.ts",
     "test": "bun run embed-metrics && bun test",
+    "test:fast": "bun run embed-metrics && bun test --coverage=false",
+    "test:coverage": "bun run embed-metrics && bun test --coverage && echo 'Coverage report: cli/coverage/lcov-report/index.html'",
     "typecheck": "bun run embed-metrics && bunx tsc --noEmit"
   },
   "dependencies": {

package/sql/05.helpers.sql

@@ -3,11 +3,17 @@
 -- operations they don't have direct permissions for.
 
 /*
- * pgai_explain_generic
+ * explain_generic
  *
  * Function to get generic explain plans with optional HypoPG index testing.
  * Requires: PostgreSQL 16+ (for generic_plan option), HypoPG extension (optional).
  *
+ * Security notes:
+ * - EXPLAIN without ANALYZE is read-only (plans but doesn't execute the query)
+ * - PostgreSQL's EXPLAIN only accepts a single statement (primary protection)
+ * - Input validation uses a simple heuristic to detect multiple statements
+ *   (Note: may reject valid queries containing semicolons in string literals)
+ *
  * Usage examples:
  *   -- Basic generic plan
  *   select postgres_ai.explain_generic('select * from users where id = $1');
@@ -39,6 +45,7 @@ declare
   v_hypo_result record;
   v_version int;
   v_hypopg_available boolean;
+  v_clean_query text;
 begin
   -- Check PostgreSQL version (generic_plan requires 16+)
   select current_setting('server_version_num')::int into v_version;
@@ -48,6 +55,24 @@ begin
       current_setting('server_version');
   end if;
 
+  -- Input validation: reject empty queries
+  if query is null or trim(query) = '' then
+    raise exception 'query cannot be empty';
+  end if;
+
+  -- Input validation: detect multiple statements (defense-in-depth)
+  -- Note: This is a simple heuristic - EXPLAIN itself only accepts single statements
+  -- Limitation: Queries with semicolons inside string literals will be rejected
+  v_clean_query := trim(query);
+  if v_clean_query like '%;%' then
+    -- Strip trailing semicolon if present (common user convenience)
+    v_clean_query := regexp_replace(v_clean_query, ';\s*$', '');
+    -- If there's still a semicolon, reject (likely multiple statements or semicolon in string)
+    if v_clean_query like '%;%' then
+      raise exception 'query contains semicolon (multiple statements not allowed; note: semicolons in string literals are also not supported)';
+    end if;
+  end if;
+
   -- Check if HypoPG extension is available
   if hypopg_index is not null then
     select exists(
@@ -64,15 +89,14 @@ begin
       v_hypo_result.indexname, v_hypo_result.indexrelid;
   end if;
 
-  -- Build and execute explain query based on format
-  -- Output is preserved exactly as EXPLAIN returns it
+  -- Build and execute EXPLAIN query
+  -- Note: EXPLAIN is read-only (plans but doesn't execute), making this safe
   begin
     if lower(format) = 'json' then
-      v_explain_query := 'explain (verbose, settings, generic_plan, format json) ' || query;
-      execute v_explain_query into result;
+      execute 'explain (verbose, settings, generic_plan, format json) ' || v_clean_query
+        into result;
     else
-      v_explain_query := 'explain (verbose, settings, generic_plan) ' || query;
-      for v_line in execute v_explain_query loop
+      for v_line in execute 'explain (verbose, settings, generic_plan) ' || v_clean_query loop
         v_lines := array_append(v_lines, v_line."QUERY PLAN");
       end loop;
       result := array_to_string(v_lines, e'\n');

package/test/auth.test.ts

@@ -0,0 +1,258 @@
+import { describe, test, expect } from "bun:test";
+import { resolve } from "path";
+
+import * as util from "../lib/util";
+import * as pkce from "../lib/pkce";
+import * as authServer from "../lib/auth-server";
+
+function runCli(args: string[], env: Record<string, string> = {}) {
+  const cliPath = resolve(import.meta.dir, "..", "bin", "postgres-ai.ts");
+  const bunBin = typeof process.execPath === "string" && process.execPath.length > 0 ? process.execPath : "bun";
+  const result = Bun.spawnSync([bunBin, cliPath, ...args], {
+    env: { ...process.env, ...env },
+  });
+  return {
+    status: result.exitCode,
+    stdout: new TextDecoder().decode(result.stdout),
+    stderr: new TextDecoder().decode(result.stderr),
+  };
+}
+
+describe("URL resolution", () => {
+  test("resolveBaseUrls returns correct production defaults", () => {
+    const result = util.resolveBaseUrls();
+    expect(result.apiBaseUrl).toBe("https://postgres.ai/api/general");
+    expect(result.uiBaseUrl).toBe("https://console.postgres.ai");
+  });
+
+  test("resolveBaseUrls strips trailing slashes", () => {
+    const result = util.resolveBaseUrls({
+      apiBaseUrl: "https://example.com/api/",
+      uiBaseUrl: "https://example.com/",
+    });
+    expect(result.apiBaseUrl).toBe("https://example.com/api");
+    expect(result.uiBaseUrl).toBe("https://example.com");
+  });
+
+  test("resolveBaseUrls respects environment variables", () => {
+    const originalApiUrl = process.env.PGAI_API_BASE_URL;
+    const originalUiUrl = process.env.PGAI_UI_BASE_URL;
+
+    try {
+      process.env.PGAI_API_BASE_URL = "https://custom-api.example.com/api/";
+      process.env.PGAI_UI_BASE_URL = "https://custom-ui.example.com/";
+
+      const result = util.resolveBaseUrls();
+      expect(result.apiBaseUrl).toBe("https://custom-api.example.com/api");
+      expect(result.uiBaseUrl).toBe("https://custom-ui.example.com");
+    } finally {
+      if (originalApiUrl === undefined) {
+        delete process.env.PGAI_API_BASE_URL;
+      } else {
+        process.env.PGAI_API_BASE_URL = originalApiUrl;
+      }
+      if (originalUiUrl === undefined) {
+        delete process.env.PGAI_UI_BASE_URL;
+      } else {
+        process.env.PGAI_UI_BASE_URL = originalUiUrl;
+      }
+    }
+  });
+
+  test("resolveBaseUrls prefers CLI options over env vars", () => {
+    const originalApiUrl = process.env.PGAI_API_BASE_URL;
+
+    try {
+      process.env.PGAI_API_BASE_URL = "https://env.example.com/api/";
+
+      const result = util.resolveBaseUrls({
+        apiBaseUrl: "https://cli-option.example.com/api/",
+      });
+      expect(result.apiBaseUrl).toBe("https://cli-option.example.com/api");
+    } finally {
+      if (originalApiUrl === undefined) {
+        delete process.env.PGAI_API_BASE_URL;
+      } else {
+        process.env.PGAI_API_BASE_URL = originalApiUrl;
+      }
+    }
+  });
+
+  test("resolveBaseUrls uses config baseUrl for API", () => {
+    const result = util.resolveBaseUrls({}, { baseUrl: "https://config.example.com/api/" });
+    expect(result.apiBaseUrl).toBe("https://config.example.com/api");
+    // UI should still use default since config doesn't have uiBaseUrl
+    expect(result.uiBaseUrl).toBe("https://console.postgres.ai");
+  });
+
+  test("normalizeBaseUrl throws on invalid URL", () => {
+    expect(() => util.normalizeBaseUrl("not-a-url")).toThrow(/Invalid base URL/);
+  });
+
+  test("normalizeBaseUrl accepts valid URLs", () => {
+    expect(util.normalizeBaseUrl("https://example.com")).toBe("https://example.com");
+    expect(util.normalizeBaseUrl("https://example.com/")).toBe("https://example.com");
+    expect(util.normalizeBaseUrl("https://example.com/api/")).toBe("https://example.com/api");
+  });
+});
+
+describe("PKCE module", () => {
+  test("generateCodeVerifier returns correct length string", () => {
+    const verifier = pkce.generateCodeVerifier();
+    expect(typeof verifier).toBe("string");
+    expect(verifier.length).toBeGreaterThanOrEqual(43);
+    expect(verifier.length).toBeLessThanOrEqual(128);
+  });
+
+  test("generateCodeChallenge returns base64url encoded SHA256", () => {
+    const verifier = pkce.generateCodeVerifier();
+    const challenge = pkce.generateCodeChallenge(verifier);
+    expect(typeof challenge).toBe("string");
+    expect(challenge.length).toBeGreaterThan(0);
+    // Base64url encoding should not contain + or / characters
+    expect(challenge).not.toMatch(/[+/]/);
+  });
+
+  test("generateState returns random string", () => {
+    const state1 = pkce.generateState();
+    const state2 = pkce.generateState();
+    expect(typeof state1).toBe("string");
+    expect(state1.length).toBeGreaterThan(0);
+    expect(state1).not.toBe(state2); // Should be random
+  });
+
+  test("generatePKCEParams returns all required parameters", () => {
+    const params = pkce.generatePKCEParams();
+    expect(params.codeVerifier).toBeTruthy();
+    expect(params.codeChallenge).toBeTruthy();
+    expect(params.codeChallengeMethod).toBe("S256");
+    expect(params.state).toBeTruthy();
+  });
+});
+
+describe("Auth callback server", () => {
+  test("createCallbackServer returns correct interface", () => {
+    const server = authServer.createCallbackServer(0, "test-state", 1000);
+    expect(server.server).toBeTruthy();
+    expect(server.server.stop).toBeInstanceOf(Function);
+    expect(server.promise).toBeInstanceOf(Promise);
+    expect(server.ready).toBeInstanceOf(Promise);
+    expect(server.getPort).toBeInstanceOf(Function);
+
+    // Clean up
+    server.server.stop();
+  });
+
+  test("createCallbackServer binds to a port", async () => {
+    const server = authServer.createCallbackServer(0, "test-state", 5000);
+    const port = await server.ready;
+    expect(typeof port).toBe("number");
+    expect(port).toBeGreaterThan(0);
+
+    // Clean up
+    server.server.stop();
+  });
+
+  test("createCallbackServer responds to callback requests", async () => {
+    const testState = "test-state-" + Math.random().toString(36).substring(7);
+    const server = authServer.createCallbackServer(0, testState, 5000);
+    const port = await server.ready;
+
+    // Simulate OAuth callback
+    const testCode = "test-auth-code";
+    const callbackUrl = `http://127.0.0.1:${port}/callback?code=${testCode}&state=${testState}`;
+
+    const fetchPromise = fetch(callbackUrl);
+    const result = await server.promise;
+
+    expect(result.code).toBe(testCode);
+    expect(result.state).toBe(testState);
+
+    // Check response
+    const response = await fetchPromise;
+    expect(response.status).toBe(200);
+    const text = await response.text();
+    expect(text).toMatch(/Authentication successful/);
+  });
+
+  test("createCallbackServer rejects on state mismatch", async () => {
+    const server = authServer.createCallbackServer(0, "expected-state", 5000);
+    const port = await server.ready;
+
+    const callbackUrl = `http://127.0.0.1:${port}/callback?code=test-code&state=wrong-state`;
+
+    const fetchPromise = fetch(callbackUrl);
+
+    await expect(server.promise).rejects.toThrow(/State mismatch/);
+
+    const response = await fetchPromise;
+    expect(response.status).toBe(400);
+  });
+
+  test("createCallbackServer handles OAuth errors", async () => {
+    const server = authServer.createCallbackServer(0, "test-state", 5000);
+    const port = await server.ready;
+
+    const callbackUrl = `http://127.0.0.1:${port}/callback?error=access_denied&error_description=User%20denied%20access`;
+
+    const fetchPromise = fetch(callbackUrl);
+
+    await expect(server.promise).rejects.toThrow(/OAuth error: access_denied/);
+
+    const response = await fetchPromise;
+    expect(response.status).toBe(400);
+  });
+
+  test("createCallbackServer times out", async () => {
+    const server = authServer.createCallbackServer(0, "test-state", 100); // 100ms timeout
+    await server.ready;
+
+    await expect(server.promise).rejects.toThrow(/timeout/i);
+  });
+});
+
+describe("CLI auth commands", () => {
+  test("cli: auth login --help shows all options", () => {
+    const r = runCli(["auth", "login", "--help"]);
+    expect(r.status).toBe(0);
+    expect(r.stdout).toMatch(/--set-key/);
+    expect(r.stdout).toMatch(/--debug/);
+  });
+
+  test("cli: auth show-key --help works", () => {
+    const r = runCli(["auth", "show-key", "--help"]);
+    expect(r.status).toBe(0);
+    expect(r.stdout).toMatch(/show.*key/i);
+  });
+
+  test("cli: auth remove-key --help works", () => {
+    const r = runCli(["auth", "remove-key", "--help"]);
+    expect(r.status).toBe(0);
+    expect(r.stdout).toMatch(/remove.*key/i);
+  });
+});
+
+describe("maskSecret utility", () => {
+  test("masks short secrets completely", () => {
+    expect(util.maskSecret("abc")).toBe("****");
+    expect(util.maskSecret("12345678")).toBe("****");
+  });
+
+  test("masks medium secrets with visible ends", () => {
+    const masked = util.maskSecret("1234567890123456");
+    // maskSecret shows first 4 chars, middle masked, last 4 chars for 16-char strings
+    expect(masked).toMatch(/^1234\*+3456$/);
+  });
+
+  test("masks long secrets appropriately", () => {
+    const secret = "abcdefghij1234567890klmnopqrstuvwxyz";
+    const masked = util.maskSecret(secret);
+    expect(masked.startsWith("abcdefghij12")).toBe(true);
+    expect(masked.endsWith("wxyz")).toBe(true);
+    expect(masked).toMatch(/\*+/);
+  });
+
+  test("handles empty string", () => {
+    expect(util.maskSecret("")).toBe("");
+  });
+});

package/test/checkup.integration.test.ts

@@ -253,6 +253,52 @@ describe.skipIf(!!skipReason)("checkup integration: express mode schema compatib
     expect(typeof nodeResult.data).toBe("object");
   });
 
+  test("H001 returns index_definition with CREATE INDEX statement", async () => {
+    // Create a table and an index, then mark the index as invalid
+    await client.query(`
+      CREATE TABLE IF NOT EXISTS test_invalid_idx_table (id serial PRIMARY KEY, value text);
+      CREATE INDEX IF NOT EXISTS test_invalid_idx ON test_invalid_idx_table(value);
+    `);
+
+    // Mark the index as invalid (simulating a failed CONCURRENTLY build)
+    await client.query(`
+      UPDATE pg_index SET indisvalid = false
+      WHERE indexrelid = 'test_invalid_idx'::regclass;
+    `);
+
+    try {
+      const report = await checkup.generateH001(client, "test-node");
+      validateAgainstSchema(report, "H001");
+
+      const nodeResult = report.results["test-node"];
+      const dbName = Object.keys(nodeResult.data)[0];
+      expect(dbName).toBeTruthy();
+
+      const dbData = nodeResult.data[dbName] as any;
+      expect(dbData.invalid_indexes).toBeDefined();
+      expect(dbData.invalid_indexes.length).toBeGreaterThan(0);
+
+      // Find our test index
+      const testIndex = dbData.invalid_indexes.find(
+        (idx: any) => idx.index_name === "test_invalid_idx"
+      );
+      expect(testIndex).toBeDefined();
+
+      // Verify index_definition contains the actual CREATE INDEX statement
+      expect(testIndex.index_definition).toMatch(/^CREATE INDEX/);
+      expect(testIndex.index_definition).toContain("test_invalid_idx");
+      expect(testIndex.index_definition).toContain("test_invalid_idx_table");
+    } finally {
+      // Cleanup: restore the index and drop test objects
+      await client.query(`
+        UPDATE pg_index SET indisvalid = true
+        WHERE indexrelid = 'test_invalid_idx'::regclass;
+        DROP INDEX IF EXISTS test_invalid_idx;
+        DROP TABLE IF EXISTS test_invalid_idx_table;
+      `);
+    }
+  });
+
   test("H002 (unused indexes) has correct data structure", async () => {
     const report = await checkup.generateH002(client, "test-node");
     validateAgainstSchema(report, "H002");

package/test/checkup.test.ts

@@ -480,7 +480,7 @@ describe("H001 - Invalid indexes", () => {
   test("getInvalidIndexes returns invalid indexes", async () => {
     const mockClient = createMockClient({
       invalidIndexesRows: [
-        { schema_name: "public", table_name: "users", index_name: "users_email_idx", relation_name: "users", index_size_bytes: "1048576", supports_fk: false },
+        { schema_name: "public", table_name: "users", index_name: "users_email_idx", relation_name: "users", index_size_bytes: "1048576", index_definition: "CREATE INDEX users_email_idx ON public.users USING btree (email)", supports_fk: false },
       ],
     });
 
@@ -491,6 +491,7 @@ describe("H001 - Invalid indexes", () => {
     expect(indexes[0].index_name).toBe("users_email_idx");
     expect(indexes[0].index_size_bytes).toBe(1048576);
     expect(indexes[0].index_size_pretty).toBeTruthy();
+    expect(indexes[0].index_definition).toMatch(/^CREATE INDEX/);
     expect(indexes[0].relation_name).toBe("users");
     expect(indexes[0].supports_fk).toBe(false);
   });
@@ -502,7 +503,7 @@ describe("H001 - Invalid indexes", () => {
         { name: "server_version_num", setting: "160003" },
       ],
         invalidIndexesRows: [
-          { schema_name: "public", table_name: "orders", index_name: "orders_status_idx", relation_name: "orders", index_size_bytes: "2097152", supports_fk: false },
+          { schema_name: "public", table_name: "orders", index_name: "orders_status_idx", relation_name: "orders", index_size_bytes: "2097152", index_definition: "CREATE INDEX orders_status_idx ON public.orders USING btree (status)", supports_fk: false },
         ],
       }
     );

package/test/init.integration.test.ts

@@ -396,4 +396,102 @@ describe.skipIf(skipTests)("integration: prepare-db", () => {
       await pg.cleanup();
     }
   });
+
+  test("explain_generic validates input and prevents SQL injection", async () => {
+    pg = await createTempPostgres();
+
+    try {
+      // Run init first
+      {
+        const r = runCliInit([pg.adminUri, "--password", "pw1", "--skip-optional-permissions"]);
+        expect(r.status).toBe(0);
+      }
+
+      const c = new Client({ connectionString: pg.adminUri });
+      await c.connect();
+
+      try {
+        // Check PostgreSQL version - generic_plan requires 16+
+        const versionRes = await c.query("show server_version_num");
+        const version = parseInt(versionRes.rows[0].server_version_num, 10);
+
+        if (version < 160000) {
+          // Skip this test on older PostgreSQL versions
+          console.log("Skipping explain_generic tests: requires PostgreSQL 16+");
+          return;
+        }
+
+        // Test 1: Empty query should be rejected
+        await expect(
+          c.query("select postgres_ai.explain_generic('')")
+        ).rejects.toThrow(/query cannot be empty/);
+
+        // Test 2: Null query should be rejected
+        await expect(
+          c.query("select postgres_ai.explain_generic(null)")
+        ).rejects.toThrow(/query cannot be empty/);
+
+        // Test 3: Multiple statements (semicolon in middle) should be rejected
+        await expect(
+          c.query("select postgres_ai.explain_generic('select 1; select 2')")
+        ).rejects.toThrow(/semicolon|multiple statements/i);
+
+        // Test 4: Trailing semicolon should be stripped and work
+        {
+          const res = await c.query("select postgres_ai.explain_generic('select 1;') as result");
+          expect(res.rows[0].result).toBeTruthy();
+          expect(res.rows[0].result).toMatch(/Result/i);
+        }
+
+        // Test 5: Valid query should work
+        {
+          const res = await c.query("select postgres_ai.explain_generic('select $1::int', 'text') as result");
+          expect(res.rows[0].result).toBeTruthy();
+        }
+
+        // Test 6: JSON format should work
+        {
+          const res = await c.query("select postgres_ai.explain_generic('select 1', 'json') as result");
+          const plan = JSON.parse(res.rows[0].result);
+          expect(Array.isArray(plan)).toBe(true);
+          expect(plan[0].Plan).toBeTruthy();
+        }
+
+        // Test 7: Whitespace-only query should be rejected
+        await expect(
+          c.query("select postgres_ai.explain_generic('   ')")
+        ).rejects.toThrow(/query cannot be empty/);
+
+        // Test 8: Semicolon in string literal is rejected (documented limitation)
+        // Note: This is a known limitation - the simple heuristic cannot parse SQL strings
+        await expect(
+          c.query("select postgres_ai.explain_generic('select ''hello;world''')")
+        ).rejects.toThrow(/semicolon/i);
+
+        // Test 9: SQL comments should work (no semicolons)
+        {
+          const res = await c.query("select postgres_ai.explain_generic('select 1 -- comment') as result");
+          expect(res.rows[0].result).toBeTruthy();
+        }
+
+        // Test 10: Escaped quotes should work (no semicolons)
+        {
+          const res = await c.query("select postgres_ai.explain_generic('select ''test''''s value''') as result");
+          expect(res.rows[0].result).toBeTruthy();
+        }
+
+        // Test 11: Case-insensitive format parameter
+        {
+          const res = await c.query("select postgres_ai.explain_generic('select 1', 'JSON') as result");
+          const plan = JSON.parse(res.rows[0].result);
+          expect(Array.isArray(plan)).toBe(true);
+        }
+
+      } finally {
+        await c.end();
+      }
+    } finally {
+      await pg.cleanup();
+    }
+  });
 });

package/test/init.test.ts

@@ -337,9 +337,81 @@ describe("CLI commands", () => {
     expect(r.stdout).toMatch(/--api-key/);
   });
 
+  test("cli: mon local-install --api-key and --db-url skip interactive prompts", () => {
+    // This test verifies that when --api-key and --db-url are provided,
+    // the CLI uses them directly without prompting for input.
+    // The command will fail later (no Docker, invalid DB), but we check
+    // that the options were parsed and used correctly.
+    const r = runCli([
+      "mon", "local-install",
+      "--api-key", "test-api-key-12345",
+      "--db-url", "postgresql://user:pass@localhost:5432/testdb"
+    ]);
+
+    // Should show that API key was provided via CLI option (not prompting)
+    expect(r.stdout).toMatch(/Using API key provided via --api-key parameter/);
+    // Should show that DB URL was provided via CLI option (not prompting)
+    expect(r.stdout).toMatch(/Using database URL provided via --db-url parameter/);
+  });
+
   test("cli: auth login --help shows --set-key option", () => {
     const r = runCli(["auth", "login", "--help"]);
     expect(r.status).toBe(0);
     expect(r.stdout).toMatch(/--set-key/);
   });
+
+  test("cli: mon local-install reads global --api-key option", () => {
+    // The fix ensures --api-key works when passed as a global option (before subcommand)
+    // Commander.js routes global options to program.opts(), not subcommand opts
+    const r = runCli([
+      "--api-key", "global-api-key-test",
+      "mon", "local-install",
+      "--db-url", "postgresql://user:pass@localhost:5432/testdb"
+    ]);
+
+    // Should detect the API key from global options
+    expect(r.stdout).toMatch(/Using API key provided via --api-key parameter/);
+  });
+
+  test("cli: mon local-install works with --api-key after subcommand", () => {
+    // Test that --api-key works when passed after the subcommand
+    // Note: Commander.js routes --api-key to global opts, the fix reads from both
+    const r = runCli([
+      "mon", "local-install",
+      "--api-key", "test-key-after-subcommand",
+      "--db-url", "postgresql://user:pass@localhost:5432/testdb"
+    ]);
+
+    // Should detect the API key regardless of position
+    expect(r.stdout).toMatch(/Using API key provided via --api-key parameter/);
+    // Verify the key was saved
+    expect(r.stdout).toMatch(/API key saved/);
+  });
+
+  test("cli: mon local-install with --yes and no --api-key skips API setup", () => {
+    // When --yes is provided without --api-key, the CLI should skip
+    // the interactive prompt and proceed without API key
+    const r = runCli([
+      "mon", "local-install",
+      "--db-url", "postgresql://user:pass@localhost:5432/testdb",
+      "--yes"
+    ]);
+
+    // Should indicate auto-yes mode without API key
+    expect(r.stdout).toMatch(/Auto-yes mode: no API key provided/);
+    expect(r.stdout).toMatch(/Reports will be generated locally only/);
+  });
+
+  test("cli: mon local-install --demo with global --api-key shows error", () => {
+    // When --demo is used with global --api-key, it should still be detected and error
+    const r = runCli([
+      "--api-key", "global-api-key-test",
+      "mon", "local-install",
+      "--demo"
+    ]);
+
+    // Should reject demo mode with API key (from global option)
+    expect(r.status).not.toBe(0);
+    expect(r.stderr).toMatch(/Cannot use --api-key with --demo mode/);
+  });
 });