@scotthamilton77/sidekick 0.1.19 → 0.1.20

package/dist/bin.js

@@ -1038,6 +1038,8 @@ var require_hook_events = __commonJS({
     exports2.isPostToolUseEvent = isPostToolUseEvent;
     exports2.isStopEvent = isStopEvent;
     exports2.isPreCompactEvent = isPreCompactEvent;
+    exports2.isSubagentStartEvent = isSubagentStartEvent;
+    exports2.isSubagentStopEvent = isSubagentStopEvent;
     exports2.HOOK_NAMES = [
       "SessionStart",
       "SessionEnd",
@@ -1045,7 +1047,9 @@ var require_hook_events = __commonJS({
       "PreToolUse",
       "PostToolUse",
       "Stop",
-      "PreCompact"
+      "PreCompact",
+      "SubagentStart",
+      "SubagentStop"
     ];
     function isSessionStartEvent(event) {
       return event.hook === "SessionStart";
@@ -1068,6 +1072,12 @@ var require_hook_events = __commonJS({
     function isPreCompactEvent(event) {
       return event.hook === "PreCompact";
     }
+    function isSubagentStartEvent(event) {
+      return event.hook === "SubagentStart";
+    }
+    function isSubagentStopEvent(event) {
+      return event.hook === "SubagentStop";
+    }
   }
 });
 
@@ -17942,7 +17952,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.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.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 */
@@ -17954,7 +17964,11 @@ var require_hook_input = __commonJS({
       /** Current permission level: "default", "plan", "acceptEdits", or "bypassPermissions" */
       permission_mode: zod_1.z.string().optional(),
       /** Name of the triggered hook (e.g., "UserPromptSubmit", "SessionStart") */
-      hook_event_name: zod_1.z.string()
+      hook_event_name: zod_1.z.string(),
+      /** Unique identifier for the subagent (present when hook fires inside a subagent) */
+      agent_id: zod_1.z.string().optional(),
+      /** Agent type/name: "Bash", "Explore", "Plan", or custom (present when inside a subagent) */
+      agent_type: zod_1.z.string().optional()
     });
     exports2.UserPromptSubmitInputSchema = exports2.HookInputBaseSchema.extend({
       /** The user's message text */
@@ -18002,6 +18016,26 @@ var require_hook_input = __commonJS({
       /** Type: "permission_prompt", "idle_prompt", "auth_success", or "elicitation_dialog" */
       notification_type: zod_1.z.string()
     });
+    exports2.SubagentStartInputSchema = exports2.HookInputBaseSchema.extend({
+      /** Unique identifier for the subagent (required per official docs) */
+      agent_id: zod_1.z.string(),
+      /** Agent name: "Bash", "Explore", "Plan", or custom agent name */
+      agent_type: zod_1.z.string()
+    });
+    exports2.SubagentStopInputSchema = exports2.HookInputBaseSchema.extend({
+      /** Unique identifier for the subagent */
+      agent_id: zod_1.z.string(),
+      /** Agent name */
+      agent_type: zod_1.z.string(),
+      /** Path to subagent's own transcript JSONL */
+      agent_transcript_path: zod_1.z.string(),
+      /** Text content of the subagent's final response */
+      last_assistant_message: zod_1.z.string(),
+      /** Permission mode for the subagent session */
+      permission_mode: zod_1.z.string(),
+      /** Optional: whether stop hook is active (probe doc says never populated; official docs show false) */
+      stop_hook_active: zod_1.z.boolean().optional()
+    });
     exports2.StatuslineModelSchema = zod_1.z.object({
       /** Full model identifier (e.g., "claude-opus-4-1") */
       id: zod_1.z.string(),
@@ -18057,13 +18091,15 @@ var require_hook_input = __commonJS({
       output_style: zod_1.z.object({ name: zod_1.z.string() }).optional()
     });
     exports2.HookInputSchema = zod_1.z.union([
+      exports2.SessionStartInputSchema,
+      exports2.SessionEndInputSchema,
       exports2.UserPromptSubmitInputSchema,
       exports2.PreToolUseInputSchema,
       exports2.PostToolUseInputSchema,
       exports2.StopInputSchema,
-      exports2.SessionStartInputSchema,
-      exports2.SessionEndInputSchema,
       exports2.PreCompactInputSchema,
+      exports2.SubagentStartInputSchema,
+      exports2.SubagentStopInputSchema,
       exports2.NotificationInputSchema,
       exports2.HookInputBaseSchema
       // Fallback for hooks without extra fields
@@ -18160,9 +18196,11 @@ var require_setup_status = __commonJS({
       "missing",
       // User declined or entries not present
       "incomplete",
-      // Section exists but missing end marker or required entries
-      "installed"
-      // Sidekick section present with all required entries
+      // .sidekick/.gitignore exists but missing required entries (legacy: partial root section)
+      "installed",
+      // .sidekick/.gitignore present with all entries (new format)
+      "legacy"
+      // Root .gitignore has old marked section — functional, migrate recommended
     ]);
     exports2.ProjectApiKeyValueSchema = zod_1.z.union([exports2.ProjectApiKeyHealthSchema, exports2.ProjectApiKeyStatusSchema]);
     exports2.ProjectSetupStatusSchema = zod_1.z.object({
@@ -27199,6 +27237,18 @@ var require_dist2 = __commonJS({
   }
 });
 
+// ../sidekick-core/dist/error-utils.js
+var require_error_utils = __commonJS({
+  "../sidekick-core/dist/error-utils.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.toErrorMessage = toErrorMessage;
+    function toErrorMessage(error) {
+      return error instanceof Error ? error.message : String(error);
+    }
+  }
+});
+
 // ../sidekick-core/dist/assets.js
 var require_assets = __commonJS({
   "../sidekick-core/dist/assets.js"(exports2) {
@@ -27212,6 +27262,7 @@ var require_assets = __commonJS({
     var yaml_1 = require_dist2();
     var node_os_1 = require("node:os");
     var node_path_1 = require("node:path");
+    var error_utils_js_1 = require_error_utils();
     function createCascadingResolver(options) {
       const { cascadeLayers } = options;
       const findFile = (relativePath) => {
@@ -27261,7 +27312,7 @@ var require_assets = __commonJS({
           try {
             return (0, yaml_1.parse)(content);
           } catch (error) {
-            throw new Error(`Failed to parse YAML file ${relativePath}: ${error instanceof Error ? error.message : String(error)}`, { cause: error });
+            throw new Error(`Failed to parse YAML file ${relativePath}: ${(0, error_utils_js_1.toErrorMessage)(error)}`, { cause: error });
           }
         },
         cascadeLayers
@@ -27336,6 +27387,7 @@ var require_persona_loader = __commonJS({
     var node_path_1 = require("node:path");
     var types_1 = require_dist();
     var assets_js_1 = require_assets();
+    var error_utils_js_1 = require_error_utils();
     function buildPersonaCascadeLayers(defaultPersonasDir, homeDir, projectRoot) {
       const layers = [];
       layers.push(defaultPersonasDir);
@@ -27363,7 +27415,7 @@ var require_persona_loader = __commonJS({
         }
         return result.data;
       } catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
+        const message = (0, error_utils_js_1.toErrorMessage)(error);
         logger?.warn(`Failed to load persona file ${filename}: ${message}`);
         return null;
       }
@@ -27946,6 +27998,7 @@ var require_config2 = __commonJS({
     var node_path_1 = require("node:path");
     var yaml_1 = require_dist2();
     var v4_1 = require_v4();
+    var error_utils_js_1 = require_error_utils();
     function deepFreeze(obj) {
       if (obj === null || typeof obj !== "object") {
         return obj;
@@ -27972,7 +28025,7 @@ var require_config2 = __commonJS({
       consoleEnabled: v4_1.z.boolean(),
       /** Per-component log level overrides. Keys are component names (e.g., 'reminders', 'statusline'). */
       components: v4_1.z.record(v4_1.z.string(), LogLevelSchema).optional(),
-      /** Log rotation settings. Defaults to 10MB/5 files if not specified. */
+      /** Log rotation settings. Defaults come from core.defaults.yaml (2MB/2 files). */
       rotation: v4_1.z.object({
         maxSizeBytes: v4_1.z.number().min(1),
         maxFiles: v4_1.z.number().min(1)
@@ -28022,7 +28075,10 @@ var require_config2 = __commonJS({
       fallbackProfileId: v4_1.z.string().optional(),
       // OpenRouter-specific provider routing (ignored for other providers)
       providerAllowlist: v4_1.z.array(v4_1.z.string()).optional(),
-      providerBlocklist: v4_1.z.array(v4_1.z.string()).optional()
+      providerBlocklist: v4_1.z.array(v4_1.z.string()).optional(),
+      // OpenRouter-specific: toggle the model's reasoning mode (maps to reasoning.enabled).
+      // Ignored for non-openrouter providers.
+      reasoning: v4_1.z.boolean().optional()
     });
     exports2.LlmConfigSchema = v4_1.z.object({
       defaultProfile: v4_1.z.string(),
@@ -28138,7 +28194,7 @@ var require_config2 = __commonJS({
         const parsed = (0, yaml_1.parse)(content);
         return parsed ?? {};
       } catch (err) {
-        const message = err instanceof Error ? err.message : String(err);
+        const message = (0, error_utils_js_1.toErrorMessage)(err);
         throw new Error(`Failed to parse YAML at ${filePath}: ${message}`, { cause: err });
       }
     }
@@ -28446,6 +28502,7 @@ var require_config_writer = __commonJS({
     var node_os_1 = require("node:os");
     var node_path_1 = require("node:path");
     var yaml_1 = __importDefault2(require_dist2());
+    var error_utils_js_1 = require_error_utils();
     var config_1 = require_config2();
     var VALID_DOMAINS = /* @__PURE__ */ new Set(["core", "llm", "transcript", "features"]);
     var FORBIDDEN_KEYS = /* @__PURE__ */ new Set(["__proto__", "constructor", "prototype"]);
@@ -28572,7 +28629,7 @@ var require_config_writer = __commonJS({
           } catch {
           }
         }
-        const message = err instanceof Error ? err.message : String(err);
+        const message = (0, error_utils_js_1.toErrorMessage)(err);
         throw new Error(`Configuration validation failed after setting "${dotPath}": ${message}`, { cause: err });
       }
       return {
@@ -34235,6 +34292,8 @@ var require_session_log_writer = __commonJS({
       idleTimeoutMs;
       /** Map key: `${sessionId}/${logFile}` */
       handles = /* @__PURE__ */ new Map();
+      /** Sentinel map to prevent duplicate handle creation on concurrent writes */
+      pendingCreation = /* @__PURE__ */ new Map();
       constructor(options) {
         this.sessionsDir = options.sessionsDir;
         this.maxHandles = options.maxHandles ?? 10;
@@ -34254,30 +34313,26 @@ var require_session_log_writer = __commonJS({
         if (!(0, staging_paths_js_1.isValidPathSegment)(sessionId) || !(0, staging_paths_js_1.isValidPathSegment)(logFile))
           return;
         const key = `${sessionId}/${logFile}`;
+        const pending = this.pendingCreation.get(key);
+        if (pending) {
+          try {
+            await pending;
+          } catch {
+          }
+        }
         let entry = this.handles.get(key);
         if (!entry) {
           if (this.handles.size >= this.maxHandles) {
             this.evictLRU();
           }
-          const logDir = (0, node_path_1.join)(this.sessionsDir, sessionId, "logs");
-          await (0, promises_12.mkdir)(logDir, { recursive: true });
-          const filePath = (0, node_path_1.join)(logDir, logFile);
-          const stream = (0, node_fs_1.createWriteStream)(filePath, { flags: "a" });
-          const ready = new Promise((resolve3, reject) => {
-            stream.once("open", () => resolve3());
-            stream.once("error", (err) => {
-              this.handles.delete(key);
-              stream.destroy();
-              reject(err);
-            });
-          });
-          entry = {
-            stream,
-            lastUsed: Date.now(),
-            timer: null,
-            ready
-          };
-          this.handles.set(key, entry);
+          const creationPromise = this.createHandle(sessionId, logFile);
+          this.pendingCreation.set(key, creationPromise);
+          try {
+            entry = await creationPromise;
+            this.handles.set(key, entry);
+          } finally {
+            this.pendingCreation.delete(key);
+          }
         }
         await entry.ready;
         entry.lastUsed = Date.now();
@@ -34293,6 +34348,25 @@ var require_session_log_writer = __commonJS({
           });
         });
       }
+      async createHandle(sessionId, logFile) {
+        const logDir = (0, node_path_1.join)(this.sessionsDir, sessionId, "logs");
+        await (0, promises_12.mkdir)(logDir, { recursive: true });
+        const filePath = (0, node_path_1.join)(logDir, logFile);
+        const stream = (0, node_fs_1.createWriteStream)(filePath, { flags: "a" });
+        const ready = new Promise((resolve3, reject) => {
+          stream.once("open", () => resolve3());
+          stream.once("error", (err) => {
+            stream.destroy();
+            reject(err);
+          });
+        });
+        return {
+          stream,
+          lastUsed: Date.now(),
+          timer: null,
+          ready
+        };
+      }
       /** Close all handles for a specific session. */
       async closeSession(sessionId) {
         const prefix = `${sessionId}/`;
@@ -46093,6 +46167,7 @@ var require_structured_logging = __commonJS({
     var node_fs_1 = require("node:fs");
     var node_path_1 = require("node:path");
     var node_stream_1 = require("node:stream");
+    var error_utils_js_1 = require_error_utils();
     var log_events_1 = require_log_events();
     Object.defineProperty(exports2, "LogEvents", { enumerable: true, get: function() {
       return log_events_1.LogEvents;
@@ -46122,8 +46197,8 @@ var require_structured_logging = __commonJS({
       }
       return defaultLevel;
     }
-    exports2.DEFAULT_ROTATE_SIZE_BYTES = 10 * 1024 * 1024;
-    exports2.DEFAULT_MAX_FILES = 5;
+    exports2.DEFAULT_ROTATE_SIZE_BYTES = 2 * 1024 * 1024;
+    exports2.DEFAULT_MAX_FILES = 2;
     var DEFAULT_REDACT_KEYS = [
       "apiKey",
       "token",
@@ -46464,7 +46539,7 @@ var require_structured_logging = __commonJS({
               upgradeOptions.onUpgradeError(err);
             }
             activeLogger.error("Failed to upgrade to Pino logger", {
-              error: err instanceof Error ? err.message : String(err)
+              error: (0, error_utils_js_1.toErrorMessage)(err)
             });
           }
         },
@@ -46480,7 +46555,7 @@ var require_structured_logging = __commonJS({
       };
       const rejectionHandler = (reason) => {
         logger.fatal("Unhandled promise rejection", {
-          reason: reason instanceof Error ? reason.message : String(reason)
+          reason: (0, error_utils_js_1.toErrorMessage)(reason)
         });
       };
       process.on("uncaughtException", uncaughtHandler);
@@ -46573,13 +46648,11 @@ var require_daemon_client2 = __commonJS({
     var client_js_1 = require_client();
     var transport_js_1 = require_transport();
     var sandbox_js_1 = require_sandbox();
+    var error_utils_js_1 = require_error_utils();
     var LOCK_TIMEOUT_MS = 1e4;
     var LOCK_RETRY_INTERVAL_MS = 100;
     var LOCK_STALE_THRESHOLD_MS = 3e4;
     var CLIENT_VERSION = require_package3().version;
-    function toErrorMsg(err) {
-      return err instanceof Error ? err.message : String(err);
-    }
     var DaemonClient = class {
       projectDir;
       logger;
@@ -46945,7 +47018,7 @@ var require_daemon_client2 = __commonJS({
             } catch (err) {
               logger.debug("Graceful stop failed, falling back to SIGKILL", {
                 pid: info.pid,
-                error: toErrorMsg(err)
+                error: (0, error_utils_js_1.toErrorMessage)(err)
               });
             }
           }
@@ -46954,7 +47027,7 @@ var require_daemon_client2 = __commonJS({
             logger.info("Killed daemon", { pid: info.pid, projectDir: info.projectDir });
             results.push({ projectDir: info.projectDir, pid: info.pid, killed: true });
           } catch (err) {
-            const msg = toErrorMsg(err);
+            const msg = (0, error_utils_js_1.toErrorMessage)(err);
             logger.warn("Failed to kill daemon", { pid: info.pid, error: msg });
             results.push({ projectDir: info.projectDir, pid: info.pid, killed: false, error: msg });
           }
@@ -46966,7 +47039,7 @@ var require_daemon_client2 = __commonJS({
             });
           }
         } catch (err) {
-          logger.warn("Invalid PID file, removing", { pidFile, error: toErrorMsg(err) });
+          logger.warn("Invalid PID file, removing", { pidFile, error: (0, error_utils_js_1.toErrorMessage)(err) });
           await promises_12.default.unlink(pidPath).catch(() => {
           });
         }
@@ -46987,7 +47060,7 @@ var require_daemon_client2 = __commonJS({
         });
       } catch (err) {
         logger.warn("Failed to run ps \u2014 cannot detect zombie daemons", {
-          error: toErrorMsg(err)
+          error: (0, error_utils_js_1.toErrorMessage)(err)
         });
         return [];
       }
@@ -47048,7 +47121,7 @@ var require_daemon_client2 = __commonJS({
           logger.info("Killed zombie daemon", { pid: zombie.pid, command: zombie.command });
           results.push({ projectDir: "unknown", pid: zombie.pid, killed: true });
         } catch (err) {
-          const msg = toErrorMsg(err);
+          const msg = (0, error_utils_js_1.toErrorMessage)(err);
           logger.warn("Failed to kill zombie daemon", { pid: zombie.pid, error: msg });
           results.push({ projectDir: "unknown", pid: zombie.pid, killed: false, error: msg });
         }
@@ -47100,60 +47173,94 @@ var require_gitignore = __commonJS({
       };
     })();
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.GITIGNORE_ENTRIES = exports2.SIDEKICK_SECTION_END = exports2.SIDEKICK_SECTION_START = void 0;
+    exports2.GITIGNORE_ENTRIES = exports2.SIDEKICK_GITIGNORE_HEADER = exports2.SIDEKICK_SECTION_END = exports2.SIDEKICK_SECTION_START = void 0;
     exports2.installGitignoreSection = installGitignoreSection;
-    exports2.removeGitignoreSection = removeGitignoreSection;
     exports2.detectGitignoreStatus = detectGitignoreStatus;
+    exports2.removeGitignoreSection = removeGitignoreSection;
+    exports2.detectLegacyGitignoreSection = detectLegacyGitignoreSection;
+    exports2.removeLegacyGitignoreSection = removeLegacyGitignoreSection;
     var fs = __importStar(require("node:fs/promises"));
     var path = __importStar(require("node:path"));
     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 = [
-      ".sidekick/logs/",
-      ".sidekick/sessions/",
-      ".sidekick/state/",
-      ".sidekick/setup-status.json",
-      ".sidekick/.env",
-      ".sidekick/.env.local",
-      ".sidekick/sidekick*.pid",
-      ".sidekick/sidekick*.token",
-      ".sidekick/*.local.yaml"
+      "logs/",
+      "sessions/",
+      "state/",
+      "setup-status.json",
+      ".env",
+      ".env.local",
+      "sidekick*.pid",
+      "sidekick*.token",
+      "*.local.yaml"
     ];
     async function installGitignoreSection(projectDir) {
-      const gitignorePath = path.join(projectDir, ".gitignore");
-      let content = "";
+      let status;
       try {
-        content = await fs.readFile(gitignorePath, "utf-8");
+        status = await detectGitignoreStatus(projectDir);
       } catch (err) {
-        if (err.code !== "ENOENT") {
-          return { status: "error", error: `Failed to read .gitignore: ${err.message}` };
-        }
+        return { status: "error", error: `Failed to check gitignore status: ${err.message}` };
       }
-      const status = await detectGitignoreStatus(projectDir);
       if (status === "installed") {
         return { status: "already-installed" };
       }
-      if (status === "incomplete") {
-        await removeGitignoreSection(projectDir);
-        try {
-          content = await fs.readFile(gitignorePath, "utf-8");
-        } catch {
-          content = "";
-        }
+      const sidekickDir = path.join(projectDir, ".sidekick");
+      try {
+        await fs.mkdir(sidekickDir, { recursive: true });
+      } catch (err) {
+        return { status: "error", error: `Failed to create .sidekick directory: ${err.message}` };
       }
-      const section = ["", exports2.SIDEKICK_SECTION_START, ...exports2.GITIGNORE_ENTRIES, exports2.SIDEKICK_SECTION_END].join("\n");
-      const newContent = content.trimEnd() + section + "\n";
+      const content = [exports2.SIDEKICK_GITIGNORE_HEADER, ...exports2.GITIGNORE_ENTRIES].join("\n") + "\n";
       try {
-        await fs.writeFile(gitignorePath, newContent);
+        await fs.writeFile(path.join(sidekickDir, ".gitignore"), content);
         return { status: "installed", entriesAdded: exports2.GITIGNORE_ENTRIES };
       } catch (err) {
-        return { status: "error", error: `Failed to write .gitignore: ${err.message}` };
+        return { status: "error", error: `Failed to write .sidekick/.gitignore: ${err.message}` };
       }
     }
+    async function detectGitignoreStatus(projectDir) {
+      const sidekickGitignorePath = path.join(projectDir, ".sidekick", ".gitignore");
+      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";
+      } catch (err) {
+        if (err.code !== "ENOENT") {
+          throw err;
+        }
+      }
+      const hasLegacy = await detectLegacyGitignoreSection(projectDir);
+      return hasLegacy ? "legacy" : "missing";
+    }
     async function removeGitignoreSection(projectDir) {
-      const gitignorePath = path.join(projectDir, ".gitignore");
+      let removed = false;
+      try {
+        await fs.unlink(path.join(projectDir, ".sidekick", ".gitignore"));
+        removed = true;
+      } catch (err) {
+        if (err.code !== "ENOENT") {
+          throw err;
+        }
+      }
+      const legacyRemoved = await removeLegacyGitignoreSection(projectDir);
+      return removed || legacyRemoved;
+    }
+    async function detectLegacyGitignoreSection(projectDir) {
       try {
-        const content = await fs.readFile(gitignorePath, "utf-8");
+        const content = await fs.readFile(path.join(projectDir, ".gitignore"), "utf-8");
+        return content.includes(exports2.SIDEKICK_SECTION_START);
+      } catch (err) {
+        if (err.code === "ENOENT") {
+          return false;
+        }
+        throw err;
+      }
+    }
+    async function removeLegacyGitignoreSection(projectDir) {
+      const rootGitignorePath = path.join(projectDir, ".gitignore");
+      try {
+        const content = await fs.readFile(rootGitignorePath, "utf-8");
         const startIdx = content.indexOf(exports2.SIDEKICK_SECTION_START);
         const endIdx = content.indexOf(exports2.SIDEKICK_SECTION_END);
         if (startIdx === -1 || endIdx === -1 || endIdx < startIdx) {
@@ -47165,37 +47272,13 @@ var require_gitignore = __commonJS({
         const before = content.slice(0, lineStartIdx).trimEnd();
         const after = content.slice(actualEndIdx).trimStart();
         const newContent = before + (after ? "\n" + after : "") + "\n";
-        await fs.writeFile(gitignorePath, newContent);
+        await fs.writeFile(rootGitignorePath, newContent);
         return true;
-      } catch {
-        return false;
-      }
-    }
-    async function detectGitignoreStatus(projectDir) {
-      const gitignorePath = path.join(projectDir, ".gitignore");
-      try {
-        const content = await fs.readFile(gitignorePath, "utf-8");
-        const hasStart = content.includes(exports2.SIDEKICK_SECTION_START);
-        const hasEnd = content.includes(exports2.SIDEKICK_SECTION_END);
-        if (!hasStart && !hasEnd) {
-          return "missing";
-        }
-        if (!hasStart || !hasEnd) {
-          return "incomplete";
-        }
-        const startIdx = content.indexOf(exports2.SIDEKICK_SECTION_START);
-        const endIdx = content.indexOf(exports2.SIDEKICK_SECTION_END);
-        if (endIdx <= startIdx) {
-          return "incomplete";
-        }
-        const sectionContent = content.slice(startIdx, endIdx + exports2.SIDEKICK_SECTION_END.length);
-        const missingEntries = exports2.GITIGNORE_ENTRIES.filter((entry) => !sectionContent.includes(entry));
-        if (missingEntries.length > 0) {
-          return "incomplete";
+      } catch (err) {
+        if (err.code === "ENOENT") {
+          return false;
         }
-        return "installed";
-      } catch {
-        return "missing";
+        throw err;
       }
     }
   }
@@ -47206,7 +47289,7 @@ var require_errors4 = __commonJS({
   "../shared-providers/dist/errors.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.TimeoutError = exports2.AuthError = exports2.RateLimitError = exports2.ProviderError = void 0;
+    exports2.MalformedResponseError = exports2.TimeoutError = exports2.AuthError = exports2.RateLimitError = exports2.ProviderError = void 0;
     var ProviderError = class _ProviderError extends Error {
       provider;
       retryable;
@@ -47247,6 +47330,18 @@ var require_errors4 = __commonJS({
       }
     };
     exports2.TimeoutError = TimeoutError;
+    var MalformedResponseError = class _MalformedResponseError extends ProviderError {
+      code;
+      providerMessage;
+      constructor(provider, code, providerMessage, cause) {
+        super(`Malformed response from ${provider}: ${code ?? "unknown"} - ${providerMessage ?? "no message"}`, provider, false, cause);
+        this.name = "MalformedResponseError";
+        this.code = code;
+        this.providerMessage = providerMessage;
+        Object.setPrototypeOf(this, _MalformedResponseError.prototype);
+      }
+    };
+    exports2.MalformedResponseError = MalformedResponseError;
   }
 });
 
@@ -56225,6 +56320,7 @@ var require_base = __commonJS({
           model: response.model,
           durationMs,
           usage: response.usage,
+          finishReason: response.finishReason,
           status: response.rawResponse.status,
           contentLength: response.content.length
         });
@@ -56272,6 +56368,7 @@ var require_openai_native = __commonJS({
       maxTokens;
       providerAllowlist;
       providerBlocklist;
+      reasoning;
       constructor(config, logger) {
         super(logger);
         this.id = config.baseURL?.includes("openrouter") ? "openrouter" : "openai";
@@ -56280,6 +56377,7 @@ var require_openai_native = __commonJS({
         this.maxTokens = config.maxTokens;
         this.providerAllowlist = config.providerAllowlist;
         this.providerBlocklist = config.providerBlocklist;
+        this.reasoning = config.reasoning;
         this.client = new openai_1.default({
           apiKey: config.apiKey,
           baseURL: config.baseURL,
@@ -56295,6 +56393,7 @@ var require_openai_native = __commonJS({
           maxTokens: this.maxTokens,
           providerAllowlist: this.providerAllowlist,
           providerBlocklist: this.providerBlocklist,
+          reasoning: this.reasoning,
           apiKey: this.redactApiKey(config.apiKey)
         });
       }
@@ -56312,6 +56411,7 @@ var require_openai_native = __commonJS({
             }
           } : void 0;
           const providerRouting = this.buildProviderRouting();
+          const reasoningParam = this.buildReasoningParam();
           const completion = await this.client.chat.completions.create({
             model: request.model ?? this.defaultModel,
             messages,
@@ -56319,8 +56419,13 @@ var require_openai_native = __commonJS({
             max_tokens: this.maxTokens,
             response_format: responseFormat,
             ...providerRouting,
+            ...reasoningParam,
             ...request.additionalParams
           });
+          if (!completion.choices || completion.choices.length === 0) {
+            const errorPayload = completion.error;
+            throw new errors_1.MalformedResponseError(this.id, errorPayload?.code, errorPayload?.message);
+          }
           const response = {
             content: completion.choices[0]?.message?.content ?? "",
             model: completion.model,
@@ -56328,6 +56433,7 @@ var require_openai_native = __commonJS({
               inputTokens: completion.usage.prompt_tokens,
               outputTokens: completion.usage.completion_tokens
             } : void 0,
+            finishReason: completion.choices[0]?.finish_reason ?? void 0,
             rawResponse: {
               status: 200,
               body: JSON.stringify(completion)
@@ -56363,7 +56469,25 @@ var require_openai_native = __commonJS({
         }
         return { provider: providerObj };
       }
+      /**
+       * Build OpenRouter reasoning param object.
+       * Returns empty object if reasoning is unset or provider is not OpenRouter.
+       * Maps `reasoning?: boolean` to OpenRouter's `reasoning: { enabled: <bool> }`.
+       * @see https://openrouter.ai/docs/use-cases/reasoning-tokens
+       */
+      buildReasoningParam() {
+        if (this.id !== "openrouter") {
+          return {};
+        }
+        if (this.reasoning === void 0) {
+          return {};
+        }
+        return { reasoning: { enabled: this.reasoning } };
+      }
       mapError(error) {
+        if (error instanceof errors_1.ProviderError) {
+          return error;
+        }
         if (error instanceof openai_1.default.APIError) {
           if (error.status === 401 || error.status === 403) {
             return new errors_1.AuthError(this.id, error);
@@ -56457,7 +56581,13 @@ var require_claude_cli_spawn = __commonJS({
         });
         const child = (0, node_child_process_1.spawn)(cliPath, args, {
           cwd,
-          stdio: ["pipe", "pipe", "pipe"]
+          stdio: ["pipe", "pipe", "pipe"],
+          // Recursion guard: Sidekick's own Claude Code hooks fire inside any
+          // `claude -p` subprocess we spawn. Without this flag, the subprocess
+          // hook handler would dispatch to the daemon, trigger another LLM call,
+          // spawn another subprocess, and so on. handleHookCommand short-circuits
+          // when SIDEKICK_SUBPROCESS=1 is set. See packages/sidekick-cli/src/commands/hook.ts.
+          env: { ...process.env, SIDEKICK_SUBPROCESS: "1" }
         });
         let stdout = "";
         let stderr = "";
@@ -56519,6 +56649,31 @@ var require_claude_cli_spawn = __commonJS({
   }
 });
 
+// ../shared-providers/dist/providers/anthropic-stop-reason.js
+var require_anthropic_stop_reason = __commonJS({
+  "../shared-providers/dist/providers/anthropic-stop-reason.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.mapAnthropicStopReason = mapAnthropicStopReason;
+    function mapAnthropicStopReason(stopReason) {
+      if (!stopReason)
+        return void 0;
+      switch (stopReason) {
+        case "end_turn":
+          return "stop";
+        case "max_tokens":
+          return "length";
+        case "stop_sequence":
+          return "stop";
+        case "tool_use":
+          return "tool_calls";
+        default:
+          return stopReason;
+      }
+    }
+  }
+});
+
 // ../shared-providers/dist/providers/anthropic-cli.js
 var require_anthropic_cli = __commonJS({
   "../shared-providers/dist/providers/anthropic-cli.js"(exports2) {
@@ -56527,6 +56682,7 @@ var require_anthropic_cli = __commonJS({
     exports2.AnthropicCliProvider = void 0;
     var base_1 = require_base();
     var claude_cli_spawn_1 = require_claude_cli_spawn();
+    var anthropic_stop_reason_1 = require_anthropic_stop_reason();
     var AnthropicCliProvider = class extends base_1.AbstractProvider {
       id = "claude-cli";
       defaultModel;
@@ -56588,6 +56744,7 @@ var require_anthropic_cli = __commonJS({
               inputTokens: parsed.usage.input_tokens ?? 0,
               outputTokens: parsed.usage.output_tokens ?? 0
             } : void 0,
+            finishReason: (0, anthropic_stop_reason_1.mapAnthropicStopReason)(parsed.stop_reason),
             rawResponse: {
               status: 200,
               body: stdout
@@ -56859,6 +57016,7 @@ var require_openai_emulator = __commonJS({
             inputTokens,
             outputTokens
           },
+          finishReason: "stop",
           rawResponse: {
             status: 200,
             body: JSON.stringify(rawBody)
@@ -56913,6 +57071,7 @@ var require_openrouter_emulator = __commonJS({
             inputTokens,
             outputTokens
           },
+          finishReason: "stop",
           rawResponse: {
             status: 200,
             body: JSON.stringify(rawBody)
@@ -56933,6 +57092,7 @@ var require_claude_cli_emulator = __commonJS({
     var node_child_process_1 = require("node:child_process");
     var node_path_1 = require("node:path");
     var base_1 = require_base();
+    var anthropic_stop_reason_1 = require_anthropic_stop_reason();
     var EMULATOR_SCRIPT = `#!/bin/bash
 # Claude CLI Emulator Script
 STATE_FILE="\${SIDEKICK_EMULATOR_STATE_PATH:-.sidekick/emulator-state/call-counts.json}"
@@ -57020,6 +57180,7 @@ echo "{\\"content\\":\\"\${CONTENT}\\",\\"message\\":\\"\${CONTENT}\\",\\"model\
             inputTokens,
             outputTokens
           },
+          finishReason: (0, anthropic_stop_reason_1.mapAnthropicStopReason)(parsed.stop_reason),
           rawResponse: {
             status: 0,
             // Exit code
@@ -57156,7 +57317,8 @@ var require_factory = __commonJS({
           temperature: this.config.temperature,
           maxTokens: this.config.maxTokens,
           providerAllowlist: this.config.providerAllowlist,
-          providerBlocklist: this.config.providerBlocklist
+          providerBlocklist: this.config.providerBlocklist,
+          reasoning: this.config.reasoning
         };
         return new openai_native_1.OpenAINativeProvider(openrouterConfig, this.logger);
       }
@@ -57333,7 +57495,9 @@ var require_profile_factory = __commonJS({
           maxTokens: profile.maxTokens,
           // OpenRouter-specific provider routing
           providerAllowlist: profile.providerAllowlist ? [...profile.providerAllowlist] : void 0,
-          providerBlocklist: profile.providerBlocklist ? [...profile.providerBlocklist] : void 0
+          providerBlocklist: profile.providerBlocklist ? [...profile.providerBlocklist] : void 0,
+          // OpenRouter-specific reasoning toggle
+          reasoning: profile.reasoning
         }, this.logger);
         return factory.create();
       }
@@ -57388,7 +57552,7 @@ var require_dist3 = __commonJS({
   "../shared-providers/dist/index.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.spawnClaudeCli = exports2.ClaudeCliEmulator = exports2.OpenRouterEmulator = exports2.OpenAIEmulator = exports2.EmulatorStateManager = exports2.AbstractEmulator = exports2.validateOpenAIKey = exports2.validateOpenRouterKey = exports2.AbstractProvider = exports2.AnthropicCliProvider = exports2.OpenAINativeProvider = exports2.FallbackProvider = exports2.ProfileProviderFactory = exports2.ProviderFactory = exports2.TimeoutError = exports2.AuthError = exports2.RateLimitError = exports2.ProviderError = void 0;
+    exports2.spawnClaudeCli = exports2.ClaudeCliEmulator = exports2.OpenRouterEmulator = exports2.OpenAIEmulator = exports2.EmulatorStateManager = exports2.AbstractEmulator = exports2.validateOpenAIKey = exports2.validateOpenRouterKey = exports2.AbstractProvider = exports2.AnthropicCliProvider = exports2.OpenAINativeProvider = exports2.FallbackProvider = exports2.ProfileProviderFactory = exports2.ProviderFactory = exports2.MalformedResponseError = exports2.TimeoutError = exports2.AuthError = exports2.RateLimitError = exports2.ProviderError = void 0;
     var errors_1 = require_errors4();
     Object.defineProperty(exports2, "ProviderError", { enumerable: true, get: function() {
       return errors_1.ProviderError;
@@ -57402,6 +57566,9 @@ var require_dist3 = __commonJS({
     Object.defineProperty(exports2, "TimeoutError", { enumerable: true, get: function() {
       return errors_1.TimeoutError;
     } });
+    Object.defineProperty(exports2, "MalformedResponseError", { enumerable: true, get: function() {
+      return errors_1.MalformedResponseError;
+    } });
     var factory_1 = require_factory();
     Object.defineProperty(exports2, "ProviderFactory", { enumerable: true, get: function() {
       return factory_1.ProviderFactory;
@@ -57691,6 +57858,7 @@ var require_plugin_detector = __commonJS({
     var crypto2 = __importStar(require("node:crypto"));
     var node_child_process_1 = require("node:child_process");
     var api_key_detector_js_1 = require_api_key_detector();
+    var error_utils_js_1 = require_error_utils();
     function isSidekickStatuslineCommand(command) {
       return command?.toLowerCase().includes("sidekick") ?? false;
     }
@@ -57820,7 +57988,7 @@ var require_plugin_detector = __commonJS({
         return result;
       } catch (err) {
         logger?.warn("Failed to parse plugin list JSON", {
-          error: err instanceof Error ? err.message : String(err)
+          error: (0, error_utils_js_1.toErrorMessage)(err)
         });
         logger?.info("Plugin detection completed", { result: "error" });
         return "error";
@@ -58024,7 +58192,16 @@ var require_doctor_engine = __commonJS({
           const expectedUserStatus = (0, api_key_detector_js_1.buildUserApiKeyStatus)(detection);
           const currentUserEntry = currentUserStatus.apiKeys[keyName];
           const currentStatus = typeof currentUserEntry === "object" ? currentUserEntry.status : currentUserEntry ?? "missing";
-          if (currentStatus !== "not-required" && (0, api_key_detector_js_1.toScopeStatus)(currentStatus) !== (0, api_key_detector_js_1.toScopeStatus)(expectedUserStatus.status)) {
+          if (currentStatus === "not-required")
+            continue;
+          const isLegacyString = typeof currentUserEntry === "string";
+          if (isLegacyString) {
+            updatedUserApiKeys[keyName] = expectedUserStatus;
+            userNeedsUpdate = true;
+          } else if ((0, api_key_detector_js_1.toScopeStatus)(currentStatus) !== (0, api_key_detector_js_1.toScopeStatus)(expectedUserStatus.status)) {
+            updatedUserApiKeys[keyName] = expectedUserStatus;
+            userNeedsUpdate = true;
+          } else if (typeof currentUserEntry === "object" && (currentUserEntry.used !== expectedUserStatus.used || JSON.stringify(currentUserEntry.scopes) !== JSON.stringify(expectedUserStatus.scopes))) {
             updatedUserApiKeys[keyName] = expectedUserStatus;
             userNeedsUpdate = true;
           }
@@ -58099,7 +58276,7 @@ var require_setup_status_service = __commonJS({
       };
     })();
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.SetupStatusService = exports2.LEGACY_USER_STATUS_FILENAME = exports2.PROJECT_STATUS_FILENAME = exports2.USER_STATUS_FILENAME = void 0;
+    exports2.SetupStatusService = exports2.PROJECT_STATUS_FILENAME = exports2.USER_STATUS_FILENAME = void 0;
     exports2.createSetupStatusService = createSetupStatusService;
     var fs = __importStar(require("node:fs/promises"));
     var path = __importStar(require("node:path"));
@@ -58111,7 +58288,6 @@ var require_setup_status_service = __commonJS({
     var doctor_engine_js_1 = require_doctor_engine();
     exports2.USER_STATUS_FILENAME = "user-setup-status.json";
     exports2.PROJECT_STATUS_FILENAME = "setup-status.json";
-    exports2.LEGACY_USER_STATUS_FILENAME = exports2.PROJECT_STATUS_FILENAME;
     var SetupStatusService = class {
       projectDir;
       homeDir;
@@ -58125,10 +58301,6 @@ var require_setup_status_service = __commonJS({
       get userStatusPath() {
         return path.join(this.homeDir, ".sidekick", exports2.USER_STATUS_FILENAME);
       }
-      /** Legacy path for migration: old user-scope file that collided with project-scope */
-      get legacyUserStatusPath() {
-        return path.join(this.homeDir, ".sidekick", exports2.LEGACY_USER_STATUS_FILENAME);
-      }
       get projectStatusPath() {
         return path.join(this.projectDir, ".sidekick", exports2.PROJECT_STATUS_FILENAME);
       }
@@ -58162,7 +58334,7 @@ var require_setup_status_service = __commonJS({
           return parsed.data;
         } catch (err) {
           if (err.code === "ENOENT") {
-            return this.migrateFromLegacyUserStatus();
+            return null;
           }
           if (err instanceof SyntaxError) {
             this.logger?.warn(`Corrupt ${exports2.USER_STATUS_FILENAME}, treating as missing`, {
@@ -58174,54 +58346,6 @@ var require_setup_status_service = __commonJS({
           throw err;
         }
       }
-      /**
-       * Migration: read user status from the legacy `setup-status.json` location,
-       * write it to the new `user-setup-status.json`, and remove the old file.
-       *
-       * Only migrates if the legacy file contains valid UserSetupStatus data
-       * (not project-format data that may have been written by the collision bug).
-       */
-      async migrateFromLegacyUserStatus() {
-        try {
-          const legacyContent = await fs.readFile(this.legacyUserStatusPath, "utf-8");
-          const parsed = types_1.UserSetupStatusSchema.safeParse(JSON.parse(legacyContent));
-          if (!parsed.success) {
-            this.logger?.debug("Legacy user status file exists but is not valid user format, skipping migration", {
-              path: this.legacyUserStatusPath
-            });
-            return null;
-          }
-          this.logger?.info("Migrating user status from legacy location", {
-            from: this.legacyUserStatusPath,
-            to: this.userStatusPath
-          });
-          await this.writeUserStatus(parsed.data);
-          try {
-            await fs.unlink(this.legacyUserStatusPath);
-          } catch (unlinkErr) {
-            if (unlinkErr.code !== "ENOENT") {
-              this.logger?.warn("Migrated user status but failed to remove legacy file", {
-                path: this.legacyUserStatusPath,
-                error: unlinkErr instanceof Error ? unlinkErr.message : String(unlinkErr)
-              });
-            }
-          }
-          this.logger?.info("Legacy user status migration complete");
-          return parsed.data;
-        } catch (err) {
-          if (err.code === "ENOENT") {
-            return null;
-          }
-          if (err instanceof SyntaxError) {
-            this.logger?.warn(`Corrupt legacy ${exports2.LEGACY_USER_STATUS_FILENAME}, treating as missing`, {
-              path: this.legacyUserStatusPath,
-              error: err.message
-            });
-            return null;
-          }
-          throw err;
-        }
-      }
       async getProjectStatus() {
         if (path.resolve(this.projectDir) === path.resolve(this.homeDir)) {
           this.logger?.debug("Skipping project status read: projectDir is the home directory", {
@@ -58602,6 +58726,7 @@ var require_staging_service = __commonJS({
     var structured_logging_1 = require_structured_logging();
     var errors_js_1 = require_errors6();
     var staging_paths_js_1 = require_staging_paths();
+    var error_utils_js_1 = require_error_utils();
     var StagingServiceCore = class {
       options;
       constructor(options) {
@@ -58705,7 +58830,7 @@ var require_staging_service = __commonJS({
             hookName,
             reminderName,
             path: reminderPath,
-            error: err instanceof Error ? err.message : String(err)
+            error: (0, error_utils_js_1.toErrorMessage)(err)
           });
           return null;
         }
@@ -58736,7 +58861,7 @@ var require_staging_service = __commonJS({
             }
             this.options.logger.warn("Skipping invalid reminder file", {
               path: reminderPath,
-              error: err instanceof Error ? err.message : String(err)
+              error: (0, error_utils_js_1.toErrorMessage)(err)
             });
           }
         }
@@ -58797,7 +58922,7 @@ var require_staging_service = __commonJS({
             }
             this.options.logger.warn("Skipping invalid consumed reminder file", {
               path: reminderPath,
-              error: err instanceof Error ? err.message : String(err)
+              error: (0, error_utils_js_1.toErrorMessage)(err)
             });
           }
         }
@@ -58949,6 +59074,7 @@ var require_handler_registry2 = __commonJS({
     exports2.HandlerRegistryImpl = void 0;
     var transcript_content_js_1 = require_transcript_content();
     var structured_logging_js_1 = require_structured_logging();
+    var error_utils_js_1 = require_error_utils();
     var HandlerRegistryImpl = class {
       options;
       handlers = [];
@@ -59059,7 +59185,7 @@ var require_handler_registry2 = __commonJS({
             log.error("Handler execution failed", {
               handlerId: handler.id,
               hook,
-              error: err instanceof Error ? err.message : String(err)
+              error: (0, error_utils_js_1.toErrorMessage)(err)
             });
           }
         }
@@ -59105,7 +59231,7 @@ var require_handler_registry2 = __commonJS({
           (0, structured_logging_js_1.logEvent)(this.options.logger, structured_logging_js_1.LogEvents.eventProcessed(logContext, { handlerId: handler.id, success: true }, { durationMs }));
         } catch (err) {
           const durationMs = Date.now() - startTime;
-          const errorMsg = err instanceof Error ? err.message : String(err);
+          const errorMsg = (0, error_utils_js_1.toErrorMessage)(err);
           (0, structured_logging_js_1.logEvent)(this.options.logger, structured_logging_js_1.LogEvents.eventProcessed(logContext, { handlerId: handler.id, success: false }, { durationMs, error: errorMsg }));
           this.options.logger.error("Transcript handler failed", {
             handlerId: handler.id,
@@ -59536,6 +59662,7 @@ var require_state_service = __commonJS({
     var node_path_1 = require("node:path");
     var path_resolver_js_1 = require_path_resolver();
     var errors_js_1 = require_errors6();
+    var error_utils_js_1 = require_error_utils();
     var errors_js_2 = require_errors6();
     Object.defineProperty(exports2, "StateNotFoundError", { enumerable: true, get: function() {
       return errors_js_2.StateNotFoundError;
@@ -59647,7 +59774,7 @@ var require_state_service = __commonJS({
           } catch (cleanupErr) {
             this.logger?.trace("Failed to cleanup temp file", {
               tmpPath,
-              error: cleanupErr instanceof Error ? cleanupErr.message : String(cleanupErr)
+              error: (0, error_utils_js_1.toErrorMessage)(cleanupErr)
             });
           }
           throw err;
@@ -59773,7 +59900,7 @@ var require_state_service = __commonJS({
           } catch (err) {
             this.logger?.warn("Failed to preload state file", {
               file,
-              error: err instanceof Error ? err.message : String(err)
+              error: (0, error_utils_js_1.toErrorMessage)(err)
             });
           }
         }
@@ -59799,7 +59926,7 @@ var require_state_service = __commonJS({
         this.logger?.warn("Corrupt state file detected", {
           path,
           reason,
-          error: error instanceof Error ? error.message : String(error)
+          error: (0, error_utils_js_1.toErrorMessage)(error)
         });
         try {
           await fs.rename(path, bakPath);
@@ -59829,7 +59956,7 @@ var require_state_service = __commonJS({
         } catch (err) {
           this.logger?.warn("Failed to create dev mode backup", {
             path,
-            error: err instanceof Error ? err.message : String(err)
+            error: (0, error_utils_js_1.toErrorMessage)(err)
           });
         }
       }
@@ -59892,12 +60019,17 @@ var require_typed_accessor = __commonJS({
     var SessionStateAccessor = class {
       stateService;
       descriptor;
-      constructor(stateService, descriptor) {
+      journal;
+      /** Descriptor filename without .json extension — used as journal file key */
+      fileKey;
+      constructor(stateService, descriptor, journal) {
         this.stateService = stateService;
         this.descriptor = descriptor;
+        this.journal = journal;
         if (descriptor.scope !== "session") {
           throw new Error(`SessionStateAccessor requires a session-scoped descriptor, got: ${descriptor.scope}`);
         }
+        this.fileKey = descriptor.filename.replace(/\.json$/, "");
       }
       /**
        * Read session state file.
@@ -59915,9 +60047,15 @@ var require_typed_accessor = __commonJS({
        */
       async write(sessionId, data) {
         const path = this.stateService.sessionStatePath(sessionId, this.descriptor.filename);
-        return this.stateService.write(path, data, this.descriptor.schema, {
+        await this.stateService.write(path, data, this.descriptor.schema, {
           trackHistory: this.descriptor.trackHistory
         });
+        if (this.journal) {
+          try {
+            await this.journal.appendIfChanged(sessionId, this.fileKey, data);
+          } catch {
+          }
+        }
       }
       /**
        * Delete session state file.
@@ -59925,6 +60063,12 @@ var require_typed_accessor = __commonJS({
       async delete(sessionId) {
         const path = this.stateService.sessionStatePath(sessionId, this.descriptor.filename);
         await this.stateService.delete(path);
+        if (this.journal) {
+          try {
+            await this.journal.appendDeletion(sessionId, this.fileKey);
+          } catch {
+          }
+        }
       }
       /**
        * Get the path for a session state file.
@@ -60190,8 +60334,51 @@ var require_transcript_normalizer = __commonJS({
     exports2.parseUuid = parseUuid;
     exports2.renderTranscriptString = renderTranscriptString;
     var index_js_1 = require_state3();
+    function buildRecapEntry(params) {
+      const text = typeof params.rawText === "string" ? params.rawText.trim() : "";
+      if (!text)
+        return null;
+      return {
+        id: params.uuid ?? `line-${params.lineNumber}`,
+        timestamp: new Date(params.timestamp ?? Date.now()),
+        role: "system",
+        type: "recap",
+        content: text,
+        metadata: {
+          provider: "claude",
+          lineNumber: params.lineNumber,
+          recapSource: params.recapSource,
+          leafUuid: params.leafUuid
+        }
+      };
+    }
     function normalizeEntry(rawEntry, lineNumber) {
       const entryType = rawEntry.type;
+      if (entryType === "summary") {
+        const raw = rawEntry;
+        const recap = buildRecapEntry({
+          rawText: raw.summary,
+          uuid: raw.uuid,
+          timestamp: raw.timestamp,
+          lineNumber,
+          recapSource: "compaction",
+          leafUuid: typeof raw.leafUuid === "string" ? raw.leafUuid : void 0
+        });
+        return recap ? [recap] : null;
+      }
+      if (entryType === "system") {
+        const raw = rawEntry;
+        if (raw.subtype !== "away_summary")
+          return null;
+        const recap = buildRecapEntry({
+          rawText: raw.content,
+          uuid: raw.uuid,
+          timestamp: raw.timestamp,
+          lineNumber,
+          recapSource: "away"
+        });
+        return recap ? [recap] : null;
+      }
       if (entryType !== "user" && entryType !== "assistant") {
         return null;
       }
@@ -60325,6 +60512,9 @@ var require_transcript_normalizer = __commonJS({
           return `[${timestamp}] ${role} TOOL_USE: ${String(toolContent.name)}`;
         } else if (type === "tool_result") {
           return `[${timestamp}] ${role} TOOL_RESULT`;
+        } else if (type === "recap") {
+          const content = typeof entry.content === "string" ? entry.content : "";
+          return `[${timestamp}] RECAP: ${content}`;
         }
         return `[${timestamp}] ${role}: ${JSON.stringify(entry.content)}`;
       }).join("\n");
@@ -60343,6 +60533,7 @@ var require_transcript_excerpt_builder = __commonJS({
     exports2.extractTextContent = extractTextContent;
     exports2.getRawContentString = getRawContentString;
     var transcript_helpers_js_1 = require_transcript_helpers();
+    var error_utils_js_1 = require_error_utils();
     function getBufferedEntries(buffer, head, count, bufferSize) {
       if (count === 0)
         return [];
@@ -60397,7 +60588,7 @@ var require_transcript_excerpt_builder = __commonJS({
         };
       } catch (err) {
         logger.error("Failed to extract transcript excerpt from buffer", {
-          error: err instanceof Error ? err.message : String(err)
+          error: (0, error_utils_js_1.toErrorMessage)(err)
         });
         return {
           content: "",
@@ -60458,6 +60649,14 @@ var require_transcript_excerpt_builder = __commonJS({
               return null;
             }
             return `[SESSION_HINT]: ${entry.summary ?? ""}`;
+          case "system": {
+            if (entry.subtype !== "away_summary")
+              return null;
+            const content = entry.content;
+            if (typeof content !== "string" || !content.trim())
+              return null;
+            return `[SESSION_RECAP]: ${content}`;
+          }
           default:
             return null;
         }
@@ -63316,6 +63515,7 @@ var require_instrumented_llm_provider = __commonJS({
     var node_path_1 = require("node:path");
     var yaml_1 = __importDefault2(require_dist2());
     var types_1 = require_dist();
+    var error_utils_js_1 = require_error_utils();
     var STATE_FILE = "llm-metrics.json";
     var DEFAULT_DEBOUNCE_MS = 500;
     function hasFallbackTracking(provider) {
@@ -63366,7 +63566,7 @@ var require_instrumented_llm_provider = __commonJS({
           }
         } catch (err) {
           this.config.logger.warn("Failed to load LLM metrics, starting fresh", {
-            error: err instanceof Error ? err.message : String(err)
+            error: (0, error_utils_js_1.toErrorMessage)(err)
           });
         }
       }
@@ -63453,7 +63653,7 @@ var require_instrumented_llm_provider = __commonJS({
           this.config.logger.debug("Debug dump written", { path: basePath });
         } catch (dumpError) {
           this.config.logger.warn("Failed to write debug dump", {
-            error: dumpError instanceof Error ? dumpError.message : String(dumpError)
+            error: (0, error_utils_js_1.toErrorMessage)(dumpError)
           });
         }
       }
@@ -63678,7 +63878,7 @@ var require_instrumented_llm_provider = __commonJS({
           });
         } catch (err) {
           this.config.logger.warn("Failed to persist LLM metrics", {
-            error: err instanceof Error ? err.message : String(err)
+            error: (0, error_utils_js_1.toErrorMessage)(err)
           });
         }
       }
@@ -63954,6 +64154,7 @@ var require_daemon_health = __commonJS({
     var fs = __importStar(require("node:fs/promises"));
     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");
     }
@@ -64012,7 +64213,7 @@ var require_daemon_health = __commonJS({
         logger.warn("Failed to write daemon health", {
           from,
           to,
-          error: err instanceof Error ? err.message : String(err)
+          error: (0, error_utils_js_1.toErrorMessage)(err)
         });
         return false;
       }
@@ -64099,6 +64300,7 @@ var require_user_profile_loader = __commonJS({
     var node_path_1 = require("node:path");
     var yaml_1 = require_dist2();
     var types_1 = require_dist();
+    var error_utils_js_1 = require_error_utils();
     function loadUserProfile(options) {
       const home = options?.homeDir ?? (0, node_os_1.homedir)();
       const filePath = (0, node_path_1.join)(home, ".sidekick", "user.yaml");
@@ -64120,7 +64322,7 @@ var require_user_profile_loader = __commonJS({
       } catch (err) {
         options?.logger?.warn("Failed to read user profile", {
           path: filePath,
-          error: err instanceof Error ? err.message : String(err)
+          error: (0, error_utils_js_1.toErrorMessage)(err)
         });
         return null;
       }
@@ -64187,9 +64389,9 @@ var require_dist4 = __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.toScopeStatus = exports2.LEGACY_USER_STATUS_FILENAME = 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.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.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 = 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.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 = void 0;
-    exports2.CoalescingGuard = exports2.loadUserProfile = exports2.parseGitStatusOutput = exports2.getGitFileStatus = 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 = void 0;
+    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;
     var types_1 = require_dist();
     Object.defineProperty(exports2, "TaskTypes", { enumerable: true, get: function() {
       return types_1.TaskTypes;
@@ -64234,6 +64436,12 @@ var require_dist4 = __commonJS({
     Object.defineProperty(exports2, "isPreCompactEvent", { enumerable: true, get: function() {
       return types_2.isPreCompactEvent;
     } });
+    Object.defineProperty(exports2, "isSubagentStartEvent", { enumerable: true, get: function() {
+      return types_2.isSubagentStartEvent;
+    } });
+    Object.defineProperty(exports2, "isSubagentStopEvent", { enumerable: true, get: function() {
+      return types_2.isSubagentStopEvent;
+    } });
     __exportStar(require_assets(), exports2);
     var claude_paths_1 = require_claude_paths();
     Object.defineProperty(exports2, "encodeProjectPath", { enumerable: true, get: function() {
@@ -64354,9 +64562,6 @@ var require_dist4 = __commonJS({
     Object.defineProperty(exports2, "PROJECT_STATUS_FILENAME", { enumerable: true, get: function() {
       return setup_status_service_1.PROJECT_STATUS_FILENAME;
     } });
-    Object.defineProperty(exports2, "LEGACY_USER_STATUS_FILENAME", { enumerable: true, get: function() {
-      return setup_status_service_1.LEGACY_USER_STATUS_FILENAME;
-    } });
     var api_key_detector_1 = require_api_key_detector();
     Object.defineProperty(exports2, "toScopeStatus", { enumerable: true, get: function() {
       return api_key_detector_1.toScopeStatus;
@@ -64425,12 +64630,21 @@ var require_dist4 = __commonJS({
     Object.defineProperty(exports2, "detectGitignoreStatus", { enumerable: true, get: function() {
       return gitignore_1.detectGitignoreStatus;
     } });
+    Object.defineProperty(exports2, "detectLegacyGitignoreSection", { enumerable: true, get: function() {
+      return gitignore_1.detectLegacyGitignoreSection;
+    } });
+    Object.defineProperty(exports2, "removeLegacyGitignoreSection", { enumerable: true, get: function() {
+      return gitignore_1.removeLegacyGitignoreSection;
+    } });
     Object.defineProperty(exports2, "SIDEKICK_SECTION_START", { enumerable: true, get: function() {
       return gitignore_1.SIDEKICK_SECTION_START;
     } });
     Object.defineProperty(exports2, "SIDEKICK_SECTION_END", { enumerable: true, get: function() {
       return gitignore_1.SIDEKICK_SECTION_END;
     } });
+    Object.defineProperty(exports2, "SIDEKICK_GITIGNORE_HEADER", { enumerable: true, get: function() {
+      return gitignore_1.SIDEKICK_GITIGNORE_HEADER;
+    } });
     Object.defineProperty(exports2, "GITIGNORE_ENTRIES", { enumerable: true, get: function() {
       return gitignore_1.GITIGNORE_ENTRIES;
     } });
@@ -64583,6 +64797,10 @@ var require_dist4 = __commonJS({
     Object.defineProperty(exports2, "isInSandbox", { enumerable: true, get: function() {
       return sandbox_1.isInSandbox;
     } });
+    var error_utils_1 = require_error_utils();
+    Object.defineProperty(exports2, "toErrorMessage", { enumerable: true, get: function() {
+      return error_utils_1.toErrorMessage;
+    } });
     var git_status_1 = require_git_status();
     Object.defineProperty(exports2, "getGitFileStatus", { enumerable: true, get: function() {
       return git_status_1.getGitFileStatus;
@@ -64641,7 +64859,7 @@ var require_runtime = __commonJS({
         });
       } catch (err) {
         loggerFacade.error("Failed to load configuration", {
-          error: err instanceof Error ? err.message : String(err)
+          error: (0, core_1.toErrorMessage)(err)
         });
         throw err;
       }
@@ -64809,7 +65027,7 @@ var require_dev_mode_guard = __commonJS({
           }
         } catch (err) {
           logger.warn(`Failed to auto-correct devMode flag for ${callerLabel}`, {
-            error: err instanceof Error ? err.message : String(err),
+            error: (0, core_1.toErrorMessage)(err),
             caller: callerLabel
           });
         }
@@ -64827,7 +65045,7 @@ var require_dev_mode_guard = __commonJS({
         }
       } catch (err) {
         logger.warn(`Failed to check plugin/dev-mode status for ${callerLabel}, proceeding normally`, {
-          error: err instanceof Error ? err.message : String(err),
+          error: (0, core_1.toErrorMessage)(err),
           caller: callerLabel
         });
       }
@@ -71853,6 +72071,7 @@ var require_reminder_utils = __commonJS({
     var node_path_1 = require("node:path");
     var yaml = __importStar(require_js_yaml());
     var zod_1 = require_zod2();
+    var core_1 = require_dist4();
     var ReminderDefinitionSchema = zod_1.z.object({
       id: zod_1.z.string(),
       blocking: zod_1.z.boolean(),
@@ -71905,7 +72124,7 @@ var require_reminder_utils = __commonJS({
         if (logger) {
           logger.error("Failed to load reminder", {
             reminderId,
-            error: err instanceof Error ? err.message : String(err)
+            error: (0, core_1.toErrorMessage)(err)
           });
         } else {
           console.error(`Failed to load reminder ${reminderId}:`, err);
@@ -72645,7 +72864,7 @@ var require_stage_pause_and_reflect = __commonJS({
       (0, staging_handler_utils_js_1.createStagingHandler)(context, {
         id: "reminders:stage-pause-and-reflect",
         priority: 80,
-        filter: { kind: "transcript", eventTypes: ["ToolCall"] },
+        filter: { kind: "transcript", eventTypes: ["ToolResult"] },
         execute: async (event, ctx) => {
           if (!(0, types_1.isTranscriptEvent)(event))
             return void 0;
@@ -74328,17 +74547,15 @@ var require_track_verification_tools = __commonJS({
     var state_js_1 = require_state4();
     var FILE_EDIT_TOOLS = ["Write", "Edit", "MultiEdit"];
     var VC_TOOL_NAME_SET = new Set(types_js_1.VC_TOOL_REMINDER_IDS);
-    function extractToolInput(event) {
-      const entry = event.payload.entry;
-      return entry?.input;
-    }
+    var MAX_PENDING_TOOL_CALLS = 100;
     function registerTrackVerificationTools(context) {
       if (!(0, types_1.isDaemonContext)(context))
         return;
+      const pendingBySession = /* @__PURE__ */ new Map();
       context.handlers.register({
         id: "reminders:track-verification-tools",
         priority: 60,
-        filter: { kind: "transcript", eventTypes: ["ToolCall"] },
+        filter: { kind: "transcript", eventTypes: ["ToolCall", "ToolResult"] },
         handler: async (event, ctx) => {
           if (!(0, types_1.isTranscriptEvent)(event))
             return;
@@ -74350,22 +74567,66 @@ var require_track_verification_tools = __commonJS({
           const sessionId = event.context?.sessionId;
           if (!sessionId)
             return;
-          const toolName = event.payload.toolName;
-          if (!toolName)
+          if (event.eventType === "ToolCall") {
+            const toolUseId = event.payload.entry.id;
+            const toolName = event.payload.toolName;
+            if (!toolUseId || !toolName)
+              return;
+            const entry = event.payload.entry;
+            const input = entry?.input ?? {};
+            let sessionMap = pendingBySession.get(sessionId);
+            if (!sessionMap) {
+              sessionMap = /* @__PURE__ */ new Map();
+              pendingBySession.set(sessionId, sessionMap);
+            }
+            if (sessionMap.size >= MAX_PENDING_TOOL_CALLS) {
+              const oldest = sessionMap.keys().next().value;
+              if (oldest)
+                sessionMap.delete(oldest);
+            }
+            sessionMap.set(toolUseId, { toolName, input });
             return;
-          const config = (0, types_js_1.getRemindersConfig)(context.config);
-          const verificationTools = config.verification_tools ?? {};
-          const runners = config.command_runners ?? [];
-          const remindersState = (0, state_js_1.createRemindersState)(daemonCtx.stateService);
-          const stateResult = await remindersState.verificationTools.read(sessionId);
-          const toolsState = { ...stateResult.data };
-          if (FILE_EDIT_TOOLS.includes(toolName)) {
-            await handleFileEdit(event, daemonCtx, sessionId, verificationTools, toolsState, remindersState);
-          } else if (toolName === "Bash") {
-            await handleBashCommand(event, daemonCtx, sessionId, verificationTools, toolsState, remindersState, runners);
+          }
+          if (event.eventType === "ToolResult") {
+            const toolUseId = event.payload.entry.tool_use_id;
+            if (!toolUseId)
+              return;
+            const sessionMap = pendingBySession.get(sessionId);
+            const pending = sessionMap?.get(toolUseId);
+            if (!pending)
+              return;
+            sessionMap.delete(toolUseId);
+            if (sessionMap.size === 0)
+              pendingBySession.delete(sessionId);
+            const { toolName, input } = pending;
+            const config = (0, types_js_1.getRemindersConfig)(context.config);
+            const verificationTools = config.verification_tools ?? {};
+            const runners = config.command_runners ?? [];
+            const remindersState = (0, state_js_1.createRemindersState)(daemonCtx.stateService);
+            const stateResult = await remindersState.verificationTools.read(sessionId);
+            const toolsState = { ...stateResult.data };
+            if (FILE_EDIT_TOOLS.includes(toolName)) {
+              await handleFileEdit(input, daemonCtx, sessionId, verificationTools, toolsState, remindersState);
+            } else if (toolName === "Bash") {
+              await handleBashCommand(input, daemonCtx, sessionId, verificationTools, toolsState, remindersState, runners);
+            }
           }
         }
       });
+      context.handlers.register({
+        id: "reminders:track-verification-tools-cleanup",
+        priority: 60,
+        filter: { kind: "hook", hooks: ["UserPromptSubmit", "Stop"] },
+        // eslint-disable-next-line @typescript-eslint/require-await -- sync cleanup, async required by EventHandler type
+        handler: async (event, _ctx) => {
+          if (!(0, types_1.isHookEvent)(event))
+            return;
+          const sessionId = event.context?.sessionId;
+          if (!sessionId)
+            return;
+          pendingBySession.delete(sessionId);
+        }
+      });
     }
     async function stageToolsForFiles(filePaths, daemonCtx, sessionId, verificationTools, toolsState, remindersState, triggeredBy = "file_edit") {
       const existingReminders = await daemonCtx.staging.listReminders("Stop");
@@ -74470,7 +74731,7 @@ var require_track_verification_tools = __commonJS({
               toolName,
               reminderId,
               sessionId,
-              error: error instanceof Error ? error.message : String(error)
+              error: (0, core_1.toErrorMessage)(error)
             });
           }
         }
@@ -74484,8 +74745,8 @@ var require_track_verification_tools = __commonJS({
       await remindersState.verificationTools.write(sessionId, toolsState);
       return anyStaged;
     }
-    async function handleFileEdit(event, daemonCtx, sessionId, verificationTools, toolsState, remindersState) {
-      const filePath = extractToolInput(event)?.file_path;
+    async function handleFileEdit(input, daemonCtx, sessionId, verificationTools, toolsState, remindersState) {
+      const filePath = input.file_path;
       if (!filePath)
         return;
       const projectDir = daemonCtx.paths?.projectDir;
@@ -74493,8 +74754,8 @@ var require_track_verification_tools = __commonJS({
         return;
       await stageToolsForFiles([filePath], daemonCtx, sessionId, verificationTools, toolsState, remindersState);
     }
-    async function handleBashCommand(event, daemonCtx, sessionId, verificationTools, toolsState, remindersState, runners = []) {
-      const command = extractToolInput(event)?.command;
+    async function handleBashCommand(input, daemonCtx, sessionId, verificationTools, toolsState, remindersState, runners = []) {
+      const command = input.command;
       if (!command)
         return;
       let anyUnstaged = false;
@@ -74923,7 +75184,7 @@ var require_stage_persona_reminders = __commonJS({
         } catch (err) {
           logger.error("Failed to restage persona reminders", {
             sessionId,
-            error: err instanceof Error ? err.message : String(err)
+            error: (0, core_1.toErrorMessage)(err)
           });
         }
       }
@@ -75159,6 +75420,38 @@ var require_stage_user_profile_reminders = __commonJS({
   }
 });
 
+// ../feature-reminders/dist/handlers/staging/cleanup-on-stop.js
+var require_cleanup_on_stop = __commonJS({
+  "../feature-reminders/dist/handlers/staging/cleanup-on-stop.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.registerCleanupOnStop = registerCleanupOnStop;
+    var types_1 = require_dist();
+    function registerCleanupOnStop(context) {
+      if (!(0, types_1.isDaemonContext)(context))
+        return;
+      context.handlers.register({
+        id: "reminders:cleanup-on-stop",
+        priority: 50,
+        filter: { kind: "hook", hooks: ["Stop"] },
+        handler: async (event, ctx) => {
+          if (!(0, types_1.isHookEvent)(event))
+            return;
+          if (!(0, types_1.isDaemonContext)(ctx))
+            return;
+          const daemonCtx = ctx;
+          const sessionId = event.context?.sessionId;
+          if (!sessionId)
+            return;
+          if (daemonCtx.orchestrator) {
+            await daemonCtx.orchestrator.onStop(sessionId);
+          }
+        }
+      });
+    }
+  }
+});
+
 // ../feature-reminders/dist/handlers/staging/index.js
 var require_staging2 = __commonJS({
   "../feature-reminders/dist/handlers/staging/index.js"(exports2) {
@@ -75172,6 +75465,7 @@ var require_staging2 = __commonJS({
     var unstage_verify_completion_1 = require_unstage_verify_completion();
     var stage_persona_reminders_1 = require_stage_persona_reminders();
     var stage_user_profile_reminders_1 = require_stage_user_profile_reminders();
+    var cleanup_on_stop_1 = require_cleanup_on_stop();
     function registerStagingHandlers(context) {
       (0, stage_default_user_prompt_1.registerStageDefaultUserPrompt)(context);
       (0, stage_pause_and_reflect_1.registerStagePauseAndReflect)(context);
@@ -75180,6 +75474,7 @@ var require_staging2 = __commonJS({
       (0, unstage_verify_completion_1.registerUnstageVerifyCompletion)(context);
       (0, stage_persona_reminders_1.registerStagePersonaReminders)(context);
       (0, stage_user_profile_reminders_1.registerStageUserProfileReminders)(context);
+      (0, cleanup_on_stop_1.registerCleanupOnStop)(context);
     }
   }
 });
@@ -75900,7 +76195,7 @@ var require_orchestrator = __commonJS({
           } catch (err) {
             this.deps.logger.warn("Failed to unstage VC reminders after P&R staged", {
               sessionId,
-              error: err instanceof Error ? err.message : String(err)
+              error: (0, core_1.toErrorMessage)(err)
             });
           }
         }
@@ -75924,27 +76219,10 @@ var require_orchestrator = __commonJS({
           } catch (err) {
             this.deps.logger.warn("Failed to reset P&R baseline after VC consumed", {
               sessionId,
-              error: err instanceof Error ? err.message : String(err)
-            });
-          }
-          try {
-            const staging = this.deps.getStagingService(sessionId);
-            const deleted = await staging.deleteReminder("PreToolUse", types_js_1.ReminderIds.PAUSE_AND_REFLECT);
-            if (deleted) {
-              (0, core_1.logEvent)(this.deps.logger.child({ context: { sessionId } }), events_js_1.ReminderEvents.reminderUnstaged({ sessionId }, {
-                reminderName: types_js_1.ReminderIds.PAUSE_AND_REFLECT,
-                hookName: "PreToolUse",
-                reason: "vc_consumed_cascade",
-                triggeredBy: "cascade_from_verify_completion"
-              }));
-            }
-            this.deps.logger.debug("VC unstage: P&R cascade from VC consumed", { sessionId, deleted });
-          } catch (err) {
-            this.deps.logger.warn("Failed to unstage P&R after VC consumed", {
-              sessionId,
-              error: err instanceof Error ? err.message : String(err)
+              error: (0, core_1.toErrorMessage)(err)
             });
           }
+          await this.unstagePauseAndReflect(sessionId, "vc_consumed_cascade", "cascade_from_verify_completion");
         }
       }
       /**
@@ -75961,7 +76239,43 @@ var require_orchestrator = __commonJS({
         } catch (err) {
           this.deps.logger.warn("Failed to clear P&R baseline on UserPromptSubmit", {
             sessionId,
-            error: err instanceof Error ? err.message : String(err)
+            error: (0, core_1.toErrorMessage)(err)
+          });
+        }
+      }
+      /**
+       * Called when Stop hook fires.
+       *
+       * P&R is designed to interrupt runaway execution — once the agent stops,
+       * it's irrelevant. This is defensive: Rule 4 (VC consumed → unstage P&R)
+       * covers the VC case, but this handles the no-VC case where P&R would
+       * otherwise linger on PreToolUse.
+       */
+      async onStop(sessionId) {
+        await this.unstagePauseAndReflect(sessionId, "agent_stopping", "stop_hook");
+      }
+      /**
+       * Delete P&R from PreToolUse staging and log the event.
+       * Shared by Rule 4 (VC consumed → unstage P&R) and onStop (agent stopping).
+       */
+      async unstagePauseAndReflect(sessionId, reason, triggeredBy) {
+        try {
+          const staging = this.deps.getStagingService(sessionId);
+          const deleted = await staging.deleteReminder("PreToolUse", types_js_1.ReminderIds.PAUSE_AND_REFLECT);
+          if (deleted) {
+            (0, core_1.logEvent)(this.deps.logger.child({ context: { sessionId } }), events_js_1.ReminderEvents.reminderUnstaged({ sessionId }, {
+              reminderName: types_js_1.ReminderIds.PAUSE_AND_REFLECT,
+              hookName: "PreToolUse",
+              reason,
+              triggeredBy
+            }));
+          }
+          this.deps.logger.debug("P&R unstaged", { sessionId, deleted, reason });
+        } catch (err) {
+          this.deps.logger.warn("Failed to unstage P&R", {
+            sessionId,
+            reason,
+            error: (0, core_1.toErrorMessage)(err)
           });
         }
       }
@@ -76130,6 +76444,7 @@ var require_hook = __commonJS({
     exports2.isHookCommand = isHookCommand;
     exports2.getHookName = getHookName;
     var core_1 = require_dist4();
+    var types_1 = require_dist();
     var context_js_1 = require_context2();
     function truncateForLog(raw) {
       const entries = Object.entries(raw);
@@ -76158,15 +76473,7 @@ var require_hook = __commonJS({
       }
       return truncateForLog(filtered);
     }
-    var VALID_HOOK_NAMES = /* @__PURE__ */ new Set([
-      "SessionStart",
-      "SessionEnd",
-      "UserPromptSubmit",
-      "PreToolUse",
-      "PostToolUse",
-      "Stop",
-      "PreCompact"
-    ]);
+    var VALID_HOOK_NAMES = new Set(types_1.HOOK_NAMES);
     function validateHookName(hookEventName) {
       return VALID_HOOK_NAMES.has(hookEventName) ? hookEventName : void 0;
     }
@@ -76177,7 +76484,9 @@ var require_hook = __commonJS({
       "pre-tool-use": "PreToolUse",
       "post-tool-use": "PostToolUse",
       stop: "Stop",
-      "pre-compact": "PreCompact"
+      "pre-compact": "PreCompact",
+      "subagent-start": "SubagentStart",
+      "subagent-stop": "SubagentStop"
     };
     function extractToolFields(raw) {
       const toolName = typeof raw.tool_name === "string" ? raw.tool_name : "unknown";
@@ -76279,11 +76588,46 @@ var require_hook = __commonJS({
         }
       };
     }
+    function buildSubagentStartEvent(context, input) {
+      return {
+        kind: "hook",
+        hook: "SubagentStart",
+        context,
+        payload: {
+          transcriptPath: input.transcriptPath,
+          agentId: context.agentId,
+          agentType: context.agentType
+        }
+      };
+    }
+    function buildSubagentStopEvent(context, input) {
+      const raw = input.raw;
+      const agentTranscriptPath = typeof raw.agent_transcript_path === "string" ? raw.agent_transcript_path : "";
+      const lastAssistantMessage = typeof raw.last_assistant_message === "string" ? raw.last_assistant_message : "";
+      const permissionMode = input.permissionMode ?? "default";
+      const stopHookActive = typeof raw.stop_hook_active === "boolean" ? raw.stop_hook_active : void 0;
+      return {
+        kind: "hook",
+        hook: "SubagentStop",
+        context,
+        payload: {
+          transcriptPath: input.transcriptPath,
+          permissionMode,
+          agentId: context.agentId,
+          agentType: context.agentType,
+          agentTranscriptPath,
+          lastAssistantMessage,
+          ...stopHookActive !== void 0 && { stopHookActive }
+        }
+      };
+    }
     function buildHookEvent(hookName, input, correlationId) {
       const context = {
         sessionId: input.sessionId,
         timestamp: Date.now(),
-        correlationId
+        correlationId,
+        ...input.agentId !== void 0 && { agentId: input.agentId },
+        ...input.agentType !== void 0 && { agentType: input.agentType }
       };
       switch (hookName) {
         case "SessionStart":
@@ -76300,6 +76644,22 @@ var require_hook = __commonJS({
           return buildStopEvent(context, input);
         case "PreCompact":
           return buildPreCompactEvent(context, input);
+        case "SubagentStart": {
+          const subagentContext = {
+            ...context,
+            agentId: input.agentId ?? "",
+            agentType: input.agentType ?? ""
+          };
+          return buildSubagentStartEvent(subagentContext, input);
+        }
+        case "SubagentStop": {
+          const subagentContext = {
+            ...context,
+            agentId: input.agentId ?? "",
+            agentType: input.agentType ?? ""
+          };
+          return buildSubagentStopEvent(subagentContext, input);
+        }
       }
     }
     function mergeHookResponses(daemonResponse, cliResponse) {
@@ -76321,6 +76681,10 @@ ${daemonResponse.additionalContext}` : cliResponse.additionalContext;
       return merged;
     }
     async function handleHookCommand(hookName, options, logger, stdout) {
+      if (process.env.SIDEKICK_SUBPROCESS === "1") {
+        stdout.write("{}\n");
+        return { exitCode: 0, output: "{}" };
+      }
       const { projectRoot, hookInput, correlationId, runtime } = options;
       const startTime = Date.now();
       const logContext = {
@@ -76429,7 +76793,7 @@ var require_hook_command = __commonJS({
         return void 0;
       } catch (err) {
         logger.error("Failed to load safe-word-liveness.yaml", {
-          error: err instanceof Error ? err.message : String(err),
+          error: (0, core_1.toErrorMessage)(err),
           projectRoot
         });
         return void 0;
@@ -76512,6 +76876,17 @@ var require_hook_command = __commonJS({
       addUserMessage(response, internal.userMessage);
       return response;
     }
+    function translateSubagentStart(internal) {
+      const response = {};
+      if (internal.additionalContext) {
+        response.hookSpecificOutput = {
+          hookEventName: "SubagentStart",
+          additionalContext: internal.additionalContext
+        };
+      }
+      addUserMessage(response, internal.userMessage);
+      return response;
+    }
     var TRANSLATORS = {
       SessionStart: translateSessionStart,
       SessionEnd: () => ({}),
@@ -76519,7 +76894,10 @@ var require_hook_command = __commonJS({
       PreToolUse: translatePreToolUse,
       PostToolUse: translatePostToolUse,
       Stop: translateStop,
-      PreCompact: () => ({})
+      PreCompact: () => ({}),
+      SubagentStart: translateSubagentStart,
+      // SubagentStop shares Stop's blocking semantics verbatim per Claude Code docs.
+      SubagentStop: translateStop
     };
     function translateToClaudeCodeFormat(hookName, internal) {
       return TRANSLATORS[hookName](internal);
@@ -76532,13 +76910,17 @@ var require_hook_command = __commonJS({
       "post-tool-use": "PostToolUse",
       stop: "Stop",
       "pre-compact": "PreCompact",
+      "subagent-start": "SubagentStart",
+      "subagent-stop": "SubagentStop",
       SessionStart: "SessionStart",
       SessionEnd: "SessionEnd",
       UserPromptSubmit: "UserPromptSubmit",
       PreToolUse: "PreToolUse",
       PostToolUse: "PostToolUse",
       Stop: "Stop",
-      PreCompact: "PreCompact"
+      PreCompact: "PreCompact",
+      SubagentStart: "SubagentStart",
+      SubagentStop: "SubagentStop"
     };
     function parseHookArg(arg) {
       return arg ? HOOK_ARG_TO_NAME[arg] : void 0;
@@ -76571,7 +76953,7 @@ var require_hook_command = __commonJS({
         return configured;
       } catch (err) {
         logger.warn("Failed to auto-configure project", {
-          error: err instanceof Error ? err.message : String(err),
+          error: (0, core_1.toErrorMessage)(err),
           projectRoot
         });
         return false;
@@ -76584,7 +76966,7 @@ var require_hook_command = __commonJS({
         state = await setupService.getSetupState();
       } catch (err) {
         logger.warn("Failed to check setup state, assuming healthy", {
-          error: err instanceof Error ? err.message : String(err),
+          error: (0, core_1.toErrorMessage)(err),
           hookName,
           projectRoot
         });
@@ -76622,7 +77004,7 @@ var require_hook_command = __commonJS({
         }
       } catch (err) {
         logger.warn("Failed to check setup status for daemon start, proceeding anyway", {
-          error: err instanceof Error ? err.message : String(err)
+          error: (0, core_1.toErrorMessage)(err)
         });
       }
       try {
@@ -76632,7 +77014,7 @@ var require_hook_command = __commonJS({
         await (0, core_1.updateDaemonHealth)(projectRoot, "healthy", logger);
         return true;
       } catch (err) {
-        const errorMessage = err instanceof Error ? err.message : String(err);
+        const errorMessage = (0, core_1.toErrorMessage)(err);
         await (0, core_1.updateDaemonHealth)(projectRoot, "failed", logger, errorMessage);
         return false;
       }
@@ -76645,13 +77027,17 @@ var require_hook_command = __commonJS({
       } catch (err) {
         logger.warn("Failed to parse internal hook response", {
           hookName,
-          error: err instanceof Error ? err.message : String(err),
+          error: (0, core_1.toErrorMessage)(err),
           output
         });
         return {};
       }
     }
     async function handleUnifiedHookCommand(hookName, options, logger, stdout) {
+      if (process.env.SIDEKICK_SUBPROCESS === "1") {
+        stdout.write("{}\n");
+        return { exitCode: 0, output: "{}" };
+      }
       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);
@@ -77420,7 +77806,7 @@ var require_persona_selection = __commonJS({
       } catch (err) {
         ctx.logger.warn("Failed to ensure persona for session", {
           sessionId,
-          error: err instanceof Error ? err.message : String(err)
+          error: (0, core_1.toErrorMessage)(err)
         });
       }
     }
@@ -78180,7 +78566,7 @@ var require_update_summary = __commonJS({
         ctx.logger.error("performAnalysis failed", {
           sessionId,
           reason,
-          error: err instanceof Error ? err.message : String(err)
+          error: (0, core_1.toErrorMessage)(err)
         });
       }
     }
@@ -78582,7 +78968,7 @@ var require_resume_discovery = __commonJS({
         }
         config.logger?.warn("Failed to discover previous resume message", {
           sessionsDir: config.sessionsDir,
-          error: error instanceof Error ? error.message : String(error)
+          error: (0, core_1.toErrorMessage)(error)
         });
         return NOT_FOUND;
       }
@@ -80339,7 +80725,7 @@ Examples:
         }
         const event = core_1.LogEvents.statuslineError(eventContext, "unknown", {
           fallbackUsed: true,
-          error: error instanceof Error ? error.message : String(error)
+          error: (0, core_1.toErrorMessage)(error)
         });
         (0, core_1.logEvent)(logger, event);
         logger.warn("Statusline render failed", { durationMs });
@@ -80357,6 +80743,7 @@ var require_ui = __commonJS({
     exports2.handleUiCommand = handleUiCommand;
     var node_child_process_1 = require("node:child_process");
     var node_path_1 = require("node:path");
+    var core_1 = require_dist4();
     function resolveUiPackageDir() {
       const cliCommandsDir = __dirname;
       const cliPackageDir = (0, node_path_1.resolve)(cliCommandsDir, "..", "..");
@@ -80386,7 +80773,7 @@ var require_ui = __commonJS({
         logger.debug("Browser open command executed", { command, url });
       } catch (err) {
         logger.warn("Failed to open browser", {
-          error: err instanceof Error ? err.message : String(err)
+          error: (0, core_1.toErrorMessage)(err)
         });
       }
     }
@@ -80692,7 +81079,7 @@ var require_persona2 = __commonJS({
         }
         return writeJsonResponse(stdout, { success: true, personaId, previousPersonaId }, 0);
       } catch (err) {
-        const errorMsg = err instanceof Error ? err.message : String(err);
+        const errorMsg = (0, core_1.toErrorMessage)(err);
         logger.error("Failed to set persona", { error: errorMsg });
         return writeJsonResponse(stdout, { success: false, error: errorMsg }, 1);
       }
@@ -80716,7 +81103,7 @@ var require_persona2 = __commonJS({
         logger.info("Persona cleared", { previousPersonaId: previousPersonaId ?? "(none)" });
         return writeJsonResponse(stdout, { success: true, personaId: null, previousPersonaId }, 0);
       } catch (err) {
-        const errorMsg = err instanceof Error ? err.message : String(err);
+        const errorMsg = (0, core_1.toErrorMessage)(err);
         logger.error("Failed to clear persona", { error: errorMsg });
         return writeJsonResponse(stdout, { success: false, error: errorMsg }, 1);
       }
@@ -80761,7 +81148,7 @@ var require_persona2 = __commonJS({
           return writeJsonResponse(stdout, { error: `Failed to read generated file: ${statePath}` }, 1);
         }
       } catch (err) {
-        const errorMsg = err instanceof Error ? err.message : String(err);
+        const errorMsg = (0, core_1.toErrorMessage)(err);
         logger.error("Persona test failed", { error: errorMsg });
         return writeJsonResponse(stdout, { error: errorMsg }, 1);
       } finally {
@@ -80789,7 +81176,7 @@ var require_persona2 = __commonJS({
           filePath: result.filePath
         }, 0);
       } catch (err) {
-        const errorMsg = err instanceof Error ? err.message : String(err);
+        const errorMsg = (0, core_1.toErrorMessage)(err);
         logger.error("Failed to pin persona", { error: errorMsg });
         return writeJsonResponse(stdout, { success: false, error: errorMsg }, 1);
       }
@@ -80813,7 +81200,7 @@ var require_persona2 = __commonJS({
           previousPersonaId
         }, 0);
       } catch (err) {
-        const errorMsg = err instanceof Error ? err.message : String(err);
+        const errorMsg = (0, core_1.toErrorMessage)(err);
         logger.error("Failed to unpin persona", { error: errorMsg });
         return writeJsonResponse(stdout, { success: false, error: errorMsg }, 1);
       }
@@ -80924,7 +81311,7 @@ var require_config3 = __commonJS({
           logger
         });
       } catch (err) {
-        const message = err instanceof Error ? err.message : String(err);
+        const message = (0, core_1.toErrorMessage)(err);
         const error = `Error: ${message}`;
         stdout.write(error + "\n");
         return { exitCode: 1, output: error };
@@ -80970,7 +81357,7 @@ var require_config3 = __commonJS({
         stdout.write(output + "\n");
         return { exitCode: 0, output };
       } catch (err) {
-        const message = err instanceof Error ? err.message : String(err);
+        const message = (0, core_1.toErrorMessage)(err);
         const error = `Error: ${message}`;
         stdout.write(error + "\n");
         return { exitCode: 1, output: error };
@@ -80999,7 +81386,7 @@ var require_config3 = __commonJS({
         stdout.write(output + "\n");
         return { exitCode: 0, output };
       } catch (err) {
-        const message = err instanceof Error ? err.message : String(err);
+        const message = (0, core_1.toErrorMessage)(err);
         const error = `Error: ${message}`;
         stdout.write(error + "\n");
         return { exitCode: 1, output: error };
@@ -81028,7 +81415,7 @@ var require_config3 = __commonJS({
         stdout.write(output + "\n");
         return { exitCode: 0, output };
       } catch (err) {
-        const message = err instanceof Error ? err.message : String(err);
+        const message = (0, core_1.toErrorMessage)(err);
         const error = `Error: ${message}`;
         stdout.write(error + "\n");
         return { exitCode: 1, output: error };
@@ -81254,7 +81641,7 @@ Examples:
         logger.info("Listed sessions", { count: sessions.length });
         return { exitCode: 0, output: JSON.stringify({ count: sessions.length }) };
       } catch (err) {
-        const errorMsg = err instanceof Error ? err.message : String(err);
+        const errorMsg = (0, core_1.toErrorMessage)(err);
         logger.error("Failed to list sessions", { error: errorMsg });
         stdout.write(JSON.stringify({ error: errorMsg }, null, 2) + "\n");
         return { exitCode: 1, output: errorMsg };
@@ -81907,14 +82294,63 @@ var require_dev_mode = __commonJS({
       log(stdout, "info", "Full clean complete.");
       return { exitCode: 0 };
     }
+    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 projects = await registry.list();
+      if (projects.length === 0) {
+        log(stdout, "info", `No registered projects found in ${registryRoot}`);
+        return { exitCode: 0 };
+      }
+      log(stdout, "step", `Found ${projects.length} registered project(s):`);
+      for (const project of projects) {
+        stdout.write(`  - ${project.displayName} (${project.path})
+`);
+      }
+      stdout.write("\n");
+      let cleanedCount = 0;
+      let skippedCount = 0;
+      for (const project of projects) {
+        let projectStats;
+        try {
+          projectStats = await (0, promises_12.stat)(project.path);
+        } catch {
+          log(stdout, "warn", `${project.displayName}: directory not found at ${project.path}, skipping`);
+          skippedCount++;
+          continue;
+        }
+        if (!projectStats.isDirectory()) {
+          log(stdout, "warn", `${project.displayName}: path is not a directory at ${project.path}, skipping`);
+          skippedCount++;
+          continue;
+        }
+        if (!force) {
+          const shouldClean = await (0, prompt_js_1.promptConfirm)({ stdin, stdout }, `Clean ${project.displayName} (${project.path})?`);
+          if (!shouldClean) {
+            log(stdout, "info", `Skipping ${project.displayName}`);
+            skippedCount++;
+            continue;
+          }
+        }
+        stdout.write("\n");
+        log(stdout, "step", `Cleaning ${project.displayName}...`);
+        await doClean(project.path, logger, stdout, { force, stdin });
+        cleanedCount++;
+      }
+      stdout.write("\n");
+      log(stdout, "info", `Clean-all-projects complete: cleaned ${cleanedCount} project(s), skipped ${skippedCount}.`);
+      return { exitCode: 0 };
+    }
     var USAGE_TEXT = `Usage: sidekick dev-mode <command> [options]
 
 Commands:
-  enable     Add dev-sidekick to .claude/settings.local.json
-  disable    Remove dev-sidekick from settings.local.json
-  status     Show current dev-mode state
-  clean      Truncate logs, kill daemon, clean state folders
-  clean-all  Full cleanup: clean + remove logs/sessions/state dirs
+  enable              Add dev-sidekick to .claude/settings.local.json
+  disable             Remove dev-sidekick from settings.local.json
+  status              Show current dev-mode state
+  clean               Truncate logs, kill daemon, clean state folders
+  clean-all           Full cleanup: clean + remove logs/sessions/state dirs
+  clean-all-projects  Clean all registered projects in ~/.sidekick/projects/
 
 Options:
   --force    Skip confirmation prompts for destructive operations
@@ -81931,6 +82367,8 @@ Options:
           return doClean(projectDir, logger, stdout, options);
         case "clean-all":
           return doCleanAll(projectDir, logger, stdout, options);
+        case "clean-all-projects":
+          return doCleanAllProjects(logger, stdout, options);
         case "help":
         case "--help":
         case "-h":
@@ -82702,6 +83140,7 @@ var require_helpers = __commonJS({
     exports2.getPluginStatusLabel = getPluginStatusLabel;
     exports2.getApiKeyStatusType = getApiKeyStatusType;
     exports2.getPluginStatusIcon = getPluginStatusIcon;
+    exports2.isPluginPresent = isPluginPresent;
     exports2.getLivenessIcon = getLivenessIcon;
     exports2.getLivenessLabel = getLivenessLabel;
     exports2.formatApiKeyScopes = formatApiKeyScopes;
@@ -82784,7 +83223,7 @@ var require_helpers = __commonJS({
         case "dev-mode":
           return "dev-mode (local)";
         case "both":
-          return "conflict (both plugin and dev-mode detected!)";
+          return "plugin and dev-mode both active";
         case "none":
           return "not installed";
         case "timeout":
@@ -82809,6 +83248,7 @@ var require_helpers = __commonJS({
         case "dev-mode":
           return "\u2713";
         case "both":
+          return "\u2022";
         case "timeout":
         case "error":
           return "\u26A0";
@@ -82816,6 +83256,9 @@ var require_helpers = __commonJS({
           return "\u2717";
       }
     }
+    function isPluginPresent(status) {
+      return status === "plugin" || status === "dev-mode" || status === "both";
+    }
     function getLivenessIcon(status) {
       switch (status) {
         case "active":
@@ -82919,8 +83362,74 @@ var require_doctor = __commonJS({
       "liveness",
       "zombies",
       "auto-config",
-      "shell-alias"
+      "shell-alias",
+      "llm-config"
     ];
+    var DEPRECATED_LLM_MODELS = [
+      {
+        model: "google/gemini-2.0-flash-lite-001",
+        message: "Your llm.yaml references google/gemini-2.0-flash-lite-001, which Google deprecates in June 2026. Sidekick's default has moved to google/gemini-2.5-flash-lite. Update your override or accept the new default."
+      }
+    ];
+    function collectLlmYamlModels(parsed) {
+      if (!parsed)
+        return [];
+      const models = [];
+      for (const key of ["profiles", "fallbackProfiles"]) {
+        const section = parsed[key];
+        if (!section || typeof section !== "object")
+          continue;
+        for (const profile of Object.values(section)) {
+          if (profile && typeof profile === "object") {
+            const model = profile.model;
+            if (typeof model === "string") {
+              models.push(model);
+            }
+          }
+        }
+      }
+      return models;
+    }
+    function runLlmConfigCheck(projectDir, homeDir, stdout, logger) {
+      const candidatePaths = [path.join(homeDir, ".sidekick", "llm.yaml"), path.join(projectDir, ".sidekick", "llm.yaml")];
+      const matched = /* @__PURE__ */ new Set();
+      const parseFailures = [];
+      for (const yamlPath of candidatePaths) {
+        let parsed;
+        try {
+          parsed = (0, core_1.tryReadYaml)(yamlPath);
+        } catch (err) {
+          logger.warn("Failed to parse llm.yaml during migration check", {
+            path: yamlPath,
+            error: (0, core_1.toErrorMessage)(err)
+          });
+          parseFailures.push(yamlPath);
+          continue;
+        }
+        if (!parsed)
+          continue;
+        const models = collectLlmYamlModels(parsed);
+        for (const { model, message } of DEPRECATED_LLM_MODELS) {
+          if (models.includes(model) && !matched.has(model)) {
+            matched.add(model);
+            logger.warn("Deprecated LLM model referenced in user override", {
+              path: yamlPath,
+              model
+            });
+            stdout.write(`\u26A0 ${message}
+`);
+          }
+        }
+      }
+      if (parseFailures.length > 0) {
+        stdout.write(`\u26A0 LLM Config: could not be parsed (${parseFailures.join(", ")}) \u2014 deprecation check skipped
+`);
+        return;
+      }
+      if (matched.size === 0) {
+        stdout.write("\u2713 LLM Config: no deprecated models referenced\n");
+      }
+    }
     function parseDoctorOnly(only) {
       if (!only)
         return null;
@@ -82931,6 +83440,13 @@ var require_doctor = __commonJS({
       }
       return new Set(requested);
     }
+    async function tryRemoveLegacySection(projectDir) {
+      try {
+        return await (0, core_1.removeLegacyGitignoreSection)(projectDir);
+      } catch {
+        return false;
+      }
+    }
     async function runDoctorFixes(projectDir, logger, stdout, context) {
       const { homeDir, filter, doctorResult, gitignore, pluginStatus, liveness } = context;
       const isFullMode = filter === null;
@@ -82972,15 +83488,40 @@ var require_doctor = __commonJS({
           stdout.write("  \u26A0 Statusline managed by dev-mode (skipped)\n");
         }
       }
-      if (shouldFix("gitignore") && gitignore !== null && gitignore !== "installed") {
-        stdout.write("Fixing: Gitignore\n");
-        const result = await (0, core_1.installGitignoreSection)(projectDir);
-        if (result.status === "error") {
-          stdout.write(`  \u26A0 Failed to update .gitignore: ${result.error}
+      if (shouldFix("gitignore") && gitignore !== null) {
+        if (gitignore === "legacy") {
+          stdout.write("Fixing: Gitignore (migrating legacy format)\n");
+          const result = await (0, core_1.installGitignoreSection)(projectDir);
+          if (result.status === "error") {
+            stdout.write(`  \u26A0 Failed to create .sidekick/.gitignore: ${result.error}
 `);
+          } else {
+            const legacyRemoved = await tryRemoveLegacySection(projectDir);
+            stdout.write(legacyRemoved ? "  \u2713 Migrated to .sidekick/.gitignore and removed legacy root section\n" : "  \u26A0 Created .sidekick/.gitignore, but legacy root section could not be removed\n");
+            fixedCount++;
+          }
+        } else if (gitignore === "installed") {
+          const hasLegacy = await (0, core_1.detectLegacyGitignoreSection)(projectDir);
+          if (hasLegacy) {
+            stdout.write("Fixing: Gitignore (removing redundant legacy section)\n");
+            const legacyRemoved = await tryRemoveLegacySection(projectDir);
+            if (legacyRemoved) {
+              stdout.write("  \u2713 Removed legacy section from root .gitignore\n");
+              fixedCount++;
+            } else {
+              stdout.write("  \u26A0 Legacy section detected but could not be removed from root .gitignore\n");
+            }
+          }
         } else {
-          stdout.write("  \u2713 Gitignore configured\n");
-          fixedCount++;
+          stdout.write("Fixing: Gitignore\n");
+          const result = await (0, core_1.installGitignoreSection)(projectDir);
+          if (result.status === "error") {
+            stdout.write(`  \u26A0 Failed to update .sidekick/.gitignore: ${result.error}
+`);
+          } else {
+            stdout.write("  \u2713 Gitignore configured\n");
+            fixedCount++;
+          }
         }
       }
       if (shouldFix("plugin") && pluginStatus === "none") {
@@ -83002,7 +83543,7 @@ var require_doctor = __commonJS({
             fixedCount++;
           }
         } catch (err) {
-          stdout.write(`  \u26A0 Plugin installation failed: ${err instanceof Error ? err.message : String(err)}
+          stdout.write(`  \u26A0 Plugin installation failed: ${(0, core_1.toErrorMessage)(err)}
 `);
         }
       }
@@ -83072,7 +83613,7 @@ var require_doctor = __commonJS({
       try {
         filter = parseDoctorOnly(options?.only);
       } catch (err) {
-        stdout.write(`${err instanceof Error ? err.message : String(err)}
+        stdout.write(`${(0, core_1.toErrorMessage)(err)}
 `);
         return { exitCode: 1 };
       }
@@ -83122,7 +83663,12 @@ var require_doctor = __commonJS({
         promises.push((0, core_1.detectGitignoreStatus)(projectDir).then((result) => {
           gitignore = result;
           const gitignoreIcon = result === "installed" ? "\u2713" : "\u26A0";
-          stdout.write(`${gitignoreIcon} Gitignore: ${result}
+          const gitignoreMessage = result === "legacy" ? `legacy section found in root .gitignore \u2014 run sidekick doctor --fix --only=gitignore to migrate` : result;
+          stdout.write(`${gitignoreIcon} Gitignore: ${gitignoreMessage}
+`);
+        }).catch((err) => {
+          gitignore = "unknown";
+          stdout.write(`\u26A0 Gitignore: could not read status \u2014 ${err.message}
 `);
         }));
       }
@@ -83137,8 +83683,7 @@ var require_doctor = __commonJS({
             stdout.write(`${pluginIcon} Plugin: ${pluginLabel}
 `);
           }
-          const isPluginPresent = status === "plugin" || status === "dev-mode" || status === "both";
-          if (shouldRun("liveness") && isPluginPresent) {
+          if (shouldRun("liveness") && (0, helpers_js_1.isPluginPresent)(status)) {
             logger.info("Starting plugin liveness check");
             liveness = await setupService.detectPluginLiveness();
             const livenessIcon = (0, helpers_js_1.getLivenessIcon)(liveness);
@@ -83160,6 +83705,9 @@ var require_doctor = __commonJS({
         }));
       }
       await Promise.all(promises);
+      if (shouldRun("llm-config")) {
+        runLlmConfigCheck(projectDir, homeDir, stdout, logger);
+      }
       if (shouldRun("auto-config")) {
         const userStatus = await setupService.getUserStatus();
         if (userStatus?.preferences.autoConfigureProjects) {
@@ -83185,7 +83733,7 @@ var require_doctor = __commonJS({
         }
       }
       if (filter === null) {
-        const isPluginOk = pluginStatus === "plugin" || pluginStatus === "dev-mode";
+        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 overallIcon = isHealthy ? "\u2713" : "\u26A0";
@@ -83625,12 +84173,18 @@ Examples:
     }
     async function runStep3Gitignore(wctx, force) {
       const { ctx, projectDir } = wctx;
-      const currentStatus = await (0, core_1.detectGitignoreStatus)(projectDir);
-      if (currentStatus === "installed") {
+      let currentStatus;
+      try {
+        currentStatus = await (0, core_1.detectGitignoreStatus)(projectDir);
+      } catch {
+        currentStatus = "missing";
+      }
+      if (currentStatus === "installed" || currentStatus === "legacy") {
         if (!force) {
-          (0, prompts_js_1.printStatus)(ctx, "success", "Sidekick entries already present in .gitignore");
+          const message2 = currentStatus === "legacy" ? "Sidekick entries already present in root .gitignore (legacy \u2014 run doctor --fix to migrate)" : "Sidekick already configured (.sidekick/.gitignore)";
+          (0, prompts_js_1.printStatus)(ctx, "success", message2);
         }
-        return "installed";
+        return currentStatus;
       }
       const needsRepair = currentStatus === "incomplete";
       if (force) {
@@ -84103,7 +84657,6 @@ var require_uninstall = __commonJS({
         await removeFile(path.join(userHome, ".sidekick", core_1.USER_STATUS_FILENAME), "user", core_1.USER_STATUS_FILENAME, actions, {
           dryRun
         });
-        await removeFile(path.join(userHome, ".sidekick", core_1.LEGACY_USER_STATUS_FILENAME), "user", core_1.LEGACY_USER_STATUS_FILENAME, actions, { dryRun });
         await removeFile(path.join(userHome, ".sidekick", "features.yaml"), "user", "features.yaml", actions, { dryRun });
       }
       if (projectDetected) {
@@ -84200,11 +84753,6 @@ var require_uninstall = __commonJS({
       try {
         await fs.access(path.join(userHome, ".sidekick", core_1.USER_STATUS_FILENAME));
         return true;
-      } catch {
-      }
-      try {
-        await fs.access(path.join(userHome, ".sidekick", core_1.LEGACY_USER_STATUS_FILENAME));
-        return true;
       } catch {
         try {
           const content = await fs.readFile(path.join(userHome, ".claude", "settings.json"), "utf-8");
@@ -84275,8 +84823,12 @@ var require_uninstall = __commonJS({
           summary.project.push({ label: ".env", details: envDetail });
         }
         if (!devModeActive) {
-          const gitignore = await (0, fs_js_1.readFileOrNull)(path.join(projectDir, ".gitignore"));
-          if (gitignore?.includes("# >>> sidekick")) {
+          const sidekickGitignore = await (0, fs_js_1.readFileOrNull)(path.join(projectDir, ".sidekick", ".gitignore"));
+          const rootGitignore = await (0, fs_js_1.readFileOrNull)(path.join(projectDir, ".gitignore"));
+          if (sidekickGitignore !== null) {
+            summary.project.push({ label: ".sidekick/.gitignore", details: "sidekick managed file" });
+          }
+          if (rootGitignore?.includes("# >>> sidekick")) {
             summary.project.push({ label: ".gitignore", details: "sidekick section" });
           }
         }
@@ -84293,11 +84845,7 @@ var require_uninstall = __commonJS({
           } catch {
           }
         }
-        const userConfigFiles = await detectExistingItems(userHome, [
-          core_1.USER_STATUS_FILENAME,
-          core_1.LEGACY_USER_STATUS_FILENAME,
-          "features.yaml"
-        ]);
+        const userConfigFiles = await detectExistingItems(userHome, [core_1.USER_STATUS_FILENAME, "features.yaml"]);
         if (userConfigFiles.length > 0) {
           summary.user.push({ label: "Config", details: userConfigFiles.join(", ") });
         }
@@ -84675,7 +85223,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.19" : "dev";
+    var VERSION = true ? "0.1.20" : "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.
@@ -84808,6 +85356,8 @@ Example: { "command": "pnpm sidekick daemon status", "dangerouslyDisableSandbox"
         const cwd = typeof raw.cwd === "string" ? raw.cwd : void 0;
         const hookEventName = typeof raw.hook_event_name === "string" ? raw.hook_event_name : void 0;
         const permissionMode = typeof raw.permission_mode === "string" ? raw.permission_mode : void 0;
+        const agentId = typeof raw.agent_id === "string" ? raw.agent_id : void 0;
+        const agentType = typeof raw.agent_type === "string" ? raw.agent_type : void 0;
         if (!sessionId) {
           return void 0;
         }
@@ -84818,6 +85368,8 @@ Example: { "command": "pnpm sidekick daemon status", "dangerouslyDisableSandbox"
           // Optional - some hooks (Stop, SessionStart) may not include cwd
           hookEventName: hookEventName ?? "unknown",
           permissionMode,
+          agentId,
+          agentType,
           raw
         };
       } catch {
@@ -85115,7 +85667,7 @@ Run 'sidekick help' for available commands.
       } catch (err) {
         logger.warn("Failed to persist CLI log metrics", {
           sessionId,
-          error: err instanceof Error ? err.message : String(err)
+          error: (0, core_1.toErrorMessage)(err)
         });
       }
     }