lean-memory-console 0.2.2__tar.gz → 0.2.3__tar.gz

{lean_memory_console-0.2.2 → lean_memory_console-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lean-memory-console
-Version: 0.2.2
+Version: 0.2.3
 Summary: Agent-first read-only verification console for lean-memory
 Project-URL: Homepage, https://github.com/Wuesteon/lean-memory
 Project-URL: Repository, https://github.com/Wuesteon/lean-memory
@@ -22,7 +22,7 @@ Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
 Requires-Python: >=3.10
 Requires-Dist: fastapi>=0.115
 Requires-Dist: lean-memory
-Requires-Dist: mcp<2,>=1.2
+Requires-Dist: mcp<3,>=1.2
 Requires-Dist: uvicorn>=0.30
 Provides-Extra: dev
 Requires-Dist: anyio>=4; extra == 'dev'

{lean_memory_console-0.2.2 → lean_memory_console-0.2.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "lean-memory-console"
-version = "0.2.2"
+version = "0.2.3"
 description = "Agent-first read-only verification console for lean-memory"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -35,8 +35,8 @@ dependencies = [
     "lean-memory",
     "fastapi>=0.115",
     "uvicorn>=0.30",
-    # <2: mcp 2.0.0 removed mcp.server.fastmcp (see core [mcp] extra note).
-    "mcp>=1.2,<2",
+    # Dual-path (WP12): lean_memory_console._mcp_compat supports 1.x and 2.x.
+    "mcp>=1.2,<3",
 ]
 
 [project.optional-dependencies]

{lean_memory_console-0.2.2 → lean_memory_console-0.2.3}/src/lean_memory_console/__init__.py

@@ -1,3 +1,3 @@
 """lean-memory-console — agent-first read-only verification console."""
 
-__version__ = "0.2.2"
+__version__ = "0.2.3"

lean_memory_console-0.2.3/src/lean_memory_console/_mcp_compat.py

@@ -0,0 +1,35 @@
+"""Dual-path mcp SDK compatibility (WP12): 2.0 renamed FastMCP → MCPServer
+(same decorator API) and moved transport params from the constructor to the
+`streamable_http_app(...)` call. Deliberately duplicated from
+`lean_memory._mcp_compat` rather than imported: console↔core version skew
+makes cross-package private imports fragile."""
+
+from __future__ import annotations
+
+from typing import Any
+
+try:  # mcp >= 2
+    from mcp.server.mcpserver import MCPServer as MCPServerType
+
+    MCP_V2 = True
+except ImportError:  # mcp 1.x
+    from mcp.server.fastmcp import FastMCP as MCPServerType  # type: ignore[assignment]
+
+    MCP_V2 = False
+
+
+def make_http_server_and_app(name: str, **transport_kwargs: Any):
+    """Build a streamable-HTTP server + its ASGI app under either SDK major.
+
+    1.x takes the transport kwargs (stateless_http, json_response,
+    streamable_http_path, transport_security) in the FastMCP constructor and a
+    bare `streamable_http_app()`; 2.0 takes a bare constructor and passes them
+    to `streamable_http_app(...)`. Returns (server, build_app) where build_app
+    is a zero-arg callable — tools must be registered on `server` BEFORE
+    calling it (both majors snapshot the tool set into the app).
+    """
+    if MCP_V2:
+        server = MCPServerType(name)
+        return server, lambda: server.streamable_http_app(**transport_kwargs)
+    server = MCPServerType(name, **transport_kwargs)
+    return server, lambda: server.streamable_http_app()

{lean_memory_console-0.2.2 → lean_memory_console-0.2.3}/src/lean_memory_console/mcp_tools.py

@@ -2,7 +2,7 @@
 
 The console ships the SAME memory + maintenance tools on both its stdio server
 (``observe_mcp.py`` — what the plugin runs) and its Docker HTTP mount
-(``routes/mcp.py``). Registering them once here, against a passed-in FastMCP + the
+(``routes/mcp.py``). Registering them once here, against a passed-in server + the
 gateway, keeps tool names, signatures, and return shapes IDENTICAL across the two —
 and identical to the core stdio server (``lean_memory.mcp_server``), which is the §6.3
 requirement and the v0.1.3 manifest-parity lesson.
@@ -22,7 +22,7 @@ from __future__ import annotations
 import json
 from typing import Any
 
-from mcp.server.fastmcp import FastMCP
+from ._mcp_compat import MCPServerType
 
 from .engine import EngineGateway
 
@@ -61,7 +61,7 @@ Workflow:
 """
 
 
-def register_maintenance_tools(mcp: FastMCP, gateway: EngineGateway) -> None:
+def register_maintenance_tools(mcp: MCPServerType, gateway: EngineGateway) -> None:
     """Register the four §6.3 maintenance tools on `mcp`, routed through `gateway`.
 
     Identical names/signatures to the core stdio server: memory_maintenance_run
@@ -120,7 +120,7 @@ def register_maintenance_tools(mcp: FastMCP, gateway: EngineGateway) -> None:
         return json.loads(json.dumps(result, default=str))
 
 
-def register_review_prompt(mcp: FastMCP) -> None:
+def register_review_prompt(mcp: MCPServerType) -> None:
     """Register the `review-memory-maintenance` prompt on a stdio FastMCP (§6.4).
 
     The prompt hands the client agent the review workflow but FORBIDS it from deciding

{lean_memory_console-0.2.2 → lean_memory_console-0.2.3}/src/lean_memory_console/observe_mcp.py

@@ -9,16 +9,15 @@ from __future__ import annotations
 
 from typing import Any
 
-from mcp.server.fastmcp import FastMCP
-
+from ._mcp_compat import MCPServerType
 from .config import ConsoleConfig
 from .engine import EngineGateway
 from .events import EventLog
 from .mcp_tools import register_maintenance_tools, register_review_prompt
 
 
-def build_mcp(gateway: EngineGateway) -> FastMCP:
-    mcp = FastMCP("lean-memory-console")
+def build_mcp(gateway: EngineGateway) -> MCPServerType:
+    mcp = MCPServerType("lean-memory-console")
 
     @mcp.tool()
     async def memory_add(

{lean_memory_console-0.2.2 → lean_memory_console-0.2.3}/src/lean_memory_console/routes/mcp.py

@@ -49,9 +49,9 @@ from __future__ import annotations
 import secrets
 from typing import Any
 
-from mcp.server.fastmcp import FastMCP
 from mcp.server.transport_security import TransportSecuritySettings
 
+from .._mcp_compat import MCPServerType, make_http_server_and_app
 from ..config import ConsoleConfig
 from ..engine import EngineGateway
 from ..mcp_tools import register_maintenance_tools
@@ -78,14 +78,16 @@ _ALLOWED_ORIGINS = [
 
 def _build_http_mcp(
     gateway: EngineGateway, extra_allowed_hosts: list[str] | None = None
-) -> FastMCP:
+) -> tuple[MCPServerType, Any]:
     # Loopback defaults + any operator-supplied patterns (LM_MCP_ALLOWED_HOSTS),
     # de-duplicated while preserving order.
     allowed_hosts = list(_DEFAULT_ALLOWED_HOSTS)
     for host in extra_allowed_hosts or []:
         if host not in allowed_hosts:
             allowed_hosts.append(host)
-    mcp = FastMCP(
+    # The compat factory places the transport kwargs where the installed SDK
+    # major wants them (1.x: constructor; 2.x: streamable_http_app call).
+    mcp, build_app = make_http_server_and_app(
         "lean-memory-console",
         stateless_http=True,
         json_response=True,
@@ -130,7 +132,7 @@ def _build_http_mcp(
     # here — MCP prompts are a stdio-client capability; HTTP clients use the tools.
     register_maintenance_tools(mcp, gateway)
 
-    return mcp
+    return mcp, build_app
 
 
 def build_mcp_mount(gateway: EngineGateway, config: ConsoleConfig):
@@ -142,8 +144,8 @@ def build_mcp_mount(gateway: EngineGateway, config: ConsoleConfig):
     enter its ``run()`` in the app lifespan (see module docstring, decision 1) —
     there is no per-request fallback, because ``run()`` is once-only per instance.
     """
-    mcp = _build_http_mcp(gateway, config.mcp_allowed_hosts)
-    inner = mcp.streamable_http_app()
+    mcp, build_app = _build_http_mcp(gateway, config.mcp_allowed_hosts)
+    inner = build_app()
     session_manager = mcp.session_manager  # initializes it on the inner app
     # None when no api_key is configured, so the constant-time compare below
     # always fails (compare_digest is skipped for a None expected value).

{lean_memory_console-0.2.2 → lean_memory_console-0.2.3}/tests/test_mcp_parity.py

@@ -46,7 +46,7 @@ def test_http_mount_exposes_the_same_tool_set(tmp_path):
     cfg = ConsoleConfig(data_root=tmp_path, mode="local", models="stub")
     log = EventLog(tmp_path)
     gw = EngineGateway(cfg, log)
-    http_mcp = _build_http_mcp(gw, cfg.mcp_allowed_hosts)
+    http_mcp, _build_app = _build_http_mcp(gw, cfg.mcp_allowed_hosts)
     names = set(_tool_params(http_mcp).keys())
     gw.close()
     log.close()

{lean_memory_console-0.2.2 → lean_memory_console-0.2.3}/tests/test_observe_mcp.py

@@ -18,7 +18,11 @@ def wrapper(tmp_path):
 
 
 def _unwrap(result):
-    """FastMCP call_tool returns (content, structured) or structured dict."""
+    """Server-side call_tool return differs per mcp major (WP12): 1.x FastMCP
+    returns (content, structured) or a structured dict; 2.0 MCPServer returns
+    a CallToolResult carrying `.structured_content`."""
+    if hasattr(result, "structured_content"):  # mcp >= 2
+        return result.structured_content
     if isinstance(result, tuple):
         return result[1]
     return result