Raise an error in WM addDir if starting ERs fails. If project is provided in CLI run options, start ERs only in it. More migration from apischema to cattrs in WM.

Author: Aksem

src/finecode/cli_app/commands/run_cmd.py

@@ -129,7 +129,15 @@ async def _ignore_tree_changed(params: dict) -> None:
 
             client.on_notification("actions/treeChanged", _ignore_tree_changed)
 
-            await client.add_dir(workdir_path)
+            # When a project filter is given and we own the server, discover
+            # projects first (no runners), resolve names to paths, then start
+            # runners only for the requested projects.  In shared-server mode
+            # runners are already running, so always use the normal path.
+            deferred_runner_start = own_server and projects_names is not None
+            try:
+                await client.add_dir(workdir_path, start_runners=not deferred_runner_start)
+            except ApiError as exc:
+                raise RunFailed(str(exc)) from exc
 
             # Resolve project names (CLI option) to paths (canonical API identifier).
             project_paths: list[str] | None = None
@@ -145,6 +153,12 @@ async def _ignore_tree_changed(params: dict) -> None:
                     p["path"] for p in all_projects if p["name"] in projects_names
                 ]
 
+            if deferred_runner_start:
+                try:
+                    await client.start_runners(projects=project_paths)
+                except ApiError as exc:
+                    raise RunFailed(str(exc)) from exc
+
             # Resolve action names to sources (ADR-0019).
             all_actions = await client.list_actions()
             name_to_source: dict[str, str] = {a["name"]: a["source"] for a in all_actions}

src/finecode/lsp_server/endpoints/code_actions.py

@@ -3,10 +3,10 @@
 from pathlib import Path
 from typing import TYPE_CHECKING, Any
 
-import apischema
 from loguru import logger
 from lsprotocol import types
 
+from finecode._converter import converter as _converter
 from finecode.lsp_server import global_state, pygls_types_utils
 from finecode_extension_api.actions.code_quality.code_action_types import (
     CodeAction,
@@ -168,7 +168,7 @@ async def document_code_action(
     if json_result is None:
         return []
 
-    result = apischema.deserialize(GetCodeActionsRunResult, json_result)
+    result = _converter.structure(json_result, GetCodeActionsRunResult)
 
     return [_code_action_to_lsp(action) for action in result.actions]
 

src/finecode/lsp_server/endpoints/diagnostics.py

@@ -4,10 +4,10 @@
 from pathlib import Path
 from typing import TYPE_CHECKING, cast
 
-import apischema
 from loguru import logger
 from lsprotocol import types
 
+from finecode._converter import converter as _converter
 from finecode.lsp_server import global_state, pygls_types_utils
 from finecode_extension_api.actions.code_quality import lint_action
 from finecode_extension_api.resource_uri import ResourceUri
@@ -100,7 +100,7 @@ async def document_diagnostic_with_full_result(
     json_result = (response.get("resultByFormat") or {}).get("json")
     if json_result is None:
         return None
-    lint_result = apischema.deserialize(lint_action.LintRunResult, json_result)
+    lint_result = _converter.structure(json_result, lint_action.LintRunResult)
 
     try:
         requested_file_messages = lint_result.messages.pop(
@@ -261,7 +261,7 @@ async def workspace_diagnostic_with_full_result() -> types.WorkspaceDiagnosticRe
     json_result = (response.get("resultByFormat") or {}).get("json")
     if not json_result:
         return types.WorkspaceDiagnosticReport(items=[])
-    lint_result = apischema.deserialize(lint_action.LintRunResult, json_result)
+    lint_result = _converter.structure(json_result, lint_action.LintRunResult)
 
     items: list[types.WorkspaceDocumentDiagnosticReport] = []
     for file_uri, lint_messages in lint_result.messages.items():

src/finecode/lsp_server/endpoints/formatting.py

@@ -2,10 +2,10 @@
 
 from typing import TYPE_CHECKING, cast
 
-import apischema
 from loguru import logger
 from lsprotocol import types
 
+from finecode._converter import converter as _converter
 from finecode.lsp_server import global_state, pygls_types_utils
 from finecode_extension_api.actions.code_quality import format_files_action
 from finecode_extension_api.resource_uri import ResourceUri
@@ -49,9 +49,7 @@ async def format_document(_ls: LspServer, params: types.DocumentFormattingParams
     if json_result is None:
         return []
 
-    format_result = apischema.deserialize(
-        format_files_action.FormatFilesRunResult, json_result
-    )
+    format_result = _converter.structure(json_result, format_files_action.FormatFilesRunResult)
 
     response_for_file = format_result.result_by_file_path.get(
         cast(ResourceUri, file_uri)

src/finecode/wm_server/_api_handlers/_workspace.py

@@ -219,6 +219,7 @@ async def _handle_add_dir(
                            f"Did you run `finecode prepare-envs`?",
                 "type": "ERROR",
             })
+            raise
 
         # If config overrides were set before this addDir call (e.g. standalone CLI mode),
         # apply them to the newly discovered projects and push to their running runners.