@scotthamilton77/sidekick 0.1.5 → 0.1.7

package/dist/daemon.js

@@ -54,6 +54,7 @@ var require_events = __commonJS({
   "../types/dist/events.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.HOOK_NAMES = void 0;
     exports2.isHookEvent = isHookEvent;
     exports2.isTranscriptEvent = isTranscriptEvent;
     exports2.isSessionStartEvent = isSessionStartEvent;
@@ -67,6 +68,15 @@ var require_events = __commonJS({
     exports2.isCLILoggingEvent = isCLILoggingEvent;
     exports2.isDaemonLoggingEvent = isDaemonLoggingEvent;
     exports2.isTranscriptLoggingEvent = isTranscriptLoggingEvent;
+    exports2.HOOK_NAMES = [
+      "SessionStart",
+      "SessionEnd",
+      "UserPromptSubmit",
+      "PreToolUse",
+      "PostToolUse",
+      "Stop",
+      "PreCompact"
+    ];
     function isHookEvent(event) {
       return event.kind === "hook";
     }
@@ -16227,6 +16237,7 @@ var require_staging = __commonJS({
       userMessage: zod_1.z.string().optional(),
       additionalContext: zod_1.z.string().optional(),
       reason: zod_1.z.string().optional(),
+      throttle: zod_1.z.boolean().optional(),
       stagedAt: exports2.StagingMetricsSchema.optional()
     });
   }
@@ -16237,9 +16248,10 @@ 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.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.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.ReminderThrottleStateSchema = exports2.ReminderThrottleEntrySchema = exports2.CachedReminderSchema = 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();
+    var events_js_1 = require_events();
     exports2.SessionSummaryStateSchema = zod_1.z.object({
       /** Session identifier */
       session_id: zod_1.z.string(),
@@ -16401,10 +16413,25 @@ 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({
+    exports2.CachedReminderSchema = zod_1.z.object({
+      name: zod_1.z.string(),
+      blocking: zod_1.z.boolean(),
+      priority: zod_1.z.number(),
+      persistent: zod_1.z.boolean(),
+      throttle: zod_1.z.boolean().optional(),
+      userMessage: zod_1.z.string().optional(),
+      additionalContext: zod_1.z.string().optional(),
+      reason: zod_1.z.string().optional()
+    });
+    exports2.ReminderThrottleEntrySchema = zod_1.z.object({
       /** Number of conversation messages since the reminder was last staged */
-      messagesSinceLastStaging: zod_1.z.number()
+      messagesSinceLastStaging: zod_1.z.number().int().nonnegative(),
+      /** Hook to re-stage the reminder for */
+      targetHook: zod_1.z.enum(events_js_1.HOOK_NAMES),
+      /** Cached resolved reminder content for re-staging */
+      cachedReminder: exports2.CachedReminderSchema
     });
+    exports2.ReminderThrottleStateSchema = zod_1.z.record(zod_1.z.string(), exports2.ReminderThrottleEntrySchema);
     exports2.BaseTokenMetricsStateSchema = zod_1.z.object({
       /** System prompt tokens (~3.2k) */
       systemPromptTokens: zod_1.z.number(),
@@ -69802,6 +69829,7 @@ var require_reminder_utils = __commonJS({
       blocking: zod_1.z.boolean(),
       priority: zod_1.z.number(),
       persistent: zod_1.z.boolean(),
+      throttle: zod_1.z.boolean().optional(),
       userMessage: zod_1.z.string().optional(),
       additionalContext: zod_1.z.string().optional(),
       reason: zod_1.z.string().optional()
@@ -69852,6 +69880,7 @@ var require_reminder_utils = __commonJS({
           blocking: def.blocking,
           priority: def.priority,
           persistent: def.persistent,
+          throttle: def.throttle,
           userMessage: def.userMessage ? interpolateTemplate(def.userMessage, context) : void 0,
           additionalContext: def.additionalContext ? interpolateTemplate(def.additionalContext, context) : void 0,
           reason: def.reason ? interpolateTemplate(def.reason, context) : void 0
@@ -70148,7 +70177,10 @@ var require_types2 = __commonJS({
       max_verification_cycles: -1,
       // -1 = unlimited, 0 = disabled
       verification_tools: exports2.DEFAULT_VERIFICATION_TOOLS,
-      user_prompt_submit_threshold: 10
+      reminder_thresholds: {
+        "user-prompt-submit": 10,
+        "remember-your-persona": 5
+      }
     };
     exports2.ReminderIds = {
       USER_PROMPT_SUBMIT: "user-prompt-submit",
@@ -70192,8 +70224,8 @@ var require_state3 = __commonJS({
       defaultValue: {},
       trackHistory: false
     });
-    var UPSThrottleDescriptor = (0, core_1.sessionState)("ups-throttle.json", types_1.UPSThrottleStateSchema, {
-      defaultValue: { messagesSinceLastStaging: 0 },
+    var ReminderThrottleDescriptor = (0, core_1.sessionState)("reminder-throttle.json", types_1.ReminderThrottleStateSchema, {
+      defaultValue: {},
       trackHistory: false
     });
     function createRemindersState(stateService) {
@@ -70201,8 +70233,40 @@ var require_state3 = __commonJS({
         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)
+        reminderThrottle: new core_1.SessionStateAccessor(stateService, ReminderThrottleDescriptor)
+      };
+    }
+  }
+});
+
+// ../feature-reminders/dist/handlers/staging/throttle-utils.js
+var require_throttle_utils = __commonJS({
+  "../feature-reminders/dist/handlers/staging/throttle-utils.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.registerThrottledReminder = registerThrottledReminder;
+    exports2.resetThrottleCounters = resetThrottleCounters;
+    var state_js_1 = require_state3();
+    async function registerThrottledReminder(ctx, sessionId, reminderId, targetHook, resolvedReminder) {
+      const remindersState = (0, state_js_1.createRemindersState)(ctx.stateService);
+      const result = await remindersState.reminderThrottle.read(sessionId);
+      const state = { ...result.data };
+      const { stagedAt: _stagedAt, ...cachedReminder } = resolvedReminder;
+      state[reminderId] = {
+        messagesSinceLastStaging: 0,
+        targetHook,
+        cachedReminder
       };
+      await remindersState.reminderThrottle.write(sessionId, state);
+    }
+    async function resetThrottleCounters(ctx, sessionId) {
+      const remindersState = (0, state_js_1.createRemindersState)(ctx.stateService);
+      const result = await remindersState.reminderThrottle.read(sessionId);
+      const state = { ...result.data };
+      for (const key of Object.keys(state)) {
+        state[key] = { ...state[key], messagesSinceLastStaging: 0 };
+      }
+      await remindersState.reminderThrottle.write(sessionId, state);
     }
   }
 });
@@ -70218,6 +70282,7 @@ var require_stage_default_user_prompt = __commonJS({
     var types_js_1 = require_types2();
     var reminder_utils_js_1 = require_reminder_utils();
     var state_js_1 = require_state3();
+    var throttle_utils_js_1 = require_throttle_utils();
     function registerStageDefaultUserPrompt(context) {
       (0, staging_handler_utils_js_1.createStagingHandler)(context, {
         id: "reminders:stage-default-user-prompt",
@@ -70235,23 +70300,6 @@ 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,
@@ -70268,65 +70316,120 @@ var require_stage_default_user_prompt = __commonJS({
           };
         }
       });
-      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"] },
+        id: "reminders:throttle-register-ups-session-start",
+        priority: 49,
+        filter: { kind: "hook", hooks: ["SessionStart"] },
         handler: async (event, ctx) => {
-          if (!(0, types_1.isTranscriptEvent)(event))
+          if (!(0, types_1.isHookEvent)(event) || !(0, types_1.isSessionStartEvent)(event))
+            return;
+          if (!(0, types_1.isDaemonContext)(ctx))
+            return;
+          const handlerCtx = ctx;
+          const sessionId = event.context.sessionId;
+          if (!sessionId)
+            return;
+          const reminder = (0, reminder_utils_js_1.resolveReminder)(types_js_1.ReminderIds.USER_PROMPT_SUBMIT, {
+            context: { sessionId },
+            assets: handlerCtx.assets
+          });
+          if (reminder) {
+            await (0, throttle_utils_js_1.registerThrottledReminder)(handlerCtx, sessionId, types_js_1.ReminderIds.USER_PROMPT_SUBMIT, "UserPromptSubmit", reminder);
+          }
+        }
+      });
+      context.handlers.register({
+        id: "reminders:throttle-reset-session-start",
+        priority: 48,
+        filter: { kind: "hook", hooks: ["SessionStart"] },
+        handler: async (event, ctx) => {
+          if (!(0, types_1.isHookEvent)(event) || !(0, types_1.isSessionStartEvent)(event))
             return;
           if (!(0, types_1.isDaemonContext)(ctx))
             return;
+          const handlerCtx = ctx;
+          const sessionId = event.context.sessionId;
+          if (!sessionId)
+            return;
+          await (0, throttle_utils_js_1.resetThrottleCounters)(handlerCtx, sessionId);
+        }
+      });
+      context.handlers.register({
+        id: "reminders:throttle-reset-bulk",
+        priority: 49,
+        filter: { kind: "transcript", eventTypes: ["BulkProcessingComplete"] },
+        handler: async (event, ctx) => {
+          if (!(0, types_1.isTranscriptEvent)(event))
+            return;
           if (event.metadata.isBulkProcessing)
             return;
+          if (!(0, types_1.isDaemonContext)(ctx))
+            return;
+          const handlerCtx = ctx;
           const sessionId = event.context?.sessionId;
           if (!sessionId)
             return;
+          await (0, throttle_utils_js_1.resetThrottleCounters)(handlerCtx, sessionId);
+        }
+      });
+      context.handlers.register({
+        id: "reminders:throttle-restage",
+        priority: 50,
+        filter: { kind: "transcript", eventTypes: ["UserPrompt", "AssistantMessage"] },
+        handler: async (event, ctx) => {
+          if (!(0, types_1.isTranscriptEvent)(event))
+            return;
+          if (event.metadata.isBulkProcessing)
+            return;
+          if (!(0, types_1.isDaemonContext)(ctx))
+            return;
           const handlerCtx = ctx;
+          const sessionId = event.context?.sessionId;
+          if (!sessionId)
+            return;
           const remindersState = (0, state_js_1.createRemindersState)(handlerCtx.stateService);
-          const result = await remindersState.upsThrottle.read(sessionId);
-          const current = result.data.messagesSinceLastStaging;
+          const result = await remindersState.reminderThrottle.read(sessionId);
+          const state = { ...result.data };
+          if (Object.keys(state).length === 0)
+            return;
           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", {
+          const thresholds = config.reminder_thresholds ?? {};
+          let changed = false;
+          for (const [reminderId, entry] of Object.entries(state)) {
+            const typedEntry = entry;
+            const threshold = thresholds[reminderId];
+            if (threshold === void 0)
+              continue;
+            const newCount = typedEntry.messagesSinceLastStaging + 1;
+            if (newCount >= threshold) {
+              const metrics = event.metadata.metrics;
+              const stagedAt = {
+                timestamp: Date.now(),
+                turnCount: metrics.turnCount,
+                toolsThisTurn: metrics.toolsThisTurn,
+                toolCount: metrics.toolCount
+              };
+              await (0, reminder_utils_js_1.stageReminder)(handlerCtx, typedEntry.targetHook, {
+                ...typedEntry.cachedReminder,
+                stagedAt
+              });
+              state[reminderId] = { ...typedEntry, messagesSinceLastStaging: 0 };
+              handlerCtx.logger.debug("Throttle: re-staged reminder", {
                 sessionId,
+                reminderId,
                 messageCount: newCount,
                 threshold
               });
+            } else {
+              state[reminderId] = { ...typedEntry, messagesSinceLastStaging: newCount };
             }
-            await remindersState.upsThrottle.write(sessionId, { messagesSinceLastStaging: 0 });
-          } else {
-            await remindersState.upsThrottle.write(sessionId, { messagesSinceLastStaging: newCount });
+            changed = true;
+          }
+          if (changed) {
+            await remindersState.reminderThrottle.write(sessionId, state);
           }
         }
       });
@@ -72029,27 +72132,33 @@ var require_track_verification_tools = __commonJS({
             continue;
           const current = toolsState[toolName];
           if (!current || current.status === "staged") {
-            if (!current) {
-              toolsState[toolName] = {
-                status: "staged",
-                editsSinceVerified: 0,
-                lastVerifiedAt: null,
-                lastStagedAt: Date.now()
-              };
+            const staged = await ensureToolReminderStaged(daemonCtx, reminderId, stagedNames);
+            if (staged) {
+              if (!current) {
+                toolsState[toolName] = {
+                  status: "staged",
+                  editsSinceVerified: 0,
+                  lastVerifiedAt: null,
+                  lastStagedAt: Date.now()
+                };
+              }
+              stagedNames.add(reminderId);
+              anyStaged = true;
             }
-            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()
-              };
-              await stageToolReminderIfNeeded(daemonCtx, reminderId, stagedNames);
-              anyStaged = true;
+              const staged = await ensureToolReminderStaged(daemonCtx, reminderId, stagedNames);
+              if (staged) {
+                toolsState[toolName] = {
+                  ...current,
+                  status: "staged",
+                  editsSinceVerified: 0,
+                  lastStagedAt: Date.now()
+                };
+                stagedNames.add(reminderId);
+                anyStaged = true;
+              }
             } else {
               toolsState[toolName] = {
                 ...current,
@@ -72061,7 +72170,10 @@ var require_track_verification_tools = __commonJS({
         }
       }
       if (anyStaged) {
-        await stageToolReminderIfNeeded(daemonCtx, types_js_1.ReminderIds.VERIFY_COMPLETION, stagedNames);
+        const wrapperStaged = await ensureToolReminderStaged(daemonCtx, types_js_1.ReminderIds.VERIFY_COMPLETION, stagedNames);
+        if (!wrapperStaged) {
+          daemonCtx.logger.warn("Failed to stage verify-completion wrapper reminder", { sessionId });
+        }
       }
       await remindersState.verificationTools.write(sessionId, toolsState);
       return anyStaged;
@@ -72117,21 +72229,22 @@ var require_track_verification_tools = __commonJS({
         await remindersState.verificationTools.write(sessionId, toolsState);
       }
     }
-    async function stageToolReminderIfNeeded(daemonCtx, reminderId, stagedNames) {
+    async function ensureToolReminderStaged(daemonCtx, reminderId, stagedNames) {
       if (stagedNames.has(reminderId))
-        return;
+        return true;
       const reminder = (0, reminder_utils_js_1.resolveReminder)(reminderId, {
         context: {},
         assets: daemonCtx.assets
       });
       if (!reminder) {
         daemonCtx.logger.warn("Failed to resolve VC tool reminder", { reminderId });
-        return;
+        return false;
       }
       await (0, reminder_utils_js_1.stageReminder)(daemonCtx, "Stop", {
         ...reminder,
         stagedAt: { timestamp: Date.now(), turnCount: 0, toolsThisTurn: 0, toolCount: 0 }
       });
+      return true;
     }
   }
 });
@@ -72386,6 +72499,7 @@ var require_stage_persona_reminders = __commonJS({
     var types_1 = require_dist();
     var reminder_utils_js_1 = require_reminder_utils();
     var types_js_1 = require_types2();
+    var throttle_utils_js_1 = require_throttle_utils();
     async function restagePersonaRemindersForActiveSessions(ctxFactory, sessionIds, logger) {
       logger.info("Re-staging persona reminders for active sessions", { count: sessionIds.length });
       for (const sessionId of sessionIds) {
@@ -72468,6 +72582,9 @@ var require_stage_persona_reminders = __commonJS({
       if (reminder) {
         for (const targetHook of PERSONA_REMINDER_HOOKS) {
           await (0, reminder_utils_js_1.stageReminder)(ctx, targetHook, reminder);
+          if (targetHook === "UserPromptSubmit") {
+            await (0, throttle_utils_js_1.registerThrottledReminder)(ctx, sessionId, types_js_1.ReminderIds.REMEMBER_YOUR_PERSONA, "UserPromptSubmit", reminder);
+          }
         }
       } else {
         ctx.logger.warn("Failed to resolve persona reminder", {

package/package.json

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