@scotthamilton77/sidekick 0.0.1-alpha → 0.0.4-alpha

package/dist/bin.js

@@ -16699,6 +16699,72 @@ var require_hook_input = __commonJS({
   }
 });
 
+// ../types/dist/setup-status.js
+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;
+    var zod_1 = require_zod();
+    exports2.ApiKeyHealthSchema = zod_1.z.enum([
+      "missing",
+      // Key needed but not found
+      "not-required",
+      // No LLM profiles configured for provider
+      "pending-validation",
+      // Key exists but not validated
+      "invalid",
+      // Validation failed
+      "healthy"
+      // Validation succeeded
+    ]);
+    exports2.ProjectApiKeyHealthSchema = zod_1.z.enum([
+      "missing",
+      "not-required",
+      "pending-validation",
+      "invalid",
+      "healthy",
+      "user"
+      // Deferring to user-level
+    ]);
+    exports2.UserSetupStatusSchema = zod_1.z.object({
+      version: zod_1.z.literal(1),
+      lastUpdatedAt: zod_1.z.string(),
+      // ISO timestamp
+      preferences: zod_1.z.object({
+        autoConfigureProjects: zod_1.z.boolean(),
+        defaultStatuslineScope: zod_1.z.enum(["user", "project"]),
+        defaultApiKeyScope: zod_1.z.enum(["user", "project", "skip"])
+      }),
+      statusline: zod_1.z.enum(["configured", "skipped"]),
+      apiKeys: zod_1.z.object({
+        OPENROUTER_API_KEY: exports2.ApiKeyHealthSchema,
+        OPENAI_API_KEY: exports2.ApiKeyHealthSchema
+      })
+    });
+    exports2.GitignoreStatusSchema = zod_1.z.enum([
+      "unknown",
+      // Setup hasn't checked yet (legacy projects)
+      "missing",
+      // User declined or entries not present
+      "installed"
+      // Sidekick section present in .gitignore
+    ]);
+    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"]),
+      apiKeys: zod_1.z.object({
+        OPENROUTER_API_KEY: exports2.ProjectApiKeyHealthSchema,
+        OPENAI_API_KEY: exports2.ProjectApiKeyHealthSchema
+      }),
+      gitignore: exports2.GitignoreStatusSchema.optional().default("unknown")
+    });
+  }
+});
+
 // ../types/dist/index.js
 var require_dist = __commonJS({
   "../types/dist/index.js"(exports2) {
@@ -16729,6 +16795,7 @@ var require_dist = __commonJS({
     __exportStar(require_context(), exports2);
     __exportStar(require_tasks(), exports2);
     __exportStar(require_hook_input(), exports2);
+    __exportStar(require_setup_status(), exports2);
   }
 });
 
@@ -27684,134 +27751,19 @@ var require_runtime_context = __commonJS({
   }
 });
 
-// ../sidekick-core/dist/scope.js
-var require_scope = __commonJS({
-  "../sidekick-core/dist/scope.js"(exports2) {
+// ../sidekick-core/dist/project-root.js
+var require_project_root = __commonJS({
+  "../sidekick-core/dist/project-root.js"(exports2) {
     "use strict";
     var __importDefault2 = exports2 && exports2.__importDefault || function(mod) {
       return mod && mod.__esModule ? mod : { "default": mod };
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.resolveScope = resolveScope;
-    var node_fs_1 = require("node:fs");
-    var node_os_1 = require("node:os");
+    exports2.resolveProjectRoot = resolveProjectRoot;
     var node_path_1 = __importDefault2(require("node:path"));
-    var SIDEKICK_HOOK_SEGMENT = `${node_path_1.default.sep}.claude${node_path_1.default.sep}hooks${node_path_1.default.sep}sidekick${node_path_1.default.sep}`;
-    function normalizeHookPath(hookScriptPath) {
-      try {
-        return (0, node_fs_1.realpathSync)(hookScriptPath);
-      } catch {
-        return node_path_1.default.resolve(hookScriptPath);
-      }
-    }
-    function deriveProjectRootFromHook(hookScriptPath) {
-      const index = hookScriptPath.lastIndexOf(SIDEKICK_HOOK_SEGMENT);
-      if (index === -1) {
-        return void 0;
-      }
-      return hookScriptPath.slice(0, index);
-    }
-    function findNearestSidekickDir(startDir) {
-      let current = node_path_1.default.resolve(startDir);
-      while (true) {
-        const candidate = node_path_1.default.join(current, ".claude", "hooks", "sidekick");
-        if ((0, node_fs_1.existsSync)(candidate)) {
-          return candidate;
-        }
-        const parent = node_path_1.default.dirname(current);
-        if (parent === current) {
-          return void 0;
-        }
-        current = parent;
-      }
-    }
-    function projectHasSidekickInstall(projectDir) {
-      const targets = [
-        node_path_1.default.join(projectDir, ".claude", "settings.json"),
-        node_path_1.default.join(projectDir, ".claude", "settings.json.local")
-      ];
-      return targets.some((filePath) => {
-        if (!(0, node_fs_1.existsSync)(filePath)) {
-          return false;
-        }
-        try {
-          const contents = (0, node_fs_1.readFileSync)(filePath, "utf8");
-          return contents.toLowerCase().includes("sidekick");
-        } catch {
-          return false;
-        }
-      });
-    }
-    function normalizeDir(dir) {
-      try {
-        return (0, node_fs_1.realpathSync)(node_path_1.default.resolve(dir));
-      } catch {
-        return node_path_1.default.resolve(dir);
-      }
-    }
-    function resolveScope(input) {
-      const warnings = [];
-      const cwd = input.cwd ? node_path_1.default.resolve(input.cwd) : process.cwd();
-      const hookScriptPath = input.hookScriptPath ? normalizeHookPath(input.hookScriptPath) : void 0;
-      const providedProjectDir = input.projectDir ? node_path_1.default.resolve(input.projectDir) : void 0;
-      const resolvedHomeDir = input.homeDir ? normalizeDir(input.homeDir) : normalizeDir((0, node_os_1.homedir)());
-      if (input.scopeOverride) {
-        return {
-          scope: input.scopeOverride,
-          source: "override",
-          hookScriptPath,
-          projectRoot: input.scopeOverride === "project" ? providedProjectDir : void 0,
-          warnings,
-          dualInstallDetected: false
-        };
-      }
-      if (hookScriptPath) {
-        if (hookScriptPath.startsWith(node_path_1.default.join(resolvedHomeDir, ".claude", "hooks", "sidekick"))) {
-          const dualInstallDetected2 = Boolean(providedProjectDir && projectHasSidekickInstall(providedProjectDir));
-          return {
-            scope: "user",
-            source: "hook-script-path",
-            hookScriptPath,
-            projectRoot: void 0,
-            warnings,
-            dualInstallDetected: dualInstallDetected2
-          };
-        }
-        const projectRoot = deriveProjectRootFromHook(hookScriptPath);
-        if (projectRoot) {
-          if (providedProjectDir && node_path_1.default.resolve(projectRoot) !== providedProjectDir) {
-            warnings.push("Project directory hint from --project-dir does not match path derived from --hook-script-path. Using hook-script-path.");
-          }
-          return {
-            scope: "project",
-            source: "hook-script-path",
-            hookScriptPath,
-            projectRoot,
-            warnings,
-            dualInstallDetected: false
-          };
-        }
-      }
-      const sidekickDir = findNearestSidekickDir(cwd);
-      if (sidekickDir && !sidekickDir.startsWith(node_path_1.default.join(resolvedHomeDir, ".claude", "hooks", "sidekick"))) {
-        return {
-          scope: "project",
-          source: "cwd-fallback",
-          hookScriptPath,
-          projectRoot: node_path_1.default.resolve(sidekickDir, "..", "..", ".."),
-          warnings,
-          dualInstallDetected: false
-        };
-      }
-      const dualInstallDetected = Boolean(providedProjectDir && projectHasSidekickInstall(providedProjectDir));
-      return {
-        scope: "user",
-        source: "default",
-        hookScriptPath,
-        projectRoot: void 0,
-        warnings,
-        dualInstallDetected
-      };
+    function resolveProjectRoot(input) {
+      const projectRoot = input.projectDir ? node_path_1.default.resolve(input.projectDir) : void 0;
+      return { projectRoot };
     }
   }
 });
@@ -32460,7 +32412,6 @@ var require_structured_logging = __commonJS({
           source: "cli",
           context: {
             sessionId: context.sessionId,
-            scope: context.scope,
             correlationId: context.correlationId,
             traceId: context.traceId,
             hook: context.hook
@@ -32480,7 +32431,6 @@ var require_structured_logging = __commonJS({
           source: "cli",
           context: {
             sessionId: context.sessionId,
-            scope: context.scope,
             correlationId: context.correlationId,
             traceId: context.traceId,
             hook: context.hook
@@ -32502,7 +32452,6 @@ var require_structured_logging = __commonJS({
           source: "daemon",
           context: {
             sessionId: context.sessionId,
-            scope: context.scope,
             correlationId: context.correlationId,
             traceId: context.traceId,
             hook: context.hook,
@@ -32524,7 +32473,6 @@ var require_structured_logging = __commonJS({
           source: "daemon",
           context: {
             sessionId: context.sessionId,
-            scope: context.scope,
             correlationId: context.correlationId,
             traceId: context.traceId,
             hook: context.hook,
@@ -32546,7 +32494,6 @@ var require_structured_logging = __commonJS({
           source: "daemon",
           context: {
             sessionId: context.sessionId,
-            scope: context.scope,
             correlationId: context.correlationId,
             traceId: context.traceId,
             hook: context.hook,
@@ -32568,8 +32515,7 @@ var require_structured_logging = __commonJS({
           time: Date.now(),
           source: "daemon",
           context: {
-            sessionId: "",
-            scope: "project"
+            sessionId: ""
           },
           payload: {
             metadata
@@ -32585,8 +32531,7 @@ var require_structured_logging = __commonJS({
           time: Date.now(),
           source: "daemon",
           context: {
-            sessionId: "",
-            scope: "project"
+            sessionId: ""
           },
           payload: {
             metadata
@@ -32602,8 +32547,7 @@ var require_structured_logging = __commonJS({
           time: Date.now(),
           source: "daemon",
           context: {
-            sessionId: "",
-            scope: "project"
+            sessionId: ""
           },
           payload: {
             metadata
@@ -32619,8 +32563,7 @@ var require_structured_logging = __commonJS({
           time: Date.now(),
           source: "daemon",
           context: {
-            sessionId: "",
-            scope: "project"
+            sessionId: ""
           },
           payload: {
             metadata
@@ -32636,8 +32579,7 @@ var require_structured_logging = __commonJS({
           time: Date.now(),
           source: "daemon",
           context: {
-            sessionId: "",
-            scope: "project"
+            sessionId: ""
           },
           payload: {
             metadata
@@ -32656,7 +32598,6 @@ var require_structured_logging = __commonJS({
           source: "cli",
           context: {
             sessionId: context.sessionId,
-            scope: context.scope,
             correlationId: context.correlationId,
             traceId: context.traceId,
             hook: context.hook,
@@ -32679,7 +32620,6 @@ var require_structured_logging = __commonJS({
           source: "cli",
           context: {
             sessionId: context.sessionId,
-            scope: context.scope,
             correlationId: context.correlationId,
             traceId: context.traceId,
             hook: context.hook,
@@ -32703,7 +32643,6 @@ var require_structured_logging = __commonJS({
           source: "daemon",
           context: {
             sessionId: context.sessionId,
-            scope: context.scope,
             correlationId: context.correlationId,
             traceId: context.traceId,
             hook: context.hook,
@@ -32726,7 +32665,6 @@ var require_structured_logging = __commonJS({
           source: "daemon",
           context: {
             sessionId: context.sessionId,
-            scope: context.scope,
             correlationId: context.correlationId,
             traceId: context.traceId,
             hook: context.hook,
@@ -32749,7 +32687,6 @@ var require_structured_logging = __commonJS({
           source: "daemon",
           context: {
             sessionId: context.sessionId,
-            scope: context.scope,
             correlationId: context.correlationId,
             traceId: context.traceId,
             hook: context.hook,
@@ -32773,7 +32710,6 @@ var require_structured_logging = __commonJS({
           source: "transcript",
           context: {
             sessionId: context.sessionId,
-            scope: context.scope,
             correlationId: context.correlationId,
             traceId: context.traceId,
             hook: context.hook,
@@ -32796,7 +32732,6 @@ var require_structured_logging = __commonJS({
           source: "transcript",
           context: {
             sessionId: context.sessionId,
-            scope: context.scope,
             correlationId: context.correlationId,
             traceId: context.traceId,
             hook: context.hook,
@@ -32854,7 +32789,10 @@ var require_package3 = __commonJS({
         lint: "eslint packages",
         "lint:fix": "eslint packages --fix",
         format: 'prettier --write "packages/**/*.ts"',
-        sidekick: "node packages/sidekick-cli/dist/bin.js"
+        sidekick: "node packages/sidekick-cli/dist/bin.js",
+        "test:dist:setup": "./scripts/test-dist.sh setup",
+        "test:dist:teardown": "./scripts/test-dist.sh teardown",
+        "test:dist:rebuild": "./scripts/test-dist.sh rebuild"
       },
       devDependencies: {
         "@eslint/js": "^9.39.1",
@@ -32917,15 +32855,7 @@ var require_daemon_client2 = __commonJS({
             await this.waitForShutdown();
           }
           this.logger.info("Starting daemon...");
-          let daemonPath;
-          try {
-            const pkgPath = require.resolve("@sidekick/daemon/package.json");
-            const pkg = require(pkgPath);
-            const binPath = pkg.bin ? typeof pkg.bin === "string" ? pkg.bin : pkg.bin["sidekickd"] : pkg.main;
-            daemonPath = path_1.default.resolve(path_1.default.dirname(pkgPath), binPath ?? "dist/index.js");
-          } catch {
-            daemonPath = path_1.default.resolve(__dirname, "../../sidekick-daemon/dist/index.js");
-          }
+          const daemonPath = await this.resolveDaemonPath();
           const child = (0, child_process_1.spawn)("node", [daemonPath, this.projectDir], {
             detached: true,
             stdio: "ignore",
@@ -33004,6 +32934,33 @@ var require_daemon_client2 = __commonJS({
         } catch {
         }
       }
+      /**
+       * Resolve the daemon entry point path.
+       * Checks in order:
+       * 1. Bundled context: daemon.js as sibling file (npm distribution)
+       * 2. Dev mode: workspace package resolution
+       */
+      async resolveDaemonPath() {
+        const bundledPath = path_1.default.resolve(__dirname, "daemon.js");
+        try {
+          await promises_12.default.access(bundledPath);
+          this.logger.debug("Using bundled daemon", { path: bundledPath });
+          return bundledPath;
+        } catch {
+        }
+        try {
+          const pkgPath = require.resolve("@sidekick/daemon/package.json");
+          const pkg = require(pkgPath);
+          const binPath = pkg.bin ? typeof pkg.bin === "string" ? pkg.bin : pkg.bin["sidekickd"] : pkg.main;
+          const daemonPath = path_1.default.resolve(path_1.default.dirname(pkgPath), binPath ?? "dist/index.js");
+          this.logger.debug("Using workspace daemon", { path: daemonPath });
+          return daemonPath;
+        } catch {
+          const fallbackPath = path_1.default.resolve(__dirname, "../../sidekick-daemon/dist/index.js");
+          this.logger.debug("Using fallback daemon path", { path: fallbackPath });
+          return fallbackPath;
+        }
+      }
       /**
        * Request daemon shutdown (fire-and-forget).
        * Sends shutdown request, receives ack, closes connection immediately.
@@ -33245,6 +33202,346 @@ var require_daemon_client2 = __commonJS({
   }
 });
 
+// ../sidekick-core/dist/setup-status-service.js
+var require_setup_status_service = __commonJS({
+  "../sidekick-core/dist/setup-status-service.js"(exports2) {
+    "use strict";
+    var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
+      if (k2 === void 0) k2 = k;
+      var desc = Object.getOwnPropertyDescriptor(m, k);
+      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+        desc = { enumerable: true, get: function() {
+          return m[k];
+        } };
+      }
+      Object.defineProperty(o, k2, desc);
+    } : function(o, m, k, k2) {
+      if (k2 === void 0) k2 = k;
+      o[k2] = m[k];
+    });
+    var __setModuleDefault = exports2 && exports2.__setModuleDefault || (Object.create ? function(o, v) {
+      Object.defineProperty(o, "default", { enumerable: true, value: v });
+    } : function(o, v) {
+      o["default"] = v;
+    });
+    var __importStar = exports2 && exports2.__importStar || /* @__PURE__ */ function() {
+      var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function(o2) {
+          var ar = [];
+          for (var k in o2) if (Object.prototype.hasOwnProperty.call(o2, k)) ar[ar.length] = k;
+          return ar;
+        };
+        return ownKeys(o);
+      };
+      return function(mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) {
+          for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        }
+        __setModuleDefault(result, mod);
+        return result;
+      };
+    }();
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.SetupStatusService = void 0;
+    exports2.createSetupStatusService = createSetupStatusService;
+    var fs = __importStar(require("node:fs/promises"));
+    var path = __importStar(require("node:path"));
+    var os = __importStar(require("node:os"));
+    var types_1 = require_dist();
+    var SetupStatusService = class {
+      constructor(projectDir, options) {
+        this.projectDir = projectDir;
+        this.homeDir = options?.homeDir ?? os.homedir();
+        this.logger = options?.logger;
+      }
+      // === Paths ===
+      get userStatusPath() {
+        return path.join(this.homeDir, ".sidekick", "setup-status.json");
+      }
+      get projectStatusPath() {
+        return path.join(this.projectDir, ".sidekick", "setup-status.json");
+      }
+      // === Low-level read/write ===
+      async getUserStatus() {
+        try {
+          const content = await fs.readFile(this.userStatusPath, "utf-8");
+          const parsed = types_1.UserSetupStatusSchema.safeParse(JSON.parse(content));
+          if (!parsed.success) {
+            this.logger?.warn("Invalid user setup status", { error: parsed.error });
+            return null;
+          }
+          return parsed.data;
+        } catch (err) {
+          if (err.code === "ENOENT") {
+            return null;
+          }
+          throw err;
+        }
+      }
+      async getProjectStatus() {
+        try {
+          const content = await fs.readFile(this.projectStatusPath, "utf-8");
+          const parsed = types_1.ProjectSetupStatusSchema.safeParse(JSON.parse(content));
+          if (!parsed.success) {
+            this.logger?.warn("Invalid project setup status", { error: parsed.error });
+            return null;
+          }
+          return parsed.data;
+        } catch (err) {
+          if (err.code === "ENOENT") {
+            return null;
+          }
+          throw err;
+        }
+      }
+      async writeUserStatus(status) {
+        const validated = types_1.UserSetupStatusSchema.parse(status);
+        const dir = path.dirname(this.userStatusPath);
+        await fs.mkdir(dir, { recursive: true });
+        await fs.writeFile(this.userStatusPath, JSON.stringify(validated, null, 2) + "\n");
+        this.logger?.debug("User setup status written", { path: this.userStatusPath });
+      }
+      async writeProjectStatus(status) {
+        const validated = types_1.ProjectSetupStatusSchema.parse(status);
+        const dir = path.dirname(this.projectStatusPath);
+        await fs.mkdir(dir, { recursive: true });
+        await fs.writeFile(this.projectStatusPath, JSON.stringify(validated, null, 2) + "\n");
+        this.logger?.debug("Project setup status written", { path: this.projectStatusPath });
+      }
+      async updateUserStatus(updates) {
+        const current = await this.getUserStatus();
+        if (!current) {
+          throw new Error("Cannot update user status: no existing status found");
+        }
+        const updated = {
+          ...current,
+          ...updates,
+          lastUpdatedAt: (/* @__PURE__ */ new Date()).toISOString()
+        };
+        await this.writeUserStatus(updated);
+      }
+      async updateProjectStatus(updates) {
+        const current = await this.getProjectStatus();
+        if (!current) {
+          throw new Error("Cannot update project status: no existing status found");
+        }
+        const updated = {
+          ...current,
+          ...updates,
+          lastUpdatedAt: (/* @__PURE__ */ new Date()).toISOString()
+        };
+        await this.writeProjectStatus(updated);
+      }
+      // === Merged getters ===
+      async getStatuslineHealth() {
+        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";
+        }
+        const user = await this.getUserStatus();
+        return user?.statusline ?? "not-setup";
+      }
+      async getApiKeyHealth(key) {
+        const project = await this.getProjectStatus();
+        const projectHealth = project?.apiKeys[key];
+        if (projectHealth && projectHealth !== "user") {
+          return projectHealth;
+        }
+        const user = await this.getUserStatus();
+        return user?.apiKeys[key] ?? "missing";
+      }
+      async getEffectiveApiKeyHealth(key) {
+        const health = await this.getApiKeyHealth(key);
+        return health === "user" ? "missing" : health;
+      }
+      async isHealthy() {
+        const statusline = await this.getStatuslineHealth();
+        const openrouterKey = await this.getEffectiveApiKeyHealth("OPENROUTER_API_KEY");
+        return statusline === "configured" && (openrouterKey === "healthy" || openrouterKey === "not-required");
+      }
+      // === Auto-config helpers ===
+      async isUserSetupComplete() {
+        const user = await this.getUserStatus();
+        return user !== null;
+      }
+      async isProjectConfigured() {
+        const project = await this.getProjectStatus();
+        return project !== null;
+      }
+      async shouldAutoConfigureProject() {
+        const user = await this.getUserStatus();
+        if (!user?.preferences.autoConfigureProjects) {
+          return false;
+        }
+        return !await this.isProjectConfigured();
+      }
+      async setApiKeyHealth(key, health, scope) {
+        if (scope === "user") {
+          const current = await this.getUserStatus();
+          if (!current) {
+            throw new Error("Cannot update API key health: no user status found");
+          }
+          await this.updateUserStatus({
+            apiKeys: { ...current.apiKeys, [key]: health }
+          });
+        } else {
+          const current = await this.getProjectStatus();
+          if (!current) {
+            throw new Error("Cannot update API key health: no project status found");
+          }
+          await this.updateProjectStatus({
+            apiKeys: { ...current.apiKeys, [key]: health }
+          });
+        }
+      }
+      // === Backward compatibility (for statusline service) ===
+      /**
+       * Get the overall setup state for statusline display.
+       *
+       * - `not-run` - Setup has never been run
+       * - `partial` - User setup done, project not configured
+       * - `healthy` - All configured and working
+       * - `unhealthy` - Setup exists but has issues (invalid keys, etc)
+       */
+      async getSetupState() {
+        const userStatus = await this.getUserStatus();
+        const projectStatus = await this.getProjectStatus();
+        if (!userStatus) {
+          return "not-run";
+        }
+        if (!projectStatus) {
+          return "partial";
+        }
+        const isHealthy = await this.isHealthy();
+        return isHealthy ? "healthy" : "unhealthy";
+      }
+    };
+    exports2.SetupStatusService = SetupStatusService;
+    function createSetupStatusService(projectDir, homeDir) {
+      return new SetupStatusService(projectDir, { homeDir });
+    }
+  }
+});
+
+// ../sidekick-core/dist/gitignore.js
+var require_gitignore = __commonJS({
+  "../sidekick-core/dist/gitignore.js"(exports2) {
+    "use strict";
+    var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
+      if (k2 === void 0) k2 = k;
+      var desc = Object.getOwnPropertyDescriptor(m, k);
+      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+        desc = { enumerable: true, get: function() {
+          return m[k];
+        } };
+      }
+      Object.defineProperty(o, k2, desc);
+    } : function(o, m, k, k2) {
+      if (k2 === void 0) k2 = k;
+      o[k2] = m[k];
+    });
+    var __setModuleDefault = exports2 && exports2.__setModuleDefault || (Object.create ? function(o, v) {
+      Object.defineProperty(o, "default", { enumerable: true, value: v });
+    } : function(o, v) {
+      o["default"] = v;
+    });
+    var __importStar = exports2 && exports2.__importStar || /* @__PURE__ */ function() {
+      var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function(o2) {
+          var ar = [];
+          for (var k in o2) if (Object.prototype.hasOwnProperty.call(o2, k)) ar[ar.length] = k;
+          return ar;
+        };
+        return ownKeys(o);
+      };
+      return function(mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) {
+          for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        }
+        __setModuleDefault(result, mod);
+        return result;
+      };
+    }();
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.GITIGNORE_ENTRIES = exports2.SIDEKICK_SECTION_END = exports2.SIDEKICK_SECTION_START = void 0;
+    exports2.installGitignoreSection = installGitignoreSection;
+    exports2.removeGitignoreSection = removeGitignoreSection;
+    exports2.detectGitignoreStatus = detectGitignoreStatus;
+    var fs = __importStar(require("node:fs/promises"));
+    var path = __importStar(require("node:path"));
+    exports2.SIDEKICK_SECTION_START = "# >>> sidekick";
+    exports2.SIDEKICK_SECTION_END = "# <<< sidekick";
+    exports2.GITIGNORE_ENTRIES = [
+      ".sidekick/logs/",
+      ".sidekick/sessions/",
+      ".sidekick/state/",
+      ".sidekick/.env",
+      ".sidekick/.env.local"
+    ];
+    async function installGitignoreSection(projectDir) {
+      const gitignorePath = path.join(projectDir, ".gitignore");
+      let content = "";
+      try {
+        content = await fs.readFile(gitignorePath, "utf-8");
+      } catch (err) {
+        if (err.code !== "ENOENT") {
+          return { status: "error", error: `Failed to read .gitignore: ${err.message}` };
+        }
+      }
+      if (content.includes(exports2.SIDEKICK_SECTION_START)) {
+        return { status: "already-installed" };
+      }
+      const section = ["", exports2.SIDEKICK_SECTION_START, ...exports2.GITIGNORE_ENTRIES, exports2.SIDEKICK_SECTION_END].join("\n");
+      const newContent = content.trimEnd() + section + "\n";
+      try {
+        await fs.writeFile(gitignorePath, newContent);
+        return { status: "installed", entriesAdded: exports2.GITIGNORE_ENTRIES };
+      } catch (err) {
+        return { status: "error", error: `Failed to write .gitignore: ${err.message}` };
+      }
+    }
+    async function removeGitignoreSection(projectDir) {
+      const gitignorePath = path.join(projectDir, ".gitignore");
+      try {
+        const content = await fs.readFile(gitignorePath, "utf-8");
+        const startIdx = content.indexOf(exports2.SIDEKICK_SECTION_START);
+        const endIdx = content.indexOf(exports2.SIDEKICK_SECTION_END);
+        if (startIdx === -1 || endIdx === -1 || endIdx < startIdx) {
+          return false;
+        }
+        const lineStartIdx = content.lastIndexOf("\n", startIdx - 1) + 1;
+        const lineEndIdx = content.indexOf("\n", endIdx);
+        const actualEndIdx = lineEndIdx === -1 ? content.length : lineEndIdx + 1;
+        const before = content.slice(0, lineStartIdx).trimEnd();
+        const after = content.slice(actualEndIdx).trimStart();
+        const newContent = before + (after ? "\n" + after : "") + "\n";
+        await fs.writeFile(gitignorePath, newContent);
+        return true;
+      } catch {
+        return false;
+      }
+    }
+    async function detectGitignoreStatus(projectDir) {
+      const gitignorePath = path.join(projectDir, ".gitignore");
+      try {
+        const content = await fs.readFile(gitignorePath, "utf-8");
+        return content.includes(exports2.SIDEKICK_SECTION_START) ? "installed" : "missing";
+      } catch {
+        return "missing";
+      }
+    }
+  }
+});
+
 // ../sidekick-core/dist/state/errors.js
 var require_errors4 = __commonJS({
   "../sidekick-core/dist/state/errors.js"(exports2) {
@@ -33395,7 +33692,6 @@ var require_staging_service = __commonJS({
         await this.options.stateService.write(reminderPath, data, types_1.StagedReminderSchema);
         const event = structured_logging_1.LogEvents.reminderStaged({
           sessionId,
-          scope: this.options.scope,
           hook: hookName
         }, {
           reminderName: data.name,
@@ -33541,10 +33837,9 @@ var require_staging_service = __commonJS({
     };
     exports2.StagingServiceCore = StagingServiceCore;
     var SessionScopedStagingService = class {
-      constructor(core, sessionId, scope) {
+      constructor(core, sessionId) {
         this.core = core;
         this.sessionId = sessionId;
-        this.scope = scope;
       }
       // ============================================================================
       // StagingService Interface Implementation (delegates to core)
@@ -33585,12 +33880,6 @@ var require_staging_service = __commonJS({
       getSessionId() {
         return this.sessionId;
       }
-      /**
-       * Get the scope (for testing/debugging).
-       */
-      getScope() {
-        return this.scope;
-      }
     };
     exports2.SessionScopedStagingService = SessionScopedStagingService;
   }
@@ -33685,8 +33974,7 @@ var require_handler_registry2 = __commonJS({
         this.handlers = [];
         this.context = {
           sessionId: options.sessionId,
-          transcriptPath: options.transcriptPath,
-          scope: options.scope
+          transcriptPath: options.transcriptPath
         };
       }
       /**
@@ -33802,7 +34090,7 @@ var require_handler_registry2 = __commonJS({
         const event = this.buildTranscriptEvent(eventType, entry, lineNumber, isBulkProcessing);
         const metrics = this.options.getMetrics?.();
         if (metrics) {
-          (0, structured_logging_js_1.logEvent)(this.options.logger, structured_logging_js_1.LogEvents.transcriptEventEmitted({ sessionId: this.options.sessionId, scope: this.options.scope }, {
+          (0, structured_logging_js_1.logEvent)(this.options.logger, structured_logging_js_1.LogEvents.transcriptEventEmitted({ sessionId: this.options.sessionId }, {
             eventType,
             lineNumber,
             uuid: entry.uuid,
@@ -33828,8 +34116,7 @@ var require_handler_registry2 = __commonJS({
       async invokeTranscriptHandler(handler, event) {
         const startTime = Date.now();
         const logContext = {
-          sessionId: this.options.sessionId,
-          scope: this.options.scope
+          sessionId: this.options.sessionId
         };
         try {
           await handler.handler(event, this.context);
@@ -33875,8 +34162,7 @@ var require_handler_registry2 = __commonJS({
       buildTranscriptEvent(eventType, entry, lineNumber, isBulkProcessing = false) {
         const context = {
           sessionId: this.options.sessionId,
-          timestamp: Date.now(),
-          scope: this.options.scope
+          timestamp: Date.now()
         };
         const metrics = this.options.getMetrics?.() ?? this.createEmptyMetrics();
         return {
@@ -37247,7 +37533,7 @@ var require_transcript_service = __commonJS({
         await this.persistCompactionHistory();
         if (this.sessionId) {
           const lineCount = (0, node_fs_1.statSync)(snapshotPath).size > 0 ? this.metrics.lastProcessedLine : 0;
-          (0, structured_logging_js_1.logEvent)(this.options.logger, structured_logging_js_1.LogEvents.preCompactCaptured({ sessionId: this.sessionId, scope: "project" }, { snapshotPath, lineCount }, { transcriptPath: this.transcriptPath ?? "", metrics: this.deepCloneMetrics() }));
+          (0, structured_logging_js_1.logEvent)(this.options.logger, structured_logging_js_1.LogEvents.preCompactCaptured({ sessionId: this.sessionId }, { snapshotPath, lineCount }, { transcriptPath: this.transcriptPath ?? "", metrics: this.deepCloneMetrics() }));
         }
         this.options.logger.info("Captured pre-compact state", { sessionId: this.sessionId, snapshotPath });
       }
@@ -37831,7 +38117,6 @@ var require_service_factory2 = __commonJS({
         this.stagingCore = new staging_service_js_1.StagingServiceCore({
           stateDir: options.stateDir,
           logger: options.logger,
-          scope: options.scope,
           stateService: stagingStateService
         });
       }
@@ -37841,7 +38126,7 @@ var require_service_factory2 = __commonJS({
        */
       getStagingService(sessionId) {
         this.touchSession(sessionId);
-        return new staging_service_js_1.SessionScopedStagingService(this.stagingCore, sessionId, this.options.scope);
+        return new staging_service_js_1.SessionScopedStagingService(this.stagingCore, sessionId);
       }
       /**
        * Prepare a session-scoped TranscriptService without starting event emission.
@@ -38447,8 +38732,8 @@ var require_dist3 = __commonJS({
       for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports3, p)) __createBinding(exports3, m, p);
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.HandlerRegistryImpl = exports2.extractConsumedTimestamp = exports2.createConsumedFilePattern = exports2.CONSUMED_FILE_PATTERN = exports2.filterActiveReminderFiles = exports2.validatePathSegment = exports2.isValidPathSegment = exports2.getReminderPath = exports2.getHookDir = exports2.getStagingRoot = exports2.SessionScopedStagingService = exports2.StagingServiceCore = exports2.DaemonClient = exports2.killAllDaemons = exports2.logEvent = exports2.LogEvents = exports2.getComponentLogLevel = exports2.setupGlobalErrorHandlers = exports2.createLoggerFacade = exports2.createLogManager = exports2.createConsoleLogger = exports2.getUserDaemonsDir = exports2.getUserPidPath = exports2.getTokenPath = exports2.getSocketPath = exports2.getProjectHash = exports2.getPidPath = exports2.getLockPath = exports2.IpcService = exports2.IpcServer = exports2.loadPersonaFile = exports2.getDefaultPersonasDir = exports2.discoverPersonas = exports2.createPersonaLoader = exports2.reconstructTranscriptPath = exports2.encodeProjectPath = exports2.isPreCompactEvent = exports2.isStopEvent = exports2.isPostToolUseEvent = exports2.isPreToolUseEvent = exports2.isUserPromptSubmitEvent = exports2.isSessionEndEvent = exports2.isSessionStartEvent = exports2.isTranscriptEvent = exports2.isHookEvent = exports2.MetricsPersistPayloadSchema = exports2.CleanupPayloadSchema = exports2.ResumeGenerationPayloadSchema = exports2.SessionSummaryPayloadSchema = exports2.TaskTypes = void 0;
-    exports2.DaemonGlobalLogMetricsDescriptor = exports2.CliLogMetricsDescriptor = exports2.DaemonLogMetricsDescriptor = exports2.CompactionHistoryDescriptor = exports2.TranscriptMetricsDescriptor = exports2.GlobalStateAccessor = exports2.SessionStateAccessor = exports2.globalState = exports2.sessionState = exports2.StateCorruptError = exports2.StateNotFoundError = exports2.StateService = exports2.createHookableLogger = exports2.InstrumentedProfileProviderFactory = exports2.InstrumentedLLMProvider = exports2.ServiceFactoryImpl = exports2.TranscriptServiceImpl = exports2.createDefaultTokenUsage = exports2.createDefaultMetrics = exports2.copyWithTimestampSync = exports2.renameWithTimestampSync = exports2.renameWithTimestamp = exports2.copyWithTimestamp = exports2.getTimestampedPath = exports2.extractToolResultPreview = exports2.extractToolCallPreview = exports2.extractTextFromContent = exports2.extractContentPreview = void 0;
+    exports2.getHookDir = exports2.getStagingRoot = exports2.SessionScopedStagingService = exports2.StagingServiceCore = exports2.GITIGNORE_ENTRIES = exports2.SIDEKICK_SECTION_END = exports2.SIDEKICK_SECTION_START = exports2.detectGitignoreStatus = exports2.removeGitignoreSection = exports2.installGitignoreSection = exports2.createSetupStatusService = exports2.SetupStatusService = exports2.DaemonClient = exports2.killAllDaemons = exports2.logEvent = exports2.LogEvents = exports2.getComponentLogLevel = exports2.setupGlobalErrorHandlers = exports2.createLoggerFacade = exports2.createLogManager = exports2.createConsoleLogger = exports2.getUserDaemonsDir = exports2.getUserPidPath = exports2.getTokenPath = exports2.getSocketPath = exports2.getProjectHash = exports2.getPidPath = exports2.getLockPath = exports2.IpcService = exports2.IpcServer = exports2.loadPersonaFile = exports2.getDefaultPersonasDir = exports2.discoverPersonas = exports2.createPersonaLoader = exports2.reconstructTranscriptPath = exports2.encodeProjectPath = exports2.isPreCompactEvent = exports2.isStopEvent = exports2.isPostToolUseEvent = exports2.isPreToolUseEvent = exports2.isUserPromptSubmitEvent = exports2.isSessionEndEvent = exports2.isSessionStartEvent = exports2.isTranscriptEvent = exports2.isHookEvent = exports2.MetricsPersistPayloadSchema = exports2.CleanupPayloadSchema = exports2.ResumeGenerationPayloadSchema = exports2.SessionSummaryPayloadSchema = exports2.TaskTypes = void 0;
+    exports2.DaemonGlobalLogMetricsDescriptor = exports2.CliLogMetricsDescriptor = exports2.DaemonLogMetricsDescriptor = exports2.CompactionHistoryDescriptor = exports2.TranscriptMetricsDescriptor = exports2.GlobalStateAccessor = exports2.SessionStateAccessor = exports2.globalState = exports2.sessionState = exports2.StateCorruptError = exports2.StateNotFoundError = exports2.StateService = exports2.createHookableLogger = exports2.InstrumentedProfileProviderFactory = exports2.InstrumentedLLMProvider = exports2.ServiceFactoryImpl = exports2.TranscriptServiceImpl = exports2.createDefaultTokenUsage = exports2.createDefaultMetrics = exports2.copyWithTimestampSync = exports2.renameWithTimestampSync = exports2.renameWithTimestamp = exports2.copyWithTimestamp = exports2.getTimestampedPath = exports2.extractToolResultPreview = exports2.extractToolCallPreview = exports2.extractTextFromContent = exports2.extractContentPreview = exports2.HandlerRegistryImpl = exports2.extractConsumedTimestamp = exports2.createConsumedFilePattern = exports2.CONSUMED_FILE_PATTERN = exports2.filterActiveReminderFiles = exports2.validatePathSegment = exports2.isValidPathSegment = exports2.getReminderPath = void 0;
     var types_1 = require_dist();
     Object.defineProperty(exports2, "TaskTypes", { enumerable: true, get: function() {
       return types_1.TaskTypes;
@@ -38554,7 +38839,7 @@ var require_dist3 = __commonJS({
       return logger_1.createConsoleLogger;
     } });
     __exportStar(require_runtime_context(), exports2);
-    __exportStar(require_scope(), exports2);
+    __exportStar(require_project_root(), exports2);
     var structured_logging_1 = require_structured_logging();
     Object.defineProperty(exports2, "createLogManager", { enumerable: true, get: function() {
       return structured_logging_1.createLogManager;
@@ -38581,6 +38866,32 @@ var require_dist3 = __commonJS({
     Object.defineProperty(exports2, "DaemonClient", { enumerable: true, get: function() {
       return daemon_client_1.DaemonClient;
     } });
+    var setup_status_service_1 = require_setup_status_service();
+    Object.defineProperty(exports2, "SetupStatusService", { enumerable: true, get: function() {
+      return setup_status_service_1.SetupStatusService;
+    } });
+    Object.defineProperty(exports2, "createSetupStatusService", { enumerable: true, get: function() {
+      return setup_status_service_1.createSetupStatusService;
+    } });
+    var gitignore_1 = require_gitignore();
+    Object.defineProperty(exports2, "installGitignoreSection", { enumerable: true, get: function() {
+      return gitignore_1.installGitignoreSection;
+    } });
+    Object.defineProperty(exports2, "removeGitignoreSection", { enumerable: true, get: function() {
+      return gitignore_1.removeGitignoreSection;
+    } });
+    Object.defineProperty(exports2, "detectGitignoreStatus", { enumerable: true, get: function() {
+      return gitignore_1.detectGitignoreStatus;
+    } });
+    Object.defineProperty(exports2, "SIDEKICK_SECTION_START", { enumerable: true, get: function() {
+      return gitignore_1.SIDEKICK_SECTION_START;
+    } });
+    Object.defineProperty(exports2, "SIDEKICK_SECTION_END", { enumerable: true, get: function() {
+      return gitignore_1.SIDEKICK_SECTION_END;
+    } });
+    Object.defineProperty(exports2, "GITIGNORE_ENTRIES", { enumerable: true, get: function() {
+      return gitignore_1.GITIGNORE_ENTRIES;
+    } });
     var staging_service_1 = require_staging_service();
     Object.defineProperty(exports2, "StagingServiceCore", { enumerable: true, get: function() {
       return staging_service_1.StagingServiceCore;
@@ -38726,9 +39037,9 @@ var require_runtime = __commonJS({
     var node_crypto_1 = require("node:crypto");
     var node_os_1 = require("node:os");
     var node_path_1 = require("node:path");
-    function getLogFilePath(scope) {
-      if (scope.scope === "project" && scope.projectRoot) {
-        return (0, node_path_1.join)(scope.projectRoot, ".sidekick", "logs", "sidekick.log");
+    function getLogFilePath(projectRoot) {
+      if (projectRoot) {
+        return (0, node_path_1.join)(projectRoot, ".sidekick", "logs", "sidekick.log");
       }
       return (0, node_path_1.join)((0, node_os_1.homedir)(), ".sidekick", "logs", "sidekick.log");
     }
@@ -38739,17 +39050,17 @@ var require_runtime = __commonJS({
         bootstrapSink: options.stderrSink ?? process.stderr,
         bufferPreUpgrade: true
       });
-      const scope = (0, core_1.resolveScope)(options);
+      const { projectRoot } = (0, core_1.resolveProjectRoot)(options);
       const defaultAssetsDir = options.defaultAssetsDir ?? (0, core_1.getDefaultAssetsDir)();
       const assets = (0, core_1.createAssetResolver)({
         defaultAssetsDir,
-        projectRoot: scope.projectRoot,
+        projectRoot,
         homeDir: options.homeDir
       });
       let config;
       try {
         config = (0, core_1.createConfigService)({
-          projectRoot: scope.projectRoot,
+          projectRoot,
           homeDir: options.homeDir,
           assets
         });
@@ -38761,15 +39072,14 @@ var require_runtime = __commonJS({
       }
       const effectiveLogLevel = options.logLevel ?? config.core.logging.level;
       let logContext = {
-        scope: scope.scope,
         correlationId,
         command: options.command
       };
-      const logFilePath = getLogFilePath(scope);
+      const logFilePath = getLogFilePath(projectRoot);
       const isInteractive = options.interactive ?? process.env.SIDEKICK_INTERACTIVE === "1";
       const enableFileLogging = options.enableFileLogging ?? true;
       const logManager = (0, core_1.createLogManager)({
-        name: scope.scope === "project" ? "sidekick:cli" : "sidekick:cli:user",
+        name: "sidekick:cli",
         level: effectiveLogLevel,
         context: logContext,
         destinations: {
@@ -38782,7 +39092,7 @@ var require_runtime = __commonJS({
         }
       });
       loggerFacade.upgrade({
-        name: scope.scope === "project" ? "sidekick:cli" : "sidekick:cli:user",
+        name: "sidekick:cli",
         level: effectiveLogLevel,
         context: logContext,
         destinations: {
@@ -38810,28 +39120,21 @@ var require_runtime = __commonJS({
       const telemetry = logManager.getTelemetry();
       const cleanupErrorHandlers = (0, core_1.setupGlobalErrorHandlers)(logger);
       logger.debug("Runtime bootstrap complete", {
-        scope: scope.scope,
-        projectRoot: scope.projectRoot ?? null,
-        source: scope.source,
-        warnings: scope.warnings,
+        projectRoot: projectRoot ?? null,
         logFile: enableFileLogging ? logFilePath : null
       });
       if (config.sources.length > 0) {
         logger.debug("Configuration sources loaded", { sources: config.sources });
       }
       logger.debug("Asset resolver initialized", { cascadeLayers: assets.cascadeLayers });
-      if (scope.dualInstallDetected) {
-        logger.warn("Detected project-scope installation while running from user hooks. Deferring to project scope.");
-        telemetry.increment("dual_install_detected", { scope: scope.scope });
-      }
-      const stateRoot = scope.projectRoot ?? (0, node_path_1.join)((0, node_os_1.homedir)(), ".claude");
+      const stateRoot = projectRoot ?? (0, node_path_1.join)((0, node_os_1.homedir)(), ".claude");
       const stateService = new core_1.StateService(stateRoot, { logger });
       return {
         get logger() {
           return logger;
         },
         telemetry,
-        scope,
+        projectRoot,
         config,
         assets,
         stateService,
@@ -38842,7 +39145,7 @@ var require_runtime = __commonJS({
         bindSessionId: (sessionId) => {
           logContext = { ...logContext, sessionId };
           const newLogManager = (0, core_1.createLogManager)({
-            name: scope.scope === "project" ? "sidekick:cli" : "sidekick:cli:user",
+            name: "sidekick:cli",
             level: effectiveLogLevel,
             context: logContext,
             destinations: {
@@ -47929,7 +48232,6 @@ var require_events2 = __commonJS({
           source: "cli",
           context: {
             sessionId: context.sessionId,
-            scope: context.scope,
             correlationId: context.correlationId,
             traceId: context.traceId,
             hook: context.hook,
@@ -47952,7 +48254,6 @@ var require_events2 = __commonJS({
           source: "daemon",
           context: {
             sessionId: context.sessionId,
-            scope: context.scope,
             correlationId: context.correlationId,
             traceId: context.traceId,
             hook: context.hook,
@@ -48095,7 +48396,6 @@ var require_consumption_handler_factory = __commonJS({
           }
           (0, core_1.logEvent)(cliCtx.logger, events_js_1.ReminderEvents.reminderConsumed({
             sessionId,
-            scope: cliCtx.paths.projectDir ? "project" : "user",
             hook
           }, {
             reminderName: reminder.name,
@@ -48204,7 +48504,7 @@ var require_inject_stop = __commonJS({
               }
               return (0, consumption_handler_factory_js_1.buildDefaultResponse)(reminder, supportsBlocking);
             } else {
-              const metrics = reminder.stagedAt ?? { turnCount: 0, toolsThisTurn: 0 };
+              const metrics = reminder.stagedAt ?? { turnCount: 0, toolsThisTurn: 0, toolCount: 0 };
               try {
                 await ipc.send("vc-unverified.set", {
                   sessionId,
@@ -48214,7 +48514,8 @@ var require_inject_stop = __commonJS({
                   },
                   metrics: {
                     turnCount: metrics.turnCount,
-                    toolsThisTurn: metrics.toolsThisTurn
+                    toolsThisTurn: metrics.toolsThisTurn,
+                    toolCount: metrics.toolCount
                   }
                 });
               } catch (setErr) {
@@ -48243,13 +48544,14 @@ var require_inject_stop = __commonJS({
             if (projectDir) {
               const ipc = new core_1.IpcService(projectDir, cliCtx.logger);
               try {
-                const metrics = reminder.stagedAt ?? { turnCount: 0, toolsThisTurn: 0 };
+                const metrics = reminder.stagedAt ?? { turnCount: 0, toolsThisTurn: 0, toolCount: 0 };
                 await ipc.send("reminder.consumed", {
                   sessionId,
                   reminderName: reminder.name,
                   metrics: {
                     turnCount: metrics.turnCount,
-                    toolsThisTurn: metrics.toolsThisTurn
+                    toolsThisTurn: metrics.toolsThisTurn,
+                    toolCount: metrics.toolCount
                   }
                 });
               } finally {
@@ -48702,21 +49004,19 @@ var require_context2 = __commonJS({
     var feature_reminders_1 = require_dist4();
     function buildCLIContext(options) {
       const { runtime, sessionId, transcriptPath } = options;
-      if (!runtime.scope.projectRoot) {
-        throw new Error("Cannot build CLIContext without project root - reminder consumption requires project scope");
+      if (!runtime.projectRoot) {
+        throw new Error("Cannot build CLIContext without project root - reminder consumption requires project root");
       }
-      const projectRoot = runtime.scope.projectRoot;
+      const projectRoot = runtime.projectRoot;
       const paths = {
         projectDir: projectRoot,
         userConfigDir: (0, node_path_1.join)((0, node_os_1.homedir)(), ".sidekick"),
-        projectConfigDir: (0, node_path_1.join)(projectRoot, ".sidekick"),
-        hookScriptPath: runtime.scope.hookScriptPath
+        projectConfigDir: (0, node_path_1.join)(projectRoot, ".sidekick")
       };
       const handlers = new core_1.HandlerRegistryImpl({
         logger: runtime.logger,
         sessionId,
-        transcriptPath,
-        scope: runtime.scope.scope
+        transcriptPath
       });
       const daemon = new core_1.DaemonClient(projectRoot, runtime.logger);
       const context = {
@@ -48871,11 +49171,10 @@ var require_hook = __commonJS({
         }
       };
     }
-    function buildHookEvent(hookName, input, correlationId, scope) {
+    function buildHookEvent(hookName, input, correlationId) {
       const context = {
         sessionId: input.sessionId,
         timestamp: Date.now(),
-        scope,
         correlationId
       };
       switch (hookName) {
@@ -48914,16 +49213,15 @@ ${daemonResponse.additionalContext}` : cliResponse.additionalContext;
       return merged;
     }
     async function handleHookCommand(hookName, options, logger, stdout) {
-      const { projectRoot, hookInput, correlationId, scope, runtime } = options;
+      const { projectRoot, hookInput, correlationId, runtime } = options;
       const startTime = Date.now();
       const logContext = {
         sessionId: hookInput.sessionId,
-        scope,
         correlationId,
         hook: hookName
       };
       (0, core_1.logEvent)(logger, core_1.LogEvents.hookReceived(logContext, { cwd: hookInput.cwd, mode: "hook" }));
-      const event = buildHookEvent(hookName, hookInput, correlationId, scope);
+      const event = buildHookEvent(hookName, hookInput, correlationId);
       logger.debug("Dispatching hook event to daemon", {
         hook: hookName,
         sessionId: hookInput.sessionId
@@ -49125,7 +49423,7 @@ var require_hook_command = __commonJS({
       }
     }
     async function handleUnifiedHookCommand(hookName, options, logger, stdout) {
-      const { projectRoot, hookInput, correlationId, scope, runtime } = options;
+      const { projectRoot, hookInput, correlationId, runtime } = options;
       logger.debug("Unified hook command invoked", { hookName, sessionId: hookInput.sessionId });
       let internalOutput = "";
       const captureStream = {
@@ -49139,7 +49437,6 @@ var require_hook_command = __commonJS({
         sessionId: hookInput.sessionId,
         hookInput,
         correlationId,
-        scope,
         runtime
       }, logger, captureStream);
       const internalResponse = parseInternalResponse(internalOutput.trim(), hookName, logger);
@@ -49672,7 +49969,6 @@ var require_events3 = __commonJS({
           source: "daemon",
           context: {
             sessionId: context.sessionId,
-            scope: context.scope,
             correlationId: context.correlationId,
             traceId: context.traceId,
             hook: context.hook,
@@ -49696,7 +49992,6 @@ var require_events3 = __commonJS({
           source: "daemon",
           context: {
             sessionId: context.sessionId,
-            scope: context.scope,
             correlationId: context.correlationId,
             traceId: context.traceId,
             hook: context.hook,
@@ -50097,7 +50392,7 @@ var require_update_summary = __commonJS({
     async function generateResumeMessage(ctx, summaryState, eventContext, summary, transcriptExcerpt, config) {
       const { sessionId } = eventContext;
       if (summary.session_title_confidence < types_js_1.RESUME_MIN_CONFIDENCE || summary.latest_intent_confidence < types_js_1.RESUME_MIN_CONFIDENCE) {
-        (0, core_1.logEvent)(ctx.logger, core_1.LogEvents.resumeSkipped({ sessionId, scope: eventContext.scope }, {
+        (0, core_1.logEvent)(ctx.logger, core_1.LogEvents.resumeSkipped({ sessionId }, {
           title_confidence: summary.session_title_confidence,
           intent_confidence: summary.latest_intent_confidence,
           min_confidence: types_js_1.RESUME_MIN_CONFIDENCE
@@ -50114,7 +50409,7 @@ var require_update_summary = __commonJS({
           timestamp: (/* @__PURE__ */ new Date()).toISOString()
         };
         await summaryState.resumeMessage.write(sessionId, resumeState);
-        (0, core_1.logEvent)(ctx.logger, core_1.LogEvents.resumeUpdated({ sessionId, scope: eventContext.scope }, {
+        (0, core_1.logEvent)(ctx.logger, core_1.LogEvents.resumeUpdated({ sessionId }, {
           snarky_comment: resumeState.snarky_comment,
           timestamp: resumeState.timestamp
         }));
@@ -50125,7 +50420,7 @@ var require_update_summary = __commonJS({
         ctx.logger.warn("Resume message prompt not found", { path: RESUME_PROMPT_FILE });
         return;
       }
-      (0, core_1.logEvent)(ctx.logger, core_1.LogEvents.resumeGenerating({ sessionId, scope: eventContext.scope }, {
+      (0, core_1.logEvent)(ctx.logger, core_1.LogEvents.resumeGenerating({ sessionId }, {
         title_confidence: summary.session_title_confidence,
         intent_confidence: summary.latest_intent_confidence
       }));
@@ -50154,7 +50449,7 @@ var require_update_summary = __commonJS({
           timestamp: (/* @__PURE__ */ new Date()).toISOString()
         };
         await summaryState.resumeMessage.write(sessionId, resumeState);
-        (0, core_1.logEvent)(ctx.logger, core_1.LogEvents.resumeUpdated({ sessionId, scope: eventContext.scope }, {
+        (0, core_1.logEvent)(ctx.logger, core_1.LogEvents.resumeUpdated({ sessionId }, {
           snarky_comment: resumeState.snarky_comment,
           timestamp: resumeState.timestamp
         }));
@@ -51276,6 +51571,10 @@ var require_statusline_service = __commonJS({
           theme: this.config.theme,
           useColors: this.useColors
         });
+        this.setupService = serviceConfig.setupService ?? new core_1.SetupStatusService(serviceConfig.projectDir ?? serviceConfig.cwd, {
+          homeDir: serviceConfig.homeDir,
+          logger: serviceConfig.logger
+        });
       }
       /**
        * Load persona definition for the session.
@@ -51365,6 +51664,74 @@ var require_statusline_service = __commonJS({
         }
         return { ...types_js_2.DEFAULT_STATUSLINE_CONFIG, ...serviceConfig.config };
       }
+      /**
+       * Check setup status and return warning message if unhealthy.
+       * Returns empty warning for healthy state.
+       */
+      async checkSetupStatus() {
+        const state = await this.setupService.getSetupState();
+        switch (state) {
+          case "not-run":
+            return {
+              warning: "Sidekick not configured. Run 'sidekick setup' to get started.",
+              state
+            };
+          case "partial":
+            return {
+              warning: "Project not configured. Run 'sidekick setup' for this project.",
+              state
+            };
+          case "unhealthy": {
+            const keyHealth = await this.setupService.getEffectiveApiKeyHealth("OPENROUTER_API_KEY");
+            if (keyHealth === "missing") {
+              return {
+                warning: "OPENROUTER_API_KEY not found. Run 'sidekick doctor' or /sidekick-config",
+                state
+              };
+            }
+            if (keyHealth === "invalid") {
+              return {
+                warning: "API key invalid. Run 'sidekick doctor' to fix.",
+                state
+              };
+            }
+            return {
+              warning: "Setup issue detected. Run 'sidekick doctor'.",
+              state
+            };
+          }
+          default:
+            return { warning: "", state: "healthy" };
+        }
+      }
+      /**
+       * Build minimal view model for setup_warning display mode.
+       * Only includes fields needed for warning display.
+       */
+      buildMinimalViewModel(setupCheck) {
+        return {
+          model: "",
+          contextWindow: "",
+          tokenUsageActual: "",
+          tokenUsageEffective: "",
+          tokenPercentageActual: "",
+          tokenPercentageEffective: "",
+          tokensStatus: "normal",
+          cost: "",
+          costStatus: "normal",
+          duration: "",
+          cwd: "",
+          branch: "",
+          branchColor: "",
+          displayMode: "setup_warning",
+          summary: setupCheck.warning,
+          title: "",
+          warningCount: 0,
+          errorCount: 0,
+          logStatus: "normal",
+          personaName: ""
+        };
+      }
       /**
        * Render the statusline by fetching all data in parallel and formatting.
        *
@@ -51374,6 +51741,19 @@ var require_statusline_service = __commonJS({
        * for model/tokens/cost/duration instead of reading from state files.
        */
       async render() {
+        const setupCheck = await this.checkSetupStatus();
+        if (setupCheck.state !== "healthy") {
+          const viewModel2 = this.buildMinimalViewModel(setupCheck);
+          const ANSI_YELLOW = "\x1B[33m";
+          const ANSI_RESET = "\x1B[0m";
+          const text2 = this.useColors ? `${ANSI_YELLOW}${setupCheck.warning}${ANSI_RESET}` : setupCheck.warning;
+          return {
+            text: text2,
+            displayMode: "setup_warning",
+            staleData: false,
+            viewModel: viewModel2
+          };
+        }
         const hasHookInput = !!this.hookInput;
         const [transcriptResult, summaryResult, resumeResult, snarkyResult, branchResult, baseline, logMetricsResult, personaResult] = await Promise.all([
           this.stateReader.getTranscriptMetrics(),
@@ -51855,8 +52235,7 @@ Examples:
       const sessionId = options.sessionId ?? "current";
       const stateService = new core_1.StateService(projectDir);
       const eventContext = {
-        sessionId,
-        scope: "project"
+        sessionId
       };
       const cwd = options.hookInput?.cwd ?? process.cwd();
       logger.debug("Statusline hookInput received", { hookInput: options.hookInput });
@@ -52735,6 +53114,38 @@ var require_dev_mode = __commonJS({
       }
       return zombies;
     }
+    async function cleanupStalePidFiles(logger) {
+      const daemonsDir = (0, core_1.getUserDaemonsDir)();
+      let cleanedCount = 0;
+      let files;
+      try {
+        files = await (0, promises_12.readdir)(daemonsDir);
+      } catch {
+        return 0;
+      }
+      const pidFiles = files.filter((f) => f.endsWith(".pid"));
+      for (const pidFile of pidFiles) {
+        const pidPath = node_path_1.default.join(daemonsDir, pidFile);
+        try {
+          const content = await (0, promises_12.readFile)(pidPath, "utf-8");
+          const info = JSON.parse(content);
+          try {
+            process.kill(info.pid, 0);
+          } catch {
+            await (0, promises_12.unlink)(pidPath).catch(() => {
+            });
+            logger.debug("Removed stale PID file", { pidFile, pid: info.pid });
+            cleanedCount++;
+          }
+        } catch {
+          await (0, promises_12.unlink)(pidPath).catch(() => {
+          });
+          logger.debug("Removed corrupt PID file", { pidFile });
+          cleanedCount++;
+        }
+      }
+      return cleanedCount;
+    }
     function isDevHookCommand(command) {
       return command?.includes("dev-hooks") ?? false;
     }
@@ -53007,13 +53418,42 @@ var require_dev_mode = __commonJS({
         stdout.write("\n");
         const shouldKill = force || await promptConfirm("Kill these processes?", stdout, stdin);
         if (shouldKill) {
-          const results = await (0, core_1.killAllDaemons)(logger);
-          const killedCount = results.filter((r) => r.killed).length;
+          let killedCount = 0;
+          for (const zombie of zombies) {
+            const filesToRemove = [
+              (0, core_1.getUserPidPath)(zombie.projectDir),
+              (0, core_1.getPidPath)(zombie.projectDir),
+              (0, core_1.getSocketPath)(zombie.projectDir),
+              (0, core_1.getTokenPath)(zombie.projectDir)
+            ];
+            try {
+              process.kill(zombie.pid, "SIGKILL");
+              logger.info("Killed zombie daemon", { pid: zombie.pid, projectDir: zombie.projectDir });
+              killedCount++;
+            } catch (err) {
+              const code = err.code;
+              if (code === "ESRCH") {
+                logger.info("Zombie daemon already exited", { pid: zombie.pid, projectDir: zombie.projectDir });
+                killedCount++;
+              } else {
+                logger.warn("Failed to kill zombie daemon", {
+                  pid: zombie.pid,
+                  error: err instanceof Error ? err.message : String(err)
+                });
+              }
+            }
+            await Promise.all(filesToRemove.map((f) => (0, promises_12.unlink)(f).catch(() => {
+            })));
+          }
           log(stdout, "info", `Killed ${killedCount} zombie daemon(s)`);
         } else {
           log(stdout, "info", "Skipping zombie cleanup");
         }
       }
+      const staleCount = await cleanupStalePidFiles(logger);
+      if (staleCount > 0) {
+        log(stdout, "info", `Cleaned up ${staleCount} stale PID file(s)`);
+      }
       stdout.write("\n");
       log(stdout, "info", "Clean complete. Restart Claude Code with: claude --continue");
       return { exitCode: 0 };
@@ -53105,6 +53545,582 @@ ${USAGE_TEXT}`);
   }
 });
 
+// ../sidekick-cli/dist/commands/setup/prompts.js
+var require_prompts = __commonJS({
+  "../sidekick-cli/dist/commands/setup/prompts.js"(exports2) {
+    "use strict";
+    var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
+      if (k2 === void 0) k2 = k;
+      var desc = Object.getOwnPropertyDescriptor(m, k);
+      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+        desc = { enumerable: true, get: function() {
+          return m[k];
+        } };
+      }
+      Object.defineProperty(o, k2, desc);
+    } : function(o, m, k, k2) {
+      if (k2 === void 0) k2 = k;
+      o[k2] = m[k];
+    });
+    var __setModuleDefault = exports2 && exports2.__setModuleDefault || (Object.create ? function(o, v) {
+      Object.defineProperty(o, "default", { enumerable: true, value: v });
+    } : function(o, v) {
+      o["default"] = v;
+    });
+    var __importStar = exports2 && exports2.__importStar || /* @__PURE__ */ function() {
+      var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function(o2) {
+          var ar = [];
+          for (var k in o2) if (Object.prototype.hasOwnProperty.call(o2, k)) ar[ar.length] = k;
+          return ar;
+        };
+        return ownKeys(o);
+      };
+      return function(mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) {
+          for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        }
+        __setModuleDefault(result, mod);
+        return result;
+      };
+    }();
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.printHeader = printHeader;
+    exports2.printStatus = printStatus;
+    exports2.promptSelect = promptSelect;
+    exports2.promptConfirm = promptConfirm;
+    exports2.promptInput = promptInput;
+    var readline = __importStar(require("node:readline"));
+    var colors = {
+      reset: "\x1B[0m",
+      bold: "\x1B[1m",
+      dim: "\x1B[2m",
+      green: "\x1B[32m",
+      yellow: "\x1B[33m",
+      blue: "\x1B[34m",
+      cyan: "\x1B[36m"
+    };
+    function printHeader(ctx, title, description) {
+      ctx.stdout.write("\n");
+      ctx.stdout.write(`${colors.bold}${title}${colors.reset}
+`);
+      ctx.stdout.write("\u2500".repeat(Math.min(title.length + 10, 60)) + "\n");
+      if (description) {
+        ctx.stdout.write(`${colors.dim}${description}${colors.reset}
+`);
+      }
+      ctx.stdout.write("\n");
+    }
+    function printStatus(ctx, type, message) {
+      const icons = { success: "\u2713", warning: "\u26A0", info: "\u2022", error: "\u2717" };
+      const colorMap = { success: colors.green, warning: colors.yellow, info: colors.blue, error: "\x1B[31m" };
+      ctx.stdout.write(`${colorMap[type]}${icons[type]}${colors.reset} ${message}
+`);
+    }
+    async function promptSelect(ctx, question, options) {
+      ctx.stdout.write(`${question}
+
+`);
+      options.forEach((opt, i) => {
+        ctx.stdout.write(`  ${colors.cyan}${i + 1})${colors.reset} ${opt.label}
+`);
+        if (opt.description) {
+          ctx.stdout.write(`     ${colors.dim}${opt.description}${colors.reset}
+`);
+        }
+      });
+      ctx.stdout.write("\n");
+      const rl = readline.createInterface({
+        input: ctx.stdin,
+        output: ctx.stdout,
+        terminal: false
+      });
+      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);
+          }
+        });
+      });
+    }
+    async function promptConfirm(ctx, question, defaultYes = true) {
+      const hint = defaultYes ? "[Y/n]" : "[y/N]";
+      const rl = readline.createInterface({
+        input: ctx.stdin,
+        output: ctx.stdout,
+        terminal: false
+      });
+      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");
+          }
+        });
+      });
+    }
+    async function promptInput(ctx, question) {
+      const rl = readline.createInterface({
+        input: ctx.stdin,
+        output: ctx.stdout,
+        terminal: false
+      });
+      return new Promise((resolve3) => {
+        ctx.stdout.write(`${question}: `);
+        rl.once("line", (answer) => {
+          rl.close();
+          resolve3(answer.trim());
+        });
+      });
+    }
+  }
+});
+
+// ../sidekick-cli/dist/commands/setup/validate-api-key.js
+var require_validate_api_key = __commonJS({
+  "../sidekick-cli/dist/commands/setup/validate-api-key.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.validateOpenRouterKey = validateOpenRouterKey;
+    exports2.validateOpenAIKey = validateOpenAIKey;
+    var API_ENDPOINTS = {
+      openrouter: "https://openrouter.ai/api/v1/models",
+      openai: "https://api.openai.com/v1/models"
+    };
+    async function validateApiKey(provider, apiKey, logger) {
+      try {
+        const response = await fetch(API_ENDPOINTS[provider], {
+          headers: { Authorization: `Bearer ${apiKey}` }
+        });
+        if (response.ok) {
+          return { valid: true };
+        }
+        if (response.status === 401) {
+          return { valid: false, error: "Invalid API key" };
+        }
+        return { valid: false, error: `API returned status ${response.status}` };
+      } catch (err) {
+        logger?.warn("API key validation failed", { error: err });
+        return { valid: false, error: err instanceof Error ? err.message : "Network error" };
+      }
+    }
+    function validateOpenRouterKey(apiKey, logger) {
+      return validateApiKey("openrouter", apiKey, logger);
+    }
+    function validateOpenAIKey(apiKey, logger) {
+      return validateApiKey("openai", apiKey, logger);
+    }
+  }
+});
+
+// ../sidekick-cli/dist/commands/setup/index.js
+var require_setup = __commonJS({
+  "../sidekick-cli/dist/commands/setup/index.js"(exports2) {
+    "use strict";
+    var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
+      if (k2 === void 0) k2 = k;
+      var desc = Object.getOwnPropertyDescriptor(m, k);
+      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+        desc = { enumerable: true, get: function() {
+          return m[k];
+        } };
+      }
+      Object.defineProperty(o, k2, desc);
+    } : function(o, m, k, k2) {
+      if (k2 === void 0) k2 = k;
+      o[k2] = m[k];
+    });
+    var __setModuleDefault = exports2 && exports2.__setModuleDefault || (Object.create ? function(o, v) {
+      Object.defineProperty(o, "default", { enumerable: true, value: v });
+    } : function(o, v) {
+      o["default"] = v;
+    });
+    var __importStar = exports2 && exports2.__importStar || /* @__PURE__ */ function() {
+      var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function(o2) {
+          var ar = [];
+          for (var k in o2) if (Object.prototype.hasOwnProperty.call(o2, k)) ar[ar.length] = k;
+          return ar;
+        };
+        return ownKeys(o);
+      };
+      return function(mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) {
+          for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        }
+        __setModuleDefault(result, mod);
+        return result;
+      };
+    }();
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.handleSetupCommand = handleSetupCommand;
+    var fs = __importStar(require("node:fs/promises"));
+    var path = __importStar(require("node:path"));
+    var os = __importStar(require("node:os"));
+    var core_1 = require_dist3();
+    var prompts_js_1 = require_prompts();
+    var validate_api_key_js_1 = require_validate_api_key();
+    var STATUSLINE_COMMAND = "npx @scotthamilton77/sidekick statusline --project-dir=$CLAUDE_PROJECT_DIR";
+    function getApiKeyStatusType(health) {
+      switch (health) {
+        case "healthy":
+          return "success";
+        case "not-required":
+          return "info";
+        default:
+          return "warning";
+      }
+    }
+    async function configureStatusline(settingsPath, logger) {
+      let settings = {};
+      try {
+        const content = await fs.readFile(settingsPath, "utf-8");
+        settings = JSON.parse(content);
+      } catch (err) {
+        if (err.code !== "ENOENT") {
+          throw err;
+        }
+      }
+      settings.statusLine = {
+        type: "command",
+        command: STATUSLINE_COMMAND
+      };
+      const dir = path.dirname(settingsPath);
+      await fs.mkdir(dir, { recursive: true });
+      await fs.writeFile(settingsPath, JSON.stringify(settings, null, 2) + "\n");
+      logger?.info("Statusline configured", { path: settingsPath });
+    }
+    async function writeApiKeyToEnv(envPath, key, value) {
+      const dir = path.dirname(envPath);
+      await fs.mkdir(dir, { recursive: true });
+      let content = "";
+      try {
+        content = await fs.readFile(envPath, "utf-8");
+      } catch {
+      }
+      const keyRegex = new RegExp(`^${key}=.*$`, "m");
+      if (keyRegex.test(content)) {
+        content = content.replace(keyRegex, `${key}=${value}`);
+      } else {
+        if (content && !content.endsWith("\n")) {
+          content += "\n";
+        }
+        content += `${key}=${value}
+`;
+      }
+      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 configPath = path.join(configDir, "config.yaml");
+      await fs.mkdir(configDir, { recursive: true });
+      let content = "";
+      try {
+        content = await fs.readFile(configPath, "utf-8");
+      } catch {
+      }
+      const personasRegex = /^features:\s*\n\s*personas:\s*\n\s*enabled:\s*(true|false)/m;
+      const newPersonasBlock = `features:
+  personas:
+    enabled: ${enabled}`;
+      if (personasRegex.test(content)) {
+        content = content.replace(personasRegex, newPersonasBlock);
+      } else {
+        if (content && !content.endsWith("\n")) {
+          content += "\n";
+        }
+        content += newPersonasBlock + "\n";
+      }
+      await fs.writeFile(configPath, content);
+    }
+    function printWizardHeader(stdout) {
+      stdout.write("\n\u250C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2510\n");
+      stdout.write("\u2502  Sidekick Setup Wizard                                  \u2502\n");
+      stdout.write("\u2502                                                         \u2502\n");
+      stdout.write("\u2502  This wizard configures sidekick for Claude Code.       \u2502\n");
+      stdout.write("\u2502  Run 'sidekick setup' again anytime to reconfigure.     \u2502\n");
+      stdout.write("\u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2518\n");
+    }
+    async function runStep1Statusline(wctx) {
+      const { ctx, homeDir, projectDir, logger } = wctx;
+      (0, prompts_js_1.printHeader)(ctx, "Step 1: Statusline Configuration", "Claude Code plugins cannot provide statusline config directly.");
+      const statuslineScope = await (0, prompts_js_1.promptSelect)(ctx, "Where should sidekick configure your statusline?", [
+        { value: "user", label: "User-level (~/.claude/settings.json)", description: "Works in all projects" },
+        { value: "project", label: "Project-level (.claude/settings.local.json)", description: "This project only" }
+      ]);
+      const statuslinePath = statuslineScope === "user" ? path.join(homeDir, ".claude", "settings.json") : path.join(projectDir, ".claude", "settings.local.json");
+      await configureStatusline(statuslinePath, logger);
+      (0, prompts_js_1.printStatus)(ctx, "success", `Statusline configured in ${statuslinePath}`);
+      return statuslineScope;
+    }
+    async function runStep2Gitignore(wctx, force) {
+      const { ctx, projectDir } = wctx;
+      const currentStatus = await (0, core_1.detectGitignoreStatus)(projectDir);
+      if (currentStatus === "installed") {
+        if (!force) {
+          (0, prompts_js_1.printStatus)(ctx, "success", "Sidekick entries already present in .gitignore");
+        }
+        return "installed";
+      }
+      if (force) {
+        const result2 = await (0, core_1.installGitignoreSection)(projectDir);
+        return result2.status === "error" ? "missing" : "installed";
+      }
+      (0, prompts_js_1.printHeader)(ctx, "Step 2: Git Configuration", "Sidekick creates logs and session data that should not be committed.");
+      const shouldInstall = await (0, prompts_js_1.promptConfirm)(ctx, "Update .gitignore to exclude sidekick transient files?", true);
+      if (!shouldInstall) {
+        (0, prompts_js_1.printStatus)(ctx, "info", "Skipping .gitignore configuration (you can manage it manually)");
+        return "missing";
+      }
+      const result = await (0, core_1.installGitignoreSection)(projectDir);
+      if (result.status === "error") {
+        (0, prompts_js_1.printStatus)(ctx, "warning", `Failed to update .gitignore: ${result.error}`);
+        return "missing";
+      }
+      const message = result.status === "already-installed" ? "Sidekick entries already present in .gitignore" : "Added sidekick section to .gitignore";
+      (0, prompts_js_1.printStatus)(ctx, "success", message);
+      return "installed";
+    }
+    async function runStep3Personas(wctx) {
+      const { ctx, homeDir, projectDir } = wctx;
+      const stdout = ctx.stdout;
+      (0, prompts_js_1.printHeader)(ctx, "Step 3: Persona Features", "Sidekick includes AI personas (Marvin, GLaDOS, Skippy, etc.) that add\npersonality to your coding sessions with snarky messages and contextual nudges.");
+      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";
+      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);
+      }
+      return { wantPersonas, apiKeyHealth };
+    }
+    async function configureApiKey(wctx) {
+      const { ctx, homeDir, projectDir, logger } = 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, validate_api_key_js_1.validateOpenRouterKey)(existingKey, logger);
+        if (result2.valid) {
+          stdout.write("valid!\n");
+          return "healthy";
+        } else {
+          stdout.write(`invalid (${result2.error})
+`);
+          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);
+      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";
+      }
+      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" },
+        { value: "project", label: "Project-level (.sidekick/.env)", description: "This project only" }
+      ]);
+      const apiKey = await (0, prompts_js_1.promptInput)(ctx, "Paste your OpenRouter API key");
+      stdout.write("Validating... ");
+      const result = await (0, validate_api_key_js_1.validateOpenRouterKey)(apiKey, logger);
+      const envPath = keyScope === "user" ? path.join(homeDir, ".sidekick", ".env") : path.join(projectDir, ".sidekick", ".env");
+      if (result.valid) {
+        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";
+      }
+    }
+    async function runStep4AutoConfig(wctx) {
+      const { ctx } = wctx;
+      (0, prompts_js_1.printHeader)(ctx, "Step 4: Project Auto-Configuration");
+      const autoConfig = await (0, prompts_js_1.promptSelect)(ctx, "When sidekick runs in a new project for the first time:", [
+        { value: "auto", label: "Auto-configure using my defaults", description: "Recommended" },
+        { value: "ask", label: "Ask me each time" },
+        { value: "manual", label: "Do nothing", description: "Manual setup only" }
+      ]);
+      return autoConfig;
+    }
+    async function writeStatusFiles(wctx, state) {
+      const { setupService } = wctx;
+      const { statuslineScope, gitignoreStatus, wantPersonas, apiKeyHealth, autoConfig } = state;
+      const userStatus = {
+        version: 1,
+        lastUpdatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+        preferences: {
+          autoConfigureProjects: autoConfig === "auto",
+          defaultStatuslineScope: statuslineScope,
+          defaultApiKeyScope: wantPersonas ? "user" : "skip"
+        },
+        statusline: "configured",
+        apiKeys: {
+          OPENROUTER_API_KEY: apiKeyHealth,
+          OPENAI_API_KEY: "not-required"
+        }
+      };
+      await setupService.writeUserStatus(userStatus);
+      const projectStatus = {
+        version: 1,
+        lastUpdatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+        autoConfigured: false,
+        statusline: statuslineScope === "project" ? "configured" : "user",
+        apiKeys: {
+          OPENROUTER_API_KEY: apiKeyHealth === "healthy" ? "user" : apiKeyHealth,
+          OPENAI_API_KEY: "not-required"
+        },
+        gitignore: gitignoreStatus
+      };
+      await setupService.writeProjectStatus(projectStatus);
+    }
+    function printSummary(wctx, state) {
+      const { ctx } = wctx;
+      const { statuslineScope, gitignoreStatus, wantPersonas, apiKeyHealth, autoConfig } = state;
+      const stdout = ctx.stdout;
+      (0, prompts_js_1.printHeader)(ctx, "Summary");
+      (0, prompts_js_1.printStatus)(ctx, "success", `Statusline: ${statuslineScope === "user" ? "User-level" : "Project-level"}`);
+      (0, prompts_js_1.printStatus)(ctx, gitignoreStatus === "installed" ? "success" : "info", `Gitignore: ${gitignoreStatus === "installed" ? "Configured" : "Skipped"}`);
+      (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}`);
+      (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");
+    }
+    async function runWizard(projectDir, logger, stdout, options) {
+      const homeDir = os.homedir();
+      const wctx = {
+        ctx: {
+          stdin: options.stdin ?? process.stdin,
+          stdout
+        },
+        homeDir,
+        projectDir,
+        logger,
+        setupService: new core_1.SetupStatusService(projectDir, { homeDir, logger })
+      };
+      const force = options.force ?? false;
+      if (!force) {
+        printWizardHeader(stdout);
+      }
+      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 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 };
+      await writeStatusFiles(wctx, state);
+      if (!force) {
+        printSummary(wctx, state);
+      } else {
+        stdout.write("Setup complete (force mode):\n");
+        stdout.write(`  Statusline: user-level (~/.claude/settings.json)
+`);
+        stdout.write(`  Gitignore: ${gitignoreStatus === "installed" ? "configured" : "skipped"}
+`);
+        stdout.write(`  Personas: enabled (API key not configured)
+`);
+        stdout.write(`  Auto-configure: enabled
+`);
+      }
+      return { exitCode: 0 };
+    }
+    async function runDoctor(projectDir, logger, stdout) {
+      const homeDir = os.homedir();
+      const setupService = new core_1.SetupStatusService(projectDir, { homeDir, logger });
+      stdout.write("\nSidekick Doctor\n");
+      stdout.write("===============\n\n");
+      const statusline = await setupService.getStatuslineHealth();
+      const gitignore = await (0, core_1.detectGitignoreStatus)(projectDir);
+      const apiKey = await setupService.getEffectiveApiKeyHealth("OPENROUTER_API_KEY");
+      const isHealthy = await setupService.isHealthy();
+      const statuslineIcon = statusline === "configured" ? "\u2713" : "\u26A0";
+      const gitignoreIcon = gitignore === "installed" ? "\u2713" : "\u26A0";
+      const apiKeyIcon = apiKey === "healthy" || apiKey === "not-required" ? "\u2713" : "\u26A0";
+      const overallIcon = isHealthy && gitignore === "installed" ? "\u2713" : "\u26A0";
+      stdout.write(`${statuslineIcon} Statusline: ${statusline}
+`);
+      stdout.write(`${gitignoreIcon} Gitignore: ${gitignore}
+`);
+      stdout.write(`${apiKeyIcon} OpenRouter API Key: ${apiKey}
+`);
+      stdout.write(`${overallIcon} Overall: ${isHealthy && gitignore === "installed" ? "healthy" : "needs attention"}
+`);
+      if (!isHealthy || gitignore !== "installed") {
+        stdout.write("\nRun 'sidekick setup' to configure.\n");
+      }
+      return { exitCode: isHealthy && gitignore === "installed" ? 0 : 1 };
+    }
+    async function handleSetupCommand(projectDir, logger, stdout, options = {}) {
+      if (options.checkOnly) {
+        return runDoctor(projectDir, logger, stdout);
+      }
+      return runWizard(projectDir, logger, stdout, options);
+    }
+  }
+});
+
+// ../sidekick-cli/dist/commands/setup.js
+var require_setup2 = __commonJS({
+  "../sidekick-cli/dist/commands/setup.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.handleSetupCommand = void 0;
+    var index_js_1 = require_setup();
+    Object.defineProperty(exports2, "handleSetupCommand", { enumerable: true, get: function() {
+      return index_js_1.handleSetupCommand;
+    } });
+  }
+});
+
 // ../sidekick-cli/dist/cli.js
 var require_cli = __commonJS({
   "../sidekick-cli/dist/cli.js"(exports2) {
@@ -53159,6 +54175,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.4-alpha" : "dev";
     function isInSandbox() {
       return process.env.SANDBOX_RUNTIME === "1";
     }
@@ -53171,26 +54188,23 @@ Example: { "command": "pnpm sidekick daemon status", "dangerouslyDisableSandbox"
 `;
     var types_1 = require_dist();
     var runtime_1 = require_runtime();
-    var hook_js_1 = require_hook();
     function parseArgs(argv) {
       const parsed = (0, yargs_parser_1.default)(argv, {
-        boolean: ["hook", "wait", "open", "prefer-project", "help", "kill", "force"],
-        string: ["hook-script-path", "project-dir", "scope", "log-level", "format", "host", "session-id", "type"],
+        boolean: ["wait", "open", "prefer-project", "help", "version", "kill", "force"],
+        string: ["project-dir", "log-level", "format", "host", "session-id", "type"],
         number: ["port", "width"],
         alias: {
-          h: "help"
+          h: "help",
+          v: "version"
         },
         configuration: {
           "camel-case-expansion": false
         }
       });
-      const command = parsed._[0] ?? "session-start";
+      const command = parsed._[0];
       return {
         command,
-        hookMode: Boolean(parsed.hook),
-        hookScriptPath: parsed["hook-script-path"],
         projectDir: parsed["project-dir"],
-        scopeOverride: parsed.scope,
         logLevel: parsed["log-level"],
         wait: Boolean(parsed.wait),
         format: parsed.format,
@@ -53202,6 +54216,7 @@ Example: { "command": "pnpm sidekick daemon status", "dangerouslyDisableSandbox"
         sessionIdArg: parsed["session-id"],
         messageType: parsed.type,
         help: Boolean(parsed.help),
+        version: Boolean(parsed.version),
         kill: Boolean(parsed.kill),
         force: Boolean(parsed.force),
         _: parsed._
@@ -53240,12 +54255,9 @@ Example: { "command": "pnpm sidekick daemon status", "dangerouslyDisableSandbox"
       const homeDir = options.homeDir ?? options.env?.HOME;
       const hookInput = parseHookInput(options.stdinData);
       const runtime = (0, runtime_1.bootstrapRuntime)({
-        hookScriptPath: parsed.hookScriptPath,
         projectDir: parsed.projectDir,
-        scopeOverride: parsed.scopeOverride,
         logLevel: parsed.logLevel,
         stderrSink: stderr,
-        cwd: options.cwd,
         homeDir,
         command: parsed.command,
         interactive: options.interactive ?? false,
@@ -53254,15 +54266,12 @@ Example: { "command": "pnpm sidekick daemon status", "dangerouslyDisableSandbox"
       if (hookInput) {
         runtime.logger.debug("Hook input received", { hookInput: hookInput.raw });
       }
-      const shouldExit = runtime.scope.dualInstallDetected && parsed.scopeOverride !== "project";
-      if (shouldExit) {
-        runtime.logger.warn("User-scope hook detected project installation. Exiting to prevent duplicate execution.");
-      }
       return {
         runtime,
         hookInput,
         parsed,
-        shouldExit
+        shouldExit: false
+        // No longer needed - Claude Code handles deduplication
       };
     }
     async function initializeSession(options) {
@@ -53308,9 +54317,12 @@ Commands:
   statusline               Render the status line (used by hooks)
   dev-mode <subcommand>    Manage development hooks (enable, disable, status, clean)
   ui                       Launch the web UI
+  setup                    Run the setup wizard (configure statusline, API keys)
+  doctor                   Check sidekick health (alias: setup --check)
 
 Global Options:
   --help, -h               Show this help message
+  --version, -v            Show version number
   --format=<format>        Output format: json or table (command-specific)
   --width=<n>              Table width in characters (default: 100)
   --project-dir=<path>     Override project directory
@@ -53327,36 +54339,10 @@ Examples:
       return { exitCode: 0, stdout: GLOBAL_HELP_TEXT, stderr: "" };
     }
     async function routeCommand(context) {
-      const { parsed, runtime, hookInput, stdout, daemonStarted } = context;
+      const { parsed, runtime, hookInput, stdout } = context;
       runtime.logger.debug("Raw hook input", { hookInput });
-      if (parsed.hookMode && hookInput && runtime.scope.projectRoot) {
-        const hookName = (0, hook_js_1.validateHookName)(hookInput.hookEventName) ?? (0, hook_js_1.getHookName)(parsed.command);
-        if (hookName) {
-          const result = await (0, hook_js_1.handleHookCommand)(hookName, {
-            projectRoot: runtime.scope.projectRoot,
-            sessionId: hookInput.sessionId,
-            hookInput,
-            correlationId: runtime.correlationId,
-            scope: runtime.scope.scope,
-            runtime
-          }, runtime.logger, stdout);
-          return { exitCode: result.exitCode, stdout: result.output, stderr: "" };
-        }
-      }
-      if (!parsed.hookMode) {
-        const isDefaultCommand = parsed.command === "session-start";
-        const isHelpCommand = parsed.command === "help" || parsed.command === "--help" || parsed.command === "-h";
-        if (parsed.help && isDefaultCommand || isHelpCommand) {
-          return showGlobalHelp(stdout);
-        }
-      }
-      if (parsed.hookMode && !hookInput) {
-        runtime.logger.warn("Hook mode invoked without valid hook input, returning empty response", {
-          command: parsed.command,
-          daemonStarted
-        });
-        stdout.write("{}\n");
-        return { exitCode: 0, stdout: "{}", stderr: "" };
+      if (!parsed.command || parsed.command === "help") {
+        return showGlobalHelp(stdout);
       }
       if (parsed.command === "hook") {
         const { parseHookArg, handleUnifiedHookCommand } = await Promise.resolve().then(() => __importStar(require_hook_command()));
@@ -53384,27 +54370,31 @@ Examples:
           return { exitCode: 0, stdout: helpText, stderr: "" };
         }
         if (!hookName) {
-          const errorMsg = `Error: Unknown hook name '${hookArg}'
+          const errorMsg2 = `Error: Unknown hook name '${hookArg}'
 Run 'sidekick hook --help' for available hooks.
 `;
-          stdout.write(errorMsg);
-          return { exitCode: 1, stdout: errorMsg, stderr: "" };
+          stdout.write(errorMsg2);
+          return { exitCode: 1, stdout: errorMsg2, stderr: "" };
+        }
+        if (!parsed.projectDir) {
+          const errorMsg2 = "Hook command requires --project-dir to be specified\n";
+          stdout.write(errorMsg2);
+          return { exitCode: 1, stdout: errorMsg2, stderr: "" };
         }
         if (!hookInput) {
           runtime.logger.warn("Hook command invoked without valid hook input", { hookName });
           stdout.write("{}\n");
           return { exitCode: 0, stdout: "{}", stderr: "" };
         }
-        if (!runtime.scope.projectRoot) {
+        if (!runtime.projectRoot) {
           runtime.logger.warn("Hook command invoked without project root", { hookName });
           stdout.write("{}\n");
           return { exitCode: 0, stdout: "{}", stderr: "" };
         }
         const result = await handleUnifiedHookCommand(hookName, {
-          projectRoot: runtime.scope.projectRoot,
+          projectRoot: runtime.projectRoot,
           hookInput,
           correlationId: runtime.correlationId,
-          scope: runtime.scope.scope,
           runtime
         }, runtime.logger, stdout);
         return { exitCode: result.exitCode, stdout: result.output, stderr: "" };
@@ -53416,7 +54406,9 @@ Run 'sidekick hook --help' for available hooks.
           return { exitCode: 1, stdout: SANDBOX_ERROR_MESSAGE, stderr: "" };
         }
         const { handleDaemonCommand } = await Promise.resolve().then(() => __importStar(require_daemon()));
-        const result = await handleDaemonCommand(subcommand, runtime.scope.projectRoot || process.cwd(), runtime.logger, stdout, { wait: parsed.wait });
+        const result = await handleDaemonCommand(subcommand, runtime.projectRoot || process.cwd(), runtime.logger, stdout, {
+          wait: parsed.wait
+        });
         return { exitCode: result.exitCode, stdout: "", stderr: "" };
       }
       if (parsed.command === "statusline") {
@@ -53424,7 +54416,7 @@ Run 'sidekick hook --help' for available hooks.
         const sessionId = parsed.sessionIdArg ?? hookInput?.sessionId;
         const parsedHookInput = hookInput?.raw ? parseStatuslineInput(hookInput.raw) : void 0;
         const statuslineFormat = parsed.format === "text" || parsed.format === "json" ? parsed.format : void 0;
-        const result = await handleStatuslineCommand(runtime.scope.projectRoot || process.cwd(), runtime.logger, stdout, {
+        const result = await handleStatuslineCommand(runtime.projectRoot || process.cwd(), runtime.logger, stdout, {
           format: statuslineFormat,
           sessionId,
           hookInput: parsedHookInput,
@@ -53436,7 +54428,7 @@ Run 'sidekick hook --help' for available hooks.
       }
       if (parsed.command === "ui") {
         const { handleUiCommand } = await Promise.resolve().then(() => __importStar(require_ui()));
-        const result = await handleUiCommand(runtime.scope.projectRoot || process.cwd(), runtime.logger, stdout, {
+        const result = await handleUiCommand(runtime.projectRoot || process.cwd(), runtime.logger, stdout, {
           port: parsed.port,
           host: parsed.host,
           open: parsed.open,
@@ -53448,7 +54440,7 @@ Run 'sidekick hook --help' for available hooks.
         const { handlePersonaCommand } = await Promise.resolve().then(() => __importStar(require_persona2()));
         const subcommand = parsed.help ? "--help" : parsed._?.[1];
         const args = parsed._?.slice(2) ?? [];
-        const result = await handlePersonaCommand(subcommand, args, runtime.scope.projectRoot || process.cwd(), runtime.logger, stdout, {
+        const result = await handlePersonaCommand(subcommand, args, runtime.projectRoot || process.cwd(), runtime.logger, stdout, {
           sessionId: parsed.sessionIdArg,
           format: parsed.format === "json" || parsed.format === "table" ? parsed.format : void 0,
           testType: parsed.messageType,
@@ -53458,7 +54450,7 @@ Run 'sidekick hook --help' for available hooks.
       }
       if (parsed.command === "sessions") {
         const { handleSessionsCommand } = await Promise.resolve().then(() => __importStar(require_sessions()));
-        const result = await handleSessionsCommand(runtime.scope.projectRoot || process.cwd(), runtime.logger, stdout, {
+        const result = await handleSessionsCommand(runtime.projectRoot || process.cwd(), runtime.logger, stdout, {
           format: parsed.format === "json" || parsed.format === "table" ? parsed.format : void 0,
           help: parsed.help,
           width: parsed.width
@@ -53468,14 +54460,29 @@ Run 'sidekick hook --help' for available hooks.
       if (parsed.command === "dev-mode") {
         const subcommand = parsed.help ? "--help" : parsed._ && parsed._[1] || "status";
         const { handleDevModeCommand } = await Promise.resolve().then(() => __importStar(require_dev_mode()));
-        const result = await handleDevModeCommand(subcommand, runtime.scope.projectRoot || process.cwd(), runtime.logger, stdout, { force: Boolean(parsed.force) });
+        const result = await handleDevModeCommand(subcommand, runtime.projectRoot || process.cwd(), runtime.logger, stdout, { force: Boolean(parsed.force) });
         return { exitCode: result.exitCode, stdout: "", stderr: "" };
       }
-      if (!parsed.hookMode) {
-        stdout.write(`Sidekick CLI executed ${parsed.command} in ${runtime.scope.scope} scope
-`);
+      if (parsed.command === "setup") {
+        const { handleSetupCommand } = await Promise.resolve().then(() => __importStar(require_setup2()));
+        const result = await handleSetupCommand(runtime.projectRoot || process.cwd(), runtime.logger, stdout, {
+          checkOnly: parsed.help ? false : parsed._?.[1] === "--check",
+          stdin: process.stdin
+        });
+        return { exitCode: result.exitCode, stdout: "", stderr: "" };
+      }
+      if (parsed.command === "doctor") {
+        const { handleSetupCommand } = await Promise.resolve().then(() => __importStar(require_setup2()));
+        const result = await handleSetupCommand(runtime.projectRoot || process.cwd(), runtime.logger, stdout, {
+          checkOnly: true
+        });
+        return { exitCode: result.exitCode, stdout: "", stderr: "" };
       }
-      return Promise.resolve({ exitCode: 0, stdout: "", stderr: "" });
+      const errorMsg = `Unknown command: ${parsed.command}
+Run 'sidekick help' for available commands.
+`;
+      stdout.write(errorMsg);
+      return { exitCode: 1, stdout: errorMsg, stderr: "" };
     }
     async function persistCliLogMetrics(stateService, sessionId, counts, logger) {
       const logMetricsPath = stateService.sessionStatePath(sessionId, "cli-log-metrics.json");
@@ -53497,6 +54504,16 @@ Run 'sidekick hook --help' for available hooks.
     }
     async function runCli(options) {
       const stdout = options.stdout ?? new node_stream_1.PassThrough();
+      const quickParsed = (0, yargs_parser_1.default)(options.argv, {
+        boolean: ["version"],
+        alias: { v: "version" }
+      });
+      if (quickParsed.version) {
+        const versionOutput = `${VERSION}
+`;
+        stdout.write(versionOutput);
+        return { exitCode: 0, stdout: versionOutput, stderr: "" };
+      }
       const initResult = initializeRuntime(options);
       if (initResult.shouldExit) {
         return { exitCode: 0, stdout: "", stderr: "" };
@@ -53512,18 +54529,17 @@ Run 'sidekick hook --help' for available hooks.
         stateService: runtime.stateService,
         logger: runtime.logger
       });
-      const isHookExecution = parsed.hookMode || parsed.command === "hook";
-      const { started: daemonStarted } = await ensureDaemon({
+      const isHookExecution = parsed.command === "hook" && Boolean(parsed.projectDir);
+      await ensureDaemon({
         hookMode: isHookExecution,
-        projectRoot: runtime.scope.projectRoot,
+        projectRoot: runtime.projectRoot,
         logger: runtime.logger
       });
       const result = await routeCommand({
         parsed,
         runtime,
         hookInput,
-        stdout,
-        daemonStarted
+        stdout
       });
       if (sessionId) {
         await persistCliLogMetrics(runtime.stateService, sessionId, runtime.getLogCounts(), runtime.logger);