beeops 0.1.6 → 0.1.9

package/bin/beeops.js

@@ -117,6 +117,32 @@ function checkPrerequisites() {
   return allOk;
 }
 
+// ── .gitignore management ──
+
+const GITIGNORE_ENTRIES = [
+  ".claude/tasks/",
+  ".claude/worktrees/",
+];
+
+function updateGitignore(root) {
+  const gitignorePath = path.join(root, ".gitignore");
+  let content = "";
+  if (fs.existsSync(gitignorePath)) {
+    content = fs.readFileSync(gitignorePath, "utf8");
+  }
+
+  const lines = content.split("\n");
+  const missing = GITIGNORE_ENTRIES.filter((entry) => !lines.some((line) => line.trim() === entry));
+
+  if (missing.length === 0) return;
+
+  const block = "\n# beeops runtime artifacts\n" + missing.join("\n") + "\n";
+  fs.writeFileSync(gitignorePath, content.trimEnd() + block);
+  for (const entry of missing) {
+    console.log(`  gitignore: added ${entry}`);
+  }
+}
+
 // ── Hook registration ──
 
 function resolveSettingsFile(root, mode) {
@@ -267,16 +293,19 @@ function init(opts) {
     }
   }
 
-  // 4. Register hooks (UserPromptSubmit)
+  // 4. Update .gitignore (runtime artifacts should not be tracked)
+  updateGitignore(root);
+
+  // 5. Register hooks (UserPromptSubmit)
   updateSettingsHook(root, opts.hookMode);
 
-  // 5. Save locale preference
+  // 6. Save locale preference
   const boDir = path.join(claudeDir, "beeops");
   ensureDir(boDir);
   fs.writeFileSync(path.join(boDir, "locale"), opts.locale + "\n");
   console.log(`  locale: ${opts.locale} (saved to .claude/beeops/locale)`);
 
