Skip to content
This repository was archived by the owner on Jan 2, 2026. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: zircote/git-notes-memory
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6f41cab
Choose a base ref
...
head repository: zircote/git-notes-memory
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 83c804e
Choose a head ref
  • 5 commits
  • 25 files changed
  • 2 contributors

Commits on Dec 25, 2025

  1. chore: initialize implementation progress tracking 

    - Add PROGRESS.md with 20 tasks across 5 phases
- Update README.md status to in-progress
- Add APPROVAL_RECORD.md with audit trail
- Update CHANGELOG.md with approval entry

Fixes #18
    @zircote
    zircote committed Dec 25, 2025
    Configuration menu
    Copy the full SHA
    592f717 View commit details
    Browse the repository at this point in the history

  2. feat: implement Phase 1 - core refspec fix and migration 

    Phase 1 complete (4/4 tasks):
- Task 1.1: Update configure_sync() to use tracking refs pattern
  - Changed from refs/notes/mem/*:refs/notes/mem/* (problematic)
  - To +refs/notes/mem/*:refs/notes/origin/mem/* (correct)
- Task 1.2: Update is_sync_configured() to detect both patterns
  - Tracks fetch_old and fetch_new for migration detection
- Task 1.3: Add migrate_fetch_config() method
  - Idempotent migration from old to new refspec
- Task 1.4: Add migration to SessionStart handler
  - Auto-migrates existing installations

Fixes #18
    @zircote
    zircote committed Dec 25, 2025
    Configuration menu
    Copy the full SHA
    e3ce588 View commit details
    Browse the repository at this point in the history

  3. feat: implement Phase 2 - remote sync workflow 

    Phase 2 complete (5/5 tasks):
- Task 2.1: Add fetch_notes_from_remote() - fetches to tracking refs
- Task 2.2: Add merge_notes_from_tracking() - uses cat_sort_uniq strategy
- Task 2.3: Add push_notes_to_remote() - pushes all namespaces
- Task 2.4: Add sync_notes_with_remote() - orchestrates fetch→merge→push
- Task 2.5: Add sync_with_remote() to SyncService - includes reindex

The remote sync workflow enables:
- Fetch notes to refs/notes/origin/mem/* tracking refs
- Merge using Git's cat_sort_uniq strategy (concatenate, sort, dedupe)
- Push merged notes back to origin
- Reindex SQLite after successful sync

Fixes #18
    @zircote
    zircote committed Dec 25, 2025
    Configuration menu
    Copy the full SHA
    aa3a9e2 View commit details
    Browse the repository at this point in the history

  4. feat: complete implementation of GitHub Issue #18 - fix git notes fet… 

    …ch refspec

## Summary
Implements proper remote tracking refs pattern for git notes to prevent
non-fast-forward errors when notes have diverged across machines.

## Changes
- Add remote tracking refs pattern (+refs/notes/mem/*:refs/notes/origin/mem/*)
- Add fetch_notes_from_remote() method for fetching to tracking refs
- Add merge_notes_from_tracking() with cat_sort_uniq strategy
- Add push_notes_to_remote() for pushing all namespaces
- Add sync_notes_with_remote() orchestration method
- Add migrate_fetch_config() for idempotent migration from old pattern
- Add hook-based auto-sync (opt-in via env vars)
- Update /memory:sync command with remote mode and dry-run
- Update /memory:validate with refspec configuration check
- Add 26 new tests (migration, remote sync, integration, hooks)
- Move completed spec to docs/spec/completed/

## Testing
- All 1,834 tests passing
- 80%+ coverage maintained
- Quality checks (lint, typecheck, security) passing

Closes #18

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
    @zircote @claude
    zircote and claude committed Dec 25, 2025
    Configuration menu
    Copy the full SHA
    eb05ff0 View commit details
    Browse the repository at this point in the history

  5. chore(release): bump version 0.10.0 → 0.11.0

    @zircote
    zircote committed Dec 25, 2025
    Configuration menu
    Copy the full SHA
    83c804e View commit details
    Browse the repository at this point in the history
Loading