Remove workspace param from CLI tool commands, fix formatting

phernandez · claude · phernandez · commit 4e8a62be5ef1 · 2026-04-30T17:43:24.000-05:00
The CLI tool commands still passed workspace= to MCP tool functions
after the workspace parameter was removed from all MCP tool signatures.

Also removes the workspace passthrough test and applies ruff formatting.

Signed-off-by: phernandez &lt;paul@basicmemory.com&gt;

Co-Authored-By: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;
Signed-off-by: phernandez &lt;paul@basicmachines.co&gt;
diff --git a/src/basic_memory/cli/commands/db.py b/src/basic_memory/cli/commands/db.py
@@ -99,9 +99,7 @@ def _abort_if_mcp_processes_alive() -> None:
     if not zombies:
         return
 
-    console.print(
-        "[red]Refusing to reset:[/red] basic-memory MCP processes are still running."
-    )
+    console.print("[red]Refusing to reset:[/red] basic-memory MCP processes are still running.")
     console.print(
         "[yellow]On macOS/Linux these would keep reading the deleted memory.db inode "
         "and return phantom search results (see #765).[/yellow]"
@@ -117,9 +115,7 @@ def _abort_if_mcp_processes_alive() -> None:
             "Where-Object {$_.CommandLine -like '*basic-memory*mcp*'}[/green]"
         )
     else:
-        console.print(
-            "  2. Verify nothing remains: [green]pgrep -fa 'basic-memory mcp'[/green]"
-        )
+        console.print("  2. Verify nothing remains: [green]pgrep -fa 'basic-memory mcp'[/green]")
     console.print("  3. Re-run [green]bm reset[/green].")
     raise typer.Exit(1)
 
diff --git a/src/basic_memory/cli/commands/tool.py b/src/basic_memory/cli/commands/tool.py
@@ -62,10 +62,6 @@ def write_note(
             help="The project to write to. If not provided, the default project will be used."
         ),
     ] = None,
-    workspace: Annotated[
-        Optional[str],
-        typer.Option(help="Cloud workspace tenant ID or unique name to route this request."),
-    ] = None,
     local: bool = typer.Option(
         False, "--local", help="Force local API routing (ignore cloud mode)"
     ),
@@ -106,7 +102,6 @@ def write_note(
                     content=content,
                     directory=folder,
                     project=project,
-                    workspace=workspace,
                     tags=tags,
                     output_format="json",
                 )
@@ -132,10 +127,6 @@ def read_note(
         Optional[str],
         typer.Option(help="The project to use. If not provided, the default project will be used."),
     ] = None,
-    workspace: Annotated[
-        Optional[str],
-        typer.Option(help="Cloud workspace tenant ID or unique name to route this request."),
-    ] = None,
     local: bool = typer.Option(
         False, "--local", help="Force local API routing (ignore cloud mode)"
     ),
@@ -156,7 +147,6 @@ def read_note(
                 mcp_read_note(
                     identifier=identifier,
                     project=project,
-                    workspace=workspace,
                     include_frontmatter=include_frontmatter,
                     output_format="json",
                 )
@@ -195,10 +185,6 @@ def edit_note(
             help="The project to edit. If not provided, the default project will be used."
         ),
     ] = None,
-    workspace: Annotated[
-        Optional[str],
-        typer.Option(help="Cloud workspace tenant ID or unique name to route this request."),
-    ] = None,
     local: bool = typer.Option(
         False, "--local", help="Force local API routing (ignore cloud mode)"
     ),
