@scotthamilton77/sidekick 0.1.19 → 0.1.20

package/dist/daemon.js

@@ -62,6 +62,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",
@@ -69,7 +71,9 @@ var require_hook_events = __commonJS({
       "PreToolUse",
       "PostToolUse",
       "Stop",
-      "PreCompact"
+      "PreCompact",
+      "SubagentStart",
+      "SubagentStop"
     ];
     function isSessionStartEvent(event) {
       return event.hook === "SessionStart";
@@ -92,6 +96,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";
+    }
   }
 });
 
@@ -16966,7 +16976,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 */
@@ -16978,7 +16988,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 */
@@ -17026,6 +17040,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(),
@@ -17081,13 +17115,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
@@ -17184,9 +17220,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({
@@ -26223,6 +26261,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) {
@@ -26236,6 +26286,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) => {
@@ -26285,7 +26336,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
@@ -26360,6 +26411,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);
@@ -26387,7 +26439,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;
       }
@@ -26970,6 +27022,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;
@@ -26996,7 +27049,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)
@@ -27046,7 +27099,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(),
@@ -27162,7 +27218,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 });
       }
     }
@@ -27470,6 +27526,7 @@ var require_config_writer = __commonJS({
     var node_os_1 = require("node:os");
     var node_path_1 = require("node:path");
     var yaml_1 = __importDefault(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"]);
@@ -27596,7 +27653,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 {
@@ -33259,6 +33316,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;
@@ -33278,30 +33337,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_1.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();
@@ -33317,6 +33372,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_1.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}/`;
@@ -45117,6 +45191,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;
@@ -45146,8 +45221,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",
@@ -45488,7 +45563,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)
             });
           }
         },
@@ -45504,7 +45579,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);
@@ -45597,13 +45672,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;
@@ -45969,7 +46042,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)
               });
             }
           }
@@ -45978,7 +46051,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 });
           }
@@ -45990,7 +46063,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_1.default.unlink(pidPath).catch(() => {
           });
         }
@@ -46011,7 +46084,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 [];
       }
@@ -46072,7 +46145,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 });
         }
@@ -46124,60 +46197,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(projectDir2) {
-      const gitignorePath = path.join(projectDir2, ".gitignore");
-      let content = "";
+      let status;
       try {
-        content = await fs.readFile(gitignorePath, "utf-8");
+        status = await detectGitignoreStatus(projectDir2);
       } 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(projectDir2);
       if (status === "installed") {
         return { status: "already-installed" };
       }
-      if (status === "incomplete") {
-        await removeGitignoreSection(projectDir2);
-        try {
-          content = await fs.readFile(gitignorePath, "utf-8");
-        } catch {
-          content = "";
-        }
+      const sidekickDir = path.join(projectDir2, ".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(projectDir2) {
+      const sidekickGitignorePath = path.join(projectDir2, ".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(projectDir2);
+      return hasLegacy ? "legacy" : "missing";
     }
     async function removeGitignoreSection(projectDir2) {
-      const gitignorePath = path.join(projectDir2, ".gitignore");
+      let removed = false;
+      try {
+        await fs.unlink(path.join(projectDir2, ".sidekick", ".gitignore"));
+        removed = true;
+      } catch (err) {
+        if (err.code !== "ENOENT") {
+          throw err;
+        }
+      }
+      const legacyRemoved = await removeLegacyGitignoreSection(projectDir2);
+      return removed || legacyRemoved;
+    }
+    async function detectLegacyGitignoreSection(projectDir2) {
+      try {
+        const content = await fs.readFile(path.join(projectDir2, ".gitignore"), "utf-8");
+        return content.includes(exports2.SIDEKICK_SECTION_START);
+      } catch (err) {
+        if (err.code === "ENOENT") {
+          return false;
+        }
+        throw err;
+      }
+    }
+    async function removeLegacyGitignoreSection(projectDir2) {
+      const rootGitignorePath = path.join(projectDir2, ".gitignore");
       try {
-        const content = await fs.readFile(gitignorePath, "utf-8");
+        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) {
@@ -46189,37 +46296,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(projectDir2) {
-      const gitignorePath = path.join(projectDir2, ".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;
       }
     }
   }
@@ -46230,7 +46313,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;
@@ -46271,6 +46354,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;
   }
 });
 
@@ -55249,6 +55344,7 @@ var require_base = __commonJS({
           model: response.model,
           durationMs,
           usage: response.usage,
+          finishReason: response.finishReason,
           status: response.rawResponse.status,
           contentLength: response.content.length
         });
@@ -55296,6 +55392,7 @@ var require_openai_native = __commonJS({
       maxTokens;
       providerAllowlist;
       providerBlocklist;
+      reasoning;
       constructor(config, logger) {
         super(logger);
         this.id = config.baseURL?.includes("openrouter") ? "openrouter" : "openai";
@@ -55304,6 +55401,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,
@@ -55319,6 +55417,7 @@ var require_openai_native = __commonJS({
           maxTokens: this.maxTokens,
           providerAllowlist: this.providerAllowlist,
           providerBlocklist: this.providerBlocklist,
+          reasoning: this.reasoning,
           apiKey: this.redactApiKey(config.apiKey)
         });
       }
@@ -55336,6 +55435,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,
@@ -55343,8 +55443,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,
@@ -55352,6 +55457,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)
@@ -55387,7 +55493,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);
@@ -55481,7 +55605,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 = "";
@@ -55543,6 +55673,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) {
@@ -55551,6 +55706,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;
@@ -55612,6 +55768,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
@@ -55883,6 +56040,7 @@ var require_openai_emulator = __commonJS({
             inputTokens,
             outputTokens
           },
+          finishReason: "stop",
           rawResponse: {
             status: 200,
             body: JSON.stringify(rawBody)
@@ -55937,6 +56095,7 @@ var require_openrouter_emulator = __commonJS({
             inputTokens,
             outputTokens
           },
+          finishReason: "stop",
           rawResponse: {
             status: 200,
             body: JSON.stringify(rawBody)
@@ -55957,6 +56116,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}"
@@ -56044,6 +56204,7 @@ echo "{\\"content\\":\\"\${CONTENT}\\",\\"message\\":\\"\${CONTENT}\\",\\"model\
             inputTokens,
             outputTokens
           },
+          finishReason: (0, anthropic_stop_reason_1.mapAnthropicStopReason)(parsed.stop_reason),
           rawResponse: {
             status: 0,
             // Exit code
@@ -56180,7 +56341,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);
       }
@@ -56357,7 +56519,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();
       }
@@ -56412,7 +56576,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;
@@ -56426,6 +56590,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;
@@ -56715,6 +56882,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;
     }
@@ -56844,7 +57012,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";
@@ -57048,7 +57216,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;
           }
@@ -57123,7 +57300,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"));
@@ -57135,7 +57312,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;
@@ -57149,10 +57325,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);
       }
@@ -57186,7 +57358,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`, {
@@ -57198,54 +57370,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", {
@@ -57626,6 +57750,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) {
@@ -57729,7 +57854,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;
         }
@@ -57760,7 +57885,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)
             });
           }
         }
