squad-bmad 1.2.5 → 1.2.7

package/package.json

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

package/template/.gemini/scripts/_common.sh

@@ -0,0 +1,48 @@
+#!/bin/bash
+# _common.sh — Shared helpers for squad-bmad tmux scripts.
+#
+# SOURCE this file; do not execute it directly.
+#   source "$(dirname "$0")/_common.sh"
+
+# ── sanitize_for_tmux ──────────────────────────────────────────────────────
+# Make a string safe for use as a tmux session name.
+#   • '.'  → tmux uses it as session.window.pane separator
+#   • ':'  → tmux uses it as session:window separator
+#   • ' '  → causes quoting headaches in targets
+# Replace all of them with underscores.
+sanitize_for_tmux() {
+  local name="$1"
+  name="${name//./_}"
+  name="${name//:/_}"
+  name="${name// /_}"
+  echo "$name"
+}
+
+# ── resolve_folder ─────────────────────────────────────────────────────────
+# Determine the project folder name (already sanitised for tmux).
+#   $1 — explicit folder name (optional; falls back to git root or $PWD)
+resolve_folder() {
+  local folder
+  if [ -n "$1" ]; then
+    folder="$1"
+  else
+    local git_root
+    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
+  sanitize_for_tmux "$folder"
+}
+
+# ── derive_session_names ───────────────────────────────────────────────────
+# Sets SESSION_GEMINI, SESSION_IMPLEMENT, SESSION_BRAINSTORM globals.
+#   $1 — sanitised folder name (output of resolve_folder)
+derive_session_names() {
+  local folder="$1"
+  SESSION_GEMINI="gemini-orchestrator-${folder}"
+  SESSION_IMPLEMENT="claude-implement-${folder}"
+  SESSION_BRAINSTORM="claude-brainstorm-${folder}"
+}

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

@@ -17,25 +17,14 @@
 
 set -e
 
-# ── Resolve folder name ──────────────────────────────────────────────────────
-if [ -n "$1" ]; then
-  FOLDER="$1"
-else
-  # 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
+# ── Load shared helpers ────────────────────────────────────────────────────
+source "$(dirname "$0")/_common.sh"
 
-# ── Derive session names ─────────────────────────────────────────────────────
-SESSION_GEMINI="gemini-orchestrator-${FOLDER}"
-SESSION_IMPLEMENT="claude-implement-${FOLDER}"
-SESSION_BRAINSTORM="claude-brainstorm-${FOLDER}"
+# ── Resolve folder & session names ─────────────────────────────────────────
+FOLDER=$(resolve_folder "$1")
+derive_session_names "$FOLDER"
 
