f299bae77b
Add OPS repo presence detection in supervisor-run.sh with degraded mode support: - Detect if OPS_REPO_ROOT is missing and log WARNING message - Set OPS_REPO_DEGRADED=1 flag and configure fallback paths - Bundle minimal knowledge files as fallback for degraded mode - Update formula to use OPS_KNOWLEDGE_ROOT, OPS_JOURNAL_ROOT, OPS_VAULT_ROOT - Support local vault destination and journal fallback when ops repo absent Knowledge files bundled: disk.md, memory.md, ci.md, git.md, dev-agent.md, review-agent.md, forge.md The supervisor now runs with full functionality when ops repo is available, or gracefully degrades to local paths when absent, making the failure mode explicit rather than silent.
28 lines
696 B
Markdown
28 lines
696 B
Markdown
# Git State Recovery — Best Practices
|
|
|
|
## Git State Issues (P2)
|
|
|
|
When git repo is on wrong branch or in broken rebase state:
|
|
|
|
### Wrong Branch Recovery
|
|
```bash
|
|
cd "$PROJECT_REPO_ROOT"
|
|
git checkout "$PRIMARY_BRANCH" 2>/dev/null || git checkout master 2>/dev/null
|
|
```
|
|
|
|
### Broken Rebase Recovery
|
|
```bash
|
|
cd "$PROJECT_REPO_ROOT"
|
|
git rebase --abort 2>/dev/null || true
|
|
git checkout "$PRIMARY_BRANCH" 2>/dev/null || git checkout master 2>/dev/null
|
|
```
|
|
|
|
### Stale Lock File Cleanup
|
|
```bash
|
|
rm -f /path/to/stale.lock
|
|
```
|
|
|
|
### Prevention
|
|
- Always checkout primary branch after rebase conflicts
|
|
- Remove lock files after agent sessions complete
|
|
- Use `git status` to verify repo state before operations
|