@gaia-ai/addon-deployment 0.10.0 → 0.11.0

package/dist/src/deployment.d.ts

@@ -9,10 +9,27 @@ export interface GatherResult {
     }>;
     unresolved: string[];
 }
-/** Deduped GAIA-nnn from a git log, in first-seen order. */
+/**
+ * Deduped ticket identifiers from a git log, in first-seen order — for any
+ * project key, not just `GAIA` (GAIA-392 AC-2).
+ *
+ * The parse admits *keys*, not tokens, in two passes: a key is admitted where
+ * it stands in one of the anchored positions above, and every identifier whose
+ * key was admitted is then collected — anchored or bare.
+ *
+ * The second pass is not optional: of the last 300 commits on `develop` only
+ * two carry a `ref:` trailer, the rest name the ticket in the subject, and a
+ * bare `GAIA-135` in a body is a real reference. What the rule gives up is one
+ * residual case — a delta in which a key appears *only* in bare mid-prose form,
+ * anchored nowhere, yields nothing for that key. That is the deliberate trade:
+ * such a token is indistinguishable from `AC-1` without hardcoding a project
+ * key, which is the defect this replaces. The cheap direction is the other one,
+ * a wrongly admitted key, because it surfaces in `unresolved` rather than as a
+ * wrong ticket.
+ */
 export declare function parseIdentifiers(gitLog: string): string[];
 /**
- * Compute the release batch from a git-log delta: parse GAIA-nnn identifiers and
+ * Compute the release batch from a git-log delta: parse ticket identifiers and
  * resolve each to a ticket. Unresolved identifiers are reported, never fatal
  * (the resolver returning null is not an error) — GAIA-153 AC-2.
  */

package/dist/src/deployment.js

@@ -1,18 +1,79 @@
 import { exec } from '@gaia-ai/core';
-/** Deduped GAIA-nnn from a git log, in first-seen order. */
+/**
+ * An identifier's shape: a project key plus its number. A key is validated as
+ * `/^[A-Z][A-Z0-9]{1,9}$/` and never contains a hyphen (`GaiaProject`), so this
+ * is the whole grammar — and it is also the shape of prose like `AC-1`,
+ * `UTF-8` or `SHA-256`, which is why matching it alone is not enough.
+ */
+const IDENTIFIER = '[A-Z][A-Z0-9]{1,9}-\\d+';
+/**
+ * What may precede a subject: the `%x1e` record separator and the abbreviated
+ * or full commit hash that `gaia deployment tickets` asks `git log` to print in
+ * front of `%s`. Both optional, so a bare subject line anchors too.
+ */
+const SUBJECT_HEAD = '^\\x1e?(?:[0-9a-f]{2,40} )?';
+/**
+ * The three positions in which an identifier can only be a ticket reference,
+ * and which therefore admit its project key:
+ *
+ * 1. the `ref:` trailer the commit convention prescribes — `ref:SHOP-42`;
+ * 2. a conventional-commit scope — `feat(GAIA-134): …`;
+ * 3. the head of a subject line — `GAIA-375: …`, the legacy form 298 of the
+ *    last 300 commits on `develop` use.
+ *
+ * Positions 2 and 3 are deliberately anchored to the head of a line rather than
+ * to "any token before a colon" or "any parenthesised token": a body bullet
+ * `- AC-2: …` and a body line `(AC-5): parent = …` are exactly those two
+ * shapes, and both occur in this repository's real history. Admitting `AC` from
+ * them puts six phantom identifiers into a 300-commit release batch.
+ */
+const ANCHORED = new RegExp([
+    `ref:[ \\t]*(${IDENTIFIER})\\b`,
+    `${SUBJECT_HEAD}[a-z]+!?\\((${IDENTIFIER})\\):`,
+    `${SUBJECT_HEAD}(${IDENTIFIER}):`,
+].join('|'), 'gm');
+/**
+ * Deduped ticket identifiers from a git log, in first-seen order — for any
+ * project key, not just `GAIA` (GAIA-392 AC-2).
+ *
+ * The parse admits *keys*, not tokens, in two passes: a key is admitted where
+ * it stands in one of the anchored positions above, and every identifier whose
+ * key was admitted is then collected — anchored or bare.
+ *
+ * The second pass is not optional: of the last 300 commits on `develop` only
+ * two carry a `ref:` trailer, the rest name the ticket in the subject, and a
+ * bare `GAIA-135` in a body is a real reference. What the rule gives up is one
+ * residual case — a delta in which a key appears *only* in bare mid-prose form,
+ * anchored nowhere, yields nothing for that key. That is the deliberate trade:
+ * such a token is indistinguishable from `AC-1` without hardcoding a project
+ * key, which is the defect this replaces. The cheap direction is the other one,
+ * a wrongly admitted key, because it surfaces in `unresolved` rather than as a
+ * wrong ticket.
+ */
 export function parseIdentifiers(gitLog) {
+    const admitted = new Set();
+    for (const [, trailer, scope, subject] of gitLog.matchAll(ANCHORED)) {
+        const identifier = trailer ?? scope ?? subject;
+        if (identifier !== undefined) {
+            admitted.add(keyOf(identifier));
+        }
+    }
     const seen = new Set();
     const out = [];
-    for (const m of gitLog.matchAll(/\bGAIA-\d+\b/g)) {
-        if (!seen.has(m[0])) {
-            seen.add(m[0]);
-            out.push(m[0]);
+    for (const [identifier] of gitLog.matchAll(new RegExp(`\\b${IDENTIFIER}\\b`, 'g'))) {
+        if (admitted.has(keyOf(identifier)) && !seen.has(identifier)) {
+            seen.add(identifier);
+            out.push(identifier);
         }
     }
     return out;
 }
+/** An identifier's project key — everything left of its `-<number>`. */
+function keyOf(identifier) {
+    return identifier.slice(0, identifier.indexOf('-'));
+}
 /**
- * Compute the release batch from a git-log delta: parse GAIA-nnn identifiers and
+ * Compute the release batch from a git-log delta: parse ticket identifiers and
  * resolve each to a ticket. Unresolved identifiers are reported, never fatal
  * (the resolver returning null is not an error) — GAIA-153 AC-2.
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gaia-ai/addon-deployment",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "description": "GAIA deployment command plugin: `gaia deployment tickets` — the release batch computed from a git-log range.",
   "type": "module",
   "license": "MIT",
@@ -23,7 +23,7 @@
     "commander": "^12.1.0"
   },
   "peerDependencies": {
-    "@gaia-ai/conductor": "^0.10.0",
-    "@gaia-ai/core": "^0.10.0"
+    "@gaia-ai/conductor": "^0.11.0",
+    "@gaia-ai/core": "^0.11.0"
   }
 }