specweave 1.0.372 → 1.0.374

package/plugins/specweave-github/lib/github-ac-comment-poster.js

@@ -89,17 +89,34 @@ async function parseIssueLinks(specPath) {
   }
   return links;
 }
+function parseUSIdParts(usId) {
+  const compoundMatch = usId.match(/^US-([A-Z]+)-(\d+)$/);
+  if (compoundMatch) {
+    return { prefix: compoundMatch[1], num: parseInt(compoundMatch[2], 10) };
+  }
+  const simpleMatch = usId.match(/^US-(\d+)$/);
+  if (simpleMatch) {
+    return { num: parseInt(simpleMatch[1], 10) };
+  }
+  const fallback = usId.match(/(\d+)$/);
+  return { num: fallback ? parseInt(fallback[1], 10) : 0 };
+}
+function buildACPrefix(usId) {
+  const { prefix, num } = parseUSIdParts(usId);
+  return prefix ? `AC-${prefix}-US${num}-` : `AC-US${num}-`;
+}
 function parseACStatesForUS(content, usId) {
   const states = [];
-  const usNum = String(parseInt(usId.replace("US-", ""), 10));
+  const acPrefix = buildACPrefix(usId);
+  const escapedPrefix = acPrefix.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
   const acPattern = new RegExp(
-    `- \\[([ x])\\] (?:\\*\\*)?AC-US${usNum}-(\\d+)(?:\\*\\*)?:\\s*(.+)`,
+    `- \\[([ x])\\] (?:\\*\\*)?${escapedPrefix}(\\d+)(?:\\*\\*)?:\\s*(.+)`,
     "g"
   );
   let match;
   while ((match = acPattern.exec(content)) !== null) {
     states.push({
-      id: `AC-US${usNum}-${match[2]}`,
+      id: `${acPrefix}${match[2]}`,
       description: match[3].trim(),
       completed: match[1] === "x"
     });

package/plugins/specweave-github/lib/github-ac-comment-poster.ts

@@ -174,24 +174,52 @@ async function parseIssueLinks(specPath: string): Promise<Record<string, ParsedU
   return links;
 }
 
+/**
+ * Parse a US ID into parts for AC matching.
+ * US-001 → { prefix: undefined, num: 1 }
+ * US-SPE-001 → { prefix: 'SPE', num: 1 }
+ */
+function parseUSIdParts(usId: string): { prefix?: string; num: number } {
+  const compoundMatch = usId.match(/^US-([A-Z]+)-(\d+)$/);
+  if (compoundMatch) {
+    return { prefix: compoundMatch[1], num: parseInt(compoundMatch[2], 10) };
+  }
+  const simpleMatch = usId.match(/^US-(\d+)$/);
+  if (simpleMatch) {
+    return { num: parseInt(simpleMatch[1], 10) };
+  }
+  const fallback = usId.match(/(\d+)$/);
+  return { num: fallback ? parseInt(fallback[1], 10) : 0 };
+}
+
+/**
+ * Build the AC ID prefix for a given US ID.
+ * US-001 → "AC-US1-", US-SPE-001 → "AC-SPE-US1-"
+ */
+function buildACPrefix(usId: string): string {
+  const { prefix, num } = parseUSIdParts(usId);
+  return prefix ? `AC-${prefix}-US${num}-` : `AC-US${num}-`;
+}
+
 /**
  * Extract AC states for a specific user story from spec.md content.
+ * Supports both simple (AC-US1-01) and compound (AC-SPE-US1-01) AC ID formats.
  */
 function parseACStatesForUS(content: string, usId: string): ParsedACState[] {
   const states: ParsedACState[] = [];
-  // AC IDs use unpadded US number: US-001 → AC-US1-XX
-  const usNum = String(parseInt(usId.replace('US-', ''), 10));
+  const acPrefix = buildACPrefix(usId);
+  const escapedPrefix = acPrefix.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 
-  // Support both bold (**AC-US1-01**:) and plain (AC-US1-01:) formats
+  // Support both bold (**AC-...**:) and plain (AC-...:) formats
   const acPattern = new RegExp(
-    `- \\[([ x])\\] (?:\\*\\*)?AC-US${usNum}-(\\d+)(?:\\*\\*)?:\\s*(.+)`,
+    `- \\[([ x])\\] (?:\\*\\*)?${escapedPrefix}(\\d+)(?:\\*\\*)?:\\s*(.+)`,
     'g',
   );
 
   let match;
   while ((match = acPattern.exec(content)) !== null) {
     states.push({
-      id: `AC-US${usNum}-${match[2]}`,
+      id: `${acPrefix}${match[2]}`,
       description: match[3].trim(),
       completed: match[1] === 'x',
     });