@codyswann/lisa 2.191.1 → 2.191.2

package/package.json

@@ -95,7 +95,7 @@
     "ws": ">=8.20.1"
   },
   "name": "@codyswann/lisa",
-  "version": "2.191.1",
+  "version": "2.191.2",
   "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.191.1",
+  "version": "2.191.2",
   "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.191.1",
+  "version": "2.191.2",
   "description": "Universal governance: agents, skills, commands, hooks, and rules for all projects.",
   "author": {
     "name": "Cody Swann"

package/plugins/lisa/skills/lisa-drive-pr-to-merge/SKILL.md

@@ -38,9 +38,29 @@ Use plain `gh` + `git` so Claude and Codex execute identically.
 
 ## 1. Enable auto-merge
 
+Before enabling auto-merge, capture the live PR head and compare it to
+`verify_commit`:
+
+```bash
+head_sha=$(gh pr view <pr> --json headRefOid -q .headRefOid)
+test "$head_sha" = "<verify_commit>"
+```
+
+If they differ, reset `verify_commit` to the live head only after confirming the
+new head contains the intended fix, or stop and report the mismatch. Never enable
+auto-merge against a stale head you have not verified.
+
 `gh pr merge <pr> --auto --<merge_method>`. Enabling auto-merge is **not terminal**
 — continue the loop below until the PR is actually `MERGED` or `CLOSED`.
 
+If any later step will push commits, temporarily remove the auto-merge latch
+before the push when GitHub exposes that mutation (`disablePullRequestAutoMerge`),
+or otherwise treat the push as a merge race: immediately re-read `headRefOid`,
+reset `verify_commit` to the pushed head, wait until that head's checks have
+started, then re-enable auto-merge. Do not leave auto-merge armed while a
+required fix, CodeRabbit follow-up, generated artifact update, or CI auto-fix is
+still in flight.
+
 - **Capability fallback**: if the repo disallows auto-merge, do not fail. Keep
   watching; once checks are green, the review gate is clear, and `mergeable == MERGEABLE`,
   run `gh pr merge <pr> --<merge_method>` directly.
@@ -99,17 +119,23 @@ surface the file list and merge state.
 ### c. Failing CI / deploy checks (`statusCheckRollup` has FAILURE)
 Inspect the failing check's logs (`gh pr checks <pr>`, `gh run view <run> --log-failed`).
 Fix the underlying code inline — **never lower thresholds, skip tests, or disable
-checks** to force green. Commit, push, resume. When the root cause is an upstream
-Lisa template/postinstall bug rather than this project's code, fix it upstream and
-propagate down rather than patching only here.
+checks** to force green. Before pushing the fix, disarm auto-merge or classify the
+run as race-prone, then after the push re-read the PR head, update `verify_commit`
+to that exact SHA, wait for checks on that head to start, and only then resume
+auto-merge. When the root cause is an upstream Lisa template/postinstall bug
+rather than this project's code, fix it upstream and propagate down rather than
+patching only here.
 
 ### d. Review comments — human and bot (CodeRabbit, etc.)
 Delegate to the `pull-request-review` skill with the PR number. It owns the whole
 comment cycle: fetch every unresolved human + bot thread (with resolution state via
 GraphQL), implement valid feedback (commit + push), reply to invalid feedback, and
 resolve every thread via `resolveReviewThread` so the branch-protection
-thread-resolution gate clears. Do not re-implement that here — it is the single
-source of truth for review-thread handling. When it returns, re-poll and continue.
+thread-resolution gate clears. If that skill needs to push a commit, auto-merge
+must be disabled first when possible; when it returns, re-read `headRefOid`, reset
+`verify_commit` to the returned/pushed head, wait for that head's checks to start,
+then re-enable auto-merge and continue. Do not re-implement review handling here
+— it is the single source of truth for review-thread handling.
 
 ### e. Review gate stall (`reviewDecision == CHANGES_REQUESTED`)
 After the requested changes are addressed and threads resolved, the prior
@@ -138,7 +164,8 @@ git merge-base --is-ancestor <verify_commit> origin/<baseRefName>   # exit 0 = s
 Also confirm the merge commit's parent is your fixed head, not a stale one. If a
 late commit (CI auto-fix, CodeRabbit follow-up) raced past the merge, it did **not**
 ship — fix forward with a new commit/PR and re-drive. Re-confirm after any commit
-that lands while auto-merge is enabled.
+that lands while auto-merge is enabled; a successful merge of an older head is a
+failed drive-to-merge outcome, not a successful closeout.
 
 ## 4. Terminal states
 

package/plugins/lisa-agy/plugin.json

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

package/plugins/lisa-agy/skills/lisa-drive-pr-to-merge/SKILL.md

@@ -38,9 +38,29 @@ Use plain `gh` + `git` so Claude and Codex execute identically.
 
 ## 1. Enable auto-merge
 
+Before enabling auto-merge, capture the live PR head and compare it to
+`verify_commit`:
+
+```bash
+head_sha=$(gh pr view <pr> --json headRefOid -q .headRefOid)
+test "$head_sha" = "<verify_commit>"
+```
+
+If they differ, reset `verify_commit` to the live head only after confirming the
+new head contains the intended fix, or stop and report the mismatch. Never enable
+auto-merge against a stale head you have not verified.
+
 `gh pr merge <pr> --auto --<merge_method>`. Enabling auto-merge is **not terminal**
 — continue the loop below until the PR is actually `MERGED` or `CLOSED`.
 
+If any later step will push commits, temporarily remove the auto-merge latch
+before the push when GitHub exposes that mutation (`disablePullRequestAutoMerge`),
+or otherwise treat the push as a merge race: immediately re-read `headRefOid`,
+reset `verify_commit` to the pushed head, wait until that head's checks have
+started, then re-enable auto-merge. Do not leave auto-merge armed while a
+required fix, CodeRabbit follow-up, generated artifact update, or CI auto-fix is
+still in flight.
+
 - **Capability fallback**: if the repo disallows auto-merge, do not fail. Keep
   watching; once checks are green, the review gate is clear, and `mergeable == MERGEABLE`,
   run `gh pr merge <pr> --<merge_method>` directly.
@@ -99,17 +119,23 @@ surface the file list and merge state.
 ### c. Failing CI / deploy checks (`statusCheckRollup` has FAILURE)
 Inspect the failing check's logs (`gh pr checks <pr>`, `gh run view <run> --log-failed`).
 Fix the underlying code inline — **never lower thresholds, skip tests, or disable
-checks** to force green. Commit, push, resume. When the root cause is an upstream
-Lisa template/postinstall bug rather than this project's code, fix it upstream and
-propagate down rather than patching only here.
+checks** to force green. Before pushing the fix, disarm auto-merge or classify the
+run as race-prone, then after the push re-read the PR head, update `verify_commit`
+to that exact SHA, wait for checks on that head to start, and only then resume
+auto-merge. When the root cause is an upstream Lisa template/postinstall bug
+rather than this project's code, fix it upstream and propagate down rather than
+patching only here.
 
 ### d. Review comments — human and bot (CodeRabbit, etc.)
 Delegate to the `pull-request-review` skill with the PR number. It owns the whole
 comment cycle: fetch every unresolved human + bot thread (with resolution state via
 GraphQL), implement valid feedback (commit + push), reply to invalid feedback, and
 resolve every thread via `resolveReviewThread` so the branch-protection
-thread-resolution gate clears. Do not re-implement that here — it is the single
-source of truth for review-thread handling. When it returns, re-poll and continue.
+thread-resolution gate clears. If that skill needs to push a commit, auto-merge
+must be disabled first when possible; when it returns, re-read `headRefOid`, reset
+`verify_commit` to the returned/pushed head, wait for that head's checks to start,
+then re-enable auto-merge and continue. Do not re-implement review handling here
+— it is the single source of truth for review-thread handling.
 
 ### e. Review gate stall (`reviewDecision == CHANGES_REQUESTED`)
 After the requested changes are addressed and threads resolved, the prior
@@ -138,7 +164,8 @@ git merge-base --is-ancestor <verify_commit> origin/<baseRefName>   # exit 0 = s
 Also confirm the merge commit's parent is your fixed head, not a stale one. If a
 late commit (CI auto-fix, CodeRabbit follow-up) raced past the merge, it did **not**
 ship — fix forward with a new commit/PR and re-drive. Re-confirm after any commit
-that lands while auto-merge is enabled.
+that lands while auto-merge is enabled; a successful merge of an older head is a
+failed drive-to-merge outcome, not a successful closeout.
 
 ## 4. Terminal states
 

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

@@ -1,6 +1,6 @@
 {
   "name": "lisa-cdk",
-  "version": "2.191.1",
+  "version": "2.191.2",
   "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.191.1",
+  "version": "2.191.2",
   "description": "AWS CDK-specific Lisa plugin.",
   "author": {
     "name": "Cody Swann"

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

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

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

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

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

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

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

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

package/plugins/lisa-copilot/skills/lisa-drive-pr-to-merge/SKILL.md

@@ -38,9 +38,29 @@ Use plain `gh` + `git` so Claude and Codex execute identically.
 
 ## 1. Enable auto-merge
 
+Before enabling auto-merge, capture the live PR head and compare it to
+`verify_commit`:
+
+```bash
+head_sha=$(gh pr view <pr> --json headRefOid -q .headRefOid)
+test "$head_sha" = "<verify_commit>"
+```
+
+If they differ, reset `verify_commit` to the live head only after confirming the
+new head contains the intended fix, or stop and report the mismatch. Never enable
+auto-merge against a stale head you have not verified.
+
 `gh pr merge <pr> --auto --<merge_method>`. Enabling auto-merge is **not terminal**
 — continue the loop below until the PR is actually `MERGED` or `CLOSED`.
 
+If any later step will push commits, temporarily remove the auto-merge latch
+before the push when GitHub exposes that mutation (`disablePullRequestAutoMerge`),
+or otherwise treat the push as a merge race: immediately re-read `headRefOid`,
+reset `verify_commit` to the pushed head, wait until that head's checks have
+started, then re-enable auto-merge. Do not leave auto-merge armed while a
+required fix, CodeRabbit follow-up, generated artifact update, or CI auto-fix is
+still in flight.
+
 - **Capability fallback**: if the repo disallows auto-merge, do not fail. Keep
   watching; once checks are green, the review gate is clear, and `mergeable == MERGEABLE`,
   run `gh pr merge <pr> --<merge_method>` directly.
@@ -99,17 +119,23 @@ surface the file list and merge state.
 ### c. Failing CI / deploy checks (`statusCheckRollup` has FAILURE)
 Inspect the failing check's logs (`gh pr checks <pr>`, `gh run view <run> --log-failed`).
 Fix the underlying code inline — **never lower thresholds, skip tests, or disable
-checks** to force green. Commit, push, resume. When the root cause is an upstream
-Lisa template/postinstall bug rather than this project's code, fix it upstream and
-propagate down rather than patching only here.
+checks** to force green. Before pushing the fix, disarm auto-merge or classify the
+run as race-prone, then after the push re-read the PR head, update `verify_commit`
+to that exact SHA, wait for checks on that head to start, and only then resume
+auto-merge. When the root cause is an upstream Lisa template/postinstall bug
+rather than this project's code, fix it upstream and propagate down rather than
+patching only here.
 
 ### d. Review comments — human and bot (CodeRabbit, etc.)
 Delegate to the `pull-request-review` skill with the PR number. It owns the whole
 comment cycle: fetch every unresolved human + bot thread (with resolution state via
 GraphQL), implement valid feedback (commit + push), reply to invalid feedback, and
 resolve every thread via `resolveReviewThread` so the branch-protection
-thread-resolution gate clears. Do not re-implement that here — it is the single
-source of truth for review-thread handling. When it returns, re-poll and continue.
+thread-resolution gate clears. If that skill needs to push a commit, auto-merge
+must be disabled first when possible; when it returns, re-read `headRefOid`, reset
+`verify_commit` to the returned/pushed head, wait for that head's checks to start,
+then re-enable auto-merge and continue. Do not re-implement review handling here
+— it is the single source of truth for review-thread handling.
 
 ### e. Review gate stall (`reviewDecision == CHANGES_REQUESTED`)
 After the requested changes are addressed and threads resolved, the prior
@@ -138,7 +164,8 @@ git merge-base --is-ancestor <verify_commit> origin/<baseRefName>   # exit 0 = s
 Also confirm the merge commit's parent is your fixed head, not a stale one. If a
 late commit (CI auto-fix, CodeRabbit follow-up) raced past the merge, it did **not**
 ship — fix forward with a new commit/PR and re-drive. Re-confirm after any commit
-that lands while auto-merge is enabled.
+that lands while auto-merge is enabled; a successful merge of an older head is a
+failed drive-to-merge outcome, not a successful closeout.
 
 ## 4. Terminal states
 

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

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

package/plugins/lisa-cursor/skills/lisa-drive-pr-to-merge/SKILL.md

@@ -38,9 +38,29 @@ Use plain `gh` + `git` so Claude and Codex execute identically.
 
 ## 1. Enable auto-merge
 
+Before enabling auto-merge, capture the live PR head and compare it to
+`verify_commit`:
+
+```bash
+head_sha=$(gh pr view <pr> --json headRefOid -q .headRefOid)
+test "$head_sha" = "<verify_commit>"
+```
+
+If they differ, reset `verify_commit` to the live head only after confirming the
+new head contains the intended fix, or stop and report the mismatch. Never enable
+auto-merge against a stale head you have not verified.
+
 `gh pr merge <pr> --auto --<merge_method>`. Enabling auto-merge is **not terminal**
 — continue the loop below until the PR is actually `MERGED` or `CLOSED`.
 
+If any later step will push commits, temporarily remove the auto-merge latch
+before the push when GitHub exposes that mutation (`disablePullRequestAutoMerge`),
+or otherwise treat the push as a merge race: immediately re-read `headRefOid`,
+reset `verify_commit` to the pushed head, wait until that head's checks have
+started, then re-enable auto-merge. Do not leave auto-merge armed while a
+required fix, CodeRabbit follow-up, generated artifact update, or CI auto-fix is
+still in flight.
+
 - **Capability fallback**: if the repo disallows auto-merge, do not fail. Keep
   watching; once checks are green, the review gate is clear, and `mergeable == MERGEABLE`,
   run `gh pr merge <pr> --<merge_method>` directly.
@@ -99,17 +119,23 @@ surface the file list and merge state.
 ### c. Failing CI / deploy checks (`statusCheckRollup` has FAILURE)
 Inspect the failing check's logs (`gh pr checks <pr>`, `gh run view <run> --log-failed`).
 Fix the underlying code inline — **never lower thresholds, skip tests, or disable
-checks** to force green. Commit, push, resume. When the root cause is an upstream
-Lisa template/postinstall bug rather than this project's code, fix it upstream and
-propagate down rather than patching only here.
+checks** to force green. Before pushing the fix, disarm auto-merge or classify the
+run as race-prone, then after the push re-read the PR head, update `verify_commit`
+to that exact SHA, wait for checks on that head to start, and only then resume
+auto-merge. When the root cause is an upstream Lisa template/postinstall bug
+rather than this project's code, fix it upstream and propagate down rather than
+patching only here.
 
 ### d. Review comments — human and bot (CodeRabbit, etc.)
 Delegate to the `pull-request-review` skill with the PR number. It owns the whole
 comment cycle: fetch every unresolved human + bot thread (with resolution state via
 GraphQL), implement valid feedback (commit + push), reply to invalid feedback, and
 resolve every thread via `resolveReviewThread` so the branch-protection
-thread-resolution gate clears. Do not re-implement that here — it is the single
-source of truth for review-thread handling. When it returns, re-poll and continue.
+thread-resolution gate clears. If that skill needs to push a commit, auto-merge
+must be disabled first when possible; when it returns, re-read `headRefOid`, reset
+`verify_commit` to the returned/pushed head, wait for that head's checks to start,
+then re-enable auto-merge and continue. Do not re-implement review handling here
+— it is the single source of truth for review-thread handling.
 
 ### e. Review gate stall (`reviewDecision == CHANGES_REQUESTED`)
 After the requested changes are addressed and threads resolved, the prior
@@ -138,7 +164,8 @@ git merge-base --is-ancestor <verify_commit> origin/<baseRefName>   # exit 0 = s
 Also confirm the merge commit's parent is your fixed head, not a stale one. If a
 late commit (CI auto-fix, CodeRabbit follow-up) raced past the merge, it did **not**
 ship — fix forward with a new commit/PR and re-drive. Re-confirm after any commit
-that lands while auto-merge is enabled.
+that lands while auto-merge is enabled; a successful merge of an older head is a
+failed drive-to-merge outcome, not a successful closeout.
 
 ## 4. Terminal states
 

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

@@ -1,6 +1,6 @@
 {
   "name": "lisa-expo",
-  "version": "2.191.1",
+  "version": "2.191.2",
   "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.191.1",
+  "version": "2.191.2",
   "description": "Expo and React Native-specific skills, agents, rules, and MCP servers.",
   "author": {
     "name": "Cody Swann"

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

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

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

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

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

@@ -1,6 +1,6 @@
 {
   "name": "lisa-expo",
-  "version": "2.191.1",
+  "version": "2.191.2",
   "description": "Expo/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.191.1",
+  "version": "2.191.2",
   "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.191.1",
+  "version": "2.191.2",
   "description": "Harper/Fabric-specific Lisa rules for TypeScript component apps.",
   "author": {
     "name": "Cody Swann"

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

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

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

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

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

@@ -1,6 +1,6 @@
 {
   "name": "lisa-harper-fabric",
-  "version": "2.191.1",
+  "version": "2.191.2",
   "description": "Harper/Fabric-specific 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.191.1",
+  "version": "2.191.2",
   "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.191.1",
+  "version": "2.191.2",
   "description": "NestJS-specific skills and migration write-protection hooks.",
   "author": {
     "name": "Cody Swann"

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

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

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

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

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

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

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

@@ -1,6 +1,6 @@
 {
   "name": "lisa-openclaw",
-  "version": "2.191.1",
+  "version": "2.191.2",
   "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.191.1",
+  "version": "2.191.2",
   "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-openclaw-agy/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "lisa-openclaw",
-  "version": "2.191.1",
+  "version": "2.191.2",
   "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-copilot/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "lisa-openclaw",
-  "version": "2.191.1",
+  "version": "2.191.2",
   "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-cursor/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "lisa-openclaw",
-  "version": "2.191.1",
+  "version": "2.191.2",
   "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-phaser/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "lisa-phaser",
-  "version": "2.191.1",
+  "version": "2.191.2",
   "description": "Phaser 4 game-development rules for TypeScript projects",
   "author": {
     "name": "Cody Swann"

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

@@ -1,6 +1,6 @@
 {
   "name": "lisa-phaser",
-  "version": "2.191.1",
+  "version": "2.191.2",
   "description": "Phaser 4 game-development rules for TypeScript projects",
   "author": {
     "name": "Cody Swann"

package/plugins/lisa-phaser-agy/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "lisa-phaser",
-  "version": "2.191.1",
+  "version": "2.191.2",
   "description": "Phaser 4 game-development rules for TypeScript projects",
   "author": {
     "name": "Cody Swann"

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

@@ -1,6 +1,6 @@
 {
   "name": "lisa-phaser",
-  "version": "2.191.1",
+  "version": "2.191.2",
   "description": "Phaser 4 game-development rules for TypeScript projects",
   "author": {
     "name": "Cody Swann"

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

@@ -1,6 +1,6 @@
 {
   "name": "lisa-phaser",
-  "version": "2.191.1",
+  "version": "2.191.2",
   "description": "Phaser 4 game-development rules for TypeScript projects",
   "author": {
     "name": "Cody Swann"

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

@@ -1,6 +1,6 @@
 {
   "name": "lisa-rails",
-  "version": "2.191.1",
+  "version": "2.191.2",
   "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.191.1",
+  "version": "2.191.2",
   "description": "Ruby on Rails-specific skills and hooks for RuboCop and ast-grep scanning on edit.",
   "author": {
     "name": "Cody Swann"

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

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

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

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

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

@@ -1,6 +1,6 @@
 {
   "name": "lisa-rails",
-  "version": "2.191.1",
+  "version": "2.191.2",
   "description": "Ruby on Rails-specific hooks — RuboCop linting/formatting 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.191.1",
+  "version": "2.191.2",
   "description": "TypeScript-specific hooks — Prettier formatting, ESLint linting, ast-grep scanning, and error-suppression blocking on edit",
   "author": {
     "name": "Cody Swann"

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

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

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

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

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

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

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

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

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

@@ -1,6 +1,6 @@
 {
   "name": "lisa-wiki",
-  "version": "2.191.1",
+  "version": "2.191.2",
   "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.191.1",
+  "version": "2.191.2",
   "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/lisa-wiki-agy/plugin.json

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

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

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

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

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

package/plugins/src/base/skills/lisa-drive-pr-to-merge/SKILL.md

@@ -38,9 +38,29 @@ Use plain `gh` + `git` so Claude and Codex execute identically.
 
 ## 1. Enable auto-merge
 
+Before enabling auto-merge, capture the live PR head and compare it to
+`verify_commit`:
+
+```bash
+head_sha=$(gh pr view <pr> --json headRefOid -q .headRefOid)
+test "$head_sha" = "<verify_commit>"
+```
+
+If they differ, reset `verify_commit` to the live head only after confirming the
+new head contains the intended fix, or stop and report the mismatch. Never enable
+auto-merge against a stale head you have not verified.
+
 `gh pr merge <pr> --auto --<merge_method>`. Enabling auto-merge is **not terminal**
 — continue the loop below until the PR is actually `MERGED` or `CLOSED`.
 
+If any later step will push commits, temporarily remove the auto-merge latch
+before the push when GitHub exposes that mutation (`disablePullRequestAutoMerge`),
+or otherwise treat the push as a merge race: immediately re-read `headRefOid`,
+reset `verify_commit` to the pushed head, wait until that head's checks have
+started, then re-enable auto-merge. Do not leave auto-merge armed while a
+required fix, CodeRabbit follow-up, generated artifact update, or CI auto-fix is
+still in flight.
+
 - **Capability fallback**: if the repo disallows auto-merge, do not fail. Keep
   watching; once checks are green, the review gate is clear, and `mergeable == MERGEABLE`,
   run `gh pr merge <pr> --<merge_method>` directly.
@@ -99,17 +119,23 @@ surface the file list and merge state.
 ### c. Failing CI / deploy checks (`statusCheckRollup` has FAILURE)
 Inspect the failing check's logs (`gh pr checks <pr>`, `gh run view <run> --log-failed`).
 Fix the underlying code inline — **never lower thresholds, skip tests, or disable
-checks** to force green. Commit, push, resume. When the root cause is an upstream
-Lisa template/postinstall bug rather than this project's code, fix it upstream and
-propagate down rather than patching only here.
+checks** to force green. Before pushing the fix, disarm auto-merge or classify the
+run as race-prone, then after the push re-read the PR head, update `verify_commit`
+to that exact SHA, wait for checks on that head to start, and only then resume
+auto-merge. When the root cause is an upstream Lisa template/postinstall bug
+rather than this project's code, fix it upstream and propagate down rather than
+patching only here.
 
 ### d. Review comments — human and bot (CodeRabbit, etc.)
 Delegate to the `pull-request-review` skill with the PR number. It owns the whole
 comment cycle: fetch every unresolved human + bot thread (with resolution state via
 GraphQL), implement valid feedback (commit + push), reply to invalid feedback, and
 resolve every thread via `resolveReviewThread` so the branch-protection
-thread-resolution gate clears. Do not re-implement that here — it is the single
-source of truth for review-thread handling. When it returns, re-poll and continue.
+thread-resolution gate clears. If that skill needs to push a commit, auto-merge
+must be disabled first when possible; when it returns, re-read `headRefOid`, reset
+`verify_commit` to the returned/pushed head, wait for that head's checks to start,
+then re-enable auto-merge and continue. Do not re-implement review handling here
+— it is the single source of truth for review-thread handling.
 
 ### e. Review gate stall (`reviewDecision == CHANGES_REQUESTED`)
 After the requested changes are addressed and threads resolved, the prior
@@ -138,7 +164,8 @@ git merge-base --is-ancestor <verify_commit> origin/<baseRefName>   # exit 0 = s
 Also confirm the merge commit's parent is your fixed head, not a stale one. If a
 late commit (CI auto-fix, CodeRabbit follow-up) raced past the merge, it did **not**
 ship — fix forward with a new commit/PR and re-drive. Re-confirm after any commit
-that lands while auto-merge is enabled.
+that lands while auto-merge is enabled; a successful merge of an older head is a
+failed drive-to-merge outcome, not a successful closeout.
 
 ## 4. Terminal states