basic-memory 0.17.4__tar.gz → 0.17.5__tar.gz

{basic_memory-0.17.4 → basic_memory-0.17.5}/.github/workflows/test.yml

@@ -19,7 +19,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
-        python-version: [ "3.12", "3.13" ]
+        python-version: [ "3.12", "3.13", "3.14" ]
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -75,7 +75,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ "3.12", "3.13" ]
+        python-version: [ "3.12", "3.13", "3.14" ]
     runs-on: ubuntu-latest
 
     # Note: No services section needed - testcontainers handles Postgres in Docker
@@ -164,4 +164,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: htmlcov
-          path: htmlcov/
+          path: htmlcov/

basic_memory-0.17.5/.python-version

@@ -0,0 +1 @@
+3.14

{basic_memory-0.17.4 → basic_memory-0.17.5}/CHANGELOG.md

@@ -1,5 +1,16 @@
 # CHANGELOG
 
+## v0.17.5 (2026-01-11)
+
+### Bug Fixes
+
+- **#505**: Prevent CLI commands from hanging on exit (Python 3.14 compatibility)
+  ([`863e0a4`](https://github.com/basicmachines-co/basic-memory/commit/863e0a4))
+  - Skip `nest_asyncio` on Python 3.14+ where it causes event loop issues
+  - Simplify CLI test infrastructure for cross-version compatibility
+  - Update pyright to 1.1.408 for Python 3.14 support
+  - Fix SQLAlchemy rowcount typing for Python 3.14
+
 ## v0.17.4 (2026-01-05)
 
 ### Bug Fixes

{basic_memory-0.17.4 → basic_memory-0.17.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: basic-memory
-Version: 0.17.4
+Version: 0.17.5
 Summary: Local-first knowledge management combining Zettelkasten with knowledge graphs
 Project-URL: Homepage, https://github.com/basicmachines-co/basic-memory
 Project-URL: Repository, https://github.com/basicmachines-co/basic-memory
@@ -12,11 +12,13 @@ Requires-Python: >=3.12
 Requires-Dist: aiofiles>=24.1.0
 Requires-Dist: aiosqlite>=0.20.0
 Requires-Dist: alembic>=1.14.1
+Requires-Dist: anyio>=4.10.0
 Requires-Dist: asyncpg>=0.30.0
 Requires-Dist: dateparser>=1.2.0
 Requires-Dist: fastapi[standard]>=0.115.8
 Requires-Dist: fastmcp==2.12.3
 Requires-Dist: greenlet>=3.1.1
+Requires-Dist: httpx>=0.28.0
 Requires-Dist: loguru>=0.7.3
 Requires-Dist: markdown-it-py>=3.0.0
 Requires-Dist: mcp>=1.23.1
@@ -29,7 +31,7 @@ Requires-Dist: pillow>=11.1.0
 Requires-Dist: psycopg==3.3.1
 Requires-Dist: pybars3>=0.9.7
 Requires-Dist: pydantic-settings>=2.6.1
-Requires-Dist: pydantic[email,timezone]>=2.10.3
+Requires-Dist: pydantic[email,timezone]>=2.12.0
 Requires-Dist: pyjwt>=2.10.1
 Requires-Dist: pyright>=1.1.390
 Requires-Dist: pytest-aio>=1.9.0
@@ -38,6 +40,7 @@ Requires-Dist: python-dotenv>=1.1.0
 Requires-Dist: python-frontmatter>=1.1.0
 Requires-Dist: pyyaml>=6.0.1
 Requires-Dist: rich>=13.9.4
+Requires-Dist: sniffio>=1.3.1
 Requires-Dist: sqlalchemy>=2.0.0
 Requires-Dist: typer>=0.9.0
 Requires-Dist: unidecode>=1.3.8

{basic_memory-0.17.4 → basic_memory-0.17.5}/pyproject.toml

@@ -14,7 +14,7 @@ dependencies = [
     "typer>=0.9.0",
     "aiosqlite>=0.20.0",
     "greenlet>=3.1.1",
-    "pydantic[email,timezone]>=2.10.3",
+    "pydantic[email,timezone]>=2.12.0",
     "mcp>=1.23.1",
     "pydantic-settings>=2.6.1",
     "loguru>=0.7.3",
@@ -29,7 +29,7 @@ dependencies = [
     "alembic>=1.14.1",
     "pillow>=11.1.0",
     "pybars3>=0.9.7",
-    "fastmcp==2.12.3",  # Pinned - 2.14.x breaks MCP tools visibility (issue #463)
+    "fastmcp==2.12.3", # Pinned - 2.14.x breaks MCP tools visibility (issue #463)
     "pyjwt>=2.10.1",
     "python-dotenv>=1.1.0",
     "pytest-aio>=1.9.0",
@@ -41,7 +41,10 @@ dependencies = [
     "mdformat>=0.7.22",
     "mdformat-gfm>=0.3.7",
     "mdformat-frontmatter>=2.0.8",
-    "openpanel>=0.0.1",  # Anonymous usage telemetry (Homebrew-style opt-out)
+    "openpanel>=0.0.1", # Anonymous usage telemetry (Homebrew-style opt-out)
+    "sniffio>=1.3.1",
+    "anyio>=4.10.0",
+    "httpx>=0.28.0",
 ]
 
 
@@ -88,6 +91,7 @@ dev = [
     "freezegun>=1.5.5",
     "testcontainers[postgres]>=4.0.0",
     "psycopg>=3.2.0",
+    "pyright>=1.1.408",
 ]
 
 [tool.hatch.version]

{basic_memory-0.17.4 → basic_memory-0.17.5}/src/basic_memory/__init__.py

@@ -1,7 +1,7 @@
 """basic-memory - Local-first knowledge management combining Zettelkasten with knowledge graphs"""
 
 # Package version - updated by release automation
-__version__ = "0.17.4"
+__version__ = "0.17.5"
 
 # API version for FastAPI - independent of package version
 __api_version__ = "v0"

{basic_memory-0.17.4 → basic_memory-0.17.5}/src/basic_memory/alembic/env.py

@@ -5,14 +5,18 @@ import os
 from logging.config import fileConfig
 
 # Allow nested event loops (needed for pytest-asyncio and other async contexts)
-# Note: nest_asyncio doesn't work with uvloop, so we handle that case separately
-try:
-    import nest_asyncio
-
-    nest_asyncio.apply()
-except (ImportError, ValueError):
-    # nest_asyncio not available or can't patch this loop type (e.g., uvloop)
-    pass
+# Note: nest_asyncio doesn't work with uvloop or Python 3.14+, so we handle those cases separately
+import sys
+
+if sys.version_info < (3, 14):
+    try:
+        import nest_asyncio
+
+        nest_asyncio.apply()
+    except (ImportError, ValueError):
+        # nest_asyncio not available or can't patch this loop type (e.g., uvloop)
+        pass
+# For Python 3.14+, we rely on the thread-based fallback in run_migrations_online()
 
 from sqlalchemy import engine_from_config, pool
 from sqlalchemy.ext.asyncio import AsyncEngine, create_async_engine

{basic_memory-0.17.4 → basic_memory-0.17.5}/src/basic_memory/alembic/versions/6830751f5fb6_merge_multiple_heads.py

@@ -5,13 +5,13 @@ Revises: a2b3c4d5e6f7, g9a0b3c4d5e6
 Create Date: 2025-12-29 12:46:46.476268
 
 """
-from typing import Sequence, Union
 
+from typing import Sequence, Union
 
 
 # revision identifiers, used by Alembic.
-revision: str = '6830751f5fb6'
-down_revision: Union[str, Sequence[str], None] = ('a2b3c4d5e6f7', 'g9a0b3c4d5e6')
+revision: str = "6830751f5fb6"
+down_revision: Union[str, Sequence[str], None] = ("a2b3c4d5e6f7", "g9a0b3c4d5e6")
 branch_labels: Union[str, Sequence[str], None] = None
 depends_on: Union[str, Sequence[str], None] = None
 

{basic_memory-0.17.4 → basic_memory-0.17.5}/src/basic_memory/api/v2/routers/knowledge_router.py

@@ -414,9 +414,7 @@ async def move_entity(
 
         result = EntityResponseV2.model_validate(moved_entity)
 
-        logger.info(
-            f"API v2 response: moved external_id={entity_id} to '{data.destination_path}'"
-        )
+        logger.info(f"API v2 response: moved external_id={entity_id} to '{data.destination_path}'")
 
         return result
 

{basic_memory-0.17.4 → basic_memory-0.17.5}/src/basic_memory/api/v2/routers/project_router.py

@@ -264,9 +264,7 @@ async def delete_project_by_id(
         # Use is_default from database, not ConfigManager (which doesn't work in cloud mode)
         if old_project.is_default:
             available_projects = await project_service.list_projects()
-            other_projects = [
-                p.name for p in available_projects if p.external_id != project_id
-            ]
+            other_projects = [p.name for p in available_projects if p.external_id != project_id]
             detail = f"Cannot delete default project '{old_project.name}'. "
             if other_projects:
                 detail += (  # pragma: no cover

{basic_memory-0.17.4 → basic_memory-0.17.5}/src/basic_memory/cli/commands/cloud/core_commands.py

@@ -1,11 +1,10 @@
 """Core cloud commands for Basic Memory CLI."""
 
-import asyncio
-
 import typer
 from rich.console import Console
 
 from basic_memory.cli.app import cloud_app
+from basic_memory.cli.commands.command_utils import run_with_cleanup
 from basic_memory.cli.auth import CLIAuth
 from basic_memory.config import ConfigManager
 from basic_memory.cli.commands.cloud.api_client import (
@@ -64,7 +63,7 @@ def login():
             )
             raise typer.Exit(1)
 
-    asyncio.run(_login())
+    run_with_cleanup(_login())
 
 
 @cloud_app.command()
@@ -110,7 +109,7 @@ def status() -> None:
         console.print("\n[blue]Checking cloud instance health...[/blue]")
 
         # Make API request to check health
-        response = asyncio.run(
+        response = run_with_cleanup(
             make_api_request(method="GET", url=f"{host_url}/proxy/health", headers=headers)
         )
 
@@ -156,12 +155,12 @@ def setup() -> None:
 
         # Step 2: Get tenant info
         console.print("\n[blue]Step 2: Getting tenant information...[/blue]")
-        tenant_info = asyncio.run(get_mount_info())
+        tenant_info = run_with_cleanup(get_mount_info())
         console.print(f"[green]Found tenant: {tenant_info.tenant_id}[/green]")
 
         # Step 3: Generate credentials
         console.print("\n[blue]Step 3: Generating sync credentials...[/blue]")
-        creds = asyncio.run(generate_mount_credentials(tenant_info.tenant_id))
+        creds = run_with_cleanup(generate_mount_credentials(tenant_info.tenant_id))
         console.print("[green]Generated secure credentials[/green]")
 
         # Step 4: Configure rclone remote

{basic_memory-0.17.4 → basic_memory-0.17.5}/src/basic_memory/cli/commands/cloud/rclone_commands.py

@@ -27,6 +27,7 @@ console = Console()
 # Minimum rclone version for --create-empty-src-dirs support
 MIN_RCLONE_VERSION_EMPTY_DIRS = (1, 64, 0)
 
+
 class RunResult(Protocol):
     returncode: int
     stdout: str

{basic_memory-0.17.4 → basic_memory-0.17.5}/src/basic_memory/cli/commands/cloud/upload_command.py

@@ -1,12 +1,12 @@
 """Upload CLI commands for basic-memory projects."""
 
-import asyncio
 from pathlib import Path
 
 import typer
 from rich.console import Console
 
 from basic_memory.cli.app import cloud_app
+from basic_memory.cli.commands.command_utils import run_with_cleanup
 from basic_memory.cli.commands.cloud.cloud_utils import (
     create_cloud_project,
     project_exists,
@@ -121,4 +121,4 @@ def upload(
                 console.print(f"[yellow]Warning: Sync failed: {e}[/yellow]")
                 console.print("[dim]Files uploaded but may not be indexed yet[/dim]")
 
-    asyncio.run(_upload())
+    run_with_cleanup(_upload())

{basic_memory-0.17.4 → basic_memory-0.17.5}/src/basic_memory/cli/commands/command_utils.py

@@ -14,6 +14,7 @@ from basic_memory.mcp.async_client import get_client
 from basic_memory.mcp.tools.utils import call_post, call_get
 from basic_memory.mcp.project_context import get_active_project
 from basic_memory.schemas import ProjectInfoResponse
+from basic_memory.telemetry import shutdown_telemetry
 
 console = Console()
 
@@ -23,8 +24,8 @@ T = TypeVar("T")
 def run_with_cleanup(coro: Coroutine[Any, Any, T]) -> T:
     """Run an async coroutine with proper database cleanup.
 
-    This helper ensures database connections are cleaned up before the event
-    loop closes, preventing process hangs in CLI commands.
+    This helper ensures database connections and telemetry threads are cleaned up
+    before the event loop closes, preventing process hangs in CLI commands.
 
     Args:
         coro: The coroutine to run
@@ -38,6 +39,9 @@ def run_with_cleanup(coro: Coroutine[Any, Any, T]) -> T:
             return await coro
         finally:
             await db.shutdown_db()
+            # Shutdown telemetry to stop the OpenPanel background thread
+            # This prevents hangs on Python 3.14+ during thread shutdown
+            shutdown_telemetry()
 
     return asyncio.run(_with_cleanup())
 

{basic_memory-0.17.4 → basic_memory-0.17.5}/src/basic_memory/cli/commands/db.py

@@ -1,6 +1,5 @@
 """Database management commands."""
 
-import asyncio
 from pathlib import Path
 
 import typer
@@ -10,6 +9,7 @@ from sqlalchemy.exc import OperationalError
 
 from basic_memory import db
 from basic_memory.cli.app import app
+from basic_memory.cli.commands.command_utils import run_with_cleanup
 from basic_memory.config import ConfigManager
 from basic_memory.repository import ProjectRepository
 from basic_memory.services.initialization import reconcile_projects_with_config
@@ -81,7 +81,7 @@ def reset(
 
         # Create a new empty database (preserves project configuration)
         try:
-            asyncio.run(db.run_migrations(app_config))
+            run_with_cleanup(db.run_migrations(app_config))
         except OperationalError as e:
             if "disk I/O error" in str(e) or "database is locked" in str(e):
                 console.print(
@@ -99,5 +99,7 @@ def reset(
                 console.print("[yellow]No projects configured. Skipping reindex.[/yellow]")
             else:
                 console.print(f"Rebuilding search index for {len(projects)} project(s)...")
-                asyncio.run(_reindex_projects(app_config))
+                # Note: _reindex_projects has its own cleanup, but run_with_cleanup
+                # ensures db.shutdown_db() is called even if _reindex_projects changes
+                run_with_cleanup(_reindex_projects(app_config))
                 console.print("[green]Reindex complete[/green]")

{basic_memory-0.17.4 → basic_memory-0.17.5}/src/basic_memory/cli/commands/format.py

@@ -1,6 +1,5 @@
 """Format command for basic-memory CLI."""
 
-import asyncio
 from pathlib import Path
 from typing import Annotated, Optional
 
@@ -10,6 +9,7 @@ from rich.console import Console
 from rich.progress import Progress, SpinnerColumn, TextColumn
 
 from basic_memory.cli.app import app
+from basic_memory.cli.commands.command_utils import run_with_cleanup
 from basic_memory.config import ConfigManager, get_project_config
 from basic_memory.file_utils import format_file
 
@@ -189,7 +189,7 @@ def format(
         basic-memory format notes/             # Format all files in directory
     """
     try:
-        asyncio.run(run_format(path, project))
+        run_with_cleanup(run_format(path, project))
     except Exception as e:
         if not isinstance(e, typer.Exit):
             logger.error(f"Error formatting files: {e}")

{basic_memory-0.17.4 → basic_memory-0.17.5}/src/basic_memory/cli/commands/import_chatgpt.py

@@ -1,12 +1,12 @@
 """Import command for ChatGPT conversations."""
 
-import asyncio
 import json
 from pathlib import Path
 from typing import Annotated, Tuple
 
 import typer
 from basic_memory.cli.app import import_app
+from basic_memory.cli.commands.command_utils import run_with_cleanup
 from basic_memory.config import ConfigManager, get_project_config
 from basic_memory.importers import ChatGPTImporter
 from basic_memory.markdown import EntityParser, MarkdownProcessor
@@ -53,7 +53,7 @@ def import_chatgpt(
             raise typer.Exit(1)
 
         # Get importer dependencies
-        markdown_processor, file_service = asyncio.run(get_importer_dependencies())
+        markdown_processor, file_service = run_with_cleanup(get_importer_dependencies())
         config = get_project_config()
         # Process the file
         base_path = config.home / folder
@@ -63,7 +63,7 @@ def import_chatgpt(
         importer = ChatGPTImporter(config.home, markdown_processor, file_service)
         with conversations_json.open("r", encoding="utf-8") as file:
             json_data = json.load(file)
-            result = asyncio.run(importer.import_data(json_data, folder))
+            result = run_with_cleanup(importer.import_data(json_data, folder))
 
         if not result.success:  # pragma: no cover
             typer.echo(f"Error during import: {result.error_message}", err=True)

{basic_memory-0.17.4 → basic_memory-0.17.5}/src/basic_memory/cli/commands/import_claude_conversations.py

@@ -1,12 +1,12 @@
 """Import command for basic-memory CLI to import chat data from conversations2.json format."""
 
-import asyncio
 import json
 from pathlib import Path
 from typing import Annotated, Tuple
 
 import typer
 from basic_memory.cli.app import claude_app
+from basic_memory.cli.commands.command_utils import run_with_cleanup
 from basic_memory.config import ConfigManager, get_project_config
 from basic_memory.importers.claude_conversations_importer import ClaudeConversationsImporter
 from basic_memory.markdown import EntityParser, MarkdownProcessor
@@ -54,7 +54,7 @@ def import_claude(
             raise typer.Exit(1)
 
         # Get importer dependencies
-        markdown_processor, file_service = asyncio.run(get_importer_dependencies())
+        markdown_processor, file_service = run_with_cleanup(get_importer_dependencies())
 
         # Create the importer
         importer = ClaudeConversationsImporter(config.home, markdown_processor, file_service)
@@ -66,7 +66,7 @@ def import_claude(
         # Run the import
         with conversations_json.open("r", encoding="utf-8") as file:
             json_data = json.load(file)
-            result = asyncio.run(importer.import_data(json_data, folder))
+            result = run_with_cleanup(importer.import_data(json_data, folder))
 
         if not result.success:  # pragma: no cover
             typer.echo(f"Error during import: {result.error_message}", err=True)

{basic_memory-0.17.4 → basic_memory-0.17.5}/src/basic_memory/cli/commands/import_claude_projects.py

@@ -1,12 +1,12 @@
 """Import command for basic-memory CLI to import project data from Claude.ai."""
 
-import asyncio
 import json
 from pathlib import Path
 from typing import Annotated, Tuple
 
 import typer
 from basic_memory.cli.app import claude_app
+from basic_memory.cli.commands.command_utils import run_with_cleanup
 from basic_memory.config import ConfigManager, get_project_config
 from basic_memory.importers.claude_projects_importer import ClaudeProjectsImporter
 from basic_memory.markdown import EntityParser, MarkdownProcessor
@@ -53,7 +53,7 @@ def import_projects(
             raise typer.Exit(1)
 
         # Get importer dependencies
-        markdown_processor, file_service = asyncio.run(get_importer_dependencies())
+        markdown_processor, file_service = run_with_cleanup(get_importer_dependencies())
 
         # Create the importer
         importer = ClaudeProjectsImporter(config.home, markdown_processor, file_service)
@@ -65,7 +65,7 @@ def import_projects(
         # Run the import
         with projects_json.open("r", encoding="utf-8") as file:
             json_data = json.load(file)
-            result = asyncio.run(importer.import_data(json_data, base_folder))
+            result = run_with_cleanup(importer.import_data(json_data, base_folder))
 
         if not result.success:  # pragma: no cover
             typer.echo(f"Error during import: {result.error_message}", err=True)

{basic_memory-0.17.4 → basic_memory-0.17.5}/src/basic_memory/cli/commands/import_memory_json.py

@@ -1,12 +1,12 @@
 """Import command for basic-memory CLI to import from JSON memory format."""
 
-import asyncio
 import json
 from pathlib import Path
 from typing import Annotated, Tuple
 
 import typer
 from basic_memory.cli.app import import_app
+from basic_memory.cli.commands.command_utils import run_with_cleanup
 from basic_memory.config import ConfigManager, get_project_config
 from basic_memory.importers.memory_json_importer import MemoryJsonImporter
 from basic_memory.markdown import EntityParser, MarkdownProcessor
@@ -52,7 +52,7 @@ def memory_json(
     config = get_project_config()
     try:
         # Get importer dependencies
-        markdown_processor, file_service = asyncio.run(get_importer_dependencies())
+        markdown_processor, file_service = run_with_cleanup(get_importer_dependencies())
 
         # Create the importer
         importer = MemoryJsonImporter(config.home, markdown_processor, file_service)
@@ -67,7 +67,7 @@ def memory_json(
             for line in file:
                 json_data = json.loads(line)
                 file_data.append(json_data)
-        result = asyncio.run(importer.import_data(file_data, destination_folder))
+        result = run_with_cleanup(importer.import_data(file_data, destination_folder))
 
         if not result.success:  # pragma: no cover
             typer.echo(f"Error during import: {result.error_message}", err=True)

{basic_memory-0.17.4 → basic_memory-0.17.5}/src/basic_memory/cli/commands/project.py

@@ -1,6 +1,5 @@
 """Command module for basic-memory project management."""
 
-import asyncio
 import os
 from pathlib import Path
 
@@ -9,7 +8,7 @@ from rich.console import Console
 from rich.table import Table
 
 from basic_memory.cli.app import app
-from basic_memory.cli.commands.command_utils import get_project_info
+from basic_memory.cli.commands.command_utils import get_project_info, run_with_cleanup
 from basic_memory.config import ConfigManager
 import json
 from datetime import datetime
@@ -56,7 +55,7 @@ def list_projects() -> None:
             return ProjectList.model_validate(response.json())
 
     try:
-        result = asyncio.run(_list_projects())
+        result = run_with_cleanup(_list_projects())
         config = ConfigManager().config
 
         table = Table(title="Basic Memory Projects")
@@ -155,7 +154,7 @@ def add_project(
                 return ProjectStatusResponse.model_validate(response.json())
 
     try:
-        result = asyncio.run(_add_project())
+        result = run_with_cleanup(_add_project())
         console.print(f"[green]{result.message}[/green]")
 
         # Save local sync path to config if in cloud mode
@@ -212,7 +211,7 @@ def setup_project_sync(
 
     try:
         # Verify project exists on cloud
-        asyncio.run(_verify_project_exists())
+        run_with_cleanup(_verify_project_exists())
 
         # Resolve and create local path
         resolved_path = Path(os.path.abspath(os.path.expanduser(local_path)))
@@ -279,7 +278,7 @@ def remove_project(
             has_bisync_state = bisync_state_path.exists()
 
         # Remove project from cloud/API
-        result = asyncio.run(_remove_project())
+        result = run_with_cleanup(_remove_project())
         console.print(f"[green]{result.message}[/green]")
 
         # Clean up local sync directory if it exists and delete_notes is True
@@ -347,7 +346,7 @@ def set_default_project(
             return ProjectStatusResponse.model_validate(response.json())
 
     try:
-        result = asyncio.run(_set_default())
+        result = run_with_cleanup(_set_default())
         console.print(f"[green]{result.message}[/green]")
     except Exception as e:
         console.print(f"[red]Error setting default project: {str(e)}[/red]")
@@ -372,7 +371,7 @@ def synchronize_projects() -> None:
             return ProjectStatusResponse.model_validate(response.json())
 
     try:
-        result = asyncio.run(_sync_config())
+        result = run_with_cleanup(_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]")
@@ -407,7 +406,7 @@ def move_project(
             return ProjectStatusResponse.model_validate(response.json())
 
     try:
-        result = asyncio.run(_move_project())
+        result = run_with_cleanup(_move_project())
         console.print(f"[green]{result.message}[/green]")
 
         # Show important file movement reminder
@@ -448,7 +447,7 @@ def sync_project_command(
 
     try:
         # Get tenant info for bucket name
-        tenant_info = asyncio.run(get_mount_info())
+        tenant_info = run_with_cleanup(get_mount_info())
         bucket_name = tenant_info.bucket_name
 
         # Get project info
@@ -461,7 +460,7 @@ def sync_project_command(
                         return proj
                 return None
 
-        project_data = asyncio.run(_get_project())
+        project_data = run_with_cleanup(_get_project())
         if not project_data:
             console.print(f"[red]Error: Project '{name}' not found[/red]")
             raise typer.Exit(1)
@@ -502,7 +501,7 @@ def sync_project_command(
                         return response.json()
 
                 try:
-                    result = asyncio.run(_trigger_db_sync())
+                    result = run_with_cleanup(_trigger_db_sync())
                     console.print(f"[dim]Database sync initiated: {result.get('message')}[/dim]")
                 except Exception as e:
                     console.print(f"[yellow]Warning: Could not trigger database sync: {e}[/yellow]")
@@ -539,7 +538,7 @@ def bisync_project_command(
 
     try:
         # Get tenant info for bucket name
-        tenant_info = asyncio.run(get_mount_info())
+        tenant_info = run_with_cleanup(get_mount_info())
         bucket_name = tenant_info.bucket_name
 
         # Get project info
@@ -552,7 +551,7 @@ def bisync_project_command(
                         return proj
                 return None
 
-        project_data = asyncio.run(_get_project())
+        project_data = run_with_cleanup(_get_project())
         if not project_data:
             console.print(f"[red]Error: Project '{name}' not found[/red]")
             raise typer.Exit(1)
@@ -600,7 +599,7 @@ def bisync_project_command(
                         return response.json()
 
                 try:
-                    result = asyncio.run(_trigger_db_sync())
+                    result = run_with_cleanup(_trigger_db_sync())
                     console.print(f"[dim]Database sync initiated: {result.get('message')}[/dim]")
                 except Exception as e:
                     console.print(f"[yellow]Warning: Could not trigger database sync: {e}[/yellow]")
@@ -633,7 +632,7 @@ def check_project_command(
 
     try:
         # Get tenant info for bucket name
-        tenant_info = asyncio.run(get_mount_info())
+        tenant_info = run_with_cleanup(get_mount_info())
         bucket_name = tenant_info.bucket_name
 
         # Get project info
@@ -646,7 +645,7 @@ def check_project_command(
                         return proj
                 return None
 
-        project_data = asyncio.run(_get_project())
+        project_data = run_with_cleanup(_get_project())
         if not project_data:
             console.print(f"[red]Error: Project '{name}' not found[/red]")
             raise typer.Exit(1)
@@ -734,7 +733,7 @@ def ls_project_command(
 
     try:
         # Get tenant info for bucket name
-        tenant_info = asyncio.run(get_mount_info())
+        tenant_info = run_with_cleanup(get_mount_info())
         bucket_name = tenant_info.bucket_name
 
         # Get project info
@@ -747,7 +746,7 @@ def ls_project_command(
                         return proj
                 return None
 
-        project_data = asyncio.run(_get_project())
+        project_data = run_with_cleanup(_get_project())
         if not project_data:
             console.print(f"[red]Error: Project '{name}' not found[/red]")
             raise typer.Exit(1)
@@ -784,7 +783,7 @@ def display_project_info(
     """Display detailed information and statistics about the current project."""
     try:
         # Get project info
-        info = asyncio.run(get_project_info(name))
+        info = run_with_cleanup(get_project_info(name))
 
         if json_output:
             # Convert to JSON and print