-# ── Helper: create session only if it does not already exist ─────────────────
+# ── Helper: create session only if it does not already exist ─────────────
 create_session_if_missing() {
   local session_name="$1"
   local start_cmd="$2"     # command to run inside the new session
@@ -46,7 +35,6 @@ create_session_if_missing() {
   else
     # -d  : start detached
     # -s  : session name
-    # The shell command is passed via tmux's 'new-session' so it runs immediately
     tmux new-session -d -s "$session_name" -x 220 -y 50
     # Give the shell a moment to initialise before sending the startup command
     sleep 0.5
@@ -55,7 +43,7 @@ create_session_if_missing() {
   fi
 }
 
-# ── Print plan ────────────────────────────────────────────────────────────────
+# ── Print plan ────────────────────────────────────────────────────────────
 echo ""
 echo "╔══════════════════════════════════════════════════════════════╗"
 echo "║         squad-bmad  •  Session Setup                        ║"

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

@@ -17,24 +17,14 @@
 
 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
+# ── Load shared helpers ────────────────────────────────────────────────────
+source "$(dirname "$0")/_common.sh"
 
-# ── Derive session names ─────────────────────────────────────────────────────
-SESSION_GEMINI="gemini-orchestrator-${FOLDER}"
-SESSION_IMPLEMENT="claude-implement-${FOLDER}"
-SESSION_BRAINSTORM="claude-brainstorm-${FOLDER}"
+# ── Resolve folder & session names ─────────────────────────────────────────
+FOLDER=$(resolve_folder "$1")
+derive_session_names "$FOLDER"
 
-# ── Helper: kill session if it exists ─────────────────────────────────────────
+# ── Helper: kill session if it exists ─────────────────────────────────────
 kill_session_if_exists() {
   local session_name="$1"
   local label="$2"
@@ -47,7 +37,7 @@ kill_session_if_exists() {
   fi
 }
 
-# ── Print plan ────────────────────────────────────────────────────────────────
+# ── Print plan ────────────────────────────────────────────────────────────
 echo ""
 echo "╔══════════════════════════════════════════════════════════════╗"
 echo "║         squad-bmad  •  Session Teardown                     ║"
@@ -61,12 +51,12 @@ echo "    2. ${SESSION_IMPLEMENT}"
 echo "    3. ${SESSION_BRAINSTORM}"
 echo ""
 
-# ── Kill sessions ─────────────────────────────────────────────────────────────
+# ── 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 ───────────────────────────────────────────────────────────────────
+# ── Summary ───────────────────────────────────────────────────────────────
 echo ""
 REMAINING=$(tmux list-sessions 2>/dev/null || true)
 if [ -n "$REMAINING" ]; then

package/template/.gemini/scripts/tmux-send.sh

@@ -2,33 +2,40 @@
 # tmux-send.sh — Reliably send text to a tmux pane.
 #
 # USAGE:
-#   ./tmux-send.sh <pane-target> <message> [wait-seconds]
+#   ./tmux-send.sh <session-name> <message> [wait-seconds]
 #
 # ARGUMENTS:
-#   pane-target   — tmux target, e.g.: gemini-orchestrator:0.0
+#   session-name  — tmux session (will be sanitised and targeted at :0.0)
 #   message       — content to send (wrap in quotes if it contains spaces)
 #   wait-seconds  — (optional) seconds to wait between text and Enter, default: 5
 #
 # EXAMPLES:
-#   .gemini/scripts/tmux-send.sh "gemini-orchestrator:0.0" "Hello from Claude Code"
-#   .gemini/scripts/tmux-send.sh "cc-implement:0" "/dev-story" 3
+#   .gemini/scripts/tmux-send.sh "gemini-orchestrator-squad-bmad" "Hello from Claude Code"
+#   .gemini/scripts/tmux-send.sh "claude-implement-squad-bmad" "/dev-story" 3
 
 set -e
 
-PANE_TARGET="$1"
+# ── Load shared helpers ────────────────────────────────────────────────────
+source "$(dirname "$0")/_common.sh"
+
+SESSION_NAME="$1"
 MESSAGE="$2"
 WAIT_SECONDS="${3:-5}"
 
 # Validate required arguments
-if [ -z "$PANE_TARGET" ] || [ -z "$MESSAGE" ]; then
+if [ -z "$SESSION_NAME" ] || [ -z "$MESSAGE" ]; then
   echo "Error: Missing arguments." >&2
-  echo "Usage: $0 <pane-target> <message> [wait-seconds]" >&2
+  echo "Usage: $0 <session-name> <message> [wait-seconds]" >&2
   exit 1
 fi
 
-# Check that the pane exists
-if ! tmux has-session -t "$PANE_TARGET" 2>/dev/null; then
-  echo "Error: Tmux target '$PANE_TARGET' does not exist." >&2
+# Sanitise the session name (in case caller passed raw folder name inside it)
+SESSION_NAME=$(sanitize_for_tmux "$SESSION_NAME")
+PANE_TARGET="${SESSION_NAME}:0.0"
+
+# Check that the session exists
+if ! tmux has-session -t "$SESSION_NAME" 2>/dev/null; then
+  echo "Error: Tmux session '$SESSION_NAME' does not exist." >&2
   exit 1
 fi
 
@@ -41,4 +48,4 @@ sleep "$WAIT_SECONDS"
 # Send Enter (C-m) — do NOT use 'Enter' or '\n'
 tmux send-keys -t "$PANE_TARGET" C-m
 
-echo "✓ Sent to '$PANE_TARGET': $MESSAGE"
+echo "Sent to '$PANE_TARGET': $MESSAGE"