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

package/dist/bin.js

@@ -17842,9 +17842,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
     ]);
@@ -17855,7 +17857,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,
@@ -33950,6 +33952,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) {
@@ -34009,6 +34023,7 @@ var require_daemon_client2 = __commonJS({
     var path_1 = __importDefault2(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;
@@ -34021,6 +34036,10 @@ var require_daemon_client2 = __commonJS({
         this.ipcClient = new client_js_1.IpcClient((0, transport_js_1.getSocketPath)(projectDir), 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()) {
@@ -57524,7 +57543,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;
@@ -57821,6 +57840,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;
+    } });
   }
 });
 
@@ -68286,6 +68309,10 @@ var require_hook_command = __commonJS({
       };
     }
     async function ensureDaemonForHook(projectRoot, logger) {
+      if ((0, core_1.isInSandbox)()) {
+        logger.debug("Skipping daemon start \u2014 sandbox mode");
+        return false;
+      }
       try {
         const setupService = new core_1.SetupStatusService(projectRoot);
         const setupState = await setupService.getSetupState();
@@ -72730,6 +72757,341 @@ var require_prompts = __commonJS({
   }
 });
 
+// ../sidekick-cli/dist/commands/setup/plugin-installer.js
+var require_plugin_installer = __commonJS({
+  "../sidekick-cli/dist/commands/setup/plugin-installer.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.PLUGIN_NAME = exports2.MARKETPLACE_SOURCE = exports2.MARKETPLACE_NAME = void 0;
+    exports2.getValidPluginScopes = getValidPluginScopes;
+    exports2.isScopeValid = isScopeValid;
+    exports2.mergeMarketplaceSettings = mergeMarketplaceSettings;
+    exports2.ensurePluginInstalled = ensurePluginInstalled;
+    var fs = __importStar(require("node:fs/promises"));
+    var path = __importStar(require("node:path"));
+    var node_child_process_1 = require("node:child_process");
+    var prompts_js_1 = require_prompts();
+    exports2.MARKETPLACE_NAME = "claude-code-sidekick";
+    exports2.MARKETPLACE_SOURCE = "github:scotthamilton77/claude-code-sidekick";
+    exports2.PLUGIN_NAME = "sidekick";
+    var ALL_SCOPES = ["user", "project", "local"];
+    var SCOPE_ORDER = { user: 0, project: 1, local: 2 };
+    function getValidPluginScopes(marketplaceScope) {
+      const minOrder = SCOPE_ORDER[marketplaceScope];
+      return ALL_SCOPES.filter((s) => SCOPE_ORDER[s] >= minOrder);
+    }
+    function isScopeValid(marketplaceScope, pluginScope) {
+      return SCOPE_ORDER[pluginScope] >= SCOPE_ORDER[marketplaceScope];
+    }
+    function mergeMarketplaceSettings(existing) {
+      const result = { ...existing };
+      const marketplaces = Array.isArray(result.extraKnownMarketplaces) ? [...result.extraKnownMarketplaces] : [];
+      if (!marketplaces.some((m) => m.name === exports2.MARKETPLACE_NAME)) {
+        marketplaces.push({ name: exports2.MARKETPLACE_NAME, source: exports2.MARKETPLACE_SOURCE });
+      }
+      result.extraKnownMarketplaces = marketplaces;
+      const plugins = Array.isArray(result.enabledPlugins) ? [...result.enabledPlugins] : [];
+      const pluginEntry = `${exports2.PLUGIN_NAME}@${exports2.MARKETPLACE_NAME}`;
+      if (!plugins.includes(pluginEntry)) {
+        plugins.push(pluginEntry);
+      }
+      result.enabledPlugins = plugins;
+      return result;
+    }
+    function createDefaultExecutor() {
+      return {
+        exec(cmd, args) {
+          return new Promise((resolve3, reject) => {
+            (0, node_child_process_1.execFile)(cmd, args, (error, stdout) => {
+              if (!error) {
+                resolve3({ stdout, exitCode: 0 });
+                return;
+              }
+              if (error.code === "ENOENT") {
+                reject(error);
+                return;
+              }
+              resolve3({ stdout: stdout ?? "", exitCode: error.code ? Number(error.code) : 1 });
+            });
+          });
+        }
+      };
+    }
+    function settingsFilename(scope) {
+      return scope === "project" ? "settings.json" : "settings.local.json";
+    }
+    function isCliMissing(err) {
+      return err.code === "ENOENT" || (err.message ?? "").includes("ENOENT");
+    }
+    async function detectMarketplaceFromCLI(executor, logger) {
+      const { stdout, exitCode } = await executor.exec("claude", ["plugin", "marketplace", "list", "--json"]);
+      if (exitCode !== 0) {
+        logger.warn("claude plugin marketplace list failed", { exitCode });
+        return false;
+      }
+      const marketplaces = JSON.parse(stdout);
+      return marketplaces.some((m) => m.name === exports2.MARKETPLACE_NAME);
+    }
+    async function detectMarketplaceFromSettings(projectDir, scope, logger) {
+      const settingsPath = path.join(projectDir, ".claude", settingsFilename(scope));
+      try {
+        const content = await fs.readFile(settingsPath, "utf-8");
+        const settings = JSON.parse(content);
+        const marketplaces = settings.extraKnownMarketplaces;
+        if (!Array.isArray(marketplaces))
+          return false;
+        return marketplaces.some((m) => m.name === exports2.MARKETPLACE_NAME);
+      } catch {
+        logger.debug("Settings file not found or unreadable", { path: settingsPath });
+        return false;
+      }
+    }
+    async function detectPluginFromCLI(executor, logger) {
+      const { stdout, exitCode } = await executor.exec("claude", ["plugin", "list", "--json"]);
+      if (exitCode !== 0) {
+        logger.warn("claude plugin list failed", { exitCode });
+        return false;
+      }
+      const plugins = JSON.parse(stdout);
+      return plugins.some((p) => p.id.startsWith(`${exports2.PLUGIN_NAME}@`));
+    }
+    async function detectMarketplaceAnywhere(executor, projectDir, logger) {
+      let cliAvailable = true;
+      try {
+        if (await detectMarketplaceFromCLI(executor, logger)) {
+          return { scope: "user", cliAvailable };
+        }
+      } catch (err) {
+        if (isCliMissing(err)) {
+          cliAvailable = false;
+        }
+        logger.warn("Failed to detect marketplace via CLI", { error: err.message });
+      }
+      if (await detectMarketplaceFromSettings(projectDir, "project", logger)) {
+        return { scope: "project", cliAvailable };
+      }
+      if (await detectMarketplaceFromSettings(projectDir, "local", logger)) {
+        return { scope: "local", cliAvailable };
+      }
+      return { scope: null, cliAvailable };
+    }
+    async function installMarketplaceViaCLI(executor, logger) {
+      logger.info("Installing marketplace via CLI", { source: exports2.MARKETPLACE_SOURCE });
+      const { exitCode } = await executor.exec("claude", ["plugin", "marketplace", "add", exports2.MARKETPLACE_SOURCE]);
+      return exitCode === 0;
+    }
+    async function installMarketplaceViaSettings(projectDir, scope, logger) {
+      const settingsPath = path.join(projectDir, ".claude", settingsFilename(scope));
+      logger.info("Installing marketplace via settings file", { path: settingsPath });
+      let existing = {};
+      try {
+        const content = await fs.readFile(settingsPath, "utf-8");
+        existing = JSON.parse(content);
+      } catch {
+      }
+      const merged = mergeMarketplaceSettings(existing);
+      await fs.mkdir(path.dirname(settingsPath), { recursive: true });
+      await fs.writeFile(settingsPath, JSON.stringify(merged, null, 2) + "\n");
+    }
+    async function installPlugin(executor, scope, logger) {
+      logger.info("Installing sidekick plugin", { scope });
+      const { exitCode } = await executor.exec("claude", ["plugin", "install", exports2.PLUGIN_NAME, "-s", scope]);
+      return exitCode === 0;
+    }
+    var SCOPE_LABELS = {
+      user: { label: "User (recommended)", description: "Available to all your projects" },
+      project: { label: "Project", description: "Only this project" },
+      local: { label: "Local", description: "Local-only, not shared via git" }
+    };
+    async function promptMarketplaceScope(ctx) {
+      return (0, prompts_js_1.promptSelect)(ctx, "Where should the sidekick marketplace be installed?", [
+        { value: "user", ...SCOPE_LABELS.user },
+        { value: "project", ...SCOPE_LABELS.project },
+        { value: "local", ...SCOPE_LABELS.local }
+      ]);
+    }
+    async function promptPluginScope(ctx, validScopes) {
+      const options = validScopes.map((scope) => ({
+        value: scope,
+        ...SCOPE_LABELS[scope]
+      }));
+      return (0, prompts_js_1.promptSelect)(ctx, "Where should the sidekick plugin be installed?", options);
+    }
+    function printManualInstructions(stdout) {
+      stdout.write("\nThe claude CLI is not available. Install sidekick manually:\n");
+      stdout.write(`  1. claude plugin marketplace add ${exports2.MARKETPLACE_SOURCE}
+`);
+      stdout.write(`  2. claude plugin install ${exports2.PLUGIN_NAME}
+`);
+      stdout.write("\nSee https://github.com/scotthamilton77/claude-code-sidekick for details.\n\n");
+    }
+    async function ensurePluginInstalled(options) {
+      const { logger, stdout, force, projectDir } = options;
+      const executor = options.executor ?? createDefaultExecutor();
+      if (options.marketplaceScope && options.pluginScope) {
+        if (!isScopeValid(options.marketplaceScope, options.pluginScope)) {
+          const msg = `Plugin scope '${options.pluginScope}' is broader than marketplace scope '${options.marketplaceScope}'. Plugin scope must be equal to or narrower than marketplace scope.`;
+          stdout.write(`\u2717 ${msg}
+`);
+          return {
+            marketplaceScope: options.marketplaceScope,
+            pluginScope: options.pluginScope,
+            marketplaceAction: "failed",
+            pluginAction: "failed",
+            error: msg
+          };
+        }
+      }
+      const { scope: detectedMktScope, cliAvailable } = await detectMarketplaceAnywhere(executor, projectDir, logger);
+      let pluginDetected = false;
+      if (cliAvailable) {
+        try {
+          pluginDetected = await detectPluginFromCLI(executor, logger);
+        } catch {
+        }
+      }
+      if (detectedMktScope && pluginDetected) {
+        stdout.write(`\u2713 Marketplace: already installed (${detectedMktScope})
+`);
+        stdout.write(`\u2713 Plugin: already installed
+`);
+        return {
+          marketplaceScope: options.marketplaceScope ?? detectedMktScope,
+          pluginScope: options.pluginScope ?? detectedMktScope,
+          marketplaceAction: "already-installed",
+          pluginAction: "already-installed"
+        };
+      }
+      if (!cliAvailable) {
+        printManualInstructions(stdout);
+        const error = "claude CLI not available";
+        stdout.write(`\u2717 Marketplace: ${error}
+`);
+        return {
+          marketplaceScope: options.marketplaceScope ?? "user",
+          pluginScope: options.pluginScope ?? "user",
+          marketplaceAction: detectedMktScope ? "already-installed" : "failed",
+          pluginAction: "failed",
+          error
+        };
+      }
+      let marketplaceScope;
+      let pluginScope;
+      if (options.marketplaceScope && options.pluginScope) {
+        marketplaceScope = options.marketplaceScope;
+        pluginScope = options.pluginScope;
+      } else if (force) {
+        marketplaceScope = options.marketplaceScope ?? detectedMktScope ?? "user";
+        pluginScope = options.pluginScope ?? "user";
+      } else if (options.ctx) {
+        (0, prompts_js_1.printHeader)(options.ctx, "Step 1: Plugin Installation", "Sidekick needs the marketplace and plugin installed in Claude Code.");
+        if (detectedMktScope) {
+          marketplaceScope = detectedMktScope;
+          (0, prompts_js_1.printStatus)(options.ctx, "info", `Marketplace already installed (${detectedMktScope})`);
+        } else {
+          marketplaceScope = await promptMarketplaceScope(options.ctx);
+        }
+        if (pluginDetected) {
+          pluginScope = marketplaceScope;
+          (0, prompts_js_1.printStatus)(options.ctx, "info", "Plugin already installed");
+        } else {
+          const validPluginScopes = getValidPluginScopes(marketplaceScope);
+          if (validPluginScopes.length === 1) {
+            pluginScope = validPluginScopes[0];
+            (0, prompts_js_1.printStatus)(options.ctx, "info", `Plugin scope auto-selected: ${pluginScope} (constrained by marketplace scope)`);
+          } else {
+            pluginScope = await promptPluginScope(options.ctx, validPluginScopes);
+          }
+        }
+      } else {
+        marketplaceScope = detectedMktScope ?? "user";
+        pluginScope = "user";
+      }
+      let marketplaceAction;
+      if (detectedMktScope) {
+        marketplaceAction = "already-installed";
+        stdout.write(`\u2713 Marketplace: already installed (${detectedMktScope})
+`);
+      } else if (marketplaceScope === "user") {
+        const success = await installMarketplaceViaCLI(executor, logger);
+        if (success) {
+          marketplaceAction = "installed";
+          stdout.write(`\u2713 Marketplace: installed (${marketplaceScope})
+`);
+        } else {
+          marketplaceAction = "failed";
+          const error = "Failed to install marketplace via CLI";
+          stdout.write(`\u2717 Marketplace: ${error}
+`);
+          return { marketplaceScope, pluginScope, marketplaceAction, pluginAction: "failed", error };
+        }
+      } else {
+        await installMarketplaceViaSettings(projectDir, marketplaceScope, logger);
+        marketplaceAction = "installed";
+        stdout.write(`\u2713 Marketplace: installed via settings (${marketplaceScope})
+`);
+      }
+      let pluginAction;
+      if (pluginDetected) {
+        pluginAction = "already-installed";
+        stdout.write(`\u2713 Plugin: already installed
+`);
+      } else {
+        const success = await installPlugin(executor, pluginScope, logger);
+        if (success) {
+          pluginAction = "installed";
+          stdout.write(`\u2713 Plugin: installed (${pluginScope})
+`);
+        } else {
+          pluginAction = "failed";
+          const error = "Failed to install sidekick plugin";
+          stdout.write(`\u2717 Plugin: ${error}
+`);
+          return { marketplaceScope, pluginScope, marketplaceAction, pluginAction, error };
+        }
+      }
+      return { marketplaceScope, pluginScope, marketplaceAction, pluginAction };
+    }
+  }
+});
+
 // ../sidekick-cli/dist/commands/setup/index.js
 var require_setup = __commonJS({
   "../sidekick-cli/dist/commands/setup/index.js"(exports2) {
@@ -72778,6 +73140,7 @@ var require_setup = __commonJS({
     var os = __importStar(require("node:os"));
     var core_1 = require_dist4();
     var prompts_js_1 = require_prompts();
+    var plugin_installer_js_1 = require_plugin_installer();
     var USAGE_TEXT = `Usage: sidekick setup [options]
 
 Run the interactive setup wizard to configure sidekick for Claude Code.
@@ -72791,7 +73154,9 @@ Options:
   --help                        Show this help message
 
 Scripting Flags (for non-interactive/partial setup):
-  --statusline-scope=<scope>    Configure statusline: user | project
+  --marketplace-scope=<scope>   Install marketplace: user | project | local
+  --plugin-scope=<scope>        Install plugin: user | project | local
+  --statusline-scope=<scope>    Configure statusline: user | project | local
   --gitignore                   Update .gitignore to exclude sidekick files
   --no-gitignore                Skip .gitignore configuration
   --personas                    Enable persona features
@@ -72809,6 +73174,16 @@ Examples:
   OPENROUTER_API_KEY=sk-xxx sidekick setup --personas --api-key-scope=user
 `;
     var STATUSLINE_COMMAND = "npx @scotthamilton77/sidekick statusline --project-dir=$CLAUDE_PROJECT_DIR";
+    function statuslineSettingsPath(scope, homeDir, projectDir) {
+      switch (scope) {
+        case "user":
+          return path.join(homeDir, ".claude", "settings.json");
+        case "project":
+          return path.join(projectDir, ".claude", "settings.json");
+        case "local":
+          return path.join(projectDir, ".claude", "settings.local.json");
+      }
+    }
     function getPluginStatusLabel(status) {
       switch (status) {
         case "plugin":
@@ -72966,27 +73341,36 @@ Examples:
       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) {
+    async function runStep2Statusline(wctx, pluginScope) {
       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");
-      const wrote = await configureStatusline(statuslinePath, logger);
+      (0, prompts_js_1.printHeader)(ctx, "Step 2: Statusline Configuration", "Claude Code plugins cannot provide statusline config directly.");
+      const STATUSLINE_SCOPE_OPTIONS = {
+        user: { label: "User-level (~/.claude/settings.json)", description: "Works in all projects" },
+        project: { label: "Project-level (.claude/settings.json)", description: "Shared via git" },
+        local: { label: "Local (.claude/settings.local.json)", description: "This machine only, not shared via git" }
+      };
+      const validScopes = (0, plugin_installer_js_1.getValidPluginScopes)(pluginScope);
+      let statuslineScope;
+      if (validScopes.length === 1) {
+        statuslineScope = validScopes[0];
+        (0, prompts_js_1.printStatus)(ctx, "info", `Statusline scope auto-selected: ${statuslineScope} (constrained by plugin scope)`);
+      } else {
+        const options = validScopes.map((scope) => ({
+          value: scope,
+          ...STATUSLINE_SCOPE_OPTIONS[scope]
+        }));
+        statuslineScope = await (0, prompts_js_1.promptSelect)(ctx, "Where should sidekick configure your statusline?", options);
+      }
+      const settingsPath = statuslineSettingsPath(statuslineScope, homeDir, projectDir);
+      const wrote = await configureStatusline(settingsPath, logger);
       if (wrote) {
-        (0, prompts_js_1.printStatus)(ctx, "success", `Statusline configured in ${statuslinePath}`);
+        (0, prompts_js_1.printStatus)(ctx, "success", `Statusline configured in ${settingsPath}`);
       } else {
         (0, prompts_js_1.printStatus)(ctx, "warning", "Statusline managed by dev-mode (skipped)");
       }
       return statuslineScope;
     }
-    async function runStep2Gitignore(wctx, force) {
+    async function runStep3Gitignore(wctx, force) {
       const { ctx, projectDir } = wctx;
       const currentStatus = await (0, core_1.detectGitignoreStatus)(projectDir);
       if (currentStatus === "installed") {
@@ -73000,7 +73384,7 @@ Examples:
         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.");
+      (0, prompts_js_1.printHeader)(ctx, "Step 3: Git Configuration", "Sidekick creates logs and session data that should not be committed.");
       if (needsRepair) {
         (0, prompts_js_1.printStatus)(ctx, "warning", "Existing .gitignore section is incomplete and needs repair");
       }
@@ -73026,10 +73410,10 @@ Examples:
       (0, prompts_js_1.printStatus)(ctx, "success", message);
       return "installed";
     }
-    async function runStep3Personas(wctx) {
+    async function runStep4Personas(wctx) {
       const { ctx, homeDir } = wctx;
       const stdout = ctx.stdout;
-      (0, prompts_js_1.printHeader)(ctx, "Step 3: Persona Features", "Sidekick includes AI personas (Marvin, Skippy, etc.) that add\npersonality to your coding sessions with snarky messages and contextual nudges.");
+      (0, prompts_js_1.printHeader)(ctx, "Step 4: Persona Features", "Sidekick includes AI personas (Marvin, 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";
@@ -73105,9 +73489,9 @@ Examples:
       const postDetection = await setupService.detectAllApiKeys("OPENROUTER_API_KEY", true);
       return { health: result.valid ? "healthy" : "invalid", detection: postDetection };
     }
-    async function runStep4AutoConfig(wctx) {
+    async function runStep5AutoConfig(wctx) {
       const { ctx } = wctx;
-      (0, prompts_js_1.printHeader)(ctx, "Step 4: Project Auto-Configuration");
+      (0, prompts_js_1.printHeader)(ctx, "Step 5: 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: "manual", label: "Do nothing", description: "Manual setup only" }
@@ -73153,7 +73537,8 @@ Examples:
       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"}`);
+      const scopeLabel = { user: "User-level", project: "Project-level", local: "Local" }[statuslineScope];
+      (0, prompts_js_1.printStatus)(ctx, "success", `Statusline: ${scopeLabel}`);
       let gitignoreStatusType;
       let gitignoreLabel;
       switch (gitignoreStatus) {
@@ -73202,13 +73587,26 @@ Examples:
       if (!force) {
         printWizardHeader(stdout);
       }
-      const statuslineScope = force ? "user" : await runStep1Statusline(wctx);
-      const gitignoreStatus = await runStep2Gitignore(wctx, force);
-      const { wantPersonas, apiKeyHealth, apiKeyDetection } = force ? { wantPersonas: true, apiKeyHealth: "not-required", apiKeyDetection: null } : await runStep3Personas(wctx);
-      const autoConfig = force ? "auto" : await runStep4AutoConfig(wctx);
+      const pluginResult = await (0, plugin_installer_js_1.ensurePluginInstalled)({
+        logger,
+        stdout,
+        force,
+        projectDir,
+        ctx: wctx.ctx,
+        marketplaceScope: options.marketplaceScope,
+        pluginScope: options.pluginScope
+      });
+      if (pluginResult.error) {
+        logger.warn("Plugin installation had issues, continuing with setup", { error: pluginResult.error });
+      }
+      const forceStatuslineScope = pluginResult.pluginScope;
+      const statuslineScope = force ? forceStatuslineScope : await runStep2Statusline(wctx, pluginResult.pluginScope);
+      const gitignoreStatus = await runStep3Gitignore(wctx, force);
+      const { wantPersonas, apiKeyHealth, apiKeyDetection } = force ? { wantPersonas: true, apiKeyHealth: "not-required", apiKeyDetection: null } : await runStep4Personas(wctx);
+      const autoConfig = force ? "auto" : await runStep5AutoConfig(wctx);
       if (force) {
-        const statuslinePath = path.join(homeDir, ".claude", "settings.json");
-        const wrote = await configureStatusline(statuslinePath, logger);
+        const settingsPath = statuslineSettingsPath(forceStatuslineScope, homeDir, projectDir);
+        const wrote = await configureStatusline(settingsPath, logger);
         if (!wrote) {
           stdout.write("\u26A0 Statusline managed by dev-mode (skipped)\n");
         }
@@ -73226,7 +73624,9 @@ Examples:
         printSummary(wctx, state);
       } else {
         stdout.write("Setup complete (force mode):\n");
-        stdout.write(`  Statusline: user-level (~/.claude/settings.json)
+        stdout.write(`  Plugin: ${pluginResult.pluginAction} (${pluginResult.pluginScope})
+`);
+        stdout.write(`  Statusline: ${forceStatuslineScope} (${statuslineSettingsPath(forceStatuslineScope, homeDir, projectDir)})
 `);
         stdout.write(`  Gitignore: ${gitignoreStatus === "installed" ? "configured" : "skipped"}
 `);
@@ -73238,15 +73638,32 @@ Examples:
       return { exitCode: 0 };
     }
     function hasScriptingFlags(options) {
-      return options.statuslineScope !== void 0 || options.gitignore !== void 0 || options.personas !== void 0 || options.apiKeyScope !== void 0 || options.autoConfig !== void 0;
+      return options.marketplaceScope !== void 0 || options.pluginScope !== void 0 || options.statuslineScope !== void 0 || options.gitignore !== void 0 || options.personas !== void 0 || options.apiKeyScope !== void 0 || options.autoConfig !== void 0;
     }
     async function runScripted(projectDir, logger, stdout, options) {
       const homeDir = options.homeDir ?? os.homedir();
       const setupService = new core_1.SetupStatusService(projectDir, { homeDir, logger });
       let configuredCount = 0;
+      if (options.marketplaceScope !== void 0 || options.pluginScope !== void 0) {
+        const pluginResult = await (0, plugin_installer_js_1.ensurePluginInstalled)({
+          logger,
+          stdout,
+          force: true,
+          // scripted mode never prompts
+          projectDir,
+          marketplaceScope: options.marketplaceScope,
+          pluginScope: options.pluginScope
+        });
+        if (pluginResult.error) {
+          stdout.write(`\u26A0 Plugin installation issue: ${pluginResult.error}
+`);
+        } else {
+          configuredCount++;
+        }
+      }
       if (options.statuslineScope) {
-        const statuslinePath = options.statuslineScope === "user" ? path.join(homeDir, ".claude", "settings.json") : path.join(projectDir, ".claude", "settings.local.json");
-        const wrote = await configureStatusline(statuslinePath, logger);
+        const settingsPath = statuslineSettingsPath(options.statuslineScope, homeDir, projectDir);
+        const wrote = await configureStatusline(settingsPath, logger);
         if (wrote) {
           stdout.write(`\u2713 Statusline configured (${options.statuslineScope}-level)
 `);
@@ -73549,6 +73966,10 @@ var require_uninstall = __commonJS({
           dryRun,
           removeHooks: true
         });
+        await cleanSettingsFile(path.join(projectDir, ".claude", "settings.json"), "project", logger, actions, {
+          dryRun,
+          removeHooks: true
+        });
       }
       if (userDetected) {
         await cleanSettingsFile(path.join(userHome, ".claude", "settings.json"), "user", logger, actions, {
@@ -73621,12 +74042,15 @@ var require_uninstall = __commonJS({
         await fs.access(path.join(projectDir, ".sidekick", "setup-status.json"));
         return true;
       } catch {
-        try {
-          const content = await fs.readFile(path.join(projectDir, ".claude", "settings.local.json"), "utf-8");
-          return content.includes("sidekick");
-        } catch {
-          return false;
+        for (const file of ["settings.local.json", "settings.json"]) {
+          try {
+            const content = await fs.readFile(path.join(projectDir, ".claude", file), "utf-8");
+            if (content.includes("sidekick"))
+              return true;
+          } catch {
+          }
         }
+        return false;
       }
     }
     async function detectUserScope(userHome) {
@@ -73943,10 +74367,7 @@ var require_cli = __commonJS({
     var promises_12 = require("node:fs/promises");
     var node_stream_1 = require("node:stream");
     var yargs_parser_1 = __importDefault2(require_build());
-    var VERSION = true ? "0.0.8-alpha.7" : "dev";
-    function isInSandbox() {
-      return process.env.SANDBOX_RUNTIME === "1";
-    }
+    var VERSION = true ? "0.0.8-alpha.8" : "dev";
     var SANDBOX_ERROR_MESSAGE = `Error: Daemon commands cannot run in sandbox mode.
 
 Claude Code's sandbox blocks Unix socket operations required for daemon IPC.
@@ -73955,6 +74376,7 @@ To run this command, use dangerouslyDisableSandbox: true in the Bash tool call.
 Example: { "command": "pnpm sidekick daemon status", "dangerouslyDisableSandbox": true }
 `;
     var types_1 = require_dist();
+    var core_1 = require_dist4();
     var runtime_1 = require_runtime();
     var UnknownOptionError = class extends Error {
       constructor(unknownOptions) {
@@ -73990,7 +74412,9 @@ Example: { "command": "pnpm sidekick daemon status", "dangerouslyDisableSandbox"
         "statusline-scope",
         "api-key-scope",
         "auto-config",
-        "only"
+        "only",
+        "marketplace-scope",
+        "plugin-scope"
       ],
       number: ["port", "width"],
       alias: { h: "help", v: "version" }
@@ -74045,7 +74469,9 @@ Example: { "command": "pnpm sidekick daemon status", "dangerouslyDisableSandbox"
         personas: hasPersonasFlag ? Boolean(parsed.personas) : void 0,
         apiKeyScope: parsed["api-key-scope"],
         autoConfig: parsed["auto-config"],
-        only: parsed.only
+        only: parsed.only,
+        marketplaceScope: parsed["marketplace-scope"],
+        pluginScope: parsed["plugin-scope"]
       };
     }
     function parseHookInput(stdinData) {
@@ -74209,7 +74635,7 @@ Run 'sidekick hook --help' for available hooks.
       }
       if (parsed.command === "daemon") {
         const subcommand = parsed.help ? "--help" : parsed.kill ? "kill" : parsed._ && parsed._[1] || "status";
-        if (isInSandbox() && subcommand !== "--help") {
+        if ((0, core_1.isInSandbox)() && subcommand !== "--help") {
           stdout.write(SANDBOX_ERROR_MESSAGE);
           return { exitCode: 1, stdout: SANDBOX_ERROR_MESSAGE, stderr: "" };
         }
@@ -74283,7 +74709,9 @@ Run 'sidekick hook --help' for available hooks.
           gitignore: parsed.gitignore,
           personas: parsed.personas,
           apiKeyScope: parsed.apiKeyScope,
-          autoConfig: parsed.autoConfig
+          autoConfig: parsed.autoConfig,
+          marketplaceScope: parsed.marketplaceScope,
+          pluginScope: parsed.pluginScope
         });
         return { exitCode: result.exitCode, stdout: "", stderr: "" };
       }

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()) {
@@ -56548,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;
@@ -56845,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.7",
+  "version": "0.0.8-alpha.8",
   "description": "AI pair programming assistant with personas, session tracking, and contextual nudges",
   "bin": {
     "sidekick": "dist/bin.js"