dotscope 1.7.4__tar.gz → 1.7.7__tar.gz

{dotscope-1.7.4 → dotscope-1.7.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dotscope
-Version: 1.7.4
+Version: 1.7.7
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Libraries
@@ -17,7 +17,7 @@ Requires-Dist: dotscope[mcp,tokens,search] ; extra == 'all'
 Requires-Dist: pytest ; extra == 'dev'
 Requires-Dist: ruff ; extra == 'dev'
 Requires-Dist: sentence-transformers ; extra == 'embeddings'
-Requires-Dist: mcp>=1.2.0,<3 ; extra == 'mcp'
+Requires-Dist: mcp>=1.6.0,<3 ; extra == 'mcp'
 Requires-Dist: sentence-transformers ; extra == 'search'
 Requires-Dist: numpy ; extra == 'search'
 Requires-Dist: tiktoken ; extra == 'tokens'

{dotscope-1.7.4 → dotscope-1.7.7}/dotscope/__init__.py

@@ -1,3 +1,3 @@
 """dotscope — Directory-scoped context boundaries for AI coding agents."""
 
-__version__ = "1.7.4"
+__version__ = "1.7.7"

{dotscope-1.7.4 → dotscope-1.7.7}/dotscope/cli/__init__.py

@@ -86,12 +86,13 @@ def main(argv=None):
     sub.add_parser("health", help="Scope health: staleness, coverage, drift")
 
     # --- sync ---
-    p_sync = sub.add_parser("sync", help="Structurally synchronize stale .scope boundary configurations against the real-time AST engine")
-    p_sync.add_argument("scopes", nargs="*", help="Specific scope boundaries to sync (omit for entire repo)")
+    p_sync = sub.add_parser("sync", help="Re-align .scope boundaries against the current import graph")
+    p_sync.add_argument("scopes", nargs="*", help="Specific scopes to sync (omit for entire repo)")
 
     # --- ingest ---
     p_ingest = sub.add_parser("ingest", help="Reverse-engineer .scope files from an existing codebase")
-    p_ingest.add_argument("--dir", default=".", help="Repository root to ingest")
+    p_ingest.add_argument("directory", nargs="?", default=None, help="Repository root to ingest (default: current directory)")
+    p_ingest.add_argument("--dir", default=None, help="Repository root to ingest (alias for positional arg)")
     p_ingest.add_argument("--no-history", action="store_true", help="Skip git history mining")
     p_ingest.add_argument("--no-docs", action="store_true", help="Skip doc absorption")
     p_ingest.add_argument("--dry-run", action="store_true", help="Plan only, don't write files")

{dotscope-1.7.4 → dotscope-1.7.7}/dotscope/cli/ingest.py

@@ -5,7 +5,7 @@ import sys
 def _cmd_ingest(args):
     from ..workflows.ingest import ingest, format_ingest_report
 
-    root = os.path.abspath(args.dir)
+    root = os.path.abspath(args.directory or args.dir or ".")
     plan = ingest(
         root,
         mine_history=not args.no_history,

{dotscope-1.7.4 → dotscope-1.7.7}/dotscope/engine/search.py

@@ -21,7 +21,7 @@ def execute_semantic_search(root: str, query: str) -> str:
             query
         ]
         # Ignore case by default to maximize recall for the agent
-        cmd.insert(2, "-i")
+        cmd.insert(3, "-i")
 
         result = subprocess.run(cmd, cwd=root, capture_output=True, text=True, timeout=15)
         # 1 means no match, 0 means match. >1 is error

{dotscope-1.7.4 → dotscope-1.7.7}/dotscope/mcp/__init__.py

@@ -59,17 +59,17 @@ def main():
     import contextlib
 
     # Redirect stray stdout writes (from libraries, print() calls, etc.)
-    # to stderr so that only clean JSON-RPC flows over the stdio transport.
+    # to stderr so only clean JSON-RPC flows over the stdio transport.
     #
     # How it works:
     #   1. Save the real stdout fd (the MCP pipe to the client).
     #   2. Point fd 1 and sys.stdout at stderr (captures stray output).
-    #   3. Build an isolated file object from the saved fd.
-    #   4. Patch the reference that FastMCP.run_stdio_async actually uses
-    #      — the local name imported via `from mcp.server.stdio import
-    #      stdio_server` inside mcp/server/fastmcp/server.py.  Patching
-    #      `mcp.server.stdio.stdio_server` alone has no effect because
-    #      the `from … import` already bound a direct reference.
+    #   3. Build an async file object from the saved fd.
+    #   4. Override FastMCP.run_stdio_async to pass the saved stdout
+    #      into stdio_server(stdout=...) — its public API.
+    #
+    # This avoids monkeypatching internal module references, which break
+    # when FastMCP caches them via `from … import` at load time.
     _isolated_stdout = None
     try:
         virgin_stdout_fd = os.dup(1)
@@ -97,35 +97,29 @@ def main():
     known, _remaining = parser.parse_known_args()
     _cli_root = known.root
 
-    # Patch the stdio_server reference that FastMCP.run_stdio_async actually
-    # calls.  The module does `from mcp.server.stdio import stdio_server` so
-    # we must overwrite that *local* name, not the module-level attribute.
+    mcp = FastMCP("dotscope")
+
+    # Override run_stdio_async to pass the isolated stdout directly into
+    # stdio_server's public `stdout=` parameter.  This is stable across
+    # mcp versions — no module-level monkeypatching required.
     if _isolated_stdout is not None:
-        try:
-            import mcp.server.stdio as _mcp_stdio
-            import mcp.server.fastmcp.server as _fastmcp_mod
-            import anyio
-            from io import TextIOWrapper
-
-            _original_stdio_server = _mcp_stdio.stdio_server
-
-            @contextlib.asynccontextmanager
-            async def _patched_stdio_server(stdin=None, stdout=None):
-                if stdout is None:
-                    stdout = anyio.wrap_file(
-                        TextIOWrapper(_isolated_stdout, encoding="utf-8")
-                    )
-                async with _original_stdio_server(stdin=stdin, stdout=stdout) as streams:
-                    yield streams
-
-            # Patch both: the module attr (for anyone else importing it) and
-            # the local name inside fastmcp.server (the one that matters).
-            _mcp_stdio.stdio_server = _patched_stdio_server
-            _fastmcp_mod.stdio_server = _patched_stdio_server
-        except Exception as e:
-            print(f"dotscope warning: stdio patch failed: {e}", file=sys.stderr)
+        from mcp.server.stdio import stdio_server
+        import anyio
+        from io import TextIOWrapper
 
-    mcp = FastMCP("dotscope")
+        _mcp_stdout = anyio.wrap_file(
+            TextIOWrapper(_isolated_stdout, encoding="utf-8")
+        )
+
+        async def _run_stdio_with_isolated_stdout(self_ref=mcp):
+            async with stdio_server(stdout=_mcp_stdout) as (read_stream, write_stream):
+                await self_ref._mcp_server.run(
+                    read_stream,
+                    write_stream,
+                    self_ref._mcp_server.create_initialization_options(),
+                )
+
+        mcp.run_stdio_async = _run_stdio_with_isolated_stdout
 
     # Session-level tracker (lives across tool calls in a single MCP session)
     from ..ux.visibility import SessionTracker

{dotscope-1.7.4 → dotscope-1.7.7}/dotscope/mcp/core.py

@@ -110,7 +110,7 @@ def register_core_tools(mcp, **kwargs):
 
         index = load_resolution_index(root)
         scopes = []
-        if index:
+        if index and index.scopes:
             for name, entry in index.scopes.items():
                 scopes.append((name, entry.keywords, entry.description or ""))
         else:
@@ -167,7 +167,7 @@ def register_core_tools(mcp, **kwargs):
         scopes = []
         index = load_resolution_index(root)
 
-        if index:
+        if index and index.scopes:
             for name, entry in index.scopes.items():
                 scopes.append({
                     "name": name,

dotscope-1.7.7/dotscope/mcp/hooks.py

@@ -0,0 +1,38 @@
+def register_hooks_tools(mcp, **kwargs):
+    tracker = kwargs.get('tracker')
+    client_id = kwargs.get('client_id')
+    _root = kwargs.get('_root')
+    _repo_tokens = kwargs.get('_repo_tokens')
+    _cached_history = kwargs.get('_cached_history')
+    _cached_graph_hubs = kwargs.get('_cached_graph_hubs')
+    _cli_root = kwargs.get('_cli_root')
+
+    @mcp.tool()
+    def dotscope_sync(
+        scopes: list[str] | None = None,
+        root: str | None = None,
+    ) -> str:
+        """Synchronize .scope file boundaries against the current AST topology.
+
+        Re-scans the dependency graph and updates each .scope file's includes
+        and excludes to match the real imports.  Preserves any lines marked
+        with ``# keep`` or ``# manual``.  Non-destructive: context, description,
+        keywords, and related fields are never touched.
+
+        Args:
+            scopes: Specific scope names to sync (omit for entire repo).
+            root: Repository root path (auto-detected if omitted).
+        """
+        import json
+        from ..paths.repo import find_repo_root
+        from ..workflows.sync import sync_scopes
+
+        effective_root = root or _root or find_repo_root(_cli_root)
+        if effective_root is None:
+            return json.dumps({"error": "Could not find repository root"})
+
+        count = sync_scopes(effective_root, scopes)
+        return json.dumps({
+            "scopes_modified": count,
+            "message": f"Synchronized {count} scope(s)." if count else "All scopes already in sync.",
+        })

{dotscope-1.7.4 → dotscope-1.7.7}/dotscope/ux/help.py

@@ -8,17 +8,25 @@ HELP_ROOT = """\
 Usage: dotscope <command>
 
   init                      One command: ingest, hooks, MCP config
-  resolve <scope>           Serve context to an agent
+  resolve <scope>           Serve files + context to an agent
+  context <scope>           Architectural context only (no files)
+  match <task>              Find matching scope for a task description
+  list                      List all scopes
   check                     Verify routing (guards block, nudges guide)
-  conventions               View and manage conventions
-  voice                     View and manage code style
   health                    Scope staleness and drift
-  refresh                   Runtime refresh queue and worker
+  validate                  Check .scope files for broken paths
+
+  ingest .                  Reverse-engineer .scope files from codebase
+  sync                      Re-align .scope boundaries against import graph
+  refresh                   Reload runtime cache from disk
 
-  ingest .                  Re-ingest (full scan)
+  conventions               View and manage conventions
+  voice                     View and manage code style
   intent                    Declare architectural direction
-  diff --staged             Semantic diff
-  hook install              Re-install hooks
+  diff --staged             Semantic diff against conventions
+  impact <file>             Predict blast radius of changes
+
+  hook install              Install git hooks
   bench                     Performance metrics
   test-compiler             Regression suite
   debug --last              Diagnose a bad session
@@ -188,10 +196,60 @@ Usage: dotscope refresh <action> [options]
 Automatic refresh writes only to .dotscope/. Tracked .scope files stay stable
 until you run dotscope ingest."""
 
+HELP_SYNC = """\
+Usage: dotscope sync [scopes...]
+
+  dotscope sync                        Re-align all .scope boundaries
+  dotscope sync auth payments          Sync specific scopes only
+
+Scans the AST dependency graph and updates each .scope file's includes
+and excludes to match real imports. Lines marked # keep or # manual are
+preserved. Context, description, and keywords are never touched."""
+
+HELP_CONTEXT = """\
+Usage: dotscope context <scope> [options]
+
+  dotscope context auth                Full architectural context
+  dotscope context auth --section gotchas   Specific section only
+
+Options:
+  --section <name>     Filter to a named section (invariants, gotchas, etc.)"""
+
+HELP_MATCH = """\
+Usage: dotscope match <task>
+
+  dotscope match "fix the auth token refresh bug"
+  dotscope match "add retry logic to API client"
+
+Returns ranked scopes with confidence scores based on keyword overlap."""
+
+HELP_VALIDATE = """\
+Usage: dotscope validate
+
+  dotscope validate                    Check all .scope files
+
+Checks:
+  - Include paths exist on disk
+  - Related scope files exist
+  - Description is not empty
+  - Context field is present"""
+
+HELP_IMPACT = """\
+Usage: dotscope impact <file>
+
+  dotscope impact auth/tokens.py       Show blast radius
+
+Returns direct dependents, two-hop dependents, and co-change companions."""
+
 HELP_COMMANDS = {
     "ingest": HELP_INGEST,
     "resolve": HELP_RESOLVE,
+    "context": HELP_CONTEXT,
+    "match": HELP_MATCH,
     "check": HELP_CHECK,
+    "sync": HELP_SYNC,
+    "validate": HELP_VALIDATE,
+    "impact": HELP_IMPACT,
     "intent": HELP_INTENT,
     "conventions": HELP_CONVENTIONS,
     "diff": HELP_DIFF,

{dotscope-1.7.4 → dotscope-1.7.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dotscope"
-version = "1.7.4"
+version = "1.7.7"
 description = "Agents see files. You see architecture. dotscope gives agents the architecture."
 readme = "README.md"
 license = "MIT"
@@ -26,7 +26,7 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
-mcp = ["mcp>=1.2.0,<3"]
+mcp = ["mcp>=1.6.0,<3"]
 tokens = ["tiktoken"]
 embeddings = ["sentence-transformers"]
 search = ["sentence-transformers", "numpy"]

dotscope-1.7.4/dotscope/mcp/hooks.py

@@ -1,8 +0,0 @@
-def register_hooks_tools(mcp, **kwargs):
-    tracker = kwargs.get('tracker')
-    client_id = kwargs.get('client_id')
-    _root = kwargs.get('_root')
-    _repo_tokens = kwargs.get('_repo_tokens')
-    _cached_history = kwargs.get('_cached_history')
-    _cached_graph_hubs = kwargs.get('_cached_graph_hubs')
-    _cli_root = kwargs.get('_cli_root')