Post-merge git friction fixes: drone sync FF-only realign + sync_main_ref (no checkout), merge.md/branch-prompt corrected (merge commit not squash), deterministic spawn template registry IDs#640

Open

AIOSAI wants to merge 34 commits into

mainfrom

Commits on Jun 11, 2026

fix(git): kill post-merge friction — sync FF-only realign (not rebase), merge-not-squash docs, deterministic spawn registry
AIOSAI
committed

Commits on Jun 12, 2026

feat(skills): revive dormant citizen — namespace skills.*→aipass.skills.* (48 imports), path-depth parents[3]→[4], happy-path logger.info() central logging (DPLAN-0203 night shift). 252 tests, seed…
AIOSAI
committed
feat(commons): revive dormant citizen — verify namespace migration (172 imports/67 files) + path-depth + 4 bug fixes, add E501/CLI/Windows_Compat cleanup + happy-path logger.info() central logging …
AIOSAI
committed
feat(daemon): revive dormant citizen (revive-to-working ONLY) — scrub 6 stale @vera refs, add happy-path logger.info() central logging, fix Ruff/Introspection/Windows_Compat/Handler_Import/Imports …
AIOSAI
committed
feat(backup): revive dormant citizen (revive-to-working) — path-depth parents[4]->[3], fill branch prompt, archive stray upgrade/ to .archive, Handler_Import + happy-path central logging (DPLAN-020…
AIOSAI
committed
feat(backup): namespace migration standalone -> aipass.backup.* citizen — convert 47 internal imports across 11 files (apps.* -> aipass.backup.apps.*), fix importlib discovery string, drop sys.path…
AIOSAI
committed
fix(backup): split top-level --help from bare introspection — drone @backup --help now shows a curated Rich command reference (boxed header + USAGE + COMMANDS), bare drone @backup shows the discove…
AIOSAI
committed
feat(backup): restore full 9-stage rich CLI output (FPLAN-0263) — new backup_timestamps state handler + display.py 5-stage pipeline (last_backups panel -> boxed header -> live Rich progress bar -> …
AIOSAI
committed
fix(drone): route @backup through interactive passthrough — add 'backup' to INTERACTIVE_BRANCHES so snapshot/versioned/all inherit the TTY instead of capture_output=True. Drone was flattening backu…
AIOSAI
committed
feat(backup): FPLAN-0265 — seedgo 100% + 94-test green foundation (restoration Phase 1)

AIOSAI
and
claude
committed
feat(backup): FPLAN-0266 — snapshot fidelity + shared core (restoration Phase 2)

AIOSAI
and
claude
committed
feat(backup): FPLAN-0267 — versioned baseline + per-file diff engine (restoration Phase 3, the heart)

AIOSAI
and
claude
committed
feat(backup): FPLAN-0268 — Google Drive sync pipeline + restore command (restoration Phase 4, final)

AIOSAI
and
claude
committed

Commits on Jun 13, 2026

Commits on Jun 14, 2026