gabriel / muse public
feat patch task/bridge-phase8 #1 / 1
AI Agent gabriel · 144 days ago · Apr 27, 2026 · Diff

feat: bridge Phase 8 — Harmony↔rerere and Shelf↔Stash

import_rerere_to_harmony, export_harmony_to_rerere: bidirectional bridge between git rerere conflict memory and Muse Harmony patterns.

import_stashes_to_shelf, export_shelves_to_stash: bidirectional bridge between git stash and Muse shelf entries.

New flags: --import-rerere, --export-rerere, --import-stashes, --export-shelves. Tests in tests/test_bridge_harmony_shelf.py.

sha256:220dca535448797a22a8ac4ba246e029dc86e141e61ebe793a4443a246ec84a8 sha
sha256:dac8aceb3bfad0bd1db1faed1024742806aa2ef45d90f1f026b27fed218e2c77 parent
+44 ~4 symbols
sha256:252780f16d7b884dad64ed00f36a649ba45c662b77b7f0e1c30975c279f82a33 snapshot
+44
symbols added
~4
symbols modified
0
dead code introduced
Semantic Changes 48 symbols
~ tests/test_bridge_harmony_shelf.py .py 40 symbols added
+ TestArgparseFlags class class TestArgparseFlags L743–763
+ test_git_export_has_export_rerere_flag method method test_git_export_has_export_rerere_flag L757–759
+ test_git_export_has_export_shelves_flag method method test_git_export_has_export_shelves_flag L761–763
+ test_git_import_has_import_rerere_flag method method test_git_import_has_import_rerere_flag L745–747
+ test_git_import_has_import_stashes_flag method method test_git_import_has_import_stashes_flag L753–755
+ test_git_import_has_rerere_confidence_flag method method test_git_import_has_rerere_confidence_flag L749–751
+ TestExportHarmonyToRerere class class TestExportHarmonyToRerere L240–517
+ test_export_harmony_dry_run_writes_nothing method method test_export_harmony_dry_run_writes_nothing L452–517
+ test_export_harmony_high_confidence_exported method method test_export_harmony_high_confidence_exported L318–386
+ test_export_harmony_human_verified_exported_regardless_of_confidence method method test_export_harmony_human_verified_exported_regardless_of_confidence L388–450
+ test_export_harmony_low_confidence_skipped method method test_export_harmony_low_confidence_skipped L254–316
+ test_export_harmony_no_patterns_returns_zero method method test_export_harmony_no_patterns_returns_zero L242–252
+ TestExportShelvesToStash class class TestExportShelvesToStash L613–735
+ test_export_one_shelf_creates_git_stash method method test_export_one_shelf_creates_git_stash L634–684
+ test_export_shelves_dry_run_writes_nothing method method test_export_shelves_dry_run_writes_nothing L686–735
+ test_export_shelves_no_entries_returns_zero method method test_export_shelves_no_entries_returns_zero L615–632
+ TestImportRerereToHarmony class class TestImportRerereToHarmony L94–237
+ test_import_rerere_custom_confidence method method test_import_rerere_custom_confidence L192–212
+ test_import_rerere_dry_run_writes_nothing method method test_import_rerere_dry_run_writes_nothing L151–170
+ test_import_rerere_empty_rr_cache_returns_zero method method test_import_rerere_empty_rr_cache_returns_zero L96–109
+ test_import_rerere_idempotent method method test_import_rerere_idempotent L214–237
+ test_import_rerere_imports_one_entry method method test_import_rerere_imports_one_entry L124–149
+ test_import_rerere_missing_postimage_skipped method method test_import_rerere_missing_postimage_skipped L172–190
+ test_import_rerere_missing_rr_cache_raises method method test_import_rerere_missing_rr_cache_raises L111–122
+ TestImportStashesToShelf class class TestImportStashesToShelf L525–610
+ test_import_one_stash_creates_shelf_entry method method test_import_one_stash_creates_shelf_entry L541–566
+ test_import_stash_dry_run_writes_nothing method method test_import_stash_dry_run_writes_nothing L568–587
+ test_import_stashes_idempotent method method test_import_stashes_idempotent L589–610
+ test_import_stashes_no_stashes_returns_zero method method test_import_stashes_no_stashes_returns_zero L527–539
+ _invoke function function _invoke L33–35
+ _make_git_repo function function _make_git_repo L46–69
+ _make_muse_repo function function _make_muse_repo L38–43
+ _make_rr_cache_entry function function _make_rr_cache_entry L72–86
+ CliRunner import import CliRunner L23–23
+ annotations import import annotations L15–15
+ os import import os L17–17
+ pathlib import import pathlib L18–18
+ pytest import import pytest L21–21
+ subprocess import import subprocess L19–19
+ runner variable variable runner L25–25
~ muse/cli/commands/bridge.py .py 4 symbols added, 4 symbols modified
+ export_harmony_to_rerere function function export_harmony_to_rerere L1481–1543
+ export_shelves_to_stash function function export_shelves_to_stash L1693–1809
+ import_rerere_to_harmony function function import_rerere_to_harmony L1343–1478
+ import_stashes_to_shelf function function import_stashes_to_shelf L1551–1690
~ _register_git_export
~ _register_git_import
~ run_git_export
~ run_git_import
← Older Oldest on task/bridge-phase8
All commits
Newer → Latest on task/bridge-phase8

0 comments

No comments yet. Be the first to start the discussion.

To add a comment, use the Muse CLI: muse hub commit comment sha256:220dca535448797a22a8ac4ba246e029dc86e141e61ebe793a4443a246ec84a8 --body "your comment"