memgit 0.1.4__tar.gz → 0.1.5__tar.gz

{memgit-0.1.4 → memgit-0.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: memgit
-Version: 0.1.4
+Version: 0.1.5
 Summary: Git for AI memory — version-controlled context persistence across Claude, GPT, Gemini, Cursor, Windsurf, and more
 License: MIT
 Project-URL: Homepage, https://memgit.dev
@@ -353,11 +353,11 @@ See [CONTRIBUTING.md](CONTRIBUTING.md).
 - [x] `memgit git push/pull` — team sync via standard git
 - [x] Flat `memories/` directory — grep/diff/blame your memories
 - [x] D3.js graph visualization of memory relationships
-- [x] PyPI + Homebrew (tap) + npm published (v0.1.4)
+- [x] PyPI + Homebrew (tap) + npm published (v0.1.5)
 - [ ] Chocolatey (not yet live on community.chocolatey.org)
 - [x] Interactive setup wizard (`memgit setup`)
 - [x] Smart `memgit init` (auto-detects tool, no path needed)
-- [x] VS Code extension (v0.1.4, Marketplace: code416-memgit.memgit)
+- [x] VS Code extension (v0.1.5, Marketplace: code416-memgit.memgit)
 - [ ] JetBrains plugin (Phase 3)
 - [ ] Semantic search via embeddings (Phase 4)
 - [x] memgit.dev website (live)

{memgit-0.1.4 → memgit-0.1.5}/README.md

@@ -322,11 +322,11 @@ See [CONTRIBUTING.md](CONTRIBUTING.md).
 - [x] `memgit git push/pull` — team sync via standard git
 - [x] Flat `memories/` directory — grep/diff/blame your memories
 - [x] D3.js graph visualization of memory relationships
-- [x] PyPI + Homebrew (tap) + npm published (v0.1.4)
+- [x] PyPI + Homebrew (tap) + npm published (v0.1.5)
 - [ ] Chocolatey (not yet live on community.chocolatey.org)
 - [x] Interactive setup wizard (`memgit setup`)
 - [x] Smart `memgit init` (auto-detects tool, no path needed)
-- [x] VS Code extension (v0.1.4, Marketplace: code416-memgit.memgit)
+- [x] VS Code extension (v0.1.5, Marketplace: code416-memgit.memgit)
 - [ ] JetBrains plugin (Phase 3)
 - [ ] Semantic search via embeddings (Phase 4)
 - [x] memgit.dev website (live)

{memgit-0.1.4 → memgit-0.1.5}/memgit/cli.py

@@ -1143,7 +1143,11 @@ def _patch_mcp_servers(config_path: Path, dry_run: bool = False) -> str:
         try:
             data = _json.loads(config_path.read_text(encoding='utf-8'))
         except _json.JSONDecodeError:
-            data = {}
+            # Never clobber an existing config we can't parse — for Claude Code
+            # this file (~/.claude.json) holds all user state, not just MCP.
+            raise RuntimeError(
+                f'{config_path} exists but is not valid JSON — fix it manually, then re-run setup'
+            )
     else:
         data = {}
 
@@ -1189,7 +1193,11 @@ def _patch_continue(config_path: Path, dry_run: bool = False) -> str:
     return 'registered'
 
 
-# Targets: (label, config_path_fn, patch_fn)
+# Targets: (label, config_path, patch_fn, detect_path)
+# detect_path: existence marks the tool as installed; None falls back to
+# "config file or its parent dir exists". Claude Code needs an explicit one
+# because its real MCP config (~/.claude.json) sits directly in $HOME —
+# Claude Code ignores mcpServers in ~/.claude/settings.json.
 def _all_targets():
     home = Path.home()
     app_support = home / 'Library' / 'Application Support'
@@ -1197,43 +1205,51 @@ def _all_targets():
     return [
         (
             'Claude Code',
-            home / '.claude' / 'settings.json',
+            home / '.claude.json',
             _patch_mcp_servers,
+            home / '.claude',
         ),
         (
             'Claude Desktop (macOS)',
             app_support / 'Claude' / 'claude_desktop_config.json',
             _patch_mcp_servers,
+            None,
         ),
         (
             'Claude Desktop (Linux)',
             linux_config / 'Claude' / 'claude_desktop_config.json',
             _patch_mcp_servers,
+            None,
         ),
         (
             'Cursor',
             home / '.cursor' / 'mcp.json',
             _patch_mcp_servers,
+            None,
         ),
         (
             'Windsurf',
             home / '.windsurf' / 'mcp.json',
             _patch_mcp_servers,
+            None,
         ),
         (
             'Cline (VS Code)',
             app_support / 'Code' / 'User' / 'globalStorage' / 'saoudrizwan.claude-dev' / 'settings' / 'cline_mcp_settings.json',
             _patch_mcp_servers,
+            None,
         ),
         (
             'Roo-Code (VS Code)',
             app_support / 'Code' / 'User' / 'globalStorage' / 'rooveterinaryinc.roo-cline' / 'settings' / 'cline_mcp_settings.json',
             _patch_mcp_servers,
+            None,
         ),
         (
             'Continue.dev',
             home / '.continue' / 'config.json',
             _patch_continue,
+            None,
         ),
     ]
 
@@ -1243,10 +1259,13 @@ def _setup_wizard() -> None:
     targets = _all_targets()
 
     detected, missing = [], []
-    for label, config_path, patch_fn in targets:
-        (detected if config_path.exists() or config_path.parent.exists() else missing).append(
-            (label, config_path, patch_fn)
+    for label, config_path, patch_fn, detect_path in targets:
+        installed = (
+            detect_path.exists()
+            if detect_path is not None
+            else config_path.exists() or config_path.parent.exists()
         )
+        (detected if installed else missing).append((label, config_path, patch_fn))
 
     console.print('[bold]memgit setup[/bold] — interactive tool registration\n')
 
@@ -1327,6 +1346,33 @@ def _run_target(label: str, config_path: Path, patch_fn, dry_run: bool) -> None:
         console.print(f'[red]✗[/red] {label}: {e}')
 
 
+def _cleanup_legacy_claude_code(dry_run: bool = False) -> None:
+    """Drop the memgit entry from ~/.claude/settings.json if present.
+
+    Releases before 0.1.5 registered there, but Claude Code only loads MCP
+    servers from ~/.claude.json — the old entry is dead weight.
+    """
+    legacy = Path.home() / '.claude' / 'settings.json'
+    if not legacy.exists():
+        return
+    try:
+        data = _json.loads(legacy.read_text(encoding='utf-8'))
+    except _json.JSONDecodeError:
+        return
+    servers = data.get('mcpServers')
+    if not isinstance(servers, dict) or 'memgit' not in servers:
+        return
+    servers.pop('memgit')
+    if not servers:
+        data.pop('mcpServers', None)
+    if not dry_run:
+        _write_json_safe(legacy, data)
+    console.print(
+        f'[yellow]↻[/yellow] removed stale memgit entry from {legacy} '
+        f'[dim](Claude Code ignores mcpServers there)[/dim]'
+    )
+
+
 @setup.command('all')
 @click.option('--dry-run', is_flag=True, help='Show what would be changed without writing files.')
 def setup_all(dry_run):
@@ -1340,14 +1386,18 @@ def setup_all(dry_run):
 
     registered = 0
     skipped = 0
-    for label, config_path, patch_fn in _all_targets():
-        # Skip if neither the file nor its parent directory exists
-        # (tool not installed on this machine)
-        if not config_path.exists() and not config_path.parent.exists():
+    for label, config_path, patch_fn, detect_path in _all_targets():
+        installed = (
+            detect_path.exists()
+            if detect_path is not None
+            else config_path.exists() or config_path.parent.exists()
+        )
+        if not installed:
             skipped += 1
             continue
         _run_target(label, config_path, patch_fn, dry_run)
         registered += 1
+    _cleanup_legacy_claude_code(dry_run)
 
     console.print(f'\n[dim]{registered} tool(s) processed, {skipped} not installed (skipped)[/dim]')
     if not dry_run and registered:
@@ -1357,9 +1407,10 @@ def setup_all(dry_run):
 @setup.command('claude-code')
 @click.option('--dry-run', is_flag=True)
 def setup_claude_code(dry_run):
-    """Register with Claude Code (~/.claude/settings.json)."""
-    path = Path.home() / '.claude' / 'settings.json'
+    """Register with Claude Code (~/.claude.json, user scope)."""
+    path = Path.home() / '.claude.json'
     _run_target('Claude Code', path, _patch_mcp_servers, dry_run)
+    _cleanup_legacy_claude_code(dry_run)
 
 
 @setup.command('claude-desktop')

{memgit-0.1.4 → memgit-0.1.5}/memgit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: memgit
-Version: 0.1.4
+Version: 0.1.5
 Summary: Git for AI memory — version-controlled context persistence across Claude, GPT, Gemini, Cursor, Windsurf, and more
 License: MIT
 Project-URL: Homepage, https://memgit.dev
@@ -353,11 +353,11 @@ See [CONTRIBUTING.md](CONTRIBUTING.md).
 - [x] `memgit git push/pull` — team sync via standard git
 - [x] Flat `memories/` directory — grep/diff/blame your memories
 - [x] D3.js graph visualization of memory relationships
-- [x] PyPI + Homebrew (tap) + npm published (v0.1.4)
+- [x] PyPI + Homebrew (tap) + npm published (v0.1.5)
 - [ ] Chocolatey (not yet live on community.chocolatey.org)
 - [x] Interactive setup wizard (`memgit setup`)
 - [x] Smart `memgit init` (auto-detects tool, no path needed)
-- [x] VS Code extension (v0.1.4, Marketplace: code416-memgit.memgit)
+- [x] VS Code extension (v0.1.5, Marketplace: code416-memgit.memgit)
 - [ ] JetBrains plugin (Phase 3)
 - [ ] Semantic search via embeddings (Phase 4)
 - [x] memgit.dev website (live)

{memgit-0.1.4 → memgit-0.1.5}/memgit.egg-info/SOURCES.txt

@@ -20,5 +20,6 @@ memgit.egg-info/entry_points.txt
 memgit.egg-info/requires.txt
 memgit.egg-info/top_level.txt
 tests/test_advanced.py
+tests/test_setup.py
 tests/test_store_repo.py
 tests/test_toon.py

{memgit-0.1.4 → memgit-0.1.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "memgit"
-version = "0.1.4"
+version = "0.1.5"
 description = "Git for AI memory — version-controlled context persistence across Claude, GPT, Gemini, Cursor, Windsurf, and more"
 readme = "README.md"
 requires-python = ">=3.11"

memgit-0.1.5/tests/test_setup.py

@@ -0,0 +1,78 @@
+"""Tests for `memgit setup` MCP registration paths."""
+
+import json
+from pathlib import Path
+
+import pytest
+
+from memgit import cli as cli_mod
+from memgit.cli import (
+    _all_targets,
+    _cleanup_legacy_claude_code,
+    _patch_mcp_servers,
+)
+
+
+@pytest.fixture
+def fake_home(tmp_path, monkeypatch):
+    monkeypatch.setattr(Path, 'home', classmethod(lambda cls: tmp_path))
+    return tmp_path
+
+
+def test_claude_code_target_is_claude_json(fake_home):
+    """Claude Code loads MCP servers from ~/.claude.json, NOT ~/.claude/settings.json."""
+    targets = {label: (config, detect) for label, config, _, detect in _all_targets()}
+    config, detect = targets['Claude Code']
+    assert config == fake_home / '.claude.json'
+    assert detect == fake_home / '.claude'
+
+
+def test_patch_registers_and_is_idempotent(fake_home):
+    config = fake_home / '.claude.json'
+    assert _patch_mcp_servers(config) == 'registered'
+    data = json.loads(config.read_text())
+    assert 'memgit' in data['mcpServers']
+    assert data['mcpServers']['memgit']['args'][-1] == 'serve'
+    assert _patch_mcp_servers(config) == 'already registered'
+
+
+def test_patch_preserves_existing_state(fake_home):
+    """~/.claude.json holds all Claude Code user state — never drop other keys."""
+    config = fake_home / '.claude.json'
+    config.write_text(json.dumps({'projects': {'/x': {}}, 'mcpServers': {'other': {'command': 'x'}}}))
+    _patch_mcp_servers(config)
+    data = json.loads(config.read_text())
+    assert data['projects'] == {'/x': {}}
+    assert set(data['mcpServers']) == {'other', 'memgit'}
+
+
+def test_patch_refuses_to_clobber_invalid_json(fake_home):
+    config = fake_home / '.claude.json'
+    config.write_text('{not json')
+    with pytest.raises(RuntimeError, match='not valid JSON'):
+        _patch_mcp_servers(config)
+    assert config.read_text() == '{not json'
+
+
+def test_cleanup_removes_legacy_entry(fake_home):
+    legacy = fake_home / '.claude' / 'settings.json'
+    legacy.parent.mkdir()
+    legacy.write_text(json.dumps({'theme': 'dark', 'mcpServers': {'memgit': {'command': 'memgit'}}}))
+    _cleanup_legacy_claude_code()
+    data = json.loads(legacy.read_text())
+    assert data['theme'] == 'dark'
+    assert 'mcpServers' not in data
+
+
+def test_cleanup_keeps_other_servers(fake_home):
+    legacy = fake_home / '.claude' / 'settings.json'
+    legacy.parent.mkdir()
+    legacy.write_text(json.dumps({'mcpServers': {'memgit': {}, 'other': {'command': 'x'}}}))
+    _cleanup_legacy_claude_code()
+    data = json.loads(legacy.read_text())
+    assert set(data['mcpServers']) == {'other'}
+
+
+def test_cleanup_noop_without_legacy_file(fake_home):
+    _cleanup_legacy_claude_code()  # must not raise or create files
+    assert not (fake_home / '.claude' / 'settings.json').exists()