fix: merging ALWAYS requires user permission, even in bypass mode

Removed all 'auto-merge' language from AGENTS.md, CLAUDE.md, and every
agent config template (.cursorrules, .windsurfrules, copilot-instructions,
CONVENTIONS.md). Merge guard hook no longer respects bypass mode — it
always prompts. Merging is irreversible and must never be autonomous.

Author: vivek7405

AGENTS.md

@@ -65,8 +65,8 @@ using these defaults:**
 |---|---|---|
 | On `main`, need a branch | Auto-create `feature/<task-slug>` | Never pollute main |
 | Parent branch has new commits | Auto-rebase before starting | Avoid conflicts |
-| Ready to merge | Auto-merge (no prompt) | User opted into autonomy |
-| Delete branch after merge? | **Delete** feature/fix branches, **keep** long-lived branches (dev, staging, release/*) | Feature branches are disposable |
+| Ready to merge | **ALWAYS ask user** — merging is never autonomous | Merges are irreversible |
+| Delete branch after merge? | **ALWAYS ask user** — include in the merge prompt | User decides |
 | Commit message | Auto-generate meaningful message | Never ask "what should the message be?" |
 | Tests failing | Fix them, don't ask | User expects working code |
 | Convention violations | Fix them, don't ask | User expects clean code |

CLAUDE.md

@@ -18,7 +18,7 @@ and defines the AI-driven development workflow for the webjs framework itself.
 3. Verify the branch matches the task at hand
 
 **Autonomous mode (sandbox/bypass):** Don't ask questions. Auto-create
-branches, auto-rebase, auto-merge + delete feature branches, auto-generate
+branches, auto-rebase, auto-generate
 commit messages, fix failing tests and violations. Same quality bar.
 
 **Every change to this framework MUST include — automatically, without the

packages/cli/templates/.claude/hooks/guard-main-merge.sh

@@ -22,14 +22,8 @@ if [ -z "$COMMAND" ]; then
   exit 0
 fi
 
-# Respect bypass/dangerous mode.
-SETTINGS="$HOME/.claude/settings.json"
-if [ -f "$SETTINGS" ]; then
-  BYPASS=$(jq -r '.skipDangerousModePermissionPrompt // false' "$SETTINGS" 2>/dev/null)
-  if [ "$BYPASS" = "true" ]; then
-    exit 0
-  fi
-fi
+# Merge guard NEVER respects bypass mode. Merging is irreversible and
+# always requires explicit user approval, regardless of settings.
 
 # Normalize whitespace so multi-line / heredoc commands match the same way.
 NORMALIZED=$(printf '%s' "$COMMAND" | tr -s '[:space:]' ' ')

packages/cli/templates/.cursorrules

@@ -20,7 +20,7 @@ FIRST, before writing any code:
 If running without interactive approval, auto-decide:
 - On main? Auto-create feature/<task-slug> branch
 - Parent has new commits? Auto-rebase before starting
-- Merge? Auto-merge, auto-delete feature/fix branches
+- Merge? ALWAYS ask user — merging is never autonomous, even in bypass mode
 - Commit message? Auto-generate (meaningful, no AI attribution)
 - Tests failing? Fix them. Convention violations? Fix them.
 Quality bar stays the same — just no blocking on questions.

packages/cli/templates/.github/copilot-instructions.md

@@ -16,7 +16,7 @@ FIRST, before writing any code:
 
 If running without interactive approval (sandbox, auto-approve, etc.):
 - On main? Auto-create feature/<task-slug> branch
-- Parent behind? Auto-rebase. Merge? Auto-merge + delete feature branches.
+- Parent behind? Auto-rebase. Merge? ALWAYS ask user — never autonomous.
 - Auto-generate meaningful commit messages. Fix tests and violations.
 
 ## Mandatory workflow

packages/cli/templates/.windsurfrules

@@ -16,7 +16,7 @@ FIRST, before writing any code:
 
 If running without interactive approval, auto-decide:
 - On main? Auto-create feature/<task-slug> branch
-- Parent behind? Auto-rebase. Merge? Auto-merge + delete feature branches.
+- Parent behind? Auto-rebase. Merge? ALWAYS ask user — never autonomous.
 - Auto-generate commit messages. Fix failing tests and violations.
 Quality bar stays the same — no blocking on questions.
 

packages/cli/templates/CONVENTIONS.md

@@ -52,8 +52,8 @@ When running without interactive approval, agents must NOT ask questions.
 Instead, auto-decide using best practices:
 - On `main`? → Auto-create `feature/<task-slug>` branch
 - Parent branch has new commits? → Auto-rebase before starting
-- Ready to merge? → Auto-merge, auto-delete feature/fix branches
-  (keep long-lived branches like dev, staging, release/*)
+- Ready to merge? → **ALWAYS ask user**, even in bypass mode. Merging
+  is never autonomous. Ask: "Merge <branch> into <target>? Delete or keep?"
 - Commit message? → Auto-generate: what changed and why
 - Tests failing? → Fix them, don't report the failure and stop
 - Convention violations? → Fix them silently