@@ -222,7 +208,6 @@ def edit_note(
                     operation=operation,
                     content=content,
                     project=project,
-                    workspace=workspace,
                     section=section,
                     find_text=find_text,
                     expected_replacements=expected_replacements,
@@ -260,10 +245,6 @@ def build_context(
         Optional[str],
         typer.Option(help="The project to use. If not provided, the default project will be used."),
     ] = None,
-    workspace: Annotated[
-        Optional[str],
-        typer.Option(help="Cloud workspace tenant ID or unique name to route this request."),
-    ] = None,
     local: bool = typer.Option(
         False, "--local", help="Force local API routing (ignore cloud mode)"
     ),
@@ -284,7 +265,6 @@ def build_context(
                 mcp_build_context(
                     url=url,
                     project=project,
-                    workspace=workspace,
                     depth=depth,
                     timeframe=timeframe,
                     page=page,
@@ -317,10 +297,6 @@ def recent_activity(
         Optional[str],
         typer.Option(help="The project to use. If not provided, the default project will be used."),
     ] = None,
-    workspace: Annotated[
-        Optional[str],
-        typer.Option(help="Cloud workspace tenant ID or unique name to route this request."),
-    ] = None,
     local: bool = typer.Option(
         False, "--local", help="Force local API routing (ignore cloud mode)"
     ),
@@ -346,7 +322,6 @@ def recent_activity(
                     page=page,
                     page_size=page_size,
                     project=project,
-                    workspace=workspace,
                     output_format="json",
                 )
             )
@@ -408,10 +383,6 @@ def search_notes(
         Optional[str],
         typer.Option(help="The project to use. If not provided, the default project will be used."),
     ] = None,
-    workspace: Annotated[
-        Optional[str],
-        typer.Option(help="Cloud workspace tenant ID or unique name to route this request."),
-    ] = None,
     local: bool = typer.Option(
         False, "--local", help="Force local API routing (ignore cloud mode)"
     ),
@@ -482,7 +453,6 @@ def search_notes(
                 mcp_search(
                     query=query or None,
                     project=project,
-                    workspace=workspace,
                     search_type=search_type,
                     output_format="json",
                     page=page,
@@ -592,10 +562,6 @@ def schema_validate(
         Optional[str],
         typer.Option(help="The project to use. If not provided, the default project will be used."),
     ] = None,
-    workspace: Annotated[
-        Optional[str],
-        typer.Option(help="Cloud workspace tenant ID or unique name to route this request."),
-    ] = None,
     local: bool = typer.Option(
         False, "--local", help="Force local API routing (ignore cloud mode)"
     ),
@@ -629,7 +595,6 @@ def schema_validate(
                     note_type=note_type,
                     identifier=identifier,
                     project=project,
-                    workspace=workspace,
                     output_format="json",
                 )
             )
@@ -660,10 +625,6 @@ def schema_infer(
         Optional[str],
         typer.Option(help="The project to use. If not provided, the default project will be used."),
     ] = None,
-    workspace: Annotated[
-        Optional[str],
-        typer.Option(help="Cloud workspace tenant ID or unique name to route this request."),
-    ] = None,
     local: bool = typer.Option(
         False, "--local", help="Force local API routing (ignore cloud mode)"
     ),
@@ -686,7 +647,6 @@ def schema_infer(
                     note_type=note_type,
                     threshold=threshold,
                     project=project,
-                    workspace=workspace,
                     output_format="json",
                 )
             )
@@ -714,10 +674,6 @@ def schema_diff(
         Optional[str],
         typer.Option(help="The project to use. If not provided, the default project will be used."),
     ] = None,
-    workspace: Annotated[
-        Optional[str],
-        typer.Option(help="Cloud workspace tenant ID or unique name to route this request."),
-    ] = None,
     local: bool = typer.Option(
         False, "--local", help="Force local API routing (ignore cloud mode)"
     ),
@@ -738,7 +694,6 @@ def schema_diff(
                 mcp_schema_diff(
                     note_type=note_type,
                     project=project,
-                    workspace=workspace,
                     output_format="json",
                 )
             )
diff --git a/src/basic_memory/mcp/project_context.py b/src/basic_memory/mcp/project_context.py
@@ -633,9 +633,7 @@ async def resolve_workspace_project_identifier(
 
     if len(matches) > 1:
         # Prefer the project in the default workspace when name is ambiguous
-        default_match = next(
-            (entry for entry in matches if entry.workspace.is_default), None
-        )
+        default_match = next((entry for entry in matches if entry.workspace.is_default), None)
         if default_match:
             return default_match
 
diff --git a/src/basic_memory/mcp/tools/edit_note.py b/src/basic_memory/mcp/tools/edit_note.py
@@ -176,9 +176,7 @@ async def edit_note(
     content: Annotated[
         str,
         Field(
-            validation_alias=AliasChoices(
-                "content", "new_content", "replacement", "replace_with"
-            )
+            validation_alias=AliasChoices("content", "new_content", "replacement", "replace_with")
         ),
     ],
     project: Optional[str] = None,
@@ -196,9 +194,7 @@ async def edit_note(
         Optional[str],
         Field(
             default=None,
-            validation_alias=AliasChoices(
-                "find_text", "find", "old_text", "old_content", "search"
-            ),
+            validation_alias=AliasChoices("find_text", "find", "old_text", "old_content", "search"),
         ),
     ] = None,
     expected_replacements: Optional[int] = None,
diff --git a/src/basic_memory/mcp/tools/project_management.py b/src/basic_memory/mcp/tools/project_management.py
@@ -24,7 +24,6 @@
 # --- Helpers for dual-fetch + merge ---
 
 
-
 def _merge_projects(
     local_list: ProjectList | None,
     cloud_list: ProjectList | None,
diff --git a/src/basic_memory/mcp/tools/search.py b/src/basic_memory/mcp/tools/search.py
@@ -358,9 +358,7 @@ async def search_notes(
         Optional[float],
         Field(
             default=None,
-            validation_alias=AliasChoices(
-                "min_similarity", "threshold", "similarity_threshold"
-            ),
+            validation_alias=AliasChoices("min_similarity", "threshold", "similarity_threshold"),
         ),
     ] = None,
     context: Context | None = None,
diff --git a/src/basic_memory/repository/sqlite_search_repository.py b/src/basic_memory/repository/sqlite_search_repository.py
@@ -107,8 +107,7 @@ async def init_search_index(self):
                 await self._ensure_vector_tables()
             except SemanticDependenciesMissingError as exc:
                 logger.warning(
-                    f"Semantic search disabled: {exc}. "
-                    "Falling back to keyword-only search."
+                    f"Semantic search disabled: {exc}. Falling back to keyword-only search."
                 )
                 self._semantic_enabled = False
 
diff --git a/test-int/mcp/test_param_aliases_integration.py b/test-int/mcp/test_param_aliases_integration.py
@@ -489,7 +489,17 @@ async def test_aliases_not_advertised_in_schema(mcp_server, app):
             ),
             "search_notes": (
                 ["query", "page", "page_size", "note_types", "after_date", "min_similarity"],
-                ["q", "search", "offset", "limit", "note_type", "types", "since", "after", "threshold"],
+                [
+                    "q",
+                    "search",
+                    "offset",
+                    "limit",
+                    "note_type",
+                    "types",
+                    "since",
+                    "after",
+                    "threshold",
+                ],
             ),
             "recent_activity": (
                 ["type", "timeframe", "page", "page_size"],
diff --git a/tests/cli/test_cli_tool_json_output.py b/tests/cli/test_cli_tool_json_output.py
@@ -167,22 +167,6 @@ def test_read_note_json_output(mock_mcp_read):
     assert mock_mcp_read.call_args.kwargs["output_format"] == "json"
 
 
-@patch(
-    "basic_memory.cli.commands.tool.mcp_read_note",
-    new_callable=AsyncMock,
-    return_value=READ_NOTE_RESULT,
-)
-def test_read_note_workspace_passthrough(mock_mcp_read):
-    """read-note --workspace passes workspace through to the MCP tool call."""
-    result = runner.invoke(
-        cli_app,
-        ["tool", "read-note", "test-note", "--workspace", "tenant-123"],
-    )
-
-    assert result.exit_code == 0, f"CLI failed: {result.output}"
-    assert mock_mcp_read.call_args.kwargs["workspace"] == "tenant-123"
-
-
 @patch(
     "basic_memory.cli.commands.tool.mcp_read_note",
     new_callable=AsyncMock,
diff --git a/tests/markdown/test_markdown_plugins.py b/tests/markdown/test_markdown_plugins.py
@@ -189,8 +189,7 @@ def test_observation_skips_obsidian_callouts():
         t.meta.get("observation")
         for t in tokens
         if t.type == "inline" and t.meta and t.meta.get("observation")
-        if t.meta["observation"]["category"]
-        and t.meta["observation"]["category"].startswith("!")
+        if t.meta["observation"]["category"] and t.meta["observation"]["category"].startswith("!")
     ]
     assert callout_observations == [], (
         f"Obsidian callouts should not produce observations, got: {callout_observations}"
diff --git a/tests/mcp/test_project_context.py b/tests/mcp/test_project_context.py
@@ -830,7 +830,6 @@ async def fake_resolve_project_parameter(project=None, **kwargs):
     assert is_memory_url is True
 
 
-
 class TestDetectProjectFromUrlPrefix:
     """Test detect_project_from_url_prefix for URL-based project detection."""
 
diff --git a/tests/mcp/test_tool_project_management.py b/tests/mcp/test_tool_project_management.py
@@ -316,7 +316,6 @@ async def test_list_memory_projects_factory_mode_workspace_lookup_failure(app, t
     assert "- cloud-proj (cloud)" in result
 
 
-
 @pytest.mark.asyncio
 async def test_list_memory_projects_json_with_cloud(app, test_project):
     """JSON output includes local_path, cloud_path, and source fields."""
@@ -491,7 +490,6 @@ def _make_workspace_index(workspace_projects):
     return _build_workspace_project_index(workspaces, entries)
 
 
-
 @pytest.mark.asyncio
 async def test_list_memory_projects_aggregates_without_config_workspace(app, test_project):
     """When no explicit workspace is given, cloud discovery fans out across workspaces."""
@@ -522,6 +520,3 @@ async def test_list_memory_projects_aggregates_without_config_workspace(app, tes
 
     mock_index.assert_awaited_once()
     assert "- cloud-proj (cloud) [00000000-0000-0000-0000-000000000001]" in result
-
-
-
diff --git a/tests/mcp/test_tool_telemetry.py b/tests/mcp/test_tool_telemetry.py
@@ -63,7 +63,6 @@ async def test_write_note_emits_root_operation_and_project_context(
             "entrypoint": "mcp",
             "tool_name": "write_note",
             "requested_project": test_project.name,
-
             "note_type": "note",
             "overwrite": False,
             "output_format": "json",
@@ -108,7 +107,6 @@ async def test_read_note_emits_root_operation_and_project_context(
             "entrypoint": "mcp",
             "tool_name": "read_note",
             "requested_project": test_project.name,
-
             "output_format": "json",
             "include_frontmatter": True,
         },
@@ -156,7 +154,6 @@ async def test_search_notes_emits_root_operation_and_project_context(
             "entrypoint": "mcp",
             "tool_name": "search_notes",
             "requested_project": test_project.name,
-
             "search_type": "text",
             "output_format": "json",
             "page": 1,
@@ -209,7 +206,6 @@ async def test_edit_note_emits_root_operation_and_project_context(
             "entrypoint": "mcp",
             "tool_name": "edit_note",
             "requested_project": test_project.name,
-
             "edit_operation": "append",
             "output_format": "json",
             "has_section": False,
@@ -261,7 +257,6 @@ async def test_build_context_emits_root_operation_and_project_context(
             "entrypoint": "mcp",
             "tool_name": "build_context",
             "requested_project": test_project.name,
-
             "depth": 2,
             "timeframe": "7d",
             "page": 1,
diff --git a/tests/services/test_search_service.py b/tests/services/test_search_service.py
@@ -259,9 +259,7 @@ async def test_delete_entity_without_permalink(search_service, sample_entity):
 
 
 @pytest.mark.asyncio
-async def test_handle_delete_clears_entity_vectors(
-    search_service, sample_entity, monkeypatch
-):
+async def test_handle_delete_clears_entity_vectors(search_service, sample_entity, monkeypatch):
     """Regression guard for #764: handle_delete must drive vector-row cleanup
     so deleting an entity doesn't leave orphaned rows in `search_vector_chunks`
     or `search_vector_embeddings`.
@@ -288,8 +286,7 @@ async def spy_delete_entity_vector_rows(entity_id: int) -> None:
     await search_service.handle_delete(sample_entity)
 
     assert calls == [sample_entity.id], (
-        f"handle_delete must call delete_entity_vector_rows({sample_entity.id}); "
-        f"got calls={calls}"
+        f"handle_delete must call delete_entity_vector_rows({sample_entity.id}); got calls={calls}"
     )
 
 

Original file line number	Diff line number	Diff line change
`@@ -107,8 +107,7 @@ async def init_search_index(self):`
`107`	`107`	`await self._ensure_vector_tables()`
`108`	`108`	`except SemanticDependenciesMissingError as exc:`
`109`	`109`	`logger.warning(`
`110`		`- f"Semantic search disabled: {exc}. "`
`111`		`- "Falling back to keyword-only search."`
	`110`	`+ f"Semantic search disabled: {exc}. Falling back to keyword-only search."`
`112`	`111`	`)`
`113`	`112`	`self._semantic_enabled = False`
`114`	`113`