spec-runner 1.0.7 → 1.0.9

package/templates/.spec-runner/scripts/spec-runner-core.sh

@@ -4,155 +4,255 @@
 # cmd-dispatch.sh（次のステップ・ゲート確認・ブランチ作成）から呼ばれる。
 
 set -e
+
+# ============================================================
+# 0) 基本設定
+# ============================================================
 REPO_ROOT="${REPO_ROOT:-$(git rev-parse --show-toplevel 2>/dev/null || echo ".")}"
 cd "$REPO_ROOT"
 STEPS_DIR="${STEPS_DIR:-$REPO_ROOT/.spec-runner/steps}"
+STEPS_JSON="${STEPS_JSON:-$STEPS_DIR/steps.json}"
 LOCK_FILE=".spec-runner/phase-locks.json"
+GRADE_FILE=".spec-runner/grade-history.json"
 PROJECT_JSON=".spec-runner/project.json"
 
+# ============================================================
+# 1) ユーティリティ
+# ============================================================
+die() { echo "$1" >&2; exit 1; }
+
+require_cmd() {
+  command -v "$1" >/dev/null 2>&1 || die "spec-runner-core: $1 が必要です（例: brew install $1）"
+}
+
+require_file() {
+  [[ -f "$1" ]] || die "spec-runner-core: ファイルがありません: $1"
+}
+
+get_steps_common_doc() {
+  local key="$1"
+  local v
+  v="$(jq -r --arg k "$key" '.common.docs[$k] // empty' "$STEPS_JSON" 2>/dev/null)"
+  [[ -n "$v" && "$v" != "null" ]] || die "spec-runner-core: steps.json に common.docs.$key がありません"
+  echo "$v"
+}
+
+# ============================================================
+# 2) 引数解析
+# ============================================================
 MODE="phase"
 JSON_MODE=false
 GATE_GRADE=""
-while [[ $# -gt 0 ]]; do
-  case "$1" in
-    --phase)  MODE="phase" ;;
-    --json)   JSON_MODE=true ;;
-    --gate)   MODE="gate"; GATE_GRADE="${2:-}"; shift ;;
-    --status) MODE="status" ;;
-    --grade)  MODE="grade" ;;
-    *)        [[ "$MODE" == "gate" && -z "$GATE_GRADE" ]] && GATE_GRADE="$1" ;;
-  esac
-  shift
-done
-
-# === 共通: lock / grade / branch を一度だけ読む ===
+parse_args() {
+  while [[ $# -gt 0 ]]; do
+    case "$1" in
+      --phase)  MODE="phase" ;;
+      --json)   JSON_MODE=true ;;
+      --gate)   MODE="gate"; GATE_GRADE="${2:-}"; shift ;;
+      --status) MODE="status" ;;
+      --grade)  MODE="grade" ;;
+      *)        [[ "$MODE" == "gate" && -z "$GATE_GRADE" ]] && GATE_GRADE="$1" ;;
+    esac
+    shift
+  done
+}
+parse_args "$@"
+
+# ============================================================
+# 3) 前提チェック & 状態ロード（1回だけ）
+# ============================================================
+require_cmd jq
+require_file "$PROJECT_JSON"
+require_file "$STEPS_JSON"
+require_file "$LOCK_FILE"
+require_file "$GRADE_FILE"
+
 has_charter_lock=0
 has_domain_lock=0
 has_arch_lock=0
 has_infra_lock=0
-if [[ -f "$LOCK_FILE" ]] && command -v jq >/dev/null 2>&1; then
-  [[ "$(jq -r '.charter.completed // false' "$LOCK_FILE" 2>/dev/null)" == "true" ]] && has_charter_lock=1
-  [[ "$(jq -r '.domain.completed // false' "$LOCK_FILE" 2>/dev/null)" == "true" ]] && has_domain_lock=1
-  [[ "$(jq -r '.architecture.completed // false' "$LOCK_FILE" 2>/dev/null)" == "true" ]] && has_arch_lock=1
-  [[ "$(jq -r '.infra.completed // false' "$LOCK_FILE" 2>/dev/null)" == "true" ]] && has_infra_lock=1
-fi
-
-grade="LOOP1"
-if [[ -f ".spec-runner/grade-history.json" ]] && command -v jq >/dev/null 2>&1; then
-  grade=$(jq -r '.current_grade // "LOOP1"' .spec-runner/grade-history.json 2>/dev/null || echo "LOOP1")
-fi
-
-branch=$(git branch --show-current 2>/dev/null || echo "")
-branch_prefix="feature"
-test_dir="tests"
-test_pattern="*.spec.*"
-if [[ -f "$PROJECT_JSON" ]] && command -v jq >/dev/null 2>&1; then
-  p=$(jq -r '.naming.branch_prefix // empty' "$PROJECT_JSON" 2>/dev/null)
-  [[ -n "$p" ]] && branch_prefix="$p"
-  d=$(jq -r '.test_design.dir // empty' "$PROJECT_JSON" 2>/dev/null)
-  [[ -n "$d" ]] && test_dir="$d"
-  pat=$(jq -r '.test_design.pattern // empty' "$PROJECT_JSON" 2>/dev/null)
-  [[ -n "$pat" ]] && test_pattern="$pat"
-fi
+grade=""
+branch=""
+test_dir=""
+test_pattern=""
+branch_prefix=""
+uc_id_re=""
+other_work_pattern=""
 on_uc_branch=0
 on_other_work_branch=0
 current_uc_id=""
