basic-memory 0.14.4__py3-none-any.whl → 0.15.1__py3-none-any.whl

basic_memory/cli/commands/mcp.py

@@ -1,7 +1,9 @@
 """MCP server command with streamable HTTP transport."""
 
 import asyncio
+import os
 import typer
+from typing import Optional
 
 from basic_memory.cli.app import app
 from basic_memory.config import ConfigManager
@@ -15,63 +17,78 @@ import basic_memory.mcp.tools  # noqa: F401  # pragma: no cover
 # Import prompts to register them
 import basic_memory.mcp.prompts  # noqa: F401  # pragma: no cover
 from loguru import logger
-
-
-@app.command()
-def mcp(
-    transport: str = typer.Option("stdio", help="Transport type: stdio, streamable-http, or sse"),
-    host: str = typer.Option(
-        "0.0.0.0", help="Host for HTTP transports (use 0.0.0.0 to allow external connections)"
-    ),
-    port: int = typer.Option(8000, help="Port for HTTP transports"),
-    path: str = typer.Option("/mcp", help="Path prefix for streamable-http transport"),
-):  # pragma: no cover
-    """Run the MCP server with configurable transport options.
-
-    This command starts an MCP server using one of three transport options:
-
-    - stdio: Standard I/O (good for local usage)
-    - streamable-http: Recommended for web deployments (default)
-    - sse: Server-Sent Events (for compatibility with existing clients)
-    """
-
-    from basic_memory.services.initialization import initialize_file_sync
-
-    # Use unified thread-based sync approach for both transports
-    import threading
-
-    app_config = ConfigManager().config
-
-    def run_file_sync():
-        """Run file sync in a separate thread with its own event loop."""
-        loop = asyncio.new_event_loop()
-        asyncio.set_event_loop(loop)
-        try:
-            loop.run_until_complete(initialize_file_sync(app_config))
-        except Exception as e:
-            logger.error(f"File sync error: {e}", err=True)
-        finally:
-            loop.close()
-
-    logger.info(f"Sync changes enabled: {app_config.sync_changes}")
-    if app_config.sync_changes:
-        # Start the sync thread
-        sync_thread = threading.Thread(target=run_file_sync, daemon=True)
-        sync_thread.start()
-        logger.info("Started file sync in background")
-
-    # Now run the MCP server (blocks)
-    logger.info(f"Starting MCP server with {transport.upper()} transport")
-
-    if transport == "stdio":
-        mcp_server.run(
-            transport=transport,
-        )
-    elif transport == "streamable-http" or transport == "sse":
-        mcp_server.run(
-            transport=transport,
-            host=host,
-            port=port,
-            path=path,
-            log_level="INFO",
-        )
+import threading
+from basic_memory.services.initialization import initialize_file_sync
+
+config = ConfigManager().config
+
+if not config.cloud_mode_enabled:
+
+    @app.command()
+    def mcp(
+        transport: str = typer.Option(
+            "stdio", help="Transport type: stdio, streamable-http, or sse"
+        ),
+        host: str = typer.Option(
+            "0.0.0.0", help="Host for HTTP transports (use 0.0.0.0 to allow external connections)"
+        ),
+        port: int = typer.Option(8000, help="Port for HTTP transports"),
+        path: str = typer.Option("/mcp", help="Path prefix for streamable-http transport"),
+        project: Optional[str] = typer.Option(None, help="Restrict MCP server to single project"),
+    ):  # pragma: no cover
+        """Run the MCP server with configurable transport options.
+
+        This command starts an MCP server using one of three transport options:
+
+        - stdio: Standard I/O (good for local usage)
+        - streamable-http: Recommended for web deployments (default)
+        - sse: Server-Sent Events (for compatibility with existing clients)
+        """
+
+        # Validate and set project constraint if specified
+        if project:
+            config_manager = ConfigManager()
+            project_name, _ = config_manager.get_project(project)
+            if not project_name:
+                typer.echo(f"No project found named: {project}", err=True)
+                raise typer.Exit(1)
+
+            # Set env var with validated project name
+            os.environ["BASIC_MEMORY_MCP_PROJECT"] = project_name
+            logger.info(f"MCP server constrained to project: {project_name}")
+
+        app_config = ConfigManager().config
+
+        def run_file_sync():
+            """Run file sync in a separate thread with its own event loop."""
+            loop = asyncio.new_event_loop()
+            asyncio.set_event_loop(loop)
+            try:
+                loop.run_until_complete(initialize_file_sync(app_config))
+            except Exception as e:
+                logger.error(f"File sync error: {e}", err=True)
+            finally:
+                loop.close()
+
+        logger.info(f"Sync changes enabled: {app_config.sync_changes}")
+        if app_config.sync_changes:
+            # Start the sync thread
+            sync_thread = threading.Thread(target=run_file_sync, daemon=True)
+            sync_thread.start()
+            logger.info("Started file sync in background")
+
+        # Now run the MCP server (blocks)
+        logger.info(f"Starting MCP server with {transport.upper()} transport")
+
+        if transport == "stdio":
+            mcp_server.run(
+                transport=transport,
+            )
+        elif transport == "streamable-http" or transport == "sse":
+            mcp_server.run(
+                transport=transport,
+                host=host,
+                port=port,
+                path=path,
+                log_level="INFO",
+            )

