memorymaster 3.2.1__tar.gz → 3.3.0__tar.gz

{memorymaster-3.2.1/memorymaster.egg-info → memorymaster-3.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: memorymaster
-Version: 3.2.1
+Version: 3.3.0
 Summary: Production-grade memory reliability system for AI coding agents. Lifecycle-managed claims with citations, conflict detection, steward governance, and MCP integration.
 Author: wolverin0
 License: MIT
@@ -42,9 +42,9 @@ Lifecycle-managed claims with citations, conflict detection, steward governance,
 
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](LICENSE)
 [![Python 3.10+](https://img.shields.io/badge/python-3.10+-blue.svg)](https://www.python.org/downloads/)
-[![Tests](https://img.shields.io/badge/tests-932-green.svg)]()
-[![MCP Tools](https://img.shields.io/badge/MCP%20tools-21-purple.svg)]()
-[![CLI Commands](https://img.shields.io/badge/CLI%20commands-54%2B-orange.svg)]()
+[![Tests](https://img.shields.io/badge/tests-1034-green.svg)]()
+[![MCP Tools](https://img.shields.io/badge/MCP%20tools-22-purple.svg)]()
+[![CLI Commands](https://img.shields.io/badge/CLI%20commands-64-orange.svg)]()
 
 ---
 
@@ -55,9 +55,9 @@ MemoryMaster gives AI coding agents **persistent, verifiable memory** with a ful
 | Metric | Count |
 |--------|-------|
 | Source modules | 35+ (20,000+ lines) |
-| Tests | 932 across 66 test modules |
-| MCP tools | 21 |
-| CLI commands | 54+ |
+| Tests | 1034 across 68 test modules |
+| MCP tools | 22 |
+| CLI commands | 64 |
 | Import connectors | 10+ (Git, Slack, Jira, email, GitHub, conversations) |
 | Utility scripts | 30+ (connectors, benchmarks, drills) |
 
@@ -68,7 +68,7 @@ MemoryMaster gives AI coding agents **persistent, verifiable memory** with a ful
 │                        Agent Runtime                            │
 │  (Claude Code / Codex / any MCP-compatible agent)               │
 └────────────┬────────────────────────────────┬───────────────────┘
-             │ MCP (21 tools)                 │ CLI (50+ commands)
+             │ MCP (22 tools)                 │ CLI (64 commands)
              v                                v
 ┌─────────────────────────────────────────────────────────────────┐
 │                      MemoryMaster Core                          │
@@ -153,7 +153,7 @@ The setup command configures everything interactively:
 - **SessionStart hook** — injects recent claims + cycle summary + pending candidates at session start
 - **Auto-ingest hook** — uses a cheap LLM (Gemini Flash Lite/GPT-4o-mini/Haiku/Ollama) to extract learnings from each session, with a block-based checkpoint every 15 human messages
 - **PreCompact hook** — forces save to MemoryMaster before Claude Code compacts context (permanent context loss prevention)
-- **MCP server** — 21 tools available in all Claude Code & Codex sessions
+- **MCP server** — 22 tools available in all Claude Code & Codex sessions
 - **Steward cron** — validates and curates claims every 6 hours
 - **CLAUDE.md / AGENTS.md** — appends instructions so Claude and Codex actually use MemoryMaster
 - **Obsidian skills** — read/write/search your vault from Claude Code
@@ -211,7 +211,7 @@ Add to your `.mcp.json` (see [`.mcp.json.example`](.mcp.json.example)):
 }
 ```
 
-**21 MCP tools:** `init_db`, `ingest_claim`, `run_cycle`, `run_steward`, `classify_query`, `query_memory`, `query_for_context`, `list_claims`, `redact_claim_payload`, `pin_claim`, `compact_memory`, `list_events`, `open_dashboard`, `list_steward_proposals`, `resolve_steward_proposal`, `extract_entities`, `entity_stats`, `find_related_claims`, `quality_scores`, `recompute_tiers`, `federated_query`
+**22 MCP tools:** `init_db`, `ingest_claim`, `run_cycle`, `run_steward`, `classify_query`, `query_memory`, `query_for_context`, `list_claims`, `redact_claim_payload`, `pin_claim`, `compact_memory`, `list_events`, `search_verbatim`, `open_dashboard`, `list_steward_proposals`, `resolve_steward_proposal`, `extract_entities`, `entity_stats`, `find_related_claims`, `quality_scores`, `recompute_tiers`, `federated_query`
 
 ## How It All Works (E2E)
 
@@ -257,7 +257,7 @@ YOU SEND A MESSAGE
 |-----------|-------------|-----------|
 | **Recall hook** | Injects relevant claims into every prompt | Every message you send |
 | **Auto-ingest hook** | LLM extracts learnings from transcript | Every time Claude stops |
-| **MCP server** (global) | 21 tools for query/ingest/steward | Always available |
+| **MCP server** (global) | 22 tools for query/ingest/steward | Always available |
 | **CLAUDE.md append** | Instructions for Claude to use MemoryMaster | Read at session start |
 | **AGENTS.md append** | Instructions for Codex to use MemoryMaster | Read at session start |
 | **Steward cron** | Validates, decays, compacts claims | Every 6 hours |
@@ -622,7 +622,7 @@ These are optional but enhance the experience:
 
 | MCP | What it adds | Install |
 |-----|--------------|---------|
-| **memorymaster** | The 21 MCP tools (`ingest_claim`, `query_memory`, `run_cycle`, etc.) | `memorymaster-setup` (interactive; or `python scripts/setup-hooks.py` from clone) |
+| **memorymaster** | The 22 MCP tools (`ingest_claim`, `query_memory`, `run_cycle`, etc.) | `memorymaster-setup` (interactive; or `python scripts/setup-hooks.py` from clone) |
 | **GitNexus** | Code-graph aware impact analysis before edits | See [GitNexus Integration](#gitnexus-integration-code-intelligence) |
 | **Obsidian CLI** | Vault-aware search via the obsidian CLI tool | `npm install -g obsidian-cli` (requires Obsidian 1.12+) |
 | **Qdrant** | Vector search backend for semantic recall | `docker run -p 6333:6333 qdrant/qdrant` |
@@ -704,7 +704,7 @@ Key config groups:
 # Install with all dev dependencies
 pip install -e ".[dev,mcp,security,embeddings,qdrant]"
 
-# Run tests (932 tests)
+# Run tests (1034 tests)
 pytest tests/ -q
 
 # Lint and format

{memorymaster-3.2.1 → memorymaster-3.3.0}/README.md

@@ -6,9 +6,9 @@ Lifecycle-managed claims with citations, conflict detection, steward governance,
 
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](LICENSE)
 [![Python 3.10+](https://img.shields.io/badge/python-3.10+-blue.svg)](https://www.python.org/downloads/)
-[![Tests](https://img.shields.io/badge/tests-932-green.svg)]()
-[![MCP Tools](https://img.shields.io/badge/MCP%20tools-21-purple.svg)]()
-[![CLI Commands](https://img.shields.io/badge/CLI%20commands-54%2B-orange.svg)]()
+[![Tests](https://img.shields.io/badge/tests-1034-green.svg)]()
+[![MCP Tools](https://img.shields.io/badge/MCP%20tools-22-purple.svg)]()
+[![CLI Commands](https://img.shields.io/badge/CLI%20commands-64-orange.svg)]()
 
 ---
 
@@ -19,9 +19,9 @@ MemoryMaster gives AI coding agents **persistent, verifiable memory** with a ful
 | Metric | Count |
 |--------|-------|
 | Source modules | 35+ (20,000+ lines) |
-| Tests | 932 across 66 test modules |
-| MCP tools | 21 |
-| CLI commands | 54+ |
+| Tests | 1034 across 68 test modules |
+| MCP tools | 22 |
+| CLI commands | 64 |
 | Import connectors | 10+ (Git, Slack, Jira, email, GitHub, conversations) |
 | Utility scripts | 30+ (connectors, benchmarks, drills) |
 
@@ -32,7 +32,7 @@ MemoryMaster gives AI coding agents **persistent, verifiable memory** with a ful
 │                        Agent Runtime                            │
 │  (Claude Code / Codex / any MCP-compatible agent)               │
 └────────────┬────────────────────────────────┬───────────────────┘
-             │ MCP (21 tools)                 │ CLI (50+ commands)
+             │ MCP (22 tools)                 │ CLI (64 commands)
              v                                v
 ┌─────────────────────────────────────────────────────────────────┐
 │                      MemoryMaster Core                          │
@@ -117,7 +117,7 @@ The setup command configures everything interactively:
 - **SessionStart hook** — injects recent claims + cycle summary + pending candidates at session start
 - **Auto-ingest hook** — uses a cheap LLM (Gemini Flash Lite/GPT-4o-mini/Haiku/Ollama) to extract learnings from each session, with a block-based checkpoint every 15 human messages
 - **PreCompact hook** — forces save to MemoryMaster before Claude Code compacts context (permanent context loss prevention)
-- **MCP server** — 21 tools available in all Claude Code & Codex sessions
+- **MCP server** — 22 tools available in all Claude Code & Codex sessions
 - **Steward cron** — validates and curates claims every 6 hours
 - **CLAUDE.md / AGENTS.md** — appends instructions so Claude and Codex actually use MemoryMaster
 - **Obsidian skills** — read/write/search your vault from Claude Code
@@ -175,7 +175,7 @@ Add to your `.mcp.json` (see [`.mcp.json.example`](.mcp.json.example)):
 }
 ```
 
-**21 MCP tools:** `init_db`, `ingest_claim`, `run_cycle`, `run_steward`, `classify_query`, `query_memory`, `query_for_context`, `list_claims`, `redact_claim_payload`, `pin_claim`, `compact_memory`, `list_events`, `open_dashboard`, `list_steward_proposals`, `resolve_steward_proposal`, `extract_entities`, `entity_stats`, `find_related_claims`, `quality_scores`, `recompute_tiers`, `federated_query`
+**22 MCP tools:** `init_db`, `ingest_claim`, `run_cycle`, `run_steward`, `classify_query`, `query_memory`, `query_for_context`, `list_claims`, `redact_claim_payload`, `pin_claim`, `compact_memory`, `list_events`, `search_verbatim`, `open_dashboard`, `list_steward_proposals`, `resolve_steward_proposal`, `extract_entities`, `entity_stats`, `find_related_claims`, `quality_scores`, `recompute_tiers`, `federated_query`
 
 ## How It All Works (E2E)
 
@@ -221,7 +221,7 @@ YOU SEND A MESSAGE
 |-----------|-------------|-----------|
 | **Recall hook** | Injects relevant claims into every prompt | Every message you send |
 | **Auto-ingest hook** | LLM extracts learnings from transcript | Every time Claude stops |
-| **MCP server** (global) | 21 tools for query/ingest/steward | Always available |
+| **MCP server** (global) | 22 tools for query/ingest/steward | Always available |
 | **CLAUDE.md append** | Instructions for Claude to use MemoryMaster | Read at session start |
 | **AGENTS.md append** | Instructions for Codex to use MemoryMaster | Read at session start |
 | **Steward cron** | Validates, decays, compacts claims | Every 6 hours |
@@ -586,7 +586,7 @@ These are optional but enhance the experience:
 
 | MCP | What it adds | Install |
 |-----|--------------|---------|
-| **memorymaster** | The 21 MCP tools (`ingest_claim`, `query_memory`, `run_cycle`, etc.) | `memorymaster-setup` (interactive; or `python scripts/setup-hooks.py` from clone) |
+| **memorymaster** | The 22 MCP tools (`ingest_claim`, `query_memory`, `run_cycle`, etc.) | `memorymaster-setup` (interactive; or `python scripts/setup-hooks.py` from clone) |
 | **GitNexus** | Code-graph aware impact analysis before edits | See [GitNexus Integration](#gitnexus-integration-code-intelligence) |
 | **Obsidian CLI** | Vault-aware search via the obsidian CLI tool | `npm install -g obsidian-cli` (requires Obsidian 1.12+) |
 | **Qdrant** | Vector search backend for semantic recall | `docker run -p 6333:6333 qdrant/qdrant` |
@@ -668,7 +668,7 @@ Key config groups:
 # Install with all dev dependencies
 pip install -e ".[dev,mcp,security,embeddings,qdrant]"
 
-# Run tests (932 tests)
+# Run tests (1034 tests)
 pytest tests/ -q
 
 # Lint and format

{memorymaster-3.2.1 → memorymaster-3.3.0}/memorymaster/__init__.py

@@ -2,4 +2,4 @@
 
 __all__ = ["__version__"]
 
-__version__ = "3.2.1"
+__version__ = "3.3.0"

{memorymaster-3.2.1 → memorymaster-3.3.0}/memorymaster/_storage_lifecycle.py

@@ -6,24 +6,18 @@ and `self.db_path`. Do not instantiate directly.
 """
 from __future__ import annotations
 
-import contextlib
-import hashlib
 import json
 import logging
 import sqlite3
 from datetime import datetime, timedelta, timezone
-from pathlib import Path
 
 from memorymaster.embeddings import EmbeddingProvider, cosine_similarity
 from memorymaster.models import (
     CLAIM_LINK_TYPES,
     CLAIM_STATUSES,
     STATUS_TRANSITION_EVENT_TYPES,
-    Citation,
-    CitationInput,
     Claim,
     ClaimLink,
-    Event,
     validate_event_payload,
     validate_event_type,
     validate_transition_event_type,
@@ -33,12 +27,7 @@ logger = logging.getLogger(__name__)
 
 from memorymaster._storage_shared import (
     EVENT_HASH_ALGO,
-    HUMAN_ID_PREFIX,
-    SQLITE_CONFIRMED_TUPLE_GUARD_TRIGGERS,
-    SQLITE_EVENTS_APPEND_ONLY_TRIGGERS,
     ConcurrentModificationError,
-    generate_human_id_hash,
-    generate_top_level_human_id,
     utc_now,
 )
 

{memorymaster-3.2.1 → memorymaster-3.3.0}/memorymaster/_storage_read.py

@@ -6,41 +6,19 @@ and `self.db_path`. Do not instantiate directly.
 """
 from __future__ import annotations
 
-import contextlib
-import hashlib
-import json
 import logging
 import sqlite3
 from datetime import datetime, timedelta, timezone
-from pathlib import Path
 
-from memorymaster.embeddings import EmbeddingProvider, cosine_similarity
 from memorymaster.models import (
-    CLAIM_LINK_TYPES,
-    CLAIM_STATUSES,
-    STATUS_TRANSITION_EVENT_TYPES,
     Citation,
-    CitationInput,
     Claim,
     ClaimLink,
     Event,
-    validate_event_payload,
-    validate_event_type,
-    validate_transition_event_type,
 )
 
 logger = logging.getLogger(__name__)
 
-from memorymaster._storage_shared import (
-    EVENT_HASH_ALGO,
-    HUMAN_ID_PREFIX,
-    SQLITE_CONFIRMED_TUPLE_GUARD_TRIGGERS,
-    SQLITE_EVENTS_APPEND_ONLY_TRIGGERS,
-    ConcurrentModificationError,
-    generate_human_id_hash,
-    generate_top_level_human_id,
-    utc_now,
-)
 
 
 class _ReadMixin:
@@ -612,3 +590,63 @@ class _ReadMixin:
             ).fetchall()
         return [self._row_to_citation(row) for row in rows]
 
+    def traverse_relationships(
+        self,
+        start_claim_id: int,
+        *,
+        link_types: list[str] | None = None,
+        max_depth: int = 3,
+        direction: str = "both",
+    ) -> list[dict]:
+        """Traverse the claim relationship graph from a starting claim.
+
+        Returns a list of dicts: [{"claim": Claim, "depth": int, "path": [int],
+        "link_type": str}]. BFS traversal, stops at max_depth. direction can be
+        "outgoing" (source→target), "incoming" (target→source), or "both".
+
+        Inspired by GBrain's graph traversal queries — "what depends on Qdrant?"
+        becomes traverse_relationships(qdrant_claim_id, link_types=["depends_on"]).
+        """
+        with self.connect() as conn:
+            visited: set[int] = {start_claim_id}
+            queue: list[tuple[int, int, list[int], str]] = []  # (claim_id, depth, path, via_link_type)
+
+            # Seed with depth-0 neighbors
+            def _get_neighbors(claim_id: int) -> list[tuple[int, str]]:
+                neighbors: list[tuple[int, str]] = []
+                if direction in ("outgoing", "both"):
+                    q = "SELECT target_id, link_type FROM claim_links WHERE source_id = ?"
+                    for row in conn.execute(q, (claim_id,)).fetchall():
+                        if link_types is None or row[1] in link_types:
+                            neighbors.append((row[0], row[1]))
+                if direction in ("incoming", "both"):
+                    q = "SELECT source_id, link_type FROM claim_links WHERE target_id = ?"
+                    for row in conn.execute(q, (claim_id,)).fetchall():
+                        if link_types is None or row[1] in link_types:
+                            neighbors.append((row[0], row[1]))
+                return neighbors
+
+            for neighbor_id, link_type in _get_neighbors(start_claim_id):
+                if neighbor_id not in visited:
+                    visited.add(neighbor_id)
+                    queue.append((neighbor_id, 1, [start_claim_id, neighbor_id], link_type))
+
+            results: list[dict] = []
+            while queue:
+                cid, depth, path, via_type = queue.pop(0)
+                claim = self.get_claim(cid, include_citations=False)
+                if claim:
+                    results.append({
+                        "claim": claim,
+                        "depth": depth,
+                        "path": path,
+                        "link_type": via_type,
+                    })
+                if depth < max_depth:
+                    for neighbor_id, link_type in _get_neighbors(cid):
+                        if neighbor_id not in visited:
+                            visited.add(neighbor_id)
+                            queue.append((neighbor_id, depth + 1, path + [neighbor_id], link_type))
+
+        return results
+

{memorymaster-3.2.1 → memorymaster-3.3.0}/memorymaster/_storage_schema.py

@@ -6,40 +6,19 @@ and `self.db_path`. Do not instantiate directly.
 """
 from __future__ import annotations
 
-import contextlib
 import hashlib
 import json
 import logging
 import sqlite3
-from datetime import datetime, timedelta, timezone
-from pathlib import Path
-
-from memorymaster.embeddings import EmbeddingProvider, cosine_similarity
-from memorymaster.models import (
-    CLAIM_LINK_TYPES,
-    CLAIM_STATUSES,
-    STATUS_TRANSITION_EVENT_TYPES,
-    Citation,
-    CitationInput,
-    Claim,
-    ClaimLink,
-    Event,
-    validate_event_payload,
-    validate_event_type,
-    validate_transition_event_type,
-)
+
 
 logger = logging.getLogger(__name__)
 
 from memorymaster._storage_shared import (
     EVENT_HASH_ALGO,
-    HUMAN_ID_PREFIX,
     SQLITE_CONFIRMED_TUPLE_GUARD_TRIGGERS,
     SQLITE_EVENTS_APPEND_ONLY_TRIGGERS,
-    ConcurrentModificationError,
-    generate_human_id_hash,
     generate_top_level_human_id,
-    utc_now,
 )
 
 
@@ -283,21 +262,57 @@ class _SchemaMixin:
 
     @staticmethod
     def _ensure_claim_links_schema(conn: sqlite3.Connection) -> None:
-        conn.execute(
-            """
-            CREATE TABLE IF NOT EXISTS claim_links (
-                id INTEGER PRIMARY KEY AUTOINCREMENT,
-                source_id INTEGER NOT NULL,
-                target_id INTEGER NOT NULL,
-                link_type TEXT NOT NULL,
-                created_at TEXT NOT NULL,
-                FOREIGN KEY (source_id) REFERENCES claims(id) ON DELETE CASCADE,
-                FOREIGN KEY (target_id) REFERENCES claims(id) ON DELETE CASCADE,
-                CHECK (source_id <> target_id),
-                CHECK (link_type IN ('relates_to', 'supersedes', 'derived_from', 'contradicts', 'supports'))
-            )
-            """
-        )
+        from memorymaster.models import CLAIM_LINK_TYPES
+
+        # Build the CHECK constraint from the canonical CLAIM_LINK_TYPES tuple
+        # so new types only need to be added in models.py.
+        types_sql = ", ".join(f"'{t}'" for t in CLAIM_LINK_TYPES)
+        check_clause = f"CHECK (link_type IN ({types_sql}))"
+
+        # Check if table exists and whether it needs migration (old CHECK with only 5 types)
+        existing = conn.execute(
+            "SELECT sql FROM sqlite_master WHERE type='table' AND name='claim_links'"
+        ).fetchone()
+
+        if existing and existing[0]:
+            # Table exists — check if it has the old 5-type CHECK
+            if "'implements'" not in existing[0]:
+                # Migrate: rename old → create new → copy → drop old
+                conn.execute("ALTER TABLE claim_links RENAME TO _claim_links_old")
+                conn.execute(f"""
+                    CREATE TABLE claim_links (
+                        id INTEGER PRIMARY KEY AUTOINCREMENT,
+                        source_id INTEGER NOT NULL,
+                        target_id INTEGER NOT NULL,
+                        link_type TEXT NOT NULL,
+                        created_at TEXT NOT NULL,
+                        FOREIGN KEY (source_id) REFERENCES claims(id) ON DELETE CASCADE,
+                        FOREIGN KEY (target_id) REFERENCES claims(id) ON DELETE CASCADE,
+                        CHECK (source_id <> target_id),
+                        {check_clause}
+                    )
+                """)
+                conn.execute("""
+                    INSERT INTO claim_links (id, source_id, target_id, link_type, created_at)
+                    SELECT id, source_id, target_id, link_type, created_at FROM _claim_links_old
+                """)
+                conn.execute("DROP TABLE _claim_links_old")
+        else:
+            # Fresh creation
+            conn.execute(f"""
+                CREATE TABLE IF NOT EXISTS claim_links (
+                    id INTEGER PRIMARY KEY AUTOINCREMENT,
+                    source_id INTEGER NOT NULL,
+                    target_id INTEGER NOT NULL,
+                    link_type TEXT NOT NULL,
+                    created_at TEXT NOT NULL,
+                    FOREIGN KEY (source_id) REFERENCES claims(id) ON DELETE CASCADE,
+                    FOREIGN KEY (target_id) REFERENCES claims(id) ON DELETE CASCADE,
+                    CHECK (source_id <> target_id),
+                    {check_clause}
+                )
+            """)
+
         conn.execute(
             "CREATE UNIQUE INDEX IF NOT EXISTS idx_claim_links_unique ON claim_links(source_id, target_id, link_type)"
         )

{memorymaster-3.2.1 → memorymaster-3.3.0}/memorymaster/_storage_write_claims.py

@@ -6,39 +6,19 @@ and `self.db_path`. Do not instantiate directly.
 """
 from __future__ import annotations
 
-import contextlib
-import hashlib
 import json
 import logging
 import sqlite3
-from datetime import datetime, timedelta, timezone
-from pathlib import Path
 
-from memorymaster.embeddings import EmbeddingProvider, cosine_similarity
 from memorymaster.models import (
-    CLAIM_LINK_TYPES,
-    CLAIM_STATUSES,
-    STATUS_TRANSITION_EVENT_TYPES,
-    Citation,
     CitationInput,
     Claim,
-    ClaimLink,
-    Event,
     validate_event_payload,
-    validate_event_type,
-    validate_transition_event_type,
 )
 
 logger = logging.getLogger(__name__)
 
 from memorymaster._storage_shared import (
-    EVENT_HASH_ALGO,
-    HUMAN_ID_PREFIX,
-    SQLITE_CONFIRMED_TUPLE_GUARD_TRIGGERS,
-    SQLITE_EVENTS_APPEND_ONLY_TRIGGERS,
-    ConcurrentModificationError,
-    generate_human_id_hash,
-    generate_top_level_human_id,
     utc_now,
 )
 

{memorymaster-3.2.1 → memorymaster-3.3.0}/memorymaster/cli.py

@@ -3,19 +3,18 @@ from __future__ import annotations
 import argparse
 from pathlib import Path
 
-from memorymaster.cli_helpers import (
+from memorymaster.cli_helpers import (  # noqa: F401 — re-export for backward compat with tests/external callers
     STEALTH_DB_NAME,
     _add_cycle_policy_args,
     _json_error,
-    _resolve_claim_id,  # re-export for backward-compat with tests/external callers
+    _resolve_claim_id,
     _resolve_db_path,
     _stealth_active,
     parse_citation,
     parse_scope_allowlist,
 )
 from memorymaster.context_optimizer import OUTPUT_FORMATS
-from memorymaster.models import CLAIM_LINK_TYPES, CLAIM_STATUSES, CitationInput, VOLATILITY_LEVELS
-from memorymaster.policy import POLICY_MODES
+from memorymaster.models import CLAIM_LINK_TYPES, CLAIM_STATUSES, VOLATILITY_LEVELS
 from memorymaster.retrieval import RETRIEVAL_MODES
 from memorymaster.service import MemoryService
 
@@ -376,6 +375,22 @@ def build_parser() -> argparse.ArgumentParser:
     dream_clean_cmd.add_argument("--project", default=None, help="Project path to compute Claude Code memory dir slug")
     dream_clean_cmd.add_argument("--dry-run", action="store_true", help="Preview what would be removed without deleting files")
 
+    # Entity registry (GBrain-inspired)
+    entity_list = sub.add_parser("entity-list", help="List canonical entities with alias and claim counts")
+    entity_list.add_argument("--scope", default="", help="Filter by scope prefix")
+    entity_list.add_argument("--type", default="", help="Filter by entity type")
+    entity_list.add_argument("--limit", type=int, default=50)
+
+    entity_merge = sub.add_parser("entity-merge", help="Merge two entities (move aliases + claims to target)")
+    entity_merge.add_argument("keep_id", type=int, help="Entity ID to keep")
+    entity_merge.add_argument("merge_id", type=int, help="Entity ID to merge into keep_id")
+
+    entity_aliases_cmd = sub.add_parser("entity-aliases", help="List or add aliases for an entity")
+    entity_aliases_cmd.add_argument("entity_id", type=int, help="Entity ID")
+    entity_aliases_cmd.add_argument("--add", default="", help="Add this alias to the entity")
+
+    entity_backfill = sub.add_parser("entity-backfill", help="Backfill entity_id on claims with subject but no entity")
+
     return parser
 
 

{memorymaster-3.2.1 → memorymaster-3.3.0}/memorymaster/cli_handlers_basic.py

@@ -9,14 +9,13 @@ from __future__ import annotations
 import argparse
 import json
 import os
-from dataclasses import asdict, is_dataclass
+from dataclasses import asdict
 from pathlib import Path
 import time
 
 from memorymaster.cli_helpers import (
     STEALTH_DB_NAME,
     _SCORE_KEYS,
-    _add_cycle_policy_args,
     _claim_to_dict,
     _event_to_timeline_entry,
     _json_default,
@@ -24,19 +23,14 @@ from memorymaster.cli_helpers import (
     _json_error,
     _print_claim_brief,
     _resolve_claim_id,
-    _resolve_db_path,
+    _score_str_from_payload,
     _stealth_active,
     parse_citation,
     parse_scope_allowlist,
     print_claim,
 )
-from memorymaster.context_optimizer import OUTPUT_FORMATS
-from memorymaster.models import CLAIM_LINK_TYPES, CLAIM_STATUSES, CitationInput, VOLATILITY_LEVELS
-from memorymaster.policy import POLICY_MODES
-from memorymaster.retrieval import RETRIEVAL_MODES
 from memorymaster.scheduler import run_daemon
 from memorymaster.security import resolve_allow_sensitive_access
-from memorymaster.service import MemoryService
 
 
 def _handle_create_snapshot(args: argparse.Namespace, db_resolved: Path) -> int: