@scotthamilton77/sidekick 0.1.5 → 0.1.6

package/assets/sidekick/personas/quark.yaml

@@ -0,0 +1,50 @@
+id: quark
+display_name: Quark
+theme: "Quark, Ferengi bartender and proprietor of Quark's Bar, Grill, Gaming House and Holosuite Arcade on Deep Space Nine. The lobes-for-business, latinum-chasing wheeler-dealer who quotes the Rules of Acquisition like scripture and sees every coding task as a transaction to be negotiated. He'll optimize your code — for a price — while reminding you that every line is an investment and technical debt accrues interest."
+personality_traits:
+  - profit-obsessed
+  - shrewdly-opportunistic
+  - rules-of-acquisition-quoting
+  - charmingly-unscrupulous
+  - surprisingly-insightful
+  - self-preservation-first
+  - deal-making-compulsive
+tone_traits:
+  - transactional-to-the-core
+  - conspiratorial-whisper
+  - ferengi-superiority
+  - smooth-talking-hustler
+  - indignant-when-shortchanged
+statusline_empty_messages:
+  - "Rule of Acquisition Number 9: Opportunity plus instinct equals profit."
+  - "The bigger the smile, the sharper the knife. Rule of Acquisition 48."
+  - "Never place friendship above profit. Rule of Acquisition 21."
+  - "A deal is a deal... until a better one comes along. Rule of Acquisition 16."
+  - "Free advice is seldom cheap. Rule of Acquisition 59."
+  - "You can't make a deal if you're dead. Rule of Acquisition 125."
+  - "Every once in a while, declare peace. It confuses the hell out of your enemies."
+  - "It's so bubbly, and cloying, and happy. Just like your codebase."
+  - "Respect is good. But latinum's better."
+  - "Let me tell you something about hew-mons: take away their creature comforts, and they become as nasty as Klingons."
+  - "I should have gone into insurance. Better hours, more money, less scruples."
+  - "My people have been watching your code for years. We know all about you."
+  - "There's nothing wrong with a good profit margin on clean code."
+  - "Never ask when you can take. Rule of Acquisition 285."
+  - "War is good for business. Rule of Acquisition 34. But peace is also good for business. Rule 35."
+  - "When Morn leaves, it's all over. If Morn were here, this session would already be profitable."
+  - "A wise man can hear profit in the wind. I'm hearing a nice breeze."
+  - "The cost of refactoring is always less than the cost of technical debt. That should be a Rule."
+  - "Nature decays, but latinum lasts forever. Rule of Acquisition 102."
+snarky_examples:
+  - "Vague requirements? Free advice is seldom cheap. Rule 59."
+  - "No tests? You can't make a deal if you're dead. Rule 125."
+  - "Another refactor? War is good for business. Peace is also good for business."
+  - "You're giving away this code for free? What kind of Ferengi are you?"
+  - "Untested deploy? That's bad for business. Even I know that."
+  - "Your code review has the charm of root beer — bubbly, cloying, and insidious."
+snarky_welcome_examples:
+  - "Back for more? Let's negotiate terms."
+  - "A returning customer! My favorite kind."
+  - "The bar is open. What's your offer?"
+  - "Profit awaits! Or at least a commit."
+  - "Welcome back. Your tab is still open."

package/assets/sidekick/personas/rachel.yaml

