ensemble-claude 0.3.0__py3-none-any.whl

ensemble/templates/scripts/worktree-merge.sh

@@ -0,0 +1,194 @@
+#!/bin/bash
+# scripts/worktree-merge.sh
+# Ensembleのworktreeをメインブランチにマージする
+
+set -euo pipefail
+
+# 色定義
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+BLUE='\033[0;34m'
+NC='\033[0m' # No Color
+
+# ログ関数
+log_info() { echo -e "${GREEN}[INFO]${NC} $1"; }
+log_warn() { echo -e "${YELLOW}[WARN]${NC} $1"; }
+log_error() { echo -e "${RED}[ERROR]${NC} $1"; }
+log_debug() { echo -e "${BLUE}[DEBUG]${NC} $1"; }
+
+# 使用方法
+usage() {
+    echo "Usage: $0 <worktree-path> [main-branch]"
+    echo ""
+    echo "Arguments:"
+    echo "  worktree-path    マージするworktreeのパス"
+    echo "  main-branch      マージ先ブランチ（デフォルト: main）"
+    echo ""
+    echo "Options:"
+    echo "  --dry-run        実際にはマージせず、コンフリクトのみチェック"
+    echo "  --auto-resolve   自動解決可能なコンフリクトを解決"
+    echo ""
+    echo "Example:"
+    echo "  $0 ../ensemble-feature-auth"
+    echo "  $0 ../ensemble-feature-auth main --dry-run"
+    exit 1
+}
+
+# 引数チェック
+if [ $# -lt 1 ]; then
+    usage
+fi
+
+WORKTREE_PATH="$1"
+MAIN_BRANCH="${2:-main}"
+DRY_RUN=false
+AUTO_RESOLVE=false
+
+# オプション解析
+for arg in "$@"; do
+    case $arg in
+        --dry-run)
+            DRY_RUN=true
+            shift
+            ;;
+        --auto-resolve)
+            AUTO_RESOLVE=true
+            shift
+            ;;
+    esac
+done
+
+# worktreeの存在確認
+if [ ! -d "$WORKTREE_PATH" ]; then
+    log_error "Worktree not found: ${WORKTREE_PATH}"
+    exit 1
+fi
+
+# worktreeのブランチ名を取得
+WORKTREE_PATH_ABS=$(cd "$WORKTREE_PATH" && pwd)
+BRANCH_NAME=$(cd "$WORKTREE_PATH" && git rev-parse --abbrev-ref HEAD)
+
+log_info "Merging worktree: ${WORKTREE_PATH_ABS}"
+log_info "Branch: ${BRANCH_NAME}"
+log_info "Target: ${MAIN_BRANCH}"
+
+# メインリポジトリに移動
+PROJECT_ROOT=$(git rev-parse --show-toplevel)
+cd "$PROJECT_ROOT"
+
+# メインブランチに切り替え
+log_info "Switching to ${MAIN_BRANCH}..."
+git checkout "$MAIN_BRANCH"
+
+# 最新の変更をpull
+log_info "Pulling latest changes..."
+git pull --ff-only 2>/dev/null || log_warn "Could not fast-forward pull"
+
+# dry-runモード
+if [ "$DRY_RUN" = true ]; then
+    log_info "Dry-run mode: checking for conflicts..."
+
+    # マージを試行（コミットなし）
+    if git merge --no-commit --no-ff "$BRANCH_NAME" 2>/dev/null; then
+        log_info "No conflicts detected. Merge would succeed."
+        git merge --abort 2>/dev/null || true
+        exit 0
+    else
+        log_warn "Conflicts detected!"
+
+        # コンフリクトファイル一覧
+        echo ""
+        echo "Conflicting files:"
+        git diff --name-only --diff-filter=U
+        echo ""
+
+        git merge --abort 2>/dev/null || true
+        exit 1
+    fi
+fi
+
+# 実際のマージ
+log_info "Merging ${BRANCH_NAME} into ${MAIN_BRANCH}..."
+
+if git merge --no-ff "$BRANCH_NAME" -m "Merge ${BRANCH_NAME} into ${MAIN_BRANCH}"; then
+    log_info "Merge successful!"
+
+    # 統計情報
+    echo ""
+    echo "Merge statistics:"
+    git diff --stat HEAD~1
+
+    exit 0
+else
+    log_warn "Merge conflict detected!"
+
+    # コンフリクトファイル一覧
+    CONFLICT_FILES=$(git diff --name-only --diff-filter=U)
+    echo ""
+    echo "Conflicting files:"
+    echo "$CONFLICT_FILES"
+    echo ""
+
+    if [ "$AUTO_RESOLVE" = true ]; then
+        log_info "Attempting auto-resolve..."
+
+        RESOLVED=0
+        UNRESOLVED=0
+
+        for file in $CONFLICT_FILES; do
+            # 自動解決を試みる（両方の変更を保持）
+            if git checkout --ours "$file" && git add "$file"; then
+                log_info "Auto-resolved (ours): $file"
+                ((RESOLVED++))
+            else
+                log_warn "Could not auto-resolve: $file"
+                ((UNRESOLVED++))
+            fi
+        done
+
+        if [ $UNRESOLVED -eq 0 ]; then
+            git commit -m "Merge ${BRANCH_NAME} into ${MAIN_BRANCH} (auto-resolved)"
+            log_info "All conflicts resolved!"
+            exit 0
+        else
+            log_error "Some conflicts could not be resolved automatically."
+            log_error "Please resolve manually and run: git commit"
+            exit 1
+        fi
+    else
+        # コンフリクト報告を生成
+        REPORT_DIR="${PROJECT_ROOT}/queue/reports"
+        mkdir -p "$REPORT_DIR"
+        TIMESTAMP=$(date +%Y%m%d-%H%M%S)
+        REPORT_FILE="${REPORT_DIR}/conflict-${TIMESTAMP}.yaml"
+
+        cat > "$REPORT_FILE" << EOF
+type: conflict
+timestamp: $(date -Iseconds)
+worktree: ${WORKTREE_PATH_ABS}
+branch: ${BRANCH_NAME}
+main_branch: ${MAIN_BRANCH}
+conflict_files:
+EOF
+
+        for file in $CONFLICT_FILES; do
+            cat >> "$REPORT_FILE" << EOF
+  - file: ${file}
+    status: unmerged
+EOF
+        done
+
+        cat >> "$REPORT_FILE" << EOF
+
+action_required: |
+  Manual conflict resolution needed.
+  Run: git status
+  Resolve conflicts, then: git add . && git commit
+EOF
+
+        log_info "Conflict report saved to: ${REPORT_FILE}"
+        log_error "Please resolve conflicts manually."
+        exit 1
+    fi
+fi

