summaryrefslogtreecommitdiff
path: root/Omni/Agent
diff options
context:
space:
mode:
authorBen Sima <ben@bensima.com>2025-11-26 08:24:21 -0500
committerBen Sima <ben@bensima.com>2025-11-26 08:24:21 -0500
commitfdc00295da1e3575b28acab0a8aacfae85613f2b (patch)
tree2926675802b5c5c58b716a5025c417ea8ccc4940 /Omni/Agent
parent852697390bff12101f87602da16797d893d4f962 (diff)
Remove git-tracked task references from hooks and docs
- Remove task sync from pre-commit hook - Remove task import from post-merge and post-checkout hooks - Remove merge driver config from post-checkout - Remove merge-driver command from jr - Update Task README for SQLite storage - Delete outdated WORKER_AGENT_GUIDE.md Amp-Thread-ID: https://ampcode.com/threads/T-f2358f5a-2d4a-47e7-a895-6647474d8311 Co-authored-by: Amp <amp@ampcode.com>
Diffstat (limited to 'Omni/Agent')
-rw-r--r--Omni/Agent/WORKER_AGENT_GUIDE.md124
1 files changed, 0 insertions, 124 deletions
diff --git a/Omni/Agent/WORKER_AGENT_GUIDE.md b/Omni/Agent/WORKER_AGENT_GUIDE.md
deleted file mode 100644
index d0bc7a7..0000000
--- a/Omni/Agent/WORKER_AGENT_GUIDE.md
+++ /dev/null
@@ -1,124 +0,0 @@
-# Worker Agent Guide
-
-This guide describes how to run a headless Worker Agent using the Multi-Agent Workflow.
-
-## 1. Setup
-
-First, create a dedicated worktree for the worker:
-
-```bash
-./Omni/Agent/setup-worker.sh omni-worker-1
-```
-
-This creates `../omni-worker-1` sharing the same git history but with its own workspace and branch (`omni-worker-1`).
-
-## 2. Worker Loop
-
-The Worker Agent should run the following loop continuously:
-
-### Step 1: Sync and Find Work
-
-```bash
-# Go to worker directory
-cd ../omni-worker-1
-
-# Update base branch with latest live code
-# We use rebase to keep history linear (patch-based workflow)
-# The custom merge driver handles tasks.jsonl conflicts during rebase
-git fetch origin live
-git rebase origin/live
-
-# Sync tasks from the live branch
-./Omni/Agent/sync-tasks.sh
-
-# Check for ready tasks
-task ready --json
-```
-
-### Step 2: Claim Task
-
-If a task is found (e.g., `t-123`):
-
-```bash
-# Mark in progress
-task update t-123 in-progress
-
-# Commit the claim locally
-./Omni/Agent/sync-tasks.sh --commit
-```
-
-### Step 3: Create Workspace
-
-**CRITICAL: Determine the correct base branch.**
-
-1. **Check Dependencies**: Run `task deps t-123 --json`.
-2. **Check for Unmerged Work**: Look for dependencies that have existing branches (e.g., `task/t-parent-id`) which are NOT yet merged into `live`.
-3. **Select Base**:
- * If you find an unmerged dependency branch, check it out: `git checkout task/t-parent-id`.
- * Otherwise, start from fresh live code: `git checkout -b task/t-123 live`.
-
-4. **Implement**:
- (Proceed to implementation)
-
-### Step 4: Implement
-
-1. Read task details: `task show t-123`
-2. Implement changes.
-3. **Run Tests**: `bild --test Omni/YourNamespace.hs`
-
-### Step 5: Submit for Review
-
- 1. **Update Status and Commit**:
- Bundle the task status update with your implementation to keep history clean.
-
- ```bash
- # 1. Mark task for review (updates .tasks/tasks.jsonl)
- task update t-123 review
-
- # 2. Commit changes + task update
- git add .
- git commit -m "feat: implement t-123"
- ```
-
- 2. **Signal Review Readiness**:
- Update the worker branch to signal the planner.
-
- ```bash
- # Switch to base branch
- git checkout omni-worker-1
-
- # Sync to get latest state
- ./Omni/Agent/sync-tasks.sh
-
- # Ensure the task is marked review here too
- task update t-123 review
-
- # Commit this status change to the worker branch
- ./Omni/Agent/sync-tasks.sh --commit
- ```
-
- *Note: The Planner will now see 't-123' in 'Review' when it runs `task list --status=review`.*
-
-## 3. Planner (Reviewer) Workflow
-
-The Planner Agent (running in the main repo) will:
-1. **Find Reviews**: Run `task list --status=review`.
-3. **Review Code**:
- * Check out the feature branch: `git checkout task/t-123`.
- * **Rebase onto Live**: Ensure the branch is up-to-date and linear.
- ```bash
- git rebase live
- ```
- * Run tests and review code.
-4. **Merge**:
- * `git checkout live`
- * `git merge task/t-123` (This will now be a fast-forward or clean merge)
-5. **Complete**:
- * `task update t-123 done`
- * `git commit -am "task: t-123 done"`
-
-## Troubleshooting
-
-If `sync-tasks.sh` reports a conflict:
-1. Manually run `task import -i .tasks/live-tasks.jsonl`
-2. If git merge conflicts occur in `tasks.jsonl`, the custom merge driver should handle them. If not, resolve by keeping the union of tasks (or letting `task import` decide).