feat(cli): imposer un workspace explicite pour les commandes workspace/venv

Author: raidos23

cli/click_app.py

@@ -142,6 +142,16 @@ def _resolve_workspace_path(workspace: str | None) -> str | None:
     return normalize_path(workspace)
 
 
+def _require_workspace_path(workspace: str | None, command_hint: str) -> str:
+    """Resolve a mandatory workspace path or raise a usage error."""
+    resolved = _resolve_workspace_path(workspace)
+    if resolved:
+        return resolved
+    raise click.ClickException(
+        f"Workspace is required. Usage: pycompiler_ark {command_hint} <workspace>"
+    )
+
+
 def _workspace_init_emit(workspace_dir: str, as_json: bool, with_venv: bool) -> None:
     """Run init workflow and emit output according to CLI output mode."""
     # Mode JSON destiné à l'automatisation (CI, scripts, wrappers).
@@ -337,14 +347,23 @@ def gui_engines(workspace):
         )
 
     @cli.command("prog-engine")
-    @click.argument("engine_id")
+    @click.argument("engine_or_workspace", required=False, type=str)
     @click.argument("workspace", required=False, type=click.Path(exists=False))
-    def prog_engine_cmd(engine_id, workspace):
-        """Launch dedicated single-engine config GUI with live JSON editor."""
+    def prog_engine_cmd(engine_or_workspace, workspace):
+        """Launch prog-engine GUI (single engine, or all engines when id is omitted)."""
+        engine_id = None
+        workspace_value = workspace
+        if workspace_value:
+            engine_id = engine_or_workspace
+        else:
+            workspace_value = engine_or_workspace
+
         sys.exit(
             launch_prog_engine_gui(
                 engine_id=engine_id,
-                workspace_dir=_ensure_workspace_exists(_resolve_workspace_path(workspace)),
+                workspace_dir=_ensure_workspace_exists(
+                    _require_workspace_path(workspace_value, "prog-engine")
+                ),
             )
         )
 
@@ -656,7 +675,9 @@ def venv():
     @click.option("--json", "as_json", is_flag=True)
     def venv_status(workspace, as_json):
         """Show current workspace Python mode and venv preference."""
-        payload = venv_status_payload(_resolve_workspace_path(workspace or "."))
+        payload = venv_status_payload(
+            _require_workspace_path(workspace, "venv status")
+        )
         if as_json:
             if not payload.get("ok"):
                 _emit_and_exit(payload, EXIT_WORKSPACE_INVALID, as_json=True)
@@ -676,7 +697,9 @@ def venv_status(workspace, as_json):
     @click.option("--json", "as_json", is_flag=True)
     def venv_use_system(workspace, as_json):
         """Switch workspace Python mode to system interpreter."""
-        payload = venv_use_system_payload(_resolve_workspace_path(workspace or "."))
+        payload = venv_use_system_payload(
+            _require_workspace_path(workspace, "venv use-system")
+        )
         if as_json:
             if not payload.get("ok"):
                 _emit_and_exit(payload, EXIT_WORKSPACE_INVALID, as_json=True)
@@ -698,7 +721,7 @@ def venv_use_system(workspace, as_json):
     def venv_use_venv(workspace, venv_path, create, as_json):
         """Switch workspace Python mode to venv and persist preference."""
         payload = venv_use_venv_payload(
-            _resolve_workspace_path(workspace or "."),
+            _require_workspace_path(workspace, "venv use-venv"),
             venv_path=venv_path,
             create_if_missing=bool(create),
         )
@@ -719,7 +742,7 @@ def venv_use_venv(workspace, venv_path, create, as_json):
     def venv_install_req(workspace, force_pip, as_json):
         """Install workspace requirements using current Python mode."""
         payload = venv_install_requirements_payload(
-            _resolve_workspace_path(workspace or "."),
+            _require_workspace_path(workspace, "venv install-req"),
             force_pip=bool(force_pip),
         )
         if as_json:
@@ -741,6 +764,7 @@ def venv_install_req(workspace, force_pip, as_json):
         cli=cli,
         click=click,
         resolve_workspace_path=_resolve_workspace_path,
+        require_workspace_path=_require_workspace_path,
         emit_and_exit=_emit_and_exit,
         echo_payload=_echo_payload,
         workspace_init_emit=_workspace_init_emit,

cli/click_workspace_commands.py

