Skip to content

feat: Guided Merge — manual read-only merge workflow with CLI, GUI, manifests, and verification#19

Merged
geoffmcc merged 5 commits into
mainfrom
feature/guided-merge
Jul 10, 2026
Merged

feat: Guided Merge — manual read-only merge workflow with CLI, GUI, manifests, and verification#19
geoffmcc merged 5 commits into
mainfrom
feature/guided-merge

Conversation

@geoffmcc

Copy link
Copy Markdown
Owner

Guided Merge

Safe, manual, read-only merge workflow for Ableton Live Sets.

Included

  • CLI: alscan merge guide (interactive wizard), alscan merge plan (manifest export), alscan merge verify, alscan merge resume
  • GUI: 9-stage wizard
  • Session persistence: Save/open/resume via versioned MergeManifest JSON
  • Foundation recommendation: Penalty-based scoring
  • Verification engine: Tempo, time sig, tracks, locators
  • Source immutability: Hash capture + recheck
  • Safety: ALS_WRITING_ENABLED=False — no automatic .als writing

Tests

  • 1008 passed, 1 skipped, 242 GUI, -W error clean
  • Wheel build succeeds

No automatic writing

Guided Merge is read-only and manual. Future automation via Extensions SDK. Direct .als XML synthesis abandoned after fatal crash in Live 12.4.2.

@geoffmcc
geoffmcc merged commit 4c774df into main Jul 10, 2026
5 checks passed
@geoffmcc
geoffmcc deleted the feature/guided-merge branch July 10, 2026 04:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant