@wipcomputer/wip-ai-devops-toolbox 1.9.71-alpha.4 → 1.9.71-alpha.6

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Changelog
 
+## 1.9.71-alpha.6 (2026-04-05)
+
+Guard 1.9.72: allow git stash push on main to unblock native untracked-file escape hatch
+
+## 1.9.71-alpha.5 (2026-04-05)
+
+Guard 1.9.72: allow git stash push on main to unblock native untracked-file escape hatch
+
+## 1.9.72-alpha.1 (2026-04-05)
+
+### wip-branch-guard
+
+Allow `git stash push` / `git stash save` / bare `git stash` on main. Stashing is non-destructive (drop/pop/clear remain blocked in DESTRUCTIVE_PATTERNS). This closes the loop where an untracked file in main's working tree blocks `git pull` and every clearing command (rm, mv, git stash, git clean, git reset) is also blocked, leaving no native escape hatch. Agents and humans lost hours to this.
+
+Error message now points at the stash workaround explicitly so future sessions don't loop:
+
+```
+STUCK clearing an untracked file before git pull? Use stash (non-destructive):
+  git stash push -u -- <path>
+  git pull
+  git stash list
+```
+
 ## 1.9.71-alpha.4 (2026-04-04)
 
 Guard: allow cp/mv/mkdir hotfixes to deployed extensions

package/RELEASE-NOTES-v1-9-72-alpha-1.md

@@ -0,0 +1,30 @@
+# v1.9.72-alpha.1
+
+## wip-branch-guard: unblock native escape hatch for clearing untracked files on main
+
+**Problem.** When an untracked file exists in main's working tree (for example, content Parker saved manually before a PR merged, or a deployed artifact the pipeline dropped there), `git pull` refuses to proceed because it would overwrite the untracked file. Every command that could clear the file was blocked by the guard: `rm`, `mv`, `git stash push`, `git clean`, `git reset`, `git restore`. No native escape hatch existed. Agents (and humans) lost hours looping: retry rm, retry mv, tool-swap to Write/Edit to bypass the guard, rationalize, spiral. One session today burned $936 on the loop before the bug was isolated.
+
+**Fix.** Add `git stash push` / `git stash save` / bare `git stash` to `ALLOWED_GIT_PATTERNS`. Stashing is non-destructive because `git stash drop`, `git stash pop`, and `git stash clear` remain in `DESTRUCTIVE_PATTERNS` (blocked on any branch). The stash survives as a safety net; nothing is ever lost.
+
+**New workflow for this failure mode:**
+
+```
+git stash push -u -- path/to/untracked-file    # move untracked file aside
+git pull                                        # pulls cleanly
+git stash list                                  # file preserved in stash
+```
+
+**Error message improvement.** The `WORKFLOW_ON_MAIN` block now includes a concrete, copy-pasteable stash workaround so future sessions don't loop. LLMs and humans both follow concrete commands more reliably than abstract workflow steps.
+
+**Test coverage added.** `test.sh` now asserts `git stash push`, `git stash save`, and bare `git stash` all return `allow`. All 33 tests pass.
+
+## Why this matters
+
+This is the third time in five days that the guard loop has trapped a session. The prior bug files (`ai/product/bugs/guard/2026-04-03--cc-mini--guard-blocks-readonly-bash-loops.md`, `2026-04-05--cc-mini--branch-guard-compaction-loop.md`) document the pattern. This fix closes one specific failure mode (untracked-stub-blocks-pull). Other guard loop failure modes remain and will be addressed separately.
+
+## Files changed
+
+- `tools/wip-branch-guard/guard.mjs`: two new `ALLOWED_GIT_PATTERNS` entries, expanded `WORKFLOW_ON_MAIN` with stash workaround
+- `tools/wip-branch-guard/package.json`: 1.9.71 -> 1.9.72
+- `tools/wip-branch-guard/test.sh`: three new passing test cases
+- `CHANGELOG.md`: entry for 1.9.72-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wipcomputer/wip-ai-devops-toolbox",
-  "version": "1.9.71-alpha.4",
+  "version": "1.9.71-alpha.6",
   "type": "module",
   "description": "The complete AI DevOps toolkit for AI-assisted development teams.",
   "license": "MIT",

package/tools/wip-branch-guard/guard.mjs

@@ -89,6 +89,8 @@ const ALLOWED_GIT_PATTERNS = [
   /\bgit\s+worktree\b/,
   /\bgit\s+stash\s+list\b/,              // read-only, just lists stashes
   /\bgit\s+stash\s+show\b/,              // read-only, just shows stash contents
+  /\bgit\s+stash\s+(push|save)\b/,       // saving to stash is non-destructive; drop/pop/clear blocked in DESTRUCTIVE_PATTERNS
+  /\bgit\s+stash\s*$/,                   // bare "git stash" = "git stash push"; same safety
   /\bgit\s+remote\b/,
   /\bgit\s+describe\b/,
   /\bgit\s+tag\b/,
@@ -156,7 +158,12 @@ Step 6: Back in main repo: git pull
 Step 7: wip-release patch (with RELEASE-NOTES on the branch, not after)
 Step 8: deploy-public.sh to sync public repo
 
-Release notes go ON the feature branch, committed with the code. Not as a separate PR.`.trim();
+Release notes go ON the feature branch, committed with the code. Not as a separate PR.
+
+STUCK clearing an untracked file before git pull? Use stash (non-destructive):
+  git stash push -u -- <path>    # move untracked file aside
+  git pull                       # pulls cleanly
+  git stash list                 # file is preserved in stash, not lost`.trim();
 
 const WORKFLOW_NOT_WORKTREE = `
 You're on a branch but not in a worktree. Use a worktree so the main working tree stays clean.

package/tools/wip-branch-guard/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wipcomputer/wip-branch-guard",
-  "version": "1.9.70",
+  "version": "1.9.72",
   "description": "PreToolUse hook that blocks all writes on main branch. Forces agents to work on branches or worktrees.",
   "type": "module",
   "scripts": {

package/tools/wip-branch-guard/test.sh

@@ -98,6 +98,9 @@ test_case "git checkout branch" allow Bash "git checkout feature-branch"
 test_case "git worktree add" allow Bash "git worktree add .worktrees/repo--branch -b feat"
 test_case "git stash list" allow Bash "git stash list"
 test_case "git stash show" allow Bash "git stash show"
+test_case "git stash push -u" allow Bash "git stash push -u -- path/to/file"
+test_case "git stash save" allow Bash "git stash save 'message'"
+test_case "bare git stash" allow Bash "git stash"
 test_case "git restore --staged" allow Bash "git restore --staged file.txt"
 test_case "ls command" allow Bash "ls -la"
 test_case "grep command" allow Bash "grep -r pattern ."