arctx-cli 0.3.1b1__tar.gz → 0.3.1b2__tar.gz

{arctx_cli-0.3.1b1 → arctx_cli-0.3.1b2}/.gitignore

@@ -6,6 +6,7 @@ __pycache__/
 .mypy_cache/
 .ruff_cache/
 .uv-cache/
+.uv-tools/
 .venv/
 .coverage
 htmlcov/
@@ -25,9 +26,9 @@ run.json
 # Package build artifacts
 dist/
 *.egg-info/
+packages/arctx/src/arctx/web/static/
 
 # IDE / Agent state directories
 .claude/
 .antigravitycli/
 .codex/
-

{arctx_cli-0.3.1b1 → arctx_cli-0.3.1b2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arctx-cli
-Version: 0.3.1b1
+Version: 0.3.1b2
 Summary: CLI for ARCTX — append-only DAG editing and refactoring
 Project-URL: Homepage, https://github.com/takumiecd/arctx
 Project-URL: Repository, https://github.com/takumiecd/arctx
@@ -17,7 +17,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Utilities
 Requires-Python: >=3.10
-Requires-Dist: arctx>=0.3.1b1
+Requires-Dist: arctx>=0.3.1b2
 Provides-Extra: dev
 Requires-Dist: black>=23.0; extra == 'dev'
 Requires-Dist: mypy>=1.0; extra == 'dev'

{arctx_cli-0.3.1b1 → arctx_cli-0.3.1b2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "arctx-cli"
-version = "0.3.1b1"
+version = "0.3.1b2"
 description = "CLI for ARCTX — append-only DAG editing and refactoring"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -25,7 +25,7 @@ classifiers = [
     "Topic :: Utilities",
 ]
 dependencies = [
-    "arctx>=0.3.1b1",
+    "arctx>=0.3.1b2",
 ]
 
 [project.optional-dependencies]

{arctx_cli-0.3.1b1 → arctx_cli-0.3.1b2}/src/arctx_cli/commands/serve.py

@@ -13,7 +13,7 @@ import argparse
 from arctx.serve import serve
 
 from arctx_cli.context import (
-    resolve_run_id_from_args,
+    require_existing_run_from_args,
     resolve_store,
     resolve_user_id_from_args,
     resolve_lane_id_from_args,
@@ -40,9 +40,7 @@ def add_parser(subparsers) -> argparse.ArgumentParser:
 
 def cli_serve(args) -> int:
     store = resolve_store(args.store_dir)
-    run_id = resolve_run_id_from_args(args)
-    if not store.run_path(run_id).exists():
-        raise KeyError(f"unknown run_id: {run_id}")
+    run_id = require_existing_run_from_args(args, store)
     serve(
         store,
         run_id,

{arctx_cli-0.3.1b1 → arctx_cli-0.3.1b2}/src/arctx_cli/commands/web.py

@@ -11,8 +11,8 @@ from arctx.web.extensions import load_enabled_routes, load_enabled_scripts
 from arctx.web.server import serve_gui
 
 from arctx_cli.context import (
+    require_existing_run_from_args,
     resolve_lane_id_from_args,
-    resolve_run_id_from_args,
     resolve_store,
     resolve_user_id_from_args,
 )
@@ -43,9 +43,7 @@ def cli_web(args) -> int:
         return 1
 
     store = resolve_store(args.store_dir)
-    run_id = resolve_run_id_from_args(args)
-    if not store.run_path(run_id).exists():
-        raise KeyError(f"unknown run_id: {run_id}")
+    run_id = require_existing_run_from_args(args, store)
 
     extension_scripts = load_enabled_scripts(store.run_path(run_id))
     extension_routes = load_enabled_routes(store.run_path(run_id))

{arctx_cli-0.3.1b1 → arctx_cli-0.3.1b2}/src/arctx_cli/context.py

@@ -8,6 +8,8 @@ code keeps working, and adds the argparse-Namespace helpers that belong here.
 
 from __future__ import annotations
 
+import os
+
 from arctx.session import (  # noqa: F401
     ExtensionAwareStore,
     RunHandleProxy,
@@ -28,6 +30,31 @@ def resolve_run_id_from_args(args) -> str:
     return resolve_run_id(getattr(args, "run", None))
 
 
+def require_existing_run_from_args(args, store) -> str:
+    """Resolve a run_id and verify the run actually exists on disk.
+
+    Raises a friendly :class:`RuntimeError` (rendered by the CLI as a clean
+    ``arctx: ...`` line) when the resolved run is missing. The message
+    distinguishes a stale current-run pointer from an explicit bad ``--run`` so
+    the user knows how to recover.
+    """
+    run_id = resolve_run_id_from_args(args)
+    if store.run_path(run_id).exists():
+        return run_id
+
+    explicit = getattr(args, "run", None) or os.environ.get("ARCTX_RUN_ID")
+    if explicit:
+        raise RuntimeError(
+            f"unknown run: {run_id!r}. See 'arctx list' for available runs."
+        )
+    # No --run / env: the id came from the <gitdir>/arctx-id current-run pointer.
+    raise RuntimeError(
+        f"current run {run_id!r} no longer exists (set in <gitdir>/arctx-id). "
+        "Point it at an existing run with 'arctx use <run_id>', "
+        "or see 'arctx list'."
+    )
+
+
 def resolve_user_id_from_args(args) -> str:
     """Resolve user attribution from parsed CLI args."""
     return resolve_user_id(getattr(args, "user", None))

{arctx_cli-0.3.1b1 → arctx_cli-0.3.1b2}/src/arctx_cli/main.py

@@ -3,11 +3,42 @@
 from __future__ import annotations
 
 import argparse
+import errno
+import os
 import sys
 
 from arctx_cli.commands import core_cli_commands, register_cli_commands
 
 
+def _user_error(message: str) -> int:
+    """Print a clean ``arctx: <message>`` to stderr and return exit code 1."""
+    print(f"arctx: {message}", file=sys.stderr)
+    return 1
+
+
+def _format_user_error(exc: BaseException, args) -> str | None:
+    """Turn an expected, user-facing exception into a friendly message.
+
+    Returns ``None`` for exceptions that should keep their traceback (genuine
+    bugs), so they propagate unchanged.
+    """
+    if isinstance(exc, OSError) and exc.errno == errno.EADDRINUSE:
+        host = getattr(args, "host", "127.0.0.1")
+        port = getattr(args, "port", None)
+        where = f"{host}:{port}" if port is not None else "the requested address"
+        return (
+            f"address already in use ({where}). "
+            "Another server is probably already running there — "
+            "stop it, or pick a different port with --port <N>."
+        )
+    if isinstance(exc, KeyError):
+        # KeyError stringifies with quotes; unwrap to the bare message.
+        return str(exc.args[0]) if exc.args else str(exc)
+    if isinstance(exc, (RuntimeError, FileNotFoundError, ValueError)):
+        return str(exc) or exc.__class__.__name__
+    return None
+
+
 def _build_parser(*, run_dir: str | None = None) -> argparse.ArgumentParser:
     parser = argparse.ArgumentParser(
         prog="arctx",
@@ -128,10 +159,21 @@ def main(argv: list[str] | None = None) -> int:
     parser = _build_parser(run_dir=run_dir)
     args = parser.parse_args(tokens)
     handler = getattr(args, "_arctx_handler", None)
-    if handler is not None:
-        return handler(args)
+    if handler is None:
+        return 1
 
-    return 1
+    if os.environ.get("ARCTX_DEBUG"):
+        # Opt back into full tracebacks for debugging.
+        return handler(args)
+    try:
+        return handler(args)
+    except KeyboardInterrupt:
+        return 130
+    except BaseException as exc:  # noqa: BLE001 — re-raise anything unexpected
+        message = _format_user_error(exc, args)
+        if message is None:
+            raise
+        return _user_error(message)
 
 
 if __name__ == "__main__":