basic_memory/cli/commands/project.py

@@ -9,14 +9,13 @@ from rich.console import Console
 from rich.table import Table
 
 from basic_memory.cli.app import app
-from basic_memory.mcp.project_session import session
-from basic_memory.mcp.resources.project_info import project_info
+from basic_memory.cli.commands.command_utils import get_project_info
+from basic_memory.config import ConfigManager
 import json
 from datetime import datetime
 
 from rich.panel import Panel
-from rich.tree import Tree
-from basic_memory.mcp.async_client import client
+from basic_memory.mcp.async_client import get_client
 from basic_memory.mcp.tools.utils import call_get
 from basic_memory.schemas.project_info import ProjectList
 from basic_memory.mcp.tools.utils import call_post
@@ -32,6 +31,8 @@ console = Console()
 project_app = typer.Typer(help="Manage multiple Basic Memory projects")
 app.add_typer(project_app, name="project")
 
+config = ConfigManager().config
+
 
 def format_path(path: str) -> str:
     """Format a path for display, using ~ for home directory."""
@@ -43,22 +44,24 @@ def format_path(path: str) -> str:
 
 @project_app.command("list")
 def list_projects() -> None:
-    """List all configured projects."""
-    # Use API to list projects
+    """List all Basic Memory projects."""
+
+    async def _list_projects():
+        async with get_client() as client:
+            response = await call_get(client, "/projects/projects")
+            return ProjectList.model_validate(response.json())
+
     try:
-        response = asyncio.run(call_get(client, "/projects/projects"))
-        result = ProjectList.model_validate(response.json())
+        result = asyncio.run(_list_projects())
 
         table = Table(title="Basic Memory Projects")
         table.add_column("Name", style="cyan")
         table.add_column("Path", style="green")
-        table.add_column("Default", style="yellow")
-        table.add_column("Active", style="magenta")
+        table.add_column("Default", style="magenta")
 
         for project in result.projects:
             is_default = "✓" if project.is_default else ""
-            is_active = "✓" if session.get_current_project() == project.name else ""
-            table.add_row(project.name, format_path(project.path), is_default, is_active)
+            table.add_row(project.name, format_path(project.path), is_default)
 
         console.print(table)
     except Exception as e:
@@ -66,44 +69,75 @@ def list_projects() -> None:
         raise typer.Exit(1)
 
 
