@codyswann/lisa 2.292.0 → 2.293.1

package/all/copy-overwrite/scripts/lisa-work-item.mjs

@@ -76,6 +76,26 @@ function currentBranch() {
   return git(["branch", "--show-current"]);
 }
 
+/**
+ * Branch an in-progress rebase is rewriting, or empty when no rebase is in
+ * progress. During a rebase HEAD is detached, but git records the branch being
+ * rebased in `<rebase-state-dir>/head-name` (issue #1956) — resolved via
+ * `git rev-parse --git-path` so linked worktrees find their private state dir.
+ */
+function rebaseBranch() {
+  for (const stateDir of ["rebase-merge", "rebase-apply"]) {
+    const file = resolve(
+      git(["rev-parse", "--git-path", `${stateDir}/head-name`])
+    );
+    if (!existsSync(file)) continue;
+    const headName = readFileSync(file, "utf8").trim();
+    if (headName.startsWith("refs/heads/")) {
+      return headName.slice("refs/heads/".length);
+    }
+  }
+  return "";
+}
+
 function deepMerge(base, override) {
   if (Array.isArray(base) || Array.isArray(override)) return override;
   if (
@@ -301,7 +321,11 @@ function readState(optional = true) {
 }
 
 function assertStateBranch(state) {
-  const branch = currentBranch();
+  // Mid-rebase HEAD is detached, but the binding must validate against the
+  // branch the rebase is rewriting (its head-name) so rebase picks and
+  // `git rebase --continue` commits are not wedged (issue #1956). A detached
+  // HEAD with NO rebase in progress still fails closed below.
+  const branch = currentBranch() || rebaseBranch();
   if (!branch)
     throw new TrackingError(
       "Cannot use a work-item binding from detached HEAD"
@@ -402,15 +426,24 @@ function namesFrom(value) {
 }
 
 function assertRepoScope(ref, contract, labels, components = []) {
-  const expected = `repo:${contract.identityRepo}`.toLowerCase();
+  // #1957: mirror the intake-side scoping rule uniformly across trackers
+  // (plugins/lisa/rules/reference/config-resolution.md:949,:968): a work item
+  // is repo-scoped by the label `repo:<name>` OR the bare `<name>` label
+  // (Sentry-provenance items carry only the bare repo name). The match is the
+  // exact repo short name, case-insensitive via namesFrom's lowercasing —
+  // never substring or prefix. Jira additionally accepts a component equal to
+  // the bare name.
+  const bare = contract.identityRepo.toLowerCase();
+  const expected = `repo:${bare}`;
   const labelNames = namesFrom(labels);
   const componentNames = namesFrom(components);
   if (
     !labelNames.includes(expected) &&
-    !componentNames.includes(contract.identityRepo.toLowerCase())
+    !labelNames.includes(bare) &&
+    !componentNames.includes(bare)
   ) {
     throw new TrackingError(
-      `Work item ${ref} is not scoped to repository ${contract.identityRepo}; require label ${expected}`
+      `Work item ${ref} is not scoped to repository ${contract.identityRepo}; require label ${expected} or bare label ${bare}`
     );
   }
 }
@@ -888,15 +921,52 @@ function validateCommits(commits) {
   };
 }
 
+/**
+ * Fully qualified remote default-branch ref (e.g. refs/remotes/origin/main),
+ * or undefined when it cannot be resolved offline. Reads the LOCAL
+ * `refs/remotes/<remote>/HEAD` symref only — never the network. Resolution
+ * failure means the exclusion is skipped (fail-safe strict, issue #1956).
+ * Security: only the remote DEFAULT branch is ever excluded — never
+ * `--remotes=<remote>`, whose ref set includes the branch being (force-)pushed
+ * and would let a pusher exempt arbitrary commits.
+ */
+function remoteDefaultRef(remote) {
+  const symref = run(
+    "git",
+    ["symbolic-ref", "--quiet", `refs/remotes/${remote}/HEAD`],
+    { allowFailure: true }
+  );
+  if (symref.status !== 0) return undefined;
+  const target = symref.stdout.trim();
+  if (!target.startsWith(`refs/remotes/${remote}/`)) return undefined;
+  const exists = run("git", ["rev-parse", "-q", "--verify", target], {
+    allowFailure: true,
+  });
+  return exists.status === 0 ? target : undefined;
+}
+
 function parsePushLines(input, remote) {
   const commits = [];
+  // Commits already reachable from the remote default branch are the base's
+  // history (a merge-sync brings them along); excluding them keeps validation
+  // scoped to branch-authored commits (issue #1956).
+  const defaultRef = remoteDefaultRef(remote);
   for (const line of input.trim().split(/\r?\n/).filter(Boolean)) {
     const [, localOid, , remoteOid] = line.trim().split(/\s+/);
     if (!localOid || ZERO_OID.test(localOid)) continue;
     const args =
       remoteOid && !ZERO_OID.test(remoteOid)
-        ? ["rev-list", `${remoteOid}..${localOid}`]
-        : ["rev-list", localOid, "--not", `--remotes=${remote}`];
+        ? [
+            "rev-list",
+            `${remoteOid}..${localOid}`,
+            ...(defaultRef ? ["--not", defaultRef] : []),
+          ]
+        : // New-branch lane: `--remotes=<remote>` is safe HERE because the branch
+          // being pushed has no remote-tracking ref yet — the exclusion set can
+          // only contain refs that already passed validation on earlier pushes.
+          // The existing-branch lane above must NOT use it (its tracking ref is
+          // pusher-controlled); it excludes only the remote default branch.
+          ["rev-list", localOid, "--not", `--remotes=${remote}`];
     commits.push(...git(args).split("\n").filter(Boolean));
   }
   if (commits.length === 0 && input.trim() === "") {

package/dist/core/upstream-evidence-manifest.js

@@ -2,7 +2,7 @@
 /** Generated by scripts/generate-upstream-evidence-manifest.mjs. Do not edit. */
 export const UPSTREAM_EVIDENCE_MANIFEST = Object.freeze({
     "all/copy-contents/gitignore": "06b56376465d5421db55d0b04958bbc79fdbf33b42f0559fe5ef6875ced1160f",
-    "all/copy-overwrite/scripts/lisa-work-item.mjs": "4c263fef48c03b3b6c623ea8a6cd55505bfaf28197e5072226ea35f9f3d26885",
+    "all/copy-overwrite/scripts/lisa-work-item.mjs": "5eb31c284e820a51312d4484f0669128007326af55ee515923fec33700d003a1",
     "all/create-only/.claude/rules/PROJECT_RULES.md": "6e1c7923ad2a15356babc60c97e7f97be728d790af285b6a7cd7d1b4d39cd97f",
     "all/create-only/.lisaignore": "3c9827e7e98daa46510b5357cd6dd9406da1821e64cc46d2eea9f311cd6d06b9",
     "all/create-only/scripts/remote-agent-aws-setup.sh": "7677908a345891810d2104ba8b2fd1a8318bb29c408fb5ce0110d57beef9b556",
@@ -294,7 +294,7 @@ export const UPSTREAM_EVIDENCE_MANIFEST = Object.freeze({
     "plugins/src/base/hooks/install-pkgs.sh": "e9a13faba849a277410dde911ab102ee6f88ef915b33571bb1d4eef904172db5",
     "plugins/src/base/hooks/parity-safety-net-heredoc.py": "c5301958ed8ca29b0de7b8521d299cdbc8c1c402df8d8fada6b5f173b6cf5dbe",
     "plugins/src/base/hooks/parity-safety-net.agy.sh": "ce9bd2b4566ad9147e4ace56434cffbbe87edb4ccbb57549ab3fd9f4c671ced4",
-    "plugins/src/base/hooks/parity-safety-net.sh": "64546813f168fb446f39e34bc674fd3af85b15bd5e7f4f6bf4503463e701a7b9",
+    "plugins/src/base/hooks/parity-safety-net.sh": "b83c5043a0f29b2d8851258acfe6906aab7922cd80f486e25220e55f26a8c0a5",
     "plugins/src/base/hooks/setup-jira-cli.sh": "a675f6b17ce7f0d6b9fb7daeba6d2bc59bcb48ef79b034076ea73b2b1e72ee09",
     "plugins/src/base/hooks/shell-write-nudge.sh": "69839af423f8792b1e52c71097316c3264425553031627c0a2f9409a9d5becd0",
     "plugins/src/base/hooks/threshold-ratchet-compare.mjs": "8bc4b379d7057b2fecf9cb35820c39efad0a65df7df49073786f996cc2a74810",
@@ -426,7 +426,7 @@ export const UPSTREAM_EVIDENCE_MANIFEST = Object.freeze({
     "plugins/src/base/skills/lisa-github-write-issue/SKILL.md": "ee54b3d14cc5dd3a68a8c36590102dd02f49334c9493ad52fa8c7f35157073b1",
     "plugins/src/base/skills/lisa-github-write-prd/SKILL.md": "bc919c52e2f42129d41a3f40279d2def99486ec58bed2dab51ca7166b427a947",
     "plugins/src/base/skills/lisa-health/SKILL.md": "dfdb08a863e78bff42671793dcec29cfae0654db18ebf66a4aa77aeb56ddb775",
-    "plugins/src/base/skills/lisa-implement/SKILL.md": "6271b8c4dd34efb630020a63e03d8df813d4faccb81517dfb3637ef2433d968d",
+    "plugins/src/base/skills/lisa-implement/SKILL.md": "cb3a0587907321301e6662480af0d333aee4a3e0d29e9bdc851c225be2c220d7",
     "plugins/src/base/skills/lisa-improve-code-complexity/SKILL.md": "24ab5b193b409db6ee6bee981a1c0a48d08991782d7846116ad01658c8bc1ae8",
     "plugins/src/base/skills/lisa-improve-harness/SKILL.md": "bafda5d2f9b86c48cd16bf0015528fdf5891675221d662fdc533aaad66aad669",
     "plugins/src/base/skills/lisa-improve-max-lines-per-function/SKILL.md": "95c875950c9848fdaf520a18b9bbb264e33d7347be10170add768e01d9cd8e52",
@@ -480,7 +480,7 @@ export const UPSTREAM_EVIDENCE_MANIFEST = Object.freeze({
     "plugins/src/base/skills/lisa-parity-code-review/SKILL.md": "5805254747c4ed9081fd514236f06e078be86d41694bf74b480bf7592cd58c1f",
     "plugins/src/base/skills/lisa-parity-code-simplifier/SKILL.md": "c721ae772e73abff633c43d93267066afac188e911a77322fbb102db673849d7",
     "plugins/src/base/skills/lisa-parity-coderabbit/SKILL.md": "ae882837d43741293d1b639c4516331fa6124fa1f5da234a74ecb31c5d7e52cd",
-    "plugins/src/base/skills/lisa-parity-safety-net-rules/SKILL.md": "d338796d10498bd660c36f7f66c6b5be54cf7e281d19b9df44b0d2a01e398b68",
+    "plugins/src/base/skills/lisa-parity-safety-net-rules/SKILL.md": "2515b016f3a1c80163aaf097c3f530e884e59e2070d072a6cb5c7b9d2658c946",
     "plugins/src/base/skills/lisa-parity-sentry-sdk-setup/SKILL.md": "ed52b0273f6b535d26d561c80ae6c0bedb84c67fcf4321f688c05fe3ee3af575",
     "plugins/src/base/skills/lisa-parity-sentry-seer/SKILL.md": "f44216fa7c8f0c3c3371c65ff73bbeadd1717579502a5603f16b3b33291cab7a",
     "plugins/src/base/skills/lisa-parity-skill-creator/SKILL.md": "616e0493f75fe92c18137548d7c86a91a9b04d9844ca76fa3f14156e3e7814e5",

package/dist/opencode/plugin-templates/parity-safety-net.sh

@@ -24,6 +24,11 @@
 #     divergence: upstream blocks unconditionally; Lisa allows clean-tree resets.
 #     Residual risk (documented, accepted): the dirty check runs in the hook's
 #     cwd at hook time, so a `cd elsewhere && git reset --hard` evades it.
+#   - `git rebase --abort`/`--quit` while the in-progress rebase holds
+#     human-made conflict resolutions (AUTO_MERGE discriminator; issue #1956).
+#     Clean or untouched rebase state stays abortable; the apply backend and a
+#     missing AUTO_MERGE ref fail closed. Deliberate divergence: upstream
+#     blocks `rebase --abort` unconditionally, which strands agents mid-rebase.
 #   - `git checkout` discards (`--`, `-f/--force`, `--pathspec-from-file`,
 #     bare `.` — the bare-`.` block exceeds upstream)
 #   - `git switch --discard-changes` / `-f/--force`
@@ -312,6 +317,42 @@ if matches "${GIT_CMD}"'reset\b.*--(hard|merge)\b'; then
   fi
 fi
 
+# 3b. `git rebase --abort` / `--quit` ONLY while human/agent conflict
+#     resolutions exist (issue #1956). `--abort` restores the pre-rebase branch
+#     and discards every resolution; `--quit` deletes the rebase bookkeeping
+#     (head-name, todo) while stranding a detached HEAD, making recovery
+#     ambiguous — both are treated the same, conditionally. A rebase state with
+#     nothing human-made in it (a clean-pick wedge, or a conflict stop nobody
+#     has touched) is agent-recoverable, so aborting it stays ALLOWED.
+#     Discriminator (empirical, git 2.53): diff the worktree/index against the
+#     AUTO_MERGE ref (the merge-ort recorded conflicted tree). Abort-safe ⇔
+#     worktree diff is quiet AND (the cached diff is quiet OR unmerged index
+#     entries exist — an untouched conflict stop has unmerged entries that make
+#     the cached diff non-quiet without any human edit). Fail CLOSED on the
+#     rebase-apply backend (no AUTO_MERGE contract) and on a missing AUTO_MERGE
+#     ref while rebase-merge state exists. Same accepted residual risk as
+#     guard 3: the probes run in the hook's cwd at hook time.
+if matches "${GIT_CMD}"'rebase'"${GIT_TOKENS}"'--(abort|quit)([[:space:]]|$)'; then
+  rebase_apply_dir="$(git rev-parse --git-path rebase-apply 2>/dev/null || true)"
+  rebase_merge_dir="$(git rev-parse --git-path rebase-merge 2>/dev/null || true)"
+  if [ -n "$rebase_apply_dir" ] && [ -d "$rebase_apply_dir" ]; then
+    block "git rebase --abort/--quit on an apply-backend rebase cannot prove no conflict resolutions would be lost (fail closed; finish or continue the rebase instead)"
+  fi
+  if [ -n "$rebase_merge_dir" ] && [ -d "$rebase_merge_dir" ]; then
+    if ! git rev-parse -q --verify AUTO_MERGE >/dev/null 2>&1; then
+      block "git rebase --abort/--quit with an unresolvable AUTO_MERGE ref cannot prove no conflict resolutions would be lost (fail closed)"
+    fi
+    if ! git diff --quiet AUTO_MERGE 2>/dev/null; then
+      block "git rebase --abort/--quit would discard conflict resolutions in the working tree (finish resolving and run git rebase --continue instead)"
+    fi
+    unmerged_entries="$(git ls-files -u 2>/dev/null || true)"
+    if [ -z "$unmerged_entries" ] \
+      && ! git diff --cached --quiet AUTO_MERGE 2>/dev/null; then
+      block "git rebase --abort/--quit would discard staged conflict resolutions (finish resolving and run git rebase --continue instead)"
+    fi
+  fi
+fi
+
 # 4. `git checkout` worktree discards: the `--` pathspec form (with or without a
 #    ref), `-f/--force`, `--pathspec-from-file`, and bare `git checkout .`.
 #    Blocking bare `.` exceeds upstream (which allows any single positional) —

package/package.json

@@ -113,7 +113,7 @@
     "brace-expansion": ">=5.0.6"
   },
   "name": "@codyswann/lisa",
-  "version": "2.292.0",
+  "version": "2.293.1",
   "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.292.0",
+  "version": "2.293.1",
   "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.292.0",
+  "version": "2.293.1",
   "description": "Universal governance: agents, skills, commands, hooks, and rules for all projects.",
   "author": {
     "name": "Cody Swann"

package/plugins/lisa/.codex-plugin/skills/lisa-implement/SKILL.md

@@ -95,7 +95,7 @@ Using the general-purpose agent in Team Lead session, **determine the base branc
    - Already on a feature branch with an **open PR** → reuse it. If the PR's base ≠ the resolved base branch, surface the mismatch and re-target only with confirmation — the ticket's environment is the source of truth.
    - Already on a feature branch with **no open PR** → reuse it; its PR base will be the resolved base branch (do not ask the human — the environment determines it).
    - On an **environment / default branch** → check out a feature branch named for this plan (with the work-item ref prefix, per the linkage rules below) **from `origin/<base>`**.
-   - **Rebase the feature branch onto `origin/<base>` and resolve any merge conflicts BEFORE starting work.** If the conflicts cannot be resolved cleanly and safely, create a fix task for the agent team (with the conflicting file list and current merge state) and resolve it before implementation begins — never start work on stale or conflicted code.
+   - **Sync the feature branch onto the latest `origin/<base>` and resolve any merge conflicts BEFORE starting work.** Both sync lanes are sanctioned in a bound worktree: **rebase** (`git rebase origin/<base>` — the commit hooks validate mid-rebase picks against the rebase head-name, so a work-item binding never wedges a rebase) and **merge** (`git merge origin/<base>` — push validation exempts commits already reachable from the remote default branch, while branch-authored commits stay strictly validated; the exemption needs the local `origin/HEAD` symref, so if a hand-added remote fails push validation on foreign commits, run `git remote set-head origin -a` first). Prefer rebase for a linear history; use merge when rewriting pushed history is undesirable. If a rebase goes wrong before anyone has resolved conflicts, `git rebase --abort` is a safe, allowed recovery; once conflict resolutions exist, the safety net blocks abort to protect them — finish resolving and `git rebase --continue` instead. If the conflicts cannot be resolved cleanly and safely, create a fix task for the agent team (with the conflicting file list and current merge state) and resolve it before implementation begins — never start work on stale or conflicted code.
 4. **The PR targets the resolved base branch** — carry it as `target_branch=<base>` into `lisa-git-submit-pr` (Verify flow). `git-submit-pr` already chooses a closing keyword when the base is the production/default branch and a non-closing reference for a non-terminal environment branch. For a bug fixed on a non-integration environment branch, the current flow is not done until the fix is merged and verified there, then forward cherry-picked down to the integration branch via a linked follow-up.
 
 Every Implement run now has a tracker work item. Preserve its canonical identifier for development linkage unconditionally:

package/plugins/lisa/.codex-plugin/skills/lisa-parity-safety-net-rules/SKILL.md

@@ -69,22 +69,27 @@ RULES_FILE="${SAFETY_NET_RULES_FILE:-${CLAUDE_PROJECT_DIR:-$PWD}/.claude/safety-
    (`git push origin +main`) is not blocked — upstream 1.0.6 allows it too.
 4. `git reset --hard` / `git reset --merge` while the working tree is **dirty**
    (would discard work). Clean-tree resets are intentionally allowed.
-5. `git checkout` discards: the `--` pathspec form (with or without a ref),
+5. `git rebase --abort` / `git rebase --quit` while the in-progress rebase
+   holds human-made conflict resolutions (they would be discarded). A clean or
+   untouched rebase state stays abortable — an agent-recoverable wedge; the
+   apply backend and a missing `AUTO_MERGE` ref fail closed. Deliberate
+   divergence: upstream blocks `rebase --abort` unconditionally.
+6. `git checkout` discards: the `--` pathspec form (with or without a ref),
    `-f`/`--force`, `--pathspec-from-file`, and bare `git checkout .`.
    Branch switching and `-b`/`-B` creation stay allowed.
-6. `git switch --discard-changes` / `-f`/`--force`.
-7. `git restore` touching the worktree — only `git restore --staged <path>`
+7. `git switch --discard-changes` / `-f`/`--force`.
+8. `git restore` touching the worktree — only `git restore --staged <path>`
    without `--worktree` is allowed (unstaging is safe).
-8. `git stash drop` / `git stash clear` (push/pop/list/apply stay allowed).
-9. `git clean` with a force flag and no dry-run — `-n`/`--dry-run` anywhere
-   makes it a safe preview.
-10. `git branch -D` (or `-d` combined with `-f`, clustered or split);
+9. `git stash drop` / `git stash clear` (push/pop/list/apply stay allowed).
+10. `git clean` with a force flag and no dry-run — `-n`/`--dry-run` anywhere
+    makes it a safe preview.
+11. `git branch -D` (or `-d` combined with `-f`, clustered or split);
     safe `-d` and rename `-m` stay allowed.
-11. `git tag -d`, `git reflog delete`, `git worktree remove --force`.
-12. Deletion via `find … -delete`, `find … -exec rm -rf`, and `xargs … rm -rf`
+12. `git tag -d`, `git reflog delete`, `git worktree remove --force`.
+13. Deletion via `find … -delete`, `find … -exec rm -rf`, and `xargs … rm -rf`
     (plain non-recursive `rm` on find/xargs output stays allowed).
-13. Disk destroyers: `dd of=/dev/…`, `mkfs … /dev/…`, `shred`.
-14. Destructive SQL — `DROP DATABASE/SCHEMA/TABLE`, `TRUNCATE TABLE`.
+14. Disk destroyers: `dd of=/dev/…`, `mkfs … /dev/…`, `shred`.
+15. Destructive SQL — `DROP DATABASE/SCHEMA/TABLE`, `TRUNCATE TABLE`.
 
 Every git guard sees through leading git **global options** (`-C <path>`,
 `-c <k>=<v>`, `--git-dir[=…]`, `--no-pager`, …), so `git -C /path <destructive>`

package/plugins/lisa/hooks/parity-safety-net.sh

@@ -24,6 +24,11 @@
 #     divergence: upstream blocks unconditionally; Lisa allows clean-tree resets.
 #     Residual risk (documented, accepted): the dirty check runs in the hook's
 #     cwd at hook time, so a `cd elsewhere && git reset --hard` evades it.
+#   - `git rebase --abort`/`--quit` while the in-progress rebase holds
+#     human-made conflict resolutions (AUTO_MERGE discriminator; issue #1956).
+#     Clean or untouched rebase state stays abortable; the apply backend and a
+#     missing AUTO_MERGE ref fail closed. Deliberate divergence: upstream
+#     blocks `rebase --abort` unconditionally, which strands agents mid-rebase.
 #   - `git checkout` discards (`--`, `-f/--force`, `--pathspec-from-file`,
 #     bare `.` — the bare-`.` block exceeds upstream)
 #   - `git switch --discard-changes` / `-f/--force`
@@ -312,6 +317,42 @@ if matches "${GIT_CMD}"'reset\b.*--(hard|merge)\b'; then
   fi
 fi
 
+# 3b. `git rebase --abort` / `--quit` ONLY while human/agent conflict
+#     resolutions exist (issue #1956). `--abort` restores the pre-rebase branch
+#     and discards every resolution; `--quit` deletes the rebase bookkeeping
+#     (head-name, todo) while stranding a detached HEAD, making recovery
+#     ambiguous — both are treated the same, conditionally. A rebase state with
+#     nothing human-made in it (a clean-pick wedge, or a conflict stop nobody
+#     has touched) is agent-recoverable, so aborting it stays ALLOWED.
+#     Discriminator (empirical, git 2.53): diff the worktree/index against the
+#     AUTO_MERGE ref (the merge-ort recorded conflicted tree). Abort-safe ⇔
+#     worktree diff is quiet AND (the cached diff is quiet OR unmerged index
+#     entries exist — an untouched conflict stop has unmerged entries that make
+#     the cached diff non-quiet without any human edit). Fail CLOSED on the
+#     rebase-apply backend (no AUTO_MERGE contract) and on a missing AUTO_MERGE
+#     ref while rebase-merge state exists. Same accepted residual risk as
+#     guard 3: the probes run in the hook's cwd at hook time.
+if matches "${GIT_CMD}"'rebase'"${GIT_TOKENS}"'--(abort|quit)([[:space:]]|$)'; then
+  rebase_apply_dir="$(git rev-parse --git-path rebase-apply 2>/dev/null || true)"
+  rebase_merge_dir="$(git rev-parse --git-path rebase-merge 2>/dev/null || true)"
+  if [ -n "$rebase_apply_dir" ] && [ -d "$rebase_apply_dir" ]; then
+    block "git rebase --abort/--quit on an apply-backend rebase cannot prove no conflict resolutions would be lost (fail closed; finish or continue the rebase instead)"
+  fi
+  if [ -n "$rebase_merge_dir" ] && [ -d "$rebase_merge_dir" ]; then
+    if ! git rev-parse -q --verify AUTO_MERGE >/dev/null 2>&1; then
+      block "git rebase --abort/--quit with an unresolvable AUTO_MERGE ref cannot prove no conflict resolutions would be lost (fail closed)"
+    fi
+    if ! git diff --quiet AUTO_MERGE 2>/dev/null; then
+      block "git rebase --abort/--quit would discard conflict resolutions in the working tree (finish resolving and run git rebase --continue instead)"
+    fi
+    unmerged_entries="$(git ls-files -u 2>/dev/null || true)"
+    if [ -z "$unmerged_entries" ] \
+      && ! git diff --cached --quiet AUTO_MERGE 2>/dev/null; then
+      block "git rebase --abort/--quit would discard staged conflict resolutions (finish resolving and run git rebase --continue instead)"
+    fi
+  fi
+fi
+
 # 4. `git checkout` worktree discards: the `--` pathspec form (with or without a
 #    ref), `-f/--force`, `--pathspec-from-file`, and bare `git checkout .`.
 #    Blocking bare `.` exceeds upstream (which allows any single positional) —

package/plugins/lisa/skills/lisa-implement/SKILL.md

@@ -95,7 +95,7 @@ Using the general-purpose agent in Team Lead session, **determine the base branc
    - Already on a feature branch with an **open PR** → reuse it. If the PR's base ≠ the resolved base branch, surface the mismatch and re-target only with confirmation — the ticket's environment is the source of truth.
    - Already on a feature branch with **no open PR** → reuse it; its PR base will be the resolved base branch (do not ask the human — the environment determines it).
    - On an **environment / default branch** → check out a feature branch named for this plan (with the work-item ref prefix, per the linkage rules below) **from `origin/<base>`**.
-   - **Rebase the feature branch onto `origin/<base>` and resolve any merge conflicts BEFORE starting work.** If the conflicts cannot be resolved cleanly and safely, create a fix task for the agent team (with the conflicting file list and current merge state) and resolve it before implementation begins — never start work on stale or conflicted code.
+   - **Sync the feature branch onto the latest `origin/<base>` and resolve any merge conflicts BEFORE starting work.** Both sync lanes are sanctioned in a bound worktree: **rebase** (`git rebase origin/<base>` — the commit hooks validate mid-rebase picks against the rebase head-name, so a work-item binding never wedges a rebase) and **merge** (`git merge origin/<base>` — push validation exempts commits already reachable from the remote default branch, while branch-authored commits stay strictly validated; the exemption needs the local `origin/HEAD` symref, so if a hand-added remote fails push validation on foreign commits, run `git remote set-head origin -a` first). Prefer rebase for a linear history; use merge when rewriting pushed history is undesirable. If a rebase goes wrong before anyone has resolved conflicts, `git rebase --abort` is a safe, allowed recovery; once conflict resolutions exist, the safety net blocks abort to protect them — finish resolving and `git rebase --continue` instead. If the conflicts cannot be resolved cleanly and safely, create a fix task for the agent team (with the conflicting file list and current merge state) and resolve it before implementation begins — never start work on stale or conflicted code.
 4. **The PR targets the resolved base branch** — carry it as `target_branch=<base>` into `lisa-git-submit-pr` (Verify flow). `git-submit-pr` already chooses a closing keyword when the base is the production/default branch and a non-closing reference for a non-terminal environment branch. For a bug fixed on a non-integration environment branch, the current flow is not done until the fix is merged and verified there, then forward cherry-picked down to the integration branch via a linked follow-up.
 
 Every Implement run now has a tracker work item. Preserve its canonical identifier for development linkage unconditionally:

package/plugins/lisa/skills/lisa-parity-safety-net-rules/SKILL.md

@@ -69,22 +69,27 @@ RULES_FILE="${SAFETY_NET_RULES_FILE:-${CLAUDE_PROJECT_DIR:-$PWD}/.claude/safety-
    (`git push origin +main`) is not blocked — upstream 1.0.6 allows it too.
 4. `git reset --hard` / `git reset --merge` while the working tree is **dirty**
    (would discard work). Clean-tree resets are intentionally allowed.
-5. `git checkout` discards: the `--` pathspec form (with or without a ref),
+5. `git rebase --abort` / `git rebase --quit` while the in-progress rebase
+   holds human-made conflict resolutions (they would be discarded). A clean or
+   untouched rebase state stays abortable — an agent-recoverable wedge; the
+   apply backend and a missing `AUTO_MERGE` ref fail closed. Deliberate
+   divergence: upstream blocks `rebase --abort` unconditionally.
+6. `git checkout` discards: the `--` pathspec form (with or without a ref),
    `-f`/`--force`, `--pathspec-from-file`, and bare `git checkout .`.
    Branch switching and `-b`/`-B` creation stay allowed.
-6. `git switch --discard-changes` / `-f`/`--force`.
-7. `git restore` touching the worktree — only `git restore --staged <path>`
+7. `git switch --discard-changes` / `-f`/`--force`.
+8. `git restore` touching the worktree — only `git restore --staged <path>`
    without `--worktree` is allowed (unstaging is safe).
-8. `git stash drop` / `git stash clear` (push/pop/list/apply stay allowed).
-9. `git clean` with a force flag and no dry-run — `-n`/`--dry-run` anywhere
-   makes it a safe preview.
-10. `git branch -D` (or `-d` combined with `-f`, clustered or split);
+9. `git stash drop` / `git stash clear` (push/pop/list/apply stay allowed).
+10. `git clean` with a force flag and no dry-run — `-n`/`--dry-run` anywhere
+    makes it a safe preview.
+11. `git branch -D` (or `-d` combined with `-f`, clustered or split);
     safe `-d` and rename `-m` stay allowed.
-11. `git tag -d`, `git reflog delete`, `git worktree remove --force`.
-12. Deletion via `find … -delete`, `find … -exec rm -rf`, and `xargs … rm -rf`
+12. `git tag -d`, `git reflog delete`, `git worktree remove --force`.
+13. Deletion via `find … -delete`, `find … -exec rm -rf`, and `xargs … rm -rf`
     (plain non-recursive `rm` on find/xargs output stays allowed).
-13. Disk destroyers: `dd of=/dev/…`, `mkfs … /dev/…`, `shred`.
-14. Destructive SQL — `DROP DATABASE/SCHEMA/TABLE`, `TRUNCATE TABLE`.
+14. Disk destroyers: `dd of=/dev/…`, `mkfs … /dev/…`, `shred`.
+15. Destructive SQL — `DROP DATABASE/SCHEMA/TABLE`, `TRUNCATE TABLE`.
 
 Every git guard sees through leading git **global options** (`-C <path>`,
 `-c <k>=<v>`, `--git-dir[=…]`, `--no-pager`, …), so `git -C /path <destructive>`

package/plugins/lisa-agy/hooks/parity-safety-net.sh

@@ -24,6 +24,11 @@
 #     divergence: upstream blocks unconditionally; Lisa allows clean-tree resets.
 #     Residual risk (documented, accepted): the dirty check runs in the hook's
 #     cwd at hook time, so a `cd elsewhere && git reset --hard` evades it.
+#   - `git rebase --abort`/`--quit` while the in-progress rebase holds
+#     human-made conflict resolutions (AUTO_MERGE discriminator; issue #1956).
+#     Clean or untouched rebase state stays abortable; the apply backend and a
+#     missing AUTO_MERGE ref fail closed. Deliberate divergence: upstream
+#     blocks `rebase --abort` unconditionally, which strands agents mid-rebase.
 #   - `git checkout` discards (`--`, `-f/--force`, `--pathspec-from-file`,
 #     bare `.` — the bare-`.` block exceeds upstream)
 #   - `git switch --discard-changes` / `-f/--force`
@@ -312,6 +317,42 @@ if matches "${GIT_CMD}"'reset\b.*--(hard|merge)\b'; then
   fi
 fi
 
+# 3b. `git rebase --abort` / `--quit` ONLY while human/agent conflict
+#     resolutions exist (issue #1956). `--abort` restores the pre-rebase branch
+#     and discards every resolution; `--quit` deletes the rebase bookkeeping
+#     (head-name, todo) while stranding a detached HEAD, making recovery
+#     ambiguous — both are treated the same, conditionally. A rebase state with
+#     nothing human-made in it (a clean-pick wedge, or a conflict stop nobody
+#     has touched) is agent-recoverable, so aborting it stays ALLOWED.
+#     Discriminator (empirical, git 2.53): diff the worktree/index against the
+#     AUTO_MERGE ref (the merge-ort recorded conflicted tree). Abort-safe ⇔
+#     worktree diff is quiet AND (the cached diff is quiet OR unmerged index
+#     entries exist — an untouched conflict stop has unmerged entries that make
+#     the cached diff non-quiet without any human edit). Fail CLOSED on the
+#     rebase-apply backend (no AUTO_MERGE contract) and on a missing AUTO_MERGE
+#     ref while rebase-merge state exists. Same accepted residual risk as
+#     guard 3: the probes run in the hook's cwd at hook time.
+if matches "${GIT_CMD}"'rebase'"${GIT_TOKENS}"'--(abort|quit)([[:space:]]|$)'; then
+  rebase_apply_dir="$(git rev-parse --git-path rebase-apply 2>/dev/null || true)"
+  rebase_merge_dir="$(git rev-parse --git-path rebase-merge 2>/dev/null || true)"
+  if [ -n "$rebase_apply_dir" ] && [ -d "$rebase_apply_dir" ]; then
+    block "git rebase --abort/--quit on an apply-backend rebase cannot prove no conflict resolutions would be lost (fail closed; finish or continue the rebase instead)"
+  fi
+  if [ -n "$rebase_merge_dir" ] && [ -d "$rebase_merge_dir" ]; then
+    if ! git rev-parse -q --verify AUTO_MERGE >/dev/null 2>&1; then
+      block "git rebase --abort/--quit with an unresolvable AUTO_MERGE ref cannot prove no conflict resolutions would be lost (fail closed)"
+    fi
+    if ! git diff --quiet AUTO_MERGE 2>/dev/null; then
+      block "git rebase --abort/--quit would discard conflict resolutions in the working tree (finish resolving and run git rebase --continue instead)"
+    fi
+    unmerged_entries="$(git ls-files -u 2>/dev/null || true)"
+    if [ -z "$unmerged_entries" ] \
+      && ! git diff --cached --quiet AUTO_MERGE 2>/dev/null; then
+      block "git rebase --abort/--quit would discard staged conflict resolutions (finish resolving and run git rebase --continue instead)"
+    fi
+  fi
+fi
+
 # 4. `git checkout` worktree discards: the `--` pathspec form (with or without a
 #    ref), `-f/--force`, `--pathspec-from-file`, and bare `git checkout .`.
 #    Blocking bare `.` exceeds upstream (which allows any single positional) —

package/plugins/lisa-agy/plugin.json

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

package/plugins/lisa-agy/skills/lisa-implement/SKILL.md

@@ -95,7 +95,7 @@ Using the general-purpose agent in Team Lead session, **determine the base branc
    - Already on a feature branch with an **open PR** → reuse it. If the PR's base ≠ the resolved base branch, surface the mismatch and re-target only with confirmation — the ticket's environment is the source of truth.
    - Already on a feature branch with **no open PR** → reuse it; its PR base will be the resolved base branch (do not ask the human — the environment determines it).
    - On an **environment / default branch** → check out a feature branch named for this plan (with the work-item ref prefix, per the linkage rules below) **from `origin/<base>`**.
-   - **Rebase the feature branch onto `origin/<base>` and resolve any merge conflicts BEFORE starting work.** If the conflicts cannot be resolved cleanly and safely, create a fix task for the agent team (with the conflicting file list and current merge state) and resolve it before implementation begins — never start work on stale or conflicted code.
+   - **Sync the feature branch onto the latest `origin/<base>` and resolve any merge conflicts BEFORE starting work.** Both sync lanes are sanctioned in a bound worktree: **rebase** (`git rebase origin/<base>` — the commit hooks validate mid-rebase picks against the rebase head-name, so a work-item binding never wedges a rebase) and **merge** (`git merge origin/<base>` — push validation exempts commits already reachable from the remote default branch, while branch-authored commits stay strictly validated; the exemption needs the local `origin/HEAD` symref, so if a hand-added remote fails push validation on foreign commits, run `git remote set-head origin -a` first). Prefer rebase for a linear history; use merge when rewriting pushed history is undesirable. If a rebase goes wrong before anyone has resolved conflicts, `git rebase --abort` is a safe, allowed recovery; once conflict resolutions exist, the safety net blocks abort to protect them — finish resolving and `git rebase --continue` instead. If the conflicts cannot be resolved cleanly and safely, create a fix task for the agent team (with the conflicting file list and current merge state) and resolve it before implementation begins — never start work on stale or conflicted code.
 4. **The PR targets the resolved base branch** — carry it as `target_branch=<base>` into `lisa-git-submit-pr` (Verify flow). `git-submit-pr` already chooses a closing keyword when the base is the production/default branch and a non-closing reference for a non-terminal environment branch. For a bug fixed on a non-integration environment branch, the current flow is not done until the fix is merged and verified there, then forward cherry-picked down to the integration branch via a linked follow-up.
 
 Every Implement run now has a tracker work item. Preserve its canonical identifier for development linkage unconditionally:

package/plugins/lisa-agy/skills/lisa-parity-safety-net-rules/SKILL.md

@@ -69,22 +69,27 @@ RULES_FILE="${SAFETY_NET_RULES_FILE:-${CLAUDE_PROJECT_DIR:-$PWD}/.claude/safety-
    (`git push origin +main`) is not blocked — upstream 1.0.6 allows it too.
 4. `git reset --hard` / `git reset --merge` while the working tree is **dirty**
    (would discard work). Clean-tree resets are intentionally allowed.
-5. `git checkout` discards: the `--` pathspec form (with or without a ref),
+5. `git rebase --abort` / `git rebase --quit` while the in-progress rebase
+   holds human-made conflict resolutions (they would be discarded). A clean or
+   untouched rebase state stays abortable — an agent-recoverable wedge; the
+   apply backend and a missing `AUTO_MERGE` ref fail closed. Deliberate
+   divergence: upstream blocks `rebase --abort` unconditionally.
+6. `git checkout` discards: the `--` pathspec form (with or without a ref),
    `-f`/`--force`, `--pathspec-from-file`, and bare `git checkout .`.
    Branch switching and `-b`/`-B` creation stay allowed.
-6. `git switch --discard-changes` / `-f`/`--force`.
-7. `git restore` touching the worktree — only `git restore --staged <path>`
+7. `git switch --discard-changes` / `-f`/`--force`.
+8. `git restore` touching the worktree — only `git restore --staged <path>`
    without `--worktree` is allowed (unstaging is safe).
-8. `git stash drop` / `git stash clear` (push/pop/list/apply stay allowed).
-9. `git clean` with a force flag and no dry-run — `-n`/`--dry-run` anywhere
-   makes it a safe preview.
-10. `git branch -D` (or `-d` combined with `-f`, clustered or split);
+9. `git stash drop` / `git stash clear` (push/pop/list/apply stay allowed).
+10. `git clean` with a force flag and no dry-run — `-n`/`--dry-run` anywhere
+    makes it a safe preview.
+11. `git branch -D` (or `-d` combined with `-f`, clustered or split);
     safe `-d` and rename `-m` stay allowed.
-11. `git tag -d`, `git reflog delete`, `git worktree remove --force`.
-12. Deletion via `find … -delete`, `find … -exec rm -rf`, and `xargs … rm -rf`
+12. `git tag -d`, `git reflog delete`, `git worktree remove --force`.
+13. Deletion via `find … -delete`, `find … -exec rm -rf`, and `xargs … rm -rf`
     (plain non-recursive `rm` on find/xargs output stays allowed).
-13. Disk destroyers: `dd of=/dev/…`, `mkfs … /dev/…`, `shred`.
-14. Destructive SQL — `DROP DATABASE/SCHEMA/TABLE`, `TRUNCATE TABLE`.
+14. Disk destroyers: `dd of=/dev/…`, `mkfs … /dev/…`, `shred`.
+15. Destructive SQL — `DROP DATABASE/SCHEMA/TABLE`, `TRUNCATE TABLE`.
 
 Every git guard sees through leading git **global options** (`-C <path>`,
 `-c <k>=<v>`, `--git-dir[=…]`, `--no-pager`, …), so `git -C /path <destructive>`

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

@@ -1,6 +1,6 @@
 {
   "name": "lisa-cdk",
-  "version": "2.292.0",
+  "version": "2.293.1",
   "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.292.0",
+  "version": "2.293.1",
   "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.292.0",
+  "version": "2.293.1",
   "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.292.0",
+  "version": "2.293.1",
   "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.292.0",
+  "version": "2.293.1",
   "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.292.0",
+  "version": "2.293.1",
   "description": "Universal governance — agents, skills, commands, hooks, and rules for all projects",
   "author": {
     "name": "Cody Swann"