@scotthamilton77/sidekick 0.1.10 → 0.1.12

package/dist/bin.js

@@ -58164,24 +58164,20 @@ var require_staging_paths = __commonJS({
     function getReminderPath(stateDir, sessionId, hookName, reminderName) {
       return (0, node_path_1.join)(getHookDir(stateDir, sessionId, hookName), `${reminderName}.json`);
     }
-    function isValidPathSegment(segment) {
-      if (!segment)
+    function isValidPathSegment(s) {
+      if (s === "")
         return false;
-      if (segment.includes("..") || segment.includes("/") || segment.includes("\\"))
+      if (s === "." || s === "..")
         return false;
-      if (segment.startsWith("."))
+      if (s.includes("/") || s.includes("\\"))
         return false;
-      return true;
+      if ((0, node_path_1.basename)(s) !== s)
+        return false;
+      return /^[a-zA-Z0-9._-]+$/.test(s);
     }
     function validatePathSegment(segment, name) {
-      if (!segment) {
-        throw new Error(`${name} cannot be empty`);
-      }
-      if (segment.includes("..") || segment.includes("/") || segment.includes("\\")) {
-        throw new Error(`Invalid ${name}: path traversal characters not allowed`);
-      }
-      if (segment.startsWith(".")) {
-        throw new Error(`Invalid ${name}: cannot start with '.'`);
+      if (!isValidPathSegment(segment)) {
+        throw new Error(`Invalid ${name}: must be a non-empty alphanumeric string without path separators`);
       }
     }
     exports2.CONSUMED_FILE_PATTERN = /\.\d+\.json$/;
@@ -58287,7 +58283,7 @@ var require_staging_service = __commonJS({
           persistent: data.persistent,
           ...enrichment
         }, { stagingPath: reminderPath });
-        (0, structured_logging_1.logEvent)(this.options.logger, event);
+        (0, structured_logging_1.logEvent)(this.options.logger.child({ context: { sessionId } }), event);
       }
       /**
        * Read a staged reminder.
@@ -71465,7 +71461,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.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.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({
@@ -71682,6 +71678,12 @@ var require_types2 = __commonJS({
       PERSONA_CHANGED: "persona-changed",
       USER_PROFILE: "user-profile"
     };
+    exports2.TOOL_REMINDER_MAP = {
+      build: exports2.ReminderIds.VC_BUILD,
+      typecheck: exports2.ReminderIds.VC_TYPECHECK,
+      test: exports2.ReminderIds.VC_TEST,
+      lint: exports2.ReminderIds.VC_LINT
+    };
     exports2.VC_TOOL_REMINDER_IDS = [
       exports2.ReminderIds.VC_BUILD,
       exports2.ReminderIds.VC_TYPECHECK,
@@ -73691,12 +73693,6 @@ var require_track_verification_tools = __commonJS({
     var types_js_1 = require_types2();
     var state_js_1 = require_state4();
     var FILE_EDIT_TOOLS = ["Write", "Edit", "MultiEdit"];
-    var TOOL_REMINDER_MAP = {
-      build: types_js_1.ReminderIds.VC_BUILD,
-      typecheck: types_js_1.ReminderIds.VC_TYPECHECK,
-      test: types_js_1.ReminderIds.VC_TEST,
-      lint: types_js_1.ReminderIds.VC_LINT
-    };
     var VC_TOOL_NAME_SET = new Set(types_js_1.VC_TOOL_REMINDER_IDS);
     function extractToolInput(event) {
       const entry = event.payload.entry;
@@ -73744,7 +73740,7 @@ var require_track_verification_tools = __commonJS({
       const emittedNotStaged = /* @__PURE__ */ new Set();
       for (const filePath of filePaths) {
         for (const [toolName, toolConfig] of Object.entries(verificationTools)) {
-          const reminderId = TOOL_REMINDER_MAP[toolName];
+          const reminderId = types_js_1.TOOL_REMINDER_MAP[toolName];
           if (!reminderId)
             continue;
           if (!toolConfig.enabled) {
@@ -73853,7 +73849,7 @@ var require_track_verification_tools = __commonJS({
       for (const [toolName, toolConfig] of Object.entries(verificationTools)) {
         if (!toolConfig.enabled)
           continue;
-        const reminderId = TOOL_REMINDER_MAP[toolName];
+        const reminderId = types_js_1.TOOL_REMINDER_MAP[toolName];
         if (!reminderId)
           continue;
         const match = (0, tool_pattern_matcher_js_1.findMatchingPattern)(command, toolConfig.patterns);
@@ -74075,6 +74071,18 @@ var require_unstage_verify_completion = __commonJS({
     var types_js_1 = require_types2();
     var reminder_utils_js_1 = require_reminder_utils();
     var state_js_1 = require_state4();
+    function toolNeedsVerification(toolConfig, state) {
+      if (!toolConfig.enabled)
+        return false;
+      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;
+    }
     function registerUnstageVerifyCompletion(context) {
       if (!(0, types_1.isDaemonContext)(context))
         return;
@@ -74092,8 +74100,10 @@ var require_unstage_verify_completion = __commonJS({
           const sessionId = event.context?.sessionId;
           if (!sessionId) {
             daemonCtx.logger.warn("No sessionId in UserPromptSubmit event");
-            await daemonCtx.staging.deleteReminder("Stop", types_js_1.ReminderIds.VERIFY_COMPLETION);
-            (0, core_1.logEvent)(daemonCtx.logger, events_js_1.ReminderEvents.reminderUnstaged({ sessionId: "" }, { reminderName: types_js_1.ReminderIds.VERIFY_COMPLETION, hookName: "Stop", reason: "no_session_id" }));
+            for (const vcId of types_js_1.ALL_VC_REMINDER_IDS) {
+              await daemonCtx.staging.deleteReminder("Stop", vcId);
+              (0, core_1.logEvent)(daemonCtx.logger, events_js_1.ReminderEvents.reminderUnstaged({ sessionId: "" }, { reminderName: vcId, hookName: "Stop", reason: "no_session_id" }));
+            }
             return;
           }
           const remindersState = (0, state_js_1.createRemindersState)(daemonCtx.stateService);
@@ -74116,19 +74126,7 @@ var require_unstage_verify_completion = __commonJS({
               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;
-              });
+              const hasToolsNeedingVerification = Object.entries(verificationTools).some(([toolName, toolConfig]) => toolNeedsVerification(toolConfig, toolsState[toolName]));
               if (!hasToolsNeedingVerification) {
                 daemonCtx.logger.info("VC unstage: all tools verified, skipping wrapper re-stage", {
                   sessionId,
@@ -74136,6 +74134,28 @@ var require_unstage_verify_completion = __commonJS({
                 });
                 await remindersState.vcUnverified.delete(sessionId);
               } else {
+                for (const [toolName, toolConfig] of Object.entries(verificationTools)) {
+                  if (!toolNeedsVerification(toolConfig, toolsState[toolName]))
+                    continue;
+                  const reminderId = types_js_1.TOOL_REMINDER_MAP[toolName];
+                  if (!reminderId)
+                    continue;
+                  const toolReminder = (0, reminder_utils_js_1.resolveReminder)(reminderId, {
+                    context: {},
+                    assets: daemonCtx.assets
+                  });
+                  if (toolReminder) {
+                    await (0, reminder_utils_js_1.stageReminder)(daemonCtx, "Stop", {
+                      ...toolReminder,
+                      stagedAt: {
+                        timestamp: Date.now(),
+                        turnCount: unverifiedState.setAt.turnCount,
+                        toolsThisTurn: unverifiedState.setAt.toolsThisTurn,
+                        toolCount: unverifiedState.setAt.toolCount
+                      }
+                    });
+                  }
+                }
                 const reminder = (0, reminder_utils_js_1.resolveReminder)(types_js_1.ReminderIds.VERIFY_COMPLETION, {
                   context: {},
                   assets: daemonCtx.assets
@@ -83739,7 +83759,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.10" : "dev";
+    var VERSION = true ? "0.1.12" : "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

@@ -57188,24 +57188,20 @@ var require_staging_paths = __commonJS({
     function getReminderPath(stateDir, sessionId, hookName, reminderName) {
       return (0, node_path_1.join)(getHookDir(stateDir, sessionId, hookName), `${reminderName}.json`);
     }
-    function isValidPathSegment(segment) {
-      if (!segment)
+    function isValidPathSegment(s) {
+      if (s === "")
         return false;
-      if (segment.includes("..") || segment.includes("/") || segment.includes("\\"))
+      if (s === "." || s === "..")
         return false;
-      if (segment.startsWith("."))
+      if (s.includes("/") || s.includes("\\"))
         return false;
-      return true;
+      if ((0, node_path_1.basename)(s) !== s)
+        return false;
+      return /^[a-zA-Z0-9._-]+$/.test(s);
     }
     function validatePathSegment(segment, name) {
-      if (!segment) {
-        throw new Error(`${name} cannot be empty`);
-      }
-      if (segment.includes("..") || segment.includes("/") || segment.includes("\\")) {
-        throw new Error(`Invalid ${name}: path traversal characters not allowed`);
-      }
-      if (segment.startsWith(".")) {
-        throw new Error(`Invalid ${name}: cannot start with '.'`);
+      if (!isValidPathSegment(segment)) {
+        throw new Error(`Invalid ${name}: must be a non-empty alphanumeric string without path separators`);
       }
     }
     exports2.CONSUMED_FILE_PATTERN = /\.\d+\.json$/;
@@ -57311,7 +57307,7 @@ var require_staging_service = __commonJS({
           persistent: data.persistent,
           ...enrichment
         }, { stagingPath: reminderPath });
-        (0, structured_logging_1.logEvent)(this.options.logger, event);
+        (0, structured_logging_1.logEvent)(this.options.logger.child({ context: { sessionId } }), event);
       }
       /**
        * Read a staged reminder.
@@ -70312,7 +70308,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.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.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({
@@ -70529,6 +70525,12 @@ var require_types2 = __commonJS({
       PERSONA_CHANGED: "persona-changed",
       USER_PROFILE: "user-profile"
     };
+    exports2.TOOL_REMINDER_MAP = {
+      build: exports2.ReminderIds.VC_BUILD,
+      typecheck: exports2.ReminderIds.VC_TYPECHECK,
+      test: exports2.ReminderIds.VC_TEST,
+      lint: exports2.ReminderIds.VC_LINT
+    };
     exports2.VC_TOOL_REMINDER_IDS = [
       exports2.ReminderIds.VC_BUILD,
       exports2.ReminderIds.VC_TYPECHECK,
@@ -72538,12 +72540,6 @@ var require_track_verification_tools = __commonJS({
     var types_js_1 = require_types2();
     var state_js_1 = require_state4();
     var FILE_EDIT_TOOLS = ["Write", "Edit", "MultiEdit"];
-    var TOOL_REMINDER_MAP = {
-      build: types_js_1.ReminderIds.VC_BUILD,
-      typecheck: types_js_1.ReminderIds.VC_TYPECHECK,
-      test: types_js_1.ReminderIds.VC_TEST,
-      lint: types_js_1.ReminderIds.VC_LINT
-    };
     var VC_TOOL_NAME_SET = new Set(types_js_1.VC_TOOL_REMINDER_IDS);
     function extractToolInput(event) {
       const entry = event.payload.entry;
@@ -72591,7 +72587,7 @@ var require_track_verification_tools = __commonJS({
       const emittedNotStaged = /* @__PURE__ */ new Set();
       for (const filePath of filePaths) {
         for (const [toolName, toolConfig] of Object.entries(verificationTools)) {
-          const reminderId = TOOL_REMINDER_MAP[toolName];
+          const reminderId = types_js_1.TOOL_REMINDER_MAP[toolName];
           if (!reminderId)
             continue;
           if (!toolConfig.enabled) {
@@ -72700,7 +72696,7 @@ var require_track_verification_tools = __commonJS({
       for (const [toolName, toolConfig] of Object.entries(verificationTools)) {
         if (!toolConfig.enabled)
           continue;
-        const reminderId = TOOL_REMINDER_MAP[toolName];
+        const reminderId = types_js_1.TOOL_REMINDER_MAP[toolName];
         if (!reminderId)
           continue;
         const match = (0, tool_pattern_matcher_js_1.findMatchingPattern)(command, toolConfig.patterns);
@@ -72922,6 +72918,18 @@ var require_unstage_verify_completion = __commonJS({
     var types_js_1 = require_types2();
     var reminder_utils_js_1 = require_reminder_utils();
     var state_js_1 = require_state4();
+    function toolNeedsVerification(toolConfig, state) {
+      if (!toolConfig.enabled)
+        return false;
+      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;
+    }
     function registerUnstageVerifyCompletion(context) {
       if (!(0, types_1.isDaemonContext)(context))
         return;
@@ -72939,8 +72947,10 @@ var require_unstage_verify_completion = __commonJS({
           const sessionId = event.context?.sessionId;
           if (!sessionId) {
             daemonCtx.logger.warn("No sessionId in UserPromptSubmit event");
-            await daemonCtx.staging.deleteReminder("Stop", types_js_1.ReminderIds.VERIFY_COMPLETION);
-            (0, core_1.logEvent)(daemonCtx.logger, events_js_1.ReminderEvents.reminderUnstaged({ sessionId: "" }, { reminderName: types_js_1.ReminderIds.VERIFY_COMPLETION, hookName: "Stop", reason: "no_session_id" }));
+            for (const vcId of types_js_1.ALL_VC_REMINDER_IDS) {
+              await daemonCtx.staging.deleteReminder("Stop", vcId);
+              (0, core_1.logEvent)(daemonCtx.logger, events_js_1.ReminderEvents.reminderUnstaged({ sessionId: "" }, { reminderName: vcId, hookName: "Stop", reason: "no_session_id" }));
+            }
             return;
           }
           const remindersState = (0, state_js_1.createRemindersState)(daemonCtx.stateService);
@@ -72963,19 +72973,7 @@ var require_unstage_verify_completion = __commonJS({
               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;
-              });
+              const hasToolsNeedingVerification = Object.entries(verificationTools).some(([toolName, toolConfig]) => toolNeedsVerification(toolConfig, toolsState[toolName]));
               if (!hasToolsNeedingVerification) {
                 daemonCtx.logger.info("VC unstage: all tools verified, skipping wrapper re-stage", {
                   sessionId,
@@ -72983,6 +72981,28 @@ var require_unstage_verify_completion = __commonJS({
                 });
                 await remindersState.vcUnverified.delete(sessionId);
               } else {
+                for (const [toolName, toolConfig] of Object.entries(verificationTools)) {
+                  if (!toolNeedsVerification(toolConfig, toolsState[toolName]))
+                    continue;
+                  const reminderId = types_js_1.TOOL_REMINDER_MAP[toolName];
+                  if (!reminderId)
+                    continue;
+                  const toolReminder = (0, reminder_utils_js_1.resolveReminder)(reminderId, {
+                    context: {},
+                    assets: daemonCtx.assets
+                  });
+                  if (toolReminder) {
+                    await (0, reminder_utils_js_1.stageReminder)(daemonCtx, "Stop", {
+                      ...toolReminder,
+                      stagedAt: {
+                        timestamp: Date.now(),
+                        turnCount: unverifiedState.setAt.turnCount,
+                        toolsThisTurn: unverifiedState.setAt.toolsThisTurn,
+                        toolCount: unverifiedState.setAt.toolCount
+                      }
+                    });
+                  }
+                }
                 const reminder = (0, reminder_utils_js_1.resolveReminder)(types_js_1.ReminderIds.VERIFY_COMPLETION, {
                   context: {},
                   assets: daemonCtx.assets

package/package.json

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