-@project_app.command("add")
-def add_project(
-    name: str = typer.Argument(..., help="Name of the project"),
-    path: str = typer.Argument(..., help="Path to the project directory"),
-    set_default: bool = typer.Option(False, "--default", help="Set as default project"),
-) -> None:
-    """Add a new project."""
-    # Resolve to absolute path
-    resolved_path = Path(os.path.abspath(os.path.expanduser(path))).as_posix()
-
-    try:
-        data = {"name": name, "path": resolved_path, "set_default": set_default}
-
-        response = asyncio.run(call_post(client, "/projects/projects", json=data))
-        result = ProjectStatusResponse.model_validate(response.json())
-
-        console.print(f"[green]{result.message}[/green]")
-    except Exception as e:
-        console.print(f"[red]Error adding project: {str(e)}[/red]")
-        raise typer.Exit(1)
-
-    # Display usage hint
-    console.print("\nTo use this project:")
-    console.print(f"  basic-memory --project={name} <command>")
-    console.print("  # or")
-    console.print(f"  basic-memory project default {name}")
+if config.cloud_mode_enabled:
+
+    @project_app.command("add")
+    def add_project_cloud(
+        name: str = typer.Argument(..., help="Name of the project"),
+        set_default: bool = typer.Option(False, "--default", help="Set as default project"),
+    ) -> None:
+        """Add a new project to Basic Memory Cloud"""
+
+        async def _add_project():
+            async with get_client() as client:
+                data = {"name": name, "path": generate_permalink(name), "set_default": set_default}
+                response = await call_post(client, "/projects/projects", json=data)
+                return ProjectStatusResponse.model_validate(response.json())
+
+        try:
+            result = asyncio.run(_add_project())
+            console.print(f"[green]{result.message}[/green]")
+        except Exception as e:
+            console.print(f"[red]Error adding project: {str(e)}[/red]")
+            raise typer.Exit(1)
+
+        # Display usage hint
+        console.print("\nTo use this project:")
+        console.print(f"  basic-memory --project={name} <command>")
+else:
+
+    @project_app.command("add")
+    def add_project(
+        name: str = typer.Argument(..., help="Name of the project"),
+        path: str = typer.Argument(..., help="Path to the project directory"),
+        set_default: bool = typer.Option(False, "--default", help="Set as default project"),
+    ) -> None:
+        """Add a new project."""
+        # Resolve to absolute path
+        resolved_path = Path(os.path.abspath(os.path.expanduser(path))).as_posix()
+
+        async def _add_project():
+            async with get_client() as client:
+                data = {"name": name, "path": resolved_path, "set_default": set_default}
+                response = await call_post(client, "/projects/projects", json=data)
+                return ProjectStatusResponse.model_validate(response.json())
+
+        try:
+            result = asyncio.run(_add_project())
+            console.print(f"[green]{result.message}[/green]")
+        except Exception as e:
+            console.print(f"[red]Error adding project: {str(e)}[/red]")
+            raise typer.Exit(1)
+
+        # Display usage hint
+        console.print("\nTo use this project:")
+        console.print(f"  basic-memory --project={name} <command>")
 
 
 @project_app.command("remove")
 def remove_project(
     name: str = typer.Argument(..., help="Name of the project to remove"),
 ) -> None:
-    """Remove a project from configuration."""
-    try:
-        project_permalink = generate_permalink(name)
-        response = asyncio.run(call_delete(client, f"/projects/{project_permalink}"))
-        result = ProjectStatusResponse.model_validate(response.json())
+    """Remove a project."""
+
+    async def _remove_project():
+        async with get_client() as client:
+            project_permalink = generate_permalink(name)
+            response = await call_delete(client, f"/projects/{project_permalink}")
+            return ProjectStatusResponse.model_validate(response.json())
 
+    try:
+        result = asyncio.run(_remove_project())
         console.print(f"[green]{result.message}[/green]")
     except Exception as e:
         console.print(f"[red]Error removing project: {str(e)}[/red]")