@@ -57821,7 +57946,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)
             });
           }
         }
@@ -57973,6 +58098,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 = [];
@@ -58083,7 +58209,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)
             });
           }
         }
@@ -58129,7 +58255,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,
@@ -58560,6 +58686,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;
@@ -58671,7 +58798,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;
@@ -58797,7 +58924,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)
             });
           }
         }
@@ -58823,7 +58950,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);
@@ -58853,7 +58980,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)
           });
         }
       }
@@ -58916,12 +59043,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.
@@ -58939,9 +59071,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.
@@ -58949,6 +59087,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.
@@ -59214,8 +59358,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;
       }
@@ -59349,6 +59536,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");
@@ -59367,6 +59557,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 [];
@@ -59421,7 +59612,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: "",
@@ -59482,6 +59673,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;
         }
@@ -62340,6 +62539,7 @@ var require_instrumented_llm_provider = __commonJS({
     var node_path_1 = require("node:path");
     var yaml_1 = __importDefault(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) {
@@ -62390,7 +62590,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)
           });
         }
       }
@@ -62477,7 +62677,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)
           });
         }
       }
@@ -62702,7 +62902,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)
           });
         }
       }
@@ -62978,6 +63178,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(projectDir2) {
       return (0, node_path_1.join)(projectDir2, ".sidekick", "state", "daemon-health.json");
     }
