@productbrain/cli 0.1.0-beta.1049 → 0.1.0-beta.10494

package/dist/lib/config.js

@@ -2,7 +2,8 @@
  * CLI config — reads PRODUCTBRAIN_API_KEY + CONVEX_SITE_URL from:
  * 1. Environment variables (always highest priority)
  * 2. Project local config: .productbrain/config.local.json (walked up from CWD, machine-local)
- * 3. Project config: .productbrain/config.json (walked up from CWD, siteUrl only — committed)
+ * 3. Project config: .productbrain/config.json (walked up from CWD, committed) — its presence
+ *    declares a project; its siteUrl never routes a key (TEN-4500)
  * 4. Profile system (~/.config/productbrain/profiles/{name}.env)
  * 5. Legacy ~/.config/productbrain/.env (auto-migrated to profiles on first use)
  * 6. CWD .env.mcp / packages/mcp-server/.env.mcp / .env
@@ -12,18 +13,21 @@
  *
  * When key is missing and retry is provided (TTY), runs guided flow per docs/cli-unauthenticated-user-journey.md.
  *
- * Split config design:
- * - config.json (committed): siteUrl only — workspace gateway, safe to share with teammates.
- * - config.local.json (gitignored): profile pin — machine-local, never committed.
+ * The repo's own config files (.productbrain/config.json, config.local.json) are located and
+ * read by projectConfig.ts — this module turns what they declare into a credential.
  */
 import { readFileSync, existsSync, mkdirSync, writeFileSync } from 'fs';
 import { resolve } from 'path';
 import { homedir } from 'os';
-import { DEFAULT_SITE_URL, isDevMode } from './constants.js';
+import { DEFAULT_SITE_URL } from './constants.js';
 import { API_KEY_PREFIX } from './tokenConstants.js';
+import { isEnvKeyBinding } from './envKeySnapshot.js';
 import { resolveProfileConfig, resolveNamedProfileConfig, getGlobalActiveProfile } from './profiles.js';
+import { findProjectRoot, readBoundPreviewKey, readLocalProjectConfig } from './projectConfig.js';
+import { declaresCompletePreviewBinding, refuseWhenProjectHasNoTenant, resolveLocalBinding, resolvePinnedProfile } from './localBinding.js';
 import { CLIError, ErrorCode } from './errors.js';
 import { confirm as promptConfirm, password as promptPassword } from './prompts.js';
+import { isInsecureSiteUrl, pickSiteUrl, resolveConfigResult, } from './configResult.js';
 const HOME_CONFIG_DIR = resolve(homedir(), '.config', 'productbrain');
 const HOME_ENV_PATH = resolve(HOME_CONFIG_DIR, '.env');
 const CWD_ENV_PATHS = ['.env.mcp', 'packages/mcp-server/.env.mcp', '.env'];
@@ -31,115 +35,9 @@ const CWD_ENV_PATHS = ['.env.mcp', 'packages/mcp-server/.env.mcp', '.env'];
 const NON_TTY_MESSAGE = 'No API key. Set PRODUCTBRAIN_API_KEY or run pb login.';
 /** Track whether env has been loaded to avoid redundant file reads. */
 let envLoaded = false;
