Three fixes for the reweave merge failure cycle:
1. reweave.py: fetch + reset to origin/main before branch creation,
eliminating the stale-base problem that caused ~75% merge failure rate
2. merge.py: delete remote branch when closing reweave PRs (in reconcile,
merge failure, and conflict retry paths) — prevents discover_external_prs
from rediscovering stale branches and creating new PRs every 18 minutes
3. merge.py: skip cherry-pick retry for reweave branches — reweave modifies
existing files so cherry-pick always fails, go straight to close+delete
Pentagon-Agent: Ship <f3064ef4-c330-4809-ad37-39290b2eaa5b>
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
The regex fallback was writing list entries as ' - "title"' (2-space
indent + quotes) while existing frontmatter uses '- title' (0-space
indent, no quotes). This caused YAML parse failures during merge.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Imports 67 files from VPS (/opt/teleo-eval/) into repo as the single source
of truth. Previously only 8 of 67 files existed in repo — the rest were
deployed directly to VPS via SCP, causing massive drift.
Includes:
- pipeline/lib/: 33 Python modules (daemon core, extraction, evaluation, merge, cascade, cross-domain, costs, attribution, etc.)
- pipeline/: main daemon (teleo-pipeline.py), reweave.py, batch-extract-50.sh
- diagnostics/: 19 files (4-page dashboard, alerting, daily digest, review queue, tier1 metrics)
- agent-state/: bootstrap, lib-state, cascade inbox processor, schema
- systemd/: service unit files for reference
- deploy.sh: rsync-based deploy with --dry-run, syntax checks, dirty-tree gate
- research-session.sh: updated with Step 8.5 digest + cascade inbox processing
No new code written — all files are exact copies from VPS as of 2026-04-06.
From this point forward: edit in repo, commit, then deploy.sh.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
