@codyswann/lisa 4.34.18 → 4.34.20

package/plugins/src/base/hooks/parity-safety-net.sh

@@ -162,6 +162,37 @@ describes yours:
 EOF
 )"
 
+# How to preserve uncommitted work before an operation that would discard it.
+#
+# This is appended to the reasons that refuse a discarding operation, and its
+# whole point is what it does NOT say (issue #3722). The obvious advice is
+# "stash it first", and on a single-checkout repository that is fine. Here it
+# is the most dangerous thing an agent can be told: the stash is ONE STACK PER
+# CLONE, shared by every worktree, so with concurrent agents a sibling's push
+# can shift your entry and a sibling's pop can consume it. `lint-staged` pushes
+# one on every commit too, so agent and tooling entries interleave.
+#
+# A remedy fires at the exact moment an agent is holding the work most worth
+# protecting, and a guard's own output reads as authoritative — so pointing it
+# at shared mutable state there is worse than the refusal it accompanies.
+#
+# The patch file is per-worktree: `mktemp` names it, so nothing has to invent a
+# filename, and it lives in this agent's own TMPDIR where no sibling can reach
+# it. Untracked files are unaffected by both refused operations, so `git diff`
+# captures everything at risk.
+PRESERVE_GUIDANCE="$(
+  cat <<'EOF'
+Preserve the work first, per-worktree:
+
+  git diff [-- <path>] > "$(mktemp "${TMPDIR:-/tmp}/lisa-preserve-XXXXXX.patch")"
+
+and restore it later with `git apply <that file>`.
+
+Do NOT reach for `git stash`. One stash stack is shared by every worktree of a
+clone, so a concurrently running agent can consume the entry you just pushed.
+EOF
+)"
+
 # block() prints the reason to stderr (surfaced to the model) and exits 2 so the
 # Bash tool call is denied. $1 = human-readable reason for the block.
 #
@@ -1574,7 +1605,9 @@ done <<<"$push_segments"
 if matches "${GIT_CMD}"'reset\b.*--(hard|merge)\b'; then
   if git rev-parse --is-inside-work-tree >/dev/null 2>&1 \
     && [ -n "$(git status --porcelain 2>/dev/null)" ]; then
-    block "git reset --hard/--merge on a dirty working tree would discard uncommitted changes (stash or commit first)"
+    block "git reset --hard/--merge on a dirty working tree would discard uncommitted changes (commit first, or preserve as below)" "$PRESERVE_GUIDANCE
+
+$DESTRUCTIVE_GUIDANCE"
   fi
 fi
 
@@ -1624,7 +1657,9 @@ if matches "${GIT_CHECKOUT}${GIT_TOKENS}"'--([[:space:]]|$)' \
   || matches "${GIT_CHECKOUT}${GIT_TOKENS}"'(-[[:alnum:]]*f[[:alnum:]]*|--force)([[:space:]]|=|$)' \
   || matches "${GIT_CHECKOUT}"'[[:space:]][^;&|]*--pathspec-from-file' \
   || matches "${GIT_CHECKOUT}"'[[:space:]]+\.(/)?([[:space:]]|$)'; then
-  block "git checkout discarding local changes (--, -f/--force, --pathspec-from-file, or bare .) — use git stash to preserve work first"
+  block "git checkout discarding local changes (--, -f/--force, --pathspec-from-file, or bare .)" "$PRESERVE_GUIDANCE
+
+$DESTRUCTIVE_GUIDANCE"
 fi
 
 # 5. `git switch` discards: `--discard-changes` and its `-f/--force` aliases.

package/scripts/check-plugins-sync.sh

@@ -24,7 +24,9 @@ cd "$ROOT_DIR"
 
 if [ -n "$(git status --porcelain -- plugins/ 2>/dev/null)" ]; then
   echo "✗ plugins/ has uncommitted changes before the sync check could run." >&2
-  echo "  Commit or stash them, then re-run: bun run check:plugins" >&2
+  echo "  Commit them, then re-run: bun run check:plugins" >&2
+  echo "  (To set them aside instead, save a patch under your own TMPDIR — not" >&2
+  echo "   the stash, which is one stack shared by every worktree of a clone.)" >&2
   exit 1
 fi
 
@@ -57,7 +59,9 @@ if [ -f "$MATERIALIZED_MANIFEST" ]; then
       echo "  These are generated by 'bun run build:plugins'. Rebuilding would" >&2
       echo "  overwrite them, so the check refuses rather than discarding an edit" >&2
       echo "  and reporting a clean tree. Edit the canonical source instead, or" >&2
-      echo "  stash, then re-run: bun run check:plugins" >&2
+      echo "  save a patch under your own TMPDIR — not the stash, which is one" >&2
+      echo "  stack shared by every worktree of a clone — then re-run:" >&2
+      echo "  bun run check:plugins" >&2
       exit 1
     fi
   fi