@scotthamilton77/sidekick 0.0.8-alpha.0 → 0.0.8-alpha.1

package/dist/bin.js

@@ -16704,7 +16704,7 @@ var require_setup_status = __commonJS({
   "../types/dist/setup-status.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.ProjectSetupStatusSchema = exports2.GitignoreStatusSchema = exports2.UserSetupStatusSchema = exports2.ProjectApiKeyHealthSchema = exports2.ApiKeyHealthSchema = void 0;
+    exports2.ProjectSetupStatusSchema = exports2.ProjectApiKeyValueSchema = exports2.GitignoreStatusSchema = exports2.UserSetupStatusSchema = exports2.UserApiKeyValueSchema = exports2.StatuslineStatusSchema = exports2.ProjectApiKeyStatusSchema = exports2.UserApiKeyStatusSchema = exports2.ApiKeyScopeSchema = exports2.ScopeStatusSchema = exports2.ProjectApiKeyHealthSchema = exports2.ApiKeyHealthSchema = void 0;
     var zod_1 = require_zod();
     exports2.ApiKeyHealthSchema = zod_1.z.enum([
       "missing",
@@ -16727,6 +16727,42 @@ var require_setup_status = __commonJS({
       "user"
       // Deferring to user-level
     ]);
+    exports2.ScopeStatusSchema = zod_1.z.enum(["healthy", "invalid", "missing"]);
+    exports2.ApiKeyScopeSchema = zod_1.z.enum(["project", "user", "env"]);
+    exports2.UserApiKeyStatusSchema = zod_1.z.object({
+      /** Which scope's key is being used (first valid in priority order) */
+      used: zod_1.z.enum(["user", "env"]).nullable(),
+      /** Overall status based on the used key */
+      status: exports2.ScopeStatusSchema,
+      /** Per-scope breakdown */
+      scopes: zod_1.z.object({
+        user: exports2.ScopeStatusSchema,
+        env: exports2.ScopeStatusSchema
+      })
+    });
+    exports2.ProjectApiKeyStatusSchema = zod_1.z.object({
+      /** Which scope's key is being used (first valid in priority order) */
+      used: zod_1.z.enum(["project", "user", "env"]).nullable(),
+      /** Overall status based on the used key */
+      status: exports2.ScopeStatusSchema,
+      /** Per-scope breakdown */
+      scopes: zod_1.z.object({
+        project: exports2.ScopeStatusSchema,
+        user: exports2.ScopeStatusSchema,
+        env: exports2.ScopeStatusSchema
+      })
+    });
+    exports2.StatuslineStatusSchema = zod_1.z.enum([
+      "user",
+      // Configured in ~/.claude/settings.json
+      "project",
+      // Configured in .claude/settings.local.json
+      "both",
+      // Configured in both (project overrides user)
+      "none"
+      // Not configured anywhere
+    ]);
+    exports2.UserApiKeyValueSchema = zod_1.z.union([exports2.ApiKeyHealthSchema, exports2.UserApiKeyStatusSchema]);
     exports2.UserSetupStatusSchema = zod_1.z.object({
       version: zod_1.z.literal(1),
       lastUpdatedAt: zod_1.z.string(),
@@ -16736,10 +16772,10 @@ var require_setup_status = __commonJS({
         defaultStatuslineScope: zod_1.z.enum(["user", "project"]),
         defaultApiKeyScope: zod_1.z.enum(["user", "project", "skip"])
       }),
-      statusline: zod_1.z.enum(["configured", "skipped"]),
+      statusline: exports2.StatuslineStatusSchema,
       apiKeys: zod_1.z.object({
-        OPENROUTER_API_KEY: exports2.ApiKeyHealthSchema,
-        OPENAI_API_KEY: exports2.ApiKeyHealthSchema
+        OPENROUTER_API_KEY: exports2.UserApiKeyValueSchema,
+        OPENAI_API_KEY: exports2.UserApiKeyValueSchema
       }),
       /** True if sidekick plugin detected at user scope via `claude plugin list` */
       pluginDetected: zod_1.z.boolean().optional()
@@ -16754,15 +16790,16 @@ var require_setup_status = __commonJS({
       "installed"
       // Sidekick section present with all required entries
     ]);
+    exports2.ProjectApiKeyValueSchema = zod_1.z.union([exports2.ProjectApiKeyHealthSchema, exports2.ProjectApiKeyStatusSchema]);
     exports2.ProjectSetupStatusSchema = zod_1.z.object({
       version: zod_1.z.literal(1),
       lastUpdatedAt: zod_1.z.string(),
       // ISO timestamp
       autoConfigured: zod_1.z.boolean(),
-      statusline: zod_1.z.enum(["configured", "skipped", "user"]),
+      statusline: exports2.StatuslineStatusSchema,
       apiKeys: zod_1.z.object({
-        OPENROUTER_API_KEY: exports2.ProjectApiKeyHealthSchema,
-        OPENAI_API_KEY: exports2.ProjectApiKeyHealthSchema
+        OPENROUTER_API_KEY: exports2.ProjectApiKeyValueSchema,
+        OPENAI_API_KEY: exports2.ProjectApiKeyValueSchema
       }),
       gitignore: exports2.GitignoreStatusSchema.optional().default("unknown"),
       /** True if sidekick plugin detected at project scope via `claude plugin list` */
@@ -50025,7 +50062,7 @@ var require_validation = __commonJS({
     exports2.validateOpenRouterKey = validateOpenRouterKey;
     exports2.validateOpenAIKey = validateOpenAIKey;
     var VALIDATION_ENDPOINTS = {
-      openrouter: "https://openrouter.ai/api/v1/models",
+      openrouter: "https://openrouter.ai/api/v1/key",
       openai: "https://api.openai.com/v1/models"
     };
     async function validateApiKey(provider, apiKey, logger) {
@@ -50185,6 +50222,25 @@ var require_setup_status_service = __commonJS({
     function isDevModeCommand(command) {
       return command.includes("dev-sidekick");
     }
+    function toScopeStatus(health) {
+      if (health === "healthy")
+        return "healthy";
+      if (health === "invalid")
+        return "invalid";
+      return "missing";
+    }
+    function determineOverallStatus(used, anyKeyFound) {
+      if (used)
+        return "healthy";
+      if (anyKeyFound)
+        return "invalid";
+      return "missing";
+    }
+    var SCOPE_TO_SOURCE = {
+      project: "project-env",
+      user: "user-env",
+      env: "env-var"
+    };
     var SetupStatusService = class {
       constructor(projectDir, options) {
         this.projectDir = projectDir;
@@ -50272,47 +50328,152 @@ var require_setup_status_service = __commonJS({
       // === Actual config detection ===
       /**
        * Detect actual API key by reading .env files.
-       * Checks environment variable first, then project .env, then user .env.
-       * Returns the key value if found, null otherwise.
+       * Priority: project .env → user .env → environment variable.
+       * Returns both the key value and where it was found.
        */
       async detectActualApiKey(keyName) {
+        const projectKey = await this.readKeyFromEnvFile(path.join(this.projectDir, ".sidekick", ".env"), keyName);
+        if (projectKey) {
+          return { key: projectKey, source: "project-env" };
+        }
+        const userKey = await this.readKeyFromEnvFile(path.join(this.homeDir, ".sidekick", ".env"), keyName);
+        if (userKey) {
+          return { key: userKey, source: "user-env" };
+        }
         if (process.env[keyName]) {
-          return process.env[keyName];
+          return { key: process.env[keyName] ?? null, source: "env-var" };
         }
-        const envPaths = [path.join(this.projectDir, ".sidekick", ".env"), path.join(this.homeDir, ".sidekick", ".env")];
-        for (const envPath of envPaths) {
-          try {
-            const content = await fs.readFile(envPath, "utf-8");
-            const match = content.match(new RegExp(`^${keyName}=(.+)$`, "m"));
-            if (match) {
-              return match[1];
-            }
-          } catch {
-          }
+        return { key: null, source: null };
+      }
+      /**
+       * Read API key from a specific .env file.
+       * @returns The key value if found, null otherwise.
+       */
+      async readKeyFromEnvFile(envPath, keyName) {
+        try {
+          const content = await fs.readFile(envPath, "utf-8");
+          const match = content.match(new RegExp(`^${keyName}=(.+)$`, "m"));
+          return match ? match[1] : null;
+        } catch {
+          return null;
         }
-        return null;
+      }
+      /**
+       * Detect API key across ALL scopes and optionally validate each.
+       * New priority order: project → user → env
+       *
+       * @param keyName - The API key name (OPENROUTER_API_KEY or OPENAI_API_KEY)
+       * @param skipValidation - If true, found keys are marked 'healthy' without validation
+       * @returns Detection results for all three scopes
+       */
+      async detectAllApiKeys(keyName, skipValidation = false) {
+        const validateFn = keyName === "OPENROUTER_API_KEY" ? shared_providers_1.validateOpenRouterKey : shared_providers_1.validateOpenAIKey;
+        const projectEnvPath = path.join(this.projectDir, ".sidekick", ".env");
+        const userEnvPath = path.join(this.homeDir, ".sidekick", ".env");
+        const projectKey = await this.readKeyFromEnvFile(projectEnvPath, keyName);
+        const userKey = await this.readKeyFromEnvFile(userEnvPath, keyName);
+        const rawEnvKey = process.env[keyName] ?? null;
+        const envKey = rawEnvKey && rawEnvKey !== projectKey && rawEnvKey !== userKey ? rawEnvKey : null;
+        const getStatus = async (key) => {
+          if (!key)
+            return "missing";
+          if (skipValidation)
+            return "healthy";
+          const result = await validateFn(key, this.logger);
+          return result.valid ? "healthy" : "invalid";
+        };
+        const [projectStatus, userStatus, envStatus] = await Promise.all([
+          getStatus(projectKey),
+          getStatus(userKey),
+          getStatus(envKey)
+        ]);
+        return {
+          project: { found: projectKey !== null, key: projectKey, status: projectStatus },
+          user: { found: userKey !== null, key: userKey, status: userStatus },
+          env: { found: envKey !== null, key: envKey, status: envStatus }
+        };
+      }
+      /**
+       * Build UserApiKeyStatus from detection results.
+       * User-level status only includes 'user' and 'env' scopes.
+       * Priority for 'used': user → env (first valid)
+       */
+      buildUserApiKeyStatus(detection) {
+        let used = null;
+        if (detection.user.status === "healthy") {
+          used = "user";
+        } else if (detection.env.status === "healthy") {
+          used = "env";
+        }
+        const status = determineOverallStatus(used, detection.user.found || detection.env.found);
+        return {
+          used,
+          status,
+          scopes: {
+            user: detection.user.status,
+            env: detection.env.status
+          }
+        };
+      }
+      /**
+       * Build ProjectApiKeyStatus from detection results.
+       * Project-level status includes all three scopes.
+       * Priority for 'used': project → user → env (first valid)
+       */
+      buildProjectApiKeyStatus(detection) {
+        let used = null;
+        if (detection.project.status === "healthy") {
+          used = "project";
+        } else if (detection.user.status === "healthy") {
+          used = "user";
+        } else if (detection.env.status === "healthy") {
+          used = "env";
+        }
+        const status = determineOverallStatus(used, detection.project.found || detection.user.found || detection.env.found);
+        return {
+          used,
+          status,
+          scopes: {
+            project: detection.project.status,
+            user: detection.user.status,
+            env: detection.env.status
+          }
+        };
       }
       /**
        * Detect actual statusline configuration by reading Claude settings files.
-       * Checks both user (~/.claude/settings.json) and project (.claude/settings.local.json).
+       * Returns WHERE the statusline is configured, matching PluginInstallationStatus pattern.
        */
       async detectActualStatusline() {
-        const settingsPaths = [
-          path.join(this.homeDir, ".claude", "settings.json"),
-          path.join(this.projectDir, ".claude", "settings.local.json")
-        ];
-        for (const settingsPath of settingsPaths) {
-          try {
-            const content = await fs.readFile(settingsPath, "utf-8");
-            const settings = JSON.parse(content);
-            const statusLine = settings.statusLine;
-            if (isSidekickStatuslineCommand(statusLine?.command)) {
-              return "configured";
-            }
-          } catch {
+        const userSettingsPath = path.join(this.homeDir, ".claude", "settings.json");
+        const projectSettingsPath = path.join(this.projectDir, ".claude", "settings.local.json");
+        let inUser = false;
+        let inProject = false;
+        try {
+          const content = await fs.readFile(userSettingsPath, "utf-8");
+          const settings = JSON.parse(content);
+          const statusLine = settings.statusLine;
+          if (isSidekickStatuslineCommand(statusLine?.command)) {
+            inUser = true;
           }
+        } catch {
         }
-        return "not-setup";
+        try {
+          const content = await fs.readFile(projectSettingsPath, "utf-8");
+          const settings = JSON.parse(content);
+          const statusLine = settings.statusLine;
+          if (isSidekickStatuslineCommand(statusLine?.command)) {
+            inProject = true;
+          }
+        } catch {
+        }
+        if (inUser && inProject)
+          return "both";
+        if (inProject)
+          return "project";
+        if (inUser)
+          return "user";
+        return "none";
       }
       /**
        * Detect plugin installation status.
@@ -50432,36 +50593,52 @@ var require_setup_status_service = __commonJS({
         return false;
       }
       // === Merged getters ===
-      async getStatuslineHealth() {
+      /**
+       * Get cached statusline status. Project cache takes precedence over user cache.
+       * Returns 'none' if no cache exists.
+       */
+      async getStatuslineStatus() {
         const project = await this.getProjectStatus();
-        if (project?.statusline === "configured")
-          return "configured";
-        if (project?.statusline === "skipped")
-          return "skipped";
-        if (project?.statusline === "user") {
-          const user2 = await this.getUserStatus();
-          return user2?.statusline ?? "not-setup";
-        }
+        if (project?.statusline)
+          return project.statusline;
         const user = await this.getUserStatus();
-        return user?.statusline ?? "not-setup";
+        if (user?.statusline)
+          return user.statusline;
+        return "none";
+      }
+      /**
+       * @deprecated Use getStatuslineStatus() instead
+       */
+      async getStatuslineHealth() {
+        return this.getStatuslineStatus();
       }
       async getApiKeyHealth(key) {
         const project = await this.getProjectStatus();
         const projectHealth = project?.apiKeys[key];
         if (projectHealth && projectHealth !== "user") {
+          if (typeof projectHealth === "object") {
+            return toScopeStatus(projectHealth.status);
+          }
           return projectHealth;
         }
         const user = await this.getUserStatus();
-        return user?.apiKeys[key] ?? "missing";
+        const userHealth = user?.apiKeys[key];
+        if (!userHealth)
+          return "missing";
+        if (typeof userHealth === "object") {
+          return toScopeStatus(userHealth.status);
+        }
+        return userHealth;
       }
       async getEffectiveApiKeyHealth(key) {
         const health = await this.getApiKeyHealth(key);
         return health === "user" ? "missing" : health;
       }
       async isHealthy() {
-        const statusline = await this.getStatuslineHealth();
+        const statusline = await this.getStatuslineStatus();
         const openrouterKey = await this.getEffectiveApiKeyHealth("OPENROUTER_API_KEY");
-        return statusline === "configured" && (openrouterKey === "healthy" || openrouterKey === "not-required");
+        const statuslineOk = statusline !== "none";
+        return statuslineOk && (openrouterKey === "healthy" || openrouterKey === "not-required");
       }
       // === Dev-mode and plugin detection helpers ===
       /**
@@ -50474,21 +50651,38 @@ var require_setup_status_service = __commonJS({
       }
       /**
        * Set the devMode flag in project status.
-       * Creates project status if it doesn't exist.
+       * Creates project status if it doesn't exist, detecting actual configuration state.
        */
       async setDevMode(enabled) {
         const current = await this.getProjectStatus();
         if (current) {
           await this.updateProjectStatus({ devMode: enabled });
         } else {
+          const statusline = await this.detectActualStatusline();
+          const openRouterResult = await this.detectActualApiKey("OPENROUTER_API_KEY");
+          const openAIResult = await this.detectActualApiKey("OPENAI_API_KEY");
+          const getApiKeyHealth = async (result) => {
+            if (result.source === "project-env") {
+              return "pending-validation";
+            }
+            if (result.source === "user-env" || result.source === "env-var") {
+              return "user";
+            }
+            const userStatus = await this.getUserStatus();
+            if (userStatus) {
+              return "user";
+            }
+            return "missing";
+          };
           await this.writeProjectStatus({
             version: 1,
             lastUpdatedAt: (/* @__PURE__ */ new Date()).toISOString(),
             autoConfigured: false,
-            statusline: "user",
+            statusline,
+            // Now directly uses 'user' | 'project' | 'both' | 'none'
             apiKeys: {
-              OPENROUTER_API_KEY: "user",
-              OPENAI_API_KEY: "user"
+              OPENROUTER_API_KEY: await getApiKeyHealth(openRouterResult),
+              OPENAI_API_KEY: await getApiKeyHealth(openAIResult)
             },
             gitignore: "unknown",
             devMode: enabled
@@ -50520,6 +50714,41 @@ var require_setup_status_service = __commonJS({
         }
         return !await this.isProjectConfigured();
       }
+      /**
+       * Auto-configure the project using user's default preferences.
+       * Creates project status that inherits from user-level settings.
+       * @returns true if auto-configured, false if skipped (preference disabled or already configured)
+       */
+      async autoConfigureProject() {
+        const user = await this.getUserStatus();
+        if (!user?.preferences.autoConfigureProjects) {
+          this.logger?.debug("Skipping auto-configure: user preference disabled");
+          return false;
+        }
+        if (await this.isProjectConfigured()) {
+          this.logger?.debug("Skipping auto-configure: project already configured");
+          return false;
+        }
+        this.logger?.info("Auto-configuring project with user defaults", {
+          projectDir: this.projectDir
+        });
+        const projectStatus = {
+          version: 1,
+          lastUpdatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+          autoConfigured: true,
+          statusline: "user",
+          apiKeys: {
+            OPENROUTER_API_KEY: "user",
+            OPENAI_API_KEY: "user"
+          },
+          gitignore: "unknown"
+        };
+        await this.writeProjectStatus(projectStatus);
+        this.logger?.info("Project auto-configured successfully", {
+          projectDir: this.projectDir
+        });
+        return true;
+      }
       async setApiKeyHealth(key, health, scope) {
         if (scope === "user") {
           const current = await this.getUserStatus();
@@ -50547,62 +50776,110 @@ var require_setup_status_service = __commonJS({
       async runDoctorCheck(options = {}) {
         const fixes = [];
         const actualStatusline = await this.detectActualStatusline();
-        const cachedStatusline = await this.getStatuslineHealth();
-        const statuslineFixed = actualStatusline !== cachedStatusline && actualStatusline === "configured";
+        const cachedStatusline = await this.getStatuslineStatus();
+        const statuslineFixed = actualStatusline !== cachedStatusline && actualStatusline !== "none";
         if (statuslineFixed) {
-          fixes.push("Statusline was actually configured (updated cache)");
-          const userStatus = await this.getUserStatus();
-          if (userStatus) {
-            await this.updateUserStatus({ statusline: "configured" });
+          fixes.push(`Statusline was actually configured at ${actualStatusline} level (updated cache)`);
+          if (actualStatusline === "project" || actualStatusline === "both") {
+            const projectStatus = await this.getProjectStatus();
+            if (projectStatus) {
+              await this.updateProjectStatus({ statusline: actualStatusline });
+            } else {
+              await this.writeProjectStatus({
+                version: 1,
+                lastUpdatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+                autoConfigured: false,
+                statusline: actualStatusline,
+                apiKeys: {
+                  OPENROUTER_API_KEY: "user",
+                  OPENAI_API_KEY: "user"
+                },
+                gitignore: "unknown"
+              });
+            }
           } else {
-            await this.writeUserStatus({
-              version: 1,
-              lastUpdatedAt: (/* @__PURE__ */ new Date()).toISOString(),
-              preferences: {
-                autoConfigureProjects: false,
-                defaultStatuslineScope: "user",
-                defaultApiKeyScope: "user"
-              },
-              statusline: "configured",
-              apiKeys: {
-                OPENROUTER_API_KEY: "missing",
-                OPENAI_API_KEY: "not-required"
-              }
-            });
+            const userStatus = await this.getUserStatus();
+            if (userStatus) {
+              await this.updateUserStatus({ statusline: actualStatusline });
+            } else {
+              await this.writeUserStatus({
+                version: 1,
+                lastUpdatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+                preferences: {
+                  autoConfigureProjects: false,
+                  defaultStatuslineScope: "user",
+                  defaultApiKeyScope: "user"
+                },
+                statusline: actualStatusline,
+                apiKeys: {
+                  OPENROUTER_API_KEY: "missing",
+                  OPENAI_API_KEY: "not-required"
+                }
+              });
+            }
           }
         }
         const apiKeyResults = {};
         const keysToCheck = ["OPENROUTER_API_KEY", "OPENAI_API_KEY"];
         for (const keyName of keysToCheck) {
-          const actualKey = await this.detectActualApiKey(keyName);
+          const detection = await this.detectAllApiKeys(keyName, options.skipValidation);
+          const projectApiKeyStatus = this.buildProjectApiKeyStatus(detection);
           const cachedHealth = await this.getEffectiveApiKeyHealth(keyName);
-          let actualHealth;
-          if (!actualKey) {
-            actualHealth = "missing";
-          } else if (options.skipValidation) {
-            actualHealth = "pending-validation";
-          } else {
-            const validateFn = keyName === "OPENROUTER_API_KEY" ? shared_providers_1.validateOpenRouterKey : shared_providers_1.validateOpenAIKey;
-            const validationResult = await validateFn(actualKey, this.logger);
-            actualHealth = validationResult.valid ? "healthy" : "invalid";
-          }
-          const keyFixed = actualKey !== null && cachedHealth === "missing";
+          const actualHealth = toScopeStatus(projectApiKeyStatus.status);
+          const source = projectApiKeyStatus.used ? SCOPE_TO_SOURCE[projectApiKeyStatus.used] ?? null : null;
+          const anyKeyPresent = detection.project.found || detection.user.found || detection.env.found;
+          const cacheNeedsUpdate = anyKeyPresent && cachedHealth === "missing" || !anyKeyPresent && cachedHealth !== "missing" && cachedHealth !== "not-required";
+          const keyFixed = cacheNeedsUpdate;
           if (keyFixed) {
-            fixes.push(`${keyName} was actually present (updated cache)`);
-            const userStatus = await this.getUserStatus();
-            if (userStatus) {
-              await this.updateUserStatus({
-                apiKeys: { ...userStatus.apiKeys, [keyName]: actualHealth }
+            const state = anyKeyPresent ? "present" : "missing";
+            fixes.push(`${keyName} was actually ${state} (updated cache)`);
+            const projectStatus = await this.getProjectStatus();
+            if (projectStatus) {
+              await this.updateProjectStatus({
+                apiKeys: { ...projectStatus.apiKeys, [keyName]: projectApiKeyStatus }
               });
+            } else {
+              const userApiKeyStatus = this.buildUserApiKeyStatus(detection);
+              await this.writeProjectStatus({
+                version: 1,
+                lastUpdatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+                autoConfigured: false,
+                statusline: actualStatusline,
+                apiKeys: {
+                  OPENROUTER_API_KEY: keyName === "OPENROUTER_API_KEY" ? projectApiKeyStatus : "user",
+                  OPENAI_API_KEY: keyName === "OPENAI_API_KEY" ? projectApiKeyStatus : "user"
+                },
+                gitignore: "unknown"
+              });
+              const userStatus = await this.getUserStatus();
+              if (!userStatus) {
+                await this.writeUserStatus({
+                  version: 1,
+                  lastUpdatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+                  preferences: {
+                    autoConfigureProjects: false,
+                    defaultStatuslineScope: "user",
+                    defaultApiKeyScope: "user"
+                  },
+                  statusline: actualStatusline,
+                  apiKeys: {
+                    OPENROUTER_API_KEY: keyName === "OPENROUTER_API_KEY" ? userApiKeyStatus : "missing",
+                    OPENAI_API_KEY: keyName === "OPENAI_API_KEY" ? userApiKeyStatus : "not-required"
+                  }
+                });
+              }
             }
           }
           apiKeyResults[keyName] = {
             actual: actualHealth,
             cached: cachedHealth,
-            fixed: keyFixed
+            fixed: keyFixed,
+            source,
+            used: projectApiKeyStatus.used,
+            scopes: projectApiKeyStatus.scopes
           };
         }
-        const isStatuslineHealthy = actualStatusline === "configured";
+        const isStatuslineHealthy = actualStatusline !== "none";
         const openRouterActual = apiKeyResults.OPENROUTER_API_KEY.actual;
         const openRouterCached = apiKeyResults.OPENROUTER_API_KEY.cached;
         const isApiKeyHealthy = openRouterActual !== "missing" || openRouterCached === "not-required";
@@ -66751,6 +67028,25 @@ var require_hook_command = __commonJS({
       }
     };
     var VERBOSE_DEGRADED_HOOKS = /* @__PURE__ */ new Set(["SessionStart", "UserPromptSubmit"]);
+    async function maybeAutoConfigureProject(projectRoot, logger) {
+      try {
+        const setupService = new core_1.SetupStatusService(projectRoot, { logger });
+        const shouldAuto = await setupService.shouldAutoConfigureProject();
+        if (!shouldAuto)
+          return false;
+        const configured = await setupService.autoConfigureProject();
+        if (configured) {
+          logger.info("Project auto-configured on SessionStart", { projectRoot });
+        }
+        return configured;
+      } catch (err) {
+        logger.warn("Failed to auto-configure project", {
+          error: err instanceof Error ? err.message : String(err),
+          projectRoot
+        });
+        return false;
+      }
+    }
     async function checkSetupState(projectRoot, hookName, logger) {
       let state;
       try {
@@ -66818,6 +67114,9 @@ var require_hook_command = __commonJS({
           });
         }
       }
+      if (hookName === "SessionStart") {
+        await maybeAutoConfigureProject(projectRoot, logger);
+      }
       const degradedResponse = await checkSetupState(projectRoot, hookName, logger);
       if (degradedResponse !== null) {
         const claudeResponse2 = translateToClaudeCodeFormat(hookName, degradedResponse);
@@ -67223,7 +67522,9 @@ var require_types4 = __commonJS({
       includeAssistantThinking: false,
       keepHistory: false,
       maxTitleWords: 8,
-      maxIntentWords: 12,
+      maxIntentWords: 15,
+      maxSnarkyWords: 20,
+      maxResumeWords: 20,
       snarkyMessages: true,
       countdown: {
         lowConfidence: 5,
@@ -67603,7 +67904,7 @@ var require_update_summary = __commonJS({
       await summaryState.summaryCountdown.write(sessionId, state);
     }
     function interpolatePrompt(template, context) {
-      return template.replace(/\{\{transcript\}\}/g, context.transcript).replace(/\{\{previousConfidence\}\}/g, String(context.previousConfidence)).replace(/\{\{previousAnalysis\}\}/g, context.previousAnalysis);
+      return template.replace(/\{\{transcript\}\}/g, context.transcript).replace(/\{\{previousConfidence\}\}/g, String(context.previousConfidence)).replace(/\{\{previousAnalysis\}\}/g, context.previousAnalysis).replace(/\{\{maxTitleWords\}\}/g, String(context.maxTitleWords)).replace(/\{\{maxIntentWords\}\}/g, String(context.maxIntentWords));
     }
     function parseResponse(content) {
       try {
@@ -67645,7 +67946,9 @@ var require_update_summary = __commonJS({
       const prompt = interpolatePrompt(promptTemplate, {
         transcript,
         previousConfidence,
-        previousAnalysis
+        previousAnalysis,
+        maxTitleWords: config.maxTitleWords,
+        maxIntentWords: config.maxIntentWords
       });
       const schemaContent = ctx.assets.resolve(SESSION_SUMMARY_SCHEMA_FILE);
       const jsonSchema = schemaContent ? {
@@ -67777,7 +68080,8 @@ var require_update_summary = __commonJS({
         latest_intent: summary.latest_intent,
         turn_count: ctx.transcript.getMetrics().turnCount,
         tool_count: ctx.transcript.getMetrics().toolCount,
-        sessionSummary: JSON.stringify(summary, null, 2)
+        sessionSummary: JSON.stringify(summary, null, 2),
+        maxSnarkyWords: config.maxSnarkyWords
       });
       const llmConfig = config.llm?.snarkyComment ?? types_js_1.DEFAULT_SESSION_SUMMARY_CONFIG.llm.snarkyComment;
       const provider = ctx.profileFactory.createForProfile(llmConfig.profile, llmConfig.fallbackProfile);
@@ -67843,7 +68147,8 @@ var require_update_summary = __commonJS({
         confidence: summary.session_title_confidence,
         latestIntent: summary.latest_intent,
         keyPhrases,
-        transcript: transcriptExcerpt
+        transcript: transcriptExcerpt,
+        maxResumeWords: config.maxResumeWords
       });
       const llmConfig = config.llm?.resumeMessage ?? types_js_1.DEFAULT_SESSION_SUMMARY_CONFIG.llm.resumeMessage;
       const provider = ctx.profileFactory.createForProfile(llmConfig.profile, llmConfig.fallbackProfile);
@@ -67943,16 +68248,17 @@ var require_on_demand_generation = __commonJS({
         };
       }
       const personaContext = (0, persona_utils_js_1.buildPersonaContext)(persona);
+      const featureConfig = ctx.config.getFeature("session-summary");
+      const config = { ...types_js_1.DEFAULT_SESSION_SUMMARY_CONFIG, ...featureConfig.settings };
       const prompt = (0, update_summary_js_1.interpolateTemplate)(promptTemplate, {
         ...personaContext,
         session_title: summary.session_title,
         latest_intent: summary.latest_intent,
         turn_count: ctx.transcript.getMetrics().turnCount,
         tool_count: ctx.transcript.getMetrics().toolCount,
-        sessionSummary: JSON.stringify(summary, null, 2)
+        sessionSummary: JSON.stringify(summary, null, 2),
+        maxSnarkyWords: config.maxSnarkyWords
       });
-      const featureConfig = ctx.config.getFeature("session-summary");
-      const config = { ...types_js_1.DEFAULT_SESSION_SUMMARY_CONFIG, ...featureConfig.settings };
       const llmConfig = config.llm?.snarkyComment ?? types_js_1.DEFAULT_SESSION_SUMMARY_CONFIG.llm.snarkyComment;
       const provider = ctx.profileFactory.createForProfile(llmConfig.profile, llmConfig.fallbackProfile);
       try {
@@ -68015,6 +68321,8 @@ var require_on_demand_generation = __commonJS({
         };
       }
       const personaContext = (0, persona_utils_js_1.buildPersonaContext)(persona);
+      const featureConfig = ctx.config.getFeature("session-summary");
+      const config = { ...types_js_1.DEFAULT_SESSION_SUMMARY_CONFIG, ...featureConfig.settings };
       const excerpt = ctx.transcript.getExcerpt({
         maxLines: 50,
         includeToolMessages: true,
@@ -68028,10 +68336,9 @@ var require_on_demand_generation = __commonJS({
         confidence: summary.session_title_confidence,
         latestIntent: summary.latest_intent,
         keyPhrases,
-        transcript: excerpt.content
+        transcript: excerpt.content,
+        maxResumeWords: config.maxResumeWords
       });
-      const featureConfig = ctx.config.getFeature("session-summary");
-      const config = { ...types_js_1.DEFAULT_SESSION_SUMMARY_CONFIG, ...featureConfig.settings };
       const llmConfig = config.llm?.resumeMessage ?? types_js_1.DEFAULT_SESSION_SUMMARY_CONFIG.llm.resumeMessage;
       const provider = ctx.profileFactory.createForProfile(llmConfig.profile, llmConfig.fallbackProfile);
       try {
@@ -70922,6 +71229,11 @@ var require_dev_mode = __commonJS({
         log(stdout, "info", "No sessions directory found");
       }
       await removeDirectory(node_path_1.default.join(sidekickDir, "state"), "state", stdout);
+      const setupStatusPath = node_path_1.default.join(sidekickDir, "setup-status.json");
+      if (await fileExists(setupStatusPath)) {
+        await (0, promises_12.unlink)(setupStatusPath);
+        log(stdout, "info", `Removed ${setupStatusPath}`);
+      }
       const tmpDir = node_os_1.default.tmpdir();
       try {
         const files = await (0, promises_12.readdir)(tmpDir);
@@ -71051,7 +71363,7 @@ var require_prompts = __commonJS({
       ctx.stdout.write(`${colorMap[type]}${icons[type]}${colors.reset} ${message}
 `);
     }
-    async function promptSelect(ctx, question, options) {
+    async function promptSelect(ctx, question, options, defaultIndex = 0) {
       ctx.stdout.write(`${question}
 
 `);
@@ -71069,17 +71381,30 @@ var require_prompts = __commonJS({
         output: ctx.stdout,
         terminal: false
       });
+      const defaultNum = defaultIndex + 1;
+      const prompt = `Enter choice (1-${options.length}) [${defaultNum}]: `;
       return new Promise((resolve3) => {
-        ctx.stdout.write(`Enter choice (1-${options.length}): `);
-        rl.once("line", (answer) => {
-          rl.close();
-          const num = parseInt(answer.trim(), 10);
-          if (num >= 1 && num <= options.length) {
-            resolve3(options[num - 1].value);
-          } else {
-            resolve3(options[0].value);
-          }
-        });
+        const ask = () => {
+          ctx.stdout.write(prompt);
+          rl.once("line", (answer) => {
+            const trimmed = answer.trim();
+            if (trimmed === "") {
+              rl.close();
+              resolve3(options[defaultIndex].value);
+            } else {
+              const num = parseInt(trimmed, 10);
+              if (num >= 1 && num <= options.length) {
+                rl.close();
+                resolve3(options[num - 1].value);
+              } else {
+                ctx.stdout.write(`${colors.yellow}Invalid choice. Enter a number between 1 and ${options.length}.${colors.reset}
+`);
+                ask();
+              }
+            }
+          });
+        };
+        ask();
       });
     }
     async function promptConfirm(ctx, question, defaultYes = true) {
@@ -71089,17 +71414,29 @@ var require_prompts = __commonJS({
         output: ctx.stdout,
         terminal: false
       });
+      const prompt = `${question} ${hint} `;
       return new Promise((resolve3) => {
-        ctx.stdout.write(`${question} ${hint} `);
-        rl.once("line", (answer) => {
-          rl.close();
-          const normalized = answer.trim().toLowerCase();
-          if (normalized === "") {
-            resolve3(defaultYes);
-          } else {
-            resolve3(normalized === "y" || normalized === "yes");
-          }
-        });
+        const ask = () => {
+          ctx.stdout.write(prompt);
+          rl.once("line", (answer) => {
+            const normalized = answer.trim().toLowerCase();
+            if (normalized === "") {
+              rl.close();
+              resolve3(defaultYes);
+            } else if (normalized === "y" || normalized === "yes") {
+              rl.close();
+              resolve3(true);
+            } else if (normalized === "n" || normalized === "no") {
+              rl.close();
+              resolve3(false);
+            } else {
+              ctx.stdout.write(`${colors.yellow}Please enter y or n.${colors.reset}
+`);
+              ask();
+            }
+          });
+        };
+        ask();
       });
     }
     async function promptInput(ctx, question) {
@@ -71247,6 +71584,12 @@ Examples:
           return "check failed";
       }
     }
+    function getScopeIcon(status) {
+      return status === "healthy" ? "\u2713" : "\u2717";
+    }
+    function formatApiKeyScopes(scopes) {
+      return `[project ${getScopeIcon(scopes.project)} user ${getScopeIcon(scopes.user)} env ${getScopeIcon(scopes.env)}]`;
+    }
     async function configureStatusline(settingsPath, logger) {
       let settings = {};
       try {
@@ -71286,27 +71629,6 @@ Examples:
       }
       await fs.writeFile(envPath, content);
     }
-    async function findExistingApiKey(keyName, homeDir, projectDir) {
-      if (process.env[keyName]) {
-        return process.env[keyName];
-      }
-      const envPaths = [
-        path.join(homeDir, ".sidekick", ".env"),
-        path.join(projectDir, ".sidekick", ".env"),
-        path.join(projectDir, ".sidekick", ".env.local")
-      ];
-      for (const envPath of envPaths) {
-        try {
-          const content = await fs.readFile(envPath, "utf-8");
-          const match = content.match(new RegExp(`^${keyName}=(.+)$`, "m"));
-          if (match) {
-            return match[1];
-          }
-        } catch {
-        }
-      }
-      return null;
-    }
     async function writePersonaConfig(_projectDir, homeDir, enabled) {
       const configDir = path.join(homeDir, ".sidekick");
       const featuresPath = path.join(configDir, "features.yaml");
@@ -71389,39 +71711,52 @@ Examples:
       stdout.write("These require an OpenRouter API key (small cost per message).\n\n");
       const wantPersonas = await (0, prompts_js_1.promptConfirm)(ctx, "Enable persona features?", true);
       let apiKeyHealth = "not-required";
+      let apiKeyDetection = null;
       if (!wantPersonas) {
         await writePersonaConfig(projectDir, homeDir, false);
         (0, prompts_js_1.printStatus)(ctx, "info", "Personas disabled");
       } else {
         await writePersonaConfig(projectDir, homeDir, true);
-        apiKeyHealth = await configureApiKey(wctx);
+        const result = await configureApiKey(wctx);
+        apiKeyHealth = result.health;
+        apiKeyDetection = result.detection;
       }
-      return { wantPersonas, apiKeyHealth };
+      return { wantPersonas, apiKeyHealth, apiKeyDetection };
     }
     async function configureApiKey(wctx) {
-      const { ctx, homeDir, projectDir, logger } = wctx;
+      const { ctx, homeDir, projectDir, logger, setupService } = wctx;
       const stdout = ctx.stdout;
-      const existingKey = await findExistingApiKey("OPENROUTER_API_KEY", homeDir, projectDir);
-      if (existingKey) {
-        (0, prompts_js_1.printStatus)(ctx, "success", "OPENROUTER_API_KEY found");
-        stdout.write("Validating... ");
-        const result2 = await (0, core_1.validateOpenRouterKey)(existingKey, logger);
-        if (result2.valid) {
-          stdout.write("valid!\n");
-          return "healthy";
-        } else {
-          stdout.write(`invalid (${result2.error})
+      stdout.write("\nChecking API keys...\n");
+      const detection = await setupService.detectAllApiKeys("OPENROUTER_API_KEY");
+      const scopeLabels = {
+        project: "project (.sidekick/.env)",
+        user: "user (~/.sidekick/.env)",
+        env: "env (OPENROUTER_API_KEY)"
+      };
+      for (const scope of ["project", "user", "env"]) {
+        const r = detection[scope];
+        const icon = r.found ? r.status === "healthy" ? "\u2713" : "\u2717" : "-";
+        const label = r.found ? r.status : "not found";
+        stdout.write(`  ${icon} ${scopeLabels[scope]}: ${label}
 `);
-          return "invalid";
-        }
       }
-      (0, prompts_js_1.printStatus)(ctx, "warning", "OPENROUTER_API_KEY not found");
-      const configureNow = await (0, prompts_js_1.promptConfirm)(ctx, "Configure API key now?", true);
+      const healthyScope = ["project", "user", "env"].find((s) => detection[s].status === "healthy");
+      if (healthyScope) {
+        (0, prompts_js_1.printStatus)(ctx, "success", `OpenRouter API Key: healthy (using ${healthyScope})`);
+        return { health: "healthy", detection };
+      }
+      const invalidScope = ["project", "user", "env"].find((s) => detection[s].found);
+      if (invalidScope) {
+        (0, prompts_js_1.printStatus)(ctx, "warning", "API key found but validation failed");
+      } else {
+        (0, prompts_js_1.printStatus)(ctx, "warning", "OPENROUTER_API_KEY not found");
+      }
+      const configureNow = await (0, prompts_js_1.promptConfirm)(ctx, invalidScope ? "Replace API key?" : "Configure API key now?", true);
       if (!configureNow) {
         stdout.write("\n");
         (0, prompts_js_1.printStatus)(ctx, "warning", "Persona features will show warnings in the statusline until an API key is configured.");
         stdout.write("Run 'sidekick setup' again or ask Claude to help configure API keys using /sidekick-config.\n");
-        return "missing";
+        return { health: "missing", detection };
       }
       const keyScope = await (0, prompts_js_1.promptSelect)(ctx, "Where should the API key be stored?", [
         { value: "user", label: "User-level (~/.sidekick/.env)", description: "Works in all projects" },
@@ -71435,14 +71770,14 @@ Examples:
         stdout.write("valid!\n");
         await writeApiKeyToEnv(envPath, "OPENROUTER_API_KEY", apiKey);
         (0, prompts_js_1.printStatus)(ctx, "success", `API key saved to ${envPath}`);
-        return "healthy";
       } else {
         stdout.write(`invalid (${result.error})
 `);
         (0, prompts_js_1.printStatus)(ctx, "warning", "API key validation failed, saving anyway");
         await writeApiKeyToEnv(envPath, "OPENROUTER_API_KEY", apiKey);
-        return "invalid";
       }
+      const postDetection = await setupService.detectAllApiKeys("OPENROUTER_API_KEY");
+      return { health: result.valid ? "healthy" : "invalid", detection: postDetection };
     }
     async function runStep4AutoConfig(wctx) {
       const { ctx } = wctx;
@@ -71456,7 +71791,7 @@ Examples:
     }
     async function writeStatusFiles(wctx, state) {
       const { setupService } = wctx;
-      const { statuslineScope, gitignoreStatus, wantPersonas, apiKeyHealth, autoConfig } = state;
+      const { statuslineScope, gitignoreStatus, wantPersonas, apiKeyHealth, apiKeyDetection, autoConfig } = state;
       const userStatus = {
         version: 1,
         lastUpdatedAt: (/* @__PURE__ */ new Date()).toISOString(),
@@ -71465,9 +71800,9 @@ Examples:
           defaultStatuslineScope: statuslineScope,
           defaultApiKeyScope: wantPersonas ? "user" : "skip"
         },
-        statusline: "configured",
+        statusline: statuslineScope,
         apiKeys: {
-          OPENROUTER_API_KEY: apiKeyHealth,
+          OPENROUTER_API_KEY: apiKeyDetection ? setupService.buildUserApiKeyStatus(apiKeyDetection) : apiKeyHealth,
           OPENAI_API_KEY: "not-required"
         }
       };
@@ -71476,9 +71811,9 @@ Examples:
         version: 1,
         lastUpdatedAt: (/* @__PURE__ */ new Date()).toISOString(),
         autoConfigured: false,
-        statusline: statuslineScope === "project" ? "configured" : "user",
+        statusline: statuslineScope,
         apiKeys: {
-          OPENROUTER_API_KEY: apiKeyHealth === "healthy" ? "user" : apiKeyHealth,
+          OPENROUTER_API_KEY: apiKeyDetection ? setupService.buildProjectApiKeyStatus(apiKeyDetection) : apiKeyHealth === "healthy" ? "user" : apiKeyHealth,
           OPENAI_API_KEY: "not-required"
         },
         gitignore: gitignoreStatus
@@ -71497,6 +71832,15 @@ Examples:
       (0, prompts_js_1.printStatus)(ctx, wantPersonas ? "success" : "info", `Personas: ${wantPersonas ? "Enabled" : "Disabled"}`);
       const apiKeyStatusType = getApiKeyStatusType(apiKeyHealth);
       (0, prompts_js_1.printStatus)(ctx, apiKeyStatusType, `API Key: ${apiKeyHealth}`);
+      if (state.apiKeyDetection) {
+        const scopes = {
+          project: state.apiKeyDetection.project.status,
+          user: state.apiKeyDetection.user.status,
+          env: state.apiKeyDetection.env.status
+        };
+        stdout.write(`         ${formatApiKeyScopes(scopes)}
+`);
+      }
       (0, prompts_js_1.printStatus)(ctx, "success", `Auto-configure: ${autoConfig === "auto" ? "Enabled" : "Disabled"}`);
       stdout.write("\n");
       stdout.write("Restart Claude Code to see your statusline: claude --continue\n");
@@ -71519,13 +71863,20 @@ Examples:
       }
       const statuslineScope = force ? "user" : await runStep1Statusline(wctx);
       const gitignoreStatus = await runStep2Gitignore(wctx, force);
-      const { wantPersonas, apiKeyHealth } = force ? { wantPersonas: true, apiKeyHealth: "not-required" } : await runStep3Personas(wctx);
+      const { wantPersonas, apiKeyHealth, apiKeyDetection } = force ? { wantPersonas: true, apiKeyHealth: "not-required", apiKeyDetection: null } : await runStep3Personas(wctx);
       const autoConfig = force ? "auto" : await runStep4AutoConfig(wctx);
       if (force) {
         const statuslinePath = path.join(homeDir, ".claude", "settings.json");
         await configureStatusline(statuslinePath, logger);
       }
-      const state = { statuslineScope, gitignoreStatus, wantPersonas, apiKeyHealth, autoConfig };
+      const state = {
+        statuslineScope,
+        gitignoreStatus,
+        wantPersonas,
+        apiKeyHealth,
+        apiKeyDetection,
+        autoConfig
+      };
       await writeStatusFiles(wctx, state);
       if (!force) {
         printSummary(wctx, state);
@@ -71609,8 +71960,8 @@ Examples:
             defaultStatuslineScope: "user",
             defaultApiKeyScope: "user"
           },
-          statusline: "skipped",
-          // Default to skipped if no prior setup
+          statusline: "none",
+          // Default to none if no prior setup
           apiKeys: {
             OPENROUTER_API_KEY: "not-required",
             OPENAI_API_KEY: "not-required"
@@ -71655,10 +72006,12 @@ Configured ${configuredCount} setting${configuredCount === 1 ? "" : "s"}.
       const pluginLabel = getPluginStatusLabel(pluginStatus);
       const livenessIcon = getLivenessIcon(liveness);
       const livenessLabel = getLivenessLabel(liveness);
-      const statuslineIcon = doctorResult.statusline.actual === "configured" ? "\u2713" : "\u26A0";
+      const statuslineIcon = doctorResult.statusline.actual !== "none" ? "\u2713" : "\u26A0";
       const gitignoreIcon = gitignore === "installed" ? "\u2713" : "\u26A0";
-      const openRouterHealth = doctorResult.apiKeys.OPENROUTER_API_KEY.actual;
+      const openRouterResult = doctorResult.apiKeys.OPENROUTER_API_KEY;
+      const openRouterHealth = openRouterResult.actual;
       const apiKeyIcon = openRouterHealth === "healthy" || openRouterHealth === "not-required" ? "\u2713" : "\u26A0";
+      const scopeBreakdown = formatApiKeyScopes(openRouterResult.scopes);
       stdout.write("\n");
       stdout.write(`${pluginIcon} Plugin: ${pluginLabel}
 `);
@@ -71668,7 +72021,7 @@ Configured ${configuredCount} setting${configuredCount === 1 ? "" : "s"}.
 `);
       stdout.write(`${gitignoreIcon} Gitignore: ${gitignore}
 `);
-      stdout.write(`${apiKeyIcon} OpenRouter API Key: ${openRouterHealth}
+      stdout.write(`${apiKeyIcon} OpenRouter API Key: ${openRouterHealth} ${scopeBreakdown}
 `);
       const isPluginOk = pluginStatus === "plugin" || pluginStatus === "dev-mode";
       const isPluginLive = liveness === "active";
@@ -71764,7 +72117,7 @@ var require_cli = __commonJS({
     var promises_12 = require("node:fs/promises");
     var node_stream_1 = require("node:stream");
     var yargs_parser_1 = __importDefault2(require_build());
-    var VERSION = true ? "0.0.8-alpha.0" : "dev";
+    var VERSION = true ? "0.0.8-alpha.1" : "dev";
     function isInSandbox() {
       return process.env.SANDBOX_RUNTIME === "1";
     }