-other_work_pattern="work|infra|cicd"
-if [[ -f "$PROJECT_JSON" ]] && command -v jq >/dev/null 2>&1; then
-  ow=$(jq -r '.naming.other_work_prefixes[]? // empty' "$PROJECT_JSON" 2>/dev/null | tr '\n' '|' | sed 's/|$//')
-  [[ -n "$ow" ]] && other_work_pattern="$ow"
-fi
-if [[ "$branch" =~ ^${branch_prefix}/UC-[0-9]{3}- ]]; then
-  on_uc_branch=1
-  current_uc_id="${branch#*/}"
-elif [[ "$branch" =~ ^${branch_prefix}/(${other_work_pattern})/ ]]; then
-  on_other_work_branch=1
-fi
 
-# === ゲート確認モード ===
-run_gate() {
-  exit_error() { echo "GATE: $1" >&2; exit 1; }
-  GRD="${GATE_GRADE:-$grade}"
-  [[ -f "$LOCK_FILE" ]] || exit_error "phase-locks.json が存在しません"
-  command -v jq >/dev/null 2>&1 || exit_error "jq がインストールされていません（例: brew install jq）"
-
-  check_required_paths() {
-    local key="$1"
-    local list
-    if [[ -f "$PROJECT_JSON" ]]; then
-      list=$(jq -r --arg k "$key" '.required_docs[$k][]? // empty' "$PROJECT_JSON" 2>/dev/null)
-    fi
-    if [[ -z "$list" ]]; then return 1; fi
-    while IFS= read -r path; do
-      [[ -z "$path" ]] && continue
-      if [[ -f "$path" ]]; then
-        :
-      elif [[ -d "$path" ]]; then
-        count=$(find "$path" -maxdepth 1 -name "*.md" 2>/dev/null | wc -l | tr -d ' ')
-        [[ "${count:-0}" -ge 1 ]] || exit_error "必須: $path に 1 件以上の .md がありません"
-      else
-        exit_error "必須: $path が存在しません"
-      fi
-    done <<< "$list"
-    return 0
-  }
+load_state() {
+  jq -e '.charter.completed == true' "$LOCK_FILE" >/dev/null 2>&1 && has_charter_lock=1
+  jq -e '.domain.completed == true' "$LOCK_FILE" >/dev/null 2>&1 && has_domain_lock=1
+  jq -e '.architecture.completed == true' "$LOCK_FILE" >/dev/null 2>&1 && has_arch_lock=1
+  jq -e '.infra.completed == true' "$LOCK_FILE" >/dev/null 2>&1 && has_infra_lock=1
+
+  grade=$(jq -r '.current_grade' "$GRADE_FILE")
+  [[ -n "$grade" && "$grade" != "null" ]] || die "spec-runner-core: grade-history.json の current_grade が未設定です"
 
-  if check_required_paths "charter"; then :; else
-    [[ -f "docs/01_憲章/憲章.md" ]] || exit_error "憲章.md が存在しません"
+  branch=$(git branch --show-current 2>/dev/null || echo "")
+
+  branch_prefix=$(jq -r '.naming.branch_prefix' "$PROJECT_JSON")
+  [[ -n "$branch_prefix" && "$branch_prefix" != "null" ]] || die "spec-runner-core: project.json naming.branch_prefix が未設定です"
+  uc_id_re=$(jq -r '.naming.uc_id_pattern' "$PROJECT_JSON")
+  [[ -n "$uc_id_re" && "$uc_id_re" != "null" ]] || die "spec-runner-core: project.json naming.uc_id_pattern が未設定です"
+  other_work_pattern=$(jq -r '.naming.other_work_prefixes | join("|")' "$PROJECT_JSON")
+  [[ -n "$other_work_pattern" ]] || die "spec-runner-core: project.json naming.other_work_prefixes が空です"
+
+  test_dir=$(jq -r '.test_design.dir' "$PROJECT_JSON")
+  [[ -n "$test_dir" && "$test_dir" != "null" ]] || die "spec-runner-core: project.json test_design.dir が未設定です"
+  test_pattern=$(jq -r '.test_design.pattern' "$PROJECT_JSON")
+  [[ -n "$test_pattern" && "$test_pattern" != "null" ]] || die "spec-runner-core: project.json test_design.pattern が未設定です"
+  require_uc_prefixed_tests=1
+  rq="$(jq -r '.test_design.require_uc_prefixed_tests // true' "$PROJECT_JSON")"
+  [[ "$rq" == "false" || "$rq" == "0" ]] && require_uc_prefixed_tests=0
+
+  if [[ "$branch" =~ ^${branch_prefix}/(${uc_id_re})- ]]; then
+    on_uc_branch=1
+    current_uc_id="${BASH_REMATCH[1]}"
+  elif [[ "$branch" =~ ^${branch_prefix}/(${other_work_pattern})/ ]]; then
+    on_other_work_branch=1
   fi
-  if [[ "$GRD" == "LOOP1" ]]; then
-    [[ "$(jq -r '.charter.completed // false' "$LOCK_FILE" 2>/dev/null)" == "true" ]] || exit_error "Phase 0 未完了（phase-locks.json の charter.completed）"
-    jq -e '.charter.reviewed_by' "$LOCK_FILE" >/dev/null 2>&1 || exit_error "憲章に署名がありません（charter.reviewed_by）"
-    echo "Phase 0: OK"
+}
+load_state
+
+# UC ブランチで「実装に進める」ためのテスト存在判定（TDD: 当該 UC 用 spec を先に書かせる）
+uc_branch_has_tests_ready_for_implement() {
+  [[ -d "$test_dir" ]] || return 1
+  if [[ $require_uc_prefixed_tests -eq 0 ]]; then
+    [[ -n "$(find "$test_dir" -type f -name "$test_pattern" 2>/dev/null | head -1)" ]]
+    return $?
   fi
-  if [[ "$GRD" != "LOOP1" ]]; then
-    [[ "$(jq -r '.domain.completed // false' "$LOCK_FILE" 2>/dev/null)" == "true" ]] || exit_error "Phase 1 未完了"
-    if check_required_paths "domain"; then :; else
-      for doc in ユビキタス言語辞書 ドメインモデル 集約; do
-        [[ -f "docs/02_ドメイン設計/${doc}.md" ]] || exit_error "${doc}.md が存在しません"
-      done
-    fi
-    echo "Phase 1: OK"
-    [[ "$(jq -r '.architecture.completed // false' "$LOCK_FILE" 2>/dev/null)" == "true" ]] || exit_error "Phase 2 未完了"
-    if check_required_paths "architecture"; then :; else
-      [[ -f "docs/03_アーキテクチャ/パターン選定.md" ]] || exit_error "パターン選定.md が存在しません"
-      [[ -f "docs/03_アーキテクチャ/インフラ方針.md" ]] || exit_error "インフラ方針.md が存在しません"
-      [[ $(find "docs/03_アーキテクチャ/設計判断記録/" -name "*.md" 2>/dev/null | wc -l) -gt 0 ]] || exit_error "ADR が 1 件もありません"
+  [[ -n "$current_uc_id" ]] || return 1
+  local f bn
+  while IFS= read -r f; do
+    [[ -z "$f" ]] && continue
+    bn=$(basename "$f")
+    [[ "$bn" == "${current_uc_id}-"* ]] || continue
+    [[ "$bn" == $test_pattern ]] || continue
+    return 0
+  done < <(find "$test_dir" -type f 2>/dev/null)
+  return 1
+}
+
+# ============================================================
+# 4) ゲート関連（小関数）
+# ============================================================
+gate_error() { echo "GATE: $1" >&2; exit 1; }
+
+resolve_steps_token() {
+  local p="$1"
+  [[ "$p" != steps:* ]] && { echo "$p"; return 0; }
+  local token keypart suffix base
+  token="${p#steps:}"
+  keypart="${token%%/*}"
+  suffix=""
+  [[ "$token" == *"/"* ]] && suffix="/${token#*/}"
+  base="$(jq -r --arg k "$keypart" '.common.docs[$k] // empty' "$STEPS_JSON")"
+  [[ -n "$base" && "$base" != "null" ]] || gate_error "steps.json に common.docs.$keypart がありません（required_docs の $p を解決できません）"
+  echo "${base}${suffix}"
+}
+
+get_required_docs_list() {
+  local key="$1"
+  jq -r --arg k "$key" '.required_docs[$k][]?' "$PROJECT_JSON"
+}
+
+assert_paths_exist() {
+  local paths="$1"
+  while IFS= read -r p; do
+    [[ -z "$p" || "$p" == "null" ]] && continue
+    p="$(resolve_steps_token "$p")"
+    if [[ -f "$p" ]]; then
+      :
+    elif [[ -d "$p" ]]; then
+      count=$(find "$p" -maxdepth 1 -name "*.md" 2>/dev/null | wc -l | tr -d ' ')
+      [[ "${count:-0}" -ge 1 ]] || gate_error "必須: $p に 1 件以上の .md がありません"
+    else
+      gate_error "必須: $p が存在しません"
     fi
-    echo "Phase 2: OK"
+  done <<< "$paths"
+}
+
+gate_charter() {
+  local list
+  list="$(get_required_docs_list "charter")"
+  [[ -n "$list" ]] || gate_error "project.json の required_docs.charter が未設定です"
+  assert_paths_exist "$list"
+  if [[ "$1" == "LOOP1" ]]; then
+    jq -e '.charter.completed == true' "$LOCK_FILE" >/dev/null 2>&1 || gate_error "Phase 0 未完了（phase-locks.json の charter.completed）"
+    jq -e '.charter.reviewed_by' "$LOCK_FILE" >/dev/null 2>&1 || gate_error "憲章に署名がありません（charter.reviewed_by）"
+    echo "Phase 0: OK"
   fi
-  if [[ "$GRD" == "A" ]]; then
-    [[ "$(jq -r '.infra.completed // false' "$LOCK_FILE" 2>/dev/null)" == "true" ]] || exit_error "Grade A: インフラ設計未完了"
-    if check_required_paths "grade_a"; then :; else
-      [[ -f "docs/04_インフラ設計/schema.dbml" ]] || exit_error "Grade A 必須: docs/04_インフラ設計/schema.dbml が存在しません"
-    fi
-    echo "Phase 4 (Grade A): OK"
+}
+
+gate_domain_and_arch() {
+  local grd="$1"
+  [[ "$grd" == "LOOP1" ]] && return 0
+
+  jq -e '.domain.completed == true' "$LOCK_FILE" >/dev/null 2>&1 || gate_error "Phase 1 未完了"
+  list="$(get_required_docs_list "domain")"
+  [[ -n "$list" ]] || gate_error "project.json の required_docs.domain が未設定です"
+  assert_paths_exist "$list"
+  echo "Phase 1: OK"
+
+  jq -e '.architecture.completed == true' "$LOCK_FILE" >/dev/null 2>&1 || gate_error "Phase 2 未完了"
+  list="$(get_required_docs_list "architecture")"
+  [[ -n "$list" ]] || gate_error "project.json の required_docs.architecture が未設定です"
+  assert_paths_exist "$list"
+  echo "Phase 2: OK"
+}
+
+gate_infra_grade_a() {
+  [[ "$1" != "A" ]] && return 0
+  jq -e '.infra.completed == true' "$LOCK_FILE" >/dev/null 2>&1 || gate_error "Grade A: インフラ設計未完了"
+  list="$(get_required_docs_list "grade_a")"
+  [[ -n "$list" ]] || gate_error "project.json の required_docs.grade_a が未設定です（Grade A 時必須）"
+  assert_paths_exist "$list"
+  echo "Phase 4 (Grade A): OK"
+}
+
+gate_uc_openapi_and_tests() {
+  local grd="$1"
+  [[ "$grd" != "A" && "$grd" != "B" ]] && return 0
+
+  uc_count=$(find docs/02_ユースケース仕様 -mindepth 2 -maxdepth 2 -name "UC-*.md" 2>/dev/null | wc -l)
+  if [[ "${uc_count:-0}" -gt 0 ]]; then
+    uc_reviewed_count=$(jq '.uc_reviewed | length' "$LOCK_FILE")
+    [[ "${uc_reviewed_count:-0}" -gt 0 ]] || gate_error "Gate 3: uc_reviewed に少なくとも1件の UC 識別子を登録してください"
+    list="$(get_required_docs_list "gate3_openapi")"
+    [[ -n "$list" ]] || gate_error "project.json の required_docs.gate3_openapi が未設定です"
+    assert_paths_exist "$list"
+    echo "Gate 3 (UC+OpenAPI): OK"
   fi
-  if [[ "$GRD" == "A" || "$GRD" == "B" ]]; then
-    uc_count=$(find docs/05_ユースケース仕様 -mindepth 2 -maxdepth 2 -name "UC-*.md" 2>/dev/null | wc -l)
-    if [[ "${uc_count:-0}" -gt 0 ]]; then
-      uc_reviewed_count=$(jq -r '.uc_reviewed // [] | length' "$LOCK_FILE" 2>/dev/null || echo 0)
-      [[ "${uc_reviewed_count:-0}" -gt 0 ]] || exit_error "Gate 3: uc_reviewed に少なくとも1件の UC 識別子を登録してください"
-      if check_required_paths "gate3_openapi"; then :; else
-        [[ -f "docs/06_API仕様/openapi.yaml" ]] || exit_error "Gate 3: docs/06_API仕様/openapi.yaml が存在しません"
-      fi
-      echo "Gate 3 (UC+OpenAPI): OK"
-    fi
-    test_design_ok=0
-    [[ "$(jq -r '.test_design.completed // false' "$LOCK_FILE" 2>/dev/null)" == "true" ]] && test_design_ok=1
-    if [[ $test_design_ok -eq 1 ]] || [[ -d "$test_dir" && -n "$(find "$test_dir" -type f -name "$test_pattern" 2>/dev/null | head -1)" ]]; then
-      echo "Gate 5 (テスト設計): OK"
-    fi
+
+  test_design_ok=0
+  jq -e '.test_design.completed == true' "$LOCK_FILE" >/dev/null 2>&1 && test_design_ok=1
+  if [[ $test_design_ok -eq 1 ]] || [[ -d "$test_dir" && -n "$(find "$test_dir" -type f -name "$test_pattern" 2>/dev/null | head -1)" ]]; then
+    echo "Gate 5 (テスト設計): OK"
   fi
-  if [[ "$GRD" == "A" || "$GRD" == "B" || "$GRD" == "C" ]]; then
-    if [[ -f ".spec-runner/scripts/test/require-tests-green.sh" ]]; then
-      .spec-runner/scripts/test/require-tests-green.sh 2>/dev/null && echo "Gate 6 (テスト通過): OK" || true
-    elif [[ -f "docker-compose.yml" ]] || [[ -f "compose.yml" ]]; then
-      docker compose run --rm app npm test 2>/dev/null && echo "Gate 6 (テスト通過): OK" || true
-    elif [[ -f "package.json" ]]; then
-      npm test 2>/dev/null && echo "Gate 6 (テスト通過): OK" || true
-    fi
+}
+
+gate_tests_green_soft() {
+  local grd="$1"
+  [[ "$grd" != "A" && "$grd" != "B" && "$grd" != "C" ]] && return 0
+
+  if [[ -f ".spec-runner/scripts/test/require-tests-green.sh" ]]; then
+    .spec-runner/scripts/test/require-tests-green.sh 2>/dev/null && echo "Gate 6 (テスト通過): OK" || true
   fi
+}
+
+# === ゲート確認モード ===
+run_gate() {
+  GRD="${GATE_GRADE:-$grade}"
+
+  gate_charter "$GRD"
+  gate_domain_and_arch "$GRD"
+  gate_infra_grade_a "$GRD"
+  gate_uc_openapi_and_tests "$GRD"
+  gate_tests_green_soft "$GRD"
+
   echo "ゲート確認: 通過"
 }
 
@@ -162,62 +262,92 @@ run_phase() {
   phase_name_ja=""
   command=""
   command_file=""
+  step_id=""
+  step_commands="[]"
+  check_command=""
+  feature_dir=""
+  feature_spec=""
+
+  resolve_step() {
+    local sid="$1"
+    step_id="$sid"
+    command=$(jq -r --arg id "$sid" '.steps[]? | select(.id==$id) | .name_ja' "$STEPS_JSON")
+    local md
+    md=$(jq -r --arg id "$sid" '.steps[]? | select(.id==$id) | .md_file' "$STEPS_JSON")
+    [[ -n "$command" && "$command" != "null" ]] || die "spec-runner-core: steps.json に id=$sid の name_ja がありません"
+    [[ -n "$md" && "$md" != "null" ]] || die "spec-runner-core: steps.json に id=$sid の md_file がありません"
+    command_file="$STEPS_DIR/$md"
+    step_commands=$(jq -c --arg id "$sid" '.steps[]? | select(.id==$id) | .commands' "$STEPS_JSON")
+    [[ -n "$step_commands" && "$step_commands" != "null" ]] || die "spec-runner-core: steps.json に id=$sid の commands がありません"
+    check_command=$(jq -r '.common.commands.check' "$STEPS_JSON")
+    [[ -n "$check_command" && "$check_command" != "null" ]] || die "spec-runner-core: steps.json に common.commands.check がありません"
+  }
+
+  if [[ $on_uc_branch -eq 1 ]] && [[ -n "$current_uc_id" ]]; then
+    for f in docs/02_ユースケース仕様/*/"${current_uc_id}-"*.md; do
+      [[ -f "$f" ]] && feature_spec="$f" && feature_dir="$(dirname "$f")" && break
+    done
+  fi
+
+  uc_count_total=$(find docs/02_ユースケース仕様 -mindepth 2 -maxdepth 2 -name "UC-*.md" 2>/dev/null | wc -l | tr -d ' ')
+  uc_count_total=${uc_count_total:-0}
 
   if [[ $has_charter_lock -eq 0 ]]; then
-    phase=0; phase_name_ja="憲章策定"; command="憲章"; command_file="$STEPS_DIR/憲章.md"
-  elif [[ $has_domain_lock -eq 0 ]]; then
-    phase=1; phase_name_ja="ドメイン設計"; command="ドメイン設計"; command_file="$STEPS_DIR/ドメイン設計.md"
-  elif [[ $has_arch_lock -eq 0 ]]; then
-    phase=2; phase_name_ja="アーキテクチャ選択"; command="実装計画"; command_file="$STEPS_DIR/実装計画.md"
+    phase=0; phase_name_ja="憲章策定"; resolve_step "charter"
+  elif [[ $has_domain_lock -eq 0 && ${uc_count_total} -gt 0 && $on_uc_branch -eq 0 ]]; then
+    phase=2; phase_name_ja="ドメイン設計"; resolve_step "domain"
+  elif [[ $has_arch_lock -eq 0 && $has_domain_lock -eq 1 ]]; then
+    phase=3; phase_name_ja="アーキテクチャ選択"; resolve_step "architecture_plan"
   elif [[ $on_uc_branch -eq 1 ]]; then
     uc_spec=""
     if [[ -n "$current_uc_id" ]]; then
-      for f in docs/05_ユースケース仕様/*/"${current_uc_id}.md"; do [[ -f "$f" ]] && uc_spec="$f" && break; done
+      for f in docs/02_ユースケース仕様/*/"${current_uc_id}-"*.md; do [[ -f "$f" ]] && uc_spec="$f" && break; done
     fi
     if [[ -z "$uc_spec" ]]; then
-      phase=3; phase_name_ja="UC 仕様書"; command="仕様策定"; command_file="$STEPS_DIR/仕様策定.md"
+      phase=1; phase_name_ja="ユースケース仕様"; resolve_step "uc_spec"
     else
+      feature_spec="$uc_spec"
+      feature_dir="$(dirname "$uc_spec")"
       uc_dir=$(basename "$uc_spec" .md)
       reviewed=0
-      [[ -f "$LOCK_FILE" ]] && command -v jq >/dev/null 2>&1 && jq -e --arg u "$uc_dir" '.uc_reviewed[]? == $u' "$LOCK_FILE" 2>/dev/null | grep -q true && reviewed=1
+      jq -e --arg u "$uc_dir" '.uc_reviewed[]? == $u' "$LOCK_FILE" 2>/dev/null | grep -q true && reviewed=1
       if [[ $reviewed -eq 0 ]]; then
-        phase=3; phase_name_ja="UC 仕様書（レビュー通過まで）"; command="曖昧さ解消"; command_file="$STEPS_DIR/曖昧さ解消.md"
+        phase=1; phase_name_ja="ユースケース仕様（レビュー通過まで）"; resolve_step "clarify"
       else
         if [[ "$grade" == "A" ]] && [[ $has_infra_lock -eq 0 ]]; then
-          phase=4; phase_name_ja="インフラ詳細設計"; command="実装計画"; command_file="$STEPS_DIR/実装計画.md"
+          phase=4; phase_name_ja="インフラ詳細設計"; resolve_step "infra_plan"
         else
-          has_tests=0
-          [[ -d "$test_dir" ]] && [[ -n "$(find "$test_dir" -type f -name "$test_pattern" 2>/dev/null | head -1)" ]] && has_tests=1
-          if [[ $has_tests -eq 0 ]]; then
-            phase=5; phase_name_ja="テスト設計"; command="テスト設計"; command_file="$STEPS_DIR/テスト設計.md"
+          if uc_branch_has_tests_ready_for_implement; then
+            phase=6; phase_name_ja="実装"; resolve_step "implement"
           else
-            phase=6; phase_name_ja="実装"; command="実装"; command_file="$STEPS_DIR/実装.md"
+            phase=5; phase_name_ja="テスト設計（当該 UC の spec 必須）"; resolve_step "test_design"
           fi
         fi
       fi
     fi
   else
     if [[ $on_other_work_branch -eq 1 ]]; then
-      phase=3; phase_name_ja="その他作業（CI/CD・インフラ等）"; command="その他作業"; command_file="$STEPS_DIR/その他作業.md"
+      phase=1; phase_name_ja="その他作業（CI/CD・インフラ等）"; resolve_step "other_work"
+    elif [[ $has_domain_lock -eq 0 ]]; then
+      phase=1; phase_name_ja="ユースケース開始（仕様策定）"; resolve_step "uc_spec"
     elif [[ $has_arch_lock -eq 0 ]]; then
-      phase=2; phase_name_ja="アーキテクチャ選択"; command="実装計画"; command_file="$STEPS_DIR/実装計画.md"
+      phase=3; phase_name_ja="アーキテクチャ選択"; resolve_step "architecture_plan"
     else
-      phase=3; phase_name_ja="UC 開始（仕様策定）"; command="仕様策定"; command_file="$STEPS_DIR/仕様策定.md"
+      phase=1; phase_name_ja="ユースケース開始（仕様策定）"; resolve_step "uc_spec"
     fi
   fi
 
   if [[ "$JSON_MODE" == true ]]; then
-    if command -v jq >/dev/null 2>&1; then
-      jq -cn --argjson phase $phase --arg name "$phase_name_ja" --arg cmd "$command" --arg file "$command_file" --arg grade "$grade" \
-        '{phase:$phase, phase_name_ja:$name, command:$cmd, command_file:$file, grade:$grade}'
-    else
-      echo "{\"phase\":$phase,\"phase_name_ja\":\"$phase_name_ja\",\"command\":\"$command\",\"command_file\":\"$command_file\",\"grade\":\"$grade\"}"
-    fi
+    jq -cn --argjson phase "$phase" --arg name "$phase_name_ja" --arg step_id "$step_id" --arg cmd "$command" --arg file "$command_file" --arg grade "$grade" \
+      --arg check "$check_command" --argjson cmds "$step_commands" \
+      --arg feature_dir "$feature_dir" --arg feature_spec "$feature_spec" \
+      '{phase:$phase, phase_name_ja:$name, step_id:$step_id, command:$cmd, command_file:$file, grade:$grade, check_command:$check, step_commands:$cmds, feature_dir:$feature_dir, feature_spec:$feature_spec}'
   else
     echo "現在フェーズ: Phase $phase（$phase_name_ja）"
     echo "推奨コマンド: $command"
     echo "コマンドファイル: $command_file"
     echo "グレード: $grade"
+    echo "チェック（毎回）: $check_command"
     if [[ $on_uc_branch -eq 0 ]] && [[ -n "$branch" ]]; then
       echo ""
       echo "注意: main 等のままの修正は危険です。UC 用ブランチを作成してから作業してください（仕様策定ステップでブランチ作成）。"
@@ -231,14 +361,13 @@ run_status() {
   echo "グレード: $grade"
   echo ""
   echo "Lock（.spec-runner/phase-locks.json）:"
-  if [[ -f "$LOCK_FILE" ]] && command -v jq >/dev/null 2>&1; then
-    for sec in charter domain architecture infra test_design; do
-      val=$(jq -r --arg s "$sec" '.[$s].completed // false' "$LOCK_FILE" 2>/dev/null)
-      [[ "$val" == "true" ]] && echo "  ✓ $sec" || echo "  - $sec"
-    done
-  else
-    echo "  phase-locks.json が存在しないか jq がインストールされていません"
-  fi
+  for sec in charter domain architecture infra test_design; do
+    if jq -e --arg s "$sec" '.[$s].completed == true' "$LOCK_FILE" >/dev/null 2>&1; then
+      echo "  ✓ $sec"
+    else
+      echo "  - $sec"
+    fi
+  done
 }
 
 # === グレード判定チェックリスト ===
@@ -250,7 +379,7 @@ run_grade() {
   echo "  → 新規UC: STEP 2 へ"
   echo ""
   echo "STEP 2: Grade B 仮置きで UC 草稿を作成する"
-  echo "  → AI と対話して UC 仕様書の草稿（status: draft）を作成する"
+  echo "  → AI と対話して UC 仕様書の草稿を作成する"
   echo "  → この時点ではまだブランチ作成・コミット不要"
   echo ""
   echo "STEP 3: UC 草稿を見て Grade を確定する"

package/templates/.spec-runner/scripts/test/require-tests-green.sh

@@ -1,75 +1,21 @@
 #!/usr/bin/env bash
 # テストコマンドを実行し、すべてグリーンでないと終了コード 1 を返す。
-# 実装ステップの「完了検証」で必須。コマンドは .spec-runner/project.json の test_command.run で指定。
-# 未設定時はプロジェクトを検出して候補を実行し、設定を促す。
+# コマンドは .spec-runner/project.json の test_command.run のみ（必須）。
 
 set -e
 REPO_ROOT="${REPO_ROOT:-$(git rev-parse --show-toplevel 2>/dev/null || echo ".")}"
 cd "$REPO_ROOT"
 SPEC_RUNNER="${REPO_ROOT}/.spec-runner"
 PROJECT_JSON="${SPEC_RUNNER}/project.json"
-LEGACY_TEST_JSON="${SPEC_RUNNER}/test-command.json"
+command -v jq >/dev/null 2>&1 || { echo "require-tests-green: jq が必要です（brew install jq）" >&2; exit 1; }
+[[ -f "$PROJECT_JSON" ]] || { echo "require-tests-green: $PROJECT_JSON がありません" >&2; exit 1; }
 
-# 設定を読む: project.json の test_command.run → 後方互換で test-command.json の run
-get_run_command() {
-  local run=""
-  if [[ -f "$PROJECT_JSON" ]]; then
-    if command -v jq >/dev/null 2>&1; then
-      run=$(jq -r '.test_command.run // empty' "$PROJECT_JSON" 2>/dev/null)
-    else
-      run=$(grep -o '"run"[[:space:]]*:[[:space:]]*"[^"]*"' "$PROJECT_JSON" 2>/dev/null | head -1 | sed 's/.*"\([^"]*\)" *$/\1/')
-    fi
-  fi
-  if [[ -z "$run" ]] && [[ -f "$LEGACY_TEST_JSON" ]]; then
-    if command -v jq >/dev/null 2>&1; then
-      run=$(jq -r '.run // empty' "$LEGACY_TEST_JSON" 2>/dev/null)
-    else
-      run=$(grep -o '"run"[[:space:]]*:[[:space:]]*"[^"]*"' "$LEGACY_TEST_JSON" 2>/dev/null | sed 's/.*"\([^"]*\)" *$/\1/')
-    fi
-  fi
-  echo -n "$run"
-}
-
-# 未設定時に検出して実行するコマンドを決める
-detect_and_run() {
-  if [[ -f "package.json" ]] && grep -q '"test"' package.json 2>/dev/null; then
-    echo "npm test"
-    return
-  fi
-  if [[ -f "pyproject.toml" ]]; then
-    if command -v poetry >/dev/null 2>&1; then
-      echo "poetry run pytest"
-    else
-      echo "pytest"
-    fi
-    return
-  fi
-  if [[ -f "go.mod" ]]; then
-    echo "go test ./..."
-    return
-  fi
-  if [[ -f "docker-compose.yml" ]] || [[ -f "docker-compose.yaml" ]]; then
-    # サービス名は app を仮定（未設定時は検出のみで実行しない）
-    echo ""
-    return
-  fi
-  echo ""
+RUN_CMD=$(jq -r '.test_command.run' "$PROJECT_JSON")
+[[ -n "$RUN_CMD" && "$RUN_CMD" != "null" ]] || {
+  echo "require-tests-green: project.json に test_command.run を設定してください。" >&2
+  exit 1
 }
 
-RUN_CMD=$(get_run_command)
-
-# 未設定なら検出
-if [[ -z "$RUN_CMD" ]]; then
-  RUN_CMD=$(detect_and_run)
-  if [[ -z "$RUN_CMD" ]]; then
-    echo "require-tests-green: テストコマンドが未設定です。.spec-runner/project.json の test_command.run を設定するか、初期化（init-project.sh）を実行してください。" >&2
-    echo "  例: project.json に \"test_command\": {\"run\": \"npm test\"} を追加" >&2
-    exit 1
-  fi
-  echo "require-tests-green: project.json に test_command がありません。検出したコマンドで実行します: $RUN_CMD" >&2
-  echo "  恒久設定: 初期化で設定するか、project.json に test_command.run を追加してください。" >&2
-fi
-
 echo "require-tests-green: テストを実行しています（$RUN_CMD）..."
 if eval "$RUN_CMD"; then
   echo "require-tests-green: すべてグリーンです。実装完了の条件（テスト）を満たしています。"
@@ -77,7 +23,5 @@ if eval "$RUN_CMD"; then
 else
   echo "" >&2
   echo "require-tests-green: テストが失敗しました。実装完了とみなせません。" >&2
-  echo "  テストを修正し、再度 .spec-runner/scripts/test/require-tests-green.sh を実行してください。" >&2
-  echo "  コマンドを変更する場合は .spec-runner/project.json の test_command.run を編集するか、初期化（init-project.sh）を実行してください。" >&2
   exit 1
 fi