fix: user code CC tests

Author: AlCalzone

dut/zwave-js/handlers/behaviors/capabilities.ts

@@ -25,8 +25,11 @@ const dutCapabilityResponses: Record<
   CONTROLS_UNLISTED_CCS: "No",
   ALL_DOCUMENTED_AS_CONTROLLED: "Yes",
   PARTIAL_CONTROL_DOCUMENTED: (ctx) => {
-    // Entry Control CC is marked as partial control in the certification portal
-    if (ctx.testName.includes("CCR_EntryControlCC")) {
+    // Entry Control CC and User Code CC is marked as partial control in the certification portal
+    if (
+      ctx.testName.includes("CCR_EntryControlCC") ||
+      ctx.testName.includes("CCR_UserCodeCC")
+    ) {
       return "Yes";
     }
     return "No";
@@ -103,7 +106,9 @@ registerHandler(/.*/, {
       const key: CCCapabilityKey = `${commandClass}:${capabilityId}`;
       const response = ccCapabilityResponses[key];
       if (response !== undefined) {
-        return typeof response === "function" ? response(ctx.message) : response;
+        return typeof response === "function"
+          ? response(ctx.message)
+          : response;
       }
     }
 

dut/zwave-js/handlers/tests/CCR_UserCodeCC_Rev04.ts

@@ -1,6 +1,9 @@
 import { UserIDStatus, KeypadMode } from "zwave-js";
 import { registerHandler } from "../../prompt-handlers.ts";
-import type { SendCommandMessage } from "../../../../src/ctt-message-types.ts";
+import type {
+  SendCommandMessage,
+  QueryUserCodesMessage,
+} from "../../../../src/ctt-message-types.ts";
 
 const statusNameToEnum: Record<string, UserIDStatus> = {
   enabled: UserIDStatus.Enabled,
@@ -69,5 +72,17 @@ registerHandler("CCR_UserCodeCC_Rev04", {
         return true;
       }
     }
+
+    // Handle QUERY_USER_CODES - query specific user codes without full re-interview
+    if (ctx.message?.type === "QUERY_USER_CODES") {
+      const msg = ctx.message as QueryUserCodesMessage;
+      const userCodeCC = node.commandClasses["User Code"];
+
+      // Query each user ID in sequence
+      for (const userId of msg.userIds) {
+        await userCodeCC.get(userId);
+      }
+      return true;
+    }
   },
 });

dut/zwave-js/package-lock.json

@@ -13,7 +13,7 @@
     "@zwave-js/server": "^3.5.0",
     "alcalzone-shared": "^5.0.0",
     "ws": "^8.18.0",
-    "zwave-js": "^15.18.0"
+    "zwave-js": "^15.19.0"
   },
   "devDependencies": {
     "@types/node": "^22.10.2",

dut/zwave-js/package.json

@@ -607,6 +607,15 @@ export interface TriggerReInterviewMessage {
   nodeId: number;
 }
 
+// =============================================================================
+// QUERY_USER_CODES - Query specific user codes without full re-interview
+// =============================================================================
+
+export interface QueryUserCodesMessage {
+  type: "QUERY_USER_CODES";
+  userIds: number[];
+}
+
 // =============================================================================
 // VERIFY_INDICATOR_IDENTIFY - Check if identify event was received
 // =============================================================================
@@ -637,6 +646,7 @@ export type DUTMessage =
   | TrySetConfigParameterMessage
   | ShouldDisregardRecommendationMessage
   | TriggerReInterviewMessage
+  | QueryUserCodesMessage
   | VerifyIndicatorIdentifyMessage;
 
 // =============================================================================

src/ctt-message-types.ts

@@ -18,6 +18,7 @@ import type {
   TrySetConfigParameterMessage,
   ShouldDisregardRecommendationMessage,
   TriggerReInterviewMessage,
+  QueryUserCodesMessage,
   VerifyIndicatorIdentifyMessage,
   OrchestratorState,
   DUTCapabilityId,
@@ -925,6 +926,25 @@ export function parsePrompt(
     return { action: "send_to_dut", message, answer: "Ok" };
   }
 
+  // QUERY_USER_CODES - Request specific user codes without full re-interview
+  // Matches: "trigger an interview...without deleting user codes...User IDs = '1', '50' and '11111'"
+  if (/trigger an interview.+without deleting user codes.+from User IDs/i.test(promptText)) {
+    // Extract all user IDs from the prompt (e.g., '1', '50', '11111')
+    const userIdPattern = /'(\d+)'/g;
+    const userIds: number[] = [];
+    let match;
+    while ((match = userIdPattern.exec(promptText)) !== null) {
+      userIds.push(parseInt(match[1]!));
+    }
+    if (userIds.length > 0) {
+      const message: QueryUserCodesMessage = {
+        type: "QUERY_USER_CODES",
+        userIds,
+      };
+      return { action: "send_to_dut", message, answer: "Ok" };
+    }
+  }
+
   // VERIFY_INDICATOR_IDENTIFY
   if (/did .+ indicator .+ blink \w+ times/i.test(promptText)) {
     const message: VerifyIndicatorIdentifyMessage = {