@codyswann/lisa 2.104.3 → 2.104.5

package/package.json

@@ -82,7 +82,7 @@
     "lodash": ">=4.18.1"
   },
   "name": "@codyswann/lisa",
-  "version": "2.104.3",
+  "version": "2.104.5",
   "description": "Claude Code governance framework that applies guardrails, guidance, and automated enforcement to projects",
   "main": "dist/index.js",
   "exports": {

package/plugins/lisa/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "lisa",
-  "version": "2.104.3",
+  "version": "2.104.5",
   "description": "Universal governance — agents, skills, commands, hooks, and rules for all projects",
   "author": {
     "name": "Cody Swann"

package/plugins/lisa/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "lisa",
-  "version": "2.104.3",
+  "version": "2.104.5",
   "description": "Universal governance: agents, skills, commands, hooks, and rules for all projects.",
   "author": {
     "name": "Cody Swann"

package/plugins/lisa/scripts/automation-status-claude-adapter.mjs

@@ -9,7 +9,7 @@
  * Claude does not expose last-run or failure metadata.
  */
 
-import { compareAutomationContract } from "./automation-status-contract-drift.mjs";
+import { compareAutomationFleet } from "./automation-status-contract-drift.mjs";
 
 const CLAUDE_RUNTIME_LABEL = "Claude /schedule";
 const CLAUDE_ACTIVE_STATUSES = new Set([
@@ -80,11 +80,13 @@ export function inspectClaudeAutomationFleet(input) {
     ["exploratory", []],
   ]);
 
-  for (const expected of expectedFleet.expected) {
-    const comparison = compareAutomationContract({
-      expected,
-      observedAutomations,
-    });
+  const comparisons = compareAutomationFleet({
+    expectedAutomations: expectedFleet.expected,
+    observedAutomations,
+  });
+
+  for (const [index, expected] of expectedFleet.expected.entries()) {
+    const comparison = comparisons[index];
     expectedGroups.get(expected.group)?.push(
       createObservedStatusItem({
         expected,
@@ -175,6 +177,31 @@ export function deriveClaudeObservedCommand(command) {
   return undefined;
 }
 
+/**
+ * Extract the cadence argument from a Claude `/schedule` command string.
+ * Supports quoted (double-quote, single-quote, backtick) and unquoted cadence
+ * values, returning the first matched capture group via {@link firstString}.
+ *
+ * @param {string | undefined} command - The command string to parse
+ * @returns {string | undefined} The extracted cadence, or undefined if not found
+ */
+function extractClaudeScheduleCadence(command) {
+  if (!command) {
+    return undefined;
+  }
+
+  const scheduleLine = command
+    .trim()
+    .match(/^\/schedule\s+(?:"([^"]+)"|'([^']+)'|`([^`]+)`|(\S+))/m);
+
+  return firstString(
+    scheduleLine?.[1],
+    scheduleLine?.[2],
+    scheduleLine?.[3],
+    scheduleLine?.[4]
+  );
+}
+
 function createObservedStatusItem(input) {
   const expected = input.expected;
   const comparison = input.comparison;
@@ -405,7 +432,7 @@ function normalizeClaudeScheduleTextEntry(block) {
 
   const cadenceSource =
     extractField(block, /^(?:Cadence|Schedule):\s*(.+)$/im) ??
-    block.match(/^\/schedule\s+(?:"[^"]+"|'[^']+'|`[^`]+`|\S+)/m)?.[0];
+    extractClaudeScheduleCadence(block);
   const commandSource =
     extractField(block, /^(?:Command|Prompt):\s*(.+)$/im) ??
     extractField(

package/plugins/lisa/scripts/automation-status-codex-adapter.mjs

@@ -14,9 +14,10 @@ import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
 
-import { compareAutomationContract } from "./automation-status-contract-drift.mjs";
+import { compareAutomationFleet } from "./automation-status-contract-drift.mjs";
 
 const CODEx_RUNTIME_LABEL = "Codex automations";
+const RUN_TIMESTAMP_PATTERN = /20\d{2}-\d\d-\d\dT\d\d:\d\d:\d\d(?:\.\d+)?Z/;
 const RUN_FAILURE_PATTERN =
   /\b(failed|failure|errored|error|exception|crash(?:ed)?)\b/i;
 const NEGATED_FAILURE_PATTERN =
@@ -82,11 +83,13 @@ export async function inspectCodexAutomationFleet(input) {
     ["exploratory", []],
   ]);
 
-  for (const expected of expectedFleet.expected) {
-    const comparison = compareAutomationContract({
-      expected,
-      observedAutomations,
-    });
+  const comparisons = compareAutomationFleet({
+    expectedAutomations: expectedFleet.expected,
+    observedAutomations,
+  });
+
+  for (const [index, expected] of expectedFleet.expected.entries()) {
+    const comparison = comparisons[index];
     expectedGroups.get(expected.group)?.push(
       createObservedStatusItem({
         expected,
@@ -211,28 +214,50 @@ export function parseCodexAutomationMemory(memoryContent) {
     };
   }
 
-  const timestampMatch = memoryContent.match(
-    /20\d{2}-\d\d-\d\dT\d\d:\d\d:\d\d(?:\.\d+)?Z/
-  );
   const lines = memoryContent.split(/\r?\n/);
+  const latestBlock = findLatestAutomationMemoryBlock(lines);
   const summaryLine =
-    lines
+    latestBlock.lines
       .find(line => line.startsWith("- "))
       ?.replace(/^- /, "")
       .trim() ?? null;
 
-  const latestBlock = lines.slice(0, 20).join("\n");
+  const latestBlockText = latestBlock.lines.join("\n");
   const lastRunFailed =
-    RUN_FAILURE_PATTERN.test(latestBlock) &&
-    !NEGATED_FAILURE_PATTERN.test(latestBlock);
+    RUN_FAILURE_PATTERN.test(latestBlockText) &&
+    !NEGATED_FAILURE_PATTERN.test(latestBlockText);
 
   return {
-    lastRunAt: timestampMatch?.[0] ?? null,
+    lastRunAt: latestBlock.timestamp,
     lastRunSummary: summaryLine,
     lastRunFailed,
   };
 }
 
+function findLatestAutomationMemoryBlock(lines) {
+  const timestampLines = lines
+    .map((line, index) => ({
+      index,
+      timestamp: line.match(RUN_TIMESTAMP_PATTERN)?.[0] ?? null,
+    }))
+    .filter(entry => entry.timestamp);
+
+  if (timestampLines.length === 0) {
+    return {
+      timestamp: null,
+      lines,
+    };
+  }
+
+  const latest = timestampLines.at(-1);
+  const next = timestampLines.find(entry => entry.index > latest.index);
+
+  return {
+    timestamp: latest.timestamp,
+    lines: lines.slice(latest.index, next?.index),
+  };
+}
+
 async function readCodexAutomation(automationDir) {
   const tomlPath = path.join(automationDir, "automation.toml");
   const memoryPath = path.join(automationDir, "memory.md");

package/plugins/lisa/scripts/automation-status-contract-drift.mjs

@@ -39,6 +39,41 @@ const DRIFT_LABELS = {
  * }} AutomationContractComparison
  */
 
+/**
+ * Compare the expected automation fleet against observed scheduler entries,
+ * consuming each observed automation at most once.
+ *
+ * @param {{
+ *   readonly expectedAutomations: readonly ExpectedAutomationContract[]
+ *   readonly observedAutomations?: readonly ObservedAutomationContract[]
+ * }} input
+ * @returns {readonly AutomationContractComparison[]}
+ */
+export function compareAutomationFleet(input) {
+  const remainingObserved = [...(input.observedAutomations ?? [])];
+
+  return input.expectedAutomations.map(expected => {
+    const observed = findObservedAutomationMatch(
+      expected,
+      remainingObserved,
+      input.expectedAutomations
+    );
+    const comparison = compareAutomationContract({
+      expected,
+      observedAutomation: observed,
+    });
+
+    if (observed) {
+      const index = remainingObserved.indexOf(observed);
+      if (index >= 0) {
+        remainingObserved.splice(index, 1);
+      }
+    }
+
+    return comparison;
+  });
+}
+
 /**
  * Find the best observed scheduler entry for an expected automation contract.
  *
@@ -50,11 +85,13 @@ const DRIFT_LABELS = {
  *
  * @param {ExpectedAutomationContract} expected
  * @param {readonly ObservedAutomationContract[]} observedAutomations
+ * @param {readonly ExpectedAutomationContract[]} expectedAutomations
  * @returns {ObservedAutomationContract | null}
  */
 export function findObservedAutomationMatch(
   expected,
-  observedAutomations = []
+  observedAutomations = [],
+  expectedAutomations = [expected]
 ) {
   const exactId = observedAutomations.find(
     observed => observed.automationId === expected.automationId
@@ -99,6 +136,15 @@ export function findObservedAutomationMatch(
     return exactCommand;
   }
 
+  if (
+    isSharedExpectedCommandToken(
+      expectedCommand.commandToken,
+      expectedAutomations
+    )
+  ) {
+    return null;
+  }
+
   return (
     observedAutomations.find(observed => {
       const observedCommand = normalizeAutomationCommand(
@@ -161,6 +207,24 @@ export function compareAutomationContract(input) {
   };
 }
 
+/**
+ * @param {string} commandToken
+ * @param {readonly ExpectedAutomationContract[]} expectedAutomations
+ * @returns {boolean}
+ */
+function isSharedExpectedCommandToken(commandToken, expectedAutomations) {
+  if (!commandToken) {
+    return false;
+  }
+
+  return (
+    expectedAutomations.filter(expected => {
+      const normalized = normalizeAutomationCommand(expected.expectedCommand);
+      return normalized.commandToken === commandToken;
+    }).length > 1
+  );
+}
+
 /**
  * @param {ExpectedAutomationContract} expected
  * @param {ObservedAutomationContract} observed

package/plugins/lisa/scripts/queue-status-build-readers.mjs

@@ -9,6 +9,7 @@
  */
 
 import { classifyQueueHealth } from "./queue-health-classification.mjs";
+import { resolveBuildLifecycleRoles } from "./queue-contract-resolution.mjs";
 
 export const BUILD_LIFECYCLE_ORDER = [
   "ready",
@@ -60,7 +61,7 @@ const HIGHLIGHT_COPY = {
  * }} input
  */
 export function readGithubBuildQueueSnapshot(input = {}) {
-  const roles = input.roles ?? {};
+  const roles = input.roles ?? resolveBuildLifecycleRoles({}, "github").roles;
   const normalizedItems = (input.issues ?? [])
     .map(issue => normalizeGithubBuildIssue(issue, roles))
     .filter(Boolean);

package/plugins/lisa/scripts/queue-status-prd-readers.mjs

@@ -9,6 +9,7 @@
  */
 
 import { classifyQueueHealth } from "./queue-health-classification.mjs";
+import { resolvePrdLifecycleRoles } from "./queue-contract-resolution.mjs";
 
 export const PRD_LIFECYCLE_ORDER = [
   "draft",
@@ -67,7 +68,7 @@ const HIGHLIGHT_COPY = {
  * }} input
  */
 export function readGithubPrdQueueSnapshot(input = {}) {
-  const roles = input.roles ?? {};
+  const roles = input.roles ?? resolvePrdLifecycleRoles({}, "github").roles;
   const normalizedItems = (input.issues ?? [])
     .map(issue => normalizeGithubPrdIssue(issue, roles))
     .filter(Boolean);

package/plugins/lisa-cdk/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "lisa-cdk",
-  "version": "2.104.3",
+  "version": "2.104.5",
   "description": "AWS CDK-specific plugin",
   "author": {
     "name": "Cody Swann"

package/plugins/lisa-cdk/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "lisa-cdk",
-  "version": "2.104.3",
+  "version": "2.104.5",
   "description": "AWS CDK-specific Lisa plugin.",
   "author": {
     "name": "Cody Swann"

package/plugins/lisa-expo/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "lisa-expo",
-  "version": "2.104.3",
+  "version": "2.104.5",
   "description": "Expo/React Native-specific skills, agents, rules, and MCP servers",
   "author": {
     "name": "Cody Swann"

package/plugins/lisa-expo/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "lisa-expo",
-  "version": "2.104.3",
+  "version": "2.104.5",
   "description": "Expo and React Native-specific skills, agents, rules, and MCP servers.",
   "author": {
     "name": "Cody Swann"

package/plugins/lisa-harper-fabric/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "lisa-harper-fabric",
-  "version": "2.104.3",
+  "version": "2.104.5",
   "description": "Harper/Fabric-specific rules for TypeScript component apps",
   "author": {
     "name": "Cody Swann"

package/plugins/lisa-harper-fabric/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "lisa-harper-fabric",
-  "version": "2.104.3",
+  "version": "2.104.5",
   "description": "Harper/Fabric-specific Lisa rules for TypeScript component apps.",
   "author": {
     "name": "Cody Swann"

package/plugins/lisa-nestjs/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "lisa-nestjs",
-  "version": "2.104.3",
+  "version": "2.104.5",
   "description": "NestJS-specific skills (GraphQL, TypeORM) and hooks (migration write-protection)",
   "author": {
     "name": "Cody Swann"

package/plugins/lisa-nestjs/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "lisa-nestjs",
-  "version": "2.104.3",
+  "version": "2.104.5",
   "description": "NestJS-specific skills and migration write-protection hooks.",
   "author": {
     "name": "Cody Swann"

package/plugins/lisa-openclaw/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "lisa-openclaw",
-  "version": "2.104.3",
+  "version": "2.104.5",
   "description": "Connect staff roles to Telegram or Slack via OpenClaw — facilitator/specialist hub-and-spoke routing and repo-coding topics, for Claude Code and Codex",
   "author": {
     "name": "Cody Swann"

package/plugins/lisa-openclaw/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "lisa-openclaw",
-  "version": "2.104.3",
+  "version": "2.104.5",
   "description": "Connect staff roles to Telegram or Slack via OpenClaw — facilitator/specialist hub-and-spoke routing and repo-coding topics, across Claude and Codex.",
   "author": {
     "name": "Cody Swann"

package/plugins/lisa-rails/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "lisa-rails",
-  "version": "2.104.3",
+  "version": "2.104.5",
   "description": "Ruby on Rails-specific hooks — RuboCop linting/formatting and ast-grep scanning on edit",
   "author": {
     "name": "Cody Swann"

package/plugins/lisa-rails/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "lisa-rails",
-  "version": "2.104.3",
+  "version": "2.104.5",
   "description": "Ruby on Rails-specific skills and hooks for RuboCop and ast-grep scanning on edit.",
   "author": {
     "name": "Cody Swann"

package/plugins/lisa-typescript/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "lisa-typescript",
-  "version": "2.104.3",
+  "version": "2.104.5",
   "description": "TypeScript-specific hooks — Prettier formatting, ESLint linting, and ast-grep scanning on edit",
   "author": {
     "name": "Cody Swann"

package/plugins/lisa-typescript/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "lisa-typescript",
-  "version": "2.104.3",
+  "version": "2.104.5",
   "description": "TypeScript-specific hooks for formatting, linting, and ast-grep scanning on edit.",
   "author": {
     "name": "Cody Swann"

package/plugins/lisa-wiki/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "lisa-wiki",
-  "version": "2.104.3",
+  "version": "2.104.5",
   "description": "LLM Wiki — a distributable, git-native markdown knowledge base for Claude Code and Codex",
   "author": {
     "name": "Cody Swann"

package/plugins/lisa-wiki/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "lisa-wiki",
-  "version": "2.104.3",
+  "version": "2.104.5",
   "description": "Distributable LLM Wiki kernel — ingest, query, lint, and maintain a git-native markdown knowledge base across Claude and Codex.",
   "author": {
     "name": "Cody Swann"

package/plugins/src/base/scripts/automation-status-claude-adapter.mjs

@@ -9,7 +9,7 @@
  * Claude does not expose last-run or failure metadata.
  */
 
-import { compareAutomationContract } from "./automation-status-contract-drift.mjs";
+import { compareAutomationFleet } from "./automation-status-contract-drift.mjs";
 
 const CLAUDE_RUNTIME_LABEL = "Claude /schedule";
 const CLAUDE_ACTIVE_STATUSES = new Set([
@@ -80,11 +80,13 @@ export function inspectClaudeAutomationFleet(input) {
     ["exploratory", []],
   ]);
 
-  for (const expected of expectedFleet.expected) {
-    const comparison = compareAutomationContract({
-      expected,
-      observedAutomations,
-    });
+  const comparisons = compareAutomationFleet({
+    expectedAutomations: expectedFleet.expected,
+    observedAutomations,
+  });
+
+  for (const [index, expected] of expectedFleet.expected.entries()) {
+    const comparison = comparisons[index];
     expectedGroups.get(expected.group)?.push(
       createObservedStatusItem({
         expected,
@@ -175,6 +177,31 @@ export function deriveClaudeObservedCommand(command) {
   return undefined;
 }
 
+/**
+ * Extract the cadence argument from a Claude `/schedule` command string.
+ * Supports quoted (double-quote, single-quote, backtick) and unquoted cadence
+ * values, returning the first matched capture group via {@link firstString}.
+ *
+ * @param {string | undefined} command - The command string to parse
+ * @returns {string | undefined} The extracted cadence, or undefined if not found
+ */
+function extractClaudeScheduleCadence(command) {
+  if (!command) {
+    return undefined;
+  }
+
+  const scheduleLine = command
+    .trim()
+    .match(/^\/schedule\s+(?:"([^"]+)"|'([^']+)'|`([^`]+)`|(\S+))/m);
+
+  return firstString(
+    scheduleLine?.[1],
+    scheduleLine?.[2],
+    scheduleLine?.[3],
+    scheduleLine?.[4]
+  );
+}
+
 function createObservedStatusItem(input) {
   const expected = input.expected;
   const comparison = input.comparison;
@@ -405,7 +432,7 @@ function normalizeClaudeScheduleTextEntry(block) {
 
   const cadenceSource =
     extractField(block, /^(?:Cadence|Schedule):\s*(.+)$/im) ??
-    block.match(/^\/schedule\s+(?:"[^"]+"|'[^']+'|`[^`]+`|\S+)/m)?.[0];
+    extractClaudeScheduleCadence(block);
   const commandSource =
     extractField(block, /^(?:Command|Prompt):\s*(.+)$/im) ??
     extractField(

package/plugins/src/base/scripts/automation-status-codex-adapter.mjs

@@ -14,9 +14,10 @@ import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
 
-import { compareAutomationContract } from "./automation-status-contract-drift.mjs";
+import { compareAutomationFleet } from "./automation-status-contract-drift.mjs";
 
 const CODEx_RUNTIME_LABEL = "Codex automations";
+const RUN_TIMESTAMP_PATTERN = /20\d{2}-\d\d-\d\dT\d\d:\d\d:\d\d(?:\.\d+)?Z/;
 const RUN_FAILURE_PATTERN =
   /\b(failed|failure|errored|error|exception|crash(?:ed)?)\b/i;
 const NEGATED_FAILURE_PATTERN =
@@ -82,11 +83,13 @@ export async function inspectCodexAutomationFleet(input) {
     ["exploratory", []],
   ]);
 
-  for (const expected of expectedFleet.expected) {
-    const comparison = compareAutomationContract({
-      expected,
-      observedAutomations,
-    });
+  const comparisons = compareAutomationFleet({
+    expectedAutomations: expectedFleet.expected,
+    observedAutomations,
+  });
+
+  for (const [index, expected] of expectedFleet.expected.entries()) {
+    const comparison = comparisons[index];
     expectedGroups.get(expected.group)?.push(
       createObservedStatusItem({
         expected,
@@ -211,28 +214,50 @@ export function parseCodexAutomationMemory(memoryContent) {
     };
   }
 
-  const timestampMatch = memoryContent.match(
-    /20\d{2}-\d\d-\d\dT\d\d:\d\d:\d\d(?:\.\d+)?Z/
-  );
   const lines = memoryContent.split(/\r?\n/);
+  const latestBlock = findLatestAutomationMemoryBlock(lines);
   const summaryLine =
-    lines
+    latestBlock.lines
       .find(line => line.startsWith("- "))
       ?.replace(/^- /, "")
       .trim() ?? null;
 
-  const latestBlock = lines.slice(0, 20).join("\n");
+  const latestBlockText = latestBlock.lines.join("\n");
   const lastRunFailed =
-    RUN_FAILURE_PATTERN.test(latestBlock) &&
-    !NEGATED_FAILURE_PATTERN.test(latestBlock);
+    RUN_FAILURE_PATTERN.test(latestBlockText) &&
+    !NEGATED_FAILURE_PATTERN.test(latestBlockText);
 
   return {
-    lastRunAt: timestampMatch?.[0] ?? null,
+    lastRunAt: latestBlock.timestamp,
     lastRunSummary: summaryLine,
     lastRunFailed,
   };
 }
 
+function findLatestAutomationMemoryBlock(lines) {
+  const timestampLines = lines
+    .map((line, index) => ({
+      index,
+      timestamp: line.match(RUN_TIMESTAMP_PATTERN)?.[0] ?? null,
+    }))
+    .filter(entry => entry.timestamp);
+
+  if (timestampLines.length === 0) {
+    return {
+      timestamp: null,
+      lines,
+    };
+  }
+
+  const latest = timestampLines.at(-1);
+  const next = timestampLines.find(entry => entry.index > latest.index);
+
+  return {
+    timestamp: latest.timestamp,
+    lines: lines.slice(latest.index, next?.index),
+  };
+}
+
 async function readCodexAutomation(automationDir) {
   const tomlPath = path.join(automationDir, "automation.toml");
   const memoryPath = path.join(automationDir, "memory.md");

package/plugins/src/base/scripts/automation-status-contract-drift.mjs

@@ -39,6 +39,41 @@ const DRIFT_LABELS = {
  * }} AutomationContractComparison
  */
 
+/**
+ * Compare the expected automation fleet against observed scheduler entries,
+ * consuming each observed automation at most once.
+ *
+ * @param {{
+ *   readonly expectedAutomations: readonly ExpectedAutomationContract[]
+ *   readonly observedAutomations?: readonly ObservedAutomationContract[]
+ * }} input
+ * @returns {readonly AutomationContractComparison[]}
+ */
+export function compareAutomationFleet(input) {
+  const remainingObserved = [...(input.observedAutomations ?? [])];
+
+  return input.expectedAutomations.map(expected => {
+    const observed = findObservedAutomationMatch(
+      expected,
+      remainingObserved,
+      input.expectedAutomations
+    );
+    const comparison = compareAutomationContract({
+      expected,
+      observedAutomation: observed,
+    });
+
+    if (observed) {
+      const index = remainingObserved.indexOf(observed);
+      if (index >= 0) {
+        remainingObserved.splice(index, 1);
+      }
+    }
+
+    return comparison;
+  });
+}
+
 /**
  * Find the best observed scheduler entry for an expected automation contract.
  *
@@ -50,11 +85,13 @@ const DRIFT_LABELS = {
  *
  * @param {ExpectedAutomationContract} expected
  * @param {readonly ObservedAutomationContract[]} observedAutomations
+ * @param {readonly ExpectedAutomationContract[]} expectedAutomations
  * @returns {ObservedAutomationContract | null}
  */
 export function findObservedAutomationMatch(
   expected,
-  observedAutomations = []
+  observedAutomations = [],
+  expectedAutomations = [expected]
 ) {
   const exactId = observedAutomations.find(
     observed => observed.automationId === expected.automationId
@@ -99,6 +136,15 @@ export function findObservedAutomationMatch(
     return exactCommand;
   }
 
+  if (
+    isSharedExpectedCommandToken(
+      expectedCommand.commandToken,
+      expectedAutomations
+    )
+  ) {
+    return null;
+  }
+
   return (
     observedAutomations.find(observed => {
       const observedCommand = normalizeAutomationCommand(
@@ -161,6 +207,24 @@ export function compareAutomationContract(input) {
   };
 }
 
+/**
+ * @param {string} commandToken
+ * @param {readonly ExpectedAutomationContract[]} expectedAutomations
+ * @returns {boolean}
+ */
+function isSharedExpectedCommandToken(commandToken, expectedAutomations) {
+  if (!commandToken) {
+    return false;
+  }
+
+  return (
+    expectedAutomations.filter(expected => {
+      const normalized = normalizeAutomationCommand(expected.expectedCommand);
+      return normalized.commandToken === commandToken;
+    }).length > 1
+  );
+}
+
 /**
  * @param {ExpectedAutomationContract} expected
  * @param {ObservedAutomationContract} observed

package/plugins/src/base/scripts/queue-status-build-readers.mjs

@@ -9,6 +9,7 @@
  */
 
 import { classifyQueueHealth } from "./queue-health-classification.mjs";
+import { resolveBuildLifecycleRoles } from "./queue-contract-resolution.mjs";
 
 export const BUILD_LIFECYCLE_ORDER = [
   "ready",
@@ -60,7 +61,7 @@ const HIGHLIGHT_COPY = {
  * }} input
  */
 export function readGithubBuildQueueSnapshot(input = {}) {
-  const roles = input.roles ?? {};
+  const roles = input.roles ?? resolveBuildLifecycleRoles({}, "github").roles;
   const normalizedItems = (input.issues ?? [])
     .map(issue => normalizeGithubBuildIssue(issue, roles))
     .filter(Boolean);

package/plugins/src/base/scripts/queue-status-prd-readers.mjs

@@ -9,6 +9,7 @@
  */
 
 import { classifyQueueHealth } from "./queue-health-classification.mjs";
+import { resolvePrdLifecycleRoles } from "./queue-contract-resolution.mjs";
 
 export const PRD_LIFECYCLE_ORDER = [
   "draft",
@@ -67,7 +68,7 @@ const HIGHLIGHT_COPY = {
  * }} input
  */
 export function readGithubPrdQueueSnapshot(input = {}) {
-  const roles = input.roles ?? {};
+  const roles = input.roles ?? resolvePrdLifecycleRoles({}, "github").roles;
   const normalizedItems = (input.issues ?? [])
     .map(issue => normalizeGithubPrdIssue(issue, roles))
     .filter(Boolean);