specweave 1.0.472 → 1.0.474

package/plugins/specweave/hooks/user-prompt-submit.sh

@@ -1,14 +1,10 @@
 #!/bin/bash
 
-# SpecWeave UserPromptSubmit Hook (v1.0.343 - vskill Plugin Installation Fix)
+# SpecWeave UserPromptSubmit Hook (v1.0.533 - Native Plugin Installation)
 # Fires BEFORE user's command executes (prompt-based hook)
 # Purpose: Auto-load plugins, discipline validation, context injection, instant command execution
 #
 # FEATURES:
-# - v1.0.272: VSKILL PLUGIN INSTALL - sw-* plugins now installed via vskill instead of
-#   `claude plugin install`. Includes security scanning (tier1 PASS/CONCERNS/FAIL) and
-#   vskill.lock fast-path for already-installed plugins. Non-specweave plugins (LSP, etc.)
-#   still use `claude plugin install`.
 # - v1.0.201: LSP CLI FALLBACK INSTRUCTIONS - When LSP requested, instruct Claude to use
 #   `specweave lsp` commands instead of Grep. These use TsServerClient for REAL semantic
 #   analysis. Key fix: "find references" now gets semantic refs, not text matches!
@@ -294,11 +290,9 @@ if [[ "$SCOPE_GUARD_RUN" == "true" ]] && command -v jq >/dev/null 2>&1 && comman
       for plugin_key in $POLLUTED_PLUGINS; do
         # Uninstall from user scope
         if timeout 5 claude plugin uninstall "$plugin_key" >/dev/null 2>&1; then
-          # v1.0.272: sw-* plugins reinstall via vskill, LSP plugins via claude CLI
           if [[ "$plugin_key" == sw-*@specweave ]]; then
-            # Extract plugin name from "sw-name@specweave" format
-            _sw_name="${plugin_key%%@*}"
-            if install_plugin_via_vskill "$_sw_name"; then
+            # Reinstall at project scope via native Claude plugin system (v1.0.533)
+            if timeout 10 claude plugin install "$plugin_key" --scope project >/dev/null 2>&1; then
               [[ -n "$MIGRATED" ]] && MIGRATED="$MIGRATED, "
               MIGRATED="${MIGRATED}${plugin_key}"
             fi
@@ -480,71 +474,6 @@ check_plugin_in_vskill_lock() {
   fi
 }
 
-# Helper: Install plugin via vskill (v1.0.272, fixed v1.0.343, v1.0.344: --repo)
-# Uses npx vskill install with --repo anton-abyzov/specweave for sw-* plugins.
-# Args: $1=plugin name (e.g., "sw-github")
-# Returns: 0 if installed successfully, 1 if failed
-# Sets VSKILL_INSTALL_OUTPUT with stdout/stderr for scan result display
-# v1.0.344 (0394): Uses --repo anton-abyzov/specweave instead of local marketplace directory
-install_plugin_via_vskill() {
-  local plugin="$1"
-  VSKILL_INSTALL_OUTPUT=""
-
-  if command -v npx >/dev/null 2>&1; then
-    if command -v timeout >/dev/null 2>&1; then
-      VSKILL_INSTALL_OUTPUT=$(timeout 30 npx vskill install --repo anton-abyzov/specweave --plugin "$plugin" --agent claude-code --force --yes 2>&1) || true
-    else
-      VSKILL_INSTALL_OUTPUT=$(npx vskill install --repo anton-abyzov/specweave --plugin "$plugin" --agent claude-code --force --yes 2>&1) || true
-    fi
-  else
-    VSKILL_INSTALL_OUTPUT="vskill not available (npx not found)"
-    return 1
-  fi
-
-  # Check if install succeeded
-  if echo "$VSKILL_INSTALL_OUTPUT" | grep -qiE "(installed|Installed)"; then
-    return 0
-  else
-    return 1
-  fi
-}
-
-# Domain skill plugins in vskill marketplace (per-category plugins).
-# Each is a standalone plugin: mobile@vskill, skills@vskill.
-# Skills are invoked as plugin:skill (e.g., mobile:react-native).
-# v1.0.397: Reduced to plugins with actual directories on disk. Phantom entries removed.
-VSKILL_REPO_PLUGINS="mobile skills"
-
-# Check if plugin name is a vskill marketplace plugin
-is_vskill_repo_plugin() {
-  local plugin="$1"
-  echo " $VSKILL_REPO_PLUGINS " | grep -q " $plugin "
-}
-
-# Install vskill marketplace plugin via --repo flag. (fixed v1.0.343: add→install)
-# Args: $1=plugin name (e.g., "frontend")
-install_vskill_repo_plugin() {
-  local plugin="$1"
-  VSKILL_INSTALL_OUTPUT=""
-  if command -v npx >/dev/null 2>&1; then
-    if command -v timeout >/dev/null 2>&1; then
-      VSKILL_INSTALL_OUTPUT=$(timeout 30 npx vskill install --repo anton-abyzov/vskill --plugin "$plugin" --agent claude-code --force --yes 2>&1) || true
-    else
-      VSKILL_INSTALL_OUTPUT=$(npx vskill install --repo anton-abyzov/vskill --plugin "$plugin" --agent claude-code --force --yes 2>&1) || true
-    fi
-  else
-    VSKILL_INSTALL_OUTPUT="vskill not available (npx not found)"
-    return 1
-  fi
-
-  # Check if install succeeded
-  if echo "$VSKILL_INSTALL_OUTPUT" | grep -qiE "(installed|Installed)"; then
-    return 0
-  else
-    return 1
-  fi
-}
-
 # Helper: Check if plugin is installed by reading installed_plugins.json (v1.0.175)
 # This is the SOURCE OF TRUTH - more reliable than `claude plugin list` which can have timing issues.
 # Args: $1=plugin name (e.g., "frontend"), $2=marketplace (e.g., "vskill")