@@ -113,100 +147,104 @@ def remove_project(
     console.print("[yellow]Note: The project files have not been deleted from disk.[/yellow]")
 
 
-@project_app.command("default")
-def set_default_project(
-    name: str = typer.Argument(..., help="Name of the project to set as default"),
-) -> None:
-    """Set the default project and activate it for the current session."""
-    try:
-        project_permalink = generate_permalink(name)
-        response = asyncio.run(call_put(client, f"/projects/{project_permalink}/default"))
-        result = ProjectStatusResponse.model_validate(response.json())
-
-        console.print(f"[green]{result.message}[/green]")
-    except Exception as e:
-        console.print(f"[red]Error setting default project: {str(e)}[/red]")
-        raise typer.Exit(1)
-
-    # The API call above should have updated both config and MCP session
-    # No need for manual reload - the project service handles this automatically
-    console.print("[green]Project activated for current session[/green]")
-
-
-@project_app.command("sync-config")
-def synchronize_projects() -> None:
-    """Synchronize project config between configuration file and database."""
-    # Call the API to synchronize projects
-
-    try:
-        response = asyncio.run(call_post(client, "/projects/sync"))
-        result = ProjectStatusResponse.model_validate(response.json())
-
-        console.print(f"[green]{result.message}[/green]")
-    except Exception as e:  # pragma: no cover
-        console.print(f"[red]Error synchronizing projects: {str(e)}[/red]")
-        raise typer.Exit(1)
-
-
-@project_app.command("move")
-def move_project(
-    name: str = typer.Argument(..., help="Name of the project to move"),
-    new_path: str = typer.Argument(..., help="New absolute path for the project"),
-) -> None:
-    """Move a project to a new location."""
-    # Resolve to absolute path
-    resolved_path = Path(os.path.abspath(os.path.expanduser(new_path))).as_posix()
-
-    try:
-        data = {"path": resolved_path}
-
-        project_permalink = generate_permalink(name)
-        current_project = session.get_current_project()
-        response = asyncio.run(
-            call_patch(client, f"/{current_project}/project/{project_permalink}", json=data)
-        )
-        result = ProjectStatusResponse.model_validate(response.json())
+if not config.cloud_mode_enabled:
+
+    @project_app.command("default")
+    def set_default_project(
+        name: str = typer.Argument(..., help="Name of the project to set as CLI default"),
+    ) -> None:
+        """Set the default project when 'config.default_project_mode' is set."""
+
+        async def _set_default():
+            async with get_client() as client:
+                project_permalink = generate_permalink(name)
+                response = await call_put(client, f"/projects/{project_permalink}/default")
+                return ProjectStatusResponse.model_validate(response.json())
+
+        try:
+            result = asyncio.run(_set_default())
+            console.print(f"[green]{result.message}[/green]")
+        except Exception as e:
+            console.print(f"[red]Error setting default project: {str(e)}[/red]")
+            raise typer.Exit(1)
+
+    @project_app.command("sync-config")
+    def synchronize_projects() -> None:
+        """Synchronize project config between configuration file and database."""
+
+        async def _sync_config():
+            async with get_client() as client:
+                response = await call_post(client, "/projects/config/sync")
+                return ProjectStatusResponse.model_validate(response.json())
+
+        try:
+            result = asyncio.run(_sync_config())
+            console.print(f"[green]{result.message}[/green]")
+        except Exception as e:  # pragma: no cover
+            console.print(f"[red]Error synchronizing projects: {str(e)}[/red]")
+            raise typer.Exit(1)
+
+    @project_app.command("move")
+    def move_project(
+        name: str = typer.Argument(..., help="Name of the project to move"),
+        new_path: str = typer.Argument(..., help="New absolute path for the project"),
+    ) -> None:
+        """Move a project to a new location."""
+        # Resolve to absolute path
+        resolved_path = Path(os.path.abspath(os.path.expanduser(new_path))).as_posix()
+
+        async def _move_project():
+            async with get_client() as client:
+                data = {"path": resolved_path}
+                project_permalink = generate_permalink(name)
+
+                # TODO fix route to use ProjectPathDep
+                response = await call_patch(
+                    client, f"/{name}/project/{project_permalink}", json=data
+                )
+                return ProjectStatusResponse.model_validate(response.json())
 
-        console.print(f"[green]{result.message}[/green]")
+        try:
+            result = asyncio.run(_move_project())
+            console.print(f"[green]{result.message}[/green]")
 
-        # Show important file movement reminder
-        console.print()  # Empty line for spacing
-        console.print(
-            Panel(
-                "[bold red]IMPORTANT:[/bold red] Project configuration updated successfully.\n\n"
-                "[yellow]You must manually move your project files from the old location to:[/yellow]\n"
-                f"[cyan]{resolved_path}[/cyan]\n\n"
-                "[dim]Basic Memory has only updated the configuration - your files remain in their original location.[/dim]",
-                title="⚠️  Manual File Movement Required",
-                border_style="yellow",
-                expand=False,
+            # Show important file movement reminder
+            console.print()  # Empty line for spacing
+            console.print(
+                Panel(
+                    "[bold red]IMPORTANT:[/bold red] Project configuration updated successfully.\n\n"
+                    "[yellow]You must manually move your project files from the old location to:[/yellow]\n"
+                    f"[cyan]{resolved_path}[/cyan]\n\n"
+                    "[dim]Basic Memory has only updated the configuration - your files remain in their original location.[/dim]",
+                    title="⚠️  Manual File Movement Required",
+                    border_style="yellow",
+                    expand=False,
+                )
             )
-        )
 
-    except Exception as e:
-        console.print(f"[red]Error moving project: {str(e)}[/red]")
-        raise typer.Exit(1)
+        except Exception as e:
+            console.print(f"[red]Error moving project: {str(e)}[/red]")
+            raise typer.Exit(1)
 
 
 @project_app.command("info")
 def display_project_info(
+    name: str = typer.Argument(..., help="Name of the project"),
     json_output: bool = typer.Option(False, "--json", help="Output in JSON format"),
 ):
     """Display detailed information and statistics about the current project."""
     try:
         # Get project info
-        info = asyncio.run(project_info.fn())  # type: ignore  # pyright: ignore [reportAttributeAccessIssue]
+        info = asyncio.run(get_project_info(name))
 
         if json_output:
             # Convert to JSON and print
             print(json.dumps(info.model_dump(), indent=2, default=str))
         else:
-            # Create rich display
-            console = Console()
-
             # Project configuration section
             console.print(
                 Panel(
+                    f"Basic Memory version: [bold green]{info.system.version}[/bold green]\n"
                     f"[bold]Project:[/bold] {info.project_name}\n"
                     f"[bold]Path:[/bold] {info.project_path}\n"
                     f"[bold]Default Project:[/bold] {info.default_project}\n",
@@ -276,42 +314,6 @@ def display_project_info(
 
                 console.print(recent_table)
 
-            # System status
-            system_tree = Tree("🖥️ System Status")
-            system_tree.add(f"Basic Memory version: [bold green]{info.system.version}[/bold green]")
-            system_tree.add(
-                f"Database: [cyan]{info.system.database_path}[/cyan] ([green]{info.system.database_size}[/green])"
-            )
-
-            # Watch status
-            if info.system.watch_status:  # pragma: no cover
-                watch_branch = system_tree.add("Watch Service")
-                running = info.system.watch_status.get("running", False)
-                status_color = "green" if running else "red"
-                watch_branch.add(
-                    f"Status: [bold {status_color}]{'Running' if running else 'Stopped'}[/bold {status_color}]"
-                )
-
-                if running:
-                    start_time = (
-                        datetime.fromisoformat(info.system.watch_status.get("start_time", ""))
-                        if isinstance(info.system.watch_status.get("start_time"), str)
-                        else info.system.watch_status.get("start_time")
-                    )
-                    watch_branch.add(
-                        f"Running since: [cyan]{start_time.strftime('%Y-%m-%d %H:%M')}[/cyan]"
-                    )
-                    watch_branch.add(
-                        f"Files synced: [green]{info.system.watch_status.get('synced_files', 0)}[/green]"
-                    )
-                    watch_branch.add(
-                        f"Errors: [{'red' if info.system.watch_status.get('error_count', 0) > 0 else 'green'}]{info.system.watch_status.get('error_count', 0)}[/{'red' if info.system.watch_status.get('error_count', 0) > 0 else 'green'}]"
-                    )
-            else:
-                system_tree.add("[yellow]Watch service not running[/yellow]")
-
-            console.print(system_tree)
-
             # Available projects
             projects_table = Table(title="📁 Available Projects")
             projects_table.add_column("Name", style="blue")

basic_memory/cli/commands/status.py

@@ -2,19 +2,20 @@
 
 import asyncio
 from typing import Set, Dict
+from typing import Annotated, Optional
 
+from mcp.server.fastmcp.exceptions import ToolError
 import typer
 from loguru import logger
 from rich.console import Console
 from rich.panel import Panel
 from rich.tree import Tree
 
-from basic_memory import db
 from basic_memory.cli.app import app
-from basic_memory.cli.commands.sync import get_sync_service
-from basic_memory.config import ConfigManager, get_project_config
-from basic_memory.repository import ProjectRepository
-from basic_memory.sync.sync_service import SyncReport
+from basic_memory.mcp.async_client import get_client
+from basic_memory.mcp.tools.utils import call_post
+from basic_memory.schemas import SyncReportResponse
+from basic_memory.mcp.project_context import get_active_project
 
 # Create rich console
 console = Console()
@@ -47,7 +48,7 @@ def add_files_to_tree(
                 branch.add(f"[{style}]{file_name}[/{style}]")
 
 
-def group_changes_by_directory(changes: SyncReport) -> Dict[str, Dict[str, int]]:
+def group_changes_by_directory(changes: SyncReportResponse) -> Dict[str, Dict[str, int]]:
     """Group changes by directory for summary view."""
     by_dir = {}
     for change_type, paths in [
@@ -87,7 +88,9 @@ def build_directory_summary(counts: Dict[str, int]) -> str:
     return " ".join(parts)
 
 
-def display_changes(project_name: str, title: str, changes: SyncReport, verbose: bool = False):
+def display_changes(
+    project_name: str, title: str, changes: SyncReportResponse, verbose: bool = False
+):
     """Display changes using Rich for better visualization."""
     tree = Tree(f"{project_name}: {title}")
 
@@ -122,33 +125,33 @@ def display_changes(project_name: str, title: str, changes: SyncReport, verbose:
     console.print(Panel(tree, expand=False))
 
 
-async def run_status(verbose: bool = False):  # pragma: no cover
+async def run_status(project: Optional[str] = None, verbose: bool = False):  # pragma: no cover
     """Check sync status of files vs database."""
-    # Check knowledge/ directory
 
-    app_config = ConfigManager().config
-    config = get_project_config()
+    try:
+        async with get_client() as client:
+            project_item = await get_active_project(client, project, None)
+            response = await call_post(client, f"{project_item.project_url}/project/status")
+            sync_report = SyncReportResponse.model_validate(response.json())
 
-    _, session_maker = await db.get_or_create_db(
-        db_path=app_config.database_path, db_type=db.DatabaseType.FILESYSTEM
-    )
-    project_repository = ProjectRepository(session_maker)
-    project = await project_repository.get_by_name(config.project)
-    if not project:  # pragma: no cover
-        raise Exception(f"Project '{config.project}' not found")
+            display_changes(project_item.name, "Status", sync_report, verbose)
 
-    sync_service = await get_sync_service(project)
-    knowledge_changes = await sync_service.scan(config.home)
-    display_changes(project.name, "Status", knowledge_changes, verbose)
+    except (ValueError, ToolError) as e:
+        console.print(f"[red]✗ Error: {e}[/red]")
+        raise typer.Exit(1)
 
 
 @app.command()
 def status(
+    project: Annotated[
+        Optional[str],
+        typer.Option(help="The project name."),
+    ] = None,
     verbose: bool = typer.Option(False, "--verbose", "-v", help="Show detailed file information"),
 ):
     """Show sync status between files and database."""
     try:
-        asyncio.run(run_status(verbose))  # pragma: no cover
+        asyncio.run(run_status(project, verbose))  # pragma: no cover
     except Exception as e:
         logger.error(f"Error checking status: {e}")
         typer.echo(f"Error checking status: {e}", err=True)