ensemble/templates/workflows/default.yaml

@@ -0,0 +1,78 @@
+name: default
+description: |
+  標準ワークフロー。計画→実装→並列レビュー→改善の全サイクル。
+  通常の機能開発向け。
+max_iterations: 15
+cost_level: medium
+
+steps:
+  - name: plan
+    description: タスク分析と実行計画の策定
+    agent: conductor
+    mode: plan
+    thinking: false
+    outputs:
+      - plan.md
+      - task-breakdown.md
+    transitions:
+      - condition: plan_approved
+        next_step: execute
+      - condition: needs_clarification
+        next_step: PAUSE
+
+  - name: execute
+    description: |
+      計画に基づき実行。タスク規模に応じて
+      subagent/tmux並列/worktree分離を自動選択。
+    agent: conductor
+    mode: execute
+    allow_parallel: true
+    allow_worktree: true
+    transitions:
+      - condition: execution_complete
+        next_step: parallel_review
+      - condition: blocked
+        next_step: plan
+
+  - name: parallel_review
+    description: アーキテクチャとセキュリティを並列でレビュー
+    parallel:
+      - name: arch-review
+        agent: reviewer
+        rules:
+          - condition: approved
+          - condition: needs_fix
+        instruction_template: |
+          アーキテクチャと設計品質に集中してレビューしてください。
+          - コード構造
+          - 依存関係の方向
+          - 命名規則
+          - SOLID原則の遵守
+
+      - name: security-review
+        agent: security-reviewer
+        rules:
+          - condition: approved
+          - condition: needs_fix
+        instruction_template: |
+          セキュリティに集中してレビューしてください。
+          - インジェクション脆弱性
+          - 認証・認可
+          - データ保護
+          - OWASP Top 10
+
+    rules:
+      - condition: all("approved")
+        next_step: improve
+      - condition: any("needs_fix")
+        next_step: execute
+
+  - name: improve
+    description: 自己改善フェーズ
+    agent: learner
+    outputs:
+      - notes/{task-id}/lessons.md
+      - notes/{task-id}/skill-candidates.md
+    transitions:
+      - condition: done
+        next_step: COMPLETE

