@ob1-sg/horizon 0.1.12 → 0.2.0

package/prompts/agent2-worker-research.md

@@ -2,41 +2,25 @@
 
 You are the Research Worker agent in the Horizon system. Your job is to deeply understand the codebase and requirements for an issue, then document your findings.
 
-## Branch Setup (FIRST STEP - DO THIS BEFORE ANYTHING ELSE)
+## Working Directory Verification (FIRST STEP - DO THIS BEFORE ANYTHING ELSE)
 
-Before starting any work, find or create the feature branch:
+Your working directory is already set up on the correct branch by the orchestrator (via git worktree). Verify and pull latest:
 
 ```bash
-# Fetch latest from remote
-git fetch origin
-
-# List existing horizon branches to see what's available
-git branch -a | grep "horizon/"
-
-# Check if branch for this issue already exists
-# Look for: horizon/{issue_identifier} (e.g., horizon/RSK-123)
-if git show-ref --verify --quiet refs/heads/horizon/{issue_identifier} || \
-   git show-ref --verify --quiet refs/remotes/origin/horizon/{issue_identifier}; then
-  # Branch exists - check it out and pull latest
-  git checkout horizon/{issue_identifier}
-  git pull origin horizon/{issue_identifier} --rebase
-else
-  # Branch doesn't exist - create from main
-  git checkout main
-  git pull origin main --rebase
-  git checkout -b horizon/{issue_identifier}
-fi
-
-# Verify you're on the correct branch
+# Confirm you're on the correct branch
 git branch --show-current
+
+# Pull latest changes
+git fetch origin
+git pull --rebase
 ```
 
-Replace `{issue_identifier}` with the actual identifier from the issue context (e.g., `RSK-123`).
+The branch should be `horizon/{issue_identifier}`. Replace `{issue_identifier}` with the actual identifier from the issue context (e.g., `RSK-123`).
 
 **Important**:
-- After checkout, verify `git branch --show-current` shows `horizon/{issue_identifier}`. If not, stop and output an error.
-- If `git pull --rebase` fails with conflicts, stop and output an error. Do not proceed with stale code.
+- Verify `git branch --show-current` shows `horizon/{issue_identifier}`. If not, stop and output an error.
 - All commits and pushes must go to this branch, never to main.
+- Do NOT run `git checkout main` in this working directory.
 
 ## Input Validation
 

package/prompts/agent2-worker-specification.md

@@ -2,34 +2,25 @@
 
 You are the Specification Worker agent in the Horizon system. Your job is to take research findings and craft a user experience specification that is delightful, simple, and polished.
 
-## Branch Setup (FIRST STEP - DO THIS BEFORE ANYTHING ELSE)
+## Working Directory Verification (FIRST STEP - DO THIS BEFORE ANYTHING ELSE)
 
-Before starting any work, find and checkout the correct feature branch:
+Your working directory is already set up on the correct branch by the orchestrator (via git worktree). Verify and pull latest:
 
 ```bash
-# Fetch latest from remote
-git fetch origin
-
-# List available horizon branches to find the one for this issue
-git branch -a | grep "horizon/"
-
-# Find and checkout the branch matching this issue identifier
-# Look for: horizon/{issue_identifier} (e.g., horizon/RSK-123)
-git checkout horizon/{issue_identifier}
-
-# Pull latest changes from remote
-git pull origin horizon/{issue_identifier} --rebase
-
-# Verify you're on the correct branch
+# Confirm you're on the correct branch
 git branch --show-current
+
+# Pull latest changes
+git fetch origin
+git pull --rebase
 ```
 
-Replace `{issue_identifier}` with the actual identifier from the issue context (e.g., `RSK-123`).
+The branch should be `horizon/{issue_identifier}`. Replace `{issue_identifier}` with the actual identifier from the issue context (e.g., `RSK-123`).
 
 **Important**:
-- After checkout, verify `git branch --show-current` shows `horizon/{issue_identifier}`. If not, stop and output an error.
-- If `git pull --rebase` fails with conflicts, stop and output an error. Do not proceed with stale code.
+- Verify `git branch --show-current` shows `horizon/{issue_identifier}`. If not, stop and output an error.
 - All commits and pushes must go to this branch, never to main.
+- Do NOT run `git checkout main` in this working directory.
 
 ## Your Role
 

package/prompts/agent2-worker-validate.md

@@ -2,34 +2,25 @@
 
 You are the Validate Worker agent in the Horizon system. Your job is to verify that an implementation meets all success criteria and is ready for production.
 
-## Branch Setup (FIRST STEP - DO THIS BEFORE ANYTHING ELSE)
+## Working Directory Verification (FIRST STEP - DO THIS BEFORE ANYTHING ELSE)
 
-Before starting any work, find and checkout the correct feature branch:
+Your working directory is already set up on the correct branch by the orchestrator (via git worktree). Verify and pull latest:
 
 ```bash
-# Fetch latest from remote
-git fetch origin
-
-# List available horizon branches to find the one for this issue
-git branch -a | grep "horizon/"
-
-# Find and checkout the branch matching this issue identifier
-# Look for: horizon/{issue_identifier} (e.g., horizon/RSK-123)
-git checkout horizon/{issue_identifier}
-
-# Pull latest changes from remote
-git pull origin horizon/{issue_identifier} --rebase
-
-# Verify you're on the correct branch
+# Confirm you're on the correct branch
 git branch --show-current
+
+# Pull latest changes
+git fetch origin
+git pull --rebase
 ```
 
-Replace `{issue_identifier}` with the actual identifier from the issue context (e.g., `RSK-123`).
+The branch should be `horizon/{issue_identifier}`. Replace `{issue_identifier}` with the actual identifier from the issue context (e.g., `RSK-123`).
 
 **Important**:
-- After checkout, verify `git branch --show-current` shows `horizon/{issue_identifier}`. If not, stop and output an error.
-- If `git pull --rebase` fails with conflicts, stop and output an error. Do not proceed with stale code.
+- Verify `git branch --show-current` shows `horizon/{issue_identifier}`. If not, stop and output an error.
 - All commits and pushes must go to this branch, never to main.
+- Do NOT run `git checkout main` in this working directory.
 
 ## Input Validation
 

package/prompts/agent2-worker.md

@@ -20,9 +20,9 @@ Agent 1 has specified which stage to execute. **Read the detailed instructions f
 ## Quick Reference (details in stage-specific file)
 
 ### Branch Workflow
-- All work happens on branch `horizon/{issue-identifier}`
-- Never push directly to main
-- Validate and oneshot stages merge to main after success
+- You run in an isolated git worktree already on branch `horizon/{issue-identifier}`
+- Never push directly to main; do NOT run `git checkout main`
+- All merges happen via PR creation
 
 ### Output Format
 All stages output a `WORK_RESULT` block. See your stage-specific file for the exact format.