@scotthamilton77/sidekick 0.1.15 → 0.1.16

package/assets/sidekick/defaults/features/reminders.defaults.yaml

@@ -18,6 +18,34 @@ settings:
     user-prompt-submit: 10
     remember-your-persona: 5
 
+  # Command runner prefixes that trigger unanchored pattern matching.
+  # When a bash command starts with one of these prefixes, the tool pattern
+  # matcher drops its first-token anchor and scans for the tool name at any
+  # position. This allows commands like 'uv run mypy' to match pattern 'mypy'.
+  # Array merge strategy: replace (project/user config replaces defaults entirely).
+  command_runners:
+    # Python
+    - prefix: "uv run"
+    - prefix: "poetry run"
+    - prefix: "pipx run"
+    - prefix: "pdm run"
+    - prefix: "hatch run"
+    - prefix: "conda run"
+    # Node.js
+    - prefix: "npx"
+    - prefix: "pnpx"
+    - prefix: "bunx"
+    - prefix: "pnpm dlx"
+    - prefix: "pnpm exec"
+    - prefix: "bun run"
+    - prefix: "yarn dlx"
+    - prefix: "yarn exec"
+    - prefix: "npm exec"
+    # Ruby
+    - prefix: "bundle exec"
+    # .NET
+    - prefix: "dotnet tool run"
+
   # Glob patterns that trigger verify-completion reminder on file edit.
   # Uses picomatch syntax: https://github.com/micromatch/picomatch
   # Only edits to files matching these patterns will stage the reminder.

package/dist/bin.js

