@scotthamilton77/sidekick 0.1.25 → 0.1.26

package/dist/bin.js

@@ -1038,6 +1038,7 @@ var require_hook_events = __commonJS({
     exports2.isPostToolUseEvent = isPostToolUseEvent;
     exports2.isStopEvent = isStopEvent;
     exports2.isPreCompactEvent = isPreCompactEvent;
+    exports2.isPostCompactEvent = isPostCompactEvent;
     exports2.isSubagentStartEvent = isSubagentStartEvent;
     exports2.isSubagentStopEvent = isSubagentStopEvent;
     exports2.HOOK_NAMES = [
@@ -1048,6 +1049,7 @@ var require_hook_events = __commonJS({
       "PostToolUse",
       "Stop",
       "PreCompact",
+      "PostCompact",
       "SubagentStart",
       "SubagentStop"
     ];
@@ -1072,6 +1074,9 @@ var require_hook_events = __commonJS({
     function isPreCompactEvent(event) {
       return event.hook === "PreCompact";
     }
+    function isPostCompactEvent(event) {
+      return event.hook === "PostCompact";
+    }
     function isSubagentStartEvent(event) {
       return event.hook === "SubagentStart";
     }
@@ -17927,7 +17932,8 @@ var require_tasks = __commonJS({
     });
     exports2.CleanupPayloadSchema = zod_1.z.object({
       maxAgeMs: zod_1.z.number().optional(),
-      dryRun: zod_1.z.boolean().optional()
+      dryRun: zod_1.z.boolean().optional(),
+      logMaxAgeMs: zod_1.z.number().optional()
     });
     exports2.MetricsPersistPayloadSchema = zod_1.z.object({
       sessionId: zod_1.z.string(),
@@ -17952,7 +17958,7 @@ var require_hook_input = __commonJS({
   "../types/dist/hook-input.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.HookInputSchema = exports2.StatuslineInputSchema = exports2.StatuslineWorkspaceSchema = exports2.StatuslineCostSchema = exports2.StatuslineContextWindowSchema = exports2.StatuslineModelSchema = exports2.SubagentStopInputSchema = exports2.SubagentStartInputSchema = exports2.NotificationInputSchema = exports2.PreCompactInputSchema = exports2.SessionEndInputSchema = exports2.SessionStartInputSchema = exports2.StopInputSchema = exports2.PostToolUseInputSchema = exports2.PreToolUseInputSchema = exports2.UserPromptSubmitInputSchema = exports2.HookInputBaseSchema = void 0;
+    exports2.HookInputSchema = exports2.StatuslineInputSchema = exports2.StatuslineWorkspaceSchema = exports2.StatuslineCostSchema = exports2.StatuslineContextWindowSchema = exports2.StatuslineModelSchema = exports2.SubagentStopInputSchema = exports2.SubagentStartInputSchema = exports2.NotificationInputSchema = exports2.PostCompactInputSchema = exports2.PreCompactInputSchema = exports2.SessionEndInputSchema = exports2.SessionStartInputSchema = exports2.StopInputSchema = exports2.PostToolUseInputSchema = exports2.PreToolUseInputSchema = exports2.UserPromptSubmitInputSchema = exports2.HookInputBaseSchema = void 0;
     var zod_1 = require_zod();
     exports2.HookInputBaseSchema = zod_1.z.object({
       /** Unique identifier for the current Claude session */
@@ -18010,6 +18016,10 @@ var require_hook_input = __commonJS({
       /** Custom instructions from /compact command (empty for auto) */
       custom_instructions: zod_1.z.string().optional()
     });
+    exports2.PostCompactInputSchema = exports2.HookInputBaseSchema.extend({
+      /** 'manual' (user ran /compact) or 'auto' (context window threshold) */
+      compaction_trigger: zod_1.z.enum(["manual", "auto"]).optional()
+    });
     exports2.NotificationInputSchema = exports2.HookInputBaseSchema.extend({
       /** Notification message text */
       message: zod_1.z.string(),
@@ -18098,6 +18108,7 @@ var require_hook_input = __commonJS({
       exports2.PostToolUseInputSchema,
       exports2.StopInputSchema,
       exports2.PreCompactInputSchema,
+      exports2.PostCompactInputSchema,
       exports2.SubagentStartInputSchema,
       exports2.SubagentStopInputSchema,
       exports2.NotificationInputSchema,
@@ -27373,6 +27384,32 @@ var require_claude_paths = __commonJS({
   }
 });
 
+// ../sidekick-core/dist/sidekick-paths.js
+var require_sidekick_paths = __commonJS({
+  "../sidekick-core/dist/sidekick-paths.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.resolveHome = resolveHome;
+    exports2.userSidekickRoot = userSidekickRoot;
+    exports2.projectStateDir = projectStateDir;
+    var node_os_1 = __importDefault2(require("node:os"));
+    var node_path_1 = require("node:path");
+    var claude_paths_js_1 = require_claude_paths();
+    function resolveHome(home) {
+      return home && home.trim() ? home : node_os_1.default.homedir();
+    }
+    function userSidekickRoot(home) {
+      return (0, node_path_1.join)(resolveHome(home), ".sidekick");
+    }
+    function projectStateDir(projectRoot, home) {
+      return (0, node_path_1.join)(userSidekickRoot(home), "projects", (0, claude_paths_js_1.encodeProjectPath)(projectRoot));
+    }
+  }
+});
+
 // ../sidekick-core/dist/persona-loader.js
 var require_persona_loader = __commonJS({
   "../sidekick-core/dist/persona-loader.js"(exports2) {
@@ -28041,10 +28078,19 @@ var require_config2 = __commonJS({
     var ProjectsSchema = v4_1.z.object({
       retentionDays: v4_1.z.number().min(1)
     }).strict();
+    var CleanupSchema = v4_1.z.object({
+      sessionMaxAgeDays: v4_1.z.number().min(1).default(7),
+      logMaxAgeDays: v4_1.z.number().min(1).default(30),
+      intervalHours: v4_1.z.number().min(1).default(4)
+    }).strict();
     var DaemonSchema = v4_1.z.object({
       idleTimeoutMs: v4_1.z.number().min(0),
       shutdownTimeoutMs: v4_1.z.number().min(0),
-      projects: ProjectsSchema.default({ retentionDays: 30 })
+      projects: ProjectsSchema.default({ retentionDays: 30 }),
+      // Per-field defaults (see CleanupSchema) make any subset of keys valid —
+      // partial overrides are filled at parse time. The object-level default
+      // covers the case where `cleanup` is omitted entirely.
+      cleanup: CleanupSchema.default({ sessionMaxAgeDays: 7, logMaxAgeDays: 30, intervalHours: 4 })
     }).strict();
     var IpcSchema = v4_1.z.object({
       connectTimeoutMs: v4_1.z.number().min(0),
@@ -29121,6 +29167,7 @@ var require_transport = __commonJS({
     var crypto_1 = __importDefault2(require("crypto"));
     var os_1 = __importDefault2(require("os"));
     var path_1 = __importDefault2(require("path"));
+    var sidekick_paths_js_1 = require_sidekick_paths();
     function getProjectHash(projectDir) {
       return crypto_1.default.createHash("sha256").update(projectDir).digest("hex").substring(0, 16);
     }
@@ -29146,14 +29193,14 @@ var require_transport = __commonJS({
         throw new Error(`Socket path exceeds Unix limit of ${exports2.UNIX_PATH_MAX} characters (got ${socketPath.length}): ${socketPath}`);
       }
     }
-    function getTokenPath(projectDir) {
-      return path_1.default.join(projectDir, ".sidekick", "sidekickd.token");
+    function getTokenPath(projectDir, home) {
+      return path_1.default.join((0, sidekick_paths_js_1.projectStateDir)(projectDir, home), "sidekickd.token");
     }
-    function getPidPath(projectDir) {
-      return path_1.default.join(projectDir, ".sidekick", "sidekickd.pid");
+    function getPidPath(projectDir, home) {
+      return path_1.default.join((0, sidekick_paths_js_1.projectStateDir)(projectDir, home), "sidekickd.pid");
     }
-    function getLockPath(projectDir) {
-      return path_1.default.join(projectDir, ".sidekick", "sidekickd.lock");
+    function getLockPath(projectDir, home) {
+      return path_1.default.join((0, sidekick_paths_js_1.projectStateDir)(projectDir, home), "sidekickd.lock");
     }
     function getUserDaemonsDir() {
       return path_1.default.join(os_1.default.homedir(), ".sidekick", "daemons");
@@ -33976,6 +34023,46 @@ var require_log_events = __commonJS({
           }
         };
       },
+      /** Create a CleanupTimerStarted event (logged when the cleanup timer starts). */
+      cleanupTimerStarted(metadata) {
+        return {
+          type: "cleanup:timer-started",
+          time: Date.now(),
+          source: "daemon",
+          context: EMPTY_CONTEXT,
+          payload: { intervalMs: metadata.intervalMs }
+        };
+      },
+      /** Create a CleanupTaskEnqueued event (logged when a cleanup task is enqueued). */
+      cleanupTaskEnqueued(metadata) {
+        return {
+          type: "cleanup:task-enqueued",
+          time: Date.now(),
+          source: "daemon",
+          context: EMPTY_CONTEXT,
+          payload: { reason: metadata.reason }
+        };
+      },
+      /** Create a CleanupSkippedRecent event (logged when startup cleanup is skipped). */
+      cleanupSkippedRecent(metadata) {
+        return {
+          type: "cleanup:skipped-recent",
+          time: Date.now(),
+          source: "daemon",
+          context: EMPTY_CONTEXT,
+          payload: { lastCleanupAt: metadata.lastCleanupAt, intervalMs: metadata.intervalMs }
+        };
+      },
+      /** Create a CleanupLogCompleted event (logged when log pruning finishes). */
+      cleanupLogCompleted(metadata) {
+        return {
+          type: "cleanup:log-completed",
+          time: Date.now(),
+          source: "daemon",
+          context: EMPTY_CONTEXT,
+          payload: { cleaned: metadata.cleaned, skipped: metadata.skipped, dryRun: metadata.dryRun }
+        };
+      },
       // --- Statusline Events ---
       /**
        * Create a StatuslineRendered event (logged when statusline renders successfully).
@@ -46580,57 +46667,76 @@ var require_sandbox = __commonJS({
   }
 });
 
-// ../../package.json
-var require_package3 = __commonJS({
-  "../../package.json"(exports2, module2) {
-    module2.exports = {
-      name: "claude-code-sidekick",
-      private: true,
-      version: "0.1.0",
-      type: "module",
-      packageManager: "pnpm@9.12.2",
-      scripts: {
-        build: "pnpm -r build",
-        clean: "rm -rf packages/*/dist packages/*/*.tsbuildinfo",
-        typecheck: "tsc -p tsconfig.lint.json --noEmit",
-        test: "pnpm -r test",
-        "test:coverage": "vitest run --coverage",
-        "test:coverage:full": "INTEGRATION_TESTS=1 vitest run --coverage",
-        lint: "NODE_OPTIONS='--max-old-space-size=4096' eslint packages",
-        "lint:fix": "NODE_OPTIONS='--max-old-space-size=4096' eslint packages --fix",
-        format: 'prettier --write "packages/**/*.ts"',
-        sidekick: "node packages/sidekick-cli/dist/bin.js",
-        "test:dist:setup": "./scripts/test-dist.sh setup",
-        "test:dist:teardown": "./scripts/test-dist.sh teardown",
-        "test:dist:rebuild": "./scripts/test-dist.sh rebuild",
-        "publish:dist": "./scripts/publish-dist.sh"
-      },
-      pnpm: {
-        overrides: {
-          ajv: ">=6.14.0 <7",
-          minimatch: ">=10.2.1",
-          "vite@^7.0.0": "^7.3.2",
-          "picomatch@^4.0.0": "^4.0.4",
-          "picomatch@^2.0.0": "^2.3.2",
-          "flatted@^3.0.0": "^3.4.2",
-          "postcss@^8.0.0": "^8.5.10"
+// ../sidekick-core/dist/build-identity.js
+var require_build_identity = __commonJS({
+  "../sidekick-core/dist/build-identity.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.computeBuildIdentity = computeBuildIdentity;
+    exports2.computeDevFingerprint = computeDevFingerprint;
+    exports2.discoverDistDirs = discoverDistDirs;
+    exports2.fingerprintDistDirs = fingerprintDistDirs;
+    var fs_1 = require("fs");
+    var path_1 = __importDefault2(require("path"));
+    var DEV_PREFIX = "dev:";
+    var NO_DIST_SENTINEL = "nodist";
+    function computeBuildIdentity(injectedVersion = true ? "0.1.26" : void 0, devFingerprint = computeDevFingerprint) {
+      return injectedVersion !== void 0 ? injectedVersion : DEV_PREFIX + devFingerprint();
+    }
+    function computeDevFingerprint() {
+      const repoRoot = path_1.default.resolve(__dirname, "../../..");
+      return fingerprintDistDirs(discoverDistDirs(repoRoot));
+    }
+    function discoverDistDirs(repoRoot) {
+      const packagesDir = path_1.default.join(repoRoot, "packages");
+      let entries;
+      try {
+        entries = (0, fs_1.readdirSync)(packagesDir);
+      } catch {
+        return [];
+      }
+      const dirs = [];
+      for (const entry of entries) {
+        const distDir = path_1.default.join(packagesDir, entry, "dist");
+        try {
+          if ((0, fs_1.statSync)(distDir).isDirectory())
+            dirs.push(distDir);
+        } catch {
         }
-      },
-      devDependencies: {
-        "@eslint/js": "^10.0.1",
-        "@types/node": "^22.19.17",
-        "@typescript-eslint/eslint-plugin": "^8.59.1",
-        "@typescript-eslint/parser": "^8.59.1",
-        "@vitest/coverage-v8": "^4.1.5",
-        eslint: "^10.3.0",
-        "eslint-config-prettier": "^9.1.2",
-        "eslint-plugin-prettier": "^5.5.5",
-        prettier: "^3.8.3",
-        typescript: "^5.9.3",
-        "typescript-eslint": "^8.59.1",
-        vitest: "^4.1.5"
       }
-    };
+      return dirs;
+    }
+    function fingerprintDistDirs(distDirs) {
+      let maxMtimeMs = 0;
+      for (const dir of distDirs) {
+        maxMtimeMs = Math.max(maxMtimeMs, maxMtimeInDir(dir));
+      }
+      return maxMtimeMs === 0 ? NO_DIST_SENTINEL : Math.floor(maxMtimeMs).toString(36);
+    }
+    function maxMtimeInDir(dir) {
+      let max = 0;
+      let entries;
+      try {
+        entries = (0, fs_1.readdirSync)(dir, { withFileTypes: true });
+      } catch {
+        return 0;
+      }
+      for (const entry of entries) {
+        const full = path_1.default.join(dir, entry.name);
+        try {
+          if (entry.isDirectory()) {
+            max = Math.max(max, maxMtimeInDir(full));
+          } else if (entry.isFile()) {
+            max = Math.max(max, (0, fs_1.statSync)(full).mtimeMs);
+          }
+        } catch {
+        }
+      }
+      return max;
+    }
   }
 });
 
@@ -46654,10 +46760,11 @@ var require_daemon_client2 = __commonJS({
     var transport_js_1 = require_transport();
     var sandbox_js_1 = require_sandbox();
     var error_utils_js_1 = require_error_utils();
+    var build_identity_js_1 = require_build_identity();
     var LOCK_TIMEOUT_MS = 1e4;
     var LOCK_RETRY_INTERVAL_MS = 100;
     var LOCK_STALE_THRESHOLD_MS = 3e4;
-    var CLIENT_VERSION = require_package3().version;
+    var CLIENT_VERSION = (0, build_identity_js_1.computeBuildIdentity)();
     var DaemonClient = class {
       projectDir;
       logger;
@@ -47189,16 +47296,14 @@ var require_gitignore = __commonJS({
     exports2.SIDEKICK_SECTION_START = "# >>> sidekick";
     exports2.SIDEKICK_SECTION_END = "# <<< sidekick";
     exports2.SIDEKICK_GITIGNORE_HEADER = "# Sidekick \u2014 managed file, do not edit manually";
-    exports2.GITIGNORE_ENTRIES = [
+    exports2.GITIGNORE_ENTRIES = [".env", ".env.local", "*.local.yaml"];
+    var STALE_GITIGNORE_ENTRIES = [
       "logs/",
       "sessions/",
       "state/",
       "setup-status.json",
-      ".env",
-      ".env.local",
       "sidekick*.pid",
-      "sidekick*.token",
-      "*.local.yaml"
+      "sidekick*.token"
     ];
     async function installGitignoreSection(projectDir) {
       let status;
@@ -47229,7 +47334,8 @@ var require_gitignore = __commonJS({
       try {
         const content = await fs.readFile(sidekickGitignorePath, "utf-8");
         const missingEntries = exports2.GITIGNORE_ENTRIES.filter((entry) => !content.includes(entry));
-        return missingEntries.length === 0 ? "installed" : "incomplete";
+        const staleEntries = STALE_GITIGNORE_ENTRIES.filter((entry) => content.includes(entry));
+        return missingEntries.length === 0 && staleEntries.length === 0 ? "installed" : "incomplete";
       } catch (err) {
         if (err.code !== "ENOENT") {
           throw err;
@@ -58285,9 +58391,9 @@ var require_setup_status_service = __commonJS({
     exports2.createSetupStatusService = createSetupStatusService;
     var fs = __importStar(require("node:fs/promises"));
     var path = __importStar(require("node:path"));
-    var os = __importStar(require("node:os"));
     var types_1 = require_dist();
     var gitignore_js_1 = require_gitignore();
+    var sidekick_paths_js_1 = require_sidekick_paths();
     var api_key_detector_js_1 = require_api_key_detector();
     var plugin_detector_js_1 = require_plugin_detector();
     var doctor_engine_js_1 = require_doctor_engine();
@@ -58299,7 +58405,7 @@ var require_setup_status_service = __commonJS({
       logger;
       constructor(projectDir, options) {
         this.projectDir = projectDir;
-        this.homeDir = options?.homeDir ?? os.homedir();
+        this.homeDir = (0, sidekick_paths_js_1.resolveHome)(options?.homeDir);
         this.logger = options?.logger;
       }
       // === Paths ===
@@ -58307,7 +58413,7 @@ var require_setup_status_service = __commonJS({
         return path.join(this.homeDir, ".sidekick", exports2.USER_STATUS_FILENAME);
       }
       get projectStatusPath() {
-        return path.join(this.projectDir, ".sidekick", exports2.PROJECT_STATUS_FILENAME);
+        return path.join((0, sidekick_paths_js_1.projectStateDir)(this.projectDir, this.homeDir), exports2.PROJECT_STATUS_FILENAME);
       }
       // === Feature config ===
       /**
@@ -59569,10 +59675,24 @@ var require_path_resolver = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.PathResolver = void 0;
     var node_path_1 = require("node:path");
+    var sidekick_paths_js_1 = require_sidekick_paths();
     var PathResolver = class {
       stateBase;
-      constructor(projectRoot, stateDir = ".sidekick") {
-        this.stateBase = (0, node_path_1.join)(projectRoot, stateDir);
+      /**
+       * @param projectRoot Project root (project scope) or an absolute state root (user scope).
+       * @param stateDir Scope selector, NOT a path segment. Only two values are
+       *   meaningful: `''` selects user scope (use `projectRoot` as the absolute base,
+       *   as-is); any other value (default `'.sidekick'`) selects project scope, where
+       *   runtime state is redirected to `~/.sidekick/projects/<encoded-id>/` and the
+       *   string content is ignored.
+       * @param home Optional override for the user home that anchors the redirected
+       *   project state dir. Only consulted in project scope; in user scope the base
+       *   is already absolute. Defaults to `os.homedir()` when omitted. Thread this
+       *   from an injected home (production: `$HOME` via env; tests: a programmatic
+       *   override) so state, logs, and sessions all resolve under the same root.
+       */
+      constructor(projectRoot, stateDir = ".sidekick", home) {
+        this.stateBase = stateDir === "" ? projectRoot : (0, sidekick_paths_js_1.projectStateDir)(projectRoot, home);
       }
       // === Directories ===
       /** Root state directory (.sidekick or user equivalent) */
@@ -59688,7 +59808,7 @@ var require_state_service = __commonJS({
       cache;
       configGetter;
       constructor(projectRoot, options) {
-        this.paths = new path_resolver_js_1.PathResolver(projectRoot, options?.stateDir);
+        this.paths = new path_resolver_js_1.PathResolver(projectRoot, options?.stateDir, options?.homeDir);
         this.staleThresholdMs = options?.staleThresholdMs ?? 6e4;
         this.logger = options?.logger;
         this.cache = options?.cache ? /* @__PURE__ */ new Map() : null;
@@ -60712,7 +60832,6 @@ var require_transcript_metrics_engine = __commonJS({
     exports2.extractTokenUsage = extractTokenUsage;
     exports2.processNestedToolUses = processNestedToolUses;
     exports2.processNestedToolResults = processNestedToolResults;
-    exports2.handleCompactBoundary = handleCompactBoundary;
     exports2.isToolResultOnlyMessage = isToolResultOnlyMessage;
     exports2.isLocalCommandStdoutMessage = isLocalCommandStdoutMessage;
     exports2.isExcludedBuiltinCommandInvocation = isExcludedBuiltinCommandInvocation;
@@ -60747,13 +60866,8 @@ var require_transcript_metrics_engine = __commonJS({
           await emitEvent("AssistantMessage", entry, lineNumber);
           await processNestedToolUses(entry, lineNumber, metrics, toolUseIdToName, emitEvent);
           break;
-        case "system": {
-          const subtype = entry.subtype;
-          if (subtype === "compact_boundary") {
-            await handleCompactBoundary(entry, lineNumber, metrics, emitEvent);
-          }
+        case "system":
           break;
-        }
       }
     }
     function extractTokenUsage(entry, metrics) {
@@ -60831,11 +60945,6 @@ var require_transcript_metrics_engine = __commonJS({
         }
       }
     }
-    async function handleCompactBoundary(entry, lineNumber, metrics, emitEvent) {
-      metrics.currentContextTokens = null;
-      metrics.isPostCompactIndeterminate = true;
-      await emitEvent("Compact", entry, lineNumber);
-    }
     function isToolResultOnlyMessage(entry) {
       const message = entry.message;
       if (!message?.content)
@@ -63216,6 +63325,13 @@ var require_transcript_service = __commonJS({
       // ============================================================================
       // Compaction Management
       // ============================================================================
+      async signalCompaction() {
+        this.metrics.currentContextTokens = null;
+        this.metrics.isPostCompactIndeterminate = true;
+        await this.emitEvent("Compact", {}, this.metrics.lastProcessedLine);
+        this.notifyMetricsChange();
+        this.schedulePersistence();
+      }
       async capturePreCompactState(snapshotPath) {
         if (!this.transcriptPath) {
           throw new Error("TranscriptService not initialized");
@@ -63424,6 +63540,18 @@ var require_service_factory2 = __commonJS({
         }
         return service;
       }
+      /**
+       * Get the cached TranscriptService for a session if it exists.
+       * Returns undefined if no service has been prepared for this session yet.
+       * Touches the session access time if the service exists.
+       */
+      getTranscriptService(sessionId) {
+        const service = this.transcriptServices.get(sessionId);
+        if (service) {
+          this.touchSession(sessionId);
+        }
+        return service;
+      }
       /**
        * Shutdown a session's services (called on SessionEnd).
        */
@@ -64006,28 +64134,69 @@ var require_project_registry = __commonJS({
       return mod && mod.__esModule ? mod : { "default": mod };
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.ProjectRegistryService = void 0;
-    exports2.encodeProjectDir = encodeProjectDir;
+    exports2.ProjectRegistryService = exports2.encodeProjectDir = void 0;
     var node_fs_1 = require("node:fs");
     var promises_12 = __importDefault2(require("node:fs/promises"));
     var node_crypto_1 = require("node:crypto");
     var node_path_1 = require("node:path");
     var types_1 = require_dist();
-    function encodeProjectDir(absPath) {
-      return absPath.replace(/\//g, "-");
-    }
+    var claude_paths_js_1 = require_claude_paths();
+    var error_utils_js_1 = require_error_utils();
+    exports2.encodeProjectDir = claude_paths_js_1.encodeProjectPath;
     var REGISTRY_FILE = "registry.json";
     var ProjectRegistryService = class {
       registryRoot;
-      constructor(registryRoot) {
+      logger;
+      constructor(registryRoot, logger) {
         this.registryRoot = registryRoot;
+        this.logger = logger;
+      }
+      /**
+       * Read and validate a single registry entry, returning null when it cannot
+       * be used.
+       *
+       * Two unreadable cases are deliberately distinguished:
+       * - **Missing** `registry.json` (ENOENT) is expected: a CLI hook can create
+       *   the project dir with live runtime state (sessions/, state/, logs/) before
+       *   the daemon writes registry.json. Logged at debug only — routine, not a
+       *   fault.
+       * - **Corrupt** (unreadable/unparseable/schema-invalid) is unexpected and
+       *   warned: a persistently-bad registry.json silently excludes the dir from
+       *   both listing and pruning, so it must leave a trace.
+       *
+       * Callers treat null as "skip this dir" — never as "safe to delete".
+       */
+      async readEntry(entryFile) {
+        let raw;
+        try {
+          raw = await promises_12.default.readFile(entryFile, "utf-8");
+        } catch (err) {
+          if (err.code === "ENOENT") {
+            this.logger?.debug("Project registry dir has no registry.json; skipping", { entryFile });
+          } else {
+            this.logger?.warn("Failed to read project registry entry; skipping", {
+              entryFile,
+              error: (0, error_utils_js_1.toErrorMessage)(err)
+            });
+          }
+          return null;
+        }
+        try {
+          return types_1.ProjectRegistryEntrySchema.parse(JSON.parse(raw));
+        } catch (err) {
+          this.logger?.warn("Project registry entry is corrupt; skipping", {
+            entryFile,
+            error: (0, error_utils_js_1.toErrorMessage)(err)
+          });
+          return null;
+        }
       }
       /**
        * Register or update a project in the registry.
        * Creates the directory and writes registry.json with current timestamp.
        */
       async register(projectDir) {
-        const encoded = encodeProjectDir(projectDir);
+        const encoded = (0, exports2.encodeProjectDir)(projectDir);
         const entryDir = (0, node_path_1.join)(this.registryRoot, encoded);
         const entryFile = (0, node_path_1.join)(entryDir, REGISTRY_FILE);
         await promises_12.default.mkdir(entryDir, { recursive: true });
@@ -64060,12 +64229,9 @@ var require_project_registry = __commonJS({
           if (!dirent.isDirectory())
             continue;
           const entryFile = (0, node_path_1.join)(this.registryRoot, dirent.name, REGISTRY_FILE);
-          try {
-            const raw = await promises_12.default.readFile(entryFile, "utf-8");
-            const parsed = types_1.ProjectRegistryEntrySchema.parse(JSON.parse(raw));
-            entries.push(parsed);
-          } catch {
-          }
+          const entry = await this.readEntry(entryFile);
+          if (entry)
+            entries.push(entry);
         }
         return entries;
       }
@@ -64086,14 +64252,9 @@ var require_project_registry = __commonJS({
             continue;
           const entryDir = (0, node_path_1.join)(this.registryRoot, dirent.name);
           const entryFile = (0, node_path_1.join)(entryDir, REGISTRY_FILE);
-          let entry;
-          try {
-            const raw = await promises_12.default.readFile(entryFile, "utf-8");
-            entry = types_1.ProjectRegistryEntrySchema.parse(JSON.parse(raw));
-          } catch {
-            await promises_12.default.rm(entryDir, { recursive: true, force: true });
+          const entry = await this.readEntry(entryFile);
+          if (!entry)
             continue;
-          }
           let reason = null;
           if (!(0, node_fs_1.existsSync)(entry.path)) {
             reason = "path-missing";
@@ -64160,8 +64321,9 @@ var require_daemon_health = __commonJS({
     var node_path_1 = require("node:path");
     var types_1 = require_dist();
     var error_utils_js_1 = require_error_utils();
-    function healthFilePath(projectDir) {
-      return (0, node_path_1.join)(projectDir, ".sidekick", "state", "daemon-health.json");
+    var sidekick_paths_js_1 = require_sidekick_paths();
+    function healthFilePath(projectDir, home) {
+      return (0, node_path_1.join)((0, sidekick_paths_js_1.projectStateDir)(projectDir, home), "state", "daemon-health.json");
     }
     function defaultHealth() {
       return {
@@ -64169,8 +64331,8 @@ var require_daemon_health = __commonJS({
         lastCheckedAt: (/* @__PURE__ */ new Date(0)).toISOString()
       };
     }
-    async function readDaemonHealth(projectDir) {
-      const path = healthFilePath(projectDir);
+    async function readDaemonHealth(projectDir, home) {
+      const path = healthFilePath(projectDir, home);
       try {
         const content = await fs.readFile(path, "utf-8");
         const json = JSON.parse(content);
@@ -64183,8 +64345,8 @@ var require_daemon_health = __commonJS({
         return defaultHealth();
       }
     }
-    async function writeDaemonHealth(projectDir, health) {
-      const path = healthFilePath(projectDir);
+    async function writeDaemonHealth(projectDir, health, home) {
+      const path = healthFilePath(projectDir, home);
       const dir = (0, node_path_1.dirname)(path);
       await fs.mkdir(dir, { recursive: true });
       const tmpPath = `${path}.${Date.now()}.${Math.random().toString(36).slice(2, 8)}.tmp`;
@@ -64200,8 +64362,8 @@ var require_daemon_health = __commonJS({
         throw err;
       }
     }
-    async function updateDaemonHealth(projectDir, newStatus, logger, error) {
-      const current = await readDaemonHealth(projectDir);
+    async function updateDaemonHealth(projectDir, newStatus, logger, error, home) {
+      const current = await readDaemonHealth(projectDir, home);
       if (current.status === newStatus) {
         return false;
       }
@@ -64213,7 +64375,7 @@ var require_daemon_health = __commonJS({
         ...error !== void 0 && { error }
       };
       try {
-        await writeDaemonHealth(projectDir, health);
+        await writeDaemonHealth(projectDir, health, home);
       } catch (err) {
         logger.warn("Failed to write daemon health", {
           from,
@@ -64396,7 +64558,7 @@ var require_dist4 = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.PROJECT_STATUS_FILENAME = exports2.USER_STATUS_FILENAME = exports2.createSetupStatusService = exports2.SetupStatusService = exports2.DaemonClient = exports2.findZombieDaemons = exports2.killZombieDaemons = exports2.killAllDaemons = exports2.SessionLogWriter = exports2.setSessionLogWriter = exports2.logEvent = exports2.LogEvents = exports2.DEFAULT_MAX_FILES = exports2.DEFAULT_ROTATE_SIZE_BYTES = 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.isSubagentStopEvent = exports2.isSubagentStartEvent = 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.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 = exports2.SessionScopedStagingService = exports2.StagingServiceCore = exports2.GITIGNORE_ENTRIES = exports2.SIDEKICK_GITIGNORE_HEADER = exports2.SIDEKICK_SECTION_END = exports2.SIDEKICK_SECTION_START = exports2.removeLegacyGitignoreSection = exports2.detectLegacyGitignoreSection = exports2.detectGitignoreStatus = exports2.removeGitignoreSection = exports2.installGitignoreSection = exports2.validateOpenAIKey = exports2.validateOpenRouterKey = exports2.runDoctorCheck = exports2.detectPluginLiveness = exports2.detectPluginInstallation = exports2.detectActualStatusline = exports2.spawnWithTimeout = exports2.getDoctorTimeout = exports2.DOCTOR_TIMEOUTS = exports2.projectApiKeyStatusFromHealth = exports2.userApiKeyStatusFromHealth = exports2.buildProjectApiKeyStatus = exports2.buildUserApiKeyStatus = exports2.detectAllApiKeys = exports2.detectActualApiKey = exports2.readKeyFromEnvFile = exports2.determineOverallStatus = exports2.toScopeStatus = void 0;
-    exports2.CoalescingGuard = exports2.loadUserProfile = exports2.parseGitStatusOutput = exports2.getGitFileStatus = exports2.toErrorMessage = exports2.isInSandbox = exports2.updateDaemonHealth = exports2.readDaemonHealth = exports2.ProjectRegistryService = exports2.encodeProjectDir = 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 = void 0;
+    exports2.computeBuildIdentity = exports2.CoalescingGuard = exports2.loadUserProfile = exports2.parseGitStatusOutput = exports2.getGitFileStatus = exports2.toErrorMessage = exports2.isInSandbox = exports2.updateDaemonHealth = exports2.readDaemonHealth = exports2.ProjectRegistryService = exports2.encodeProjectDir = 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 = void 0;
     var types_1 = require_dist();
     Object.defineProperty(exports2, "TaskTypes", { enumerable: true, get: function() {
       return types_1.TaskTypes;
@@ -64455,6 +64617,7 @@ var require_dist4 = __commonJS({
     Object.defineProperty(exports2, "reconstructTranscriptPath", { enumerable: true, get: function() {
       return claude_paths_1.reconstructTranscriptPath;
     } });
+    __exportStar(require_sidekick_paths(), exports2);
     var persona_loader_1 = require_persona_loader();
     Object.defineProperty(exports2, "createPersonaLoader", { enumerable: true, get: function() {
       return persona_loader_1.createPersonaLoader;
@@ -64821,6 +64984,10 @@ var require_dist4 = __commonJS({
     Object.defineProperty(exports2, "CoalescingGuard", { enumerable: true, get: function() {
       return coalescing_guard_1.CoalescingGuard;
     } });
+    var build_identity_1 = require_build_identity();
+    Object.defineProperty(exports2, "computeBuildIdentity", { enumerable: true, get: function() {
+      return build_identity_1.computeBuildIdentity;
+    } });
   }
 });
 
@@ -64833,13 +65000,12 @@ var require_runtime = __commonJS({
     var core_1 = require_dist4();
     var types_1 = require_dist();
     var node_crypto_1 = require("node:crypto");
-    var node_os_1 = require("node:os");
     var node_path_1 = require("node:path");
-    function getLogFilePath(projectRoot) {
+    function getLogFilePath(projectRoot, homeDir) {
       if (projectRoot) {
-        return (0, node_path_1.join)(projectRoot, ".sidekick", "logs", "sidekick.log");
+        return (0, node_path_1.join)((0, core_1.projectStateDir)(projectRoot, homeDir), "logs", "sidekick.log");
       }
-      return (0, node_path_1.join)((0, node_os_1.homedir)(), ".sidekick", "logs", "sidekick.log");
+      return (0, node_path_1.join)((0, core_1.userSidekickRoot)(homeDir), "logs", "sidekick.log");
     }
     function bootstrapRuntime(options) {
       const correlationId = options.correlationId ?? (0, node_crypto_1.randomUUID)();
@@ -64873,7 +65039,7 @@ var require_runtime = __commonJS({
         correlationId,
         command: options.command
       };
-      const logFilePath = getLogFilePath(projectRoot);
+      const logFilePath = getLogFilePath(projectRoot, options.homeDir);
       const isInteractive = options.interactive ?? process.env.SIDEKICK_INTERACTIVE === "1";
       const enableFileLogging = options.enableFileLogging ?? true;
       const rotation = config.core.logging.rotation;
@@ -64923,7 +65089,7 @@ var require_runtime = __commonJS({
         }
       });
       const telemetry = logManager.getTelemetry();
-      const sessionsDir = projectRoot ? (0, node_path_1.join)(projectRoot, ".sidekick", "sessions") : (0, node_path_1.join)((0, node_os_1.homedir)(), ".sidekick", "sessions");
+      const sessionsDir = projectRoot ? (0, node_path_1.join)((0, core_1.projectStateDir)(projectRoot, options.homeDir), "sessions") : (0, node_path_1.join)((0, core_1.userSidekickRoot)(options.homeDir), "sessions");
       const sessionLogWriter = new core_1.SessionLogWriter({
         sessionsDir,
         maxHandles: 2,
@@ -64940,14 +65106,14 @@ var require_runtime = __commonJS({
         logger.debug("Configuration sources loaded", { sources: config.sources });
       }
       logger.debug("Asset resolver initialized", { cascadeLayers: assets.cascadeLayers });
-      const stateRoot = projectRoot ?? (0, node_path_1.join)((0, node_os_1.homedir)(), ".claude");
-      const stateService = new core_1.StateService(stateRoot, { logger });
+      const stateService = projectRoot ? new core_1.StateService(projectRoot, { logger, homeDir: options.homeDir }) : new core_1.StateService((0, core_1.userSidekickRoot)(options.homeDir), { stateDir: "", logger });
       return {
         get logger() {
           return logger;
         },
         telemetry,
         projectRoot,
+        homeDir: options.homeDir,
         config,
         assets,
         stateService,
@@ -65019,10 +65185,10 @@ var require_dev_mode_guard = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.checkDevModeConflict = checkDevModeConflict;
     var core_1 = require_dist4();
-    async function checkDevModeConflict(projectRoot, forceDevMode, logger, callerLabel) {
+    async function checkDevModeConflict(projectRoot, forceDevMode, logger, callerLabel, home) {
       if (forceDevMode) {
         try {
-          const setupService = new core_1.SetupStatusService(projectRoot);
+          const setupService = new core_1.SetupStatusService(projectRoot, { homeDir: home });
           const devMode = await setupService.getDevMode();
           if (!devMode) {
             logger.warn(`Dev-mode ${callerLabel} running but devMode flag is off \u2014 auto-correcting`, {
@@ -65039,7 +65205,7 @@ var require_dev_mode_guard = __commonJS({
         return "proceed";
       }
       try {
-        const setupService = new core_1.SetupStatusService(projectRoot);
+        const setupService = new core_1.SetupStatusService(projectRoot, { homeDir: home });
         const devMode = await setupService.getDevMode();
         if (devMode) {
           logger.debug(`Dev-mode active, ${callerLabel} bailing early (let dev-mode hooks win)`, {
@@ -75173,6 +75339,7 @@ var require_stage_persona_reminders = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.restagePersonaRemindersForActiveSessions = restagePersonaRemindersForActiveSessions;
     exports2.stagePersonaRemindersForSession = stagePersonaRemindersForSession;
+    exports2.resolvePersonaContextForSnapshot = resolvePersonaContextForSnapshot;
     exports2.registerStagePersonaReminders = registerStagePersonaReminders;
     var core_1 = require_dist4();
     var events_js_1 = require_events2();
@@ -75336,6 +75503,20 @@ var require_stage_persona_reminders = __commonJS({
         includeChanged: options?.includeChangedReminder ?? false
       });
     }
+    async function resolvePersonaContextForSnapshot(ctx, sessionId) {
+      if (!isPersonaInjectionEnabled(ctx))
+        return void 0;
+      const persona = await loadPersonaForSession(ctx, sessionId);
+      if (!persona)
+        return void 0;
+      const templateContext = buildPersonaTemplateContext(persona);
+      const reminder = (0, reminder_utils_js_1.resolveReminder)(types_js_1.ReminderIds.REMEMBER_YOUR_PERSONA, {
+        context: templateContext,
+        assets: ctx.assets,
+        logger: ctx.logger
+      });
+      return reminder?.additionalContext ?? void 0;
+    }
     function registerStagePersonaReminders(context) {
       if (!(0, types_1.isDaemonContext)(context))
         return;
@@ -75364,6 +75545,7 @@ var require_stage_user_profile_reminders = __commonJS({
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.stageUserProfileRemindersForSession = stageUserProfileRemindersForSession;
+    exports2.resolveUserProfileContextForSnapshot = resolveUserProfileContextForSnapshot;
     exports2.registerStageUserProfileReminders = registerStageUserProfileReminders;
     var core_1 = require_dist4();
     var events_js_1 = require_events2();
@@ -75403,6 +75585,21 @@ var require_stage_user_profile_reminders = __commonJS({
         ctx.logger.warn("Failed to resolve user-profile reminder", { sessionId });
       }
     }
+    function resolveUserProfileContextForSnapshot(ctx) {
+      const profile = (0, core_1.loadUserProfile)({ logger: ctx.logger });
+      if (!profile)
+        return void 0;
+      const templateContext = {
+        user_name: profile.name,
+        user_role: profile.role,
+        user_interests: profile.interests.join(", ")
+      };
+      const reminder = (0, reminder_utils_js_1.resolveReminder)(types_js_1.ReminderIds.USER_PROFILE, {
+        context: templateContext,
+        assets: ctx.assets
+      });
+      return reminder?.additionalContext ?? void 0;
+    }
     function registerStageUserProfileReminders(context) {
       if (!(0, types_1.isDaemonContext)(context))
         return;
@@ -75498,10 +75695,10 @@ var require_cli_staging_reader = __commonJS({
       stateDir;
       sessionId;
       constructor(options) {
-        if (!options.paths.projectConfigDir) {
-          throw new Error("CLIStagingReader requires project scope (projectConfigDir must be defined)");
+        if (!options.paths.projectStateDir) {
+          throw new Error("CLIStagingReader requires project scope (projectStateDir must be defined)");
         }
-        this.stateDir = options.paths.projectConfigDir;
+        this.stateDir = options.paths.projectStateDir;
         this.sessionId = options.sessionId;
       }
       /**
@@ -75865,6 +76062,22 @@ var require_inject_session_start = __commonJS({
   }
 });
 
+// ../feature-reminders/dist/handlers/consumption/inject-post-compact.js
+var require_inject_post_compact = __commonJS({
+  "../feature-reminders/dist/handlers/consumption/inject-post-compact.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.registerInjectPostCompact = registerInjectPostCompact;
+    var consumption_handler_factory_js_1 = require_consumption_handler_factory();
+    function registerInjectPostCompact(context) {
+      (0, consumption_handler_factory_js_1.createConsumptionHandler)(context, {
+        id: "reminders:inject-post-compact",
+        hook: "PostCompact"
+      });
+    }
+  }
+});
+
 // ../feature-reminders/dist/handlers/consumption/index.js
 var require_consumption = __commonJS({
   "../feature-reminders/dist/handlers/consumption/index.js"(exports2) {
@@ -75876,12 +76089,14 @@ var require_consumption = __commonJS({
     var inject_post_tool_use_1 = require_inject_post_tool_use();
     var inject_stop_1 = require_inject_stop();
     var inject_session_start_1 = require_inject_session_start();
+    var inject_post_compact_js_1 = require_inject_post_compact();
     function registerConsumptionHandlers(context) {
       (0, inject_user_prompt_submit_1.registerInjectUserPromptSubmit)(context);
       (0, inject_pre_tool_use_1.registerInjectPreToolUse)(context);
       (0, inject_post_tool_use_1.registerInjectPostToolUse)(context);
       (0, inject_stop_1.registerInjectStop)(context);
       (0, inject_session_start_1.registerInjectSessionStart)(context);
+      (0, inject_post_compact_js_1.registerInjectPostCompact)(context);
     }
   }
 });
@@ -76326,7 +76541,7 @@ var require_dist5 = __commonJS({
       for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports3, p)) __createBinding(exports3, m, p);
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.createRemindersState = exports2.ReminderOrchestrator = exports2.ReminderEvents = exports2.handleVCUnverifiedClear = exports2.handleVCUnverifiedSet = exports2.handleReminderConsumed = exports2.classifyCompletion = exports2.restagePersonaRemindersForActiveSessions = exports2.stagePersonaRemindersForSession = exports2.registerStagingHandlers = exports2.registerConsumptionHandlers = exports2.manifest = void 0;
+    exports2.createRemindersState = exports2.ReminderOrchestrator = exports2.ReminderEvents = exports2.handleVCUnverifiedClear = exports2.handleVCUnverifiedSet = exports2.handleReminderConsumed = exports2.classifyCompletion = exports2.resolveUserProfileContextForSnapshot = exports2.resolvePersonaContextForSnapshot = exports2.restagePersonaRemindersForActiveSessions = exports2.stagePersonaRemindersForSession = exports2.registerStagingHandlers = exports2.registerConsumptionHandlers = exports2.manifest = void 0;
     exports2.register = register;
     var staging_1 = require_staging2();
     var consumption_1 = require_consumption();
@@ -76360,6 +76575,13 @@ var require_dist5 = __commonJS({
     Object.defineProperty(exports2, "restagePersonaRemindersForActiveSessions", { enumerable: true, get: function() {
       return stage_persona_reminders_1.restagePersonaRemindersForActiveSessions;
     } });
+    Object.defineProperty(exports2, "resolvePersonaContextForSnapshot", { enumerable: true, get: function() {
+      return stage_persona_reminders_1.resolvePersonaContextForSnapshot;
+    } });
+    var stage_user_profile_reminders_1 = require_stage_user_profile_reminders();
+    Object.defineProperty(exports2, "resolveUserProfileContextForSnapshot", { enumerable: true, get: function() {
+      return stage_user_profile_reminders_1.resolveUserProfileContextForSnapshot;
+    } });
     var completion_classifier_1 = require_completion_classifier();
     Object.defineProperty(exports2, "classifyCompletion", { enumerable: true, get: function() {
       return completion_classifier_1.classifyCompletion;
@@ -76397,7 +76619,6 @@ var require_context2 = __commonJS({
     exports2.buildCLIContext = buildCLIContext;
     exports2.registerCLIFeatures = registerCLIFeatures;
     var node_path_1 = require("node:path");
-    var node_os_1 = require("node:os");
     var core_1 = require_dist4();
     var feature_reminders_1 = require_dist5();
     function buildCLIContext(options) {
@@ -76408,8 +76629,11 @@ var require_context2 = __commonJS({
       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")
+        userConfigDir: (0, core_1.userSidekickRoot)(runtime.homeDir),
+        projectConfigDir: (0, node_path_1.join)(projectRoot, ".sidekick"),
+        // Single source: the runtime's StateService already resolves the project
+        // state dir under the injected home — don't recompute and risk drift.
+        projectStateDir: runtime.stateService.rootDir()
       };
       const handlers = new core_1.HandlerRegistryImpl({
         logger: runtime.logger,
@@ -76593,6 +76817,18 @@ var require_hook = __commonJS({
         }
       };
     }
+    function buildPostCompactEvent(context, input) {
+      const trigger = input.raw.compaction_trigger;
+      return {
+        kind: "hook",
+        hook: "PostCompact",
+        context,
+        payload: {
+          compactionTrigger: trigger === "manual" ? "manual" : "auto",
+          transcriptPath: input.transcriptPath
+        }
+      };
+    }
     function buildSubagentStartEvent(context, input) {
       return {
         kind: "hook",
@@ -76649,6 +76885,8 @@ var require_hook = __commonJS({
           return buildStopEvent(context, input);
         case "PreCompact":
           return buildPreCompactEvent(context, input);
+        case "PostCompact":
+          return buildPostCompactEvent(context, input);
         case "SubagentStart": {
           const subagentContext = {
             ...context,
@@ -76892,6 +77130,17 @@ var require_hook_command = __commonJS({
       addUserMessage(response, internal.userMessage);
       return response;
     }
+    function translatePostCompact(internal) {
+      const response = {};
+      if (internal.additionalContext) {
+        response.hookSpecificOutput = {
+          hookEventName: "PostCompact",
+          additionalContext: internal.additionalContext
+        };
+      }
+      addUserMessage(response, internal.userMessage);
+      return response;
+    }
     var TRANSLATORS = {
       SessionStart: translateSessionStart,
       SessionEnd: () => ({}),
@@ -76900,6 +77149,7 @@ var require_hook_command = __commonJS({
       PostToolUse: translatePostToolUse,
       Stop: translateStop,
       PreCompact: () => ({}),
+      PostCompact: translatePostCompact,
       SubagentStart: translateSubagentStart,
       // SubagentStop shares Stop's blocking semantics verbatim per Claude Code docs.
       SubagentStop: translateStop
@@ -76915,6 +77165,7 @@ var require_hook_command = __commonJS({
       "post-tool-use": "PostToolUse",
       stop: "Stop",
       "pre-compact": "PreCompact",
+      "post-compact": "PostCompact",
       "subagent-start": "SubagentStart",
       "subagent-stop": "SubagentStop",
       SessionStart: "SessionStart",
@@ -76924,6 +77175,7 @@ var require_hook_command = __commonJS({
       PostToolUse: "PostToolUse",
       Stop: "Stop",
       PreCompact: "PreCompact",
+      PostCompact: "PostCompact",
       SubagentStart: "SubagentStart",
       SubagentStop: "SubagentStop"
     };
@@ -76945,9 +77197,9 @@ var require_hook_command = __commonJS({
       }
     };
     var VERBOSE_DEGRADED_HOOKS = /* @__PURE__ */ new Set(["SessionStart", "UserPromptSubmit"]);
-    async function maybeAutoConfigureProject(projectRoot, logger) {
+    async function maybeAutoConfigureProject(projectRoot, logger, home) {
       try {
-        const setupService = new core_1.SetupStatusService(projectRoot, { logger });
+        const setupService = new core_1.SetupStatusService(projectRoot, { logger, homeDir: home });
         const shouldAuto = await setupService.shouldAutoConfigureProject();
         if (!shouldAuto)
           return false;
@@ -76964,10 +77216,10 @@ var require_hook_command = __commonJS({
         return false;
       }
     }
-    async function checkSetupState(projectRoot, hookName, logger) {
+    async function checkSetupState(projectRoot, hookName, logger, home) {
       let state;
       try {
-        const setupService = new core_1.SetupStatusService(projectRoot);
+        const setupService = new core_1.SetupStatusService(projectRoot, { homeDir: home });
         state = await setupService.getSetupState();
       } catch (err) {
         logger.warn("Failed to check setup state, assuming healthy", {
@@ -76995,13 +77247,13 @@ var require_hook_command = __commonJS({
         userMessage: messages.userMessage
       };
     }
-    async function ensureDaemonForHook(projectRoot, logger) {
+    async function ensureDaemonForHook(projectRoot, logger, home) {
       if ((0, core_1.isInSandbox)()) {
         logger.debug("Skipping daemon start \u2014 sandbox mode");
         return false;
       }
       try {
-        const setupService = new core_1.SetupStatusService(projectRoot);
+        const setupService = new core_1.SetupStatusService(projectRoot, { homeDir: home });
         const setupState = await setupService.getSetupState();
         if (setupState !== "healthy") {
           logger.debug("Skipping daemon start - setup not healthy", { setupState });
@@ -77016,11 +77268,11 @@ var require_hook_command = __commonJS({
         const daemonClient = new core_1.DaemonClient(projectRoot, logger);
         await daemonClient.start();
         logger.debug("Daemon started for hook execution");
-        await (0, core_1.updateDaemonHealth)(projectRoot, "healthy", logger);
+        await (0, core_1.updateDaemonHealth)(projectRoot, "healthy", logger, void 0, home);
         return true;
       } catch (err) {
         const errorMessage = (0, core_1.toErrorMessage)(err);
-        await (0, core_1.updateDaemonHealth)(projectRoot, "failed", logger, errorMessage);
+        await (0, core_1.updateDaemonHealth)(projectRoot, "failed", logger, errorMessage, home);
         return false;
       }
     }
@@ -77045,17 +77297,17 @@ var require_hook_command = __commonJS({
       }
       const { projectRoot, hookInput, correlationId, runtime, forceDevMode } = options;
       logger.debug("Unified hook command invoked", { hookName, sessionId: hookInput.sessionId });
-      const devModeGuard = await (0, dev_mode_guard_js_1.checkDevModeConflict)(projectRoot, forceDevMode, logger, hookName);
+      const devModeGuard = await (0, dev_mode_guard_js_1.checkDevModeConflict)(projectRoot, forceDevMode, logger, hookName, runtime.homeDir);
       if (devModeGuard === "bail") {
         stdout.write("{}\n");
         return { exitCode: 0, output: "{}" };
       }
       if (hookName === "SessionStart") {
-        await maybeAutoConfigureProject(projectRoot, logger);
+        await maybeAutoConfigureProject(projectRoot, logger, runtime.homeDir);
       }
-      const daemonAvailable = await ensureDaemonForHook(projectRoot, logger);
+      const daemonAvailable = await ensureDaemonForHook(projectRoot, logger, runtime.homeDir);
       const isLivenessCheck = !!process.env.SIDEKICK_LIVENESS_CHECK;
-      const degradedResponse = isLivenessCheck ? null : await checkSetupState(projectRoot, hookName, logger);
+      const degradedResponse = isLivenessCheck ? null : await checkSetupState(projectRoot, hookName, logger, runtime.homeDir);
       if (degradedResponse !== null) {
         const claudeResponse2 = translateToClaudeCodeFormat(hookName, degradedResponse);
         const outputStr2 = JSON.stringify(claudeResponse2);
@@ -78932,9 +79184,7 @@ var require_resume_discovery = __commonJS({
     })();
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.discoverPreviousResumeMessage = discoverPreviousResumeMessage;
-    exports2.projectRootFromSessionsDir = projectRootFromSessionsDir;
     var fs = __importStar(require("node:fs/promises"));
-    var path = __importStar(require("node:path"));
     var core_1 = require_dist4();
     var feature_session_summary_1 = require_dist6();
     async function discoverPreviousResumeMessage(config, stateService) {
@@ -78981,9 +79231,6 @@ var require_resume_discovery = __commonJS({
     function isNodeError(error) {
       return error instanceof Error && "code" in error;
     }
-    function projectRootFromSessionsDir(sessionsDir) {
-      return path.dirname(path.dirname(sessionsDir));
-    }
   }
 });
 
@@ -78994,7 +79241,6 @@ var require_state_reader = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.StateReader = void 0;
     exports2.createStateReader = createStateReader;
-    exports2.discoverPreviousResumeMessage = discoverPreviousResumeMessage;
     var core_1 = require_dist4();
     var feature_session_summary_1 = require_dist6();
     var types_js_1 = require_types3();
@@ -79213,12 +79459,6 @@ var require_state_reader = __commonJS({
         staleThresholdMs: options?.staleThresholdMs
       });
     }
-    var resume_discovery_js_1 = require_resume_discovery();
-    async function discoverPreviousResumeMessage(sessionsDir, currentSessionId) {
-      const projectRoot = (0, resume_discovery_js_1.projectRootFromSessionsDir)(sessionsDir);
-      const stateService = new core_1.StateService(projectRoot);
-      return (0, resume_discovery_js_1.discoverPreviousResumeMessage)({ sessionsDir, currentSessionId }, stateService);
-    }
   }
 });
 
@@ -79784,8 +80024,8 @@ var require_context_overhead_reader = __commonJS({
       const result = await stateService.read(filePath, types_1.BaseTokenMetricsStateSchema, types_1.DEFAULT_BASE_METRICS);
       return result.data;
     }
-    async function readProjectMetrics(projectDir) {
-      const stateService = new core_1.StateService(projectDir);
+    async function readProjectMetrics(projectDir, home) {
+      const stateService = new core_1.StateService(projectDir, { homeDir: home });
       const filePath = stateService.globalStatePath(PROJECT_METRICS_FILE);
       const result = await stateService.read(filePath, types_1.ProjectContextMetricsSchema, types_1.DEFAULT_PROJECT_METRICS);
       return result.data;
@@ -79806,7 +80046,7 @@ var require_context_overhead_reader = __commonJS({
     async function readContextOverhead(config) {
       const [base, project] = await Promise.all([
         readBaseMetrics(config.userConfigDir),
-        readProjectMetrics(config.projectDir)
+        readProjectMetrics(config.projectDir, config.homeDir)
       ]);
       return buildOverhead(base, project);
     }
@@ -79866,6 +80106,7 @@ var require_statusline_service = __commonJS({
     var formatter_js_1 = require_formatter();
     var git_provider_js_1 = require_git_provider();
     var state_reader_js_1 = require_state_reader();
+    var resume_discovery_js_1 = require_resume_discovery();
     var context_overhead_reader_js_1 = require_context_overhead_reader();
     var token_resolution_js_1 = require_token_resolution();
     var types_js_1 = require_types3();
@@ -79895,6 +80136,7 @@ var require_statusline_service = __commonJS({
       personaName: ""
     };
     var StatuslineService = class {
+      stateService;
       stateReader;
       gitProvider;
       formatter;
@@ -79928,6 +80170,7 @@ var require_statusline_service = __commonJS({
         this.projectDir = serviceConfig.projectDir;
         this.assets = serviceConfig.assets;
         this.resumeFreshnessHours = serviceConfig.personaConfig?.resumeFreshnessHours ?? 4;
+        this.stateService = serviceConfig.stateService;
         this.stateReader = (0, state_reader_js_1.createStateReader)(serviceConfig.stateService, serviceConfig.sessionId);
         this.gitProvider = (0, git_provider_js_1.createGitProvider)(serviceConfig.cwd);
         this.formatter = (0, formatter_js_1.createFormatter)({
@@ -80110,7 +80353,7 @@ var require_statusline_service = __commonJS({
           return this.buildWarningResult(setupCheck.warning);
         }
         if (this.projectDir) {
-          const daemonHealth = await (0, core_1.readDaemonHealth)(this.projectDir);
+          const daemonHealth = await (0, core_1.readDaemonHealth)(this.projectDir, this.homeDir);
           if (daemonHealth.status === "failed") {
             const warning = daemonHealth.error ? `Daemon not running: ${daemonHealth.error}. Sidekick features limited.` : "Daemon not running. Sidekick features limited.";
             return this.buildWarningResult(warning);
@@ -80138,7 +80381,7 @@ var require_statusline_service = __commonJS({
         let effectiveResumeData = resumeResult.data;
         const hasNoMeaningfulSummary = !summaryResult.data.session_title || summaryResult.data.session_title === "" || (summaryResult.data.session_title_confidence ?? 0) === 0;
         if (hasNoMeaningfulSummary && !effectiveResumeData && this.sessionsDir && this.sessionId) {
-          const discovery = await (0, state_reader_js_1.discoverPreviousResumeMessage)(this.sessionsDir, this.sessionId);
+          const discovery = await (0, resume_discovery_js_1.discoverPreviousResumeMessage)({ sessionsDir: this.sessionsDir, currentSessionId: this.sessionId, logger: this.logger }, this.stateService);
           if (discovery.source === "discovered" && discovery.data) {
             effectiveResumeData = discovery.data;
           }
@@ -80204,7 +80447,8 @@ var require_statusline_service = __commonJS({
             });
             const overhead = await (0, context_overhead_reader_js_1.readContextOverhead)({
               userConfigDir: this.userConfigDir,
-              projectDir: this.projectDir
+              projectDir: this.projectDir,
+              homeDir: this.homeDir
             });
             this.logger?.debug("Successfully read baseline context overhead metrics", { overhead });
             return overhead;
@@ -80408,7 +80652,7 @@ var require_dist7 = __commonJS({
       for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports3, p)) __createBinding(exports3, m, p);
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.getDefaultOverhead = exports2.readContextOverhead = exports2.createStatuslineService = exports2.StatuslineService = exports2.getThresholdStatus = exports2.formatBranch = exports2.formatDuration = exports2.formatCost = exports2.formatTokens = exports2.createFormatter = exports2.Formatter = exports2.createGitProvider = exports2.GitProvider = exports2.createStateReader = exports2.StateReader = exports2.projectRootFromSessionsDir = exports2.discoverPreviousResumeMessageDI = exports2.resolveEffectiveTokens = exports2.truncatePath = exports2.truncatePrefix = exports2.truncateSuffix = exports2.visibleLength = exports2.stripAnsi = void 0;
+    exports2.getDefaultOverhead = exports2.readContextOverhead = exports2.createStatuslineService = exports2.StatuslineService = exports2.getThresholdStatus = exports2.formatBranch = exports2.formatDuration = exports2.formatCost = exports2.formatTokens = exports2.createFormatter = exports2.Formatter = exports2.createGitProvider = exports2.GitProvider = exports2.createStateReader = exports2.StateReader = exports2.discoverPreviousResumeMessageDI = exports2.resolveEffectiveTokens = exports2.truncatePath = exports2.truncatePrefix = exports2.truncateSuffix = exports2.visibleLength = exports2.stripAnsi = void 0;
     __exportStar(require_types3(), exports2);
     var ansi_utils_js_1 = require_ansi_utils();
     Object.defineProperty(exports2, "stripAnsi", { enumerable: true, get: function() {
@@ -80435,9 +80679,6 @@ var require_dist7 = __commonJS({
     Object.defineProperty(exports2, "discoverPreviousResumeMessageDI", { enumerable: true, get: function() {
       return resume_discovery_js_1.discoverPreviousResumeMessage;
     } });
-    Object.defineProperty(exports2, "projectRootFromSessionsDir", { enumerable: true, get: function() {
-      return resume_discovery_js_1.projectRootFromSessionsDir;
-    } });
     var state_reader_js_1 = require_state_reader();
     Object.defineProperty(exports2, "StateReader", { enumerable: true, get: function() {
       return state_reader_js_1.StateReader;
@@ -80627,7 +80868,8 @@ Examples:
         stdout.write(USAGE_TEXT);
         return { exitCode: 0 };
       }
-      const devModeGuard = await (0, dev_mode_guard_js_1.checkDevModeConflict)(projectDir, options.forceDevMode, logger, "statusline");
+      const homeDir = options.homeDir ?? process.env.HOME;
+      const devModeGuard = await (0, dev_mode_guard_js_1.checkDevModeConflict)(projectDir, options.forceDevMode, logger, "statusline", homeDir);
       if (devModeGuard === "bail") {
         stdout.write("\n");
         return { exitCode: 0 };
@@ -80637,7 +80879,7 @@ Examples:
       const startTime = performance.now();
       const { createStatuslineService, stripAnsi } = await Promise.resolve().then(() => __importStar(require_dist7()));
       const sessionId = options.sessionId ?? "current";
-      const stateService = new core_1.StateService(projectDir);
+      const stateService = new core_1.StateService(projectDir, { homeDir });
       if (sessionId !== "current") {
         const personaStatePath = stateService.sessionStatePath(sessionId, "session-persona.json");
         if (!(0, node_fs_1.existsSync)(personaStatePath)) {
@@ -80667,7 +80909,7 @@ Examples:
       if (options.hookInput?.context_window) {
         logger.debug("ClaudeCodeContextWindow", { context_window: options.hookInput.context_window });
       }
-      const userConfigDir = process.env.HOME ? path.join(process.env.HOME, ".sidekick") : void 0;
+      const userConfigDir = homeDir ? path.join(homeDir, ".sidekick") : void 0;
       const sessionsDir = stateService.sessionsDir();
       const sessionSummaryConfig = options.configService?.getFeature("session-summary");
       const resumeFreshnessHours = sessionSummaryConfig?.settings?.personas?.resumeFreshnessHours;
@@ -80675,7 +80917,7 @@ Examples:
         stateService,
         sessionId,
         cwd,
-        homeDir: process.env.HOME,
+        homeDir,
         isResumedSession: options.isResumed ?? false,
         useColors,
         // Pass hook input directly - service will use these instead of reading state files
@@ -81060,7 +81302,7 @@ var require_persona2 = __commonJS({
       if (validation.result)
         return validation.result;
       const personas = validation.personas;
-      const stateService = new core_1.StateService(projectRoot, { cache: false, logger });
+      const stateService = new core_1.StateService(projectRoot, { cache: false, logger, homeDir: options.homeDir });
       const personaAccessor = new core_1.SessionStateAccessor(stateService, SessionPersonaDescriptor);
       try {
         const existingResult = await personaAccessor.read(sessionId);
@@ -81098,7 +81340,7 @@ var require_persona2 = __commonJS({
         return { exitCode: 1, output: error };
       }
       logger.info("Clearing persona", { sessionId });
-      const stateService = new core_1.StateService(projectRoot, { cache: false, logger });
+      const stateService = new core_1.StateService(projectRoot, { cache: false, logger, homeDir: options.homeDir });
       const personaAccessor = new core_1.SessionStateAccessor(stateService, SessionPersonaDescriptor);
       try {
         const existingResult = await personaAccessor.read(sessionId);
@@ -81143,7 +81385,7 @@ var require_persona2 = __commonJS({
           return writeJsonResponse(stdout, { error: errorMsg }, 1);
         }
         const stateFileName = testType === "snarky" ? "snarky-message.json" : "resume-message.json";
-        const stateService = new core_1.StateService(projectRoot, { cache: false, logger });
+        const stateService = new core_1.StateService(projectRoot, { cache: false, logger, homeDir: options.homeDir });
         const statePath = stateService.sessionStatePath(sessionId, stateFileName);
         try {
           const content = await (0, promises_12.readFile)(statePath, "utf-8");
@@ -81577,7 +81819,7 @@ Examples:
         return { exitCode: 0, output: "" };
       }
       const format3 = options.format ?? "table";
-      const stateService = new core_1.StateService(projectRoot);
+      const stateService = new core_1.StateService(projectRoot, { homeDir: options.homeDir });
       const sessionsDir = stateService.sessionsDir();
       logger.debug("Listing sessions", { sessionsDir });
       try {
@@ -81887,7 +82129,8 @@ var require_dev_mode = __commonJS({
       "PreToolUse",
       "PostToolUse",
       "Stop",
-      "PreCompact"
+      "PreCompact",
+      "PostCompact"
     ];
     var HOOK_SCRIPTS = [
       "session-start",
@@ -81897,6 +82140,7 @@ var require_dev_mode = __commonJS({
       "post-tool-use",
       "stop",
       "pre-compact",
+      "post-compact",
       "statusline"
     ];
     async function collectMdFiles(dir) {
@@ -82007,7 +82251,7 @@ var require_dev_mode = __commonJS({
       await (0, promises_12.writeFile)(backupPath, content);
       log(stdout, "info", `Backup created: ${backupPath}`);
     }
-    async function doEnable(projectDir, stdout) {
+    async function doEnable(projectDir, stdout, home) {
       log(stdout, "step", "Enabling dev-mode hooks...");
       const devHooksDir = node_path_1.default.join(projectDir, "scripts", "dev-sidekick");
       const settingsPath = node_path_1.default.join(projectDir, ".claude", "settings.local.json");
@@ -82048,7 +82292,8 @@ var require_dev_mode = __commonJS({
         { type: "PreToolUse", script: "pre-tool-use" },
         { type: "PostToolUse", script: "post-tool-use", matcher: "*" },
         { type: "Stop", script: "stop" },
-        { type: "PreCompact", script: "pre-compact" }
+        { type: "PreCompact", script: "pre-compact" },
+        { type: "PostCompact", script: "post-compact" }
       ];
       for (const { type, script, matcher } of hookConfig) {
         const command = `${devHooksPath}/${script}`;
@@ -82064,7 +82309,7 @@ var require_dev_mode = __commonJS({
       }
       settings.statusLine = { type: "command", command: `${devHooksPath}/statusline` };
       await (0, settings_js_1.writeSettingsFile)(settingsPath, settings);
-      const setupService = new core_1.SetupStatusService(projectDir);
+      const setupService = new core_1.SetupStatusService(projectDir, { homeDir: home });
       await setupService.setDevMode(true);
       await setupService.updateProjectStatus({ statusline: "local", gitignore: "installed" });
       log(stdout, "info", `Dev-mode hooks enabled in ${settingsPath}`);
@@ -82079,7 +82324,7 @@ var require_dev_mode = __commonJS({
       log(stdout, "info", "  2. Verify sidekick is active (check statusline or run: pnpm sidekick doctor)");
       return { exitCode: 0 };
     }
-    async function doDisable(projectDir, logger, stdout) {
+    async function doDisable(projectDir, logger, stdout, home) {
       log(stdout, "step", "Disabling dev-mode hooks...");
       const settingsPath = node_path_1.default.join(projectDir, ".claude", "settings.local.json");
       if (!await (0, fs_js_1.fileExists)(settingsPath)) {
@@ -82111,7 +82356,7 @@ var require_dev_mode = __commonJS({
       if (isDevHookCommand(settings.statusLine?.command)) {
         delete settings.statusLine;
       }
-      const setupService = new core_1.SetupStatusService(projectDir);
+      const setupService = new core_1.SetupStatusService(projectDir, { homeDir: home });
       await setupService.setDevMode(false);
       const writeResult = await (0, settings_js_1.writeSettingsFile)(settingsPath, settings);
       if (writeResult === "deleted") {
@@ -82203,8 +82448,8 @@ var require_dev_mode = __commonJS({
     async function doClean(projectDir, logger, stdout, options = {}) {
       const { force = false, stdin = process.stdin } = options;
       log(stdout, "step", "Cleaning up sidekick state...");
-      const sidekickDir = node_path_1.default.join(projectDir, ".sidekick");
-      const logsDir = node_path_1.default.join(sidekickDir, "logs");
+      const stateDir = (0, core_1.projectStateDir)(projectDir, options.homeDir);
+      const logsDir = node_path_1.default.join(stateDir, "logs");
       const daemonClient = new core_1.DaemonClient(projectDir, logger);
       const killResult = await daemonClient.kill();
       if (killResult.killed) {
@@ -82231,7 +82476,7 @@ var require_dev_mode = __commonJS({
       } else {
         log(stdout, "info", "No logs directory found");
       }
-      await cleanStateFolder(node_path_1.default.join(sidekickDir, "state"), "Project", stdout);
+      await cleanStateFolder(node_path_1.default.join(stateDir, "state"), "Project", stdout);
       await cleanStateFolder(node_path_1.default.join(node_os_1.default.homedir(), ".sidekick", "state"), "Global", stdout);
       stdout.write("\n");
       log(stdout, "step", "Checking for zombie daemon processes...");
@@ -82263,11 +82508,11 @@ var require_dev_mode = __commonJS({
     async function doCleanAll(projectDir, logger, stdout, options = {}) {
       const { force = false, stdin = process.stdin } = options;
       await doClean(projectDir, logger, stdout, options);
-      const sidekickDir = node_path_1.default.join(projectDir, ".sidekick");
+      const stateDir = (0, core_1.projectStateDir)(projectDir, options.homeDir);
       stdout.write("\n");
       log(stdout, "step", "Removing logs, sessions, and state directories...");
-      await removeDirectory(node_path_1.default.join(sidekickDir, "logs"), "logs", stdout);
-      const sessionsDir = node_path_1.default.join(sidekickDir, "sessions");
+      await removeDirectory(node_path_1.default.join(stateDir, "logs"), "logs", stdout);
+      const sessionsDir = node_path_1.default.join(stateDir, "sessions");
       if (await (0, fs_js_1.fileExists)(sessionsDir)) {
         try {
           const sessions = await (0, promises_12.readdir)(sessionsDir);
@@ -82291,8 +82536,8 @@ var require_dev_mode = __commonJS({
       } else {
         log(stdout, "info", "No sessions directory found");
       }
-      await removeDirectory(node_path_1.default.join(sidekickDir, "state"), "state", stdout);
-      const setupStatusPath = node_path_1.default.join(sidekickDir, core_1.PROJECT_STATUS_FILENAME);
+      await removeDirectory(node_path_1.default.join(stateDir, "state"), "state", stdout);
+      const setupStatusPath = node_path_1.default.join(stateDir, core_1.PROJECT_STATUS_FILENAME);
       if (await (0, fs_js_1.fileExists)(setupStatusPath)) {
         await (0, promises_12.unlink)(setupStatusPath);
         log(stdout, "info", `Removed ${setupStatusPath}`);
@@ -82316,7 +82561,7 @@ var require_dev_mode = __commonJS({
     async function doCleanAllProjects(logger, stdout, options = {}) {
       const { force = false, stdin = process.stdin } = options;
       const registryRoot = node_path_1.default.join(node_os_1.default.homedir(), ".sidekick", "projects");
-      const registry = new core_1.ProjectRegistryService(registryRoot);
+      const registry = new core_1.ProjectRegistryService(registryRoot, logger);
       const projects = await registry.list();
       if (projects.length === 0) {
         log(stdout, "info", `No registered projects found in ${registryRoot}`);
@@ -82377,9 +82622,9 @@ Options:
     async function handleDevModeCommand(subcommand, projectDir, logger, stdout, options = {}) {
       switch (subcommand) {
         case "enable":
-          return doEnable(projectDir, stdout);
+          return doEnable(projectDir, stdout, options.homeDir);
         case "disable":
-          return doDisable(projectDir, logger, stdout);
+          return doDisable(projectDir, logger, stdout, options.homeDir);
         case "status":
           return doStatus(projectDir, stdout);
         case "clean":
@@ -83109,6 +83354,71 @@ ${MARKER_END}
   }
 });
 
+// ../sidekick-cli/dist/commands/setup/legacy-state-cleanup.js
+var require_legacy_state_cleanup = __commonJS({
+  "../sidekick-cli/dist/commands/setup/legacy-state-cleanup.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.isLegacyDaemonAlive = isLegacyDaemonAlive;
+    exports2.detectLegacyState = detectLegacyState;
+    exports2.cleanLegacyState = cleanLegacyState;
+    var node_path_1 = require("node:path");
+    var promises_12 = require("node:fs/promises");
+    var fs_js_1 = require_fs();
+    var LEGACY_STATE_ENTRIES = [
+      "sessions",
+      "state",
+      "logs",
+      "setup-status.json",
+      "sidekickd.pid",
+      "sidekickd.token",
+      "sidekickd.lock"
+    ];
+    async function isLegacyDaemonAlive(projectDir) {
+      const legacyPid = (0, node_path_1.join)(projectDir, ".sidekick", "sidekickd.pid");
+      try {
+        const pid = parseInt(await (0, promises_12.readFile)(legacyPid, "utf-8"), 10);
+        if (!Number.isInteger(pid) || pid <= 0)
+          return false;
+        process.kill(pid, 0);
+        return true;
+      } catch (err) {
+        if (err.code === "EPERM")
+          return true;
+        return false;
+      }
+    }
+    async function detectLegacyState(projectDir) {
+      const sk = (0, node_path_1.join)(projectDir, ".sidekick");
+      const present = [];
+      for (const entry of LEGACY_STATE_ENTRIES) {
+        if (await (0, fs_js_1.fileExists)((0, node_path_1.join)(sk, entry)))
+          present.push(entry);
+      }
+      return present;
+    }
+    async function cleanLegacyState(projectDir) {
+      const present = await detectLegacyState(projectDir);
+      if (present.length === 0)
+        return { removed: [], refused: false };
+      if (await isLegacyDaemonAlive(projectDir)) {
+        return {
+          removed: [],
+          refused: true,
+          reason: "A pre-upgrade Sidekick daemon is still running against the old paths. Stop it first ('sidekick daemon stop' or 'sidekick daemon kill'), then re-run."
+        };
+      }
+      const sk = (0, node_path_1.join)(projectDir, ".sidekick");
+      const removed = [];
+      for (const entry of present) {
+        await (0, promises_12.rm)((0, node_path_1.join)(sk, entry), { recursive: true, force: true });
+        removed.push(entry);
+      }
+      return { removed, refused: false };
+    }
+  }
+});
+
 // ../sidekick-cli/dist/commands/setup/helpers.js
 var require_helpers = __commonJS({
   "../sidekick-cli/dist/commands/setup/helpers.js"(exports2) {
@@ -83372,6 +83682,7 @@ var require_doctor = __commonJS({
     var core_1 = require_dist4();
     var plugin_installer_js_1 = require_plugin_installer();
     var shell_alias_js_1 = require_shell_alias();
+    var legacy_state_cleanup_js_1 = require_legacy_state_cleanup();
     var helpers_js_1 = require_helpers();
     var DOCTOR_CHECK_NAMES = [
       "api-keys",
@@ -83382,7 +83693,8 @@ var require_doctor = __commonJS({
       "zombies",
       "auto-config",
       "shell-alias",
-      "llm-config"
+      "llm-config",
+      "legacy-state"
     ];
     var DEPRECATED_LLM_MODELS = [
       {
@@ -83467,7 +83779,7 @@ var require_doctor = __commonJS({
       }
     }
     async function runDoctorFixes(projectDir, logger, stdout, context) {
-      const { homeDir, filter, doctorResult, gitignore, pluginStatus, liveness } = context;
+      const { homeDir, filter, doctorResult, gitignore, pluginStatus, liveness, legacyState } = context;
       const isFullMode = filter === null;
       const shouldFix = (check) => isFullMode || filter.has(check);
       logger.info("Starting doctor fix mode", { homeDir, isFullMode, gitignore, pluginStatus, liveness });
@@ -83583,6 +83895,20 @@ var require_doctor = __commonJS({
           }
         }
       }
+      if (shouldFix("legacy-state") && legacyState.length > 0) {
+        const res = await (0, legacy_state_cleanup_js_1.cleanLegacyState)(projectDir);
+        if (res.refused) {
+          stdout.write(`Fixing: Legacy State
+  \u26A0 Skipped \u2014 ${res.reason}
+`);
+          unfixable.push("legacy-state");
+        } else if (res.removed.length > 0) {
+          stdout.write(`Fixing: Legacy State
+  \u2713 Removed ${res.removed.join(", ")}
+`);
+          fixedCount++;
+        }
+      }
       if (shouldFix("shell-alias")) {
         const shellInfo = (0, shell_alias_js_1.detectShell)(process.env.SHELL);
         if (shellInfo) {
@@ -83720,6 +84046,19 @@ var require_doctor = __commonJS({
           const zombieIcon = zombies.length === 0 ? "\u2713" : "\u26A0";
           const label = zombies.length === 0 ? "none detected" : `${zombies.length} found (run 'sidekick daemon kill-zombies' or 'sidekick doctor --fix --only=zombies')`;
           stdout.write(`${zombieIcon} Zombie Daemons: ${label}
+`);
+        }));
+      }
+      let legacyState = [];
+      if (shouldRun("legacy-state")) {
+        promises.push((0, legacy_state_cleanup_js_1.detectLegacyState)(projectDir).then((found) => {
+          legacyState = found;
+          const icon = found.length === 0 ? "\u2713" : "\u26A0";
+          const label = found.length === 0 ? "none \u2014 .sidekick is config-only" : `${found.length} legacy state entr${found.length === 1 ? "y" : "ies"} in .sidekick (run sidekick doctor --fix --only=legacy-state)`;
+          stdout.write(`${icon} Legacy State: ${label}
+`);
+        }).catch((err) => {
+          stdout.write(`\u26A0 Legacy State: could not read \u2014 ${err.message}
 `);
         }));
       }
@@ -83754,7 +84093,7 @@ var require_doctor = __commonJS({
       if (filter === null) {
         const isPluginOk = (0, helpers_js_1.isPluginPresent)(pluginStatus);
         const isPluginLive = liveness === null || liveness === "active";
-        const isHealthy = doctorResult.overallHealth === "healthy" && gitignore === "installed" && isPluginOk && isPluginLive && zombieCount === 0;
+        const isHealthy = doctorResult.overallHealth === "healthy" && gitignore === "installed" && isPluginOk && isPluginLive && zombieCount === 0 && legacyState.length === 0;
         const overallIcon = isHealthy ? "\u2713" : "\u26A0";
         stdout.write(`${overallIcon} Overall: ${isHealthy ? "healthy" : "needs attention"}
 `);
@@ -83765,7 +84104,8 @@ var require_doctor = __commonJS({
             doctorResult,
             gitignore,
             pluginStatus,
-            liveness
+            liveness,
+            legacyState
           });
         }
         if (!isHealthy) {
@@ -83780,7 +84120,8 @@ var require_doctor = __commonJS({
           doctorResult,
           gitignore,
           pluginStatus,
-          liveness
+          liveness,
+          legacyState
         });
       }
       return { exitCode: 0 };
@@ -84598,9 +84939,10 @@ var require_uninstall = __commonJS({
     var fs_js_1 = require_fs();
     var settings_js_1 = require_settings();
     async function handleUninstallCommand(projectDir, logger, stdout, options = {}) {
-      const { force = false, dryRun = false, scope, userHome = process.env.HOME || "", stdin = process.stdin } = options;
+      const { force = false, dryRun = false, scope, stdin = process.stdin } = options;
+      const userHome = (0, core_1.resolveHome)(options.userHome ?? process.env.HOME);
       const actions = [];
-      const projectDetected = scope !== "user" && await detectProjectScope(projectDir);
+      const projectDetected = scope !== "user" && await detectProjectScope(projectDir, userHome);
       const userDetected = scope !== "project" && await detectUserScope(userHome);
       if (!projectDetected && !userDetected) {
         stdout.write("No sidekick installation detected.\n");
@@ -84608,7 +84950,7 @@ var require_uninstall = __commonJS({
       }
       let devModeActive = false;
       if (projectDetected) {
-        const setupService = new core_1.SetupStatusService(projectDir);
+        const setupService = new core_1.SetupStatusService(projectDir, { homeDir: userHome });
         devModeActive = await setupService.getDevMode();
         if (devModeActive) {
           logger.info("Dev-mode active \u2014 skipping dev-mode-managed artifacts");
@@ -84659,15 +85001,16 @@ var require_uninstall = __commonJS({
         });
       }
       if (projectDetected) {
+        const projectStatusPath = path.join((0, core_1.projectStateDir)(projectDir, userHome), core_1.PROJECT_STATUS_FILENAME);
         if (devModeActive) {
           actions.push({
             scope: "project",
             artifact: core_1.PROJECT_STATUS_FILENAME,
-            path: path.join(projectDir, ".sidekick", core_1.PROJECT_STATUS_FILENAME),
+            path: projectStatusPath,
             action: "skipped"
           });
         } else {
-          await removeFile(path.join(projectDir, ".sidekick", core_1.PROJECT_STATUS_FILENAME), "project", core_1.PROJECT_STATUS_FILENAME, actions, {
+          await removeFile(projectStatusPath, "project", core_1.PROJECT_STATUS_FILENAME, actions, {
             dryRun
           });
         }
@@ -84689,18 +85032,13 @@ var require_uninstall = __commonJS({
         await handleEnvFile(path.join(userHome, ".sidekick", ".env"), "user", stdout, actions, { force, dryRun, stdin });
       }
       if (projectDetected) {
-        await removeDir(path.join(projectDir, ".sidekick", "logs"), "project", "logs/", actions, { dryRun });
-        await removeDir(path.join(projectDir, ".sidekick", "sessions"), "project", "sessions/", actions, { dryRun });
-        await removeDir(path.join(projectDir, ".sidekick", "state"), "project", "state/", actions, { dryRun });
-        await removeFile(path.join(projectDir, ".sidekick", "sidekickd.pid"), "project", "sidekickd.pid", actions, {
-          dryRun
-        });
-        await removeFile(path.join(projectDir, ".sidekick", "sidekickd.token"), "project", "sidekickd.token", actions, {
-          dryRun
-        });
-        await removeFile(path.join(projectDir, ".sidekick", "sidekickd.lock"), "project", "sidekickd.lock", actions, {
-          dryRun
-        });
+        const stateDir = (0, core_1.projectStateDir)(projectDir, userHome);
+        await removeDir(path.join(stateDir, "logs"), "project", "logs/", actions, { dryRun });
+        await removeDir(path.join(stateDir, "sessions"), "project", "sessions/", actions, { dryRun });
+        await removeDir(path.join(stateDir, "state"), "project", "state/", actions, { dryRun });
+        await removeFile((0, core_1.getPidPath)(projectDir, userHome), "project", "sidekickd.pid", actions, { dryRun });
+        await removeFile((0, core_1.getTokenPath)(projectDir, userHome), "project", "sidekickd.token", actions, { dryRun });
+        await removeFile((0, core_1.getLockPath)(projectDir, userHome), "project", "sidekickd.lock", actions, { dryRun });
       }
       if (userDetected) {
         await removeDir(path.join(userHome, ".sidekick", "state"), "user", "state/", actions, { dryRun });
@@ -84752,9 +85090,9 @@ var require_uninstall = __commonJS({
       printReport(stdout, actions, dryRun);
       return { exitCode: 0, output: "" };
     }
-    async function detectProjectScope(projectDir) {
+    async function detectProjectScope(projectDir, userHome) {
       try {
-        await fs.access(path.join(projectDir, ".sidekick", core_1.PROJECT_STATUS_FILENAME));
+        await fs.access(path.join((0, core_1.projectStateDir)(projectDir, userHome), core_1.PROJECT_STATUS_FILENAME));
         return true;
       } catch {
         for (const file of ["settings.local.json", "settings.json"]) {
@@ -84824,13 +85162,13 @@ var require_uninstall = __commonJS({
         if (settingsDetails.length > 0) {
           summary.project.push({ label: "Settings", details: [...new Set(settingsDetails)].join(", ") });
         }
-        if (await (0, fs_js_1.fileExists)(path.join(projectDir, ".sidekick", "sidekickd.pid"))) {
+        if (await (0, fs_js_1.fileExists)((0, core_1.getPidPath)(projectDir, userHome))) {
           summary.project.push({ label: "Daemon", details: "pid file found" });
         }
         if (!devModeActive) {
-          const configFiles = await detectExistingItems(projectDir, [core_1.PROJECT_STATUS_FILENAME]);
-          if (configFiles.length > 0) {
-            summary.project.push({ label: "Config", details: configFiles.join(", ") });
+          const setupStatusPath = path.join((0, core_1.projectStateDir)(projectDir, userHome), core_1.PROJECT_STATUS_FILENAME);
+          if (await (0, fs_js_1.fileExists)(setupStatusPath)) {
+            summary.project.push({ label: "Config", details: core_1.PROJECT_STATUS_FILENAME });
           }
         }
         const dataItems = await detectExistingItems(projectDir, ["logs", "sessions", "state"], "/");
@@ -85242,7 +85580,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.1.25" : "dev";
+    var VERSION = true ? "0.1.26" : "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.
@@ -85554,7 +85892,8 @@ Run 'sidekick hook --help' for available hooks.
           configService: runtime.config,
           assets: runtime.assets,
           help: parsed.help,
-          forceDevMode: parsed.forceDevMode
+          forceDevMode: parsed.forceDevMode,
+          homeDir: runtime.homeDir
         });
         return { exitCode: result.exitCode, stdout: "", stderr: "" };
       }
@@ -85577,7 +85916,8 @@ Run 'sidekick hook --help' for available hooks.
           testType: parsed.messageType,
           width: parsed.width,
           scope: parsed.scope === "user" || parsed.scope === "project" ? parsed.scope : void 0,
-          assets: runtime.assets
+          assets: runtime.assets,
+          homeDir: runtime.homeDir
         });
         return { exitCode: result.exitCode, stdout: result.output, stderr: "" };
       }
@@ -85597,14 +85937,15 @@ Run 'sidekick hook --help' for available hooks.
         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
+          width: parsed.width,
+          homeDir: runtime.homeDir
         });
         return { exitCode: result.exitCode, stdout: result.output, stderr: "" };
       }
       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.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), homeDir: runtime.homeDir });
         return { exitCode: result.exitCode, stdout: "", stderr: "" };
       }
       if (parsed.command === "setup" || parsed.command === "install") {