-/**
- * Walk up the directory tree (git-style) to find the nearest CLI project root.
- *
- * A `.productbrain/` directory only counts as a CLI project root when it carries
- * CLI configuration — `config.json` (committed siteUrl gateway) or
- * `config.local.json` (machine-local profile pin or preview binding). A
- * projection-only `.productbrain/` written by `pb handshake` (briefing.md,
- * context.md, rules/, etc.) does NOT count — otherwise a subrepo like
- * `packages/cli/.productbrain/` would shadow the real configuring root and
- * `npm run pb:preview` writes (which always land at the repo-root
- * `.productbrain/`) would be invisible to commands run from the subrepo.
- *
- * Stops at home directory or filesystem root. Returns the directory containing
- * a config-bearing `.productbrain/`, or null if not found.
- */
-export function findProjectRoot(startDir) {
-    let dir = startDir;
-    const home = homedir();
-    while (true) {
-        const pbDir = resolve(dir, '.productbrain');
-        if (existsSync(pbDir) &&
-            (existsSync(resolve(pbDir, 'config.json')) ||
-                existsSync(resolve(pbDir, 'config.local.json')))) {
-            return dir;
-        }
-        const parent = resolve(dir, '..');
-        if (parent === dir || dir === home)
-            return null;
-        dir = parent;
-    }
-}
-/**
- * Read .productbrain/config.json from the walked-up project root.
- * Only reads siteUrl — profile and apiKey fields are ignored (legacy or misplaced).
- * Returns null if file missing or project root not found.
- * Warns to stderr on invalid JSON but does not throw.
- */
-function readProjectConfig() {
-    const projectRoot = findProjectRoot(process.cwd());
-    if (!projectRoot)
-        return null;
-    const configPath = resolve(projectRoot, '.productbrain', 'config.json');
-    if (!existsSync(configPath))
-        return null;
-    try {
-        const raw = readFileSync(configPath, 'utf8');
-        const parsed = JSON.parse(raw);
-        if (typeof parsed !== 'object' || parsed === null || Array.isArray(parsed)) {
-            process.stderr.write('Warning: .productbrain/config.json is not a JSON object, skipping.\n');
-            return null;
-        }
-        const result = {};
-        if (typeof parsed.siteUrl === 'string' && parsed.siteUrl) {
-            result.siteUrl = parsed.siteUrl;
-        }
-        // Silently ignore `profile` and `apiKey` in config.json — those must be in config.local.json
-        return result;
-    }
-    catch {
-        process.stderr.write('Warning: .productbrain/config.json contains invalid JSON, skipping.\n');
-        return null;
-    }
-}
-/**
- * Read .productbrain/config.local.json from the walked-up project root.
- * Returns the machine-local pin (`profile`) and any preview-binding fields
- * (`apiKey`, `siteUrl`, `preview`, `workspaceName`) written by
- * `npm run pb:preview` — all gitignored, never committed.
- * Returns null if file missing or project root not found.
- * Warns to stderr on invalid JSON but does not throw.
- */
-export function readLocalProjectConfig() {
-    const projectRoot = findProjectRoot(process.cwd());
-    if (!projectRoot)
-        return null;
-    const configPath = resolve(projectRoot, '.productbrain', 'config.local.json');
-    if (!existsSync(configPath))
-        return null;
-    try {
-        const raw = readFileSync(configPath, 'utf8');
-        const parsed = JSON.parse(raw);
-        if (typeof parsed !== 'object' || parsed === null || Array.isArray(parsed)) {
-            process.stderr.write('Warning: .productbrain/config.local.json is not a JSON object, skipping.\n');
-            return null;
-        }
-        const result = {};
-        if (typeof parsed.profile === 'string' && parsed.profile) {
-            result.profile = parsed.profile;
-        }
-        // Preview binding fields — written by `npm run pb:preview`, cleared by `npm run pb:real`.
-        if (typeof parsed.apiKey === 'string' && parsed.apiKey.startsWith(API_KEY_PREFIX)) {
-            result.apiKey = parsed.apiKey;
-        }
-        if (typeof parsed.siteUrl === 'string' && parsed.siteUrl) {
-            result.siteUrl = parsed.siteUrl;
-        }
-        if (parsed.preview === true) {
-            result.preview = true;
-        }
-        if (typeof parsed.workspaceName === 'string' && parsed.workspaceName) {
-            result.workspaceName = parsed.workspaceName;
-        }
-        return result;
-    }
-    catch {
-        process.stderr.write('Warning: .productbrain/config.local.json contains invalid JSON, skipping.\n');
-        return null;
-    }
-}
+// Re-exported so callers keep importing the repo-config readers from here (they are part of
+// this module's long-standing public surface); the implementations live in projectConfig.ts.
+export { findProjectRoot, readLocalProjectConfig } from './projectConfig.js';
 /**
  * Returns the preview binding metadata when pb is currently bound to a throwaway preview,
  * or null when bound to the real Chain (the default).
@@ -161,11 +59,7 @@ export function getPreviewBinding() {
     try {
         if (process.env.PRODUCTBRAIN_API_KEY)
             return null;
-        const localConfig = readLocalProjectConfig();
-        if (localConfig?.preview === true && localConfig.apiKey && localConfig.siteUrl) {
-            return { workspaceName: localConfig.workspaceName ?? null };
-        }
-        return null;
+        return declaresCompletePreviewBinding(readLocalProjectConfig());
     }
     catch {
         return null;
@@ -178,7 +72,7 @@ export function getPreviewBinding() {
  *
  * Co-writer note (SF-2): scripts/pb-binding.mjs is the OTHER writer of config.local.json — it
  * merges/strips the preview-binding keys (apiKey, siteUrl, preview, workspaceName) for
- * `npm run pb:preview` / `npm run pb:real`. Both writers preserve the `profile` pin. If you add
+ * `npm run pb:preview` / `npm run pb:real`, plus previewKey*. Both writers keep the `profile` pin. If you add
  * a preview-scoped key here or in readLocalProjectConfig(), update pb-binding.mjs's PREVIEW_KEYS.
  */
 export function setLocalProfilePin(projectRoot, profile) {
@@ -197,21 +91,85 @@ export function setLocalProfilePin(projectRoot, profile) {
     writeFileSync(localConfigPath, JSON.stringify({ ...existing, profile }, null, 2) + '\n');
 }
 /**
- * Resolve the effective profile NAME + where it came from. The SOURCE-PRECEDENCE
- * ORDER matches resolveConfig() (env > local pin > global > default), but unlike
- * resolveConfig() this reports the *configured* pin name even when that profile is
- * unresolvable (deleted / missing key). That divergence is intentional: a dangling
- * repo pin must be surfaced by `pb whoami`, not silently masked by the global
- * profile — masking it is the TEN-2163 silent-drift bug. Used by `pb whoami` and
- * the inline "now using" prints.
+ * WP-458 E2 — one-shot preview apiKey refresh from disk.
+ *
+ * After a worktree preview is reseeded, seed-preview.mjs Step 6 mints a NEW apiKey into the bound key
+ * file the binding recorded (`previewKey`), but `config.local.json` (and the live `process.env` binding it
+ * seeded via loadEnv) still carry the PRE-reseed key — so the next `pb session start` fails auth
+ * with an opaque INTERNAL. This re-reads the fresh key from that file so the caller can retry
+ * ONCE (session.ts). It is deliberately disk-to-disk: it compares that file's key against
+ * config.local.json's bound key, NOT against process.env (which loadEnv already populated from the
+ * stale binding), so it can't be confused by its own prior population. Never throws — any error
+ * degrades to 'unavailable'/'not-bound' so it can sit on the session-start path.
+ *
+ * Co-writer note (SF-2): mirrors pb-binding.mjs / setLocalProfilePin — preserves every sibling key
+ * in config.local.json (profile, preview, workspaceName, previewKey*) and only rewrites apiKey + siteUrl.
+ */
+export function refreshPreviewApiKeyFromDisk() {
+    try {
+        const projectRoot = findProjectRoot(process.cwd());
+        if (!projectRoot)
+            return 'not-bound';
+        const local = readLocalProjectConfig();
+        // Only act on a real preview binding (preview:true + atomic apiKey+siteUrl pair, SF-3).
+        if (!local?.preview || !local.apiKey || !local.siteUrl)
+            return 'not-bound';
+        // Never clobber a genuine env override. BOTH signals: the value comparison misses an operator
+        // who exported the SAME key the binding holds (Codex P2 r12); the snapshot misses one set
+        // after module load. An unset key is fine — loadEnv may not have run yet.
+        const liveKey = process.env.PRODUCTBRAIN_API_KEY;
+        if (isEnvKeyBinding() || (liveKey && liveKey !== local.apiKey))
+            return 'not-bound';
+        // Only the key file pb:preview bound, and only while it still names that person, workspace and seat (TEN-4883).
+        const fresh = local.previewKey ? readBoundPreviewKey(projectRoot, local.previewKey) : null;
+        if (!fresh)
+            return 'unavailable';
+        const freshKey = typeof fresh.apiKey === 'string' ? fresh.apiKey : '';
+        if (!freshKey.startsWith(API_KEY_PREFIX))
+            return 'unavailable';
+        // Same key as the one already bound — retrying would just fail again; the failure is not a
+        // stale key, so the caller surfaces the real error rather than relabelling it.
+        if (freshKey === local.apiKey)
+            return 'unchanged';
+        const freshSite = typeof fresh.siteUrl === 'string' && fresh.siteUrl ? fresh.siteUrl : local.siteUrl;
+        // Merge the fresh preview key into config.local.json, preserving siblings.
+        const localConfigPath = resolve(projectRoot, '.productbrain', 'config.local.json');
+        let existing = {};
+        if (existsSync(localConfigPath)) {
+            try {
+                const parsed = JSON.parse(readFileSync(localConfigPath, 'utf8'));
+                if (parsed && typeof parsed === 'object' && !Array.isArray(parsed))
+                    existing = parsed;
+            }
+            catch { /* overwrite below */ }
+        }
+        writeFileSync(localConfigPath, JSON.stringify({ ...existing, apiKey: freshKey, siteUrl: freshSite }, null, 2) + '\n');
+        // Update the live binding + drop the load cache so the next getConfig() uses the fresh key.
+        process.env.PRODUCTBRAIN_API_KEY = freshKey;
+        process.env.CONVEX_SITE_URL = freshSite.replace(/\/$/, '');
+        resetConfigCache();
+        return 'refreshed';
+    }
+    catch {
+        return 'unavailable';
+    }
+}
+/**
+ * Resolve the effective profile NAME + where it came from. PRECEDENCE — local pin > env >
+ * global > default: the pin outranks `PB_PROFILE` because resolveConfig() 2b / loadEnv() 1b
+ * bind the pinned key before the profile system (the only step reading `PB_PROFILE`), so
+ * under both the env name never supplies the credential and must not be reported. Unlike
+ * resolveConfig() this names the *configured* pin even when unresolvable (deleted / missing
+ * key): a dangling pin must be surfaced by `pb whoami`, never masked by the global profile
+ * — the TEN-2163 silent-drift bug. Used by `pb whoami`, session labels, "now using" prints.
  */
 export function resolveEffectiveProfile() {
-    const envProfile = process.env.PB_PROFILE?.trim();
-    if (envProfile)
-        return { profile: envProfile, source: 'env' };
     const localProfile = readLocalProjectConfig()?.profile;
     if (localProfile)
         return { profile: localProfile, source: 'local' };
+    const envProfile = process.env.PB_PROFILE?.trim();
+    if (envProfile)
+        return { profile: envProfile, source: 'env' };
     const globalProfile = getGlobalActiveProfile();
     if (globalProfile)
         return { profile: globalProfile, source: 'global' };
@@ -224,23 +182,28 @@ export function resolveEffectiveProfile() {
  * Resolution order:
  * 1. Environment variables (highest priority)
  * 2. config.local.json profile → resolveNamedProfileConfig(profile) for apiKey + siteUrl
- * 2b. config.json siteUrl (gateway override only — no apiKey, no profile)
+ * 2c. Declared project naming no tenant — refuses (config.json names neither a tenant nor a gateway)
  * 3. Profile system (~/.config/productbrain/profiles/{name}.env)
  * 4. Legacy home config (~/.config/productbrain/.env)
  * 5. CWD .env files (.env.mcp, packages/mcp-server/.env.mcp, .env)
  *
- * siteUrl always has a value (falls back to DEFAULT_SITE_URL).
+ * A key travels only with the site URL stored or exported beside it (TEN-4500): every branch
+ * reads its URL from the same source as its key, and a key with no URL of its own goes to
+ * DEFAULT_SITE_URL. `.productbrain/config.json` is committed, so a cloned repo controls its
+ * siteUrl; it never routes a key. Same rule as resolveAdminConfig() (TEN-1334). loadEnv()
+ * exports this function's answer, so `pb doctor` and the command path cannot name different
+ * hosts. `siteUrlSource` records which source supplied the URL.
+ *
+ * THROWS at step 2 rather than substituting a different workspace: CONFIG_INVALID at 2a
+ * (incomplete binding), AUTH_MISSING at 2b (dangling pin), missing-pin at 2c. getConfigSafe()
+ * reports each as `ok: false` with the kind preserved, for callers that must not crash.
  */
-export function resolveConfig() {
-    // 1. Env vars — check directly, don't mutate process.env
-    const envKey = process.env.PRODUCTBRAIN_API_KEY;
+export function resolveConfig(ignoreEnvKey = false) {
+    // 1. Env vars. `ignoreEnvKey`: reporting-only seam, rationale at its call site (TEN-3311).
+    const envKey = ignoreEnvKey ? undefined : process.env.PRODUCTBRAIN_API_KEY;
     const envSite = process.env.CONVEX_SITE_URL;
     if (envKey) {
-        return {
-            apiKey: envKey,
-            siteUrl: (envSite || DEFAULT_SITE_URL).replace(/\/$/, ''),
-            source: 'env',
-        };
+        return { apiKey: envKey, source: 'env', ...pickSiteUrl([['env', envSite]]) };
     }
     // 2. Local project config — check for direct preview binding first, then profile pin.
     const localConfig = readLocalProjectConfig();
@@ -251,39 +214,35 @@ export function resolveConfig() {
     //
     // Atomic apiKey+siteUrl (SF-3): only honor the preview key when its OWN siteUrl is present.
     // Never let a preview key borrow config.json's (real-dev) siteUrl — that would send a
-    // preview credential to a non-preview gateway (STD-261). If siteUrl is absent we skip this
-    // branch and fall through to the profile pin / default, so it is impossible by construction
-    // for a `preview:true` key to be paired with the committed real-dev gateway.
-    if (localConfig?.apiKey && localConfig.siteUrl) {
+    // preview credential to a non-preview gateway (STD-261). A claimed but incomplete binding
+    // refuses before the profile pin, so neither credential nor tenant can silently change.
+    const localBinding = resolveLocalBinding(localConfig);
+    if (localBinding) {
+        // The binding carries its own atomic siteUrl (SF-3), so it is also the URL's origin.
         return {
-            apiKey: localConfig.apiKey,
-            siteUrl: localConfig.siteUrl.replace(/\/$/, ''),
+            apiKey: localBinding.apiKey,
+            siteUrl: localBinding.siteUrl,
             source: 'project',
+            siteUrlSource: 'local-binding',
         };
     }
     // 2b. Profile pin (config.local.json profile field, gitignored)
     if (localConfig?.profile) {
-        const namedConfig = resolveNamedProfileConfig(localConfig.profile);
-        if (namedConfig?.apiKey) {
-            // siteUrl: local.profile.siteUrl || config.json.siteUrl || env || default
-            const projectConfig = readProjectConfig();
-            return {
-                apiKey: namedConfig.apiKey,
-                siteUrl: (namedConfig.siteUrl || projectConfig?.siteUrl || envSite || DEFAULT_SITE_URL).replace(/\/$/, ''),
-                source: 'project',
-            };
-        }
+        const pinned = resolvePinnedProfile(localConfig.profile);
+        return {
+            apiKey: pinned.apiKey,
+            source: 'project', profileName: localConfig.profile,
+            ...pickSiteUrl([['profile-pin', pinned.siteUrl]]),
+        };
     }
-    // 2b. config.json — siteUrl gateway override only (no apiKey, no profile)
-    // Falls through; siteUrl from config.json is used as a tiebreaker below in step 3.
+    refuseWhenProjectHasNoTenant(); // 2c — declared project, no tenant named
     // 3. Profile system
-    const projectConfig = readProjectConfig();
     const profileConfig = resolveProfileConfig();
     if (profileConfig?.apiKey) {
         return {
             apiKey: profileConfig.apiKey,
-            siteUrl: (projectConfig?.siteUrl || profileConfig.siteUrl || envSite || DEFAULT_SITE_URL).replace(/\/$/, ''),
-            source: 'profile',
+            source: 'profile', profileName: profileConfig.profileName ?? undefined,
+            ...pickSiteUrl([['profile', profileConfig.siteUrl]]),
         };
     }
     // 4. Legacy home config
@@ -292,8 +251,8 @@ export function resolveConfig() {
         if (vars['PRODUCTBRAIN_API_KEY']) {
             return {
                 apiKey: vars['PRODUCTBRAIN_API_KEY'],
-                siteUrl: (projectConfig?.siteUrl || vars['CONVEX_SITE_URL'] || envSite || DEFAULT_SITE_URL).replace(/\/$/, ''),
                 source: 'profile',
+                ...pickSiteUrl([['legacy', vars['CONVEX_SITE_URL']]]),
             };
         }
     }
@@ -305,18 +264,18 @@ export function resolveConfig() {
             if (vars['PRODUCTBRAIN_API_KEY']) {
                 return {
                     apiKey: vars['PRODUCTBRAIN_API_KEY'],
-                    siteUrl: (projectConfig?.siteUrl || vars['CONVEX_SITE_URL'] || envSite || DEFAULT_SITE_URL).replace(/\/$/, ''),
                     source: 'cwd',
+                    ...pickSiteUrl([['cwd', vars['CONVEX_SITE_URL'], p]]),
                 };
             }
             break;
         }
     }
-    // 6. No API key found anywhere — return with siteUrl default
+    // 6. No API key found anywhere — siteUrl still resolves so diagnostics can report a gateway.
     return {
         apiKey: undefined,
-        siteUrl: (projectConfig?.siteUrl || envSite || DEFAULT_SITE_URL).replace(/\/$/, ''),
         source: 'default',
+        ...pickSiteUrl([['env', envSite]]),
     };
 }
 /** Parse env file content and return key-value pairs (without mutating process.env). */
@@ -341,53 +300,21 @@ function parseEnvContent(content) {
 function loadEnv() {
     if (envLoaded)
         return;
-    envLoaded = true;
-    // 1. Try local project config first (preview binding or profile pin, config.local.json)
-    const localConfig = readLocalProjectConfig();
-    // 1a. Direct preview binding — set by `npm run pb:preview`, takes priority over profile pin.
-    // Atomic apiKey+siteUrl (SF-3): only bind the preview key when its OWN siteUrl is present —
-    // never let it fall through to config.json's (real-dev) siteUrl (STD-261). Mirror of the
-    // resolveConfig() 2a guard so loadEnv() and resolveConfig() agree on what counts as a binding.
-    if (localConfig?.apiKey && localConfig.siteUrl && !process.env.PRODUCTBRAIN_API_KEY) {
-        process.env.PRODUCTBRAIN_API_KEY = localConfig.apiKey;
-        // SF-3 atomic pair: when we accept the preview key, we MUST pair it with
-        // its OWN siteUrl — even if CONVEX_SITE_URL is already exported. Otherwise
-        // a stale/real exported CONVEX_SITE_URL would silently route the preview
-        // credential to a non-preview gateway. Mirror of resolveConfig() step 2a,
-        // which returns localConfig.siteUrl unconditionally inside this branch.
-        process.env.CONVEX_SITE_URL = localConfig.siteUrl.replace(/\/$/, '');
-    }
-    // 1b. Profile pin
-    if (localConfig?.profile && !process.env.PRODUCTBRAIN_API_KEY) {
-        const namedConfig = resolveNamedProfileConfig(localConfig.profile);
-        if (namedConfig?.apiKey) {
-            process.env.PRODUCTBRAIN_API_KEY = namedConfig.apiKey;
-            if (!process.env.CONVEX_SITE_URL && namedConfig.siteUrl) {
-                process.env.CONVEX_SITE_URL = namedConfig.siteUrl.replace(/\/$/, '');
-            }
-        }
-    }
-    // 1b. Apply siteUrl from config.json (gateway override — no apiKey reading here)
-    const projectConfig = readProjectConfig();
-    if (projectConfig?.siteUrl && !process.env.CONVEX_SITE_URL) {
-        process.env.CONVEX_SITE_URL = projectConfig.siteUrl.replace(/\/$/, '');
-    }
-    // 2. Try profile system (handles auto-migration from legacy .env)
-    const profileConfig = resolveProfileConfig();
-    if (profileConfig) {
-        // Only set if not already set by env vars or project config
-        if (!process.env.PRODUCTBRAIN_API_KEY) {
-            process.env.PRODUCTBRAIN_API_KEY = profileConfig.apiKey;
-        }
-        if (!process.env.CONVEX_SITE_URL && profileConfig.siteUrl) {
-            process.env.CONVEX_SITE_URL = profileConfig.siteUrl.replace(/\/$/, '');
-        }
+    // 1. The credential and its site URL come from resolveConfig() as one pair, so the URL a key
+    // is sent to is decided in one place and `pb doctor` (getConfigSafe) names the same host this
+    // exports (TEN-4500). resolveConfig() throws the same refusals this path must raise: an
+    // incomplete preview binding, a dangling pin, a declared project with no pin.
+    const resolved = resolveConfig();
+    if (resolved.apiKey) {
+        process.env.PRODUCTBRAIN_API_KEY = resolved.apiKey;
+        process.env.CONVEX_SITE_URL = resolved.siteUrl;
     }
-    // 3. Legacy home config (in case profiles didn't find it)
+    // 2. The legacy home file and the first CWD env file still seed any OTHER unset variable they
+    // hold. They cannot move the pair above: both variables are already set whenever a key
+    // resolved, and when none did, resolveConfig() already read these files and found no key.
     if (existsSync(HOME_ENV_PATH)) {
         parseEnvContent(readFileSync(HOME_ENV_PATH, 'utf8'));
     }
-    // 4. CWD env files
     for (const p of CWD_ENV_PATHS) {
         const full = resolve(process.cwd(), p);
         if (existsSync(full)) {
@@ -395,6 +322,10 @@ function loadEnv() {
             break;
         }
     }
+    // Marked loaded only on success: a dangling pin (step 1) throws, and latching the flag
+    // before that would leave the module "loaded" with no credential, so a caller that catches
+    // the refusal and retries would silently get the keyless path instead of the refusal again.
+    envLoaded = true;
 }
 /** Reset env loaded state — used for profile switching. */
 export function resetConfigCache() {
@@ -462,12 +393,12 @@ export function getConfig() {
             guidance: 'Set PRODUCTBRAIN_API_KEY or run `pb login`.',
         });
     }
-    const allowHttp = isDevMode() && siteUrl.startsWith('http://localhost');
-    if (!siteUrl.startsWith('https://') && !allowHttp) {
-        throw new CLIError(`CONVEX_SITE_URL must use HTTPS (got "${siteUrl.slice(0, 30)}…"). API keys must not be sent over unencrypted connections.`, {
+    if (isInsecureSiteUrl(siteUrl)) {
+        // loadEnv() exports a file-sourced URL into CONVEX_SITE_URL, so only `pb doctor` can name the origin.
+        throw new CLIError(`Site URL must use HTTPS (got "${siteUrl.slice(0, 30)}…"). API keys must not be sent over unencrypted connections.`, {
             code: ErrorCode.CONFIG_INVALID,
             category: 'config',
-            guidance: 'Set CONVEX_SITE_URL to an https:// URL.',
+            guidance: 'Run `pb doctor` to see which source supplied the URL, then set an https:// URL there.',
         });
     }
     return { apiKey, siteUrl };
@@ -482,21 +413,15 @@ export function getConfig() {
  * coexist by design — see WP-303 review (DW#5).
  *
  * Uses resolveConfig() directly (no loadEnv) to avoid env var pollution affecting source attribution.
+ *
+ * A refusal from resolveConfig() (dangling repo pin) is reported as `ok: false` with the
+ * refusal as the reason — NOT rethrown. This surface is what `pb doctor` and the bare-`pb`
+ * dashboard use to *diagnose*, and a diagnostic that dies on the condition it exists to
+ * explain is useless. The refusal keeps its teeth either way: `ok: false` hands out no
+ * credential, so nothing can proceed against the wrong workspace.
  */
 export function getConfigSafe() {
-    const resolved = resolveConfig();
-    if (!resolved.apiKey || !resolved.apiKey.startsWith(API_KEY_PREFIX)) {
-        return { ok: false, reason: 'No API key. Run pb login or set PRODUCTBRAIN_API_KEY.' };
-    }
-    const siteUrl = resolved.siteUrl;
-    const allowHttp = isDevMode() && siteUrl.startsWith('http://localhost');
-    if (!siteUrl.startsWith('https://') && !allowHttp) {
-        return {
-            ok: false,
-            reason: `CONVEX_SITE_URL must use HTTPS (got "${siteUrl.slice(0, 30)}…"). API keys must not be sent over unencrypted connections.`,
-        };
-    }
-    return { ok: true, apiKey: resolved.apiKey, siteUrl, source: resolved.source };
+    return resolveConfigResult(resolveConfig);
 }
 /**
  * Get config; if key is missing and stdin is a TTY, run guided flow (y/n → paste key → save → retry).
@@ -507,8 +432,7 @@ export async function getConfigOrGuide(retry) {
     loadEnv();
     const apiKey = process.env.PRODUCTBRAIN_API_KEY ?? '';
     const siteUrl = (process.env.CONVEX_SITE_URL ?? DEFAULT_SITE_URL).replace(/\/$/, '');
-    const allowHttp = isDevMode() && siteUrl.startsWith('http://localhost');
-    if (apiKey.startsWith(API_KEY_PREFIX) && (siteUrl.startsWith('https://') || allowHttp)) {
+    if (apiKey.startsWith(API_KEY_PREFIX) && !isInsecureSiteUrl(siteUrl)) {
         return { apiKey, siteUrl };
     }
     if (!process.stdin.isTTY) {
@@ -521,64 +445,8 @@ export async function getConfigOrGuide(retry) {
     const didRetry = await runGuidedFlow(retry);
     return didRetry ? null : null;
 }
-/**
- * Resolve config for admin operations — profile-only resolution.
- *
- * Admin commands (pb admin ...) must NOT read .productbrain/config.json or CWD env files.
- * The project config intentionally pins the repo to a dev Convex site; admin operations
- * target PROD workspaces via the operator's active profile. Reading project config here
- * would silently route admin calls to the wrong gateway (TEN-1334).
- *
- * Resolution order:
- * 1. Shell env vars (PRODUCTBRAIN_API_KEY / CONVEX_SITE_URL) — always win
- * 2. Active named profile (~/.config/productbrain/profiles/{name}.env)
- * 3. Legacy home config (~/.config/productbrain/.env)
- * 4. DEFAULT_SITE_URL as fallback for siteUrl
- *
- * Throws CLIError with AUTH_MISSING if no API key is found.
- */
-export function resolveAdminConfig() {
-    let apiKey;
-    let rawSiteUrl;
-    // 1. Shell env vars — always highest priority
-    const envKey = process.env.PRODUCTBRAIN_API_KEY;
-    if (envKey?.startsWith(API_KEY_PREFIX)) {
-        apiKey = envKey;
-        rawSiteUrl = process.env.CONVEX_SITE_URL;
-    }
-    // 2. Active profile (no project config, no CWD files)
-    if (!apiKey) {
-        const profileConfig = resolveProfileConfig();
-        if (profileConfig?.apiKey?.startsWith(API_KEY_PREFIX)) {
-            apiKey = profileConfig.apiKey;
-            rawSiteUrl = profileConfig.siteUrl;
-        }
-    }
-    // 3. Legacy ~/.config/productbrain/.env
-    if (!apiKey && existsSync(HOME_ENV_PATH)) {
-        const vars = parseEnvVars(readFileSync(HOME_ENV_PATH, 'utf8'));
-        if (vars['PRODUCTBRAIN_API_KEY']?.startsWith(API_KEY_PREFIX)) {
-            apiKey = vars['PRODUCTBRAIN_API_KEY'];
-            rawSiteUrl = vars['CONVEX_SITE_URL'];
-        }
-    }
-    if (!apiKey) {
-        throw new CLIError('No API key found. Run pb login or set PRODUCTBRAIN_API_KEY.', {
-            code: ErrorCode.AUTH_MISSING,
-            category: 'auth',
-            guidance: 'Run `pb login` to set your API key.',
-        });
-    }
-    const siteUrl = (rawSiteUrl || DEFAULT_SITE_URL).replace(/\/$/, '');
-    const allowHttp = isDevMode() && siteUrl.startsWith('http://localhost');
-    if (!siteUrl.startsWith('https://') && !allowHttp) {
-        throw new CLIError(`CONVEX_SITE_URL must use HTTPS for admin operations (got "${siteUrl.slice(0, 30)}…").`, {
-            code: ErrorCode.CONFIG_INVALID,
-            category: 'config',
-            guidance: 'Set CONVEX_SITE_URL to an https:// URL.',
-        });
-    }
-    return { apiKey, siteUrl };
-}
-export { HOME_CONFIG_DIR, HOME_ENV_PATH, readProjectConfig };
+// resolveAdminConfig() lives in adminConfig.ts (WP-681: split out to stay under the 500-LOC
+// budget). NOT re-exported here — that would be a circular import (adminConfig.ts imports
+// readLocalProjectConfig/HOME_ENV_PATH from this file); every caller imports it directly.
+export { HOME_CONFIG_DIR, HOME_ENV_PATH };
 //# sourceMappingURL=config.js.map