@@ -71535,7 +71535,7 @@ var require_types2 = __commonJS({
   "../feature-reminders/dist/types.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.ALL_VC_REMINDER_IDS = exports2.VC_TOOL_REMINDER_IDS = exports2.TOOL_REMINDER_MAP = exports2.ReminderIds = exports2.DEFAULT_REMINDERS_SETTINGS = exports2.DEFAULT_COMPLETION_DETECTION_SETTINGS = exports2.DEFAULT_SOURCE_CODE_PATTERNS = exports2.DEFAULT_VERIFICATION_TOOLS = exports2.VerificationToolsMapSchema = exports2.VerificationToolConfigSchema = exports2.ToolPatternSchema = exports2.ToolPatternScopeSchema = void 0;
+    exports2.ALL_VC_REMINDER_IDS = exports2.VC_TOOL_REMINDER_IDS = exports2.TOOL_REMINDER_MAP = exports2.ReminderIds = exports2.DEFAULT_REMINDERS_SETTINGS = exports2.DEFAULT_COMPLETION_DETECTION_SETTINGS = exports2.DEFAULT_SOURCE_CODE_PATTERNS = exports2.DEFAULT_VERIFICATION_TOOLS = exports2.CommandRunnerSchema = exports2.VerificationToolsMapSchema = exports2.VerificationToolConfigSchema = exports2.ToolPatternSchema = exports2.ToolPatternScopeSchema = void 0;
     var zod_1 = require_zod2();
     exports2.ToolPatternScopeSchema = zod_1.z.enum(["project", "package", "file"]);
     exports2.ToolPatternSchema = zod_1.z.object({
@@ -71550,6 +71550,9 @@ var require_types2 = __commonJS({
       clearing_patterns: zod_1.z.array(zod_1.z.string()).min(1)
     });
     exports2.VerificationToolsMapSchema = zod_1.z.record(zod_1.z.string(), exports2.VerificationToolConfigSchema);
+    exports2.CommandRunnerSchema = zod_1.z.object({
+      prefix: zod_1.z.string().trim().min(1)
+    });
     exports2.DEFAULT_VERIFICATION_TOOLS = {
       build: {
         enabled: true,
@@ -71738,7 +71741,30 @@ var require_types2 = __commonJS({
       reminder_thresholds: {
         "user-prompt-submit": 10,
         "remember-your-persona": 5
-      }
+      },
+      command_runners: [
+        // Python
+        { prefix: "uv run" },
+        { prefix: "poetry run" },
+        { prefix: "pipx run" },
+        { prefix: "pdm run" },
+        { prefix: "hatch run" },
+        { prefix: "conda run" },
+        // Node.js
+        { prefix: "npx" },
+        { prefix: "pnpx" },
+        { prefix: "bunx" },
+        { prefix: "pnpm dlx" },
+        { prefix: "pnpm exec" },
+        { prefix: "bun run" },
+        { prefix: "yarn dlx" },
+        { prefix: "yarn exec" },
+        { prefix: "npm exec" },
+        // Ruby
+        { prefix: "bundle exec" },
+        // .NET
+        { prefix: "dotnet tool run" }
+      ]
     };
     exports2.ReminderIds = {
       USER_PROMPT_SUBMIT: "user-prompt-submit",
@@ -71970,6 +71996,16 @@ var require_stage_default_user_prompt = __commonJS({
               continue;
             const newCount = typedEntry.messagesSinceLastStaging + 1;
             if (newCount >= threshold) {
+              (0, core_1.logEvent)(handlerCtx.logger, types_1.DecisionEvents.decisionRecorded({ sessionId }, {
+                decision: "staged",
+                reason: [
+                  `message count reached threshold (${newCount}/${threshold})`,
+                  `target hook: ${typedEntry.targetHook}`,
+                  `messages since last staging: ${typedEntry.messagesSinceLastStaging}`
+                ].join("; "),
+                subsystem: "reminder-throttle",
+                title: `Re-stage ${reminderId} reminder`
+              }));
               const metrics = event.metadata.metrics;
               const stagedAt = {
                 timestamp: Date.now(),
@@ -71981,12 +72017,6 @@ var require_stage_default_user_prompt = __commonJS({
                 ...typedEntry.cachedReminder,
                 stagedAt
               });
-              (0, core_1.logEvent)(handlerCtx.logger, types_1.DecisionEvents.decisionRecorded({ sessionId }, {
-                decision: "staged",
-                reason: `message count reached threshold (${newCount}/${threshold})`,
-                subsystem: "user-prompt-reminders",
-                title: "Stage user-prompt reminder"
-              }));
               state[reminderId] = { ...typedEntry, messagesSinceLastStaging: 0 };
               handlerCtx.logger.debug("Throttle: re-staged reminder", {
                 sessionId,
@@ -72036,6 +72066,9 @@ var require_events2 = __commonJS({
             blocking: state.blocking,
             priority: state.priority,
             persistent: state.persistent,
+            ...state.renderedText !== void 0 && {
+              renderedText: state.renderedText
+            },
             ...state.classificationResult !== void 0 && {
               classificationResult: state.classificationResult
             }
@@ -73727,17 +73760,51 @@ var require_tool_pattern_matcher = __commonJS({
     exports2.matchesToolPattern = matchesToolPattern;
     exports2.findMatchingPattern = findMatchingPattern;
     var SHELL_OPERATOR_RE = /\s*(?:&&|\|\||[;|])\s*/;
-    function matchesToolPattern(command, pattern) {
+    function detectRunnerPrefix(segmentTokens, runners) {
+      let longestMatch = 0;
+      for (const runner of runners) {
+        if (typeof runner.prefix !== "string")
+          continue;
+        const prefixTokens = runner.prefix.trim().split(/\s+/);
+        if (prefixTokens.length === 0)
+          continue;
+        if (prefixTokens.length > segmentTokens.length)
+          continue;
+        let matches = true;
+        for (let i = 0; i < prefixTokens.length; i++) {
+          if (segmentTokens[i] !== prefixTokens[i]) {
+            matches = false;
+            break;
+          }
+        }
+        if (matches && prefixTokens.length > longestMatch) {
+          longestMatch = prefixTokens.length;
+        }
+      }
+      return longestMatch;
+    }
+    function matchesToolPattern(command, pattern, runners) {
       if (!command || !pattern)
         return false;
       const segments = command.split(SHELL_OPERATOR_RE);
       const patternTokens = pattern.trim().split(/\s+/).filter(Boolean);
       if (patternTokens.length === 0)
         return false;
+      const activeRunners = runners?.length ? runners : void 0;
       return segments.some((segment) => {
         const cmdTokens = segment.trim().split(/\s+/);
         if (cmdTokens.length === 0 || cmdTokens[0] === "")
           return false;
+        const runnerTokenCount = activeRunners ? detectRunnerPrefix(cmdTokens, activeRunners) : 0;
+        if (runnerTokenCount > 0) {
+          let pi2 = 0;
+          for (let ci = runnerTokenCount; ci < cmdTokens.length && pi2 < patternTokens.length; ci++) {
+            if (patternTokens[pi2] === "*" || patternTokens[pi2] === cmdTokens[ci]) {
+              pi2++;
+            }
+          }
+          return pi2 === patternTokens.length;
+        }
         if (cmdTokens[0] !== patternTokens[0])
           return false;
         let pi = 1;
@@ -73749,11 +73816,11 @@ var require_tool_pattern_matcher = __commonJS({
         return pi === patternTokens.length;
       });
     }
-    function findMatchingPattern(command, patterns) {
+    function findMatchingPattern(command, patterns, runners) {
       for (const pattern of patterns) {
         if (pattern.tool === null)
           continue;
-        if (matchesToolPattern(command, pattern.tool))
+        if (matchesToolPattern(command, pattern.tool, runners))
           return pattern;
       }
       return null;
@@ -73809,13 +73876,14 @@ var require_track_verification_tools = __commonJS({
           const featureConfig = context.config.getFeature("reminders");
           const config = { ...types_js_1.DEFAULT_REMINDERS_SETTINGS, ...featureConfig.settings };
           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);
+            await handleBashCommand(event, daemonCtx, sessionId, verificationTools, toolsState, remindersState, runners);
           }
         }
       });
@@ -73937,7 +74005,7 @@ var require_track_verification_tools = __commonJS({
         return;
       await stageToolsForFiles([filePath], daemonCtx, sessionId, verificationTools, toolsState, remindersState);
     }
-    async function handleBashCommand(event, daemonCtx, sessionId, verificationTools, toolsState, remindersState) {
+    async function handleBashCommand(event, daemonCtx, sessionId, verificationTools, toolsState, remindersState, runners = []) {
       const command = extractToolInput(event)?.command;
       if (!command)
         return;
@@ -73948,7 +74016,7 @@ var require_track_verification_tools = __commonJS({
         const reminderId = types_js_1.TOOL_REMINDER_MAP[toolName];
         if (!reminderId)
           continue;
-        const match = (0, tool_pattern_matcher_js_1.findMatchingPattern)(command, toolConfig.patterns);
+        const match = (0, tool_pattern_matcher_js_1.findMatchingPattern)(command, toolConfig.patterns, runners);
         if (!match)
           continue;
         toolsState[toolName] = {
@@ -74764,6 +74832,12 @@ var require_consumption_handler_factory = __commonJS({
           if (onConsume) {
             await onConsume({ reminder: primary, reader, cliCtx, sessionId });
           }
+          const renderedParts = [];
+          if (response.userMessage)
+            renderedParts.push(response.userMessage);
+          if (response.additionalContext)
+            renderedParts.push(response.additionalContext);
+          const renderedText = renderedParts.length > 0 ? renderedParts.join("\n\n") : void 0;
           (0, core_1.logEvent)(cliCtx.logger, events_js_1.ReminderEvents.reminderConsumed({
             sessionId,
             hook
@@ -74773,6 +74847,7 @@ var require_consumption_handler_factory = __commonJS({
             blocking: response.blocking ?? false,
             priority: primary.priority,
             persistent: primary.persistent,
+            renderedText,
             ...enrichment
           }));
           return { response };
@@ -77149,6 +77224,7 @@ var require_update_summary = __commonJS({
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.buildPersonaContext = void 0;
+    exports2.resetAnalysisGuard = resetAnalysisGuard;
     exports2.interpolateTemplate = interpolateTemplate;
     exports2.updateSessionSummary = updateSessionSummary;
     var core_1 = require_dist4();
@@ -77161,6 +77237,7 @@ var require_update_summary = __commonJS({
     var persona_selection_js_1 = require_persona_selection();
     var DECISION_TITLE_SKIP = "Skip session analysis";
     var DECISION_TITLE_RUN = "Run session analysis";
+    var analysisInFlight = /* @__PURE__ */ new Map();
     var PROMPT_FILE = "prompts/session-summary.prompt.txt";
     var SNARKY_PROMPT_FILE = "prompts/snarky-message.prompt.txt";
     var RESUME_PROMPT_FILE = "prompts/resume-message.prompt.txt";
@@ -77178,6 +77255,9 @@ var require_update_summary = __commonJS({
     Object.defineProperty(exports2, "buildPersonaContext", { enumerable: true, get: function() {
       return persona_utils_js_2.buildPersonaContext;
     } });
+    function resetAnalysisGuard() {
+      analysisInFlight.clear();
+    }
     function interpolateTemplate(template, context) {
       let result = template;
       const conditionalRegex = /\{\{#if\s+(\w+)\}\}([\s\S]*?)\{\{\/if\}\}/g;
@@ -77221,12 +77301,12 @@ var require_update_summary = __commonJS({
         }
         (0, core_1.logEvent)(ctx.logger, types_1.DecisionEvents.decisionRecorded(event.context, {
           decision: "calling",
-          reason: "BulkProcessingComplete - analyzing full transcript",
+          reason: "Bulk transcript replay complete \u2014 running catch-up analysis",
           subsystem: "session-summary",
           title: DECISION_TITLE_RUN
         }));
         const countdown2 = await loadCountdownState(summaryState, sessionId);
-        void performAnalysis(event, ctx, summaryState, countdown2, "user_prompt_forced");
+        void performAnalysis(event, ctx, summaryState, countdown2, "bulk_replay_complete");
         return;
       }
       const countdown = await loadCountdownState(summaryState, sessionId);
@@ -77241,7 +77321,7 @@ var require_update_summary = __commonJS({
       }
       (0, core_1.logEvent)(ctx.logger, types_1.DecisionEvents.decisionRecorded(event.context, {
         decision: "calling",
-        reason: "countdown reached zero after ToolResult",
+        reason: "Prompt countdown reached zero \u2014 running scheduled analysis",
         subsystem: "session-summary",
         title: DECISION_TITLE_RUN
       }));
@@ -77276,6 +77356,17 @@ var require_update_summary = __commonJS({
     }
     async function performAnalysis(event, ctx, summaryState, countdown, reason) {
       const { sessionId } = event.context;
+      if (analysisInFlight.has(sessionId)) {
+        analysisInFlight.set(sessionId, true);
+        (0, core_1.logEvent)(ctx.logger, types_1.DecisionEvents.decisionRecorded(event.context, {
+          decision: "deferred",
+          reason: "Analysis deferred \u2014 will rerun after current analysis completes",
+          subsystem: "session-summary",
+          title: DECISION_TITLE_SKIP
+        }));
+        return;
+      }
+      analysisInFlight.set(sessionId, false);
       try {
         const startTime = Date.now();
         (0, core_1.logEvent)(ctx.logger, events_js_1.SessionSummaryEvents.summaryStart(event.context, {
@@ -77420,6 +77511,13 @@ var require_update_summary = __commonJS({
           reason,
           error: err instanceof Error ? err.message : String(err)
         });
+      } finally {
+        const rerunPending = analysisInFlight.get(sessionId) ?? false;
+        analysisInFlight.delete(sessionId);
+        if (rerunPending) {
+          const freshCountdown = await loadCountdownState(summaryState, sessionId);
+          void performAnalysis(event, ctx, summaryState, freshCountdown, reason);
+        }
       }
     }
     async function loadCurrentSummary(summaryState, sessionId) {
@@ -83915,7 +84013,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.15" : "dev";
+    var VERSION = true ? "0.1.16" : "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.

package/dist/daemon.js

@@ -70382,7 +70382,7 @@ var require_types2 = __commonJS({
   "../feature-reminders/dist/types.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.ALL_VC_REMINDER_IDS = exports2.VC_TOOL_REMINDER_IDS = exports2.TOOL_REMINDER_MAP = exports2.ReminderIds = exports2.DEFAULT_REMINDERS_SETTINGS = exports2.DEFAULT_COMPLETION_DETECTION_SETTINGS = exports2.DEFAULT_SOURCE_CODE_PATTERNS = exports2.DEFAULT_VERIFICATION_TOOLS = exports2.VerificationToolsMapSchema = exports2.VerificationToolConfigSchema = exports2.ToolPatternSchema = exports2.ToolPatternScopeSchema = void 0;
+    exports2.ALL_VC_REMINDER_IDS = exports2.VC_TOOL_REMINDER_IDS = exports2.TOOL_REMINDER_MAP = exports2.ReminderIds = exports2.DEFAULT_REMINDERS_SETTINGS = exports2.DEFAULT_COMPLETION_DETECTION_SETTINGS = exports2.DEFAULT_SOURCE_CODE_PATTERNS = exports2.DEFAULT_VERIFICATION_TOOLS = exports2.CommandRunnerSchema = exports2.VerificationToolsMapSchema = exports2.VerificationToolConfigSchema = exports2.ToolPatternSchema = exports2.ToolPatternScopeSchema = void 0;
     var zod_1 = require_zod2();
     exports2.ToolPatternScopeSchema = zod_1.z.enum(["project", "package", "file"]);
     exports2.ToolPatternSchema = zod_1.z.object({
@@ -70397,6 +70397,9 @@ var require_types2 = __commonJS({
       clearing_patterns: zod_1.z.array(zod_1.z.string()).min(1)
     });
     exports2.VerificationToolsMapSchema = zod_1.z.record(zod_1.z.string(), exports2.VerificationToolConfigSchema);
+    exports2.CommandRunnerSchema = zod_1.z.object({
+      prefix: zod_1.z.string().trim().min(1)
+    });
     exports2.DEFAULT_VERIFICATION_TOOLS = {
       build: {
         enabled: true,
@@ -70585,7 +70588,30 @@ var require_types2 = __commonJS({
       reminder_thresholds: {
         "user-prompt-submit": 10,
         "remember-your-persona": 5
-      }
+      },
+      command_runners: [
+        // Python
+        { prefix: "uv run" },
+        { prefix: "poetry run" },
+        { prefix: "pipx run" },
+        { prefix: "pdm run" },
+        { prefix: "hatch run" },
+        { prefix: "conda run" },
+        // Node.js
+        { prefix: "npx" },
+        { prefix: "pnpx" },
+        { prefix: "bunx" },
+        { prefix: "pnpm dlx" },
+        { prefix: "pnpm exec" },
+        { prefix: "bun run" },
+        { prefix: "yarn dlx" },
+        { prefix: "yarn exec" },
+        { prefix: "npm exec" },
+        // Ruby
+        { prefix: "bundle exec" },
+        // .NET
+        { prefix: "dotnet tool run" }
+      ]
     };
     exports2.ReminderIds = {
       USER_PROMPT_SUBMIT: "user-prompt-submit",
@@ -70817,6 +70843,16 @@ var require_stage_default_user_prompt = __commonJS({
               continue;
             const newCount = typedEntry.messagesSinceLastStaging + 1;
             if (newCount >= threshold) {
+              (0, core_1.logEvent)(handlerCtx.logger, types_1.DecisionEvents.decisionRecorded({ sessionId }, {
+                decision: "staged",
+                reason: [
+                  `message count reached threshold (${newCount}/${threshold})`,
+                  `target hook: ${typedEntry.targetHook}`,
+                  `messages since last staging: ${typedEntry.messagesSinceLastStaging}`
+                ].join("; "),
+                subsystem: "reminder-throttle",
+                title: `Re-stage ${reminderId} reminder`
+              }));
               const metrics = event.metadata.metrics;
               const stagedAt = {
                 timestamp: Date.now(),
@@ -70828,12 +70864,6 @@ var require_stage_default_user_prompt = __commonJS({
                 ...typedEntry.cachedReminder,
                 stagedAt
               });
-              (0, core_1.logEvent)(handlerCtx.logger, types_1.DecisionEvents.decisionRecorded({ sessionId }, {
-                decision: "staged",
-                reason: `message count reached threshold (${newCount}/${threshold})`,
-                subsystem: "user-prompt-reminders",
-                title: "Stage user-prompt reminder"
-              }));
               state[reminderId] = { ...typedEntry, messagesSinceLastStaging: 0 };
               handlerCtx.logger.debug("Throttle: re-staged reminder", {
                 sessionId,
@@ -70883,6 +70913,9 @@ var require_events2 = __commonJS({
             blocking: state.blocking,
             priority: state.priority,
             persistent: state.persistent,
+            ...state.renderedText !== void 0 && {
+              renderedText: state.renderedText
+            },
             ...state.classificationResult !== void 0 && {
               classificationResult: state.classificationResult
             }
@@ -72574,17 +72607,51 @@ var require_tool_pattern_matcher = __commonJS({
     exports2.matchesToolPattern = matchesToolPattern;
     exports2.findMatchingPattern = findMatchingPattern;
     var SHELL_OPERATOR_RE = /\s*(?:&&|\|\||[;|])\s*/;
-    function matchesToolPattern(command, pattern) {
+    function detectRunnerPrefix(segmentTokens, runners) {
+      let longestMatch = 0;
+      for (const runner of runners) {
+        if (typeof runner.prefix !== "string")
+          continue;
+        const prefixTokens = runner.prefix.trim().split(/\s+/);
+        if (prefixTokens.length === 0)
+          continue;
+        if (prefixTokens.length > segmentTokens.length)
+          continue;
+        let matches = true;
+        for (let i = 0; i < prefixTokens.length; i++) {
+          if (segmentTokens[i] !== prefixTokens[i]) {
+            matches = false;
+            break;
+          }
+        }
+        if (matches && prefixTokens.length > longestMatch) {
+          longestMatch = prefixTokens.length;
+        }
+      }
+      return longestMatch;
+    }
+    function matchesToolPattern(command, pattern, runners) {
       if (!command || !pattern)
         return false;
       const segments = command.split(SHELL_OPERATOR_RE);
       const patternTokens = pattern.trim().split(/\s+/).filter(Boolean);
       if (patternTokens.length === 0)
         return false;
+      const activeRunners = runners?.length ? runners : void 0;
       return segments.some((segment) => {
         const cmdTokens = segment.trim().split(/\s+/);
         if (cmdTokens.length === 0 || cmdTokens[0] === "")
           return false;
+        const runnerTokenCount = activeRunners ? detectRunnerPrefix(cmdTokens, activeRunners) : 0;
+        if (runnerTokenCount > 0) {
+          let pi2 = 0;
+          for (let ci = runnerTokenCount; ci < cmdTokens.length && pi2 < patternTokens.length; ci++) {
+            if (patternTokens[pi2] === "*" || patternTokens[pi2] === cmdTokens[ci]) {
+              pi2++;
+            }
+          }
+          return pi2 === patternTokens.length;
+        }
         if (cmdTokens[0] !== patternTokens[0])
           return false;
         let pi = 1;
@@ -72596,11 +72663,11 @@ var require_tool_pattern_matcher = __commonJS({
         return pi === patternTokens.length;
       });
     }
-    function findMatchingPattern(command, patterns) {
+    function findMatchingPattern(command, patterns, runners) {
       for (const pattern of patterns) {
         if (pattern.tool === null)
           continue;
-        if (matchesToolPattern(command, pattern.tool))
+        if (matchesToolPattern(command, pattern.tool, runners))
           return pattern;
       }
       return null;
@@ -72656,13 +72723,14 @@ var require_track_verification_tools = __commonJS({
           const featureConfig = context.config.getFeature("reminders");
           const config = { ...types_js_1.DEFAULT_REMINDERS_SETTINGS, ...featureConfig.settings };
           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);
+            await handleBashCommand(event, daemonCtx, sessionId, verificationTools, toolsState, remindersState, runners);
           }
         }
       });
@@ -72784,7 +72852,7 @@ var require_track_verification_tools = __commonJS({
         return;
       await stageToolsForFiles([filePath], daemonCtx, sessionId, verificationTools, toolsState, remindersState);
     }
-    async function handleBashCommand(event, daemonCtx, sessionId, verificationTools, toolsState, remindersState) {
+    async function handleBashCommand(event, daemonCtx, sessionId, verificationTools, toolsState, remindersState, runners = []) {
       const command = extractToolInput(event)?.command;
       if (!command)
         return;
@@ -72795,7 +72863,7 @@ var require_track_verification_tools = __commonJS({
         const reminderId = types_js_1.TOOL_REMINDER_MAP[toolName];
         if (!reminderId)
           continue;
-        const match = (0, tool_pattern_matcher_js_1.findMatchingPattern)(command, toolConfig.patterns);
+        const match = (0, tool_pattern_matcher_js_1.findMatchingPattern)(command, toolConfig.patterns, runners);
         if (!match)
           continue;
         toolsState[toolName] = {
@@ -73611,6 +73679,12 @@ var require_consumption_handler_factory = __commonJS({
           if (onConsume) {
             await onConsume({ reminder: primary, reader, cliCtx, sessionId });
           }
+          const renderedParts = [];
+          if (response.userMessage)
+            renderedParts.push(response.userMessage);
+          if (response.additionalContext)
+            renderedParts.push(response.additionalContext);
+          const renderedText = renderedParts.length > 0 ? renderedParts.join("\n\n") : void 0;
           (0, core_1.logEvent)(cliCtx.logger, events_js_1.ReminderEvents.reminderConsumed({
             sessionId,
             hook
@@ -73620,6 +73694,7 @@ var require_consumption_handler_factory = __commonJS({
             blocking: response.blocking ?? false,
             priority: primary.priority,
             persistent: primary.persistent,
+            renderedText,
             ...enrichment
           }));
           return { response };
@@ -74942,6 +75017,7 @@ var require_update_summary = __commonJS({
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.buildPersonaContext = void 0;
+    exports2.resetAnalysisGuard = resetAnalysisGuard;
     exports2.interpolateTemplate = interpolateTemplate;
     exports2.updateSessionSummary = updateSessionSummary;
     var core_1 = require_dist4();
@@ -74954,6 +75030,7 @@ var require_update_summary = __commonJS({
     var persona_selection_js_1 = require_persona_selection();
     var DECISION_TITLE_SKIP = "Skip session analysis";
     var DECISION_TITLE_RUN = "Run session analysis";
+    var analysisInFlight = /* @__PURE__ */ new Map();
     var PROMPT_FILE = "prompts/session-summary.prompt.txt";
     var SNARKY_PROMPT_FILE = "prompts/snarky-message.prompt.txt";
     var RESUME_PROMPT_FILE = "prompts/resume-message.prompt.txt";
@@ -74971,6 +75048,9 @@ var require_update_summary = __commonJS({
     Object.defineProperty(exports2, "buildPersonaContext", { enumerable: true, get: function() {
       return persona_utils_js_2.buildPersonaContext;
     } });
+    function resetAnalysisGuard() {
+      analysisInFlight.clear();
+    }
     function interpolateTemplate(template, context) {
       let result = template;
       const conditionalRegex = /\{\{#if\s+(\w+)\}\}([\s\S]*?)\{\{\/if\}\}/g;
@@ -75014,12 +75094,12 @@ var require_update_summary = __commonJS({
         }
         (0, core_1.logEvent)(ctx.logger, types_1.DecisionEvents.decisionRecorded(event.context, {
           decision: "calling",
-          reason: "BulkProcessingComplete - analyzing full transcript",
+          reason: "Bulk transcript replay complete \u2014 running catch-up analysis",
           subsystem: "session-summary",
           title: DECISION_TITLE_RUN
         }));
         const countdown2 = await loadCountdownState(summaryState, sessionId);
-        void performAnalysis(event, ctx, summaryState, countdown2, "user_prompt_forced");
+        void performAnalysis(event, ctx, summaryState, countdown2, "bulk_replay_complete");
         return;
       }
       const countdown = await loadCountdownState(summaryState, sessionId);
@@ -75034,7 +75114,7 @@ var require_update_summary = __commonJS({
       }
       (0, core_1.logEvent)(ctx.logger, types_1.DecisionEvents.decisionRecorded(event.context, {
         decision: "calling",
-        reason: "countdown reached zero after ToolResult",
+        reason: "Prompt countdown reached zero \u2014 running scheduled analysis",
         subsystem: "session-summary",
         title: DECISION_TITLE_RUN
       }));
@@ -75069,6 +75149,17 @@ var require_update_summary = __commonJS({
     }
     async function performAnalysis(event, ctx, summaryState, countdown, reason) {
       const { sessionId } = event.context;
+      if (analysisInFlight.has(sessionId)) {
+        analysisInFlight.set(sessionId, true);
+        (0, core_1.logEvent)(ctx.logger, types_1.DecisionEvents.decisionRecorded(event.context, {
+          decision: "deferred",
+          reason: "Analysis deferred \u2014 will rerun after current analysis completes",
+          subsystem: "session-summary",
+          title: DECISION_TITLE_SKIP
+        }));
+        return;
+      }
+      analysisInFlight.set(sessionId, false);
       try {
         const startTime = Date.now();
         (0, core_1.logEvent)(ctx.logger, events_js_1.SessionSummaryEvents.summaryStart(event.context, {
@@ -75213,6 +75304,13 @@ var require_update_summary = __commonJS({
           reason,
           error: err instanceof Error ? err.message : String(err)
         });
+      } finally {
+        const rerunPending = analysisInFlight.get(sessionId) ?? false;
+        analysisInFlight.delete(sessionId);
+        if (rerunPending) {
+          const freshCountdown = await loadCountdownState(summaryState, sessionId);
+          void performAnalysis(event, ctx, summaryState, freshCountdown, reason);
+        }
       }
     }
     async function loadCurrentSummary(summaryState, sessionId) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scotthamilton77/sidekick",
-  "version": "0.1.15",
+  "version": "0.1.16",
   "description": "AI pair programming assistant with personas, session tracking, and contextual nudges",
   "bin": {
     "sidekick": "dist/bin.js"