@@ -63036,7 +63237,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;
       }
@@ -63123,6 +63324,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");
@@ -63144,7 +63346,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;
       }
@@ -63211,9 +63413,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;
@@ -63258,6 +63460,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() {
@@ -63378,9 +63586,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;
@@ -63449,12 +63654,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;
     } });
@@ -63607,6 +63821,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;
@@ -70642,6 +70860,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(),
@@ -70694,7 +70913,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);
@@ -71434,7 +71653,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;
@@ -73117,17 +73336,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;
@@ -73139,22 +73356,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");
@@ -73259,7 +73520,7 @@ var require_track_verification_tools = __commonJS({
               toolName,
               reminderId,
               sessionId,
-              error: error instanceof Error ? error.message : String(error)
+              error: (0, core_1.toErrorMessage)(error)
             });
           }
         }
@@ -73273,8 +73534,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 projectDir2 = daemonCtx.paths?.projectDir;
@@ -73282,8 +73543,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;
@@ -73712,7 +73973,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)
           });
         }
       }
@@ -73948,6 +74209,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) {
@@ -73961,6 +74254,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);
@@ -73969,6 +74263,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);
     }
   }
 });
@@ -74689,7 +74984,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)
             });
           }
         }
@@ -74713,27 +75008,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");
         }
       }
       /**
@@ -74750,7 +75028,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)
           });
         }
       }
@@ -75146,7 +75460,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)
         });
       }
     }
@@ -75906,7 +76220,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)
         });
       }
     }
@@ -76233,6 +76547,7 @@ var require_config_watcher = __commonJS({
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.ConfigWatcher = void 0;
+    var core_1 = require_dist4();
     var chokidar_1 = (init_chokidar(), __toCommonJS(chokidar_exports));
     var os_1 = require("os");
     var path_1 = __importDefault(require("path"));
@@ -76363,7 +76678,7 @@ var require_config_watcher = __commonJS({
           } catch (err) {
             this.logger.error("Error in config change handler", {
               file: filename,
-              error: err instanceof Error ? err.message : String(err)
+              error: (0, core_1.toErrorMessage)(err)
             });
           }
         }, this.debounceMs);
@@ -76396,6 +76711,7 @@ var require_session_persona_watcher = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.SessionPersonaWatcher = void 0;
     exports2.extractSessionIdFromPath = extractSessionIdFromPath;
+    var core_1 = require_dist4();
     var chokidar_1 = (init_chokidar(), __toCommonJS(chokidar_exports));
     var path_1 = __importDefault(require("path"));
     var PERSONA_FILENAME = "session-persona.json";
@@ -76516,7 +76832,7 @@ var require_session_persona_watcher = __commonJS({
           } catch (err) {
             this.logger.error("Error in persona change handler", {
               sessionId,
-              error: err instanceof Error ? err.message : String(err)
+              error: (0, core_1.toErrorMessage)(err)
             });
           }
         }, this.debounceMs);
@@ -76813,7 +77129,7 @@ var require_context_metrics_service = __commonJS({
           this.logger.info("Triggering async CLI capture for base metrics");
           void this.captureBaseMetrics().catch((err) => {
             this.logger.warn("Failed to capture base metrics via CLI", {
-              error: err instanceof Error ? err.message : String(err),
+              error: (0, core_1.toErrorMessage)(err),
               stack: err instanceof Error ? err.stack : void 0
             });
           });
@@ -76939,7 +77255,7 @@ var require_context_metrics_service = __commonJS({
             sessionId
           });
         } catch (err) {
-          const errorMessage = err instanceof Error ? err.message : String(err);
+          const errorMessage = (0, core_1.toErrorMessage)(err);
           this.logger.warn("CLI capture failed", {
             error: errorMessage,
             stack: err instanceof Error ? err.stack : void 0
@@ -77231,7 +77547,7 @@ var require_cleanup_handler = __commonJS({
             } catch (statErr) {
               ctx.logger.warn("Failed to stat session directory", {
                 session: entry.name,
-                error: statErr instanceof Error ? statErr.message : String(statErr)
+                error: (0, core_1.toErrorMessage)(statErr)
               });
             }
           }
@@ -77247,7 +77563,7 @@ var require_cleanup_handler = __commonJS({
             return;
           }
           ctx.logger.error("Cleanup task failed", {
-            error: err instanceof Error ? err.message : String(err)
+            error: (0, core_1.toErrorMessage)(err)
           });
           throw err;
         }
@@ -77423,6 +77739,7 @@ var require_task_engine = __commonJS({
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.TaskEngine = exports2.TaskTimeoutError = void 0;
+    var core_1 = require_dist4();
     var crypto_1 = __importDefault(require("crypto"));
     var DEFAULT_TASK_TIMEOUT_MS = 5 * 60 * 1e3;
     var TaskTimeoutError = class extends Error {
@@ -77551,7 +77868,7 @@ var require_task_engine = __commonJS({
             this.logger.error("Task failed", {
               type: task.type,
               id: task.id,
-              error: err instanceof Error ? err.message : String(err),
+              error: (0, core_1.toErrorMessage)(err),
               stack: err instanceof Error ? err.stack : void 0,
               durationMs
             });
@@ -77871,7 +78188,7 @@ var require_daemon_timer_manager = __commonJS({
           this.deps.logger.info("Project registered for UI discovery", { projectDir: this.deps.projectDir });
         } catch (err) {
           this.deps.logger.warn("Failed to register project", {
-            error: err instanceof Error ? err.message : String(err)
+            error: (0, core_1.toErrorMessage)(err)
           });
         }
       }
@@ -78035,7 +78352,7 @@ var require_daemon_log_metrics = __commonJS({
           await this.daemonStatusAccessor.write(status);
         } catch (err) {
           this.logger?.warn("Failed to write heartbeat status", {
-            error: err instanceof Error ? err.message : String(err)
+            error: (0, core_1.toErrorMessage)(err)
           });
         }
         await this.persistLogMetrics();
@@ -78077,7 +78394,7 @@ var require_daemon_log_metrics = __commonJS({
           } catch (err) {
             this.logger?.warn("Failed to persist log metrics", {
               sessionId,
-              error: err instanceof Error ? err.message : String(err)
+              error: (0, core_1.toErrorMessage)(err)
             });
           }
         }
@@ -78090,7 +78407,7 @@ var require_daemon_log_metrics = __commonJS({
           await this.globalLogMetricsAccessor.write(globalMetrics);
         } catch (err) {
           this.logger?.warn("Failed to persist global log metrics", {
-            error: err instanceof Error ? err.message : String(err)
+            error: (0, core_1.toErrorMessage)(err)
           });
         }
       }
@@ -78543,7 +78860,7 @@ var require_daemon = __commonJS({
           this.logger.info("Configuration reloaded successfully");
         } catch (err) {
           this.logger.error("Failed to reload configuration", {
-            error: err instanceof Error ? err.message : String(err)
+            error: (0, core_1.toErrorMessage)(err)
           });
         }
       }
@@ -78586,7 +78903,7 @@ var require_daemon = __commonJS({
         } catch (err) {
           this.logger.error("Failed to stage persona reminders on change", {
             sessionId: event.sessionId,
-            error: err instanceof Error ? err.message : String(err)
+            error: (0, core_1.toErrorMessage)(err)
           });
         }
       }
@@ -78618,7 +78935,7 @@ var require_daemon = __commonJS({
         } catch (err) {
           this.logger.error("Failed to regenerate messages after persona change", {
             sessionId,
-            error: err instanceof Error ? err.message : String(err)
+            error: (0, core_1.toErrorMessage)(err)
           });
         }
       }
@@ -78782,7 +79099,7 @@ var require_daemon = __commonJS({
               }
             } catch (err) {
               log.warn("Failed to cache persona for clear handoff", {
-                error: err instanceof Error ? err.message : String(err)
+                error: (0, core_1.toErrorMessage)(err)
               });
             }
           } else {