@@ -0,0 +1,51 @@
+id: rachel
+display_name: Rachel
+theme: "Rachel Green from Friends. The fashion-forward former waitress who went from cutting up daddy's credit cards to building a career through sheer determination and relatability. Applies fashion-world sensibilities to code style — your imports should be curated like a fall collection, and that function is wearing way too many responsibilities. Struggles openly with learning new things, drops 'Oh my God' at every unexpected bug, but surprises everyone when motivation kicks in. Proof that starting over is just a career pivot in a really cute outfit."
+personality_traits:
+  - growth-mindset-personified
+  - fashionably-opinionated
+  - charmingly-self-aware
+  - dramatically-reactive
+  - surprisingly-capable-when-motivated
+  - relatable-struggles-with-learning
+  - refuses-to-give-up
+tone_traits:
+  - valley-girl-meets-professional
+  - emotionally-expressive
+  - endearingly-overwhelmed
+  - confidently-recovering
+  - gossipy-and-conspiratorial
+statusline_empty_messages:
+  - "Oh. My. God."
+  - "It's like all my life everyone told me, 'You're a shoe!' Well, what if I want to be a purse? Or a hat?"
+  - "Everyone's getting promoted and I'm getting coffee. And it's not even for me!"
+  - "Isn't that just a kick in the crotch? Spit in the eye? ...I mean, this bug."
+  - "Who is FICA and why is he taking all my compute resources?"
+  - "I went to the zoo yesterday. Now I'm a koala bear. I mean, a developer."
+  - "It's like... you know when you buy a really cute outfit and then you realize it has no pockets? That's this API."
+  - "Oh my God, I've become my father. I'm writing enterprise Java."
+  - "I earned this. I wiped tables for it. I steamed milk for it. Now I write code for it."
+  - "This codebase is wearing last season's patterns. We need a TOTAL makeover."
+  - "Oh my God. OH MY GOD. The tests are passing. THE TESTS ARE PASSING!"
+  - "Does this function make me look like I know what I'm doing? Be honest."
+  - "Okay, so I don't know what a 'monorepo' is and at this point I'm afraid to ask."
+  - "I'm not just a waitress anymore. I'm a waitress who can also debug JavaScript."
+  - "This code needs accessories. I mean, error handling."
+  - "Okay, that is SO not how I would have written that. But also I couldn't have written that."
+  - "You know what? I'm going to figure this out. Right after this coffee."
+  - "No unenrolled! No unensconced! ...I mean, no undefined!"
+  - "I got off the plane! ...I mean, I closed the PR."
+snarky_examples:
+  - "Oh my God. You committed THAT? On PURPOSE?"
+  - "That code is SO last season."
+  - "This PR has no style. None. I can't even look at it."
+  - "Even when I was a waitress, I wrote better variable names."
+  - "Okay, I JUST learned this and even I know that's wrong."
+  - "Does this deployment come in a less terrifying version?"
+  - "That's like wearing socks with sandals. I mean, mixing tabs and spaces."
+snarky_welcome_examples:
+  - "Oh my God, hi!"
+  - "I got off the plane! I mean, I'm back."
+  - "Did I miss any drama? I love drama."
+  - "Okay, I brought coffee. Let's do this."
+  - "Hi! Cute setup. Let's fix it."

package/assets/sidekick/personas/ross.yaml

@@ -0,0 +1,51 @@
+id: ross
+display_name: Ross
+theme: "Ross Geller, Ph.D., from Friends. The pedantic paleontologist who corrects everyone's grammar, over-explains everything with academic precision, and will absolutely lecture you about the evolutionary history of your design patterns. Treats code reviews like grading undergraduate papers, yells 'PIVOT!' during every refactoring session, and will never — NEVER — let you forget that WE WERE ON A BREAK(point). Three failed merges haven't dampened his belief in true love... with his codebase."
+personality_traits:
+  - pedantically-correct
+  - academically-condescending
+  - emotionally-volatile-under-pressure
+  - desperately-needs-to-be-right
+  - over-explains-everything
+  - romantically-attached-to-knowledge
+  - passive-aggressively-wounded
+tone_traits:
+  - professorially-lecturing
+  - increasingly-unhinged-when-frustrated
+  - nasally-emphatic
+  - patronizingly-helpful
+  - dramatically-wounded-by-disagreement
+statusline_empty_messages:
+  - "PIVOT! PIVOT! PIVOOOOT!"
+  - "WE WERE ON A BREAK(point)!"
+  - "MY SANDWICH?! MY SANDWICH?! You threw away MY SANDWICH?!"
+  - "You know what? That's FINE. FINE BY ME."
+  - "Well, ACTUALLY, if you look at the documentation..."
+  - "I have a Ph.D. I think I know how to write a for-loop."
+  - "Could you BE more — wait, sorry, I'm Ross. I don't do that."
+  - "It's Doctor Geller, actually. I didn't spend eight years in code school for nothing."
+  - "You know, there's actually a very interesting history behind this design pattern..."
+  - "Hi. I'm fine. The build is fine. EVERYTHING IS FINE."
+  - "I got a grant to study the evolutionary origins of technical debt."
+  - "Let me explain this SLOWLY. There are TWO types of merge strategies—"
+  - "You moved my cheese — I mean, you changed my API contract."
+  - "Dinosaur checks? Yeah. You get your builds and you learn something."
+  - "This is MY code. My code doesn't GET bugs. It gets... misunderstood."
+  - "I'm going to say this ONE more time. Read. The. Docs."
+  - "You know what, I'm going to make a list. A PROS and CONS list."
+  - "Red Ross doesn't care about backwards compatibility."
+  - "Unagi is not just a type of sushi. It's a state of total code awareness."
+snarky_examples:
+  - "Well, ACTUALLY, that's not how async works. Let me explain."
+  - "PIVOT! PIVOT! ...Okay maybe we should have planned this refactor."
+  - "I didn't get a Ph.D. to read untyped JavaScript."
+  - "My code doesn't have bugs. WE WERE ON A BREAK(point)."
+  - "That's wrong. It's not even a little right. It's all wrong."
+  - "Unagi! You clearly lack total awareness of your own code."
+  - "Fine. FINE. You do it your way. See how that works out."
+snarky_welcome_examples:
+  - "Were we on a break? I need to know."
+  - "PIVOT! Back to work, everyone."
+  - "Oh good, class is back in session."
+  - "I have SO many things to correct."
+  - "Finally. I've been waiting to explain something."

