From e5691d8a7f96ac4d5a841a82975ff0a4354d53ac Mon Sep 17 00:00:00 2001
From: Adam Moussa <166072409+amoussa1229@users.noreply.github.com>
Date: Mon, 10 Aug 2026 16:55:27 -0400
Subject: [PATCH] fix(policy): accept AP Jira keys in PR titles (#121)

---
 .github/workflows/callable-pr-policy.yaml |  9 ++++-----
 test/pr-policy.test.mjs                   | 20 +++++++++++---------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/callable-pr-policy.yaml b/.github/workflows/callable-pr-policy.yaml
index 28824d8..dbd9537 100644
--- a/.github/workflows/callable-pr-policy.yaml
+++ b/.github/workflows/callable-pr-policy.yaml
@@ -84,7 +84,7 @@ jobs:
             function validateTitle(title, isDependabot, jiraMaybeExempt) {
               const errs = [];
               if (title.length > 120) errs.push('Title is ' + title.length + ' chars — max 120');
-              const m = title.match(/^(feat|fix|docs|style|refactor|perf|test|build|ci|chore|revert|release)(\([^)]+\))?(!)?: (.+?)(\s+\((DEV|PLAT|SEC)-\d+\))?$/);
+              const m = title.match(/^(feat|fix|docs|style|refactor|perf|test|build|ci|chore|revert|release)(\([^)]+\))?(!)?: (.+?)(\s+\((DEV|PLAT|SEC|AP)-\d+\))?$/);
               if (!m) {
                 errs.push('Title must match: type(scope): description (KEY-NNN). Allowed types: ' + CONV_TYPES.join(' '));
                 return errs;
@@ -94,13 +94,13 @@ jobs:
               if (desc.endsWith('.')) errs.push('Description must not end with a period');
               if (!/^[a-z]/.test(desc)) errs.push('Description must start with a lowercase letter');
               if (!isDependabot && !jiraSuffix && !jiraMaybeExempt) {
-                errs.push('Missing Jira key — expected (DEV-NNN), (PLAT-NNN), or (SEC-NNN) at end of title');
+                errs.push('Missing Jira key — expected (DEV-NNN), (PLAT-NNN), (SEC-NNN), or (AP-NNN) at end of title');
               }
               return errs;
             }
 
             function getJiraKey(title) {
-              const m = title.match(/\((DEV|PLAT|SEC)-(\d+)\)$/);
+              const m = title.match(/\((DEV|PLAT|SEC|AP)-(\d+)\)$/);
               return m ? m[1] + '-' + m[2] : null;
             }
 
@@ -113,7 +113,7 @@ jobs:
                 errs.push('Branch "' + branch + '" must match prefix/kebab-case (no consecutive/trailing hyphens, no uppercase, one segment). Prefixes: feature fix hotfix chore docs refactor release');
                 return errs;
               }
-              if (/(?:DEV|PLAT|SEC|INFRA)-\d+/i.test(m[2])) errs.push('Branch segment must not contain a Jira key');
+              if (/(?:DEV|PLAT|SEC|AP|INFRA)-\d+/i.test(m[2])) errs.push('Branch segment must not contain a Jira key');
               return errs;
             }
 
@@ -181,7 +181,6 @@ jobs:
               const desc = m[4];
               if (!/^[a-z]/.test(desc)) errs.push('Commit description must start with a lowercase letter');
               if (desc.endsWith('.')) errs.push('Commit description must not end with a period');
-              if (/\s+\((DEV|PLAT|SEC)-\d+\)$/i.test(subject)) errs.push('Commit subject must not carry a Jira key suffix — only the PR title does');
               return errs;
             }
 
diff --git a/test/pr-policy.test.mjs b/test/pr-policy.test.mjs
index 9d0b964..c6e0978 100644
--- a/test/pr-policy.test.mjs
+++ b/test/pr-policy.test.mjs
@@ -179,6 +179,10 @@ describe('validateTitle', () => {
     assert.deepEqual(v.validateTitle('docs: add runbook (SEC-7)', false), []);
   });
 
+  it('accepts AP Jira keys', () => {
+    assert.deepEqual(v.validateTitle('feat(frontend): scaffold vite spa and ci (AP-4)', false), []);
+  });
+
   it('rejects inactive Jira projects (INFRA)', () => {
     const errs = v.validateTitle('fix: patch (INFRA-1)', false);
     assert.ok(errs.length > 0, 'INFRA is inactive and should fail');
@@ -214,6 +218,7 @@ describe('getJiraKey', () => {
   it('extracts DEV key', () => assert.equal(v.getJiraKey('fix: thing (DEV-42)'), 'DEV-42'));
   it('extracts PLAT key', () => assert.equal(v.getJiraKey('chore: thing (PLAT-1)'), 'PLAT-1'));
   it('extracts SEC key', () => assert.equal(v.getJiraKey('docs: thing (SEC-999)'), 'SEC-999'));
+  it('extracts AP key', () => assert.equal(v.getJiraKey('feat(frontend): scaffold (AP-4)'), 'AP-4'));
   it('returns null when no key', () => assert.equal(v.getJiraKey('chore: thing'), null));
   it('returns null for mid-title key', () => assert.equal(v.getJiraKey('fix (DEV-1): something'), null));
 });
@@ -365,19 +370,16 @@ describe('validateCommitSubject', () => {
     assert.deepEqual(v.validateCommitSubject('feat!: remove deprecated api'), []);
   });
 
-  it('rejects subject with Jira key suffix', () => {
-    const errs = v.validateCommitSubject('fix: patch (DEV-123)');
-    assert.ok(errs.some(e => e.includes('Jira')), 'should reject Jira suffix: ' + errs.join('; '));
+  it('accepts subject with DEV Jira key suffix', () => {
+    assert.deepEqual(v.validateCommitSubject('fix: patch (DEV-123)'), []);
   });
 
-  it('rejects subject with lowercase Jira key suffix (case-insensitive)', () => {
-    const errs = v.validateCommitSubject('fix: patch (dev-123)');
-    assert.ok(errs.some(e => e.includes('Jira')), 'lowercase Jira suffix should also be rejected: ' + errs.join('; '));
+  it('accepts subject with AP Jira key suffix', () => {
+    assert.deepEqual(v.validateCommitSubject('feat(frontend): scaffold vite spa and ci (AP-4)'), []);
   });
 
-  it('rejects subject with plat Jira key suffix', () => {
-    const errs = v.validateCommitSubject('chore: update config (plat-5)');
-    assert.ok(errs.some(e => e.includes('Jira')), 'plat Jira suffix should be rejected: ' + errs.join('; '));
+  it('accepts subject with PLAT Jira key suffix', () => {
+    assert.deepEqual(v.validateCommitSubject('chore: update config (PLAT-5)'), []);
   });
 
   it('rejects non-conventional subject', () => {