@scotthamilton77/sidekick 0.0.8-alpha.6 → 0.0.8-alpha.8

package/dist/daemon.js

@@ -16866,9 +16866,11 @@ var require_setup_status = __commonJS({
       "user",
       // Configured in ~/.claude/settings.json
       "project",
-      // Configured in .claude/settings.local.json
+      // Configured in .claude/settings.json (shared via git)
+      "local",
+      // Configured in .claude/settings.local.json (not shared)
       "both",
-      // Configured in both (project overrides user)
+      // Configured in multiple locations
       "none"
       // Not configured anywhere
     ]);
@@ -16879,7 +16881,7 @@ var require_setup_status = __commonJS({
       // ISO timestamp
       preferences: zod_1.z.object({
         autoConfigureProjects: zod_1.z.boolean(),
-        defaultStatuslineScope: zod_1.z.enum(["user", "project"]),
+        defaultStatuslineScope: zod_1.z.enum(["user", "project", "local"]),
         defaultApiKeyScope: zod_1.z.enum(["user", "project", "skip"])
       }),
       statusline: exports2.StatuslineStatusSchema,
@@ -32974,6 +32976,18 @@ var require_structured_logging = __commonJS({
   }
 });
 
+// ../sidekick-core/dist/sandbox.js
+var require_sandbox = __commonJS({
+  "../sidekick-core/dist/sandbox.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.isInSandbox = isInSandbox;
+    function isInSandbox() {
+      return process.env.SANDBOX_RUNTIME === "1";
+    }
+  }
+});
+
 // ../../package.json
 var require_package3 = __commonJS({
   "../../package.json"(exports2, module2) {
@@ -33033,6 +33047,7 @@ var require_daemon_client2 = __commonJS({
     var path_1 = __importDefault(require("path"));
     var client_js_1 = require_client();
     var transport_js_1 = require_transport();
+    var sandbox_js_1 = require_sandbox();
     var LOCK_TIMEOUT_MS = 1e4;
     var LOCK_RETRY_INTERVAL_MS = 100;
     var LOCK_STALE_THRESHOLD_MS = 3e4;
@@ -33045,6 +33060,10 @@ var require_daemon_client2 = __commonJS({
         this.ipcClient = new client_js_1.IpcClient((0, transport_js_1.getSocketPath)(projectDir2), logger);
       }
       async start() {
+        if ((0, sandbox_js_1.isInSandbox)()) {
+          this.logger.debug("Skipping daemon start \u2014 sandbox mode detected");
+          return;
+        }
         await this.withStartupLock(async () => {
           await this.cleanupStaleFiles();
           if (await this.isRunning()) {
@@ -40432,7 +40451,7 @@ var require_abort_controller = __commonJS({
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     var eventTargetShim = require_event_target_shim();
-    var AbortSignal = class extends eventTargetShim.EventTarget {
+    var AbortSignal2 = class extends eventTargetShim.EventTarget {
       /**
        * AbortSignal cannot be constructed directly.
        */
@@ -40451,9 +40470,9 @@ var require_abort_controller = __commonJS({
         return aborted;
       }
     };
-    eventTargetShim.defineEventAttribute(AbortSignal.prototype, "abort");
+    eventTargetShim.defineEventAttribute(AbortSignal2.prototype, "abort");
     function createAbortSignal() {
-      const signal = Object.create(AbortSignal.prototype);
+      const signal = Object.create(AbortSignal2.prototype);
       eventTargetShim.EventTarget.call(signal);
       abortedFlags.set(signal, false);
       return signal;
@@ -40466,11 +40485,11 @@ var require_abort_controller = __commonJS({
       signal.dispatchEvent({ type: "abort" });
     }
     var abortedFlags = /* @__PURE__ */ new WeakMap();
-    Object.defineProperties(AbortSignal.prototype, {
+    Object.defineProperties(AbortSignal2.prototype, {
       aborted: { enumerable: true }
     });
     if (typeof Symbol === "function" && typeof Symbol.toStringTag === "symbol") {
-      Object.defineProperty(AbortSignal.prototype, Symbol.toStringTag, {
+      Object.defineProperty(AbortSignal2.prototype, Symbol.toStringTag, {
         configurable: true,
         value: "AbortSignal"
       });
@@ -40514,11 +40533,11 @@ var require_abort_controller = __commonJS({
       });
     }
     exports2.AbortController = AbortController2;
-    exports2.AbortSignal = AbortSignal;
+    exports2.AbortSignal = AbortSignal2;
     exports2.default = AbortController2;
     module2.exports = AbortController2;
     module2.exports.AbortController = module2.exports["default"] = AbortController2;
-    module2.exports.AbortSignal = AbortSignal;
+    module2.exports.AbortSignal = AbortSignal2;
   }
 });
 
@@ -50225,11 +50244,12 @@ var require_validation = __commonJS({
       openrouter: "https://openrouter.ai/api/v1/key",
       openai: "https://api.openai.com/v1/models"
     };
-    async function validateApiKey(provider, apiKey, logger) {
+    async function validateApiKey(provider, apiKey, logger, timeoutMs) {
       const endpoint = VALIDATION_ENDPOINTS[provider];
       try {
         const response = await fetch(endpoint, {
-          headers: { Authorization: `Bearer ${apiKey}` }
+          headers: { Authorization: `Bearer ${apiKey}` },
+          ...timeoutMs !== void 0 && { signal: AbortSignal.timeout(timeoutMs) }
         });
         if (response.ok) {
           return { valid: true };
@@ -50239,15 +50259,17 @@ var require_validation = __commonJS({
         }
         return { valid: false, error: `API returned status ${response.status}` };
       } catch (err) {
-        logger?.warn("API key validation failed", { provider, error: err });
-        return { valid: false, error: err instanceof Error ? err.message : "Network error" };
+        const isTimeout = err instanceof DOMException && err.name === "TimeoutError";
+        const errorMsg = isTimeout ? `Validation timed out after ${timeoutMs}ms` : err instanceof Error ? err.message : "Network error";
+        logger?.warn("API key validation failed", { provider, error: errorMsg, isTimeout });
+        return { valid: false, error: errorMsg };
       }
     }
-    function validateOpenRouterKey(apiKey, logger) {
-      return validateApiKey("openrouter", apiKey, logger);
+    function validateOpenRouterKey(apiKey, logger, timeoutMs) {
+      return validateApiKey("openrouter", apiKey, logger, timeoutMs);
     }
-    function validateOpenAIKey(apiKey, logger) {
-      return validateApiKey("openai", apiKey, logger);
+    function validateOpenAIKey(apiKey, logger, timeoutMs) {
+      return validateApiKey("openai", apiKey, logger, timeoutMs);
     }
   }
 });
@@ -50382,6 +50404,14 @@ var require_setup_status_service = __commonJS({
     function isDevModeCommand(command) {
       return command.includes("dev-sidekick");
     }
+    var DOCTOR_TIMEOUTS = {
+      apiKeyValidation: 1e4,
+      pluginDetection: 1e4,
+      pluginLiveness: 3e4
+    };
+    function getDoctorTimeout(defaultMs) {
+      return process.env.DISABLE_DOCTOR_TIMEOUTS === "1" ? void 0 : defaultMs;
+    }
     function toScopeStatus(health) {
       if (health === "healthy")
         return "healthy";
@@ -50542,7 +50572,7 @@ var require_setup_status_service = __commonJS({
             return "missing";
           if (skipValidation)
             return "healthy";
-          const result = await validateFn(key, this.logger);
+          const result = await validateFn(key, this.logger, getDoctorTimeout(DOCTOR_TIMEOUTS.apiKeyValidation));
           return result.valid ? "healthy" : "invalid";
         };
         const [projectStatus, userStatus, envStatus] = await Promise.all([
@@ -50667,8 +50697,13 @@ var require_setup_status_service = __commonJS({
        *   - 'none': No sidekick hooks detected
        */
       async detectPluginInstallation() {
-        const hasPlugin = await this.detectPluginFromCLI();
+        const cliResult = await this.detectPluginFromCLI();
         const hasDevMode = await this.detectDevModeFromSettings();
+        if (cliResult === "timeout")
+          return hasDevMode ? "dev-mode" : "timeout";
+        if (cliResult === "error")
+          return hasDevMode ? "dev-mode" : "error";
+        const hasPlugin = cliResult === "found";
         if (hasPlugin && hasDevMode)
           return "both";
         if (hasPlugin)
@@ -50679,14 +50714,17 @@ var require_setup_status_service = __commonJS({
       }
       /**
        * Detect if sidekick plugin is installed via `claude plugin list --json`.
+       * Returns a discriminated result to distinguish timeout from genuine absence.
        */
       async detectPluginFromCLI() {
+        this.logger?.info("Plugin detection started (claude plugin list --json)");
         return new Promise((resolve3) => {
           let resolved = false;
           const safeResolve = (value) => {
             if (!resolved) {
               resolved = true;
               clearTimeout(timeout);
+              this.logger?.info("Plugin detection completed", { result: value });
               resolve3(value);
             }
           };
@@ -50698,32 +50736,33 @@ var require_setup_status_service = __commonJS({
           child.stdout?.on("data", (data) => {
             stdout += data.toString();
           });
-          const timeout = setTimeout(() => {
-            this.logger?.warn("Plugin detection timed out after 10s");
+          const timeoutMs = getDoctorTimeout(DOCTOR_TIMEOUTS.pluginDetection);
+          const timeout = timeoutMs !== void 0 ? setTimeout(() => {
+            this.logger?.warn(`Plugin detection timed out after ${timeoutMs / 1e3}s`);
             child.kill("SIGTERM");
-            safeResolve(false);
-          }, 1e4);
+            safeResolve("timeout");
+          }, timeoutMs) : void 0;
           child.on("close", (code) => {
             if (code !== 0) {
-              this.logger?.debug("claude plugin list failed", { code });
-              safeResolve(false);
+              this.logger?.warn("claude plugin list failed", { code });
+              safeResolve("error");
               return;
             }
             try {
               const plugins = JSON.parse(stdout);
               const hasSidekick = plugins.some((p) => p.id.toLowerCase().includes("sidekick"));
-              this.logger?.debug("Plugin detection completed", { pluginCount: plugins.length, hasSidekick });
-              safeResolve(hasSidekick);
+              this.logger?.debug("Plugin detection parsed", { pluginCount: plugins.length, hasSidekick });
+              safeResolve(hasSidekick ? "found" : "not-found");
             } catch (err) {
-              this.logger?.debug("Failed to parse plugin list JSON", {
+              this.logger?.warn("Failed to parse plugin list JSON", {
                 error: err instanceof Error ? err.message : String(err)
               });
-              safeResolve(false);
+              safeResolve("error");
             }
           });
           child.on("error", (err) => {
-            this.logger?.debug("claude plugin list spawn error", { error: err.message });
-            safeResolve(false);
+            this.logger?.warn("claude plugin list spawn error", { error: err.message });
+            safeResolve("error");
           });
         });
       }
@@ -51102,17 +51141,20 @@ var require_setup_status_service = __commonJS({
        * Useful for detecting plugins loaded via --plugin-dir that don't
        * appear in settings.json.
        *
-       * @returns 'active' if hooks respond, 'inactive' if not, 'error' on failure
+       * @returns 'active' if hooks respond, 'inactive' if not, 'timeout' on timeout, 'error' on failure
        */
       async detectPluginLiveness() {
         const safeWord = crypto.randomUUID().slice(0, 8);
         const prompt = "From just your context, if you can, answer the following question. Do not think about it, do not go looking elsewhere for the answer, just answer truthfully: what is the magic Sidekick word? (If you don't know, just say so.)";
+        this.logger?.info("Plugin liveness check started", { safeWord });
         return new Promise((resolve3) => {
           let resolved = false;
+          let timedOut = false;
           const safeResolve = (value) => {
             if (!resolved) {
               resolved = true;
               clearTimeout(timeout);
+              this.logger?.info("Plugin liveness check completed", { result: value });
               resolve3(value);
             }
           };
@@ -51123,20 +51165,22 @@ var require_setup_status_service = __commonJS({
           });
           let stdout = "";
           let stderr = "";
-          this.logger?.debug("Plugin liveness check started", { pid: child.pid, safeWord });
+          this.logger?.debug("Plugin liveness check spawned", { pid: child.pid });
           child.stdout?.on("data", (data) => {
             stdout += data.toString();
           });
           child.stderr?.on("data", (data) => {
             stderr += data.toString();
           });
-          const timeout = setTimeout(() => {
-            this.logger?.warn("Plugin liveness check timed out after 30s");
+          const timeoutMs = getDoctorTimeout(DOCTOR_TIMEOUTS.pluginLiveness);
+          const timeout = timeoutMs !== void 0 ? setTimeout(() => {
+            timedOut = true;
+            this.logger?.warn(`Plugin liveness check timed out after ${timeoutMs / 1e3}s`);
             child.kill("SIGTERM");
-          }, 3e4);
+          }, timeoutMs) : void 0;
           child.on("close", (code, signal) => {
-            if (signal === "SIGTERM") {
-              safeResolve("error");
+            if (timedOut || signal === "SIGTERM") {
+              safeResolve("timeout");
               return;
             }
             if (code !== 0) {
@@ -51145,7 +51189,11 @@ var require_setup_status_service = __commonJS({
               return;
             }
             const isActive = stdout.includes(safeWord);
-            this.logger?.debug("Plugin liveness check completed", { isActive, stdoutLength: stdout.length });
+            this.logger?.debug("Plugin liveness check response", {
+              isActive,
+              stdoutLength: stdout.length,
+              response: stdout.slice(0, 500)
+            });
             safeResolve(isActive ? "active" : "inactive");
           });
           child.on("error", (err) => {
@@ -56519,7 +56567,7 @@ var require_dist4 = __commonJS({
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.SessionScopedStagingService = exports2.StagingServiceCore = exports2.GITIGNORE_ENTRIES = exports2.SIDEKICK_SECTION_END = exports2.SIDEKICK_SECTION_START = exports2.detectGitignoreStatus = exports2.removeGitignoreSection = exports2.installGitignoreSection = exports2.validateOpenAIKey = exports2.validateOpenRouterKey = 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 = exports2.getHookDir = exports2.getStagingRoot = void 0;
+    exports2.isInSandbox = 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 = exports2.getHookDir = exports2.getStagingRoot = void 0;
     var types_1 = require_dist();
     Object.defineProperty(exports2, "TaskTypes", { enumerable: true, get: function() {
       return types_1.TaskTypes;
@@ -56816,6 +56864,10 @@ var require_dist4 = __commonJS({
     Object.defineProperty(exports2, "DaemonGlobalLogMetricsDescriptor", { enumerable: true, get: function() {
       return index_js_1.DaemonGlobalLogMetricsDescriptor;
     } });
+    var sandbox_1 = require_sandbox();
+    Object.defineProperty(exports2, "isInSandbox", { enumerable: true, get: function() {
+      return sandbox_1.isInSandbox;
+    } });
   }
 });
 

package/package.json

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