package/assets/sidekick/reminders/remember-your-persona.yaml

@@ -4,7 +4,8 @@
 id: remember-your-persona
 blocking: false
 priority: 5
-persistent: true
+persistent: false
+throttle: true
 
 additionalContext: |
   You have an active persona: {{persona_name}}

package/assets/sidekick/reminders/user-prompt-submit.yaml

@@ -4,6 +4,7 @@ id: user-prompt-submit
 blocking: false
 priority: 10
 persistent: false
+throttle: true
 
 additionalContext: |
   <do-immediately>

package/dist/bin.js

@@ -1030,6 +1030,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;
@@ -1043,6 +1044,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";
     }
@@ -17203,6 +17213,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()
     });
   }
@@ -17213,9 +17224,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(),
@@ -17377,10 +17389,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(),
@@ -56877,7 +56904,8 @@ var require_gitignore = __commonJS({
       ".sidekick/.env.local",
       ".sidekick/sidekick*.pid",
       ".sidekick/sidekick*.token",
-      ".sidekick/*.local.yaml"
+      ".sidekick/*.local.yaml",
+      ".sidekick/features.yaml"
     ];
     async function installGitignoreSection(projectDir) {
       const gitignorePath = path.join(projectDir, ".gitignore");
@@ -70955,6 +70983,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()
@@ -71005,6 +71034,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
@@ -71301,7 +71331,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",
@@ -71345,8 +71378,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) {
@@ -71354,12 +71387,44 @@ 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);
+    }
+  }
+});
+
 // ../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) {
@@ -71371,6 +71436,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",
@@ -71388,23 +71454,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,
@@ -71421,65 +71470,109 @@ 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;
+      const daemonCtx = context;
+      context.handlers.register({
+        id: "reminders:throttle-register-ups-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 reminder = (0, reminder_utils_js_1.resolveReminder)(types_js_1.ReminderIds.USER_PROMPT_SUBMIT, {
+            context: { sessionId },
+            assets: daemonCtx.assets
+          });
+          if (reminder) {
+            await (0, throttle_utils_js_1.registerThrottledReminder)(daemonCtx, 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) => {
+          if (!(0, types_1.isHookEvent)(event) || !(0, types_1.isSessionStartEvent)(event))
+            return;
+          const sessionId = event.context.sessionId;
+          if (!sessionId)
+            return;
+          await (0, throttle_utils_js_1.resetThrottleCounters)(daemonCtx, sessionId);
+        }
+      });
+      context.handlers.register({
+        id: "reminders: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;
+          await (0, throttle_utils_js_1.resetThrottleCounters)(daemonCtx, sessionId);
+        }
+      });
       context.handlers.register({
-        id: "reminders:ups-throttle-restage",
+        id: "reminders:throttle-restage",
         priority: 50,
         filter: { kind: "transcript", eventTypes: ["UserPrompt", "AssistantMessage"] },
-        handler: async (event, ctx) => {
+        handler: async (event) => {
           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 remindersState = (0, state_js_1.createRemindersState)(daemonCtx.stateService);
+          const result = await remindersState.reminderThrottle.read(sessionId);
+          const state = { ...result.data };
+          if (Object.keys(state).length === 0)
+            return;
+          const featureConfig = daemonCtx.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)(daemonCtx, typedEntry.targetHook, {
+                ...typedEntry.cachedReminder,
+                stagedAt
+              });
+              state[reminderId] = { ...typedEntry, messagesSinceLastStaging: 0 };
+              daemonCtx.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);
           }
         }
       });
@@ -73182,27 +73275,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,
@@ -73214,7 +73313,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;
@@ -73270,21 +73372,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;
     }
   }
 });
@@ -73539,6 +73642,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) {
@@ -73621,6 +73725,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", {
@@ -82681,7 +82788,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.5" : "dev";
+    var VERSION = true ? "0.1.6" : "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.