squad-bmad 1.2.3 → 1.2.4

package/bin/cli.js

@@ -228,6 +228,8 @@ async function install() {
     console.log(`       ${c.cyan}English:${c.reset}    ${c.bold}/withClaudeCodeTmux${c.reset}`);
     console.log(`       ${c.cyan}Tiếng Việt:${c.reset} ${c.bold}/withClaudeCodeTmux.vi${c.reset}`);
     console.log();
+    info(`To tear down all sessions when done: ${c.bold}.gemini/scripts/teardown-sessions.sh${c.reset}`);
+    console.log();
 }
 
 // ── Command: upgrade ─────────────────────────────────────────────────────────
@@ -260,6 +262,8 @@ async function upgrade() {
     console.log(`       ${c.cyan}English:${c.reset}    ${c.bold}/withClaudeCodeTmux${c.reset}`);
     console.log(`       ${c.cyan}Tiếng Việt:${c.reset} ${c.bold}/withClaudeCodeTmux.vi${c.reset}`);
     console.log();
+    info(`To tear down all sessions when done: ${c.bold}.gemini/scripts/teardown-sessions.sh${c.reset}`);
+    console.log();
 }
 
 // ── Entry point ───────────────────────────────────────────────────────────────

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "squad-bmad",
-    "version": "1.2.3",
+    "version": "1.2.4",
     "description": "Automated project orchestration boilerplate with Gemini CLI & Claude Code via Tmux, following the BMAD methodology.",
     "keywords": [
         "gemini",

package/template/.claude/hooks/notify-gemini.sh

@@ -7,9 +7,20 @@ if [ -z "$MSG" ]; then
 fi
 
 # --- Dynamic Gemini session target ---
-# Derive the tmux session name from the current project folder.
+# Derive the tmux session name from the project ROOT folder name.
+# We use `git rev-parse --show-toplevel` to resolve from any subdirectory
+# to the git root, then take its basename.
 # Convention: gemini-orchestrator-<folder-name>
-FOLDER_NAME=$(basename "$PWD")
+GIT_ROOT=$(git rev-parse --show-toplevel 2>/dev/null || echo "")
+
+if [ -n "$GIT_ROOT" ]; then
+  FOLDER_NAME=$(basename "$GIT_ROOT")
+else
+  # Fallback: if not inside a git repo, use PWD directly
+  echo "[notify-gemini] Warning: not inside a git repo. Falling back to basename of PWD." >&2
+  FOLDER_NAME=$(basename "$PWD")
+fi
+
 GEMINI_SESSION="gemini-orchestrator-${FOLDER_NAME}"
 
 # Check whether the target tmux session actually exists before sending

package/template/.claude/hooks/wakeup-gemini.sh

@@ -15,8 +15,10 @@ AGENT_NAME=$(echo "$HOOK_INPUT" | jq -r '.agent // empty')
 # Example: if [ -n "$AGENT_NAME" ] && [ "$AGENT_NAME" != "root" ]; then exit 0; fi
 
 # --- Dynamic Gemini session target ---
-# Derive the tmux session name from the project folder name in the hook's cwd.
-# Convention: gemini-orchestrator-<folder-name>  (e.g. cwd=/…/squad-bmad → gemini-orchestrator-squad-bmad)
+# Derive the tmux session name from the project ROOT folder name.
+# We use `git rev-parse --show-toplevel` to resolve from any subdirectory
+# to the git root, then take its basename.
+# Convention: gemini-orchestrator-<folder-name>  (e.g. cwd=/…/squad-bmad/frontend → gemini-orchestrator-squad-bmad)
 CWD=$(echo "$HOOK_INPUT" | jq -r '.cwd // empty')
 
 if [ -z "$CWD" ]; then
@@ -24,7 +26,17 @@ if [ -z "$CWD" ]; then
   exit 0
 fi
 
-FOLDER_NAME=$(basename "$CWD")
+# Resolve to git root so subdirectories (e.g. frontend/) don't break session lookup
+GIT_ROOT=$(git -C "$CWD" rev-parse --show-toplevel 2>/dev/null || echo "")
+
+if [ -n "$GIT_ROOT" ]; then
+  FOLDER_NAME=$(basename "$GIT_ROOT")
+else
+  # Fallback: if not inside a git repo, use cwd directly
+  echo "[wakeup-gemini] Warning: '$CWD' is not inside a git repo. Falling back to basename of cwd." >&2
+  FOLDER_NAME=$(basename "$CWD")
+fi
+
 GEMINI_SESSION="gemini-orchestrator-${FOLDER_NAME}"
 
 # Check whether the target tmux session actually exists before sending

package/template/.gemini/scripts/setup-sessions.sh

@@ -21,7 +21,13 @@ set -e
 if [ -n "$1" ]; then
   FOLDER="$1"
 else
-  FOLDER=$(basename "$PWD")
+  # Use git root to resolve correctly from any subdirectory
+  GIT_ROOT=$(git rev-parse --show-toplevel 2>/dev/null || echo "")
+  if [ -n "$GIT_ROOT" ]; then
+    FOLDER=$(basename "$GIT_ROOT")
+  else
+    FOLDER=$(basename "$PWD")
+  fi
 fi
 
 # ── Derive session names ─────────────────────────────────────────────────────

package/template/.gemini/scripts/teardown-sessions.sh

@@ -0,0 +1,78 @@
+#!/bin/bash
+# teardown-sessions.sh — Kill the 3 standard tmux sessions for a project.
+#
+# CONVENTION (matches setup-sessions.sh):
+#   gemini-orchestrator-<folder>   → Gemini CLI
+#   claude-implement-<folder>      → Claude Code (sonnet)
+#   claude-brainstorm-<folder>     → Claude Code (opus)
+#
+# USAGE:
+#   .gemini/scripts/teardown-sessions.sh [folder-name]
+#
+#   If folder-name is omitted, the name of the git root directory is used.
+#
+# EXAMPLES:
+#   .gemini/scripts/teardown-sessions.sh
+#   .gemini/scripts/teardown-sessions.sh squad-bmad
+
+set -e
+
+# ── Resolve folder name ──────────────────────────────────────────────────────
+if [ -n "$1" ]; then
+  FOLDER="$1"
+else
+  GIT_ROOT=$(git rev-parse --show-toplevel 2>/dev/null || echo "")
+  if [ -n "$GIT_ROOT" ]; then
+    FOLDER=$(basename "$GIT_ROOT")
+  else
+    FOLDER=$(basename "$PWD")
+  fi
+fi
+
+# ── Derive session names ─────────────────────────────────────────────────────
+SESSION_GEMINI="gemini-orchestrator-${FOLDER}"
+SESSION_IMPLEMENT="claude-implement-${FOLDER}"
+SESSION_BRAINSTORM="claude-brainstorm-${FOLDER}"
+
+# ── Helper: kill session if it exists ─────────────────────────────────────────
+kill_session_if_exists() {
+  local session_name="$1"
+  local label="$2"
+
+  if tmux has-session -t "$session_name" 2>/dev/null; then
+    tmux kill-session -t "$session_name"
+    echo "  [KILLED] $label → session '${session_name}' terminated."
+  else
+    echo "  [SKIP]   $label → session '${session_name}' not found."
+  fi
+}
+
+# ── Print plan ────────────────────────────────────────────────────────────────
+echo ""
+echo "╔══════════════════════════════════════════════════════════════╗"
+echo "║         squad-bmad  •  Session Teardown                     ║"
+echo "╚══════════════════════════════════════════════════════════════╝"
+echo ""
+echo "  Project folder : ${FOLDER}"
+echo ""
+echo "  Sessions to kill:"
+echo "    1. ${SESSION_GEMINI}"
+echo "    2. ${SESSION_IMPLEMENT}"
+echo "    3. ${SESSION_BRAINSTORM}"
+echo ""
+
+# ── Kill sessions ─────────────────────────────────────────────────────────────
+kill_session_if_exists "$SESSION_GEMINI"    "Gemini Orchestrator"
+kill_session_if_exists "$SESSION_IMPLEMENT" "Claude Implement (Sonnet)"
+kill_session_if_exists "$SESSION_BRAINSTORM" "Claude Brainstorm (Opus)"
+
+# ── Summary ───────────────────────────────────────────────────────────────────
+echo ""
+REMAINING=$(tmux list-sessions 2>/dev/null || true)
+if [ -n "$REMAINING" ]; then
+  echo "Remaining tmux sessions:"
+  echo "$REMAINING" | sed 's/^/  /'
+else
+  echo "No tmux sessions remaining."
+fi
+echo ""