ensemble/templates/workflows/heavy.yaml

@@ -0,0 +1,149 @@
+name: heavy
+description: |
+  重量級ワークフロー。大規模リファクタ、セキュリティ重要タスク向け。
+  5段階レビュー（アーキ、セキュリティ、パフォーマンス、テスト、統合）。
+  修正ループあり、最大25イテレーション。
+max_iterations: 25
+cost_level: high
+
+steps:
+  - name: plan
+    description: 詳細計画の策定（リスク分析含む）
+    agent: conductor
+    mode: plan
+    thinking: false
+    outputs:
+      - plan.md
+      - task-breakdown.md
+      - risk-analysis.md
+    transitions:
+      - condition: plan_approved
+        next_step: design_review
+      - condition: needs_clarification
+        next_step: PAUSE
+
+  - name: design_review
+    description: 実装前のアーキテクチャ設計レビュー
+    agent: reviewer
+    instruction_template: |
+      実装前のアーキテクチャ設計をレビューしてください。
+      - 全体構造の妥当性
+      - スケーラビリティ
+      - 依存関係の健全性
+      - 既存コードとの整合性
+    transitions:
+      - condition: approved
+        next_step: execute
+      - condition: needs_fix
+        next_step: plan
+
+  - name: execute
+    description: |
+      計画に基づき実行。大規模タスクのため
+      worktree分離を優先的に選択。
+    agent: conductor
+    mode: execute
+    allow_parallel: true
+    allow_worktree: true
+    prefer_worktree: true
+    transitions:
+      - condition: execution_complete
+        next_step: parallel_review
+      - condition: blocked
+        next_step: plan
+
+  - name: parallel_review
+    description: 5段階並列レビュー
+    parallel:
+      - name: arch-review
+        agent: reviewer
+        rules:
+          - condition: approved
+          - condition: needs_fix
+        instruction_template: |
+          アーキテクチャと設計品質を厳密にレビューしてください。
+          - コード構造と責務分離
+          - 依存関係の方向（クリーンアーキテクチャ準拠）
+          - SOLID原則の遵守
+          - 抽象化レベルの適切性
+
+      - name: security-review
+        agent: security-reviewer
+        rules:
+          - condition: approved
+          - condition: needs_fix
+        instruction_template: |
+          セキュリティを厳密にレビューしてください。
+          - OWASP Top 10（全項目チェック）
+          - 認証・認可の実装
+          - データ保護（暗号化、サニタイズ）
+          - シークレット管理
+          - 依存ライブラリの脆弱性
+
+      - name: perf-review
+        agent: reviewer
+        rules:
+          - condition: approved
+          - condition: needs_fix
+        instruction_template: |
+          パフォーマンス観点でレビューしてください。
+          - アルゴリズムの計算量
+          - メモリ使用量
+          - N+1クエリ問題
+          - キャッシュ戦略
+          - 非同期処理の適切性
+
+      - name: test-review
+        agent: reviewer
+        rules:
+          - condition: approved
+          - condition: needs_fix
+        instruction_template: |
+          テスト品質をレビューしてください。
+          - カバレッジ（80%以上必須）
+          - エッジケースの網羅
+          - テストの独立性
+          - モックの適切性
+          - 統合テストの存在
+
+      - name: integration-review
+        agent: integrator
+        rules:
+          - condition: approved
+          - condition: needs_fix
+        instruction_template: |
+          統合観点でレビューしてください。
+          - 既存機能への影響
+          - 後方互換性
+          - マイグレーション要件
+          - デプロイ手順
+
+    rules:
+      - condition: all("approved")
+        next_step: final_check
+      - condition: any("needs_fix")
+        next_step: execute
+
+  - name: final_check
+    description: 最終確認（Conductorによる総合判断）
+    agent: conductor
+    instruction_template: |
+      全レビューが承認されました。最終確認を行ってください。
+      - 全ての要件が満たされているか
+      - 残課題はないか
+      - リリースノートの内容
+    transitions:
+      - condition: approved
+        next_step: improve
+      - condition: needs_fix
+        next_step: execute
+
+  - name: improve
+    description: 自己改善フェーズ
+    agent: learner
+    outputs:
+      - notes/{task-id}/lessons.md
+      - notes/{task-id}/skill-candidates.md
+    transitions:
+      - condition: done
+        next_step: COMPLETE