@@ -1263,176 +1192,13 @@ if [[ "${SPECWEAVE_DISABLE_AUTO_LOAD:-0}" != "1" ]] && [[ "${SPECWEAVE_DISABLE_H
             fi
 
             # ==================================================================
-            # PLUGIN INSTALLATION/SUGGESTION (from LLM response)
+            # PLUGIN INSTALLATION/SUGGESTION — REMOVED (v1.0.535)
+            # ==================================================================
+            # On-demand plugin installation via `claude plugin install` has been
+            # removed. All plugins are now installed at init time by copying
+            # SKILL.md files directly into .claude/skills/ (project-local).
+            # Use `specweave refresh-plugins` to update plugin skills.
             # ==================================================================
-            if [[ "$PLUGIN_AUTOLOAD_ENABLED" == "true" ]]; then
-              DETECTED_PLUGINS=$(echo "$JSON_OUTPUT" | jq -r '.plugins[]?' 2>/dev/null | tr '\n' ' ')
-
-              if [[ -n "$DETECTED_PLUGINS" ]]; then
-                # v1.0.158/v1.0.397: SUGGEST-ONLY MODE (now the default) - suggest with install commands, don't auto-install
-                if [[ "$PLUGIN_SUGGEST_ONLY" == "true" ]]; then
-                  SUGGEST_CMDS=""
-                  for plugin in $DETECTED_PLUGINS; do
-                    [[ -z "$plugin" ]] && continue
-                    if [[ "$plugin" == sw-* ]] || [[ "$plugin" == "sw" ]] || [[ "$plugin" == "docs" ]]; then
-                      SUGGEST_CMDS="${SUGGEST_CMDS}  - **${plugin}**: \`npx vskill install --repo anton-abyzov/specweave --plugin ${plugin} --agent claude-code\`\\n"
-                    elif is_vskill_repo_plugin "$plugin"; then
-                      SUGGEST_CMDS="${SUGGEST_CMDS}  - **${plugin}**: \`npx vskill install --repo anton-abyzov/vskill --plugin ${plugin} --agent claude-code\`\\n"
-                    fi
-                  done
-                  LLM_REASON=$(echo "$JSON_OUTPUT" | jq -r '.reasoning // empty' 2>/dev/null)
-                  AUTOLOAD_PLUGINS_MSG="**Suggested plugins for this task**:\\n${SUGGEST_CMDS}"
-                  [[ -n "$LLM_REASON" ]] && AUTOLOAD_PLUGINS_MSG="${AUTOLOAD_PLUGINS_MSG}*Why*: ${LLM_REASON}\\n"
-                  AUTOLOAD_PLUGINS_MSG="${AUTOLOAD_PLUGINS_MSG}\\nTo enable auto-install: set \`\"pluginAutoLoad\": { \"suggestOnly\": false }\` in \`.specweave/config.json\`\\n"
-                  AUTOLOAD_PLUGINS_MSG="${AUTOLOAD_PLUGINS_MSG}After installing, **restart Claude Code** to use new plugins.\\n\\n---\\n"
-                  PLUGIN_LIST=$(echo "$DETECTED_PLUGINS" | tr ' ' ', ' | sed 's/,$//')
-                  echo "[$(date -Iseconds)] plugins | suggested=${PLUGIN_LIST} | mode=suggestOnly" >> "$LAZY_LOAD_LOG"
-                elif command -v claude >/dev/null 2>&1; then
-                  # NORMAL MODE - Actually install plugins
-                  PLUGINS_INSTALLED=""
-                  PLUGINS_ALREADY=""
-
-                  # v1.0.210: All plugins install with PROJECT scope by default
-                  # This prevents global pollution - plugins stay scoped to current project
-                  SPECWEAVE_PLUGIN_SCOPE="project"
-                  DEFAULT_PLUGIN_SCOPE="project"
-                  if [[ -f "$CONFIG_PATH" ]] && command -v jq >/dev/null 2>&1; then
-                    SCOPE_VAL=$(jq -r '.plugins.scope.specweaveScope // "project"' "$CONFIG_PATH" 2>/dev/null)
-                    [[ "$SCOPE_VAL" == "user" || "$SCOPE_VAL" == "project" || "$SCOPE_VAL" == "local" ]] && SPECWEAVE_PLUGIN_SCOPE="$SCOPE_VAL"
-                    SCOPE_VAL=$(jq -r '.plugins.scope.defaultScope // "project"' "$CONFIG_PATH" 2>/dev/null)
-                    [[ "$SCOPE_VAL" == "user" || "$SCOPE_VAL" == "project" || "$SCOPE_VAL" == "local" ]] && DEFAULT_PLUGIN_SCOPE="$SCOPE_VAL"
-                  fi
-
-                  for plugin in $DETECTED_PLUGINS; do
-                    [[ -z "$plugin" ]] && continue
-
-                    # v1.0.159: Determine marketplace based on plugin name
-                    # sw-* plugins → @specweave (via vskill), others → @claude-plugins-official (via claude CLI)
-                    # v1.0.240 (0198): context7/playwright removed from auto-install
-                    # v1.0.272 (0232): sw-* plugins now installed via vskill instead of claude plugin install
-                    # v1.0.344 (0394): docs plugin routes through specweave repo (not vskill)
-                    if [[ "$plugin" == sw-* ]] || [[ "$plugin" == "sw" ]] || [[ "$plugin" == "docs" ]]; then
-                      # ---- SW-* PLUGINS: Install via vskill (v1.0.272) ----
-                      # Fast-path: check vskill.lock first (no CLI invocation needed)
-                      if check_plugin_in_vskill_lock "$plugin"; then
-                        [[ -n "$PLUGINS_ALREADY" ]] && PLUGINS_ALREADY="$PLUGINS_ALREADY, "
-                        PLUGINS_ALREADY="${PLUGINS_ALREADY}${plugin}"
-                      elif check_plugin_installed_from_json "$plugin" "specweave"; then
-                        # Fallback: check installed_plugins.json (legacy installations)
-                        [[ -n "$PLUGINS_ALREADY" ]] && PLUGINS_ALREADY="$PLUGINS_ALREADY, "
-                        PLUGINS_ALREADY="${PLUGINS_ALREADY}${plugin}"
-                      else
-                        # Not installed - install via vskill add
-                        if install_plugin_via_vskill "$plugin"; then
-                          [[ -n "$PLUGINS_INSTALLED" ]] && PLUGINS_INSTALLED="$PLUGINS_INSTALLED, "
-                          PLUGINS_INSTALLED="${PLUGINS_INSTALLED}${plugin}"
-
-                          # Display scan result if available
-                          if [[ -n "$VSKILL_INSTALL_OUTPUT" ]]; then
-                            SCAN_RESULT=$(echo "$VSKILL_INSTALL_OUTPUT" | grep -oE "Score:[[:space:]]*[0-9]+/100[[:space:]]*Verdict:[[:space:]]*[A-Z]+" || true)
-                            [[ -n "$SCAN_RESULT" ]] && echo "[$(date -Iseconds)] vskill | ${plugin} | ${SCAN_RESULT}" >> "$LAZY_LOAD_LOG"
-                          fi
-                        else
-                          echo "[$(date -Iseconds)] vskill | ${plugin} | FAILED: ${VSKILL_INSTALL_OUTPUT:-unknown}" >> "$LAZY_LOAD_LOG"
-                        fi
-                      fi
-                    elif is_vskill_repo_plugin "$plugin"; then
-                      # ---- VSKILL MARKETPLACE PLUGINS ----
-                      # Each category is a standalone plugin (frontend@vskill, backend@vskill, etc.)
-                      if check_plugin_in_vskill_lock "$plugin"; then
-                        [[ -n "$PLUGINS_ALREADY" ]] && PLUGINS_ALREADY="$PLUGINS_ALREADY, "
-                        PLUGINS_ALREADY="${PLUGINS_ALREADY}${plugin}"
-                      else
-                        if install_vskill_repo_plugin "$plugin"; then
-                          [[ -n "$PLUGINS_INSTALLED" ]] && PLUGINS_INSTALLED="$PLUGINS_INSTALLED, "
-                          PLUGINS_INSTALLED="${PLUGINS_INSTALLED}${plugin}"
-
-                          # Display scan result if available
-                          if [[ -n "$VSKILL_INSTALL_OUTPUT" ]]; then
-                            SCAN_RESULT=$(echo "$VSKILL_INSTALL_OUTPUT" | grep -oE "Score:[[:space:]]*[0-9]+/100[[:space:]]*Verdict:[[:space:]]*[A-Z]+" || true)
-                            [[ -n "$SCAN_RESULT" ]] && echo "[$(date -Iseconds)] vskill-repo | ${plugin} | ${SCAN_RESULT}" >> "$LAZY_LOAD_LOG"
-                          fi
-                        else
-                          echo "[$(date -Iseconds)] vskill-repo | ${plugin} | FAILED: ${VSKILL_INSTALL_OUTPUT:-unknown}" >> "$LAZY_LOAD_LOG"
-                        fi
-                      fi
-                    else
-                      # ---- NON-SW PLUGINS: Install via claude CLI (unchanged) ----
-                      MARKETPLACE="claude-plugins-official"
-                      PLUGIN_SCOPE="$DEFAULT_PLUGIN_SCOPE"
-                      FULL_PLUGIN_NAME="${plugin}@${MARKETPLACE}"
-                      ALREADY_INSTALLED=false
-
-                      if check_plugin_installed_from_json "$plugin" "$MARKETPLACE"; then
-                        ALREADY_INSTALLED=true
-                      else
-                        CURRENT_PLUGINS=""
-                        if command -v timeout >/dev/null 2>&1; then
-                          CURRENT_PLUGINS=$(timeout 10 claude plugin list 2>/dev/null | grep -E "^  ❯ " | sed 's/^  ❯ //' || true)
-                        else
-                          CURRENT_PLUGINS=$(claude plugin list 2>/dev/null | grep -E "^  ❯ " | sed 's/^  ❯ //' || true)
-                        fi
-                        if echo "$CURRENT_PLUGINS" | grep -q "^${FULL_PLUGIN_NAME}$"; then
-                          ALREADY_INSTALLED=true
-                        fi
-                      fi
-
-                      if [[ "$ALREADY_INSTALLED" == "true" ]]; then
-                        [[ -n "$PLUGINS_ALREADY" ]] && PLUGINS_ALREADY="$PLUGINS_ALREADY, "
-                        PLUGINS_ALREADY="${PLUGINS_ALREADY}${plugin}"
-                      else
-                        if command -v timeout >/dev/null 2>&1; then
-                          OUT=$(timeout 10 claude plugin install "${FULL_PLUGIN_NAME}" --scope "$PLUGIN_SCOPE" 2>&1) || true
-                        else
-                          OUT=$(claude plugin install "${FULL_PLUGIN_NAME}" --scope "$PLUGIN_SCOPE" 2>&1) || true
-                        fi
-                        if echo "$OUT" | grep -qiE "(success|installed)"; then
-                          sleep 0.5
-                          if check_plugin_installed_from_json "$plugin" "$MARKETPLACE"; then
-                            [[ -n "$PLUGINS_INSTALLED" ]] && PLUGINS_INSTALLED="$PLUGINS_INSTALLED, "
-                            PLUGINS_INSTALLED="${PLUGINS_INSTALLED}${plugin}"
-                          else
-                            [[ -n "$PLUGINS_ALREADY" ]] && PLUGINS_ALREADY="$PLUGINS_ALREADY, "
-                            PLUGINS_ALREADY="${PLUGINS_ALREADY}${plugin}"
-                          fi
-                        fi
-                      fi
-                    fi
-                  done
-
-                  # Build feedback message
-                  if [[ -n "$PLUGINS_INSTALLED" ]]; then
-                    # v1.0.260: Compacted RESTART message (~400 chars vs ~2000 chars)
-                    # ASCII art boxes were wasting ~1600 chars of the 3000-char context budget.
-                    AUTOLOAD_PLUGINS_MSG="RESTART REQUIRED: Plugins installed (${PLUGINS_INSTALLED}) but NOT loaded in current session.\\n"
-                    AUTOLOAD_PLUGINS_MSG="${AUTOLOAD_PLUGINS_MSG}ALL tools BLOCKED (Write, Edit, Bash, Task). DO NOT proceed.\\n"
-                    AUTOLOAD_PLUGINS_MSG="${AUTOLOAD_PLUGINS_MSG}Restart: VSCode \\\`Cmd+Shift+P\\\` > 'Claude: New Session' | CLI: exit + \\\`claude\\\`\\n"
-                    AUTOLOAD_PLUGINS_MSG="${AUTOLOAD_PLUGINS_MSG}STOP COMPLETELY. Do NOT help, do NOT implement, do NOT ignore this.\\n"
-                  elif [[ -n "$PLUGINS_ALREADY" ]]; then
-                    # v1.0.260: Daily caching — "Using plugins" shown once per day
-                    # Uses date-based marker (like archive-suggestion) to auto-reset daily
-                    _PLUGINS_SHOWN_FLAG="${SPECWEAVE_DIR}/state/plugins-shown.marker"
-                    _TODAY=$(date +%Y-%m-%d)
-                    _LAST_SHOWN=""
-                    [[ -f "$_PLUGINS_SHOWN_FLAG" ]] && _LAST_SHOWN=$(cat "$_PLUGINS_SHOWN_FLAG" 2>/dev/null)
-                    if [[ "$_LAST_SHOWN" != "$_TODAY" ]]; then
-                      AUTOLOAD_PLUGINS_MSG="🔌 **Using plugins**: ${PLUGINS_ALREADY}\\n"
-                      mkdir -p "$(dirname "$_PLUGINS_SHOWN_FLAG")" 2>/dev/null
-                      echo "$_TODAY" > "$_PLUGINS_SHOWN_FLAG" 2>/dev/null
-                    fi
-                  fi
-                  if [[ -n "$AUTOLOAD_PLUGINS_MSG" ]]; then
-                    # v1.0.260: Skip LLM reasoning to save context budget — it's informational only
-                    :
-                  fi
-
-                  echo "[$(date -Iseconds)] plugins | installed=${PLUGINS_INSTALLED:-none} | already=${PLUGINS_ALREADY:-none}" >> "$LAZY_LOAD_LOG"
-
-                  # v1.0.240 (0198): Playwright MCP suggestion removed
-                  # Browser automation handled by @playwright/cli (CLI-only mode)
-                fi
-              fi
-            fi
 
             # ==================================================================
             # EXTRACT ROUTING INFO EARLY (v1.0.155 - needed for agent directives)
@@ -1678,55 +1444,12 @@ After increment, chain domain skills per tech stack (see CLAUDE.md Skill Chainin
         fi
 
         # ==================================================================
-        # KEYWORD FALLBACK: PLUGIN INSTALLATION (v1.0.343)
+        # KEYWORD FALLBACK: PLUGIN INSTALLATION — REMOVED (v1.0.535)
+        # ==================================================================
+        # Keyword-based plugin installation removed. All plugins are now
+        # installed at init time via `specweave init` (direct file copy
+        # to .claude/skills/). No on-demand marketplace lookups.
         # ==================================================================
-        # When LLM detection fails/times out, try lightweight keyword-based
-        # plugin detection. Only installs if plugin NOT already in vskill.lock.
-        # Targeted domain keywords (not generic action verbs) to avoid over-installing.
-        if [[ "$LLM_DETECTION_FAILED" == "true" && "$PLUGIN_AUTOLOAD_ENABLED" == "true" ]]; then
-          FALLBACK_PLUGINS=""
-          if echo "$PROMPT" | grep -qiE "(react|vue|angular|next\.?js|svelte|frontend|component|tailwind|CSS|UI design|dashboard)"; then
-            check_plugin_in_vskill_lock "frontend" || FALLBACK_PLUGINS="${FALLBACK_PLUGINS}frontend "
-          fi
-          if echo "$PROMPT" | grep -qiE "(API|REST|GraphQL|\.NET|C#|express|fastapi|django|spring boot|NestJS|backend|database|postgres|mongo)"; then
-            check_plugin_in_vskill_lock "backend" || FALLBACK_PLUGINS="${FALLBACK_PLUGINS}backend "
-          fi
-          if echo "$PROMPT" | grep -qiE "(vitest|playwright|jest|cypress|E2E|unit test|integration test|test coverage|TDD|mutation test)"; then
-            check_plugin_in_vskill_lock "testing" || FALLBACK_PLUGINS="${FALLBACK_PLUGINS}testing "
-          fi
-          if echo "$PROMPT" | grep -qiE "(react native|iOS|android|expo|flutter|swift|kotlin|mobile app)"; then
-            check_plugin_in_vskill_lock "mobile" || FALLBACK_PLUGINS="${FALLBACK_PLUGINS}mobile "
-          fi
-          if echo "$PROMPT" | grep -qiE "(terraform|AWS|Azure|GCP|docker|kubernetes|k8s|CI/CD|github actions|helm)"; then
-            check_plugin_in_vskill_lock "infra" || FALLBACK_PLUGINS="${FALLBACK_PLUGINS}infra "
-          fi
-          if echo "$PROMPT" | grep -qiE "(security scan|vulnerability|OWASP|penetration|CVE|hardening|devsecops)"; then
-            check_plugin_in_vskill_lock "security" || FALLBACK_PLUGINS="${FALLBACK_PLUGINS}security "
-          fi
-          if echo "$PROMPT" | grep -qiE "(kafka|event stream|confluent|schema registry)"; then
-            check_plugin_in_vskill_lock "kafka" || FALLBACK_PLUGINS="${FALLBACK_PLUGINS}kafka "
-          fi
-          if echo "$PROMPT" | grep -qiE "(machine learning|pytorch|tensorflow|LLM|RAG|fine.?tun|hugging.?face|langchain)"; then
-            check_plugin_in_vskill_lock "ml" || FALLBACK_PLUGINS="${FALLBACK_PLUGINS}ml "
-          fi
-          if echo "$PROMPT" | grep -qiE "(stripe|payment|billing|subscription|checkout|PCI)"; then
-            check_plugin_in_vskill_lock "payments" || FALLBACK_PLUGINS="${FALLBACK_PLUGINS}payments "
-          fi
-
-          # Install detected plugins (limit to first 2 to avoid long delays)
-          if [[ -n "$FALLBACK_PLUGINS" ]]; then
-            FALLBACK_INSTALLED=""
-            FALLBACK_COUNT=0
-            for fp in $FALLBACK_PLUGINS; do
-              [[ "$FALLBACK_COUNT" -ge 2 ]] && break
-              if install_vskill_repo_plugin "$fp"; then
-                FALLBACK_INSTALLED="${FALLBACK_INSTALLED}${fp} "
-                FALLBACK_COUNT=$((FALLBACK_COUNT + 1))
-              fi
-            done
-            [[ -n "$FALLBACK_INSTALLED" ]] && echo "[$(date -Iseconds)] keyword-plugin-fallback | installed=${FALLBACK_INSTALLED}" >> "$LAZY_LOAD_LOG"
-          fi
-        fi
 
         # ==================================================================
         # KEYWORD FALLBACK FOR INCREMENT DISCIPLINE (v1.0.257)

package/plugins/specweave/skills/team-lead/SKILL.md

@@ -31,34 +31,23 @@ hooks:
 
 **Before mode detection or any other step**, clean up stale teams from previous runs in this session.
 
-### Why This Matters
+### Cleanup Protocol
 
-Teams persist at `~/.claude/teams/` and `~/.claude/tasks/` after completion. If not cleaned up, they pollute the session and may prevent `TeamCreate` from working.
+1. **First team-lead invocation in this session**: Nothing to clean. Proceed to Section 0.
 
-### Cleanup Steps
+2. **Repeat invocation** (you previously ran team-lead and remember the team name + agent names):
+   - Send `shutdown_request` to each agent you previously spawned:
+     ```typescript
+     SendMessage({ type: "shutdown_request", recipient: "<previous-agent-name>" });
+     ```
+   - Call `TeamDelete()` with the previous team name
+   - If `TeamDelete` fails (agents still shutting down), wait 3 seconds, retry once
 
-```bash
-# 1. List existing teams
-ls ~/.claude/teams/ 2>/dev/null
-
-# 2. List existing task directories
-ls ~/.claude/tasks/ 2>/dev/null
-```
+3. **Use a unique team name** for each invocation to avoid collisions:
+   - `impl-checkout-1`, `impl-checkout-2`
+   - `review-auth-{timestamp}`
 
-**If stale teams exist from a previous run in this session:**
-
-1. Call `TeamDelete()` for each stale team that is no longer active
-2. If `TeamDelete` fails (agents still active), send `shutdown_request` to all agents first:
-   ```typescript
-   SendMessage({ type: "shutdown_request", recipient: "<agent-name>" });
-   ```
-3. Then retry `TeamDelete()`
-
-**If no stale teams or all cleaned up:** Proceed to Increment Pre-Flight (Section 0).
-
-**CRITICAL**: Use a **unique team name** for each invocation to avoid collisions. Append a timestamp or sequence number:
-- `review-pr-1533-1`, `review-pr-1533-2`
-- `impl-feature-{timestamp}`
+**Do NOT** inspect the filesystem (`ls`, `jq`, reading config files). You either know the previous team name from this session, or there is nothing to clean.
 
 ---
 
@@ -790,7 +779,7 @@ When an agent is declared stuck:
   │ ── CLOSURE PHASE (all agents done) ──
   │
   ├── Step 7: Invoke /sw:team-merge (handles all closure: done, sync, archival)
-  ├── Step 8: TeamDelete() + kill orphaned tmux panes (MANDATORY)
+  ├── Step 8: Shutdown agents → TeamDelete() → orphaned pane safety net (Step 9 below)
   └── Done.
 ```
 
@@ -799,29 +788,44 @@ Direct invocation of `/sw:team-lead` without an existing increment will trigger
 
 ### Step 9: Post-Completion Cleanup (MANDATORY — NEVER SKIP)
 
-**After delivering results OR after /sw:team-merge, ALWAYS clean up the team AND its tmux panes.**
+**After delivering results OR after /sw:team-merge, clean up the team.**
 
-TeamDelete() only removes filesystem state — it does NOT close tmux panes. You MUST kill orphaned panes manually.
+#### Phase 1: Graceful Agent Shutdown
+
+Send `shutdown_request` to every agent you spawned. You know their names — you spawned them via `Task()`.
 
 ```typescript
-// 1. Clean up team filesystem state
-TeamDelete();
+// Replace with your actual agent names from this session
+SendMessage({ type: "shutdown_request", recipient: "<agent-1-name>", content: "Team work complete" });
+SendMessage({ type: "shutdown_request", recipient: "<agent-2-name>", content: "Team work complete" });
+// ... for every agent you spawned
 ```
 
-```bash
-// 2. Kill orphaned tmux panes (MANDATORY — panes persist after TeamDelete)
-// List all panes, kill any teammate panes that are no longer needed
-tmux list-panes -a -F '#{pane_id} #{pane_current_command}' 2>/dev/null | grep -i claude | head -20
-# Kill specific panes (replace %ID with actual pane IDs from above):
-# tmux kill-pane -t %ID
+Harmless if agents already exited. When an agent receives `shutdown_request` and approves, Claude Code handles its pane cleanup natively.
+
+#### Phase 2: Destroy Team
 
-// 3. Or kill the entire tmux session if all work is done:
-# tmux kill-session -t <session-name>
+```typescript
+TeamDelete();
 ```
 
-**Why this matters**: Claude Code only kills panes when the ENTIRE session exits via its cleanup hook. If agents finish but the main session continues, their panes stay open indefinitely — consuming terminal resources and confusing the user.
+If `TeamDelete` fails (agents still shutting down), wait 3 seconds, retry once.
+
+#### Phase 3: Orphaned Pane Safety Net (macOS/Linux tmux only)
 
-**If you skip this step**, orphaned tmux panes accumulate and the next `/sw:team-lead` run will fail to spawn agents due to stale team state.
+SpecWeave agents often exit via auto-mode before receiving `shutdown_request`, so their panes survive. This catches those orphans. **Skip entirely on Windows or non-tmux terminals.**
+
+```bash
+if command -v tmux >/dev/null 2>&1 && [ -n "$TMUX" ]; then
+  CURRENT_PANE=$(tmux display-message -p '#{pane_id}')
+  for pane_id in $(tmux list-panes -a -F '#{pane_id}'); do
+    [ "$pane_id" = "$CURRENT_PANE" ] && continue
+    if tmux capture-pane -t "$pane_id" -p -S -50 2>/dev/null | grep -q "Resume this session"; then
+      tmux kill-pane -t "$pane_id" 2>/dev/null
+    fi
+  done
+fi
+```
 
 ### --dry-run Output
 

package/plugins/specweave/skills/team-merge/SKILL.md

@@ -104,45 +104,57 @@ For each closed increment, trigger external sync:
 /sw-jira:push <increment-id>
 ```
 
-### Step 6: Archive Team Execution Data
+### Step 6: Execution Summary
 
-Before destroying the team, preserve execution logs for debugging and tracing:
+The team's durable artifacts are already in `.specweave/increments/` (spec.md, tasks.md, grill-report.json, metadata.json). No additional archival of ephemeral Claude Code state is needed.
 
-```bash
-# Determine team name from current session context
-# Read ~/.claude/teams/{team-name}/config.json for team metadata
-
-TEAM_NAME="<team-name>"
-TIMESTAMP=$(date +%Y%m%dT%H%M%S)
-ARCHIVE_DIR=".specweave/team-logs/${TEAM_NAME}--${TIMESTAMP}"
+Print a structured execution summary as the final output:
 
-mkdir -p "$ARCHIVE_DIR"
+```
+Team Execution Summary
+═══════════════════════
+Team: {team_name}
 
-# Copy team config and message inboxes
-cp -r ~/.claude/teams/${TEAM_NAME}/ "$ARCHIVE_DIR/team/"
+Agents:
+  {agent-1}: COMPLETED (T-8/8, tests passing)
+  {agent-2}: COMPLETED (T-12/12, tests passing)
 
-# Copy shared task list (ownership, status transitions, dependencies)
-cp -r ~/.claude/tasks/${TEAM_NAME}/ "$ARCHIVE_DIR/tasks/"
+Increments closed: {list}
+Sync: {GitHub/JIRA status}
 ```
 
-This preserves:
-- **Team config** — members, roles, models, spawn timestamps
-- **Message inboxes** — full inter-agent communication history
-- **Task list** — ownership, status, dependency chains, completion order
-
-### Step 7: Destroy Team Session
+### Step 7: Shutdown Agents and Destroy Team
 
-After archiving, call `TeamDelete` to clear the session's team context. This allows creating a new team in the same terminal without restarting.
+**7a. Send shutdown_request to all agents** you know from the team session:
 
+```typescript
+SendMessage({ type: "shutdown_request", recipient: "<agent-1>", content: "Merge complete" });
+SendMessage({ type: "shutdown_request", recipient: "<agent-2>", content: "Merge complete" });
+// ... for every agent in this team
 ```
-TeamDelete()   # Removes ~/.claude/teams/{name}/ and ~/.claude/tasks/{name}/, clears session context
-```
 
-**Important**: `TeamDelete` fails if teammates are still active. Ensure all teammates were shut down in Step 4 (via `/sw:done` which triggers shutdown).
+Harmless if agents already exited.
+
+**7b. Destroy team:**
 
-If `TeamDelete` fails due to active members, send shutdown requests to remaining teammates first:
+```typescript
+TeamDelete()
 ```
-SendMessage({ type: "shutdown_request", recipient: "<teammate-name>", content: "Merge complete, shutting down" })
+
+If `TeamDelete` fails (agents still shutting down), wait 3 seconds, retry once.
+
+**7c. Orphaned pane safety net (macOS/Linux tmux only — skip on Windows):**
+
+```bash
+if command -v tmux >/dev/null 2>&1 && [ -n "$TMUX" ]; then
+  CURRENT_PANE=$(tmux display-message -p '#{pane_id}')
+  for pane_id in $(tmux list-panes -a -F '#{pane_id}'); do
+    [ "$pane_id" = "$CURRENT_PANE" ] && continue
+    if tmux capture-pane -t "$pane_id" -p -S -50 2>/dev/null | grep -q "Resume this session"; then
+      tmux kill-pane -t "$pane_id" 2>/dev/null
+    fi
+  done
+fi
 ```
 
 ## Options
@@ -174,11 +186,17 @@ Syncing to GitHub...
   0301 -> issue #46 closed
   0302 -> issue #47 closed
 
-Archiving team execution data...
-  -> .specweave/team-logs/feature-0300--20260302T143012/
-
-Cleaning up team session...
-  -> TeamDelete: session context cleared
-
-All increments merged, synced, and team archived.
+Team Execution Summary
+═══════════════════════
+Team: feature-checkout
+Agents:
+  shared-agent:   COMPLETED (T-4/4, tests passing)
+  backend-agent:  COMPLETED (T-8/8, tests passing)
+  frontend-agent: COMPLETED (T-6/6, tests passing)
+Increments closed: 0300, 0301, 0302
+Sync: GitHub issues #45, #46, #47 closed
+
+Shutting down agents... done
+TeamDelete: team cleaned up.
+All increments merged and synced.
 ```