@scotthamilton77/sidekick 0.1.4 → 0.1.5

package/dist/bin.js

@@ -17213,7 +17213,7 @@ var require_state = __commonJS({
   "../types/dist/services/state.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.DEFAULT_LATENCY_STATS = exports2.LLMMetricsStateSchema = exports2.LLMSessionTotalsSchema = exports2.LLMProviderMetricsSchema = exports2.LLMModelMetricsSchema = exports2.LLMLatencyStatsSchema = exports2.DEFAULT_PROJECT_METRICS = exports2.DEFAULT_BASE_METRICS = exports2.SessionContextMetricsSchema = exports2.ProjectContextMetricsSchema = exports2.BaseTokenMetricsStateSchema = exports2.VerificationToolsStateSchema = exports2.VerificationToolStatusSchema = exports2.VCUnverifiedStateSchema = exports2.PRBaselineStateSchema = exports2.EMPTY_LOG_METRICS = exports2.LogMetricsStateSchema = exports2.TranscriptMetricsStateSchema = exports2.ResumeMessageStateSchema = exports2.SnarkyMessageStateSchema = exports2.SummaryCountdownStateSchema = exports2.LastStagedPersonaSchema = exports2.SessionPersonaStateSchema = exports2.SESSION_SUMMARY_PLACEHOLDERS = exports2.SessionSummaryStateSchema = void 0;
+    exports2.DEFAULT_LATENCY_STATS = exports2.LLMMetricsStateSchema = exports2.LLMSessionTotalsSchema = exports2.LLMProviderMetricsSchema = exports2.LLMModelMetricsSchema = exports2.LLMLatencyStatsSchema = exports2.DEFAULT_PROJECT_METRICS = exports2.DEFAULT_BASE_METRICS = exports2.SessionContextMetricsSchema = exports2.ProjectContextMetricsSchema = exports2.BaseTokenMetricsStateSchema = exports2.UPSThrottleStateSchema = exports2.VerificationToolsStateSchema = exports2.VerificationToolStatusSchema = exports2.VCUnverifiedStateSchema = exports2.PRBaselineStateSchema = exports2.EMPTY_LOG_METRICS = exports2.LogMetricsStateSchema = exports2.TranscriptMetricsStateSchema = exports2.ResumeMessageStateSchema = exports2.SnarkyMessageStateSchema = exports2.SummaryCountdownStateSchema = exports2.LastStagedPersonaSchema = exports2.SessionPersonaStateSchema = exports2.SESSION_SUMMARY_PLACEHOLDERS = exports2.SessionSummaryStateSchema = void 0;
     exports2.createDefaultLLMMetrics = createDefaultLLMMetrics;
     var zod_1 = require_zod();
     exports2.SessionSummaryStateSchema = zod_1.z.object({
@@ -17377,6 +17377,10 @@ var require_state = __commonJS({
       lastMatchedScope: zod_1.z.enum(["project", "package", "file"]).nullable().optional()
     });
     exports2.VerificationToolsStateSchema = zod_1.z.record(zod_1.z.string(), exports2.VerificationToolStatusSchema);
+    exports2.UPSThrottleStateSchema = zod_1.z.object({
+      /** Number of conversation messages since the reminder was last staged */
+      messagesSinceLastStaging: zod_1.z.number()
+    });
     exports2.BaseTokenMetricsStateSchema = zod_1.z.object({
       /** System prompt tokens (~3.2k) */
       systemPromptTokens: zod_1.z.number(),
@@ -45265,7 +45269,10 @@ var require_structured_logging = __commonJS({
           mkdir: true
         }).then((stream) => {
           this.realStream = stream;
-          this.drainPending((chunk, cb) => stream.write(chunk, cb));
+          this.drainPending((chunk, cb) => {
+            stream.write(chunk);
+            cb();
+          });
         }).catch((err) => {
           process.stderr.write(`[sidekick] pino-roll init failed, using appendFileSync fallback: ${err}
 `);
@@ -45274,7 +45281,8 @@ var require_structured_logging = __commonJS({
       }
       _write(chunk, _encoding, callback) {
         if (this.realStream) {
-          this.realStream.write(chunk, callback);
+          this.realStream.write(chunk);
+          callback();
         } else if (this.initPending) {
           this.pending.push({ chunk, callback });
         } else {
@@ -71292,7 +71300,8 @@ var require_types2 = __commonJS({
       source_code_patterns: exports2.DEFAULT_SOURCE_CODE_PATTERNS,
       max_verification_cycles: -1,
       // -1 = unlimited, 0 = disabled
-      verification_tools: exports2.DEFAULT_VERIFICATION_TOOLS
+      verification_tools: exports2.DEFAULT_VERIFICATION_TOOLS,
+      user_prompt_submit_threshold: 10
     };
     exports2.ReminderIds = {
       USER_PROMPT_SUBMIT: "user-prompt-submit",
@@ -71316,6 +71325,41 @@ var require_types2 = __commonJS({
   }
 });
 
+// ../feature-reminders/dist/state.js
+var require_state3 = __commonJS({
+  "../feature-reminders/dist/state.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.createRemindersState = createRemindersState;
+    var core_1 = require_dist4();
+    var types_1 = require_dist();
+    var PRBaselineDescriptor = (0, core_1.sessionState)("pr-baseline.json", types_1.PRBaselineStateSchema, {
+      defaultValue: null,
+      trackHistory: true
+    });
+    var VCUnverifiedDescriptor = (0, core_1.sessionState)("vc-unverified.json", types_1.VCUnverifiedStateSchema, {
+      defaultValue: null,
+      trackHistory: true
+    });
+    var VerificationToolsDescriptor = (0, core_1.sessionState)("verification-tools.json", types_1.VerificationToolsStateSchema, {
+      defaultValue: {},
+      trackHistory: false
+    });
+    var UPSThrottleDescriptor = (0, core_1.sessionState)("ups-throttle.json", types_1.UPSThrottleStateSchema, {
+      defaultValue: { messagesSinceLastStaging: 0 },
+      trackHistory: false
+    });
+    function createRemindersState(stateService) {
+      return {
+        prBaseline: new core_1.SessionStateAccessor(stateService, PRBaselineDescriptor),
+        vcUnverified: new core_1.SessionStateAccessor(stateService, VCUnverifiedDescriptor),
+        verificationTools: new core_1.SessionStateAccessor(stateService, VerificationToolsDescriptor),
+        upsThrottle: new core_1.SessionStateAccessor(stateService, UPSThrottleDescriptor)
+      };
+    }
+  }
+});
+
 // ../feature-reminders/dist/handlers/staging/stage-default-user-prompt.js
 var require_stage_default_user_prompt = __commonJS({
   "../feature-reminders/dist/handlers/staging/stage-default-user-prompt.js"(exports2) {
@@ -71325,6 +71369,8 @@ var require_stage_default_user_prompt = __commonJS({
     var types_1 = require_dist();
     var staging_handler_utils_js_1 = require_staging_handler_utils();
     var types_js_1 = require_types2();
+    var reminder_utils_js_1 = require_reminder_utils();
+    var state_js_1 = require_state3();
     function registerStageDefaultUserPrompt(context) {
       (0, staging_handler_utils_js_1.createStagingHandler)(context, {
         id: "reminders:stage-default-user-prompt",
@@ -71342,6 +71388,23 @@ var require_stage_default_user_prompt = __commonJS({
           };
         }
       });
+      if ((0, types_1.isDaemonContext)(context)) {
+        const startCtx = context;
+        context.handlers.register({
+          id: "reminders:ups-throttle-reset-session-start",
+          priority: 49,
+          filter: { kind: "hook", hooks: ["SessionStart"] },
+          handler: async (event) => {
+            if (!(0, types_1.isHookEvent)(event) || !(0, types_1.isSessionStartEvent)(event))
+              return;
+            const sessionId = event.context.sessionId;
+            if (!sessionId)
+              return;
+            const remindersState = (0, state_js_1.createRemindersState)(startCtx.stateService);
+            await remindersState.upsThrottle.write(sessionId, { messagesSinceLastStaging: 0 });
+          }
+        });
+      }
       (0, staging_handler_utils_js_1.createStagingHandler)(context, {
         id: "reminders:stage-default-user-prompt-after-bulk",
         priority: 50,
@@ -71358,36 +71421,68 @@ var require_stage_default_user_prompt = __commonJS({
           };
         }
       });
-    }
-  }
-});
-
-// ../feature-reminders/dist/state.js
-var require_state3 = __commonJS({
-  "../feature-reminders/dist/state.js"(exports2) {
-    "use strict";
-    Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.createRemindersState = createRemindersState;
-    var core_1 = require_dist4();
-    var types_1 = require_dist();
-    var PRBaselineDescriptor = (0, core_1.sessionState)("pr-baseline.json", types_1.PRBaselineStateSchema, {
-      defaultValue: null,
-      trackHistory: true
-    });
-    var VCUnverifiedDescriptor = (0, core_1.sessionState)("vc-unverified.json", types_1.VCUnverifiedStateSchema, {
-      defaultValue: null,
-      trackHistory: true
-    });
-    var VerificationToolsDescriptor = (0, core_1.sessionState)("verification-tools.json", types_1.VerificationToolsStateSchema, {
-      defaultValue: {},
-      trackHistory: false
-    });
-    function createRemindersState(stateService) {
-      return {
-        prBaseline: new core_1.SessionStateAccessor(stateService, PRBaselineDescriptor),
-        vcUnverified: new core_1.SessionStateAccessor(stateService, VCUnverifiedDescriptor),
-        verificationTools: new core_1.SessionStateAccessor(stateService, VerificationToolsDescriptor)
-      };
+      if ((0, types_1.isDaemonContext)(context)) {
+        const bulkCtx = context;
+        context.handlers.register({
+          id: "reminders:ups-throttle-reset-bulk",
+          priority: 49,
+          filter: { kind: "transcript", eventTypes: ["BulkProcessingComplete"] },
+          handler: async (event) => {
+            if (!(0, types_1.isTranscriptEvent)(event))
+              return;
+            if (event.metadata.isBulkProcessing)
+              return;
+            const sessionId = event.context?.sessionId;
+            if (!sessionId)
+              return;
+            const remindersState = (0, state_js_1.createRemindersState)(bulkCtx.stateService);
+            await remindersState.upsThrottle.write(sessionId, { messagesSinceLastStaging: 0 });
+          }
+        });
+      }
+      if (!(0, types_1.isDaemonContext)(context))
+        return;
+      context.handlers.register({
+        id: "reminders:ups-throttle-restage",
+        priority: 50,
+        filter: { kind: "transcript", eventTypes: ["UserPrompt", "AssistantMessage"] },
+        handler: async (event, ctx) => {
+          if (!(0, types_1.isTranscriptEvent)(event))
+            return;
+          if (!(0, types_1.isDaemonContext)(ctx))
+            return;
+          if (event.metadata.isBulkProcessing)
+            return;
+          const sessionId = event.context?.sessionId;
+          if (!sessionId)
+            return;
+          const handlerCtx = ctx;
+          const remindersState = (0, state_js_1.createRemindersState)(handlerCtx.stateService);
+          const result = await remindersState.upsThrottle.read(sessionId);
+          const current = result.data.messagesSinceLastStaging;
+          const featureConfig = handlerCtx.config.getFeature("reminders");
+          const config = { ...types_js_1.DEFAULT_REMINDERS_SETTINGS, ...featureConfig.settings };
+          const threshold = config.user_prompt_submit_threshold ?? 10;
+          const newCount = current + 1;
+          if (newCount >= threshold) {
+            const reminder = (0, reminder_utils_js_1.resolveReminder)(types_js_1.ReminderIds.USER_PROMPT_SUBMIT, {
+              context: { sessionId },
+              assets: handlerCtx.assets
+            });
+            if (reminder) {
+              await (0, reminder_utils_js_1.stageReminder)(handlerCtx, "UserPromptSubmit", reminder);
+              handlerCtx.logger.debug("UPS throttle: re-staged reminder", {
+                sessionId,
+                messageCount: newCount,
+                threshold
+              });
+            }
+            await remindersState.upsThrottle.write(sessionId, { messagesSinceLastStaging: 0 });
+          } else {
+            await remindersState.upsThrottle.write(sessionId, { messagesSinceLastStaging: newCount });
+          }
+        }
+      });
     }
   }
 });
@@ -72967,121 +73062,6 @@ var require_picomatch2 = __commonJS({
   }
 });
 
-// ../feature-reminders/dist/handlers/staging/stage-stop-bash-changes.js
-var require_stage_stop_bash_changes = __commonJS({
-  "../feature-reminders/dist/handlers/staging/stage-stop-bash-changes.js"(exports2) {
-    "use strict";
-    var __importDefault2 = exports2 && exports2.__importDefault || function(mod) {
-      return mod && mod.__esModule ? mod : { "default": mod };
-    };
-    Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.registerStageBashChanges = registerStageBashChanges;
-    var core_1 = require_dist4();
-    var types_1 = require_dist();
-    var picomatch_1 = __importDefault2(require_picomatch2());
-    var staging_handler_utils_js_1 = require_staging_handler_utils();
-    var types_js_1 = require_types2();
-    var GIT_STATUS_TIMEOUT_MS = 200;
-    var MAX_BASELINES = 50;
-    function registerStageBashChanges(context) {
-      if (!(0, types_1.isDaemonContext)(context))
-        return;
-      const cwd = context.paths.projectDir;
-      if (!cwd)
-        return;
-      const baselines = /* @__PURE__ */ new Map();
-      context.handlers.register({
-        id: "reminders:git-baseline-capture",
-        priority: 40,
-        // Before unstage-verify-completion (45)
-        filter: { kind: "hook", hooks: ["UserPromptSubmit"] },
-        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;
-          const files = await (0, core_1.getGitFileStatus)(cwd, GIT_STATUS_TIMEOUT_MS);
-          if (baselines.size >= MAX_BASELINES) {
-            const oldest = baselines.keys().next().value;
-            if (oldest)
-              baselines.delete(oldest);
-          }
-          baselines.set(sessionId, files);
-          daemonCtx.logger.debug("Git baseline captured", {
-            sessionId,
-            fileCount: files.length
-          });
-        }
-      });
-      (0, staging_handler_utils_js_1.createStagingHandler)(context, {
-        id: "reminders:stage-stop-bash-changes",
-        priority: 55,
-        filter: { kind: "transcript", eventTypes: ["ToolResult"] },
-        execute: async (event, ctx) => {
-          if (!(0, types_1.isTranscriptEvent)(event))
-            return void 0;
-          const toolName = event.payload.toolName;
-          if (toolName !== "Bash")
-            return void 0;
-          const sessionId = event.context?.sessionId;
-          if (!sessionId)
-            return void 0;
-          const baseline = baselines.get(sessionId);
-          if (!baseline) {
-            ctx.logger.debug("Bash VC: no baseline for session, skipping", { sessionId });
-            return void 0;
-          }
-          const metrics = event.metadata.metrics;
-          const lastConsumed = await ctx.staging.getLastConsumed("Stop", types_js_1.ReminderIds.VERIFY_COMPLETION);
-          if (lastConsumed?.stagedAt) {
-            const shouldReactivate = metrics.turnCount > lastConsumed.stagedAt.turnCount;
-            if (!shouldReactivate) {
-              ctx.logger.debug("Bash VC: skipped (already consumed this turn)", {
-                currentTurn: metrics.turnCount,
-                lastConsumedTurn: lastConsumed.stagedAt.turnCount
-              });
-              return void 0;
-            }
-          }
-          const current = await (0, core_1.getGitFileStatus)(cwd, GIT_STATUS_TIMEOUT_MS);
-          const baselineSet = new Set(baseline);
-          const newFiles = current.filter((f) => !baselineSet.has(f));
-          ctx.logger.debug("Bash VC: git status diff", {
-            baselineCount: baseline.length,
-            currentCount: current.length,
-            newFileCount: newFiles.length
-          });
-          if (newFiles.length === 0)
-            return void 0;
-          const featureConfig = context.config.getFeature("reminders");
-          const config = { ...types_js_1.DEFAULT_REMINDERS_SETTINGS, ...featureConfig.settings };
-          const sourceMatches = newFiles.filter((f) => picomatch_1.default.isMatch(f, config.source_code_patterns));
-          if (sourceMatches.length === 0) {
-            ctx.logger.debug("Bash VC: new files found but no source code matches", {
-              newFiles
-            });
-            return void 0;
-          }
-          ctx.logger.info("Bash VC: staging verify-completion", {
-            sourceMatches,
-            turnCount: metrics.turnCount,
-            toolCount: metrics.toolCount
-          });
-          baselines.set(sessionId, current);
-          return {
-            reminderId: types_js_1.ReminderIds.VERIFY_COMPLETION,
-            targetHook: "Stop"
-          };
-        }
-      });
-    }
-  }
-});
-
 // ../feature-reminders/dist/tool-pattern-matcher.js
 var require_tool_pattern_matcher = __commonJS({
   "../feature-reminders/dist/tool-pattern-matcher.js"(exports2) {
@@ -73133,6 +73113,7 @@ var require_track_verification_tools = __commonJS({
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.registerTrackVerificationTools = registerTrackVerificationTools;
+    exports2.stageToolsForFiles = stageToolsForFiles;
     var types_1 = require_dist();
     var picomatch_1 = __importDefault2(require_picomatch2());
     var tool_pattern_matcher_js_1 = require_tool_pattern_matcher();
@@ -73186,53 +73167,49 @@ var require_track_verification_tools = __commonJS({
         }
       });
     }
-    async function handleFileEdit(event, daemonCtx, sessionId, verificationTools, toolsState, remindersState) {
-      const filePath = extractToolInput(event)?.file_path;
-      if (!filePath)
-        return;
-      const projectDir = daemonCtx.paths?.projectDir;
-      if (projectDir && !filePath.startsWith(projectDir))
-        return;
+    async function stageToolsForFiles(filePaths, daemonCtx, sessionId, verificationTools, toolsState, remindersState) {
       const existingReminders = await daemonCtx.staging.listReminders("Stop");
       const stagedNames = new Set(existingReminders.map((r) => r.name));
       let anyStaged = false;
-      for (const [toolName, toolConfig] of Object.entries(verificationTools)) {
-        if (!toolConfig.enabled)
-          continue;
-        const reminderId = TOOL_REMINDER_MAP[toolName];
-        if (!reminderId)
-          continue;
-        if (!picomatch_1.default.isMatch(filePath, toolConfig.clearing_patterns))
-          continue;
-        const current = toolsState[toolName];
-        if (!current || current.status === "staged") {
-          if (!current) {
-            toolsState[toolName] = {
-              status: "staged",
-              editsSinceVerified: 0,
-              lastVerifiedAt: null,
-              lastStagedAt: Date.now()
-            };
-          }
-          await stageToolReminderIfNeeded(daemonCtx, reminderId, stagedNames);
-          anyStaged = true;
-        } else {
-          const newEdits = current.editsSinceVerified + 1;
-          if (newEdits >= toolConfig.clearing_threshold) {
-            toolsState[toolName] = {
-              ...current,
-              status: "staged",
-              editsSinceVerified: 0,
-              lastStagedAt: Date.now()
-            };
+      for (const filePath of filePaths) {
+        for (const [toolName, toolConfig] of Object.entries(verificationTools)) {
+          if (!toolConfig.enabled)
+            continue;
+          const reminderId = TOOL_REMINDER_MAP[toolName];
+          if (!reminderId)
+            continue;
+          if (!picomatch_1.default.isMatch(filePath, toolConfig.clearing_patterns))
+            continue;
+          const current = toolsState[toolName];
+          if (!current || current.status === "staged") {
+            if (!current) {
+              toolsState[toolName] = {
+                status: "staged",
+                editsSinceVerified: 0,
+                lastVerifiedAt: null,
+                lastStagedAt: Date.now()
+              };
+            }
             await stageToolReminderIfNeeded(daemonCtx, reminderId, stagedNames);
             anyStaged = true;
           } else {
-            toolsState[toolName] = {
-              ...current,
-              status: "cooldown",
-              editsSinceVerified: newEdits
-            };
+            const newEdits = current.editsSinceVerified + 1;
+            if (newEdits >= toolConfig.clearing_threshold) {
+              toolsState[toolName] = {
+                ...current,
+                status: "staged",
+                editsSinceVerified: 0,
+                lastStagedAt: Date.now()
+              };
+              await stageToolReminderIfNeeded(daemonCtx, reminderId, stagedNames);
+              anyStaged = true;
+            } else {
+              toolsState[toolName] = {
+                ...current,
+                status: "cooldown",
+                editsSinceVerified: newEdits
+              };
+            }
           }
         }
       }
@@ -73240,6 +73217,16 @@ var require_track_verification_tools = __commonJS({
         await stageToolReminderIfNeeded(daemonCtx, types_js_1.ReminderIds.VERIFY_COMPLETION, stagedNames);
       }
       await remindersState.verificationTools.write(sessionId, toolsState);
+      return anyStaged;
+    }
+    async function handleFileEdit(event, daemonCtx, sessionId, verificationTools, toolsState, remindersState) {
+      const filePath = extractToolInput(event)?.file_path;
+      if (!filePath)
+        return;
+      const projectDir = daemonCtx.paths?.projectDir;
+      if (projectDir && !filePath.startsWith(projectDir))
+        return;
+      await stageToolsForFiles([filePath], daemonCtx, sessionId, verificationTools, toolsState, remindersState);
     }
     async function handleBashCommand(event, daemonCtx, sessionId, verificationTools, toolsState, remindersState) {
       const command = extractToolInput(event)?.command;
@@ -73302,6 +73289,126 @@ var require_track_verification_tools = __commonJS({
   }
 });
 
+// ../feature-reminders/dist/handlers/staging/stage-stop-bash-changes.js
+var require_stage_stop_bash_changes = __commonJS({
+  "../feature-reminders/dist/handlers/staging/stage-stop-bash-changes.js"(exports2) {
+    "use strict";
+    var __importDefault2 = exports2 && exports2.__importDefault || function(mod) {
+      return mod && mod.__esModule ? mod : { "default": mod };
+    };
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.registerStageBashChanges = registerStageBashChanges;
+    var core_1 = require_dist4();
+    var types_1 = require_dist();
+    var picomatch_1 = __importDefault2(require_picomatch2());
+    var track_verification_tools_js_1 = require_track_verification_tools();
+    var types_js_1 = require_types2();
+    var state_js_1 = require_state3();
+    var GIT_STATUS_TIMEOUT_MS = 200;
+    var MAX_BASELINES = 50;
+    function registerStageBashChanges(context) {
+      if (!(0, types_1.isDaemonContext)(context))
+        return;
+      const cwd = context.paths.projectDir;
+      if (!cwd)
+        return;
+      const baselines = /* @__PURE__ */ new Map();
+      context.handlers.register({
+        id: "reminders:git-baseline-capture",
+        priority: 40,
+        // Before unstage-verify-completion (45)
+        filter: { kind: "hook", hooks: ["UserPromptSubmit"] },
+        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;
+          const files = await (0, core_1.getGitFileStatus)(cwd, GIT_STATUS_TIMEOUT_MS);
+          if (baselines.size >= MAX_BASELINES) {
+            const oldest = baselines.keys().next().value;
+            if (oldest)
+              baselines.delete(oldest);
+          }
+          baselines.set(sessionId, files);
+          daemonCtx.logger.debug("Git baseline captured", {
+            sessionId,
+            fileCount: files.length
+          });
+        }
+      });
+      context.handlers.register({
+        id: "reminders:stage-stop-bash-changes",
+        priority: 55,
+        filter: { kind: "transcript", eventTypes: ["ToolResult"] },
+        handler: async (event, ctx) => {
+          if (!(0, types_1.isTranscriptEvent)(event))
+            return;
+          if (event.metadata.isBulkProcessing)
+            return;
+          if (!(0, types_1.isDaemonContext)(ctx))
+            return;
+          const daemonCtx = ctx;
+          const toolName = event.payload.toolName;
+          if (toolName !== "Bash")
+            return;
+          const sessionId = event.context?.sessionId;
+          if (!sessionId)
+            return;
+          const baseline = baselines.get(sessionId);
+          if (!baseline) {
+            daemonCtx.logger.debug("Bash VC: no baseline for session, skipping", { sessionId });
+            return;
+          }
+          const metrics = event.metadata.metrics;
+          const lastConsumed = await daemonCtx.staging.getLastConsumed("Stop", types_js_1.ReminderIds.VERIFY_COMPLETION);
+          if (lastConsumed?.stagedAt) {
+            const shouldReactivate = metrics.turnCount > lastConsumed.stagedAt.turnCount;
+            if (!shouldReactivate) {
+              daemonCtx.logger.debug("Bash VC: skipped (already consumed this turn)", {
+                currentTurn: metrics.turnCount,
+                lastConsumedTurn: lastConsumed.stagedAt.turnCount
+              });
+              return;
+            }
+          }
+          const current = await (0, core_1.getGitFileStatus)(cwd, GIT_STATUS_TIMEOUT_MS);
+          const baselineSet = new Set(baseline);
+          const newFiles = current.filter((f) => !baselineSet.has(f));
+          daemonCtx.logger.debug("Bash VC: git status diff", {
+            baselineCount: baseline.length,
+            currentCount: current.length,
+            newFileCount: newFiles.length
+          });
+          if (newFiles.length === 0)
+            return;
+          const featureConfig = context.config.getFeature("reminders");
+          const config = { ...types_js_1.DEFAULT_REMINDERS_SETTINGS, ...featureConfig.settings };
+          const sourceMatches = newFiles.filter((f) => picomatch_1.default.isMatch(f, config.source_code_patterns));
+          if (sourceMatches.length === 0) {
+            daemonCtx.logger.debug("Bash VC: new files found but no source code matches", { newFiles });
+            return;
+          }
+          daemonCtx.logger.info("Bash VC: staging per-tool reminders for source changes", {
+            sourceMatches,
+            turnCount: metrics.turnCount,
+            toolCount: metrics.toolCount
+          });
+          baselines.set(sessionId, current);
+          const verificationTools = config.verification_tools ?? {};
+          const remindersState = (0, state_js_1.createRemindersState)(daemonCtx.stateService);
+          const stateResult = await remindersState.verificationTools.read(sessionId);
+          const toolsState = { ...stateResult.data };
+          await (0, track_verification_tools_js_1.stageToolsForFiles)(sourceMatches, daemonCtx, sessionId, verificationTools, toolsState, remindersState);
+        }
+      });
+    }
+  }
+});
+
 // ../feature-reminders/dist/handlers/staging/unstage-verify-completion.js
 var require_unstage_verify_completion = __commonJS({
   "../feature-reminders/dist/handlers/staging/unstage-verify-completion.js"(exports2) {
@@ -73349,28 +73456,52 @@ var require_unstage_verify_completion = __commonJS({
               setAtToolCount: unverifiedState.setAt.toolCount
             });
             if (maxCycles < 0 || unverifiedState.cycleCount < maxCycles) {
-              const reminder = (0, reminder_utils_js_1.resolveReminder)(types_js_1.ReminderIds.VERIFY_COMPLETION, {
-                context: {},
-                assets: daemonCtx.assets
+              const verificationToolsResult = await remindersState.verificationTools.read(sessionId);
+              const toolsState = verificationToolsResult.data;
+              const verificationTools = config.verification_tools ?? {};
+              const hasToolsNeedingVerification = Object.entries(verificationTools).some(([toolName, toolConfig]) => {
+                if (!toolConfig.enabled)
+                  return false;
+                const state = toolsState[toolName];
+                if (!state)
+                  return true;
+                if (state.status === "staged")
+                  return true;
+                if (state.status === "verified" || state.status === "cooldown") {
+                  return state.editsSinceVerified >= toolConfig.clearing_threshold;
+                }
+                return false;
               });
-              if (reminder) {
-                await (0, reminder_utils_js_1.stageReminder)(daemonCtx, "Stop", {
-                  ...reminder,
-                  stagedAt: {
-                    timestamp: Date.now(),
-                    turnCount: unverifiedState.setAt.turnCount,
-                    toolsThisTurn: unverifiedState.setAt.toolsThisTurn,
-                    toolCount: unverifiedState.setAt.toolCount
-                  }
-                });
-                daemonCtx.logger.info("VC unstage: re-staged for next Stop", {
+              if (!hasToolsNeedingVerification) {
+                daemonCtx.logger.info("VC unstage: all tools verified, skipping wrapper re-stage", {
                   sessionId,
-                  cycleCount: unverifiedState.cycleCount,
-                  lastCategory: unverifiedState.lastClassification.category
+                  cycleCount: unverifiedState.cycleCount
                 });
-                return;
+                await remindersState.vcUnverified.delete(sessionId);
               } else {
-                daemonCtx.logger.warn("VC unstage: failed to resolve reminder for re-staging");
+                const reminder = (0, reminder_utils_js_1.resolveReminder)(types_js_1.ReminderIds.VERIFY_COMPLETION, {
+                  context: {},
+                  assets: daemonCtx.assets
+                });
+                if (reminder) {
+                  await (0, reminder_utils_js_1.stageReminder)(daemonCtx, "Stop", {
+                    ...reminder,
+                    stagedAt: {
+                      timestamp: Date.now(),
+                      turnCount: unverifiedState.setAt.turnCount,
+                      toolsThisTurn: unverifiedState.setAt.toolsThisTurn,
+                      toolCount: unverifiedState.setAt.toolCount
+                    }
+                  });
+                  daemonCtx.logger.info("VC unstage: re-staged for next Stop", {
+                    sessionId,
+                    cycleCount: unverifiedState.cycleCount,
+                    lastCategory: unverifiedState.lastClassification.category
+                  });
+                  return;
+                } else {
+                  daemonCtx.logger.warn("VC unstage: failed to resolve reminder for re-staging");
+                }
               }
             } else {
               daemonCtx.logger.info("VC unstage: cycle limit reached, clearing", {
@@ -74739,6 +74870,7 @@ ${daemonResponse.additionalContext}` : cliResponse.additionalContext;
         hook: hookName
       };
       (0, core_1.logEvent)(logger, core_1.LogEvents.hookReceived(logContext, { cwd: hookInput.cwd, mode: "hook" }));
+      logger.debug("Hook invocation received", { hook: hookName, sessionId: hookInput.sessionId });
       const event = buildHookEvent(hookName, hookInput, correlationId);
       logger.debug("Dispatching hook event to daemon", {
         hook: hookName,
@@ -75544,7 +75676,8 @@ var require_types4 = __commonJS({
         injectPersonaIntoClaude: true,
         defaultLlmProfile: "",
         llmProfiles: {},
-        weights: {}
+        weights: {},
+        persistThroughClear: true
       }
     };
     exports2.RESUME_MIN_CONFIDENCE = 0.7;
@@ -75619,7 +75752,7 @@ var require_persona_selection = __commonJS({
       }
       return weighted[weighted.length - 1].persona;
     }
-    async function selectPersonaForSession(sessionId, config, ctx) {
+    async function selectPersonaForSession(sessionId, config, ctx, options) {
       const personaConfig = {
         ...types_js_1.DEFAULT_SESSION_SUMMARY_CONFIG.personas,
         ...config.personas
@@ -75658,6 +75791,38 @@ var require_persona_selection = __commonJS({
           availablePersonas: Array.from(allPersonas.keys())
         });
       }
+      const persistThroughClear = personaConfig.persistThroughClear ?? true;
+      ctx.logger.debug("Persona clear handoff check", {
+        persistThroughClear,
+        startType: options?.startType,
+        hasClearCache: !!ctx.personaClearCache
+      });
+      if (persistThroughClear && options?.startType === "clear" && ctx.personaClearCache) {
+        const cachedPersonaId = ctx.personaClearCache.consume();
+        if (cachedPersonaId) {
+          const cachedPersona = allPersonas.get(cachedPersonaId);
+          if (cachedPersona) {
+            const personaState2 = {
+              persona_id: cachedPersona.id,
+              selected_from: [cachedPersona.id],
+              timestamp: (/* @__PURE__ */ new Date()).toISOString()
+            };
+            const summaryState2 = (0, state_js_1.createSessionSummaryState)(ctx.stateService);
+            await summaryState2.sessionPersona.write(sessionId, personaState2);
+            ctx.logger.info("Preserved persona through clear", {
+              sessionId,
+              personaId: cachedPersona.id,
+              personaName: cachedPersona.display_name
+            });
+            return cachedPersona.id;
+          } else {
+            ctx.logger.warn("Cached persona from clear not found in available personas, falling back to selection", {
+              sessionId,
+              cachedPersonaId
+            });
+          }
+        }
+      }
       const allowList = parsePersonaList(personaConfig.allowList ?? "");
       const blockList = parsePersonaList(personaConfig.blockList ?? "");
       const eligiblePersonas = filterPersonas(allPersonas, allowList, blockList, ctx.logger);
@@ -75744,7 +75909,7 @@ var require_create_first_summary = __commonJS({
       const summaryState = (0, state_js_1.createSessionSummaryState)(ctx.stateService);
       await summaryState.sessionSummary.write(sessionId, placeholder);
       ctx.logger.info("Created placeholder session summary", { sessionId });
-      await (0, persona_selection_js_1.selectPersonaForSession)(sessionId, config, ctx);
+      await (0, persona_selection_js_1.selectPersonaForSession)(sessionId, config, ctx, { startType });
     }
   }
 });
@@ -76604,10 +76769,10 @@ var require_handlers = __commonJS({
         id: "session-summary:init",
         priority: 80,
         filter: { kind: "hook", hooks: ["SessionStart"] },
-        handler: async (event) => {
+        handler: async (event, context2) => {
           if (!(0, core_1.isHookEvent)(event) || !(0, core_1.isSessionStartEvent)(event))
             return;
-          await (0, create_first_summary_js_1.createFirstSessionSummary)(event, ctx);
+          await (0, create_first_summary_js_1.createFirstSessionSummary)(event, context2);
         }
       });
       ctx.handlers.register({
@@ -82516,7 +82681,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.4" : "dev";
+    var VERSION = true ? "0.1.5" : "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.