-  // 6. Copy contexts if --with-contexts
+  // 7. Copy contexts if --with-contexts
   if (opts.withContexts) {
     const destContexts = path.join(claudeDir, "beeops", "contexts");
     copyDir(CONTEXTS_SRC, destContexts);

package/command/bo.md

@@ -86,17 +86,78 @@ done
 
 Polls for up to 120 seconds. Startup is complete when the `Claude Code` banner appears.
 
-### Step 5: Send initial prompt
+### Step 5: Resolve execution mode and send initial prompt
 
-If `$ARGUMENTS` is non-empty, pass the user's instruction directly. Otherwise, send a default instruction to sync issues.
+Determine what instruction to send to the Queen. Priority order:
+
+1. **`$ARGUMENTS` provided** → use it directly, skip settings/interactive
+2. **Settings file exists** (`.claude/beeops/settings.json`) → build instruction from settings
+3. **No arguments and no settings** → ask the user interactively
+
+#### 5a. If `$ARGUMENTS` is non-empty
+
+Use it directly:
 
 ```bash
 if [ -n "$ARGUMENTS" ]; then
   INSTRUCTION="$ARGUMENTS"
-else
-  INSTRUCTION="Sync GitHub Issues to queue.yaml and complete all tasks."
 fi
+```
+
+#### 5b. If no arguments, check for settings file
+
+```bash
+SETTINGS_FILE=".claude/beeops/settings.json"
+if [ -z "$ARGUMENTS" ] && [ -f "$SETTINGS_FILE" ]; then
+  echo "Found settings: $SETTINGS_FILE"
+  cat "$SETTINGS_FILE"
+fi
+```
+
+If the settings file exists, build the instruction based on its contents:
+
+| Field | Type | Description |
+|-------|------|-------------|
+| `issues` | `number[]` | Specific issue numbers to process (e.g. `[42, 55]`) |
+| `assignee` | `string` | `"me"` = only issues assigned to the current GitHub user, `"all"` = all open issues |
+| `skip_review` | `boolean` | Skip review phase if true (default: false) |
+| `priority` | `string` | Only process issues of this priority or higher (`"high"`, `"medium"`, `"low"`) |
+| `labels` | `string[]` | Only process issues with these labels |
+
+Build the `INSTRUCTION` string as follows:
+- If `issues` is set: `"Sync GitHub Issues to queue.yaml and process only issues: #42, #55."`
+- If `assignee` is `"me"`: `"Sync GitHub Issues to queue.yaml and process only issues assigned to me."`
+- If `assignee` is `"all"` or not set: `"Sync GitHub Issues to queue.yaml and complete all tasks."`
+- Append options: if `skip_review` is true, append `" Skip the review phase."`. If `priority` is set, append `" Only process issues with priority {priority} or higher."`. If `labels` is set, append `" Only process issues with labels: {labels}."`
+
+#### 5c. If no arguments and no settings file, ask the user interactively
 
+Present the following choices to the user (use AskUserQuestion or display the options and wait for input):
+
+```
+How should the Queen process issues?
+
+1. Specify issue numbers (e.g. 42, 55, 100)
+2. Only issues assigned to me
+3. All open issues
+
+Enter your choice (1/2/3):
+```
+
+Based on the user's response:
+- **Choice 1**: Ask for issue numbers, then set `INSTRUCTION="Sync GitHub Issues to queue.yaml and process only issues: #42, #55."`
+- **Choice 2**: Set `INSTRUCTION="Sync GitHub Issues to queue.yaml and process only issues assigned to me."`
+- **Choice 3**: Set `INSTRUCTION="Sync GitHub Issues to queue.yaml and complete all tasks."`
+
+Optionally, after the mode is selected, ask:
+```
+Save this as default settings? (y/n)
+```
+If yes, write the corresponding `.claude/beeops/settings.json` file so the next run uses it automatically.
+
+#### 5d. Send the instruction to the Queen
+
+```bash
 tmux send-keys -t "$SESSION:queen" "$INSTRUCTION"
 sleep 0.3
 tmux send-keys -t "$SESSION:queen" Enter

package/contexts/en/queen.md

@@ -70,7 +70,12 @@ Analyze the received instructions (prompt) and formulate an execution plan.
 
 | Instruction Content | Action |
 |---------------------|--------|
-| No instructions / "Process Issues" etc. | Go directly to Phase 1 (Issue sync) |
+| No instructions / "Process Issues" etc. | Go directly to Phase 1 (Issue sync) — process all open issues |
+| "process only issues: #42, #55" etc. | Phase 1 with issue filter — only sync and process the specified issue numbers |
+| "process only issues assigned to me" | Phase 1 with assignee filter — use `gh issue list --assignee @me` to fetch only assigned issues |
+| "Only process issues with priority X or higher" | Phase 1 with priority filter — skip issues below the specified priority |
+| "Only process issues with labels: X, Y" | Phase 1 with label filter — use `gh issue list --label X --label Y` |
+| "Skip the review phase" | Set skip_review flag — after Leader completes, go directly to ci_checking instead of launching Review Leader |
 | Specific work instructions present | Decompose into tasks and add to queue.yaml |
 
 ### Task Decomposition Procedure
@@ -125,6 +130,11 @@ queued -> dispatched -> leader_working -> review_dispatched -> reviewing -> done
               ^                                                        |
               +---- fixing <-- fix_required ----------------------------+
                      (max 3 loops)
+
+(shortcut: existing PR detected)
+review_dispatched -> reviewing -> done
+                                   |
+              fixing <-- fix_required
 ```
 
 | Status | Meaning |
@@ -144,7 +154,7 @@ queued -> dispatched -> leader_working -> review_dispatched -> reviewing -> done
 
 ## Task Selection Rules
 
-1. Select tasks that are `queued` and whose `depends_on` is empty (or all dependencies are `done`)
+1. Select tasks that are `queued` or `review_dispatched` (with existing PR) and whose `depends_on` is empty (or all dependencies are `done`)
 2. Skip tasks with a `blocked_reason` (record "Skipped: {reason}" in the log)
 3. Priority order: high -> medium -> low
 4. Within the same priority, process lower Issue numbers first
@@ -172,11 +182,17 @@ review_window: "review-42"      # review window name
 3. Execute based on the task's type and assignee:
 
 ### type: issue (or assignee: leader)
-1. Invoke **Skill: `bo-dispatch`** to launch a Leader
+
+**First, check if the task already has a PR** (i.e. `pr` field is non-null when status is `review_dispatched`):
+- **PR exists** → Skip Leader. Directly launch Review Leader via bo-dispatch to verify the existing PR meets the Issue requirements.
+- **No PR** → Normal flow: launch Leader first.
+
+After determining the starting point:
+1. Invoke **Skill: `bo-dispatch`** to launch a Leader (or Review Leader if PR exists)
 2. Based on the result (report content) returned by bo-dispatch:
    - Leader completed -> update to `review_dispatched` -> launch Review Leader (invoke bo-dispatch again)
    - Review Leader approve -> `ci_checking` -> verify CI
-   - Review Leader fix_required -> if review_count < 3, set to `fixing` -> relaunch Leader (fix mode)
+   - Review Leader fix_required -> if review_count < 3, set to `fixing` -> relaunch Leader (fix mode, using existing branch)
    - Failure -> update to `error`
 
 ### type: adhoc, assignee: orchestrator

package/contexts/ja/queen.md

@@ -70,7 +70,12 @@ Phase 2: イベント駆動ループ
 
 | 指示の内容 | 処理 |
 |-----------|------|
-| 指示なし / 「Issue を消化」等 | Phase 1（Issue 同期）に直行 |
+| 指示なし / 「Issue を消化」等 | Phase 1（Issue 同期）に直行 — 全オープン Issue を処理 |
+| "process only issues: #42, #55" 等 | Phase 1（Issue フィルター付き） — 指定された Issue 番号のみ同期・処理 |
+| "process only issues assigned to me" | Phase 1（担当者フィルター付き） — `gh issue list --assignee @me` で自分担当のみ取得 |
+| "Only process issues with priority X or higher" | Phase 1（優先度フィルター付き） — 指定優先度未満をスキップ |
+| "Only process issues with labels: X, Y" | Phase 1（ラベルフィルター付き） — `gh issue list --label X --label Y` |
+| "Skip the review phase" | skip_review フラグ設定 — Leader 完了後、Review Leader を飛ばして直接 ci_checking へ |
 | 具体的な作業指示がある | タスク分解して queue.yaml に追加 |
 
 ### タスク分解の手順
@@ -125,6 +130,11 @@ queued → dispatched → leader_working → review_dispatched → reviewing →
               ↑                                                        │
               └──── fixing ←── fix_required ───────────────────────────┘
                      （最大3回ループ）
+
+（短縮パス: 既存 PR 検出時）
+review_dispatched → reviewing → done
+                                  │
+              fixing ←── fix_required
 ```
 
 | ステータス | 意味 |
@@ -144,7 +154,7 @@ queued → dispatched → leader_working → review_dispatched → reviewing →
 
 ## タスク選択ルール
 
-1. `queued` かつ `depends_on` が空（または全て `done`）のタスクを選択
+1. `queued` または `review_dispatched`（既存 PR あり）かつ `depends_on` が空（または全て `done`）のタスクを選択
 2. `blocked_reason` があるタスクはスキップ（ログに「スキップ: {理由}」を記録）
 3. 優先度順: high → medium → low
 4. 同一優先度内では Issue 番号が小さい方を先に
@@ -172,11 +182,17 @@ review_window: "review-42"      # review window 名
 3. タスクの type と assignee に応じて実行:
 
 ### type: issue（または assignee: leader）
-1. **Skill: `bo-dispatch`** を発動し、Leader を起動
+
+**まず、タスクに既存 PR があるか確認する**（`pr` フィールドが非null かつ status が `review_dispatched`）:
+- **PR あり** → Leader をスキップ。bo-dispatch で Review Leader を直接起動し、既存 PR が Issue の要件を満たしているか検証する。
+- **PR なし** → 通常フロー: まず Leader を起動。
+
+開始ポイントを決定した後:
+1. **Skill: `bo-dispatch`** を発動し、Leader（または PR 既存なら Review Leader）を起動
 2. bo-dispatch が返す結果（レポート内容）に基づいて判定:
    - Leader completed → `review_dispatched` に更新 → Review Leader 起動（再度 bo-dispatch）
    - Review Leader approve → `ci_checking` → CI 確認
-   - Review Leader fix_required → review_count < 3 なら `fixing` → Leader 再起動 (fix mode)
+   - Review Leader fix_required → review_count < 3 なら `fixing` → Leader 再起動（fix mode、既存ブランチを再利用）
    - 失敗 → `error` に更新
 
 ### type: adhoc, assignee: orchestrator

package/contexts/queen.md

@@ -70,7 +70,12 @@ Analyze the received instructions (prompt) and formulate an execution plan.
 
 | Instruction Content | Action |
 |---------------------|--------|
-| No instructions / "Process Issues" etc. | Go directly to Phase 1 (Issue sync) |
+| No instructions / "Process Issues" etc. | Go directly to Phase 1 (Issue sync) — process all open issues |
+| "process only issues: #42, #55" etc. | Phase 1 with issue filter — only sync and process the specified issue numbers |
+| "process only issues assigned to me" | Phase 1 with assignee filter — use `gh issue list --assignee @me` to fetch only assigned issues |
+| "Only process issues with priority X or higher" | Phase 1 with priority filter — skip issues below the specified priority |
+| "Only process issues with labels: X, Y" | Phase 1 with label filter — use `gh issue list --label X --label Y` |
+| "Skip the review phase" | Set skip_review flag — after Leader completes, go directly to ci_checking instead of launching Review Leader |
 | Specific work instructions present | Decompose into tasks and add to queue.yaml |
 
 ### Task Decomposition Procedure

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "beeops",
-  "version": "0.1.6",
+  "version": "0.1.9",
   "description": "3-layer multi-agent orchestration system (Queen → Leader → Worker) powered by tmux",
   "author": "YuugouOhno",
   "license": "MIT",

package/skills/bo-issue-sync/SKILL.md

@@ -26,6 +26,22 @@ gh issue list -R "$REPO" --state open --json number,title,labels,assignees --lim
 
 If 0 issues, display "No issues to process" and exit.
 
+### 2.5. Detect Existing PRs
+
+For each open Issue, check if a linked PR already exists:
+
+```bash
+gh pr list -R "$REPO" --search "linked:issue:{number}" --state open --json number,url,headRefName --limit 1
+```
+
+If no result, also try keyword search as fallback:
+
+```bash
+gh pr list -R "$REPO" --search "{issue_number} in:title" --state open --json number,url,headRefName --limit 1
+```
+
+Store the results (PR URL + branch name) for use in Step 4.
+
 ### 3. Load queue.yaml
 
 If `.claude/tasks/queue.yaml` exists, read it. Otherwise initialize:
@@ -37,7 +53,9 @@ tasks: []
 
 ### 4. Diff Detection and Raw Addition
 
-Add Issues not present in queue.yaml with `raw` status:
+Add Issues not present in queue.yaml. If an existing PR was detected in Step 2.5, start from `review_dispatched`; otherwise use `raw` status:
+
+**No existing PR (normal flow):**
 
 ```yaml
 - id: "ISSUE-{number}"
@@ -53,6 +71,22 @@ Add Issues not present in queue.yaml with `raw` status:
     - "{ISO8601} created from gh issue"
 ```
 
+**Existing PR detected (skip to review):**
+
+```yaml
+- id: "ISSUE-{number}"
+  issue: {number}
+  title: "{title}"
+  status: review_dispatched
+  priority: high
+  branch: "{headRefName from PR}"
+  depends_on: []
+  review_count: 0
+  pr: "{PR URL}"
+  log:
+    - "{ISO8601} created from gh issue (existing PR #{pr_number} detected, starting from review)"
+```
+
 - Skip Issues already in queue.yaml (with status other than done)
 - Update status to `done` for Issues in queue.yaml that are closed on GitHub