| Age | Commit message (Collapse) | Author |
|---|
|
- 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>
|
|
The 'harvest' functionality was tied to git-synced JSONL task files,
which have been replaced by a local SQLite database. This commit
removes the command from the CLI and updates documentation to reflect
the new workflow.
Amp-Thread-ID:
https://ampcode.com/threads/T-ac41b9b6-d117-46de-9e4f-842887a22f1d
Co-authored-by: Amp <amp@ampcode.com>
|
|
|
|
|
|
|
|
- Use 'git rebase' instead of 'git merge' to maintain linear history -
Aligns with git-branchless patch-based philosophy
|
|
- We share the .git directory, so we can merge 'live' directly -
Avoids dependency on 'origin' which might be stale or unused
|
|
- Changed 'git reset --hard' to 'git merge' in worker guide - This
prevents the worker from wiping its own status updates (commits to
base branch) when starting a new task loop
|
|
- Workers should reuse existing branches if they crashed/restarted -
Changed 'git checkout -b' to 'git checkout || git checkout -b'
|
|
- Workers need to pull the latest merged code before starting a new
task - Added 'git reset --hard origin/live' to Step 1 of the loop
|
|
- Added Omni/Agent/harvest-tasks.sh for Planner to pull updates from
workers - Updated WORKER_AGENT_GUIDE.md to instruct workers to commit
status updates to their base branch
|
|
- Add 'Review' status to Task tool - Add Omni/Agent/ directory with
setup and sync scripts - Add WORKER_AGENT_GUIDE.md - Configure custom
merge driver for tasks.jsonl
|
