fix(cli): address cloud review feedback

Signed-off-by: phernandez <paul@basicmachines.co>

Author: phernandez

src/basic_memory/cli/commands/cloud/cloud_utils.py

@@ -69,6 +69,7 @@ async def create_cloud_project(
 
     Args:
         project_name: Name of project to create
+        workspace: Optional workspace override for tenant-scoped project creation
 
     Returns:
         CloudProjectCreateResponse with project details from API
@@ -127,17 +128,18 @@ async def project_exists(
 
     Args:
         project_name: Name of project to check
+        workspace: Optional workspace override for tenant-scoped project lookup
 
     Returns:
         True if project exists, False otherwise
+
+    Raises:
+        CloudUtilsError: If the project list cannot be fetched from cloud
     """
-    try:
-        projects = await fetch_cloud_projects(
-            project_name=project_name,
-            workspace=workspace,
-            api_request=api_request,
-        )
-        project_names = {p.name for p in projects.projects}
-        return project_name in project_names
-    except Exception:
-        return False
+    projects = await fetch_cloud_projects(
+        project_name=project_name,
+        workspace=workspace,
+        api_request=api_request,
+    )
+    project_names = {p.name for p in projects.projects}
+    return project_name in project_names

src/basic_memory/cli/commands/cloud/project_sync.py

@@ -195,7 +195,10 @@ def bisync_project_command(
             # Update config — sync_entry is guaranteed non-None because
             # _get_sync_project validated local_sync_path (which comes from sync_entry)
             sync_entry = config.projects.get(name)
-            assert sync_entry is not None
+            if sync_entry is None:
+                raise RuntimeError(
+                    f"Sync entry for project '{name}' unexpectedly missing after validation"
+                )
             sync_entry.last_sync = datetime.now()
             sync_entry.bisync_initialized = True
             ConfigManager().save_config(config)

src/basic_memory/cli/commands/cloud/upload_command.py

@@ -9,6 +9,7 @@
 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 (
+    CloudUtilsError,
     create_cloud_project,
     project_exists,
     sync_project,
@@ -79,8 +80,14 @@ def upload(
     async def _upload():
         resolved_workspace = resolve_configured_workspace(project_name=project)
 
+        try:
+            project_already_exists = await project_exists(project, workspace=resolved_workspace)
+        except CloudUtilsError as e:
+            console.print(f"[red]Failed to check cloud project '{project}': {e}[/red]")
+            raise typer.Exit(1)
+
         # Check if project exists
-        if not await project_exists(project, workspace=resolved_workspace):
+        if not project_already_exists:
             if create_project:
                 console.print(f"[blue]Creating cloud project '{project}'...[/blue]")
                 try:
@@ -126,8 +133,10 @@ async def _upload():
         else:
             console.print(f"[green]Successfully uploaded to '{project}'[/green]")
 
-        # Sync project if requested (skip on dry run)
-        # Force full scan after bisync to ensure database is up-to-date with synced files
+        # Sync project if requested (skip on dry run).
+        # Trigger: upload adds new files the watcher has not observed locally.
+        # Why: force_full ensures those freshly uploaded files are indexed immediately.
+        # Outcome: upload keeps its eager reindex while sync/bisync stay incremental.
         if sync and not dry_run:
             console.print(f"[blue]Syncing project '{project}'...[/blue]")
             try:

tests/cli/cloud/test_cloud_api_client_and_utils.py

@@ -10,6 +10,7 @@
     make_api_request,
 )
 from basic_memory.cli.commands.cloud.cloud_utils import (
+    CloudUtilsError,
     create_cloud_project,
     fetch_cloud_projects,
     project_exists,
@@ -216,6 +217,20 @@ async def api_request(**kwargs):
     ]
 
 
+@pytest.mark.asyncio
+async def test_project_exists_surfaces_cloud_lookup_failures(config_home, config_manager):
+    """project_exists should surface lookup failures instead of pretending the project is missing."""
+    config = config_manager.load_config()
+    config.cloud_host = "https://cloud.example.test"
+    config_manager.save_config(config)
+
+    async def api_request(**_kwargs):
+        raise httpx.ConnectError("boom")
+
+    with pytest.raises(CloudUtilsError, match="Failed to fetch cloud projects"):
+        await project_exists("alpha", api_request=api_request)
+
+
 @pytest.mark.asyncio
 async def test_make_api_request_prefers_api_key_over_oauth(config_home, config_manager):
     """API key in config should be used without needing an OAuth token on disk."""

tests/cli/cloud/test_project_sync_command.py

@@ -76,5 +76,39 @@ async def sync(self, external_id: str, force_full: bool = False):
     assert seen["force_full"] is False
 
 
+def test_cloud_bisync_fails_fast_when_sync_entry_disappears(monkeypatch, config_manager):
+    """Bisync should raise a runtime error when validated sync config vanishes before persistence."""
+    project_sync_command = importlib.import_module("basic_memory.cli.commands.cloud.project_sync")
+
+    config = config_manager.load_config()
+    config.projects.pop("research", None)
+    config_manager.save_config(config)
+
+    monkeypatch.setattr(project_sync_command, "_require_cloud_credentials", lambda _config: None)
+    monkeypatch.setattr(
+        project_sync_command,
+        "get_mount_info",
+        lambda: _async_value(SimpleNamespace(bucket_name="tenant-bucket")),
+    )
+    monkeypatch.setattr(
+        project_sync_command,
+        "_get_cloud_project",
+        lambda _name: _async_value(
+            SimpleNamespace(name="research", external_id="external-project-id", path="research")
+        ),
+    )
+    monkeypatch.setattr(
+        project_sync_command,
+        "_get_sync_project",
+        lambda _name, _config, _project_data: (SimpleNamespace(name="research"), "/tmp/research"),
+    )
+    monkeypatch.setattr(project_sync_command, "project_bisync", lambda *args, **kwargs: True)
+
+    result = runner.invoke(app, ["cloud", "bisync", "--name", "research"])
+
+    assert result.exit_code == 1, result.output
+    assert "unexpectedly missing after validation" in result.output
+
+
 async def _async_value(value):
     return value

tests/cli/cloud/test_upload_command_routing.py

@@ -6,6 +6,7 @@
 from typer.testing import CliRunner
 
 from basic_memory.cli.app import app
+from basic_memory.cli.commands.cloud.cloud_utils import CloudUtilsError
 from basic_memory.config import ProjectMode
 
 runner = CliRunner()
@@ -111,3 +112,32 @@ async def fake_upload_path(*args, **kwargs):
     assert seen["project_exists_workspace"] == "project-workspace"
     assert seen["control_plane_workspace"] == "project-workspace"
     assert seen["base_url"] == "https://cloud.example.test"
+
+
+def test_cloud_upload_exits_when_project_lookup_fails(monkeypatch, tmp_path):
+    """Upload command should fail fast when cloud project lookup cannot reach the API."""
+    import basic_memory.cli.commands.cloud.upload_command as upload_command
+
+    upload_dir = tmp_path / "upload"
+    upload_dir.mkdir()
+    (upload_dir / "note.md").write_text("hello", encoding="utf-8")
+
+    async def fake_project_exists(_project_name: str, workspace: str | None = None) -> bool:
+        raise CloudUtilsError("lookup failed")
+
+    monkeypatch.setattr(upload_command, "project_exists", fake_project_exists)
+
+    result = runner.invoke(
+        app,
+        [
+            "cloud",
+            "upload",
+            str(upload_dir),
+            "--project",
+            "routing-test",
+            "--no-sync",
+        ],
+    )
+
+    assert result.exit_code == 1, result.output
+    assert "Failed to check cloud project 'routing-test'" in result.output