ensemble/templates/workflows/simple.yaml

@@ -0,0 +1,41 @@
+name: simple
+description: |
+  軽量ワークフロー。README更新、typo修正など軽微な変更向け。
+  レビューは1回、修正ループなし。
+max_iterations: 5
+cost_level: low
+
+steps:
+  - name: plan
+    description: 簡易計画の策定
+    agent: conductor
+    mode: plan
+    thinking: false
+    outputs:
+      - plan.md
+    transitions:
+      - condition: plan_approved
+        next_step: execute
+      - condition: needs_clarification
+        next_step: PAUSE
+
+  - name: execute
+    description: タスクの直接実行
+    agent: conductor
+    mode: execute
+    allow_parallel: false
+    allow_worktree: false
+    transitions:
+      - condition: execution_complete
+        next_step: review
+      - condition: blocked
+        next_step: plan
+
+  - name: review
+    description: 簡易レビュー（1回のみ）
+    agent: reviewer
+    transitions:
+      - condition: approved
+        next_step: COMPLETE
+      - condition: needs_fix
+        next_step: execute

ensemble/templates/workflows/worktree.yaml

@@ -0,0 +1,202 @@
+name: worktree
+description: |
+  git worktree統合ワークフロー。
+  複数の独立した機能を並列開発し、最終的にメインブランチに統合する。
+  大規模タスク（パターンC）向け。
+max_iterations: 20
+cost_level: high
+
+steps:
+  - name: plan
+    description: タスク分析とworktree分割計画の策定
+    agent: conductor
+    mode: plan
+    thinking: false
+    outputs:
+      - plan.md
+      - worktree-breakdown.md
+    transitions:
+      - condition: plan_approved
+        next_step: create_worktrees
+      - condition: needs_clarification
+        next_step: PAUSE
+
+  - name: create_worktrees
+    description: |
+      計画に基づきworktreeを作成。
+      各worktreeで独立したブランチを用意。
+    agent: conductor
+    mode: execute
+    script: |
+      for branch in $WORKTREE_BRANCHES; do
+        ./scripts/worktree-create.sh "$branch" main
+      done
+    transitions:
+      - condition: worktrees_created
+        next_step: parallel_develop
+      - condition: creation_failed
+        next_step: PAUSE
+
+  - name: parallel_develop
+    description: 各worktreeで並列開発
+    parallel:
+      - name: worktree-1
+        agent: coder
+        worktree: true
+        rules:
+          - condition: complete
+          - condition: blocked
+        instruction_template: |
+          worktree内で担当機能を実装してください。
+          - TDDでテストファーストで開発
+          - コミットは細かく
+          - 完了したらqueue/reports/に報告
+
+      - name: worktree-2
+        agent: coder
+        worktree: true
+        rules:
+          - condition: complete
+          - condition: blocked
+
+      - name: worktree-3
+        agent: coder
+        worktree: true
+        rules:
+          - condition: complete
+          - condition: blocked
+
+    rules:
+      - condition: all("complete")
+        next_step: integrate
+      - condition: any("blocked")
+        next_step: resolve_blocked
+
+  - name: resolve_blocked
+    description: ブロックされたworktreeの問題を解決
+    agent: conductor
+    mode: execute
+    transitions:
+      - condition: resolved
+        next_step: parallel_develop
+      - condition: escalate
+        next_step: PAUSE
+
+  - name: integrate
+    description: 各worktreeをメインブランチに統合
+    agent: integrator
+    mode: execute
+    script: |
+      for worktree in $WORKTREE_PATHS; do
+        ./scripts/worktree-merge.sh "$worktree" main
+      done
+    transitions:
+      - condition: merge_success
+        next_step: cross_review
+      - condition: conflict_detected
+        next_step: resolve_conflict
+
+  - name: resolve_conflict
+    description: コンフリクト解決
+    agent: integrator
+    mode: execute
+    auto_resolve: true
+    transitions:
+      - condition: resolved
+        next_step: cross_review
+      - condition: needs_manual
+        next_step: escalate_conflict
+
+  - name: escalate_conflict
+    description: 手動解決が必要なコンフリクトをConductorに報告
+    agent: conductor
+    mode: execute
+    transitions:
+      - condition: manual_resolved
+        next_step: cross_review
+      - condition: abort
+        next_step: PAUSE
+
+  - name: cross_review
+    description: 相互レビュー - 各担当が他の変更をレビュー
+    parallel:
+      - name: review-1
+        agent: reviewer
+        scope: worktree-2,worktree-3
+        rules:
+          - condition: approved
+          - condition: needs_fix
+        instruction_template: |
+          自分が担当したworktree-1以外の変更をレビューしてください。
+
+      - name: review-2
+        agent: reviewer
+        scope: worktree-1,worktree-3
+        rules:
+          - condition: approved
+          - condition: needs_fix
+
+      - name: review-3
+        agent: reviewer
+        scope: worktree-1,worktree-2
+        rules:
+          - condition: approved
+          - condition: needs_fix
+
+    rules:
+      - condition: all("approved")
+        next_step: security_review
+      - condition: any("needs_fix")
+        next_step: fix_issues
+
+  - name: fix_issues
+    description: レビューで指摘された問題を修正
+    agent: conductor
+    mode: execute
+    transitions:
+      - condition: fixed
+        next_step: cross_review
+      - condition: needs_discussion
+        next_step: PAUSE
+
+  - name: security_review
+    description: 統合後のセキュリティレビュー
+    agent: security-reviewer
+    transitions:
+      - condition: approved
+        next_step: cleanup
+      - condition: needs_fix
+        next_step: fix_security
+
+  - name: fix_security
+    description: セキュリティ問題を修正
+    agent: conductor
+    mode: execute
+    transitions:
+      - condition: fixed
+        next_step: security_review
+
+  - name: cleanup
+    description: worktreeとブランチのクリーンアップ
+    agent: integrator
+    mode: execute
+    script: |
+      for worktree in $WORKTREE_PATHS; do
+        git worktree remove "$worktree"
+      done
+      for branch in $WORKTREE_BRANCHES; do
+        git branch -d "ensemble/$branch"
+      done
+    transitions:
+      - condition: done
+        next_step: improve
+
+  - name: improve
+    description: 自己改善フェーズ
+    agent: learner
+    outputs:
+      - notes/{task-id}/lessons.md
+      - notes/{task-id}/skill-candidates.md
+    transitions:
+      - condition: done
+        next_step: COMPLETE