@@ -18,6 +18,7 @@ def register_workspace_commands(
     cli: Any,
     click: Any,
     resolve_workspace_path: Callable[[str | None], str | None],
+    require_workspace_path: Callable[[str | None, str], str],
     emit_and_exit: Callable[[object, int, bool], None],
     echo_payload: Callable[[object, bool], None],
     workspace_init_emit: Callable[[str, bool, bool], None],
@@ -42,7 +43,9 @@ def workspace():
     def workspace_inspect(path, as_json, strict):
         """Inspect workspace state and optionally enforce strict existence checks."""
         # Inspection non destructive: lit l'état workspace sans rien modifier.
-        payload = workspace_inspect_payload(resolve_workspace_path(path or "."))
+        payload = workspace_inspect_payload(
+            require_workspace_path(path, "workspace inspect")
+        )
         if as_json:
             if strict and not payload.get("exists"):
                 emit_and_exit(payload, EXIT_WORKSPACE_INVALID, True)
@@ -67,7 +70,9 @@ def workspace_inspect(path, as_json, strict):
     def workspace_entrypoint(path, as_json, strict):
         """Return the current workspace entrypoint in compact text or JSON form."""
         # Sortie volontairement compacte pour simplifier les scripts shell.
-        payload = workspace_inspect_payload(resolve_workspace_path(path or "."))
+        payload = workspace_inspect_payload(
+            require_workspace_path(path, "workspace entrypoint")
+        )
         result = {
             "workspace": payload.get("workspace"),
             "entrypoint": payload.get("entrypoint"),
@@ -88,7 +93,7 @@ def workspace_entrypoint(path, as_json, strict):
     def workspace_entrypoint_set(path, entrypoint, as_json):
         """Set and persist an explicit workspace entrypoint."""
         payload = workspace_entrypoint_set_payload(
-            resolve_workspace_path(path or "."),
+            require_workspace_path(path, "workspace entrypoint-set"),
             entrypoint,
         )
         if as_json:
@@ -112,7 +117,7 @@ def workspace_entrypoint_set(path, entrypoint, as_json):
     def workspace_entrypoint_clear(path, as_json):
         """Clear the persisted workspace entrypoint."""
         payload = workspace_entrypoint_clear_payload(
-            resolve_workspace_path(path or ".")
+            require_workspace_path(path, "workspace entrypoint-clear")
         )
         if as_json:
             if not payload.get("ok"):
@@ -137,7 +142,9 @@ def workspace_entrypoint_clear(path, as_json):
     def workspace_files(path, as_json):
         """Show a preview list of Python files discovered in the workspace."""
         # Preview partielle: on ne dump pas toute l'arborescence pour rester lisible.
-        payload = workspace_inspect_payload(resolve_workspace_path(path or "."))
+        payload = workspace_inspect_payload(
+            require_workspace_path(path, "workspace files")
+        )
         result = {
             "workspace": payload.get("workspace"),
             "python_file_count": payload.get("python_file_count", 0),
@@ -190,8 +197,9 @@ def workspace_apply(
         require_entrypoint,
     ):
         """Apply the full workspace workflow in a single command."""
+        resolved_path = require_workspace_path(path, "workspace apply")
         args = build_workspace_apply_args(
-            path=path,
+            path=resolved_path,
             as_json=bool(as_json),
             with_venv=bool(with_venv),
             entrypoint=entrypoint,
@@ -246,8 +254,9 @@ def workspace_select(
         require_entrypoint,
     ):
         """Alias of workspace apply that keeps GUI wording familiarity."""
+        resolved_path = require_workspace_path(path, "workspace select")
         args = build_workspace_apply_args(
-            path=path,
+            path=resolved_path,
             as_json=bool(as_json),
             with_venv=bool(with_venv),
             entrypoint=entrypoint,
@@ -271,7 +280,7 @@ def workspace_select(
     def init_cmd(workspace, as_json, with_venv):
         """Initialize workspace structure and baseline configuration files."""
         # Les effets de bord (création fichiers/dossiers) sont encapsulés dans workspace_init_emit.
-        workspace_dir = resolve_workspace_path(workspace or ".")
+        workspace_dir = require_workspace_path(workspace, "init")
         workspace_init_emit(workspace_dir, as_json=as_json, with_venv=with_venv)
 
     @cli.command("config-auto")
@@ -282,7 +291,7 @@ def config_auto_cmd(workspace, entrypoint, as_json):
         """Auto-configure workspace entrypoint and dependency settings."""
         # Support d'override explicite via --entrypoint pour bypasser l'auto-détection.
         workspace_config_auto_emit(
-            resolve_workspace_path(workspace or "."),
+            require_workspace_path(workspace, "config-auto"),
             entrypoint=entrypoint,
             as_json=as_json,
         )
@@ -294,7 +303,7 @@ def config_auto_cmd(workspace, entrypoint, as_json):
     def cfg_auto_cmd(workspace, entrypoint, as_json):
         """Short alias for config-auto."""
         workspace_config_auto_emit(
-            resolve_workspace_path(workspace or "."),
+            require_workspace_path(workspace, "cfg-auto"),
             entrypoint=entrypoint,
             as_json=as_json,
         )
@@ -312,7 +321,7 @@ def ws():
     def ws_init_cmd(workspace, as_json, with_venv):
         """Initialize workspace using the short ws namespace."""
         # Alias strict de `init` pour garder une UX type "git-like".
-        workspace_dir = resolve_workspace_path(workspace or ".")
+        workspace_dir = require_workspace_path(workspace, "ws init")
         workspace_init_emit(workspace_dir, as_json=as_json, with_venv=with_venv)
 
     @ws.command("config-auto")
@@ -322,7 +331,7 @@ def ws_init_cmd(workspace, as_json, with_venv):
     def ws_config_auto_cmd(workspace, entrypoint, as_json):
         """Auto-configure workspace using the short ws namespace."""
         workspace_config_auto_emit(
-            resolve_workspace_path(workspace or "."),
+            require_workspace_path(workspace, "ws config-auto"),
             entrypoint=entrypoint,
             as_json=as_json,
         )
@@ -334,7 +343,7 @@ def ws_config_auto_cmd(workspace, entrypoint, as_json):
     def ws_entrypoint_set_cmd(workspace, entrypoint, as_json):
         """Set workspace entrypoint through the short ws namespace."""
         payload = workspace_entrypoint_set_payload(
-            resolve_workspace_path(workspace or "."),
+            require_workspace_path(workspace, "ws entrypoint-set"),
             entrypoint,
         )
         if as_json:
@@ -358,7 +367,7 @@ def ws_entrypoint_set_cmd(workspace, entrypoint, as_json):
     def ws_entrypoint_clear_cmd(workspace, as_json):
         """Clear workspace entrypoint through the short ws namespace."""
         payload = workspace_entrypoint_clear_payload(
-            resolve_workspace_path(workspace or ".")
+            require_workspace_path(workspace, "ws entrypoint-clear")
         )
         if as_json:
             if not payload.get("ok"):
@@ -417,8 +426,9 @@ def ws_apply_cmd(
         require_entrypoint,
     ):
         """Apply workspace workflow using the short ws namespace."""
+        resolved_path = require_workspace_path(workspace, "ws apply")
         args = build_workspace_apply_args(
-            path=workspace,
+            path=resolved_path,
             as_json=bool(as_json),
             with_venv=bool(with_venv),
             entrypoint=entrypoint,
@@ -473,8 +483,9 @@ def ws_select_cmd(
         require_entrypoint,
     ):
         """Select/apply workspace using the short ws namespace."""
+        resolved_path = require_workspace_path(workspace, "ws select")
         args = build_workspace_apply_args(
-            path=workspace,
+            path=resolved_path,
             as_json=bool(as_json),
             with_venv=bool(with_venv),
             entrypoint=entrypoint,

cli/headless_commands.py

@@ -59,6 +59,17 @@ def extract_option_value(args: list[str], option: str) -> tuple[str | None, list
     return value, clean
 
 
+def require_workspace_arg(args: list[str], command_hint: str) -> str | None:
+    """Return explicit workspace from args or emit usage error and return None."""
+    workspace = normalize_path(
+        first_positional([token for token in args if not token.startswith("-")])
+    )
+    if workspace:
+        return workspace
+    error(f"Workspace is required. Usage: {command_hint} <workspace>")
+    return None
+
+
 def run_check(args: list[str]) -> int:
     """Execute the strict CI/CD check command in headless mode."""
     # On garde les mêmes valeurs par défaut que la commande click `check`.
@@ -91,12 +102,9 @@ def run_init(args: list[str]) -> int:
     # Le rendu texte suit le format partagé pour limiter les divergences d'UX.
     as_json = "--json" in args
     with_venv = "--with-venv" in args
-    workspace = (
-        normalize_path(
-            first_positional([token for token in args if not token.startswith("-")])
-        )
-        or "."
-    )
+    workspace = require_workspace_arg(args, "init")
+    if not workspace:
+        return EXIT_USAGE_ERROR
     # L'initialisation unifie création dossier/config/bcasl/pref (et venv optionnel).
     payload = workspace_init_payload(workspace, with_venv=with_venv)
     if as_json:
@@ -121,14 +129,9 @@ def run_config_auto(args: list[str]) -> int:
     except ValueError as exc:
         error(str(exc))
         return EXIT_USAGE_ERROR
-    workspace = (
-        normalize_path(
-            first_positional(
-                [token for token in clean_args if not token.startswith("-")]
-            )
-        )
-        or "."
-    )
+    workspace = require_workspace_arg(clean_args, "config-auto")
+    if not workspace:
+        return EXIT_USAGE_ERROR
     # Détection auto de l'entrypoint + mise à jour config workspace.
     payload = workspace_config_auto_payload(workspace, entrypoint=entrypoint)
     if as_json:
@@ -165,14 +168,9 @@ def run_workspace_apply(args: list[str]) -> int:
         error(str(exc))
         return EXIT_USAGE_ERROR
 
-    workspace = (
-        normalize_path(
-            first_positional(
-                [token for token in clean_args if not token.startswith("-")]
-            )
-        )
-        or "."
-    )
+    workspace = require_workspace_arg(clean_args, "workspace apply")
+    if not workspace:
+        return EXIT_USAGE_ERROR
 
     payload = workspace_apply_payload(
         workspace,