@scotthamilton77/sidekick 0.0.1-alpha → 0.0.2-alpha

package/dist/bin.js

@@ -27684,134 +27684,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 +32345,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 +32364,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 +32385,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 +32406,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 +32427,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 +32448,7 @@ var require_structured_logging = __commonJS({
           time: Date.now(),
           source: "daemon",
           context: {
-            sessionId: "",
-            scope: "project"
+            sessionId: ""
           },
           payload: {
             metadata
@@ -32585,8 +32464,7 @@ var require_structured_logging = __commonJS({
           time: Date.now(),
           source: "daemon",
           context: {
-            sessionId: "",
-            scope: "project"
+            sessionId: ""
           },
           payload: {
             metadata
@@ -32602,8 +32480,7 @@ var require_structured_logging = __commonJS({
           time: Date.now(),
           source: "daemon",
           context: {
-            sessionId: "",
-            scope: "project"
+            sessionId: ""
           },
           payload: {
             metadata
@@ -32619,8 +32496,7 @@ var require_structured_logging = __commonJS({
           time: Date.now(),
           source: "daemon",
           context: {
-            sessionId: "",
-            scope: "project"
+            sessionId: ""
           },
           payload: {
             metadata
@@ -32636,8 +32512,7 @@ var require_structured_logging = __commonJS({
           time: Date.now(),
           source: "daemon",
           context: {
-            sessionId: "",
-            scope: "project"
+            sessionId: ""
           },
           payload: {
             metadata
@@ -32656,7 +32531,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 +32553,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 +32576,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 +32598,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 +32620,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 +32643,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 +32665,6 @@ var require_structured_logging = __commonJS({
           source: "transcript",
           context: {
             sessionId: context.sessionId,
-            scope: context.scope,
             correlationId: context.correlationId,
             traceId: context.traceId,
             hook: context.hook,
@@ -33395,7 +33263,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 +33408,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 +33451,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 +33545,7 @@ var require_handler_registry2 = __commonJS({
         this.handlers = [];
         this.context = {
           sessionId: options.sessionId,
-          transcriptPath: options.transcriptPath,
-          scope: options.scope
+          transcriptPath: options.transcriptPath
         };
       }
       /**
@@ -33802,7 +33661,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 +33687,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 +33733,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 +37104,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 +37688,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 +37697,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.
@@ -38554,7 +38410,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;
@@ -38726,9 +38582,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 +38595,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 +38617,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 +38637,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 +38665,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 +38690,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 +47777,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 +47799,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 +47941,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 +48049,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 +48059,8 @@ var require_inject_stop = __commonJS({
                   },
                   metrics: {
                     turnCount: metrics.turnCount,
-                    toolsThisTurn: metrics.toolsThisTurn
+                    toolsThisTurn: metrics.toolsThisTurn,
+                    toolCount: metrics.toolCount
                   }
                 });
               } catch (setErr) {
@@ -48243,13 +48089,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 +48549,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 +48716,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 +48758,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 +48968,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 +48982,6 @@ var require_hook_command = __commonJS({
         sessionId: hookInput.sessionId,
         hookInput,
         correlationId,
-        scope,
         runtime
       }, logger, captureStream);
       const internalResponse = parseInternalResponse(internalOutput.trim(), hookName, logger);
@@ -49672,7 +49514,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 +49537,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 +49937,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 +49954,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 +49965,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 +49994,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
         }));
@@ -51855,8 +51695,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 +52574,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 +52878,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 };
@@ -53171,11 +53071,10 @@ 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", "kill", "force"],
+        string: ["project-dir", "log-level", "format", "host", "session-id", "type"],
         number: ["port", "width"],
         alias: {
           h: "help"
@@ -53184,13 +53083,10 @@ Example: { "command": "pnpm sidekick daemon status", "dangerouslyDisableSandbox"
           "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,
@@ -53240,12 +53136,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 +53147,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) {
@@ -53327,36 +53217,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 +53248,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 +53284,7 @@ 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 +53292,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 +53304,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 +53316,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 +53326,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 +53336,14 @@ 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
-`);
-      }
-      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");
@@ -53512,18 +53380,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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scotthamilton77/sidekick",
-  "version": "0.0.1-alpha",
+  "version": "0.0.2-alpha",
   "description": "AI pair programming assistant with personas, session tracking, and contextual nudges",
   "bin": {
     "sidekick": "dist/bin.js"